1268 files changed, 175237 insertions, 100654 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d46850c2..e10ecf8d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,12 +23,15 @@ SUBDIRS = \
   $(PQ_DIR) \
   $(SQ_DIR) \
   mhd \
+  templating \
   bank-lib \
   exchangedb \
+  kyclogic \
   exchange \
   auditordb \
   auditor \
   lib \
   exchange-tools \
+  extensions/age_restriction \
   testing \
   benchmark
diff --git a/src/auditor/.gitignore b/src/auditor/.gitignore
index 6d25d8bae..11c875dc6 100644
--- a/src/auditor/.gitignore
+++ b/src/auditor/.gitignore
@@ -19,3 +19,10 @@ generate-auditor-basedb-revocation.conf
 revocation-tmp-*
 auditor-basedb.wdb
 taler-auditor-sync
+auditor-basedb.sqlite3
+taler-auditor-test.sqlite3
+libeufin-nexus.pid
+libeufin-sandbox.pid
+taler-helper-auditor-purses
+generate-kyc-basedb.conf.edited
+generate-auditor-basedb.conf.edited
diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index 6d49da6db..381c0b115 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -16,12 +16,12 @@ clean-local:
 
 bin_PROGRAMS = \
   taler-auditor-dbinit \
-  taler-auditor-exchange \
   taler-auditor-httpd \
   taler-auditor-sync \
   taler-helper-auditor-aggregation \
   taler-helper-auditor-coins \
   taler-helper-auditor-deposits \
+  taler-helper-auditor-purses \
   taler-helper-auditor-reserves \
   taler-helper-auditor-wire
 
@@ -65,9 +65,9 @@ taler_auditor_dbinit_CPPFLAGS = \
   -I$(top_srcdir)/src/pq/ \
   $(POSTGRESQL_CPPFLAGS)
 
-taler_helper_auditor_reserves_SOURCES = \
-  taler-helper-auditor-reserves.c
-taler_helper_auditor_reserves_LDADD = \
+taler_helper_auditor_coins_SOURCES = \
+  taler-helper-auditor-coins.c
+taler_helper_auditor_coins_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -80,9 +80,9 @@ taler_helper_auditor_reserves_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
-taler_helper_auditor_coins_SOURCES = \
-  taler-helper-auditor-coins.c
-taler_helper_auditor_coins_LDADD = \
+taler_helper_auditor_aggregation_SOURCES = \
+  taler-helper-auditor-aggregation.c
+taler_helper_auditor_aggregation_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -95,9 +95,9 @@ taler_helper_auditor_coins_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
-taler_helper_auditor_aggregation_SOURCES = \
-  taler-helper-auditor-aggregation.c
-taler_helper_auditor_aggregation_LDADD = \
+taler_helper_auditor_deposits_SOURCES = \
+  taler-helper-auditor-deposits.c
+taler_helper_auditor_deposits_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -110,9 +110,24 @@ taler_helper_auditor_aggregation_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
-taler_helper_auditor_deposits_SOURCES = \
-  taler-helper-auditor-deposits.c
-taler_helper_auditor_deposits_LDADD = \
+taler_helper_auditor_purses_SOURCES = \
+  taler-helper-auditor-purses.c
+taler_helper_auditor_purses_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  $(top_builddir)/src/auditordb/libtalerauditordb.la \
+  libauditorreport.la \
+  -ljansson \
+  -lgnunetjson \
+  -lgnunetutil \
+  $(XLIB)
+
+taler_helper_auditor_reserves_SOURCES = \
+  taler-helper-auditor-reserves.c
+taler_helper_auditor_reserves_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -125,6 +140,8 @@ taler_helper_auditor_deposits_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
+
+
 taler_helper_auditor_wire_SOURCES = \
   taler-helper-auditor-wire.c
 taler_helper_auditor_wire_LDADD = \
@@ -145,7 +162,7 @@ taler_helper_auditor_wire_LDADD = \
 taler_auditor_httpd_SOURCES = \
   taler-auditor-httpd.c taler-auditor-httpd.h \
   taler-auditor-httpd_deposit-confirmation.c taler-auditor-httpd_deposit-confirmation.h \
-  taler-auditor-httpd_exchanges.c taler-auditor-httpd_exchanges.h \
+  taler-auditor-httpd_deposit-confirmation-get.c taler-auditor-httpd_deposit-confirmation-get.h \
   taler-auditor-httpd_mhd.c taler-auditor-httpd_mhd.h
 taler_auditor_httpd_LDADD = \
   $(LIBGCRYPT_LIBS) \
@@ -161,15 +178,6 @@ taler_auditor_httpd_LDADD = \
   -lz \
   $(XLIB)
 
-taler_auditor_exchange_SOURCES = \
-  taler-auditor-exchange.c
-taler_auditor_exchange_LDADD = \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/auditordb/libtalerauditordb.la \
-  -lgnunetutil \
-  $(XLIB)
-
 taler_auditor_sync_SOURCES = \
   taler-auditor-sync.c
 taler_auditor_sync_LDADD = \
@@ -189,29 +197,22 @@ taler_auditor_sync_CPPFLAGS = \
 
 check_SCRIPTS = \
   test-auditor.sh \
+  test-kyc.sh \
   test-revocation.sh \
   test-sync.sh
 
 .NOTPARALLEL:
-# revocation test disabled for now: need working wallet first!
-TESTS = $(check_SCRIPTS)
+# TESTS = $(check_SCRIPTS)
 
 EXTRA_DIST = \
   taler-auditor.in \
   taler-helper-auditor-render.py \
   auditor.conf \
+  setup.sh \
   test-sync-in.conf \
   test-sync-out.conf \
   generate-auditor-basedb.sh \
-  generate-revoke-basedb.sh \
   generate-auditor-basedb.conf \
-  generate-auditor-basedb-template.conf \
-  $(check_SCRIPTS) \
-  auditor-basedb.age \
-  auditor-basedb.conf \
-  auditor-basedb.sql \
-  auditor-basedb.mpub \
-  revoke-basedb.age \
-  revoke-basedb.conf \
-  revoke-basedb.sql \
-  revoke-basedb.mpub
+  generate-kyc-basedb.conf \
+  generate-revoke-basedb.sh \
+  $(check_SCRIPTS)
diff --git a/src/auditor/auditor-basedb.age b/src/auditor/auditor-basedb.age
deleted file mode 100644
index 18fdb08e5..000000000
--- a/src/auditor/auditor-basedb.age
+++ /dev/null
@@ -1 +0,0 @@
-1651516353
diff --git a/src/auditor/auditor-basedb.conf b/src/auditor/auditor-basedb.conf
deleted file mode 100644
index a67f2bf1a..000000000
--- a/src/auditor/auditor-basedb.conf
+++ /dev/null
@@ -1,187 +0,0 @@
-[arm]
-CONFIG = /research/taler/exchange/src/auditor/auditor-basedb.conf
-
-[benchmark]
-MERCHANT_DETAILS = merchant_details.json
-BANK_DETAILS = bank_details.json
-
-[coin_kudos_10]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.01
-fee_withdraw = TESTKUDOS:0.01
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:10
-
-[coin_kudos_8]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.04
-fee_refresh = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.02
-fee_withdraw = TESTKUDOS:0.05
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:8
-
-[coin_kudos_5]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.01
-fee_withdraw = TESTKUDOS:0.01
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:5
-
-[coin_kudos_4]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.02
-fee_refresh = TESTKUDOS:0.04
-fee_deposit = TESTKUDOS:0.03
-fee_withdraw = TESTKUDOS:0.03
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:4
-
-[coin_kudos_2]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.02
-fee_refresh = TESTKUDOS:0.04
-fee_deposit = TESTKUDOS:0.03
-fee_withdraw = TESTKUDOS:0.03
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:2
-
-[coin_kudos_1]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.02
-fee_withdraw = TESTKUDOS:0.02
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:1
-
-[coin_kudos_ct_10]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_deposit = TESTKUDOS:0.01
-fee_withdraw = TESTKUDOS:0.01
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:0.10
-
-[coin_kudos_ct_1]
-rsa_keysize = 1024
-CIPHER = RSA
-fee_refund = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.01
-fee_deposit = TESTKUDOS:0.01
-fee_withdraw = TESTKUDOS:0.01
-duration_legal = 3 years
-duration_spend = 2 years
-duration_withdraw = 7 days
-value = TESTKUDOS:0.01
-
-[payments-generator]
-exchange = http://localhost:8081/
-exchange-admin = http://localhost:18080/
-exchange_admin = http://localhost:18080/
-merchant = http://localhost:9966/
-bank = http://localhost:8082/
-instance = default
-currency = TESTKUDOS
-
-[merchant-exchange-default]
-CURRENCY = TESTKUDOS
-EXCHANGE_BASE_URL = http://localhost:8081/
-MASTER_KEY = W2824S2YNKFZDR0P57Q005J23XGFWSE2GB24A1YS0157NE3F24NG
-
-[merchant-account-merchant]
-ACTIVE_default = YES
-HONOR_default = YES
-PAYTO_URI = payto://x-taler-bank/localhost/42
-
-[exchange-accountcredentials-1]
-PASSWORD = x
-USERNAME = Exchange
-WIRE_GATEWAY_AUTH_METHOD = basic
-WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/
-
-[exchange-account-1]
-enable_credit = yes
-enable_debit = yes
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-
-[instance-default]
-NAME = Merchant Inc.
-KEYFILE = ${TALER_DATA_HOME}/merchant/default.priv
-
-[taler]
-CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
-CURRENCY = TESTKUDOS
-
-[merchantdb-postgres]
-CONFIG = postgres:///auditor-basedb
-
-[merchant]
-DEFAULT_MAX_WIRE_FEE = TESTKUDOS:0.10
-KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-DEFAULT_MAX_DEPOSIT_FEE = TESTKUDOS:0.1
-WIREFORMAT = default
-WIRE_TRANSFER_DELAY = 1 minute
-FORCE_AUDIT = YES
-UNIXPATH = ${TALER_RUNTIME_DIR}/merchant.http
-
-[exchangedb-postgres]
-CONFIG = postgres:///auditor-basedb
-
-[exchange]
-LOOKAHEAD_SIGN = 32 weeks 1 day
-SIGNKEY_DURATION = 4 weeks
-MASTER_PUBLIC_KEY = W2824S2YNKFZDR0P57Q005J23XGFWSE2GB24A1YS0157NE3F24NG
-SIGNKEY_LEGAL_DURATION = 4 weeks
-UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
-
-[bank]
-SERVE = http
-ALLOW_REGISTRATIONS = YES
-SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost/2
-SUGGESTED_EXCHANGE = http://localhost:8081/
-HTTP_PORT = 8082
-MAX_DEBT_BANK = TESTKUDOS:100000.0
-MAX_DEBT = TESTKUDOS:50.0
-DATABASE = postgres:///auditor-basedb
-
-[auditordb-postgres]
-CONFIG = postgres:///auditor-basedb
-
-[auditor]
-PUBLIC_KEY = MSF4QDJMZTT9CC5EMHS480F652QAS40SEXEPAW0GGB9G9RB9B5T0
-TINY_AMOUNT = TESTKUDOS:0.01
-BASE_URL = http://localhost:8083/
-
-[PATHS]
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
-TALER_HOME = ${PWD}/generate_auditordb_home/
-
diff --git a/src/auditor/auditor-basedb.fees b/src/auditor/auditor-basedb.fees
deleted file mode 100644
index ef2a6d121..000000000
--- a/src/auditor/auditor-basedb.fees
+++ /dev/null
diff --git a/src/auditor/auditor-basedb.mpub b/src/auditor/auditor-basedb.mpub
deleted file mode 100644
index efa2b454b..000000000
--- a/src/auditor/auditor-basedb.mpub
+++ /dev/null
@@ -1 +0,0 @@
-NYBEPNN9Z5C6ZKM4BTD7TWRD9EBE6TE2YE12STA6GJHBP4HVQCYG
diff --git a/src/auditor/auditor-basedb.sql b/src/auditor/auditor-basedb.sql
deleted file mode 100644
index e2b83be64..000000000
--- a/src/auditor/auditor-basedb.sql
+++ /dev/null
@@ -1,16131 +0,0 @@
---
--- PostgreSQL database dump
---
-
--- Dumped from database version 13.5 (Debian 13.5-0+deb11u1)
--- Dumped by pg_dump version 13.5 (Debian 13.5-0+deb11u1)
-
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SELECT pg_catalog.set_config('search_path', '', false);
-SET check_function_bodies = false;
-SET xmloption = content;
-SET client_min_messages = warning;
-SET row_security = off;
-
---
--- Name: _v; Type: SCHEMA; Schema: -; Owner: -
---
-
-CREATE SCHEMA _v;
-
-
---
--- Name: SCHEMA _v; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
-
-
---
--- Name: assert_patch_is_applied(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_patch_is_applied(in_patch_name text) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    t_text TEXT;
-BEGIN
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'Patch % is not applied!', in_patch_name;
-    END IF;
-    RETURN format('Patch %s is applied.', in_patch_name);
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_patch_is_applied(in_patch_name text); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_patch_is_applied(in_patch_name text) IS 'Function that can be used to make sure that patch has been applied.';
-
-
---
--- Name: assert_user_is_not_superuser(); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_not_superuser() RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RAISE EXCEPTION 'Current user is superuser - cannot continue.';
-    END IF;
-    RETURN 'assert_user_is_not_superuser: OK';
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_not_superuser(); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_not_superuser() IS 'Function that can be used to make sure that patch is being applied using normal (not superuser) account.';
-
-
---
--- Name: assert_user_is_one_of(text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_one_of(VARIADIC p_acceptable_users text[]) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-BEGIN
-    IF current_user = any( p_acceptable_users ) THEN
-        RETURN 'assert_user_is_one_of: OK';
-    END IF;
-    RAISE EXCEPTION 'User is not one of: % - cannot continue.', p_acceptable_users;
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_one_of(VARIADIC p_acceptable_users text[]); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_one_of(VARIADIC p_acceptable_users text[]) IS 'Function that can be used to make sure that patch is being applied by one of defined users.';
-
-
---
--- Name: assert_user_is_superuser(); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_superuser() RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RETURN 'assert_user_is_superuser: OK';
-    END IF;
-    RAISE EXCEPTION 'Current user is not superuser - cannot continue.';
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_superuser(); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_superuser() IS 'Function that can be used to make sure that patch is being applied using superuser account.';
-
-
---
--- Name: register_patch(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(text) RETURNS SETOF integer
-    LANGUAGE sql
-    AS $_$
-    SELECT _v.register_patch( $1, NULL, NULL );
-$_$;
-
-
---
--- Name: FUNCTION register_patch(text); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(text) IS 'Wrapper to allow registration of patches without requirements and conflicts.';
-
-
---
--- Name: register_patch(text, text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(text, text[]) RETURNS SETOF integer
-    LANGUAGE sql
-    AS $_$
-    SELECT _v.register_patch( $1, $2, NULL );
-$_$;
-
-
---
--- Name: FUNCTION register_patch(text, text[]); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(text, text[]) IS 'Wrapper to allow registration of patches without conflicts.';
-
-
---
--- Name: register_patch(text, text[], text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer) RETURNS SETOF integer
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    t_text   TEXT;
-    t_text_a TEXT[];
-    i INT4;
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF FOUND THEN
-        RAISE EXCEPTION 'Patch % is already applied!', in_patch_name;
-    END IF;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE patch_name = any( in_conflicts ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Versioning patches conflict. Conflicting patche(s) installed: %.', array_to_string( t_text_a, ', ' );
-    END IF;
-
-    IF array_upper( in_requirements, 1 ) IS NOT NULL THEN
-        t_text_a := '{}';
-        FOR i IN array_lower( in_requirements, 1 ) .. array_upper( in_requirements, 1 ) LOOP
-            SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_requirements[i];
-            IF NOT FOUND THEN
-                t_text_a := t_text_a || in_requirements[i];
-            END IF;
-        END LOOP;
-        IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-            RAISE EXCEPTION 'Missing prerequisite(s): %.', array_to_string( t_text_a, ', ' );
-        END IF;
-    END IF;
-
-    INSERT INTO _v.patches (patch_name, applied_tsz, applied_by, requires, conflicts ) VALUES ( in_patch_name, now(), current_user, coalesce( in_requirements, '{}' ), coalesce( in_conflicts, '{}' ) );
-    RETURN;
-END;
-$$;
-
-
---
--- Name: FUNCTION register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer) IS 'Function to register patches in database. Raises exception if there are conflicts, prerequisites are not installed or the migration has already been installed.';
-
-
---
--- Name: unregister_patch(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.unregister_patch(in_patch_name text, OUT versioning integer) RETURNS SETOF integer
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    i        INT4;
-    t_text_a TEXT[];
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE in_patch_name = ANY( requires ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Cannot uninstall %, as it is required by: %.', in_patch_name, array_to_string( t_text_a, ', ' );
-    END IF;
-
-    DELETE FROM _v.patches WHERE patch_name = in_patch_name;
-    GET DIAGNOSTICS i = ROW_COUNT;
-    IF i < 1 THEN
-        RAISE EXCEPTION 'Patch % is not installed, so it can''t be uninstalled!', in_patch_name;
-    END IF;
-
-    RETURN;
-END;
-$$;
-
-
---
--- Name: FUNCTION unregister_patch(in_patch_name text, OUT versioning integer); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.unregister_patch(in_patch_name text, OUT versioning integer) IS 'Function to unregister patches in database. Dies if the patch is not registered, or if unregistering it would break dependencies.';
-
-
---
--- Name: add_constraints_to_account_merges_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_account_merges_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE account_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT account_merges_' || partition_suffix || '_account_merge_request_serial_id_key '
-        'UNIQUE (account_merge_request_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_aggregation_tracking_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_aggregation_tracking_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE aggregation_tracking_' || partition_suffix || ' '
-      'ADD CONSTRAINT aggregation_tracking_' || partition_suffix || '_aggregation_serial_id_key '
-        'UNIQUE (aggregation_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_contracts_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_contracts_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE contracts_' || partition_suffix || ' '
-      'ADD CONSTRAINT contracts_' || partition_suffix || '_contract_serial_id_key '
-        'UNIQUE (contract_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_cs_nonce_locks_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_cs_nonce_locks_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE cs_nonce_locks_' || partition_suffix || ' '
-      'ADD CONSTRAINT cs_nonce_locks_' || partition_suffix || '_cs_nonce_lock_serial_id_key '
-        'UNIQUE (cs_nonce_lock_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_deposits_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_deposits_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT deposits_' || partition_suffix || '_deposit_serial_id_pkey '
-        'PRIMARY KEY (deposit_serial_id) '
-      ',ADD CONSTRAINT deposits_' || partition_suffix || '_coin_pub_merchant_pub_h_contract_terms_key '
-        'UNIQUE (coin_pub, merchant_pub, h_contract_terms)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_known_coins_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_known_coins_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE known_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT known_coins_' || partition_suffix || '_known_coin_id_key '
-        'UNIQUE (known_coin_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_deposits_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_deposits_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_deposits_' || partition_suffix || '_purse_deposit_serial_id_key '
-        'UNIQUE (purse_deposit_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_merges_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_merges_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_merges_' || partition_suffix || '_purse_merge_request_serial_id_key '
-        'UNIQUE (purse_merge_request_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_requests_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_requests_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_requests_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_requests_' || partition_suffix || '_purse_requests_serial_id_key '
-        'UNIQUE (purse_requests_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_recoup_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_recoup_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_' || partition_suffix || '_recoup_uuid_key '
-        'UNIQUE (recoup_uuid) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_recoup_refresh_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_recoup_refresh_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_refresh_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_refresh_' || partition_suffix || '_recoup_refresh_uuid_key '
-        'UNIQUE (recoup_refresh_uuid) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_commitments_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_commitments_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_commitments_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_commitments_' || partition_suffix || '_melt_serial_id_key '
-        'UNIQUE (melt_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_revealed_coins_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_revealed_coins_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_revealed_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_rrc_serial_key '
-        'UNIQUE (rrc_serial) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_coin_ev_key '
-        'UNIQUE (coin_ev) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_h_coin_ev_key '
-        'UNIQUE (h_coin_ev) '
-      ',ADD PRIMARY KEY (melt_serial_id, freshcoin_index) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_transfer_keys_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_transfer_keys_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_transfer_keys_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_transfer_keys_' || partition_suffix || '_rtc_serial_key '
-        'UNIQUE (rtc_serial)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refunds_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refunds_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refunds_' || partition_suffix || ' '
-      'ADD CONSTRAINT refunds_' || partition_suffix || '_refund_serial_id_key '
-        'UNIQUE (refund_serial_id) '
-      ',ADD PRIMARY KEY (deposit_serial_id, rtransaction_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_close_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_close_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_close_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_close_' || partition_suffix || '_close_uuid_pkey '
-        'PRIMARY KEY (close_uuid)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_in_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_in_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_in_' || partition_suffix || '_reserve_in_serial_id_key '
-        'UNIQUE (reserve_in_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_out_' || partition_suffix || '_reserve_out_serial_id_key '
-        'UNIQUE (reserve_out_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wad_in_entries_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wad_in_entries_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_in_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_in_entries_' || partition_suffix || '_wad_in_entry_serial_id_key '
-        'UNIQUE (wad_in_entry_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wad_out_entries_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wad_out_entries_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_out_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_out_entries_' || partition_suffix || '_wad_out_entry_serial_id_key '
-        'UNIQUE (wad_out_entry_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wads_in_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wads_in_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_in_serial_id_key '
-        'UNIQUE (wad_in_serial_id) '
-      ',ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_is_origin_exchange_url_key '
-        'UNIQUE (wad_id, origin_exchange_url) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wads_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wads_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_out_' || partition_suffix || '_wad_out_serial_id_key '
-        'UNIQUE (wad_out_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wire_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wire_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_out_' || partition_suffix || '_wireout_uuid_pkey '
-        'PRIMARY KEY (wireout_uuid)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wire_targets_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wire_targets_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_targets_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_targets_' || partition_suffix || '_wire_target_serial_id_key '
-        'UNIQUE (wire_target_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: create_foreign_hash_partition(character varying, integer, character varying, integer, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_hash_partition(source_table_name character varying, modulus integer, shard_suffix character varying, current_shard_num integer, local_user character varying DEFAULT 'taler-exchange-httpd'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating %_% on %', source_table_name, shard_suffix, shard_suffix;
-
-  EXECUTE FORMAT(
-    'CREATE FOREIGN TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s) '
-      'SERVER %I'
-    ,source_table_name || '_' || shard_suffix
-    ,source_table_name
-    ,modulus
-    ,current_shard_num-1
-    ,shard_suffix
-  );
-
-  EXECUTE FORMAT(
-    'ALTER FOREIGN TABLE %I OWNER TO %I'
-    ,source_table_name || '_' || shard_suffix
-    ,local_user
-  );
-
-END
-$$;
-
-
---
--- Name: create_foreign_range_partition(character varying, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_range_partition(source_table_name character varying, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-   RAISE NOTICE 'TODO';
-END
-$$;
-
-
---
--- Name: create_foreign_servers(integer, character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_servers(amount integer, domain character varying, remote_user character varying DEFAULT 'taler'::character varying, remote_user_password character varying DEFAULT 'taler'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM prepare_sharding();
-
-  FOR i IN 1..amount LOOP
-    PERFORM create_shard_server(
-      i::varchar
-     ,amount
-     ,i
-     ,'shard-' || i::varchar || '.' || domain
-     ,remote_user
-     ,remote_user_password
-     ,'taler-exchange'
-     ,'5432'
-     ,'taler-exchange-httpd'
-    );
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
-
---
--- Name: create_hash_partition(character varying, integer, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_hash_partition(source_table_name character varying, modulus integer, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating partition %_%', source_table_name, partition_num;
-
-  EXECUTE FORMAT(
-    'CREATE TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s)'
-    ,source_table_name || '_' || partition_num
-    ,source_table_name
-    ,modulus
-    ,partition_num-1
-  );
-
-END
-$$;
-
-
---
--- Name: create_partitioned_table(character varying, character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_partitioned_table(table_definition character varying, table_name character varying, main_table_partition_str character varying, shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  IF shard_suffix IS NOT NULL THEN
-    table_name=table_name || '_' || shard_suffix;
-    main_table_partition_str = '';
-  END IF;
-
-  EXECUTE FORMAT(
-    table_definition,
-    table_name,
-    main_table_partition_str
-  );
-
-END
-$$;
-
-
---
--- Name: create_partitions(integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_partitions(num_partitions integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  modulus INTEGER;
-BEGIN
-
-  modulus := num_partitions;
-
-  PERFORM detach_default_partitions();
-
-  LOOP
-
-    PERFORM create_hash_partition(
-      'wire_targets'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_targets_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'reserves_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_close'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_close_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'known_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_known_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_commitments'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_commitments_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_revealed_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_revealed_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_transfer_keys'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_transfer_keys_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_deposits_partition(num_partitions::varchar);
-
--- TODO: dynamically (!) creating/deleting deposits partitions:
---    create new partitions 'as needed', drop old ones once the aggregator has made
---    them empty; as 'new' deposits will always have deadlines in the future, this
---    would basically guarantee no conflict between aggregator and exchange service!
--- SEE also: https://www.cybertec-postgresql.com/en/automatic-partition-creation-in-postgresql/
--- (article is slightly wrong, as this works:)
---CREATE TABLE tab (
---  id bigint GENERATED ALWAYS AS IDENTITY,
---  ts timestamp NOT NULL,
---  data text
--- PARTITION BY LIST ((ts::date));
--- CREATE TABLE tab_def PARTITION OF tab DEFAULT;
--- BEGIN
--- CREATE TABLE tab_part2 (LIKE tab);
--- insert into tab_part2 (id,ts, data) values (5,'2022-03-21', 'foo');
--- alter table tab attach partition tab_part2 for values in ('2022-03-21');
--- commit;
--- Naturally, to ensure this is actually 100% conflict-free, we'd
--- need to create tables at the granularity of the wire/refund deadlines;
--- that is right now configurable via AGGREGATOR_SHIFT option.
-
--- FIXME: range partitioning
---    PERFORM create_range_partition(
---      'deposits_by_ready'
---      ,modulus
---      ,num_partitions
---    );
---
---    PERFORM create_range_partition(
---      'deposits_for_matching'
---      ,modulus
---      ,num_partitions
---    );
-
-    PERFORM create_hash_partition(
-      'refunds'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refunds_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wire_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'aggregation_transient'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'aggregation_tracking'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_aggregation_tracking_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'recoup_refresh'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_refresh_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'prewire'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'cs_nonce_locks'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_cs_nonce_locks_partition(num_partitions::varchar);
-
-    ---------------- P2P ----------------------
-
-    PERFORM create_hash_partition(
-      'purse_requests'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_requests_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'purse_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'account_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_account_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'contracts'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_contracts_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'history_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'close_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'purse_deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_deposits_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_out_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_out_entries_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wads_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wads_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_in_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_in_entries_partition(num_partitions::varchar);
-
-    num_partitions=num_partitions-1;
-    EXIT WHEN num_partitions=0;
-
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
-
---
--- Name: create_range_partition(character varying, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_range_partition(source_table_name character varying, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  RAISE NOTICE 'TODO';
-END
-$$;
-
-
---
--- Name: create_shard_server(character varying, integer, integer, character varying, character varying, character varying, character varying, integer, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying DEFAULT 'taler-exchange'::character varying, remote_port integer DEFAULT 5432, local_user character varying DEFAULT 'taler-exchange-httpd'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating server %', remote_host;
-
-  EXECUTE FORMAT(
-    'CREATE SERVER IF NOT EXISTS %I '
-      'FOREIGN DATA WRAPPER postgres_fdw '
-      'OPTIONS (dbname %L, host %L, port %L)'
-    ,shard_suffix
-    ,remote_db_name
-    ,remote_host
-    ,remote_port
-  );
-
-  EXECUTE FORMAT(
-    'CREATE USER MAPPING IF NOT EXISTS '
-      'FOR %I SERVER %I '
-      'OPTIONS (user %L, password %L)'
-    ,local_user
-    ,shard_suffix
-    ,remote_user
-    ,remote_user_password
-  );
-
-  EXECUTE FORMAT(
-    'GRANT ALL PRIVILEGES '
-      'ON FOREIGN SERVER %I '
-      'TO %I;'
-    ,shard_suffix
-    ,local_user
-  );
-
-  PERFORM create_foreign_hash_partition(
-    'wire_targets'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_close'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'known_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_commitments'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_revealed_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_transfer_keys'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
---  PERFORM create_foreign_range_partition(
---    'deposits_by_ready'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
---  PERFORM create_foreign_range_partition(
---    'deposits_for_matching'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
-  PERFORM create_foreign_hash_partition(
-    'refunds'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wire_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_transient'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_tracking'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_refresh'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'prewire'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'cs_nonce_locks'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-  ------------------- P2P --------------------
-
-  PERFORM create_foreign_hash_partition(
-    'purse_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'account_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'contracts'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'history_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'close_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_out_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wads_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_in_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-END
-$$;
-
-
---
--- Name: FUNCTION create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying, remote_port integer, local_user character varying); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying, remote_port integer, local_user character varying) IS 'Create a shard server on the master
-      node with all foreign tables and user mappings';
-
-
---
--- Name: create_table_account_merges(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_account_merges(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'account_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(account_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' -- REFERENCES purse_requests (purse_pub)
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_aggregation_tracking(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_aggregation_tracking(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_tracking';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(aggregation_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-	    ',deposit_serial_id INT8 PRIMARY KEY' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE' -- FIXME chnage to coint_pub + deposit_serial_id for more efficient depost -- or something else ???
-      ',wtid_raw BYTEA NOT NULL' -- CONSTRAINT wire_out_ref REFERENCES wire_out(wtid_raw) ON DELETE CASCADE DEFERRABLE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (deposit_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wtid_raw_index '
-    'ON ' || table_name || ' '
-    '(wtid_raw);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_wtid_raw_index '
-    'IS ' || quote_literal('for lookup_transactions') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_aggregation_transient(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_aggregation_transient(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_transient';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',wtid_raw BYTEA NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ') %s ;'
-      ,table_name
-      ,'PARTITION BY HASH (wire_target_h_payto)'
-      ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_close_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_close_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'close_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',close_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',close_val INT8 NOT NULL'
-      ',close_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,close_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_contracts(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_contracts(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'contracts';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(contract_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',pub_ckey BYTEA NOT NULL CHECK (LENGTH(pub_ckey)=32)'
-      ',contract_sig BYTEA NOT NULL CHECK (LENGTH(contract_sig)=64)'
-      ',e_contract BYTEA NOT NULL'
-      ',purse_expiration INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_cs_nonce_locks(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_cs_nonce_locks(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(cs_nonce_lock_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',nonce BYTEA PRIMARY KEY CHECK (LENGTH(nonce)=32)'
-      ',op_hash BYTEA NOT NULL CHECK (LENGTH(op_hash)=64)'
-      ',max_denomination_serial INT8 NOT NULL'
-    ') %s ;'
-    ,'cs_nonce_locks'
-    ,'PARTITION BY HASH (nonce)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',shard INT8 NOT NULL'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',known_coin_id INT8 NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE' --- FIXME: column needed???
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wallet_timestamp INT8 NOT NULL'
-      ',exchange_timestamp INT8 NOT NULL'
-      ',refund_deadline INT8 NOT NULL'
-      ',wire_deadline INT8 NOT NULL'
-      ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)'
-      ',wire_salt BYTEA NOT NULL CHECK (LENGTH(wire_salt)=16)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',done BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_blocked BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_details_serial_id INT8' -- REFERENCES extension_details (extension_details_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits_by_ready(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits_by_ready(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_by_ready';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(wire_deadline INT8 NOT NULL'
-    ',shard INT8 NOT NULL'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (wire_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(wire_deadline ASC, shard ASC, coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits_for_matching(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits_for_matching(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_for_matching';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(refund_deadline INT8 NOT NULL'
-    ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (refund_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(refund_deadline ASC, merchant_pub, coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_history_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_history_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'history_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',request_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',history_fee_val INT8 NOT NULL'
-      ',history_fee_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,request_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_known_coins(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_known_coins(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'known_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(known_coin_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_pub BYTEA NOT NULL PRIMARY KEY CHECK (LENGTH(coin_pub)=32)'
-      ',age_commitment_hash BYTEA CHECK (LENGTH(age_commitment_hash)=32)'
-      ',denom_sig BYTEA NOT NULL'
-      ',remaining_val INT8 NOT NULL'
-      ',remaining_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)' -- FIXME: or include denominations_serial? or multi-level partitioning?;
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-END
-$$;
-
-
---
--- Name: create_table_prewire(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_prewire(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'prewire';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(prewire_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
-      ',wire_method TEXT NOT NULL'
-      ',finished BOOLEAN NOT NULL DEFAULT false'
-      ',failed BOOLEAN NOT NULL DEFAULT false'
-      ',buf BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (prewire_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_finished_index '
-    'ON ' || table_name || ' '
-    '(finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_finished_index '
-    'IS ' || quote_literal('for gc_prewire') || ';'
-  );
-  -- FIXME: find a way to combine these two indices?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_failed_finished_index '
-    'ON ' || table_name || ' '
-    '(failed,finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_failed_finished_index '
-    'IS ' || quote_literal('for wire_prepare_data_get') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_deposits(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_deposits(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',PRIMARY KEY (purse_pub,coin_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by coin_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_merges(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_merges(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY '-- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(length(reserve_pub)=32)'--REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' --REFERENCES purse_requests (purse_pub) ON DELETE CASCADE
-      ',merge_sig BYTEA NOT NULL CHECK (LENGTH(merge_sig)=64)'
-      ',merge_timestamp INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_requests_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',merge_pub BYTEA NOT NULL CHECK (LENGTH(merge_pub)=32)'
-      ',purse_expiration INT8 NOT NULL'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',age_limit INT4 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',balance_val INT8 NOT NULL DEFAULT (0)'
-      ',balance_frac INT4 NOT NULL DEFAULT (0)'
-      ',purse_sig BYTEA NOT NULL CHECK(LENGTH(purse_sig)=64)'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by marge_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_merge_pub '
-    'ON ' || table_name || ' '
-    '(merge_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves_out (reserve_out_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub);'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup_by_reserve(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup_by_reserve(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves (reserve_out_serial_id) ON DELETE CASCADE
-    ',coin_pub BYTEA CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_out_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup_refresh(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup_refresh(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_refresh';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_refresh_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',known_coin_id BIGINT NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',rrc_serial INT8 NOT NULL' -- REFERENCES refresh_revealed_coins (rrc_serial) ON DELETE CASCADE -- UNIQUE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: any query using this index will be slow. Materialize index or change query?
-  -- Also: which query uses this index?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_rrc_serial_index '
-    'ON ' || table_name || ' '
-    '(rrc_serial);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_commitments(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_commitments(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_commitments';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(melt_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',rc BYTEA PRIMARY KEY CHECK (LENGTH(rc)=64)'
-      ',old_coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',old_coin_sig BYTEA NOT NULL CHECK(LENGTH(old_coin_sig)=64)'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',noreveal_index INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (rc)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- Note: index spans partitions, may need to be materialized.
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_old_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(old_coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_revealed_coins(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_revealed_coins(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_revealed_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rrc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 NOT NULL' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',freshcoin_index INT4 NOT NULL'
-      ',link_sig BYTEA NOT NULL CHECK(LENGTH(link_sig)=64)'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_ev BYTEA NOT NULL' -- UNIQUE'
-      ',h_coin_ev BYTEA NOT NULL CHECK(LENGTH(h_coin_ev)=64)' -- UNIQUE'
-      ',ev_sig BYTEA NOT NULL'
-      ',ewv BYTEA NOT NULL'
-      --  ,PRIMARY KEY (melt_serial_id, freshcoin_index) -- done per shard
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_coins_by_melt_serial_id_index '
-    'ON ' || table_name || ' '
-    '(melt_serial_id);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_transfer_keys(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_transfer_keys(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_transfer_keys';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rtc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 PRIMARY KEY' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',transfer_pub BYTEA NOT NULL CHECK(LENGTH(transfer_pub)=32)'
-      ',transfer_privs BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refunds(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refunds(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refunds';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(refund_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',deposit_serial_id INT8 NOT NULL' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE'
-      ',merchant_sig BYTEA NOT NULL CHECK(LENGTH(merchant_sig)=64)'
-      ',rtransaction_id INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      -- ,PRIMARY KEY (deposit_serial_id, rtransaction_id) -- done per shard!
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
-      ',reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)'
-      ',current_balance_val INT8 NOT NULL'
-      ',current_balance_frac INT4 NOT NULL'
-      ',purses_active INT8 NOT NULL DEFAULT(0)'
-      ',purses_allowed INT8 NOT NULL DEFAULT(0)'
-      ',kyc_required BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',kyc_passed BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',expiration_date INT8 NOT NULL'
-      ',gc_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_expiration_index '
-    'ON ' || table_name || ' '
-    '(expiration_date'
-    ',current_balance_val'
-    ',current_balance_frac'
-    ');'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_expiration_index '
-    'IS ' || quote_literal('used in get_expired_reserves') || ';'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_gc_date_index '
-    'ON ' || table_name || ' '
-    '(gc_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_gc_date_index '
-    'IS ' || quote_literal('for reserve garbage collection') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_close(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_close(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_close';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(close_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE / PRIMARY KEY'
-      ',reserve_pub BYTEA NOT NULL' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',execution_date INT8 NOT NULL'
-      ',wtid BYTEA NOT NULL CHECK (LENGTH(wtid)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',closing_fee_val INT8 NOT NULL'
-      ',closing_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_close_uuid_index '
-    'ON ' || table_name || ' '
-    '(close_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub_index '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-END
-$$;
-
-
---
--- Name: create_table_reserves_in(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_in(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',reserve_pub BYTEA PRIMARY KEY' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',wire_reference INT8 NOT NULL'
-      ',credit_val INT8 NOT NULL'
-      ',credit_frac INT4 NOT NULL'
-      ',wire_source_h_payto BYTEA CHECK (LENGTH(wire_source_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',execution_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_in_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_in_serial_id);'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_section_execution_date_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section '
-    ',execution_date'
-    ');'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section,'
-    'reserve_in_serial_id DESC'
-    ');'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64) UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial)'
-      ',denom_sig BYTEA NOT NULL'
-      ',reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',execution_date INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,'reserves_out'
-    ,'PARTITION BY HASH (h_blind_ev)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_out_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-  -- FIXME: change query to use reserves_out_by_reserve instead and materialize execution_date there as well???
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid, execution_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'IS ' || quote_literal('for get_reserves_out and exchange_do_withdraw_limit_check') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_out_by_reserve(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_out_by_reserve(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves_out_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE
-    ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64)'
-    ') %s '
-    ,table_name
-    ,'PARTITION BY HASH (reserve_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wad_in_entries(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wad_in_entries(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_in_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_in_serial_id INT8' -- REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wad_out_entries(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wad_out_entries(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_out_serial_id INT8' -- REFERENCES wads_out (wad_out_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wads_in(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wads_in(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',origin_exchange_url TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',arrival_time INT8 NOT NULL'
-      ',UNIQUE (wad_id, origin_exchange_url)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wads_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wads_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',partner_serial_id INT8 NOT NULL' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',execution_time INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wire_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wire_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wire_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wireout_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',execution_date INT8 NOT NULL'
-      ',wtid_raw BYTEA UNIQUE NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wtid_raw)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wire_target_h_payto_index '
-    'ON ' || table_name || ' '
-    '(wire_target_h_payto);'
-  );
-
-
-END
-$$;
-
-
---
--- Name: create_table_wire_targets(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wire_targets(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wire_target_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',wire_target_h_payto BYTEA PRIMARY KEY CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',payto_uri VARCHAR NOT NULL'
-      ',kyc_ok BOOLEAN NOT NULL DEFAULT (FALSE)'
-      ',external_id VARCHAR'
-    ') %s ;'
-    ,'wire_targets'
-    ,'PARTITION BY HASH (wire_target_h_payto)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: defer_wire_out(); Type: PROCEDURE; Schema: public; Owner: -
---
-
-CREATE PROCEDURE public.defer_wire_out()
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-IF EXISTS (
-  SELECT 1
-    FROM information_Schema.constraint_column_usage
-   WHERE table_name='wire_out'
-     AND constraint_name='wire_out_ref')
-THEN
-  SET CONSTRAINTS wire_out_ref DEFERRED;
-END IF;
-
-END $$;
-
-
---
--- Name: deposits_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  was_ready BOOLEAN;
-BEGIN
-  was_ready  = NOT (OLD.done OR OLD.extension_blocked);
-
-  IF (was_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_delete_trigger() IS 'Replicate deposit deletions into materialized indices.';
-
-
---
--- Name: deposits_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-
-  IF (is_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_insert_trigger() IS 'Replicate deposit inserts into materialized indices.';
-
-
---
--- Name: deposits_update_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_update_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  was_ready BOOLEAN;
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  was_ready = NOT (OLD.done OR OLD.extension_blocked);
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-  IF (was_ready AND NOT is_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  IF (is_ready AND NOT was_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_update_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_update_trigger() IS 'Replicate deposits changes into materialized indices.';
-
-
---
--- Name: detach_default_partitions(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.detach_default_partitions() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Detaching all default table partitions';
-
-  ALTER TABLE IF EXISTS wire_targets
-    DETACH PARTITION wire_targets_default;
-
-  ALTER TABLE IF EXISTS reserves
-    DETACH PARTITION reserves_default;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DETACH PARTITION reserves_in_default;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DETACH PARTITION reserves_close_default;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DETACH PARTITION reserves_out_default;
-
-  ALTER TABLE IF EXISTS reserves_out_by_reserve
-    DETACH PARTITION reserves_out_by_reserve_default;
-
-  ALTER TABLE IF EXISTS known_coins
-    DETACH PARTITION known_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DETACH PARTITION refresh_commitments_default;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DETACH PARTITION refresh_revealed_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DETACH PARTITION refresh_transfer_keys_default;
-
-  ALTER TABLE IF EXISTS deposits
-    DETACH PARTITION deposits_default;
-
---- TODO range partitioning
---  ALTER TABLE IF EXISTS deposits_by_ready
---    DETACH PARTITION deposits_by_ready_default;
---
---  ALTER TABLE IF EXISTS deposits_for_matching
---    DETACH PARTITION deposits_default_for_matching_default;
-
-  ALTER TABLE IF EXISTS refunds
-    DETACH PARTITION refunds_default;
-
-  ALTER TABLE IF EXISTS wire_out
-    DETACH PARTITION wire_out_default;
-
-  ALTER TABLE IF EXISTS aggregation_transient
-    DETACH PARTITION aggregation_transient_default;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DETACH PARTITION aggregation_tracking_default;
-
-  ALTER TABLE IF EXISTS recoup
-    DETACH PARTITION recoup_default;
-
-  ALTER TABLE IF EXISTS recoup_by_reserve
-    DETACH PARTITION recoup_by_reserve_default;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DETACH PARTITION recoup_refresh_default;
-
-  ALTER TABLE IF EXISTS prewire
-    DETACH PARTITION prewire_default;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DETACH partition cs_nonce_locks_default;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DETACH partition purse_requests_default;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DETACH partition purse_merges_default;
-
-  ALTER TABLE IF EXISTS account_merges
-    DETACH partition account_merges_default;
-
-  ALTER TABLE IF EXISTS contracts
-    DETACH partition contracts_default;
-
-  ALTER TABLE IF EXISTS history_requests
-    DETACH partition history_requests_default;
-
-  ALTER TABLE IF EXISTS close_requests
-    DETACH partition close_requests_default;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DETACH partition purse_deposits_default;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DETACH partition wad_out_entries_default;
-
-  ALTER TABLE IF EXISTS wads_in
-    DETACH partition wads_in_default;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DETACH partition wad_in_entries_default;
-END
-$$;
-
-
---
--- Name: FUNCTION detach_default_partitions(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.detach_default_partitions() IS 'We need to drop default and create new one before deleting the default partitions
-      otherwise constraints get lost too. Might be needed in shardig too';
-
-
---
--- Name: drop_default_partitions(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.drop_default_partitions() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Dropping default table partitions';
-
-  DROP TABLE IF EXISTS wire_targets_default;
-  DROP TABLE IF EXISTS reserves_default;
-  DROP TABLE IF EXISTS reserves_in_default;
-  DROP TABLE IF EXISTS reserves_close_default;
-  DROP TABLE IF EXISTS reserves_out_default;
-  DROP TABLE IF EXISTS reserves_out_by_reserve_default;
-  DROP TABLE IF EXISTS known_coins_default;
-  DROP TABLE IF EXISTS refresh_commitments_default;
-  DROP TABLE IF EXISTS refresh_revealed_coins_default;
-  DROP TABLE IF EXISTS refresh_transfer_keys_default;
-  DROP TABLE IF EXISTS deposits_default;
---DROP TABLE IF EXISTS deposits_by_ready_default;
---DROP TABLE IF EXISTS deposits_for_matching_default;
-  DROP TABLE IF EXISTS refunds_default;
-  DROP TABLE IF EXISTS wire_out_default;
-  DROP TABLE IF EXISTS aggregation_transient_default;
-  DROP TABLE IF EXISTS aggregation_tracking_default;
-  DROP TABLE IF EXISTS recoup_default;
-  DROP TABLE IF EXISTS recoup_by_reserve_default;
-  DROP TABLE IF EXISTS recoup_refresh_default;
-  DROP TABLE IF EXISTS prewire_default;
-  DROP TABLE IF EXISTS cs_nonce_locks_default;
-
-  DROP TABLE IF EXISTS purse_requests_default;
-  DROP TABLE IF EXISTS purse_merges_default;
-  DROP TABLE IF EXISTS account_merges_default;
-  DROP TABLE IF EXISTS contracts_default;
-  DROP TABLE IF EXISTS history_requests_default;
-  DROP TABLE IF EXISTS close_requests_default;
-  DROP TABLE IF EXISTS purse_deposits_default;
-  DROP TABLE IF EXISTS wad_out_entries_default;
-  DROP TABLE IF EXISTS wads_in_default;
-  DROP TABLE IF EXISTS wad_in_entries_default;
-
-END
-$$;
-
-
---
--- Name: FUNCTION drop_default_partitions(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.drop_default_partitions() IS 'Drop all default partitions once other partitions are attached.
-      Might be needed in sharding too.';
-
-
---
--- Name: exchange_do_account_merge(bytea, bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_account_merge(in_purse_pub bytea, in_reserve_pub bytea, in_reserve_sig bytea, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME: function/API is dead! Do DCE?
-END $$;
-
-
---
--- Name: exchange_do_batch_withdraw(bigint, integer, bytea, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result. Excludes storing the planchets.';
-
-
---
--- Name: exchange_do_batch_withdraw_insert(bytea, bigint, integer, bytea, bigint, bytea, bytea, bytea, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  denom_serial INT8;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-out_denom_unknown=TRUE;
-out_conflict=TRUE;
-out_nonce_reuse=TRUE;
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  out_denom_unknown=TRUE;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-out_denom_unknown=FALSE;
-
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  out_conflict=TRUE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
--- Special actions needed for a CS withdraw?
-out_nonce_reuse=FALSE;
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      out_nonce_reuse=TRUE;
-      ASSERT false, 'nonce reuse attempted by client';
-      RETURN;
-    END IF;
-  END IF;
-END IF;
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean) IS 'Stores information about a planchet for a batch withdraw operation. Checks if the planchet already exists, and in that case indicates a conflict';
-
-
---
--- Name: exchange_do_close_request(bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_close_request(in_reserve_pub bytea, in_reserve_sig bytea, OUT out_final_balance_val bigint, OUT out_final_balance_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
---
--- Name: exchange_do_deposit(bigint, integer, bytea, bytea, bigint, bigint, bigint, bigint, bytea, character varying, bytea, bigint, bytea, bytea, bigint, boolean, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_deposit(in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_h_contract_terms bytea, in_wire_salt bytea, in_wallet_timestamp bigint, in_exchange_timestamp bigint, in_refund_deadline bigint, in_wire_deadline bigint, in_merchant_pub bytea, in_receiver_wire_account character varying, in_h_payto bytea, in_known_coin_id bigint, in_coin_pub bytea, in_coin_sig bytea, in_shard bigint, in_extension_blocked boolean, in_extension_details character varying, OUT out_exchange_timestamp bigint, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  wtsi INT8; -- wire target serial id
-DECLARE
-  xdi INT8; -- eXstension details serial id
-BEGIN
--- Shards: INSERT extension_details (by extension_details_serial_id)
---         INSERT wire_targets (by h_payto), on CONFLICT DO NOTHING;
---         INSERT deposits (by coin_pub, shard), ON CONFLICT DO NOTHING;
---         UPDATE known_coins (by coin_pub)
-
-IF NOT NULL in_extension_details
-THEN
-  INSERT INTO extension_details
-  (extension_options)
-  VALUES
-    (in_extension_details)
-  RETURNING extension_details_serial_id INTO xdi;
-ELSE
-  xdi=NULL;
-END IF;
-
-
-INSERT INTO wire_targets
-  (wire_target_h_payto
-  ,payto_uri)
-  VALUES
-  (in_h_payto
-  ,in_receiver_wire_account)
-ON CONFLICT DO NOTHING -- for CONFLICT ON (wire_target_h_payto)
-  RETURNING wire_target_serial_id INTO wtsi;
-
-IF NOT FOUND
-THEN
-  SELECT wire_target_serial_id
-  INTO wtsi
-  FROM wire_targets
-  WHERE wire_target_h_payto=in_h_payto;
-END IF;
-
-
-INSERT INTO deposits
-  (shard
-  ,coin_pub
-  ,known_coin_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,wallet_timestamp
-  ,exchange_timestamp
-  ,refund_deadline
-  ,wire_deadline
-  ,merchant_pub
-  ,h_contract_terms
-  ,coin_sig
-  ,wire_salt
-  ,wire_target_h_payto
-  ,extension_blocked
-  ,extension_details_serial_id
-  )
-  VALUES
-  (in_shard
-  ,in_coin_pub
-  ,in_known_coin_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_wallet_timestamp
-  ,in_exchange_timestamp
-  ,in_refund_deadline
-  ,in_wire_deadline
-  ,in_merchant_pub
-  ,in_h_contract_terms
-  ,in_coin_sig
-  ,in_wire_salt
-  ,in_h_payto
-  ,in_extension_blocked
-  ,xdi)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and wire_target_h_payto
-  -- primarily here to maximally use the existing index.
-  SELECT
-     exchange_timestamp
-   INTO
-     out_exchange_timestamp
-   FROM deposits
-   WHERE shard=in_shard
-     AND merchant_pub=in_merchant_pub
-     AND wire_target_h_payto=in_h_payto
-     AND coin_pub=in_coin_pub
-     AND coin_sig=in_coin_sig;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_balance_ok=TRUE;
-  out_conflict=FALSE;
-
-  RETURN;
-END IF;
-
-
-out_exchange_timestamp=in_exchange_timestamp;
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_conflict=FALSE;
-
-END $$;
-
-
---
--- Name: exchange_do_gc(bigint, bigint); Type: PROCEDURE; Schema: public; Owner: -
---
-
-CREATE PROCEDURE public.exchange_do_gc(in_ancient_date bigint, in_now bigint)
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_uuid_min INT8; -- minimum reserve UUID still alive
-DECLARE
-  melt_min INT8; -- minimum melt still alive
-DECLARE
-  coin_min INT8; -- minimum known_coin still alive
-DECLARE
-  deposit_min INT8; -- minimum deposit still alive
-DECLARE
-  reserve_out_min INT8; -- minimum reserve_out still alive
-DECLARE
-  denom_min INT8; -- minimum denomination still alive
-BEGIN
-
-DELETE FROM prewire
-  WHERE finished=TRUE;
-
-DELETE FROM wire_fee
-  WHERE end_date < in_ancient_date;
-
--- TODO: use closing fee as threshold?
-DELETE FROM reserves
-  WHERE gc_date < in_now
-    AND current_balance_val = 0
-    AND current_balance_frac = 0;
-
-SELECT
-     reserve_out_serial_id
-  INTO
-     reserve_out_min
-  FROM reserves_out
-  ORDER BY reserve_out_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM recoup
-  WHERE reserve_out_serial_id < reserve_out_min;
--- FIXME: recoup_refresh lacks GC!
-
-SELECT
-     reserve_uuid
-  INTO
-     reserve_uuid_min
-  FROM reserves
-  ORDER BY reserve_uuid ASC
-  LIMIT 1;
-
-DELETE FROM reserves_out
-  WHERE reserve_uuid < reserve_uuid_min;
-
--- FIXME: this query will be horribly slow;
--- need to find another way to formulate it...
-DELETE FROM denominations
-  WHERE expire_legal < in_now
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM reserves_out)
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup))
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup_refresh));
-
-SELECT
-     melt_serial_id
-  INTO
-     melt_min
-  FROM refresh_commitments
-  ORDER BY melt_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refresh_revealed_coins
-  WHERE melt_serial_id < melt_min;
-
-DELETE FROM refresh_transfer_keys
-  WHERE melt_serial_id < melt_min;
-
-SELECT
-     known_coin_id
-  INTO
-     coin_min
-  FROM known_coins
-  ORDER BY known_coin_id ASC
-  LIMIT 1;
-
-DELETE FROM deposits
-  WHERE known_coin_id < coin_min;
-
-SELECT
-     deposit_serial_id
-  INTO
-     deposit_min
-  FROM deposits
-  ORDER BY deposit_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refunds
-  WHERE deposit_serial_id < deposit_min;
-
-DELETE FROM aggregation_tracking
-  WHERE deposit_serial_id < deposit_min;
-
-SELECT
-     denominations_serial
-  INTO
-     denom_min
-  FROM denominations
-  ORDER BY denominations_serial ASC
-  LIMIT 1;
-
-DELETE FROM cs_nonce_locks
-  WHERE max_denomination_serial <= denom_min;
-
-END $$;
-
-
---
--- Name: exchange_do_history_request(bytea, bytea, bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_history_request(in_reserve_pub bytea, in_reserve_sig bytea, in_request_timestamp bigint, in_history_fee_val bigint, in_history_fee_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
---
--- Name: exchange_do_melt(bytea, bigint, integer, bytea, bytea, bytea, bigint, integer, boolean); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_melt(in_cs_rms bytea, in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_rc bytea, in_old_coin_pub bytea, in_old_coin_sig bytea, in_known_coin_id bigint, in_noreveal_index integer, in_zombie_required boolean, OUT out_balance_ok boolean, OUT out_zombie_bad boolean, OUT out_noreveal_index integer) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  denom_max INT8;
-BEGIN
--- Shards: INSERT refresh_commitments (by rc)
--- (rare:) SELECT refresh_commitments (by old_coin_pub) -- crosses shards!
--- (rare:) SEELCT refresh_revealed_coins (by melt_serial_id)
--- (rare:) PERFORM recoup_refresh (by rrc_serial) -- crosses shards!
---         UPDATE known_coins (by coin_pub)
-
-INSERT INTO refresh_commitments
-  (rc
-  ,old_coin_pub
-  ,old_coin_sig
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,noreveal_index
-  )
-  VALUES
-  (in_rc
-  ,in_old_coin_pub
-  ,in_old_coin_sig
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_noreveal_index)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  out_noreveal_index=-1;
-  SELECT
-     noreveal_index
-    INTO
-     out_noreveal_index
-    FROM refresh_commitments
-   WHERE rc=in_rc;
-  out_balance_ok=FOUND;
-  out_zombie_bad=FALSE; -- zombie is OK
-  RETURN;
-END IF;
-
-
-IF in_zombie_required
-THEN
-  -- Check if this coin was part of a refresh
-  -- operation that was subsequently involved
-  -- in a recoup operation.  We begin by all
-  -- refresh operations our coin was involved
-  -- with, then find all associated reveal
-  -- operations, and then see if any of these
-  -- reveal operations was involved in a recoup.
-  PERFORM
-    FROM recoup_refresh
-   WHERE rrc_serial IN
-    (SELECT rrc_serial
-       FROM refresh_revealed_coins
-      WHERE melt_serial_id IN
-      (SELECT melt_serial_id
-         FROM refresh_commitments
-        WHERE old_coin_pub=in_old_coin_pub));
-  IF NOT FOUND
-  THEN
-    out_zombie_bad=TRUE;
-    out_balance_ok=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_zombie_bad=FALSE; -- zombie is OK
-
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_noreveal_index=-1;
-  out_balance_ok=FALSE;
-  RETURN;
-END IF;
-
-
-
--- Special actions needed for a CS melt?
-IF NOT NULL in_cs_rms
-THEN
-  -- Get maximum denominations serial value in
-  -- existence, this will determine how long the
-  -- nonce will be locked.
-  SELECT
-      denominations_serial
-    INTO
-      denom_max
-    FROM denominations
-      ORDER BY denominations_serial DESC
-      LIMIT 1;
-
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_rms
-    ,denom_serial
-    ,in_rc)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- Record exists, make sure it is the same
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_rms
-       AND op_hash=in_rc;
-
-    IF NOT FOUND
-    THEN
-       -- Nonce reuse detected
-       out_balance_ok=FALSE;
-       out_zombie_bad=FALSE;
-       out_noreveal_index=42; -- FIXME: return error message more nicely!
-       ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_noreveal_index=in_noreveal_index;
-
-END $$;
-
-
---
--- Name: exchange_do_purse_deposit(bigint, bytea, bigint, integer, bytea, bytea, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_purse_deposit(in_partner_id bigint, in_purse_pub bytea, in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_coin_pub bytea, in_coin_sig bytea, in_amount_without_fee_val bigint, in_amount_without_fee_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
--- Store the deposit request.
-INSERT INTO purse_deposits
-  (partner_serial_id
-  ,purse_pub
-  ,coin_pub
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,coin_sig)
-  VALUES
-  (in_partner_id
-  ,in_purse_pub
-  ,in_coin_pub
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_coin_sig)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: check if coin_sig is the same,
-  -- if so, success, otherwise conflict!
-  SELECT
-    1
-  FROM purse_deposits
-  WHERE coin_pub = in_coin_pub
-    AND purse_pub = in_purse_pub
-    AND coin_sig = in_cion_sig;
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-END IF;
-
-
--- Debit the coin
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
-
--- Credit the purse.
-UPDATE purse_requests
-  SET
-    balance_frac=balance_frac+in_amount_without_fee_frac
-       - CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    balance_val=balance_val+in_amount_without_fee_val
-       + CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE purse_pub=in_purse_pub;
-
-out_conflict=FALSE;
-out_balance_ok=TRUE;
-
-END $$;
-
-
---
--- Name: exchange_do_purse_merge(bytea, bytea, bigint, bytea, character varying, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_purse_merge(in_purse_pub bytea, in_merge_sig bytea, in_merge_timestamp bigint, in_reserve_sig bytea, in_partner_url character varying, in_reserve_pub bytea, OUT out_no_partner boolean, OUT out_no_balance boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  my_partner_serial_id INT8;
-BEGIN
-
-IF in_partner_url IS NULL
-THEN
-  my_partner_serial_id=0;
-ELSE
-  SELECT
-    partner_serial_id
-  INTO
-    my_partner_serial_id
-  FROM partners
-  WHERE partner_base_url=in_partner_url
-    AND start_date <= in_merge_timestamp
-    AND end_date > in_merge_timestamp;
-  IF NOT FOUND
-  THEN
-    out_no_partner=TRUE;
-    out_conflict=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_no_partner=FALSE;
-
-
--- Check purse is 'full'.
-PERFORM
-  FROM purse_requests
-  WHERE purse_pub=in_purse_pub
-    AND balance_val >= amount_with_fee_val
-    AND ( (balance_frac >= amount_with_fee_frac) OR
-          (balance_val > amount_with_fee_val) );
-IF NOT FOUND
-THEN
-  out_no_balance=TRUE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_no_balance=FALSE;
-
-
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (my_partner_serial_id
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
-
-RETURN;
-
-END $$;
-
-
---
--- Name: exchange_do_recoup_to_coin(bytea, bigint, bytea, bytea, bigint, bytea, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_recoup_to_coin(in_old_coin_pub bytea, in_rrc_serial bigint, in_coin_blind bytea, in_coin_pub bytea, in_known_coin_id bigint, in_coin_sig bytea, in_recoup_timestamp bigint, OUT out_recoup_ok boolean, OUT out_internal_failure boolean, OUT out_recoup_timestamp bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
-
--- Shards: UPDATE known_coins (by coin_pub)
---         SELECT recoup_refresh (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         INSERT recoup_refresh (by coin_pub)
-
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-      recoup_timestamp
-    INTO
-      out_recoup_timestamp
-    FROM recoup_refresh
-    WHERE coin_pub=in_coin_pub;
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the old coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+tmp_frac
-       - CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+tmp_val
-       + CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase old coin balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup_refresh
-  (coin_pub
-  ,known_coin_id
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,rrc_serial
-  )
-VALUES
-  (in_coin_pub
-  ,in_known_coin_id
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_rrc_serial);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
-
---
--- Name: exchange_do_recoup_to_reserve(bytea, bigint, bytea, bytea, bigint, bytea, bigint, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_recoup_to_reserve(in_reserve_pub bytea, in_reserve_out_serial_id bigint, in_coin_blind bytea, in_coin_pub bytea, in_known_coin_id bigint, in_coin_sig bytea, in_reserve_gc bigint, in_reserve_expiration bigint, in_recoup_timestamp bigint, OUT out_recoup_ok boolean, OUT out_internal_failure boolean, OUT out_recoup_timestamp bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
--- Shards: SELECT known_coins (by coin_pub)
---         SELECT recoup      (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         UPDATE reserves (by reserve_pub)
---         INSERT recoup      (by coin_pub)
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-    recoup_timestamp
-  INTO
-    out_recoup_timestamp
-    FROM recoup
-    WHERE coin_pub=in_coin_pub;
-
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the reserve and update reserve timers.
-UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac+tmp_frac
-       - CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val+tmp_val
-       + CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END,
-    gc_date=GREATEST(gc_date, in_reserve_gc),
-    expiration_date=GREATEST(expiration_date, in_reserve_expiration)
-  WHERE reserve_pub=in_reserve_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase reserve balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup
-  (coin_pub
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,reserve_out_serial_id
-  )
-VALUES
-  (in_coin_pub
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_reserve_out_serial_id);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
-
---
--- Name: exchange_do_refund(bigint, integer, bigint, integer, bigint, integer, bytea, bigint, bigint, bigint, bytea, bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_refund(in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_amount_val bigint, in_amount_frac integer, in_deposit_fee_val bigint, in_deposit_fee_frac integer, in_h_contract_terms bytea, in_rtransaction_id bigint, in_deposit_shard bigint, in_known_coin_id bigint, in_coin_pub bytea, in_merchant_pub bytea, in_merchant_sig bytea, OUT out_not_found boolean, OUT out_refund_ok boolean, OUT out_gone boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  dsi INT8; -- ID of deposit being refunded
-DECLARE
-  tmp_val INT8; -- total amount refunded
-DECLARE
-  tmp_frac INT8; -- total amount refunded
-DECLARE
-  deposit_val INT8; -- amount that was originally deposited
-DECLARE
-  deposit_frac INT8; -- amount that was originally deposited
-BEGIN
--- Shards: SELECT deposits (coin_pub, shard, h_contract_terms, merchant_pub)
---         INSERT refunds (by coin_pub, rtransaction_id) ON CONFLICT DO NOTHING
---         SELECT refunds (by coin_pub)
---         UPDATE known_coins (by coin_pub)
-
-SELECT
-   deposit_serial_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,done
-INTO
-   dsi
-  ,deposit_val
-  ,deposit_frac
-  ,out_gone
-FROM deposits
- WHERE coin_pub=in_coin_pub
-  AND shard=in_deposit_shard
-  AND merchant_pub=in_merchant_pub
-  AND h_contract_terms=in_h_contract_terms;
-
-IF NOT FOUND
-THEN
-  -- No matching deposit found!
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=TRUE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-INSERT INTO refunds
-  (deposit_serial_id
-  ,coin_pub
-  ,merchant_sig
-  ,rtransaction_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  )
-  VALUES
-  (dsi
-  ,in_coin_pub
-  ,in_merchant_sig
-  ,in_rtransaction_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and h_contract_terms
-  -- primarily here to maximally use the existing index.
-   PERFORM
-   FROM refunds
-   WHERE coin_pub=in_coin_pub
-     AND deposit_serial_id=dsi
-     AND rtransaction_id=in_rtransaction_id
-     AND amount_with_fee_val=in_amount_with_fee_val
-     AND amount_with_fee_frac=in_amount_with_fee_frac;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but have conflicting refund.
-    out_refund_ok=FALSE;
-    out_conflict=TRUE;
-    out_not_found=FALSE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_refund_ok=TRUE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-IF out_gone
-THEN
-  -- money already sent to the merchant. Tough luck.
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Check refund balance invariant.
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   tmp_val
-  ,tmp_frac
-  FROM refunds
-  WHERE coin_pub=in_coin_pub
-    AND deposit_serial_id=dsi;
-IF tmp_val IS NULL
-THEN
-  RAISE NOTICE 'failed to sum up existing refunds';
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Normalize result before continuing
-tmp_val = tmp_val + tmp_frac / 100000000;
-tmp_frac = tmp_frac % 100000000;
-
--- Actually check if the deposits are sufficient for the refund. Verbosely. ;-)
-IF (tmp_val < deposit_val)
-THEN
-  out_refund_ok=TRUE;
-ELSE
-  IF (tmp_val = deposit_val) AND (tmp_frac <= deposit_frac)
-  THEN
-    out_refund_ok=TRUE;
-  ELSE
-    out_refund_ok=FALSE;
-  END IF;
-END IF;
-
-IF (tmp_val = deposit_val) AND (tmp_frac = deposit_frac)
-THEN
-  -- Refunds have reached the full value of the original
-  -- deposit. Also refund the deposit fee.
-  in_amount_frac = in_amount_frac + in_deposit_fee_frac;
-  in_amount_val = in_amount_val + in_deposit_fee_val;
-
-  -- Normalize result before continuing
-  in_amount_val = in_amount_val + in_amount_frac / 100000000;
-  in_amount_frac = in_amount_frac % 100000000;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+in_amount_frac
-       - CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+in_amount_val
-       + CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub;
-
-
-out_conflict=FALSE;
-out_not_found=FALSE;
-
-END $$;
-
-
---
--- Name: exchange_do_reserve_purse(bytea, bytea, bigint, bytea, bigint, integer, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_reserve_purse(in_purse_pub bytea, in_merge_sig bytea, in_merge_timestamp bigint, in_reserve_sig bytea, in_purse_fee_val bigint, in_purse_fee_frac integer, in_reserve_pub bytea, OUT out_no_funds boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  my_purses_active INT8;
-DECLARE
-  my_purses_allowed INT8;
-DECLARE
-  my_balance_val INT8;
-DECLARE
-  my_balance_frac INT4;
-DECLARE
-  my_kyc_passed BOOLEAN;
-BEGIN
-
--- comment out for now
-IF TRUE
-THEN
-  out_no_funds=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (0
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  out_no_funds=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
-
-
--- Charge reserve for purse creation.
--- FIXME: Use different type of purse
--- signature in this case, so that we
--- can properly account for the purse
--- fees when auditing!!!
-SELECT
-  purses_active
- ,purses_allowed
- ,kyc_passed
- ,current_balance_val
- ,current_balance_frac
-INTO
-  my_purses_active
- ,my_purses_allowed
- ,my_kyc_passed
- ,my_balance_val
- ,my_balance_frac
-FROM reserves
-WHERE reserve_pub=in_reserve_pub;
-
-IF NOT FOUND
-THEN
-  out_no_funds=TRUE;
-  -- FIXME: be more specific in the returned
-  -- error that we don't know the reserve
-  -- (instead of merely saying it has no funds)
-  RETURN;
-END IF;
-
-IF NOT my_kyc_passed
-THEN
-  -- FIXME: might want to categorically disallow
-  -- purse creation without KYC (depending on
-  -- exchange settings => new argument?)
-END IF;
-
-IF ( (my_purses_active >= my_purses_allowed) AND
-     ( (my_balance_val < in_purse_fee_val) OR
-       ( (my_balance_val <= in_purse_fee_val) AND
-         (my_balance_frac < in_purse_fee_frac) ) ) )
-THEN
-  out_no_funds=TRUE;
-  RETURN;
-END IF;
-
-IF (my_purses_active < my_purses_allowed)
-THEN
-  my_purses_active = my_purses_active + 1;
-ELSE
-  -- FIXME: See above: we should probably have
-  -- very explicit wallet-approval in the
-  -- signature to charge the reserve!
-  my_balance_val = my_balance_val - in_purse_fee_val;
-  IF (my_balance_frac > in_purse_fee_frac)
-  THEN
-    my_balance_frac = my_balance_frac - in_purse_fee_frac;
-  ELSE
-    my_balance_val = my_balance_val - 1;
-    my_balance_frac = my_balance_frac + 100000000 - in_purse_fee_frac;
-  END IF;
-END IF;
-
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=my_balance_val
- ,current_balance_frac=my_balance_frac
- ,purses_active=my_purses_active
- ,kyc_required=TRUE
-WHERE
-  reserves.reserve_pub=rpub;
-
-out_no_funds=FALSE;
-
-
-END $$;
-
-
---
--- Name: exchange_do_withdraw(bytea, bigint, integer, bytea, bytea, bytea, bytea, bytea, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  denom_serial INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=0;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- We optimistically insert, and then on conflict declare
--- the query successful due to idempotency.
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- idempotent query, all constraints must be satisfied
-  reserve_found=TRUE;
-  balance_ok=TRUE;
-  kycok=TRUE;
-  account_uuid=0;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
-
--- Special actions needed for a CS withdraw?
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      reserve_found=FALSE;
-      balance_ok=FALSE;
-      kycok=FALSE;
-      account_uuid=0;
-      ruuid=1; -- FIXME: return error message more nicely!
-      ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result';
-
-
---
--- Name: exchange_do_withdraw_limit_check(bigint, bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean) RETURNS boolean
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  total_val INT8;
-DECLARE
-  total_frac INT8; -- INT4 could overflow during accumulation!
-BEGIN
--- NOTE: Read-only, but crosses shards.
--- Shards: reserves by reserve_pub
---         reserves_out by reserve_uuid -- crosses shards!!
-
-
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   total_val
-  ,total_frac
-  FROM reserves_out
- WHERE reserve_uuid=ruuid
-   AND execution_date > start_time;
-
--- normalize result
-total_val = total_val + total_frac / 100000000;
-total_frac = total_frac % 100000000;
-
--- compare to threshold
-below_limit = (total_val < upper_limit_val) OR
-            ( (total_val = upper_limit_val) AND
-              (total_frac <= upper_limit_frac) );
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean) IS 'Check whether the withdrawals from the given reserve since the given time are below the given threshold';
-
-
---
--- Name: prepare_sharding(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.prepare_sharding() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  CREATE EXTENSION IF NOT EXISTS postgres_fdw;
-
-  PERFORM detach_default_partitions();
-
-  ALTER TABLE IF EXISTS wire_targets
-    DROP CONSTRAINT IF EXISTS wire_targets_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves
-    DROP CONSTRAINT IF EXISTS reserves_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DROP CONSTRAINT IF EXISTS reserves_in_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DROP CONSTRAINT IF EXISTS reserves_close_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DROP CONSTRAINT IF EXISTS reserves_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS reserves_out_denominations_serial_fkey
-    ,DROP CONSTRAINT IF EXISTS reserves_out_h_blind_ev_key
-  ;
-
-  ALTER TABLE IF EXISTS known_coins
-    DROP CONSTRAINT IF EXISTS known_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS known_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DROP CONSTRAINT IF EXISTS refresh_commitments_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_old_coin_pub_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DROP CONSTRAINT IF EXISTS refresh_revealed_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_revealed_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DROP CONSTRAINT IF EXISTS refresh_transfer_keys_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS deposits
-    DROP CONSTRAINT IF EXISTS deposits_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS deposits_extension_details_serial_id_fkey
-    ,DROP CONSTRAINT IF EXISTS deposits_coin_pub_merchant_pub_h_contract_terms_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS refunds
-    DROP CONSTRAINT IF EXISTS refunds_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wire_out
-    DROP CONSTRAINT IF EXISTS wire_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wire_out_wtid_raw_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DROP CONSTRAINT IF EXISTS aggregation_tracking_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS aggregation_tracking_wtid_raw_fkey
-  ;
-
-  ALTER TABLE IF EXISTS recoup
-    DROP CONSTRAINT IF EXISTS recoup_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DROP CONSTRAINT IF EXISTS recoup_refresh_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS prewire
-    DROP CONSTRAINT IF EXISTS prewire_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DROP CONSTRAINT IF EXISTS cs_nonce_locks_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DROP CONSTRAINT IF EXISTS purse_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DROP CONSTRAINT IF EXISTS purse_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS account_merges
-    DROP CONSTRAINT IF EXISTS account_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS contracts
-    DROP CONSTRAINT IF EXISTS contracts_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS history_requests
-    DROP CONSTRAINT IF EXISTS history_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS close_requests
-    DROP CONSTRAINT IF EXISTS close_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DROP CONSTRAINT IF EXISTS purse_deposits_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_out
-    DROP CONSTRAINT IF EXISTS wads_out_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DROP CONSTRAINT IF EXISTS wad_out_entries_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_in
-    DROP CONSTRAINT IF EXISTS wads_in_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wads_in_wad_id_origin_exchange_url_key
-  ;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DROP CONSTRAINT IF EXISTS wad_in_entries_pkey CASCADE
-  ;
-
-END
-$$;
-
-
---
--- Name: recoup_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.recoup_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM recoup_by_reserve
-   WHERE reserve_out_serial_id = OLD.reserve_out_serial_id
-     AND coin_pub = OLD.coin_pub;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION recoup_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.recoup_delete_trigger() IS 'Replicate recoup deletions into recoup_by_reserve table.';
-
-
---
--- Name: recoup_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.recoup_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  INSERT INTO recoup_by_reserve
-    (reserve_out_serial_id
-    ,coin_pub)
-  VALUES
-    (NEW.reserve_out_serial_id
-    ,NEW.coin_pub);
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION recoup_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.recoup_insert_trigger() IS 'Replicate recoup inserts into recoup_by_reserve table.';
-
-
---
--- Name: reserves_out_by_reserve_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.reserves_out_by_reserve_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM reserves_out_by_reserve
-   WHERE reserve_uuid = OLD.reserve_uuid;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION reserves_out_by_reserve_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.reserves_out_by_reserve_delete_trigger() IS 'Replicate reserve_out deletions into reserve_out_by_reserve table.';
-
-
---
--- Name: reserves_out_by_reserve_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.reserves_out_by_reserve_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  INSERT INTO reserves_out_by_reserve
-    (reserve_uuid
-    ,h_blind_ev)
-  VALUES
-    (NEW.reserve_uuid
-    ,NEW.h_blind_ev);
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION reserves_out_by_reserve_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.reserves_out_by_reserve_insert_trigger() IS 'Replicate reserve_out inserts into reserve_out_by_reserve table.';
-
-
---
--- Name: wire_out_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.wire_out_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM aggregation_tracking
-   WHERE wtid_raw = OLD.wtid_raw;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION wire_out_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.wire_out_delete_trigger() IS 'Replicate reserve_out deletions into aggregation_tracking. This replaces an earlier use of an ON DELETE CASCADE that required a DEFERRABLE constraint and conflicted with nice partitioning.';
-
-
-SET default_tablespace = '';
-
-SET default_table_access_method = heap;
-
---
--- Name: patches; Type: TABLE; Schema: _v; Owner: -
---
-
-CREATE TABLE _v.patches (
-    patch_name text NOT NULL,
-    applied_tsz timestamp with time zone DEFAULT now() NOT NULL,
-    applied_by text NOT NULL,
-    requires text[],
-    conflicts text[]
-);
-
-
---
--- Name: TABLE patches; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON TABLE _v.patches IS 'Contains information about what patches are currently applied on database.';
-
-
---
--- Name: COLUMN patches.patch_name; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.patch_name IS 'Name of patch, has to be unique for every patch.';
-
-
---
--- Name: COLUMN patches.applied_tsz; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.applied_tsz IS 'When the patch was applied.';
-
-
---
--- Name: COLUMN patches.applied_by; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.applied_by IS 'Who applied this patch (PostgreSQL username)';
-
-
---
--- Name: COLUMN patches.requires; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.requires IS 'List of patches that are required for given patch.';
-
-
---
--- Name: COLUMN patches.conflicts; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.conflicts IS 'List of patches that conflict with given patch.';
-
-
---
--- Name: account_merges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.account_merges (
-    account_merge_request_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    CONSTRAINT account_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT account_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT account_merges_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE account_merges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.account_merges IS 'Merge requests where a purse- and account-owner requested merging the purse into the account';
-
-
---
--- Name: COLUMN account_merges.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.reserve_pub IS 'public key of the target reserve';
-
-
---
--- Name: COLUMN account_merges.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.reserve_sig IS 'signature by the reserve private key affirming the merge, of type TALER_SIGNATURE_WALLET_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN account_merges.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.purse_pub IS 'public key of the purse';
-
-
---
--- Name: account_merges_account_merge_request_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.account_merges ALTER COLUMN account_merge_request_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.account_merges_account_merge_request_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: account_merges_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.account_merges_default (
-    account_merge_request_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    CONSTRAINT account_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT account_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT account_merges_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.account_merges ATTACH PARTITION public.account_merges_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: aggregation_tracking; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_tracking (
-    aggregation_serial_id bigint NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    wtid_raw bytea NOT NULL
-)
-PARTITION BY HASH (deposit_serial_id);
-
-
---
--- Name: TABLE aggregation_tracking; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.aggregation_tracking IS 'mapping from wire transfer identifiers (WTID) to deposits (and back)';
-
-
---
--- Name: COLUMN aggregation_tracking.wtid_raw; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_tracking.wtid_raw IS 'identifier of the wire transfer';
-
-
---
--- Name: aggregation_tracking_aggregation_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.aggregation_tracking ALTER COLUMN aggregation_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.aggregation_tracking_aggregation_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: aggregation_tracking_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_tracking_default (
-    aggregation_serial_id bigint NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    wtid_raw bytea NOT NULL
-);
-ALTER TABLE ONLY public.aggregation_tracking ATTACH PARTITION public.aggregation_tracking_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: aggregation_transient; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_transient (
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    wtid_raw bytea NOT NULL,
-    CONSTRAINT aggregation_transient_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT aggregation_transient_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-)
-PARTITION BY HASH (wire_target_h_payto);
-
-
---
--- Name: TABLE aggregation_transient; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.aggregation_transient IS 'aggregations currently happening (lacking wire_out, usually because the amount is too low); this table is not replicated';
-
-
---
--- Name: COLUMN aggregation_transient.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_transient.amount_val IS 'Sum of all of the aggregated deposits (without deposit fees)';
-
-
---
--- Name: COLUMN aggregation_transient.wtid_raw; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_transient.wtid_raw IS 'identifier of the wire transfer';
-
-
---
--- Name: aggregation_transient_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_transient_default (
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    wtid_raw bytea NOT NULL,
-    CONSTRAINT aggregation_transient_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT aggregation_transient_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-);
-ALTER TABLE ONLY public.aggregation_transient ATTACH PARTITION public.aggregation_transient_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: app_bankaccount; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_bankaccount (
-    is_public boolean NOT NULL,
-    account_no integer NOT NULL,
-    balance character varying NOT NULL,
-    user_id integer NOT NULL
-);
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.app_bankaccount_account_no_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.app_bankaccount_account_no_seq OWNED BY public.app_bankaccount.account_no;
-
-
---
--- Name: app_banktransaction; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_banktransaction (
-    id bigint NOT NULL,
-    amount character varying NOT NULL,
-    subject character varying(200) NOT NULL,
-    date timestamp with time zone NOT NULL,
-    cancelled boolean NOT NULL,
-    request_uid character varying(128) NOT NULL,
-    credit_account_id integer NOT NULL,
-    debit_account_id integer NOT NULL
-);
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.app_banktransaction_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.app_banktransaction_id_seq OWNED BY public.app_banktransaction.id;
-
-
---
--- Name: app_talerwithdrawoperation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_talerwithdrawoperation (
-    withdraw_id uuid NOT NULL,
-    amount character varying NOT NULL,
-    selection_done boolean NOT NULL,
-    confirmation_done boolean NOT NULL,
-    aborted boolean NOT NULL,
-    selected_reserve_pub text,
-    selected_exchange_account_id integer,
-    withdraw_account_id integer NOT NULL
-);
-
-
---
--- Name: auditor_balance_summary; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_balance_summary (
-    master_pub bytea NOT NULL,
-    denom_balance_val bigint NOT NULL,
-    denom_balance_frac integer NOT NULL,
-    deposit_fee_balance_val bigint NOT NULL,
-    deposit_fee_balance_frac integer NOT NULL,
-    melt_fee_balance_val bigint NOT NULL,
-    melt_fee_balance_frac integer NOT NULL,
-    refund_fee_balance_val bigint NOT NULL,
-    refund_fee_balance_frac integer NOT NULL,
-    risk_val bigint NOT NULL,
-    risk_frac integer NOT NULL,
-    loss_val bigint NOT NULL,
-    loss_frac integer NOT NULL,
-    irregular_recoup_val bigint NOT NULL,
-    irregular_recoup_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_balance_summary; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_balance_summary IS 'the sum of the outstanding coins from auditor_denomination_pending (denom_pubs must belong to the respectives exchange master public key); it represents the auditor_balance_summary of the exchange at this point (modulo unexpected historic_loss-style events where denomination keys are compromised)';
-
-
---
--- Name: auditor_denom_sigs; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_denom_sigs (
-    auditor_denom_serial bigint NOT NULL,
-    auditor_uuid bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    auditor_sig bytea,
-    CONSTRAINT auditor_denom_sigs_auditor_sig_check CHECK ((length(auditor_sig) = 64))
-);
-
-
---
--- Name: TABLE auditor_denom_sigs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_denom_sigs IS 'Table with auditor signatures on exchange denomination keys.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.auditor_uuid; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.auditor_uuid IS 'Identifies the auditor.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.denominations_serial IS 'Denomination the signature is for.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.auditor_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.auditor_sig IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.';
-
-
---
--- Name: auditor_denom_sigs_auditor_denom_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.auditor_denom_sigs ALTER COLUMN auditor_denom_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.auditor_denom_sigs_auditor_denom_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: auditor_denomination_pending; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_denomination_pending (
-    denom_pub_hash bytea NOT NULL,
-    denom_balance_val bigint NOT NULL,
-    denom_balance_frac integer NOT NULL,
-    denom_loss_val bigint NOT NULL,
-    denom_loss_frac integer NOT NULL,
-    num_issued bigint NOT NULL,
-    denom_risk_val bigint NOT NULL,
-    denom_risk_frac integer NOT NULL,
-    recoup_loss_val bigint NOT NULL,
-    recoup_loss_frac integer NOT NULL,
-    CONSTRAINT auditor_denomination_pending_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64))
-);
-
-
---
--- Name: TABLE auditor_denomination_pending; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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).';
-
-
---
--- Name: COLUMN auditor_denomination_pending.num_issued; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.num_issued IS 'counts the number of coins issued (withdraw, refresh) of this denomination';
-
-
---
--- Name: COLUMN auditor_denomination_pending.denom_risk_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.denom_risk_val IS 'amount that could theoretically be lost in the future due to recoup operations';
-
-
---
--- Name: COLUMN auditor_denomination_pending.recoup_loss_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.recoup_loss_val IS 'amount actually lost due to recoup operations past revocation';
-
-
---
--- Name: auditor_exchange_signkeys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_exchange_signkeys (
-    master_pub bytea NOT NULL,
-    ep_start bigint NOT NULL,
-    ep_expire bigint NOT NULL,
-    ep_end bigint NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT auditor_exchange_signkeys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT auditor_exchange_signkeys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE auditor_exchange_signkeys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_exchange_signkeys IS 'list of the online signing keys of exchanges we are auditing';
-
-
---
--- Name: auditor_exchanges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_exchanges (
-    master_pub bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    CONSTRAINT auditor_exchanges_master_pub_check CHECK ((length(master_pub) = 32))
-);
-
-
---
--- Name: TABLE auditor_exchanges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_exchanges IS 'list of the exchanges we are auditing';
-
-
---
--- Name: auditor_historic_denomination_revenue; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_historic_denomination_revenue (
-    master_pub bytea NOT NULL,
-    denom_pub_hash bytea NOT NULL,
-    revenue_timestamp bigint NOT NULL,
-    revenue_balance_val bigint NOT NULL,
-    revenue_balance_frac integer NOT NULL,
-    loss_balance_val bigint NOT NULL,
-    loss_balance_frac integer NOT NULL,
-    CONSTRAINT auditor_historic_denomination_revenue_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64))
-);
-
-
---
--- Name: TABLE auditor_historic_denomination_revenue; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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.';
-
-
---
--- Name: COLUMN auditor_historic_denomination_revenue.revenue_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_historic_denomination_revenue.revenue_balance_val IS 'the sum of all of the profits we made on the coin except for withdraw fees (which are in historic_reserve_revenue); so this includes the deposit, melt and refund fees';
-
-
---
--- Name: auditor_historic_reserve_summary; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_historic_reserve_summary (
-    master_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    reserve_profits_val bigint NOT NULL,
-    reserve_profits_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_historic_reserve_summary; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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).';
-
-
---
--- Name: auditor_predicted_result; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_predicted_result (
-    master_pub bytea NOT NULL,
-    balance_val bigint NOT NULL,
-    balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_predicted_result; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_predicted_result IS 'Table with the sum of the ledger, auditor_historic_revenue and the auditor_reserve_balance.  This is the final amount that the exchange should have in its bank account right now.';
-
-
---
--- Name: auditor_progress_aggregation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_aggregation (
-    master_pub bytea NOT NULL,
-    last_wire_out_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_aggregation; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_aggregation IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_coin; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_coin (
-    master_pub bytea NOT NULL,
-    last_withdraw_serial_id bigint DEFAULT 0 NOT NULL,
-    last_deposit_serial_id bigint DEFAULT 0 NOT NULL,
-    last_melt_serial_id bigint DEFAULT 0 NOT NULL,
-    last_refund_serial_id bigint DEFAULT 0 NOT NULL,
-    last_recoup_serial_id bigint DEFAULT 0 NOT NULL,
-    last_recoup_refresh_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_coin; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_coin IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_deposit_confirmation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_deposit_confirmation (
-    master_pub bytea NOT NULL,
-    last_deposit_confirmation_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_deposit_confirmation; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_deposit_confirmation IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_reserve (
-    master_pub bytea NOT NULL,
-    last_reserve_in_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_out_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_recoup_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_close_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_reserve IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_reserve_balance; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_reserve_balance (
-    master_pub bytea NOT NULL,
-    reserve_balance_val bigint NOT NULL,
-    reserve_balance_frac integer NOT NULL,
-    withdraw_fee_balance_val bigint NOT NULL,
-    withdraw_fee_balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_reserve_balance; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_reserve_balance IS 'sum of the balances of all customer reserves (by exchange master public key)';
-
-
---
--- Name: auditor_reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_reserves (
-    reserve_pub bytea NOT NULL,
-    master_pub bytea NOT NULL,
-    reserve_balance_val bigint NOT NULL,
-    reserve_balance_frac integer NOT NULL,
-    withdraw_fee_balance_val bigint NOT NULL,
-    withdraw_fee_balance_frac integer NOT NULL,
-    expiration_date bigint NOT NULL,
-    auditor_reserves_rowid bigint NOT NULL,
-    origin_account text,
-    CONSTRAINT auditor_reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-
-
---
--- Name: TABLE auditor_reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_reserves IS 'all of the customer reserves and their respective balances that the auditor is aware of';
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auditor_reserves_auditor_reserves_rowid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auditor_reserves_auditor_reserves_rowid_seq OWNED BY public.auditor_reserves.auditor_reserves_rowid;
-
-
---
--- Name: auditor_wire_fee_balance; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_wire_fee_balance (
-    master_pub bytea NOT NULL,
-    wire_fee_balance_val bigint NOT NULL,
-    wire_fee_balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_wire_fee_balance; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_wire_fee_balance IS 'sum of the balances of all wire fees (by exchange master public key)';
-
-
---
--- Name: auditors; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditors (
-    auditor_uuid bigint NOT NULL,
-    auditor_pub bytea NOT NULL,
-    auditor_name character varying NOT NULL,
-    auditor_url character varying NOT NULL,
-    is_active boolean NOT NULL,
-    last_change bigint NOT NULL,
-    CONSTRAINT auditors_auditor_pub_check CHECK ((length(auditor_pub) = 32))
-);
-
-
---
--- Name: TABLE auditors; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditors IS 'Table with auditors the exchange uses or has used in the past. Entries never expire as we need to remember the last_change column indefinitely.';
-
-
---
--- Name: COLUMN auditors.auditor_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.auditor_pub IS 'Public key of the auditor.';
-
-
---
--- Name: COLUMN auditors.auditor_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.auditor_url IS 'The base URL of the auditor.';
-
-
---
--- Name: COLUMN auditors.is_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.is_active IS 'true if we are currently supporting the use of this auditor.';
-
-
---
--- Name: COLUMN auditors.last_change; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.last_change IS 'Latest time when active status changed. Used to detect replays of old messages.';
-
-
---
--- Name: auditors_auditor_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.auditors ALTER COLUMN auditor_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.auditors_auditor_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: auth_group; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_group (
-    id integer NOT NULL,
-    name character varying(150) NOT NULL
-);
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_group_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_group_id_seq OWNED BY public.auth_group.id;
-
-
---
--- Name: auth_group_permissions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_group_permissions (
-    id bigint NOT NULL,
-    group_id integer NOT NULL,
-    permission_id integer NOT NULL
-);
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_group_permissions_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_group_permissions_id_seq OWNED BY public.auth_group_permissions.id;
-
-
---
--- Name: auth_permission; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_permission (
-    id integer NOT NULL,
-    name character varying(255) NOT NULL,
-    content_type_id integer NOT NULL,
-    codename character varying(100) NOT NULL
-);
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_permission_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_permission_id_seq OWNED BY public.auth_permission.id;
-
-
---
--- Name: auth_user; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user (
-    id integer NOT NULL,
-    password character varying(128) NOT NULL,
-    last_login timestamp with time zone,
-    is_superuser boolean NOT NULL,
-    username character varying(150) NOT NULL,
-    first_name character varying(150) NOT NULL,
-    last_name character varying(150) NOT NULL,
-    email character varying(254) NOT NULL,
-    is_staff boolean NOT NULL,
-    is_active boolean NOT NULL,
-    date_joined timestamp with time zone NOT NULL
-);
-
-
---
--- Name: auth_user_groups; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user_groups (
-    id bigint NOT NULL,
-    user_id integer NOT NULL,
-    group_id integer NOT NULL
-);
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_groups_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_groups_id_seq OWNED BY public.auth_user_groups.id;
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_id_seq OWNED BY public.auth_user.id;
-
-
---
--- Name: auth_user_user_permissions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user_user_permissions (
-    id bigint NOT NULL,
-    user_id integer NOT NULL,
-    permission_id integer NOT NULL
-);
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_user_permissions_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_user_permissions_id_seq OWNED BY public.auth_user_user_permissions.id;
-
-
---
--- Name: close_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.close_requests (
-    reserve_pub bytea NOT NULL,
-    close_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    close_val bigint NOT NULL,
-    close_frac integer NOT NULL,
-    CONSTRAINT close_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT close_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE close_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.close_requests IS 'Explicit requests by a reserve owner to close a reserve immediately';
-
-
---
--- Name: COLUMN close_requests.close_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.close_timestamp IS 'When the request was created by the client';
-
-
---
--- Name: COLUMN close_requests.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.reserve_sig IS 'Signature affirming that the reserve is to be closed';
-
-
---
--- Name: COLUMN close_requests.close_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.close_val IS 'Balance of the reserve at the time of closing, to be wired to the associated bank account (minus the closing fee)';
-
-
---
--- Name: close_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.close_requests_default (
-    reserve_pub bytea NOT NULL,
-    close_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    close_val bigint NOT NULL,
-    close_frac integer NOT NULL,
-    CONSTRAINT close_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT close_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.close_requests ATTACH PARTITION public.close_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: contracts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.contracts (
-    contract_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    pub_ckey bytea NOT NULL,
-    contract_sig bytea NOT NULL,
-    e_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    CONSTRAINT contracts_contract_sig_check CHECK ((length(contract_sig) = 64)),
-    CONSTRAINT contracts_pub_ckey_check CHECK ((length(pub_ckey) = 32)),
-    CONSTRAINT contracts_purse_pub_check CHECK ((length(purse_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE contracts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.contracts IS 'encrypted contracts associated with purses';
-
-
---
--- Name: COLUMN contracts.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.purse_pub IS 'public key of the purse that the contract is associated with';
-
-
---
--- Name: COLUMN contracts.pub_ckey; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.pub_ckey IS 'Public ECDH key used to encrypt the contract, to be used with the purse private key for decryption';
-
-
---
--- Name: COLUMN contracts.contract_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.contract_sig IS 'signature over the encrypted contract by the purse contract key';
-
-
---
--- Name: COLUMN contracts.e_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.e_contract IS 'AES-GCM encrypted contract terms (contains gzip compressed JSON after decryption)';
-
-
---
--- Name: contracts_contract_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.contracts ALTER COLUMN contract_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.contracts_contract_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: contracts_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.contracts_default (
-    contract_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    pub_ckey bytea NOT NULL,
-    contract_sig bytea NOT NULL,
-    e_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    CONSTRAINT contracts_contract_sig_check CHECK ((length(contract_sig) = 64)),
-    CONSTRAINT contracts_pub_ckey_check CHECK ((length(pub_ckey) = 32)),
-    CONSTRAINT contracts_purse_pub_check CHECK ((length(purse_pub) = 32))
-);
-ALTER TABLE ONLY public.contracts ATTACH PARTITION public.contracts_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: cs_nonce_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.cs_nonce_locks (
-    cs_nonce_lock_serial_id bigint NOT NULL,
-    nonce bytea NOT NULL,
-    op_hash bytea NOT NULL,
-    max_denomination_serial bigint NOT NULL,
-    CONSTRAINT cs_nonce_locks_nonce_check CHECK ((length(nonce) = 32)),
-    CONSTRAINT cs_nonce_locks_op_hash_check CHECK ((length(op_hash) = 64))
-)
-PARTITION BY HASH (nonce);
-
-
---
--- Name: TABLE cs_nonce_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.cs_nonce_locks IS 'ensures a Clause Schnorr client nonce is locked for use with an operation identified by a hash';
-
-
---
--- Name: COLUMN cs_nonce_locks.nonce; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.nonce IS 'actual nonce submitted by the client';
-
-
---
--- Name: COLUMN cs_nonce_locks.op_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.op_hash IS 'hash (RC for refresh, blind coin hash for withdraw) the nonce may be used with';
-
-
---
--- Name: COLUMN cs_nonce_locks.max_denomination_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.max_denomination_serial IS 'Maximum number of a CS denomination serial the nonce could be used with, for GC';
-
-
---
--- Name: cs_nonce_locks_cs_nonce_lock_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.cs_nonce_locks ALTER COLUMN cs_nonce_lock_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.cs_nonce_locks_cs_nonce_lock_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: cs_nonce_locks_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.cs_nonce_locks_default (
-    cs_nonce_lock_serial_id bigint NOT NULL,
-    nonce bytea NOT NULL,
-    op_hash bytea NOT NULL,
-    max_denomination_serial bigint NOT NULL,
-    CONSTRAINT cs_nonce_locks_nonce_check CHECK ((length(nonce) = 32)),
-    CONSTRAINT cs_nonce_locks_op_hash_check CHECK ((length(op_hash) = 64))
-);
-ALTER TABLE ONLY public.cs_nonce_locks ATTACH PARTITION public.cs_nonce_locks_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: denomination_revocations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.denomination_revocations (
-    denom_revocations_serial_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT denomination_revocations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE denomination_revocations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.denomination_revocations IS 'remembering which denomination keys have been revoked';
-
-
---
--- Name: denomination_revocations_denom_revocations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.denomination_revocations ALTER COLUMN denom_revocations_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.denomination_revocations_denom_revocations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: denominations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.denominations (
-    denominations_serial bigint NOT NULL,
-    denom_pub_hash bytea NOT NULL,
-    denom_type integer DEFAULT 1 NOT NULL,
-    age_mask integer DEFAULT 0 NOT NULL,
-    denom_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    valid_from bigint NOT NULL,
-    expire_withdraw bigint NOT NULL,
-    expire_deposit bigint NOT NULL,
-    expire_legal bigint NOT NULL,
-    coin_val bigint NOT NULL,
-    coin_frac integer NOT NULL,
-    fee_withdraw_val bigint NOT NULL,
-    fee_withdraw_frac integer NOT NULL,
-    fee_deposit_val bigint NOT NULL,
-    fee_deposit_frac integer NOT NULL,
-    fee_refresh_val bigint NOT NULL,
-    fee_refresh_frac integer NOT NULL,
-    fee_refund_val bigint NOT NULL,
-    fee_refund_frac integer NOT NULL,
-    CONSTRAINT denominations_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64)),
-    CONSTRAINT denominations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE denominations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.denominations IS 'Main denominations table. All the valid denominations the exchange knows about.';
-
-
---
--- Name: COLUMN denominations.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.denominations_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN denominations.denom_type; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.denom_type IS 'determines cipher type for blind signatures used with this denomination; 0 is for RSA';
-
-
---
--- Name: COLUMN denominations.age_mask; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.age_mask IS 'bitmask with the age restrictions that are being used for this denomination; 0 if denomination does not support the use of age restrictions';
-
-
---
--- Name: denominations_denominations_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.denominations ALTER COLUMN denominations_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.denominations_denominations_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: deposit_confirmations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposit_confirmations (
-    master_pub bytea NOT NULL,
-    serial_id bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    h_extensions bytea NOT NULL,
-    h_wire bytea NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    amount_without_fee_val bigint NOT NULL,
-    amount_without_fee_frac integer NOT NULL,
-    coin_pub bytea NOT NULL,
-    merchant_pub bytea NOT NULL,
-    exchange_sig bytea NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT deposit_confirmations_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposit_confirmations_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT deposit_confirmations_exchange_sig_check CHECK ((length(exchange_sig) = 64)),
-    CONSTRAINT deposit_confirmations_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposit_confirmations_h_contract_terms_check1 CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposit_confirmations_h_wire_check CHECK ((length(h_wire) = 64)),
-    CONSTRAINT deposit_confirmations_master_sig_check CHECK ((length(master_sig) = 64)),
-    CONSTRAINT deposit_confirmations_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-
-
---
--- Name: TABLE deposit_confirmations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposit_confirmations IS 'deposit confirmation sent to us by merchants; we must check that the exchange reported these properly.';
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.deposit_confirmations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.deposit_confirmations_serial_id_seq OWNED BY public.deposit_confirmations.serial_id;
-
-
---
--- Name: deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits (
-    deposit_serial_id bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wallet_timestamp bigint NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    wire_salt bytea NOT NULL,
-    wire_target_h_payto bytea,
-    done boolean DEFAULT false NOT NULL,
-    extension_blocked boolean DEFAULT false NOT NULL,
-    extension_details_serial_id bigint,
-    CONSTRAINT deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT deposits_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposits_merchant_pub_check CHECK ((length(merchant_pub) = 32)),
-    CONSTRAINT deposits_wire_salt_check CHECK ((length(wire_salt) = 16)),
-    CONSTRAINT deposits_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits IS 'Deposits we have received and for which we need to make (aggregate) wire transfers (and manage refunds).';
-
-
---
--- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding in the materialized indices. Should be set based on merchant_pub. 64-bit value because we need an *unsigned* 32-bit value.';
-
-
---
--- Name: COLUMN deposits.known_coin_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.known_coin_id IS 'Used for garbage collection';
-
-
---
--- Name: COLUMN deposits.wire_salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.wire_salt IS 'Salt used when hashing the payto://-URI to get the h_wire';
-
-
---
--- Name: COLUMN deposits.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.wire_target_h_payto IS 'Identifies the target bank account and KYC status';
-
-
---
--- Name: COLUMN deposits.done; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE once we have included this deposit in some aggregate wire transfer to the merchant';
-
-
---
--- Name: COLUMN deposits.extension_blocked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.extension_blocked IS 'True if the aggregation of the deposit is currently blocked by some extension mechanism. Used to filter out deposits that must not be processed by the canonical deposit logic.';
-
-
---
--- Name: COLUMN deposits.extension_details_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.extension_details_serial_id IS 'References extensions table, NULL if extensions are not used';
-
-
---
--- Name: deposits_by_ready; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_by_ready (
-    wire_deadline bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_by_ready_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY RANGE (wire_deadline);
-
-
---
--- Name: TABLE deposits_by_ready; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits_by_ready IS 'Enables fast lookups for deposits_get_ready, auto-populated via TRIGGER below';
-
-
---
--- Name: deposits_by_ready_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_by_ready_default (
-    wire_deadline bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_by_ready_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.deposits_by_ready ATTACH PARTITION public.deposits_by_ready_default DEFAULT;
-
-
---
--- Name: deposits_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_default (
-    deposit_serial_id bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wallet_timestamp bigint NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    wire_salt bytea NOT NULL,
-    wire_target_h_payto bytea,
-    done boolean DEFAULT false NOT NULL,
-    extension_blocked boolean DEFAULT false NOT NULL,
-    extension_details_serial_id bigint,
-    CONSTRAINT deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT deposits_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposits_merchant_pub_check CHECK ((length(merchant_pub) = 32)),
-    CONSTRAINT deposits_wire_salt_check CHECK ((length(wire_salt) = 16)),
-    CONSTRAINT deposits_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-);
-ALTER TABLE ONLY public.deposits ATTACH PARTITION public.deposits_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: deposits_deposit_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.deposits ALTER COLUMN deposit_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.deposits_deposit_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: deposits_for_matching; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_for_matching (
-    refund_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_for_matching_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_for_matching_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-)
-PARTITION BY RANGE (refund_deadline);
-
-
---
--- Name: TABLE deposits_for_matching; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits_for_matching IS 'Enables fast lookups for deposits_iterate_matching, auto-populated via TRIGGER below';
-
-
---
--- Name: deposits_for_matching_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_for_matching_default (
-    refund_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_for_matching_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_for_matching_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-ALTER TABLE ONLY public.deposits_for_matching ATTACH PARTITION public.deposits_for_matching_default DEFAULT;
-
-
---
--- Name: django_content_type; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_content_type (
-    id integer NOT NULL,
-    app_label character varying(100) NOT NULL,
-    model character varying(100) NOT NULL
-);
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.django_content_type_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.django_content_type_id_seq OWNED BY public.django_content_type.id;
-
-
---
--- Name: django_migrations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_migrations (
-    id bigint NOT NULL,
-    app character varying(255) NOT NULL,
-    name character varying(255) NOT NULL,
-    applied timestamp with time zone NOT NULL
-);
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.django_migrations_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.django_migrations_id_seq OWNED BY public.django_migrations.id;
-
-
---
--- Name: django_session; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_session (
-    session_key character varying(40) NOT NULL,
-    session_data text NOT NULL,
-    expire_date timestamp with time zone NOT NULL
-);
-
-
---
--- Name: exchange_sign_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.exchange_sign_keys (
-    esk_serial bigint NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    valid_from bigint NOT NULL,
-    expire_sign bigint NOT NULL,
-    expire_legal bigint NOT NULL,
-    CONSTRAINT exchange_sign_keys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT exchange_sign_keys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE exchange_sign_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.exchange_sign_keys IS 'Table with master public key signatures on exchange online signing keys.';
-
-
---
--- Name: COLUMN exchange_sign_keys.exchange_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.exchange_pub IS 'Public online signing key of the exchange.';
-
-
---
--- Name: COLUMN exchange_sign_keys.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.master_sig IS 'Signature affirming the validity of the signing key of purpose TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.';
-
-
---
--- Name: COLUMN exchange_sign_keys.valid_from; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.valid_from IS 'Time when this online signing key will first be used to sign messages.';
-
-
---
--- Name: COLUMN exchange_sign_keys.expire_sign; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.expire_sign IS 'Time when this online signing key will no longer be used to sign.';
-
-
---
--- Name: COLUMN exchange_sign_keys.expire_legal; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.expire_legal IS 'Time when this online signing key legally expires.';
-
-
---
--- Name: exchange_sign_keys_esk_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.exchange_sign_keys ALTER COLUMN esk_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.exchange_sign_keys_esk_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: extension_details; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extension_details (
-    extension_details_serial_id bigint NOT NULL,
-    extension_options character varying
-)
-PARTITION BY HASH (extension_details_serial_id);
-
-
---
--- Name: TABLE extension_details; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.extension_details IS 'Extensions that were provided with deposits (not yet used).';
-
-
---
--- Name: COLUMN extension_details.extension_options; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extension_details.extension_options IS 'JSON object with options set that the exchange needs to consider when executing a deposit. Supported details depend on the extensions supported by the exchange.';
-
-
---
--- Name: extension_details_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extension_details_default (
-    extension_details_serial_id bigint NOT NULL,
-    extension_options character varying
-);
-ALTER TABLE ONLY public.extension_details ATTACH PARTITION public.extension_details_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: extension_details_extension_details_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.extension_details ALTER COLUMN extension_details_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.extension_details_extension_details_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: extensions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extensions (
-    extension_id bigint NOT NULL,
-    name character varying NOT NULL,
-    config bytea
-);
-
-
---
--- Name: TABLE extensions; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.extensions IS 'Configurations of the activated extensions';
-
-
---
--- Name: COLUMN extensions.name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extensions.name IS 'Name of the extension';
-
-
---
--- Name: COLUMN extensions.config; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extensions.config IS 'Configuration of the extension as JSON-blob, maybe NULL';
-
-
---
--- Name: extensions_extension_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.extensions ALTER COLUMN extension_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.extensions_extension_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: global_fee; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.global_fee (
-    global_fee_serial bigint NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    kyc_fee_val bigint NOT NULL,
-    kyc_fee_frac integer NOT NULL,
-    account_fee_val bigint NOT NULL,
-    account_fee_frac integer NOT NULL,
-    purse_fee_val bigint NOT NULL,
-    purse_fee_frac integer NOT NULL,
-    purse_timeout bigint NOT NULL,
-    kyc_timeout bigint NOT NULL,
-    history_expiration bigint NOT NULL,
-    purse_account_limit integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT global_fee_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE global_fee; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.global_fee IS 'list of the global fees of this exchange, by date';
-
-
---
--- Name: COLUMN global_fee.global_fee_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.global_fee.global_fee_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: global_fee_global_fee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.global_fee ALTER COLUMN global_fee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.global_fee_global_fee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: history_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.history_requests (
-    reserve_pub bytea NOT NULL,
-    request_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    CONSTRAINT history_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT history_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE history_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.history_requests IS 'Paid history requests issued by a client against a reserve';
-
-
---
--- Name: COLUMN history_requests.request_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.request_timestamp IS 'When was the history request made';
-
-
---
--- Name: COLUMN history_requests.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.reserve_sig IS 'Signature approving payment for the history request';
-
-
---
--- Name: COLUMN history_requests.history_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.history_fee_val IS 'History fee approved by the signature';
-
-
---
--- Name: history_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.history_requests_default (
-    reserve_pub bytea NOT NULL,
-    request_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    CONSTRAINT history_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT history_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.history_requests ATTACH PARTITION public.history_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: known_coins; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.known_coins (
-    known_coin_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    age_commitment_hash bytea,
-    denom_sig bytea NOT NULL,
-    remaining_val bigint NOT NULL,
-    remaining_frac integer NOT NULL,
-    CONSTRAINT known_coins_age_commitment_hash_check CHECK ((length(age_commitment_hash) = 32)),
-    CONSTRAINT known_coins_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE known_coins; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.known_coins IS 'information about coins and their signatures, so we do not have to store the signatures more than once if a coin is involved in multiple operations';
-
-
---
--- Name: COLUMN known_coins.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.denominations_serial IS 'Denomination of the coin, determines the value of the original coin and applicable fees for coin-specific operations.';
-
-
---
--- Name: COLUMN known_coins.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.coin_pub IS 'EdDSA public key of the coin';
-
-
---
--- Name: COLUMN known_coins.age_commitment_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.age_commitment_hash IS 'Optional hash of the age commitment for age restrictions as per DD 24 (active if denom_type has the respective bit set)';
-
-
---
--- Name: COLUMN known_coins.denom_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.denom_sig IS 'This is the signature of the exchange that affirms that the coin is a valid coin. The specific signature type depends on denom_type of the denomination.';
-
-
---
--- Name: COLUMN known_coins.remaining_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.remaining_val IS 'Value of the coin that remains to be spent';
-
-
---
--- Name: known_coins_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.known_coins_default (
-    known_coin_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    age_commitment_hash bytea,
-    denom_sig bytea NOT NULL,
-    remaining_val bigint NOT NULL,
-    remaining_frac integer NOT NULL,
-    CONSTRAINT known_coins_age_commitment_hash_check CHECK ((length(age_commitment_hash) = 32)),
-    CONSTRAINT known_coins_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.known_coins ATTACH PARTITION public.known_coins_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: known_coins_known_coin_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.known_coins ALTER COLUMN known_coin_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.known_coins_known_coin_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_accounts (
-    account_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    h_wire bytea NOT NULL,
-    salt bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    active boolean NOT NULL,
-    CONSTRAINT merchant_accounts_h_wire_check CHECK ((length(h_wire) = 64)),
-    CONSTRAINT merchant_accounts_salt_check CHECK ((length(salt) = 16))
-);
-
-
---
--- Name: TABLE merchant_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_accounts IS 'bank accounts of the instances';
-
-
---
--- Name: COLUMN merchant_accounts.h_wire; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.h_wire IS 'salted hash of payto_uri';
-
-
---
--- Name: COLUMN merchant_accounts.salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.salt IS 'salt used when hashing payto_uri into h_wire';
-
-
---
--- Name: COLUMN merchant_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.payto_uri IS 'payto URI of a merchant bank account';
-
-
---
--- Name: COLUMN merchant_accounts.active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.active IS 'true if we actively use this bank account, false if it is just kept around for older contracts to refer to';
-
-
---
--- Name: merchant_accounts_account_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_accounts ALTER COLUMN account_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_accounts_account_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_contract_terms; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_contract_terms (
-    order_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    order_id character varying NOT NULL,
-    contract_terms bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    creation_time bigint NOT NULL,
-    pay_deadline bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    paid boolean DEFAULT false NOT NULL,
-    wired boolean DEFAULT false NOT NULL,
-    fulfillment_url character varying,
-    session_id character varying DEFAULT ''::character varying NOT NULL,
-    claim_token bytea NOT NULL,
-    CONSTRAINT merchant_contract_terms_claim_token_check CHECK ((length(claim_token) = 16)),
-    CONSTRAINT merchant_contract_terms_h_contract_terms_check CHECK ((length(h_contract_terms) = 64))
-);
-
-
---
--- Name: TABLE merchant_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_contract_terms IS 'Contracts are orders that have been claimed by a wallet';
-
-
---
--- Name: COLUMN merchant_contract_terms.merchant_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.merchant_serial IS 'Identifies the instance offering the contract';
-
-
---
--- Name: COLUMN merchant_contract_terms.order_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.order_id IS 'Not a foreign key into merchant_orders because paid contracts persist after expiration';
-
-
---
--- Name: COLUMN merchant_contract_terms.contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.contract_terms IS 'These contract terms include the wallet nonce';
-
-
---
--- Name: COLUMN merchant_contract_terms.h_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.h_contract_terms IS 'Hash over contract_terms';
-
-
---
--- Name: COLUMN merchant_contract_terms.pay_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.pay_deadline IS 'How long is the offer valid. After this time, the order can be garbage collected';
-
-
---
--- Name: COLUMN merchant_contract_terms.refund_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.refund_deadline IS 'By what times do refunds have to be approved (useful to reject refund requests)';
-
-
---
--- Name: COLUMN merchant_contract_terms.paid; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.paid IS 'true implies the customer paid for this contract; order should be DELETEd from merchant_orders once paid is set to release merchant_order_locks; paid remains true even if the payment was later refunded';
-
-
---
--- Name: COLUMN merchant_contract_terms.wired; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.wired IS 'true implies the exchange wired us the full amount for all non-refunded payments under this contract';
-
-
---
--- Name: COLUMN merchant_contract_terms.fulfillment_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.fulfillment_url IS 'also included in contract_terms, but we need it here to SELECT on it during repurchase detection; can be NULL if the contract has no fulfillment URL';
-
-
---
--- Name: COLUMN merchant_contract_terms.session_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.session_id IS 'last session_id from we confirmed the paying client to use, empty string for none';
-
-
---
--- Name: COLUMN merchant_contract_terms.claim_token; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.claim_token IS 'Token optionally used to access the status of the order. All zeros (not NULL) if not used';
-
-
---
--- Name: merchant_deposit_to_transfer; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_deposit_to_transfer (
-    deposit_serial bigint NOT NULL,
-    coin_contribution_value_val bigint NOT NULL,
-    coin_contribution_value_frac integer NOT NULL,
-    credit_serial bigint NOT NULL,
-    execution_time bigint NOT NULL,
-    signkey_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    CONSTRAINT merchant_deposit_to_transfer_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_deposit_to_transfer; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_deposit_to_transfer IS 'Mapping of deposits to (possibly unconfirmed) wire transfers; NOTE: not used yet';
-
-
---
--- Name: COLUMN merchant_deposit_to_transfer.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposit_to_transfer.execution_time IS 'Execution time as claimed by the exchange, roughly matches time seen by merchant';
-
-
---
--- Name: merchant_deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_deposits (
-    deposit_serial bigint NOT NULL,
-    order_serial bigint,
-    deposit_timestamp bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    deposit_fee_val bigint NOT NULL,
-    deposit_fee_frac integer NOT NULL,
-    refund_fee_val bigint NOT NULL,
-    refund_fee_frac integer NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    signkey_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    account_serial bigint NOT NULL,
-    CONSTRAINT merchant_deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT merchant_deposits_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_deposits IS 'Refunds approved by the merchant (backoffice) logic, excludes abort refunds';
-
-
---
--- Name: COLUMN merchant_deposits.deposit_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.deposit_timestamp IS 'Time when the exchange generated the deposit confirmation';
-
-
---
--- Name: COLUMN merchant_deposits.wire_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.wire_fee_val IS 'We MAY want to see if we should try to get this via merchant_exchange_wire_fees (not sure, may be too complicated with the date range, etc.)';
-
-
---
--- Name: COLUMN merchant_deposits.signkey_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.signkey_serial IS 'Online signing key of the exchange on the deposit confirmation';
-
-
---
--- Name: COLUMN merchant_deposits.exchange_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.exchange_sig IS 'Signature of the exchange over the deposit confirmation';
-
-
---
--- Name: merchant_deposits_deposit_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_deposits ALTER COLUMN deposit_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_deposits_deposit_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_exchange_signing_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_exchange_signing_keys (
-    signkey_serial bigint NOT NULL,
-    master_pub bytea NOT NULL,
-    exchange_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    expire_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT merchant_exchange_signing_keys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT merchant_exchange_signing_keys_master_pub_check CHECK ((length(master_pub) = 32)),
-    CONSTRAINT merchant_exchange_signing_keys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_exchange_signing_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_exchange_signing_keys IS 'Here we store proofs of the exchange online signing keys being signed by the exchange master key';
-
-
---
--- Name: COLUMN merchant_exchange_signing_keys.master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_exchange_signing_keys.master_pub IS 'Master public key of the exchange with these online signing keys';
-
-
---
--- Name: merchant_exchange_signing_keys_signkey_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_exchange_signing_keys ALTER COLUMN signkey_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_exchange_signing_keys_signkey_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_exchange_wire_fees; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_exchange_wire_fees (
-    wirefee_serial bigint NOT NULL,
-    master_pub bytea NOT NULL,
-    h_wire_method bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT merchant_exchange_wire_fees_h_wire_method_check CHECK ((length(h_wire_method) = 64)),
-    CONSTRAINT merchant_exchange_wire_fees_master_pub_check CHECK ((length(master_pub) = 32)),
-    CONSTRAINT merchant_exchange_wire_fees_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_exchange_wire_fees; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_exchange_wire_fees IS 'Here we store proofs of the wire fee structure of the various exchanges';
-
-
---
--- Name: COLUMN merchant_exchange_wire_fees.master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_exchange_wire_fees.master_pub IS 'Master public key of the exchange with these wire fees';
-
-
---
--- Name: merchant_exchange_wire_fees_wirefee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_exchange_wire_fees ALTER COLUMN wirefee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_exchange_wire_fees_wirefee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_instances; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_instances (
-    merchant_serial bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    auth_hash bytea,
-    auth_salt bytea,
-    merchant_id character varying NOT NULL,
-    merchant_name character varying NOT NULL,
-    address bytea NOT NULL,
-    jurisdiction bytea NOT NULL,
-    default_max_deposit_fee_val bigint NOT NULL,
-    default_max_deposit_fee_frac integer NOT NULL,
-    default_max_wire_fee_val bigint NOT NULL,
-    default_max_wire_fee_frac integer NOT NULL,
-    default_wire_fee_amortization integer NOT NULL,
-    default_wire_transfer_delay bigint NOT NULL,
-    default_pay_delay bigint NOT NULL,
-    CONSTRAINT merchant_instances_auth_hash_check CHECK ((length(auth_hash) = 64)),
-    CONSTRAINT merchant_instances_auth_salt_check CHECK ((length(auth_salt) = 32)),
-    CONSTRAINT merchant_instances_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-
-
---
--- Name: TABLE merchant_instances; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_instances IS 'all the instances supported by this backend';
-
-
---
--- Name: COLUMN merchant_instances.auth_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.auth_hash IS 'hash used for merchant back office Authorization, NULL for no check';
-
-
---
--- Name: COLUMN merchant_instances.auth_salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.auth_salt IS 'salt to use when hashing Authorization header before comparing with auth_hash';
-
-
---
--- Name: COLUMN merchant_instances.merchant_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.merchant_id IS 'identifier of the merchant as used in the base URL (required)';
-
-
---
--- Name: COLUMN merchant_instances.merchant_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.merchant_name IS 'legal name of the merchant as a simple string (required)';
-
-
---
--- Name: COLUMN merchant_instances.address; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.address IS 'physical address of the merchant as a Location in JSON format (required)';
-
-
---
--- Name: COLUMN merchant_instances.jurisdiction; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.jurisdiction IS 'jurisdiction of the merchant as a Location in JSON format (required)';
-
-
---
--- Name: merchant_instances_merchant_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_instances ALTER COLUMN merchant_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_instances_merchant_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_inventory; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_inventory (
-    product_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    product_id character varying NOT NULL,
-    description character varying NOT NULL,
-    description_i18n bytea NOT NULL,
-    unit character varying NOT NULL,
-    image bytea NOT NULL,
-    taxes bytea NOT NULL,
-    price_val bigint NOT NULL,
-    price_frac integer NOT NULL,
-    total_stock bigint NOT NULL,
-    total_sold bigint DEFAULT 0 NOT NULL,
-    total_lost bigint DEFAULT 0 NOT NULL,
-    address bytea NOT NULL,
-    next_restock bigint NOT NULL,
-    minimum_age integer DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE merchant_inventory; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_inventory IS 'products offered by the merchant (may be incomplete, frontend can override)';
-
-
---
--- Name: COLUMN merchant_inventory.description; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.description IS 'Human-readable product description';
-
-
---
--- Name: COLUMN merchant_inventory.description_i18n; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.description_i18n IS 'JSON map from IETF BCP 47 language tags to localized descriptions';
-
-
---
--- Name: COLUMN merchant_inventory.unit; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.unit IS 'Unit of sale for the product (liters, kilograms, packages)';
-
-
---
--- Name: COLUMN merchant_inventory.image; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.image IS 'NOT NULL, but can be 0 bytes; must contain an ImageDataUrl';
-
-
---
--- Name: COLUMN merchant_inventory.taxes; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.taxes IS 'JSON array containing taxes the merchant pays, must be JSON, but can be just "[]"';
-
-
---
--- Name: COLUMN merchant_inventory.price_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.price_val IS 'Current price of one unit of the product';
-
-
---
--- Name: COLUMN merchant_inventory.total_stock; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_stock IS 'A value of -1 is used for unlimited (electronic good), may never be lowered';
-
-
---
--- Name: COLUMN merchant_inventory.total_sold; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_sold IS 'Number of products sold, must be below total_stock, non-negative, may never be lowered';
-
-
---
--- Name: COLUMN merchant_inventory.total_lost; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_lost IS 'Number of products that used to be in stock but were lost (spoiled, damaged), may never be lowered; total_stock >= total_sold + total_lost must always hold';
-
-
---
--- Name: COLUMN merchant_inventory.address; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.address IS 'JSON formatted Location of where the product is stocked';
-
-
---
--- Name: COLUMN merchant_inventory.next_restock; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.next_restock IS 'GNUnet absolute time indicating when the next restock is expected. 0 for unknown.';
-
-
---
--- Name: COLUMN merchant_inventory.minimum_age; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.minimum_age IS 'Minimum age of the customer in years, to be used if an exchange supports the age restriction extension.';
-
-
---
--- Name: merchant_inventory_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_inventory_locks (
-    product_serial bigint NOT NULL,
-    lock_uuid bytea NOT NULL,
-    total_locked bigint NOT NULL,
-    expiration bigint NOT NULL,
-    CONSTRAINT merchant_inventory_locks_lock_uuid_check CHECK ((length(lock_uuid) = 16))
-);
-
-
---
--- Name: TABLE merchant_inventory_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_inventory_locks IS 'locks on inventory helt by shopping carts; note that locks MAY not be honored if merchants increase total_lost for inventory';
-
-
---
--- Name: COLUMN merchant_inventory_locks.total_locked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory_locks.total_locked IS 'how many units of the product does this lock reserve';
-
-
---
--- Name: COLUMN merchant_inventory_locks.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory_locks.expiration IS 'when does this lock automatically expire (if no order is created)';
-
-
---
--- Name: merchant_inventory_product_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_inventory ALTER COLUMN product_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_inventory_product_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_keys (
-    merchant_priv bytea NOT NULL,
-    merchant_serial bigint NOT NULL,
-    CONSTRAINT merchant_keys_merchant_priv_check CHECK ((length(merchant_priv) = 32))
-);
-
-
---
--- Name: TABLE merchant_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_keys IS 'private keys of instances that have not been deleted';
-
-
---
--- Name: merchant_kyc; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_kyc (
-    kyc_serial_id bigint NOT NULL,
-    kyc_timestamp bigint NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    exchange_sig bytea,
-    exchange_pub bytea,
-    exchange_kyc_serial bigint DEFAULT 0 NOT NULL,
-    account_serial bigint NOT NULL,
-    exchange_url character varying NOT NULL,
-    CONSTRAINT merchant_kyc_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT merchant_kyc_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_kyc; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_kyc IS 'Status of the KYC process of a merchant account at an exchange';
-
-
---
--- Name: COLUMN merchant_kyc.kyc_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.kyc_timestamp IS 'Last time we checked our KYC status at the exchange. Useful to re-check if the status is very stale. Also the timestamp used for the exchange signature (if present).';
-
-
---
--- Name: COLUMN merchant_kyc.kyc_ok; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.kyc_ok IS 'true if the KYC check was passed successfully';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_sig IS 'signature of the exchange affirming the KYC passed (or NULL if exchange does not require KYC or not kyc_ok)';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_pub IS 'public key used with exchange_sig (or NULL if exchange_sig is NULL)';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_kyc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_kyc_serial IS 'Number to use in the KYC-endpoints of the exchange to check the KYC status or begin the KYC process. 0 if we do not know it yet.';
-
-
---
--- Name: COLUMN merchant_kyc.account_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.account_serial IS 'Which bank account of the merchant is the KYC status for';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_url IS 'Which exchange base URL is this KYC status valid for';
-
-
---
--- Name: merchant_kyc_kyc_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_kyc ALTER COLUMN kyc_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_kyc_kyc_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_order_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_order_locks (
-    product_serial bigint NOT NULL,
-    total_locked bigint NOT NULL,
-    order_serial bigint NOT NULL
-);
-
-
---
--- Name: TABLE merchant_order_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_order_locks IS 'locks on orders awaiting claim and payment; note that locks MAY not be honored if merchants increase total_lost for inventory';
-
-
---
--- Name: COLUMN merchant_order_locks.total_locked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_order_locks.total_locked IS 'how many units of the product does this lock reserve';
-
-
---
--- Name: merchant_orders; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_orders (
-    order_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    order_id character varying NOT NULL,
-    claim_token bytea NOT NULL,
-    h_post_data bytea NOT NULL,
-    pay_deadline bigint NOT NULL,
-    creation_time bigint NOT NULL,
-    contract_terms bytea NOT NULL,
-    CONSTRAINT merchant_orders_claim_token_check CHECK ((length(claim_token) = 16)),
-    CONSTRAINT merchant_orders_h_post_data_check CHECK ((length(h_post_data) = 64))
-);
-
-
---
--- Name: TABLE merchant_orders; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_orders IS 'Orders we offered to a customer, but that have not yet been claimed';
-
-
---
--- Name: COLUMN merchant_orders.merchant_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.merchant_serial IS 'Identifies the instance offering the contract';
-
-
---
--- Name: COLUMN merchant_orders.claim_token; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.claim_token IS 'Token optionally used to authorize the wallet to claim the order. All zeros (not NULL) if not used';
-
-
---
--- Name: COLUMN merchant_orders.h_post_data; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.h_post_data IS 'Hash of the POST request that created this order, for idempotency checks';
-
-
---
--- Name: COLUMN merchant_orders.pay_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.pay_deadline IS 'How long is the offer valid. After this time, the order can be garbage collected';
-
-
---
--- Name: COLUMN merchant_orders.contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.contract_terms IS 'Claiming changes the contract_terms, hence we have no hash of the terms in this table';
-
-
---
--- Name: merchant_orders_order_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_orders ALTER COLUMN order_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_orders_order_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_refund_proofs; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_refund_proofs (
-    refund_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    signkey_serial bigint NOT NULL,
-    CONSTRAINT merchant_refund_proofs_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_refund_proofs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_refund_proofs IS 'Refunds confirmed by the exchange (not all approved refunds are grabbed by the wallet)';
-
-
---
--- Name: merchant_refunds; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_refunds (
-    refund_serial bigint NOT NULL,
-    order_serial bigint NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    refund_timestamp bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    reason character varying NOT NULL,
-    refund_amount_val bigint NOT NULL,
-    refund_amount_frac integer NOT NULL
-);
-
-
---
--- Name: COLUMN merchant_refunds.rtransaction_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_refunds.rtransaction_id IS 'Needed for uniqueness in case a refund is increased for the same order';
-
-
---
--- Name: COLUMN merchant_refunds.refund_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_refunds.refund_timestamp IS 'Needed for grouping of refunds in the wallet UI; has no semantics in the protocol (only for UX), but should be from the time when the merchant internally approved the refund';
-
-
---
--- Name: merchant_refunds_refund_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_refunds ALTER COLUMN refund_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_refunds_refund_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tip_pickup_signatures; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_pickup_signatures (
-    pickup_serial bigint NOT NULL,
-    coin_offset integer NOT NULL,
-    blind_sig bytea NOT NULL
-);
-
-
---
--- Name: TABLE merchant_tip_pickup_signatures; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_pickup_signatures IS 'blind signatures we got from the exchange during the tip pickup';
-
-
---
--- Name: merchant_tip_pickups; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_pickups (
-    pickup_serial bigint NOT NULL,
-    tip_serial bigint NOT NULL,
-    pickup_id bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT merchant_tip_pickups_pickup_id_check CHECK ((length(pickup_id) = 64))
-);
-
-
---
--- Name: TABLE merchant_tip_pickups; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_pickups IS 'tips that have been picked up';
-
-
---
--- Name: merchant_tip_pickups_pickup_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tip_pickups ALTER COLUMN pickup_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tip_pickups_pickup_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tip_reserve_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_reserve_keys (
-    reserve_serial bigint NOT NULL,
-    reserve_priv bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    payto_uri character varying,
-    CONSTRAINT merchant_tip_reserve_keys_reserve_priv_check CHECK ((length(reserve_priv) = 32))
-);
-
-
---
--- Name: COLUMN merchant_tip_reserve_keys.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserve_keys.payto_uri IS 'payto:// URI used to fund the reserve, may be NULL once reserve is funded';
-
-
---
--- Name: merchant_tip_reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_reserves (
-    reserve_serial bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    merchant_serial bigint NOT NULL,
-    creation_time bigint NOT NULL,
-    expiration bigint NOT NULL,
-    merchant_initial_balance_val bigint NOT NULL,
-    merchant_initial_balance_frac integer NOT NULL,
-    exchange_initial_balance_val bigint DEFAULT 0 NOT NULL,
-    exchange_initial_balance_frac integer DEFAULT 0 NOT NULL,
-    tips_committed_val bigint DEFAULT 0 NOT NULL,
-    tips_committed_frac integer DEFAULT 0 NOT NULL,
-    tips_picked_up_val bigint DEFAULT 0 NOT NULL,
-    tips_picked_up_frac integer DEFAULT 0 NOT NULL,
-    CONSTRAINT merchant_tip_reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-
-
---
--- Name: TABLE merchant_tip_reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_reserves IS 'private keys of reserves that have not been deleted';
-
-
---
--- Name: COLUMN merchant_tip_reserves.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.expiration IS 'FIXME: EXCHANGE API needs to tell us when reserves close if we are to compute this';
-
-
---
--- Name: COLUMN merchant_tip_reserves.merchant_initial_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.merchant_initial_balance_val IS 'Set to the initial balance the merchant told us when creating the reserve';
-
-
---
--- Name: COLUMN merchant_tip_reserves.exchange_initial_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.exchange_initial_balance_val IS 'Set to the initial balance the exchange told us when we queried the reserve status';
-
-
---
--- Name: COLUMN merchant_tip_reserves.tips_committed_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.tips_committed_val IS 'Amount of outstanding approved tips that have not been picked up';
-
-
---
--- Name: COLUMN merchant_tip_reserves.tips_picked_up_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.tips_picked_up_val IS 'Total amount tips that have been picked up from this reserve';
-
-
---
--- Name: merchant_tip_reserves_reserve_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tip_reserves ALTER COLUMN reserve_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tip_reserves_reserve_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tips; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tips (
-    tip_serial bigint NOT NULL,
-    reserve_serial bigint NOT NULL,
-    tip_id bytea NOT NULL,
-    justification character varying NOT NULL,
-    next_url character varying NOT NULL,
-    expiration bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    picked_up_val bigint DEFAULT 0 NOT NULL,
-    picked_up_frac integer DEFAULT 0 NOT NULL,
-    was_picked_up boolean DEFAULT false NOT NULL,
-    CONSTRAINT merchant_tips_tip_id_check CHECK ((length(tip_id) = 64))
-);
-
-
---
--- Name: TABLE merchant_tips; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tips IS 'tips that have been authorized';
-
-
---
--- Name: COLUMN merchant_tips.reserve_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.reserve_serial IS 'Reserve from which this tip is funded';
-
-
---
--- Name: COLUMN merchant_tips.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.expiration IS 'by when does the client have to pick up the tip';
-
-
---
--- Name: COLUMN merchant_tips.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.amount_val IS 'total transaction cost for all coins including withdraw fees';
-
-
---
--- Name: COLUMN merchant_tips.picked_up_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.picked_up_val IS 'Tip amount left to be picked up';
-
-
---
--- Name: merchant_tips_tip_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tips ALTER COLUMN tip_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tips_tip_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_transfer_signatures; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfer_signatures (
-    credit_serial bigint NOT NULL,
-    signkey_serial bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    credit_amount_val bigint NOT NULL,
-    credit_amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    CONSTRAINT merchant_transfer_signatures_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_transfer_signatures; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfer_signatures IS 'table represents the main information returned from the /transfer request to the exchange.';
-
-
---
--- Name: COLUMN merchant_transfer_signatures.credit_amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_signatures.credit_amount_val IS 'actual value of the (aggregated) wire transfer, excluding the wire fee, according to the exchange';
-
-
---
--- Name: COLUMN merchant_transfer_signatures.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_signatures.execution_time IS 'Execution time as claimed by the exchange, roughly matches time seen by merchant';
-
-
---
--- Name: merchant_transfer_to_coin; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfer_to_coin (
-    deposit_serial bigint NOT NULL,
-    credit_serial bigint NOT NULL,
-    offset_in_exchange_list bigint NOT NULL,
-    exchange_deposit_value_val bigint NOT NULL,
-    exchange_deposit_value_frac integer NOT NULL,
-    exchange_deposit_fee_val bigint NOT NULL,
-    exchange_deposit_fee_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE merchant_transfer_to_coin; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfer_to_coin IS 'Mapping of (credit) transfers to (deposited) coins';
-
-
---
--- Name: COLUMN merchant_transfer_to_coin.exchange_deposit_value_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_to_coin.exchange_deposit_value_val IS 'Deposit value as claimed by the exchange, should match our values in merchant_deposits minus refunds';
-
-
---
--- Name: COLUMN merchant_transfer_to_coin.exchange_deposit_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_to_coin.exchange_deposit_fee_val IS 'Deposit value as claimed by the exchange, should match our values in merchant_deposits';
-
-
---
--- Name: merchant_transfers; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfers (
-    credit_serial bigint NOT NULL,
-    exchange_url character varying NOT NULL,
-    wtid bytea,
-    credit_amount_val bigint NOT NULL,
-    credit_amount_frac integer NOT NULL,
-    account_serial bigint NOT NULL,
-    verified boolean DEFAULT false NOT NULL,
-    confirmed boolean DEFAULT false NOT NULL,
-    CONSTRAINT merchant_transfers_wtid_check CHECK ((length(wtid) = 32))
-);
-
-
---
--- Name: TABLE merchant_transfers; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfers IS 'table represents the information provided by the (trusted) merchant about incoming wire transfers';
-
-
---
--- Name: COLUMN merchant_transfers.credit_amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.credit_amount_val IS 'actual value of the (aggregated) wire transfer, excluding the wire fee, according to the merchant';
-
-
---
--- Name: COLUMN merchant_transfers.verified; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.verified IS 'true once we got an acceptable response from the exchange for this transfer';
-
-
---
--- Name: COLUMN merchant_transfers.confirmed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.confirmed IS 'true once the merchant confirmed that this transfer was received';
-
-
---
--- Name: merchant_transfers_credit_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_transfers ALTER COLUMN credit_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_transfers_credit_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: partner_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.partner_accounts (
-    payto_uri character varying NOT NULL,
-    partner_serial_id bigint,
-    partner_master_sig bytea,
-    last_seen bigint NOT NULL,
-    CONSTRAINT partner_accounts_partner_master_sig_check CHECK ((length(partner_master_sig) = 64))
-);
-
-
---
--- Name: TABLE partner_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.partner_accounts IS 'Table with bank accounts of the partner exchange. Entries never expire as we need to remember the signature for the auditor.';
-
-
---
--- Name: COLUMN partner_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.payto_uri IS 'payto URI (RFC 8905) with the bank account of the partner exchange.';
-
-
---
--- Name: COLUMN partner_accounts.partner_master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.partner_master_sig IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS by the partner master public key';
-
-
---
--- Name: COLUMN partner_accounts.last_seen; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.last_seen IS 'Last time we saw this account as being active at the partner exchange. Used to select the most recent entry, and to detect when we should check again.';
-
-
---
--- Name: partners; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.partners (
-    partner_serial_id bigint NOT NULL,
-    partner_master_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wad_frequency bigint NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    partner_base_url text NOT NULL,
-    CONSTRAINT partners_master_sig_check CHECK ((length(master_sig) = 64)),
-    CONSTRAINT partners_partner_master_pub_check CHECK ((length(partner_master_pub) = 32))
-);
-
-
---
--- Name: TABLE partners; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.partners IS 'exchanges we do wad transfers to';
-
-
---
--- Name: COLUMN partners.partner_master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.partner_master_pub IS 'offline master public key of the partner';
-
-
---
--- Name: COLUMN partners.start_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.start_date IS 'starting date of the partnership';
-
-
---
--- Name: COLUMN partners.end_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.end_date IS 'end date of the partnership';
-
-
---
--- Name: COLUMN partners.wad_frequency; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.wad_frequency IS 'how often do we promise to do wad transfers';
-
-
---
--- Name: COLUMN partners.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.wad_fee_val IS 'how high is the fee for a wallet to be added to a wad to this partner';
-
-
---
--- Name: COLUMN partners.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.master_sig IS 'signature of our master public key affirming the partnership, of purpose TALER_SIGNATURE_MASTER_PARTNER_DETAILS';
-
-
---
--- Name: COLUMN partners.partner_base_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.partner_base_url IS 'base URL of the REST API for this partner';
-
-
---
--- Name: partners_partner_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.partners ALTER COLUMN partner_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.partners_partner_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: prewire; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.prewire (
-    prewire_uuid bigint NOT NULL,
-    wire_method text NOT NULL,
-    finished boolean DEFAULT false NOT NULL,
-    failed boolean DEFAULT false NOT NULL,
-    buf bytea NOT NULL
-)
-PARTITION BY HASH (prewire_uuid);
-
-
---
--- Name: TABLE prewire; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.prewire IS 'pre-commit data for wire transfers we are about to execute';
-
-
---
--- Name: COLUMN prewire.finished; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.finished IS 'set to TRUE once bank confirmed receiving the wire transfer request';
-
-
---
--- Name: COLUMN prewire.failed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.failed IS 'set to TRUE if the bank responded with a non-transient failure to our transfer request';
-
-
---
--- Name: COLUMN prewire.buf; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.buf IS 'serialized data to send to the bank to execute the wire transfer';
-
-
---
--- Name: prewire_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.prewire_default (
-    prewire_uuid bigint NOT NULL,
-    wire_method text NOT NULL,
-    finished boolean DEFAULT false NOT NULL,
-    failed boolean DEFAULT false NOT NULL,
-    buf bytea NOT NULL
-);
-ALTER TABLE ONLY public.prewire ATTACH PARTITION public.prewire_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: prewire_prewire_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.prewire ALTER COLUMN prewire_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.prewire_prewire_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_deposits (
-    purse_deposit_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    purse_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    coin_sig bytea NOT NULL,
-    CONSTRAINT purse_deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT purse_deposits_purse_pub_check CHECK ((length(purse_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_deposits IS 'Requests depositing coins into a purse';
-
-
---
--- Name: COLUMN purse_deposits.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.partner_serial_id IS 'identifies the partner exchange, NULL in case the target purse lives at this exchange';
-
-
---
--- Name: COLUMN purse_deposits.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN purse_deposits.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.coin_pub IS 'Public key of the coin being deposited';
-
-
---
--- Name: COLUMN purse_deposits.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.amount_with_fee_val IS 'Total amount being deposited';
-
-
---
--- Name: COLUMN purse_deposits.coin_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.coin_sig IS 'Signature of the coin affirming the deposit into the purse, of type TALER_SIGNATURE_PURSE_DEPOSIT';
-
-
---
--- Name: purse_deposits_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_deposits_default (
-    purse_deposit_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    purse_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    coin_sig bytea NOT NULL,
-    CONSTRAINT purse_deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT purse_deposits_purse_pub_check CHECK ((length(purse_pub) = 32))
-);
-ALTER TABLE ONLY public.purse_deposits ATTACH PARTITION public.purse_deposits_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_deposits_purse_deposit_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_deposits ALTER COLUMN purse_deposit_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_deposits_purse_deposit_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_merges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_merges (
-    purse_merge_request_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_sig bytea NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    CONSTRAINT purse_merges_merge_sig_check CHECK ((length(merge_sig) = 64)),
-    CONSTRAINT purse_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_merges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_merges IS 'Merge requests where a purse-owner requested merging the purse into the account';
-
-
---
--- Name: COLUMN purse_merges.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.partner_serial_id IS 'identifies the partner exchange, NULL in case the target reserve lives at this exchange';
-
-
---
--- Name: COLUMN purse_merges.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.reserve_pub IS 'public key of the target reserve';
-
-
---
--- Name: COLUMN purse_merges.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.purse_pub IS 'public key of the purse';
-
-
---
--- Name: COLUMN purse_merges.merge_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.merge_sig IS 'signature by the purse private key affirming the merge, of type TALER_SIGNATURE_WALLET_PURSE_MERGE';
-
-
---
--- Name: COLUMN purse_merges.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.merge_timestamp IS 'when was the merge message signed';
-
-
---
--- Name: purse_merges_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_merges_default (
-    purse_merge_request_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_sig bytea NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    CONSTRAINT purse_merges_merge_sig_check CHECK ((length(merge_sig) = 64)),
-    CONSTRAINT purse_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-ALTER TABLE ONLY public.purse_merges ATTACH PARTITION public.purse_merges_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_merges_purse_merge_request_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_merges ALTER COLUMN purse_merge_request_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_merges_purse_merge_request_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_requests (
-    purse_requests_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_pub bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    age_limit integer NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    balance_val bigint DEFAULT 0 NOT NULL,
-    balance_frac integer DEFAULT 0 NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT purse_requests_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT purse_requests_merge_pub_check CHECK ((length(merge_pub) = 32)),
-    CONSTRAINT purse_requests_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_requests_purse_sig_check CHECK ((length(purse_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_requests IS 'Requests establishing purses, associating them with a contract but without a target reserve';
-
-
---
--- Name: COLUMN purse_requests.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN purse_requests.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_expiration IS 'When the purse is set to expire';
-
-
---
--- Name: COLUMN purse_requests.h_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.h_contract_terms IS 'Hash of the contract the parties are to agree to';
-
-
---
--- Name: COLUMN purse_requests.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.amount_with_fee_val IS 'Total amount expected to be in the purse';
-
-
---
--- Name: COLUMN purse_requests.balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.balance_val IS 'Total amount actually in the purse';
-
-
---
--- Name: COLUMN purse_requests.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_sig IS 'Signature of the purse affirming the purse parameters, of type TALER_SIGNATURE_PURSE_REQUEST';
-
-
---
--- Name: purse_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_requests_default (
-    purse_requests_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_pub bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    age_limit integer NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    balance_val bigint DEFAULT 0 NOT NULL,
-    balance_frac integer DEFAULT 0 NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT purse_requests_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT purse_requests_merge_pub_check CHECK ((length(merge_pub) = 32)),
-    CONSTRAINT purse_requests_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_requests_purse_sig_check CHECK ((length(purse_sig) = 64))
-);
-ALTER TABLE ONLY public.purse_requests ATTACH PARTITION public.purse_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_requests_purse_requests_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_requests ALTER COLUMN purse_requests_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_requests_purse_requests_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: recoup; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup (
-    recoup_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    reserve_out_serial_id bigint NOT NULL,
-    CONSTRAINT recoup_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_coin_sig_check CHECK ((length(coin_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE recoup; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup IS 'Information about recoups that were executed between a coin and a reserve. In this type of recoup, the amount is credited back to the reserve from which the coin originated.';
-
-
---
--- Name: COLUMN recoup.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_pub IS 'Coin that is being debited in the recoup. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-
-
---
--- Name: COLUMN recoup.coin_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_sig IS 'Signature by the coin affirming the recoup, of type TALER_SIGNATURE_WALLET_COIN_RECOUP';
-
-
---
--- Name: COLUMN recoup.coin_blind; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_blind IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the withdraw operation.';
-
-
---
--- Name: COLUMN recoup.reserve_out_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.reserve_out_serial_id IS 'Identifies the h_blind_ev of the recouped coin and provides the link to the credited reserve.';
-
-
---
--- Name: recoup_by_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_by_reserve (
-    reserve_out_serial_id bigint NOT NULL,
-    coin_pub bytea,
-    CONSTRAINT recoup_by_reserve_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY HASH (reserve_out_serial_id);
-
-
---
--- Name: TABLE recoup_by_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup_by_reserve IS 'Information in this table is strictly redundant with that of recoup, but saved by a different primary key for fast lookups by reserve_out_serial_id.';
-
-
---
--- Name: recoup_by_reserve_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_by_reserve_default (
-    reserve_out_serial_id bigint NOT NULL,
-    coin_pub bytea,
-    CONSTRAINT recoup_by_reserve_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.recoup_by_reserve ATTACH PARTITION public.recoup_by_reserve_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_default (
-    recoup_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    reserve_out_serial_id bigint NOT NULL,
-    CONSTRAINT recoup_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_coin_sig_check CHECK ((length(coin_sig) = 64))
-);
-ALTER TABLE ONLY public.recoup ATTACH PARTITION public.recoup_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_recoup_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.recoup ALTER COLUMN recoup_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.recoup_recoup_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: recoup_refresh; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_refresh (
-    recoup_refresh_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    rrc_serial bigint NOT NULL,
-    CONSTRAINT recoup_refresh_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_refresh_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_refresh_coin_sig_check CHECK ((length(coin_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE recoup_refresh; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup_refresh IS 'Table of coins that originated from a refresh operation and that were recouped. Links the (fresh) coin to the melted operation (and thus the old coin). A recoup on a refreshed coin credits the old coin and debits the fresh coin.';
-
-
---
--- Name: COLUMN recoup_refresh.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.coin_pub IS 'Refreshed coin of a revoked denomination where the residual value is credited to the old coin. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-
-
---
--- Name: COLUMN recoup_refresh.known_coin_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.known_coin_id IS 'FIXME: (To be) used for garbage collection (in the future)';
-
-
---
--- Name: COLUMN recoup_refresh.coin_blind; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.coin_blind IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the refresh operation.';
-
-
---
--- Name: COLUMN recoup_refresh.rrc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.rrc_serial IS 'Link to the refresh operation. Also identifies the h_blind_ev of the recouped coin (as h_coin_ev).';
-
-
---
--- Name: recoup_refresh_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_refresh_default (
-    recoup_refresh_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    rrc_serial bigint NOT NULL,
-    CONSTRAINT recoup_refresh_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_refresh_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_refresh_coin_sig_check CHECK ((length(coin_sig) = 64))
-);
-ALTER TABLE ONLY public.recoup_refresh ATTACH PARTITION public.recoup_refresh_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_refresh_recoup_refresh_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.recoup_refresh ALTER COLUMN recoup_refresh_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.recoup_refresh_recoup_refresh_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_commitments; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_commitments (
-    melt_serial_id bigint NOT NULL,
-    rc bytea NOT NULL,
-    old_coin_pub bytea NOT NULL,
-    old_coin_sig bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    noreveal_index integer NOT NULL,
-    CONSTRAINT refresh_commitments_old_coin_sig_check CHECK ((length(old_coin_sig) = 64)),
-    CONSTRAINT refresh_commitments_rc_check CHECK ((length(rc) = 64))
-)
-PARTITION BY HASH (rc);
-
-
---
--- Name: TABLE refresh_commitments; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_commitments IS 'Commitments made when melting coins and the gamma value chosen by the exchange.';
-
-
---
--- Name: COLUMN refresh_commitments.rc; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.rc IS 'Commitment made by the client, hash over the various client inputs in the cut-and-choose protocol';
-
-
---
--- Name: COLUMN refresh_commitments.old_coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.old_coin_pub IS 'Coin being melted in the refresh process.';
-
-
---
--- Name: COLUMN refresh_commitments.noreveal_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.noreveal_index IS 'The gamma value chosen by the exchange in the cut-and-choose protocol';
-
-
---
--- Name: refresh_commitments_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_commitments_default (
-    melt_serial_id bigint NOT NULL,
-    rc bytea NOT NULL,
-    old_coin_pub bytea NOT NULL,
-    old_coin_sig bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    noreveal_index integer NOT NULL,
-    CONSTRAINT refresh_commitments_old_coin_sig_check CHECK ((length(old_coin_sig) = 64)),
-    CONSTRAINT refresh_commitments_rc_check CHECK ((length(rc) = 64))
-);
-ALTER TABLE ONLY public.refresh_commitments ATTACH PARTITION public.refresh_commitments_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_commitments_melt_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_commitments ALTER COLUMN melt_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_commitments_melt_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_revealed_coins; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_revealed_coins (
-    rrc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    freshcoin_index integer NOT NULL,
-    link_sig bytea NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_ev bytea NOT NULL,
-    h_coin_ev bytea NOT NULL,
-    ev_sig bytea NOT NULL,
-    ewv bytea NOT NULL,
-    CONSTRAINT refresh_revealed_coins_h_coin_ev_check CHECK ((length(h_coin_ev) = 64)),
-    CONSTRAINT refresh_revealed_coins_link_sig_check CHECK ((length(link_sig) = 64))
-)
-PARTITION BY HASH (melt_serial_id);
-
-
---
--- Name: TABLE refresh_revealed_coins; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_revealed_coins IS 'Revelations about the new coins that are to be created during a melting session.';
-
-
---
--- Name: COLUMN refresh_revealed_coins.rrc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.rrc_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN refresh_revealed_coins.melt_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.melt_serial_id IS 'Identifies the refresh commitment (rc) of the melt operation.';
-
-
---
--- Name: COLUMN refresh_revealed_coins.freshcoin_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.freshcoin_index IS 'index of the fresh coin being created (one melt operation may result in multiple fresh coins)';
-
-
---
--- Name: COLUMN refresh_revealed_coins.coin_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.coin_ev IS 'envelope of the new coin to be signed';
-
-
---
--- Name: COLUMN refresh_revealed_coins.h_coin_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.h_coin_ev IS 'hash of the envelope of the new coin to be signed (for lookups)';
-
-
---
--- Name: COLUMN refresh_revealed_coins.ev_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.ev_sig IS 'exchange signature over the envelope';
-
-
---
--- Name: COLUMN refresh_revealed_coins.ewv; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.ewv IS 'exchange contributed values in the creation of the fresh coin (see /csr)';
-
-
---
--- Name: refresh_revealed_coins_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_revealed_coins_default (
-    rrc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    freshcoin_index integer NOT NULL,
-    link_sig bytea NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_ev bytea NOT NULL,
-    h_coin_ev bytea NOT NULL,
-    ev_sig bytea NOT NULL,
-    ewv bytea NOT NULL,
-    CONSTRAINT refresh_revealed_coins_h_coin_ev_check CHECK ((length(h_coin_ev) = 64)),
-    CONSTRAINT refresh_revealed_coins_link_sig_check CHECK ((length(link_sig) = 64))
-);
-ALTER TABLE ONLY public.refresh_revealed_coins ATTACH PARTITION public.refresh_revealed_coins_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_revealed_coins_rrc_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_revealed_coins ALTER COLUMN rrc_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_revealed_coins_rrc_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_transfer_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_transfer_keys (
-    rtc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    transfer_pub bytea NOT NULL,
-    transfer_privs bytea NOT NULL,
-    CONSTRAINT refresh_transfer_keys_transfer_pub_check CHECK ((length(transfer_pub) = 32))
-)
-PARTITION BY HASH (melt_serial_id);
-
-
---
--- Name: TABLE refresh_transfer_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_transfer_keys IS 'Transfer keys of a refresh operation (the data revealed to the exchange).';
-
-
---
--- Name: COLUMN refresh_transfer_keys.rtc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.rtc_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN refresh_transfer_keys.melt_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.melt_serial_id IS 'Identifies the refresh commitment (rc) of the operation.';
-
-
---
--- Name: COLUMN refresh_transfer_keys.transfer_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.transfer_pub IS 'transfer public key for the gamma index';
-
-
---
--- Name: COLUMN refresh_transfer_keys.transfer_privs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.transfer_privs IS 'array of TALER_CNC_KAPPA - 1 transfer private keys that have been revealed, with the gamma entry being skipped';
-
-
---
--- Name: refresh_transfer_keys_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_transfer_keys_default (
-    rtc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    transfer_pub bytea NOT NULL,
-    transfer_privs bytea NOT NULL,
-    CONSTRAINT refresh_transfer_keys_transfer_pub_check CHECK ((length(transfer_pub) = 32))
-);
-ALTER TABLE ONLY public.refresh_transfer_keys ATTACH PARTITION public.refresh_transfer_keys_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_transfer_keys_rtc_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_transfer_keys ALTER COLUMN rtc_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_transfer_keys_rtc_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refunds; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refunds (
-    refund_serial_id bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    merchant_sig bytea NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT refunds_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT refunds_merchant_sig_check CHECK ((length(merchant_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE refunds; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refunds IS 'Data on coins that were refunded. Technically, refunds always apply against specific deposit operations involving a coin. The combination of coin_pub, merchant_pub, h_contract_terms and rtransaction_id MUST be unique, and we usually select by coin_pub so that one goes first.';
-
-
---
--- Name: COLUMN refunds.deposit_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refunds.deposit_serial_id IS 'Identifies ONLY the merchant_pub, h_contract_terms and coin_pub. Multiple deposits may match a refund, this only identifies one of them.';
-
-
---
--- Name: COLUMN refunds.rtransaction_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refunds.rtransaction_id IS 'used by the merchant to make refunds unique in case the same coin for the same deposit gets a subsequent (higher) refund';
-
-
---
--- Name: refunds_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refunds_default (
-    refund_serial_id bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    merchant_sig bytea NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT refunds_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT refunds_merchant_sig_check CHECK ((length(merchant_sig) = 64))
-);
-ALTER TABLE ONLY public.refunds ATTACH PARTITION public.refunds_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refunds_refund_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refunds ALTER COLUMN refund_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refunds_refund_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves (
-    reserve_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    current_balance_val bigint NOT NULL,
-    current_balance_frac integer NOT NULL,
-    purses_active bigint DEFAULT 0 NOT NULL,
-    purses_allowed bigint DEFAULT 0 NOT NULL,
-    kyc_required boolean DEFAULT false NOT NULL,
-    kyc_passed boolean DEFAULT false NOT NULL,
-    expiration_date bigint NOT NULL,
-    gc_date bigint NOT NULL,
-    CONSTRAINT reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves IS 'Summarizes the balance of a reserve. Updated when new funds are added or withdrawn.';
-
-
---
--- Name: COLUMN reserves.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.reserve_pub IS 'EdDSA public key of the reserve. Knowledge of the private key implies ownership over the balance.';
-
-
---
--- Name: COLUMN reserves.current_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.current_balance_val IS 'Current balance remaining with the reserve.';
-
-
---
--- Name: COLUMN reserves.purses_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.purses_active IS 'Number of purses that were created by this reserve that are not expired and not fully paid.';
-
-
---
--- Name: COLUMN reserves.purses_allowed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.purses_allowed IS 'Number of purses that this reserve is allowed to have active at most.';
-
-
---
--- Name: COLUMN reserves.kyc_required; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.kyc_required IS 'True if a KYC check must have been passed before withdrawing from this reserve. Set to true once a reserve received a P2P payment.';
-
-
---
--- Name: COLUMN reserves.kyc_passed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.kyc_passed IS 'True once KYC was passed for this reserve. The KYC details are then available via the wire_targets table under the key of wire_target_h_payto which is to be derived from the reserve_pub and the base URL of this exchange.';
-
-
---
--- Name: COLUMN reserves.expiration_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.expiration_date IS 'Used to trigger closing of reserves that have not been drained after some time';
-
-
---
--- Name: COLUMN reserves.gc_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.gc_date IS 'Used to forget all information about a reserve during garbage collection';
-
-
---
--- Name: reserves_close; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_close (
-    close_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid bytea NOT NULL,
-    wire_target_h_payto bytea,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_close_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT reserves_close_wtid_check CHECK ((length(wtid) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves_close; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_close IS 'wire transfers executed by the reserve to close reserves';
-
-
---
--- Name: COLUMN reserves_close.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_close.wire_target_h_payto IS 'Identifies the credited bank account (and KYC status). Note that closing does not depend on KYC.';
-
-
---
--- Name: reserves_close_close_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_close ALTER COLUMN close_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_close_close_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_close_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_close_default (
-    close_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid bytea NOT NULL,
-    wire_target_h_payto bytea,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_close_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT reserves_close_wtid_check CHECK ((length(wtid) = 32))
-);
-ALTER TABLE ONLY public.reserves_close ATTACH PARTITION public.reserves_close_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_default (
-    reserve_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    current_balance_val bigint NOT NULL,
-    current_balance_frac integer NOT NULL,
-    purses_active bigint DEFAULT 0 NOT NULL,
-    purses_allowed bigint DEFAULT 0 NOT NULL,
-    kyc_required boolean DEFAULT false NOT NULL,
-    kyc_passed boolean DEFAULT false NOT NULL,
-    expiration_date bigint NOT NULL,
-    gc_date bigint NOT NULL,
-    CONSTRAINT reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-ALTER TABLE ONLY public.reserves ATTACH PARTITION public.reserves_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_in; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_in (
-    reserve_in_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    wire_reference bigint NOT NULL,
-    credit_val bigint NOT NULL,
-    credit_frac integer NOT NULL,
-    wire_source_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    execution_date bigint NOT NULL,
-    CONSTRAINT reserves_in_wire_source_h_payto_check CHECK ((length(wire_source_h_payto) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves_in; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_in IS 'list of transfers of funds into the reserves, one per incoming wire transfer';
-
-
---
--- Name: COLUMN reserves_in.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.reserve_pub IS 'Public key of the reserve. Private key signifies ownership of the remaining balance.';
-
-
---
--- Name: COLUMN reserves_in.credit_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.credit_val IS 'Amount that was transferred into the reserve';
-
-
---
--- Name: COLUMN reserves_in.wire_source_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.wire_source_h_payto IS 'Identifies the debited bank account and KYC status';
-
-
---
--- Name: reserves_in_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_in_default (
-    reserve_in_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    wire_reference bigint NOT NULL,
-    credit_val bigint NOT NULL,
-    credit_frac integer NOT NULL,
-    wire_source_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    execution_date bigint NOT NULL,
-    CONSTRAINT reserves_in_wire_source_h_payto_check CHECK ((length(wire_source_h_payto) = 32))
-);
-ALTER TABLE ONLY public.reserves_in ATTACH PARTITION public.reserves_in_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_in_reserve_in_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_in ALTER COLUMN reserve_in_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_in_reserve_in_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out (
-    reserve_out_serial_id bigint NOT NULL,
-    h_blind_ev bytea,
-    denominations_serial bigint NOT NULL,
-    denom_sig bytea NOT NULL,
-    reserve_uuid bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_out_h_blind_ev_check CHECK ((length(h_blind_ev) = 64)),
-    CONSTRAINT reserves_out_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (h_blind_ev);
-
-
---
--- Name: TABLE reserves_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_out IS 'Withdraw operations performed on reserves.';
-
-
---
--- Name: COLUMN reserves_out.h_blind_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.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).';
-
-
---
--- Name: COLUMN reserves_out.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_out.denominations_serial IS 'We do not CASCADE ON DELETE here, we may keep the denomination data alive';
-
-
---
--- Name: reserves_out_by_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_by_reserve (
-    reserve_uuid bigint NOT NULL,
-    h_blind_ev bytea,
-    CONSTRAINT reserves_out_by_reserve_h_blind_ev_check CHECK ((length(h_blind_ev) = 64))
-)
-PARTITION BY HASH (reserve_uuid);
-
-
---
--- Name: TABLE reserves_out_by_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_out_by_reserve IS 'Information in this table is strictly redundant with that of reserves_out, but saved by a different primary key for fast lookups by reserve public key/uuid.';
-
-
---
--- Name: reserves_out_by_reserve_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_by_reserve_default (
-    reserve_uuid bigint NOT NULL,
-    h_blind_ev bytea,
-    CONSTRAINT reserves_out_by_reserve_h_blind_ev_check CHECK ((length(h_blind_ev) = 64))
-);
-ALTER TABLE ONLY public.reserves_out_by_reserve ATTACH PARTITION public.reserves_out_by_reserve_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_default (
-    reserve_out_serial_id bigint NOT NULL,
-    h_blind_ev bytea,
-    denominations_serial bigint NOT NULL,
-    denom_sig bytea NOT NULL,
-    reserve_uuid bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_out_h_blind_ev_check CHECK ((length(h_blind_ev) = 64)),
-    CONSTRAINT reserves_out_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.reserves_out ATTACH PARTITION public.reserves_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_out_reserve_out_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_out ALTER COLUMN reserve_out_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_out_reserve_out_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_reserve_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves ALTER COLUMN reserve_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_reserve_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: revolving_work_shards; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE UNLOGGED TABLE public.revolving_work_shards (
-    shard_serial_id bigint NOT NULL,
-    last_attempt bigint NOT NULL,
-    start_row integer NOT NULL,
-    end_row integer NOT NULL,
-    active boolean DEFAULT false NOT NULL,
-    job_name character varying NOT NULL
-);
-
-
---
--- Name: TABLE revolving_work_shards; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.revolving_work_shards IS 'coordinates work between multiple processes working on the same job with partitions that need to be repeatedly processed; unlogged because on system crashes the locks represented by this table will have to be cleared anyway, typically using "taler-exchange-dbinit -s"';
-
-
---
--- Name: COLUMN revolving_work_shards.shard_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.shard_serial_id IS 'unique serial number identifying the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.last_attempt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.last_attempt IS 'last time a worker attempted to work on the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.start_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.start_row IS 'row at which the shard scope starts, inclusive';
-
-
---
--- Name: COLUMN revolving_work_shards.end_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.end_row IS 'row at which the shard scope ends, exclusive';
-
-
---
--- Name: COLUMN revolving_work_shards.active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.active IS 'set to TRUE when a worker is active on the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.job_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.job_name IS 'unique name of the job the workers on this shard are performing';
-
-
---
--- Name: revolving_work_shards_shard_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.revolving_work_shards ALTER COLUMN shard_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.revolving_work_shards_shard_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: signkey_revocations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.signkey_revocations (
-    signkey_revocations_serial_id bigint NOT NULL,
-    esk_serial bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT signkey_revocations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE signkey_revocations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.signkey_revocations IS 'Table storing which online signing keys have been revoked';
-
-
---
--- Name: signkey_revocations_signkey_revocations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.signkey_revocations ALTER COLUMN signkey_revocations_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.signkey_revocations_signkey_revocations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wad_in_entries; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_in_entries (
-    wad_in_entry_serial_id bigint NOT NULL,
-    wad_in_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_in_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_in_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_in_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_in_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_in_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE wad_in_entries; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wad_in_entries IS 'list of purses aggregated in a wad according to the sending exchange';
-
-
---
--- Name: COLUMN wad_in_entries.wad_in_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.wad_in_serial_id IS 'wad for which the given purse was included in the aggregation';
-
-
---
--- Name: COLUMN wad_in_entries.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.reserve_pub IS 'target account of the purse (must be at the local exchange)';
-
-
---
--- Name: COLUMN wad_in_entries.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_pub IS 'public key of the purse that was merged';
-
-
---
--- Name: COLUMN wad_in_entries.h_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.h_contract IS 'hash of the contract terms of the purse';
-
-
---
--- Name: COLUMN wad_in_entries.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_expiration IS 'Time when the purse was set to expire';
-
-
---
--- Name: COLUMN wad_in_entries.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.merge_timestamp IS 'Time when the merge was approved';
-
-
---
--- Name: COLUMN wad_in_entries.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.amount_with_fee_val IS 'Total amount in the purse';
-
-
---
--- Name: COLUMN wad_in_entries.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.wad_fee_val IS 'Total wad fees paid by the purse';
-
-
---
--- Name: COLUMN wad_in_entries.deposit_fees_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.deposit_fees_val IS 'Total deposit fees paid when depositing coins into the purse';
-
-
---
--- Name: COLUMN wad_in_entries.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.reserve_sig IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN wad_in_entries.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_sig IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-
---
--- Name: wad_in_entries_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_in_entries_default (
-    wad_in_entry_serial_id bigint NOT NULL,
-    wad_in_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_in_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_in_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_in_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_in_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_in_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.wad_in_entries ATTACH PARTITION public.wad_in_entries_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wad_in_entries_wad_in_entry_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wad_in_entries ALTER COLUMN wad_in_entry_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wad_in_entries_wad_in_entry_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wad_out_entries; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_out_entries (
-    wad_out_entry_serial_id bigint NOT NULL,
-    wad_out_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_out_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_out_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_out_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_out_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_out_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE wad_out_entries; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wad_out_entries IS 'Purses combined into a wad';
-
-
---
--- Name: COLUMN wad_out_entries.wad_out_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.wad_out_serial_id IS 'Wad the purse was part of';
-
-
---
--- Name: COLUMN wad_out_entries.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.reserve_pub IS 'Target reserve for the purse';
-
-
---
--- Name: COLUMN wad_out_entries.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN wad_out_entries.h_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.h_contract IS 'Hash of the contract associated with the purse';
-
-
---
--- Name: COLUMN wad_out_entries.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_expiration IS 'Time when the purse expires';
-
-
---
--- Name: COLUMN wad_out_entries.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.merge_timestamp IS 'Time when the merge was approved';
-
-
---
--- Name: COLUMN wad_out_entries.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.amount_with_fee_val IS 'Total amount in the purse';
-
-
---
--- Name: COLUMN wad_out_entries.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.wad_fee_val IS 'Wat fee charged to the purse';
-
-
---
--- Name: COLUMN wad_out_entries.deposit_fees_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.deposit_fees_val IS 'Total deposit fees charged to the purse';
-
-
---
--- Name: COLUMN wad_out_entries.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.reserve_sig IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN wad_out_entries.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_sig IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-
---
--- Name: wad_out_entries_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_out_entries_default (
-    wad_out_entry_serial_id bigint NOT NULL,
-    wad_out_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_out_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_out_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_out_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_out_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_out_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.wad_out_entries ATTACH PARTITION public.wad_out_entries_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wad_out_entries_wad_out_entry_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wad_out_entries ALTER COLUMN wad_out_entry_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wad_out_entries_wad_out_entry_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wads_in; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_in (
-    wad_in_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    origin_exchange_url text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    arrival_time bigint NOT NULL,
-    CONSTRAINT wads_in_wad_id_check CHECK ((length(wad_id) = 24))
-)
-PARTITION BY HASH (wad_id);
-
-
---
--- Name: TABLE wads_in; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wads_in IS 'Incoming exchange-to-exchange wad wire transfers';
-
-
---
--- Name: COLUMN wads_in.wad_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.wad_id IS 'Unique identifier of the wad, part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_in.origin_exchange_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.origin_exchange_url IS 'Base URL of the originating URL, also part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_in.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.amount_val IS 'Actual amount that was received by our exchange';
-
-
---
--- Name: COLUMN wads_in.arrival_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.arrival_time IS 'Time when the wad was received';
-
-
---
--- Name: wads_in_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_in_default (
-    wad_in_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    origin_exchange_url text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    arrival_time bigint NOT NULL,
-    CONSTRAINT wads_in_wad_id_check CHECK ((length(wad_id) = 24))
-);
-ALTER TABLE ONLY public.wads_in ATTACH PARTITION public.wads_in_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wads_in_wad_in_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wads_in ALTER COLUMN wad_in_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wads_in_wad_in_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wads_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_out (
-    wad_out_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    partner_serial_id bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    CONSTRAINT wads_out_wad_id_check CHECK ((length(wad_id) = 24))
-)
-PARTITION BY HASH (wad_id);
-
-
---
--- Name: TABLE wads_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wads_out IS 'Wire transfers made to another exchange to transfer purse funds';
-
-
---
--- Name: COLUMN wads_out.wad_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.wad_id IS 'Unique identifier of the wad, part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_out.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.partner_serial_id IS 'target exchange of the wad';
-
-
---
--- Name: COLUMN wads_out.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.amount_val IS 'Amount that was wired';
-
-
---
--- Name: COLUMN wads_out.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.execution_time IS 'Time when the wire transfer was scheduled';
-
-
---
--- Name: wads_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_out_default (
-    wad_out_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    partner_serial_id bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    CONSTRAINT wads_out_wad_id_check CHECK ((length(wad_id) = 24))
-);
-ALTER TABLE ONLY public.wads_out ATTACH PARTITION public.wads_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wads_out_wad_out_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wads_out ALTER COLUMN wad_out_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wads_out_wad_out_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_accounts (
-    payto_uri character varying NOT NULL,
-    master_sig bytea,
-    is_active boolean NOT NULL,
-    last_change bigint NOT NULL,
-    CONSTRAINT wire_accounts_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE wire_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_accounts IS 'Table with current and historic bank accounts of the exchange. Entries never expire as we need to remember the last_change column indefinitely.';
-
-
---
--- Name: COLUMN wire_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.payto_uri IS 'payto URI (RFC 8905) with the bank account of the exchange.';
-
-
---
--- Name: COLUMN wire_accounts.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.master_sig IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS';
-
-
---
--- Name: COLUMN wire_accounts.is_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.is_active IS 'true if we are currently supporting the use of this account.';
-
-
---
--- Name: COLUMN wire_accounts.last_change; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.last_change IS 'Latest time when active status changed. Used to detect replays of old messages.';
-
-
---
--- Name: wire_auditor_account_progress; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_auditor_account_progress (
-    master_pub bytea NOT NULL,
-    account_name text NOT NULL,
-    last_wire_reserve_in_serial_id bigint DEFAULT 0 NOT NULL,
-    last_wire_wire_out_serial_id bigint DEFAULT 0 NOT NULL,
-    wire_in_off bigint NOT NULL,
-    wire_out_off bigint NOT NULL
-);
-
-
---
--- Name: TABLE wire_auditor_account_progress; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_auditor_account_progress IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: wire_auditor_progress; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_auditor_progress (
-    master_pub bytea NOT NULL,
-    last_timestamp bigint NOT NULL,
-    last_reserve_close_uuid bigint NOT NULL
-);
-
-
---
--- Name: wire_fee; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_fee (
-    wire_fee_serial bigint NOT NULL,
-    wire_method character varying NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT wire_fee_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE wire_fee; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_fee IS 'list of the wire fees of this exchange, by date';
-
-
---
--- Name: COLUMN wire_fee.wire_fee_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_fee.wire_fee_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: wire_fee_wire_fee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_fee ALTER COLUMN wire_fee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_fee_wire_fee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_out (
-    wireout_uuid bigint NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid_raw bytea NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT wire_out_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT wire_out_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-)
-PARTITION BY HASH (wtid_raw);
-
-
---
--- Name: TABLE wire_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_out IS 'wire transfers the exchange has executed';
-
-
---
--- Name: COLUMN wire_out.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_out.wire_target_h_payto IS 'Identifies the credited bank account and KYC status';
-
-
---
--- Name: COLUMN wire_out.exchange_account_section; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_out.exchange_account_section IS 'identifies the configuration section with the debit account of this payment';
-
-
---
--- Name: wire_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_out_default (
-    wireout_uuid bigint NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid_raw bytea NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT wire_out_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT wire_out_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-);
-ALTER TABLE ONLY public.wire_out ATTACH PARTITION public.wire_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wire_out_wireout_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_out ALTER COLUMN wireout_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_out_wireout_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_targets; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_targets (
-    wire_target_serial_id bigint NOT NULL,
-    wire_target_h_payto bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    external_id character varying,
-    CONSTRAINT wire_targets_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-)
-PARTITION BY HASH (wire_target_h_payto);
-
-
---
--- Name: TABLE wire_targets; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_targets IS 'All senders and recipients of money via the exchange';
-
-
---
--- Name: COLUMN wire_targets.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.wire_target_h_payto IS 'Unsalted hash of payto_uri';
-
-
---
--- Name: COLUMN wire_targets.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.payto_uri IS 'Can be a regular bank account, or also be a URI identifying a reserve-account (for P2P payments)';
-
-
---
--- Name: COLUMN wire_targets.kyc_ok; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.kyc_ok IS 'true if the KYC check was passed successfully';
-
-
---
--- Name: COLUMN wire_targets.external_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.external_id IS 'Name of the user that was used for OAuth 2.0-based legitimization';
-
-
---
--- Name: wire_targets_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_targets_default (
-    wire_target_serial_id bigint NOT NULL,
-    wire_target_h_payto bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    external_id character varying,
-    CONSTRAINT wire_targets_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-);
-ALTER TABLE ONLY public.wire_targets ATTACH PARTITION public.wire_targets_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wire_targets_wire_target_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_targets ALTER COLUMN wire_target_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_targets_wire_target_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: work_shards; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.work_shards (
-    shard_serial_id bigint NOT NULL,
-    last_attempt bigint NOT NULL,
-    start_row bigint NOT NULL,
-    end_row bigint NOT NULL,
-    completed boolean DEFAULT false NOT NULL,
-    job_name character varying NOT NULL
-);
-
-
---
--- Name: TABLE work_shards; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.work_shards IS 'coordinates work between multiple processes working on the same job';
-
-
---
--- Name: COLUMN work_shards.shard_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.shard_serial_id IS 'unique serial number identifying the shard';
-
-
---
--- Name: COLUMN work_shards.last_attempt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.last_attempt IS 'last time a worker attempted to work on the shard';
-
-
---
--- Name: COLUMN work_shards.start_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.start_row IS 'row at which the shard scope starts, inclusive';
-
-
---
--- Name: COLUMN work_shards.end_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.end_row IS 'row at which the shard scope ends, exclusive';
-
-
---
--- Name: COLUMN work_shards.completed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.completed IS 'set to TRUE once the shard is finished by a worker';
-
-
---
--- Name: COLUMN work_shards.job_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.job_name IS 'unique name of the job the workers on this shard are performing';
-
-
---
--- Name: work_shards_shard_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.work_shards ALTER COLUMN shard_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.work_shards_shard_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: app_bankaccount account_no; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount ALTER COLUMN account_no SET DEFAULT nextval('public.app_bankaccount_account_no_seq'::regclass);
-
-
---
--- Name: app_banktransaction id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction ALTER COLUMN id SET DEFAULT nextval('public.app_banktransaction_id_seq'::regclass);
-
-
---
--- Name: auditor_reserves auditor_reserves_rowid; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves ALTER COLUMN auditor_reserves_rowid SET DEFAULT nextval('public.auditor_reserves_auditor_reserves_rowid_seq'::regclass);
-
-
---
--- Name: auth_group id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group ALTER COLUMN id SET DEFAULT nextval('public.auth_group_id_seq'::regclass);
-
-
---
--- Name: auth_group_permissions id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions ALTER COLUMN id SET DEFAULT nextval('public.auth_group_permissions_id_seq'::regclass);
-
-
---
--- Name: auth_permission id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission ALTER COLUMN id SET DEFAULT nextval('public.auth_permission_id_seq'::regclass);
-
-
---
--- Name: auth_user id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user ALTER COLUMN id SET DEFAULT nextval('public.auth_user_id_seq'::regclass);
-
-
---
--- Name: auth_user_groups id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups ALTER COLUMN id SET DEFAULT nextval('public.auth_user_groups_id_seq'::regclass);
-
-
---
--- Name: auth_user_user_permissions id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions ALTER COLUMN id SET DEFAULT nextval('public.auth_user_user_permissions_id_seq'::regclass);
-
-
---
--- Name: deposit_confirmations serial_id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations ALTER COLUMN serial_id SET DEFAULT nextval('public.deposit_confirmations_serial_id_seq'::regclass);
-
-
---
--- Name: django_content_type id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type ALTER COLUMN id SET DEFAULT nextval('public.django_content_type_id_seq'::regclass);
-
-
---
--- Name: django_migrations id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_migrations ALTER COLUMN id SET DEFAULT nextval('public.django_migrations_id_seq'::regclass);
-
-
---
--- Data for Name: patches; Type: TABLE DATA; Schema: _v; Owner: -
---
-
-COPY _v.patches (patch_name, applied_tsz, applied_by, requires, conflicts) FROM stdin;
-exchange-0001	2022-05-02 20:31:57.856832+02	grothoff	{}	{}
-merchant-0001	2022-05-02 20:31:58.689509+02	grothoff	{}	{}
-auditor-0001	2022-05-02 20:31:59.197067+02	grothoff	{}	{}
-\.
-
-
---
--- Data for Name: account_merges_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.account_merges_default (account_merge_request_serial_id, reserve_pub, reserve_sig, purse_pub) FROM stdin;
-\.
-
-
---
--- Data for Name: aggregation_tracking_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.aggregation_tracking_default (aggregation_serial_id, deposit_serial_id, wtid_raw) FROM stdin;
-\.
-
-
---
--- Data for Name: aggregation_transient_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.aggregation_transient_default (amount_val, amount_frac, wire_target_h_payto, exchange_account_section, wtid_raw) FROM stdin;
-\.
-
-
---
--- Data for Name: app_bankaccount; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_bankaccount (is_public, account_no, balance, user_id) FROM stdin;
-t	3	+TESTKUDOS:0	3
-t	4	+TESTKUDOS:0	4
-t	5	+TESTKUDOS:0	5
-t	6	+TESTKUDOS:0	6
-t	7	+TESTKUDOS:0	7
-t	8	+TESTKUDOS:0	8
-t	9	+TESTKUDOS:0	9
-f	10	+TESTKUDOS:0	10
-f	11	+TESTKUDOS:0	11
-f	12	+TESTKUDOS:90	12
-t	1	-TESTKUDOS:200	1
-f	13	+TESTKUDOS:82	13
-t	2	+TESTKUDOS:28	2
-\.
-
-
---
--- Data for Name: app_banktransaction; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_banktransaction (id, amount, subject, date, cancelled, request_uid, credit_account_id, debit_account_id) FROM stdin;
-1	TESTKUDOS:100	Joining bonus	2022-05-02 20:32:08.901914+02	f	50d22041-64ce-4fc3-b2e2-572fe211f025	12	1
-2	TESTKUDOS:10	HFY3XJR5XH19TBKJ22ZMGHDVCQD1Z8A9DPRD9SDTB6PRD9KX96TG	2022-05-02 20:32:12.354897+02	f	0240d38f-c322-471e-b850-deb57e1b2391	2	12
-3	TESTKUDOS:100	Joining bonus	2022-05-02 20:32:19.074017+02	f	26e0c18e-5531-4e80-ac29-74187d58f57f	13	1
-4	TESTKUDOS:18	D4ANTKNHAJ99EKAHYB9VKFMKS7BRCFFK3XA662YPTEBG8K5WVY70	2022-05-02 20:32:19.767664+02	f	755ad4dc-948a-47fa-ae74-54806385660b	2	13
-\.
-
-
---
--- Data for Name: app_talerwithdrawoperation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_talerwithdrawoperation (withdraw_id, amount, selection_done, confirmation_done, aborted, selected_reserve_pub, selected_exchange_account_id, withdraw_account_id) FROM stdin;
-9e47fcb3-2ae6-498f-b2b4-72b7fd4b5eed	TESTKUDOS:10	t	t	f	HFY3XJR5XH19TBKJ22ZMGHDVCQD1Z8A9DPRD9SDTB6PRD9KX96TG	2	12
-ac57842e-cc12-4560-a088-3ab3ef1f0f4a	TESTKUDOS:18	t	t	f	D4ANTKNHAJ99EKAHYB9VKFMKS7BRCFFK3XA662YPTEBG8K5WVY70	2	13
-\.
-
-
---
--- Data for Name: auditor_balance_summary; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_balance_summary (master_pub, denom_balance_val, denom_balance_frac, deposit_fee_balance_val, deposit_fee_balance_frac, melt_fee_balance_val, melt_fee_balance_frac, refund_fee_balance_val, refund_fee_balance_frac, risk_val, risk_frac, loss_val, loss_frac, irregular_recoup_val, irregular_recoup_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_denom_sigs; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_denom_sigs (auditor_denom_serial, auditor_uuid, denominations_serial, auditor_sig) FROM stdin;
-1	1	9	\\x149f68b651c89fa37a4a1c3497d6001eb852d376d957c20efc04bbffc130540f3fb9c9e1de4f2f30962f09f79ab63b0797fd4b327cb7cfd63019a3a3a7d5e101
-2	1	139	\\x594297451bdc316f9f7801c2840f1ae5e99d541ae20c372b7c876761ec1877ad7c3d3fcd962ef2a7bc63069900afd0edb7cdc0f2cea782683760a40792aea10e
-3	1	198	\\xe3700d0f3894e1462b79c066f30432bd21662787497ae392a1016529d1f12d9f81a90ec8e07f3742381c553c03a9f2d01340d491f0595931575bf7e876188804
-4	1	372	\\xbfbaa63a569ea1ded26d36e296ea8df2942df9879773533005e33f3d038c122de3e66631797f6dd6a53b8d13a45fa18035ae760a7a07fe014d2016867764190e
-5	1	209	\\x2a6981ec250dff1dc0076a62046003249b561b1075188d8a3ac764438fcba6a3f4dcb8b82c9d68d241036d3af195de9c534d9b2200bd61fd9adbe0a8d283cc06
-6	1	221	\\x59f385979473c3fcb6ae37b72931deb66f986bfb3287ed2e3d5290edaa036c40f2fbdb5d5e341f350582e81dc2236fbf9ff7f6af2ff82a418afc6e77a9a1a406
-7	1	388	\\xd04d5ee6890dc30727b1a5294b6b64a41f4697e9ab8fdc01f212719a209251e7399566e3170aaf9135a1d9d100999353814df7f6ef9019de318ac4f1c5a64008
-8	1	422	\\x04686c83dd20231165c5c7ee4f18a6c7de5a811bcce5d8805226b45e8af8a98fad7ec6a9ac183418b0fb479657d047cbe04fdc55d268cb5c7c6418f8e86adc0f
-9	1	411	\\x6cecbb9205cda673598d3db01cb4104b3bd46d8dd596509acb3b3782186f7a905c046b5348451930b2f2005262ee34cb11a8d3cb15d65a44d2eab3e485a92701
-10	1	312	\\xcdf3fd8c2b0de883bd0bbd35533f1fe7b9cedd44656f679d50bb649be6e705a31d3b6b8830c77c11dbef226bd75093235532f47ef98748bca439d3281e56af09
-11	1	23	\\x9527d19dc5332df2ff5029795182496b3818da2fcfc9245be3c07ee83890a9380496f13bc3392c3b8621bf2d63c41a12624fe451ebf3fde2a051748c6b0bac0f
-12	1	267	\\xc0549b5eaedd9a978bd45f9b8769e6f39396c9560b7bcc1171dc45807e9f1f75c78f20e09fc7085eb093b428aae9a4703023ee836d8cf13c8928aead2922fc0c
-13	1	299	\\xc732094858c10f02cf61bfa44a9eb2c7de5d9ea81e92259dad0fec392a35a83ebf29ca24b913f1aff7a436644d2112c128789650267feaa8f772da07cc38830c
-14	1	343	\\x435404ad01c5e938a306257d7b4dbc65462a556c6de7d7b3cc3daca2904f6722f55ed36c3927c844db20beecfa268602d5beb70d156ff5b293a3fd54c07b9c0a
-15	1	77	\\x3298842fefbcacad27b61030d2173fadb52878f7b4b091d1dd2f22425ade36ef77cbfc6fd49a59ca5de755975fc89148609ac12b1950dd8a57d2b7cf5a97390d
-16	1	318	\\x7c1bc7b9416e579540f8b602db38c07de454977e0d79190c11b81fd761eddf76d0c0db0a4b4409fc486d45a74361157ee1eae50710d6994a9daf17717ef7aa0a
-17	1	391	\\x2b0a9edb9a903337e29a851f2b4ac2b07e82a358ba4065643aa778c8b7aeb955430aab6555e81e1a3e67e9570fa2fe20916f5503ce87330aee6124f21aa69403
-18	1	348	\\x38b9d783e277f1662d4e49b245abb3e552f015a8be2f59214bb9b5fecb996c09df9644ee5f47981d6e6e6dd3a809c7ac5132d727d6e460b4dec767efd9a4c80d
-19	1	360	\\x3896df088d81c084256982febcdb72eecf61060d9394581742670a554e8c2ab8eb28facd2f4d7354152680598812c6a0ee930a5b4eea6f9e237c0054c900040e
-20	1	34	\\x7aba15f0df2d174ca5b3ce60c13ab22088b142119405c6ac5f29c41cf4131a153787c7366235c552ad5e4191d3f7bb96058aa18971ab3770724fc9fcfc525d0a
-21	1	402	\\xe1664ba87e1a447f1908da2d3df9e188b9e0cd77cb041a33d88c23578a8102ef8ab6779bec68ef2b603e116d16d245c96e1d5577cf7d3b8fb38ac8c5d87b8500
-22	1	114	\\x22be2a0e3d15e05152e72826891243a5979b76a305698edcd834ca81e7e6562ef665b2cd5a08b41656d1887014d310834bbe96e5c01a08957d23a35e62adeb01
-23	1	287	\\x3d47a3b3948619db10f0eaa198a66d84d0c2db1e49376b48a6a6b0b94cb58abda478127fbec65b7e311dc348749d6efca074c2b01f8156437fb594a022797e0b
-24	1	413	\\x1a14c6ff3d709db89c31b1b4eeaf540d36eb229d4e364f1810e0bd25528f875a67ed5127020d4a4fcb722eee3195f4b550c53335351741b7d76205d068b40e07
-25	1	334	\\x8083994ea17bf385be258e38b6ee280dc154655c452a6ba24d453c1c1c7704a98015d938ced0ff40f1bb4cc1b10ee45b2fb3ec33bc66962ec6860fd5ae9a4b0a
-26	1	335	\\x2c3433aff168fae806af742d9b253af9ee1c2ed5600b50d8ff93d47a872c8dc352173b210098ce839b722e0aa9d3adfa1d31fb9ce6f5ce98c945e72b7cf3fa0c
-27	1	346	\\x49727fcdc441417e919cafd584a1e304a0478cea2e73fc6368120586d2f81364f92361fb513151a698d17aa0a6ee6d9fffaac915e23dfbeaf196cd02543ae002
-28	1	20	\\x0a340bcf243f4375fde678fa9ba77ebaf1bd57e9ff1da5ff1f26dbd8795262badf39ee6237b403c08cf252f4409e926abaf8b3a10b4b37ea0553e010015d5702
-29	1	95	\\x7288d06d9a9b420f179a2e5e293fbdd39c2abc6e3706e9f40cd6120c6144d5b88be5c000ceee6eb3d5f49b463430cba9b92d2b94940615287bb38a268f776008
-30	1	248	\\x4f78ac0c91353f9743325eb744a800b3903adc3b9b74cf18b195a1c73d5702353f646996546f0703ad726032225653d0126c78980b44e6bbb09a7550218c910d
-31	1	148	\\xf8dafeace7e85e4436e2561feb99e5b83d87dd830c506c4917dcdef79144253f3dbedd347a7536b55cc4b9a4d3ef64b2f9df5b0c6a603ef710f14632627a9906
-32	1	158	\\x9d0817360f2f350237cb98aa47c488b5579640ca7439f55eb35c11629e4f1471afaa9bd534902bf0a2318176d1860fb719b36cd174725884f1a0ae34180b7a04
-33	1	193	\\x76c7320573c51fa23d7b52d8be58581315671cb4549d6741ae87c9eaae3756b1e62c9952efb0b07439c0c1079736acbd9a0925c8de96a5827f86d7e494ef1701
-34	1	268	\\xf8bbb37fd21b22df3f580a73f63c4bdd24eb71da4234015f12b426e90cae7bb1695b3b3c4b31fe47c2562072c4e93de51304dc377bb0a42ca87e93c9bafd7c0e
-35	1	70	\\xfb26ab8b3d29ba3266f565943714f8edd2e5e55fe186dbe96d1997f018e59a2d7005a15dd27b00d3d871ddbddb52c7a55ca1cff3cb083362572dc4c0c9dbe806
-36	1	387	\\x82ca7d203df22ed1ac780db0b5779e6ca6db2b0b985958b66d2534d8c518e7267efacd122d3b8b3439b96d30c3b487b3aad55a690150ea981a609bca0f13470b
-37	1	120	\\xd3c92a6f1a505804ddb95a010e9d8fe4a193df475bb32ffc9461a4ac26d3414ae3a2008f51eaa6ab45cd8a288d00329dc8d3e51520b5b4951eeb0dad48051100
-38	1	394	\\x0409af586128157888fb7bee0e08ead256436611ea55a1a1a26dad1a00589496ad7c4ebca0f6bb4851bc6d3ec4a1079d8c489d81e1656bba04261e239c02920b
-39	1	146	\\xcad7ebc66936178f54c7032c0c7b21c6e05bcdb32134a82865f5a16820d746701b08633bfd107844328abe281b0796d59be6a960a43a049b06e25252091c6808
-40	1	194	\\x31a960d8528ed4a3dc9d420c54c3533ae939faf6ed73a2e68c6304272995a8ce740433334518880a83a3fbf82c34455025ba83e697dba486546a413b31a7e200
-41	1	256	\\x79e227dee8823d19f27b68a65e8c1a7eb8198bd01686f633d23efcf3a957571b76a79ac7385e068fcefffd6be7c1e64b66a6de2c573c516310dba8b9fcc51406
-42	1	295	\\xd3bc5f5f9474ab666a2de6f8213b8001ca75dfdb129f8ef49e84cb68a90cfdf3c7300cb6fb6d0b55e502903a32551e2b5e22f2281e81b7e845355d4550c1d707
-43	1	196	\\x20cd07075edeb81be4e5afbc9310110598a954349eac1b508fc538c5a68e0d08abbff0a8cab6977082bd5c98e6ca311d8fcbd0edce176794ffab40378a78d90c
-44	1	357	\\x718db20664f4b929ae6fafe8271e036b777621c82f5d196973106322c801451dd69d40afeed02264d3c7402c15a32a630b48ea638b6d20a10c51e39b17fe5804
-45	1	26	\\x8027437ca59254a9563c5d8b94987820cfd4fb6b786ebc1f767576e26cae165524234fa4dc6e3e2b8504ffb0cd192f2cb36a8c5493d5c8b20428fefba50d4207
-46	1	132	\\x3724028c01f31482d8a5f61e0e8f5de96c7297dcc63bc714846e3329a33a7cb3687585ccd2ba5a9a391ac60056b473b1bcb40f1d715edc6ee7e8d64809dcca05
-47	1	63	\\x91bdccd65e9656d97b99c0f87ba799269330a515abc95a7f6688f76af94e0edfac7c3b933280bf63ff0136ef0e405794978c71719a62022bb8b5371d6a498303
-48	1	367	\\xe18f6ac337a658f10a09436b428d4c817d00120baf1bdaeb364e964d976879af917ba670c44c74a67ecb683fab0b0dc5eeaca4c36668164c49205f95f7840f07
-49	1	184	\\x2eb1d54d3f4dd83a126d6dad3fdb7ae0ec1db6ad35088e13ae3969253003557cb983769cb83fdbd84402658c21548e54d72f09475394ed1f786ffe8942937301
-50	1	32	\\x2fba4c344ca9aebabee686c07044c632ae2d621b9127bb514a5a8a2a7e59b8b5164409bda701ffac11fb7e656e440aec4fa5f878d50838827e146a2e981d6f06
-51	1	316	\\x90635a819b62c217826c8916577f683bdfad82bc04f97e2978c88985ea440160e9e251a7e8944d8780d72097027a1ef9a599457ddf7bfdafbd0b4145eb43e405
-52	1	160	\\xcef5189f126a0f1eff621e3d836ac29a21f5933794e21d43ae7c0dc46a53aabd22eb8989d2c4caba2d2cca9043b55b6ce1776cd3eae96147e4d0233f58847108
-53	1	337	\\x189cdba36acca4461507f094c561cfae0e92463e16bdf0a50926a44266b8fa2df9ef88c8d6eac20be76dd3359e1737e14c23fc733b9225087e1aa91ee5073801
-54	1	15	\\x3f44a8762173bb08700576b42e942886f9cd82e301be3fc6a49c0929454e440260cdc8fa86cf3eca84dc6750443e7be0cba2c3a383d0e9648dd1b000c96d060a
-55	1	215	\\xfab9f5f11aa1d3875489ecd96ceba59438f0a91bbe272e417e6290575b1640ddf717973ea415adaba8b153813b75650436647ef0ff65ad1cf44be1e7881f1b00
-56	1	332	\\x13dfa221a589fbc6205619086dc0da979ef0c218bf230cf1e780b9805d18fa020cc7f3c587baba88e5c574fc390fff0bc44737c7ca04533f5b57d3db513a8a06
-57	1	52	\\xcd471e4c49c6658556dd37de42547be446ca49390b6a759823202497b3189ea98e500ddb7ed2c1469fa1383217c48277e43ed7ad93e1d3b25c6a0d72a47d510a
-58	1	416	\\x3b098f1d346b59f53c5a65986a4c0330cc14a96f429cf64a48f8078a3bfb98e47bdcb0f9f29432df27d5cdc7e4fa563b61eee01c0cc6c3b7d07b66aa07fdab02
-59	1	71	\\x593b06396a43ba696fb90cbb062018ffbeb1a7e8b78cf35abcbb35c0ba47deefdfb011908912a28680554254ac49f7546157225ec7d3d26ffae6c55e030ea700
-60	1	373	\\x5b1d66d6095222cdd7aba9cd3732bedd834a55964f2bcaa81eba5fe785ad48fc382f4f3ea9b5bf3c04beebb20009004ebd912ba2bd4a3cc23f8191173eadc402
-61	1	153	\\x57cba6840cd5d2a33e7c2bf12ac2bd5e7406b90d8b3d82e7b72fb03a30e426d9c4442e7ea892966397ff2a2aa44eeb0d8d2bc18aed4d95be1618848d27a0420e
-62	1	163	\\x56230a6e5357048c846828c1c4647edefe4a923a473e957477de092e5ef510e2433595d8036bb919a757947f6864406c78d8bac884f5e62fd6511cd262adbe01
-63	1	53	\\x5d971e5f86664e73564cc0cfc4f5664e84457d59b0f47f30e039e2b366fa52620860fb1d16d09a6eb8db1f2af170add41afdb7ede04ce4f2e2c4f6ffa3f92506
-64	1	89	\\x45d64fec9e08e791f6eb9fb4886361cea790c2622a5c287b4a5bba00e7cb2d1f1431ba3fbac87e4dfbee7540d3d6fc07453e0f56ad1b29319f4d1d3f8c8a5700
-65	1	74	\\x5120b81ee47db33f44973818cf83ea4075cd93ca4cd6fb3dd21f121dcc5c10ec7bc1e9d0bfb4928edce466e7abc4eeb9aef3d19922d0cbab7b7ff42dd355bb0d
-66	1	353	\\xa1aaeba1c66aaccf13df2ff395e8709f93caadc01d79dd25fc8d617184bc7a99c024b58549f0e66898d2b48395e94a5b87255e1ffa24e84b87d7b781c0632800
-67	1	24	\\xf5e6dcbe5f8a31aa2002d818d3f68b6d3e660a6668ea290c645d037c7c3aa2f0c2fafbe57fc19077a4a2747e1d5c26c2c7a051e3e8b7a010db43be0a06da0505
-68	1	185	\\xd39378a33ed8060b5cf097492c821408c297fe561a933fa966830eac2bfc6326e5bf9740f1fddaf60ff9364ebd790f52a699e2beaebff57af7be0878b54ccf0b
-69	1	342	\\x1cc6ba6a41acb5e2381bb030ad31661527b45f9e85ef40141d8f70ef23b73a40a795c1148e842b3b99320c20e9ded638aaeaa6891892f55d2b7bcfb566c4a607
-70	1	50	\\x9bc43f4bab2e1dc7b5adcc015f56519a57b4c9ceefaf45a9bfa8d1250b75d7de5d829764d94b8431e27642086fd8840c8b8f2fd34246ad35e68ef24b58f2a906
-71	1	66	\\x46dd0782ce85d25a4afd88ae0a3f68a5cf25b68e942c810d434f87108c421cea7bba504dfee47252b14a4be6728bf4adfc41c521e16f6cacd7da43484b735b0e
-72	1	30	\\xa06c869d2dbe56ea123b31e8f6279a82b9ab0c5acabf39ed513d2fb822dd2d81c35b6dcb9a8025afa691fca53b1577e4367815e08b549a3f390ebad38171a207
-73	1	364	\\x9d8573f27a5929875e7eb340af84298917ae3081ff7214253cf658d0b1ff43f18d555da5c9b43ccd9c092f837b6b3b5c5b1acde4e380f7b625a962c56116ac0f
-74	1	399	\\xddb98cd83d9c614537e59a93fd6df3241fe62ab3cb253381fba45ac459a14961f5a184a370d54dea7a43974bf473e22705d9080a7a54cb5b2ef526f090bba60f
-75	1	85	\\x9d72b94769c251a02f6fbde91e8250c30777660f5f61369daef1599b239f3e2653187b85fa91e086a187b5edf5be4b28627a55f5e2ab29dca76fc37c99c50e09
-76	1	385	\\x635154c7b41057b3100fb16ca1e7be679527efbba49f021a288935e6d628c9cd5c287c0626a16550361f60a310d951b45221fad0be3f2b393a1c426debf99d05
-77	1	260	\\xa7f32981140b56b6f84e551a49282384693bad9831c492cc8081504e5bbd9eb409aa6d01f17424a651d7598dda969073dc1ea3a7214fe964681502fda2bd2e07
-78	1	172	\\x0e8d44fd5342d9ae319de60b64903d598a8d3a2c301ae3b57ab8196c363b33527a39ae65a25f9525f6ceedbb26c666dac8d2bcb02a8380f5444c166ad1cc7e0e
-79	1	101	\\x46323d8936ecab0666abd7a4cd56e9453d425555cf400418a98a95e84bee237e0920f979e6646db96b95c581314d1e76ea51401316491ca3f1ffdd548ddd7002
-80	1	225	\\x6e38ff53c18125f0aadc982000184612d7297aa2658157d36d584fa9ddc17492c400784c444f24d5d95275985af26b830ecb09d6bbc605096cacbf622bccc504
-81	1	211	\\x37e7994eb165436bd03addf198b25e6830a8b686114803241f19988b3ce7d869fc5a8e3fdb233e5c857e075adbce91a1aea32c3b7632b4272858613e0905c40e
-82	1	54	\\xd0cdadd70b3d68e80d67bfce9255c4b0a3dfa4028ffd82fb748ce65b5fdcc495e6f5c81ad9864459462630beaa8ad1feda4a625b250a2b55496cbc3b310c790f
-83	1	200	\\xc0b6515b30807ad9b6bcd3fe8637f11723201b72090490fcbfae3b2d4bf25969654ba4db6453d7033130dbee1ce554d1836449019e70e80e4cf0385351d30e0c
-84	1	122	\\x53cf84b60765a81e8754aea39caf97e4986be59e76a56afebff5f06a95ba60a702085f0c850b0bf249f4501b4459f81b5eda5deb2bf0b668488b96761481e803
-85	1	327	\\x6e0a53a91acc8fda91946614dd63d4aaf0aa111b64e6fadaee097d1aae2005e675be11e854dad41fa315e2c3e9fee56c1864e0a1d871732b6a6caf6ccb500309
-86	1	79	\\xdd03bdb23089d9da37c0e02cc081d3d31e049849b708c796d7f8b20d618459e54194431beeca1ff5351dfb3c177f05dc1b8d5a11e2ad2fb8d90ae0ca393dd70c
-87	1	195	\\xe14680c91f825c8aab97f0c8c36ec89a5831e94241950c9cf8df7094e9b8d227d6aacc52a741f13ed7dd83b209c61b8f2b9d3eeefb0fdcf87ab163dc71c90009
-88	1	226	\\x561f3b002c7a8a2c5bad4dbffd31746c2fc1d9affbd833bcc952ed0ed1278c41696ada577af7e069faee24cfda01a5f8642db3257b517f72a3d94aca4e50f00f
-89	1	169	\\x43b66f8c4133102150ce3d1a719c20403c18aeb79ee16810b264ced218fb8aeb6bec9a62190e33d36f6960f90eb0498edc63d800a2c7ac8a2eef36b1f13d4a08
-90	1	117	\\xb2b4c69dcf3c66a1a7ef7337d0b3bf7e86fc58f9f24c3da2190cbb790bd86b5ab8f1592a4af109211d32c4f2c75ac32d803284d26b592597d8cedb0bcbd9eb06
-91	1	341	\\xb69ca1173ab063991b3a97cd29b954d13d2984cc957870580bf6cafcf8162ceac8b88c0f4fe5e767084fbaddb6244ed27d2a152c628ec3cd9464abc2f5a0a20b
-92	1	423	\\xed57edae62dc3a299963aa4b6960fb87c4e9e7a5e6df3fc13f610f3d76bccf4f496613770c5cffeb719d05b9caaa1769f740f74582ef8ac35dd47236fc69ee07
-93	1	219	\\x737ab08631d9b34ef14871515329506d42d4af2cef0a6175fc5c9b4bcde96c7cf7838913b890c7575c310822e30c00e9a9bd011739d39190a6c0a9efddb60400
-94	1	244	\\x73634b81e176b77d70a67be69f4d45064cda620c1da026646968d6577ca95473a72b9075024940724a210c1df3fe15f5587d9908ae272cb23eb167f7e408d504
-95	1	104	\\x4ca3effbcae3cd0c77eff0afd1552776cceb36c5ef2ac1aafb871e7fff199c97c9974876422f2934517432ec442ed1a767f7fc3bff9fb33043cec738cd536d04
-96	1	86	\\x214f6f9f96e165af8803fccd56f6e2329f2bd1b6baf300b86d98af98a7ae2f5365bc91c0d129e98401452fef4217c641fcc08f6b70df915dab84e99036e1f50f
-97	1	167	\\xaa23c2b403cfebc1348d575c89f921814eaf34f7e8d629cd6dc9925a571733401f0601080dcdab79397f2933d178ca6729c1b2c1a9d0cca416af35eaed4ea90f
-98	1	309	\\x609aa74b228d18c732657af8b85652d0f902771bea298f536254836101d659bbf969aba04e7a3e7143492c16966495aa671d3394d139b0ea39b086a808e0850a
-99	1	16	\\xa16db22a43b4e7815bfe2dd3bad2b01718af3db0096cce82cd70b5bad0855ebfd96850c82e806b0c29c2cc49bacbed3e2d2b4b7367e08867b4a0cca92ea93c0e
-100	1	150	\\xb7337cfb7370fa676c76301eaf952d74a30e0fdfe81ca9162a8c00bc13d4f999f93d7235df7819112e4237ee3967bbdcda1aac9e002ac70536bec45e833b340e
-101	1	359	\\xf931588292e70f5599e6326bf33adebfabe63a719349a4012e759de82e0db065d8822d023f6699693ac9cf2692225c17409c9706dcfe4677e34f296162404d04
-102	1	72	\\xa749155911ecae1367293fd16840826c84dcb82eb9ad7bf527a67bea058789b7837703672e5c16e4c17a01798a9de72162a49786bf03cf3de1a79ac21652450b
-103	1	49	\\x0ccd7cf3a98501c88c609fe6a780c048d976ed40656a12028174656a357e24844980ad3d54898511fabd8985747044e463501cc7352f94f8dbcd9860170eef0c
-104	1	281	\\xcfbb6118e55eed796c4cb6ae63eb1d2d6f8c185200b4299d03c52cc0490f17ef99430f1cabb7e5246c893d2d23e46808f04d6f6fc98e6ce56a106e0a01127807
-105	1	2	\\xb66a9b06f85b6e46b828bdd485cee98347048da63e2636b5baaf3a6e3e163a93ca4cbbc92db47f7ebb7cfaae1d315fd762b415822ddda60bb66b814c3ac0780d
-106	1	5	\\x42bcea7da19252ef7be76e2a23381e936654dbb91d96a301ba31f5d79244c1c03691f1cb92220ad6ae3644bb51f4bab57f3ec9aab9b2f1d3b2e76bc0a6c9920e
-107	1	231	\\xb4df160b6105ba575eceb3c297332d52e63a2092f151992ff5cb320e4502bef128ee58df5ba429ac1c885e818b87a547f452fcccdc0f24f9231093c1e2443b06
-108	1	142	\\xee558a14d48ef11d7db6742b92c6f11ef6914690a17303f69fbcfd2342765a60b3b38f301317871985a40bb66701f1f6a0e1a795b6c64ad81208085695157d0e
-109	1	83	\\x26542c789350350ef0952e21cb7bf6a97295f3d4116329750289d0f6d4fe976c70f22150c251433ec13cbedbd371fc1e0df1ac3862623579a76de11645cbdd05
-110	1	311	\\xd724231233533efb7b01aef49363b7c9f5c7f5f1a66dcf6a9c727761124f70b3907c5e0c61fb262e92e66cc64d15f2386d9ab21b1ca5366efe8b06d49ce8f004
-111	1	407	\\x43bfec64f57b86e4ddc6efdab6d228e749fa50f7eb682f024bfc076b034a5116795afd1f05f99868231ec35a5253f0447e5927434557161cfb8a9c53b5977304
-112	1	410	\\x9a72db1b1173c632dc1480edac552bba55e7cc1c7d46cf323bcc5413aabd50b58e4af940a5a82b51d976ae15a67c58f77a450e53b20d026adbe2454f0d5b0201
-113	1	149	\\x621f1931cf06ad5c227c0ae8c7c02138b0a3547be3541e5a7473c827ee49403275c1528d6994045664f80feed96f57fbb1f3dbe8eedfc6a3e6633cff3525d20a
-114	1	296	\\x0de29d596a2dc67dd3cbc8f64ab30fc15c215414658d327218d8def30b8f20922959901055d4e98b87087981b80c2fd0d613efef6037ceee78c06b1fbeec730b
-115	1	58	\\x8f3676a679aff4e0a27f729a917e5916fd8abe0df789dd93d0574a1ea020cc6da03143ac48d41eba11acefc38ce0ef1fb77436322be501f21778c5658a1fce00
-116	1	355	\\x3efbd9541496028f58a709d1880b5677cb5d0fdbd3e5f2d5a0cd070854ca83134c437b53b7c38f5d0961eae24dfcabc1caa4abd49e5013a5742dc0dd6cdc5309
-117	1	351	\\xff139c839384552911ed2faec23372d8c546107a3833db79698eeaff890fa53fda1f98b856b52bc057c529129aae355b78bfebdc3e56e7bda1beb9186ce88a0d
-118	1	80	\\x85daab785b66698d08d417cd27c09bcdb3f193f99195927e70401acd4218f2ba9a0df7e36535252d4aca660078be5c91723824faa96202ae97ef2569aeeca505
-119	1	222	\\x168840b52c8639e2cf0d6090394f34423dc49f52a4560138949ffec290699e74443d7bd677863c21d6d491c2ede4fb40b0e0f6c5bf9b80e7cf8b4747fae6f40b
-120	1	347	\\xcaf08ee861c817a649ec4fa635c140483553d6ccd5207aa98248ae62e0388baad4134770e80979ded3c2a584ecccf28da405159ff5e918ad2b7382e9d32d570d
-121	1	249	\\x75532c2571de2f27ea2c6a7de51c24818fea333f9e48353780ac771bf608b9e82c79fad71e5e410b05ccfb6eb648b511ca673bf5b63bdcdef51091d319e4660f
-122	1	284	\\x0ca010e872eb379794b1262f7b2ef303f477ef6371316dcfcdc1621d4bb8b6dd1a433fa563c7c600a1d6fd4683aee512fec7d2102eea8b353c122d7419139709
-123	1	286	\\x9670f062b0a3d5c5cf1ec9e7511b0d573a5f113468784853bf15b0e60402e7e6ea80b56e96879e504e8580b7d68e9e99929f20d19191618c14af06beb6ba8606
-124	1	420	\\xce4ea0dcceccbdde9f05a7c3da54a410a6379f6137b173a90340fb958e4ca5b76d2a517ff92d7f589e5983e1cb2ae88f641f274d15a9e8b293ebcff7f12ffc0a
-125	1	320	\\x1367df878f16df5265dd2820b60babdb712131de336bb0befda4b0950794a4b39dd5a0610d81431c98461687bd3ea78c3ab4f137a656f278fdace116e1df0608
-126	1	250	\\xc426f0195b8aa30c793f9bf8dde1edc8081cb69ae825db8b424eb144113959dbc0bf30a2c511c5ba8de4d864cf15d77d8ec37a323229ff6bacff467a4e16190f
-127	1	277	\\xc7e403382718076143a1b3d292a248b49c5271dd4dc3deddaf05f7ea9ed6eb1902193aed67ed0fa6f4b4024a029814c2f813d638ddcc2d04c14e5293edac1e0c
-128	1	155	\\xfb3c391673aadeb1d8b6f020937a8ef6ac9704d6169b2b826a69e26a4883148d7e207cb126930fe6896f74143fcb93b2d1cd58549872c762df900c3c8a6b0d02
-129	1	228	\\xa71ce1c39260b3affe3e7ecc2629c30311c27a10f1a7e265d6273450defbb7650724657637fcb6d7504a5c2ba2041dbee55d931436a5b618029289821b5a8504
-130	1	99	\\xceb82c2a023875b47519e0b870673beb2b8c34f0bb814465401356f461cc128afca2b73c6a67f0ec6088f9e714e35f0866b8650a50231b77fe6099654000620e
-131	1	238	\\x58195e59392facfbfe3d7c698972a8fa362dd25e85d4a1fb768c3111bb4e90e71bc5a183068a1f62e5e503a86117d61548b143c86f8615652a0b7a3543104602
-132	1	7	\\x2203f39731a3c9236e03209595eea7f6d464d4082b4c588abf7f85acfbcd3ca543f1aa3b0fb6b444cf890d62c354a8dc2e19246482ccdcc46a006c76ccb14b00
-133	1	161	\\xb49e78c4f37a82e94da2cc5dfc713e44c937443ab93037377242143b3acca5e4d2b9178d05e8be49ae3e58b1fc2e339981c112c4c5feea4b664474033483da04
-134	1	181	\\x71193500ffd275f4fd6b0417544adb6e37e3d74390ff00a295e74f9c35a6fbad44a6e9e5bc4dafd44b08a40f0361ed59d7555974a38f36a4e9c77c6a60df480e
-135	1	314	\\x191dfa87a1d0bb304b3a735af27ab31e6fcdb59ed130115b9aa27966695c9db4ab3c33fd0a1db6b0341a6bbeea6c6aac3dce907bf7e5b2fa37ee35fd72a9c205
-136	1	136	\\x88b55b8410d235eb55b71f7bcdeba324c967cdbcd949ae2f91e1cba59ee4970f4b4659b39b8ace8153b0e6aa6002fe0eaa54df4a0c5a65958b31471dec12d905
-137	1	247	\\x1bdac75ba0409bf1bcce1838a1a848b155173d6b97df0c0799b88431058b22ec98dd28cb1908d3efdde0c21aa103dce07a153e8d386328ab3d1914fdc38b740f
-138	1	131	\\x8670cf5c4b3bb2d0a529b830cb3392322763ba1f5073b8227db65a6b1a76dcde70084d6d38aaccc229d4f45a109bf086151c6ec58c29473de2fe162a1fdaa405
-139	1	370	\\x9485a6eba25ae92cc34c219ede33f923699f64409fa20fa25f785c69e0ca37a845be6b9081f04be5d3986bb5cb363fc04290b758f1d19b612d236b5bfe222206
-140	1	324	\\x7911e6b47ac43d174bfc812b27553e72d71c75e5d349009ee6fda5c252aabe089960321b365c4f3a938ff128e9f6972b120695810d516e89636c4e4461ed5f02
-141	1	179	\\xcc221b001d5d79e6c2c47ac933a4b2b6306a3c910cede34831a3b44260a1cd4844688a13af15df31ceb54e2c779c758b0244f4ba06fe1b169717625db9dfad01
-142	1	288	\\x3c92ea594c0b204d3600817b1a4cb21eecaf39d51a57da49c10d49276eeb445c026589e2ffc512aca1f8c5bf17d68dbb3af6ea68abb2b485568ae2376f35340a
-143	1	395	\\xf3ef4a654cb88b7d47f3a2d7df5299c8f973b3a11e178349fbf5e72a67845bcdf4a92a65d83392262db098f7fbe8f288898c821f0a9ec5384dd4a0e420d1b904
-144	1	73	\\xc8a403ac79e20c3e26a5a724ba379df5912fd0fdbe718950ad3615b264db7007fb5cc3541292e8134bef23865a36d15eada222618f7546a3445bbdca431a3608
-145	1	344	\\x159b796c992ad025bbb8434db9bf2dc4a14b39fc7d1d04fd5f882478365dc7d724a3ed0e8c42bd2142c741ae87b7ed5b0700e0796d73e78e0db30633b0ac6206
-146	1	212	\\x809277a2b58b72e8f6abd41813078616244913c6e5ad1c9fd38edd37f8543db6a12f4e3e144d1169842da5a895ceeeaa0b51e13569c895dd3829600d4bf2880c
-147	1	69	\\xf1864125bc7d12834fc9d45dfa145a857710aa3bf6f177c3208b30e3fc0b52fe4a906fbbe48964f44f8096f8118f4292d24dad6468fb1359237cea10e7f25501
-148	1	175	\\xa926b1855fbea9c1dca3ae43d9c0e9e9277bfd5d5818b08db5aed80ab9e81a787b868f1ee7c127cd13419b8ffc11abd32421fdc956a67b3842f5bfe40684f90b
-149	1	315	\\x1d21ea0f550ff62247bfa2db635222d6e2c09578baaf9bf59970517d3f9611ab638ca967ea8508fe6fa15d69190d1eccd2ed6c993ef37e5c2d242599ccdcc908
-150	1	298	\\x36932376d1c0b22eb2d2df0f3bfa4d97ac952304309766c90fb30137007214abedb7698e29f939a933a9109d043acf33823929959d4abb3ade5340af87838501
-151	1	300	\\x8d56195621f5ee4751eaf72d730dea8326a6440d36de94c4cc682b47298046ab087dabd506191c67db224095db5520523a0f0738626321745e0c167dd0937c09
-152	1	303	\\x7184a01d6631c937bc7c360913a2372a6e20a8bf9d40d49ef58d06cf2ec461220e85ddedfe5b2fd298538d4a00eaa4eb66c5a822bca6bc36caa7009346c7ad04
-153	1	203	\\xa289250bb8ef962ca7557ba1b8402e639f6b90d18b7c50b1457dd14ed309f2134aa008dc18ca878d9c74c510da635dda9a1626d96adec898a901d66772244d08
-154	1	241	\\xe76a97ef11d25922587edafa9971d650b78d1af252e176a17698861029be72e7cb44cd94a441921ce8d3a9b0382199d6e61afdc926efca856e59c4f55c31b10b
-155	1	39	\\xab28c8e644409d1cf9ebb15f8fc114041b174d1f0746eb8c776388a5e39b665f64e065b53f39c5e8052f73fb0635c0542224d99ed42d3ebd0857feb51e50110a
-156	1	270	\\x8cb9b273a28a2ae7c00eb509f1ab9299e6a0470278cc6890ed396d0f4b60b26410b6ce643d7cc3121089a6b235af40ed6188e2ac76ed4fec1670b7e84b9ad30d
-157	1	378	\\xdf2577c10ee60d69a6fd58c18259f4d74138ed114fda9d5561161143687f59dfaa1e533ac29d0f1da3fa5efc6c38132ab0b7981def8876782c6aab9af193900c
-158	1	383	\\x4da49ce5aca035d969a0b472276e04835753bcae11b6b3c35952b31217bfa75d1ab588c1e3a972ac4ee6f8fda47e9c63690cdd42f99577e9bcdec5fc1cdf410a
-159	1	273	\\xb163f80e7c9f04776ccaf34ec5a7c4e8b92952de30900300090266d894ccb3fa2c59433d921c4b3136837388dde32550a8d875868b1d544c5144827b802df201
-160	1	141	\\x123a7495b7f73e4dd93e06631618416e2fa5d105cbe7828acd8ad7809e36d484eb7a1aa02827e5df78eb0e0219db66989354757ac363e56ef23ce027b1587109
-161	1	408	\\xd176c6df475bae2a3c961d542dd6e6bf505cb763d75a0899050c03ddcb50756ff2920fe1dfd7320295e5574ff73378ab7f8d689d3f18fb44ec1ad47ba3c7fa0f
-162	1	272	\\x657f985b3b62be6fd247168fd28678c58041b5cf4916d8cda6c8535e8c0f4c89c9963b377ef732d4f5c3baf568c1336f67c513db82b0ab0a24c80489f1afc305
-163	1	271	\\x94672250e363c35c20bdda6545554dabf02e8d37fb7da6d010fd6f2b80f8183d33407d9ee361bbd837fa688fee1fc592c66f14e4ee2c6c29cfbbc25f9723d001
-164	1	229	\\xaec1639fe4ef372ceda92eedd8115fbf0902ba3dc7631fd7d0d6c1bbfc39cbf08855c40ba9a9d95255f312c2e2fe09865fbbbfe1441694af274593849fe5040b
-165	1	239	\\x9a92864d11d1356fb1f6a71f7037ce856aa1c75ba799813f90324fbc998a7881003b8e6b5fd1327d74c3475204d853bd67331cc84f0eaff95c0044937dd9c709
-166	1	57	\\xe8279886fdad2f04d93f4883f3e69a7049d0844a60eba4d8cbb0c551524b470b85a6299fef55c292d96ab6956f99a4244bd19e7b2b95c6907c70ec61b6409f0c
-167	1	94	\\x725db14eaabf89d3d40922bfa617047a42af1913c6b67bb4df9abb6e9f134c378f1729f4693dea0d6cbaf0db2bfd00157ebb3966096894156517caaf62f4db0a
-168	1	102	\\x839fa1e9c67e87694800eca29cea65d86765fea168a9285fe42dc8a31d7816de518306257cc1f5eb4e393110c29baf33034e6f3b141a49a348f8bb7c8ecd0309
-169	1	170	\\x8f4de9ec01940aa304cecf127c9c2edf293a4c5236bf1704496793707c3bd2967f6f82ddf8d32ca02e192df66159b893ad177bb603144de2c4a8601b0d101c01
-170	1	6	\\x30e07bc3b7bd16bf0e380754570b9c9c7b43826a08c2be87d7677e44931092872d7ea244e8a5dbdf286075e4c3d3d0ab9e78deec231ef39193bb44cd3959c501
-171	1	42	\\xf81812cf43fe624efa98530ccc5d4fca299f5613cf3b45af87e8798de4ab0a60a882b1c1e7548477a69c1d47af5b0a1760e2d99575066a61a2984528d1eaa206
-172	1	109	\\x0b35cb348f6103ad1a947e9cb707bda1e5778ab2cc0329deeae9fd038b5c44969346dc5a8f8c2c60df5c7d0a509d73e408a2e35894b9358636ec33dca1a67200
-173	1	192	\\x53a946b2a9ab57f7cac46cc7db39d014f6d1adcf44860afce85222b8bad2645f991d79be594c6306d91f81c9f7f5fcc75ecf225f9a7858d6f3872420ab5c9708
-174	1	4	\\x06849a5232622997d0e0ebc63f18eef870acbd305c025f031ee052c9104936fcb0bcb84bdfcfbb1314d4eafe05f73f64ad9a9caa3b7a45b3ed095f6fa107c103
-175	1	129	\\xef91f01b78876b72094ba06e786adfaf2d148e8a777e98ab44551757fcb87a92b4bdacb3443d42591d0fde3d19b4df870460ac9d86c9882605372112eea37e0e
-176	1	305	\\xf2f4c6396228a2dbf1f4a6eed01af07ce501bf1f31ba7a72e02b7f76cd81aaee78958610c467c8e680ddc0cba227d3b09da27a1b6acc282360b6fc14cb7eff0b
-177	1	133	\\xccb7df5a2dc7b4055c81a1e6ee12f91ea92533730783af98b07b3a4556eebf804a08c7fe3b4971b867254261105f86aeb1c21a3935411d3e6a41ed7ee6da9003
-178	1	59	\\x540aca17050fcb1a74f299739e03404a4cc34026c3b6163b246fb765d5004afcb86576d3d1b21c58857c53955391ab4ea4b27a209996b28947c4788fc0c82b04
-179	1	310	\\x160dcc0658e1d0d1106f0e312d40a0285d7308f74a13956afb7c1501339c091b9c4f279f7d55a0f958a07e61314ed527256cea00a9867d01f2dfc92e726dc307
-180	1	406	\\x5fc7be532317f9be346652c42735cf7f7ce5263324901c175738c9ac3eddaa4ae97652f80adf18cc58c8e5a8e1a9aa2a5ca7fba6fa8877df8ac47ba9c9f7ff0b
-181	1	266	\\xb2ec3b43370951f742f1cdd3694451dfc4715de1fe4771cf39e009ccf1e1c53c372a34062b71f8123c3b235263a94ba2a467eb705c2591c32888b07c7db5c008
-182	1	12	\\x99e47e057824a9dc2128ff70e012f2b810e72b3fc9e3338bbe31b2b3c3734cfd9dddb61f40b8817a1a5ed8ac04cfce5b54bf738794d5ebaf1ea100a4583fb601
-183	1	107	\\x1d724af9165c5f86e9c6b2ff5e44671dbc6f3621680d6c3d01f6d360f2697d571e5bd9d2bd60f880720cdc8721d9a8b4f74d3fde1330519c35dad4976a2e3206
-184	1	417	\\x01c6009147a711e2e2db74bc9706496b1615d3fc65d0975a2c0d50c33254ee3f58e3f0b8a41858304918a380b8abf7f16717da966dfa105dbb36c70332ace909
-185	1	159	\\xb25874f6f717dd45b3181bec28b836bfc2090a53332bc80084b8ef47086a95862286c07c76f30dfef97c4614437efed15bad18fa6486ce3b58cd7d342605fa06
-186	1	87	\\x620a8f5c5464999e878d93b3b26697b396493a9a92e20fbcb0a387cf08c36ccbef08ac3450928dd3e9da2bf1b8303ab09f74feed1b0b9810ec2067c6ef6b2705
-187	1	246	\\x7d46b0bcadd5fd64d31a04528367cca6fde64de8c38c244500b2ed293e7cd02a5128fe3f1f0ac2a9b4c924f7463dcf7251f79fff3426944852a77f6fd2404d04
-188	1	115	\\x05fcf0e090eedf39e6dda17ac0075c235998c13b27a003e9c6fa45229db66f765272a8730e0d6656847d7e1de3b4b9914a9e620fdb827668f6689410d32fcb0a
-189	1	96	\\xf38e8aa18ca335770345f2ab79bb8a37daa1610ff28efdd2f847389cd660ecf50c105637e845f9d115d97f263f79f7e4713d6b9a3e9d4a2cf4012017c7c18003
-190	1	313	\\x5ecc1f6f01efe5bc8f7c6d619d81f17b3db1e6a6b1e106ca51f6e1d38839a1d3c444cdc44b1c54bec475466e4cddfbde9519e065b764a841898432e162d04b08
-191	1	390	\\x83d6c127af7a6542e6a1eceb632b7db669c658d0e321d22f2558f18292712e43632d3d8fa42e37fbaabc57bc3286dac7202090a6d49167a99439574a8afc740c
-192	1	130	\\xd1228a9a9fe4f7bdccbc49663f64a7e2386d845ef33e0290871ea136555226eab90a35095dfd762bbfc592daa95e5182ea8ec91a4d51f6db7799a6945acfbb01
-193	1	126	\\xe3342f51e58fb911bd21b757fd23bfe1ebd6885b5eb4c86dbcab4a44ffb871ee1a472f4f083cba995c942289e30970cd63769e65aa08125d2d43d801b6256a02
-194	1	369	\\x03ba5a814e82a932058662cd09d0cb3562388966a997b9d98a1d867a0bba2712ab68aedd0190aa7aa6e920163b1594003e312331dee75880a4daf47490fb6507
-195	1	240	\\x5e997b1c43b432586115eda00cbfd702d4cb346e2e4dab0dbc3c95a939228bd338e9519a3a5bbeabab31175c63df667dcde84b891fa3aa4dde6de9470265000d
-196	1	90	\\x818f1ed04e736b53e75a178d384298c881200a1333c0420067f60f768a3bb50c160e159a94faa8ede7939da16d4943299d86ac5703419533ffde9938d94df70f
-197	1	389	\\xc23026e8e3049ac12fa368ab6c2902d109c64a9bc5d361ca40af36600c2f4b08d89951c7bc4c0c878e0ac4998da4abb39caa664e3cc309772b5cab0beaae8d01
-198	1	400	\\xd3a36880c78c562f348a9c127cdbee21c50f787d761eadadb53b1777b70c9bd05ad84f269f2270cdc34f979480c50e20c95ffc55892dfb09b107eb1f59a1ee01
-199	1	255	\\x94d920c56c061e183c280a87a4867096838770eff469d56e8f0d89eef97be66e6b7aa2b1e4abd39cf89ea9ebf6e044dbf657ef9723394265ab5376928b04b20c
-200	1	322	\\xdecebb7567c7833fc3a2cacdc78935434aeaf4b40c24671eadb0d2302c611daeb095d841ea08c5e3b4926af64785fb3d8b498a5752ce2a049a2ca118deb6780e
-201	1	319	\\x4c662c84e7bfce7b207df43ea94cca4386363a10fd5a08b9cb344a10ce15ea726927a72dbe9188be47957d74495e90c6c3beaf6e4b98fe70e91aad5a67958a03
-202	1	143	\\xe6644a45d77fc2ae37d34081464154207e89b82e2ebc8d31cc1c0903abc50725c33a4205c80b235af17f981e5f319b8fcb5e8192e49c0037fa6d74c6486e5d01
-203	1	307	\\x751e21fd5e281e28dc12263682eba9e80a647c170d7b02feb27eff3d7c84e946266cd17daaf3b2b19c54d080e3d7fccd0000eb3b7634e17669f746dd360cc50b
-204	1	60	\\xa3be50a3a074557be873a6af6e646d553f682dba582c7ea9de88c6b7f1be79f2350c02b0c979adf522c36d135b1f0d0412986004689ef045e699db35bfbe1606
-205	1	321	\\x896b8550f1605443ec355bef0ef880b1553d76f598432dfa8bc15b12869ac6a9e678f28a690b5e202894a79edb4a01b714449fe8fadfcff9cceaf7da53449c04
-206	1	291	\\xe8b23cab1bb7cb541cc21cf8631e3de55ab83a3bda43779a25333556baf58c1168ad362e647c0ad41f7fca56179d22f9d5aa919cb8b410402340b506c6644d0b
-207	1	127	\\x750ee5fc36aec8bba3af9fe1e7034c8cfd571d1db44ebfa2598a3574307bf7ee04f6d582319462be1e2828067aa08c2f504cc553de18a098e00d3173d9ac0e08
-208	1	17	\\x5b2435ee5cd7d8de8c36b4c81961c31efccef2ccf4829ddba660b3ba49be87965052a6997fc5cc4d477c81325ff686268c368285b874afd7f0db71483aa8d60f
-209	1	138	\\x472dc8038d00075632160c959aaf057173c14fa234eae471e010c1594c813ec0ffcc204b64ed0bd83824550e066a4bda58298365d9ef88c5b3f653ef62566003
-210	1	152	\\x0224f65b46fb690a8b693c37b471a652fb77acf2c2bf7920b6c11cfc98d49c83e187fcf2f2d3aa636d36a8cb5621bb07ac64fb60a9c89dd78fefcf06dbbb0a06
-211	1	325	\\xc7a90f187df9b2830f20a9f2134424de133563ba18e26b911e9352c167e3423d97886d59f325dc912dfb2ec0b99d2413013c6aeacda38bd9c8bed0038dd13a04
-212	1	140	\\x7e72f32ef9df1222522cac95934332f92822c1eed9795ea338f1f75003cf3e272e12c24033b9398d0814fa8c8874a388c826eef16e86b993401c617ede162509
-213	1	31	\\xabbcc159f592c163460df2c9f51850def0442ce0bc8db4f3b1360fa9e6e50dd040bfe42676ce2b827aeeb78a6d8437726ee09efaa24cf0915c5d9ad8b3285e09
-214	1	197	\\xba1b5409abe1d8d1389e6295473f6816edd8dd8601ecc96f963edb84a200ef2eac773b109b6550347c12b7b61da79199996b73f953bb8e6553a27cb98445be0c
-215	1	409	\\x88adb2ea0e02c479dc73415d6a665db42088fbcf1db77f5e98836f12a661c91db75f1acbcbc9b8043bc1d2fcbb9679b3e44673b10be91746ea3f21d512789209
-216	1	412	\\x84824b3e3019d4855464ae7649e9bc61b6e292d2fa625c315424c7c1fc1b023562e7812a8a26af923fc5240cc1dad0fd87185636c79679193044697aa61de004
-217	1	65	\\xdacc947e17e8dd0a485234cb2a62f2c7ce5fd9bb4eea2a13ff7a852af867ddda6b01b75414d37b585c540b9a7ebd9c8bad6fc1a4ca8d14be97754b7a522d4006
-218	1	147	\\xa42efe7e2bb10541fdc8e17c4afda4b31435e63d6a69ab0feaae644c0e3f7f85b8ec78b29d84e117caee4a52645b25931959e72c59a31029d3277258d090800c
-219	1	78	\\xb1aaca26a72eda44ba63b6e6c706a6fa973db4e2092f789f262e8690c2ea0a6ed805922f05cc5e3e6c4f1e6ac8c0e93c4be2ac562801ab51dc933b55497fc60e
-220	1	14	\\x46e2fc48cd5657f91f14d6d43f82e9932026c0f9229a60af48e28f7729a7dd87dc2ff71c365f0dc1a2f4b73725ef9728635c058a53b12b143a8bf4d02050750c
-221	1	67	\\x7a41fea491af6c58eddceb58bfde7224fdfe089e3d7ec3c87ef4290ccbb2ffb9df504f850aec654d1e7a967b98e41ebbea83b3385ca118e6d0e53062e3b03a0c
-222	1	33	\\xed53cb4869668291b1d638988bb85c8a509fbc52a6fbae6c831cc62cec3fc55543b0ed266d5ea4d6ec4b081226cb0769bf28ddd5d1e4265174e1f37bca395406
-223	1	254	\\x1de2c13c4a9b15c908f13eff6cf7b401d69fa6db3d887aa90dbec76a7963acf27b43305ff2f28ee78e3b0b31081fcc0420015a78b5ec3a62f645907121f2300b
-224	1	227	\\xdd7a0ba88dbc83839dd8af0c001842daef74c28765b879e674d9a5c576fa4b0ae7bbb742b6e48c3b20640e45ebd42d5113263a6f10eed4213bbaff102d81ec02
-225	1	361	\\x6f0d4ed9075b4463615b1443a6cfcffafd3eb314a13be92879044d019280b0990a54f1b3d1116e385851fd286755f5699abe80bbda105dae640c9262a4c7900c
-226	1	206	\\x7278b64bf297093df4e71877f32d20cc08ddf20da2895b17827b3f1ddfd015233da490d03b0fc0555f19288154696805116470e32d02a52bafbc6c84de556e01
-227	1	293	\\x4cf474e98eabf9a88db7d4087c0d9a6f9b335d455dbcd4814c0c3f7d90e615ad7b3aa03c6bcff659704203a62847cee15e671b784353f483e6f9c841ba62d60b
-228	1	84	\\x04b7f5f1f2fceab5b733c75c0ed15080cd7273951fa8978e4093ab79a437a9d000ff77175c74cd87d2e19ed7d196a36b4c267d748f5c7f687bd0f9f741d6010c
-229	1	396	\\xf3ec028db008d500726b7c6fa24da277de7546cc163826dd371ca858dc0b6d28cf31623278ce4b62f3faf4f9f2c48cb676692ca8ff8a9967310a43f2d59a4500
-230	1	317	\\x7d7bae62a5b1c869252d322f3546dc98eda32a88f956302e9b220463e6548952ac5d8007f5f505280d53a32b9be1feb034e61eb283d64f377367ad189fa06f04
-231	1	404	\\x7d2c15ce7a2fd14d3d7ba395652c19190ecd9c303bd5f4f7857f345e88299811cb2315d4e218a19af041b869a1e196a89de3dae18f49943153d3b2296dd4fd09
-232	1	223	\\xbfa301a330421878bab2e386fb7b91fb26de3115157581ec1d65bfd93682796ec25cbdee55d50a095e58fd9b8acc2c756820168095537337ee8f7e3a4937f707
-233	1	280	\\x834c3c879aeddc848ff17f293c3dfade1fe22cae10d4d9db0137688537cf5e48cf337c269214abbcde99abdfebd37a5a94d21f613d2450c874fa1c25aad1eb06
-234	1	202	\\x6efd96923bf10bcf272aebb80934972abdfae1e8bfdfbc9b1f8fd55ee08175ac67ec4d2d0ee520f690d27d4a7ca540d228d197f873b9b3708655b2f41f8b290e
-235	1	93	\\x5a5c8ad5c4d13be28cd40464569a48d4b3624833e5dd61a05009869257ec87fd86217610ec2ac5587bd604562e27b62d6cec364d662c09ef5786f9a2699b650a
-236	1	187	\\x856eccaa986d07b47c16430edafa4b340d68fafe19e4d295bc3a65bec0d043965175948dc165fe6de0a04d35cd27b1a4f397a4891ec34eff0a4ab0d5e0584a06
-237	1	214	\\x466067a5a54b43797a7046010db7f190945f41e93cf3a5bf3447cac4354ddaf8d1e76c2081c6d3089362cc4a3ec6366dd7d607c1196a1593ff36567630ace809
-238	1	308	\\x0b68e696ff033a3957ada83d12cd4491fbd2be043dc1ae666d74012e5fe89ff0fc446b95632ef9fac63e744ab9b26c8a0db46ec65817c949ad4d45791877ec06
-239	1	82	\\xedef4511f1fa6fbf0fdecc1ce3d9049be5f1c7fbb670f51e6e4c483eaf176def8ebfa318ca4de18c10bedc09c564ed0427fa3b108d937fa6897dc6784ec9f00e
-240	1	116	\\x59045e061e78665142845bbfc41af24a5fa80a647895d46b69eb9b0be4be2451526545576664b69f825ef82ea2efaef1e43e39c8370221bbd1b31d89dbfe5d04
-241	1	419	\\x6ddf5f45b7f1d9b9eb643ef6f198729797416d1ef5823f78703c05bd82b1d71db693da22ac5bfe924b279147f9038d61545f60e37aa1d0a59d8d7f2c59723307
-242	1	190	\\x553c750a1531bb23a4338f60b67946b8a693f4d2cbc0cd27b57197bb0aa1f45b1ae49b1eaf23d5f6da7517c8d1898c3dd3706f9d39b2525d52c7a57c738c9f02
-243	1	397	\\x0878377dfe41bf4e09a206aef411bdb0a8f98ac633396144aa4f38a425f9c4d605955adcf5df05248e99f0d22eb312ca888295106b10e6cb86f41c454c523b0e
-244	1	224	\\x00b6863580cef35060c34062b081f26b00889ebe02a005034f2a19effaed053f3c8785f8918e92a052e40e2bb3c4cdc2771fb078654cc54bd0693093cb36170a
-245	1	382	\\x52207bf019c4f2a56e042f1a7596649cb6b7b8f422c5b4ed1319e6afd73f71af794e117391d1778722581fb00cb5b9c0ba6afde08f4fc7f0b40b30c36ba0b70f
-246	1	36	\\x9f25d0ee934e929de5dda9e7490e5651a161ab1392bf5df757e2747e581d0c3374a79d3943af4a002f2d10ef9f701d9f0013dc09b06d4edb6d2e596361dbc10c
-247	1	97	\\xd4f306f64b0cdbd65143f1abfffc9f3876574f8be02949232da112e93c84850acadf33f223c8d77e4f79b47e3a208743f19c03680eeae75bdb2ad2e4f6f94208
-248	1	261	\\x594c92b7588470ed3f2da86df9459f31d851ca38ac5b9177ccf4f784cb8f037b4e10fa7e0f64db9e8c4fea138aab61c846474732a4e61ad9a3339ee13aff4f0c
-249	1	242	\\xe862659e1406a4fcae6098c61338c72c9f8731855fcf4b6dda3bbdecd3a48d4283cabefb3fb38f35e9712486ef0290bd60190d9282a5514218f317a5cbac140a
-250	1	297	\\xf8463826774f62694beb7f838b4fe41e4fc721c0e7a08fbb3b3ce9731aea5610d98f071dc6bc82aaf164abadfaebc62cf9aa7aa909119a977b47f70862c22e04
-251	1	40	\\x5ca874af5972239cc6e9e426122bc806a4e1e73661f6a42c54d37a0018fd74f1c15fb669aececea5c1081adfe1ba191c621b7e23cb0a0c739a4b43a7bbf89c0f
-252	1	292	\\xa76b5997b859ce085032394980929bb812497d86013e004df94399cc8ec4987ca7e463c19e5570fad6fe5a4162568d6f73c85ca6e3946ce4a344a093d4cf750e
-253	1	173	\\x9c081561589637ab7c387f9915a542975a98ec9fcc9ec93909a2d2152e217cc8ab07ca307b9177154c5de834e682eda362abaa573d97e46ef396c095c7c2c403
-254	1	62	\\x5695ffd64fa3a8c29045c226efbd9668aa33f5051f2b8b27431c218991453c2f03b8665ff096cb37df9bca87d5384188a79d0034aaf1a939bdfeda3f2a2cb604
-255	1	330	\\x8959b0a86941d2bf3db6cb104beadd342f756e71a1ce60d38a3f80642579c6fbd407213b94c6468911cc1e51b07f48f5af427e2ec8017be6380394057d58510c
-256	1	375	\\xbe86418581d521c0cb8631ea8ded9eba9c6bf99d7ecb38879c0bb63f3f7493aa6249a040f1acc8ec0ceeb597399ad66a72ad53194c24cfaf4b70e9bb6adf8006
-257	1	106	\\x284da2ab185450c5f821d7515699bbe2f56936fbed497fdab3483f7e678fe9d4d170e673f80ae9bceb008775898a2d06810c3256fd9341ed3089f152ed50b809
-258	1	259	\\x0a6ecffca0577897bc80788e3486aad51b5d3df2379923ca482fc5581ada69c72f3ac3eecffccb399323d5e2031349c998db94c1049709a5946bfe01abeb7208
-259	1	105	\\x590c8e03630a959be2843dfb37e7b59287def7487532c4f5a049fc9690550b6ddf4eaed8445b5b674d8805c0c4d9e59e9cf639d2954e44eee4f972395e556406
-260	1	251	\\x32fba3499afa8fd74b4843a1cdb78bc438fa15c8ec49dd8af5582383d77f03871b62779c4e54f85517e0e98684808badf87452db4ce43a70226e09317db60c03
-261	1	19	\\x5614963cc3303076b2d662f98dc29d53acec2623e6be30ce328555eedc0685a37f528a3629376551588e81bb5646809fd10499a3af51a44e90dffe03d454a00d
-262	1	257	\\xae29276912c2dce7fd253747f593682623c40d9275d790219298d1ca18194075ac8e132f07ad8e132537e140e8d15bfe21267d980eaf5866414bcc614302500c
-263	1	48	\\x655ec8923a63cfe0e7fce96e8f36a606c34a9154077b3f02356a9c6aa35b3764bb552c0046810273bf753fa51e55202d93dea34a9d546c67e1e1f4ca15788e0f
-264	1	352	\\x47ba94477d7416d414fcefe7b646189c81ffda3c7ff13589bd7fd418ee2d3f66d0c05cf84c7c489f736cf992f6ab2fab09a3589e6632f712fa5ffdeb9079c105
-265	1	414	\\xea1b05dcdcc28fd74a7c3e02feaa825b7249630f90622e22ea788c971b9368ef74f6e5ce84f4de9c4895f49c80e0c35bfec5cc8d30dd6f74e24a242bbb2d0209
-266	1	22	\\x1b0067eda8d490187805ecec3762be96215cfe41983bf1e31f8d863e1e78444a0e7f6a98e566a57d934663905e71d9927afa4bb7cfec724c8de814e470855c09
-267	1	81	\\x04ba4b215d96cae2870496e81c6424c1ea13fe60886239b0bd91257b687c054b516f1edec229cdbeb94f8d2345c2f1448d39e918798ebefc59571a5d004d8202
-268	1	1	\\xda35043fd43a9da289c02d31721bf0a6a030a185633ccb8408e8bacf5066f724ef251ed79e4a5f7e049765428653d690ecd7c9201449146e8028517bddda5a01
-269	1	177	\\xdcce855c029e759b5faef063f4f31af3bf9821e14efdc1668431d77e8a3c7e163c9ad7a5bd5799cc033ac542ba89f8affd2e2989f281f61be22e5123a7b11c04
-270	1	174	\\xa442333e5a9b0e08ef6a3a2735169aba96913bc8d8f8007d4c853e23ba8cb241c922d46ead7c2ff2aee4210917e37d858c30eb455a3ca51e636df6ec60dec900
-271	1	245	\\xc38f0270e6a09c53b74384f677f16b998b9014555d01360fe81e6c0090c06a7ae588abaf0bfeb6ecbcc95fdc94e64d246aa8e6c93fc879c39c7043dcbf6b5f04
-272	1	264	\\x8b607158b4a6d1504a746129caad18d0d048f869e1106a6e4c6fb6d416dffce4bdadaf9a3b33754f52865859339ebbafee90689decd9410846abb7b5ca7a8608
-273	1	100	\\xeb0ea6ef1003543ae3bf5ab1fdc06e62b8d73b3d0871d1b9761984f68d17d68d296ff4c9ca901a7eb1a778774ad5e3e5ac41a4fbe4e28bd624acb334dbadd30b
-274	1	333	\\x0e79d2ec62c4c4690fe976a8c84dd217dd5bd5e90f17d6647ebde0bd7cd7060b455636267ed3eceedf259c048fce8ecf8d789133054576033a9e271f72d3a604
-275	1	64	\\x4ce28eefad95fb47b30f984f3a2f85f1c708483f7264748bad6f0ac9825146d679a2de74647d4a0e783e3fb23f5d6e639687c0934614417dca4bc0d8ddefba0a
-276	1	123	\\x21251399a95df69a192f8617301fe413fd8ac7c340a3947d1ef4b8d8749fb76e837986ad136dc0bb2649b96362132d60d7d07da7af990b400d68ea5468b5cb03
-277	1	349	\\x9b25c5ce4af488f66991d6f4fd21400363c44db149d8628ed44e3f72c869e9d038782f0584c02c2d9bdafc258f0e0789d91640fbe8fc9f8cdebe555612045000
-278	1	92	\\x1cc87e5e21c72e518e2db16d22096131174bd2c79817244a4845c6bbd19696e955c836d0e236084c086a33bdb9a88b76c5bcc710d5ad05b0d8bb870d31d8950f
-279	1	111	\\x11312ceee9d913ba30f88df8fe4002e5f210dc4c6bcde4b640a5a565587eb2f47eeb2e013241b51f8ffacd77814d70aa46f952fb0827e3d0e896b69eaa6e9c04
-280	1	339	\\xf3e13818068851c708694c2a9af24db606f34a956328d775e27f64dbbb1d6b62fa2a0e7c03706ca8e3e4f34acb14067d038a79eba11c072c2472cde27611160a
-281	1	47	\\x5bb73a302c3b6326439716a2bf168ac2acf0b4bb8b30dc85326e3fd1f3517d02a25d3e4ae35ea5c339ffe5d9c13923d90762606df7281062c3c4c01e9e33b406
-282	1	128	\\x81a99cc50d33b1cf24eac65bdd6477da0625d2c78ee550cb68b2a02c6503603a7aebb3fce4cc8e66da417c343f6832246f311ce3d2f98fe83c4314be70aa5d01
-283	1	329	\\x3196dfa172fba6b19325dd2badbcdb21cbf4cc3c6a0994d38171b7c4baa3529e3cbf8dc59020d5250c5e0ec4c7d5f3d75be5a9ed5625ecc8c8d86a7af0731203
-284	1	68	\\xc2caf46a0d8d697d7f0eb16061023fb8199e90f471119e2db15077512eb17a48ff1639b7b3968b8dd9257d7f9bf3e11f3c1f494aac7db287b1226215fd274a03
-285	1	220	\\x0f15087de53ddcb448d6cd7de2d2766e63ca1a60682da04928bc9f7ca5189df189034d9584dd34f88c34ff5133bf19b991e34dba7328793fbbf70603c0507607
-286	1	398	\\x1f7957cd432bc02e30de8d7ba761648b359a49c6dda8f496e4fa58498a4cc48214a5549bb473703a341d86ff03722b8b7115e7f5fefc4f26072b1ecf8189a103
-287	1	207	\\xf5e4fbad20af89a153a9272d64ff0f4cfef67cea212a5e1b049858383c921f9fd49e401c0a5109d5af9e6b254c0fe3fc5d0f74603bd26440b7b08d7d10790d09
-288	1	306	\\xe01887491d8df4b76c02c9d04ec0155b9ad494aef2442a22ddb4781876a98e2dc5863c42119b9b85a316a31b2a8bddc705f9dcfad65778d49a3c75b1221fa202
-289	1	27	\\xb9b0edd81d80287a795853afc44a2928fc5f2c8ca62f4b0d073d06887805754f156814c4ab7e7c06da8012a34c85fdf454fafcab69985d4207d16e9bdc00a002
-290	1	180	\\xf65be98013f7fa528a3aa3faee065191a0bfccefa9fd53a807b9da5814a2e766b1b3e4b71da1aeb68bb87a9b69531d4dfffdfa9b081c42cce17c1d1c8d68c70c
-291	1	191	\\xdfd0eb69402cf88be1762a39fde89b0f077805fc808244c80a40a0e8eeb5701b631899781b190f877c0d589c893931c9f4ae14692b255dc01866715cd0172a02
-292	1	164	\\xc63e4e6f8f3b83694ae06bcb6f84d8f694f5bf67b3c0b4cc6c328cc8c22a90c1ac9337f6136150be9d3626807972c2dc4c0e29d9cf58487c463ff2343de93109
-293	1	151	\\x53a59f7bebdd0c9a3e6df1d369fdeeb2cd02a95a287632f6ecf3719c7d408f52d9e83437de06a470ffee1d83f2c206d373b2cf2949340032cbd318266bf3480a
-294	1	25	\\xac4377470744a8fb5e5f1aacfed043d7983758245bb3d0ebde806cb90c221a71cc8ef8a5b5979bb932e0c4ae231fa476e25853f940b6b8cd03905b7a48aa7a02
-295	1	124	\\xce60f04c458a6960b87bbdd8e29994f00d17ea6e35590ddcd777dffd37cd4a6244f239a3241ab01455094f0cfbf300a287a2bb9f8bc42cc0ecaec55cca0ce409
-296	1	274	\\x2c71bd419a5626ce3a570a143c1cf635ae1074e5751e87d605d64a4030bb65a4d549464d2b8e598d636a5864ff5b491e1d48c8f04b8dea2b1b2ca0b434859c05
-297	1	403	\\x2d90209acab473b008b5b1faf5af8f4708c5e657ac4e5c0efbf583c833c1d4b405ab02791969268b1707cebf209385672e7edd7f0e222f020fba6bb939a2150a
-298	1	10	\\x78a5e6a163ffe0a6a48a5ac19184af2d198b9b37a32de70be63ed4dc5e920ae36a05059f382c18cc48e4e36c1ac5ebd38ba86ca3b782384d082637620beee40d
-299	1	21	\\x4b959c57b5d78cc6a138a286503e45fd0741d713987b40f81f353e78bb7cdff38346fafe2e0f0100e0b03c3f990b934780c2717a5406161b43211c7d81caae0d
-300	1	178	\\xded9a9ef32c3f36703db4367f547b7421bde5ce54ed231b6b7e34f254e26e90171267bbc6714d1f23f280d9840b6806c7bd47c077757cfc56d91b38db9555803
-301	1	108	\\x77f91af2b6be1cf91ced004448dc0471e1111bd2d8d73c152631e1c417c469fd41c4a31a79bf48388b7f238757c19f89ec344200b8467a8990014f0a54b91101
-302	1	302	\\x5c61824a3b704a086c8eaec06403f9ff5d3bc8ce1a10b30667520312c8997cf4e8e75414102e57fa5c50f56bf07360ac3a049e9785c0fb3103f30db225f22905
-303	1	189	\\x4b568f472adc7e6ef38dbb1ada62fd2834516c2ea23a6ed0b86c22e8ea64f1b0e34eba20cf901c86bf9c1f71d97ddb2a0ee77e141c038a90c1837e2ba8e90f01
-304	1	338	\\x894aa98e1d4bfb651ff81bc1cc99e0f9c20e54931b939035589abe238d9c023053d0b3373a1af80bc71b94eca49fe6b545db2d821cf4e530c665f901c0fc4405
-305	1	366	\\x193a1e787b1fc0bc00a0e16d43899e39b1db7f8794af67988560f35598f4731f4fcde3080e9d12008b84928eea2abfeb8f2d4e2ccc7492d261ff23cb76eaff0f
-306	1	331	\\xb6e2088009381bc9ed6b79a55d56d5a01cbd4a6de8ae0b5f4d293c60267380f68ad5d525dac71574856f5e367b7b9febcafae451c17056309c7fd41024b64702
-307	1	237	\\x2d097b1aba922631b13dffb8b56d2f0f474c5010dd5329c0a2d6e3656bc35c4c28830f1fb37741e16367ed25d32d20b4268098262876be0cd59542129221a407
-308	1	157	\\x327441c067d6bd6d5bbf625c2cd225cd7eec3c5ec88dd57f77d94d8199313e62760a9ad7f4a1e4a44d5a0a15f6962dbc8e2f37c1324db9206f57dddb9618860e
-309	1	384	\\x32bd4d1b0afd81cd36e79507e210769398c48662e5a6329b8f4b6e757aa4c78b03eb0102a1c9d300777e887be4ae6e41ffeea769f03f9f52045c737d4ac12709
-310	1	269	\\x75a49334ad4e5f464445855edef22ffbd42e5a02631eaa6770c94e34334ccc592d3c9e08d035aa04964cac19c3e2cdae6e1aecafe95948b6f5b819c971be0402
-311	1	234	\\xa1ef5ec0d149cdc799b7833ac98a87d43dfab16fb00ca4885963e40a10a5eceaf6182df9fa066164417f30e7ecaf6b337fba63d184d2f8af41849466e0e8db00
-312	1	405	\\x1bef89bfc3e42de1eefa2dd79072091cc12547016347f82d8c121e549f4450e9d101a8a09fb652a454112d704b42567effe0ec85e93b14e237200112fda5980e
-313	1	216	\\x255a15b69a6873cb6ca89d6645c0c0f50c4b967bc588425dc778c3c2696690572837abde5978b5ec83cb23ebc37a673491e9dda438a499427985066bd0ebe00f
-314	1	11	\\xa35ba4da3634c0f6c030b5f61eecf303a6f91716a47a1707de180265ae20700a3a6621de204ba9b6625606d1127744bafc2086373998f95690c80a399706a903
-315	1	204	\\x1ecb64c913eb36bc907fd39c94b5e5fb7535df12b2a3b63b3e3852b8988dbb5afa3ec1e476ec87cf2d2dff12de2aab8803f890abe65794ec1f64a1a6135b1e05
-316	1	263	\\x9169b2ae49ee50906be587770fbea3c56ba83060ee43de22c7382c675793bbf23799b3697180806276af5bc243d476942db217ebe719b31a4acf758456018205
-317	1	162	\\x2cf8fe14c002f9a08f9713425c252a5095b246ddb415abf4aac904369eba8e6e3793fa5124d627e0cfb2124d8b66ef71785d8c245d8863195bcf8204b7ae220c
-318	1	38	\\x6cdf1a1420a6355d3fa9df4fd406e6f4a4b7e73f2e38344fe7264d40cc533a80c549d2386d4f4deb1020a61a127ca8b84f5e24a6659d8552a28d9d41eef7650d
-319	1	41	\\xf94ad66072e9554034425ac291a9c8f0d54be33528c4a16c9f34f805d588c5ac7095fc1f0651ffea230a9463a0ad58ccb7c217067c0a4258c5bddb358b1d180f
-320	1	328	\\x551c4d964e36a8cf433e87e649068b9becd3c0fcd74bea099d86f2c03e3b36b552dbc31a4531a53a48be414a4605a11d55c2ff496d614ef51d8f76476ed82905
-321	1	29	\\x4ada0eb40d28fa832da19f886715b9fa6aef13dd9802e987e928f700ca321d353f37e6b35117581c42862541f356f7257748397028115ba288d0c892d733150e
-322	1	3	\\x87738e26803d9fcb12117747e0bb9a36f3bace2bb522447e448aa22526363ba5c5c915d7f465ad3f19538c7b665997833744b1801a9d43307b02ab6603335f08
-323	1	46	\\xc0964fb8e9c9e31272af580ef982ecdf12a04f2ba05cb99994a8f136e4137b8d55e591a5fb4df2395ebf6a8ce724f79f1fbf6c5e95b769d67c994d049fecd807
-324	1	44	\\x3577f6ba378ba3d7f7bc7b1584c43329c5029713550e606f9177a84066a87eaa13cb20ef7d36141e229e353a7bf56fea1276c4639036fd9611bf13713349f704
-325	1	301	\\xf5467b521ef12ed949285f1cac8dc78fde2d71c889acb3a7144438f066069c3b89421420b3fd1088e812f3f6af7f03e16b7793a3793ffa55c98eb8a3ce00d301
-326	1	258	\\x972459ab4f3a4bafc3b7df0586d6c5d27a5424fbd422696cd177ce657f4c44d77f46e987fac1543b641773794582af42f8bcf9e773a83eca6196524d8e38f304
-327	1	304	\\xe316296d9ae41db64501e552d59f4eae6c61dccdbb10406321006af47e369e91b087b661854a981aecb844e27ae516f5440ea8187a01915cb2270cca7b47740e
-328	1	183	\\xb5109e568b7956fdc70cf0408cb9ab5d60f739d7a66edbf8fa174c82134ecd7585d31490a107c6ea8e21431e51fa2c067ed8439a7affe04506961ffee7cb400b
-329	1	265	\\x768f545a2ab9a61c22195b72f84c3a31b2fbe4624f2ee290b4d5c018dd411c253cb787248f8f0ee5286e4ac354083293dbbaec2e9d1b208c39fd65d18a8e0a0d
-330	1	213	\\x35ef383981939c0b4b1cdaa30317f2ce22dd3fe2bb19f916a77b9700557b1766472773098a9898ce300dd3e00eeb64f143718aaf0091a4f6ce0bcffe1955f60d
-331	1	424	\\x764fb2149852c087f9c7883333c4ec13359aba710970d244d0a2a016fa5b488306b91a704fd6065aab554f4f5f54a8648f5d0221b4407fc4eb52e0971de73301
-332	1	201	\\x8a103c666b66ca2057c9459d933bc4af1cbb891aedeea23931738499101c98cdea7ce85f5daca5f03ded730abe00f19649364c7f0f2d0596c481661ff85af107
-333	1	379	\\x7b2ec85edf0e20ece95c70c8cabfcb82dbc4b94ecc2718d5df79affd538a97542dfe35f70832d5ca2c72349f3a6a89eb345162a0b72875cfed3a1d93e146de01
-334	1	279	\\x6753fbf5d66393792e1a2d3546b216465090fb6a3f1d830b803ef0daa968e1a0718a61eff08839a68f5f42481850b41bbabecd18675c88baebe8515619884e09
-335	1	91	\\xaefa81746633600b1b50f2a7d3513536465d152d9b3fd37881cc93c5b0bbe94d6e8af9e78cb1d8c930bbea5f543162cb886fc0a8fdba688f28f4506100915400
-336	1	51	\\xf9b47f0d1a338aafa6df753395dc90e2449c492f70bae6c6f377e915bc6422ed9fb3e89d9cf118a5f5ec2fc320b07e6a48ed4dd0c4836524a8fa3a7eae03750e
-337	1	113	\\x1a3c0660c0ca6b00f81139ff39471e50a4f7a2cd5a6412a5b511c45d2d049e0665251a2a8207e45b97ddb6241b716f6029b63a924b24834812f9c09249f7730c
-338	1	182	\\x30679cf0494b87c6da5661e415ad0bf3d1c404558c8c285a3e1c22a374a43c13694f665d1ec7c1f1f76557df13982b11dec1593dd6eabf6a7870eb241b64f005
-339	1	55	\\x93de34d7cb5703fff592b79a103cf0fc7bece34e83f2c26cb8f01dea9c61b219bda2cc8e3ee346c67b50f8808ca7c8c6385d5e8df5d135c0a11ff121828e3e07
-340	1	61	\\xdf9e64bcf7cf6122556fa4518a11557d37333cd2c7d52da988e2499b372a669cbe70f4f976624fd2ece8c3e602c9cc6972a981d83ce2ae0b89e0d642388dce0c
-341	1	13	\\x5c505a79a7f8adfce735353ba4c5e922da0273dfee38b84eab14a80a1659727d6bd76245c7b96f6ebddd75a2aeb298cf3ff9b5aeceff82b104c82f734367b00c
-342	1	285	\\x69f62c99dfc7e090afb2b12d037f9f332881fd3ae359454d3e89a6f4d0821afc425077937025ded6602a052e4e5d09ab322cefa4e91b43954fb26e0279115a09
-343	1	43	\\x7d55c33c007ccc9ce5dd941c70d5115b989119e3bdc8337274d9ff39f5f660cbab110d0f5e5edd7605422ad8750cee60f9d1314e8334e00654793a39f9c07b06
-344	1	121	\\xf45767110f44b248b611da4357bfdfa688f7eb823342585022c320eea19923fc0a247a69a9ce08ea0dd3d8f7c6bdb5bf2cff3d1d3e1f062c2182eb0ae9de530b
-345	1	289	\\x73158a319d5143db831fa320c1193a68facf5ea87cfe61ebf30ba20cfb9323fa16a3963bb97ec876476ae5d00530720828f452e402dfbb4eb46fdf72506d370b
-346	1	134	\\x103f34a42280435af6ddc27a7e8b53917df112cb78d2acb707345e42abac20a98c3c3338b786b7f89ea4cc66768c3eb7bcfcaee3afe19e9f82afcd2347609a0d
-347	1	283	\\x5a9009488b97a15affeafdba84b73c58924022b3d848459c0575f90d02803a200a3a9e98f3ea69fdbe5388cb618f20593ab9103f611e3dc7d3cc74283089ef0d
-348	1	37	\\x9d78952334f92a6d488c8ee2b5c39c3b52c84c40cfda55a74e03b528f89581c516b944a157ca328bc3ec01a4fb5fe1f7fe282986193fe49a6d4c703ce7c4e50e
-349	1	119	\\xda88960e65b6ea36f0645dadf1ce2e1a96ab31d7edaa0d01b7d999a56fba4e812347be110c6bd776980f71e1bb67c8584e6022d9845c6e948399b636ba1caa07
-350	1	56	\\x739ccb6c27fe6282f019fe5c461887ffca7f1c08a5d53978e3dd77490696629a0e21dcac44a88413a97a81bab3827907a49b743330b12d0e41f6a6c7ff172e06
-351	1	380	\\xd92b806f9df9417d8b22d1008ff78f4838aa66f915620d4c6e4905118d28abf813bc677e3b4d531d72ce040d785b72e9194cbe05742815f5ccaca790ebbf4d07
-352	1	243	\\xacce6897d1d3378f7a4b8f26f2e38b0df9ae1aac5b0b2659c56ff239872b215fccf502cf0a42fde9265128d9ca566d460bfb1eab8ddfe18a57f14e2e1be9b50e
-353	1	421	\\x54d32426d0e57276fa7df04c57362616189ce484d354d6627dc14c3973c172380a08bba78ca7e824342adddae68c5b57d0e2bc73ba91b20f163820bbfe302708
-354	1	418	\\x4682ab77b7be0052a2291cc7965f60cd0b8475761dc306a71a3e58f453d75771562fd9b4b2bf4d1406b77d57651c6dce8b8841da2d06b9819be32695b0cc4204
-355	1	75	\\x76cd491f615602c626704c13267942b6bfe49a58d2116bae269e1f4613b710dcc70485a2a2461d1b9bcfeb14b09de793b19c9af795af4f8e91b26b98f74f010a
-356	1	376	\\x5556bdc7d70fa7a4a53969e00fd24983b799507857dc83b3f2d3a21f89ffa5159411ebf6efc175f215f976ca6d15efe5a2dd853ea7198546b7f706e962982d01
-357	1	276	\\x1eefaf9dfdc64d8b080863ee6912b716a9e1664b82e34c1645d35c4b923e70bfda644b0081e8503937c13341b0049f8635400040629023124f1d37dbaa06da0a
-358	1	18	\\xd1a6024f197c950cb3eba60a6857debb6df4ac0388b5f235c7c8172b966e495daa65b9791fbef1323e6f01252fffe5c29c9fbee1cb63c226a3d6b89ac5dbaf03
-359	1	156	\\xa399c611b9561ab3bbf337eb75099813976459cb1d1ad68e75b0ca4e81be9f91ea8b4529777a09aaeb2583d2ec33d40dc5c7ad0143bddacc98665c823ea88805
-360	1	176	\\x76aa056fdba3eb8c2244c8df7edfa2d7838bdf14134c3db30e0602236d363e59bceeda7d0df51346c36cf1aa59a2f906d8ba281314b7bf5ad48f104e3b06620c
-361	1	356	\\xfe8fc9d74a9323069af9b01d8e4c22f0ac7266b5ad2c204c2fe96485368db198174f36b43a461afd84d27fb9b777a5aa7e0d606174345c33827741deec2e8604
-362	1	377	\\x5a1a6d5fcbbad70379e0177306e3a65ea05fba24878bf58c7e73d9ec76d58af98475e5de6e7b5b88f4aff84d3a432025af22246de424e832d5eba534536ff40a
-363	1	112	\\xc2071b9ba51b790381a04425e571dca9098d1122aa74fb2438720e76267dfb9d66fd50fafe4b4a20e93df92a0cfea277fad1415290270e6619df0223ed964106
-364	1	125	\\x3c3fe29a376a874401260b14b846afc56a70b15526a2b43177f74728648ce142cf4d762d826705c5953e86cb59f01b8c49e84ae67201789b4e70deb65a0ce10f
-365	1	171	\\x52f94a87b82f20efa96aa9f9b9e6b90a6d4988ea7d7bc136bef83751e49d894b15f19615499c7926c4ade9279efc0968dde0f908ada304dc2eaf3f3e6ef3a304
-366	1	354	\\x5073eabd85c5f10fc0e58bea4179fe7be3ee990844e08e20b6b4eeb073b85abaaa64e3f0ab95f72638ffff2f800cd9041d3f40394ae2a5934cdc68ba655c8c02
-367	1	166	\\xae82c0f8719a15012c8c1ff633e361ceb11d928a953b26dc6c82b00011f66acb1c6ad84bd11fccfa7c2c34e27effbf7761ce3babf364f4c6f6707a045804e302
-368	1	233	\\x64546cecfa625bb8b27a4ef53e111f0df3c4ebf2e91af65dd392a7366060d271fe1b9375f5d7a25cace8f0f0afa6a5a9040d0483791189f5f9359f84f7b6bf0b
-369	1	188	\\x82676a080fe25f1d060fd929a09b274108cd89d6263b32f350ca2c5508bb03432263ed97bc64dd7accf266732a18af371f3197ddf1156750ab08a4661338f600
-370	1	374	\\x6320814917a9329ac04762d04f6be62f639b614eea55f184992b4db804e53610a8157626141e27d433fe6393e04e1f405fdec08ed2f42b5ddd98bb3dbb96f20f
-371	1	76	\\xe03051518637b2134909d16ad3eeb0bf773d3978dcdca540f1e67cdc23d9e32cc6554ec969a651d01384ae0871bb7e8f7575c4d920145ab11f1add0a8ec06801
-372	1	368	\\xc7542da51818d4aedac809c52921c7bccd8b07d60ae03ade605a46ecc40cd13d45e69e5509dd4cf633751e8c72aa0cd78f00ecbfd2b4e1d538ad31d4349b4d08
-373	1	208	\\x2cdb3e9af1f39efea8fea8287af11b3e675e5150efe71a9d4874d93fc97b0486442f7b1bfa780886224809581c85e5708a12eb6d534c15c14da60bf037488e0d
-374	1	262	\\xc82081269ab0d775e6e53bd6018a75c8000c701b5b9a2d7e313a232746c54beb2eb25cf59c46c05544252fa8ea14d42dabeaa6eb7c99ab7bdaae45b6074d2e04
-375	1	205	\\x69b26537779e42dcb1d683f3b5820ac469c3573cde0334d6f96bc72dafa2231b33d444cddc688fbaec7f22971b98aeb73c168e7ec340ff979c6033890413d702
-376	1	165	\\xc27b3e66db5ac8325936eda6aa2a535b37f1c2357ee7ebb77e74c58533050e65ccfe9f2d26695b0254c4b454d0be5f0a8813cb721c4c3129d4921d7fe404680d
-377	1	88	\\x5f8eb681dc928e500fb7000ab3faaf78acb6b89a4f5bfcb3ca511f8ae82bbc7a01987211c40a8e8f5fdb48a7d5894a9531449d8868f1b782f58e1ac18a1c9603
-378	1	350	\\x84d282997bab90695d3bc4e0eabda2542a6b2955e729cad77ed35c1616d3e8ea8867c6dab2626e616989162be764eb5b0f698799ac4e2c9aff2c01e835854601
-379	1	236	\\xb7da37056c2dc17d70352118ba26bd38d138388455728be85c06b5cbf8d556cc65b0ec54b7b441957eb9061ec61427ffafeb1e4671dfa872458b61df34aa3c04
-380	1	362	\\x1321fc879127b47ba70e7edfe24223de7fae5c1497c7afdcfca4689855f0938bce22c6df46dea6bf736fda736fd1d81fb5b872202cc71a263584907330486b00
-381	1	415	\\x3a75c012a488b369fff665f12fe600d53ade23048c783ed6761281a0b3280c129d1f731e16c33288150cbd1f1fae8abb51bf876affbef29bfa61728e2acd950d
-382	1	401	\\xf9be3a32790ac427b842f59e1363948bc1553add1edb65e2f2315413e787c4040dfa413d06776d66375021af16e13557d4bb1c8362f7d2a49a4651473649c403
-383	1	8	\\xf727b4313cf9118bbdb5cfe2038298cf91d25afc52ff9d31d1b45c235ef8dd888a277eda4af2efebe139f88c0265682fec725973b51aec392ad3fdcb4a41f10f
-384	1	363	\\x6437ffe2c811c97fb05436e0223cbbae91fef7b9caf93bf8a9aff597d9c5a20589e7715dcae2c1e0b4b83c8026b411c59d3bc314e1c2171ff05dfb53b1c52500
-385	1	392	\\xbe93922b8b09cd9137aec5c6c3bfa60aa78975dcfeb2fbd7348cdb8217dd7e0572550aab272fe5cd8807abcc8d85526b73f8d0d28f8327cf4265124b240e1200
-386	1	210	\\xeecd51e92d7a844e7fdbf863447872cb6487b54c40a57c3fbf353c43bed7962f8aa6a7a3eae0635b173ece5a0744d7fca436d5d0143502dec0a4e76ab7f56e09
-387	1	103	\\x020b380c1077b2dcda132ad73b2a9dcdd4084e167c35ed62c635a97b640dbed5a9a9176721b8a16893a1dcbf6cb135d9688794d9422d03376529d7eb671ae90e
-388	1	252	\\x7f79de461da5d7a694063db2713be42daae204b2d361f893c74b1de7d2f649214dea37614f7875d3cd6859dadeb73f8c48950ead5308aed1298fc4730f7f2302
-389	1	323	\\x0d23dd986832386063a1fd178f68ce5fc638fd6bf0afae8127a858fee99a4bea1f02e32228fcbaa187fb7022660ce2a55f8e5407f8b3e785ab872a0949474205
-390	1	365	\\x98884ddfa92513b5b7e445a061b526cd905bfd36a80a0c77f57a9b5af7ba94d92c1161e87324496670ad744793e9661878a9a616ded2894c08106b270305d507
-391	1	386	\\x337f743ab5803ad7892ecc067503c819ac63d6049743b103f5cda89f25dc63a40106050215deac3d9ac4d7b94ce2cea5a89e5dccaf7f1ac6d167d82d751d6302
-392	1	336	\\x4ee6fe6e96834bd4728111517cecb4523097826733a06d87a19eeb9cf5acbfd9a024ad3611ac830c918dea0dcc1763bc6b7f1294f4c817731eb9e8217f428b0e
-393	1	371	\\xa0acd38812e641b16f919976a32afcb9c1d51294f0e878db516f299b0ec28f09a0886cc2027786c4bea215798a93af02622c07f1c48bc8f4360e2165799bdf00
-394	1	253	\\x6b8afc2aba70fdbc0ab56abe8f42941df83e5429f3973422472e6a82247c790c3895678a5051f24ea00664c441a717eb7562e849ac412990da150e0b7363b00f
-395	1	294	\\xc84186487c3bed848af33825d0e00d5e1e73f7154532003408cefcaa00ef43d964e39ef5527156eab178d68f659ab32036d5beedaab04445e775c10345c23a00
-396	1	282	\\x2907c94d30658cc8734e5671485fce7a461eebc33c47c08ec221ddd223f38f989826533a0a4341e7a796086ff323489f56873e7ae82e015b1a576b06ab5ff703
-397	1	218	\\x47ebb4475e91f4545ba84b8876d04cfaf8580b0ae33c7c856d65a4927fbd75023a440d72ba75d8dfbf6a51546a38ea88e3642cbf9856ce4a9a9bd8691c08cb00
-398	1	232	\\x924d2c23ff93042acbaf36d19f6e3f8b52e4e17eced4067168743b4b27e445a8dd2cb058b79dd68d1a0061048237872fd726bbb99b9d2351db4e05f4a1dca901
-399	1	137	\\x9b6ff53aab32135e3af4c7b2c9a593159aca02bdbe53dc5ccd6ff182692c26d0be1313a28fa2c970b657aab5a54c4ae1779f058342b9720f208bd27ed1be2f0a
-400	1	275	\\x5e462de7d15c1b3657a6c6d88c0782fe1531aef60450a9b91fc7b0a5c8acb4b3da3cca10505222519f288b6398cd180c34f68aaa92430610bef18fffe0560202
-401	1	35	\\xd526573aeb9437620d1ace60fa9a7809eae1e03d1d311121ae5cf118f398deb8f40e81a849167a26d26a10968e09746ef66c7ee3cf5e30bcbef30b8438e9630f
-402	1	278	\\xc898cfeb57a6666b28b2c2fcbc91c1785add7c408d682a7eabba5284abbd9675c68f0ac772c67444898cfff4b728f91e8acc45888c6a4d96cac9debdf6462201
-403	1	345	\\xd38c851b38f568912603b280d40a5869c5b25cbeee1901a0dc26eba7dc80d6607cc5c8bb37e66d77bb256da7b7a78c4a0fcb529b8ffc0834c77b0a9f6fe6a90f
-404	1	186	\\x08acc4d7cca2f58d38abb3cc096992d7aac1b11da1b129da05b6380848d123954c027c77eff551c55e01d354306dd4ea30ed50de86bb64bfdde00d5c54f58505
-405	1	135	\\x5c53ee8a8128d719ea5a0acd61d3093102e15de394f165b4f7d8b222924340e20596670f7ea41fc1ba9ec58b235a32f021331110667d9a647e969f1aee1a3509
-406	1	290	\\xa79681860db2f319f18197e84419f7e6bb44595b2361db89ba8a2b01424604e202a13d9d3bd33b43bbfa578d65d7a567671f1489e9569e6cf28ebf7683ca9403
-407	1	217	\\xe41ad91f3e25566ac5ecc4c6e51ecb1aafd7042065aa3989274dd78a508d530013ef47d51bbc1806da5ea5b62d7d69c254d87784791ac6ee314af91d335b1b02
-408	1	28	\\xe3615bac4f2cfabd11833182642d1e769a1d9365ce635cae03d3ea23ff6613a979f141409fa0c8f8ebb1384bfb07cfe9d185fa36a042b52c09c6b736a226320e
-409	1	118	\\xc9be4e1df3c639ff1281bf54778734f2bfb2999408ae88a2d0738c7e83dd2e0254e7ee5688a237f3930fbfdfbd4f233d5fa4d365b974d51528b8e5a74180620a
-410	1	110	\\x10211315ed7cdc18d2af6bcf81e9af687b3621ca16a02baed3a2a426c20cdd909616ac964fcd92254997fc4be4aa6957db0291ee308331ece6e3d045c400240f
-411	1	98	\\xb33779b9b0fd044ef8bb76d4ad70cb26d5d0dc95a85bf363f5c5ad5f3284809bef86cf9dde1574f4fbcf9d5dc6beb28830497b47edbb4c733b3a8dc2f61b3409
-412	1	154	\\x29472a3f4a9cd993587162a4982c69c671ee5e179c20e1499fb5462b3831b06ae6aef0577cb40198dd972deedf9e84ead798482fe0ce30f24e3ec165c3ee4b0c
-413	1	230	\\x17d239642f020492a48b2fafdd0e3e36b46bc01ae3169ac882c256bc31f9002dc1382e4ea6049779da442f15d604cd462f177873f2d74aad6b2f780ffbd59b08
-414	1	326	\\x44d353a23b1e66cd86c1a8a1b5c1ece11971b973378e8b436fece8a5c31df6f1952c45d5a954a96d2e5964eeafd97b53ed4b934c3572fa3e51380562e78ea90f
-415	1	340	\\x603988d03c944e1c7f50404a120fb484afa5ace6fb068ac8a8647f927cf9a80f74ae8370b8fe92f1acf6e2afb2a1ddef3a816434b0f31f9eac8681325bea0901
-416	1	168	\\xc0c1dace2b05ba6844ec8988208c46997e8f092e9fa87a487e51836425e236b5637fe4df7e3d2f14cf4fee20aa9417a2ca281dcb43ac9d773ac1968f620a3c0f
-417	1	358	\\xc1ce2d21e27d7ea78e1b680322992efaa9952a8d73064676d07924304b7a343035b5e7ea4df51576307c3c7c864ab1e1ab3d544dd67c08c3697be042975c5705
-418	1	393	\\x2ac2673b5e5a31f2e947e2b3aa267a2e886f6d91ae826a97b1f271a0240ff3d3eae29cea6f7a1281c06da0c1319e4f19112bc5e1e40538c2d540cbffb4321e02
-419	1	381	\\x52afd9026f8ea012d32577b5143187485fc78151b085ec236861d141b136fddd8652319f4ff5baf6d0bee6e93f47a215822416b3a55548c487205410c4066e04
-420	1	199	\\xa7d180a92eb2c1455ca9f5cd29341205ae935d7819220a1f918ead914851e719a4e0e57a1cba94ad07c2a5ecd3c2bdfeec744c8103fa6cde1ee505624744b509
-421	1	235	\\x71686f8c035ff30427b582c0e8bad61ad5e072317338c68dd89ba928a35f77e50f3c7be6974d578ce9ce5398988a77e85da0a695887a2ae7122af8101cfe5609
-422	1	145	\\xcfc46d5b29e56f1e3d0dd3c13f84bb85f6e4bd4c2c22967a68725386eac39b17def2e3de93aea47f282383c3d565aa958508faad11107eaa62b85d5de8b0650d
-423	1	45	\\x8fe0f1ead115700b67ed3de3f9285eb66803bb1791abd0212ce20f5ea6ca2774085a34fe6f13fc267a237b88730023aa03bf39f69a022c0419a88bbadb5f200a
-424	1	144	\\x03240b5ea3a5af710adc27bb6c4ec1a300863022e965ab4d8fc24cb9fbb4f1317117e151e046f5f6a969d2ef52ba6823a3e6d8396966d14cad507623e2969301
-\.
-
-
---
--- Data for Name: auditor_denomination_pending; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_denomination_pending (denom_pub_hash, denom_balance_val, denom_balance_frac, denom_loss_val, denom_loss_frac, num_issued, denom_risk_val, denom_risk_frac, recoup_loss_val, recoup_loss_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_exchange_signkeys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_exchange_signkeys (master_pub, ep_start, ep_expire, ep_end, exchange_pub, master_sig) FROM stdin;
-\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	1651516319000000	1658773919000000	1661193119000000	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	\\x5c46764aef393066362dc49bbaa54d15ce826c6929709cf64f3061f1526d2df5f8b895379451ef9e678bc5213e4aea5900dd69d1ec66ab21aabccaa1b49ffa0b
-\.
-
-
---
--- Data for Name: auditor_exchanges; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_exchanges (master_pub, exchange_url) FROM stdin;
-\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	http://localhost:8081/
-\.
-
-
---
--- Data for Name: auditor_historic_denomination_revenue; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_historic_denomination_revenue (master_pub, denom_pub_hash, revenue_timestamp, revenue_balance_val, revenue_balance_frac, loss_balance_val, loss_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_historic_reserve_summary; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_historic_reserve_summary (master_pub, start_date, end_date, reserve_profits_val, reserve_profits_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_predicted_result; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_predicted_result (master_pub, balance_val, balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_aggregation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_aggregation (master_pub, last_wire_out_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_coin; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_coin (master_pub, last_withdraw_serial_id, last_deposit_serial_id, last_melt_serial_id, last_refund_serial_id, last_recoup_serial_id, last_recoup_refresh_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_deposit_confirmation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_deposit_confirmation (master_pub, last_deposit_confirmation_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_reserve; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_reserve (master_pub, last_reserve_in_serial_id, last_reserve_out_serial_id, last_reserve_recoup_serial_id, last_reserve_close_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_reserve_balance; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_reserve_balance (master_pub, reserve_balance_val, reserve_balance_frac, withdraw_fee_balance_val, withdraw_fee_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_reserves; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_reserves (reserve_pub, master_pub, reserve_balance_val, reserve_balance_frac, withdraw_fee_balance_val, withdraw_fee_balance_frac, expiration_date, auditor_reserves_rowid, origin_account) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_wire_fee_balance; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_wire_fee_balance (master_pub, wire_fee_balance_val, wire_fee_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditors; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditors (auditor_uuid, auditor_pub, auditor_name, auditor_url, is_active, last_change) FROM stdin;
-1	\\x08bbda01b75f4378a0e2c7b7bf1dc7bad8429a7e9063a22ca798f4f682df38ac	TESTKUDOS Auditor	http://localhost:8083/	t	1651516325000000
-\.
-
-
---
--- Data for Name: auth_group; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_group (id, name) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_group_permissions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_group_permissions (id, group_id, permission_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_permission; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_permission (id, name, content_type_id, codename) FROM stdin;
-1	Can add permission	1	add_permission
-2	Can change permission	1	change_permission
-3	Can delete permission	1	delete_permission
-4	Can view permission	1	view_permission
-5	Can add group	2	add_group
-6	Can change group	2	change_group
-7	Can delete group	2	delete_group
-8	Can view group	2	view_group
-9	Can add user	3	add_user
-10	Can change user	3	change_user
-11	Can delete user	3	delete_user
-12	Can view user	3	view_user
-13	Can add content type	4	add_contenttype
-14	Can change content type	4	change_contenttype
-15	Can delete content type	4	delete_contenttype
-16	Can view content type	4	view_contenttype
-17	Can add session	5	add_session
-18	Can change session	5	change_session
-19	Can delete session	5	delete_session
-20	Can view session	5	view_session
-21	Can add bank account	6	add_bankaccount
-22	Can change bank account	6	change_bankaccount
-23	Can delete bank account	6	delete_bankaccount
-24	Can view bank account	6	view_bankaccount
-25	Can add taler withdraw operation	7	add_talerwithdrawoperation
-26	Can change taler withdraw operation	7	change_talerwithdrawoperation
-27	Can delete taler withdraw operation	7	delete_talerwithdrawoperation
-28	Can view taler withdraw operation	7	view_talerwithdrawoperation
-29	Can add bank transaction	8	add_banktransaction
-30	Can change bank transaction	8	change_banktransaction
-31	Can delete bank transaction	8	delete_banktransaction
-32	Can view bank transaction	8	view_banktransaction
-\.
-
-
---
--- Data for Name: auth_user; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user (id, password, last_login, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined) FROM stdin;
-1	pbkdf2_sha256$260000$X4khWuKsdDGMKXOJj87oov$8lrJ0v4joqfsaHJ0ormGQCoJe884nzdGAouUG0BLErk=	\N	f	Bank				f	t	2022-05-02 20:32:00.09996+02
-3	pbkdf2_sha256$260000$yDlM8eqo85YoQBr6RSO8fO$Dgv6wRw2b73KGFUQ2agQan4OlD6IInsBxAEbuLztDeU=	\N	f	blog				f	t	2022-05-02 20:32:00.286589+02
-4	pbkdf2_sha256$260000$atelB5gPkE2zbXAYExflsv$6x3NnFvXWXQKvjOXmyWPqfiT71oPfXEQiz+ynDXqHMU=	\N	f	Tor				f	t	2022-05-02 20:32:00.379814+02
-5	pbkdf2_sha256$260000$O05raDydITjc19XegCDFrh$0iKnlWkV54jkmPMJqfSr3Ob4TVffFWNWPLAXOIIrrwc=	\N	f	GNUnet				f	t	2022-05-02 20:32:00.472378+02
-6	pbkdf2_sha256$260000$lavhq0e0qGBgxBjNBSmhAi$0Qdn6gOTTAxDXTFPQRYcTYJ6sbW8dw7lIskGOyjdof0=	\N	f	Taler				f	t	2022-05-02 20:32:00.567669+02
-7	pbkdf2_sha256$260000$1ZvbmltsJ0KHcBFJcrwl0s$Sqzcj6OD8wUvNFpcbBKex/VaiCv9fvL199rg+PA+FgM=	\N	f	FSF				f	t	2022-05-02 20:32:00.663395+02
-8	pbkdf2_sha256$260000$waX1B2A8OY6wZNmBrNQfFR$R20xkYnSHjXnNyoeCOMLpI8q0BowVVGmkIM3kPbTtsA=	\N	f	Tutorial				f	t	2022-05-02 20:32:00.758441+02
-9	pbkdf2_sha256$260000$3okuCkBjB1sJEWqRL8vR5f$PRUCqXKt0hUTME4exnI0awzV6ocJdkcOa9aDAnQvZzc=	\N	f	Survey				f	t	2022-05-02 20:32:00.854477+02
-10	pbkdf2_sha256$260000$PgnaA9aCdWAQIRlxbeIKaS$uFOm7Hdv3ExjBDZwvHHjF6j6H9bXzMVH44RtZn+he9k=	\N	f	42				f	t	2022-05-02 20:32:01.313577+02
-11	pbkdf2_sha256$260000$xcJ7Nf2NTjyo8cvfu1pxle$Y8o3cZNz/ir1KcL76iIQb9JnzLTzHLGfEm0LW4XBKgg=	\N	f	43				f	t	2022-05-02 20:32:01.759163+02
-2	pbkdf2_sha256$260000$RaI674iv8moqcyfjA2ieml$jJ3kpJJV5AQWZagaBncDcm+lSSMn45Qlqs1BiRTnmIQ=	\N	f	Exchange				f	t	2022-05-02 20:32:00.194032+02
-12	pbkdf2_sha256$260000$mc7zuT8ylQOTxJDQZVy4jG$1yXsSi4LPHsvnDWnVjMJH7T5XihECrGaN9xumv8IF2o=	\N	f	testuser-pc10aumb				f	t	2022-05-02 20:32:08.774084+02
-13	pbkdf2_sha256$260000$0NgYsHjVNy7HTYQ99hLKzl$zCRJ/klPX8b8ZaqFVAUhB8757MSUNzgQry+wMwQkthI=	\N	f	testuser-5saj9erp				f	t	2022-05-02 20:32:18.94757+02
-\.
-
-
---
--- Data for Name: auth_user_groups; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user_groups (id, user_id, group_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_user_user_permissions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user_user_permissions (id, user_id, permission_id) FROM stdin;
-\.
-
-
---
--- Data for Name: close_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.close_requests_default (reserve_pub, close_timestamp, reserve_sig, close_val, close_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: contracts_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.contracts_default (contract_serial_id, purse_pub, pub_ckey, contract_sig, e_contract, purse_expiration) FROM stdin;
-\.
-
-
---
--- Data for Name: cs_nonce_locks_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.cs_nonce_locks_default (cs_nonce_lock_serial_id, nonce, op_hash, max_denomination_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: denomination_revocations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.denomination_revocations (denom_revocations_serial_id, denominations_serial, master_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: denominations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.denominations (denominations_serial, denom_pub_hash, denom_type, age_mask, denom_pub, master_sig, valid_from, expire_withdraw, expire_deposit, expire_legal, coin_val, coin_frac, fee_withdraw_val, fee_withdraw_frac, fee_deposit_val, fee_deposit_frac, fee_refresh_val, fee_refresh_frac, fee_refund_val, fee_refund_frac) FROM stdin;
-1	\\x004823b7ac655bfca9722e1cd6bfcf9a1324ad9ab0d1a95482f26c0de77b5eab0e92b61f3a10614d01636e79906e5bd52c4e83f274443f2a77c1fcd092e107b2	1	0	\\x000000010000000000800003d818a453b0b7b2b30c0e1216a1c9571ce064e88ca3cf858dc0816fdfa578de1ec8285bd0455b7de03860a7e99a2b256ffd5d86113609171a95235c3d0a8dd4e2792baefc9788c33a0c8f5123905178d77ad82877b697fd0d3046cdb0df511052a61f88204c4daa1ea01ce1e717b311c9f8187be7218dd20183a5f7ec54997f1f010001	\\xd090cfd97a66a2f6a6d6e31bbd457405d84c7214389dd88f6908bf9382e0f0eff1078458595fb15ef3b98298e4cf4d4569ee80ec7f2619bd5ba2d5410720bf02	1663001819000000	1663606619000000	1726678619000000	1821286619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-2	\\x01f891516850be0be09bea62a6c63622721b271e2d369c8b42da2f23a6b8797bd0b1c45a07d2bf7dfa399d75afa050eafb78a1180c0b7735b1b0621810d5fbc2	1	0	\\x000000010000000000800003a39b44a3614eebb27ea7d80729d90252cfd512c2b803e979cadabc078b99b5869946ecc97364edefb0b7fee8307ab59219ba0233ddc3d8a4721336112b7cb094418b42045464ba38611345d3dfabbb227d914ecb42f45aa4720368c7e6e3e5bd77deec98633dd644d41f15766b489cb115122cf36ce4af451a64364948d3b8c7010001	\\x0017ee3d25983a6bf3868b095cc927067e293735f27d50ae62840a8ad02d69730a39db1e51a5eb08f3f9b6b6aae6faa4e9186f0647fed644d55848977592d003	1675091819000000	1675696619000000	1738768619000000	1833376619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-3	\\x018c72ffee6c92e2f14ebf13d19dc6921fc190c54c30638da8e80a9d4aa44f76b5e6ac26b7f1e33991f53444ac4f2fdc3ebe576954e77ea622ab7ebd69941c0b	1	0	\\x000000010000000000800003c01c77224364cc489a2a1efb84459fc61dda317736d1e2fa524be5ddee7977573d672f8080e345ada170d4545a62af50ef7d541bb8a1fac57d2dcfcd6251a08c0090624e9369fb23a4dc03a73f7ad3b22c4acc372b60d8d86a4fa2e89635dc42bebd4cd66a36ae28ea1a9dffad65115adc316adae667f6dd90a46af84ed66b4f010001	\\xbb301ade3f7497993cb0a54127d22e8ea33d20ca384c6f6cac3fbd8ff9b4bc7221a92c8b11c482df2ca7604205dbec185de37ca4737304368a0016309066e70d	1658770319000000	1659375119000000	1722447119000000	1817055119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-4	\\x03d82e51052113855ed4c333ffa76464f5292d0e43d3cb7c879a13c8c98dcc95f58a0df7f26c83413f7e79e92c0e070f6cd0e3e721a421a6a840eec5b7d1364e	1	0	\\x000000010000000000800003eef28baeaf15553ca3120c9f5e21e133eb1e68123b75e3e068843f17436491a3f1ab369009f77ceeaa0b71df4c4d3a95281e10399e0f95e154b66aac9e606876f49d7cee39ebcf449fa8813e516b528aa99f842fa47cff4673be1b714510dda11fb99ddc1a97cd2611ce4445931941943446de42d3c100be3eb63c036ab4988b010001	\\x1720dbb804304347709d998ffe11d2e41bed2fb38338c003b11a11ff5797c593258d76d63c1f6a611f32c87c4c46daab822ff24ee37606cd745bd6a106dccf04	1670255819000000	1670860619000000	1733932619000000	1828540619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-5	\\x040cd1f86e9450306c3a16a363a387c0df96c6b92b7808de21e5c688c1b52cf1c6175e62c310e8c8de78a839fc0369fa595d12cc8333a41f293c6e71466e24c7	1	0	\\x000000010000000000800003bfbafbd445afdb6b10d5d03d481cd833ce569ba8e101d7ce5f5a51c47e195b4079184c386c6566b7931a3c9219c66269b854abe5de6225cceb7afab76a3073b5bbdfa1804616fb61af7d5caa20e5c06f7d09461d9cf367100dcccae7caba0ea119e89f564348461745c6e21d51dc13beec32a6fdd9fc28d955c0eb7ef5c80887010001	\\x69acf048c2c976a45b88823601fa5aa36524a079071cf2d6ea886330cb23a2894ca68118051796ecdb876b372e226021ea47efecb8f3dd44d68cd499e9279705	1675091819000000	1675696619000000	1738768619000000	1833376619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-6	\\x072cab33895bf7f2851c1a1e46ef07f4c141b2fa4c9bf81efcd3bbf50e89f207d211dc745fab2c420dc215461439f04ba84082ce42c6d65aa0f86277d85739f3	1	0	\\x000000010000000000800003c60c0c7ec55108a6b980c5b6e6df17adb40b368dd8b71936634a15aadbd7fe31f7aa7a7fc1838a7a70068f1f48d36320b9cb75afeffa1042ca10f3f73c817a7000308914cb0a866bd9d3a865118f4f78c776b68175445771f58970914342906f5e152843d28f30ed8d4c16a6cd880bd52d4db9be2630ec34dfca54f556f3c387010001	\\x10634c949cc9e419e2651699147a03e1b48d9450f76c760a78b8c632bb883303398392c8a2b2d3d8b12f4cbc0eb60ada12cea71b7a0cdc5dc16e970ad30d580e	1670255819000000	1670860619000000	1733932619000000	1828540619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-7	\\x0a94851a92215843379611fc49dcadd0df3c75e8b8cc521a80d3805aa631b0343a53bc08e90c7083b3db39172f7776f81f50252eeed5dad2547f3a6d20eabd45	1	0	\\x000000010000000000800003b9bf2bc74a0a8d7f4b72064613394dbb8e37ee1d859471f6921bc4b703ef5b5f4342c46cd200348240b328b7c27fd2b42421f2395431713b93c2a6b162f42c73ff4bfc8a9fc0e1ed6ee3403dbd024afd1a6dbf29cd9d8b2cbb417b8d67a9a52a0482eaadd6b94e516d60053668df0653a3b547f86fc225485492f93ced448dcd010001	\\x80572df928cdfe3cbf4f767546ba39d11abcf4a3544d956698875999e0b0ff73f6a007319228bd474ec283d9ce21d6b3225e7f2955db4a3499f9c5c96984ec01	1673278319000000	1673883119000000	1736955119000000	1831563119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-8	\\x0c54269ea65e4680fb0edff83d04c9424d8c137f6264c155777d4d26062ea63a6f4936286d8431a2e2a91bc2726cab1762893ed8e1dbabe24e4d26d5d8a2a3e2	1	0	\\x000000010000000000800003e58dac4647563ec07313978705d0121122d802d157c897a21558dfc1fa72df0579b3e3e2454590a51093b82c1ebe440aa2ebb523390342b17a353564b1b240f6194b97c1531f8b1e680dd9207074358ac4aca84f3783385b8e4ac12edeab4ee5ae676d70b46c51cf7e11c8ecd8608e47f0202b1c9c1ae673611e38b86d5720df010001	\\xfcac228ba0b0dff093cbb5b65b09cf537f8b5c16c466f5b51c05b57043c79579a92ba9a646981d15caeb5b2fc71d85132ee9541fe57117570eb352f7d9df090c	1654538819000000	1655143619000000	1718215619000000	1812823619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-9	\\x0d2c072e17c652b3bc30df5520b7dc1444079b21e5c3be4d89a58604eda4c83e02b3b8f1c0f198b3c8ffd131146ec7bd53cae16972fd8e34744b99591feb4299	1	0	\\x000000010000000000800003bc5ba49dff58c4d5c39ceac1ead68c225f5b438a8f8d83a873f4da847b15fcb52ce74c1232f9888788e6659b375147a02561e40be962373f5e80f2d28a8743622b45c65556e704398aa4af9d972051431697187c83bb03c5ddfd5e6a3c1684f79947bc38a725be724e1b0c888c4eab4a732ef6f6a6030000db3167dd527d93a1010001	\\xc77dc4984d625cd369210aff2b4f37a7e3395b7c018bf89c0b3c2f8ea28782a4fbc905af72a1f7b5c039c9de1fef8c56a2f78387c4b04d12ddfa07bc37cc2e0a	1682950319000000	1683555119000000	1746627119000000	1841235119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-10	\\x12a085b645a1663a800e529e841d3593424f6e02bf1f06bc35daecfa566f1652c7df2bcbe93eccd8655f4b8737dc75f6ede019d4364a0e06fa311718556f9fe1	1	0	\\x000000010000000000800003c8fc5adc28ef035f510d5f5dceeeb3f8159e662e41b7c48c4ac198de3f8daca6cf0c5a7172a6c01464b570cf20b525de74c7f597440c7d73f70e20662b6ef386fb35fbce3c99b4657a70c500f4c140f8917c85f216a5f462997e25941cd132c01d1b4913385e9a7e2898050e2459ff4a7d4327f13924abdf3838c4b795de272d010001	\\xa2bd3980a26f2c22bd181e9599e31cb926b6d683f6f93f9c9ab6491b8f2377de189acedb7ff7c4ab5351cfea5648fd949b4e5c71757c8de9b5101807ac7fc909	1660583819000000	1661188619000000	1724260619000000	1818868619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-11	\\x139467b8d05eee7cbd2593e544291b8636e665562e8583f519f37ca56a7764aa04185d8d50bea2a12a49998a7677822d3d81735e08728fcf5c129da15938d137	1	0	\\x000000010000000000800003ed7f83a04432ca029e98854a7d8045fa7c5bc64eb616a2091d9d0c6c311170501524f479178c15dcb2c25507af8f40398cd3ac08573844c165623e50d81432b1ade88e8a5bafecb79b1ef9803382e8ed12f4860a1cd9282395a9794b2c90758a3075fa6922a4af5b1c388695f6296a4a644265d47e6c54d4406d74d7adac613b010001	\\xb762edbfa80ca0b689438437d496a484df56211ea66702c6461e6f9ab06ccf3a00156b5179b93eaebf3532b8fc2ce04518bf7c97d962c86c999a270541810801	1659374819000000	1659979619000000	1723051619000000	1817659619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-12	\\x1488089355ba829865a2ede38b492fd01a9c829f5b434cab8996a873bc2f9f7095e6529d3d56e856e30bd9af38ec889aea1fcefc8d72caf9f9afcf19c0dbf9e8	1	0	\\x000000010000000000800003bafd97f55da5ec11f054e9bee564253c5cd2a0a7b184cbb97db2f683396c425284c5c53698bb39dea5d96b85da0abad5d5ed18a668ab07403de73389448e3ae9af8758be34e47b614b4d81981469483d4b8419e710fbcb254ebababa3b5b3d0a0676bb59f6c54f3067fd766b367425dd79a88d9838112fc6416941bff04bfa1d010001	\\x30c40b7cd6c59390be236a19db378ed567fbe0ac44a84e24bbc73a3b4359cda9770fb750247dd283f01a32f013e2ab36a8777ded5a6c1781c8dca08f20066808	1669651319000000	1670256119000000	1733328119000000	1827936119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-13	\\x147454ab30248641c6de454a3c8c69709155e595768933dffa77f0970c667dd13f60b400d42773713cb34cf2740dc5c0c7d0b9ea7f5c83c4a583a16ab6f3c667	1	0	\\x000000010000000000800003c0594cb894cf21388cdeae77a4350d497f50e8c78ad96aa183563971f2a6afab37d4669532312b873a699ec057738c5761c18d3bd38d5b06fd1aca670f5a0d2bdd2f3b229970d1c64f9465a96e6b6e66f2a1d973382dd3da2b91aa4a661e617c31ebf6fc920fbb4fb829e8827beb1aba26c36e51beae36fa200403063813d833010001	\\x3d7586085b25db703b1d11a33d4d7b8ed3cdbcea03f17fd1ae4146d6b25c1e9ff5ead609bb89dd00895af1ca4ef1ae2aa50da4f13d73a22790704848e509640e	1657561319000000	1658166119000000	1721238119000000	1815846119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-14	\\x14ac04e9bcc769c4eff986272a99eadd2ed64ec784bd0649119586a0559ba7b666b099ba8d7f45f8cfbc197d183cad2d13fee3af460756c6c10b7566921c937a	1	0	\\x000000010000000000800003e2700d32474c9aeef7e72e9ad0ec82c46f6cf31fffe28d1b59d5eac0353cfd73624dca4cbb3fdc69be98be345d78080a92b487b52c9682e8068171599db308836648700fb859cac9cf75c11a6035d9cbd5f88c774b831f54010721926aea1a617c6b88aa55a3cb25f936d260ff614d7181f7c0488feb0c68787c8d5ce984eccb010001	\\x335d00e6f49fee9c323d1815352f2c8278c569706d370b6eb313465eacac99b830b6ed330239eb0ac40bcf4eaa158e41e2ec833c801c75acc5a4fd75768c670e	1666628819000000	1667233619000000	1730305619000000	1824913619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-15	\\x15e091117f1aecf679e80a1134662fccecf821f0b7a2c5f8b46ad0ffd3bbf50d53b54dc7212878540105c0081fa1b3f84ed2ed6698629408a316dc9f6e012399	1	0	\\x000000010000000000800003a6ad13028ed47096f7b22454d09269a2b19c62baba93f2c3786f6816e95e2c268fd992bc1b0954bb29f1bf4d7b522c7b31bda2a45f19078f1de6fd8b0af2fc22c2e3ca36bc7538c4fc04a26b8f96a341be2f4735c1dff4a6dc93bf76ec04cff0b3bdcc251d08c38c20495ed69ea0056f53888fd2a89b99155f95129d886142c5010001	\\xe1787c9cbc2f2a6abf416c08da9dc5a8956a37ec8953899661f4439a3407ca669de41f4b1f3363cb455b4614682aca1a9f6e1ee857659d4ebd42e1ff4e58f80e	1679323319000000	1679928119000000	1743000119000000	1837608119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-16	\\x1640feec0a7c084b617fc6d0b882ab21e49a99101ed91a70c63cd20b5345c0b6465c5e68211605a5965f8124095edfe3364ec2889ed545c270a06852368bad32	1	0	\\x000000010000000000800003c38db41b8915322801081c9a8cd0fd481185af21739b8d8ab5467f9ccc2697b5768201cf1ba79aefbfeb6c60751b35279cea31ddbad471711de954333c6640cd77928105c387e3cabebb1b2cf2269a3a8be8a88c7b5a57e087e4caf319476bb3386905d1150bb084902857517024336669df824aadc4562eb73a05c5b4593cd3010001	\\x28a0110db4f89dc058fc6a002257397300e81d7eb84b07c95ae07543c9113310030ec7a457a09a87464f510c1eff633565c92e5fb0a81836773923c88ac94e08	1675696319000000	1676301119000000	1739373119000000	1833981119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-17	\\x1930fe6a60cddbbffcb071847d0522420479d1789f3c09287351ae3915d616ff1481f2a369e915b2d943957c8b5932a34652afa5bbe7447278f61f70eb05d4a2	1	0	\\x000000010000000000800003cc8060c42f401c9946dc72fa91fdc666f832696a54a50a6c448fb8cdf2c9793a531bc01730e656abe91171f5a49068d65e52c5f42eb0c78f902012d263c0e3fd5eb724bedd1d29575d70c789db4966f8bed224dc798df3be80eb283b67315a7176b1efe46ffcd85ccffb33230b1f9612fd9545d2251afcac0368bf443dcab617010001	\\x5ca20babb56c11c0f02965a11c30e8f3077d7a4b468457d02ed2f075934207d409d38d2966ad28ba81916bdf922fae7f41f51326fd801df5149fa21a6d11bd00	1667837819000000	1668442619000000	1731514619000000	1826122619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-18	\\x1b6c2f2131eed89f9d348cd226db91be615060ca616732151debdc3900f45b6ff2d8a4aae362eb68340ad3c87d02a9809de89ae1f2fc8ebd629ff0f449658aed	1	0	\\x000000010000000000800003b699ed10e2411ac2c3650c6b6bc2e0ceff6f430c3b61287dc42291858f3343a23614c09645a9bbf480e8b7f75fbde74684130432d8f02beb650b79d889234eea40bb116429f45356b797b461c224f20ca05d4f0ddb8f5e9448f0a4a2c463ee9cd4145c3a7e28fa28736a0abba06e0d9a7b72c93e62bff17b6a1525f8d627e6db010001	\\x6e85df0a3e7a016fad4f90aa4d6bbdd60a74614e2cb12d30c41f7cf0a0d8b846758e71e59ca0e5446b50cc7b9666b2c370ba0b7052ad0af7367876bf95cb9b04	1656352319000000	1656957119000000	1720029119000000	1814637119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-19	\\x1e2842f4e8e09b3ff10d0bf1825aaf41c78b2f3de241a8c59d83be8e660523c1852e2d68b95046414944822530890061a965face8754bb82682b688eca947b68	1	0	\\x000000010000000000800003b5b0bf87da7b75be3b7976790d69cb49f8082722e8e11d4b09c53e52f50b51f41fac53895590951856c7882375f3a9fca46d2768221e47a1a2f01ffe77ffd7bc535867a806c4e5be287251270591d55c42be9d0531218ebfbb890f4c164fc3a12a64f085c74f8f4b77cb8ea23b38c2cb1737515db3c63726f8983ca7591ca597010001	\\x59e945362ddac5ffb27f4e1a3836e941c09ae15b6204d02622eee2aeadb9ba1c7fe5e4a260e67bb9637491ed9e2e643ac5b49343b43bd976af4e030bf5cf9e00	1663606319000000	1664211119000000	1727283119000000	1821891119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-20	\\x1ffca0cf308134d98a4043c2201188d73d8df6b7cd6284ab6c6cf6127ca87e051d68ca82bcbf9e6cf01000b5ff57dfcbe49b53e5525e89c06c9a99b2f161da27	1	0	\\x000000010000000000800003b967f95a79f3890ffa4738c38230e7664bf1ae8b89df84cfd4461a97f8e1660f857ae6a30e6b2d5137954bb47c48287d2df200be464d3eaa5ecdbe36fc68a1506d7157bef416a1a49459645925e9d3049f643b8f6a175af8a5cde97d9f93d9e5a8856f6d3170036020bfc38aace20e23d1e81269afda6875cf46630c89ab60db010001	\\x53d262425ae8d80bd7cc92afdd5f6ce2acd5d08385aa819c39acbb1ef609a49aba1cbd65842a3c26701471082e29ccd2a73bdef746b3c4c07f424f7d2845a104	1681136819000000	1681741619000000	1744813619000000	1839421619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-21	\\x1f987f8f71ecf31da2ac74f789b2baa0d448b9af4d048e7629b90da75be1397a74543fc8b0e0f4362fdcf1d35936ae0b0f287266235b4d2087da514e35467189	1	0	\\x000000010000000000800003b7588bdc9345b5da029124211f97504db3db5b5c706048364f5f98147cc36c85f7fd03449aa7b834c15eacbddc2656d565472c6a143ec406fd3549f79f79498d4d5ecd2cee7a845c7d5db1766a06ab1fa1b3e84c305d152f6d3bf02feff8a161ec7ddf53a0e10b7130c5ab94ab89cd2ae81eecaca9f1f9155698ffa01ba69b71010001	\\x96993f0d2fff901a6b07d228acbf01feca97d871145009a076162979f6976ced76211ffca3e8341dad544586ae49bc6c3ff8356141ec8a8aa774d2147b9a6909	1660583819000000	1661188619000000	1724260619000000	1818868619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-22	\\x25a4ecaa03253a7c1ba33f5318b89c93452ffb7718e4f90ded2ea39865c1ffe66071d0f5a0733de25c5acf09a2bfee4f78b7716f089a5ae55e904e2512798e2e	1	0	\\x000000010000000000800003c5e0ce4da151f2d74b26913fea4469af19436db0a8bb1b0598b7328f6313d082ee7243b8bcd22648bb90473ca417fe4b6ad20d35d3f5134d7c114e567f70bf8bcbe73f153cb915e4625d8b60d8adcd3d7a716c582a5d88f183d2ac259f8f237446797952c698d04939448fe9b1eba84d8f970631f269b2aa56340e49ad442e77010001	\\x2ff6b621fe98d0fccaf884ea58c82e2ae6fa2b105a803021b37da0c5c055db52067c2f1fe062f258455e52b221b24a366a7c4b953dd0220e390bd7adec8fe201	1663001819000000	1663606619000000	1726678619000000	1821286619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-23	\\x2eece63efe16c36ed0b7ab7588a793fe855b557f666662200be70b67d750d5f105e38ecb6f812fb3d525fb2ad52f6d9f71ead9ab576969d5ba5acee7958469d8	1	0	\\x000000010000000000800003bbb157bc54266396020ba13c371ba5bde3a9d4cecdc3a12d29773af42c0b1732f54dba34bbe4bab3278dcad5a12ed75db8cd11ac0ea1e2ff7168761854ef6b3d43b6df216dfb1a5a997d746a569dde3f9fce33c79cb95fa18201476ace90f3d8ab23b705d5b1c31f64d98dad80637c449b1ac56521b5795b90a00f7a2f9237e7010001	\\xbca63172f29277d8fb432ed4a022ed0335fa790f1e0abebb89b7f7f91304cd2cb5361e9d19f60de4e588ee6c4b5a505007cb214c67c7b1cc9fd32d6a08331e0c	1682345819000000	1682950619000000	1746022619000000	1840630619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-24	\\x2ecc0ab45b29452ba140b42735fde7739f596bbe58df341e4afae9faef6e9515f8751e909301c5f0882a64f96f17e0f9b570f0775caa0dbea1e7e9efbf9b88dc	1	0	\\x000000010000000000800003f031bc7b3457ffe1542f027ef9536c3941a9478aa068c9645cfa5f31b13519ee544b96cb90dfb30cb7dd280a8cc285f7877b5b2ee73d278edc0ec9548e2b7eb1d5299e7e977b9e71e54adc4e9ec90013f213b9478996c9ff0aa20af3ddc310ac96acda53d3ce9f353a7146d67010307ed543b50379299be56adf09d550ebd7f3010001	\\x18e6d1901daa255ed6bc4954a3e31edc9d5bc97b048ca4b8c2b766159a9ae1189e06cfdc0ce2d05ef29806ba1958915dc6d8c845fadbe6bdedd3913490f5fa03	1678114319000000	1678719119000000	1741791119000000	1836399119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-25	\\x2f040de31f779dde4d792e79a7b9c023f279005270e2aaa8c910d31293083fb73ecc5395c2dc3dc27e03bf0f49a3358d0c0770316a50dc869cc2712c5132c9f4	1	0	\\x000000010000000000800003a9c6ac9990c60847b70b22db767d47bffdfe720b6341dcb0440176ed4424aa16e7a1885817bc760b7482a24986494c59a3a0185f5c05384da69d9e8dd02ff4f9deb54dec32a725dac2d0de023e98cae0970d1a9e55d2c1dd30ac7bf643628b39ecd109499290e03dcc2d9c240585d05fb508a0b6f1ce0e8757d3ff8b897c0bb9010001	\\xdcc4cc77bffbc46569e0e805e71440b84b833b8bdcac0311d937424680e1210f795151ad9e5da27b73365a6d0531e5e37a0c4d68aad366d267810408f7355206	1661188319000000	1661793119000000	1724865119000000	1819473119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-26	\\x33106cc80d41dfa5aac07f19b560a9f06f2880312b85c7fffc0d4cc94a59229424253da8c1c7c735284c7a1b6384f165c475b6b84d057370a0fe12b6ab221681	1	0	\\x000000010000000000800003b80e6c4a4e9ceb792af40b600bce1e9a287f7a5ab363ad06f49725f49b30b8ba232424e5a2e2d57d2aae360d8aa3777400011cea2887096de279549d3ae43ad90146b55e9ec79e8a03db35b694d9a6a93563addc4b11d1a8bab42d2124b055bf7dea61491a77aaa8a5fd2e41c2749363749f6b7ee76055ae26614a42680136c7010001	\\x431d44b432d48b3ad4f593a0311a480f40c4f01cbcb3aa91d9d439162a0eb898e90c9d07ee0ff00d0510487ef520d63b565832e38582a984c57e2103618cca06	1679927819000000	1680532619000000	1743604619000000	1838212619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-27	\\x3b0ca1f6cc54d4ce08b2426b9b889a23b76ab38530344053a076572c56a52b47944c9db3aeae7a8d26befe59862a32a68205a278b54012aa26d0500ac5d8c388	1	0	\\x000000010000000000800003d8bc203730b2d6c5b17451ffe45f7a13deb083b5262a24f5cfcaa7fddc1a853c9b66cad13d3447c03edf04a6ac24f039de18dc303ba4d6dc4c06e93839accf7bcc52f251464ac0cc704746debff1b9b6cd9d9d59b0eeed6ea967004319ad5e88521788f325dc05c185d44fc89015d9b048c5cd73580c927442f5d9dde4a17521010001	\\x32da353922681a1b689e40709b9feec2a1fb2ce2aa83aafa661797638c2ce045d0d7f49b5f7d3659b33a32dc2073f0c53ff1579a6617a50a1d9483e4a1a2a702	1661188319000000	1661793119000000	1724865119000000	1819473119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-28	\\x3f507e44e018efc04cdbbdeebe015983fdadb65f56ac1bddd374c3099a05a9706142ecd17130d7bbf6c969dda4b4aa52e358dcb7d4fe34c9afc2d37d12522b6c	1	0	\\x000000010000000000800003adc9eb936e2f17238f1c7df701e88c42eba6ff53250e52d46e1a1a7deb0b546c852da4b39c2fb05c88dd363816d7c242984c1cc30668f43d74492381dce4224da541767cb06358d07b9fa6964077828d7932f918389240a40168f2f5bb045a952fc0113c899e1223cfa48606f2b77089d7109f54a431ff36ce3ec72bdc513a7f010001	\\xd9a5e6401b57e6bc29f76c09f8d2a28fc09aebfa88a474ea8406374565f1012df6df2a765780cbafbb44f5b7490961355046c82e7d714f8bd84277ff8320d905	1652725319000000	1653330119000000	1716402119000000	1811010119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-29	\\x40d4d453df07b4c9ec3f91df893b9cd5c0cec25729796d679b16fee727b6076ae459fc35ee8da43cb4060dce80ddb191822f83163700ca52b0593da340702e64	1	0	\\x000000010000000000800003b32d940740cd9ad66f8d3daa1fad0a119a8cd0b0f66ad8ee50513255840201868c3747e790a361da7289761fb89e0ac6f6a5a6315e61d2a605f3bcda65ccf58be219f38b2d15cd595334aa3dd0453d061d0d92bbef6cfebf8cff7c631ae1130eb07198c11f5490022357d2d1d85ddcecb804832211ca0c2e2a2d906e10e0f375010001	\\x75346144ea999759071bff6470262c678538b333d26359002889139569b947db1a9578932e7261130a4cfef44a97ba8b8f23354597c01006ce9ea536f75ef60c	1658770319000000	1659375119000000	1722447119000000	1817055119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-30	\\x4be0149a6f4fa6677379c4690ae2581928820749bd3640e536b03e3734d3a89d26850f0caed19c00463cf5a8e36cef92e98a206d7bbff02fe9b0ccfb80505fff	1	0	\\x000000010000000000800003be9145e87c24ba8d862e6e85c0b3bb73780adeb57c3f15d1686233543851d44837911819fb5d8a0cf6443f0c969df62c8f67ba16951b78ffeb2784b305d94dd47a9d1d15b8100b6ebd15e86a100baa370d2e248d8159da039e099b7634ec5cb184504f6b64345ec2bd05941257fa0fddf25f17991bcc54f645aecc62f8a8384d010001	\\x5aca5b0b249f398eca6e3419bdb1b13376e244364c32590668e8aed61513461470456e4d5b6a8ec626e5732c29e4fe428d2562dc704bfb5497a7b893704e330c	1678114319000000	1678719119000000	1741791119000000	1836399119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-31	\\x4dfcef9f52692529d65d5e80a921b1bf4306a90f33b97554b0d4853f1b2f4d94d672fd56cde9bc4ae0bc073b7d60af46514be4f6fdd7ed62db11dd43b36965a8	1	0	\\x000000010000000000800003c39df8cea7759c4733985a0e1f284e6f7e5b6f7fb05ab073804b2f21b6baaea74600aa2e2f6fb57d6a30c75fe45127fb1ac7c650810b4a68866535c1ffc8eb90e680c61192173dc2036b6a6138209baaf286e50796817f89ec7fe25fa6fc9375d517d03002618356da4270949901cb98136ffa1f0ebc9a2ab857dcf2c931751b010001	\\xbd264922c5cb6f6330b0d64f99ced161752ebe752e63856de3b9974413c7936d3d14581ba0c0d2ec70057b1ce0f6fbaa8c69472576fc8c8c3d1acd261fd0050b	1667233319000000	1667838119000000	1730910119000000	1825518119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-32	\\x5098399c947694ec39bf2c92cc60b1589d02d53b17dc883780637211efe1857cce7af4e5da4e00c95ad0c9a44eace031e1a1fa8c5bfefa92aac4259984fe9283	1	0	\\x00000001000000000080000395706c0242e380133762b1402da2590de488350c1c7cecde134a5c6c13b10193194a7baafbc729f1a9816a4102804f26c10a2a92c1c66957cb893a4b9db429040c64bf8166e8f9c3d4dd3ef2e912d0cbc6669c86f978099b37c7cb0e6ab6d8370956de3a6f595359acae526fdb65aa491a727a3619fc4e887aa06d934b36571b010001	\\x1007ca7e0682e2f7c9e377b7488d38f2b552431f4a014e318f6275ada38cd88dbb2bba89e8db1b7625f7639494dbd25c864c0eea8ac612b64c78bc587c645b05	1679323319000000	1679928119000000	1743000119000000	1837608119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-33	\\x5190436110eadf7a948e4750353c864df19bd2b2b44095e9f271775b0d2a8e9d360e9610a94dd04a13fc20b66f1cc5e01bfea58902203b3373fa851106c684ff	1	0	\\x000000010000000000800003dc9939f141be6b12445b45e3792f24a77c80fc0aad27a3708353d8e9eae233f1be0d296284b151e4a453213f107ae9ee919f4f9114b930d09438b7fb55ee0f83e5898914eef6537154653e3c4489c67b458ef5479bce4fbf27937bf7578160e28ab5c2ed02c221e1897226e48ad02f74f30240504cb101b1fe03399b8f891fc5010001	\\xca36be6639509d883eee075fdaa4f8793b4dbe047460de61eb2d74d3414fcb44a25658f15157b2e7ce1d87891f47a3cb1136f22c0013b4d875567efe3a0fc403	1666628819000000	1667233619000000	1730305619000000	1824913619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-34	\\x552489b4c4042a57826c260e7c653dce9b29c8c2951c4fb416579e9cf2d955c11e6c7daa36c1ff536ed648eed40e6cd658d49f5f23e3424802315e158d29cf21	1	0	\\x000000010000000000800003d1af0a7d78293347514d2476e66e51a69ca9bc5b0269e81904c864d600aeee4577b7e4126d6f3b50bf288b684866672cac65eb0d5e844e8f0fc899c4d96661c6a75e0010121e08bc79c4696edd8dcf81fefb127353bd4ef1dfe30c230577d0ba497f22af9db4380c4959d005544951694bcdc9e8e1b49f6a96d171332e534a4d010001	\\x8bc8bbe2048b9b4ec03955fea2f5798ad9c3c816c7842e9736dfa8ef0c8ca38fedbac0473624c437c34e996112baec10dc0afc9c60752af634dc05ab3eb64608	1681741319000000	1682346119000000	1745418119000000	1840026119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-35	\\x59f05a655edf77b951a336b2b8cd5cc4422529286a4fb3a96a38801819b706474630874a3dd682eb6fadb445ec244b170dbcbfb0c2e7479e8047a605f6376c04	1	0	\\x000000010000000000800003c3a30aa7863d7f6da71e07e8ff9b769e5f16fa075a9910cd0a2a002f19c8ef47a1e5ee58c78988fe4eea3bcf92e250e04a3733c42a91a4b34db4114f3f550b5dc16a9d00771bee253ca68f6386d559310e44dfec40b897ecfd6bd5666467c263cee389f1414353b13de396d693fdbdd72da660579e7fafb587f815086f98de1b010001	\\x711edbc6cd50d09cbe3b7ea6382db50d51990512636f71a2560c2e1085874ec3b86f2b948a55c0cad6575b740ed9136bc2a795f9ecfd5211169688a0189f2805	1652725319000000	1653330119000000	1716402119000000	1811010119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-36	\\x594899550e4728f23eda3ffeba413107c554a10ef43bddee1438be1a7bb74ef966baf056b9e7c00c1c64151d2241522a0582836cd03734bfebc3700e9cbd3d47	1	0	\\x0000000100000000008000039e063adfaf447ffd5990dbbcaed2c0be619da54b1c6fa680ac1b94de073392f44353523362deba184645aa0a3e3061372fa03c3ad75a2ca50c3101851b5eb55fe3918fcb8121632a5b0344166c2e734d826c7d517830655579f9c763a2dd9c587f06ba3c01b7b23f8b7864bfcc3531b1327bf1f260b3f771b7406c597b4058e5010001	\\xec7c7d0aac0646b37e4683360275e2f219438f6652d5ad6dec1684a96b36aab689aec57b1755cec59bfd8b7e87742c4ff026b8203157aff9faaac7b490a8ff06	1664815319000000	1665420119000000	1728492119000000	1823100119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-37	\\x5f584ba5e01d67574b36676ba0533616fa48d6898ff276c1d43deea8f6784c54b6e78e4e7146946ef7ae45a1846865b6523ec4f6827ce3e8fb98aa725c975bed	1	0	\\x000000010000000000800003b23e51de4549d1ece86db303cde2991086fd5216c7627a655dc131b6660bddc9318db9ddf83664af3ceac81d5f6daf9426e0ac30173ada6f8fd68a219878c776c69833eacd3feaff885814d9835e67bb065b0b5c29fe1e049be922aee4ce482ca4086b7bfc91111ac6d9d44fe8a4c2655d7a5582110be1313467e2a101dd4ae9010001	\\xd506c0c594f6dd9c30b4c7198d2dc20b47827d1c738ca5437bbc4dbf9d3afd27f957592bb6e3a71a9ab9dfc5da432ad2e333c6761ccbb84e9154379d04473207	1656956819000000	1657561619000000	1720633619000000	1815241619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-38	\\x6368c3a09b5d85db6beec91fc0f88021b24f98de464e337c4887eb14b3cbe67b6393852ed4cb1fd6447cf2b045516f0da09f3dd4602f54b4fcd869f896155e31	1	0	\\x0000000100000000008000039a28479cbe2a70009b5b2221c4872af718af69fae21664d9d820c9838e4f4221a8ef5a2d44b8530ee102afb2a202a940adbcab6746a00f8c0a27fcbacca31b944fe784d60beee7a2c9bbfbe310f83333d1e1af02ae28dc89de21308e08d47c3c66337c77bb5eb0658f7137b2150291863b648689f85d941d9817ae3b914d072b010001	\\xdcfa0b12e8c5210ab8f70972bd9e43e1d1a264065fcbed41d10deaf7fbf47472e9c0408dac7b014d4b06e9a13f050b26f4b24c3ca10a7960bf1bc25c2164e60a	1659374819000000	1659979619000000	1723051619000000	1817659619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-39	\\x6870f9e403438c072c4751d63c2bdee4ab77009ab61b1a1f0eef49d5306499de436d2e191295bcabfccb02510ffe07383d6a0e121aa5587c78ec13c870d1d559	1	0	\\x000000010000000000800003e22612097b08f7597fd780b3ef7318b96fa72ffa2db9f2e7811593c8e3d533b9379f5657461565c80747ecf0f5c1ba11e83a408069c2fc39765351ef070968f3e2c446e00e4f6e3640e559f3e00806f33ccca8c47bab8bed0d8d528151771c4aedf44dbc9764155ee20d8d67bcd758ba20556cb12ee994b210ef7967c6e04817010001	\\x7b8fc0501a4526da85741bce8b44b902ca021763e8a2c0785f53d6d68440d728182e85a64f62945024a6e6c97321e600a0da8ad19ea8ade9193952ef945a570b	1671464819000000	1672069619000000	1735141619000000	1829749619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-40	\\x69c856b181910b3461da5fb345dcf4b5a42e67c3d4867ec20c4dc175d24226890b826802c43dcc06fd056061ab1c9ebf5afe8e835b166ddc86839fbf1c8a2695	1	0	\\x000000010000000000800003b8a1dbf610024f7f73884789b9edbe34b0691e065abd00a584e560a69ba98fafadfc2286ab01935947824c2c1c1d76960c76784029eaa30637c98f2742f8a7b25ee42f599d6a73ff7093f9705d10b43ac7610737201db4341f9b787ca66f824187afba6c325328e3c0f28b8f9d4601d34dd24d62f99639adc746076afc303ab5010001	\\x24dd2d574c719630889734ebceb1555c7febb48273b9aa5b73717a33349bc084f5f8399bcf5f6a93d97de82d5f18016484b17f511d3857bae003e31db824b70c	1664210819000000	1664815619000000	1727887619000000	1822495619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-41	\\x6a90b399c8dc009f24f3df471b9059676870475524e6d5475cd623666dae2bffd9cd48037b7978e03c84f566dc18b882e75bdbf09a0e6d1871dec5f82db8986c	1	0	\\x000000010000000000800003b26e94ca99fc331c36042c5fb51b44ac3e8d0f42c6c7461fbaf4ec42bcd3d195cc403878e693139162089258991215b50940665a475932f34d7ca28894d8af26ca6c40a1dba89bfe6d6d89cafa103fca00788f3a9216ab36998355dffaa978002d14a8fc24c35d8fd79e495578e54a97d8d4367dc71f55855e98481c8b974e45010001	\\x504ed9cd919e6ea8a3166fc70e2ab4bc00be6afa1b7bbe738c2d927ec41c7c117f58237bc7b509c6a9ae65ca4b309a57c7a00e51125c86644fd2e4ad5b2cf50a	1659374819000000	1659979619000000	1723051619000000	1817659619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-42	\\x6e34f340f98ab739c10a4353fd312b9f68b351bea7c1258fbc016403a835ea998cd20004e052dca1fff10dfa86f5df358b893d7fef8f215b230d1ab454911439	1	0	\\x000000010000000000800003c565a4062bdd0169a8d2c91564794551a66d20b08e0c9f57306d5f5ce260e904e34028aa189b78b09b477231e4aa88f33b2ca093fdfb5c99caa961044bdba13da80974eed482b01c569fe6e42e990a9d4c6b17b183dd9896c2a7af954b1c4e50f84592f63b30ad1e214de82028964c719751cc609213c178260554b356b86e61010001	\\xe6a6bf63e63eeacd306303c90a35c98a484dc9ce3d4c53b5ba9884d8a5c0e8ecad4637e01bf2e8aed2f752053caa63a5aa76f8f1f5dfc306f1294fa84000130d	1670255819000000	1670860619000000	1733932619000000	1828540619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-43	\\x6f20b4b10227b9ae8f28aada7721ce296e38a8101c1ae8b9552569c28da3e258f45237f8206fd91e8149442e290351a5ae2a57577c84972dfb0a00d085e6a858	1	0	\\x000000010000000000800003b6dde947a2ba647ad5aefbc04d46860168d5314ed55d2f92416fba4f8c0aaa9e2100732cd0723decc6b503611fb485a40370c270257594a56a5b6696bb6600aeeeb990b3bc93fd155f4984eacf9352f9007e38ba6d219a558f0a1432efd909d4378716613c08eff89450b43f90175c90fdece6e3e5ef0d345888515d7c6e389b010001	\\xc4555433ed01095b56254e803ddedee9f1e6f499e1cb7583b92d8a49cf51318da45b6e563158a478c265801560793e276bed220948fbe9bd196b04e16305c307	1657561319000000	1658166119000000	1721238119000000	1815846119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-44	\\x7578d2f1d0878c1098b34f0007fe0830fac4e5811c65a2b4f8e675e56e38f5f55d94daaf20ff993cff7096652f67d6e588b1c805eb21384ec3f68e3a943f87d5	1	0	\\x000000010000000000800003c7f6d83b07463bfd4394a8eff5ce779846628501a90477234086e53c70bfb0bc15521be931de29ca79327291c3ee154c56d601e8e246a5e05525bf65b7dd6104a8afac644047a37d7415550899c583d992f701c940880f0864faddd75ba7c0574accdf114d0e743e1bf90993709212b5318eee55b6ab5868c0dd4a044e1edd29010001	\\x5ad92b9b4f1a721b7e32b531bdbb72dc980d4a013010d8962a5de0fbb3acc05564c0b786cdaf7d049977e976d25f0d95a17534fab539e2d06bb85e842395f30a	1658770319000000	1659375119000000	1722447119000000	1817055119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-45	\\x76f8d5267b3d7148fa5c6a709001172af3649f8a4a013fba01d82093300e7d5c0367877f49e8214ae40e73761a4733f7272a4d99ced652f251011ae0c54ecc02	1	0	\\x000000010000000000800003bea8e71639822d47c17980581f90d53d44252daee1e50bb99751a079e698f3672f44a7647bd5c218a8dc8d95b4d42bd14b18a3bd5af6c66691d5209bcbe8c2c50666f694cbdb7594caafebdd1786411a92a1be7423458ce48a93389e234469a7116f7e3d5bf2d7459597e7ae0ffff337976db1b3d32659a3024663e5dedd4225010001	\\x1e3da1b940ce868350d2a723359b20fee6b505c7569f8e39d4a4e7f9463dc789d8a4cf794a73edfda77614d8701df5f36d8021274c9c0b11e90ec99c955d7408	1651516319000000	1652121119000000	1715193119000000	1809801119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-46	\\x76d89f34d3d6e3721fda87b68bee3a59e35dc8a1886be239228ddabecde3cbfc63b057fd1da1fb8bed36507cbf83a7cacac4cd28efc59df9812b658394312d8c	1	0	\\x0000000100000000008000039ee2f9c7ea2c63ba1a488131af3cb6b2716bd6459352217ba377c11f0f5f0882ac021ce5a28f882d1ab8df61abb0a35ca7f20b6e5606e10b69c2d1a907e6d56e5b91e79c454ed1943327358140f74b4be743932a67255a603e5d3fd7c2e36f1bad53a00b85f0cc738967c6235d054735633616e80931f5660cfe9885f1b9742b010001	\\x67448b37e6adb83444e063545b99448dbfa3cc7f50be553dd7151f5a80ef7b2df46582fa6a7c4099a0d3e0bdb0778a373db3e329a9ea795d78351de7aff2720b	1658770319000000	1659375119000000	1722447119000000	1817055119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-47	\\x79d0ec7b885ddd3ed5028e8e40f4d5715fba5c3148d3791a4f4463ba241db3dcc8ce3a8dd69cd74472004441de624f73cd3698f2ea6fce87315ae864969b9931	1	0	\\x000000010000000000800003b38da5abaf11df6382c1b0792eb3ba90b70cadaf6eb3a4c89e4617b31d0eeb29e4579dbe7c491cc7ad23923d9e36512481b8a6e28eed6a02d182b3106ecc07de7e304d74b8e31bb5a7f566ff6f99880a1aa06a77fd1bda9559f5c02929d1a4c124e383992346bdf2238bddf613423b6db5d8e714c885011a73bbf5da81bd20e1010001	\\x060708e88803e22892812250d3a2cc92630584e554d3225e7121f6d5e778613b8f11e449a770c2b519abf0161c6f90489ba09074d35212aac0259682c8390b08	1661792819000000	1662397619000000	1725469619000000	1820077619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-48	\\x7a90307112054163ac58866d87bc1de1efe2b62537e484563b775151abee635e3b67012745f99b2cc53564862d04d94e9b4ad4c02c01a3af0bc721ed9c822723	1	0	\\x000000010000000000800003c4360fb4b4f2d0eded1e71bf15787d7d365268b0e510771a4c403482e53dcbf1dbccb6435a6b5c1dff57bd32ac6e4d9acc358a2a75424b714bef1c26e95ec15f8ce29f3c3e4ef1e708c693b66a7272349d9ca89c289c301bc87fd2d9005ce3103300a2826e375080c5170f945e97473311383767fcd4efed7de10a21e5924103010001	\\xc185b4ecf887ff308137a6811994bc474c03fca5d80b97aaa02226aa27d8dc3a9dcce3570da01ce1c3bdee6d53d7e931cfe72a3368afaa800a4d3aa8cc40c905	1663606319000000	1664211119000000	1727283119000000	1821891119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-49	\\x7b48dbed47bf43b4f2b1afac57cf95cbfddf5767711c101db129eff7a614ac2847751fc4c44aebd302704d9dcfac518e5051f3e6db41521d4ad31b012a98de73	1	0	\\x000000010000000000800003acd3b5af9da4361fe255ceb119c33ab0b2e3e087182a26944a6bf71fed949011ced4fc76181420419cdcfe2b1123f6da4a3a0959d6418c0fcb174452671f7d69015889c046cc9a3fb1d0504d32fb7c6f1fdd5df2fd7383dfe2661b186ce0074411e1b16556f2903618426054608912a7f56f35f503240c79f716b9713363eac5010001	\\xbf6a0dd1c4cb9435dada5a097f8eed5d1156ea35ead32055b20e22de4003c98e83564895c2c4392b8fb8c74f9f05f1bd55f95e37bcdcf2cd7fe05546be6efc0b	1675696319000000	1676301119000000	1739373119000000	1833981119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-50	\\x7c4896e25566550e6f669426c6b540f182131a8540840f335c370f3ce1a7ba6bef873a01ed3e85ca6e9a260f83ebbe5fe82b0297c1e7595e9e03e95170d9038a	1	0	\\x000000010000000000800003a3e4e0b3648b4e316ea42435f9be305b0c66af85345bc7dfa7268d6d7b0646d546f74dd81d5d1335eec6ada9aaa393656962c171c7e288777d37c3e6c3efcd2d33c7a558c3f0e3744401944f521065c37c331147f600861c6879fa926c9b2ecc0a0daf9df4976f995666d7db8a41189a834a5841ffb90edc90ef4bf14ff19379010001	\\x177aa63cc8113ba5a4dd8d786b8f7bf25579aee715b8ae27962c309bfa0ec59074eb97a5a8bff0d0342cbcadde307296aa3b63470f98315577a237e97d964802	1678114319000000	1678719119000000	1741791119000000	1836399119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-51	\\x8210697a875449cd4369c10636d40b8bc0adfe1982058c77abbc709e3d890164ec71057e457e4446b90252700c23c3a74e376b76e92c0f4b0806a116e19d9fda	1	0	\\x0000000100000000008000039a29cade9cccc42dfea6dceb3490d0d761a11a5600775add06ed00e25aac68e091dc816c6542dad213bea56623c3ad9ab9ca12950c00ab43f1c57ee565f8972425b3f33437f58b7453bb0097a35b9ca07265d21b0764120a9fffaf78e8bf05225b35a4a16e1d70626242e0b27630221d7a4d94ae2fb3577e7c6c63061ffa8593010001	\\xe39306c4827d0602a6be13941aea8da17e4d903a8aa6d25723f5090ecf14eb05d97985c610c605681b8cea9bae2c0f47116191ac601f13d9e73b1e1ce132ee00	1658165819000000	1658770619000000	1721842619000000	1816450619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-52	\\x8380dcbcefe1ddf5bf9b5bcea5e5b310b79ab1077570f4732037389263c0238e9a58952184d49ddf827d18e0856a4aa4cb3fe58cef8da300b0b1697ef55ffc7c	1	0	\\x000000010000000000800003b671e95c73587cb9720a79db7a550553636e8a6dad1d24bd236ff89c5f1472bd2e56c650e358a342c8cdeb082172009ef78228af3caeeac4b5499019032c3a0177601078a8d5fab3f1e43326b9cb7f3f5107d64190cd9fc76997313f474ea5515cf6131eb66e50e55aa20b94634230ed9d0f4bd04e0e6d17413c968832c424f9010001	\\xbf3b1e9f3a3a8bdb4744013f8a2e81aba024f730e88ed62e25693af4d1caeb4975638cfdfced085c50cc2601b24cd13eb99a670e6b3fb76c9f19b58c6ed27701	1678718819000000	1679323619000000	1742395619000000	1837003619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-53	\\x8ad4bf2ab66e9bbac091c9d506e6a97183adf78cbe0b42250870ac6f418717978845c53efd5c1b149a48fa2fd50d661c5633be4b3a3cc870c58713e7c23805ac	1	0	\\x000000010000000000800003ce914b4760510a8c0b682a7a067b72989b78804707230de48e24b703c9e0f5cac7925e528331f1968e6e4bbdb4bb9b997958924f413d0b92230e57fe73520f6206138d5657f68fbf740df593888d491376216aa6cc6657b5e9add47b0eef1211896bb1a22934cd605786df6c02d1c5011d33b56c95f13a91dcd3c890f9b73fab010001	\\x23585e4211cbbf3c344bbe3b06126062d515019ad3e27c0fce61f1dfc7c2ab96273dfd8bd22e593443fc1a7da512ff0924db9dcd8fe75bc6ae84eca52c80d900	1678718819000000	1679323619000000	1742395619000000	1837003619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-54	\\x8b988114cef8c230bb536511fe01e676af8a6e3b1c49f16c476707077a4396d5839bc77b7b51e1001d0711474b648a320836eca4df946b3eeb08df82d5a91334	1	0	\\x000000010000000000800003c1bea8f1abcac267ab58b8ca7322c827bcb9f445748126eca857078e9774278d98a2fb4839be50bad31d5064a3610a3e7b3e9f95a3c8692deb92644dffdb5ab753611d9e1124e954707f86407a4d0690ac33280e2c2604d5fad399a44d903b6074eda6567648243f5d838dbb12ba327952f33a56cb081083f8d6b41994205f93010001	\\xd945e45f08763644ee2d3c2757bfbd9157a8b36ddd825b7d285f8be3d56b1d5c3219c4822294f15aec2937d525d99a06aa09487304db5553ab524fa076cd090d	1676905319000000	1677510119000000	1740582119000000	1835190119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-55	\\x8bcc04e2ce2ecb4a7f2c06bc19fa4639ba3ffee455b8eb6b260db504537a9176ccdf6c94289c9569678592db64399dff88e1946cfc53bca363b6eda5d3356718	1	0	\\x000000010000000000800003bd350ca5501870b6f53d54f5383b0bcfe8d6ff18fb96bdaefa01cbdf48e03a3ba65f8c89636dacf9f256eb1704877075fff2f6a4f9449ec25ac9e2f4b17235b39dd3ba8109ba01356612a72ec7e757812975efb42f34f3b36fa3f9faf9740cba4ddaec83aa5b9883e11ba67816cd43c89772ee6c679cbac194b0b58a52c97047010001	\\x37d54f7a0c94275101db4952c468cca6e4753b51363793a717fb1db0a0f6fa9569c8dbf2451377c496bc84cfeaaf0c0bb70300ce9c4322447135262602c84309	1657561319000000	1658166119000000	1721238119000000	1815846119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-56	\\x8c505b83cfae43cdc0500d7d186d1c49dcf51e56b21039394a2f805365cd7b988a121abae2aafccde1f5afd24978707edc12753b25d35f0a1c223b74a9f5a3a7	1	0	\\x000000010000000000800003ccdbc68af577acbf45cf7a8c081efec11752aa6f80a9805b32e67efcf618fde80017320f584be50de1039ae1db8088492a1e13b3e9900d1ffc489c11c693f8e2d694f03a1c0ea21b3a405a494cf4487946512ac4f9cfe0c874e98ff50d9a9684d9d15743f0cb111af775ca86a6ece71cc53c8ac1212fd811ade5f5b409081f07010001	\\xa865c32365f41b735eb67f293f5704dd80f48fca2af611071cb3167929de3b5676a2302a0d32b435057a13ddaf8071631cabc51ec24716ab148dbcb2a01a3508	1656956819000000	1657561619000000	1720633619000000	1815241619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-57	\\x8cfc2ad78737a62bb52ced08829c477afc6d60335ab33376c84145271198066e488187a61ec11c30cee31f01b62f7e3d88a4c669c37dac6d624470208b44e6ba	1	0	\\x000000010000000000800003c67ddc55cf05616f79917765fd00c658d39a32d7dc07ec09c28854fd7612e7bb77fbfe6903eed9ddf602cbe1acd2a03f97d7afeb0385a4f2795c467ddc423cd719619c9fa8bc1ab780d610fa7bc662be0e3535e66d6f842c65cf5a0b58fe58d24e2e212eff2ecbb82a212e4642bbb07dfebc5eb86637a3099acf71a151703371010001	\\x91b526826bf2e47cfab700c6ea1a15eabefa5296a050321136daa8ba538a62a63b8489ac2d409c15f546da8b30147a6d83ce1dcdbc78b9957a355bb89553f103	1670860319000000	1671465119000000	1734537119000000	1829145119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-58	\\x8df032d80c001013c5b9ce01899d6569af34cf46c991781dffb4bc53276951ca95a4158f995a3a3dd147a9b6480a45e64f00ef89fdf2c5522f3fba123a6dc661	1	0	\\x000000010000000000800003da2bd6afa6b243de84dd6e9964a8497305fdc592785d0623927999f3e9196f1df9a4456a18eb9d5a2aebc2be6d233f4707610c952b8902df90d6a5730d7e26ec856d4b60dc602c2e7ababd2310352e9f489e5592b0c6ad34e72766153bb43aba0d0f6b0d27dc1e2f41edf8783d8f3c10d566fbf85fdea068e3c5a44d117fa1d9010001	\\xc579c41d3ee96e322be231c0229096f3d8ad5d29cbc821556990208fbdd30190cb830cf4f93df571d3ecadcaccdbe76ad6b34c0b0b894cc7da372b62df0e8902	1674487319000000	1675092119000000	1738164119000000	1832772119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-59	\\x8d90100f42a1a55e2dff06431cbd6a1a262a7e11daaf14758de93bbce5016e9a90943191d942c3aad84d18212eec4fced8406b153b4f8806f34b3aa4c32dbd3e	1	0	\\x000000010000000000800003d35c8f3cb54e156b203c5eef05edeedaa06c0525310d5ad527761c358b5401f9c02ff49edb9997fe6d00061976b879db8894858e6aab8bb7e66a0661a3a9958bb59aedfaa3c5798c7c889e7b86c09dde0fbfcbe256f060124e6c4dc461639cfd99aa70c939af6bfef3b16a7dd36e79a8f63093f14923a9207f65f03aeaa06ef1010001	\\xf2014786d630b14631e904d9a394ca578c0ec337a9007a56a2ebef136e7c92fed48bf7b784d5145437f6751cfb16c278fcdc96dbb20d35fb80a1f3b49a39a705	1669651319000000	1670256119000000	1733328119000000	1827936119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-60	\\x8e64ba0889a5b87317df39684522cf224d84c59eb4dcb9ec3f9f2667802fbfb1199665f4dfd436432b2553dc1db7c0e62ce75e353e89ecf129a040b3c87e29e5	1	0	\\x000000010000000000800003c8669bd36247fcf0f9d852b2c1f847774cfeed9a306764a1b09ed4ef0361c390c4ffad8e0db674fb578369d144557ae75e5f60daedf2ba2c9dd7655665ce0b0c9dea5b01bbba68faab1133e60f3804c7add79e9347735783b161cf401a6755a06c0fecb63d56534be7725f0f9801e6352e6b7fc7f4f3ee08910d8b3cb61e002b010001	\\xc5fd7b30df6acaa89918a69a73c704136f0c4be435b9ef605e4cf184fdb9d077e0166d3a569c7cf960e8a6d625b4246b5435c3399d21261751917f9cdd6e5809	1667837819000000	1668442619000000	1731514619000000	1826122619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-61	\\x8f78548531e32e693066b9f62a07c560b6e8632f541c7f9aadb04a1ec1bdcf780b449928c035cd7d82a46c59917f01ec939a383009ca7f98710a505ebc942be2	1	0	\\x000000010000000000800003b92e019e83c10552c313fa11d71db0cbcabad4a4488e4305212c1f5e8f6e5b7d524810c82870e24750f80c5abf67f7d579b06743767baa66a0ad1cf87e0534043ba6028163e034fcc00de5832b8f507c284c70a3961d9955a17a3b7eecc912232c73e02c016e7fd3392af7bb535a8973f68c403c15ae1c6148042ce1c180ac0d010001	\\x249c83c8fe739bddcbb8d4c5f6ebf7f5b34eb8c6475af2268bff00586e164841c8228b5d3608be673acbf03437b7252cc5a022e829d19d11ddcaa37ddf21a905	1657561319000000	1658166119000000	1721238119000000	1815846119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-62	\\x8f94b3ba3525b0c5caee1a38001d068b19e9438e7e7ed5329ba1c614a4b2cae2b3f2dbb36ebd1d26bd94f18fb008475fb634735226c5d8908b8cd5e5cd4135ab	1	0	\\x000000010000000000800003a99ff206698ae9ab4a4e59747b18effd80972d76e28f1f08e8c5a2c3857c4f5897809b11d30ac2e492c6a200c6411f8893a8bd6384dd2ecde6eba723f5db2a3c8d9463c91db6241685b2e27e60bd55209255fff16d2e2f9e60a09de0a65c8f881dd52346355b97d8eecb11929d419ffbb61e96099c8894387e10741aced532f7010001	\\x4cd9a3bfd8c917d7e53724692f8ada5de65cce2f582db4b82bcbb3508bafbfa0ca8bd437c841707cbf334fdcc3ee9089cb98350e672d17c3b00005a4de93fd0d	1664210819000000	1664815619000000	1727887619000000	1822495619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-63	\\x93d8801198fc3d3e810acc61155646d50c6d5664db238fea4cb97c38de043695885a739d0e265515876a4e5cb0a46d29708e0750c03760be7b7dacd4792e9fde	1	0	\\x000000010000000000800003a0f6505d3c27f0c8eef518aba3d976025de5533acd270145308e55b3ec89dfebd5e37b3ea5ce1220881fc4cd7344bd11667201792d4912970afa154290e73be4d32058740162323734ccc45a574819abd17c271e1d99e761e738c5dfb5c334d8f1283dc077cbbd8421fa17d863b68260a95cfe4354c745d4baa21d89ffffe62f010001	\\x05632d5c298b79691c0e63cb68ea1370335ef8d6d18bb4c25079368b7d8920c20f0ee870585eeb0bcd479e5ac4b698d07e1f6dd0900d5129d85c94702e754f0e	1679927819000000	1680532619000000	1743604619000000	1838212619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-64	\\x96e0ea51774d030f557e51b9c989cd2a049d6daf7c7aa396d5f9f889ef84edd12080fecc2b947dfa9cff8015daee0f3fa575a73a9de77aa97396cc8e8b0afb6b	1	0	\\x000000010000000000800003ae4aa1f6d5176f7ba6b06e1108f7f1037a20853337ebcaf59d457c352ca6e79fc64b6cf97038a2a007d7d842d0077a98993ce5eab8e334bdf63afc0b8400da1b7ce2a0d2ef9b8484eeca35f4e3ce818b22ad9056f85b4c745f81efc3c5e969e3911e83871a5fd5cbe7a6a9af090e2defb0da463b1b36b0a85b433244548e6a93010001	\\xa0d7b2dad1980d462a5ac30c08b13d1b0f3ce96aa7d78e42fe70430e8b0ebc5e7fbf9f3153286f8e04a8a52e219d129546198036f2a875e999eb04558135a80d	1662397319000000	1663002119000000	1726074119000000	1820682119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-65	\\x968c490dccce7388f0673e20dddbeb90a6906b9dcfb25bdfe6357b9d97b72a113de5918e2686a774236403f08eab851cebe11623e46b25e1a6db9ba919450bfe	1	0	\\x000000010000000000800003d3cfa4af48d716b79dcd4542c708f7e9dd9650faebf67c81b7ef528890751cb6216b446ea633e721f8f299387909305981d96ea8c8c0202cbf160b52ea4e05e5c27a8b32352cab8a11bbf3c2bb66386170807573f0d9f4265398c29d2fcbccc74b0808abd8521e655965749e5fd2e09fbfd5e85a5e4f291bce1360a7aa657691010001	\\x3c1f2efe737dbccbc6982d02776aa6666349f692e39cae468d03c1c09f8641a98345a039ebe41de756fd3d128bea67f116d8e1170732ca90182a0e3cc342ce0f	1666628819000000	1667233619000000	1730305619000000	1824913619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-66	\\x97381a73a5a882e0274aaaa37c43657d8c497501789dbcb7539964a48432267877e819aa0fc25c1451b709781c6460cd2d3f81ca66fb35024525cb80a8179fa2	1	0	\\x000000010000000000800003b25b2b72917f5eb6af7fadb066cde64c1f37bfb1d769fae6ce2ea8f1ba9e925e418a88d8deb46758031991e719c7f286345b6c717843e582ca9d824e83c9d792c2dee117671ceea6ee8be6963ec4350ed7e7f617c7d7d782d2149bed5bd75c0340a1122be084a7948522822f257a1e1219c9e52bfdfefb120c3d12ba3204beed010001	\\xdc2b0e608e58b9218d085cb2f2ad55fdd1b3b809f6b19b8ecb7910bf67d20f7bde21bd998e20e544435c32cd8fe69794c161a3beb954d11547ca58a5f637300d	1678114319000000	1678719119000000	1741791119000000	1836399119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-67	\\x9834452574198c36b00dc74658ef175e3d7e7a2ec0ca63096731361b14dcb60d2171b215c8793f150ba6e2faff91770098d02a4c230f36a58725cf874475bfbe	1	0	\\x000000010000000000800003ad25ebf4d6e5d2044a7e263b11170e3ebbb13a2a6b9a4c604ea522dfbe8677c9d25a4e81d8a3170d4c3edf63d2ebd551347fc26748c49a46e3fc938a8673aa0c0aedea3b93ca442c06483e2197485a3d207bb091815007cdd74be8a21693f0031f7517538c40d10e66431721c35326773d77aa716588b65532f4aa9de532d52b010001	\\x4862bbb7600d39e14482ef5d0e699e4fcd68487292cdeff6079ff4367884afabb199416161b99a2c50479a6e19d753c34bc692f35723f128bd7862cf499d4309	1666628819000000	1667233619000000	1730305619000000	1824913619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-68	\\x9b88425e77be2f1f2d1f38c6b3b8c15e3802eb6330dbf97a15fc14997d2709c700e01423daee06b00fc7f13f675d885ad1e06c1577424c64f72e8253c7ece317	1	0	\\x000000010000000000800003b5993fd3f515e9195a146ed0801615d36dcf984f214334a3f65640b94dfdafcf78b0feb12eca29df65d61d6b54dc3d44ae3be6c2dc87aeb215d746d4af6324e5dd4d66a28f5f4f1e781cedf2d73e54eaa8f8d712db349ebfbcc2f67744ee915e3dc0ffc745c8f0a62e2bb596733db865d562ecfacd2836d5ea0b736731f9c533010001	\\xce0e9de5932f1ae35902145f4bf28a63f182e5a090c5aa7bbc1d6178dec0ef4aa07354dee0030ea28ff581a7f10d30481339ad361d5b636e8b04d6b0ddc31206	1661792819000000	1662397619000000	1725469619000000	1820077619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-69	\\x9b346b565da1000ff48d783fb8d550b37d4a247edbed79564e8ea5f59b257d694bf8e43326c6b5cfc7095eeb8981a487dc0655a8cbda1ab9d54f64e23fdda236	1	0	\\x000000010000000000800003b1b288ddec1f42357d9f844837beec0c16f61ddb29bdc700e567eaf24e3f59b208d78ea343587f5a5951cc6cc4d65b467861af4ee97ac04449e31270307c4becf4fe0903a669ec426eb04623548075f349a671305acde8bfa000d942fb870e28abeed60a59d6158085a0395996e5c46b517321c40be824a1314b8c10ed343387010001	\\x92d5de0d6954663d79be7e893d992d3097edf2cab083c0b320f00fad16e012144c321dffbf5fd4164b8047627f9b8e5f1e62ad9710860b6301fae6b4b831320c	1672069319000000	1672674119000000	1735746119000000	1830354119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-70	\\x9bf0e03a84e5329660590c58d7ca9b3d9c90cafc7025278f8d68594e8f707be65c3034e5164d1ea103819db72615376de6285c4e777fd465885d9085687dbe40	1	0	\\x000000010000000000800003e8e08faf166a86826bbd7f19d16da154606465aafa2275ffbbd9fdaa24deb8d3c5d0649f6abc3fa3779a70d721d7bce41d31be4e230e9661ec4a741166f41065dd602283c39c0cf1fa8d4ca4711010dacd47840ca5f77da4c4e481815ceda0320d17c891fc53549e6294b0b654d4721c9bb38443a6dd6a7f81cfe8d2784f42ef010001	\\x9a56454b6936d04b4d726abdc61e0ffa8cfd15cad9506b70d2e18dc75bea952582522dbf1960c14f8ad6867585f573998368e83be73c9d56a606c0d8ac32700c	1680532319000000	1681137119000000	1744209119000000	1838817119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-71	\\x9ed8819a7878951731361cddbe5e834e22533709ee1948d04274e01f68048ace530cf669f038fa60ee2727601646f95354a973309e816be48852a84de27803b6	1	0	\\x000000010000000000800003b7b392286783a488f88704103e39f1c676cd9e7ef56b55d9ef323e17531321249b61006b0b87569d24eb90fa22f31fb998945ce6f0af3f6aa433b1af4e9a4ec7af51a1970fde78d814afdc89ff7366e3de08481d679e3e6ea7e889f6c80768e6f1312fd7f7648a2fc12f81241c64c4f9afe671f4453144265a1c06ff3aff64eb010001	\\xe5ab00dddcaf9c04f05f2df6007a8a50174147b37d04eb0e018fdfbc5f857378aaa8ca5f140e1354861747ba006247772c8711fbf67a307b17bc2fd535904007	1678718819000000	1679323619000000	1742395619000000	1837003619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-72	\\xa20cc300f37ef128fe8820e1b60f5e3763b174a272631689bad68778e9a657b7e80ca83681030936dd7414c6a34e2d4470b3bfac3bd75400c7b3b631e4837a41	1	0	\\x000000010000000000800003c4e9af70d267de4c927c1846df61e26447cf8c2bbdfd8021072f2a283dc89f52c5ae247b7d00bf01f4992a52c33cd6a99f1694575f971033beac7be56b93d7b423e76cf4dbc3ef35efa313ca6098ebed909478fafcfe3e91a79a1ae5b3c8f3fb49b92242bff73fab5b03e5cb63c026a30583304c0f70415dc9a134348a53c31f010001	\\x4f9db3cef4e943b0753b131b7d342102a644048fc47399587b3eda9f12776040dd7a3712e63976c0cc51a0315421eef75ba99803dc963aff91317db68623cc0c	1675696319000000	1676301119000000	1739373119000000	1833981119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-73	\\xa374d75f646d470b84f0a4e045c96a574f00c823fa2a711053cc43ce7ec9f77c15362375f66081958d48f24bac04012268034da96fe089068a2584a499136348	1	0	\\x000000010000000000800003d62ab499e88072d1bb35c86f93c979fe60812ae9aeb8fb541b43e29a49911c81e50f15b25abccd400e2099eded73703f8d78a4b75d7518740af1fd0c165c532ff4ad13a73cb6504d5281df0f81a16c6a696b2b84f2a6fd8e28fc9d206a83bccc9b18b9c4216ee2293a2c82588da35f7924b409b4c519a6f46253934f67839cad010001	\\xeb237920369a9e379f91cfe67eb9d740152c4db4c0fc9866a65371eaf4a41602df8e68936d126c3bfe9a5120fedf21690efd23ec54df939fe1db15b8638d3808	1672673819000000	1673278619000000	1736350619000000	1830958619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-74	\\xa39830f77079af0fd61e489b7d2f960cc986808df7da1dcb55ad49a28f3a6787c87b8f25a6b895feed97a9fbbc87eb37026bd70768c513b26464a06054ad13b2	1	0	\\x000000010000000000800003c6c689ae2005ce8a0ff58b44fb55611b24934a75e367b101247a91b193c71dae18031f13c0cece937b42af47d8d6503502e59449d2e6c20d7494de6132b5797a4cc88823cd44832c7369813d1f123a4bfd5e44f0b5dc7652cf8626b9bfa712f98fba086fb14ea2e49c17d376d85911bc9e46d9a65cd06a594870578eede22593010001	\\xf5c196f5f32f9fca920580ea946d1fba4890269b3e3165edd27922284276b823d3853c3abe7b3d9137e4a5368e06fb0849d6ce228f0b0ac540157150dc96470a	1678114319000000	1678719119000000	1741791119000000	1836399119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-75	\\xa5ecf18e3d6641c9ef3d1afdd395f67e75dd0d05bdccfd10c935b56b177e4711f031fca2919f28945cfe88304d22636a134bc1993a00c5311f9e940ded1125e6	1	0	\\x000000010000000000800003cbcb0630ffbe451d2728fee36ec825a3f474b76b58fce3806d57339cced108e5ddf49d000b8c88a51a4c69bba2b2ca49ab6e4ca281f89931034877412c6c7f00c3a788eb92b6d5237cd196a862dddb0fea81c1d94106d621c22bf82ac20d5219749b98ef04f79a78b7744bf6167429e3be6ba5fb1b3d030d544591f3fa28220f010001	\\xb8ac029b3b96845d19d3b72c2c9706419ec89c6c3d66cfd686e4d64d73dd522c56507f7d5736bf5c0c7f10dcc8a523d0117769815706cea413d55c395abd360f	1656352319000000	1656957119000000	1720029119000000	1814637119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-76	\\xa6b44fcd6d160a8cbd678fa8fe489cc8674cee8951cf6d16d8ad0d2a2a9a5bbac8f6ffcdf84a37efee9b6fa0e95def0cb8fa9ca58697c75c2c57f707edd4a81d	1	0	\\x000000010000000000800003c63cf9abf69cfde73793ce51a93558ae9d55bccd22ac8cac7c225d52f77fce8576c9e11382437e73814a263bcf9b35a3373c73a6e5e7deb0a73608c91d2a6170f318693273d9061f8d4fb5ae634764b04d56dc7be1337fca64ba11fb32cd7f51bdae94578613f46235be9df844f0b4b7f875f6939d44b877b19d2071cafe9d11010001	\\xa9a48b085220ffa9c1d589e87fd833772826bf2f1218a37f037a259db6e3c60cb2984c61fda48b882e851c3f8c88985f9d9ee8330f444ffbd843b869790bd50d	1655143319000000	1655748119000000	1718820119000000	1813428119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-77	\\xa6e8910a90b672b386bcc01bada71ebda955175e67a116f6e425e14a81f48a4a1dfa418c57f2441a6f0e9936a7dd674f5111d29b9adb81db6e0cc9e044bae196	1	0	\\x000000010000000000800003dfc0e8410f2235cc638d6fc104bd2e4e274c358d8e237be57a376ab5ecf0f6d688c9f7b20a247d3ad7d2c008849d27c055332a559bc8f6e07f0b9c9f568cebd01d05fbc195e8c300ee86090aba9782dbb1f42c9412cd6fd86de32deb61fe62e0365fbf3fcb8e2c791415a2e36634b7944e9bef74e67673dfcd60ade1df59ae41010001	\\x25f310c0bb163bd628697cec049e51a7eb10e7edfad63b2dfae4a678d9c622f4c492564795117b27e907ba6d668f37cef2acb8a6aef41cfe19769ce692eb720e	1682345819000000	1682950619000000	1746022619000000	1840630619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-78	\\xafa05ad9d6859dc779d4f409a219a1776f90a5bd06e55b88876895b8212c671ac2f9b9b71cbe1632e577ae32473710da85704b214641fe206c9aa4ad657ba786	1	0	\\x000000010000000000800003d1256605a47e3f6e3039c1345652711e88773204428b7cae99bb869fc23e2ea1b5bd279dc39f146ebb7178204e79415f583ccc56d63f51c3d78cffbe32dc97eae5e2e2e4a96c432cd5906c630e47dd88362a39701c94ad27ae8c3167678418ded499adfe8646e28a3d4921534173a50753318b644ba24cbf8997cfe0756a22b9010001	\\x1c05f409ee40a08498e2f789dbdc9f06fe73b2d3fc95214707480819bad30d5975f103a499bfa651465ddf668ccbaa85b2c218d0ec96d68f2171367fc9c6a30a	1666628819000000	1667233619000000	1730305619000000	1824913619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-79	\\xb0483c00f3b0aca32328e3bbb22b1d8be4d71e15325badac9f8c0e85c55183d981c46539d5862cd4a786bc7b93db74ea69ad2ef4e42d95540ca089f35ad64835	1	0	\\x000000010000000000800003de4de9e3b8e305530b3e7ab1374b63b98db9815c94170faf9bea334048f62b151fed1869309f1e609a9c17ebfed3a071884ead5a3e8952fd5143e955c41e97c14f9d3b7159cbe5a4898ab88499f45c90b666a9f7148c274eb77b2a5a2ef182c0a318e1b73b56a9ba20adeac73378d33ff992796b6ce821c89888f7fd93a45d81010001	\\x904e26ce6ae339fdc0e0ebd734552f258eabe9356887ff678b9d20f3b0080abac01294194595d270a3cc6a05caf32fec453c7b056a662b69a73ba8ee524f6003	1676905319000000	1677510119000000	1740582119000000	1835190119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-80	\\xb34c6dc6b8ae99433f3ceb1b921d6f7d28b6aa72174b44194628c1a0f44c76c34798cbd273dbbebbb35550a1c3e75df7ee7d90fe7a5a308dc4302d02086598a3	1	0	\\x000000010000000000800003beab75b5fe7f4d74439d72259af45672d246e50e1d362ca1785bdee26a7de8dd48d7534b619b3131ad61ab9127abe61f316bdddde4a8bcebb8cb7b4e5b22e8b64424321a771ad35a0157ac2ce8d05153446b245f8e80d829f85f8409efa3dfd05aed67dfeba3199114fd71f7320b3d0037608830bb40563a6f6046287097108d010001	\\x7dd1c0a02550d7733821949d70cf26cb85ddc054553bd857a1cc735541b3916a5da8edd3118f8912e9866521872c5d2494760dd5fd31e2c4d2854a46721e010f	1674487319000000	1675092119000000	1738164119000000	1832772119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-81	\\xb5b02a6956647865309da9eb06b922c5152c7756890c51e52ead5d92c383fd3658ecbfd3fcdf50b7162abd6c4ced60f681ff2f0afa2e3f2c7c108cf753587bb2	1	0	\\x000000010000000000800003b4ed50c47817f34336a0d039ecd5657498564845ed9c2921055c8c6640c091a4a701bbe93a538a4f27dfbd095756274ee4ea96d3b63ceb7c45c9d51e6e666445ac70ff73a759a47db3be9faa3abb15c9a399abeda07da5b0b4a37098d8d330b20e4bb8a0b8fc8eaf100c55969d61c7a7b1ff8c14c132d1c7238d0ecee2d7046f010001	\\x8e93be78482992fed1b9336364644bde538021b60b548d138e52a206bdc9ea753109cec2a1c0735a2eae39bdfc03fde7b65a789bb33d123d25f08d6f00eb3d05	1663001819000000	1663606619000000	1726678619000000	1821286619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-82	\\xb56cff815620c6a42c56d2c4228679c78e021a008ff52bfcfac8d704203d13322ff0af423a43e165d025c3356c61884d4f9a1cd8d47fa98174631aceba52f6e4	1	0	\\x000000010000000000800003ca93efafbbf248b063c98b7de4e63406062d297203ba9b6c15098830543f32949f79830faff083eb6bc90190efea93044fd3c1b5cc4a54f8bfbfdf3f1627a076243b0ce556ab32003d4b3726ab4d4e1d9b0e8bbb1d7bf40cfdc48ff442bf4d409a19d23d8763f34b368d0bd1c1f808f678e05937b5865ad0d4c51aae7c1607c3010001	\\xd0ae1f4e3499048b0a4838fec8fce8ddf67b2e1872661a4379dada9b9e5aebb6d613fd728d70ed6aa7df188fc067d3b59e8467aa78f707261072e9e7d4c37b0b	1665419819000000	1666024619000000	1729096619000000	1823704619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-83	\\xb68498ee90b55d57d36b78e2c6eb8178d04bf322e1c01d17bfd39d8913b1d2ee61fc0fa48b384efbb271432a30e8784e5d4c959d9afacae2055c1c14011df374	1	0	\\x000000010000000000800003a7a38f110d5174cb60dceea23c9f6d7c06a1f3c677ef1bfb1304d585607f5eebddb9cfed4eac6acb7d2b26803f511a8bd7714e10fdadaf8677343cfc60cc27e9050c60494baaa6b3cbd3c7132082cebb138cfb3264796c16fc3c57e3e45d7fbf68a8c211ad912d79060a95062b6df357d14f94e2572f10e358781cc4348b912f010001	\\xfe35d20dcf01b38c023d13bfe959567f07c0c3b70e62a34cd8f365a2a80caf6c251f8479e60dd516bbb1d1e36d683839363c2fe42981af3a37c27dd27dda7209	1675091819000000	1675696619000000	1738768619000000	1833376619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-84	\\xbe4c3b98818da594495b8c68544b1ff9f342d75ea00fe2c8e3b89cee64c915ae1214f91dcd5c4faf7443311bfa5703f039233251137e019d0b918cb7727abae4	1	0	\\x00000001000000000080000398d8c9683e3dd80fc532b0a6d8448253f9291888b5d2622fb86273d33b644e29cc02fd3e82afe2e92370b2fec8cca64a08bc44821a30acbe571207d55bf1360484fc5ce6d243dad9c7a17bf6a6ea2d000bc8c778d9c4f51ac7be6eb8acc7030798270b5a46741bfd2cc35346e99861a064534868f822344863a9dd378d19bbeb010001	\\x65b3ecbaff16ccda0accfc8e9ebf8bc79d824a1243800b168a1a07fee20d4e9c3d229e3985073e58bc0cb11b766b94839e404907e7ac90ed6ee8b1bebeec3007	1666024319000000	1666629119000000	1729701119000000	1824309119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-85	\\xc1b019b4814f75664686c663bba8c48d9805706e513982999f7cbb71addd02c2d21c614acc9405bf2e3c607afed4113814ece8f864472674b023994d250d6e9c	1	0	\\x000000010000000000800003a91e4ef5cca7d537476e7986cce629c1da450ef7e7b21ba8299e481cd60f3d8d235e328ec3e638f1527e4ee1ce41619c2cfac1026b8dc0b7014284c5d69b463ca9e69500591a690bc3f7b7f9a3374a233eecd83142fb0b6ced7d46cf747944b41866bad7875ac92da3739d996a76cde4c98612945eab84bfbd0a9867f8a612b3010001	\\xa0c0a3f9a7e2a83d9feec02a6a04c8b0034661c46845facd5486bfb8938ee8bfea12f2a003dec3b52163e7ba1c8080cecd357e9b26998bd96f323391d188eb0a	1677509819000000	1678114619000000	1741186619000000	1835794619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-86	\\xc208dcdd5056bdc23f6a456a9e38b47e9838b615ad527aee487538f07f21c8980e3d1b0ebb9a6986ce298f5720754d6299701d6e976ad957a36348bfc5434ec4	1	0	\\x000000010000000000800003dfe5ca3049a75ce47ffb271b325ef8c84974746d714a24c3ac76b6e83483b2f7526496fd8da5812bd8050004502cab1bc56600ae355907bb410f2b486f14dd52b6a50d0d664efb096f96b72306741591125b3ca4565a9398cf15d3d3aef41d57500c356962f5b88030a229017fa38755f2f2b7dd53c75d192c659b9f52a9cfe5010001	\\x4d3f945e7b2f569bd6e72ba2708cafad981c518ce44fe8de5a3b2cc7e771e8c53883c7273b336e39f9492aa04ede0ad1b64cd6bf4e2cced45dda4092a0639902	1676300819000000	1676905619000000	1739977619000000	1834585619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-87	\\xc324e025fb720e2292be049a96ce2175a342a336d80c65d1ee8a5194905ff1d6e382daa063caab35d6dddbf87ab3afcc77794a2dc0b1570ae0a7359ad35e8563	1	0	\\x000000010000000000800003bc3de9f525030d91357bc836686ad91cf17a8b045b3d0982f49eaae1897c950ebbdc6ca500e7827abc78adc3570af32a0686d2257061252320fa77be7cfd3cad94f32d48cdcc00668a69a34b813599d959b09506fb042b2ee7880167d111d2e718bf7defc6137cfc08c5dee3218640d244fa3931ef429d622e7b983c76192e0d010001	\\x43e4481cda3c3ffbec08e6615345a2d16cc2fbcff8ac81649cb69f4a5e3d7ac6a36c7b29ef622f3d0d92d2b69690a1960b436c5813432a0ea6de6d285646df05	1669046819000000	1669651619000000	1732723619000000	1827331619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-88	\\xc3d0348ce04a0a936532582d26e7b56759057db347cfd056f43a6840361e8dd36460b1c90cc2332fefbf68cd230879e98945f8001cfa8c8146a0508aef75f8ca	1	0	\\x0000000100000000008000039c5f3818b6d34c8a8114ff877421070046d084f678dc5fb281dbd8ab2bee79a08d4312f5fa0bb82bad1e1d80081984c8a31773698164fbcbec76d131e3e05616e657c01816bdc4357806d0e7f2fcac40885b9007f36fe6457cb0eef8ddf3db6474fbd47bc6637dbbb594f7280f5d286d052ee86869699196fdb1f26dc778b64b010001	\\xcfc4dbe681bd5bad3ec1ca19b310e823d78cd1f25295c43fb1bf96b37b0ef39f10e4cea470c899c36daf7903a3c248b38fe2217d2925c6d2058de7b8dc0bd00f	1654538819000000	1655143619000000	1718215619000000	1812823619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-89	\\xc4d47f1a0c471d745a3756457ab239c2ff9c7302054d69452a76063ce401099f3eb01adcc3f38de4fd4de264653e3fbf8c31ca4e1b821ac4a6e7a0ef28fba063	1	0	\\x000000010000000000800003bfb5683db8b31dc64a3370a5f5a4375bb0c437274eafd1e67f18d43ad1a3216a31c7d5c3fa480dbcaa76b54c3b44388e84b71687550f47c3b1d60b687963b6bc9f4440d609f93544f62980662257b474823adb9da914f2b0be242a04cef5fc51154e3601ebe1d10a3a255c6dbbe8f3efdb5886c1a1274384f59bbe253047d2cb010001	\\xd6356121695d3f6de66eab733489a6f33cbb895543b41cf1d3a184eae74fcea7ea41e31a2618f73cd936020d0c90d5ab8844ba96c54246d0403a617f199cde09	1678718819000000	1679323619000000	1742395619000000	1837003619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-90	\\xc60c782b1dcf23ef638994a6bbdd2d1715b5c9d8eb88cbd40799af4f174dfbaeb3ab6bbe37728f436227525deb5b3df333ceaa59d50fd51fb54ffbfc4c7d4057	1	0	\\x000000010000000000800003e586b8bb1ddf1893ceca04fe3f17c4508f5188442f2deaa996605cc078365ee6b4817b50b55f6b1baec2ba2ff2a06c12544f07d9ff62a43cdbe6adc65fbc04887c9ebb7ff6e1c50e1a1ab354dbfcfc29222f8f1b39b36deba12b9524e222ea3af9336206f5c1c0b3fe88ad96aa0b71be12d743950a7489d2197158bb30a651c1010001	\\xf2c3e621f971b526af3ff74cd688917bf751b5213458079093644c3566e66ef5211f402206c65ade62dd73f90f356964482c56b321035607a9295b8d84f89501	1668442319000000	1669047119000000	1732119119000000	1826727119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-91	\\xc9b88ac8a90e3d26fc936ba2814f6caf8109d6f0cc68d5579d89d00579b3058171a58804b692aff0f5a1f01471b2845c0d836865b323693b62f8412bb084a77c	1	0	\\x000000010000000000800003de0ebcf2f96f3c44b0774328fb16861fd33d4a7e770821a33dda5ec7b4f38a2380c55b6311354697916b3767fd8ff6f17e28a99e5bb8da678c6da27e7a2f7428e01bb727266abda7e2f4f4229c9d68b14fb826d81dd753e54c044f0f546e0f98a27ad7c94a9c62f003950ef666637574b354662f0384d535b8c7f98583fa5c71010001	\\x9f457add3338b812599b6dd3df47978c338207a51fefc491abfb383b15f9f10d31debc62f04fb4e276b9060872c54abf02dd6612c5b8742aa28fb90890aa8301	1658165819000000	1658770619000000	1721842619000000	1816450619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-92	\\xcabc764044c3e636c58db41258d28c85f82067ab91bb2f0ca276b47b3d49c763397ecd776e0caaf428079c04955e09bd19c6395ea7922f8ab837783e39d758e0	1	0	\\x000000010000000000800003c7ff59f1443d44304ed9667da0eec2358d8d3a2c54c8a9fb75fbc242ee5553e0d029163c6000ed97b63f6164a3aa688504184caacd65320560324b9a4a846563f5de6cb4a0134f0fc320b8f893486e2420928376bac52b5cf4da31909c59eae21f48ab3b479739760287fea9277145616200a26331ee179d6e74d1497ba5cd33010001	\\x96a2b4a7c7a655de0fae9af18ff9df5bc8906f871416991a873e7219968b59123613d9ad2f7cfff4032cce33ca085095aac433cfdcc304690265f427ec0c1c03	1662397319000000	1663002119000000	1726074119000000	1820682119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-93	\\xcbe821f0f575e17655da198a8860c3e1676ced482823401f72dc067f53d4b40579fd15036ece7f03aa1d6a3b26a54b21c172993a9568ed1f2a04a4557bc90503	1	0	\\x000000010000000000800003a36b774042bfcd09230e6b5a5123a455faabe591dcbaf73aa188781d60b0aa4f8c24e2e37a7eb0807a15b29c43f33fbbf35f38421fb5e8d0d566ba086d009fce7ca6f2595a48190b63dc9539f5f0bc685ce798f7f18926ceeab68bf9051d8fa8cf8f58266c846f6d3656588bd0de0e4c173eb70fdf30f6a83bfa7e70e8a137a1010001	\\x71da63658f7371e0097e1b3a32fe8b89ac5de520be58919eb9d5473b941250eaaff5e62f7b069fb8b0cb5076809730c123c70c1dc9a3533250429cf334663203	1665419819000000	1666024619000000	1729096619000000	1823704619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-94	\\xcd1c6adcfb6d9c26cf59d6a3afc395e288d90ec2f801d1196bdc96113647d4368a75718bfe74940f3266a23d4e82a1640e8143cafb30d687f49ff3da7c52e897	1	0	\\x000000010000000000800003c70ab017c8eda3c6d1aeb87ffeb824eb9530e06958be7f1f07e794a4a4401c52b736684c344035f0a7daf14fa3b6e9a8ea922fae0bb7b6088953f10071987bcf7244cfe22889c60af9eb62cc7fbbe8821757ab347e2120d338ab127af65bb01162f7e5377dd0740d939cfbf24370357bbfc8d341aa3eee935a271e3071a21d3b010001	\\x85732ecc022ed4aa1a920d3d8b8702cd4a479e69913aa579f10ddecb6d183117ca411a8eb047e57aed8cadab0db294c1cbaca8ed7c4229e4b030d080980e6307	1670860319000000	1671465119000000	1734537119000000	1829145119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-95	\\xce2ccbf11e62ec06e0686354ef22da753d1b495c296a93dce91609f07aec17ce56e99c8ee00f23c71d9e99f7f77eae961ac8b7ea61c4fb70575d594e679502c6	1	0	\\x000000010000000000800003c5458022271f3242d215e8bb6bf91c0518f8178b621492b740ee488224bc3458c30220aaa2996c61a54539095aab8749f137bbce372966a30f12db09c267b82c67e21d5ffcc4e946af091fc6c81ad2e38d8b9a17f4f2d804c208928546bc8a300be2b9cedd494ea26b09f86d16d98d3948c1ef8252b2edf05c962515fd94d0bb010001	\\xdbdbae755b7bbd44e215275557258bc64be45489e130ded7f25103c05cf79e10d4dc6bb2194ed3b02805e4acfe72bf5b7599b22daef48c70f883b17df339b90f	1681136819000000	1681741619000000	1744813619000000	1839421619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-96	\\xcf44fa23104ca1ebe5ff1f6d719783395d9e40d8fa6314627da9c7a6a01ac5383dde60c54225913d5c046fef82e704e450456eee06d4d6a199e5574be2a20003	1	0	\\x000000010000000000800003c460646879f36929b6f583e2ea46ddc49868ffc578b00c76d79c1beb365f264ba7c6d9a1d79b0f4b2a7c5c3ff6bd8bb9a219edc1cbae81e9e4f0e43c17cd9d539a2a80e0abc93d54bc585306cd192a72cb9eeafde57e38acf10635d169b36c6fddb3d67ef9d3df536d14fb471c5b36031fc1a3a5a5e65115c27fb885135248b5010001	\\x75955e6a079708db40c859da0da1d36c888caf8c1a963813b6954a6f2de1bc50acea54b0a0434c653811404d1f07d35aa3969b8058f1622da53df091960ba105	1669046819000000	1669651619000000	1732723619000000	1827331619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-97	\\xd3fcf48314f7563a6f4716b795cad3349cf8da36d6aac1158da02d9548d83215e04695f9c040107ecffdcea4af9fb7db311eee03c016b3caf5a19e1f33d4871f	1	0	\\x000000010000000000800003ffa241d5c165166886b7b3b48f5104fe1328313ca0b259d0c4a81ed12a3b58cd01578ade5887b9eee525fb0f219a9da0e0e9d0f116505cbde03cf2e3f7b103c2d6d84e5dbf1fd917d7c526bd98e8d80a25f4a18b8dbeefc34057520c264307ddfa16fbd8f234b2125eb38d2973befcb7d53f45540fa4daf368bee773fa1e396d010001	\\x697c0c2c5174c66e09d5068e02c417cb66d69d0173e0aa894b92c2be750706210a0eac8a3831c928598d9f6b5744d464f966685ad2139dbabd5e8bf123e99509	1664815319000000	1665420119000000	1728492119000000	1823100119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-98	\\xd4b8d3448c2efb53a23ab29d7e607dc07e7c2a7118650cf631c8784f2a3fc37f2eeb8af432811276a2064889a3dddefa67527b50281d92fd1622d047959d04c6	1	0	\\x000000010000000000800003ed16a411e6028144595d5731d9cf77ef739238b3611810752a7612658ba7b5d4722bc80fbfd3a1e88e3985a210c216f1ad9d72674f8da57f90cd772564095a426529b0722122ec903dba521952b08ba49f7229e35cfb2e1a5de8c7e83f2876fefdf2164fa87410a1ec98ae690fcb74a8d156d3c95dd6f4e5f901bab2635e0263010001	\\x5bd6d206fd8c3c41207b304abb7f1f9f40662f1d9d3153c3906942344df923b214b8a66b31e59e5c25903599f016faa0504b2bfbe194489df295f799ba3e6004	1652120819000000	1652725619000000	1715797619000000	1810405619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-99	\\xdc0485475f5e74393f7220441e4def6baf43fef710a8a9ef9df4216e9415372c113d051a388a71063160d3394f2d1b46f31e4a87f4bb979ed902a956552f5727	1	0	\\x000000010000000000800003c2631e4db25268a207e31278360902b522929482192c66383d2d7f0550a8d6902c921d5605473ee5371f50aa3f6fceb6721497ba6e56d519e73cbacc5f9638eb28eca64302212d1f4628fd888de53ad444931149013145bfa09c93c75b314da07519987b4f60693cd72cb687b7e62743378477a4bd7354d5abe6fecec516c8a1010001	\\x89a04be5a361a611f9fcb362fb2d230ce118a6c2f94febf8d2a11b5f913cab4acf803d77c0bb0c4bfe5d504d39021ab719bf9e8f3306a60b048a271998150701	1673278319000000	1673883119000000	1736955119000000	1831563119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-100	\\xdc14c43cdfa2861ef7e283bd6b5e5412bc3d856fedbd1565cc89ea8723dcf70cd53ab71578a4d356c6b009d03e6e94c5ce98d890c2f860731e40ac2592dc22d7	1	0	\\x000000010000000000800003c258a0ce005a4bb0124e47f398d6e549c1f498ca5c6222145073690df38ee20df8dc37c1a9e22cd1b2fd2d6d04ef7025d2027441dba975bdab992c66476b9ad5fc24dcfb390057367347569752f5cdc19874985a7e7e7d761d7e89b0b696b24d9b0e9d8ce094248077afde7c3401e84fa93ae0b36f7ccd521d9fcd90b2c781ad010001	\\x01eae28db44ae85ada6751972de86badbb5cd70d276314bdf17d7a5255bd83f462a2aff027f17db17fafcd70d7007fbdafbc2c0a9707074e8be630c62fe94100	1662397319000000	1663002119000000	1726074119000000	1820682119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-101	\\xdd284f0a5da0851c02ed00b066a100699c3bb4218782142df94cccf775cde1aa67ec220ae408877dde1494dba5903af4798653ba9afe4008267c0eff0ca392a2	1	0	\\x000000010000000000800003b9dd33973e7f64c348f15ba391feec058acfaca1f979046e09e6ee4c6729f94c763b88d3172be3abdd344167b9a2991b7f6ba92f14e5e4f065b9b90c4354eabafcaa1a8d2218198132946626dd312e1cf696388fdadbbf266e462aa65874abc9a9c14e5552df6ac8eb2678bddf66f54a09bef67293b6def5d76197e96f6ebf41010001	\\xf8802b9029ace0329771bda3f3cee36c6ce75c79055d4f6eb9caa1d30797f3970ebb304de763382ad38c2931a28388e3e508d36c310f77b636e00ddd9a195604	1677509819000000	1678114619000000	1741186619000000	1835794619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-102	\\xdfe870b7c70e177b8d0f9844fe983404f75d384e334cca2260f07dac4d03790e13353f7a05b9625427c4190117d7b099a52d471b1b6512cb9aa542acb46ddf2f	1	0	\\x000000010000000000800003cbba4040e2e3c30fa242c46560bc8b154d1bc9ca6f7163b2416d22ed235f29df0b5679d1395712b7c62d8cf76e3e04b6e7a50e9302072ba30fb1e173815eb2319f67b2cba4ad39321b1fcb8d1511166c3c80429808aa09cd88c017517922fb84e409b23089db78edc70c3f67d3ed21d7c81f86209c0bd71d8d0acb047806cfa3010001	\\x1430a676a9a215f6b7f8ed611968df7e699557c0afc8509cd0e7d818f8b9628f9509cbc6a03ec51603bf058f6758d2262cd2af8bcd1670ef621d5c192232070b	1670860319000000	1671465119000000	1734537119000000	1829145119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-103	\\xe16854a56853cdc4e475d885a38ebc6ba60c04341e7223303d769ff751ae06810145578667430bec06bdb01e9d439ebd88b064320887b0627b8bee97da7157a9	1	0	\\x000000010000000000800003a8e33bf0585dc51a9bd9bb2915f55c5803bd96be8aaaec107c8bcfac19439461b04ab7b7e9091563e23306ddabece70d345cea1b9b1b652a82a7d0cfd8a6b836b0006cefc6faa100544e40bb4a531c61de0f77fb650b7b9fedb5be7b45e404f8a1eebda2acec1f06bb75fc3032b7a7e7b05156a9ca389d621663ee0bdb8f4acd010001	\\x4720d524413608e164f9e1b8fc705900a3f7b143ada6b2f6ced80ed1c2a2904231d0ca70a4e2635ef4f2a82a8198ca51a88ce4d65e702ce0a987db48a3a2ab00	1653934319000000	1654539119000000	1717611119000000	1812219119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-104	\\xe9bcd3c85ab84ea4688d98a865b6ba2fdd828ba9f2cf0c04508ad84ca8f52d86742d1a555dbd1df2f4f0a39c0621bd649899468bd0310e157eed00135501ce30	1	0	\\x000000010000000000800003d3e613d02195dad0896245083140b5219d59cfbf2c52ab4278a4e41a88d40a786644585fffe5ae44ab3af0c82805b3ceb3c36b022d74565109704cfe53b6f23ccfcc179f71972bae56992368e56584939fe609ab307b17b6d8ffb84ec8f11c01e03a250ae504c5f748b89807825c536fdd5ec5856e60874e3df6cab6074e84d1010001	\\xe84708cebd341df91573ca0fccffd60022ae6e063d135c3dfbba067861c065ffa63befeca952f973976e656690873b58fd1137590ec4ac8053072bb947cfa902	1676300819000000	1676905619000000	1739977619000000	1834585619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-105	\\xecb87419ee474b64e3ab6fd5e2810499d803a63f66a260d2e2c29aede56a696138fd1391b26b7d73ac9556528329d3400c8f43fb9ef8fb47aa62e31026932d94	1	0	\\x000000010000000000800003a207f398534602c5dca2faa157f3ebb93ac1c6a80bb8d8f42aed23d8dfd0ea37f1a84e45d38e1f22327b89a8fb51ad81a64a12c8a06541fb9a5d24dd34e5d56bb2181f11f16aa919e06a294827bdf8f0a8c9e48058d8bf480b075d6ed32cbdf22948d0665cd1ffd92ab84d00f464f130dc1a6c919774a8e303be3a009a21d01f010001	\\x7be1df7783424277af3f8e32d6592f16e37aeb3953faf4a5d6b6cae40fa341f7785040c8ea7a1775dd150374f36cce9208408bbd6f3689da8109d9bcc6334b0a	1663606319000000	1664211119000000	1727283119000000	1821891119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-106	\\xecf0b1efc7e2233d719b481300f8ca79db79173f8459113b528c44bbb4b57a8251b244cff9b9b032fe8278c723c193dba6828130559d7f5451c6870b0e4a39e6	1	0	\\x000000010000000000800003b6ff2234e55cfb7b062e8277b5ea5b2bafe2b51f2521020a975c911af2da435c424833b49fc5b16de5ad81448fe6124b22c5ea7d263cdd1d7219737425c5b81f67f91640288f0509b015ffb9356c79dd4edce719a1a492bc9c73d26258cdcd1a1955f20b32867738c21e57d4a30b86b96cd51eb9ef955d6535afb051d3a6d0e1010001	\\xc4b356e17fd983cfd6bfc40cee76997cb05b82484619e1086313115904201aa9d4aafcca6c7eb6b4123e900744904bb9efddb5480eeea5e49f76c36f654e0009	1663606319000000	1664211119000000	1727283119000000	1821891119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-107	\\xf37c7d39a7462579f8818f1d4309183b66dcc0f7f1b63688b982f28e65fb1d28be970e17756e3d8664ba218a2a66be1aa4aa96f6ef8a1a64899e27ca63a8b475	1	0	\\x000000010000000000800003ce90a364727e2a3bcf20170a9fee4a8edf08a72bfbc907a5efa6f002de974dcf77f77b3a88da04766b329e590aa99968290ebe292c798462ff91361f887487f5bfa165facd34a5e94efefeac993caea9b3b77e7f07d22c29be23417e948a0942815516f0481ab19c54afa45e61e7336f195e0173a16d10761007f9ae8f6f3869010001	\\x681d77759be2ea4875cbf17a028be09b85b7ed89e021e9a11994a8b4ef64dcd16981fcdd1873539f1b414a58a7328fc6db6bd0d4203a05747c9c6e43dcd29c04	1669651319000000	1670256119000000	1733328119000000	1827936119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-108	\\xf564a95f1bbe49fc227acf9d17e6f9062fe6af7b3d94765aa77e263c93f7477630aff00f16ee3fe1b57858e95d835d2e110a8e6bd31573ff251d82d0045de938	1	0	\\x000000010000000000800003d79faee8939208667312a612ae37ca89b28017aaf16e796d508b40cc1f96e3528d2b6aba3293d61937cf5ebcd4be7dd5bba56eed43a0a9fbea4cc53b34fe695e34c6c97abafd4b52bf974110ed45688f75153a6e734410fb2306fe36bc4c38fd1b6d5c5216bb12e60b81b4ddab18657767e7b534f877b785263ae6988987546d010001	\\xc1f4f343c4647e4751ef61f107016a3bd982c8f74e78521474d4f8f75056372f2744f1a69e1cfe01ae32d0177d3a836180c1113ac44b77a41bab04b35876fd02	1660583819000000	1661188619000000	1724260619000000	1818868619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-109	\\xf75c0148088114b89024334faf38b11834395e9359ebea9db84bdaa261e46ee0174cc87be92da8c0409cecd9e2db699f8343f1197a38ea9e2ed05a3ae57815e8	1	0	\\x000000010000000000800003c40b3d0ae69aa1e7ff5d4d6366843e4de46c894e7d0598e730525f08d14afd2c8da70e427c0dd502a2fef35dd02f64f9b54ea296c8058e06af1bda74669796d4a386e6a3c6ffa16b04c5329baa9424661e90e12c311eb388f150ddbb7b2cfd42651497c160a29268b0180395c1372721999f37d913c71a4eef30b71e8fb34d37010001	\\xaa55012fd55704a7009362f1511d1535e924929563f9a1b9c5f835fd1f95cd73c7da644f81e140359b44bf612a801e624497cf8087e65e79f965f6861671d202	1670255819000000	1670860619000000	1733932619000000	1828540619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-110	\\xfea4eaef4db5555295ab5768c1d30e83836542e877df3cafb5f109082112db9f5f05cdc188685ac3f32edd61b5be3bd89e4c0537ec626b19962a54d9aba48423	1	0	\\x000000010000000000800003b855688ed604216f50522b686cd10f01acb026850d13ba8875b6bc955cd12596e6d3e6c9650316df594632955211e15e89e7404dfbc3e11fafdfabd0826ffd2c11b05218914aa99f9560bbd07f5ff9bd0a9b105bfd10137b48e24ff4a9ac4d88bd2a5b85da0aeda2f65e681261648522951c760c060ec3b995b2dace1f003b0d010001	\\x3b9f20a7cdc50e9b341c9dfe636b7f51bea61fa2fb0eb072296e2b6405bff56bbcf5872fcdf907eed6164cb646a7e6dc1018442b0b5dc6b257352fb355b0d309	1652120819000000	1652725619000000	1715797619000000	1810405619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-111	\\x02b1de8fc7a0e7f3a2e8f15cefdf86ecce47f864f53dee70f5e82dfbf12dff881b0352ac82926bbc8a281f54784687cf187f3666025698d08251c06929570f48	1	0	\\x000000010000000000800003b2efe173295c04f34a34bcbdbd7773d5d836d3faa0af241f1ea477508260b5cc1269fef7d0f2981b2b1920b214977fcb7c2ab31f3966b1c607e6c3519d78cdcad1a31f6d8b84b1b87e2fda44ef8928e285b0f72e071dfa1a9385827feeac4bc190173470f3f5d442e6d6a569e88aa792a5fa545fd170da46eecc42d3533eba3b010001	\\xbcfd0ea5c05d831083ef6ed4624ca586c1aa89e25105d1fd3be52be8e5a508b34bdb01df56bbd9e415666d4aba039810909080fad78b46c122957214fddf6f03	1662397319000000	1663002119000000	1726074119000000	1820682119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-112	\\x03399facf81a0018ac1ac27653e0df932aa1f157d025634f21678ed28d54554052405dd7443effcd9e5955ba0fce7a0116420d4d3eb9a56f01f1fea95106bc81	1	0	\\x000000010000000000800003bcd593c2cd6f30d64c24c60480148f54007c855ab592f1beae97d7a9ef1206241e2ab6950a6cb4e075485abe1b3c8b139ff4294ea0100b082051af0b9dde44dab3efcd811fe2be346a5af0542c64e6e94d9972942558b666fc5c82b89bd646c0ddb3be754445bf6f2c051cf2db7f12ef03a6ca4398145f84c3216d51baea6017010001	\\x7805913a3c1f04413a67459386a5bd204c685b0703ed8d25d283cab35806ba84d09ae220e25b7eeb3d0f616eb2dd149cf111f20396acc47c030bb3860762ab0a	1655747819000000	1656352619000000	1719424619000000	1814032619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-113	\\x0f219e29d69a60c105c2e498db500fb5e1f3ba731685dfc719c02f4f1344ccf114a43e6034871f7e4929d7e7aeae8f0f0c411fa68a23cba1b604054550588460	1	0	\\x000000010000000000800003cbd50acc427fa388ab1d1e80d31b2204d90ded98bb519f84d24ada2eba1f170d63c515b096a40442e64a83e3025436a1c4d980cd1cb6c3918432d4033ccffe5c15d075ab7d987068e02eb0e7f435e83fa419d7abfe5795ea19195b1b302b9f55f0961811819516806b65ebc1e891f01a1d99f1c71e12cbae41574841fa421931010001	\\x4ec3dabf1d00aca7ca21d96259524b78f4078cafb6ce71e712d464e93b4d884175fbb8a81667bb57c6e9d47613930c4b342f644a93a7c9f9d66d07221a0be206	1657561319000000	1658166119000000	1721238119000000	1815846119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-114	\\x100d1d4dd2e202238af30238e4c7eee50cdebe4914fd148d153a838eb0f5051a35558bd43f35bc481fe358cfd4782ab05aab5ef5bef8d8bd66b295268819acb7	1	0	\\x000000010000000000800003cd8787f7e63258adfd694ae1b07179b8713c1fbe9abc385a9f1be7b53fb483a48daefd0dd2595fde709baa8f88c854429b02762103a56c6512b497e070867b4e91b5a6926380ea116308309bc7d6958027b27988248a64f5e0388cda9a00e33f89d16988363b5cd0b83a777acf04410af58db82ba5739063ae12a77fe849db3d010001	\\x73571b70f6a96a3a7bb2db7c29617c464fe14a6ce2ee3f6b30e59c3a98bd4db8c9d2482a06ac44b29f62f1268886966e7e5d2159f00fcc883b49ab84b21a7e04	1681741319000000	1682346119000000	1745418119000000	1840026119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-115	\\x12bda53cdaf283e320b2146f23700635a0bf8a8c38532ca5a66e4d72c1a0da750f9b87dcc9ae4309cf1c2ab2cc815057b53c61d0416c8b194ed1f90c6bf6468a	1	0	\\x000000010000000000800003be03a67e926ea972fcb66ab47983d0a755f97fddcc543222a89ca3a6d691bb460190aafcc45fbdbb0ef6ec6bbaa9ddea54cffef385c8df3f000a97857bed77c7f1270573891c2555bff1858f7cb242d3a63c98e9ff30cd0abfaae21230445271c30a76a7a00273ed76faf9030f0f7bf6e035eef8cf3cb189d47cefc251182c9b010001	\\xe3ed18dd3c1e22dcb7bd6ab6af8f5c7e7c02d8643239630639a2804e0a959e5cca321284ab44c77c3c18ae03ee00afa046e25c26963363356208c6e9c3fa050e	1669046819000000	1669651619000000	1732723619000000	1827331619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-116	\\x14b158b5a99d955ab3f0d539978b039f8d7c0b0a3df5fca3c67fbbef28c782aa5c10af58531187465f69077e03503da771383dde8bd97a80d9903fe2e754f1a5	1	0	\\x000000010000000000800003c5dfb010b23bb3d45c6d836bac10854853d5b1470e2a1c32c52de82f52b2fc25860aa8209f4a5dcb4ece9d3bd1e5d9c0948d8b55ce69583514c5bf790edc46f6ec39c79f81fa3c51a339b7c32796660790a5d3a23bd869e3ad74863a4ae5f2f87603d0424f13c5c91ab7537c03c3dea53942a1b20c420d981fb3a043fbd37179010001	\\x4ebc31bc3db3604eff451bc2ac08595bc61dfe80c055c6139300006a236e0d4ba657bb1690afad89475036d9a8d10f3613e3bd74130bb96189cca67c53aa7c00	1665419819000000	1666024619000000	1729096619000000	1823704619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-117	\\x15b12cc1340bbf820ba972b523e46da384a20e1080fd9bfd27efa74725a62ec87182d8fc775545c385340bf2809528e1d1674fac8f9b560546be23e5ffdcd236	1	0	\\x000000010000000000800003df81dd77d1182cfea0746a1896270fd47054e77da7a4f2098dc080538ec8367637db5597f4d75d37332a6e576a3800a777cd4474c2c4111fd3b2fb32d8c10e249cf0c9ad6c4b890ad9259b90ec1328282b4efde8f1704efb27210cf2233a92192a7de90f9803d3e18e72780d95bdaa0e756975fd6739e0fba9dbf7031f46de27010001	\\x3114592e47142ea1b86b09079aec12fc3fd271629163679ea666e96ff42af97db901d5ea8d7023fc3775aa24f57b9eba56d8b7b5c81664b1a6e9fb151bc2f00d	1676300819000000	1676905619000000	1739977619000000	1834585619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-118	\\x194d2356f6566ca1195b726bcf36f4f88eddbee9a4351b166aead8aa58e9255b820b6c72fe5f65966ea65e2e5e1c624587edeaa30e20d7a52f3caadb76980aa6	1	0	\\x000000010000000000800003a64ced86f442b18e4528549ad5a36d13541d9de7e86f89e2d93f58dfde666c1a45899d8fd45c6c1ddb004c4f620a41409bf5d50b32f8accc3d7c53977dfaf5678385bf046eeff4438cfae2f5a33d3d27f0a3feb4dde8ceaeacb76766c9082f075c3d7e2b825312f203aaac002b65efd31724c0dc9435ed8084df4392727bb985010001	\\x8d7c82cae1e48eece5d6ef295f9576080e0cf2f49d11e040c453ca89b1a2d014c9222ea385c62ec4d99494a1d33b7166c18d51eb025f625553474bc1312a1e05	1652120819000000	1652725619000000	1715797619000000	1810405619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-119	\\x1ad9189cbdec2b59a266a070401b38ce5380db399cea21d2f7bbfc0a8f6495129bd0cc812f2c62fd0518c084bd4d1d0142ea1a8074482044e48820887fcf1df6	1	0	\\x000000010000000000800003d450cb0713da08d43b1254910b16177ec43d2b366b5eb49468cc0d4f270694f0e01eecc09dc108721becf3559540fed32b15ca331a04e06a542f8dcd26593af3b8a0915117f9173ee03d697699e37668ebc0e3e8002123fa77cb85f2f18a21e621b3b6563d1c8f11ed12cd07135496f4c237682ac4d37c9399c07baf7ecc824b010001	\\x660da5b84d3f73418804aa44c27ce694a0a2e2f5176c7138fb31aacfa201917692ae1bb1cfd5bb7823fdc9c81f56fd2da9ec51b63192f6bca44201b204b3ea01	1656956819000000	1657561619000000	1720633619000000	1815241619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-120	\\x1cb12b15f5ee7e55615e7d35bfbed6f5b98a2ccadd78cd200fc8d5a2a924e4bd6339189f8e20ff2dde5929d470c1c94122d15451c3de5dcb21121b4e14931698	1	0	\\x000000010000000000800003c33921a8dfa85ccfdde574c61e32f0929c69ab7fc234d976021048a20a8a227670997db8b5340d2aa8da0c7a7cb8be503d91758a1633e7f6581ab6b8592dee679e0d6407006b336283e6a5e046c8995da5a60b8310d7487dd1423002538a2c1c4107b540b3743220876f36e5bf21dd5141085344e4860437e36c715a80579c31010001	\\xed63587944e00d825eb2607c7ed0b99e746f5d1876b75df12cdf94a57f3f91ea4a7f5638f132294d2c24ffccdaac3fe42287b987fad40de0733fe0bbc4b95f01	1680532319000000	1681137119000000	1744209119000000	1838817119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-121	\\x1ebd0fde42ba387e6285ee46807e1bd929bf388e5e25092e07c209ffd0d7054848f6cd7afb6c7e32afb105d314b641825ea3b9fd35e6f295cc69e35200b806c7	1	0	\\x0000000100000000008000039f7d76eea258c21cd7dba3e641b430b22f7144a9c4f051e4eabd23356ff30485f14ca49271fd46b61925b249e0e0e5bf67c81da880516675e16a6e45089fcc69c8d381c94eab2f5ee5754118827513473d43f055f2d447197f3fbba2071778e625825b1968b1ab8032e0bab6ff083aefeb15dbe70c90c656591aee5ef343eea1010001	\\xa0eaf7173febb43c9e7187ffc6940213411be45cbc2d21e09b5a06d13f318552419418ccad63490348e767e346b1d00b40d7aa8404970b68613238df3e19230b	1657561319000000	1658166119000000	1721238119000000	1815846119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-122	\\x20556610808c0a68276c31134f722d0ffa0366b70623930d96b4fa59a5fbde7d22ec647cbfb11810316a123b5286db97757506f27aa96f1947f1b3191f87405b	1	0	\\x000000010000000000800003bbc14de7e93276f19cec4e22c55388cf3342f58e1f850ac2c7f040ee1ab0d48980bb94044f12f4aa0ce1fc3bc820ec9e366340f8991f1a5213fb538d4c365032f95547a234b6d6553acc5d90ccaf8392dbd5b6382bf91feb09825c978f2a998eeeea36ffdee8af719ff38cdcd61339c3dd98ab9e216114db02450f23def14e75010001	\\xa8da1c37cc6d180b14178dda2bffafe13c07e95de29d744b89094b81c6938a3e13a93fbfd91ad9ac10e58e91a0ddd647e48fc50b57ffaeef575d39e586563203	1676905319000000	1677510119000000	1740582119000000	1835190119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-123	\\x21f53fc143da9eaed51b409fd1d3016a3eae9dc4b4a95840b44fb8a4cbfe69a8c72b844d14017d05e9eac556df93c848c77d6e8e393292455e6a1124aad618cb	1	0	\\x000000010000000000800003bbd164dcb8ee8e7ab0c78ca801d4ab2b1539be9ef0e26336ba01d8cf3d9056d92ca1747fd93a360ba96a12b1ab3a22eca3c28e5574347437d90857f25ab6f5856bc70788cb7eb586950b645365d375dfebe72a3a0a8c2adf58c33494762526bf9325bda6a7820af64d1a602fa44a58c4a0dbbe679645a3e7bb32a1a28c02632d010001	\\xfee478406efef7e220d23d5fb8fbe10f3bcb7a1f45c5be4c87ab823992e8bcb423d67c8ff1fe8b3818d75ebbecd63b0ec091fc99e7a7f1420d7b9e040d005c07	1662397319000000	1663002119000000	1726074119000000	1820682119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-124	\\x27dd51e42a748c77169e23834bdc02e1eacc418388671d5f337fe421d2b0b0fe40f05b4fc11c8eb2cfedcecd54a8c86ff291f226478499b2ec78d03f0ece0b98	1	0	\\x000000010000000000800003c8a3affffb48d144f4df4779ebdb2b1075044ba561442b28c53a94dba7e218a84772d514b037266e79ced491b462072c8f545833c0315bd0fd02e6bba6fd7ccfbb3b5582de7e79bc37feeb6235fb25ba9e3813dbfb24416d0e051be25d37fe278ce371f6e5bb8a83de25c18f645da2f212bb45146c31c52c37aa88c3d5544fe3010001	\\x6698c1162afb0097c2d20ca99f2198f4d1a47f1580fabba8168a4dc75083727d62e2071c49fc48ccd7eab52150091b841ca6c8eeb5f27ce701ea0be193002807	1661188319000000	1661793119000000	1724865119000000	1819473119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-125	\\x28a128ca4ef3effd9f1fef6b5de1da71fcf1b51231b1684728e315c6a91c61557468ce88577c2db0f84c7f9d820b463a81125de0e7c0d3aada073177932b522a	1	0	\\x000000010000000000800003a692ae9c9182693ae8f67eedc5c1dbbfdadea62e6b1715e6357ecfaf067bc1ad4cfa0030aa0256938ca093175dc5e9a196f29ab20c34fdae37a92f14b6448c5c6aa64d10217f492a11e6f8d89719f96a90be7b2863fad12fd20896198e7e7d9c03064f08b990f5fd2d9b169f8ceb1cbaa88a22e532bbf8b9b9f65639a7d32dff010001	\\x797a0089145e9906a8221e48802d14d94db784472890798b153209d6799e9c27072b5985e802022c7e715bcc412bb22a645363238c9e5026fb73661cb261aa00	1655747819000000	1656352619000000	1719424619000000	1814032619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-126	\\x2b0903238566749637b829dfed8a650db10f263e9daabf579b78e859a337a5878c3abc413301a7307950d67070bfd5e369344e30105151044f14fbf97def1b81	1	0	\\x000000010000000000800003e8f6aeb6da622ee632eec96b0f28c0cb1b2f752dbea17d2f663a7b8505c9474849af3db22cfd95886fc63902cdb7027b8ed6565a7cc5f5be7295f76cb78ae382f4766787cb1d486e4fdc4985fbda0910d6fe86e0bdb2c73e91cc8649fbd1fd48ab381bbb6cb1bdc6b03176087443f4e607a752f9f73a85b01cb67a83b1c260b9010001	\\xde3b4c3aafee9f3acce610b1f988390325f6f9c8514b7885bfdb1ca1661dcdcc25ad292d73f08fd3ee6614843d0bc079c722f82bbe5e396e2f0328d70cdc7e0d	1668442319000000	1669047119000000	1732119119000000	1826727119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-127	\\x2f890e536e00170cff032ef90852cad6edc9e21ac5ba170aead3c5fc319e98529b19325b53186768ab485cb34dfb84842fd7d70a0e8ef305f7e537c81168a761	1	0	\\x000000010000000000800003c7f978721c713036bbad83c77f80d5341e65469adf13ba584c5c4ff326ca4d331ed79327f2f67b2789b8ecfe616f1185411256289e18d0b9254ebfaaed45801d933e877dffcc7dc175d9ac46733bc09826c5c530fbb37d9ac11ed176c586609a64e41325d24d2453b8564dc96d06b9130f983af308b47a739a255b92cb200c05010001	\\xbc21adf98e50b28a38c39bfb689683155c7eadc8a48e908981e077f12827685ec8b296241d5fd74eb12dc45d159f0e662aa17250d87923bc11c682dccbc8b505	1667837819000000	1668442619000000	1731514619000000	1826122619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-128	\\x30b9c8a65af7dd28bd50f9557ea803aa0b4c952e9a66553da7cba42c8b67e8d627cc177e7368ba9673030ed255f5aedfb60438460c9085d4e2a1e7dc54101b39	1	0	\\x000000010000000000800003ca93be54a5cb1c68478f92e9a19226fb213b63ed02f8466cac62795e9bc2d1f541aaf99acd9a94c7c90ba837725c10c4965459570450e06d7fcb4689caf0c892534529021d606a1c8f9aca4f14b2a3b8686cdd1b10709053f9b884db0d03c64a9f6a6e9e5c57632c4f0a62f3cd9454a9e8f300fa96ec3af4c326f13f4f489b11010001	\\x533f8ba5db602b2ea34f6e707ea6998366f7e48f72c80937e5674da63018f37498b02a59d8e13741c1bbf88f86cef8393fae72dd136781ad8d90b6d614f3c000	1661792819000000	1662397619000000	1725469619000000	1820077619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-129	\\x333d69930bc55bed881aa3ef123197a6eae5e06a1651a354fb762a14b4c4467adf5e47bbc5e4ab2e207ac29528f95c65fa02d302ede6edea56de8dd05772c1d4	1	0	\\x000000010000000000800003bf02f34574101cc462a9f9f6812f1e698fb2825bd6e0277634b9ba9037fff2de63e5526564b9288f2f3e662718269022aef7a79ef16eca7d2dc30df0585f76acd0b2f614a771b980c0fe67a775e6ec1d1c272724bb6bdba90e2e4a6f1a759f2d2ce32c4a77b0d56e9bb045879fcda5383f2f6ce1e86a4ad5d77e9fba12dd5b73010001	\\x044d49be5a336495f812f4474a9230faee51b0dab6841134abf70ce20f6a5faa5c34f6443b5404e1aa1387efb8b17ada6a563c7ad8ad67505144b5d790dcfb00	1670255819000000	1670860619000000	1733932619000000	1828540619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-130	\\x340944b8ab7c662718fa32f0bc0603e4f0cb1cc2f2f272a59932c1a13cd38b4ae7fba6222a4951f273559d5dc7ecd4512b6ddd416e591ae5d3cbbf1a847a243f	1	0	\\x000000010000000000800003c1e18a33d3abc9ae5b9c9a272468fa71cb496422fd2cb4290519b9e2277f6ff5dab1f5c419f09bcac7379745b973b66aa4241cfd75ab8844be3125d5f3199aaef63b9b0c02cb1cba846ef83dc1a0b6d1ba84bd8cbd3e4d43ecc4c40b0566b9415aefa91877aa2728e8b215d6814da3e731e00f59922b1da3c275ae9748e636ab010001	\\x41b48cea09e5babbf237a261cc481d052c5cb9404013f69761ea5694586b22a7d88e87e30d727dfdab73fdb9ed9dff6e74e1b7a85a34d385f104bb72c18a6909	1669046819000000	1669651619000000	1732723619000000	1827331619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-131	\\x36a1eb84524cb6f7338b8a6358d6c0a0a92a14ebe370cc069e28b29601dd5b187e7c9e7c8edcba560d688c151fb040085308b104a32728eab212ad84f62b54f1	1	0	\\x000000010000000000800003b63ceb901488bef44d7d4bc31f1a138be1091851472e3bd27728629ff8cca46c798b076e63d92613b9bae0c021777798974cee46fc0f2f036b85d065fd8c7f17b67b034a3a6aeebaabf863669faa761e4c113d4a8a4b3e6cd037324f284ca12154044a8d9fc1e686108d5ea7ed2116c56a835102d18e2255be7bfc6dace25be7010001	\\xa29913e64aecd463fe05be38c72d8da99380c06a9a3e3275dae87c88b1ff04e51ba6a3f440773447196ce8d53dbfe4972274ed73661d2fcd7bedf995ed21020c	1672673819000000	1673278619000000	1736350619000000	1830958619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-132	\\x3725e9c9daca0ef7d647f1e0f0a0598ca507f176f6298bc6cd3922000ac18a3c9a128335edd5ea8547359d9bf4892aad658900610484b70d2a7ba4be8b6c1252	1	0	\\x000000010000000000800003a2a8c57c7e86f555be0ae4f6d2bfbe950acd02b3598023f2109fb3c0541b337f86a81e5d9ddfbae0b556f8131c3f4d5459de718e8d9ffa4eabbdcf97543db74ce00be7e6d1c9aadca8bcfe4a92ccab1e84a5502d48d3c9fa84611190d2c810091eee8bc71d5e145ba5030af14bfcec110ea104270cd2ce1c65a1bff337e13957010001	\\x2ec1549c6626b1fd5fc37593e95f6baaeeca965bfac1000b8ad44c0e5ac75a33fde3bf7cb83ff568b73536caf50864d2c5dc927e398a6e7ad5b6a31d475de502	1679927819000000	1680532619000000	1743604619000000	1838212619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-133	\\x38a12ff03d061b6adcc2e1a05a773d0af886dd43571e875d01196aca19a74ac1f18407bcf0806fe35b2bc8d3a10330e0cadb96ad0da8f4603eadd7041f59fea4	1	0	\\x000000010000000000800003c94caa6a3c9761bcea48c777892e23b9c7d858b9e67c27b08ca200728e2d07083a6bf5d378ccb2aac686c8b1a56c05d4619775156c6d0f1a42048bcee84adc5936c84faaefe681f57344bd9c513def57bcb8e2c23df3e50c574c1c03da1ca2c8bae2c391f88f56bca8cf7d9a38f2f6406cd070b6a3fcde2aa0a3288ac5b1b0c9010001	\\xf21e5967e6e94d278b6621ab7311bd2a1f60fab9f9f52eeb0b59452090d3138e0cd7c3107c2d4ffa192be45e78cd1291a432132663aabc2a5d1c55e9d006df0f	1669651319000000	1670256119000000	1733328119000000	1827936119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-134	\\x3e61e3dc6c3e52fdd3046ff29d3a038ad19e69d8651930a7d6a7cd32a544bded47f98414a2b8a6c84472df8eba090832359d93c04db0fb789f7c2a364da1f3a0	1	0	\\x000000010000000000800003c5ec29aa0f041d49d23f3e0cca2cce32453d37ff2a267e63e2947ccbef96a55f97e106f59254a212cf39ae4321589a83e9888c9a77912c1d8711229988dba94fdb94c12f5b4f1e9248682bcea8359917b534bce875509c99570e6d9158699d82feeb3eb133af3ebe0543a56279f2c770b4e552d33059490f4ceb86e1674480b3010001	\\x278e1e662d6fcc80341e5ea2e6cafc499d84cde0e52a10357d32327745ee085eda24a05e600767ef7a1712c450dc58c3395417ff102747a8aaaf9e9b47545902	1656956819000000	1657561619000000	1720633619000000	1815241619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-135	\\x3f297e6b775badc64c03679131553e671ae25740d66d18dec4d92d615571b0074f9f9acbb5a88aa285ab711cb62a780b040cd8d23e8ecea4ae93a47e2263e161	1	0	\\x000000010000000000800003cc1539d28bcdfb541c6fda696ff29a50790ebef84257c6c6911a7725db88cb9703cf6096a68da8eb74c2d9c7a47cfc4fa4624b31dc8954f1152828739091cb9454fe440bd0444c88525c1b72daa750c734f7ee2be969fa9fc650aab07670727e7365c6d9c4ca87eea3c95bc7bf1011e82e3478c092df1ea462dec54d113b77bd010001	\\x9f1c978f7ba53e805e1e461533d458b7448ff2bd9cb8714e83dbc5a50768820890387fd3151d76200105487dcbaef5fa7e2fdddac4b5cd9246e416bd5fe6670d	1652725319000000	1653330119000000	1716402119000000	1811010119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-136	\\x4185e84f96d5bfc6fde03c8d93e9741f99dc412183f4c46582df4013de26f761211d69c6c3bb8556d3072bbfa010f0b9ce18a591d7cfab4d0e0900a0c29404a8	1	0	\\x000000010000000000800003df6d285c60a9b12553e8f44307258abd23e5497c38a83e7e5cfb995cca7dd09586f9e9ab42385c01c84121b5e478dc884358513d82d2c05ebbf87fa178ce7aa09553b212668c520f311a6c07e94fc3920d67fb88968320f92dc7f2220fbd63e5b7730d2ff13bcfe521a15bdab1f369c18683c077b24fc804583c52c2c6f9b9a7010001	\\xb85ccfde7ec3207c7e1676aa113d57b3f1922ad56c6e4b76f7758d56d6a54221dae0467192135d34490bcd63b7bfa4441427d7b2d4a34c4615cfbfbcdb2e2d01	1673278319000000	1673883119000000	1736955119000000	1831563119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-137	\\x4479df616a897e9064c389a38b526b8c3edfa0849960876008e3859598852eddd7708d556453cbc85711ba5ebca97705bdbabee83ba66f8b233e82bda7067c06	1	0	\\x000000010000000000800003ea89fd9770cce033bcb13a28392370cff3c34afc774f6067d77e38ef15700d52edeebaf97701c80d442c1cfa3f54efe96f5f7f48f4c1dd777a173ce57230da695fb6bc62cb8fbf75a78533ea21196db0d65446422bb25ada92c16fd9e8ef20f6ce1b737c664ca7dfc734217199479a39f386350c7e51bfaf4d35d7e1b05bc85d010001	\\x9f55da1fdc42a4166ad90c5dc4390dd3671ff4364a70f91e6cac4eecf65bead04e62cdd5c24c8e8276791a57373ee0f461645745eadffcf511f6cf6db554c207	1653329819000000	1653934619000000	1717006619000000	1811614619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-138	\\x47f153d6a7c45d07101914d59de0c5affd2fd8aaaab1261fba49f56bb90fe805c07053a295ec2fe5def0ed166b8ea7d83b95b3caef03ca3627f9f08ee824b927	1	0	\\x000000010000000000800003ba19eaf83b0b93d24e4c0ab936552ca9358936cd0af4f1564b514c66e9ba963a1fad440679d6dd40545ff6de9e4aa8fce7223a8f916fca3eeaf50289e6af4c28a8fa949668d402492a26199fa5d2d86b076d496f90f2c20ba168fbbee447aff58f556105549eebcba922de577088f50b8559ed526820a7958bc3889f38f65f09010001	\\x05b86b5a922506291a77cc454185ebdd52e96956535aa8e45969e90b28838a2a071cbf68618495103fb4f17ebeb86ca1653ab3ff143f48e1fa87bda37e5b950f	1667233319000000	1667838119000000	1730910119000000	1825518119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-139	\\x4aa16132cbebf8446978d3df6e37fa8ca20b552b4c731d23e8146835b7f43a637801472c791a0b253090844fb315283759014372cc32aaf5c8a6303f87d424b9	1	0	\\x000000010000000000800003cc68ddf763c654a0a342126342bbb64c0584c69f2b8ecfd51bbdade377f3c8ab49ed908608cd8f3e0533edc2dc16ef6ffa8ababf157d41bad841535059e4dcf04684bd7b6c8260061a67619b91999d64baa023381d586f7fa0d02eb9aa6ebf4009f62d3f10355ca324d8576ffd7f501dff4dd39719e3b246c10b9bd59fbaca89010001	\\x5c1cf21bdfd714f5d1f86321bd3681f353714ae6077a896699e444c352bb108839f491696938ac2d884a5c1362ad538363c2caf61a44346c9cdf1518a4c8cf0e	1682950319000000	1683555119000000	1746627119000000	1841235119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-140	\\x4cf9703451de94cd7c17963b4bf2bcb56baa3bcd5cccc7d7100888bec0607f66b20718dfbca2305876c962dd21b831c8d1e5f44ae8888642a433069db04b1f80	1	0	\\x000000010000000000800003df46fbb47ba41ddf90f7ecf84c226185ce29b826bbbc089f91e540004c04f039d66ca87b60bd1db6ea296a01cab61e153befbf8c04edfc200957b453f8a2d50fb02c97028964092f10c14bda8ac870e195c2da86df2137fcf91adfda954cf0c6bd1fd0fc0e72bb28febd63183ea6f58cf3b98700395d805673d1078afeeec6c9010001	\\x5e1709c0d2d7220942a89c74697374ffde8a689585d3071d0163cdd42adf4325b095a1aa212469a35f4ef84a004c4dd249d60ec1f106a4b2e0c33a0e585c5309	1667233319000000	1667838119000000	1730910119000000	1825518119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-141	\\x4c618d5e1556883433922a87e2b4302e77d5c6f1185367ba9b420c8929b65bbb1072b73f5385800b0d5b13c235b071103dfec44ba8ac540921c99e1c233fd01b	1	0	\\x000000010000000000800003b0dd9dd67b887905f3d187111b6ec56ef0111c26a0a1fb5d9168d904bb804ef138675a4beb28bf20cbb81e307d89a36ee285b228485715e9f5d04a301253f3f4a4f67a0d4e2a79e6fd5afd7bcb80d5ddf9d012fb8ba87fad3e9f1b98d431e409f17bb808aa8c7e532e520a5c4af03ebbf21096319504efb953e9eb928c5567f5010001	\\xfd7dd4abd3b5705bf8ce444ffe9405b5f296ac0cba651840d462e863289db7f572940e41178cd5a1ba4cf34e0bc633c84aa6ba5279f42bea9a5b114ee70e9604	1671464819000000	1672069619000000	1735141619000000	1829749619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-142	\\x595defeb88f5f049af5815c9116f5ef0f31955c2f2efa799a1b309d7ec8145e81df2b92d55faf0f4c131ac7ef14cb8b4dfdd7dde8b059f2e705146d07470693c	1	0	\\x000000010000000000800003a3fec67edd2efd76abc0e58792a31e4bf5b927fb2561e6e0353ca98681ba49dad3ea25bd5e068629d0278a9b15c890e32a17d1f91b909766b850e9d306e3029ddd0a1a2cf1b3746559a6ce30baf3594031f3e82459b42a8e4b969a3ff755f4fadca0443ad7406b7bf19e588fa1eb8b44262f7e1fd0e046f4107cf08089be3c07010001	\\xcfedd0d3ffbb7dfeaf2674d8bfc650ee007c7f0c3755e29963dd164b979888873f13885ea18513b2a7d8456e0382e5024d4b9728f6f341abc4e43bb48b8de60d	1675091819000000	1675696619000000	1738768619000000	1833376619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-143	\\x5ac5f399a27bc7fe166e39ccd25b35cc3cd1a6647c12f73fc535ecc8723429bd15abdcf81235483fb5039a3ad16b1e0877e2b58cc5ab78e2728c7ef32a0e08d7	1	0	\\x000000010000000000800003bf22b4989143d0d8642233c60c113c5f97f0d345868b0aa24968968ff7467bcca05ade7553ccbcc93d347848ba1652c1ee6aa9209335c7afc0ffd087b1fb2d669e72405815e7b670195a7d2834f3af7d48c7e30da0f774779e8c6150404d5ff17ff64d3fa4123d7ecd52f2254c37a7fce0e8ee08faf8de18886bf072c818d173010001	\\xf2765db9432da3237a85697710700ffbe8a289de60bd50628bee73bc7eb447a087d88345f014299ed165b0adc8d02d33563e6f061d876181bd86c74cc7fb5001	1667837819000000	1668442619000000	1731514619000000	1826122619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-144	\\x5e0d658eb5e40166a5781ba1024301bcc01e02616a26f26c6b969f6f025ab8728e36f8063cc95463aa9faf35688bb5e4fcb888d8f61c69bc76772b0f7194141c	1	0	\\x000000010000000000800003c949a8179947b427e756262aea36c0e6a4fba56085053837c3329dfaf66396584d8ece616164b84cbef897223da3af2d5d1da01e04de6bed22b4bb397648a7ba3a5adef228eb4bbea78b6f14ddbd40a3980f2c653bf09a2c698d8959f19f3133b751aa2ab1313e1dccc42ebc3853e0b7e4972bc29107873bf070d243bd7f155b010001	\\x9922b7001aeb3b9c1cc335684f98d4322ac4406e88e4486c01fd5c3ce31fbe4516d2d7c3c3fe9cecbb2c4423ff1cb6fd2d6d88b06efb89c63f8c4b4a959ce50a	1651516319000000	1652121119000000	1715193119000000	1809801119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-145	\\x6325a2d0e5c74fe9e284f2fd9bc3761b397ca1427da853bed28e944b59da31bef82991db5ba2ef96c4f2a9624eae24033ddec1ee955c14e73b4d14dbef44523f	1	0	\\x000000010000000000800003a9dd1d83b28945724c26ff126eee3f430dc5e58a478fc2ffb317c868b818ce9dcc0f068f0ce768fa581c1263c75fb6f00860d2759b01bf057cced91c5b955c70edeeb34fabef196554bbd170094ad8fc617db997ed35ad3f55c4cc0ec51d4dfa42fb6aee67b77b6eecf46bc3016cc56bcf13060eb0da073bc3d321aeed6a6589010001	\\xfc132372b42cad96c63d3ba17a8c9ecc939f06d010287eee0eebcf5e1f1585abdc627af9c611fac47570cf1906754590e0d0ac3803e6ae46898e1e2c124ee405	1651516319000000	1652121119000000	1715193119000000	1809801119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-146	\\x64e5a57d8ffde81687d99ce2a5787538961ae0d438f6f2fc5dff04ec24eaf2b01d710986c26bd9c6cfd3fb8b45ee64f8e9ff245ff76605532b21e59358517486	1	0	\\x000000010000000000800003bf87cc255e1609ab0d14c86cc551e474d850770d395663e343c5308f4f95f0971790dae9b18d722bf2e2f830cdd6608c42cbb790924df16082d25463bc9206e8692d9fff51196d8923b198e91db46572a74e90a9637c0ec76da14ae2e9671aa1f291864b571a37fc5acf1a436b4b0ec536e8691623210298db5436fce69f88a1010001	\\x260376fb9499d57fd2ea9d8405433ac349499db9e458c4b3dd2573ba3574df5d3476e1fc2c891c4f698ca19afe8412f1db20b7f6ab69a899ff98f4309f8cf503	1680532319000000	1681137119000000	1744209119000000	1838817119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-147	\\x67a95f1054c3da573d0c6d1f13b9c6e0b2daa946ccfd6d1f7e53416e1332581beed1ffea16ef1326b3447fd27973d91b1afb9f1e8cdc9db2dcc813bd72ceeb29	1	0	\\x000000010000000000800003ceba1e5585225f50eb998443b256df2cd3b3876181d856e0d64de7bd06cf3595876821f82ba53026808f931f4a35b66fe985c0f1ea21e21d9db608027fe2f5f869d439519bf1abe20c2f447c43e4235a1ceb29b8921f86a438045f7f48d69c090aebd220425269148d5c2aa8197beaf111c4fa166ee08cc59dcb9f223aa18e5b010001	\\xf16e6bbbbecaac2d69e13778aeffbab312ed6f1b6609a27cd8fb1ca35f07e857dbc44701df36940805e3bfceea9b704591bb20ff7880d878aef153095a412804	1666628819000000	1667233619000000	1730305619000000	1824913619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-148	\\x67d5e0df7046ce05efe646b618e45348cde0112033958c9cfac879968845bf2ce74294f5f79212994b853e747d5cd06b6895a5a014af950bcd0bf2a1904adc05	1	0	\\x000000010000000000800003b8d299535129a376ae3600831894311c20543b92e1496ca8244330a03112d850ba1f7cccf53809026ededb9e87d848800da431a1d52cfbb8aa0bb2f4f3b0f8cb49e6c6800b5dcd4197c380b54a404ed864ce538a8f6e01ca465dfb0f07f9828b71186748e6136f9e8659aa2be35876e6761eff6d92bcac00a5ebfee2a7776831010001	\\x47d4efc1bfd3a373457366812dbfa93e80b69fb744042efafa9c4f69e5ab68e347936dfc65c2b25b914cddb831ce50c63251ef39f2412626bfa8b339cc9c7c0f	1681136819000000	1681741619000000	1744813619000000	1839421619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-149	\\x69fd0473806c855671749625d0756821d35e4da9c2704e0202368986bf47ab0d6f920a05e92ede9b3bf35c1f218677cf6099dbe533f9902bdf840866c471f81a	1	0	\\x000000010000000000800003d6287579dc35015d135eec4b787d89f97ad3254a7fba4ca3939e53a646acda6e74d504b7c09151a2ddca95b678e973c36343dd4a1ed53e9c8f059ce0c5f35cd341e6afd4a9563857867d5d656cbae3f9f1c9db90515d565676529d4d04c97baca7c6c800a66ec5e3af50bac276ef0c01f5ee8a4ff4f7060145f912cbc0b6fdbf010001	\\x2f9f20857be5e3530b46f6903692d670ccaabe70aecd5edeb4f72d890d78568fe6bec7a023cb116aac7a767d91469b867e7fcbe1bdbf0959e442102429c9c701	1674487319000000	1675092119000000	1738164119000000	1832772119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-150	\\x6ea93cdbf1064093d45c4736d442bb0606e752dd377faaa43b90f98347307dcb717fdbc7636d701c371ddfde5b3e6e300cdeb5c072dd902b014e6709922df695	1	0	\\x000000010000000000800003d2fb77afcacebc7f9f5171da2f9c379607567d41e6c01092b4fdaf727688acb61c42b66af9a3f71c6b1d993cb701431f48b1d76acd3ab7ce9161c14640892cb669ebd7c74283c073ebd62767c6768cdbfb19735e1271e31f3082a1f1c3d39f24312046419e92298eeac55fd029e69d865677256827e7df266c5a2228cf3e03e5010001	\\x643fb3452fd940ba88c319574e5b07fde6bd9fd47d80dc432d74a626d7b95085f82c1906b30e55e444f72ba3f0dcbc94af12c3783650d033482fd707689c040a	1675696319000000	1676301119000000	1739373119000000	1833981119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-151	\\x708574a5bf50bb26821b68567cf1db19db42646432cb2adb5a637d0e4d62920c9b1f2b05cc53513107481f21ed6e9941f69f9b08ce8ea92cf8effc30b6f3f46e	1	0	\\x000000010000000000800003b708a4be91c18ecd794127acaa39224388f87f622d97bbfed77d19a03586b59d5cbb94baa8a1688524626b399e48d57c50014637bdfed8fe5fb07efa72953bd4d283e1b35cc475827218ff1601c57a1ddf8c383e54cbcdecbf70befb3e49845fbbc2484874b7b7858444b222fe9d9d75e52a45dd4823cbeafd0c1c2de772cbbd010001	\\x089239f214d32e1978d06ee268c729573c87eb202c6881b09ed81d2cec29f94055174381e9dfc0cadd338ff1ee1aa8e12f748e4fad7c13090da763f82b215a0d	1661188319000000	1661793119000000	1724865119000000	1819473119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-152	\\x77ed778357a0a55fb29c59f7c0b157d6687f13e9f4fcd971f1390cc19faa5dca154f602465c9c12a94020dd11fa4ecf1350c0eb3cf3a8a5b55a0d55dd2416f4a	1	0	\\x000000010000000000800003cd2dd69151e298d6c86e1e16f6cdf25d338b3a8eebe22d169067ebd1d8d2ee0b57723b9bcfccc8730e9acba9a3199664d5304d4aa33525b0b52a4e9c47d131b786765801ee5d1e26bfe7102f0474c80c7182ea339edd6c79d7650fd1716b1579534a36339736b6e1d2b33c51ec3233c851174c77b5489e9af83765633a1ccd5b010001	\\xe0bf403de038974abe2ce63ab329226829e7c32ece9d2eb3c71a7e79cd7bb9cfc3940288356604621dc1b833bc958788ed61d10d265fee1fcff8d09e0ae7e006	1667233319000000	1667838119000000	1730910119000000	1825518119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-153	\\x79adc66a02e5601068ab4d63a978636a182c3fbd51e913f8c01b729e71180877e4eeedc9461ae2215603efa7f91903f2a33d88c37515c8ae618c686e71b4e851	1	0	\\x000000010000000000800003e4fd67449668bfd7bf6899c6aba0f86fc4683f66e857eddafb07e7bfec89ceff1c2244ccb51136eaa02f06bb030a289a5b33b1a08b4675eac57d4b8086d9c627cd2303869b97ac96004f1d7da4510e25786036532b4d1348dc83cfece06331ce70c8e0fc69877dbf93b62e5c3572ea2ffae65989e7d13f31b64cd1264b49cb51010001	\\x20aec60aff078c3bfa627edd29b88633c59adce3205623004bc125b4a3cb4c552f7d320329dcc593ca6fcf9ee9067840ea4cc03dd42fa44606b89f47fad52c08	1678718819000000	1679323619000000	1742395619000000	1837003619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-154	\\x7a896868d3d78b7b3a217a7a2675c8fe008ecf0d45c657953fdcb829d1b822f00ed738dd46b3996924521d77f90a84300a2b2e8c4912ced5012908d514be7eac	1	0	\\x000000010000000000800003c4d0574345795ea7e4bdf0ad3fef0f726942dfb7464ec8d28238c8162e171f4fcb665db12193e56105a740cb323816a0f34e28ba93a3ea7e80eaa6ff692990bdcaee311fd006e2cab10d15116a80266fcb3364b95e0ca8c72e58d9c67cc9e0652b3c3db5c7fc2cb2fad114425b368beb98c88a9e26e03fef26abdbc36a892773010001	\\xcec0461b151d42d823a4bb04f7a7c9ed76c1317d0775ab1c7509a9631f0f270f56bc65b8282834ea64693d3271efc6f470bc97c5a463aacfb9932517c353350e	1652120819000000	1652725619000000	1715797619000000	1810405619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-155	\\x7b295f49abdaefd048844b871e3d2b99f5c09ab03a094cbd52602d0ede694a9430c9a45e9c7b09d0e43e04b6fef4c22b6523adb670cd7d7520bfd85d7427315a	1	0	\\x000000010000000000800003fa641c97c5fddd3514315eaf9fad697a3b6bca187da8024eda2d8988cb01c76b96ee2df6f8c334919467e499ea18904e4afebd377908da7d4a394047d020d6d5fe92384beccaff3188bb4248b839d12bfc518f2545a1f66dbcb7707d4fdfa7939615344376839d7de9609c4561bf3f29d79784b3a97fd3a227406e6d39612151010001	\\xeef3d8f3bafa18609ceb365d4f93f06b2e1d5c8c500b48e5c384fc218cf15773fb043d1a064bcac523f64c5a017b2197f2278b6d06eca34047f09863fb3bb70c	1673882819000000	1674487619000000	1737559619000000	1832167619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-156	\\x7e412264a754b7c7f94f50f5426fb7a579bc2fc7f8412df39b2d92e4e2aadf840c99eea10541ae74cfd8c58acceaeb7aecd16ca95b6945d508eebf8b9b1799f0	1	0	\\x000000010000000000800003c1d07a747cd8a0ee4ea25ef3e1cc643cc87d5c3adf2e1ee6207b286408d286461e23b4ecce6ef7e2de787ca16541199ea7fff9edfb9117c0919bce6eb14b7d212c27b8090795ecec6d880b5a2ef066e1d7d7f7826e6da5d92cc0e1ffa895056d92d496155663556cb558d1e56a7627cc9dc32cfe6dd1a3b1514a29386e131a75010001	\\x45fa3619931a8e185a37c0bcd7a5de10b9cc9399e7e0e457687ea867d6ee0faaa275fa7f99cdc1e16d40ff46a914f812631f77da6d0165e326e4145275823b0d	1656352319000000	1656957119000000	1720029119000000	1814637119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-157	\\x827924cd5084b415e47b0a22bec9f4dc51be09a53ecc5494aa801d0996357b7de32306e6e89eed6ed5ce659c3cef60dd1d7cde8beea7d21db6b8be0991880187	1	0	\\x000000010000000000800003abb02d21770b55c206ef5e9bea7647af25fa282683cc208e52a5404d9bb3d7bf400f89c19ff543d61e5678b22aa7f615de187b3c722bb6d8acf1f9e75fa9bfe367d89f3fa050d9c2f34376b475608887cb4c1a56b0d99ac90bb1a2c896a72a6104f1b46c2ae1745c582ea6ba3562eea90b6594aed5e2201b168f5e21a47eb7ad010001	\\xfcf1615f93d3653b026c9501e8980308fd884e7cc0e13c77898b411e0f707fef56ba688dc99ee3110b6b89157cc835b5b9c8975f9aa6216447e58b5831bf6004	1659979319000000	1660584119000000	1723656119000000	1818264119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-158	\\x828142ffae781b28f02552cd28ff1197947cb15cf48205f631aabb8f91497e6e0f19a6efe7ccc679cf28eeccc25974b45c238c72ffa4eca8b7abac0950b9620d	1	0	\\x000000010000000000800003a6a4ffe6e74d47dfcb022bd6fa48231f3bfb5ceedaef0827bed6abe6208258ceec3e5be273283b2ce863a1c5d593285bb7b3f21352a019754309540df38e91459a5ee6d53574ed056c4ad4cfaca23cbe4a209c770f0787fb63a09ff5098eeb53f4fc260c634a54a0df16fc6f2edf5c4540ba287bbcfc4ff12389092294ed1d6b010001	\\xadf3461fe93046eb3f331c3b0b7ad90919c10ce0198eb1cffdd0c718f5c0dcad4fe4cdac54a28ca9623ae6771be8105772fa014dcad30dc25f2c1472d1b2dc0a	1681136819000000	1681741619000000	1744813619000000	1839421619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-159	\\x84bd1cccb57854d0854a9470b076a250b81885e21927be035d3e02c926db6d026d71c1773e26f7a35dafa1f370ed5ac398d4aa61b949680c45ec55ad100f23ea	1	0	\\x000000010000000000800003cb425560629d8ef2e543a5d7dcbb9f9c7b1ca2a2e47c6023555239845ddb554ad1131f011bf11c06b09a847fe22a8c0400e5234375167ac660f13a5b24e54913696a91a6b0674aecdd110d18b64368fb32790d261957a4649e79a1db87b71b530b6e73e44cda0b5bc3e4e2ca4611d74210eb7181897cdf6630fdf13699b44ac7010001	\\x531a09407725c4b571b07ab5f0d3e97523ec61580c0fd8033bbc2839b343a0f78334ea8adf03c3efbc885546c30bbbd724ce7614a0d7d11919e003eacfbddd04	1669046819000000	1669651619000000	1732723619000000	1827331619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-160	\\x85fda3c7794be933fcc7eb95528c09c678a5729ba40e2e0361a8dc4219291dbc9ed5d4b05bd87a4643dfb0f49d5f963d863eed160d34a5e98dc0d4cca3a173fa	1	0	\\x000000010000000000800003e8b760e529b5a1fd55b4ef816eeca1260e107565516511ec3f48c4d6ff4b97795624e95e571feac6258691b38da2c25ab8a7299ae6aabf0b3f044dec76eb4be4f92f04b5f5733ef92d383e5231c565c77023e72a9049dc014780eb41a82bb283a99571166444e3a26b00db75cb851aabe3a89968cd39497784723f889afa843b010001	\\xe31c1a1f234d9684f52c6ddfd0b6aab27c55454280ad418c5c9b57611d65f3a7c81cc8e23bb7a9f5c26e3c8fdd9477d00ba6856c6f14def3de1d8521b271ba04	1679323319000000	1679928119000000	1743000119000000	1837608119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-161	\\x87796bdccca943fd77cd240c86c346cf75223df569e33fb46eb1fec5a983027f0227cda10c1166a3ae29d3c5b9eee81ed6a1f019132dab3005c51f28962ddb85	1	0	\\x000000010000000000800003a0f2c48e193b2ca788b7fc844525c6ff4e20333a303f3175b382882a5c799626cb9484699ea2b8ee06a1d06b762958dc6955b4ec40266f9ffd9cdddc94bc609b1986c0253de7f6a6500fa94cd9e822bbca48360e35079244450f8c02e409ec93deae2c2e81243ec4e7b0cadb37dc8bff3a76b58a8fc695f0c816e62dfcd7929d010001	\\xfefa1c4cb64212eafdf7b94fca95baf1cdd17a49a9bcaa54bbb84416ee17229169c338f3680ced3b94c1d6ffb9beadfe927ddf4b84a35267f0d762d21b2cd808	1673278319000000	1673883119000000	1736955119000000	1831563119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-162	\\x8bc5e7a366723391a5c14efe2ff0133102c0712b2dfe3d8d91d4233edd62cd863511339771b93596ce6ef6bbb4b490811efac46d49ebc1bdcd54c61421c62d78	1	0	\\x000000010000000000800003d0d5bbc05b5b7dde895b8f48b35feccacc746685790bfebed17e0fc85ace6c9daf9ca41ea312839c4fdd91737adc061a60e926e511feaf72461b827b6195d0d0cc67b1fb7cab1a9f79b4b55d5c519f88d6131010f873a23f7ebbce148eb8d71efe11af2ff7e4677a4f3b9a4eaaa370e0c807b4ecbd8c7089f734aece43b4e1df010001	\\x67b8bcc25ad7fc0cdbb796eed2497121b3599535819c874ea4d37cf79f246ad410c245e3ab19ba73462ae15fc545ac04955894dcc5a94819b91e588daa931601	1659374819000000	1659979619000000	1723051619000000	1817659619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-163	\\x8c3dd4aaaa8b9fb5e1f84fee52ca8011bf0603566c56498ec28a2709e2f3e33f437d83cc224964546d3eb27113f6d1d6d5baffc6ccc6bb9c0d50adc3787a230a	1	0	\\x000000010000000000800003b5f5ef4973fa2ef684263beb1f40d4bb3722a952e2de78114d4b6ff7f06608af18ab96f4ac582e19c7380dac111ac16a30f325cc1ca01b37f96947bda9d76be18d14a38f7cd18e0fbd74573d6186363e77047ae944fa5480c591e075aadbbe5b7600f752c764320634e3d93c1b3d29f361c2c06fc10a9418dc9835abb4fcb97f010001	\\xeb6841a8994af73aee7c214b9883ee67068767e8b9affb0b757a0e9fb9b095946f398719ceed44a31c2f6834f497f73d640df4fa9b43da179b3491c88e0d7305	1678718819000000	1679323619000000	1742395619000000	1837003619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-164	\\x8f91e7315e104be91f02ca4982b2e851cdd8105da1279a20825f0a3ea7818684bb131bb3979f2870938aed5e38e833edad38c772399578681a239867d0b05397	1	0	\\x000000010000000000800003b92891f5417109cfe1f15c002984fdde2e6ca9a49bd1ae2cf9a900d6615eb95207693d3cda9f941dec60ae0a6f632dcfe585a32c855b810a0babda89b14d65e70548045f2e14967d400d9d7ac4dbb7a57ca8693722c3f24d5fb5bd6298ea3b71779f8ffca7b5eab39d5e62a4c8fe699a6b857155ca84028591871cad7a678939010001	\\x8efa19235a8d4fec12f3a25514d52b15eb2807ba1eff203c74e0cae483c4adbc16385d07fa280c623bf5f68a8798d8f1b63cd202a35460b1aad8f2b96a4cdc0c	1661188319000000	1661793119000000	1724865119000000	1819473119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-165	\\x8fed095dafbf09266197a98ee8838edb651bef152bd0824e4c18af7b2ac0aa14fd15d991785175cbe144d0ed8f3b9350d888ae8ba7b29c496315417ead9df06b	1	0	\\x000000010000000000800003a8e3697a9b4efe50c9ed3347d162d1b5669f28b0f62f1a42e190a543ad747004807873e385d12dce697c04c1d425187fef99df42d6e8ad5eb2fbd278fd5c1d77fcb96639c7739df59ef6f66571842dc25935e743d07d73accc58924798e0eae9a96472cec2a0a54b2e450e814c7bad1284e823244841caa5023358600b7aabbd010001	\\x186abba9aa37bbaa8fb5f13b7bf67643083fd0612631e18eca6662ff00c0aec0e471107001d8ca57cbdb972732027b2673778046b00fef2070a99eec4f150902	1655143319000000	1655748119000000	1718820119000000	1813428119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-166	\\x901183fa770d29e2a8e1187c59bdb1f24b5f3b883eac537bd4608da23ae2ff3b67f8e1ee621c1137af25083c8eec26a1560acce4fc7f8f7a1afd385925c794e7	1	0	\\x000000010000000000800003a3cfef651b3c451aa79c357802ea4df30c763cd75ea138cdff3e9c9e2637387f461cf5e6510c32832caf984ea4363d19c856e1092dd21e9334e6ffd5207724af12fb22d9361af709fca39310f0c01cbc61fa806e9f84ea0c5e1d5458ea7d2b569e8bc787e9418f7646e4189d84cf28c959b8caac06988ecf04365a125761e44d010001	\\xb5c5de59d049eeed181dfa09894dbf2763f135f2ff07322fb0f9a1a12f9d8e2dc5ae8c8ebec88af3d791a47f96e2737db0d07763c45ad2d6d8ed95a686cab10e	1655747819000000	1656352619000000	1719424619000000	1814032619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-167	\\x92d505ef6a015d377d733668d7e81d29841469e84a50f888c6acd6b3c7892babb29b2fcc74809b7fd4db29f046223109ecb422bd263358b2f7135b493ad524e4	1	0	\\x000000010000000000800003c2f265946f091df4d9e7d310a8421ec49a3fa88ce1e94121d67c7ad33635290ee7da98f9a30887b7e4c3c5419f6662a40b568bc276949ec64725844cd316670f2688560d5cf72cfa205a6db637c83fa4caf60de077b12a2e2c3f5eb91282d9287d117bac321d7b0b6f531d000732889879660164ebda2d44491e4f9ac1b3d3bb010001	\\xdaeaa9941e4b07073d2b8d419824eeaa6756a5572ba6c482b7ed1c2ea45e8dd8e42abd029f0a79b3ffd2cee13e67202317e04b5d7f5b8ea184790f899f9bcb0f	1675696319000000	1676301119000000	1739373119000000	1833981119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-168	\\x93a990f43330fd8885224399eb1f095061785b465a3795a9edb743664b3301c5d2985ada4cd7e00e9ce1211c36773483ff1279c3f517a7cc80dd3431d15441fa	1	0	\\x000000010000000000800003cc7d88c36c86bba496a93bfa789c3ffc5189f93b368b0a38b68be3c9ec1a0df5c998903143d024efcf5fc54824af07ba6bdad9a11185ad5461e436dd3c742ce4a01d24555d6e4a2533665480d5066de65204465cf802933a5e5764ef1a7d3ba7ff084f4eb12dbfeede606a7b4e816b9e85ab559a4abb674e8c63bca71346a57f010001	\\x7a0c5a1616e050deebe302d2d45356527a1bb7677db8ea48dda66cfaa2a539f4f427117002e18099fde128ca17bd7f5b610b1dc39ac7b9b6e6322af385e74a05	1652120819000000	1652725619000000	1715797619000000	1810405619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-169	\\x940d9111014209b2c13431a59fa590b2e4b5c183a1f372c39038a6133fc9520b371394158e158970cbf084185fee39bbe0da673a01bd3f44b06f2a2faa038029	1	0	\\x000000010000000000800003aa4ee26873001cef5f154efe6aeae74d762c95be1dc1600d99502c553118c7055efd53dcf29f57345db50c3fe6e07815738cf490b5f6e062c1498405a0f19a580ac8c77de7c73b02e21cbe7d71c652c3108ca77149708f0c5879e9c327d80eca0a97be0938d425c9df3b73b01b5bdd4281d75c12e21b57cb4c7ffc90e6881137010001	\\xf6f47b483e933dd9dcd310d3c0ee9b523466f2b0060cb4167d9168ee7562f5837642d635c0464d212e99fb69337a4a7cf005403c8d5ade41504c15edf8459806	1676300819000000	1676905619000000	1739977619000000	1834585619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-170	\\x94699c38aa90e6d618dce6488385c54dc89dd7a47b154ed53268852dbf174ef0d16cc2fa93705bd3a1435369fa1592dbc6d9a6a7e90fa50772aa9ce2b80131f8	1	0	\\x000000010000000000800003c0ddb188c35ca97def81ba25364538b68fe42e6b1cc6f26c15dbf2d68d1f51e1e7ad404d6d42cc3bcd6c41852f485a2d6b5d2df03716affdfcfad96d2d357328d97b0f2dba55e91af718cf1bc08e89ef7bfe6091880bf4fd2b4a83b5a40f4b32d3415049a9dd4dbb0c397db71bf26e82b74de44fb5c90f4ab23609849d6e797f010001	\\x8a7cab2b1754b720eabdfea47edf459740e79e0ba736b8603f9c080c1da5858479612108bbf0438518a275b165b2f289bedf54173973190d945d7708d4f86604	1670255819000000	1670860619000000	1733932619000000	1828540619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-171	\\x94858b32901d6b5bc69c8a57fac1c9dbcae56e7d1dcecf3982199401d7cc29289a6c94db50b1db79f8e6fa29a3d7b89577bc8454c15d53a1a38a96b982bfd76b	1	0	\\x000000010000000000800003c7ec5836d8afb7ac596f55675b1c3840518e9ef3ef1d269f1ad5d52708340f7aaf0b92a52eccfd992d5492a34c5db950606cc449e47e9fd94cb285672ddac37ca2d7839641ec769a8ec05758abfa06c2f82f836e1743cb21f0d362e75a3e5897fc7524d2fe46fb6d9d629a78c35351963c5651bd6317c35185e5bc89927fd671010001	\\x74dff100f6abfe55df6de2ea0f8d2e07b667023a13b63b1915b7b473e316c91c06e3c0e33ee6293ec95cedd2e76a484d8ca3a3ca1ea3f676f1d9c779c316f10b	1655747819000000	1656352619000000	1719424619000000	1814032619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-172	\\x978130647322413b5e47dbe96354dd5c8360e92c2075ea898fe703de2e4dd4c40cd96378994ca9e09e9e401cbc8b98693fd71f6ff825bc444db8e2cc28b3a6db	1	0	\\x000000010000000000800003c5a81906d85f5e821f22e50504b1739e94a4aaea324bb31c4dd5d0f5b49104c01ae3d4c3f89fd5fd19d4831efea6e81d613d384723e0fc69cf61ddbcccc49cab12ed3d2f520f15a9d1098cdf75093c6c8aeed15af92c5c741222a9fbabe7a74865b793c9bc7dd0ec81ffc3f662dc41b94e52c7e08ce5ae26f759e2f8ba46a01b010001	\\xe860388c438ecaa4f5fb2635761e836cf7ba2b827d1673c4225b14d88041b6f2b4f2fab51708b02be9be2fd4bc07b3f96e121af864a00dcbe27b5ce8e97f3e0f	1677509819000000	1678114619000000	1741186619000000	1835794619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-173	\\x9811425b613b4f20bdf65b0ae0dd65e1c8d1934026f043ebac3e7d3f068c224a31c9485f6cadc0423f82e7a90bab53c02302e10b912c81fe41d47f1d596c722b	1	0	\\x000000010000000000800003e4bc445accdcfc837070fcc9da39ff24c131d80c6e3c5cf77d9c05b7c1fc1eca09e0dfb83777157cd98f01c2bbf0a23419a15d5bc2b66cde67643668ff3c6f3496be5d4b500f8df884a383ef0609d07fbf7aa5b85f6b93a8eada4e79ab3c63bbd39125d4acb6a2841564316f538b684a784b47e02c9244a6ffb323e588602797010001	\\x609e39b1e13f2a14a53af2b00cc9ee846a1b22223aafc715071d68dcd740930ca92b4fa6fdf7270068dfad1e47f2fcb6cbb1cd456805a25361b7b81fe14ce901	1664210819000000	1664815619000000	1727887619000000	1822495619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-174	\\x9a811f866ee703028b19662c92e5757945e3e7dd0d044745a2e3d5740c30ef5cd718e2a9741e77966ec643aef3c8f61702aedbecd7bfbe216aa24caa783e2064	1	0	\\x000000010000000000800003cc8dcdf8f6d228970d3121c1f988dda083a8d5c46447dff5bf8a9b8ac4f3967d0b457cf832affe4ec4bc320476b1b9b6256e3420bd69cccb93cd101aad385c1ca8dce1bd4ae1ae43f632ac44d75d2989a39d194b8b725f605bbc8e196b648ce301861f02d7e6b0484e4e6083ed8fc45b60d92634b990287b688ea523b062166d010001	\\x43025a57ce14327922579e0520e28bd62805ce01cf49f4fdd7e7218aa53d8b57d85a66c007d88c01ff42ec1d61eefb6da1a8644f3fc96763938244a1599f8400	1663001819000000	1663606619000000	1726678619000000	1821286619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-175	\\x9b2df8d23591d4bf1b116f92c2154d19bd2819b5fcbb4e461f3bf68b3fe0a95e2bb7a55d8d9675c3ebf72a3d7096764f6a6cef62f95126b308027c9a066dc900	1	0	\\x000000010000000000800003ad4ba4607f5b7a676734c1f3df5281776b9a91077a22effb795c3460657253e2e87340bcef13a6c3af4273af62b309b92781ec98b54282f5f2911bcb98d836a7d55dbf1e3aea4e4244da8c7a7f286b7d31a69b88a6e2eee0fc94745082bb4e11753f0d7ae5974b6a20bc33243bf28c1c4b3068056c2cbb9580e6f74ab536351f010001	\\xdc17a07971e1da1cec63a183238fa6679efd45ac9e16f1a89aea5a5e78df5be6f6b7967f0a6c517353c4af423b5a7df31b26c91afe6d0171e25f0aa5f3685f0f	1672069319000000	1672674119000000	1735746119000000	1830354119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-176	\\x9b7dfe416d16aca35889494ae1b54abd2396e037dba25ea412b3af7419f728a3909da2fbc70ab3227578fe2396b6243a0423d3ee6610152da430a82c7794da69	1	0	\\x000000010000000000800003d7d82377de23a4ca066222529cba6b4a1fd135b2db23977de26eb03967d232b2965ca681a434a7a9bd4b17a56eb101d8490bbc51c1a103773aae8d8495943b39e3c454703c0d335211dcb74ddf9eeb2646bea7c7806a4bb279fac27024dadcbd82fe3224fef31c6cad147d148417a91d45ebe722e98e7b8453865da33d7fe7a5010001	\\x79e318149c5a3adbefd404ac78f316a92f54c0ae70c48498b28986e8eb84f65343e29d741aaefa689c083359dff82b31e9be6ef894efbd0f7453ba095b81c508	1656352319000000	1656957119000000	1720029119000000	1814637119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-177	\\x9b89e75f0b5ae64be87fe740a570b1428a78b4b419b14489f5d7d5768e9c00d65d1d0dfc38cd2efd7183b2f5be78589e1b350a5f01332a3145fd0aae9b755274	1	0	\\x000000010000000000800003d264d4201eadc19d40663617a26bd70b54c2c782a6c339094d85626313eb1b06e342dd60c06b92d6b1eb3b8d05891630c595483eb75ac79909d11f8eec33d21f35b2800c840fa00a2c744599ad01a73b16fe1bc2df5210763bbe0282bee6ef88970b63683c63e9600b37ab301d737b65f5e123930324d975829d2eadd75bed4b010001	\\xe1c9225bd0235ca972447262df7b892b47b918ffa627e2d69931c893190b0166cd3763ac5760b52ddbc9a1db941f1ed96b258794990f635a78e62436d060b104	1663001819000000	1663606619000000	1726678619000000	1821286619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-178	\\x9be157ae0866b824d57bda21b3a1398b06e80daa222279eeb8f299845214b5d134f6dd715c95a7cc822a8177f513fcd643f6d3875b27cc23ec5cfd1689c87ae7	1	0	\\x000000010000000000800003ac1e567b355b11603bcb50292f502a74be45381ff26b82bc543961d919a21bc22a06c4f62bfc5aab0fa782a39575e89b696f95a42db1b957c5ed5474d066aa91d24d98ade9ba87f3272b4f33bc3156ca1f389a5393eeca11f7626ab98b95acd32ef075599d31ee705d151961f4820c2c782606d215797d36761f8b1dd8d5dcf9010001	\\x468361c021707e5c9a3f950d9b6468e56224149e90032cf4cc4663e76d84a42c0ca8b99d2d5d4db40ad36eea3bdc5e0d1706765b3dcb1ab0860353a2f90e750a	1660583819000000	1661188619000000	1724260619000000	1818868619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-179	\\x9d2566e7a475f6c34f5c08c0b1f8318294bae921c6c31c5ea78e10d1008d70deea9e3db34427791f517a988bdc8ff5144e17197bad987a0960fd4fd58771bace	1	0	\\x000000010000000000800003ae8273bcddf1be5fcb39520d3955a6432b23e07e622f17779a15c757d03f2824ff098d610c5c26bfb78ae6ccf1223976cab7a6aa29500b1daa706cdf8a06f9b9d5bcd17227afc8a06d0f272fc5d89dc33f6e7ea854850b613b2d1a13897769826abe01e759b41486d53efaf44c4531c6acc2c1e2b54db2322be6ca91611e121f010001	\\x156e501dd9503ea7728a7e04c9f827680fe997e55a844e7ff7254718a7fbc951a2d73665262e87870d15e9ce1f535f3afbf4040d65a30e4395d3933102581900	1672673819000000	1673278619000000	1736350619000000	1830958619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-180	\\x9f59a8c0d00b36a6b230c44ecb96d4684c4ab4bd56e032a4b34b15075aab0c2e34d46ae3fbe4993618c4aa2d364d46b6b7f23b0f97ef2b80aa33423d9a1a0681	1	0	\\x000000010000000000800003d3483097fc56e74b9a0e340fed48bbb5082787f0d8754b69838cfbf4b1e72e9027b290b1d21b454c9ee7392c17afa94e9d697769a842048d7ced56b14c2632dee2df6bf69421d3d5bb70ab2924ce1a7de7c70bf763d57406d6b14eed868e24dd5f2d0c342bf4a7de292bf3f3153c69ba0e8a36cc043378afa9be46013044515b010001	\\x2e5607ff3a8334734e27768622d5a7c08ffa63efc429c9bac95a667c4952ee7cc0f87775861a1db10d0493d580066570b32f4b8788f2a476c620f17b9802940c	1661188319000000	1661793119000000	1724865119000000	1819473119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-181	\\xa21d20b42e8c047177f8579a9f8eb58fb7766da5d41e99aeae77b39322a245a403e9af0911beb4c9ffdf3aa31aa291e811e76885fd57714eb8c2328f09706af8	1	0	\\x000000010000000000800003c3fd0dbae2f97eda75c313de1f28155fdb5835ba219f48978fad09a23871adff51a0b457b2d7e7e1f43df1e908c653215c9f803e6a6f449198909b61bc6f274c45f1ca01d29d8204ac19331c0bd390bf721c83282de26b35f1dce934f1d4e218cfc62f769e1e5b9ee9899c645dadadd274cab3e43469b00a64ecadc20884d5dd010001	\\xe19689f9b9e50c617e744e0767cf54266a11ef6e023631d9fc685ce95f391c179e63f1e6cb2a175eacabec93ebb10ae7658d579ed5eddc64ec779c6a0e736f07	1673278319000000	1673883119000000	1736955119000000	1831563119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-182	\\xa439e72732c9f8293fce629b29173bd5477514faac1024341be986546b165c3f34eed40a4b4690040b314739bc2dc22caa76993ea399441ff68948c7e3b61c67	1	0	\\x000000010000000000800003ac410c35cfbba717c75dfc052ce366063756e2656f7650aef3587a5547474e783cb19e0d6dd05a1dd0a94f9935ceb0b8191dceca1d166784242ba65f2bf558fdf9deacbdebe87f6ca561dd44a51afb6c92e9eae1566834c72ed5757097fa7bc720a7adb169daa99c1c89f61985034e3588f1d656c707293b537bf94b6704e221010001	\\x42ceedb622b28092bb334727bb7d85e269c20d01fe5954ff0bcbb0bc5d04b633508e4766bed508ebcc16da1a27143ca66c7dbb51a58214eefc92a0d9e0281506	1657561319000000	1658166119000000	1721238119000000	1815846119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-183	\\xa67574c75324e8204b8f6e166c0e29747b00ce04db10c16ac8c0825146402fec27f956afcbe7f0d48c963d7cbc7194a6dbef42a5a718ec8da15b7a32f715788d	1	0	\\x000000010000000000800003d2a6d08f17476e886f7d03e28c053fe31f9e14b72dffa30d92a9f6f58cc4e0096e7502c4b8381c2039f292b3edf458a85079eb80508034b370d51c98e825ddf1e253b4b4459786d99bd67915abdba0cba18fc97e17ab33dc6cc09a9b3979ea885c7c77294f7e052ee287503fe58bf107ec3289b3b70954a22107d5571b537ea3010001	\\x46f76f31bb8fff056fef9dfe3b13d8ab3a0ea6162cf73fc84465c9979b18512bfef52f94c70532a00b11a8c49d695560dba2ed7606b89a17ba3c13361abbc208	1658770319000000	1659375119000000	1722447119000000	1817055119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-184	\\xa80934e30303db2299ecb99df1fb48b356b80ce1d428e441933cb3d521b6bd95c81f4baf5345da9d728ed70462dccd8ffda34df73446ce8fc5f21fa7b64f3f5d	1	0	\\x000000010000000000800003abb8735b193c31213cda67cdfcd72239efefa6f51af5ab77c762f0e11275b0156a2397f5fdad58e3be53451bc9ca5379c5e4cc99a2151f88140f5cc005dd3394fcc1cedd119c3db7ef4ab5cbbc7d2dc47955e822047e4cfedb221e992f0b4091da02dec3f6de8c448300d9967097dfed16a116dc6e3f0a78e28b122958bda257010001	\\x422f6f3fb8eceb5c48adc33154f86e54619d1325307b11e41ad363c5e452db795664153d2931a471c218fd246f8fdcce188a30166f797de26df3d33b223f1f0b	1679323319000000	1679928119000000	1743000119000000	1837608119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-185	\\xa959f09afddc064af297429ca9c0922433bb0a95985fdb461c01fb4405340e6cdc6063aade49379564f1bf12dc47a32cf5d0420c368d57e5b2403d1576bc313f	1	0	\\x000000010000000000800003d50863fddb25f15bd48d951be0db95e852f36af99e8571fc39b76bfec9c73451e5fdc185b6b02cf08d77fc34682a971c0f4e99b9442eee860796403fc7a6cc0ae827354d5b75ed0fd827d441c5b857ac7595369972a48b84cbf815ff1294e1e34edd77fcd86d4bd8f54d39d6a1ff3e6d0e9b923eb7cc57cba047d818ca85c6d9010001	\\x1d636d72c086015cdcda6c2f9f84eae4fbaa1a7f37c260517c7db82d5e45c8a6fbce5cebb28c4f7d9a8a4d34a3165b350323f6492147e7269794595eb12b280c	1678114319000000	1678719119000000	1741791119000000	1836399119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-186	\\xaedddd2c39f441c9c7cacc9c2fa71e8c885e148d86cfcd47b07d8388a4062e948a4f4a254b89ebcaa52af54592581a22d4acc3380570a690f4dd88e6f4c7fa9a	1	0	\\x000000010000000000800003d1c1dec52c7c0c5d71025a19c9113611ab745e24d083406fdcd7517dee697e2225b2cd995eba6700095fb0b9157c6b80a57ac7a42992cab6e9aef6de5de190e2f883c26070ad6ecb8b0e2794653f4bed4780eba1b8e13ad6af612b8223db878303b15edb4c12e796aef6b746d676d2101d7594f7facd9d941d267fa1e198c3d1010001	\\xb4d47d5e123cd9be15c70ce647da9a37afc725e08098bb446e86d412ab1658723e72b7ac593e79dda10d9139a8f0409071302d4db9816997775064866473320e	1652725319000000	1653330119000000	1716402119000000	1811010119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-187	\\xaf6d4033d7cd2b437f66d2084893ad556054a49570ee93f6abdd41731da1c795bbb75e18c582c920cf54abba96c009bc6d226818641a8937572d92682be6f559	1	0	\\x000000010000000000800003d50099439c0e53800d050b85c0be8044810a4628b2324f0f319fdf7e0cfc68c35f3d052f08379dd5f2e8843c7215279151d884e0727282580744375ac297422fab672c523e3f435e7a9a6dcfab775c665cf26ffe57631e301bcf334f69a6a1afcd359bace332d29b7b94a5eef5684080487a1c082568104a90248f9d2a9a85a3010001	\\x30963b50fbd087c53ce568ce2d0fba66bf8c3499cf6d88a3452a7a3fa02107499b569047b09ecdf5a97fbe4a3750cc921ba1db89b32e935b096d7fe194279b00	1665419819000000	1666024619000000	1729096619000000	1823704619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-188	\\xb4a53bf5ae524212799dae76bbb820c3f2ef83f303357408c6eccb72b5264a50e9f65cfdd19d3f0b366738521c540ff7209a8ff132d408d5d8f3da7b041eb9b3	1	0	\\x000000010000000000800003e492344922c92381976aebe3f6e1f9e1e1255cfadce13cee248f634e6526f260bde9069a1c2c0e7b4f160b82831a6dc4a45684ec70f8f215d03056baf859e8fc3bdea4cadc4a896f738de13522ebc0c1461077abbbe974ffaf37183bbab2f4b3e2883d155ca2ef63d4f4522544d416ae0c4e399b2b8667f0780edb1ee85b3ee9010001	\\xcaca07136aeccf11efa65a53cdea03d1cee72c887c53c186701144d1a8d4c15d9e866165c102424a944632ef57486aeb0089d4c1ce55d9fb4d7c70286f6a2809	1655143319000000	1655748119000000	1718820119000000	1813428119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-189	\\xb8f5d9b2504dd36985a66d6d272bdc2d33bc0f4bde0eca000186091106cbe1c5ae5d29386d4299f60deca6cadac246adfd7fbc554e73ae37dc33a07d93781cde	1	0	\\x000000010000000000800003ab350260b7700bb2c8531925ba7718129df162d545c6c1b3a8c5d0b9c10d748fd690a46f126f8bf41f99a6470775715b744a9267d1b52e53caef450e021c46f24a02d91030277816d14b8ab630f1d71a8d609a46e45ce9635bf2c2d4af73524ae35ecc60b6ee2a04e916b63751f28619c0d4c38c20e46712774b7a38187aadf3010001	\\xedcb9f2ecbd5edea80a6e9862862d85bef04fefd0f5f5ccf6b8a937870894df656b0cc88f1d49d33e1150db79a418e7a27b6e4e6a3c54bce0b5020718e965702	1660583819000000	1661188619000000	1724260619000000	1818868619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-190	\\xbbe1bafed9e05939410e3d7326397047de4d4f6c6fa2b27aedfd0423368ca7e6ed5468175f17ed77debc6b25f1f42e8b0fbe488eb2e583a0b3c6a36af1af2b7b	1	0	\\x0000000100000000008000039861d6b17e6b55c759711ccf42ba42f7e7f87346153b1e1b33a6a91a5e156f36f01e27cd5a70d3d0c4c899b439315fbdf1faee3c4f8e0d57afb599fcfe4ed6636c8d188c12895ecfa3fc2032c00ac0a12b14bf06b863fe42296f09fd0c681fc365515939b99fb7b364590d8e11069ccfdafe01d64edd5423b54eb20ce74d6587010001	\\x1487e35ea43e4cc878b4986a9ebe92d8ae168f84c6bc90ca5e8a3237a5ffc2807ab561324d905cb185525481cd34b25a1a27f2c6cda1e7f066a4dc39b4a4dd03	1664815319000000	1665420119000000	1728492119000000	1823100119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-191	\\xbcf519eb0766e61e27d99e8ac535b6761badbb63f4e9d5d64eb964d13e53d953e0f18c974b8b5d9e1d878a2ef4b0c0dadc6b0b37df18418764d923e8237ceece	1	0	\\x000000010000000000800003c70cd683dac4a667c3700b9581bc09f33908d2c024ea8ca9b51f8fc5b5d59c8278b9efa26c71d26b475cec5b4a53e8ef2b6a7a9110233d2d18224083b3bee0de3d8d13aa04640b2af408f5303ea6c2a5f91d2ae9bd0716b9629f2e84114ca26d5fb5a2350bdde92abedf4593059b2226423d77c536e89b93c9c1e13aa2a04735010001	\\x81aee8ebbf7f2a77fe92a1dece4752ffb144f026fa61e4a8d395183dca23df5dc0b8d3624aa47ccea851e7f84b5f137872348bd1e8c26f4efc5765c9c77ef001	1661188319000000	1661793119000000	1724865119000000	1819473119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-192	\\xbd15bbb2bc6ce60cae2e67430229d54ae0f84d081ea4102ee6fb160f5bc0b563419ee5817a15b296b1d9e18784562aac93a960e3c756b7a30a4c033b9bd4eb7f	1	0	\\x000000010000000000800003b7e6711f627ff04acd3bae2e600fc281faf25ded1f138d1bcf2da15ce8b0def8d902a8b1dfc31194f85d230a4536e64faffdf972f0b02c49a2e8fde15e540deae24e8f82cf7320af0f5a4bb522da9f5a475241f95988716af95437063a4758f866ffd41fcad387c0a75ec6f424d306b675e774524265808ad02ed034c478bd83010001	\\xee8f0259189dc4cab9c195b5e761d0c6c4024ccbce6f557a723112d43cfafe4a08febf16ed777fc84685600de727330cd464c13f35e94700cd9063618b4bc10a	1670255819000000	1670860619000000	1733932619000000	1828540619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-193	\\xc03d9831f1bea35c30cf48d79716b13afc815ba1561e608763dcdeaba333deecd42f177bf52288c94198b3d137111d527614422c4881ac4f02234265be27c4a6	1	0	\\x000000010000000000800003d2f1c84ec5123e5a706b1a8c3af31abd444b642282d00c16b22834343ff01de175b0897e0f6ef684af099622900eb0533ecbef05af1aa261dec83a4d693b37c9e3ab4c42924517ac03ea6959b23d90be3edee29667b86c70a7a2eee445bb2ca12dd3e2f246c493fdb5cbbda3e71e814e3b086129688ee0b7727a733d9ca9e51d010001	\\x62c81973551baa1aa9a26b79f3239785ea6179e3d1a56ce342c8c5d41c368ebac7b73b5cc930a742ed7d9759e6409ac48668a704c6a8ba2160c22dfe9a860c05	1680532319000000	1681137119000000	1744209119000000	1838817119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-194	\\xc61568db03eb5cb1b124d57e055bcfc8de46f57bcf0e3f7d6331024f7eee6ba541db38d4174482aa8a5894604eb9dc2031e8be8a59bb3feb3ebf0936da6f59a2	1	0	\\x000000010000000000800003d2d46244b8f78942fb184d508133feac8b846a79da1c3e6642606fdd8182c5549bbf72a66a9cc68b291e652854abac3e1eee70ebc83539aba24f25eec228bb01dfeefdcec8ade6319f6c6ccd1262bf7104d66158cd81e3b49ebf905c280d971b5d51d1efdd9b6d5004d52d59dc47b47f0bfdd2864e9ad19548eebe980cbf263f010001	\\x3e5b13f697e8618c66669c247f6e48ec2bc4863d8c9a18bf862026265ffbdf046069a331cc6e4de6d4ffa0728e9d8ab344dd7644459b455c7e57736cef745f07	1680532319000000	1681137119000000	1744209119000000	1838817119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-195	\\xce0544e53c28980f98d490d24974a14482d909f1e97bde2177e50f1401f627954567f8f541cc9fbdd06a10885994471c7d130c43c3ac4cfb73bd091f8542800f	1	0	\\x000000010000000000800003bf7ea58b8097cba78e834f4b5b65b353c34bd9240b6201653cc6cdba22eed2eaae686b2145ad596a6cbbdb41aa03472543a5833f84c491ba012fb951310d4d459a0a55d33e0e751fe85178b4e3e45616880ed70d5a8aabdeb57f1c9791284d0ab3f2818f9a126a91ca0b31f4516b75bfb2fa03bb3aa04e5ae216012c4540878f010001	\\x85bf56572bf05191c47cbd44e28583e043d906a21ab458195dc4966e15a33cf8908081fcfc46383c4a6789e4d947ac0da9d97aba302e8cce8c7456cda478b40a	1676905319000000	1677510119000000	1740582119000000	1835190119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-196	\\xcfb9dd04a7daec7ae16b45388de1693fa50e6a3875107a01630febc811f2bd595448f6fec9c6accbd0e9ab929e7cad5713579b2cfb943619d7765a766bb30d81	1	0	\\x000000010000000000800003b361cdf38f4bc21ba585281913ce7eef89bd4def25f37dc9d7f688463310419cfa399c61b280b8505dfbbb9a62ac23ecdc1a69b1e990ad2d35095fc6e4716cd27c093b7eb08a81ad48c8122ec0924a39cb77b23d99e2c466da05fa406bdf23ea7b32a0123c0cedad40cb7bccdf829e3b6f38171221f4a4fd8121d9194bfc7009010001	\\x09209888fae6b679bddb10aa56566848b9e86ff0d7b85a483cffbcba38ada112fef893ebd0644f7c9293c791ff10268ce99dbe49743a0f1695b57457f99a970f	1679927819000000	1680532619000000	1743604619000000	1838212619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-197	\\xd125febc65bdce3b63834b1bbbc85bf8f65239345707d0c21dc4c0bdbb13f2001589acfd81cc6b0524a1e8a406713d890b87131ddc323dc7030b99fa0336bfa1	1	0	\\x000000010000000000800003a9872d2cb22b24704a00eea904fffdc7dc6b133039610b1d46be9c706b971b167e9e1dd7f93ce5f713c4544f6a17f98f7482f6542601cfdf6853aed1cf80b465d994cf063588c2c8639538d32d3e577d3902274e524798faa27c44a823446f7f78cc2817389f2570c3c44c364157f260c448b59a4ac2ec44c2470abcb8f3c7f1010001	\\x5ac8260d7a1f2f7ce0dec3ec9ed3291ca88416472e0a9ce1edf30495f3042333ab5ed66861cdc1fcea3bccb210909720d42bb67aff8b4be94bd97d3d56566f05	1667233319000000	1667838119000000	1730910119000000	1825518119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-198	\\xd731cba4d1fa04c6d3150e8d0ef66fe29cba409e150857be3caf4f79aeb387f157e2e1bcf0a225df4701ce51793fc042b8acdaebcbd6865bba4d97dc1ce27536	1	0	\\x000000010000000000800003c1797183e7268f64e485d834531b6c63f99aa618bfaaa1b3df541fed4a1bf565c5e30570b19dba008656148ed723ee303c83683f94f7b00d5776233faec7b421b25dd63e73670be138ab4449cebcf9f14a439ecb62f9876404bbae9fff4249afa6af72d18340629eb36110e1ace60fc9ea09c59dd85d593921d68631e591b341010001	\\xad6f7df7c8e109daeaabc95540c9c03c09099f5ab0a69c9a88fccb47c459d1e0edb0ea8c0f88e9d7989d19b906dd7421ad91996061c507c25284b223aff3200e	1682950319000000	1683555119000000	1746627119000000	1841235119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-199	\\xd7fd3958abdba79c7fdba8efbd92df3a297f867025e769e3675f063d41d48e1c5b7e9cb591fc299e00d1eb4aaffa921e1bd786ebbc0b12adc1ff6c6b5366dcd5	1	0	\\x000000010000000000800003b56fa835ecd8b783a9780ce6ce3ce0c3226ef21b8112105be02911d00bb5f67befd3be04c440fe11d466bb1804fc29fd5a1335c251e10c5e7a48bd2265d41ffcec062092d9d97cda9b25015c599a28ce64735af2004857ffe702d86fb7c31a660c1ce1bc5bb1a85f326b5509428fcd695ebbd2ed988fb65a4774c7e0ac190041010001	\\x659328b1842d00f9fc9d7e7ff3340fbf5cc18f13592b50c42e6e9f447823a6adfed58909eae7a23961dfd76d31401bffa71c8a7677c10e28861212b04fb15301	1651516319000000	1652121119000000	1715193119000000	1809801119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-200	\\xe0f9bac9e7ff4cddd28ac18053266c7cfe51c73874519852d198b807056ce592e977084dfb07d2b719436935cd0cb2b477050be960eb1bf2151bb694a0fd2f9b	1	0	\\x000000010000000000800003babfc5c93df889d2a4fbaa8649d21bb9c13acf49ab82bc209212fe1c46ce04d83ca1fcc905cd50204babcebc31dd0c4bd3e5f9b0b1e1db16f1670fb7bb802a696d62d65af52537da018aeee5de2a268941dbed478028083556eb68124bc84c565af1db0c259af8d5c455786f9f26bea744f8dbd844833a3aa3aa7c1f6b6c413b010001	\\x65cded89dfdbd67ff8788eae017b66447d539713aa9636649e49f2dbf365fd66252fd5f3fd9cd53dd1d1e4619c8901e91744e3d36bd7400df448da967c4e8300	1676905319000000	1677510119000000	1740582119000000	1835190119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-201	\\xe13d42a71cc52f8e19fbd2fa8678ca79988c6fab2451f2ef32d053a1c5333fb6d3c0127bceef89ac7d8c67602e74c0ae65012cbf429c47e8e659d1fc998a3191	1	0	\\x000000010000000000800003c20da1976145b8e4ae6601ca66be40598e2fb11faf678187a2937f2f328bc9a52f83be1acb157bd53f1b5a30928336a24d7f03bbbf534ad2f866082ca520f5e85301c6225a0b0697e908a36e7e562e9df733ce5d9a4015afcabcf1bb570083cf79fa7a545ac88003d6268b06ff23421402bb4b62b0cbd9c3605b339c169a0ff1010001	\\x6440aa7d09d1a89f66a722c9251740ff698d34f004e5364bc2f7dd7c7fa955727c135b1c9e152279b8a3b46eb056bc0630272eed836901d455640b2a9a048703	1658165819000000	1658770619000000	1721842619000000	1816450619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-202	\\xe1fde6e754322a7043454e7bb7fd4142380af61b3a7c79f0f9802fcb3b937013ea709ffe67e1934cbe60c8c21ed71abe395d56f52eb3eb99c929a5056ab3bb8f	1	0	\\x000000010000000000800003c7310e1b06447a2d3b5b4480c92bbc372a9a775c196de2a437869b21f75b12439463dab6b9c58f182ff959dc56920de29c23c7765e31ac4821fd6f2202783f4705a8942af3d346b1bed1b4be5ce8cb9a15d450cdef605543389f0bc0ca63e459f2f4bb03cc0096aedeea7f0f4c8f9df8f22ebeb26d40d28f49bd5559d72649b9010001	\\x4e10c53ca601b56eb7fdb8b053d154d91823c0c9628686cd89cd3437ab545b0eaae75c913cc9078df964fc26744b6c8cabd96de67bc7242a4ee288a181e27708	1665419819000000	1666024619000000	1729096619000000	1823704619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-203	\\xe215ed2eb93675684e52722ca0814ca19870412238ab8ca6f8a477350698df15f067b88df562793e9bf80dc6318282f16cd54aa8f92f09de4039f2bc5ab7f54b	1	0	\\x000000010000000000800003becf2677b8e161da59cd2cc665735c8b56d73f0bb93528db397b256b204afdf528abf526ca6c6d686d980fb8b118bd805afd1142a0417a8baa01509bc7f731b1d02620cc2cb4320b21e69d9773d04b992592eaf075a6654a0deded7b5f403d89ab6f0f7813ef445f4857e57acbf43fb3deeb40e4c4f1b825b62cadd7f624211b010001	\\xec11eecb2c547404831ff60b0e81a81a93dc9b5374fb338f016dfe45889dfb5f2b5de3b532a9de8eafa9a1c0d34cd1160dbe9a63911d03eda99e7dcbbcb94103	1671464819000000	1672069619000000	1735141619000000	1829749619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-204	\\xe3191fe8b735b73fb76ba52d4a4b8342ba86c29f7309cb76501e113f52562acecb35e7e7c73af54e12d2adacb9ecd9a51db5b3556cae2a9e91efa4089424de78	1	0	\\x000000010000000000800003ca48647656b0205d661ceee62d7600c481c3ca8c335971d0a06e6d3647f1466881638a3d03c9d4fa75e9084925790b94359479b209ea04f757ca03bcd80db3e82d6c5c58e1900f3e47d60e0d9bebcda7ae433debe74e1e55b791fc0cf5e5ed67483cf6782fd095ca7f9fcf16c576e1020f255203b7e49c912395921d96af91f3010001	\\xc8ef4ed83ebcbc0e9ed015ebd604d02e5ad606fa4e761f8a3380665c6e10100f9a0df0d737e04555ef012e80e5be6250ae841e307d51c9ef3989ee27022b810f	1659374819000000	1659979619000000	1723051619000000	1817659619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-205	\\xe4c5d99072eec7d68b555f7d9401dbdad53a7ca818fc525792590b0da71720de833c2c631a5f398fa68301f8f33b2629b9203741c3f5f0cb25bed12b77fcd6b9	1	0	\\x000000010000000000800003bdbbaa7e60e1535341e6e3d181ee2afd0e494893e7244604c5cb2df37c638730be8b52052b9034e2489e626f56381493c19f06e8fa8787ba6e7166056d17f16dde0ec76d5dc86b603f068e99d823599b74c133a79783d6a85fc5ac3ca93adaef0cb5129e292c455647d2f781d1ee8715453aa3228995e0c975f9880f34c60dd3010001	\\xa7ca14a3376238713665d4d14786ffed5e6672670a8f4b72ae59292df84a6446129b2c7534b1719f76abce72346d415b4928ca1dbfeb0418fc22c6abfaf94407	1655143319000000	1655748119000000	1718820119000000	1813428119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-206	\\xe73950398742450009997dfcd9d2d853cb75a7e2b0801ba3b57be067101f432b5abcf7c8c74d0fc53099c8ee431b5b52b3dd72aa4228c265cadb4a5c692eace4	1	0	\\x000000010000000000800003ce04eceed09d3d0020f9665fde4922b6551a7507af2465026f7766e7ad9131ccdc3a64dcf4868566ea0d684e83268223c398ac8da8a3abc7518a8de6232c7d36afac90a3ace3f4d8de5d56308a77ddfb9d5efae8f3b826c58c486b528e57a8504039bba24dff912df4f7c65a3d38a68a7b881baad32357c793d06d8e0f1e03ef010001	\\xa4ba0a7691d10eafca8a357d3245fb37b7acd9e2cac09c1954ff789f92147d9e67c3660abc7676a1ded04e73afb7d4172c24ea1e187906b74e28bc66330eaa0f	1666024319000000	1666629119000000	1729701119000000	1824309119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-207	\\xea954e351bff6086caa2d91c9cc819090221357d249d7ba007efa50dac8c32f09a7d6492d213295369fc268410dbe4e397452bfe5ab7b7bf1ca2dbd01b65ac24	1	0	\\x000000010000000000800003a59cca54b02c1cf344a2ee0e88ba4e07a39983393c96a944fdd8862d680d692f06c6d597cb1cd0f7f6e08f0c7454370cd21686b38c9755ddb0f07eb15e892b3ed2c94dd024023856a8a9e6f5f22241ddfd42121a98d915d6af665ee7de6172793219ed54ca5e9b99673bc5c736cffbfbd3505665763fcfec77ebaf91648b0905010001	\\xb9f584857462f5cb47bab143ef1d812a3a7d73dd4d0ff1f27c0e6f82fc1f13c265ef065ba8e8db2ba713104e02c0c8138b4a604c8ddf511fa89f2acfdf80a402	1661792819000000	1662397619000000	1725469619000000	1820077619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-208	\\xed9d2b2b562525c058628195c147685b39560712572c8005cac62e1bfb209e9e7073312adeb1f30b95dff9ede228df8a6aa3393dbc0e14161fa874c93a7a9585	1	0	\\x000000010000000000800003b967adc67fffe5cba9e35ec18da6cc6bf530d884df62f7f1c0f1fad3af992bc2b58abcd0a254f2af4d0a500849c152a445f2ff59129fea4920777757ea80b7c51cfe44efaaea17f69ade1fe9d5dde2b1c0466db8a19f43058d3c9b7e4b021be7b61a397639b005629c2729b6a96fc347e0d021056def70ca960d1d561a00ed81010001	\\x226768ff459e77cdad4f9f5801ca66f27d3bdcc33e8d7ab2466442d3aafc4140c2c0c4da0419fb22783099545da444d58aeb8fa728cab118aefcf66073ab6a04	1655143319000000	1655748119000000	1718820119000000	1813428119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-209	\\xefbd05f613fcdbbacd34e3d72b07175bed44c7ebf49888b7e2c997cecc226a64ef80713ac9a89da2903725b1afd5996fe2b852f6334a4a447f68cb51ea759471	1	0	\\x000000010000000000800003d4031cd7e6a05a0af3e12b30921500e7b68c1a34f67bd9790f9515464e09941cb13da189be24492ce904ca2a1e35b629d53b9d5c6634e2eb21df83ce9c1ee098a1e951e86b7cdbdb7817c97f93d1eaca79b307b6a58b7c3f14b6bc90b87cfd969c1190bd9f3712fd05b952e22599f99e451f683f28b9278a5be41c4cd5220791010001	\\xb8edff375d31407f83e12d7529942cba14f5f6c21e13f0f1a9ed59ee65887db52954954f7118cc5635aaf1d0f62bd39cb49abf9f639464bbf81085cda8282b08	1682950319000000	1683555119000000	1746627119000000	1841235119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-210	\\xf035207663b9309bf3b46db2ab958deab63c8fdb49572b592d558a23f64bafc795d93ac436db61aff191b4416a4b57f426db8909e2ef28c44050f34a4aeb2b71	1	0	\\x000000010000000000800003bc5b013621d640b12bef1c55020fb9a792fd0f68fa0397b9c8ae6ce09627ff4a883e89d418dc66befc94b2d7e9b759a79c7cfa1f4f517ca25129c25a1f2099f6b62c5c41107b55f4ff0428cdcafafa21920de87c3e0a03235a288b55a1dd7c4e866c87f2ed3b5e195fea7cd679bc98751adabb16ccc5e6b9aaa3222e6b803007010001	\\xe2eacfe0cb2b426d86c2bd10899371b22f65feb2892d1c8d3e69698446ff4db48c8bc84ca10b8d7ec70158ee82ca866ec150122422933cd3e504518c29fe3703	1653934319000000	1654539119000000	1717611119000000	1812219119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-211	\\xf5d1143139068b7a965ed9b3b9e2e49031a56596f5aa0ca2fc0695e55145e3a148a60a3e0824563bf1b1bea3fa4c183290431b696fbd544ca912f5ad96b77eb3	1	0	\\x0000000100000000008000039db3e496ef9261f9f5d36325088e49aacc33330a7cff165f50333baa99d78ec0bd55810138c4d4693e58066368bd425cbfbff7974d58b1111743654cccebe8c7033771db08ea2087b57dbb3499bd5324e959936ca7f1dd5efabcef4590d55d3ca692c65c1ea5a68ab7d7281ab8087965a79d6f4d80ff6b420beca7af33062021010001	\\x6b4d13b20701001a01f55f0527e3da9ca59681553b0047a549d88b19306533b1fd66adf6b4957c2a91c0014d61c826364e3c8f3bdd534c02dcd39e3985fc360f	1676905319000000	1677510119000000	1740582119000000	1835190119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-212	\\xf5b5b945c80e0acf715fd8ede8248751189c56ab8573bf2c00cdf4b0de9cc63f58d832aef1f64eef789b7aee5db8932740e8cb6abfd1297da6615b145ee2026f	1	0	\\x000000010000000000800003b7ceed5950f649e79a57dd490cb1278e57b528dc42e8dd28781727e3c48fc050041edbf4a74b25a87a81971884713301e531973722cd38be520f97ce77e574449dd45159b917141a003758ebafe00fde496523c8eae21e6f188b420ed02233307eb5ef483a7afe7c0071c52721ec6173eb5651719b08ddb3e45908de5dbbc5d5010001	\\x1244b1b00030ad5a0e9ad9447b9d382c456047461823359ed7be18c4386487306c010d92e046e88cb9b0431782651bb202aa10466a93b3a97a0ec434729c2a0e	1672069319000000	1672674119000000	1735746119000000	1830354119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-213	\\xf599e624c0587840946478127bddde568b6199f276a7a7287ca042f05440d47b000d85d4eec6fe63e787825af6b9ba8a4e8693aadfda56f3258f8b1f9224bc62	1	0	\\x000000010000000000800003d12f1edeb12409f5669646adba99439105a8653f6e1097e8f429df7a4b582e317d6288ae4d6a2e2d4df475ddf484a2e5f712951f8753e544169414247f3086d287fcdd47a0f29b55119d10b8dff0cd7fae9d6842575da9ec26512e40b935fe75ef08857102ff8648fd3fe14ad90471ad08fb323e7d19e65ff579195b699d64f3010001	\\xfeaa5a587424e762734589cd0675be447e3ed50d755d214dfd4e4bc71333df99238c6c1918a5a1e046dc2756c7034ec71e26ae204c8f2f4872e8b64d65319208	1658165819000000	1658770619000000	1721842619000000	1816450619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-214	\\xf8f5fbba65707da47025496d78cb8290ad6177cedcf428b5041b77de469272a2a15dcab7c5cb3166a9e83eca4ad3d20d1ed96857dd41de4ef39bedb7d7bbe156	1	0	\\x000000010000000000800003e8d336638b0460af03d9146f473e0aaa3fc3aefc093d038edf5aef4d15818acebeb5484b2da11125cc0a369a3e48c58e69983373221046ebe650451911edc7c7c727bbadb67087f50b73360d333ba86fda5ec6f278d8d093c1a6f366ed8602bfa1cdd2d992b15367e8202d363941f898f8aabde058ed6cc9ea6284dc51f8419f010001	\\xb6f279e464bd17fb59dce7e06395ae515c99b6a306afd124232445d5dec43e6d6e9310012896d2bd568a984f6c02a6c5d2a5e8f6bff2832703875d39748b190b	1665419819000000	1666024619000000	1729096619000000	1823704619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-215	\\xf959f8e623e08d890b3b76ba2cd1086e2d48bb99c947a0a8760c76faf6adf1edddbe483461c30fa489ee0455c134332c260061f24d76d52d3cf8299f8d5dd2e4	1	0	\\x000000010000000000800003c0bb1a0b294f8b429974c4dd6a5a56cdc0cbb55e15fc593b2551136c400e329d71f6cd50c97150a3c1278056bf7953423ae258dbf44c075649c0d6532edc3ecfd95af9a3cb33f78700cc7de3623781f1a62d8701529e11b865e6c53903cdf04c434e0dc49c256de908c41ef15aa9359f22d6932cf6ba7ea99ebbcc0f006bf811010001	\\x02c33d7bbca101c37673b10bd8aacb3ca74a922d8664709b6c800fd977b5907d6d317846885a7e531a985fa6589d4b07c9969f82a68c8e341ca151667378210e	1679323319000000	1679928119000000	1743000119000000	1837608119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-216	\\x009e167b68aec7e238496ae949f97c8152dba4b0e50d0c8ee254b160a65daa89294c891a0e81456308734257cd1bfaac9b3105065b791853c30fc517b39f5432	1	0	\\x000000010000000000800003a26c12449211510519dac29f61fe7fda8b709f8b3494a2f52ba0d476fe7c0c2fe6b7def736792213df22014d04eef18fe3abf3ec0961d822d81801439c7dca0b8e2e6a475f1aeab1c595600610a467736cd7fa5710c4823678d849d98da70eab7fd1ecb554e0ddff0c4026d1af0e835b5140b3a4c8ac33ac880b3393e62fc259010001	\\x863d713b752f9c20493a50ea635b6e4ff920cbd3a7463f5f80e1b1742ca9d0b1f4b540838911032306af0e748d3aa66f0abdee3c6a6c52e6bcf6d73be9ba910a	1659374819000000	1659979619000000	1723051619000000	1817659619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-217	\\x04d64ae80a8b09f9c742a5b13134b901ea5241a83c80b238871244a7bc182d0ef689df80227d69ae9eebf5ec0fc79e511912d9bb94e7eac897492e7ce19e1413	1	0	\\x0000000100000000008000039d3622bca177e230826c82086d0bd8d27d5be8267aead9aea4b8abf93e3f77265cd4490ac83f7bcf9751b1069b941c6e1591d0b0d4c1363ac602323eea9580683ad9c90fadb3abce9432af6d6b2997e673d1909a11b191869ec0959f8c3f2928cd9435d03979d154aa74e22b59569229b2c85a5a4e150043452b708cb5240439010001	\\xe11b82792592b16163829a4bdad772cc8c720151a66436a0a818e8f4d02f9b5484ac9a02ff3d2ec4ac00c4fe7cd7fd98c241dbb5a64ceb38f746c4b81b90700c	1652725319000000	1653330119000000	1716402119000000	1811010119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-218	\\x04c64f58090155d46a95329e7ac173252f830227bbd7c0a41d33eedf8fe52dbfb4e6da56d872a4bde455740e5e27c2305cf88cf249bff73af70db5e2d60695d7	1	0	\\x000000010000000000800003cab2f6310c7a6286de548356b64fd3403b2634eda7fcae8ca575964db5ef7329ea0af41c4dcaf4147e15153e25dea64bcf3794ed6d4622f713a77817e13081a410afa877b3ef43b2257a67756a14f74ce9ceddac3163e884939c015318fd00dea5728b66851e694589d2aebde8fe9b11bd7f6dec7cf2f19427199577d77b5d49010001	\\x7180ef19c5621c18a9cee9fdf68e52fdf41f09039532e4ba9a866f7f39aac1c8e282327c41f8b0b99cd0c9cf17ff1d56da13a41e7afb42a0265f38f59e7dbf0f	1653329819000000	1653934619000000	1717006619000000	1811614619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-219	\\x0ae283f96952176dd8d5e8d525912cca2f011a7def9059131fae8f566cfe7ed2439a448dcccacf393bf915beddb89b8c0e47afe5854f2250693cc15ba324fd53	1	0	\\x000000010000000000800003d7d8a34030304eb29ef48f768b7aa5c5792921aa1fb2bc79e4a6b707c168f4d51fdd853c25fc3ae146f48883e11f2a12fc8291b34f610183790ae02e58a292c66b1c3ca82029f7107b93196830c2cb8001c42b223fe1f0cea37bb06bec4a2a1bdd29ace672c234dd351f083ed8885decf39863f22fa2e943f3b6119462f10afb010001	\\xfe03f9cf13d439a4c5f3c207ac944ea34751e13a9deae63a6a30b4dad91c9f40d6f441332b8a50f7d766943dc98c01f21af804445fcb509d12af62f30d275a03	1676300819000000	1676905619000000	1739977619000000	1834585619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-220	\\x0ade18f42352e60df21a991ebede4c7bf0cf8fd1c35c3a4cf47f38c3724be08e63397aeb64e02edd9677fe2cfb64db6fadcf3935efbe796c62e1d97f1238ab8c	1	0	\\x000000010000000000800003a59b2414e47bc8cdf0f52859b28aaf6efa532fa9dc6493db0212df146570d6cfef278c9bfc1d98fb8ab4b85304fd51c38fffda4e4d4a8eb25773488521861c395d9c529be065718c44d8d28f3f207bab6e4cf81f172c6ae274cd9d1533393e9861f8bc6e0fe10795218e3c7791683d564eea2bdd7c972318c6d58eb155ff035d010001	\\x76fd062ee7adc4c0aea56a19a03e5ffe2a5f049537fb3a31720102a56441037c331d5bf18a8e1e792d2718fe92478bfdc69ef22049bbed884f861abd5c8c3f0b	1661792819000000	1662397619000000	1725469619000000	1820077619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-221	\\x107a8f670f2c3b4048a0549c8b9134ff14592bacb690d1a53f6bf592460e85122ffe5624b252ab32f2d9301a2ec61e81ce3cf5624564f3023556292c6897228f	1	0	\\x0000000100000000008000039e4ee697ffa63d4190e665e76b82b07982f3a9795f277721c3f29d3ce1d22cd4e284f858054edb723638cc4412ba3ec70f0cce559de84a851fb96be7fff3a475ff636da4bc0d9e1cae47ee9ef5bde49d1d7d627d54d4ec0ef5a3e1e5a3650dcdc8f431b0594cb0d9f1d3087cb14da0fc37cc8bb0472a079ecbfeb7e578eb6b13010001	\\xadea9476a1a06da1664418d1b975dff43edd6e0aab4ebfe511f0071622b3e6e656000332145ae5e0657e1f2821e7cc18a51f41a820a954c04ff5449ff5956103	1682950319000000	1683555119000000	1746627119000000	1841235119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-222	\\x10ea9bc5f858013812a469efc021971f1a691413ad374eb8252014ea5abc27e41b77efbd3b3e1398bbf4ccb621a80ec307d6e5ab574c1bf903aa2b286a77b368	1	0	\\x000000010000000000800003a7362633f39dfe41460a1dc9e6b63c4f16e66d04276f300c906a1c5bf2c20e4881c3154ded156149f74b68886a43c879e039669bcecdd91b84b9492f7f87561dcc74be198e5481b1e117e1ed9ca2ab421f90c1c874aa40bd570513a8a6c6d907926c1b9f61dda70ee60f441fd60f1544f869a2cbb872179c076b9a0618fa67ab010001	\\xa38287638badfced0c7e91ff088b27c0294700d89c0adc5b51404ee98189273fbe25784e16c1b5c5a4cfd5d86b83a1fd316a3b635519b1788270545252137c0d	1674487319000000	1675092119000000	1738164119000000	1832772119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-223	\\x134efcf758510c0b2e93d9a57b4aa4b1bd3c96ca058dcb3ed2bf13f36ea0b346b0c9f07151d277961e91b69500a3fcd14e5a150e3a7cd57556fe743b5e57b312	1	0	\\x000000010000000000800003bbe891c39c312a62979d2fa3df42fd55537cbefd635f11f1dd1007c806f1c046b6d557385dcfbc214a9fbc8ccf13193ff5a9130a4b4f75bcd63518698adecc1a54039b05dfe0cc04ebaa5c3c1e89c3af6e7c3fe9dd175fce8915cbb61c91b75f9760bd60ee686aaf2485d9769d654009c863e51ff245c39fceeee6feb4fa20d3010001	\\xff25b2c167c88493936b0e4a27d4fafe48963c60d856d05e863b020f1d44f9c3002cb4fabe0fddc4d33aeb7d00364a6068b1266e8c72e61b97ec2fb23016290b	1666024319000000	1666629119000000	1729701119000000	1824309119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-224	\\x141a888e13866ebf05fa8b1b62bf3c3fcdd2dd3ab027477daea17c3ab2793cc6b262026247d4caaea9ab6dfacd3081e1c51ee45956e720858ad93d910bf28837	1	0	\\x000000010000000000800003b10d8f6809d9ffb5befad6d0e1f687a607f81d9c292031b93884942c636a7f0f51d48edd55d14b982cc2e417a9b9b9977381a225fe53130df42ed546f56a34983fcf69177b5b2b8dfab95714b8a533c642f4bae37223d88408b1726154c5534ef1e282d88f50db3f4ec5b6bb323f51a3b8dc30116ef87d018ec23b8d6e80cb0b010001	\\x536b4c5e638d7a69f7cb924e38e360df2c968c11992b06896dc258091f4edf196cae3ce7de88449adc5c68352c463523becdd0dbf3f6132aa60c198e796a320a	1664815319000000	1665420119000000	1728492119000000	1823100119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-225	\\x15f21c1e175b0bc83017fd0904e400f8522f0fba81cc5c2be16f3fff50052209813a9af9b697fd7e1b8b92e7fc5f1679ac94f1e4cf15ee3e8b8161efaff3724c	1	0	\\x000000010000000000800003bbc159484a0adcfb248ee3a60cb85e470cc7ab391e64790f1edb9b07c185074ea54f6f2389f6c20a45d30ff91b96f2d14eee1299d687995c17b474ad84c980417d04b4a4052bbc8a5545b19ccfc7cf41e457e9134119c75adb167067b77a53a711a0324721f8deb8e2ddcf837c8907acef1324e64710cbef9e5a4c25aea28065010001	\\x3d7279b2060919bf606e8832d8c1141e63b300b1e6a8e83a85f9e8503016180fb3376e473f863c69032669630c84b2fb38d6863c15ec5b47af292f477b31060c	1677509819000000	1678114619000000	1741186619000000	1835794619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-226	\\x155e92d7a10cb0bf5fde86d3c27a4b38b735c798dc5a20035c5784a22449b1e0a25415afd3577ec6d392d5111e1d3e445cf579fb5a604bccb9a38dbde7cc3311	1	0	\\x000000010000000000800003bba3e920b3ef168108b9bc447ea6cadeddeb54a34d44cc81f25958365aabd51f7ec8a4a19e9c559498ea4634a3599432bc11f232a2c9c7081c309b26ebe306cc2a394bc1b9970c190bd0e4f7cf544acccd38d2b491983d29bbcfb2c814dfe6e24357115f6129f9f70cf13b5e38f65dfa549bd19b2dc51cbb4de9be56e51d8153010001	\\x8c880f4b8e0708976622f4f541a71b4f953aa33d1dea43ef197a20281eb0b378aced6a4b8894c2c2d406ddb7ceb0941073518540ba6374bfd59b14acae172e04	1676905319000000	1677510119000000	1740582119000000	1835190119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-227	\\x178ac1f118d41775fe9fe5573211e045b828df282900b1f9dafb551f9bf533a86e89139ecd5019f1996c4d2b199c074e9d616d812070d9eed2e2fbb86c39b065	1	0	\\x000000010000000000800003ad03e4aff43bfc77ca97e8850d89db2f7cf38162d8fb2d615258bb1fc0ff9bbea5a91704e3f0bcaa096dd53c98db1f60e1e18b6ff30c61df358915f24b2a9e91852a81fd5f92996b9e213367d793021c4c156198327f0dd57b3af9327cb4892add5214936f8249907a839b9deda6c5a97cf56eb85b8295e6a8f4d35f404f5763010001	\\xaae68e85ca8b25b7cc852b70b9ca0bf39799fe7a1be9c8fb7c3274ca0a9ded3b8cf40f210a05264a3c68dadf2a148811456158688520cac68a1287c38bd90901	1666628819000000	1667233619000000	1730305619000000	1824913619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-228	\\x1bcea27d8050746821a92bb6ecd388c32ff9bc35ae72396ddb6e9bc82226476f7917fd4428fc744aadd9542e939ecb324738765b3f148c7c80149eff8f8ce86a	1	0	\\x000000010000000000800003d32d8fc55cdeb96e4c557b098cd7e0b84fc7a944082d2943dd8301ef2f7dccf358a6f6666415cdd88b2459b3ce665746e7ec4ad59565c89952e44015805ba72b0f616b6fc660d71c3d1495963bb7514c1f12902b41bb704111eb66a5226ceb1a0cf0bdfac6aaf800252b80e7dbde9adb9c38855f9e2536ee68b9a58cc79509d7010001	\\xd4af6c1c01d4f19f8b7536c7802bb550f7e1a1415fe21ed515492ebd13952a7b19a464bfd888b5787dcfcf9d1021fecdda386ee438e473d0afbca86e7fff740b	1673278319000000	1673883119000000	1736955119000000	1831563119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-229	\\x205244ab5283cb5315f6d50e04f8a58961438f721170bf44d1dd52282c9242a4886794be7493f148cc7975fe376ee01a89d2bfc9e7725ec1ba95f2c2fa682799	1	0	\\x000000010000000000800003ba69189b246d648b2903dfd1f61638721faf0b6e91a26b9a754208ca95176d455f888fdee8f7365e70e044373e0fecb397f1c12d2ffe7e5200193f7c7a07c37e469d973a7960304b82e8cc1a9436ae3ffee969ca51303db135ec1df798f234046460669518ef80e70365b9e5a490137c3d4c7871918b06cb1bd8fcd43b7a2945010001	\\x1345ffa45b58b42229dff9c2c32bbe191fdf5d9d12d595a4abc7864625f6446042b6324955a33e756ee2195802f0c474078dbf653882a50475b3f12614b8740a	1670860319000000	1671465119000000	1734537119000000	1829145119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-230	\\x204264964cabf6b1ea00b79f2a9803e38fc1e1cfc8464d9904eced06830eb12a70afd9de64b80e6f6c9e70fd6d18f2b6e4b024e23fcea98dfb5deb3514108e7f	1	0	\\x000000010000000000800003969961bf8f7185b522d0f11f11e537696e9adb99b92cfe0446c0f982c8e1030675c1cabdf765e0321cb5355274777dc1b3efe5f1af19d5317e036cb88e5b78607fe065810278d21814ae5afa500539c78dbb1018a596c08b265d08057fc067271dfe5f649a654cfc58a55ae3b06403ecab31f53b93e04d577947b4919909a09d010001	\\xd47187736b2ccf4a2c6a59dfed3f178dcd5b3513b28cfa7059d534f18bf017b5e7ff92d19347be2cce0c4b058947edc85db75bc2b662518900f7b6c79c2a3708	1652120819000000	1652725619000000	1715797619000000	1810405619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-231	\\x23825e6ecb4d715fbcbda1dbdcde6a8a2c8346de638e9b51818cda6b8d1cd89163a14a5c6d3c3637fd0f4043ed7746e059818edf5276df61f4563a643db3372e	1	0	\\x000000010000000000800003a729d3aebb9ce37fde0ea3d5349fe1660c8a805ff269206354657e4556ec276da22613cafb9ec33cb07232a4891c94f7f493d4ee3662ab04a7a4678a1cc9c8f3fdbebb46e5e24eddc322eb15fda034af1592b437d47b63431d7477c28db5d855ef5a0f142804abe54340a5ae544b5a313171b643c6f7ae8dbc9a0299aeb5eaa9010001	\\xa46bf5b9073ae04e7f7696089a41263849b847ea0270e63defe7da85597643c416ef5f746ee89c0777897eedcbd52a81bb6248f5aa5cb683e1fccf1da49c4800	1675091819000000	1675696619000000	1738768619000000	1833376619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-232	\\x231ae90f595f230cb47d9c7d7c7b3ac9430b04699b093e3caa4a2f4eeef2f6bdf1028dfdb7fed42e74e3ec0772062185d32bee69b109c2064b11658a6a5da98d	1	0	\\x000000010000000000800003c2b9ca9147ed689e15ff924697e18e324e9b558ee82f879a19c86852419ff2f8785fb1636029722609df31844e3ea21d24d7f54456e70b4234bdb0d12ccd051c39d0967c1b3c4ce0a31dad7639a949ee81c8407598f5b9a6b39cdd2d8c9972158627b2d027f8d9999f43fa7efa5860e039bca88fc645d59014294a0b8875b5e9010001	\\x9f2bab17b06afdd5fda38c5e93d74270fdb3653496c7a515e9b61dabafe05394616f8d0a76d2399e683b992c11b9eac4e75dcc229b6b9e574059118c0dfbc607	1653329819000000	1653934619000000	1717006619000000	1811614619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-233	\\x23d2ad2abd7132492a36126ea26d1ade85aa7c32cc2c0e3a8208d136225ac8b3632c80627754257cfd6cb97e0ab84e8f50f3260a01ca5c8b3509db102914aa35	1	0	\\x000000010000000000800003bb43cd7fb0216b5a447b1650e076572108142a8324ef813b7f996ad109f3b1410ffbda9e8abe96328358790fa7eb3ab80297a84e72f9ee2c3fa1c32e5ac4e1f845b4bd58f825eeb9aab61405332fba6f6061805948cb8697ad2f8d5470f1fa400b90f358eb2484fbf347284c481182a28f5a08f690b41922eabfc7b7b10f83ff010001	\\x26aaf3a9b173c4ab5bed54f23a813c61c16901a60192134a1c301990c0395e8437e9f4b2bf2d7abe8d934814001b20d2715d02f4689caba2f2423148d5a8400a	1655747819000000	1656352619000000	1719424619000000	1814032619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-234	\\x240e1cd692eef9e015dd576be6ed782d5b959d7bfd424a23455e7d41469b21d88afcd81209d76f320cc584a19a904a843fdb58f09e011db65291bd626608376e	1	0	\\x000000010000000000800003bf3f2407207bb2404d01d7a10cb875ce84e3ce9db528ded96f03d10d63c1b09f9664e1b98c4c040dcc5b93f5199c3eb6364d2363c10f3558da25ec2d35ac42e632161ea9fd94bfc238f21a8b46bbb4d4ea7398762a7f182561d17502c92bc9ecce0932dbb8fc000f4821737020545c269aa698b06372ca84b0077810235cc2e7010001	\\x71bb4374ecb797627f3208f29fa900fb71933d5f368ec8655cef0e4052a0f4dd9152a888ab1b26a3f2805a09cae7b889fd41e7abc15265fbe505f6bb88263d00	1659979319000000	1660584119000000	1723656119000000	1818264119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-235	\\x24dad0e52af77f9a560c06f329a2e8a2adcf022b833b1bd211d295206b8caa7de46b8d0a94be907c76e705363956671b41a74be147b785155e25a11637e7bca1	1	0	\\x00000001000000000080000396f733b4faa53f1f4edc5754d02ee4ab3571c383106c045065499cb3c8f16d26083a8386fcb530d6e16d89d80a3196d19e7e2d9b68e8d803d5ef9e2d905df15c17069c7e23f624401f8eac203f9cae33530ee6dc0d20bdefcac80f53bfa6893cf5e40e471ca5d4b75e287caf5ea84c835c39bb6e2e283fe6bc5483aa5ed27787010001	\\x2826f98d95a26b36254cc35f5bfd20eb32dc34fb2cbfb93ad326e3c067dad11e67890d8a94afb5e5ec12810603d17648a61e82768b7b1d851219da9598fd5b0d	1651516319000000	1652121119000000	1715193119000000	1809801119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-236	\\x2936e49ec1bd1ae4dc342391cf132d7cefa95bdac9caecbc9ec45b13b74b4701117f237a69faf06142f5365be6d00bef3171bed93c0bb237ac6aa480a7ae0533	1	0	\\x000000010000000000800003ea76691a4163016e501c1aa89e24cfbef571a31a74ce8a95508a02081d3f58477c1b1229a820fa1f51fbf96ac126c14860d772760721e9d2a0cc3ee782209e0367db29174cb1c6f483fd1ade51b9499ac3a759400926bbb71407c87134f8bc1eb077920b7e98de9e828377bee142abf41e421e9c67256552092646936ca09f5f010001	\\xe8f8ead305a8d61258dfee4149e0499f82e9d6bc9e841f1e905d6a72ce438440ba59863dd806fb3cff59a384ed7af4707ad6f63908d2cd3cb0db5921e0936608	1654538819000000	1655143619000000	1718215619000000	1812823619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-237	\\x2bf25c6bf3f4db3a54218f5f71f3397f709842ff2250ad2e69ca92faf5191e392cf86730cd198bcb8e52446091da6293da4a5c2c14de45f2168265e7d4fbd263	1	0	\\x000000010000000000800003c39e3b6be3598806e1697a792a82f0e513b9ad03d402d10231028b5e5d4a0dfe425a7f6fe7e5387d9a28ced872a66adb1892a94038dfd4a9f747bbd4fb99f5099ecc19ea63f435f9e801f85e7abff0108703a2a4c4d7ef4be59caa283ea9c673604fe218eef76a4102cfc380959082ba3409b47b43fa1eb5371e5adb7da8675b010001	\\xb53b7533acd1b4d85965e6d0c85ed8c48b5852917882643f38ca4fc1c24f442c8a44886681b3be8a7acf8bfacf5a97ffe08107a229af9162ed7e7054a17b3000	1659979319000000	1660584119000000	1723656119000000	1818264119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-238	\\x37a2d6b24b98f895a354645aa514d06810b6285079524bde029f997e264a61d74bc7c8de36df83a28462b81a608a75e3199f5dba37c215e15c656251652ac09e	1	0	\\x000000010000000000800003c070ca9fa59f1005f1acf4e1f43c6a7b28414c320758a53a2016720e47dbc67cb8a02d300e9304f594671c863eb9e42a2479163c88d0896c014ace1df9fe6d90ab7807646f5e6b0e004e01b44209a7fceb7e31b9abb34cd6e12b68f3a1b14999aecf0c17e4bbb11f0e1812fd5f2a79b35c7de61c41b837cbce5c71d224a2a4a1010001	\\xadd9dc5b2c5a88b30edb9c7b0301a596df77241c01678e9e1880b63883b24e4cc8a6fed817b90a414b46cc91ac9b4b9f04f14fe9bb38dcb9674f4d6edc7e3302	1673278319000000	1673883119000000	1736955119000000	1831563119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-239	\\x393215cbb6d6609d4c8631edfa3d109300848dd5f93b93517fbd78e6fc4812f7719aa731fe14427ccccaa81b511f28f1a1037862f0a59e22042fd266abdfca15	1	0	\\x000000010000000000800003cbb22b8bac427580cc111ed2056bac62bba6ae03ad0e5cbe58a61b2ba759e07541d4fe6eff43a98f0ad23e94629a66717e9ad6f0adf06dd95554fc01c1218b32cee5bc34511657565dd80030ad6c4657049903a2d52f2e8af14793a670a0bba47b6efbdd5195117dd85867e5bb96191fa661b7865a958fb545fb52d26121634b010001	\\x9408346821f3800151e8b8ad839affaaca5fb830f5839baed0e26b2b3e220552c63cd5fad63c5c4e9d278974cb765cfc77592b9e0392b93be02f145c561d0406	1670860319000000	1671465119000000	1734537119000000	1829145119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-240	\\x3b4ab033e24a655e9e76d8e6d1ce23e195cc999731cce0d0ae26edf66c9ff0e31fbe709e3ecec875d6ff0d3be55de86f08e0c2243250689e876959f3b487a099	1	0	\\x000000010000000000800003ce2ba49cbfabeeb2c8d870919f6173a353fbd39201fbf2338ca1ecdb3bd18620684c150f2ae19d55d6461559e6e69d1d38d24a7de7d2ae8fff4ede937213c9bb495a41c8c922c20cf69eef2cd93f3a1176310870bd5e89fa49e129375e12e899b8ce83da69e92c25c1d223c8321a5c3b78635bf6161426f48053aeaf89930ec9010001	\\xc70dd337929d9f061f607944bc064e02965dec081d9b6f4ee72a8dc5802add98487302c5b55f76699ffba7726a94f581608a56f0806018356dea99bb33d66303	1668442319000000	1669047119000000	1732119119000000	1826727119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-241	\\x3beeb27c3412730f11bc007c2ce796feb611e51f3c0d175a643e6d0bce2f3c182bafd09f83db3743a3b459b073e9d4b76277bf9c23973748001783b95d9b5ed1	1	0	\\x000000010000000000800003b6ace8045de4e7b138700e83de966761942473e31cb1a222408482ed0b7c5fc5d5369f2ee0d610fd8be74926282538e95f268b1b328b3f8cbae17647558bcf00fc36ffc590b259c3a889c133df0f753953adc001c53f42aa9e719c042e14671d4c343150cb47786cf71b181fbf9baf2f20da55af093571a9139e1b29e570b0d3010001	\\xb80105d272abb51689bd29514ffa75b3db128a5d6fdae80aa3be10a3fd1fbda10651dfdcf95e62ea0e34e8ea13dbde657323502b20da7843b8d4623ef870a501	1671464819000000	1672069619000000	1735141619000000	1829749619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-242	\\x40fe018cab8a56b83f58d793de109d16dcb77c7749c5fce3aad90b3e4e2a604984ceec4e7e6a3198139c5b462c9a8c2d7a3cfe3e7d6e9fc66104222d49e3dc02	1	0	\\x000000010000000000800003be14aa28542c84edfe07b7a7cae40c37aaf97224a27612f6161440174366e66f9895959f2b0c126eb4307de0101d0373a29d0e2363324b901f31951b76234427b8ca3f4a35250779ab02f6bd303b64cc29859a7c975c8c640eea923ff1c1e710e96ab6e5ed95c942c4ddeab59023d703b3c79ba2aa49f089f220c3fb17692d6d010001	\\x93bbae45d1c8e6e08eaf119a220b82b49ad50442ed51b9f2baea33f35617eb4f2f78b5cb9a39f51ab296d192c550ea1c1ddbafe30bc548d895016687715a640f	1664210819000000	1664815619000000	1727887619000000	1822495619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-243	\\x41a246d4e73ae6225a93835b0e0e29993b2791b4a4db3b8030f20bc7ca235e0a941a70143fdbe1c1ec34851e75caba774738ba96bdc96dbfe2f183d5b194ef98	1	0	\\x000000010000000000800003e021d6b86959f9d19b6504b102f164b44c5d847c2250e71921e39bedf4518ad9060074b271c3153dcd26cc3c8356bad7c4a70172aa9174e2e529f778e13c89864c5ef7a3448c7988f5e17a539c786b9b8b67ca860e0914f617eec60e6510205ff08e373c80c42641b201479825f8f469f0a2d2ed5476b6d9aa2536c1dc7fcdb1010001	\\x7a7b433d9c2d72b66c8b23798b7d1e2fa0f4af705b99196d0256dfac24c393c10196fb924b85bbbd8672e3cc0d2c5a776c9be11b1604295dfb2d69cf1a8c9602	1656956819000000	1657561619000000	1720633619000000	1815241619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-244	\\x4292604efb8df5dea70d13e5688ccdad63a0c5cb5703c7ee909af1054d3ede2b53eb89dc28e3f992c2206d4a5365384bd244016a273119856108bc3247c4b8d7	1	0	\\x000000010000000000800003a84277e2a2ab6d0eb57315e6aa07972db4dafb9a69940188edce6c83ea6799f2f438478ba216ab14f6569b6d032ab54fa1865a4bde39de40bf682b7b63a3aedc2e9e57f8580bfb9c1314d4c3bd484945a1184c4a9caa4ba68829e7482af28f6f6d3bf6bbafb5a1c1c7ad415a6d81ffab973b5e13cf9a28654a42428659ac22a1010001	\\x258766afda40805328b4c8fd80b5e3460fdcc84301c1be5c5d91f2cca5e59d36f77addf1cb5f9d1e38defc4df92f0d17824feea7c3e09e24aeb3eeb1c06a570f	1676300819000000	1676905619000000	1739977619000000	1834585619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-245	\\x45ae1451c27181d11785058df6ecce9a03684c8834135a8ea0155a3172676c573abeffdc6caa688c6bacadfc907bc3ffc7d55780fb1cbf36c12ca26533113990	1	0	\\x000000010000000000800003ba92b96df06fe6aeecbfa0127996f301f98fbf6cb7cc68b4532440ac55fbfc0836712c27bd3edcd5d4356d9ff92f772d5e63054599908541657a1e267c78aadcbe985480bf32678169aedab32a2284be3153c5ed6da048b667243d8394b2fac9ed5545fd88682eb47268dede32308bf618c47aa2e88a68e35f164aa046720e49010001	\\xbe707964801f9b0cbfd3c61f0babb9bc36f2e27636080a9e309bd50b0cc8f6e2d50bd430f870f1096ce424a08b88b09f84da44ef80c6fe465c5f0e4c7d218f06	1663001819000000	1663606619000000	1726678619000000	1821286619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-246	\\x494a13ec5ab03a057833820e453441acf91bf9525717311680892df42e20246e26af62d25237cf02d35b6647207877c6b72aedd74fe912f1202c3f3fa39dc2f7	1	0	\\x000000010000000000800003d90a028bf2b7c4b1363878249af8277ceae6dc3a0890e5bc6e6e95eaa315bc711c8e92619467b3b1823008424ec1e33c69fe4332fab32e6b50e99782b98eeeed45664cbc7ca38d8d12315c8960a370fe42966c40b29bbaa437610c8772e44d8ff1797b7441404c58344110c8374400d73b2885b80083a10ebd319f4dd8be45e7010001	\\x899f51c5f7508043640b95a7c4057b013c2d5a25d9d0ee69c77f34c13110069bf384f4ddf365ddea55cdd24935e6cf6d9c00af4bf81754345537d06c9094f40d	1669046819000000	1669651619000000	1732723619000000	1827331619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-247	\\x4d76e74d28fd61814fe29a0ff619964950b91e96b015034f4a2cffad4d4b33937bef6e9b59f3e166d43f45fa2c4eaf6c0c7cd8580504058237227e526fc72ee0	1	0	\\x000000010000000000800003dbcecde2d31f8448fd64949137154af0378887ca44a852b06695832a5900e5e64425f129ec36a16b4888336691a7a36d9df478fa6f5257f92452ad1761e8bd033b7981ceb0fbb3ed3135a6ca62adb7e348b2f12250d58f7d7504e071a25410bf60a9f870d90722bfaab456fbff8990e01ee4fa408cac04f3d37a1381d06e8a27010001	\\xfefde5e3a501ac1df83184324e5213d42c4b4f5118e6ba32d0353beddf8d41bf0b73e31424c19c591ffcd3bc9951dc056c2d8cd81232fea9ca09ff6bf926d20e	1672673819000000	1673278619000000	1736350619000000	1830958619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-248	\\x4eae39b413d2b90ea2dc35f06a0bf17708e2f323c67a0077a28a4272cd25c72c9f39ef5152576e64ab249ca9158eee060d36f1d9abcfc030eb106d2fe94ba9b5	1	0	\\x000000010000000000800003afb0bd35964e4b9400742c903a379e64c4c78dd9d9e0bd16a5cf7f48893dc513042353fb6f096d11fffe7473795217d165de5026ad8abc1a8610d26ca2875a86a52b4df55cecd6b5195793fa25d1c982d0ea7a2c7b2a46f79599e5590bada30efa14bae3f5d473f09aca38be110e2f49166c64d224f83f69a12a567e81970d61010001	\\xc1565e30f3ca381b789c04c49c1c30072a97428088f32f3d5ed91ebb5543e00cbdab66830d3f52ede9a8b77809ba137c37fb86e92ab563a802b6a4e01e32e80f	1681136819000000	1681741619000000	1744813619000000	1839421619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-249	\\x50f2810f058fa63735853f897f691d06556cdb862ffbc0491be54377e964f2832f455f69773b7a986b18388a0e18e7b8369f5aeb40e89b1ec11251188baf1a5d	1	0	\\x000000010000000000800003e56b3c153b1e757d15a81a4e22bc203549ccee1e19aa21c8df6a2c10664922558776d1cb76e2bc079b7a8a366def9e42b35ab7c7ad8d2697cc86dd2d98ab2591b7cd8c4c8d691c614e3834d8c4f844ca2fed90c3be97224419b5fda00f7d9c8b7a43b57e0c845278ca72fae964f363702de6ed32d4e2d3aa3645e2640549dee5010001	\\x76d680f4f6c7d8d78dee168a1ecc1a9d3114e17062b22f22bfa28e801735fb92e7614b59e48f78f3da853d07c0ab7226ee2d0a03a530c1672b7d49c2f55bad02	1673882819000000	1674487619000000	1737559619000000	1832167619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-250	\\x52ea9440b6fff496197768c8317e935444a65b3239a944bbfb1c6913c8419d0afa36ae39f54485565e25229304969cf22ef9d35889a07d29b78456f9652fc507	1	0	\\x000000010000000000800003c77081bcbcfaf6e88bbd88b20cd858b23b0e8122a329a977ed469f94a45a76c78c8180ea4a897f0f477625c52ad211ab126fd57faf6dc74d3fc9637af885bbc642b0394124d941ecc934876f928f8cd0362027f077057c5221b8b6951384f596a8006e3729c82a2203ff577fffbc2066ffa8cdb17a81bd5f44e998b52d050c65010001	\\x1f407a3a5377b8cf9fb1423663efc24e51b50702ef186917a91ba192b217157b5fd46edb67577bfe21ef1054c614ca34be55b43ab033fb73816c0c244838230d	1673882819000000	1674487619000000	1737559619000000	1832167619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-251	\\x53727e4a50900b8995b821ead90a3ae84726a8e0e04cdca0534bbab67f8e9f4227e150be5a0281fdf7c863f55812199efa2fd703249142c9ed00bd876969fbd5	1	0	\\x000000010000000000800003bb2d0d789ae95614d1a66da10452eab806ec81d5566097d2afb67ac68b6c468526711a7490b9046635c3a4c445c2e4d0ea6bed7706571a26c71dec054dce103a8aa1c02c9f17c423d09c07bc6e13efa49debffe5eaad8b93af02b29dd1a6ca73739ad51b972e1f41ca2bb0a306c3faef9119a12bd645f42d3f1122a78b42a967010001	\\x2fe4678d03bc7685796fbb42b72854daa6a03164af65937bbcc8d33ec1dbd20c347b44280a7d9c57591a3f64d0566c0618d629b64916719c3d76d4989159ba01	1663606319000000	1664211119000000	1727283119000000	1821891119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-252	\\x5372a62d8900fd201e7ffb46a4edb0bd0242d2609e6f3f494cb99e736d79df56e8ea5df1872e5de129e75b8bf63fd9ecd4cc7cc0080d4bea5e9916fb28e41bf8	1	0	\\x00000001000000000080000399e0daa8f140ff71d93e8807f6134776b41663564f45682fcab85ed3b8b27397cd30e4bc2c87b2c67ea228698cb2cd6a2839086b9f13ed48e683e4c4c37b1616d47b27e68c86da0846db0f5efcd96d4713fc45912f69262f1f32a70dfa4575e964827817901931719d3d136c9055e312144dfbe26b4868020f064d0b61aca49b010001	\\x69ef30319d8e577da66239cdfe0797aa6cb40ee1f677c635e897824ddba0cdd8f8294296a7c62141dcf63a3c1227f50906849ba79e32fc0c634695aa90b4110a	1653934319000000	1654539119000000	1717611119000000	1812219119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-253	\\x55561380ddacb348a0e0be837a41256ab93f5e098a6c1a64852a13ed0027cbefe158c810afc83f7af9ccb8d68a50959b3c8f7e58e21e29548cec45899df5770d	1	0	\\x000000010000000000800003c5da4c68c4d8ba7a439fbc78e7992c3d07bfce562f9480f318b5255054662ef0e7b3dc3bf17906eff4f694e7fecac2b6e1087413e7deb45adbe6df59758388c736d7fb7de33e7c197855a033dd2fd437493788e89791a699392bd4b93f20d75d650f14ecbcaf63f3d907419fd8f4b64cd9aa49c5d2838615fe5b1bc8d20f8189010001	\\x68a43d3d29481275aba05380aaa984e36048b3d43994710326ec345bedadbf0e5bb20eb9c9b66664e1a492acf3cfa3f7a111e36cfd227966402f82a52e321108	1653329819000000	1653934619000000	1717006619000000	1811614619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-254	\\x55ae336cffa28fd128de6c18fe3a49e9c832813fc746e4de5b5feab4e49ed546b81b535305c10b42533dc83a32fedb40e1ebacc85987a74511d70b388d7bdcad	1	0	\\x000000010000000000800003c6191d096d11aecb338cb0d5734f6575ebcd1f376c5db6ff1f235978eb2f0d661b4619f57516a6500f56d5e3f4876ed5784ce0afdc97243e4552330f758e0fcac9fd86cdf6644855302d44731af2ac18819619c9509802e36fe8ec90eb89f75b878766e3556e9d791f4bf311d75f5b31a44b42e9515e8514e27c004d7144ac31010001	\\xe1e142a82228d6afd4047897a043a966e55d6526fc72b9977b82921346f2675b278a7bfa969642b586c7c08894b140bccce288aa0601163715bdeaa537db6603	1666628819000000	1667233619000000	1730305619000000	1824913619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-255	\\x5e36d51460db71dedeef06d1195bbf2f14c04de9d5f63c906095c5180d10b2bd5d85d61c9eb3be19035987a81d5e8b615b1be96f66b206c080172fafde479d7d	1	0	\\x0000000100000000008000039c9a0e8477de03c868382f043ff05522a8bc1ed75794b209692226d3c58fd142055b50c1cae5cea7830b545e102d446bcec7301ea2dd59330d0dafb140fc9585f1b940177b552b8d222bb7103f3ecbc7a83b9bb02b773437764c41510bba8d6c55feb69beb642a5cfc6e9b45fed52927481d8b8a009cdffdf71530423dc8ce7b010001	\\x02f46668d90077808fc607d811d30a9d00d5f0e805456a21ef07b80cbac84cc22fa4d358e0f7294de2ad1cf9717d6c9ca04dfebc486d4cd0c4a6dc86ccf8e60c	1668442319000000	1669047119000000	1732119119000000	1826727119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-256	\\x645e5835d5d0fe948db4b95e9bdf9250c6bcc2a92851693d11382d51874089c5983ff507790de651c781ca23d2173bbf7edd414c7f65a62e43b311b575c93c1b	1	0	\\x000000010000000000800003af91d17302df76629eecc0c542214823798d1aba8fb51b6768dc181043df51675eb6b8770b6be7acfeafcdd68e0c367b0e9f6ed5a0a8b9727e76ca093a4d5fc4fc8d084cc15ea156c29a3a6db18a71eb7323e56cf8056cf3709f020d55b94f3579616f622b39347b9770b2abfddfc9b180f36f4a2ef0a208acb032ab49a8958b010001	\\xefc4fd9e6ebbd355b1d39dae30eeaafeef736c8c9a50626907468d4cb2e18e60441b57d8ad8909a6baac032ca82ba97e83042783df46fdfa450b192d2122520c	1679927819000000	1680532619000000	1743604619000000	1838212619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-257	\\x6b3a5238a850566029e7f808174c0eb5580260b75045e336efaf3be4d35cd084885f942b7fa6beb5b434e81694e96006f7bc32e3a257f6f27050abb41f355c4c	1	0	\\x000000010000000000800003aeb5ae380c56d5ae3f85cd32ad58634e875326c8f9b9275113614a0fd83161e1906dc4009eccb50637f8e91b5ee32b7b27136261e89b42ef4d18fec785ebc5687d5a4156b9d7cd4aac2e549ed4dbf99a2fb55fd8928f9f9fa208d94b55aeb642632207174e8e3c27fd828b9a047f9d2ed0e3f36e1cc5e56e3906b39b2df11e45010001	\\x907da0c5f942026240a7b997e022c8f8ef329436361dece394ebd7e74b6d48ae35147e8b0817098bd91d9c04824a52abdbf6eaaf9c6aaf7d949087d9a4d34407	1663606319000000	1664211119000000	1727283119000000	1821891119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-258	\\x6f028b0ed991ffbe726596b7528650e2da3d08a724c80e72524427a9311a1ae8a8c33015604d901072735264310b4f45f6464aabdcf13adaa935c5775f4b47f1	1	0	\\x000000010000000000800003aa7c639bad6b55a144d13a92165d0ba1ff84f33859d8e27fc0a2a5c45eed2e95f1c74515f3c9b973205392854f96afe799a21143f13e4e18b84fe34858946e1436d30020adba8276a0c235e1995a646f444fca92fa74b47f09cee11725632f85ec57e9c7faa8704579dc516284cc5787ee81895c7813409bf96286d5d2c81e4d010001	\\xb0be471039a1e89ce3e1aa702a9a4a2d69a70ccc3f3c0989c7dee062eb8aa7bcac6ed4f63e1fdfb69acfd1a3bbb81c41808d04500b793ab6c0a1c9497ed2710b	1658770319000000	1659375119000000	1722447119000000	1817055119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-259	\\x70b2ad52632ee2005af5ebc8907b6f1fd784914d7d9499c3210a6e2f5cebabffe37b1da53de1473db1a189283e23d8677c0a06ae634513b897b89abafeafc7ab	1	0	\\x000000010000000000800003ff2d94113336cbc89d8391e15371c21a523778be6efa3ac15b79871a7b38913a59cf264fa62bb538fe737e944f93d657051bc235d320d1792a8a7f63e87563cba7997224485e3cb40475df9a5167cb481a0ebc14c0a6a84d747fa5895d9580d48c96a997dc091a9eef002adf7cb58e77286618f69c1a58be6be5d11e41c2ed47010001	\\xd5f1bbae8b10cb8e2f7659bb4dced03a8dcdd734854e89e99a2408948bb7e1779b5f190ef9984154755d610bf982a9713ac67da5df59814ef61e3ad082be940d	1663606319000000	1664211119000000	1727283119000000	1821891119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-260	\\x728e1b6fc1a2f6df096483bd927fbd27a586c011400633e578cfac1802bbb2994fa168003d3b110e7e5915688776ce1ca62d44c0791ca4589a28630d73995fde	1	0	\\x000000010000000000800003cd0c6127d371b28b7f85cafa127dd9ed5aabb830e7f78e66edf4468deb3af9a9e5459aceee7f0bea57e6f08e2705343d9e85f4a3820432bb894b123676facb2e7cc5a6b2de408709866de2ae397b0f124c9242cae7eef9495a05ebabb3439e8698ca9ab78b88227f01bddb91ce4293707c34bfd6777e6862b4543178ada63f49010001	\\x663ab75eee3fd20d7b26125a54b903a5855aa8fb622780175b94de4120573709dfedac1ec6aa53c6b20ecd00ac7d647038adc5e9d4714ab5fbd3077ba7245909	1677509819000000	1678114619000000	1741186619000000	1835794619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-261	\\x7272ab4c2d8770169764c0cc04c1c6db33d40276bb66636580034f00b2ba64516c26aea677ac7ae58b683b940430092640e4ade005c6c99422a2026a8f9c6eca	1	0	\\x000000010000000000800003b2b3a01d9e5aa192c949198d4bbbf95d2951ed302e9a0f30d35371a325c7e81f9f88adaf059881b666ae876d32395e105af7159250e694de78cf5af465d6820b503bd3293cc021b65e76b0a2c54251cd2ca2a06f389529e0aea72abecf8753da4a6c2aadaf4759c9d36f98af82355251ba93906613ff33a8bc9bc10061b26831010001	\\x5f4d8df5fc4907e0013c248cd8db70d1b06ac32a784fd2dc3e3acb3b706402b790857b852ab101aee153f140aa99c9e3241c3d9a6dc136e29b46c5eac83cb708	1664815319000000	1665420119000000	1728492119000000	1823100119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-262	\\x732a8522a57a402078adc9fda1795668877a26f3b6e8caf870dc15483e33a09d5fcba1d760b8f074b9472ef956f04850c55782ab298aef63eff7f6143a383fb8	1	0	\\x000000010000000000800003b7a15c25f742abda88071607a3f6b992773e333eef3677a0c533bf3cfa651a93b59fe025a7372437800d9ac8eeaa090ce1939be8ad732ca38263d376718bdb629ed2cc27b4dba771521c2407eefb3847ee77cb436d60ab776f5c085ad302e5495d9329e12ea7523c1c35c402f154384d6e4aea563f9cdc2dc0c196c9e0f5b95d010001	\\xccb10994622f7f285b142d13ebef2e63e4254d55f7911a7d7c7f54a0dcbf31cd10f0e24316fe30e6dca4820d0ee10e0e73fa379c81143e6047413c7bc5fd9800	1655143319000000	1655748119000000	1718820119000000	1813428119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-263	\\x740eb551a89cb4a80e1940c034328d402b91d7f206f77fbf1217f171d941434d639f683277899dae36368ab2fce9772ecd1a6260d374ea9be334fad60b18d45f	1	0	\\x00000001000000000080000396a5b794624e2d5f11091a226bc96c78eff8d0fae3e8ca36c72e449e7715632a635ea06191cfe5290071955c2ca3ee362c7bb7164627922fb504fe7eda5f86a4703ba1daf69ce7cb2a098c686fee88c56e476dbb2fa51202b738b00801416a03866c99f716bf2601de58fb8a1ed54c497d4007a7a1f7a0f51e3faecba3e3cf31010001	\\xc7bba6b0ee06a7f77d5a0f1b4fc5fd952592452d3cb137e64addef3f83a3b09c92f18d68afd67737ec35b754a280afb231d3e81edb91ef1d957fb05345865f0f	1659374819000000	1659979619000000	1723051619000000	1817659619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-264	\\x772ec3510be4726d28500a3a4af87d65a94873ada1525381643aa174919777969cec581386d3c546a44327e0bdd412541249af5add55958b0698b9051484fb0c	1	0	\\x000000010000000000800003d41f5448816f7e3bc4ee8d8f064af87c46d00269222b63270394b633a68d65c8b70f5f5dd7d42b42a2c35698e1297f343ce59d3ae86c9b346f73f637666b4ec8d2280fbfe04d701ccefe109f1a8562003497881ca60b281c1ffeed57c4bdb66da4d665c392a0c82ee43fad74e10d4b2f129dc372f1c93b63db6d0fff45618a75010001	\\xedf27edb5a6fe9d0d19bc2c0604cda9588ca7fdafc30f57445bece7873a669484b5d802081007da0f3de6eb384c82617a4fac6f0b32f7b9d333f0478cdf7850c	1663001819000000	1663606619000000	1726678619000000	1821286619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-265	\\x78c26bb00ac632c8c650260f2faaca1c0440245c49ecf774791f0a10c4b22d0f3b4745c8f10049a368480aac84aebc934bc3b02123cd6f52236183a80395488e	1	0	\\x000000010000000000800003add45704b3b4973ec9b7c1b8112f25b34095fc14285c649aeb4262999bba658a5a4f6bae789104982b432b33b4d1efeadd882c187d709cc7bb87f6b85f17c2a8209bf82ab857c983b0bc5ac15b92b804c71764b7ba88656aadcaf9357260c5db31993b0c499eddea950ab325f9e253bb7c76e2e088045374ae4672ab092b1d57010001	\\x959d3f83d82e80166e02a4156241c9e72177689bb141e48e1ba009838e14ca7a68651a09a12519e1a402e5e25f340296c9195f99e7e7ac55c3c5986e03175609	1658165819000000	1658770619000000	1721842619000000	1816450619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-266	\\x7bce6538fd4c7acd4520bdef07c10fb07441d6ada25c53e9d63e71ed06e278a7bdcfdd3a870ee8675a568b455233fa100240a8b496dc64eb82076f398f09a80e	1	0	\\x000000010000000000800003b8e2ad4c964ae03b7f34d7861f55c7596ac341d13cf16479535f6a8b836c15df0addaed7bb83722e06861aaf775335a17ab83bf24b95662e301f2799534a7a063bdc43ea233355b32d57e9e43321c19f040070b9f8d3c7d92137e5105c7b79570b7b84104767d217fb3ff446d6302ac7b6f8425a00e85e8bad82ea71469206c5010001	\\x152763992926c68ffffd3effa0c4ec3da449fdaf2783318b7ae1c10ceedce8892fc2e43bd26005a5a96bf25cde4e2ec8d3f36217671c37dd7e5736ac6f95be01	1669651319000000	1670256119000000	1733328119000000	1827936119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-267	\\x7b2a671f5592e4bd3ea32ff9c4e20a08c4600f3c49c56194b404cd9ddea8d63df3e815baf9b45bcdd6805d8eb7738007f57b6e8ae2c7534ed3fea902b799b4ce	1	0	\\x000000010000000000800003cd11edb656b38fb9e9432a417d4aaf2bc7efcce5ad22970a824157689b2375d694e4d6a0f7cdf2b050ea9dd67ca74b930e91dd8cbd2f8898b239c90106c9f1bbd7b1f3f4be8465ec6b7f8f84073d0f6e00c1f4165cc8b540b233acd6ed3c6127059c4ec4810f6964c06099a3ab997663bad48e1322ce5b029cae786e6b5e4981010001	\\xbb72d1e3ed28ab719f66d89ca660573561e3f76a855c347073fb3034b033b957db79a1f643ef37cf4394669e97ebc4fe05127ca02b1d3380c1e62e0ec0b9fd06	1682345819000000	1682950619000000	1746022619000000	1840630619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-268	\\x7bd230227fea2b75f86cd946dfa1865800e673e1f6275bbc481b5afe0f5b7d9951f8fcf1a0d7b9b2c6a2418be51ac81e28d1690e23ef7aef87379d4420e27923	1	0	\\x000000010000000000800003a07d498bf388f2333e2d0d38dbae680960a4e17606b7fcbd9c27d305421d281da6db03cf9f54e98deaf0d6f0d300e41ddb03cd35e7f0bbbb4dfe649def85cfec80ffff4e3cbb0a3382510849ece74c177560f5defd7e4773e4fd623826c487e23f0c63f131a152ca59c7360163eec49fa218f9070ec3e4effa31bd0234f48f5f010001	\\xc79f2559e451c64ee04d9b9f32f035eb8274ba9b76e363f7b4ffdb70c2e2d25cf5481cb0d2d17159bc86d7ef50baa92cf297fbf596f71940b0b203dd792f7a01	1680532319000000	1681137119000000	1744209119000000	1838817119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-269	\\x7e6605ebdb00ac4643dc73d757c0f8d32fe91a9353ce222b738bceedaea2331afaf05267954eec7f1c4d054fad5c78178a74d74622322e0aab5657eb5c0dac85	1	0	\\x000000010000000000800003e041cfdc50394dccb16faba290fc62f7cd5b81c2c39846bf34c8e41c92a96bf621b6d34906749019dda1e9be40ac64a3bbc50fb7a3b634d973458092380f825472a3f37f1af4f8fe4a29f159f170236107cec8eb3598aef97557421524dfa9a5d6cb79b8aaa20227c5da228176fa3495e9dd2c589c55e14bbeddd2a3c475ffd9010001	\\xdd8384a02fb5d19c19efa6ff7bc7073761387b51fb01bb13fcabda86e6c8df5af23b1f6b98e459ae46c0eef8ed3a784fb92f03b3833c4d97f4027a571dfac606	1659979319000000	1660584119000000	1723656119000000	1818264119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-270	\\x811ab73743081980715a2c174e1495229dc68f7cb0bc7ca6c42fac6275ca3a3dcb11a56dab65a06e05aedfa835156f20cf6e2fde2fd43104e3a96873c9da38d9	1	0	\\x000000010000000000800003c7d27ab188ed63017c458eb88ba670035afd518c88f03ede24d142915bf69be8482981f2a43845a2b41208eed93ee70653583ee2720697784fb0b320053541e49bc2de47da09aceba0ba4b91341b7cb08c8f9b310caae464422f61080249d204cdb13b5cedcce54057d6e4787e06aa05eb64addec4d779e6ccf49153e6193c23010001	\\x8f3836def97e142834739159991478d57e51b7aff9e0ed6f786757a8cfaafc7f153bf5d55cedf274fc7eb7286cf319eb14e97582220478b5834ecf700654f606	1671464819000000	1672069619000000	1735141619000000	1829749619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-271	\\x82763067a5cd27c95fa6825742179c5337f7988269d98b217db2b077f5e81647f9f4afa5a8818eacc0b1b8e768e64bf2b46d20815d3b747fc8e5f212079eb47d	1	0	\\x000000010000000000800003a8de4f5c365adc49431e3e54de6c8781f58d6c17e101fb7d472869b0a0a0ae5f453703925d9f13cc5c5bc4a7e6c33a742f34603c06c290d6a7fec374810460bf605dabceacd0664ffb307f2accb9617acc3b835489fdeb00cf3782850cf7ff3544407779d7b4de44dcf17aba1c6d97dbaf38c7b66e461b71e9a11f679d4c3ddd010001	\\x9b2679d58df03602ec79c421ad8776ca162b0f86fb18259971e4a9b3d29a7571e12cd00575714c092783fcfec42a19cdc68ecde161cd3d5527ee28b14587a401	1670860319000000	1671465119000000	1734537119000000	1829145119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-272	\\x83029eb0e817db6b67b7ba5a87ec3e6b4bce756d696e4f14db993e38fca634263a14c580c39380d9cdc7dcf84a786945330841e1dc8f8086a283822e65ed3aca	1	0	\\x000000010000000000800003cc3471154844231831d7322a1d404bafcca64ebea39b74a60c8f2efb76e556cdb394a664af89784fadffcbe9dcb4d165314a6048744f663d8e8c2e475630f97e7f2500afa9ddc24376e2f57cb450d76038bd29b3cf5b1aa7b008da9395cec156e0ce8a6d791f3f8e13b7ac93278c91a450902a7f1d00a8b38aebd49992dd7b7d010001	\\xe8de27567138bc8f070a50c0e4e0771e8cf580c31dfdd0b59da4a99b52ccc03461020083fc883b065b9b6b14fbc4666df5301fd2f97e1156031b66a74cc0680b	1670860319000000	1671465119000000	1734537119000000	1829145119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-273	\\x86420305f72a51adc124c1caa2e95eb4a17cf174452fac0a07c6a53ebf7befec792d5735a0501db112c9284093f555c9f9a31d532a3f8afbd4200969b3dbd111	1	0	\\x000000010000000000800003a669a97af45dcaa196c996a35c6b04bf3df787c3b306e419a2b7f8549e7c0c8fcb9a3e54c3e22aca4e00c672966d4ee6b1b3db1525d0fa856b51868b7d5edde7634491baa4c22d8865843b52289e2fe7b350f31e7af84a6c3531cc51c37e58721e8cc8104422c00ed51b6ece450d25d86943c0454bdc885585319a45ae95eb39010001	\\x9ff107063b9326ee44a73a22a248d3ad6b541deb02f6a50f6a1d6377e9d69b3791033a148a46fd53c16d23193bb87ac8086ebf4e586e64ffc2ade137b38eda08	1671464819000000	1672069619000000	1735141619000000	1829749619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-274	\\x89f62eb7d0be3e4ab1c12e950e919a505ad833fc2f3cf29505a1ab81df480ff7699e0e36f03f8f2d055052e90c8bc37961419d7c67dbc64e9eb04bd135447517	1	0	\\x000000010000000000800003b37a2897ee001b5f5e171314c1e299a49bad021d665bc8f032c339bf5d1510aff891f42775696be635acadc33e2319b157f26b4ba6f368a5af362abb9407df09f787106de759838f092da3d7d9bc796dce3542d6d4b3e4c06cf6e11c250fc9bdf4c7aaee840656856c314e1c3a4d03993337047228c4573ddda7048b84e24403010001	\\xffff62c30b2e2da6a1c932e1a1a93c7b2ab54bdbdf7e7bb1a7713c5732435d7c49052d3525cc40061fdd1d45c2885559a7655224ffb1503b4c90da12e9eacc09	1661188319000000	1661793119000000	1724865119000000	1819473119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-275	\\x8d12ec8b4df50216918adeb65829ab300d3d1b78287d9d5bb974dffdd57a2189e7ecfe42507ac7004c02469f22857f3c8049a45256e201b572ae8f8c5e8d4412	1	0	\\x000000010000000000800003eb29762f0f8767f3f7302a30228d953b00fd6d8ef3491b27b8ff96952ea2edb1d32548b74ee140da16b6d7f4c5b4deb78397ae42a51b6db30f9b4744c3fa5880717557ab67a262bb8692f3247eda4f224d6ccf424ba622796f656338c3ffc96071cf4525d57fbfbd8833734377eb0b89bff38607926519ec0143f53227afb4e3010001	\\x5a5d95acc298650091753c804ad6202100a585fc0c073063ee2cd84d5de9a3424a37d79e284bbba8dcb76ebab6196121a96a6102625fd7f14f22af2ebb5b9f0d	1653329819000000	1653934619000000	1717006619000000	1811614619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-276	\\x906e737a17bb00070883e93d9b930923d9b2410771059e148309d9219c59ee9dc8050f7fdb6f8ca10e35e759095a920bc8a60108e182bb52be993c7e7916fafe	1	0	\\x000000010000000000800003a25ab88b502f52887222f521d0af0098c582536f862b2027e59fb850eab39a7a5ffd16b6f90ff14929ba5b4424aec489db164d6f2557b031c65c606a2127ddc50fb45ac43e2d7ca6887f15a8a4d4d069b202652d6f8700b49df452ff94f2e0bc829c3d205ecae6681545cd2f7fefcd69699302a080980d58a46b1b7d2c5599fb010001	\\xf7b9ec5bed26d81df1e51c12424bba9c32b840c325a6b5e8dc9a6c575a8e660cc19061356af1725546016f3e6b386ad56ef271c7b1b415556ba029b2dbf59a04	1656352319000000	1656957119000000	1720029119000000	1814637119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-277	\\x9092ed6124283ad2cf6a55bfb6bcb95d7e5f21cd0a594920bcc13d35e81968e9f8a660adc3443c837470e343b6a0b52d1c279d616c4b9e04c2cc428787b08b56	1	0	\\x000000010000000000800003aa593482fc7d1774c79da0917df9be30a802aec3406f7fe549321d3979fa683f0f814fc70d5069706f9607beb7cedb6e69360dfcc8db30c0227efcd90d47e2a4bf0219086e12d93758da6c1a955ae528383ff791dfe75aefa987974cc8e4301976ab5f90b69bc27582642661debc22f75ab68550795fe7e4979cc20e05bb3f8f010001	\\x0f052c98fd989fdfb72e2ddda1b892a3d53ba9b913ee9ebae3c307903a26163277cc5c4e4da37d74d413a8d2dab761b78e88ad39c7b44cdece57a5044d60320e	1673882819000000	1674487619000000	1737559619000000	1832167619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-278	\\x906ac74e77c6ca47f7795d1bf2edeb30e754cb2c5875cddc8e1883ba7d2127e24f811e4aaaf17f17244d1d8b63bc17801352dc83d767ae71a5f48717396e08bc	1	0	\\x000000010000000000800003c1949e6c7e569e0d603a8baaea8027b395d6b88cc77bc750d6ce3cd50141171bb6503d454b1dc270ebbb5be326ad9c2d15e832f3e3cfd785f3cf482fe621a6337d926e769ad6acf0b359fbc1537a0782863faab7edb424e5c66f2ed749be6b3037d0a7dcb152a90e8732b883e022ce3b3decb74e5abd0bd07e12b34f21b4e7bb010001	\\x2523293739352ae8b7e76e9c856759f49ed2a5818f45ca3e79ac9a34cdab3d5b9650c719e3d6d04ae62e9a332472c4fefa47abdeb046370bf52be36fb3452f0b	1652725319000000	1653330119000000	1716402119000000	1811010119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-279	\\x975e563a02c98637141696e1da08c7f58a2f88958e0f5f0c864dc1738a7143993f6cf280b793e6b5846a5cee93c7ec6917b2211fb1f1033234006f54deba39f5	1	0	\\x000000010000000000800003c0bf2397007d8559b90deccf0ab7edc416dcc749b4f63fc8b3a82a4aa82412f933c6edb5b12a8bff11dbd51f936ee63fc1d99ea9c0425977fde4f17c92611118c03db427f361df02f1a6f8409a0c495d3fec363f70dfaede441f643e48c0e34a4ee894a8558ea9d9ba34f5c705e22ea7a989fc52ef0bde1ca104d8cc10e1fc23010001	\\xb2e80e4ef2b9b6dbef6a62e35d1b12f4adc521261729fce82eff8b19d776a2cb39dfff7fa866bac2361ad78da8aa23733c68cc958add49be1838a3b584970103	1658165819000000	1658770619000000	1721842619000000	1816450619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-280	\\x9cbae90bb10c119eee793bd5974ab9348e513e7ce9ae512c4bbeac6e7cf22a4edc7a458cf5e440332dae3784e8f2370326c4edeff073033fdbaea77ff488ee69	1	0	\\x000000010000000000800003eea27e17f64771cc6641703af31ec7cc00b6d06cda340d9d5160c18dff2c814291977b3b5deac9c3f668e9a9b4903d3116ca779553fb9ccf1d8402149f378ff24ec074c0e7fb6f8f6188865f321a47f95519ebbe270db77837bd889886b9d3eeb6b29a9fb277cdd8e42aa540ad1dbd7bbbc3d41fc841266af12048ec8be2f0f3010001	\\x1c6245b90730f37407dd7f71e478e1a8b6845b2b3259c9b6835d2342603ce21fea76e0457f1b02c6841cead7b552b188fc7704a52343eaeb06314772995c330b	1665419819000000	1666024619000000	1729096619000000	1823704619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-281	\\x9ef2f85a66c581e30001612a4274358b8c59f6039ec4119a9c944aeda404abdd1e011f501c7e2eb1606cd424f6c365813cf0432d55b1ba6c52021eac324f1360	1	0	\\x0000000100000000008000039e04d2f27cccd6fa69090487559dacfbb1206fc801c6963784f1271478d4034a9b137c6598e9f7e914d27efa8c615fe652faa8e44325ad52de248e50ee527a29ac3d400cec43d17c49a32f45e28db801f0ff7579afe993f10c11bc7bc7a66063824931e13e45fa6c5c2c30eef4b5b7b099ea8b534d5f91f1a1545343c03cdb21010001	\\x172886aa642160d02c48415a29bb50c91a44a833946e3ee98553151b5bc88c8fc025e3aef9f57aaf28b60f6084d6b757fce36d02e5d560da81899e118a5aee06	1675696319000000	1676301119000000	1739373119000000	1833981119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-282	\\x9e7a0dfb952bf2ec7cd80db2e2805aa74edcb58484638de487aa2c0177adb61110cb81e342ac40d2a02aaf6ed95103068b14e1beffda0ddf8370a99a1fbebaff	1	0	\\x000000010000000000800003d4033b8bc5ac912fcf899e6087973cb23806bcbace325f5fe22cc8e8606e6ab624afe737fefe06f29bccf1ab4e6148b684433b50e7a819f6eeb130eb0eed9fec51eccf2fc9896b9552a4ac8f5f73aea801f2718cee219c830bd10ee1a1dac939dcba3558aad910f91971bd1550a25014f9c0431e368fd8b4afe6af5bf4f71cf1010001	\\xb172e0f7b1632c27a6f76bdf5900a1de7e57fabbafa4b6213aa519aafd43e6923307eeffcd614e3740bb7eea18671595aeb6b9bd4f739977e5f7710aa212610c	1653329819000000	1653934619000000	1717006619000000	1811614619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-283	\\xa10ea782893e8c9a836da5e48ad198f30c7ac10102a914fb2d265f1f831e5942a9fb2d466e3cb805a180157a7aedd03f2d1d7944c31aae5d4f9a8df5330156bc	1	0	\\x000000010000000000800003df9b215cd11fdc01711f1c48ff370613ff687b9e9de4c40fcbfeb7efc46b6808af7cfcd6f699650a864f031b1fde01b64cbcb3af7fea03da74f44fb2c2bd79808ab00e8859fff85907fd91dc4f8af273813ad68b5ee87a0dcd29914b944fa009af808529b9719f8eb6f1412c206517139ec1be9a39dbdd60641a94372e54d035010001	\\xc16e1c3a47b9e0eaa6540a7eb2191d83d92d7706362e61266dc8715a6bab87a0b2e13c058ac46e81a76a16cedf7ce7f884d40306b024d2a50c02e3fa6bbf1508	1656956819000000	1657561619000000	1720633619000000	1815241619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-284	\\xa5a6e2e4ba9cbe33aa1a844fa5cbdb07a4990eed80c3ce254d084414f751aebbbe02b66a797bfc54ea11cb35b17527846963f574655a46f1af6ba9643dc15877	1	0	\\x000000010000000000800003c483aa21f4fb79e4ebe3f8d94c6e2db3c12f326fbf0a27231a04b008cf935ba3fa65d053485d031c201a8ca9a656fcb8738782de608514eed8aded790baadae8f7637230a33764c61fe974138061cf4a367890d0587822251df707d614fdf315ffd6f352627f2c03ab8342251e89f0e0e8233e43f1951ba0c792608d8cc2f2c7010001	\\x619f005ef1f9e945a19c938650a8cd63d44b10ac6670acef235cc463936e317fced22cac6d984195c0d815f1caaa680b9bd25e859eac3b0f6c033a21738adc0c	1673882819000000	1674487619000000	1737559619000000	1832167619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-285	\\xa67a4160a6738113ce5915d0eeda79498dde1cb50b0e408ad2a66a464b70fe01adb54232d6e92ee12db9d04505ab7cbf3802da598643bec7865188d60c9e13db	1	0	\\x000000010000000000800003acac20385ab28c5c4eeed27b64874593281ff423a93d4e989b8dea1ce3bdc50cece487a5d574f47ae5d1fa900eb66d7fa37fb265b6cc733ccbbc2ea8249067db88411794fc42b83f5ecef56464379bbf383da63b9d117519d376cb603d7f32725249521f1632d3af90fa3e58afb240740a7a86c0de19e6a646adfbcf5ec6943f010001	\\xf779ab0647eb17b7acc6fd592fa2eea724c5d3606fdfe0d80905b58a37211dfab8c29e29dc3e0425402a81af06a07a8564290ed0e8515df86794efaa04c30409	1657561319000000	1658166119000000	1721238119000000	1815846119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-286	\\xa9fe1d7bc8362335b4fd79c55a5a718448e71b2091cda2632f8dece212d51c5632a1c307081ecbc67fe0f560062f5db450016fd34242b2b9a6920ccbd49c7fcf	1	0	\\x000000010000000000800003cf1ff98a13e11f39beb578940c81caeb9ddd4ea407d6dca9ca3545138366e42cdef31db0aa683feff91ab9a54d96222fe550d6253acf493a2d70dc6407374364c2820b9c95982915860742181fd9c2f418f4ebe1fb7733d923188cc54a5a9834cd3ef5bbe8ff56147068961673f89bfb055e1df84bf401547317ed46b608cbc9010001	\\xf121ec84c120110e3b6e872e664d197def50972873f09ffb1a0700468f2ab14faf30a8a5a0b85ac0f829d36b20218d99af919d3ca22699cf441f3dac8fb67c0e	1673882819000000	1674487619000000	1737559619000000	1832167619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-287	\\xa9b6d1337e775ed9bf413514f21eac8484f1930fad9956c5b64d5b05c24a1a7e7b9311d1b1168081f227a5752c6c33ae1caf9d57067426811c147119f2b8958e	1	0	\\x000000010000000000800003ce3992c4248647ab6829f9f5c08411a134961467c72ea148a03ee25aa2f2b7128437ad3ed081998fa412f404fd895d7230e254781c3ab0bc22611306e2d07d9e12b80a4a90db734df10a274e9911feab69935922a29a0e39ec4f2554a43651616bf63a7140ce1f9e1ad350f94d5d00822c339a80b3fc19e2d5a73a1d337c44b3010001	\\x084ed50a637959765b65ab23f85d1233fb68d935a37cf2cb786e3268dcb020f736e6539e9b1297578bd0b1ef57ac2a713240be83d9a1cd62f0fdc771dbd1b203	1681741319000000	1682346119000000	1745418119000000	1840026119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-288	\\xb4b23d8a20d571f8c9a52755ef188494dbb7b0b0730317275424a8e258076ef56e7cb24ffed147a68f2a8a9dc9a1b20ac8b2f6d965c86d86a105460dd0dfe858	1	0	\\x000000010000000000800003abb4961c7af9a130a77f7a2a7c09a1960550994cb59fe9e6359b54c1346811e5f3cf8775e884849561f1a5318d462130f1531afa801c778193a303baa654ef7ecb3834bd2a7d95b5b2580bde258075c279261a5797e9fc55cf5b391b021c56b81612f4520a47ea8dc4ac98f6f869afe43613c11329a917dd1b839a2e830e1a51010001	\\x56c1bdb60761dd671623e8783ae6ba0d12bfc8c37263b28c79c54dc38ebfc6a11d474e3ef038f9fe49c50787fdc47d9be0e763ac5c207e741555c627c98dec0f	1672673819000000	1673278619000000	1736350619000000	1830958619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-289	\\xb5c6d0db9338070947d9b8bc96b7ecbf7524d291093612881649386a925010cf62172e2c2c24fe8ddaa30e019b127e10aab2f537bf4d17b1dc69308d2a688a7f	1	0	\\x000000010000000000800003c20f891a0280fe995c202d85cda6d182ece2ef9f563ba8520bfadcf5f335075e730e4839c4cff78898de5820e9ce421dc9526e859570d090d15657392f832728a72ae2a25994d9c488efe203d70697cff86335bc844dea3be5abd1e6c1eb49037f3ac0ad2d7254fb94c9db569cc48fa28b672d2c05d3ba076a0fec26a0e8d003010001	\\xad0c21661808b0c9227cb5d7e92051843210d511edcbbfd0244ca75250a55f2550d568f83a8a01590f6a7e2553c014eea530050326646f874108924fb8121509	1656956819000000	1657561619000000	1720633619000000	1815241619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-290	\\xb602dddb76b600aa7bb595fc20cc118b39b1391bfa51cb3e16d130d99f0472631efb43744977bc29db41f326791da85a1a84522cafb03f277be15556a7ccffd8	1	0	\\x000000010000000000800003cb19187fcb8eb92019e003f3e59236a2fde7b0564ffdb32ac030de36f20f8a9d01cd1d109d48198546224cdd094c1fd1dad70228043bfd06dc389245662c0267ab82725aa2db74ac5e856cfbe8957f7f6128c5d698ce4957a61fd003c44ddf61f16d61a35e2b9c7b304581ee03f8021da6bffcc304a6fce3b6f141e982e039bf010001	\\x74e6891e9b625d40f9444a6ffe24c30a0451d053774f54d849843c3496ef01f97fa3a8a628219081c5f5d9ba4f8a978f6ae40f3972a2dd380a969b519d91940d	1652725319000000	1653330119000000	1716402119000000	1811010119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-291	\\xbb1e94d85915b9ed183d70750b80f359892f6d18da95571684a9aa96a043ba2744630e4f1779d50e945532db30d4316db1c55af0b3eb551d6fd10d4301900e05	1	0	\\x000000010000000000800003b06033dad310e338e1150dcfb851eb3d5e9af87aa7492f5ca4ceaae7417515beaf668582db33068041983568b51dcb17111c5969fa40b4965644f7a848b7b46602049510768ae8b5b9cddee513e9709683aa04e0d841aa0b98e6a34c7c5659b2942a36419ced034cc06b475db9d3ee2404872b7152f48c879949b53f64d66af1010001	\\xb134dfea1e47b92c5fbb3063c6bc60d851a2d5899e8b126ae4a7d5b9e626d492f3cbfe78f50d489da76173288fae23b2be1dfa381edad6d2f23521c6eb46d702	1667837819000000	1668442619000000	1731514619000000	1826122619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-292	\\xbc323a446bd8a7c9c05af46ee5abbb5a75525f0b5273f7c825f27c4f9b1935f4f29fcc77729db3df93f5f377f4b890e96a3bd6e6d78dfe7022ebd00dd0ac221e	1	0	\\x000000010000000000800003bd5ffa9b852571c795fa49d8412eb415c03e8c32b0be9bee376538450bb9a79af577de68b3df6be8247b13b5de3a6320025c66e6f655f95aeda4c5e7e91fc70131604ee50cd2ce4c78a8c74fdc27bab3404f1a53431a145cbf34d4fccfe086f0fecbfaf589f7987a6b45c6f883562acd9d861fc0c75e8000c7013b9d8496a3b1010001	\\x172b924d5f51827126f112cebfc578b99a6f071dbf8c8bc2b0052eca7decef144b670d4fc2c5fb6575e21f757d94d3ec5f0f0462eaf9756354f686dd6bf77d07	1664210819000000	1664815619000000	1727887619000000	1822495619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-293	\\xc30a75fe356987ff4e9ab2e654fd8251005650c6238f449489f1c861b61fbc4247e88eb7e3e666cd8117ec7ae1021c58033b85f287eded8a5160758d987f4c40	1	0	\\x000000010000000000800003cbea8d22744aab152bbc6f2149e401febb3eca1222a6af061692c2f939d75bed535b9167f81a1f28cf4a7bc2211bb666d31b1d83936069044e68b4b174dad9ea7bf7061dedb09f71293b554f39e5fbb779a3d92fffb2b52c4e9f107509a5b80eacefb957f9e1c9905d91ad8437af73b8e36146cc9264156c0755bafc7da79bc9010001	\\x052cef04ca365b64ce51e97907f52473adbf7df25ae40f037cdcea90950ee4aff6b460cb77f86375d31f104b9eb6c2c686a9e10401f5b826c2f1a8956b3ded08	1666024319000000	1666629119000000	1729701119000000	1824309119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-294	\\xc5dac36ddc6a632025439b1d7a4b96a929a17380b563b9ab1ae786978a750f9c818279c7422350c2c7028e9aee937a54999ca7bf3be07b75ccb93325d9b1848e	1	0	\\x000000010000000000800003e015202bd8480d261656449cea08b34691e9c9a92e520b5b4f95727b589e16c241fc8b85f52f8126029edf2e4265a0965ad8c6654990d5c10fc8ad10618212ae6c323149de5a68a1ff1c60afe529a45a0d60104e1fab841e3cfbace554e124239ce640e2d07742f3a04e9090656c594e1ec3877e82596e71e7d156a5a25cb8b1010001	\\x9173393b3fedfaaa586edf42a0e83ef22bcf2cb678b2b832f45b3bf3b8ea48709694cc4e882af825c52fa915897754c6ba53d0946781d68a4b9f28c9271e040f	1653329819000000	1653934619000000	1717006619000000	1811614619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-295	\\xc55e31a616233e3eb13bcbb1ae14e5d3f3dec802bde0f49d4a281ae540cbbc974a1459e411efcc342a618281a5dc655f00fbf606082e268854a39e8fceba2d86	1	0	\\x000000010000000000800003c24d1371531f798ca545732d79e970eaaa930e7a574a3d9bac1b5682b8808fcb1cc87dc598be91530b132169375a901d2bc2b9bc01b76bf0dae0ed06566e3b65d76c4e11bb63bc0e07f346073e6867f3dca75dc83592fd5032b4b857f2d4474d5a8c358f2a251f1f8e9fb6b674d928f7c80df76a5da88b449cb6e8d829fb82c7010001	\\xf69b8fd1d17f86853e231bd5878c854b6c6372d05e9b4ffa0d470b665dd30bdce0a5febda8bdabc2536b9cba2e65f2106a67b36334852fc78ea5a1b527141900	1679927819000000	1680532619000000	1743604619000000	1838212619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-296	\\xc6f63c0b3d510ab9f464adad852859308e99b22fe1842ee070262c6a173272f2cd7bd0221d639bdf516e18846a6e380a3cb9d8f8d70302781b4e9ba19dac1eee	1	0	\\x000000010000000000800003ad20d4e099d5b66c0c5eb33c9ae9a06ab3e9ef3cbfecffe056929d07eb6b020a7edae68cb4581fded4f4e64d039b6621df3ddc26e8fcc079a07852292e6c7a5c5d35666a4e2244933928fd5ac658f21b08887e95c5f06dfd37a8cc262116aa19c3814d9d3fb69a4db555dfc47d6d2987e259f1afc1586373d8dca436eccb5e11010001	\\xceb7d3705a347c1462686e2c405196593466b14a64a35dee8a50bec7c4452336236749fedd58ba07d9d36011a3eb7adaf347aff6d20c2693a752a15b78ad5a05	1674487319000000	1675092119000000	1738164119000000	1832772119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-297	\\xc73e7b00b3b81e2ebfc3a74a4102fec10f9ddbb298e5786179f3a57b7102b28396ddb77bfd42f31c9bf9506c070d3b6566f8518afcba641d5340b188011c457d	1	0	\\x000000010000000000800003de59652f486c48a0c3e15f3bee1a009b1a8d73c9bfaa7f20f23d1097f7970fb5f796c0aa4a2eb17597d5b36173c9010bb99ef46c8511fb4bf3c9c02e5b423c857dc344339be2dd0cf8d12a6c36815670256e9955c5c2739058c8747858ea2daf12c8b1f0ad407530fb4b79bdeaea70f9895c5aae3e22069105cb80e5aa7e64e9010001	\\x07fbb8a715d4cd959ff9d1fdf9ba35a050464cb11668e52d18690c802d07610864ae7c58023a69fd670a09eef5a4a74c6ab6c44698be1956feb7b395e3e1df0c	1664210819000000	1664815619000000	1727887619000000	1822495619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-298	\\xc79e42ee5ba9aa1d7d4b533b0d92d7dae70690ac70185b17b8b27c73dccf1b68c4d5d06f6a6b61e326aaee5619c45ae57b9f7b5052767a96f2c755712033c226	1	0	\\x000000010000000000800003bcfe8be21cabcf147b155a8864043fdbcae7f45ff8a5eb00326d302a1eddaaa6f66b4ae3b3ce0309d56f2e8f11b4368b7087eb00747c54c3e46e1dd2830c180dddda62fd8965f2cd79807b66caeb2e3aabfd4caa84d01612993f525396363155f88b5181a64be22864c3e4e2b4ddbf9735de13c56382263ff03566afcf816b75010001	\\xb2bf2f11d0cfb689a1929c8e6eb6dab4d60186d9f72f365da67992b87cdad336b95c3d6c32dccb9780997cece6b4f7af81cc1ea326dfbe005a9fef95aa2e3f01	1672069319000000	1672674119000000	1735746119000000	1830354119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-299	\\xc91679e38d93b0c980f4b9c4170e8d003a062c2d3aef7318d39d536d9f51ea584e69f0a786bf4962e01e51761543c3fd09bb1e08a7b6d55d6566f5119876915c	1	0	\\x00000001000000000080000394168a7c5bfb14ba39a66ea050b0b17375bce5e2df2ad1900773617d57c3c39759ca13e2aef7ec6105c760932d1cf7adce0b9904958ad1b19418bf968fa1884b68e12e555582a0481eb5903e894613f700ca14aa2c4e6a204d825afe08d1fdd8a0a0741f02113f6d6f5df53249bed1f357fc2302f7eb3240238f0fa543e7a9d7010001	\\xaeb02f7b9f80f1c6e88161a1904e5b8afdc4905ad76d33a575d05e092bc01db4cd078ea63686b8583d67ea3b03b75589f5caf763cfa7c0754e85f2e26dd95f05	1682345819000000	1682950619000000	1746022619000000	1840630619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-300	\\xca42ffed5e93e816ceda5f61f730ba0fe16e5515f3ac23b395c0e6e2c19cbcb57c14f026bc7535f9b0c685c3cfc55a1466675499fe15a7064657a5b1cf207147	1	0	\\x000000010000000000800003ed3d962d37f4ca7898a0fa3ec66a352d21b6544c66f96d6ae7a5b7cbc4d13976f211c3244b6d27e3b0bac7cae566b66b35ddd36e81b1f4c50650958d85163e39daf8c031a5824dd28645c090a5802c357a057e1318d27474cbe02a5a26ec57bda09617289f1f9dbdb082b5411e0d06899ba15800c0f71d5f1ace1aa90543f45b010001	\\x7bbd528308464e587bde3201ddb7633e18553130b7f08d5f5a1c987d522bb035f61988ce122f7ce5b4d4b04ce27600bbcc16dc0426e5a1fc377269e5fe314d0b	1672069319000000	1672674119000000	1735746119000000	1830354119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-301	\\xccce63f0671e01d75db2a08da9bb5362dae3532b3d10ed90beedea3b3bc5438c250f583026675f37707de28c05377f48e7f9322e02c4876afc51cc89a1f488ba	1	0	\\x000000010000000000800003a864f161f70b56b6fd8a34fffe7fba0b6c920eacee20771a3a17e15ea236cc659e79cb56e4ca02400a458b834d49d80aecb3d0f5be031eac054e76e040605f3489eb18d7d1739dfdf4c2d63df3ea8ff0244cce1b1cd914ee83d6ee887d81cc5407d906bdf5c3f5be289a3f06c287abbdd994bbd93525de1450b96e3564137b0f010001	\\x7fdfddbe5b93cf907ed37ab860ef1e7c82bc83dcbe0ceb00170399d1b195c85d7eed98308971570e4e3ceef7175b1a721f47ede2a190a5ca3e51c30a34def606	1658770319000000	1659375119000000	1722447119000000	1817055119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-302	\\xd0f6902a6cea07fcc57e78dfe1c1ee7294274af10262602f2f5e11595c7f345e02b9ffa1e30fc28f25d0ea9d076f21eca601966a0e2ee26f47712db1207b9136	1	0	\\x0000000100000000008000039b64fdccefc3f56676d0af98a8e12881870b5b44184fe42b50b18367f99d911cab201593f5d81944682994239f36a300222bd229156a854c953cce522b8902fd6f002f9eb50c176d34d9f64a33cf73b1ff46e20ed70d3d8b4931c396797982189fcecfc9605dd394aa092199ecf59090b306404f92dbeb8c8b883817a5498079010001	\\x43df8c5d993eaaee32325559beabc8982c9048da3e7b7bffb51b04f713f15cb164c39ebbbac96eec40fd8e37da8e4d6a3e087030185d952e082f921ece79be0b	1660583819000000	1661188619000000	1724260619000000	1818868619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-303	\\xd016f8fb205ebb2fe1a996864828efc74ce59e0ca8e862706f2ebc3e188ae94ed1ea2d34cdc77e151d66d428e167e5e4cfa15120861345ac447a0452dd01dccf	1	0	\\x000000010000000000800003a99ac3cdb9494ebdf2cc7c20e301991144e2486a4c1dda4aaedda79e4c44ef04d969bda4c1c31e2f47a2c71b3592b5544b567b54cfb3db5086508dd7577c4775daefa383e8b87b47f6c2cccf26c7076d3da7f85839776bf6b4fb752c0d3712945b7f35a15605ec617913bb3f8c9efe44c06b595bb9c5b1319edc34430720e983010001	\\x38b3b599392f39ee958e323e2ae4c60bda170c2a26c193b0f14a76f2da94f12d217af807984a36b87e9c4a35bab9eb16bf74375a09b0f43426994513bacffb0c	1672069319000000	1672674119000000	1735746119000000	1830354119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-304	\\xd25e8c3830e4089bde3423b3eae5e57accf438886c4cb93576f2178fe4e98183605cbc58881571e824762f4478747acdc13797e6383c8e9c9426f107edc13f45	1	0	\\x000000010000000000800003c4e62149340fe58f7c62b61450cb413a199bb9d7f4bc76eb77bd906b54cd6f7d19bd34b53ef2a1319c5b74e8908884dd48f5490657d7fc1fef1b8fe7dc773656f8d0b034b59e34a90dd3a44cf7f0b7a49d463646412ba27185985f647b74f1fed78243e4050b477a87b13f19a0b13409ec25c72b8bb872021f4568dac2c920d1010001	\\x334e020764e17fa80b3e6eedce531fbe42b668a438e21803aacf2aa99d97f0e159b452539ddbdabebc0929f966cce873d3cfd2faa0b06ad9ed6ad9a457839901	1658770319000000	1659375119000000	1722447119000000	1817055119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-305	\\xd83a336a4270f770fdcec90af9d609b06dd0b00520c36d403400b0a4db994fd594d4140830bce477f2334fd97c226521f4e87f69395ed843c07415a0cb5ad30d	1	0	\\x000000010000000000800003adc41944963e1a29ff810023aa2f8bad05dba596c936ff752e82b67228bca574fdb554f2b19bbbe3a12b7a6e7fce61bdda09568c8c67c9ab54f761b83970b4a1a44743fef3419622570ec2f8312f3a62d581697dc66fb4785a914ebcb1439759bb4041ec5c098cc82a755a0c2c7eb9873da1e40dd5625ed945666f711632e8a7010001	\\x2bcd86f16a27be5f99752e2a58db48e599038ce6809eecaa615c2cbb57b59b968ad9eb70e8519d3837ab1b3635c8e291ea6ace81dfdcd967c4a25e198b12e50a	1670255819000000	1670860619000000	1733932619000000	1828540619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-306	\\xda16bff8c0283942163464d324816260b55de0cdb3e1e58286c55fa20a4546389166d6f5ad382caa9c078a33ace3888969b1d1fae465298b61399551a1489fd9	1	0	\\x000000010000000000800003cf5d5410d81ffbba526f11946e1c65495c83fa1dfbccfc9983d5ce3754dd50a4553630f542c14125c909dc34f21f5916ff9b370012bc3145c130d1ce7d09ff83c232f30952da458a999811a65b9ebf594af0193cdb416b2871116e38590557a8fb24d237d3b8d4cf8e50bf149edb80bb9d2798778a18f27e44eec9bcbb134113010001	\\x2b621713b32740fcd96704116ad17aab88abee832c92c4642f525ffd596431d6ba6c08bcadc75ed9eca31a21d21b668371026c416c6b80a4d045e2b975fc2b09	1661792819000000	1662397619000000	1725469619000000	1820077619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-307	\\xdc4aea9eaf38aebed2e2d479392b62f54ca29fe0e8e30840eea6887e776cd6a0c065754b4eb85e65074e71fe32297c1f3378251b2a93353e62344c65f4dc3a6e	1	0	\\x000000010000000000800003b9a959390f0a6ea9ac831772cd8f77a567ae5ec5c3097f59532ef67be96a4c7ea5ca68b28ff870230b771d1aee4e7902f1d030dc7d205f9b28bb6fafac56dc65ecc49097bb9696570f7196c3e2acd720e50417380bd5fc9f3984084ee3d87b97092b46cdfefe22114cb5d6d3f4930fdbbc02a68649e8a0bdbf1f3c47813ec713010001	\\xb190a33bbf499aebc2dadb0419458d61b60e7996671fed580c0c9f5de715c197c097f8eb4600929c5bd26102ad67fc4a472c113edb9bf122751c67feea25100e	1667837819000000	1668442619000000	1731514619000000	1826122619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-308	\\xdefa16491d00b2fd8d5749e9f707ba5572ce22becf24f6d281cb421e098a53dfc06b05111e685e4e5ec454040189d020d8048a5c050a443dc1bcac1a0eb3f383	1	0	\\x000000010000000000800003df1f99102e80884b5079429a20c7c887ccdd0a147947ca3c2028ae9d031ad4601c5bc9da3762ee99241137fdbd09783c3455f7e37687bdfe5811b35017bb250b029ae9f42d346924cc1f91dbbfa511586d83e1ccdf9d0d2434fd6b9bcecc7b48f010421d58a09fe0b9a155c053d9d5d35f6354772f212ceb56e29f4c735c4385010001	\\x0c44a2c8b3bf7f9f78802e39ba094ec3b39efb7200979dc3e4006d248d8c046cb62e686fc322220842521aa969dda5c5cfbc757ac2189c38d6a8ba15437b540d	1665419819000000	1666024619000000	1729096619000000	1823704619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-309	\\xdfcee49d03108993d27b72ec87f1fa4c86e9355b4bd17d659fa0dcfe80e1a7f24a1075059e75d2a6bc5a35283cbf132cb827efa8015aceded7ebe65f49b6883f	1	0	\\x000000010000000000800003bfb37e852826bcd27a1db4419e0ae2efa5f26e4a211d1b4d66cb99c129e4f2ae2428da907b3aa5d6a4a4ede9b02c08ce724d8711fcd60f08a77dca58a5a7ef37b8ba459159b5d4dc7f98035dca6c6ce8f4bfc0b1e2a8960ed8cdcb588539d81a9ce6a17284b6d803523f182549a127110b24b5326650a7441349afd20761b6bd010001	\\x7ee4c1cb3a7d2ea412811561763198d8daa48a128ad8a501e4788f22d3a858e04481991e7686aa98b6f825571bd3bc4d966f7d689ff536b97a03f9ff5eb05709	1675696319000000	1676301119000000	1739373119000000	1833981119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-310	\\xe0ae8045db5fee329e26dc10d9bd7b51ced3e756837e60a7964c53def68110a5026f12f1c24cd5f8f6dbcaf5744fd97d1d662dd14c227978a7891fca6a8c3d42	1	0	\\x000000010000000000800003aaef47f46e033c235e23199958fc54ce168a89a9376d3903629b49af4cc15550c7c737a0e3f18e84c367b79d5978fc87750b752170bd102574642c621db1f79d0f7340ad4dd76a428aedb5ec8fde4ea5e391b7b93d7b77ac9d3fec6f60c2281ce3db7d648fba247596542aba1371b4bc780195390381dd19bfd8efa17fc94b43010001	\\x54a08fd12d70dfbc000d4cd0580a0fa3bd994e5c44367f0d8edb1af40d0d4b5cfdaf011d67dec954b4f013483c9dab5488047f25816892cc60aee11733132c01	1669651319000000	1670256119000000	1733328119000000	1827936119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-311	\\xe1b641206e38d07238d70a48cd2d2da84ff1714cb6b567af7dc84674cbc81dd7ba932bb4581aff433377e1b0c8040bad1ce1c35436e2ca571da0de731fa1f9bc	1	0	\\x000000010000000000800003df400f9bb9ae8183993fbbd4e3f9cb5476733a070423eb61c6b0aedc1662c3320375d1aa5a7cf00795ab9891fba94bd37c3cec179c03a433ebd15947ce77535cc7940c61d17f1de0b9283c7bba43372074c886585cbb988cff0c26ee3b92ee6b04433ada451bf3e592be36c7893e278f6dc1a92ffdc64abe6986a1f8c3e87059010001	\\x8bbd201fdc093846fbf09792b53ff48224e9688858b9c76728e7b410ecddc4d5329a1777a784fb9761c0fcd90bb4954a4ec043d29c2e36519e48f86f14693105	1675091819000000	1675696619000000	1738768619000000	1833376619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-312	\\xe25aa621b50d6c0a92eb58908bbeef6a600128bf41af6454198d057df8feced2d41e740a3b386e5bcbb1367d497d5903c8d47498e6f9bc8bf65fde49c7846d9c	1	0	\\x000000010000000000800003b2b3af39488da837bc45ca9d996c45ec25aa05efb54a2f204c21600a8e00e69bcc894f18144861833fcf60f213d0b4ebe23832eb4ad7fd53f32e0f29b075a6ed17253e5ad747d7ece442312074423e27d7e3a5b165a355ec1684f0f00ddb21998a57d11b9abe7c2a842c7b806847aa1f420f8a6d4f705715438a6b5fd2a8ef21010001	\\xf701c27fe524332325dc5eb52d890060384956870705a7f85b58d885e3947eeb2aa9f5109b7a02e373e8efeaac1b16d4eda07e9c27494c7590812758e68b680f	1682345819000000	1682950619000000	1746022619000000	1840630619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-313	\\xe9826842488b0e14a74a5de84d9a013efc0f18e1e4992a96c12fa7d4422cd2e417ca7c5315d744e75426106411d19909893f75df699df22d117719498e634723	1	0	\\x000000010000000000800003e1c27e8d030d5d109d6bc27709cd4bc0ed05adb8bc64a50bfa37d69a457e927484fb9065e1eee4f140b12f0633aed7b660ac9aff0ac2e4c7a5c8ecb388cda47f4d043ae6b01ba43505cbedb76efda274666bf8e28f3ecb1d5a30dbd994bc48ca668d2cb4329ba047108e6daeb52e137be06c568090f7b83ae1cc6469fa059079010001	\\x9f918c9cf3f88898d583fccd2b3aad40296ce75c7a70f1d5cef626629f9cf2ab22abd92bc258486874006c5623f23306e59a11042716493164485fe1e6133d03	1669046819000000	1669651619000000	1732723619000000	1827331619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-314	\\xeb620dc7f0fad4be77ee8daac4bef8519bf3232f82d04d0009404b44132bf9cda8651a5c8a87e33c8c06b1181706053ea360536662b66bafee68a28c8cb134c2	1	0	\\x000000010000000000800003c415069241d013a9ae37155ece69e5347ab2f4f85c97338cea1f99c9448e5a1a5220229087a9dc42ace5716c4d99c977d6f4d9adbc8a700a07ffbeac1c28ee5a4d66be3e53232e9edd546c9491d87a5a148cabf522832386ef45977fd050e58cc6381412d815f842f6f66e7761eda58f762cd2fa9f67f34d6302b5bfad4d817f010001	\\x09539a98017a5435fdda257c738193c83ae69fcda6280dbf1f5d553eb121964d4b868e2a8e98711509bca35860b497364ff5d67534eb42838d52c29e7f951302	1673278319000000	1673883119000000	1736955119000000	1831563119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-315	\\xebd6330ab260849cfdfac777989b5936de69ec25cb2d27560210d0872aee87dcce263792da29f1a649e72216bed324f85fa30e3612f1e6ce3d9652050bbcd858	1	0	\\x000000010000000000800003b3e034294baa150178565ac9cebece0450320de80f6f45219a0c0dd7cde6d46eedc38b4430c8a1b1d3c2e7ab0ca55382a77af3a329d334b42cc5f937968c1aba1cc4143b1a28d23ac44d4a58dbb0b1833b40b2dc2d2ba2daea113cf954a4c0f42772f56a856fcc0c2927dfce9c7e8503e1d37c965fa3971bff9d0d113093a26f010001	\\xcb4365663ac0215a23afed4acb829d0763e94029d226fc0db8523e307b547051c6a30d81af1083029edefe7cc3b589deeeb9840b6390341c4877a41ef767ab05	1672069319000000	1672674119000000	1735746119000000	1830354119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-316	\\xecee5eb0766a33614a550915d6c443986f4059e92ce5100caf9488eca0eefbffde261fe078b2c06d35fc72dc9f42a9e36c988ce8dca461dd23b21cffe0812dc9	1	0	\\x000000010000000000800003c77808d2e0e55aff4805aeda24acbb9c7690bfc46e52cc82d6b68886d3b3718ef81b67aaeba4c75412018ddb777319981461fb34e0cab54d5f8caa72793c249422d5dbb37544b8e641afb1e5fb38c9508eaefa40933dd34d27f1fe96e02ab657843ac1646ffd0cf1fe86ee2320c9b5c33cedb8d4b9cb0d9734c22bd631ba45c3010001	\\x4e96be1ce571aad53dead5b8545b16b3a04098a6321e2c262fc176e1877d9f1ac481831acb42facf308596e1140d51cad7ec973db78bed227228423a9e02e803	1679323319000000	1679928119000000	1743000119000000	1837608119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-317	\\xef0accdd206d342d2ada1cd09a7e9a18c60a5cece41428855c0e8390837bdbf277ce5df3a7226973e87f270b6dcf2876086f1417133d48b2b0662ab3b3a091d4	1	0	\\x000000010000000000800003ca07357d5a7e90490082bec7d1511def81eeabbd94b1e2dfaa4496f01b4f216ee3bd2446e445af292f7f402da70bda19b1f76cfa4bf3f922183d024504e554dec32ff59a88c9d274942fbc68d9641af313a3879b3571ee03d9b4a11e1aa76e525ce14dd434eb55b004083062f01001ab02885fa81b0c39e94dea7923cd197137010001	\\x418f8b0b371891ad1d0fc00a5d9449d20c4a6fd43b826a69a20ea33dc6ab9ee7979e53deccb62ca4a012f09f8c17afa0d9c462d91d7c795e90eb97ff416d7e0f	1666024319000000	1666629119000000	1729701119000000	1824309119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-318	\\xf2aac63ffb6426719842cfcc52b07603742eecee74e0dfc459519dfac8af14093007ed7df5362fd8ee75eecdd4bb1fa4e741cdce47a159093375c974d1aa2462	1	0	\\x0000000100000000008000039afeefea234e8d08d6417d868cff8ee4a591bc775a78ad4e1627b812ca0cf6896dc71ce74e2f924422d2282d7da19120fca5fb89944de4dadd92dba079a63835c9359dea90a2bbfb8d6855b61d55feb85482ca05ac8f5f248f2bfceb7ac9245ca2f88930c8c1a55cb31cc39add06a45f72380c86f0f506c93a8cc040c284c191010001	\\xf027e4493b9e0c4408e9ef9c7272588cdea24ac0c5a7098bc43db33609c87da5ad2d059eea8dcbd5600dfd3fae862ab5eec9fb039ba38e0142db11234395fa02	1682345819000000	1682950619000000	1746022619000000	1840630619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-319	\\xf2a264c9d35a81218202774b0a32df9dc024f6acef60ac70d97babdff79a86ceec72819d2502bfc82690ce1babc0af884139e2305684a4c7a0a275b2ca85dc09	1	0	\\x000000010000000000800003b60f6115fe811c31f382e8f445f6238fd9ba902ab88b31453ee49a69db88639b2b89c2589d11d3183df5535e06c85184b23ed8cdfb4d7c1419e8dd0c33e8eb35ac2bc98a2a255231b9c3036795666e02683d4fad1726d2be896fef2df1ad84e29e11108b1b365e6fff047de9afb23bdb26ed98a6d5019c578a7c80a7b22a24ad010001	\\x0507daf7abf6180e7c29e3943bd732590ef9f96582daee138712f8430869c56d7db86704a88cc59b6a9f9598a88a355b15737333a6cdae2f690beae0eb1f4b02	1667837819000000	1668442619000000	1731514619000000	1826122619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-320	\\xf2fabfe849cb8dd16a3eed085dc72d9bde8d6635c09eab3801303116a7a053364e58daadf8763cdb98019a377ea483c7ef454775ee46b8e22624ba1224e1d902	1	0	\\x000000010000000000800003a3eec4fd1328ae6b50477e9d229d93a3bb15231afafcc583d953862769bd80f1e3f915ada1395c68fb6264c25832837cad44a32eafe071312283cb8fecef7f9d76779b8eefc5ac516004792625ee9a7b84e1df096de7c52abb0899471b4e61c60d7db9fb1d089be5fdce70deb8f16f50efcc143b92231d665750587189bb0081010001	\\x03e3c2d3d3f76ce5b38a7f02cb3664fa031dc53ff0e96e24e92a0c07b5390160177f638ff8d7b16a7599dab71cd696c40c7d2ee5cf2a7db6fe1cac337915bb0d	1673882819000000	1674487619000000	1737559619000000	1832167619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-321	\\xf9169b68e69183209db4b36582fa7c11580b9fcb2c6e7da4ca6da22e6d9068cc2f1ea30961f9fcb5c1db0899aa1099bff69b76ac7ef2b5bf6fffd82823c7a428	1	0	\\x000000010000000000800003c3f64966b6bbf4eb0821c5398ea3ce6b839536993254b9a15f24b4032c2350a166232563e65bd11e74910630867ddd463c90620adcde7689a02932e20fc69df49bdf59934724480afb0ff558e74159d93a44b7d7c3c4f1364b5aa3466c77648e5de88d1ba93fa570fcda1c2705ad625ad06530d69ef030495f48e5ca03bc6ec9010001	\\x98328d3edd84c0fe14c1ac2b70af6e4e307d8b2a55c26b4fc900773e2500a606b894ae9ce96608ab3fe20afc0239717b93a510d2379719ca0b5fa5e88d38e90e	1667837819000000	1668442619000000	1731514619000000	1826122619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-322	\\xfbeaa79e63398b1f907379dfb576a95eaaef3f58aa97c2327fbae5a3b14a3e2cdb6006a96a93bab5980d01c2c0aa1cb9a1e97f1a4d1d762e570041a169210d89	1	0	\\x000000010000000000800003a514374670a4a69a66fa433176ea5b9dc832e0d32bfba691dabdb277fffd67b31fbe50717a1f345bd6433038a44bfd70f5d3f10534cbbf04d03f7f6487ad88d34f2d4fc1d2f1b087e6e95ac822afbd354ee95c88428f694bec5b837b705b8e653a0040ed799195ec819fa2e9c3fe65aab5b591719fe88b4d540d1ab114f21287010001	\\xed8d3a6d3185588c00832a06102525ce2ad58c4521800afb91bc4298aaaf686990aeda94561ba1878eaa42017b59e39a4a1951e6616a17ae7596b143da200b03	1668442319000000	1669047119000000	1732119119000000	1826727119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-323	\\xfd567e8073169ef94149a62a211afeebb3637561a8323362683cff3d3869c020aa30ec07fab06e1825bfbbde7b8e81e6e8b587e15da081bc43c68d3902527ef2	1	0	\\x000000010000000000800003c05f73ce2e092f5a7930c2e9104e01404f973742028082cbf82ec4b02df1603e306e5a7eaa272303da2040944a525e0a4e901c0ef9ca4a4f9beda2c57be6f1a9aaf8514543133f2f2311112e7eabf8a6167af2bb9f90b8a3cb3c07fdd5175cec322bb47dbde3d605f572ccfa5482fd7362ae9cce202e8e8fd92d6a0a8190fb4b010001	\\x0ec0f0d734066e62d51fb6ae2b6b051964f66f7869ac98d06800ceb0ff0ddecbf6c053debcf69f1e2ae7e36e77bd5f2fa1ab2c8a4f5ee87dbc032e3b1a66270a	1653934319000000	1654539119000000	1717611119000000	1812219119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-324	\\xfe6e894bc1b603c7b8fa44204c8facf7a084973779d0bfc643759550bc9f7611c706991fb1b1c0361f6b12270b273c50a2248712991d449184acfa6fd08806b4	1	0	\\x000000010000000000800003d2e299b5245ba6a89468142bf3566d8c855881157dae14f0b6a91caeb8f2907fbe2a51a31a1d173e0639f443d9e2cbfcaf25bd12e1494cd30edaaf8708084a789421680490006ee8c1fb49d783bd1c3ed4a120e479677a86536bcaea73dd795118ea8cd2da786608fc39d26f4345f6af9c2f71bd6cf71d5e9d2e880b63781f2d010001	\\xab57a605ecc44c028e927b33503a0c40c75c63e5e96b096f5263cb5237f0f483ee9c8c28d35d1c3fbcece2a50526a37a9c3b1321946b80b6df4c9b3c5f215a0e	1672673819000000	1673278619000000	1736350619000000	1830958619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-325	\\xff661c7df8f7d08ae80b7867d1de5b1584cdc95db0e1164c5f370524e0dc4b16efe122e3843adb69fc5995863b6439cce4cb0f060ffc2c6e5f23576acec8a44d	1	0	\\x000000010000000000800003bccbab6980339fd54c42a94bf1a090980808a32a30cc0e64363e89ddd43ef2e4e45d3a45fa0cf5ea364a05c253a65848b4eb67fc8763715d9307b5cef4fe25326d97a77f5354a8a32e55e16738eca5b79d027103ac339aa487b675ad2f4c1a67c5296bf13da0c867092b094ecf9ea2f1637f3ae3e4f98671806e372fb852652f010001	\\x9c4eb9a5a2dfd1ee573e8c2e3295353be92ba7d69fd8d122806293e6e6aada75919f87a2ea599a9af66c748896555b1262f6b3e450acf853328a6426893a3608	1667233319000000	1667838119000000	1730910119000000	1825518119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-326	\\xff0a6a8bce010f1590fe04929e9ff14c6f28ef65ba34882d43db2d99e0b96c16d4b7e39793081ed4f4cb4d217dd8db92332924f72033c7d6ce42183392205b63	1	0	\\x000000010000000000800003cf494d4f70ab0e830a16d7ac0fff2f3504cf833a51322df36f9bef61d2ab53d63a742397cb8a6c6a6f94f5d6aba896a21109d2fa9f65a5a029b92b65dedbaf7c617c9f084c2b5d53e0b5303bfcfa7046bcfb901fd67ad9d1200161541342565b98bf4161904a9e2e646598c3c06ad28cc857211f9953ae3edee4ce821cb58ed5010001	\\xa3153be029f1715bbbb70c69f69bf346aeb06d051f8168a46c0d77dbfec9028ccc9a39b3b30a27f1a8650aedcd5d4228395508733eab0c7f239a24128069ca0c	1652120819000000	1652725619000000	1715797619000000	1810405619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-327	\\x004f5438fdfdb96647c3e3a8f73e921c139dd76aec08cfac950a42915e72cb44435d33677f6c45e269441dcf818495d61f8c47b76459d05535fbba9a9eeecb1b	1	0	\\x000000010000000000800003cd146b6a78ca28dc93c360cc9395086375b379bbdde052baddc70b96b3b0810d8170c780f93fd120a81926ccaca462b2fc78c26ed6b4159f81968ed663500e18810e01c4e666b93c9c8c2ece35175259a7fa617a90664fc55294b5992c04c9e241395f51fcf2562f66c937fc39dbebd4517d094a8d42cceacfb75a2baa040ee5010001	\\xdcc1ec7c894ba1103876cd45f97947415f74b424922b09a0c6ed5dfb7aee5a9501fa2b43e9aa7c6ecff07d1f26e3c37bd39bdb6355c3e409e8394dd554bbb009	1676905319000000	1677510119000000	1740582119000000	1835190119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-328	\\x0517bb95b448fc3bce9d65aa441a33f9edf06bcc074a44780e8d68051310013d23becc5a30a17327a9f3e3d063a7f26547e33de5330ec624fd07b39aa5d0a2df	1	0	\\x000000010000000000800003e2870ea61ae660d75fa7bafe3fcfdd6fc4e659ec15f76beaa207b8b9714e6b8b8f1ee69ea2af2bb7fc7cfb00e3e4a9950cfea035033bc720a30540d5208bb90f450bd2d3b95daf11694d56356b2340ba2a693ce8d8462ac5a1f519e4c1323897a5fd965212288fb62213b17e68eb5b554485f55f81186552f24b1d5bb183a581010001	\\xe2dc8116fe67a6378323783fc4ec55c3bcd1fbeb0a220689a7f987228789a7b8c896656bcf00ec24e8ef53b0653600307199bb6f9059c926a7d13f9add92d801	1659374819000000	1659979619000000	1723051619000000	1817659619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-329	\\x06abd5184f07a2886f95cfe46a18860ff98789114c6ddfbc6c798c818afac8d8ba712cf941049e103308f14cb1a9f71fa53edb5fe6587ec4fdd0ffb21bac8a60	1	0	\\x000000010000000000800003cdd17a399ce51c8553661d1ed2002a37138d87d7372df312184f33067cf0ae09e285ebb68b2dcd59f37954732d73c2b3fe2b7457b81c0b3c1ba146c77284f5e32778c1d2846a8cbef468586a63af46041bceee1a2809361da66e109eac9a9e70a20da3eb968b5153f38b3826a44cf9c115712d6348fb4d0b940583151fe6480f010001	\\x9052d729f14aec93d3e6610218bbd48ca52807c0eb7ae720facd4ebc45236690ba09f2431101e5d480838ba00e5c58f0c70b34049819cb5069ba83f0f0551c02	1661792819000000	1662397619000000	1725469619000000	1820077619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-330	\\x0693d4d65dfbf7c64f11acec3d735072fd8aae7fc27eee088dd4417ada668207ce04f257172d58ff834d613a195a61265caa9d90c192d81405357622c0b549d0	1	0	\\x000000010000000000800003c520b9915c54f4418359f46bd144d1c4d6fcb4a5c4260943872df62f8c0b4c3036f948ef7177e109b8475c8441995e6aff9f36e7d4375362f8ce9c21ea9f77c08d3ce17b38e561cf21512c91b5f83b43a96dce36fa434e58ae9d7e03019a9d4e06217d08535ed4910a43f3e7b42a372a2fea821d5cd6310c7a08abe028e903e1010001	\\x726918bdecea8642f7d6966b775976a5eda276fbbc24376106eec77746be7106fea21eb59e66c0b9ff63dc8503671b02bb538839acc7fcfedc703958f8029d0d	1664210819000000	1664815619000000	1727887619000000	1822495619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-331	\\x07f72dfd048e4d1c17ad4b6b03e25736aceb3d9e140822e2c0162871a418c857cddbc854dfa705d58df8e84989ca76eedaacf94879ba06cd25faa7a8e3343f81	1	0	\\x000000010000000000800003d5c0fb1ef348e892643f145080637c3df23be746e90233fe03b41fcbba66c1a0bf1ed8c44ebb74ba267978d0dabd06aff5986dc0fa86e88e61a1376f8157193837804ca1770c2aa6cbcbad84330a81505736adeda8bbfa0f9919a8f98a7f4991717e43208aa41ed22d092f446ee801f614b4f48d89938ab164c7a8ba32cddf6f010001	\\x20da8d06845901aab6882f3ba26cc7a29e8d29a031395d86b078253d8cd236d53b7ba1372898773cf6a4e7068f8a22145bca58dd492a3264698d3672e3d0140b	1659979319000000	1660584119000000	1723656119000000	1818264119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-332	\\x07338f495d6f6405ad06b9e30012f376676956e921078c4342f7125a321ff49cde51c234dba8a7475f17bade420860506a06d928bf6678242ff674ea967c5067	1	0	\\x000000010000000000800003ddd35bcee34426de809d037515c82a7fee817082d61498af1546de56335ced2384260bca8801320f40b7b237a1a8fb986cc223126b46a684d42f553a0af7b4eba57dec4a34c5bafb0e67e69b8c102e9e3bb254ced5cebef30d009dc265e23d1b05a4c63d9a54fa33d79a9fc4810b18594d625d9155e51222747486440e4fa6df010001	\\xa2803d3074bc2b8dac4382cceef1798fbd625b69820c4c115abbc03e76f80cadb543d2d58bad5cf5939bc63ae352a856414267fd0dc0fe086a14ccb423926b07	1679323319000000	1679928119000000	1743000119000000	1837608119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-333	\\x085722428e87df5d693b357677a6379cf66853416b002d435cca34866754f5e6a19b2a848e98cc4138c017c33c227ffd01eb5230ff32463f8e728a7a8dc5acba	1	0	\\x000000010000000000800003b811e8a2f71d185aff315f6ad70986fa7abbc9970a8e2e7118095258a421202358ca6fa0c732809ef78c99b39c407ce453878ef857335730ab581bf07c9127b4defafb3c303a14be7df7e2db3ad1220bace50bf6b7305253de77c64c39ce2a8fb640064be25c5694a5ef57c5fbdeb27841f6b8da11855e24c523bbd135a41715010001	\\x446536cbc0d999e41fdbeae4f5204ec63e0c6f9947bc2658f2480749d33c8151154d185425dd355803cbd43097969e8394f13e1d0887a9fbd089e2a55fd6bf0e	1662397319000000	1663002119000000	1726074119000000	1820682119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-334	\\x0bf33f0672bccc8718a12bbdc98e7ca3c5bda8598c9467fe9263b1ef4949991df4f4c172cf6d1b55319cb432cae14b479a5225c817830b2ce54f4c257963a4cf	1	0	\\x000000010000000000800003e8b05b105cb144229128d45c33d2bc253d9f5177c40f2570495f2ce0f7ef649838229b1857685b927972078993dd6ed21693d4d63f5b7de9338074519b8e5c18a4e24ce64c43fa8c7e87ee20f476e567f07caa2c690eea12aa709506f2dbc8e8ae012709edf2dbfd5b7c021d437078294b6e9c169ea48adf20ff97ef9ac311bb010001	\\xe8e32d15c099a93504ba5560d89ede884dd6baa3267a216d38dc003ad4bbebc2a8504cda787f0f138e674cea3270523b43a8efdb270f3d37b53d30f658761d0f	1681136819000000	1681741619000000	1744813619000000	1839421619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-335	\\x0eb799dc73be225ed9942a0a532cb59d9fe3c5d88af660cf6a57d4271d13dec0c04700b03ecac6a213761d435f3571e7729f3b28076d6c06e2b5c3eda693c893	1	0	\\x000000010000000000800003d99fd9b3401086f5223dfa5979e027f60a3203d33bd327b610fe9ef607d7e70bbdb8469dcc11b72c8e993e20264f547f09525cd3ed3d456e602bacac277ff2c5ccf66f221b9a6681d9be8afabe9b8dedfcc6748cfb98a4e3ca2f421dd93d97bd198aecf029124a84b7a723ec8364b9545328520a199871b0be44d00985e1cd23010001	\\xc291b57145816a19ba7f3a4add326ee769323ab38f675066f0f344682fbea795dba79e88f5dfab4ea344910b70f39b8ec8bb78f28b94f90e8a6c912b11fe7d0f	1681136819000000	1681741619000000	1744813619000000	1839421619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-336	\\x0f43ad248e7460eb6228e887cbec70f48381d8252638a384a34383f40d7b0d5ea1614b78ab3b4822cf32ba7cd5de052d3c73e0d66cafb802888dff9cabf29510	1	0	\\x000000010000000000800003b9f5202b423e434e7468b49aaa234a5a375571504094f991d464b58afcc1110ebc0384903adfd76d01099aefc1a05662be7f39921aec4afdac52a94bd8cf4242d65e5b7d6919493c762c40040a67417b9c5c62fdf80a50d8dd65ca3fafa292fa47ac988ed30ff1c4fceca71d4a47dcb65252552f9b12a6f375214dd67bbd45d3010001	\\x4fb94d02ebc5c0cbe66e1aa52683d5c175e1d5a320953a69f66c82b012b52977f583e8ceb553294db51b7cf039eb186def4eb9c0ed305c67797165e19275d50f	1653934319000000	1654539119000000	1717611119000000	1812219119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-337	\\x0f4fb2115855ce441054018a0a4c35c19b798f6c55c326caae17171721827d159f22f7288916bb24f0f638299c176c4db3ee596a83567497cf6f20023e6f7c12	1	0	\\x000000010000000000800003cce31f67f1df36b73859dd7d8dab592edcc53ec1d074d10118ae4defb1efc48cb1c0d78d3f67c1f06e46b7ec86e5ec357ec6a66b029a5a2f6e0a7b505eeac9819e11e383fb622cfbfb70149c4476e343366785a829a6b6754dbdb4c94c7261f8c10f81e91867199df332d97f4ca707cae6b1c95bcf140dc7d8c44dc8f784d683010001	\\x5ee1e33702940e4ff7ab97a9ef89c1be033d91f63dc54386cf63f2724c30ff8f4e5ff1b0a854275a41d23b45d20015827451ed316f31e28a306c13db71312f0e	1679323319000000	1679928119000000	1743000119000000	1837608119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-338	\\x0f238369fd0de904c21fb6086b946b62e4bb9e10aff8bfea09895f9440f3bc3b3a0afc08a8b659f6079d5a99da6ef114553951c841db53adf9fe0155b12efd95	1	0	\\x000000010000000000800003a3db42915b75a0d2a90b46064bbd172e4afda48ca9aa2e556896f084e67a34d7dcc63c059210c65effff2310fe2c5f1e8bd8332373cf69f6819cc34bc7ffaba82779386feb388853b61221af48378ca148c2ef1f70112ae38f5b53f831b123f5828a2694c2a78a30a855541ce2b3d14e05c1565a32738b92980a556e67aaa819010001	\\x90819eded0ead98b362cb2bd97c6aba98a86cc7f253836e7412f44e2e3054f22aae61b3dc8fc03baf5f9a56e48c8f0deaaabec4cdf4bae5d4f9c14abb268db0c	1660583819000000	1661188619000000	1724260619000000	1818868619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-339	\\x14e770d1df2cdfe7739dd1029ab9e8f58de17118a98c936545a8784c10dc2aca8dff89ef950340837bf0e5378620e9c9e55a059327be9f15670c2c715e6d5bab	1	0	\\x000000010000000000800003d86fcf33a5de91c9900186e06708e9345dada0ff3ed8bdeb08e253c075ed7e7d50bc77823f6938c6b55951f17aa6d159048841101ed5724bd64664213de55d980f5e55b350894278997f9d3b0d4ad70fca8deca54b8d557b0fa45b36b1c91542ec1c56ca417724063e138969a9ca14022c66688b060045d9db9546dc661d1e79010001	\\x61796c9a8a0032c0b6d1d3f9f6cfc28cae59963ff48bfb31bb019328d5107cf107607bf14450ebe3fdad9087a7d23393cdaf4b3e2e1c9710f4b4da08daaae909	1662397319000000	1663002119000000	1726074119000000	1820682119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-340	\\x1887ce8365c03ec11a1a80d4b5cf16cf5620b7447661e3d6043dbc644184ae440a78b6eada51d2e0938181f5d8d207372cebabce3e74a906f53af710848161a1	1	0	\\x000000010000000000800003e2c69c837f9f350bd4f0effc6e8d1ed34deeb4c2665de3de258ee36356433418d8a42cf6c77844614f29ad9885c75b86a9157769d8ddec398f55f133afc7d338932f892b8d539e6b9bfa62a3f4681caa780c465b0ab8692d3acea966602a1d5eb1da3463c02e96bcd759067a8e56026e86ae56cf24ebdcc219cb105944ef757d010001	\\x8a9ac57df6bfc0196719fcb87032287689ab39aabe136dbc2d4789526721494411cde7aec2c2e86fba627ab0d32fbd2d060b858e379ae01e5036f577b3b33a02	1652120819000000	1652725619000000	1715797619000000	1810405619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-341	\\x19af3529d839a25b76367e2de040efc55564a9786073fecc17a50f2092e5099391ec83afb34abc8e4c75673c85a61e834b1af8de90e3c0bbf391000b76a96937	1	0	\\x000000010000000000800003bc8d9efbbd2a7388431488a5d723898fb4bf22243da1cefdae888d82cf61a299ea375be471e485b92e318cad0211d3d45bda03e3f67bb700542391a7ea6d3816db3d2921bebfbf909d83105e2decfe7494fbe572898ff6777fde968812321a9b7b1884358dafb9db6e8adf59ecaa260f41c8f72941efa8406285ab5e0b352cf7010001	\\x0a1a5f3b3ad42fed6ffd01957ada44f02a11d7dfe10c0bff5a305ccdf251c3f12bf010408d33222dfdc11af573297642c8e23d5877e2665d8dde3fd9a13e8709	1676300819000000	1676905619000000	1739977619000000	1834585619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-342	\\x195f4d5c753d107d9f3b4f6fd44066e6c08a12c850e52d677054f99467069fd23bad0c4943c824e7d0f426f4616146622caba38362dc0ded4c0a0c87b6d44a30	1	0	\\x000000010000000000800003e027a44fd75a888b37de4239882ccdc3846265648ce66118fffde7f85ad3c8d0097163fc1ac2f2ef63a0db76d58d06fa4c7721f1522eabf6249b561ea814d43da12697073cab65d351e0e128a9a6e04410b89bc99bc97ba0c9d9b5fa8107012d5570f12754c50b93bf9dfecd5d8fa3dd6e2d6b6ae21250a8b868fba85079451d010001	\\xd59df3db4498d86c279621b99ed1bce54e6a385ed55fce6ca3be9bb21b34b18ac5b3418c5b18dfd9062e6662c3f21f4693fd113b5510fe63dde7aecf1301c408	1678114319000000	1678719119000000	1741791119000000	1836399119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-343	\\x1a07a3b82991c27db73e21996b73fa680237892bbb92cbcdcba5cdbb83ce1df2884adfb9da33b1bfd61822c11d4d22416bc20846f0c02c1d9a2275e417d78972	1	0	\\x000000010000000000800003d042c769325c87d09449ca094aa51f59ce80b08302ddce3d5130824f112bc9c78cf5a250c95aee5e044587d6955ef62c657af1efb96060d35a1868ed6be93c43a30ac815f5571351ca05e93352c63bfac6c005e58c43427e1b56cfff4481fa13cf1b6b6819c6a3119bad38d214d5da9a156aac8472c57d6daf45ddd404a83485010001	\\x49fab92ab492cd42341657ec353d926fa59d1232a15e313b364a418ca00b54ac9c26825bffa3a6840e5549a2dfea82530550b9a602e32cff263566987e41c90d	1682345819000000	1682950619000000	1746022619000000	1840630619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-344	\\x27df0a9c6483aa9bfdc151c86c44d66622479af1d181a578a8274344ba6c8a5f07946025caadeb891838f16cc7ae583e4fb6568f2603fd18cc5999eda335e640	1	0	\\x000000010000000000800003d872a99a33c4b484e196b0aa2f133f2f2a952623dfaae4596a29f10b05b0dc8f7e9d9dc3b48db2ad74ae31dfa1ec249053905343c1877a951a8a1768dbfb8e11cfe7ce589eeec2f1bf4a996227482ed72c0cdc8411afbf4e1bc015fcb1148cf32ee6952dfdb6827478d807eb7572c328a3c271e033a4990225e596113178849f010001	\\x445d84c22c2b040b1a4fe36bfb0e72a0edf211a7c1265936097c16d39ae1fd155d9d2fd7594b1eaac1b26deb83d4879f484de0574d45d37a8317e12d30f08508	1672069319000000	1672674119000000	1735746119000000	1830354119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-345	\\x27b3b6aac7fdd70606ad1dccc9a91a12c091d8fb4844b5154cfe35cb08fadb5d773053c714058303331e2b4cbf1c179b734862729e485c690c7c5b5d409fe26b	1	0	\\x000000010000000000800003c82f6f03375775722fa525465f61a24279652bb51d8944a6377dd6ef78ae49020c4b4f068128ab8c28d64e1137f8238a64260e5f031fb99d770a7a132dc4522087fe13df0868dc9076a69e7bedc590ae9a65862af6007d64011fe9d9e373aa0f91b36516f6fbf8ab1e889d140079bb6bc9f8176046352a459b32fb5cd6c34f4d010001	\\x60ed05afc65142b2d6703c22ffa23695903083bc793fd82feb327cf94bc68f0b91165f015fe6a5f8114415cafdd1e009c4bdd3d469a1b7808ccd19f636520f02	1652725319000000	1653330119000000	1716402119000000	1811010119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-346	\\x294f139ebbeecf724286d46031a300c74dc91190d953bd9312ca2b102a024b106b3cfb9b3fc8cae153c29266ac6043c92eecd028ad8b5f260b9fdf842df26b6d	1	0	\\x000000010000000000800003b1422061071a7e30822997864a42b72d045ef405cce0f58b6a5b8c3973db3c48dd8576e46cd5bad7d6514c869866528840366aefb98122a632c2a80d8134d4e5037c0212c70552c72b5de1cb412bc5a95d21eb5c7eab94aeba01c2c956f3d3a10e2a71085e7735d458b750f0b534200369a22469c5872a3622478359f7e2f611010001	\\xa347bd294d4c16d5080e2e7a04744644e6d10316d20b9f0a60104bf1d3c0870e0a5ea3ff7b7c32648f2cf3fa516cc6aceb5aaabfe3eca50f73e00530743c2c0b	1681136819000000	1681741619000000	1744813619000000	1839421619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-347	\\x2caf2550784b7c2f4e86b86dbb478c1c9a136e4a64e6fce88ef0edd5774d08ebe5088743168f045ec1f849d56d0cf86e72f751fa8d5f040e77583862076c7c2b	1	0	\\x000000010000000000800003b6068f0452e74717ecafbb9fd7c17628ed69d64c524052164380ba1ecdbbbcb47c189bb2d6eca31b2fe0527f1d9c910bb9b25e34a72359429dec0fa1a02f80ae69b408dc3d05c4ed6880b26e77d3bd797b25471f5dd7b1bb9e8e32b6e61b100034c2df866474ab0c274af60af2d455e8c3436c15d153c3720930986cb62b6013010001	\\x945a1faecda718430d9fcf81b4852d715ad3e961e43c83a5b6063f99b692609bb3ffe60e674acdb319ec96f86b8bb3f6fead7692132c7134ac3be6d6a14d0d03	1674487319000000	1675092119000000	1738164119000000	1832772119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-348	\\x2e5f298d1e69fce99d8cdb30db0cd1c119825f45d0424e10dddb7eacf5c6d0e572dcb302578be156f1255614f11e2b611afbff48fc23ec77da8267bad4033314	1	0	\\x000000010000000000800003a2e728bae16725e0290ab6e447155e159b8397fb1806a682ab0c8ef70761b6299e13fa8a96996c3d995066574cd4c1335706513084e44a2b4f444908ea3c89691eba3d82f51d29f8c670f8b6b51effcfbf7a9ae4dd008be9275ebed59cc768c59ce893c2fd28ceafc873d6214e129e21daf0ce7c0261231cc018fa02a5d879d3010001	\\xc4ef455a982b0a31348133a18c3088631d33ec6c49ddd8c71edab272601cb93eda552ec7213d3d7996d1e6b22f6cc283db3b5ea64b7c488a08c3e68408d41401	1681741319000000	1682346119000000	1745418119000000	1840026119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-349	\\x2f776ecd0d0fe1c0634f72ac0271a8e13845b4103ff67c758e50e1e9be360733db0bf6d0d6cbff9265a40a1ce191ba782b05abc9c17e97459a4b0c4385b8ca99	1	0	\\x000000010000000000800003d33abf4f7af24f9ae70559f51fcbd7838fc3f5b0a773551e183c544e69bc476ef2b3f6dc26a295204632d79b98b64fa20f50c890bcac40e0808cad3c7f7cb6e95b2c7fc33d4ef0f0f6759ab607442e8d3a74c5835b0fb2e1a92619c03df8c3d80a221a0898c67f46646e3c9e018198265fc2323e06c30b376ac40919bddc25cb010001	\\x823ea0eb8a8a55eda7c070b9721817ad28781b41476e6222e57e1368851b01cdc1e93a956da0821f5562d3446125bd0c589ca476f3af4b891d035228cef82207	1662397319000000	1663002119000000	1726074119000000	1820682119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-350	\\x321b20678b0938e66f1eb3de3f33c7af6c2fd898a2d0d319199039c44d52630045964df08469a25eb2f646f3c4d13fa44a3dd5d9bddb7c31e19ff0e6200ca735	1	0	\\x000000010000000000800003bdadc67e2b7d934d5339a720903cbb0f153bb9049daff59afa7592a2342cabcc71fdd731d8916c2b12ba603fdd1162156015fb242a21ed4028ab6da0b7b8f773048d2b34e99167dcb9862f22449a6a9528ade55bbddd900791703a72ab5c97f80db02a9e6de0ac119ba4688a560538f1f7bc6b1f9717e6404a5b128b8ae87373010001	\\xc5f6f7e32c39be78044ce5ee014efa6404b99cf47bd5db5f34201d1264919fb96e69bfa28908cd5ebff87d8347cab0e7cfb9f50cda4b7434876d91d6b3d41f03	1654538819000000	1655143619000000	1718215619000000	1812823619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-351	\\x3433f04e29b5cbe68501103449a80d6b4f5681b9d60ff41835459f636272b1d513f7f732931f7abe763c8b4e691790130a2ff0a1b18511c16b5990de6a949e58	1	0	\\x000000010000000000800003bab0fb380d7c9f7fdbe049ed0c5306aa3281fbe0fa5bcace1741f264be591dd170f1fad3f36cc484b86669616f6eec6c165fa1b878df701addb5e983a1b07bf6dd059a331ec74f82778478f17f76cfd127235b2b0d8ac0ae6a32d87694104211ac4db9f0a927433d2529391d8269a2791fc8e8f69fe5f433fa127ded0e8985bb010001	\\x4bf30c1efd8839a8dfa00897b73a52721f00c00492f33eb68d9169304eb00d974666b0b823b7efc5a8faceff3af2f592b49a859962849a4f8e82d1ce92eac104	1674487319000000	1675092119000000	1738164119000000	1832772119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-352	\\x347323943138960f7a38a7b0d76b018aa883123a3443e26978c8e55f4c848a0af5c964ce69b9c7ca32cd8a7e5398a26a856c28cf2e78fe94480d5ec79cf3cb26	1	0	\\x000000010000000000800003ae34b5722efdd3c571ac56e3f2c7681a54e7ee49ba60a2f7797a523066c3df7fd3693a3a2af6cfced2272127fe42c4364d8421a5c16bbaace6e639ad225a998a1f9fbf58b172d20118dc1009b16d8899f0200eb5b88184eedec2f2036d59013661af57dd8d9639af6b706e4158289dbca564b0f61faec55bbe96ec1433263075010001	\\xf47f73d4a6e61d6beb9bb107d24359086201125a4515970891bfae9b0e75e6475f4d20a6e45b3ac8919f01c07e92bf681fc0e77ee7edf0891aa70af72de24906	1663606319000000	1664211119000000	1727283119000000	1821891119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-353	\\x3cab7aea0eef8006af114685e7fe229fe5cffb6b79bc22dc336dbc116f6db64bb6de20b84622eaae7d23a722c8f613b8f08515c493b7042fb24e7030561e7aa0	1	0	\\x000000010000000000800003c3c28b5355c5fd451664d0337851efa6fd41b8698f31e081437288404f50ba6c394dfd2788d4ae5dc1f60f04b4367f7b415661e7357b17cc96525d18d07a612b4243de69159d1b454b9490470b62690bcef8bfe37f45f1871b5e6145ff6a60ca5d03b6b26d10bd4e312ad509bf48273a43f6ded7a3784a9a79425a02b60d952d010001	\\x106b6ed0abd282a7f40c964143111b0f99aa1dc855d61cc7ed21e238fcd4d412879022fa06efe3f5a2e6681dcb8fb8ecfab6a2bc817f4c54892e7eb208edad09	1678114319000000	1678719119000000	1741791119000000	1836399119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-354	\\x3d5b46babb62f54a0318c7ff8a889ecf3ee27a6ff7d5969d034c0990b3b7cf032ab9d7c8bfe93dfadce19b980116acd5a790b72d148c75b52ebc0d5ccf45635c	1	0	\\x000000010000000000800003e33c8ce4dd0b0a80cfa44c83b3a899037a115f4706e0bcaa345c313233b26522223d4bdbd03403451f89f759884c10c5231ada3724ad8a448904142e9722cba179cd23c98e8157fb73227ccff37dec5e21a4404796aeda5d95d231dedf1109f106d4a5a6096edc91b048830b87430c8238b003c545eb5cbccfa6b9d0be26d36f010001	\\x23b38443865524e6a2338d649f12ca9d349fc5d8491adcbee39cde9029103bb7df694a021de0aa36ce61305250de536a12f6f19034df3156ff86a09c6ed08608	1655747819000000	1656352619000000	1719424619000000	1814032619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-355	\\x3ddb7eb0bcb629350b7734bf84a4bc92ef18c33a441cea27af75989df33aba401bb67947ddc9f969b1bdd01f3b09fc85ea79482d9ffdd63685935d750c46afd4	1	0	\\x000000010000000000800003b8fd58b523d06715979da9574b6eb36bea020563c761da5e2c01d02458258d1240ab46657fe58977d043ef25cfe1ba6312a43abb3325e5fcad58f99061553551d084f525f906212b8018412bc873bcbdc4564427e0f0f7f75da41d260b8dc42ffdb0b39102558ab74f092cd8d9840c9e7f7ed81d8c0543a201adaaff5b719dcf010001	\\xcfd81cb0d06bb7ae64e9d5ce75f6387a6193de41ec8631ea89127d9dcc2662e4ede413794c41beec0913205e0c4ae3dc050e51e85d90bf5ca3547f6444e8ba0f	1674487319000000	1675092119000000	1738164119000000	1832772119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-356	\\x43137115566c2da93ee9b35772d722073565904abf58600cef6c10e83b433e3991128b48be4cae9395b426d1d8957a1fd0784c1233bbe14650ecd6ed9a2d6e4c	1	0	\\x000000010000000000800003c0977c6db35674a56526716914cfb92583ccb85d56b5ab033b1eadb03d648da8afcb2d0b92470efc8bcffa36d8835efeb2949767a55e8ed2f6ae38fea878c65497106b8abdec99d203addddc9e446fe9ea3a4c25f5cbf1f4d0c425dddcf86ad3fb09598216c2db44e088e8e4abff3e0cb83c7a82a5580b3b9865209e1f1dd7ab010001	\\xaa7b87df66e065fdd32d028f3c9396932444dbbd93d1a2d863404c509e2f82b58cd66cac86d292a1654825d19e25c78f2e2d229e18104c69ce46b9b7cf5fef0a	1655747819000000	1656352619000000	1719424619000000	1814032619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-357	\\x4bcffdd83aebef5ecae8f9db9f8dc642f77df7e958e428984056cfd7d979edf61bc8e2dddcaaea6e13f79f71bb92e44db971a89c91e2d661b0f52d1ead2e743a	1	0	\\x000000010000000000800003cdda954072b485b407d819809a768a3ec40bc818430874afa6685c96e6928504ce8edcad762196f1115a866323d0c9d4ef7ddea83b8fa9f24c9735dc4b11d98276f02d762480c24e802b6127cac956f2093f906df0f26c06721a3cfa660743d27348a917ed78ad27c17b01a39f3a7765228a86c3f229c5a0b4af779af8086eab010001	\\xacd41ceb53fd8ee35075b00848ae1a84d6c59a64ebe9e687789628fbb1cc52658cc32b897a7812cfad2c5c788cf4a3599423fc8b595b5e0fb913d1c38892c003	1679927819000000	1680532619000000	1743604619000000	1838212619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-358	\\x4b97c5aa95a9c79ac4d6bb971c53afebd1632697f57b31e0a3d394e1dab7fafaa1b452d9fdf8e3cca65636f76847b39eecb51cc63ff97594eea5e64001d097fa	1	0	\\x000000010000000000800003d27d236c7e52f92cc623a28cbb6cae42f5db9a4a9ebd9e06d0e74c1052e26f315274b42aa597301ecd464e39e5f06bf88b6156b8129e2f0198f37184fd693b9c484f1f5f0332fdbe97d64898b0f156495e2128b79d0135452e0f51af536affa4157b0108ce3070934607b5246c790f7bf9770918a303a58dcf38b412eb1cc52f010001	\\x5534d32b22d65ea4249b859700db8876750047b0f75ad5e405623684e280d299395ed321e8481961655b6e7c01c33de00aa76d95759e03e7d936d66bbacccc0c	1651516319000000	1652121119000000	1715193119000000	1809801119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-359	\\x4c87b1b8969f545db1ecff6cb5a7a3ffec9f55543e12b9950721f1d77bcfa652c6a8d18fa360ad73c0f2c45fd7a609c614315e5a6d26c280f7375e4ef7587147	1	0	\\x000000010000000000800003de80956cbe2df40cb61900f58c4bec889610b6dca8f06df84d94d6dbc5cd272a55e15b8618b0abaa91a1319580e923dc7d920c2c2e5dd51cd6658898288b0336c5ec4f8c8f9a62185ce125422b90b76f277d4c253f0e9dac2a90e56c449bba58e6b890572b859287167964cc43e6ee223ffbb08a957ba03f08753fc569ee7a2b010001	\\x88ee6ab96f0b66563929da93c1d7cd579f793a0ce2aa8e52652612f21ab4e8b5b5141b71eec9953977f49ce0bf82dc73d36b158840bd5d135872ea05ca2bf309	1675696319000000	1676301119000000	1739373119000000	1833981119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-360	\\x517789a03a92f740823902ce92c8a75085b9ae58f6404106bb716a47d4fcb5ae3d40cf671a7be1d36093c04429aa0f8b529e42ecde672c0df02d15dd0f8fc7cc	1	0	\\x000000010000000000800003ce9a450e05c185c06d1be5df11ee4265798cf9c3e3273156570d8667fbab86b5147aa3b3bb8c22db67a3ff29c9997531628ba6ccc2facb548b059c28e87216bdef86f25e7a2aaa0518e7ab8bf88ad1fee49ef33f73e98647f242790c1d8fbeed2fdd2e94aacb3ffb0ce07921d5f4470118dc54c1a6a6e6a6bf0f220660bbfb65010001	\\x848294453dc9e8aa75163b9b9e3e47df7fafb4f1823e720a5aee1b504d6c98e1300d3f5336617e0edd57b7014d191fa59c4fe070d841c00040d4c3016d614f0d	1681741319000000	1682346119000000	1745418119000000	1840026119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-361	\\x578780dd89f876e6d78a62011361ebecc7e69dd3514f1e5018449e1ee981d20e458138d21b4acf239ef93bd14b1b7e1e8388f92f26b2794a5260b250c7fe9e4c	1	0	\\x000000010000000000800003c5c2c5726194cdabf436759d512e37060c41d2dbc9d72d0fc4be93e801b045ae9ee698b174f3ed31da97a18a60362440a010ead02d28498db8c4e3c2938df3aa4a59133b9cf323d6cd4008ebd1d072e1a370cda8d85d96597ff5096d5d1aa89e85eaf81d535ca3d8ad513fc51e84dd43eec25fe70118afaa0908c1dc8346b6d3010001	\\xb3c5ff6090c1b58a9ee0577103a46533c5d5fed0862388c5cfe29c80e03401af6d71de0807fa6f15492bfeca7698c6eb2c2c62f591baa41d464c4f3a30f1ea00	1666024319000000	1666629119000000	1729701119000000	1824309119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-362	\\x5a23330f3e6089e9492b22fd431953c65ecb0eb1a5cd49705047376f21e10430909e1b585b532d9938b96facf7125400dd17b4ee3d8c2a8599f25b3fa6dd7dc7	1	0	\\x000000010000000000800003eeffd5706d8c828f0227174b74569a1b53db79493cc33e0ca78b3b7f75f16a5c4501f2882e0eb5d8000159f3d075f81163b1bdada716696919ffa755f1d27a1b1dc623393daf9458143301280efc9b5fb41e085670f2de549084675cfc641f326d40e187cc4b4cde812fd0bd16418e0c5cbefaa389cdd997f3895c2fe6e89a5b010001	\\x1fbbca7d3ca158ab2b69623eac099d358f9f4fdd8ca456c466413bef560ef7886c64e9c4b644ff325ce7c1b857e277d49ceee148c8b2908a3dee3fd6d3b71d0b	1654538819000000	1655143619000000	1718215619000000	1812823619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-363	\\x5ccf5283619f5da0d1c30ac43936069f299a3c1ad2de5c2d858828cc59d435f56f0062dffc1a3cf133e35eb44800076ecb00012a06ee735876761b80fea08735	1	0	\\x000000010000000000800003c46e16869fe62393655fd558011fe2df7364136bd4d2c79be0103a99e7ebe38292be10d00e96634bf04ca964c59967c1eb51d62bee2a35faaae8dd0e70b8420bfb43690d51c09896f9d5396de8ca8fea290cb10063b7b9da27c0dcafd2a1e367ce893b7d59c101aad13bdd7cdfa2756c46d68801b2722419a8120b575362f6cf010001	\\x8313f309cd56df90b4d212800b6d85de27f4e15ce54f9cb31328ca8290300018029b163df37759fdb0f6ee39787d20eef1775210b0d553ad4ca7b28926093407	1654538819000000	1655143619000000	1718215619000000	1812823619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-364	\\x5d17eba01451148cb26443b299eaeebe6f0bb4edeaae02b9d5f707988b2600587f1a2e8c53e91331d96f4b04abb7062227236bd28d16cb3262eb7ebbffad10ec	1	0	\\x000000010000000000800003d0cec5f1a048c4d495674267430886f0d7dc107a92cb9faad2316d0da722941eafb3ea8b6f9b2a93f244c003f45892975935d102cd0b083ff225f1c5a2bf22a889a4f06080a4e153d5abdb2cb3127e7378989b9e992c5a64d5c518cbc8a19991f93a410b61248095f4cd2f5db533163254c61ff63ad629cfbb9afae671abd8f1010001	\\xee9a3ff59207c56bd4680e9d0173b753960dd4e44a27cdfe8d12acfba0afd3bf0d25406e718766cc3ef4e8c31d12398ddcef8c8b7d17e839f21b99055031c400	1677509819000000	1678114619000000	1741186619000000	1835794619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-365	\\x5f8311cc4f698edf67033a83265f9ce11e14236537e24222b4c906e9c929ded128a78d5c3d3502040249abe2b37d49ac010bd6ae350f991eb365519cd58ca0e3	1	0	\\x000000010000000000800003beddfe6cb8e3da408a107430dcf0fb5a860f90b4ec88772b6f891e9dbfef8d3949ef649cbe58cdbf4dd8e51c2c4165be72df6c0158bf6f349d0178054284282714479b10596658a40c2e545097f20da76dc2fa67001bbf7449d2353f5729fab755cd95d177315d073c6cac0a354d225dcc5cacbd51387c40f2d56bcf7b7d9475010001	\\x81f289be919e55f37a4e48a1102fa0468c4ba01d4539c6d9dffea52309b117902f74df4231b8ac7cbb2c77b2013b467f66f26eeb127f75aab6cefd20e8117100	1653934319000000	1654539119000000	1717611119000000	1812219119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-366	\\x619fe6229bcba505aedb8beef1773c86d861ca4abe73a11266e824bd42c8a5c80a55903128c793add11a2756990531a2f8d9c5a0a6476cdc99733fec4e8a1a56	1	0	\\x000000010000000000800003d78c9fa61e40a757bbfe7650626ab31e32547383b1df970bb2a36a96aee104b7a7b039621a3c1f1fd64c0d9150f3c562347fe731e04de0f07ef933131ae2ea6aa747e57b754aaef51f2d9dd83ecc03fa69d913fbb84b2cbc1b95cdc39bf2b60b68620bb4c894cb1b74063c5a24f490a75f5f09efb34f56e84086fef4d16e1513010001	\\x856c06af1dc9a8a93ffd59343e68860c810d7f6418ed0fb92cef7be36b8888e238eeb17be3f264e869c77e1dd218ae39b25fb4b884397933fd3fd8610c9d4202	1659979319000000	1660584119000000	1723656119000000	1818264119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-367	\\x62a727bb708eff70f1969fdb43822ee5c61647487aec3eab3bacfa9fcc87c288d566f7623869719fd30239fdaed76f6f5707cce562f2f702f449ce5fba0d576f	1	0	\\x000000010000000000800003bdacd2909ce6791ee3a9531b756a293b7daecd2ab3a15ad3ef89bfd149590951cec0d8a03d4542c62a5c07d637f59538d645415b80be6056f5c6e4f670e8994734a3cf4c213ba06ad098452c0d46a4124a4677943c5e30ba6c0b7603a67c7c7696efd8ac0b892247616352466cea227fc0764418b73465d97da30e82f536aec1010001	\\xfdfbd86cee7e98376e0bbb0b6a24835d3fcec15ad34e20930436ee85cc81f04b3fcd6007a8bff9d80213a996c198179b50357b920d7afc74e93e0da9c5bc0e0c	1679927819000000	1680532619000000	1743604619000000	1838212619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-368	\\x63cf053cb43ab6c26b1eb882197ac866ef7c9ba7c369e7549187f008e6ae79b9873475190bd8da3e67ef79ff828ac8cb504c1f3a922f000c38600b6cff00b85d	1	0	\\x000000010000000000800003b6417197c9fdd816a01a1e69ad11772f7014fa435183ff8196b2be50c271a37d53bebd555ac239c7f8cdb29af13029a62c5249b9e4dee1f444ae5555a56091147d7c1b476e8ab22031a4004ed07f4511590c46adc06acbd48459ce0c9152fc1dbd8a7856e1533f07b75c131b73ebad1e03ccfc616ac867f1201f1cbc8db16ceb010001	\\x1eebcb446eb37472f06fec059b509fccffb866086094dd2052684b8d2d2ddaa31b37e82d7b65d67d0de1024fede00368e3f6b0fb03588fa3deea3bbe51a0a101	1655143319000000	1655748119000000	1718820119000000	1813428119000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-369	\\x661f92670dc7d3f978152e53bf3e2dfa882a3859c073d1a44fb5585871b381915904421c668223afb6dec18ad17024b0759892a6ec2ed919c0458901058b5409	1	0	\\x000000010000000000800003c2ca17850f1b50f66496dafd3cd2afbdb3cecf9fd248567b930de921c813d799518e384f0d33b9c5bdccf9cd4b09caa76077de942fd1e84335314f51029c0b89b96303e69f534ce7c10e21dab4aede67c8a7acd2e50d23c4fc466b63bcafc64e07dc89c4b58fe9cf0c7fef03f7469c902ddd73259f18a8704d5e90c58b61ab1f010001	\\xf34e06ceaf59e0cf18b3a5b68a3061bd3b17332d268ee9082ffb84465e7fff13dd50d70ce7fe28469ba75fb9ca40529f57b8a3aa5070d362c8c0c017185a7401	1668442319000000	1669047119000000	1732119119000000	1826727119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-370	\\x674f34b2d2c09ef130900885272c4e1b7f82d13d4573e8850d97ec6fe6019f2946ada3f148fb654be5ffb07149b13e10a0eeb2a7a1684bd29a802d4816e296a0	1	0	\\x000000010000000000800003b1366e82e88f86d7349011ee90fe35b919ae574f18448455bb6df950b5a8cacdfcb22ff5d33a58ae4fdc23deed32ec7df88592266955e74164f03af141c9a0b4317bfa4170f07368f5ffc5473bb5f36f961e3fe8a6270a2f29dca7212341caee135f7e64734b9e75df84dd0e27f4a27cb6540c3bb6edfaad5b244c1b50364c97010001	\\x67f73ae644d7a19166391d42bffca4e12da22ae17583f4a7df41ba17836166c2316e44d7f12cfab9397176cbec0a70c22f6896ca873dbf370d510fb26715180d	1672673819000000	1673278619000000	1736350619000000	1830958619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-371	\\x67e3f513de5c749cd4faa11ac2962f1d1c0f66573f476180ca90453311a7fd7fec6809d0940b7151cd83e491bc35375d0d6406bc59b7d777d740c9c351940e0b	1	0	\\x000000010000000000800003ccc5f8c54ba1f07c1808f752a64a1f90fe898ca43742d8753b6781b9daa20d1ac7621539ac70cf365e1965cce3898d222fe8dc762ee3ebd2f2cc73ce1d8b6fda3464537bd78129595f58b986d0bda27b2c925a483010ed05120394badcfc02feb1b87b8bef5d485b6b9cb06a0c06626570323c36e1680031187741069c25ca85010001	\\xc4ca9663474dc8338b85ba335ea1559977d4bd56dfbfb740ae2fac44c97e2f79d34d12cf1e4df903c8cabaa458806e4623c2a5621716ca36d1232c8b6c620708	1653329819000000	1653934619000000	1717006619000000	1811614619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-372	\\x6b533ce2ab7bbd27fc15511d4964e0da1c2d5403f7a80c446baac0f2bb58a07cfbdec55ec90ccad297e5657abf850c3461df6e22b48d8a3e5a74935d7ca50a5a	1	0	\\x000000010000000000800003e5c9c1d03abc73180f6041b3aafd6e67c204c16e86a363808a03c38f336c85c5ba22ee9580ff576c2a128f0893e700cb88500384a248ff09de6adc2ca4b9ae08349c92ba4f2823b3e2d8bb4963d2c4440aafe85fb32282821f0a63a148376338d00ea1c409487bc2e338de529b2cff65f616403bffff93c2363a16a4fe112ba3010001	\\x8ef064ce8150f8f61b6a5199cdff3b839727cd3754fc3d875d9e6db7c8cfc2683bdce4c138cbf2894f5dc54192f97743e7286166c7b125195f29fc1c7802fc0b	1682950319000000	1683555119000000	1746627119000000	1841235119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-373	\\x6b4fd03a3a662f2add8a89a4a9aceb37fa19df5f00ed79447dde5f03284ae75a5724bcc286250057ad414159492cadb4c595b22c37f68f2e21c87f876b305dc3	1	0	\\x000000010000000000800003beb403c48ded75be497a91a37b023cef1122f16ed72e749365f65e6d54f51def5e57068763cd51c60f246a87a317989a06c2c8d4b1b68961737c4eeb49a56ddb52c24f3152a58b7d657f8c5e37389de8f8bc7ca0cb0972a4cb671501c96ed866cc7a84f7ae043db30bbb44db861701a87d88f93b1db140c0862b8b72befcc7dd010001	\\x7e0141f7de7affab79da118a694f2df2050bb7688bf467bc88154631bc0143ab6e0d6bdd96e977a7c93dc0db48323dcbaa43c18249e9e73d502ed33681040e05	1678718819000000	1679323619000000	1742395619000000	1837003619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-374	\\x70db47d3d01dac54ccde3e7ccce4a48c2aa891283d7a76311b37c9e489ab8e03ecf7eff557243940a97f0f5c968519fdd1e332b3eff21badb1513c1827031cc2	1	0	\\x000000010000000000800003e16f096faeb5586453bc4e423186476f9676c6d3e167b72e53eb4a266c0fc712bc4035236f6863fe4af920910f97974c93b838ed293093dc56c817439788dce12799a63e2ab9dec83f3bf748e09117784de71c0fb5b3d725c6b59927d1120c84e0e08cb1ddec1de1968c39cee65f43c2f9340d520927856aa9f223057198787b010001	\\x33e175f0a35f386f8065934343685b027365d0e1ec486d504ee8a45d75fe3af32f69ce98cf0f1a01540a13f851fbf40797be130d2e82bfd87fc2e8310bcf810d	1655143319000000	1655748119000000	1718820119000000	1813428119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-375	\\x722bf4a17fffd7de277beeb6b52dff450451af618d749ab7492ecb398d150dcb136b9c6a621f212920cb89ca4e79da57ece62ea87ac14045223b5bcaea8388cb	1	0	\\x000000010000000000800003fc69b7c514089292567a255e2670eb19981a030802fa841c89886837393d4c07d61bbd2a6d163e869e34a0a38997f67cd5382a009c0fadda54775b8abdfe6163e917960af347c32d4f86cdeae195a8257a5e8a1be5e69d03203839f7786e171796595dc24e72468698660eeffec5a92f14b4264a73e2c8b253aa65954499db8f010001	\\x2c48fa99602778409c0f5119453a3d241d064243a590bedb4941ce765ddb5cd21adf380fd57e3956c808adc8c559acdd9bf5133e26316963d897a814cffabb02	1664210819000000	1664815619000000	1727887619000000	1822495619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-376	\\x763fe6ffdba87d57dbf687ab8a1a79d919ac168ed1adf2eaa4b8cee04b89bcb57e10c432ae950ebd7688535ff84fc031422e86b57176ff3c0df7f37c850105d3	1	0	\\x000000010000000000800003c551db857c069614add78947eba0c49b7e354c8a77db4c232547669686751e0669e3f78fcf2c3c22472e8f06f225536c3aa490f4cfa301ac9b3a33969cdfdcbceaeb848a2b7dd67c77f5e91b69fe7083f75a927427d955da36810f457bfd98c2bc24d2835a1f82baaaf833ce7edac49eb1ab6470bf9a8ecbeb33e86a91b5e897010001	\\x1141bbea43b01dd777bb8590d15264ff3c2f10c9bbc14860cc9f4aabed1eafcb32cf5e92be3e036cf24e6912fe831c7a80452ca889c1711885637516caef8102	1656352319000000	1656957119000000	1720029119000000	1814637119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-377	\\x778ff9173d9168eda313ffad0e36aa2f6ee7c249295cd4c22c118195d6e51c42f969f967320b62e470ae854ebe626a8d5d4aff359be73c8961ab99a58ee5ecce	1	0	\\x000000010000000000800003c20e8f94f125866f843307389084be9b6c9f572b35dab74a7146ceba6af71d238a8923d7545d65697cca1f1337c30e22fbfe1d493e78a24b87f1ee7f712819d52f271860587045327fa5d04801598a457535e51778d894a32f63d44cd7fc0e072880e4c9d0b0b317a428ccea3577d46a1abd554ffc53dad0ca3e40d3ce31d603010001	\\x7e88a4852d7232107bf309c444c640b9f582c27c0e2f3db7ce09c22f6573beef916f50c2fb3f94a9b0b305a8bc88245d49cfc00eb1012cf8a9451421c9f00503	1655747819000000	1656352619000000	1719424619000000	1814032619000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-378	\\x78df07556f806cade02ecd557af3c505c38c229d79687ebb8e8cd075a92b59a531b0fae1de43b9fd0ba304caccb95d8479f88332813291d832a20aaf9a24a41f	1	0	\\x0000000100000000008000039b5b27cc584dab33a1fa9aa511de94371caa0b8d1baab6ba8d26110a05bcebdbd8736b7176f37ad58a607897e224d5f8c8b60df213849726460763cdd99e68e0068973772e884430948b7da233346a3a52bd82f771141e710071157959a5b67bcf7a174a5aa4cf3701523766d48bcb129e9cf3aeea2ebe47d6022e164f7544b3010001	\\x8e20659cb383d3c499b8cf7a09698594553b086d6e3ad9306bbb40ad617a15f2502b6c2f2ff79bcc840ace86484ce48eaeb5f19632c3a6290dd7c7c7285dd705	1671464819000000	1672069619000000	1735141619000000	1829749619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-379	\\x78d34bb81bdce758579e595f7de621faa9bcb73b04408b492b0251551339e3b2a4cb8b623eb89660293bdaef01cef15bc30c06c930a86fbd74859d3d277fe413	1	0	\\x000000010000000000800003bf5c1c38a979665a6e57079dd593b33298cce886363f11bfdf9266bbf4e3c50ae31cdbff3efa42bb7fe423a72f0661c60d80d1433146b8b3159487df1022530a8d214226207baaed7e6b3e2d678b9ca99aecb31c40f32f6f0ca76531d2060cf12931d029dea1f114a5d05a6997db3615b6dd07355ec5aeba0ce5c0d7efe2f9ef010001	\\x541a6e0d0df44acf0b11604a719924697c5b58c43dc1bfdfb66b60ec0eca9507c58483b7e37a342f224be8c58a7fdca89847c1e7d91fe491fb8ffd4d322e2f05	1658165819000000	1658770619000000	1721842619000000	1816450619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-380	\\x7b0f72f767015e044594e5c7f6c8040955d83a945301d1cb2f4c884d3aae940ba665ce9bf8cbb9175d08436a40bf793fb1421882bcd1fddf292c128962a1e3d0	1	0	\\x000000010000000000800003e288d0b9b12f846e0d62d6c832c75e47dd0a947ca556e1588e050e53a16d37e91ba3596f2018a45537d24f1bd5c7af355d8d89399814f5cb1bcfff9b52a52d2d5cb50ab9ab47f93ae1bec5afe9379974a7361bcc8d1ed33d84e47dc464130b13c38070fe6a68b43691a2062c8d9a51a9294105628528198d62efedb6e2a24173010001	\\x3ce49b50eaa74505ff1607fafdd7ba06f36a12c654105fb959618b243e9620bab637884816a12f933d170f51e41d14eb36736e3863bb6c6c5229796a6ef9430e	1656956819000000	1657561619000000	1720633619000000	1815241619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-381	\\x7fcbed857749bac2ce429b2b46fe5f0cb650e30e3fc30673fa1cab77be7aaccc680d2ad15f70b738add61c3ddaf9d0d195e5fd00aa2f95d631940c8ce05c533c	1	0	\\x000000010000000000800003f69cc10c43fbac4846582c8e47e92d78b36f2ad2e2468e7ec7df07e3f2e7531ca9749083cb58584486bf4e146119c44227863eb8e4f181ea4301d0158464ed97b0e1891d0f3b319c1cfbe0210d60e95d8d8eb7520edbd374e61ef767aaea68ab1c9ea63768b5acf02086733b28e8a10519598bba455ee317d8ff596c72304c9d010001	\\x7cfe670b1a16b6ca6dcdcbbba667a2593c8dc2ae823b32922571ef13ea6dd6521bf5f620befd32120ba9f4cdbfef3afea18da76df0ac07f9da5e1d2ffd067e0b	1651516319000000	1652121119000000	1715193119000000	1809801119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-382	\\x879f43ca67daae093ed6d511fc882538e685c8254602136ca651061d9da895fdee5033f2d1c3534d475b58c3bd6838aed3ddea04088101e1cd4920567164f001	1	0	\\x000000010000000000800003c17012c307d84915d2b252abeb84b5ad882b14a258cea498d7de19e9c7b4c01c6bc568e1d7a28a5bf0cfb3e816a3b32d1efb7785b71921a2476d94a56bd165ceb748de418c3e7fefbe7f1f6ca96bb85ac04bf57dd9cd0317a5b3fd5c793050bec3c6eb099b2cd30cdfe2147e3dd5cec11ab3a754a0db2c617c6e4976ece6e703010001	\\x31f75a5c1a0b1ecc2fe59154fcb5c644dbb0282b6dd74576ecda0f4715e200395e8475a3abe5164ad5c0210d12bc41b3782a2a15aec78b1f27bba9b752e5f302	1664815319000000	1665420119000000	1728492119000000	1823100119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-383	\\x8847f75db5ff369b6565d62d9bf4136ee36179313269d58339c420be91dcae5c6959bc9a7292dc70dd7fefd0211e53307bee53899cc08793a16ea190f8306929	1	0	\\x000000010000000000800003d31d58c00fc030feee5ef2ec7628226e4526fe58f8a811b76b3bd853700a164eeb5b50847a800576ac62ec2fa7eeb7537c7e7227976596057177f30ac27bde21145142d8bb3d5ea120c6cacaf70cb3acfbe3337b1f80d1694427847c75572c59a16bd55e355aaea07e4e021402ae8bbd5a7b53251655ab5b7f8eb21ae201d0f9010001	\\x8b7b4984cd67e85f4be49bb051cf8fcc9da94fd8dd01311d5924e74fe52de73ea66e1fe0281a271a8127be430f716b13cf071a3638de96bdd659a9289a92e60a	1671464819000000	1672069619000000	1735141619000000	1829749619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-384	\\x8ea3cc8356142809c258faf6c4cddde87be310dbba511d36b4db10c0ce7090082ebfb0a30bc0ec201b06a819ae476591d5bdc1164cadcda90e6c7079a8906486	1	0	\\x000000010000000000800003b42b72a3a8f9745fef9379677721c2e5988330d12d590d3179f4799518a32c100a21292c78d1c48efef139774a43272847342e9bd3b4d5de68bd8760c4874f7ab6c05ef408412a05a1cd78e6a63554093ae1f16fa4e9fca8e8e80440547cd47a9ae5aa52220b2ce9ac929323c176b43ed7679e587bd44d0eacf10a6f966d7cbb010001	\\x526599a27cd8b1b4f08dd15534c346cfa9546e4d5972d9f6bae4e1a788f1d95c5c89691f9f927bdcf8d940316e4d24431c7120340f05876963310e28e4d8c406	1659979319000000	1660584119000000	1723656119000000	1818264119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-385	\\x955379247a813688aacac648b6ad9484de3f4b9784fc0a22597d7a4d7bb3945e785f114eb781e61648fb787e7cb58a53485cf6e9a495ffa109f7347ece30efa6	1	0	\\x000000010000000000800003bc745ba725dc1cb36cde73a6d2423c1f35599ff13343b87771878f91bd2154f2549d69c3e9641734deea5c020641bf48d0a6477bb4e1c0adce933aafb6927d9372bc61d3a2ed097adbc1c453b28d6dfba0c1b1b453072d6d339cac47f0f8506f76a89016ee67ae11e623201e3e25cbccdeea855afc0a6bfc00d217417738d66f010001	\\x370f072f0c5deeee21e871380bf7c36c5872cd868b7cc161fc4ac019690e7bfe1ac1146ff07ea6474de9405cd4f02ad144b2b89f579d1b4708f53653a7a73802	1677509819000000	1678114619000000	1741186619000000	1835794619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-386	\\x989f25c593354433b69f2b8c796bdb2cdbbe9f28d590741812b21e35c2394d5ee7509bef10ca7596d1f4fe48203e4ed3cf99831953cf49278ef1aa3b2220865b	1	0	\\x000000010000000000800003bc32b088392c287da9e9560ec132d508754d5ee7ca47ddf66ec41c63965727a7d1c3dd161b2b9481b386882419cfb4b49176edeb5ba9857db5a65062d2bff8294d768bf0ed3112ca7dc9b89389ec9e16d8372eb2bf00d664ab3f1bc61e90f3fcd225bd344efe363023c560c87df1cdd59f8656e2c5f05bfa9b0951ad7bb10999010001	\\x896339705e2cef02a3bf90c039566362ef9a6c75bec52042f6745ff4722258eb63b42e9ce105200f3e8f729fd86ac8b1e223a9e10fcaa3215f71a05b7329b80a	1653934319000000	1654539119000000	1717611119000000	1812219119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-387	\\x9aff313ecb926a147f3ccbdbfe0a916ae46102aa1fc6edbfcd119d5a69cce5f52f5a677374ac02a8518d88140de9d62320b0c407b719386d25044432e4a0f8ff	1	0	\\x0000000100000000008000039e7de269c18acb11910d9dc83e2b219424728fd8388cfc0e112561ab9c6530264529b3609444e44fbfab0360587e48b387293f2df7cad6126dba9dae6ef36f94ecbda1734a20d371ef700877ac0af11004a9e8479d99d6fc37c178c52edce048a1fcd5113c07a563f4232c17cfb2d24a90e3921354eda3ff00984ad06d98806d010001	\\xac12036b77e761b82968bd5334d4569670bb865ab4f6877fb26e8737d3a318412ae917495c862522b8bfc45224c6955ca9a72b926f509a4eb45e3460641bff08	1680532319000000	1681137119000000	1744209119000000	1838817119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-388	\\x9ceba87a34700224dbccc5c8a0e7e57b4fd35c20c6f5131c214d4e3b90ebdedbb7d186796d40a94ea60a2747d8651512eedc3a3165821f39e42d62327ba34428	1	0	\\x000000010000000000800003a41a64e56717c1506e94640b2b766cc26512ee6e08306263d13c1643ba153fb63d6398a81d2e4be3e0aca560f44b85b4b1faf705a3cc78e23703c45d7a0144f7cfbdcfa90b1a7ddacc82ca83a953314f0f7887b54342c584dbd6addf086959cd620c8add757757e9beef3821e875f919c365d224c1d2c6da0f5b65a554e2e5d1010001	\\xd515757ded3a8547640f7dfa4d1829b4d254b116a50ff2d401efae5219d066610db0c885139927e67520b5482c212cb385f8508d9dc65d4bb6a20b47323deb04	1682950319000000	1683555119000000	1746627119000000	1841235119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-389	\\x9f539164d2ff15f396a0395c9ab0e78d9cfb0699e8435c2906b4b1095949e2ca81aef467bed7cb12068fe22d2c3d62bbfa166600277121ac6789a3e1d86f7fed	1	0	\\x000000010000000000800003d7a8a8b986cbe815ab4ab13eb2cf85075d44b26b1ffa701cb83a2b2eeb2549fcf6089bb4a038dc93644dea43196ab5da9e585f7bfec1a665e06916f98a121c12e52dd03b61a520726d121c3650249f3c25f054578e9f3806b643d63486f25a1c33fa8c6a66631fe0ad1b2580c8bfc885c8931c3ca7d674a3ebb02f4668385c83010001	\\x829ca8a2e10bd86f8d62695c1ea58834ffa8f157545bb50ca27b6ed11deb9cd969788ceca42d4e57ff8936de9c765f5c8213581558b5cc76024ddca0dfad2e09	1668442319000000	1669047119000000	1732119119000000	1826727119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-390	\\x9f133cf0ca6c2198affef5fdb7e3c46642b322fece173236c66ea264572ba1ccd6523825b0528ded876cc9e4937bcded09ff2e74bd49a6016afbad27e323e475	1	0	\\x000000010000000000800003af923a43d3d91344a033ad97da33d7a8bc231e7df4906ccbe975cf876ba5f653033eba786d823d9af3ac779643aabbab4caa557d1b40e3cf25a3cc93de56a0d14419a8862ee4fbb28c190335884a04637829b7a0aae843af128d36b92f759fd8143e81d70704d614a5d322a28d0d20376d745c3bf63277b9819fb63897ccd789010001	\\xb882f855b7f8b105d1b9e158d90c3dec7422345a279a69ca52d7cd6bd77aed2a790ecef43c932cfb9f96038e0c7ece46781cb54c5d81cc7ac5c6b0ac02a3b00b	1669046819000000	1669651619000000	1732723619000000	1827331619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-391	\\xa5bf5309528f55e82af238645d48ea930f06bf3e676fb44a380a200dbde5d2c04b4732a182a4c85675052bbe54aeb16ddab59b4c1bc9328f69c811eee3960171	1	0	\\x000000010000000000800003dd1bd8827516961b80c6c75f3daaa3397196d2940a7429a3e62a32008cd019e447723a640013f91e8636ddf9ab2d59851bc006b593f1a169a4a9e8d78e107e38f28d8710433ea5812a63a5a0c6ad97c41024ab11eb8f581b9cb6c5204a52c0cb79563b22833181e183cf373d880791fce5afb245d4b923ca608d7b9314aa692b010001	\\x1a8f773ddf85dc14cc9bc93b53b14a6a283a8502db96e14603e5bcb74453338c3537882f75fd135dc3ea024a89647a5796c0a9bb9607667f5e92119bdc515900	1681741319000000	1682346119000000	1745418119000000	1840026119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-392	\\xa71ff03d59de8833a046543c020ba3f235091c23b43fdb28e1b8f8738c8d478c2adb676b4fe8708a9e21bcd6b2bdaa6e829fa7d310f904c70c9f053df3fd9b12	1	0	\\x000000010000000000800003d3cf53ccaae4296773464f2c4d5697fa916af6938b72ae866a75d43234af0f75f82e011edf34f11b706204778d8b3a580a1c4e644957141e00d380b756b99825fe36c3f4f9662d2eadc8a3d5edaa09609226269b0852942e5dd793059120856acf8590c93f6b7f65ba35233290a29d60e8eb198ef384dc06e770dc4862f96dcf010001	\\xf0b6e2d4d9f25af8788f6bdf278d001211cb5cdf32a2d582a2e7ac8b615b8e3ba7f6b4f9223fceb94cff7e1509e769cc82b75aff2ece1af6dcd7801224fd9a0b	1653934319000000	1654539119000000	1717611119000000	1812219119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-393	\\xa90b0cc9839a2fc90103f9f5e3b477ad87e896fe0e4b9bbf2f07920884ea8144b4173b02bfbdebd61b00e044339e7c0a4c87b69a87f2bf2bebb37d247b6d4f94	1	0	\\x000000010000000000800003d779d56b9cad2dd38d6301b9548a49588088a9033a16b4be68584a85c2f44eac32a5aae58eb003d4badfa955a6fb8feb3cbe900d165736ed75ca55c3d00c5e8a17dd39ba73af2ca612f7db5aca96c1d580084414f0523bde1db4cc8d7a0d4d535872e85c11a5b3cf50622dccee76b7275164f9f95e6cde670eb9da084a66e7e7010001	\\xd920cbc587d9fcb94d80095fdbcaaaa6df6108ce204c9bb902878a019283ef6e71e7791d07891f26fd28c9f7d066527aea51a0c47fd2dbcaf3d28e86ad0dc30f	1651516319000000	1652121119000000	1715193119000000	1809801119000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-394	\\xaabf1ca890fbf40d200c410e18f148a45b1da8d397bb72236119b61f003385763a460d9ecf3541ce02abe2b5651eaacc5fd39f5e78ef4d4e41f961ebbc7c970f	1	0	\\x000000010000000000800003c7d804fe44cc9051a0681697a0ec6df420cadd113725f307a12e9b4f833ef4cdca308e22b6d419e7a6c3b284b638a8beebfa0c71753453547a227d7ebdb45776585c72bc7e937afb306164428204408730e6408c44b96d52be4de8568db0a8b9de31b445830aaff64426a77fa1d78824356d24127b8e8ff051340efaa9d36ea7010001	\\x1972ac36b7db34ef147fcd71f298c2024c8e19f6ee12497c5664d741521bd99a95f05c23964c67f02fccabbac11a7c817bc4fd5dca39a1cfbdb550f977d67a05	1680532319000000	1681137119000000	1744209119000000	1838817119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-395	\\xb69b12681ed05e2d76c6014363cb87ff9a67e48cea50693f27f69f17429a4b03ae9dd5d7ba58c6c9b4732888afbb40b22a9f5e02a848416601a7263f72051280	1	0	\\x000000010000000000800003b54f866be5b9fbaccdce8b7200ac718ebd70aede488aba9e99792d9af99e0d486eeac1db42da9617634ff8dd5f1003b5b0737456d16bf9d26aa4a035a37dba78d3b98b26c32fc0b638807023e5fa9263af24d6fb9f7a6765dad256b4b972b00b90099bcf477da8a8d82f9bd8bd60d437dbd2a95134d8c36c565d1524fd4c387b010001	\\x2661476207a79325ac5130861717ad59bc162c1376465e18b6e860f50294908848b2e78f0d681b2e319930f1fa69e5458c1c08398befece06ae53046b3962801	1672673819000000	1673278619000000	1736350619000000	1830958619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-396	\\xbaa380ad0351c3d4bc8e4bc840a6f848936b6227d099bcbda7db80d8fdaa0b60fa2e2c8395a03e0112a50b3168fe5ee899efc151e1c534f00aff3e0b02c3df40	1	0	\\x000000010000000000800003ba846fe2444e6c58641446e468e204702541bf7c4137ca97d816d2d60f5b9be58695d4fd0e552205165993b8c7575f09db2b7de3ce1d50166c2e279b2ba2d9b506ad2a84a6d4ae943025cdb27adecaa597aafbc2b2b5b44b6ec5f9609f9b640354b0f9b17857be0e60558e7fb03c5df2270a90a77531027491b4068e3e987eef010001	\\xef380caddbdb1ea0e34b05a8c69ed587c00cd2ebd16db01c62cfc978a90e2da6c4156bb7197c192ce6b446f21c0c3d2462528012c8fa06ffe9fa97a266466900	1666024319000000	1666629119000000	1729701119000000	1824309119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-397	\\xbb736cf2f899e3edc3f9d155bda2c8e84ece5f7a1bf106bf5297a933d5a46ce4f8573a2f6cd1f71cfcf79ed39d98ec5c5fcead8fc30843214257cfb099dfc4dc	1	0	\\x000000010000000000800003c29e161d4734c7d147278768900f96e8193dce681af4eb94d4061fb725197bf63e2dd7cf15891916c72f6c70cf81c318896ace4a153ab32c97ad8a5b6ea1e94794a57dd027b67f2a519d4ac0961ad8755e96cfa45b1e85c704cb9e8d3f15762c95533fa941647b2420befaeeafbaf247baa23eee518c0d92ca224101f0e4c11b010001	\\xaf659576be323447e8eca27b79cb6d889b8aae7af2e161aeaec901d82c4dbb94b4892a385228bd94a258b93c9632b5fb44f77985abf00e5a992365eeec5b4b08	1664815319000000	1665420119000000	1728492119000000	1823100119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-398	\\xbcab7325912c7c1736ddd629415e1b15c15964a4e901ddaa8277e2346fed1933bac0df3f250665e883c2b950c8a6cc86631aa6328827f18fb3c90deca41a7277	1	0	\\x000000010000000000800003a5d2b1d5040b6d4fe5685ad3ec03c7a18d272d3aac9df780cd462d51be1932177b477b029248686bcd1056b29b25f7a3dd3ad122063933ffa6a690beddaadd08bc8302f6d43d31c16c2788cd809207d9f5c4ebd9ad6b63a0c36bcf2060e7b309421112ea8283bc821a1ea4c8272fc0ccaa1e8f6384b37435d2dd6c9d3294eebd010001	\\xa19097dfb9c7ad4c595d87ee312807b7a5889f690d03d45777e3aad6b31f92e8089a1650e7e25a3e12c676ceb781f3cd52a15384194ebe8b8043235f477c2202	1661792819000000	1662397619000000	1725469619000000	1820077619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-399	\\xbc133eb71f1221a1369cdfec727c701d2075c80cbf4c1a96eba5b9b0355c479417aa1214ee89bbd315fda8141abd3fe0a368db0507c4b242af2695531ac09c7c	1	0	\\x000000010000000000800003c00ab2f4d6eb8c9d0f29f900b5f24fc0e6cb528bb0f470fa22e6d33654025eee5efa77c6ba04fb7733f3932edc042800d4eb2776b317c74ef6cab63f130ee8a6832ffdac3dfeae153b9a57a5b83b68e13d1f33ea0bae000d65472c48185778f73d5df2531362e16d34ab522aaffaab7d57f52ffdf87a8574dc71c26f0046863d010001	\\x92ba45838dad6e7e561ab6cea94d41c61a2f9501f3fe9391d9c40deef4855eb81fcc1c4477860d54817054f74295d5d6c1718bfe6ce3076d7dd1edb18be4bc08	1677509819000000	1678114619000000	1741186619000000	1835794619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-400	\\xbd1bf51bffaf6b8c4fc38dd903cfb92b5a3308fc53d6b5956bbb53a8fe4bb94171e6c62fc8c066e941f3be2e3e9cd6e69cdb9f554577a0a8474297cec7a74dce	1	0	\\x000000010000000000800003c816fd778d1346bd1134d4ee5bccf3c59abf03a1935736a7d59537203eab5b8c1f2f135bf8eaab2fdcf31f5b090ac91083b4c82e87d836e1e43f69efefc7652cdced7e5f597f7ec3b3bc241a30c60597759d6b3fe61d424f955b7d0585d8767b135aa0511527d1dc5b8b0b5fc80a0a26d2161b1ca9614374693b8cd37e35bd59010001	\\x9d5ca8348200a4198f2bbf702488c6495eb897e60c2536af632cfdc27ff77b35ced82339b9f64e380e3975ddb287a867ff99981d8fe8ab82e295e2c7d7c9da0e	1668442319000000	1669047119000000	1732119119000000	1826727119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-401	\\xbe13e6acb0e938292417f0fb01dcc7ee75e7b88409d9f43a7d237c6032ce962b283cb5f3b07c4fceef1186abf1929069143eb2fdb12094a50cc4a86e062d99d6	1	0	\\x000000010000000000800003acf35f3c49bc3a70f369922baf12d4d5461baebbe14f6ea0000e4e91524719913848833ee301d29450d077d08cceed3612b94dc0948a4092820fcf87ca865ab9df15b3b0d0948958e9855a06f44ffde39cbcd71fb6723dc5df9c17a14a7bd14703017f294ebd3f1d3102b7a74b8ec74416637892359e2fd0a635153c0afa8e49010001	\\x836c3a818e641864e9aa094472c6c5ac7a6df5bc8d5dfe2f0e7ac4041ecdd3feb87b4184e960c716d1f1f41142b2e5fae5af82d544d851d35b6ef0a0c1b66e00	1654538819000000	1655143619000000	1718215619000000	1812823619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-402	\\xbe87280864bc1479a5e40278a1f3380fee04ac269ec8f9d595a2236da2e0595b09053f4b56d48701c6d6f1ea85c0f6b3c944c61927359c3ec2adb2a13354ddf7	1	0	\\x000000010000000000800003bd22092459507844eaa0becb4a921bc6dfce7a53ba46b86419aea4d3ecda646a8b9a8fd4728ed75ebec045819111e6e1f657787512698b2a6bec02f16442da65980c5d06c0eee8a774871d8f563923223d2d8330dc9067615ef90da0a64bd1910421fb9dd5245cd3b602b816f7a8aae0672cc1c8d28786b5520856a8aae1affb010001	\\x70c621901fb6c9308fb5c9886df96f6218bea5a30168854ec7064e11bbaf8e9b884e80487f7c7478c5367a579f7138fd03cd84753c89522fe93faec10f9a5d04	1681741319000000	1682346119000000	1745418119000000	1840026119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-403	\\xc54f85f5afbef17ee2dc9db005aef52ccb3dd0917ce7028426d22622779b59ab40c4ede096d162581f047ac29264518b0e84410339d14b57a6d03b623db8025b	1	0	\\x000000010000000000800003d860274396b4521fea693c836833fad6c8a02ec88627b1222cebb1d67b2579ef43971ad41608ad1176f11a3f1d46b7b2bb374b815bb1f221ea0ff85829c71373cb326b79b84acb4f164c5c2b063bf3840983aee0c6a0f5c1bae8c982f7b45d18111be0371c64107669dc57b53809cd2f409b5484598f9e28e6fd318de9e99dc5010001	\\xfc56982e40ad690dc776a1483761a3645b8594f6ccb3adf3cd49e6a027c3546a0f0131c03bab1c8ef686512c1060e4471e7508df615cb7b5608dc39b3195f109	1660583819000000	1661188619000000	1724260619000000	1818868619000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-404	\\xc5db5428a51c88c63e327fb09fee2107f7c525b9259348aed7797b7ea0a75bebdfbe36d59c512a7a03faeb03943ba48d9f3a62126925d1c3d45fecb22b17f659	1	0	\\x000000010000000000800003c199ff3498b9aec4242b5f23fc05b516cd0517d1a1423f7b4d07ee9b583ddb034a83ce501cfe265f12e5b3d07d7dd5732025c20222df966ed544edb86ccc3f0e283299e4ad88e867f51f64cc91ac6090c90b0fc942706c8e9874a06ca12eecd78f684128333a64faaeadec0d7cd6f2112406fc9bc3bb4d5899633fca2a93ab23010001	\\xc40a4488ecff7ebf8236952693ab9163df5cbab68caa7b92932e4523e8e313dd4351da4971453217c06df1e0a80f5f6fe33739bb50ed3cb921b9d1a0c4324e01	1666024319000000	1666629119000000	1729701119000000	1824309119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-405	\\xc71fb650efa6c6288d033506f7c2312f36e19f003bb49836fc64e3bc7c54e04a12928803ab3f14e9de605a087b5359caecf31f5ad0bf9720ccb4a447d6a51e20	1	0	\\x000000010000000000800003c1ce16b49bea299eb145abba772dff79dc13fbdba414f6f7ca854d6dfc471672b6d4fbee630c13c138c476829a9b2266eb985b38e48134434f2a0f95044f8faa14d18daea398872374f34c545cfb48f1e10b0375551fecb2f8c9bbcb8b6527e70bffdae9b8c8c7d14906b4cbd099d892aa9baf8cfcfad92b2699c1b5bd84e7f1010001	\\xece18dbf33cd399126859b59d0df5752432cb88d0dd06c0ef144acb1bacf5f808ea093326500742667c4d3c2f22f452b37acda2e8f443014595ce15bcc06a90f	1659979319000000	1660584119000000	1723656119000000	1818264119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-406	\\xc9d7ba944ea92c67af91c4103f239e903b218976183933c6bd998d8ad4862aef8b88e3c75a5b3cf8e31333fa804884f196f51fa748ebf047198649a12b9e8157	1	0	\\x000000010000000000800003c6c6f48c12a7d752e293eb6cd7a9b31fc426c6c89fd13a472bb9551d30a671fda0763d7102aca0800b260acfee423a9e002568298547f75b068b6377b4656e5496e19926e78fb76fbb88ba59d03b444866ed1fd5bcaeb5a008787e45fa2a295e0f36d6bba2baf1c5c47eeac83197f4f5fa400bc273f522a5a37b33ff902fd85b010001	\\x193b414486090e411c4f4cd34275cf0ea7977f1f6c9237d6350cfbbc3c80a72edb383892fb8aa7a019087c87bda26d51d1cdfe8d67f7d297473767e0eb96e00d	1669651319000000	1670256119000000	1733328119000000	1827936119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-407	\\xccb7a4a314a8ba5b2a147ceab7824771f7beea35df1b345c1248d614eb53df7923107be4546e4ab9af435e30541929bf285ffc8efd34d69ea098779b68b1620a	1	0	\\x000000010000000000800003ddf09b9aa0f1a10fee9ae5da8e481b3f7d8f10b6ec02567786c249445c438965ab202eeb518cb1b0bf32823c2f0c75f1ac1d7c68238f3e5107914cc96d2a5c14369867de040e03133169c5e24fd10127d3b3599ca3e49fb545e1b03496830d2dae7196d13ca232359f6ce5edfd11c994aa33772c5e68a937019f1ce50908313d010001	\\x793173e2cfe3b52c9b64d08610807ccea9c818d99bac949e562c94342f4e01cd47d33da3aee2cb984a47c1e2b2761ab1f37f4aba7cb725b3510137e7b4a55907	1675091819000000	1675696619000000	1738768619000000	1833376619000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-408	\\xd327741dcb8647d3d9402d020803ec4776a9433d11832056dd4bf7b2cc2a5771da9e6afc6464f1c9d65b48783dd2f1d44792fa5f2ce0288e6ae6b63001d2bbc1	1	0	\\x000000010000000000800003b945e46fcec5934c24e3d88dceb38cd56a34078316a46969ea6c949525e36872c5b6bd7f3c4d8d31e642d1c3fa793ad05d43754ca8e6d95594bc7fffaf0477fc03201b8175e8ce9d051ec2483f65e6646d29ed5771c20f3cf444bd45e18794ded6370b7c304b3f6f9145d4ff3cbde0f82d2514caa0899ea208c67c4aebb24737010001	\\x2f669c3574b465c6d40dd5479166eb13946f838dfe949088ae45d045bdd6a3227b3ea3ffdef712ecdd475603326b889988e5266c8b5e0b97f7e5c339a60abf06	1670860319000000	1671465119000000	1734537119000000	1829145119000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-409	\\xd6438032010051e1b57726b1545a53a4bd8179974f94212ca9230ca09e68e4981c2836557fc6a7160f50129cb95b7bec0dba7052b56c26c0ad436183b804828a	1	0	\\x0000000100000000008000039c1320362a5ddb2667293244fdb275dc9322a465ea8f4657fa201ec19d8acd8b554c1c4c6ed5bda1eb6722755da67099b6ee51a3884065ec0737b8bd4f9be669a87c97248f4edb9f35f60586d06d1e59a8b17d8daeec8364e31e5cb4a55be1cfe25dc14a30c6ce5e847a1e1d3b28b33752333fb9b954bff1f2f351d24fa03b8b010001	\\xd6335e7c82b0cbec2837fd6467e77c8eb4d84f59c2500b1f0bee3c4eb542568f4d11f348ad9fa5d7f62bd9017bbd4cc531b907399173cb699166669954faa10b	1667233319000000	1667838119000000	1730910119000000	1825518119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-410	\\xdbcf668bf93b2237072bc432a6c42cfe0bf20dbf287e1ded42ba2df4ce74e802f37ed1c6f82d1c9d4c0453123b8bfe2e8c37d2eb1d646f848d9f55d170885317	1	0	\\x000000010000000000800003cf5f49674483538588832dec1fb0e2811eee36baf08d667bf457cf3da8b97f1d349ef19cc90e0ee144f28bae8ca867fb10f9e872cd17df1743a2be9eff935858cdb4d833636d582401daf526dbaf384ce6263675ee25e51390cd6ee2f2b81924a1fd8f2826faf2aa5284a7ac4012b10c5c84db5e218deedac40613bc141fe125010001	\\x7e1cfebcf3c60f9c315f6b1c7b6e496693dd979dec0cd7e7c83238e49f3446974b93c57ce659398d5a2ae400a09e93bcb8eb04d8862c3605ad473972ae7c6b01	1675091819000000	1675696619000000	1738768619000000	1833376619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-411	\\xdb570337d29cf1c8c47fc0114d5c63a8e90f86a7ff205dbac3a487878043e375074687720075201579cfd8ad85ba15ce9a60f672335404098106c10e0614f0aa	1	0	\\x000000010000000000800003cde684df95dfdb6103e211f74dc2b568f3fac8a12c25ca5da080d9a6d8c3f8196d32205f7017c467269badd63b1f44888f5d33556fa029b22b27b12ccb3977146af95b7634eb9fe4571a170f440aaa595252308c5b4b659deaa563b7e6bc77dbbe40a8b394359e1f52983a5e03c4f9ad64bd57017be1c6d5677329d561552bc5010001	\\x570ccfb19a5ba80d2a8b76a0816b512049bb000f78d20e1016b3d5070d6f9ac31968d2137f921fd4f276161539920105790a7f07b6dda884f7c8a653c89b5e02	1682345819000000	1682950619000000	1746022619000000	1840630619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-412	\\xdd9b8acc5647f73a25a0c3edff218a068d866f8cb8c1042b848f1251f5a39274ec11d3c308975f42aab21f59d0f137418d883ba424145f32a7f653570827f1f6	1	0	\\x000000010000000000800003a3690bbd56921e04774cd9321930808d35b736b6fc138e77ab71d3171e73a246d47a2426be09853353f7031bffaf5889ee9cdeeb69c8ea41913fd3095c8e6dd9fa870128c3f33ec7c897fb8870c2f1b034877b3818840f888a5125583edce3866cf2b4e1b8d942f240f7b54111d737a797da80c64d065be0ed97fefd9f710ecd010001	\\x9341d3bb7a34e94b5679052cfd56b3c6247f362325f8d800f1a07facd66480bd21d5315bbeea6ed073d2ec3d1bb2991c600cc5aae167eb5fb832e05988262a07	1667233319000000	1667838119000000	1730910119000000	1825518119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-413	\\xe25b9e3c47541611c962c2aecb23c65b5484cf2118290524f4b3ece271ae3011029ce8a2db1eb02643cf3f2d715f5f385e7ea604e49756ffcee8b0e94245eb62	1	0	\\x000000010000000000800003cbdabda4dad32af2cf8e638094b7e01290e3c7f192c3dec72b10029250260fd7745dfd1ef469ac42f29875f92fdf97d4a6ca3dc588b3eceb21e347d7cd9160ac26ccbb1ff42fd1ce982f8891b69746911bb8c0fb3279c8508a1898c8c0e3a10b4d7cb03646017c8ac5ff661a60b0f18ce4cf6d19e3c525a5eb136cd283cc835f010001	\\x6091f1d030d2f978c06a9b25844b9b514223765bddd038f3cc937b2a2501cd52e1eee64d35bbbe257f9a540b246dc8e675a9c4503a3307ba2d70214cc44db400	1681741319000000	1682346119000000	1745418119000000	1840026119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-414	\\xe34b19e979f097b82f935212c0faca9b5ed6103aa0abcf8d1db9480103b0681604999b903e67f837a34d58a75dcd20bf29fc9e54e72610da7698f8e4ea39fdee	1	0	\\x0000000100000000008000039abf717193a6341faa29a9d78e901f564f0f3006094df7fea9899a8d1df5db7ff223047cf8bce1b144520ee344c71d72109c6acd93c169af05a5c2ad7aee12711857992605fb40eb8d9123a8125e27beeb82420118bf10959caaef341889093cd0d2b781ace9b90f5a561170ce46498063cb2d3b79dfbf3f51b6c600cbd84e53010001	\\xd5185246c4dfb88f925964c33e7f56b084a18aa2472d170463ab84955cdbf460350cc2b8beefb0bc24c58fec2c16f466a7683b28a24a8ebec9201e8cd597d309	1663001819000000	1663606619000000	1726678619000000	1821286619000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-415	\\xe4573c7cd65f460e6f985204cb31428b6360050b198680a47142e2b8c655a051a153f31672308f429b1ae7c1fa0a3302094c469938db82002b8786b31e9695f7	1	0	\\x000000010000000000800003afa7c1ccede7397f75a90c63ac5097392eae9af374d6241bbd14899fe90093704ac5961eb35a00517f83eecc3bf2bcae6c26839802c1e273518f29ae6d76b963ba6326b0892b2605998ea05709b822aca806dfcac5153cbb6ae5e32e35a31c158ecaad00ee2e9012ec89f4efc1c30a835974750183e82f63f212d9746788415f010001	\\xb0a799b4b800e045a8bb5e62aad7435dc7216a4bc27b5b76214a6dfa8228345c04015ac70f39e7c48c4a71773a177316c38e2132cea96af168d7a668fd921c0e	1654538819000000	1655143619000000	1718215619000000	1812823619000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-416	\\xe5bf306e54c3844d3c5dbff359fc75b4feb65dbd0c64a5984142e6f235965ab5e8c33a0b4f31d77b21db151103c7d3fe0d9ee171c37cb26ac1461b3a5503d529	1	0	\\x000000010000000000800003bc181b4c98a92cf00e5ffe674f84acb3bfb7977f316ca160acecd3e2e1297c3e5e17457fae131960e8112d5d12b2717545ce3a1f0c751f14189478b8938fb43d4e794c137eeb376b953d393ef5bbc21aea67fc12074a5de30b71ca049740f72c6ed4518afcc71d64dc024923c2c2f5040e473b5e1d4a1cba03a410cfa909d479010001	\\xc69d13cfa2f6d0e0afee4c459210ad2f695d75276c78629853fcacf5f194163162b14bfcdd5127f87a201fb5cce9ff1bfcbb283b3d0e7d2139000b98d9c2710e	1678718819000000	1679323619000000	1742395619000000	1837003619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-417	\\xe6879a6a58c8bbf31d06afce331f378d77f3c476ee7f01c0fd47d2f2b5602d42f2471e9314a0625416556f6f305eaac845490087699f5d4dcaaddd392e773a08	1	0	\\x000000010000000000800003c2579622ac5a3ac0ffd847dcd4fadc076220202f2b679b9f29ae5bfde5a0a66af2244aa1608216aba900239592bfd74877c3fe37f96ca18041574294e40bf68127d84ae3bcb9e3b9cb77f3e5db9910df939dbc91ea8c257268aa21e3b33fb0ebac10dcfa4318d08ddbbafbeead47b2238477c06311f73a7ea7f41ce5a63fc56d010001	\\xa03e56f50265531bef2fa3b675099208a68f18a7f3e63f2d29c879ed8b41a243a43f8156d5db6ce85d42d8afb86dbe94bb901118dbf87bcab529a697ece20d07	1669651319000000	1670256119000000	1733328119000000	1827936119000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-418	\\xe6a3150e045163f533655de68c1918a19d8bd043fa03735af3ae3682791def2ab699c92ca0b656ea3d18b1dc6f8a05d3d5ec0d86f100d69d1ccc33b15997e97a	1	0	\\x000000010000000000800003c7e69450c0d9961cab98b2f6aaebc1f45fa1b76cb64cbc388fe6739f04ef804c572be83af61322e4f48932a2ba382d5a37976eba17e97a2418c624ed87f7a29d49ec6cc31c3069e206ba05f2553a1aadc6ea5809e0f466eb12b22aff044c61d49950f3ff91908e841b4b55a59b8170c87e6c525bc760c489c6f115679f1f426f010001	\\x2831685eaf3c106f4f2fb0366cba1aca37320d21f5a663319c18b3907c00e25f94e95550fef0b2bad2b08072a4ed8e83b029567cc038311b810f37c0f4cedf04	1656352319000000	1656957119000000	1720029119000000	1814637119000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-419	\\xed1bfd68c15f6868810c7ccc13979fa7ee21b726eabfd44c93fd241abd387e53c6b6c46a05fbc110940263b49ea5b447a8ee6d28c4ce49e8408f0c11cb5deccb	1	0	\\x000000010000000000800003dabc465fd2d234e2d3f63bf87742da95f8cba4d59373bd017b290b21b822c0c767fa4690281ca6717c7889259b513fc1dcd98b069d1d2dc7e25beb158e46f7a8df8233bdb58600c59e6bdea4dae001775b91ae673c98e01a2cb7b49801d893e6166b46d6b394c0c0f1e9a26b6be5cbec648142e4a213157e68ca698a9d493c17010001	\\x589944f8939bd09740cb9a7ba4d632b52f44f2d8cf63e282433f2ce3a7b86ead45de93e48dd6914488a653e3e098bdf89ddacb09a2fe97b657b6d4454aae5808	1664815319000000	1665420119000000	1728492119000000	1823100119000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-420	\\xed73b0be6225b6456e46050a6d5b46ba38b24d8b35d8503c46f7a0cd0d42d0b0d2955d7f85b10a3c9a2cdc92c7905cf802535a11b73f185589eff89030f70717	1	0	\\x000000010000000000800003cb917c524684bf78cdc23648a748e8c94c289c4ebe720ff4c131e4638f4f694844013eb6b3e2298c27de93b6297924e818b3d1f0e1bb49d3b2d34ed16bcd486050b5ba2c1a83e9fdaf54da202a03aae10ea349f01920447b8800929fff30eebe55203b715f4ed9315f8889eaff43a00b91e6bdc013fc1c843f795ba6596c11bf010001	\\x76cbee857cc1cbb1ccab9b4f0e83ff6a597185f893736d0ee14d85d99479b1ccd0eac498682d47e3a1965b2113b99d4d3ce0ac963fa68e566dad42b529b9a802	1673882819000000	1674487619000000	1737559619000000	1832167619000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-421	\\xf03f3147acf0afb477e5f44bcdb3544206a9641d5ae1d815d71e5fead6adff7f5fffc67ea84d16846005abc380455980b255f4bb410f8c945a50b2a60e9f5ee5	1	0	\\x000000010000000000800003d5fcf779c25b97ad26a8ab64d7d7193a88e147f25d256196a24dffa935294f26cc2bb07206a8fc1ccbab0b594c62841ab731d1b8a7bb8eec631a433ce2ab8b5c49f89d0d77848229480017df8ae18e8b039ae2f378e6bae4ad42040494401b1621ffc67d9846f291003eff8c8aa94ac18322f8d5d64ae8eb8ae2a9db825b882f010001	\\x32e281a5ff9f5e958d321205e5416f0fc763b377d91a31393b50c29e155e94f91bd8584d353f7691f330f2ffa0c64319ee68ed7d049a74118726ede3abf21b0e	1656352319000000	1656957119000000	1720029119000000	1814637119000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-422	\\xf24343054e70202aa0b780d7384aacdc9635e4853bfff5306f5d045b75c0b67b86fa69b42dd86eebdf33fa959fe1dc52c62e233680545256dba111a22e330f62	1	0	\\x000000010000000000800003c29885052737bf99b2bb1ba4aceff1180f2ed36c2ef8b627c960334aeb53951ff5e33c861acbe2df36feadc8080fbef30d1e4a8f8041c5c32b41f1cb3cb09b63b71e2077ffaf10097acf748a8f3535d0bd6c1c44204262e5caa733971cdbcbb1c407c4210a0c160be298e4f7d214f60cf531c5fd0d9235c30d4972a7aee432fb010001	\\xa273d7895cbc42881ee4477f0b37013b4e5d8270a68b684f6cb6bf7ad32c6675debaf975b7be1cb36723b6e28296afa028f3d6593c15c30fea8481ddb5f8950f	1682950319000000	1683555119000000	1746627119000000	1841235119000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-423	\\xf833adfa93d0513688e25d5cfed36a62cc180ed76a24584d984726bb8117b2fec2a531a074aea0f3a3cb1a6397a3186938e6a16f2f0ee0d255a73c1b866ee3a2	1	0	\\x000000010000000000800003b5cb5a1e3db9d683075bd66ecc14573c775da86c6242afcd8afb927d9a08b105fb7a716439afc5061e41db8743bb143d63d2a5583ceb024631d34fa295f7cd2934a13c1d5c6242be1388a5dd2317c99de9a2db07e9505b3069ac66dd7a9a5b92053551c930b84e8623c1f42bac96d85db6cf552aa624d8c0a57ab1082fb7420b010001	\\xda824eca221459d58c541b678765cb1942d0d6947ef20014b138294d3d3ca09b1b9ed3f8b65435f07699b020d67b4f2f28635809247c14b417ef260bc858d703	1676300819000000	1676905619000000	1739977619000000	1834585619000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-424	\\xfd0bb032cce4a9417b9e4d90dc8290cdb4bc2fed8dd67968d3e38d317d1b40eee682c4463f07c2e07e8680289cece042486fc968d0b011a5468ef361eccd4a50	1	0	\\x000000010000000000800003d12a7651a432d3070268d3ed6880ad0b3258bb3947ee556b9bfefba53675e2d0e21a94875afba104fb82c81049fedf4105228f379ff95dc1e10f7082049ab40559ea80da61d356d893c517435dfe7d29d4acfc4db63ff2f5766d023db0fe75722143bd76e536da265cf2578033499a2f451c742ba5f4dfebd318e27e31a90af7010001	\\x8b7b629b130b983123641b19879f706df9a99daff46f49867eb5452a4ce3784d05765754f791f1736053df44f382663d70d20b84e9994c3c4a63c9bef17e0f01	1658165819000000	1658770619000000	1721842619000000	1816450619000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-\.
-
-
---
--- Data for Name: deposit_confirmations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposit_confirmations (master_pub, serial_id, h_contract_terms, h_extensions, h_wire, exchange_timestamp, refund_deadline, wire_deadline, amount_without_fee_val, amount_without_fee_frac, coin_pub, merchant_pub, exchange_sig, exchange_pub, master_sig) FROM stdin;
-\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	1	\\x25d7f52fd910d1ef5a2e3d936c450c9802cf5f4dd2fe153c3794fbc34eae04751da8a895fc50193264ac71b56f6d3a863120f249a0e41f95d7d46a78c7696e8f	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4332a939dc3c977675db40b1afba3bec4eb37cbd6653599edc4718aac09183f78265ba0c2db1376163e0a548ab2b268085043b7b8cbb636fc5477071bfb9226e	1651516337000000	1651517235000000	1651517235000000	3	98000000	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x62f1b06e5afe9ed971811988139c7cb1b59050ccc394173a67a7990e5d08bdee7b0a00105dfa0124bbe467b5fd9b110c021c50b82a909e731c982ff83c2ed404	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	\\x20ecf7cffe7f00001db969dde55500001d2b47dee55500007a2a47dee5550000602a47dee5550000642a47dee555000070ae46dee55500000000000000000000
-\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	2	\\xdd4c0b8289d0b85eca07dbb7f15d9c16142e19c48fb9894a312cf3fba12caf823a428ecc7d3f60a54af21de0d6b2902dbf9c34e3510ab6e85a38c15a3b4fd5db	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4332a939dc3c977675db40b1afba3bec4eb37cbd6653599edc4718aac09183f78265ba0c2db1376163e0a548ab2b268085043b7b8cbb636fc5477071bfb9226e	1651516344000000	1651517242000000	1651517242000000	6	99000000	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x5b65de867efb08b0fb67bcb0cc1d778d346a09ad83ff0baf7a3418d59027e85561a888c1d0109d2bd57000b163512ebf247fc05d872dc78d23a40b5d343fc200	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	\\x20ecf7cffe7f00001db969dde55500003deb47dee55500009aea47dee555000080ea47dee555000084ea47dee5550000c00e47dee55500000000000000000000
-\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	3	\\x28711c7451f416cdfd3150c1f25209a3ea14a953cddf777e2e5a5159b494e3168e4e4b68c3dbf7f7e2b15bec4ee516f7dcd8a83b230cb8928e6ec404405786f3	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4332a939dc3c977675db40b1afba3bec4eb37cbd6653599edc4718aac09183f78265ba0c2db1376163e0a548ab2b268085043b7b8cbb636fc5477071bfb9226e	1651516350000000	1651517247000000	1651517247000000	2	99000000	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x5935ae539e2a1f0f593408241674c31cde642b9536af69c357aba5fbf99728605d45552ce86eb1e90feb41b6a385b6ab75f00f4627dbf9619c6ceb02bd3c3902	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	\\x20ecf7cffe7f00001db969dde55500001d2b47dee55500007a2a47dee5550000602a47dee5550000642a47dee5550000801247dee55500000000000000000000
-\.
-
-
---
--- Data for Name: deposits_by_ready_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_by_ready_default (wire_deadline, shard, coin_pub, deposit_serial_id) FROM stdin;
-1651517235000000	912124204	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	1
-1651517242000000	912124204	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	2
-1651517247000000	912124204	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	3
-\.
-
-
---
--- Data for Name: deposits_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_default (deposit_serial_id, shard, coin_pub, known_coin_id, amount_with_fee_val, amount_with_fee_frac, wallet_timestamp, exchange_timestamp, refund_deadline, wire_deadline, merchant_pub, h_contract_terms, coin_sig, wire_salt, wire_target_h_payto, done, extension_blocked, extension_details_serial_id) FROM stdin;
-1	912124204	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	1	4	0	1651516335000000	1651516337000000	1651517235000000	1651517235000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x25d7f52fd910d1ef5a2e3d936c450c9802cf5f4dd2fe153c3794fbc34eae04751da8a895fc50193264ac71b56f6d3a863120f249a0e41f95d7d46a78c7696e8f	\\x78edb02fdfb2961c8276cd5177678bd352554bb589b6490c0ee09f585e52b77f4aa90db589e4c6217f33e13bb15692ea975e4e03a081cbf9ca8068bbc5088d03	\\xeb64a059017e25c81ca2a5719169a1ca	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-2	912124204	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	3	7	0	1651516342000000	1651516344000000	1651517242000000	1651517242000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\xdd4c0b8289d0b85eca07dbb7f15d9c16142e19c48fb9894a312cf3fba12caf823a428ecc7d3f60a54af21de0d6b2902dbf9c34e3510ab6e85a38c15a3b4fd5db	\\x1f72829c6d6edb253a18c312bf5bddfde6f690081d420bea48d3402b89ec3a343e7960a380af1a8ec4843c63af89ca2527fc18fa7d9d1d6cf68ab56ac780790f	\\xeb64a059017e25c81ca2a5719169a1ca	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-3	912124204	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	6	3	0	1651516347000000	1651516350000000	1651517247000000	1651517247000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x28711c7451f416cdfd3150c1f25209a3ea14a953cddf777e2e5a5159b494e3168e4e4b68c3dbf7f7e2b15bec4ee516f7dcd8a83b230cb8928e6ec404405786f3	\\x87fe0d4963f19fa12858ad923fc980390ff0fb8973a4448cc8f7c62dc4639bbd83d602c6776d057f546a05d4e55d39534342622bc84736c321b44305b3a04f03	\\xeb64a059017e25c81ca2a5719169a1ca	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-\.
-
-
---
--- Data for Name: deposits_for_matching_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_for_matching_default (refund_deadline, merchant_pub, coin_pub, deposit_serial_id) FROM stdin;
-1651517235000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	1
-1651517242000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	2
-1651517247000000	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	3
-\.
-
-
---
--- Data for Name: django_content_type; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_content_type (id, app_label, model) FROM stdin;
-1	auth	permission
-2	auth	group
-3	auth	user
-4	contenttypes	contenttype
-5	sessions	session
-6	app	bankaccount
-7	app	talerwithdrawoperation
-8	app	banktransaction
-\.
-
-
---
--- Data for Name: django_migrations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_migrations (id, app, name, applied) FROM stdin;
-1	contenttypes	0001_initial	2022-05-02 20:31:59.617606+02
-2	auth	0001_initial	2022-05-02 20:31:59.746932+02
-3	app	0001_initial	2022-05-02 20:31:59.840833+02
-4	contenttypes	0002_remove_content_type_name	2022-05-02 20:31:59.859241+02
-5	auth	0002_alter_permission_name_max_length	2022-05-02 20:31:59.871255+02
-6	auth	0003_alter_user_email_max_length	2022-05-02 20:31:59.883052+02
-7	auth	0004_alter_user_username_opts	2022-05-02 20:31:59.892723+02
-8	auth	0005_alter_user_last_login_null	2022-05-02 20:31:59.902632+02
-9	auth	0006_require_contenttypes_0002	2022-05-02 20:31:59.905595+02
-10	auth	0007_alter_validators_add_error_messages	2022-05-02 20:31:59.91523+02
-11	auth	0008_alter_user_username_max_length	2022-05-02 20:31:59.930698+02
-12	auth	0009_alter_user_last_name_max_length	2022-05-02 20:31:59.941114+02
-13	auth	0010_alter_group_name_max_length	2022-05-02 20:31:59.954007+02
-14	auth	0011_update_proxy_permissions	2022-05-02 20:31:59.965557+02
-15	auth	0012_alter_user_first_name_max_length	2022-05-02 20:31:59.977777+02
-16	sessions	0001_initial	2022-05-02 20:32:00.000481+02
-\.
-
-
---
--- Data for Name: django_session; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_session (session_key, session_data, expire_date) FROM stdin;
-\.
-
-
---
--- Data for Name: exchange_sign_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.exchange_sign_keys (esk_serial, exchange_pub, master_sig, valid_from, expire_sign, expire_legal) FROM stdin;
-1	\\xc68f16bb4ac6c8328a43ea2059b4faec49131d177d490d4af31d62af42e78a23	\\x6f485a1a085fe97f446b66451adca1f6ff55b931eb487ee6e64ee8f7cbb7afb5ca4d3acee20c5c38f7cfa10ace8f8b1feea1a736c0cf521c3226053df066990e	1666030919000000	1673288519000000	1675707719000000
-2	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	\\x5c46764aef393066362dc49bbaa54d15ce826c6929709cf64f3061f1526d2df5f8b895379451ef9e678bc5213e4aea5900dd69d1ec66ab21aabccaa1b49ffa0b	1651516319000000	1658773919000000	1661193119000000
-3	\\xe8acf0f257771e5fd777911bddf36d880c1893dc3af07164d5ad0c81924b508c	\\x0964874b19b615a99696dc1a5bbfb4196d65896b7b6d97529ae0c99eea5ccc2e13c80c3c5b572df9ce46078c98d0889da127e37d9fba9fac89e06abff42ef50b	1680545519000000	1687803119000000	1690222319000000
-4	\\x726368b9bde90c5fec7b3d3770084db2c736c3ef3aa3bf94aca2e83bf4c00e3c	\\xe0e1638ffa4803861c580a8dc5ee5aa9967bbd77885ba8e4ddf4c49aea87a88b9a80e0fe29b9a80843768c68a7b568694efb9edd2955ba455ec295d0837f1e0d	1673288219000000	1680545819000000	1682965019000000
-5	\\x99b3417a4235576dd96fc1ecf625c8c02f839f14b3214bd7dd5d2a8a1f7e3e13	\\xea914120053a83a129e12dda4097d5c94423bd1a55cb93327c7921fe1b396b8834b18697868c2897175cbeb54b5c587b7a8d87f71de89ee7a2f2d92ca372dd08	1658773619000000	1666031219000000	1668450419000000
-\.
-
-
---
--- Data for Name: extension_details_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.extension_details_default (extension_details_serial_id, extension_options) FROM stdin;
-\.
-
-
---
--- Data for Name: extensions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.extensions (extension_id, name, config) FROM stdin;
-\.
-
-
---
--- Data for Name: global_fee; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.global_fee (global_fee_serial, start_date, end_date, history_fee_val, history_fee_frac, kyc_fee_val, kyc_fee_frac, account_fee_val, account_fee_frac, purse_fee_val, purse_fee_frac, purse_timeout, kyc_timeout, history_expiration, purse_account_limit, master_sig) FROM stdin;
-1	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	0	1000000	3600000000	3600000000	31536000000000	5	\\xbd8816912276876ab311c7f654d1bb74eac2bf74739438ebcfa860e079e42e0bcfed965fc527ec83a0b2e8f48eddf1c14bbce174f63bf4799491dec78e060905
-\.
-
-
---
--- Data for Name: history_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.history_requests_default (reserve_pub, request_timestamp, reserve_sig, history_fee_val, history_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: known_coins_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.known_coins_default (known_coin_id, denominations_serial, coin_pub, age_commitment_hash, denom_sig, remaining_val, remaining_frac) FROM stdin;
-1	199	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000008f166bbf0fc39ac6b1d46f80ad6d09e9271397df3f33a24a87e00b5e2a1815ebdf340a2021038f2bc8d855cb87a5910acc528314fc45b339c3016e442fd1b26a20444aa06c4b52d5982695574cec15f3fd7fa287a0a18c80a06ae16a1862528df2d5b9d7442e5ebaed2a74a26fb0a95288ba4395c75b75a3ea4cf05d0079b11b	0	0
-3	358	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x0000000100000000c0138a42a6556b8fd388b98133ba0452ffa9c907e3fecfe3dc167a1323ed10a4048e2e22a43ff98ae7556aaec426cc2e175a22f0435700cda98a1de99a8fcda7fc7f3079cea83ad1acbac160422dba9416618e3a058b6a83def23c7f99519b241ac69ad1aba5369359188be6387a3573eac4a86f8123756d18bfd8413d5c4a4d	0	1000000
-6	393	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000009b01f3106d1c2eb08b376fab79baf9bad4ca66fe720217f2201a6fc09cf5e4fa2d4fc3e45a0add7164004d5d50e22fc86c0c1cd2e780e9827f61ea70a0e93eda64b567f1cbf87e75a35060d5389e55d116ea3a8e8f61046d658692e561dee7e62f7bcd81d24e3800e87409ba9019826cfcabc7edeb1ee87d35b4df4c68033a1d	0	1000000
-\.
-
-
---
--- Data for Name: merchant_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_accounts (account_serial, merchant_serial, h_wire, salt, payto_uri, active) FROM stdin;
-1	1	\\x4332a939dc3c977675db40b1afba3bec4eb37cbd6653599edc4718aac09183f78265ba0c2db1376163e0a548ab2b268085043b7b8cbb636fc5477071bfb9226e	\\xeb64a059017e25c81ca2a5719169a1ca	payto://x-taler-bank/localhost/43	t
-\.
-
-
---
--- Data for Name: merchant_contract_terms; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, paid, wired, fulfillment_url, session_id, claim_token) FROM stdin;
-1	1	2022.122-034EM9RCCKTH6	\\x7b22616d6f756e74223a22544553544b55444f533a34222c2273756d6d617279223a2268656c6c6f20776f726c64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f73223a313635313531373233357d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f73223a313635313531373233357d2c2270726f6475637473223a5b5d2c22685f77697265223a22384353414a454557374a425143584556383252545a45485658483742365a35584353394e4b375057385743414e4734484746565234534454314750563244563143464741414a354235434b38313138343744585253455633445a324d455733485159574a345647222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032322e3132322d303334454d395243434b544836222c2274696d657374616d70223a7b22745f73223a313635313531363333352c22745f6d73223a313635313531363333353030307d2c227061795f646561646c696e65223a7b22745f73223a313635313531393933352c22745f6d73223a313635313531393933353030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a224e594245504e4e395a3543365a4b4d34425444375457524439454245365445325945313253544136474a48425034485651435947227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2251355257415056475254423141363848483553384a5131545a4d4231334151395148315333563934545a35323535574e4d585730222c226e6f6e6365223a224a4836315331304441324535345757584e374243384b56524e464d513734304e5248523435303442515043483357584552535747227d	\\x25d7f52fd910d1ef5a2e3d936c450c9802cf5f4dd2fe153c3794fbc34eae04751da8a895fc50193264ac71b56f6d3a863120f249a0e41f95d7d46a78c7696e8f	1651516335000000	1651519935000000	1651517235000000	t	f	taler://fulfillment-success/thx		\\xca90915eed155dc220a34a7cc4a88c78
-2	1	2022.122-0205YGEYQYQJ0	\\x7b22616d6f756e74223a22544553544b55444f533a37222c2273756d6d617279223a226f7264657220746861742077696c6c20626520726566756e646564222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f73223a313635313531373234327d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f73223a313635313531373234327d2c2270726f6475637473223a5b5d2c22685f77697265223a22384353414a454557374a425143584556383252545a45485658483742365a35584353394e4b375057385743414e4734484746565234534454314750563244563143464741414a354235434b38313138343744585253455633445a324d455733485159574a345647222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032322e3132322d30323035594745595159514a30222c2274696d657374616d70223a7b22745f73223a313635313531363334322c22745f6d73223a313635313531363334323030307d2c227061795f646561646c696e65223a7b22745f73223a313635313531393934322c22745f6d73223a313635313531393934323030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a224e594245504e4e395a3543365a4b4d34425444375457524439454245365445325945313253544136474a48425034485651435947227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2251355257415056475254423141363848483553384a5131545a4d4231334151395148315333563934545a35323535574e4d585730222c226e6f6e6365223a224d435a313631435456354e5456433837514d4332364843443531415839383733424d4756585154475a5a46533452465846584147227d	\\xdd4c0b8289d0b85eca07dbb7f15d9c16142e19c48fb9894a312cf3fba12caf823a428ecc7d3f60a54af21de0d6b2902dbf9c34e3510ab6e85a38c15a3b4fd5db	1651516342000000	1651519942000000	1651517242000000	t	f	taler://fulfillment-success/thx		\\x9535e79c9b91f66d98453f5f7d27509b
-3	1	2022.122-0129HBSR4765E	\\x7b22616d6f756e74223a22544553544b55444f533a33222c2273756d6d617279223a227061796d656e7420616674657220726566756e64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f73223a313635313531373234377d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f73223a313635313531373234377d2c2270726f6475637473223a5b5d2c22685f77697265223a22384353414a454557374a425143584556383252545a45485658483742365a35584353394e4b375057385743414e4734484746565234534454314750563244563143464741414a354235434b38313138343744585253455633445a324d455733485159574a345647222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032322e3132322d30313239484253523437363545222c2274696d657374616d70223a7b22745f73223a313635313531363334372c22745f6d73223a313635313531363334373030307d2c227061795f646561646c696e65223a7b22745f73223a313635313531393934372c22745f6d73223a313635313531393934373030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a224e594245504e4e395a3543365a4b4d34425444375457524439454245365445325945313253544136474a48425034485651435947227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a2251355257415056475254423141363848483553384a5131545a4d4231334151395148315333563934545a35323535574e4d585730222c226e6f6e6365223a2235303743303032354d355458365a57334b5037344e583839514a57413453315a5646574130455046574a364a4547384351505030227d	\\x28711c7451f416cdfd3150c1f25209a3ea14a953cddf777e2e5a5159b494e3168e4e4b68c3dbf7f7e2b15bec4ee516f7dcd8a83b230cb8928e6ec404405786f3	1651516347000000	1651519947000000	1651517247000000	t	f	taler://fulfillment-success/thx		\\x5f62d7deb35f75c84d74f9f23d594584
-\.
-
-
---
--- Data for Name: merchant_deposit_to_transfer; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_deposit_to_transfer (deposit_serial, coin_contribution_value_val, coin_contribution_value_frac, credit_serial, execution_time, signkey_serial, exchange_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_deposits; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_deposits (deposit_serial, order_serial, deposit_timestamp, coin_pub, exchange_url, amount_with_fee_val, amount_with_fee_frac, deposit_fee_val, deposit_fee_frac, refund_fee_val, refund_fee_frac, wire_fee_val, wire_fee_frac, signkey_serial, exchange_sig, account_serial) FROM stdin;
-1	1	1651516337000000	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	http://localhost:8081/	4	0	0	2000000	0	4000000	0	1000000	2	\\x62f1b06e5afe9ed971811988139c7cb1b59050ccc394173a67a7990e5d08bdee7b0a00105dfa0124bbe467b5fd9b110c021c50b82a909e731c982ff83c2ed404	1
-2	2	1651516344000000	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	http://localhost:8081/	7	0	0	1000000	0	1000000	0	1000000	2	\\x5b65de867efb08b0fb67bcb0cc1d778d346a09ad83ff0baf7a3418d59027e85561a888c1d0109d2bd57000b163512ebf247fc05d872dc78d23a40b5d343fc200	1
-3	3	1651516350000000	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	http://localhost:8081/	3	0	0	1000000	0	1000000	0	1000000	2	\\x5935ae539e2a1f0f593408241674c31cde642b9536af69c357aba5fbf99728605d45552ce86eb1e90feb41b6a385b6ab75f00f4627dbf9619c6ceb02bd3c3902	1
-\.
-
-
---
--- Data for Name: merchant_exchange_signing_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_exchange_signing_keys (signkey_serial, master_pub, exchange_pub, start_date, expire_date, end_date, master_sig) FROM stdin;
-1	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\xc68f16bb4ac6c8328a43ea2059b4faec49131d177d490d4af31d62af42e78a23	1666030919000000	1673288519000000	1675707719000000	\\x6f485a1a085fe97f446b66451adca1f6ff55b931eb487ee6e64ee8f7cbb7afb5ca4d3acee20c5c38f7cfa10ace8f8b1feea1a736c0cf521c3226053df066990e
-2	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\x47ad02a8c69cd47f05a8dd35e227ff48bb5129bcb55b44a4d8626335492424dd	1651516319000000	1658773919000000	1661193119000000	\\x5c46764aef393066362dc49bbaa54d15ce826c6929709cf64f3061f1526d2df5f8b895379451ef9e678bc5213e4aea5900dd69d1ec66ab21aabccaa1b49ffa0b
-3	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\xe8acf0f257771e5fd777911bddf36d880c1893dc3af07164d5ad0c81924b508c	1680545519000000	1687803119000000	1690222319000000	\\x0964874b19b615a99696dc1a5bbfb4196d65896b7b6d97529ae0c99eea5ccc2e13c80c3c5b572df9ce46078c98d0889da127e37d9fba9fac89e06abff42ef50b
-4	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\x726368b9bde90c5fec7b3d3770084db2c736c3ef3aa3bf94aca2e83bf4c00e3c	1673288219000000	1680545819000000	1682965019000000	\\xe0e1638ffa4803861c580a8dc5ee5aa9967bbd77885ba8e4ddf4c49aea87a88b9a80e0fe29b9a80843768c68a7b568694efb9edd2955ba455ec295d0837f1e0d
-5	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\x99b3417a4235576dd96fc1ecf625c8c02f839f14b3214bd7dd5d2a8a1f7e3e13	1658773619000000	1666031219000000	1668450419000000	\\xea914120053a83a129e12dda4097d5c94423bd1a55cb93327c7921fe1b396b8834b18697868c2897175cbeb54b5c587b7a8d87f71de89ee7a2f2d92ca372dd08
-\.
-
-
---
--- Data for Name: merchant_exchange_wire_fees; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_exchange_wire_fees (wirefee_serial, master_pub, h_wire_method, start_date, end_date, wire_fee_val, wire_fee_frac, closing_fee_val, closing_fee_frac, wad_fee_val, wad_fee_frac, master_sig) FROM stdin;
-1	\\xaf96eb56a9f9586fce845e9a7d730d4b96e369c2f3822ce94684a2bb123bbb3d	\\xf9099467bd884e86871559a62a7f23b6e876bf084a30371891b5129ce4440d3cbe27afe387d39b2ce8d9625abd388517c81bfc8da9f2e0f8c9471bff65a802b2	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	\\xc4bc53a23028f8d21026f07e7e7176f581de0cafb26d3f73087e9507301db0a31e88659125340f8340fd433118c0fdca78cfb42eb9920f50ed8a9926cab95a03
-\.
-
-
---
--- Data for Name: merchant_instances; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_instances (merchant_serial, merchant_pub, auth_hash, auth_salt, merchant_id, merchant_name, address, jurisdiction, default_max_deposit_fee_val, default_max_deposit_fee_frac, default_max_wire_fee_val, default_max_wire_fee_frac, default_wire_fee_amortization, default_wire_transfer_delay, default_pay_delay) FROM stdin;
-1	\\xb971c55b70c6961519118972895c3afd1611aae9bc4391ed24d7ca229795a778	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x0000000000000000000000000000000000000000000000000000000000000000	default	default	\\x7b7d	\\x7b7d	1	0	1	0	1	3600000000	3600000000
-\.
-
-
---
--- Data for Name: merchant_inventory; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_inventory (product_serial, merchant_serial, product_id, description, description_i18n, unit, image, taxes, price_val, price_frac, total_stock, total_sold, total_lost, address, next_restock, minimum_age) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_inventory_locks; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_inventory_locks (product_serial, lock_uuid, total_locked, expiration) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_keys (merchant_priv, merchant_serial) FROM stdin;
-\\x057f4ad21723346862205c2817a77ca37e36521585bcd12c1781358426935bfa	1
-\.
-
-
---
--- Data for Name: merchant_kyc; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_kyc (kyc_serial_id, kyc_timestamp, kyc_ok, exchange_sig, exchange_pub, exchange_kyc_serial, account_serial, exchange_url) FROM stdin;
-1	1651516337000000	f	\N	\N	2	1	http://localhost:8081/
-\.
-
-
---
--- Data for Name: merchant_order_locks; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_order_locks (product_serial, total_locked, order_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_orders; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_orders (order_serial, merchant_serial, order_id, claim_token, h_post_data, pay_deadline, creation_time, contract_terms) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_refund_proofs; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_refund_proofs (refund_serial, exchange_sig, signkey_serial) FROM stdin;
-1	\\x497919a7c8bfa0b1d83cc8328af737efbc2fc8304e2f94d01be746dfc2db2810da251f97fbb8da539098576b9511ffbb46066b1002555a6838fd1b976987b801	2
-\.
-
-
---
--- Data for Name: merchant_refunds; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_refunds (refund_serial, order_serial, rtransaction_id, refund_timestamp, coin_pub, reason, refund_amount_val, refund_amount_frac) FROM stdin;
-1	2	1	1651516344000000	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	test refund	6	0
-\.
-
-
---
--- Data for Name: merchant_tip_pickup_signatures; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_pickup_signatures (pickup_serial, coin_offset, blind_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_pickups; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_pickups (pickup_serial, tip_serial, pickup_id, amount_val, amount_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_reserve_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_reserve_keys (reserve_serial, reserve_priv, exchange_url, payto_uri) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_reserves; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_reserves (reserve_serial, reserve_pub, merchant_serial, creation_time, expiration, merchant_initial_balance_val, merchant_initial_balance_frac, exchange_initial_balance_val, exchange_initial_balance_frac, tips_committed_val, tips_committed_frac, tips_picked_up_val, tips_picked_up_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tips; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tips (tip_serial, reserve_serial, tip_id, justification, next_url, expiration, amount_val, amount_frac, picked_up_val, picked_up_frac, was_picked_up) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfer_signatures; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfer_signatures (credit_serial, signkey_serial, wire_fee_val, wire_fee_frac, credit_amount_val, credit_amount_frac, execution_time, exchange_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfer_to_coin; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfer_to_coin (deposit_serial, credit_serial, offset_in_exchange_list, exchange_deposit_value_val, exchange_deposit_value_frac, exchange_deposit_fee_val, exchange_deposit_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfers; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfers (credit_serial, exchange_url, wtid, credit_amount_val, credit_amount_frac, account_serial, verified, confirmed) FROM stdin;
-\.
-
-
---
--- Data for Name: partner_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.partner_accounts (payto_uri, partner_serial_id, partner_master_sig, last_seen) FROM stdin;
-\.
-
-
---
--- Data for Name: partners; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.partners (partner_serial_id, partner_master_pub, start_date, end_date, wad_frequency, wad_fee_val, wad_fee_frac, master_sig, partner_base_url) FROM stdin;
-\.
-
-
---
--- Data for Name: prewire_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.prewire_default (prewire_uuid, wire_method, finished, failed, buf) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_deposits_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_deposits_default (purse_deposit_serial_id, partner_serial_id, purse_pub, coin_pub, amount_with_fee_val, amount_with_fee_frac, coin_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_merges_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_merges_default (purse_merge_request_serial_id, partner_serial_id, reserve_pub, purse_pub, merge_sig, merge_timestamp) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_requests_default (purse_requests_serial_id, purse_pub, merge_pub, purse_expiration, h_contract_terms, age_limit, amount_with_fee_val, amount_with_fee_frac, balance_val, balance_frac, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: recoup_by_reserve_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_by_reserve_default (reserve_out_serial_id, coin_pub) FROM stdin;
-\.
-
-
---
--- Data for Name: recoup_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_default (recoup_uuid, coin_pub, coin_sig, coin_blind, amount_val, amount_frac, recoup_timestamp, reserve_out_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: recoup_refresh_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_refresh_default (recoup_refresh_uuid, coin_pub, known_coin_id, coin_sig, coin_blind, amount_val, amount_frac, recoup_timestamp, rrc_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: refresh_commitments_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_commitments_default (melt_serial_id, rc, old_coin_pub, old_coin_sig, amount_with_fee_val, amount_with_fee_frac, noreveal_index) FROM stdin;
-1	\\xaab4fd264c15497ca138ec28c6ba767f22ce0da5769fd18a9f3ebebcee75bbe7b375f8c52717817f76ef899d34fbf6c17e5c1b3830e0e955919a8b2603e4c806	\\x1fa895a49dcc46823e6e3b57dcd9c0a30cae46c2908715be2a4b2acea3a3f58b	\\x4955b9ccbda1d7a7a98d6978026a908f0afecac448e82211a92556cdeca50a2ad25baef67fa3b64c519393cb0ef77c8df63cb6b12f6a883d90ddf43c2a663e0b	4	0	1
-2	\\x37fb5d0d5327304768fc15c6926e1c8d3b921b8ea3b2fc4a09d8179a1c0e411771db0e4743a108a8f02297e1f84b31f16ca264bb510f67e60624b7b6bd7563b9	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	\\x1722003d502a1dd7f10f144ec49dd1ca0390f2b6250c56eb85e0203d62441126f261bc3e8b5ced7489c35271bc7e988e36169261b57074910c683225af7fd703	3	0	2
-3	\\x3156cf11f4fa1c0da8c454278c3c57b07253d2c9bcde786f20b18cc2f40c0992888ee851d9a6d713be96600d30e0cce0b9e170153b9f1b1c277ff6080d95f7ef	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	\\x50cff39180dff75da02cb442a27c4b17764be652da18726146601bf6c8febab47e01fd0ad28c0fd8f184ac3a90bc61d4f23cb127ba71fe255b4207f30479190d	5	98000000	1
-4	\\x8ea1a3dcd194d512f6773776d51bad77b3b8d446343ea7a90ad5479cf76548fa3f2b0f372057008a14fc222db6f16ea62ad041f32eddbcf856d461a7dfa237ee	\\x26216aadcbbc75f182255f28b581cbf635fab229c76ca40c7979cfea50415459	\\x536f114a8324b5442e11430169d79e1a49707d9ef9e1176fa05da3e2b076ccf9112ce18d6ff84ddb7a17367de9e1a424e01b5ad7ddfd919cc5a8245b02307d01	1	99000000	1
-\.
-
-
---
--- Data for Name: refresh_revealed_coins_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_revealed_coins_default (rrc_serial, melt_serial_id, freshcoin_index, link_sig, denominations_serial, coin_ev, h_coin_ev, ev_sig, ewv) FROM stdin;
-1	1	0	\\x75cb05c730d63449fc328f8a5ae1dd7d03991706e2aff9b0274acdadc2d1ada63b6d512726c72f6fa3997a55a7dede937e937c554321cf774e4454e1d79c3402	235	\\x000000010000010077936878b2a5b403179a585328cb694aa08b1563df9ec05ceac2852397179aeb83aa19711df2867eac34fbb4e14cd56c02de9f547476b9856d27be45b422fd1154669e0b2f91e8d50fb4e4c474528cbc49200711f6cc2e79f65a34c1ab0e9ef89626b2a6244a3719b944941a2c04f4cdac89cf0ea15ce5f0ba9d1f2ba525a995	\\x7622e94d0d0de53e90564576f4e1009228ed704a176f2a6c9cc616a2f7902c5a8a104190e35cb4c7a62723a36c1b2aba1b5e980ef7be6487967cd4c8d8ddf9a8	\\x00000001000000010d8db232ac6e422541401c4bc585d48bcf510e46d9ba8ae494ebbf107293b5c857f5d3dc02a9e68744fec47648c9dfaf86a73edc320505ed39f83ba92c311f5cd4a0aa8ee4deba6aaedb375c55e0341856110a1193c4676999ca464ed4f5b31a954a4d687927031ff30f8c8c50a7ca64b01f60f490f6f5684e2005f76446902f	\\x0000000100010000
-2	1	1	\\xb00d66dbac9c1ddc4236f05f7c54d04790701630a6f4412692b6a7a597c230752d87641b89f01b14b8841a1f2c9adb084a30ed96de6ce89dd89ef535fd5e4403	144	\\x000000010000010024843e9ed3691d8a4fbff82d95f33041968d2504ec483088ea954f16dc738a7f62e5b4f7f73eb3e131d252292d5856148bbf60e8548f567867f232ebc61a01f1d3326746b500ec2a7473e3ca7322b0d2d4b6dc9c11ba171a60f68d59ad7002aaac907909aadf7a5f85e355300a8df21691b52b35a119247b7b88b0ac279baad8	\\xc2f95d47b7945f80a783d0260577abac3ef38bef15c8c346aad07119d7d742117d7880c423aae3822910ef18847116bc480ff93ea16cd0bf8494ab55ab99335c	\\x0000000100000001c4c107d403aecdbb7ef392ec734b80f6b88ecaa785deef6819d2d92681fcd4674e82908f7ab9a75acf9a08037db0abd54a1e821e969d7728978078721cd4740d67d9991b73d9df0cbac0cc1ec975eccd5c4f239d98b59c89d65aa8c53531a55518b5c44652a12cd9aaf39a19ce841018af6ebb705764815f9cb74cee98adfb0c	\\x0000000100010000
-3	1	2	\\x3e1127896ba0fc0094b89db3326b654109420eb1c69f640c5176af6c8b20746206c4df3a98efb7c468728047214bd6141088c9422c96071f4b218af4fa4e8e06	45	\\x0000000100000100506c4317b956c1fe017ed4a6264ac57529f090714dcd64e50bfe6b5b41316292d95b992e38bc952f09b46c8b6542b8c3e8d0dc6a855923960e2dde2f0d9b6793aec50be272176a302a4483778019386b07a9e05bad61cf8f561568f01f4f0327c5e1b997c671d49158e4cb4290c837b5b264718bee6ccbfbdb2d3e87a516ee51	\\x769b5e7d681845ff40539f81e160543b0930772863695c022839117bb282adc58ac919620f08eecca482723e77bac1d8761305e73ddedb772983195fe2f8ea35	\\x00000001000000019095b9cd48360f37ef664479835795bdcd8eb03aceca94ff1425a9dbd02b5da491a73a72ccf3138dbfde17710d3b492c9544c0cc5b8c5c57ed5b3f0f07ea4e7d454111c67008a4c4031ba7a63a50cf98e1f1c2235222329ceb5613359b6bc2d29c6791723d786a702c53e7af9eb3e506f035822f48604aa5d168d754cf4ecfb0	\\x0000000100010000
-4	1	3	\\xd7d460835db827709de6d340a2fcf259005fac83272356592ed217deb1523c5447f9efda053c4563b7f5173e5b693b5f8452854090018f78f4af7d654884790a	45	\\x0000000100000100807e7b459e5f7dfde8e02658edb9a8be1d7cf8bceaed76a0376c14167ddc03a15585439c309a39202b048c156804fa004e70299b9d504dd4854bc85852296ab6578c19d0f186ab4a5e96ebce5406b4dac94950ab18e7a7b364a7f520da1e66e642c2a39bc20e5d270cbcd9cf66eb23aab912058d84ed39984e9e1fb2b34bb4fa	\\xb57e800bb30753a52e22503d9a147f1a7916327342dc4e8626ce24a0b08fed684aa8fef55439ee0d2b0362a4dac2011c53b527af99783ce3a8f3d09d142e3cfa	\\x000000010000000158787649b1466bf537e9f24a7f592c7a6138784ca3413f3eee69e8eef311d3e2cd34a5c9a04aeaeeb9d59f9a175a6bd53029f6bf036f8f740d580072e34acc249219cf4465a5c28a19b87be25329bd49ecb18f0743e62c5bf9ac6b9a2b551359758800f89ab595985c0b272dd74a0551ff6738b9b5c50aacd340e4fdb65a20bb	\\x0000000100010000
-5	1	4	\\x12a9648cd80ee62fa0bb1bb94f8c5f574b68118e59a4ca70ddd35135507dd2fcde994141eeb9ab50518e916f944d38ccb81ef4c70d458aaef85f66fd378f0009	45	\\x00000001000001001329722f0432d5ab1eb3e1cce2a37e3af9ccfc92d5b795e18f532a7893ccd0e50b6f6dc77f17e8f71a9ef3a9b356f6ab7626cad37025e9899a400b87e3b556bd8d70bdee050ac252ac67c720139cc30684e5e704ec93fe5280bfe918db9b39031d67868c7d22197ac8a545d885961f65d1c027705c68ddf6cf0fdcb3899519e4	\\xa44577805b3ab2fc0545766b36cb48ba6434b8e12a0151e378b0a0bb8ca686183fd426069b5a9eaf57e2b4ef35f13a6f4f3a3153fbc0d185d8e3b53cfee9f4d3	\\x0000000100000001616a4a5a3e309c8bd23654db70f6da4a11d77f488043a5442482446840bc99012696fa1e60094ca10a3887b44d85568c4f096e3e973b09d056b91377d3e63ea152fed78283b33a2ad1f208c0684bbfa83979b5e042861256848c845ca61ab3d8c3e92024319b0d8a4568773cdaab389b8b59da1991911018b67bf6317c2d01bb	\\x0000000100010000
-6	1	5	\\x8029661fd2ec7f47b8cc28a9bd08fda5e874643a8af215aae67da4e45a974aa51944b3b91cf8dc574db3f7e507f0d0f41dbc49093a49fc3e5720081c69e64f0a	45	\\x00000001000001008fd135282614113528016ae2d5c79ed43f8e4d51c376d2265ebd67b22e1764a92a3d7f81c08775c2ce0a7268e6679d8ae2ba5b01548174a79403dcb9455eee5870c4bdc2031bd2c246e00dbe85c09cdfd88a98d8461bdbea22355d477ad2fc769c3902dad49b637239f0798a56e67d53c4041dffe4027da609527daf5bcaeab0	\\x38f1703770edb3c59f454434371e8a0f409b89fc06e7dc611cbffbc2e1ffa3f2c0b2363bc5d394bca58f4bd72173d818417b93605bfff65397bef011ea846edd	\\x0000000100000001a861b77bf19f26d453496f5954624369861ae5b8c802d289c402c2b280d5f45b00f9491913c3448ad851a0e3010c3777d46401cb1bd6e38b8a6033e558a4da4fec445f6db0053fdd440aeb4691c4ef8e671dc1503b4bc558ec641fd20077d4db51d78cbf3303f8286740f3dd6234643ff7b5ad2fcc451eb9f4cf5e1c86054817	\\x0000000100010000
-7	1	6	\\xa62c28412aecd93405fa41d8f71181974f7adf4fd65e1d3330215433449ce5de4de505e44fd113232332271d6f98c7e5d97e53a42060e87566f9137384c8590e	45	\\x00000001000001008283286c35075709835d943cdff8b4ccaad18dd098e7aa50c7ac0df27dbef274cf61bc5ec5bac68b49cc0d6956eecaafd44ba6338b97f970f286df2b6a6a0964824c5bdea7f8bc84fb58e66c3adf81182f36561222c6d0110766a923ec8c6af9227830b27da4f7d5adf21ea7443c055a718150bb80b4585b8beea7f1e460b811	\\xac5330b3a561540d59f64b2f990502fbdb40e5b4664da3d46ccf01b0890881b0f05f34f1c347a74c6121442a131c4394e32465a60baaee258ed46cf7c9a62469	\\x00000001000000011d532d0efd4983a8be9d74b30adf08441ad00cf0a5fc410e2c4ab3be4e93c90dd12b54c1d5ea092dadfcf640508b83534497345049a79f3eac087a630699ffb3076620980e900f4c6932235bd0469b7ae477bbc15ebcf886830cfa9dcec199267d43d694ce674e69b4fb7aa6e4d9eaf4ba497e46d1c0cf61f7de03df48a63712	\\x0000000100010000
-8	1	7	\\x23068705ee025b3bc7937a65175e3a0bb811a3cafca67479cad8fdc70b724a5ec230b61da668bca7457bc8fb2b32978025192569a985c15813e99100cb18580c	45	\\x00000001000001007a5ecaac18c5cd9d5fc357239b33e10e72835014486ad2ead05b1f760b4d91d4ea91ca5867a0d67e0372db9d380a5248df1fdc95c7a42f146b46e2e14e1999d073775ff0272fa1e30a64d129ee0e5a8d99460ec7902bfda595e36a4d74db7dbcb8d7ec8ddb70157b5703f735a2237d7c564cc5ab733ad772c4df6b32d33f23f1	\\x2c0cceb1d435a03efdd368cb998e5a798a5dca23764d4fa07aa50bdf57bb722b104857142403422f2a4439b9cd2d660127234ca123200604a80bd8070570a588	\\x00000001000000017123a15853e086e535e56c137232bb6032e8e6d5d63e7f27a2177b0888be88598350aa046c046199f285050835f6555b9b0dc46888e2d4450b2d878eb01cf366b879f61999280c3d933bd13469227abcb687b0725713ec41ad71c080c8724934be04a201fcd58683a41048719194384aa0c994e407a054624718cc312bd28424	\\x0000000100010000
-9	1	8	\\x25455a9dbc8e8d250293cbc0479cfe4791fbb3b0eafe7704fac5650fbfb2bd80408f090cab2b6de48d37646b7eaa5ea4fd83efd6e9193f2c8596f6c4a8e1cf07	45	\\x00000001000001001802dd4f17cbb1c3b0e55ca8b1dd218605f4fbdf27e9797e9f8e27cd62c2d07f14a0a516fc7127d8b408cdbfb25af8817384afcde755ef99b4d7ed2ed323eb104839ea924c2e10a888f3c1b10d6b239808be26b27b6f7cfd8373328455db502446d4a8b950e787f35b4ab16676883d61e65c30417dac787ea39348581e764850	\\x85f0e0be1240cba1983cc543506c6bb8735a2d0853f7082daacf7bf5b9cba3f972a2a665a2f69accf1802df568db30e82323deaccf02056262bf82451d2cf449	\\x0000000100000001a7e7663fc189befd11522d6ee5da0e492fd34c0c1b6fe23ef68446a12cccc48c09d0d10422b7f7ecd5c96bd62ad57771ac0d844f98be2f0dd698c2b505b197597c76c3655a95dbef4be4803125e76830bbcdb6f5f8b0e9e71c621f461eaa92cbb0d74dac3fdf5a2716a77d3bfba7d0dc35b55debfc5256aa87a025235ccd138e	\\x0000000100010000
-10	1	9	\\x26da52a57863b47861a18f3b0edb93ff578d9cb706381c6fe0bed79321f84af252eec3f609a624d89fe5bd6e73a127dcacce12384528963459f1d2ae03a2fe0a	45	\\x00000001000001000aa9c01793cc1b5067eebc0c6110fd319bd970eea3581e16ff5dca9c0efdd1f9476427d6d914f4ad32b9a60e1376df174ff4f8eb640d70b390ea6536a74aa1010d0119f1323b93a66e2762fc4f8f1ee99be7631664b786a9c708d6c6e5bc5a77731aa8995ae46ded1ad061476e3ff7d7a09f95c50ee46cc675898ae8da0336b5	\\x5c151a8cadf4b3df2b7fb54fbd4085ba6ff4abee8f3426bd0d6dc95bd945024737f454dff91517d13c95f7094506626bd1cb9055da1fbd6b6254f5603a6cb52d	\\x00000001000000013f98a4e41f9a5e29d74d13413933328e02145ddc1a6213af8a7b92cc0ad4de95cc36aa760c77dc7aba850e21a3eee8f47a2842ecff105bae8fc298e0f5ffd4474e77401b3bca73b59c47a3b49917066db0d434ca48f0472c6199193b2af46fed6c56082962a6e21d75be568f9b0ff4312cff4952bbbd82164d2eda60debf8e82	\\x0000000100010000
-11	1	10	\\xc8277985c82f99b513465c0d4e83e87f84ffa56408b929cbca41e1930ca2fe397656457c883af065f677bdf8a7e3c2f0dcf5dc023703f2f4f2218259ab9fd30c	145	\\x0000000100000100992d4ff543651c5983e7cb2920b25b51a7e79b2738953fe39e2459b0b45e73f88a56a9aa6d7e94ab8763920844c567346aa72dfb72b431a2adc212b9230cd3d7b87d1275d131787df9a7f230b94ef4a098d446a9e88fc34b3a6d4549d8faa7a3f09a16f394ea4983d945618d9f9c962aa3636962bdcf767d0fc9054aee85c1bc	\\x365383b9bbe8f9230308e91dccadc22ec7c1a998baffee9a76276307e48166394cd69e33a74b62d0cfbf448ad0558da3be19d295d3c480c2f191b9db460de119	\\x00000001000000015ddeaf04595538428df596cefaca747ef3b16a534c733c3d2823de08e0a037a8f26e0563dea847d293750748832b22e26d3190148737e0ae1ecb73d91bb4e5275dae8477c87d61be53de523ea50e421bf527279ff0831813330ad960fa4f9cd177dc6e92bd8473fbd0f82cb3dd10c9fb338dd9a52566d7b29cfb61401d937ff6	\\x0000000100010000
-12	1	11	\\x2e58072126c0cfd10df2de1a6415bf56d7d97f2b16e1c459e18a07afb73b05b95b042954e43d1de64201f0f6ee69ae9846c5368790773131111734e5a16d1500	145	\\x00000001000001009498ec0025dd357781d6019b5ff1b411742109ee0f2b9698a3d0c24a89fd563346f67d05d49be420ac3dbba8ef3cab59d3d3b23d2e078e8a24448aee27cd4cb9365d674f18ba50c2cef16108d3483744165f7d95a1e68fa5db3eb14af930dcd42a1efcc8586be5bf17fe896e6e2047b17405b264dd99ff95212a89542e0c8c1b	\\x37bc5098a08c9efef3b6cc15fad91a7d5a2c34759db45c0f70e67980f2d2882608e00c91fe1827e8455f2e72a0b0edcc1adf7c10587d3b581294eb72e25fba0f	\\x000000010000000159d5d07084a86c7fa3a52daff4848c450317e6150ca0042ac9578cd89e22c5e19bbaba6ae76db7ca0d0813267fc026073b50f0ea0213eac38155ef65b7b9c159344433155539d522302768a4485e2d12d0d742cc649d82581519f6bd55bbe1ec34bab2a2005c48c01de3fd9d93737fc62a4db1393fd530bbfa1fab3bf5432a00	\\x0000000100010000
-13	2	0	\\xdfe4a845f5126062c35bde1c68a90d794f0b7590db0af03f8eba987835ccd00c81caafa2ffe80ca7bbf0300d10b94f0866e3c5db92ab6540365d1575b7025e07	235	\\x000000010000010015db3f4b8e13611204a7f00d09a5d610ec21fb57b67dfb0d6fb00bfdb378440078de5c138e48afb6da7862e4c24ffd4a05ff07f30da1af486497cb8f7ab38e7e6011a9b73aba51d665cd2baa76ceff3ca8fd4c73bc06463110c67b320cddf88bb9746c79fdff78cb675e43aa176b4047e13ff1c9b80a40d85899c5251293d1d2	\\x7baa3fd9fc40a860ce43b0caf89aa555756ad263968eefc6b13bba95f7c8ff514dff12dbdba3bcf69cd9783fd8144eb0d24cb6785813e56975c89d476b598eb5	\\x0000000100000001117a585e5aff929bbfd69af3747c54694ce321f5ec4299a6f38af5f058ad7f95c92af156c567b1c16264d00d9f5934d08d8ecfe8ffdfbb4d21888fadc39c6c799143017ca374441ae9f6dc8d1557b2336e1a00188a44e7ebf16834c075347a98ef34e2d49c839baadacd24d006664788dbb57e64789c937ea8c0d47b38ccac15	\\x0000000100010000
-14	2	1	\\x7ee45b4b5ab9827df44079d14409b403437a7c3baeea6aeeb68675b8a76e4069c9420d4ecc1695e0c1c98815d7169a09df25d049caa504710ebeee08781a6308	45	\\x0000000100000100a4dd31e73376c49d7ce0532ab1fe7a0b24384a761b51e05aa89da0305553727d762cfff81ff4e71a1a685d61a49231ead41d552f53c5521ea04a828d836466006391f7bf337b107394767c4698f704625e08acbbf13fa5a24d6ab5e506bdc667c0b08b5f81553fc7ba91f8a67e54de69971947405db3dd1888bc219cfcd86ce8	\\x7e83790578a7ed662bbe005f4e451a22d60b92457a9f17bb46d639bedcf50bea7e7419a6959cbf26fba3d985d735dc2b9f39e0f1b81e4f37acde471b84d92989	\\x00000001000000018bc20f8b32e0ad9485e082e05a9b33efae371678de0e670903aef555a60a0d0c3547a0a4ae1feb7b9e7bf7efd7be07c327e65e854790d0d6881f3666d0de98723e873873639f22c4b9e7a77fd3eb492c88492246ec43e6e02879e8aa421b32492f1781efe2b258711e8133295f1f381ba607461d3d0b8e9a09f1cfed0495cb63	\\x0000000100010000
-15	2	2	\\x096ef8aff103081ac04c9368779f95898f99221b989d4677469c2ca2f2251b9f6092c05a90ae20fd4b648f0a8a7db1699f883e622e12da667da8b6475b1f2302	45	\\x0000000100000100b10016edf7f7a0e8043b8ef08dc6dbacdb30bd13e6d742603f511ea08f093f84fb1ef8d65bf3527a9a778d7ba9b352d9156e0e60742ea5e2a8d27015343dc505dbcbc8792cc96362af814ce5f8cd82ce641dbeede32f46a1e2c9e21100c825282d534bfe0450cb4624213c504242a2beaf3633f52234ed6933372886bf980f3c	\\x167cd17265f812552104d7da51b714b5b7d437e1fed09e3e24e65cd59eb04cdad391f4f3e838c6ea6ea419eae503ab4a3fa326bd6bdf3add0118371521521dc6	\\x0000000100000001ab21e2136eeac67f359fba5580cd00d37d72f107250fefc8d5a6e425686d8c69b1ac8131af58bdad9ca1f6295fba34e1088a124e0c8cdff1cba9259eef9fec23e93ff30b68ad17b1d9a429abf21d7e8c3c86d485277b1e06544660008a40554350b8848ab90b7be32aee52a0a1fa2273be72a56d9ed1a6d48d20c840e014b890	\\x0000000100010000
-16	2	3	\\xc1568703de609c71596b5c9f31e3763488ef7cdc16d657678efbeb1b30c7b65122e56c00a4b7971897a642aa542d8b2ef0166604be61259008f5f0e2cf439207	45	\\x000000010000010052a5067cba4f4f17d751497a0217d16284f184af5172138d6e9f80342fd2ca0a5f0b7fee074a32db6ac4d565a7fa26c057651bf05a3db8989a290f407a81c3737047e19869bbf8da6f4510602a75a47ea6955365c978bf95d8c5d3b537dead42914f5cdd288b3875586fdfde27c9e4ffb5389ecc48064caad3177c9e2b0ae8b4	\\x293f76951fe21f9fb7fcdbdcab9524a4707ebf10ff3cb20dea1103f9cad1c627768a6ba8afb4ac67a32c3cf0fa312257c74f6f8924ecd1e30dc76efccf6dfa96	\\x00000001000000017bf33709ab38945790ecf8fd4007eb618f2c219ce3638508d16e139b38f99576567af6f4845076343074dd5659ecf846952dc5a2673c218412314509ccb057f36066450f7764498a65b50691c5ce0b166de462e717b1ce661080f307fc8b18e571a3fbed4b0eaac41b57c783083b1f212d629162c66293b59dfe46d2b71ec307	\\x0000000100010000
-17	2	4	\\xfdfe84da6f6aeb9d1d6ab5fa38937105b5da3d3bf14262ba2095c470c625e116c83d5f032f01110800118c799d48577598c17420aadf9e2ac12d410bb37b1f02	45	\\x00000001000001003199ec5895c65c5a896fb5096fa7903bd681dc856979e18ae7db08c9461bc9b35446ae958f32e3709b53aa94b14a7128f8e43759e14189524f6422c26744aa4ed97ec6e2b9a49df494e338d7da7ee7b73b9486f55218eb330c36757c2bce51046db4c25ba9f0a352836c8f7918f26fb9175bd4e5d81fb21e93e3887ce4577e66	\\xfc9df5d159a3854dcf5793a3799b3ef7f515d5acd1a31e492575ad72c6814f3ed0d5f0e453c75a75219462eef6504e35b819979d58b0ed51e0f0221f8b6e7ab9	\\x00000001000000017d36e2b112980afef2ba690a14b4debe6a9b4caa6a861ef8e65e8f26dd0d8058a385e45505ac85c6c1225dd8546b8429b20220a692336de10cb94e050d36951bc86169122b1b3a08edcdb58ea147bfa7e3fef3111008a2d510d59f2db2a6523e44d20dde569cd1fd2bd670d7864e484edc3889a42c6b1b9a3bd6980ba0b67616	\\x0000000100010000
-18	2	5	\\x1b7b60bffda96681f49ac35297fe4f046e907b6ab6ee23e092a1a8794ecd9ce048cf9b02655e7493a4fd1c491e01568a8d4106d9027b1def6a25545bceb25003	45	\\x0000000100000100748fd0756093a0be093e1ec8cb438dff0b1ee26db2fe7885c75dfa4d466915b35ed50a50200c7674cb734cb774962b6908b44909f513f4a3f180bd49368084a56ee4e0263ac93af654440aee912c92c558631d3bfb16e18aee3e4a109d5888b920c1bd4b80731e1dd21e404c96b28cd02eb60d87817743ae70f52bc7260d0c5f	\\x1a9d27050f9508a1a1410f32f54f3eec83aa7e874262b60b8e3deceab1cee46ab80245efa2e06095040faf2f3ddaa4a20daf460c1373eadcd3054d511ce0ba25	\\x00000001000000011f817425456ed2444c2c39fb15a58947d212edcf05b31a0a7d6c9ea11949d34407bb43c77be83faf5ce3254e49541180fd71cd2200cbc265b86e381687022ce0794809f498271488f356cc70dc87af80ff4ec6cba4056e40ce9f4c9a81ee172e4950e8e74c9e0f70dd949d0a005dc781905f0bbf46ca794deb89bfe6cb57c3d4	\\x0000000100010000
-19	2	6	\\xe8d2a9d8ea6b40cb08a5b581fc72a2615ad93e712e45f2934839d7b9d4fb800431edaab8c87ce7fdb7690958ce93222193be44bd7cb8bd977db72ef0fab83505	45	\\x0000000100000100515b6dc148d24930d47ddd772be06c6db7a497bca21d997fcb75003791db1f0618ab3c0b9f7d80b92536541f25a805f2796c151d3c26707a8811070762388de235bb412c034c6568d95c82b94c9f9517fcc4fb7ebf94ec42fb2d0c626ef109ef6f7e3276e5b8982f0ebb27fac7ec82d0d091ad7a1b8fd9f570928fc36f48f141	\\xd45b7dd2d9681123fc3f86f3698478436d19d4f4d598e1acab938536e8bae968d2aa8a61a75d72d0d86697ce089af18c5cc087457a7c16d87006fe7e9510b997	\\x000000010000000196e540a858c244c70c2ee72afe8966d929a2cd5f2f3c2c61c2f4a5695b57461b17cef39e047ed276be85eb0654efe7a4ca34e877f9850f6290732b8e916d728854e4aee3af8de2b26e2e59e173285fdf0a6c391e3334a6eba94075dbe73638e9fb867da833beebb46a94829554e55a8aacd5175117e3f13647ba516ffa828524	\\x0000000100010000
-20	2	7	\\x5762745f3cf8b882a8c0fa11ca609f35b01a319f08d36223c85ed4de483dd86dc17d53c13b1528ac65178147e0a63f23ba2a93e5b8875d17bc7736233ea5230d	45	\\x000000010000010046cb6534af59af4a40c182679635aa5f362ed0ae015482fe6521c71c52673d530b23afbf3bf27a4291d4ea6ff8a1664934200af5a4628e89826a08db3da7a533e113ae7317e9a8afaee4ef26146cdda5de090a93488c41a18284156dd545258b80877bfc16cf66bcbd67fd075743b4dae5d55406f71ef7343620953cb61e3915	\\x13cbef26c16ad683a07dca5d22f65b16c0d8b526bb14107b21d58858cd8d62188ddfa54400d0967456f845e306df7d50952c0dd361eec91d6958bf5a5de5160f	\\x000000010000000189c5d9eaac94878f16291e5320307e6f69b2e29d3a8aba244436e4920097bb502aa086c8f8e666169c80b76188ec57a87d3aa20ca1c312cda82520fca9de33d2b181a4686439bc2a869dd2b907d9d8536fabb5563d1911b83d03aeaf86b05fd5947965fd79e12c856d37dee92ac94f00cce5161f49e36f27b1640387fb339e9a	\\x0000000100010000
-21	2	8	\\xb3dc3b4829bb480e3763c02f07f53ab2b10f532b8cb7361a8889ec1425203403895020a698cc68efde2b651d9fb6ce5292c0b281c73178b70887c48e9b59e90b	45	\\x00000001000001008159b5b09a06da283c431e503b520f62896aa91820199bdc83bb2b63bfd757aee2dc0519abaeef14fff9defe71461bbf118e778952304a68bcd20395e71935df7eec7ba15d87cfe0751ae945efbf1981de3fdb88f7aecb0dcd5ddd1a18bcc01ff8c3f7999900c42621e126bd1576b40e42396f3f9f135058686f9aba239fcdda	\\xa04a741196a194ef279696c037fea9da87746331f50d656e98f3382423b2d22b51cbeaabac5151a7a725bd4acea5002941b917a026afbdd0a3be45097bde9098	\\x00000001000000012e147738e56debdc65a3cc4dbde25cdfc3c7fb61060557d96275a6634f0b07b3834e344e1ae4a1afa3a9cc2e631073a2f34e5cc21a154e61cc426f934120614b2de15b18b959e4ce3d5efdda7fc700a6f0f10e9944e6fdc6fa4269e511f830c1fdbcecd5530d174e7b1266e8cae5030b4ffa371b5a552bbed8acf27307ad38	\\x0000000100010000
-22	2	9	\\x299e50501e120ab617fb066c5a1f7af406cf7b662ffde992450365ece92ad65319780a1a46dffe33afd9b11fc11151bd13eb909ecfc3c4a8798d5182a5fc9d0a	145	\\x00000001000001007c74f7499d6a6f2a492f08b533f9440c37b1b848521dd65d0b3f90ba9b0e3e8b27a541f1efcebf25f0f22305945db3485ff4f5dafad506bbe36c42afe251acdd827a166db82ad1af84422be1ea21edc96643c06d210bd001f3676eb7c1b7816270ac173519dd752d523ee906021058ba811e04be3526cece8b750dd265b28061	\\x84071be50887a3281f4b504a3bd959341c2320ed1b74e75be8c543f8905e4da1e2e2abe71b94a5df8ba005849836c11acf8dee0bda86afd89392cae97014020b	\\x0000000100000001385337621e9f1aec2c4934e314e86d0589a4e2fcb8a80b5d41dc81264e6d7a972fd348022c64e6dad22a107e7c9ed6303953fb1abd0c6feafeefa774ca077b641a16818164758ef4b33edb68d2db5e169191e672d9c9de9bd5e1779a59090223f2912de7284b03a5f4f0d4cae315f3ea5f9d4edaf4cc924e40ac5bc1fe1f410e	\\x0000000100010000
-23	2	10	\\x3c8e85a7b59937ebea0843a80ccb9fe4def3591708edf9310cfb8f4621b06eb2febe478135f731060704ba767d2dcabb2bd170df68ad813fa367ab95cfc38b0e	145	\\x0000000100000100a97ce5d9c17dae9ce74b18c16b95a1b87bcc133e399d985c527244b4f5a0b7d0b7fee626f6ec01f4d8f11570f5e8ed86a526bc3a426357abc32fce46a7b2a9a5195ea979798237122fb636e16292fa1a8dbad003898b571815a26d4bace8960950f5898b941d4cf455ea8c8efa6f8f5fc233beb4679068edfeb33d187fe6b299	\\xf5a0846c05597c409f4eb72d0a84f8756823899ba1038e945022c98b81034dbabadfbe1d3f09b6e059d1098f22baf358bc09b29c48664c87aed31ff9bfeff162	\\x00000001000000018c6bc8de17e1604cdfde5ea652a6cf82faaf0f43a100d785510d235e1a6c2b83269513e9c4e2dea22195f8c44de3bbf8c30611846c00ec9abc343a393ad062f210a2e5718dd0c4d8bca735b1e59f21163e32bdc8eb830c42d854cad77a5d85943abec6ec5880403a02bcaa90b11e1c46b60fed91427fa967e847753af8ae15f9	\\x0000000100010000
-24	2	11	\\xa112af33f7de699f63675c578358a72b5ba355e91a5bb981b1278b2f63c152fa51f1d2f85d24da11d210817ac74d8aeae32395637a8a23962ef0e538fd44330f	145	\\x000000010000010001833b95e8091d32d39d85469b5f84339614bed029537f0ba2b3cb016a10bf40da9b4767ad0367c6610ddfac6a12b9a34772217704f5b9c586522231c78cb28053ca2f7b00a3f841c2a7ef1a23b1552c2eb98570c67bbe96031f50e0f2941bbb7fcc60cf326f02e67f4c81b28e14a773fe8ec0bb48e6e5589d62cb14ab03d5b8	\\xf7306226b8bcd17d048e0694e3d8730a5166d43daa52b1e2afcd44f627d5232a92e618d9984b02cc7d96f9e6e76941808ea6a87dd3e4237c394746b2b82e6341	\\x000000010000000155dd77fb900fa7378e26e93be69d1fac7a8328497a8b7c9086bc8d8cf228c1f299d00ce1c3169738b66eb850813b4a717aba58e83bcb86669c55efc17e7a1687607bfad0f983511d7b072914b6c8a0246a5a7efc48c786f2f53257ca9e8eacfe40014a00913c743c9e4f027032d474e30466263e5f987b68fce1ccfe915a0aa0	\\x0000000100010000
-25	3	0	\\x4287d29c4563c8d732470d8354440e40c936d0ffbee517d9aa76c914cfeab563c63c8133da9e4dbfd69b19d6f77c1ce018add66a94b1408e1576a3d02d551501	393	\\x0000000100000100c91d509f553a25187f87e227d416a02497870dbee0a3d54fac838bad3fa52f005beae495cf7330084c5fd824dae61c3a234f196d3c2632bbfa7592b88b0f6d08cec916794b8aee0abd4af9bcf6e19b751c29af733a42488e9fae99726739d9ca1e24d0347b52e6de67d427c4d3919cc2303afdce48c6e5df173792bed9872847	\\x90f459c526f21530364a828f0deb9fda7d6559d1bde17927139723538116572d7c6436968317a73e9dc79f4ddf5d81faa5d93cd56f9b8d6b138aa3edc3be36f6	\\x00000001000000017cd2ca97eb075bd39c3cdee8624134b6415d1053e8a1f56ef4f3d8d35ea278cebe93b79be50d3596cce622c194b6b12136ee88ff7d99706ff5d95e86e9d4af298536ea44bb1ec96274329628b2e569551170117423243e99b9f94009321d716713e452bf000a59213a33e922f7334dcbbc7a1addf539afb8f394a7c0c05021dc	\\x0000000100010000
-26	3	1	\\xffc85349aae5dfa0befea5ec60edd0e8e5a21a40aa1a95bdf7701f09f7281383c9ad037ff925bc044732f3f952d35da806e3acf53a97357bd41d145390ee590a	45	\\x0000000100000100ab8a025dcef1c598aa21739a49b0be005297214d2e7e832c719f7f54e3076104e35a58aa85bbe267a122a37251eb4743e0dcdf22a3ded81c885af04fd95720f2d3b9ffb31fd8a3418b88816173b0855feccc266b5d3f1102c07410c83b4fe716999ca181abd577f92794816d7ec89cf912fb12cc59887516373021ffe5516b3e	\\xbd7df3b54d992492068623db872786edc9541f1dcb3c73800da8071e0b8553df9608db99d517f4bf1359e263033528248436b8cc29a7a4975e975b6ef09cfcff	\\x000000010000000140116c1b6005ac1e492d0c67ab76767a2bbc600f3f95a74a7923c2760fa30d7cac00e8a67568dbfa8a40bd9e66a116b943a9a4b9e7078427bf1be73cbb1e8cffbec8a080187eb5c32882e5cd7fec8e023899bd0e9f5704008853ffef0bdbae4eae5c0675197989e581a882f699c3c0d8c295751cc9e310746e3b4d41382ac10e	\\x0000000100010000
-27	3	2	\\x98ebfaccecef5609ee754b6fe38c27fb131d8e70c056e35e99d0a94aaac6fb18c7a7fb13d428e9a3230e341048c93f08891b579fe63c38ff7446ec314a729409	45	\\x000000010000010023dc57aae00d04f2d6e7c7a8ae18651eb8b7aa8de9502832069566ca78665d82e675f376837d4e71ccb74af1b8737bbe5d5690be924e87a25fe87ae92b873ca7a9fe050564588155b012961e70dc5968d72660b5dd738bf918282addcd7f95fd7b281b901540a19020a36e180593b3dbf4f4ba90cb4ffe39f4c874bb85f55f04	\\xc676c05522b1fa1ac49f618ea4f4c65abf82b1d77bcdea664904122a38a68e3d838bb35d009ee024902c8f558406a71605366f800b6f383fb5fe811e74934fdc	\\x0000000100000001358cb01bd11cc275fd4ca67f6df4bc400dc1d932d2b61dccd8347b6efe079ec6380e0279c14923350bdd4fb8e32a8cbeb0f224dd3608e3e14f40e59b2a31fc7f2039769e22ccaf524f5cbfb5ac82f18e955b4d99b52321e35c3a49efcf264a48793f112717199ce03bff4b0732d61baf6d1a20c388bfe1337a5fdac1cde7a2c6	\\x0000000100010000
-28	3	3	\\xa6c4ad8a55f0faa049b02b1af027bb915ca63318c726ccb3e5702efcc03a36e8849213674077183c92ba044276fd98041eefdb25cbfe619089b014c96777de0a	45	\\x000000010000010097fd09dfe1f96b505ef708b74c3ac5388db4b9246b1abfa279109eae4439279c523ebe49aa1305678862a53f790f91cbec6862877acbd2865a9182624d87450ffbf8f4a3d8146d003ddc0bbaf9183124361bc73c256d53edacb0cb23f46752fc0456ec8c175367e5a47fb5e14426f693e120c632174526e0a263df0f794666b3	\\xce7b2b1c04bf293e8ac9b5feadcb2e275397ffc54f17a2c64b139ed3a2bd18fbeeaba75646842de3ab381f5a92bedbe497d2daaab98b949798c9bbea513d705d	\\x0000000100000001aad43ae985f804fa607e0990f1193eb1ae75fc5623197a8038bda7e2dc19285825722844369d3e3c5784ef76d628010d411f4782122bcca33f78d2f948f13cea196736688c71ef76f28e6b2708b3fa678b8aa5bade83b0292c8881d8a1bf196cbc48d4d32bed799107fa6353d14be5e7f8b4a7278c937012f590e76a46eccae6	\\x0000000100010000
-29	3	4	\\xce09c5a53ed43215de3e09a3ee39b3e3835ac3d1c31719086158fdea7046f4805d2a4206d0a62bba50bbef3035aa69d2d22e27aedceec61660d223c9271aa403	45	\\x00000001000001002d129a0717ce98c376bcf978211b17c9153371344eb21d94d214e257572adca8a4e015d8a07dca7bc4df99ccc0ab8996a5e1914b7cec0a397cfced5fbbe08fa692cefb1f8f7c9329adecf0a85131887f266803eb35b7871b9fb0945ee3148653e691e82c8fb71f417d9e5ce11c305ad5f4ddcfa03e4491a5cdf08256e9caad05	\\xedbc3c5f54a916877963ed1ac20283c5073851503dd050e8c6f99bfad603d21a2cd39d895b2fdece001c56b2829e01782778d2c6024a2009ddcd5b35d09586c2	\\x00000001000000018ae2b2f74b85406a6645ed3a4c5231984a72b1ccf39d281b32594460f4f86baf3296951cdd401bcd59611478996916adbd057a03ca3295c2c95aab1b832c9816450a309c2bae1e772a81fda6a1f04449276456f3dd13b2abc86ac765653e0412b317370ccbbb7892c95158767f253a75b881aeac75f2603bd203807e235d7ff9	\\x0000000100010000
-30	3	5	\\x28f882118955ab2684f63c3c2f359be94c7a4917ff7142f9382a261aeda3972de9d5c997c1b11a7238c197aa961f97f79ef3898705400463bb2a349f9e8b9206	45	\\x000000010000010065bb0d760b22264a4c44b7229ba5e457f186f7c7b041b3977607e7151d74c93043be6aac0b5a0249d295c8f9783cf8a2e2ac791d58a86b23cb6d3412b1ea6b76d529eb2b6b8f5f7fc02d074eb5c99e34bc4af399a76e60626c575e54447c4486947328a2f1184ed304cf589907611c795e9dcdc047536c85831e9d4a49d977c8	\\x3437f776358692b5cefe1eb04e99d47677ad0f36c9c31bde9c367fca9c9df5bb42c0c584175671a55b8214fa529d99d93074247112c5f1c863e4aba10a941a69	\\x000000010000000138a0dbcce423e5097ca41290401e106051ed40d48c0718b9a1413aa37eb07be09d5e1b79f641d64970210782271891193301393aba544428f0f74822ee2e5e4db577b9784408b347cf3ebc7432a00fd280871a16a986b8e444412aecee3501c41a49443c0f5fd6615b988e66f158cad65fa5d16cccf606b9d707ba87e28cb635	\\x0000000100010000
-31	3	6	\\x028a863ca7c7647e7d67727415768337e5954cde2fa9abdfd8cd42677d14d7ae18870283a0074c526c5aa488e2be27c41692c36888a523bc6291116be563520c	45	\\x0000000100000100379eeb247f3550d807c554c3116d47135b536f03a55c6ab8402c339d6e43a42155a1800ed6e8da2e0931f6991ecde0459baa9b1c486765c481302a5415769ddaedba6dc57b050d8fd8883b2f302368cbe7e39e4e7a31dd813c56b2cdc1b916dc5d6bf29af1542ce8ca4dc351e00b1a98762679934a9b28531da4f8e3c1d85895	\\x8bf391b76706df44b2114617335d6ef3431224b7fba09076e7773482cb25451528782c3bc612c10c0c969f6e92a531475893e6d53dbe654fa8e2d05867639a6e	\\x0000000100000001782d6aad7045cf31f3bbfdddd7f3b232b6c91f8ef8d5839ef4ad280bf88f57eb344ed7c64da5f9a8d1728f5708a7224dcf8389433ce6e03705c89fc3feaccbba24b2b912ab73ef0e2ef38b03110e2b748d32eb5f058a971f80fb9574f671f593b8e6ac2e66efc09f7415e0b2662c29a6e53a527a204963e144e15618f320b8dc	\\x0000000100010000
-32	3	7	\\xc4b724d126ee14b16358e8ab61030d8bdc631fd90472ea6c1538ae37577f2203b3f8451e29c40473a1a6fadd9b8021023a0796912f0abcfa9ff48f2eede85e05	45	\\x00000001000001002746bd111be97bd8e30a1a75b79e400b31e8aee2b51b977ecbdd407f3dc9b69660742278006044e6e5778c0cd4f1a3ab1223f2acc6bbb930bd426bee7c505402eff070ceb6936ff52a4629a1488fbad9d3aaa9a59eb3e0ad45cf1b102e4c0ca9cd76368669d49c6984445544264f8ce45fbd2aea6230632e39913216e87f3db2	\\x07ada5b209f3284ee6c0e1f79e9125c29bc1b6389bf7c8d0331e9bed35922230cd7aec9cd97ad7191a5ee95f9c2405926fbff71460972890ca9f0b82c9defd8d	\\x000000010000000107eba992e6996cfc3d9494cfa0572bf1c212f31da76933ad66f9f88204052c902cf51fbb42cb8928177c024f67623c3961f314a2ee1c44064e61570b862e7bb560f624b51fa337f36a27a66db4c3fd5f04b0b331565d5ae081c9808a138efb6affc50615a2100c858f6c5a574acc897a980c6fbdc41167833a823b27a2e30292	\\x0000000100010000
-33	3	8	\\xef0e97afdca65aa3f81ebb98abeab6e3e36e2a6acc13714171df76384dcccbfb884974e14154fdc60c2674845a3291af6ee50511851b90007fbddd21bcf8820e	45	\\x00000001000001000369e7f810a23c61d43ee90d24d2efab238ee6716e29a0affe4d35b4378a16bb40c36de10bd1d48bc4f88427755564d3a32d1e4d6a8abceb003b8625658d77e60162c0a19f12669e5695d08dec7e98b419e8a4eec47320189191127b05dc8e067ebc4494ee37f19810763fdfc5dd4405fdaa19abe644cc9a0cdad9b51da3fc52	\\xb39cd051fc3cb77aadd701cebdfb4744b7b242baf365f13468e0a27ecd04d494ccaf16a62d962f4e85ce46f839e2c243f59cb638253dffe9f34be564ecd36222	\\x00000001000000017954fecb0de70aecde26d0d53878ac864a09a3f145ad926c3e29f1c9bfc575270125620067f0bc72a4e74fa7f9d1275aa349cc0a68a97ce31a1dab52288fc53a898b83961992b40da8f382c60ff0ce2fb885c5af29f9d4a80d54fd5eb7ccf09122066aa6b918836ef8693d25c64503ba5443570f66464677eb581ec1a847f5bf	\\x0000000100010000
-34	3	9	\\xa0028e8c119575fc94c740c3ecdc3f0948211ecf4eb03363d5b504061d4cc00eb9f1711472f526ec8eb39ca7403748a4066b8639a34c8394a6ea42506b70ad00	145	\\x0000000100000100599aa7d96bdbe86c449f51eb1f700e2d61980d52d46f68874d3bd1662755cb16400d59341a6e89e73777e7b072bf052d34f7f69cf3b9fa11dfe91d6b52cf9ee332bcd962ddb9fae11d7843d4a72df80f666c8013354f46e92de1a2cc569f185f42cf1f2415d0f4052e21e0c761e76578a611356524b4b87d2dc9fe1920748a42	\\x69a3288985851e578ff43e91ae6d007dd980a4e80bb5e4716c047cb30bde50b0d0884960c3de347efee4a1f638734e04397f79e3e5d6409fd191f065f35de3b9	\\x00000001000000016fe4a757035f9f375816804c4e8b7336ec72fe2ef43fd46d6f2fa3cb8c8d9401a5409869fc204e01bfc3b244d86f4308155608568128d87fa43337a5574127c83ee85d04fa1ae23f248b24f1463631ba7a2e526b1ddd8be748adfca9d0ce198127d258bbb08e5bf72b5cc1b3a3671fd7acf7a2a0e0aa5af1ac3836cd51e823ea	\\x0000000100010000
-35	3	10	\\x42d5c337e59875eb2999e45c739f3ee7985a89dd1d27271aad6eb3fb76ff560ab36d1a22aac648f6fcef3c54b85c9d8537592dda9a30aaad67c396e15b7a9405	145	\\x00000001000001007a02d60ad8735a90015925c03a1520c44b8be454c804ff223a2151f82ee359fed86b3d6d144434cbc1e47e3572a403f238775eed5fb85ec0c941109351bc91ada922edc3a16a593879591df2c3ec1af02dc92d72c9db4a02a964f1e16383b2f1bb3d578c4d9f6048221b8db3cfcfe86ea6f90cf9acbce77531c788113088ee53	\\xeb0fce5b693f6f726d140ef972ec80919db3923d61a71df6d261bfecb9aaa127e97af6d59f07c44adf9d4c7d370c39fdeb707f031143a216e3e9978450325a89	\\x00000001000000015e2424156b227bb1aa5d9177b6b0f1e68963bd7de701c340f312912bbea33661b6fa49f356b17d90c8d514d8ffe0fc0968d9e5ea5954bd0022c529c8738a786b2ad19e51b21cff76b76ae5bc8f38508ba70b309c7899e8a0fe7982d0c10a4bee958ab9d1e0eb27d6c00cf2c79939dd138f66a37971e6569fa735be3ad3745c72	\\x0000000100010000
-36	3	11	\\x06e33c6067b450b3767b5b3a14a0f61df17b20a6a7f0bbb29438b388949efa50a92d77accadb474fef6b5988f8ddea59f6ad0fb661d13a84761731a2a14ec203	145	\\x000000010000010050caabc22ab330307d95d3135d22bd8913b30fe6c7d2d21822f616ab31720f1cd28e6e69f79f3bbba95d867943fa70c1b8a52fba30755ea0019707a9464b266fb7d9319a0b5e0f6f0875f4ec7d65cc56491d73cad860fc418859f41ea538fee65f61d1a31609191cc3458a2c227264585f00d3104a5d338328a2b8e7c3f2f041	\\xeeb4f593236cab2483f82489a0c0c8764610ccddfcaf303acca0b2ce1aadbbe99a40f66a53754936a60785bb7e603dcbf69fcc6b6e11a59a2c6e635611f61aba	\\x00000001000000015d5eed8c5e29acd2c677cec2dc8c734aa901c09152ea89e289db3fd83811fc5fdb8f79816bf7f17de46dcba2b2075012727a15d114bc67cd53e06798aded17ae5c724c5c3852732568403c4f59e58d0b57f3f9faf93785500b07cd0b099ca2aa8a67020b9b36fc0aa4659dd2a6e1396d21992d31cc2e8e1fe1db513bec567bb4	\\x0000000100010000
-37	4	0	\\x752a0cd258e5c8a49ee9dc8867adad72af9ea9e58806e24ba21ab21c701f5bc421cd4e8127f594de72dd844e22da072ad8e7d4f3e51372205f8e45c493b8c40e	144	\\x0000000100000100ad42e15fb6c6d6646aa618005a5df1926df8b1f4e8e2fb2fab50e34f9669c442bdd5a029299cb0d33327fbc1b55f56f4df1f2c5e0645196c4476a0d20df7e6645a0ac49589f5173169a838453021966b3cf96a81281a92a4b9956980e5443f314b166743aff832d7c89214719f71bc53f1c594d30b83c3a076fb3d65216d9746	\\xcb90901d624bfed1814294abcf2606ee5813e0e81347aff5dd5eda0109018c8f4f1c57606f5532bf3bdbc47e0b152aca78518485741315cabb44158e5fafcaca	\\x0000000100000001b9f82726cb9c463b385cf9ebd9cf77cb87c6c41ff5c1b3121062880a210e25d4d97aa08226c3ae2c80ea309ff1b1f51c3402a334e881828306ca2287edd79e8bf285f0f27116a15ad381670af741821bd4f9fc930eb6251814a08e1004be74907ec0bc1ec6b5e83a6396b36fb6384f93f2309119c55c6403476125fc2909ca15	\\x0000000100010000
-38	4	1	\\x8938736262e1d4fc15c949352c17989c3dd840684045c20aecb6f50b4ff35b586c63a63390181a915b9334404363c84d3eaaae4517933946dff623d7f88f4202	45	\\x00000001000001002108e5f5969b63fc20adc326676db8cb984d206779bd8a3a376b1513062f92e2ac85cd289df0dbaebdc69f5b4e385e41d1aeeb1a4f1318b474c98c6d100ad6c69b54ed01ec905f02c1b3a8b59fef8a492547441a1b1cf9e0e71fa9921f32abf2115c23654461473f64e76b2b8f07f9d4b18caa03bd1f8a0fa13c420446a97a9f	\\xf5509fe82f59fc1283eff93fee560c4dd5ba6a7fdb931f8c48065b457af6df95fa8495122111272ee06d0a5b361feaaa240e57f753c7f0c6d2a99a469c0dd67d	\\x0000000100000001704509d91ddd3e1547a307c2c8813a09d8f464159752b5e87c72c35229a0aa9f6a841fa1e0bb3a3ec664c1f7cd3d2f6e962bf5ee4138ba87b79e40368734576ad824a08a9bb887686055859c68f4db253770f74379f86a1e43147c650f549707e82a0740ce775ebb551f0d13730e2b1707e9c7974d3b878a480773d6a45ca163	\\x0000000100010000
-39	4	2	\\x140d227aed535230cda868439b79b947af2b2a109b0fc658b36a7cc58ba70cfa0fa6e4eefe585c9a0163ae7874a6b626b2be875cb36596a9ec5287b554781f04	45	\\x000000010000010075cc4e93b7da1cfb6bd4392804b8e10e23640aa4a07e2769eb33954d80db672d6a9e1812ebe9abc7a2be57d62464c24c190f4757216e8c60b06d4887c55d626a33f48f7c5175fb11ffca24f8f9b31c70513bdd7260194392db983304048fd97a55fde7dcaa0cebc87c6bd0229b51fb7358b53b0e73395a2af26379f6a6296d90	\\xdbd1f7041b177363aa89d819116b72ac05314950a1f95440b0427d8322385649a49a9b575c2e06a148be8f04fb94fc72015f94c43c6ef89c0fa0f209cb777bc3	\\x0000000100000001a4480ac3185889176d5cf33086e293ac3326579aef6f7504e855d1980175f7e9e80f44770ec78503e6052e380669016a30b359768886bd928a946718dacce660c5a03d435da37a1ec407095451e8320c1d8f53a6023ea6f346abd0d9766f8c45de8632f7f5a59df3ed73f250161f5167a7d33e0e8e5cd795200731f4ea4f3f0c	\\x0000000100010000
-40	4	3	\\x03bf49e7f11e9b032aa459a3361f202b41c88b17e3fa9cae3e64b5c5c3c688550532d39ba9d41afdd2014edf5e73135069f744b3b15d93d77eb95285ca034f08	45	\\x00000001000001001f93797958a0eb3b7dcbcc57b0af41a21424ac3749e0a555d67fa34e994f556fb19feee32576049209b2781c126cd04b997fc862605f6bac76564842a4e8e18d51c216a1b946428aacae5eaff8f6dd7cc3a10b4fec3eb6882fb8af557777e2f3624c9e2dc7b0ffe6258cfc20f872a4a613aa7915077e7a7423e502852aa57401	\\xa6131b57b688815566fdc5f01f67f73f3d8483eeed255bfbfb72fdc436a3db2c4282554e0f7377d4500d489052f0f219c3c5d83de10cfb02d6a11e675a74161f	\\x0000000100000001b9a419c30f01bfd198a6edd7432e4568daa39ca08ef3ef61b9aad813a86511cd5116f7332a806c0cbea5dc06960477ee5abf318aedee4166c86ea82857088c9ef21ddd252bc468ea19802cd5337c561a42efd1906dd1c41b7f729cfe70500575ea771b8f254a42cf1e5e210aa87fce8c7887c5ac77f615cf0f66bbe73b75c5ec	\\x0000000100010000
-41	4	4	\\x699c8d9e30167738525d5ad7ed0929d0ec9d3fb40d3181289a79ca5073920b2405cd87f75201acaeabec594c43ae6fa9953a7eca45d41f68619515b836c3bc06	45	\\x00000001000001006d23d5c7199953773402012eea1808b974bd226160d10082105816df7f8ab41fe1d3fdcb1aa1abe94fb5a0f26f4bacef9d9e7b180ed5c06daeb0d3880f8de9575a48fc6e16548be07b05a85ee0e216980a2cb90f9c6819d15705353c96378c8a642d13630056e1b2342418138a61a3a27f83db70ef115d60a35e1a7ebae29de9	\\xa02248ff8116745859f71b13d1730a864468dc95d35966c9f0357485cb8c9e3f66e04f03a4717deee94faa8e31e11fa691a86b5e99ee5a4fbc374fa6d971c65b	\\x00000001000000018fc010f27b780f77a8f9f1508d3f35a7068553c4b8101ae49416fda1a684cf6330732340d96bb627e9526f90c56750082ec71c841684a5061ebcedb8ec7e0708e8186b06f529b9aa5dfde1c0916cc8b49915161f1e09bcc34764a79ad76541ede4d328ad787108c48552f88adb4373ee2143118e24f48c1a7e19e7f4468d90bb	\\x0000000100010000
-42	4	5	\\xe65eba65abd753daf428bda7cf6e1a6184fbe132a819f6d80eea1a9d888f6a26ffe07a6b7dbef37b02ebfbb37be723419ee42474a076d687ed058ac67dd0010b	45	\\x0000000100000100735a910178eb783a5bb08032eef0bf4bf5aaea9029e2dd7fb2598e8a85ac1f537b5569041efe4a116854a4a6dcd6d8affe29d085e0a7c68e115adb8a9bbd9ef2d7b3b7632825102f221ebc779d89cb4432452a6115b4d0a729cf308da10fc6f8fd512e124190608f5cdcff61bf8d2d01a96caa66447f23121eaf7608ff26e2	\\xce7fb3c06db04316750e1deff45383863481ad2855736487f8d5863ca6330c39c8745b4afecc3759f60192693fe8ef763cc0e039246e7080b434e893a14e3ba1	\\x0000000100000001370f91d72ab43d488c5b13d32b2b4167e5037f0a588a19816476ca50791391aed98953b0f614e3c2fddb50a763a6836cd10ac19934be1695c1f6c636b45f8bbfcfdc5b7cfa9ae66cb8b7fe577ff3d16693d68b25986987e9c31da0266d34cdf660bb0603efe0164f722ca5981b710e26d1ac96686ef53ace0d8c4e39bce5c512	\\x0000000100010000
-43	4	6	\\x8467c0736162821eec350fb4c3494f38bbced73e62288b9b4e714af0d3e713ba6cfe69a437d1f82030d5f6c68c7d04c07555fca18453552db191345c713ff706	45	\\x0000000100000100718699a1b083f5b6d481665b957575ff763dcf52ac3b1b638dbb3b744406ad418726726b40ac270053be9187f65e1c1ec09e515ddd0aebe047a64c39e7f44d1b2fe3bdd9307ea95ad9ba5868ba6e0552ec0958f7705bd271d3be4f2e3539fb826e5462abb059d4107735829b1616a69b79aec2936c64daac155a8c1aaa2a1156	\\x8c9d0853cf022c2a8956ffb4304f54cf19b8b9cf22ee818818b8f214bea699e7758a8c816b095c093445865c10162b735390f24b152e3e7b8e510606b1abe002	\\x00000001000000017472e94cb109043175dddab7e53ed88a06a2b0257079f3ee091aa6f3705d54daa5772b14d757a220f9ffa8c75279d2eec753f0e02b08666f46e96e2e8ce0f0bb2eb3fba50b96fad31d9831637e528187d4e7499453e001f226e3ce7bcd86395df3571eaac887a49f6a2c3ad15c8dc039a533207bd41680d8ac2133a83d5e9ffc	\\x0000000100010000
-44	4	7	\\x627751089df0be8fa4e2bc4f10a09dcb60ed478ee0515eea4c7268885fb11f06484f3314c694fb58a5187c56b27a3688f6c8cb8533c1ec8a53cf6ff8f2c20c0d	45	\\x00000001000001000f1a45c34179c344652637dc61aa48dc58b57bbfb5722445dca2bf228ee0c6c46e2cec44584b533d08cd472e3601d2d3aac4e53e4dcebde7a7e09286585732992e6edb51974eb74df6b5340e8a4ba8d3bd080bb332984cf888f9cce5525fb6af29d7460a99a6990fe175f0aa4fe357cd3c5af74c9b708a591fceb181632b71e0	\\xbeeaa5fbccdfdadd119481ead443c7d585a706db92f11b0c585622b2204fca34292ec0bc3a2c724e0cb005499116135e0bbe15e86b76da7a84f034c9dadf067f	\\x00000001000000015fd6d47c6c97ca07fdfc6f9bcbd36d12a18562e3d3962c835ab24325c1ca3b50f7f9556ae213c08142d38b70d11ba1732cbfa9411963ae04b04ed5955f1a3460801e1be25777b49cf8c766460501c24508e7a6ec947b599da4b335f2590a7dc7504ec977c0f068bb735c2531ac050a9f967e6405336fe698215fea98fee26719	\\x0000000100010000
-45	4	8	\\xf6a26abd6871f3ebf05f37c5002a15564013f7d538ad5b35b6ec162d9193cee232c7144683eae5786aa7ffca7fc4d54877b8c3ec9821c527c6c031ed21dea809	45	\\x0000000100000100b2f056f2a077d8213af80f217b43f94b5ec4c2307a304a77bcdc7499f651b36deeb7729950c8233da6d46b3efca5fcfe4e69e20e4cb858beb2ec2512bb5cb2c74e0c8cb6a466c9da79d7469ad049009d98169e13cd9f90d93eaa33af52b5608ee6149b8b11863445b0868cc8751e090ae132d4e819f32ade8a3ef43c365c38e8	\\x17009db653541773beb2fa841b3924776c01d63effc526ad50d392c125133d08daeda866d5710f982e67473c15aaf74dfe6c40e123897f780364d4e9ae2650ac	\\x00000001000000017f0fa53a181fc27e01005f8abe7739c6b03b425357543c64081fee4e96609242d9fa0234f9557efa5a1ee6bae5c9704497f0b537f0d9c253506583675f01af17520ef482c3d93f723ac405850ff0c4346ccff0e2a589ed396e4e6c6ecd3a995fd63311550469bfef3ad7788f3f28b82e1ede28b3b481decd1ecfbe93d6ac24bc	\\x0000000100010000
-46	4	9	\\x0446993279402c721a6400cfe65554406b9295bf7ffcc472213009fe480cdd595b49a38beb45e231e40d9fae38bc3892c53b624300cf8c40f01b9c301804170f	145	\\x00000001000001004da8fe6396de7399f41d3363df31cb2229ca630004f2fd1355dc12093433bc17a04f0c287eb4b734358855a24a77f77a6b76bca7f02ee247c6e452b7341139a535c9c677c2da55f30fd5fc91a16f003ab612154b2d5708495c0a478aed4ecb4ea7fcef09ea0b5d0aa6428525b18a5414a8f9ea2fa6d2820cceb5932507c723ba	\\x7c42603fafcba7d1cfa3b327e043147e9ca5f9b2ff1c3cb7c1f5fa2738013049839ee09703cf26a5651c718ac1842f69de37f68b3a632cf4efd3a2941eb37d75	\\x000000010000000182f1515d78f1741e807b1396cfe0fd1826b0ad431f38812c13f110e45f26529d79da12facaa2beaefaa871282cd61bb2a88b08a4e68c02480757b04c6fc32379adda9a7f28a37e7db10f367034ea1d6e1d1f527a03ec0cc23c9af3a002f8a368c0c5ebb782be77a4a491fb9b7d6ae13ac89d1e98379e76dcd338d50aee186235	\\x0000000100010000
-47	4	10	\\x481b24d847e41fec5510427f8e8eff0b9f5ccb79dfa174ac9f953683675c0acbf1dd7a8b7707bcfc756ce226ae82587716ee5e9829ac77044f67bdd9e07eed09	145	\\x00000001000001008336ea10d18f5f1c2f2660bf89e9eef1356bdfa827b0458f718ae8fc68563ab7d28f723e24388b4ef8e3238e2ece8dcf47c117d543121470fa90f0d13d29563295bf8907cafba4eab575cbea8f5f8cf4f585a3af9cbcb8754d82669b85bcbe049f834283319af4b6fbf29ffd4bdfd25fa3080b6e7676cb1f2dd6f697c874c715	\\x32bba803399ec99606fdcc1d554c0fecc4493f73b20cb53e4abd3c031d50f6d878dc9bac7f427745755c89a5fe752f30bb36a8e7472e68e22487eab7487e26db	\\x000000010000000199b5eb8a96d8ef3e411bcf94978338329b09c49ffb360f408af395cadb9ee4f071a9c714e239a7a1e6fb935ce7b79b5b402f7cc0264878ae1d447234692dbea34483675df4d31e9da2a7e43e82d6926167ccee1959fd314bc4946884885cc361be2027be169002cbbd8b67888e6b862066bf9d84775340048714e51661189db4	\\x0000000100010000
-48	4	11	\\xde94687a485b21c1c554ada5b4da299e32b66e377ba929dcb523d727b8c8ef675fbecb54b0754cdc96d61eab5adfe5f8fc483cdad062c816c2ff23797ef72b07	145	\\x00000001000001009fa4a7b3f71b80edea2d86b600a89dd557260c3e4965bd2902d05c89f6062348348eb5c3792f272c60703272d533e8d574b3271c7bd137d8351c4fe6e0f8489636f0557a6556349adce19272e61be00996707bb3306596e37d23b1d406a6fafc66bfcfd734c3b6672862844feb0a4e42a056db771e9ad79244a0f20f66f879a9	\\xe04d19dc64ac4b3a3403789d2b424ee30c2c7359c40906178cd7753db399a7569358b74baabd2de71b24c9b700eed31b292351e194910496a01c4de0081e9cd8	\\x0000000100000001702eeac39beba0ffbafc0a4cf307452fabaa05fd4c65b68e83e544a8faf946e4a932b5caf506eeb25dacd17cda5cd5dc8e918ce5c9b77bc4f45b839caed5a7b6e250d43650a6d648dd87aa756e74a6797a865ae68a813d78a44cd676c529f4997673bec08e1c32f895bda10495d65fb2e0e1e3ee163876c30303a0d1cf2a0a41	\\x0000000100010000
-\.
-
-
---
--- Data for Name: refresh_transfer_keys_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_transfer_keys_default (rtc_serial, melt_serial_id, transfer_pub, transfer_privs) FROM stdin;
-1	1	\\xfb802fc9b82eb301e6668ae850513755e256b007bc746a3f9679f7381291ab77	\\x647e509f4c9ecf6d1506dc52d6a40c5b714560728e85a0e65f49e4fc7ea89e61197507db0ba10a6546bcb90279bc885a2e9355514efe14fb86cd244731110835
-2	2	\\x5839f8558f140814707e9d583045ac36837d69c5ade616c2e74c35a73b195645	\\x596f7530efdaeae6d354a4ec53f6050654cf763ddbb067c408b80bcd83dbbfc94f72ea1043f715254b5d1e70d711649043d62f63a47a84314956d848fa87d9dc
-3	3	\\x3676ef42e4cf7227b5c6ff1ce1841fca3fc5dbc3e77ea004161cec082f6f317c	\\xd8ad3e83026472ae359216bad5538961fa7410de6d0bbc688ea0301a412570eb0c761850a586201ec1caf3b735116a2ada4205e448bd14b927b6ebb4457fb83d
-4	4	\\x77ce177474ec1691c5c9093656e08dd59ee9efbd542497774c29618e52bb594b	\\x910e1dd63ce3bd617527f029420c07af564c8cef85029eb0d86213178341f006e7738b76b7e52907789ee2708bf1cc3196540aba21aaaecdef0ccd995281db77
-\.
-
-
---
--- Data for Name: refunds_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refunds_default (refund_serial_id, coin_pub, deposit_serial_id, merchant_sig, rtransaction_id, amount_with_fee_val, amount_with_fee_frac) FROM stdin;
-1	\\xdb47c6822d70335b30607ee22ac80c825b054b2810efdd1ca952ffcd93e4867e	2	\\x679ef7235a470bb8442d5ccb7a9c61861867e4e21306ec618197ae517647f2072707ca5ae91857d5328d3ebc5921edb985bbfae74720f71fbc150094bf83a109	1	6	0
-\.
-
-
---
--- Data for Name: reserves_close_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_close_default (close_uuid, reserve_pub, execution_date, wtid, wire_target_h_payto, amount_val, amount_frac, closing_fee_val, closing_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: reserves_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_default (reserve_uuid, reserve_pub, current_balance_val, current_balance_frac, purses_active, purses_allowed, kyc_required, kyc_passed, expiration_date, gc_date) FROM stdin;
-1	\\x8bfc3ecb05ec429d2e7210bf4845bb65da1fa1496db0d4e5ba59ad86a67d49b5	0	1000000	0	0	f	f	1653935532000000	1872268335000000
-2	\\x69155d4eb15492974d51f2d3b9be93c9d7863df31f54630bd6d397044cbcdf8e	0	1000000	0	0	f	f	1653935539000000	1872268341000000
-\.
-
-
---
--- Data for Name: reserves_in_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_in_default (reserve_in_serial_id, reserve_pub, wire_reference, credit_val, credit_frac, wire_source_h_payto, exchange_account_section, execution_date) FROM stdin;
-1	\\x8bfc3ecb05ec429d2e7210bf4845bb65da1fa1496db0d4e5ba59ad86a67d49b5	2	10	0	\\x9fdccd6e7dcee5d5170f969c3ff68fe716445016e622f0bd2beb7cab7de6589a	exchange-account-1	1651516332000000
-2	\\x69155d4eb15492974d51f2d3b9be93c9d7863df31f54630bd6d397044cbcdf8e	4	18	0	\\xdcd64d0315f126bffea43abc7779ad044bee42a64ba4c827d4005d1d0eac966d	exchange-account-1	1651516339000000
-\.
-
-
---
--- Data for Name: reserves_out_by_reserve_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_out_by_reserve_default (reserve_uuid, h_blind_ev) FROM stdin;
-1	\\x01ed3cde21d0382981f65901d84f68ffa4f083909a0e7ef9849a872aba5c3cbcd725fcde088d64ca6cfdec3be17bab3201982b7a45bae5539dade0f788d4b7d4
-1	\\x6456eba14a64896eb30254d149fc9939813b57d872eb688f4dba7cac28429125c8e02da4621ced840f3a9f8eeaad50131d3f680b549b1bff4d55bfd0938440e3
-1	\\x02c0d9bb52a6143fde9f441c14ef2687398b9e840b1971ab5caf209d7a7f1f63d8808c13f6c20a6b5fff0c1d70701259c9b2d1e5a09d01edb9bdb291d9199b9f
-1	\\xaac9050d3975156b1da4d502bdde854562276d22101e97083ec1e991443809f657fc9a25e3d6acfcf4530ad84b0e1c9131d0838a581958ae258e87b5ab8af283
-1	\\xf5c7b601a005e95f2ee9c3987d73e5ec7bd6c01a26a330266a662a0323ecb126c664e8de4ce5133cd07655ab895555e07169afc718593723b45fdd41ea37a90a
-1	\\xf36811355187ffb5c030f0ac504325d0fc9c8693348a74c390ed33128b94bd3b17d99e09f52b0ad27e87d64b2550b5b4ba0fda97c9db10dab182c2aebf017df1
-1	\\x13a01a8fbde97dc0bb363e2f9c45a81709e17ac0d9f8b89db44365123cf9043a1134d589d9ea5497dcec8cd40a464d4df0f2f1eb8b025deb30a0da23fd50ac93
-1	\\xebddd3a606bc8c84e63a272a150b89457e82d5265d4e20a4fa374625e8d310ef68d538c28ecad5c9cff7cc20c1beade09fa6560870f37cca176a5c30b442ce40
-1	\\x5897d679a6235b154fd33ac94c8d8c3974e66988ca66c3687f47d98e635be9fc0d957547abd3b7c2a09be62f96371a3b69b1e4e61f9bd0400e99e10532f5b4fe
-1	\\x378c1a1d31bf2108a6d5400ad5f1e3af2f6e77a376c7e2470f7764b49a10ee00e3a230c6405e1faf47f781c18a10d3b31714d83976b51ceb286910b2c5c836d3
-1	\\x298d3e1c5d96b27854c6617abc07c15759fa8ab8d9be34b3e6adb8a174e2bfaa873a6c323429ecde54c7c1227d2ea48238166377b1f828f6fdddaa081a222080
-1	\\x7dfbb946bdbbfd51a04142f100eefa0489c7cd257fdceb104a6d972695c9f7215fa1991036ca727acfe47488d763c006c3091d08aea30d63751d175471950316
-2	\\xafea2551572c9dd021c82e15b6ae68d96948cca99296d1c5c125d5f358fec29d32a5f8422d8c516767f79d8af214c0c33491daef9b306f457a2fba00b6fab800
-2	\\x9b40a1dcdb68eafca2559dcf2db8b766aa416f747a47334671f72f1188e58a06563eefa15d9dba3516d5c864e2ddd3d1c2aaec8b4758fda48a20882155824352
-2	\\x29095c3964a596bb78a06ca9f3adec3ff1aa1520840e4a3544fbff139e4f71505431826c47ac60135acaed42caf00a591d8f6ee97323befb0b8346963a72fe82
-2	\\xff4e506199cefe53db3d7fe6957fe8ece8355df93bce75deeccb31c568f675e37e9170cee3857754ecbd39203261cdb202ceeed9d8a1bb5643be04bff2d342d0
-2	\\x7d4a2872c2f31703683f5cbe1606430ad9d7f92e834d8a8683cda0c0d12b7ed3f512594d11e03f35da6da7c7d2d244b681c32d690402d15879eb6f070a904c23
-2	\\x2e5bef5ba80a3e779fb9c83538dcfe88b3f756e3b3c3bf86c43848bcc82cfdd6531e14566a5c6dec2078f68a7ffd4f1a8459096b8759adf5705fb4e527838276
-2	\\x6d34dd310dc7ba84cfe621cb8921374d30362918a4d36bcbfe441bd9bab4c4f8ec6e7a24f2b89971f7067b240ca40063521c77f60e7acdff5589e2c95e5f9b57
-2	\\xd18b5384a3841b46935c3f62aa33d2e7eb12ecd85e7622cccfd3881d88b96fd2c193fdbea90bf22f3e61ed7c8c2a4862bce810832455d6b4a7a3b7d0f28173da
-2	\\x89129e1959b4257a11c689d9a05d245f84c345ad3d4c585b3b9e49d956bf58a2c934eaddbab7d59057092bf344f48920b3df866586ee80d97b70ec99d65a3eda
-2	\\x410f2098735a8a8d6f1b080354001c1fd0823ec3fc1bb6d81afb1044b26d94154625d2a665f5aaf081e5a4b0ffaebf2afadfb1d40f29c77d5fd1a90a9ce1f2c8
-2	\\x64664ab99dd598ad76475bedf0f833da271efd85606159a62d4c447a9bac72ff838d547ed369a09e27e46cd429d530c4a349e35b7fca8919e1f766f16b3e69d7
-2	\\x90cea31f56472a2a10ee60e65a36cd396ced1635518fda48865a01c73b8a2573f222f4ee16cf3af259d4a97d05d8fcc65951a7d38b4f5efdd57b2b3d3e059326
-2	\\xa70f22cc7c33d2fb4a75683771f4b1afa075083b8eaad3512415af94c54f4ffa71e54bf02cc36cd85314a14222e1513312b763af77475bed82980b1b6ad79fdb
-2	\\xeec9da07dad2e0ea1ef02c9efdd229043e5fe6ae3df5d3a93219d99010746291b883996f020b5ffde76934b2ab609b9fbe7daa09441558cc5433087f3b330bbd
-\.
-
-
---
--- Data for Name: reserves_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_out_default (reserve_out_serial_id, h_blind_ev, denominations_serial, denom_sig, reserve_uuid, reserve_sig, execution_date, amount_with_fee_val, amount_with_fee_frac) FROM stdin;
-1	\\x01ed3cde21d0382981f65901d84f68ffa4f083909a0e7ef9849a872aba5c3cbcd725fcde088d64ca6cfdec3be17bab3201982b7a45bae5539dade0f788d4b7d4	199	\\x0000000100000001318151ddd422237644bc194d193cb7ff651469ac7ab3752121be619aaeb516b0b8761f4c0d5551b74979cd07eb8edaa85b1aa3432cf8ee11701afe0ca44776498a0a0ce0947421e18b09844fd20f6e465f67b4052cc5341970bfda6e8df9cc073aee8fb5ab8c472e9dad432527bf32880a6a21ec267fbcf05bd8d2f7c0e845d7	1	\\xbcef026a8567bfe41648844ca1c9a7e110b036f6995c110e7c771fc36cd33769c619a94c101c7bc77c7475089a7b709422c92c71f4e3d9c028fc2e6d75e94e0f	1651516334000000	8	5000000
-2	\\x6456eba14a64896eb30254d149fc9939813b57d872eb688f4dba7cac28429125c8e02da4621ced840f3a9f8eeaad50131d3f680b549b1bff4d55bfd0938440e3	144	\\x000000010000000176b71917490543e136de968c405c430815a6bd6e99088d09982812590e035ccfdae1ac56f5ad089ad896d513cafade7814144e9f95aad20ffa2e9e0ee821a2454e52d804beff0d925b7cb7ce972efd6a77bae73b371c6d476338fa25037bcd60b80669d8a52c83c0da3e30690481953d47a3872051dd848518a3a1c51fe0d626	1	\\x15decaf2a067433bc177b958fc1a06e0f73c3abe5ff2bf001b3aa7f5695a78111e0615c34bc900bea8bae60afbe0e2d99247683cc869d6b016503035886be80e	1651516334000000	1	2000000
-3	\\x02c0d9bb52a6143fde9f441c14ef2687398b9e840b1971ab5caf209d7a7f1f63d8808c13f6c20a6b5fff0c1d70701259c9b2d1e5a09d01edb9bdb291d9199b9f	45	\\x000000010000000156aa8afabfa5815281d28a3394ec371c89d388f3d67cff2857bc62d69aae639fa782ad05065ad50ff75794aca4e269003a3b64db5cfa74d68bfc2fd917f9f9642cb9f7310eb978cdf064ff99627eef54fe27cdaa40de16bd73856543ca571087f65233aa480e4a7f026826214650466186e135918707c238b17493a17398da81	1	\\xeef4524c6e89fa70313aa2e867f85ddef25f1052b70f21b782d5b414d528a99feb98737ee149de9dc1e3c96eb46527c5a108e80531da06396483f582d0f7b008	1651516334000000	0	11000000
-4	\\xaac9050d3975156b1da4d502bdde854562276d22101e97083ec1e991443809f657fc9a25e3d6acfcf4530ad84b0e1c9131d0838a581958ae258e87b5ab8af283	45	\\x00000001000000013fcc4d44c75cfe8aef2fb34db32bca8a0e883a41cfc7b0bcf945b4363d5509c4e38ec2206b755ba8c8a370da3e23135739a2f8a3cd883f9576d1e7ffc3881fc04bd09ce9f6372561997c7db4ddf385e447882d9a0870ef7c9199ab1e79b8d60389ec45c54aa4f2d25a2bdfef820c02ea19a1c405e7c90ce887873a6ee2d70fb4	1	\\x6c1926ac1a731726b917fc26a9b37d40ff1d9a0a13521dfc216933a41b5165c692fa6dcb99c291c85de25a0b4ace4636eb4cdc80259da0dcf00350a687eb9406	1651516334000000	0	11000000
-5	\\xf5c7b601a005e95f2ee9c3987d73e5ec7bd6c01a26a330266a662a0323ecb126c664e8de4ce5133cd07655ab895555e07169afc718593723b45fdd41ea37a90a	45	\\x00000001000000019246c997a9c06edb153fca0f90a36aaf51e013dc83f51095711a769e975eb67f29c69abee2615bac160283090bd5499a6942633de2d56fa949e1a317136d6c1f57d2c859d36a5c49f5931e383e9564a1e4758064a2d60bc7d451a9c10ac0d3f09b3982f8d159a3ccd7f08e9460d968c9e046cb768bc6bf5c39c99b4a76991119	1	\\x558187c68a2192f7e7d52c1ed0e4bd2c2e0fc15069926537f05ff19eb41fe707f07069940595d731c62b74b4f2ed37d890d17395795f13f2b2db4afc1a868908	1651516334000000	0	11000000
-6	\\xf36811355187ffb5c030f0ac504325d0fc9c8693348a74c390ed33128b94bd3b17d99e09f52b0ad27e87d64b2550b5b4ba0fda97c9db10dab182c2aebf017df1	45	\\x0000000100000001595d39858a0d8e62484b2596378198d13150f6f52337bd0f5b657ca85589a7fca0c7fda93c99e72b9a736003ca8ac097169530083799e505afe7375cafd1fe209f1235f2543a2b274154fe3369c9a57c085a0093f4eae1401b163d0fc55e620c440e5b45d3ff019fcf87687f151e3ed973ab4f61fe87ae049c571b4bb2581186	1	\\x3fd1e90d6902fbbee79d296d1fce0d100b15d625434d73478af7fa1f248a6c896031b8dcd598b9a531bab7073b545034aa1ea79b7244f748ef787d5565b97006	1651516335000000	0	11000000
-7	\\x13a01a8fbde97dc0bb363e2f9c45a81709e17ac0d9f8b89db44365123cf9043a1134d589d9ea5497dcec8cd40a464d4df0f2f1eb8b025deb30a0da23fd50ac93	45	\\x0000000100000001692d9faced981b8bfefd4381ef60b51ddff021bb02778e4d461052465ba7ac06eb42f6848dbc8d46ed2c9d1b77a11a6dccbe806436c2025ba2dd2ed04211cfa984abe04aa32a68537851022777c4a80ed76a13f186cc02bdc628a3268c3153741a18f027df86c9d93c460cbd1c34ea12e9c2ed9b92277e5ad6b933f1a1e83723	1	\\x184b891d32c2a047a7cfc10d55ccc5c36e5fe6135445c138a58c907e4de4c3d5d5b519a7b765bcc456b1f67dc3ba60269e6b288d973c7ec89b34c49db6d48c01	1651516335000000	0	11000000
-8	\\xebddd3a606bc8c84e63a272a150b89457e82d5265d4e20a4fa374625e8d310ef68d538c28ecad5c9cff7cc20c1beade09fa6560870f37cca176a5c30b442ce40	45	\\x00000001000000012e4ed97ab2558c3eb6175e691fe22cbf3063c0d676ba38d04e84ba50538884276df9fa5b16cf257a7c44a9e643b8022a9ed001d4a3e64ea7ebf768a5fade80ba1a5b2b502b66e0004c050192039753c9154fbd4c578e498472d2c12b8a7607bd243b14dcd4fa5c569bbb5015d783edab672722781b3358723406b345548b7d20	1	\\x3b4547f794a1942bc62091b62b46118173a85e3bc5ed56f26471a00ba9d512ac38592d886f2df89caff6b6e571cbd77708671bfeb9b5a1baab7de6dd3a86200a	1651516335000000	0	11000000
-9	\\x5897d679a6235b154fd33ac94c8d8c3974e66988ca66c3687f47d98e635be9fc0d957547abd3b7c2a09be62f96371a3b69b1e4e61f9bd0400e99e10532f5b4fe	45	\\x0000000100000001419110bafd89a827b60282826036e1ab03525237af4b22bad6907dc9cf8743e19ff802607c4e8e317e9d2876e6090331230f636fe24428a4bd93dbfb90a641254807c47ffa31abe9f3324d117eefe9ce80dd5ceffb68a1cfe6a7bd62ede0ef8256da065b5e957aef96cda4f833addfe7e1f512e3d90084890f83f7887c4f3832	1	\\xdaf04a5064ae7a6e4d76789c80694ca1f6e65fd9546eece5fc4113c0ea75d94fedbb9b34d6cece49fae43b66c05175ed6bdee1945723182d5098179fb521a10d	1651516335000000	0	11000000
-10	\\x378c1a1d31bf2108a6d5400ad5f1e3af2f6e77a376c7e2470f7764b49a10ee00e3a230c6405e1faf47f781c18a10d3b31714d83976b51ceb286910b2c5c836d3	45	\\x00000001000000013120fbb952281f6ecf628a978ef9cd1267eabf768aa639151a9972e1c0e07f34670b7c55979196e3120af95202038e6d9820e92489fb8b396cd0149973dc350e86a2e39d6f6dcca1fb60ea891dd1ba05cc7053e39946d263214d1be22e97ca609cbe339998d4f54905c0ac2ed807657921a9889372dcd237fa894cd98f516a92	1	\\x01e553d6b18895530945f400ecdaf6bb6d3dbfb7b0ce49cb47d11fc975f9dd214c035b89c7c7928a0d0f6ef029a58dcf29ef88850e199c94c7f9bb46a40d360b	1651516335000000	0	11000000
-11	\\x298d3e1c5d96b27854c6617abc07c15759fa8ab8d9be34b3e6adb8a174e2bfaa873a6c323429ecde54c7c1227d2ea48238166377b1f828f6fdddaa081a222080	145	\\x00000001000000019271c244eff64e21418b612105bf96b11862d3b9ec6ea17eaa376dee63b2a800065237205420ed964d6656ef49cd169937f680dbd68f5678ed46c81b4e01385c4651b93dd304b54676fef3e2e70c6a99c8340a23ccf4006b69e0b240a74e4ff4045eadeb7306803590a36201fa8f8bf6897ecae5ba90d9bc31fc7bd00c7f05b0	1	\\x2559ea40da5f1ecbdbda1d4e2b5dd74a84b902f65a4e7571cbb4216117f8939de40cd852af226f211059977b1f86107b34bf27be12c9ae9db76f22607ec35d0e	1651516335000000	0	2000000
-12	\\x7dfbb946bdbbfd51a04142f100eefa0489c7cd257fdceb104a6d972695c9f7215fa1991036ca727acfe47488d763c006c3091d08aea30d63751d175471950316	145	\\x000000010000000109af50c6c9604426404d3b4fc178503016316fde8d84cbddb43c0a12d934cc2b47f1a0f35c6a8217d0c6a336efd6cf2c84284829bd809fc7b665bc1c888d84795c014cfce930fdbfb0a3f047d749bc452e9e2cf64b627f95acf6441fe3f492e1c0627f5c865de6553b22f199d5c537459e2f5e9717b93da0175759c59c313a59	1	\\x2a86e686e1877e03e89e0840246a4198197b75e7a5780bb33ec5733782d2aa65221377c102ec0306303a804ab7fdbe5956b5a8258ef3d78fb08abead7d127203	1651516335000000	0	2000000
-13	\\xafea2551572c9dd021c82e15b6ae68d96948cca99296d1c5c125d5f358fec29d32a5f8422d8c516767f79d8af214c0c33491daef9b306f457a2fba00b6fab800	358	\\x0000000100000001cb7384b3c0b8e4cbf0132257ccc157eabfdcdcd3bb8f71f2ee10125e57e227b4348c2547fc411fffe1f13ed6b44a0e2e7508668bb61f2474d049a610ef69a6c53a955b5ae307c13e77ae57c43188049758e6dedb1c7c3650b4278c9e4e82777863cf51eba16c1373736f4bd2335474869e4266db18992f0c4f690b5133bb9ab3	2	\\xb830de0ffdfd9daf70416d250ecf728c75ca9358ce565d21d09a6119a9ce09a7e1b1eccac2909c477d103a6edc325046f1f512342c40b1dbbcf751e4e878ca09	1651516341000000	10	1000000
-14	\\x9b40a1dcdb68eafca2559dcf2db8b766aa416f747a47334671f72f1188e58a06563eefa15d9dba3516d5c864e2ddd3d1c2aaec8b4758fda48a20882155824352	393	\\x0000000100000001c890007dc292a6defc008bf3241a134e3b85e9193dbfbd17ee9954d1dd08ac22f5fbb2df964f069da6d959230cd8ca42f381c77d27d5839030ded1d820d6f90f1b2ba0eb9240cedf08d37e70cff4439652a9d05dbb664d0baa0263025fca0d8b26dc4138c7bdb1cd3c02d9fd92ce738ad7564c84005cfdad804b3a790de9db8a	2	\\x7870a65558a801140f9ef97dbdaaec4b49e7a557db26a360ebf8f8fd7cbb80a07d850f2f0e9705950226607d97c1c253e4814b1747d0f0ded91db8f6427c960d	1651516341000000	5	1000000
-15	\\x29095c3964a596bb78a06ca9f3adec3ff1aa1520840e4a3544fbff139e4f71505431826c47ac60135acaed42caf00a591d8f6ee97323befb0b8346963a72fe82	235	\\x000000010000000170f546de9796a42a24570887e5c78c00375f37f9399d368575c8130f22118b15848e5bd1009561486a39876ef35a3945fad9f4722079c7e2fb384a66981c344c995b6c6bc3fecf30cbaf00227061787e54adcafaa4607b2246c1c5e1d6fb2251ddd97231f89ce4ebb8c5928c2d040c5643c4bcafd43f0929640b6773a188d114	2	\\xefb0c3d99fef8faa8915ba96f2ce50f7d6b2ef3212df43b5b494ad0598b1a017c48b25de346aebf558cfbf0bb05cd55c0a8c62f196e6ab04f829d1a2f4a8e501	1651516341000000	2	3000000
-16	\\xff4e506199cefe53db3d7fe6957fe8ece8355df93bce75deeccb31c568f675e37e9170cee3857754ecbd39203261cdb202ceeed9d8a1bb5643be04bff2d342d0	45	\\x000000010000000173e53391d0b117287f30e1b84227f321575df97a0a902c44d56c343aee1a77b95ef0cb7dbe07b735666109de5dcc6f567c20278be7de40711620d8adb49c4e4f870cefdb9d713a442c38748d1a3667fc713ddf374d39b0891bfb924241f1459b6e07e30b08de8c87db9f718b33eb124301b2f2f624f9f3c9f1c9045c5fe3e12d	2	\\x069750e67dfe4f15196f8c0cde7a99125d2c30ceb21ebf8a2c091f8523c00a8de9011f50f18e6ec3f6223045dd3207e7374e0a9b121b5031e9239e0d67c1fb0f	1651516341000000	0	11000000
-17	\\x7d4a2872c2f31703683f5cbe1606430ad9d7f92e834d8a8683cda0c0d12b7ed3f512594d11e03f35da6da7c7d2d244b681c32d690402d15879eb6f070a904c23	45	\\x00000001000000016429d1fba18b335683d37ba1c2226c97660b46783a7069c20bf12f104dde53460e1ef017c2e18faefa2ee7670fe62a0bc8e5dfaed07581c5cec2bad6432534defd26d58d8745e320bb05e8e28dad41fc49455fd971d0a59b672b1b3925e54e27c3fe9947b6c0147e94d0beee57bebfeb72622edbbd273244251a9906e508ebc0	2	\\x3c054176c30782ef92abe69ec99e7c523fd8c160e72008c01f3a7e6bbf4018a87858cdc99a793f4322960aff6d5945520a7641c58ddc14dd5a18e3d07d371403	1651516341000000	0	11000000
-18	\\x2e5bef5ba80a3e779fb9c83538dcfe88b3f756e3b3c3bf86c43848bcc82cfdd6531e14566a5c6dec2078f68a7ffd4f1a8459096b8759adf5705fb4e527838276	45	\\x000000010000000108a4ac03860016d9b9ff6f08874aee00f254778dd8fa4ad5b106924c3368f012f98b3c8406e3c5d6e8100892c2e01a435bcba3e89b4cc5017e1617f9547798a5ece3fc8c3987aeb9bce758f5133e09b95cef69477dd1fc7be68d875cc9f1cb9bade341c28e95c8d0657b40793dfadbdfc056250e4502fcee533cfd4a1d8467e8	2	\\x725e5a580f29f46efdf2feed34f878e503caceeef809e1a5997d87a6e84bd476dc069e021eda1a6d5f92d497594f34390ae081461fcd51055017993eed6b730d	1651516341000000	0	11000000
-19	\\x6d34dd310dc7ba84cfe621cb8921374d30362918a4d36bcbfe441bd9bab4c4f8ec6e7a24f2b89971f7067b240ca40063521c77f60e7acdff5589e2c95e5f9b57	45	\\x00000001000000016a01a862297f0ec7a399fbe5f5a697ea3fe80baa1c566e0a5c9d0f1c659f79fbc636c4855bf5578a2d1dd0747b1b1e51c15bd2d106f26ec33392b3a2f6616c558d37da43470bb371ff0c9fce99c04507b63ca50501d2e022efdb29751cab65c755c982d96bb1aa6ccd1a065c2f80321926e0e27bec2d362f6a95707fabc8e7c3	2	\\x64b0f438212c3573fd8543a0c15e7f39dd87ce27e2ce22578a83fc3b4f3de4f58d0db1a544c8088bdc34bbdf5256a3b0b758540b605a8e9b63034cf6f213bd0d	1651516341000000	0	11000000
-20	\\xd18b5384a3841b46935c3f62aa33d2e7eb12ecd85e7622cccfd3881d88b96fd2c193fdbea90bf22f3e61ed7c8c2a4862bce810832455d6b4a7a3b7d0f28173da	45	\\x000000010000000166d624a079c32ec98cdb4729bd5df99617a6b2f530a9ad0ab60ea7c2dddb2f433afbffa9145d060c9fc8b794254cb2944f9e5fb0d1b5c0f44540f0befe3ba0fc19bf261a6c95b458f5a94e386ddc7b700f5b6487ca0476621ddd2c90582e003384c2a24ce98fe2cfa310b49fd6cd4583f52763ae1bfa9d2f2e8dc1e72238ef59	2	\\x16098645b42ce413db31208ed74ff95976c9b97ea680564d198d50014534c71f82234301232359955b043cfeae920a6f629187ebe2a01512e8a3549b55a02609	1651516341000000	0	11000000
-21	\\x89129e1959b4257a11c689d9a05d245f84c345ad3d4c585b3b9e49d956bf58a2c934eaddbab7d59057092bf344f48920b3df866586ee80d97b70ec99d65a3eda	45	\\x0000000100000001ab6d79005d35d02481dfca68661e99b5321f8eeba8b5008eba9be31f994efbbce8784788db3f7c04085ad9217b432e224dd3c5e11924c27c5b8500f5f924dc93330a717e20d08c857a12e3359d60a9d38b23456bba44bc196e7582624409ac5d8b442cd571a147b5ed7fe49b88ad244321aed0cef0b7baa8cf20cf7a532b08	2	\\x5deae9ce7e3fac11619e328e67b013acb9bacf68dd3d737db5936ae66dd5efedb0b7948999a1729e226d0b577702dc9a619881a3c1d1c29f23ccbfed06955a0d	1651516341000000	0	11000000
-22	\\x410f2098735a8a8d6f1b080354001c1fd0823ec3fc1bb6d81afb1044b26d94154625d2a665f5aaf081e5a4b0ffaebf2afadfb1d40f29c77d5fd1a90a9ce1f2c8	45	\\x000000010000000120a89221e74d312ea6c0b8ea2c05011cf9eba3eef03ae77896b3937f371f1df002330f1be186019ed0ea5f3404cd048e963e2bc125d4368282379adbe7510c1078b02bc6b7752abdc01e06f0348a24af6f951b0edbdb93b30d583c261ad8b61e5e7cac37d46a4e175c997451e2ba5f6473d64d7ccaca28cfd89b6a82ccb24b83	2	\\x38ef2d8790b6218589e12d7f2b65002b267e76e5f5bb665d7b6bf053a01930c4a0e766fc0f082961bb8f4c5833e1c7b24875b8794a27699b2308907d4053b604	1651516341000000	0	11000000
-23	\\x64664ab99dd598ad76475bedf0f833da271efd85606159a62d4c447a9bac72ff838d547ed369a09e27e46cd429d530c4a349e35b7fca8919e1f766f16b3e69d7	45	\\x00000001000000018440921b9963700edb0ad0d4d880a9049205c917514964d47e815d3590b02c1839f8f8af8cee989228066dfc595e8b494fd8e37a9f9e07e2f1a74f5a24d7bc6e6708588fe226b603a60cc35dea4df0d80ef8a58205bb99631b5637c29c84c33bf6b32558339b4a963164d079ad40298b03633b0e272e85a878a22fa1dba6113e	2	\\xad759d5b0db5b5a48346a5c70e4d1259c84b7f2455ac07ba0b104db9827263c47067937bc4a5985cf23c3f91e72a867865e08325ec22b0b3a3039c8adbc06a01	1651516341000000	0	11000000
-24	\\x90cea31f56472a2a10ee60e65a36cd396ced1635518fda48865a01c73b8a2573f222f4ee16cf3af259d4a97d05d8fcc65951a7d38b4f5efdd57b2b3d3e059326	145	\\x000000010000000168e6626c43d09c81044f24909995a502215a56cc961d2fee531e8a360e74e4886d98b12434ac308d9f3c0cdc38266a7ba18cb8fbba6056351513f0d728fc86319b46bcb6e628072e79dd9458a13a8814bc8e79c3edd0a4b95206a61e0aac593837377101a98d9fa7d9f49bf656d32a3f55de8143b3adeabed6e58fe7c742f502	2	\\x17fb776feb130e0693ec856b850f25cfd26ec1e7be631086935edc95050da442ef1c80bb8aacf978d4f18a3427951ae2d4422a87dd8093d0e38d8b88dcc8410d	1651516341000000	0	2000000
-25	\\xa70f22cc7c33d2fb4a75683771f4b1afa075083b8eaad3512415af94c54f4ffa71e54bf02cc36cd85314a14222e1513312b763af77475bed82980b1b6ad79fdb	145	\\x0000000100000001464c9b34de9afb94e45ac568cd2dc622c2249ebfdfe812aed17713faa6327d720af337e08bb836d391502255328f40ae998728186596a72bdd6ab1a7f59bc4840e5e83969345c2429d49ab1cf9c6a9f28fbcb694acb096c3f1e6c2415c2b9d2a4be9337f0a206163e6c935cc94426acfd582b38ab64f6edd4ddd8ecffee8858c	2	\\x4ce37c5b7d2fb138630f916fa03b28ca5c8f126ce5c6fcc8d83b0ad5058f05aa793d72911c1b735160620269690d06187aecb9fc79ce77d50ff1e5b2bf0a7a07	1651516341000000	0	2000000
-26	\\xeec9da07dad2e0ea1ef02c9efdd229043e5fe6ae3df5d3a93219d99010746291b883996f020b5ffde76934b2ab609b9fbe7daa09441558cc5433087f3b330bbd	145	\\x0000000100000001a3e2f18446950f07a099c9fb915aeb45eb85fc1463831a158f1607e2f1b616922aac6b970f353e2786cbb4fb6b90e66edbc3e825ee4e910ee85c3d608329b163bc0f9a4ab5bfa7a2f20f3dfd16e24183e4b7497be4e0101a3f17cf7c6c7a30a9da5379a2899ad15f2ed314e6af7024d34ad1730d1a99294eae194629cedde1f9	2	\\x4b54a8b5769c739fb2a121453978eb62d977a6570f9df375c3e7509f979ae085ba0dfdd51ee4b1779c46ceecc0ba4a88bcb2ccd9c293cd2f05e88b166074380d	1651516341000000	0	2000000
-\.
-
-
---
--- Data for Name: revolving_work_shards; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.revolving_work_shards (shard_serial_id, last_attempt, start_row, end_row, active, job_name) FROM stdin;
-\.
-
-
---
--- Data for Name: signkey_revocations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.signkey_revocations (signkey_revocations_serial_id, esk_serial, master_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wad_in_entries_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wad_in_entries_default (wad_in_entry_serial_id, wad_in_serial_id, reserve_pub, purse_pub, h_contract, purse_expiration, merge_timestamp, amount_with_fee_val, amount_with_fee_frac, wad_fee_val, wad_fee_frac, deposit_fees_val, deposit_fees_frac, reserve_sig, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wad_out_entries_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wad_out_entries_default (wad_out_entry_serial_id, wad_out_serial_id, reserve_pub, purse_pub, h_contract, purse_expiration, merge_timestamp, amount_with_fee_val, amount_with_fee_frac, wad_fee_val, wad_fee_frac, deposit_fees_val, deposit_fees_frac, reserve_sig, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wads_in_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wads_in_default (wad_in_serial_id, wad_id, origin_exchange_url, amount_val, amount_frac, arrival_time) FROM stdin;
-\.
-
-
---
--- Data for Name: wads_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wads_out_default (wad_out_serial_id, wad_id, partner_serial_id, amount_val, amount_frac, execution_time) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_accounts (payto_uri, master_sig, is_active, last_change) FROM stdin;
-payto://x-taler-bank/localhost/Exchange	\\x37ee013beee22858235b0d57dca4462ee47c273f90dcc1d6146eb0b1f9c22c9a7543a6f55c70fb532e12bfbc651729632b2bcea1d73262970959dffedaeb1602	t	1651516325000000
-\.
-
-
---
--- Data for Name: wire_auditor_account_progress; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_auditor_account_progress (master_pub, account_name, last_wire_reserve_in_serial_id, last_wire_wire_out_serial_id, wire_in_off, wire_out_off) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_auditor_progress; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_auditor_progress (master_pub, last_timestamp, last_reserve_close_uuid) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_fee; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_fee (wire_fee_serial, wire_method, start_date, end_date, wire_fee_val, wire_fee_frac, closing_fee_val, closing_fee_frac, wad_fee_val, wad_fee_frac, master_sig) FROM stdin;
-1	x-taler-bank	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	\\xc4bc53a23028f8d21026f07e7e7176f581de0cafb26d3f73087e9507301db0a31e88659125340f8340fd433118c0fdca78cfb42eb9920f50ed8a9926cab95a03
-\.
-
-
---
--- Data for Name: wire_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_out_default (wireout_uuid, execution_date, wtid_raw, wire_target_h_payto, exchange_account_section, amount_val, amount_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_targets_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_targets_default (wire_target_serial_id, wire_target_h_payto, payto_uri, kyc_ok, external_id) FROM stdin;
-1	\\x9fdccd6e7dcee5d5170f969c3ff68fe716445016e622f0bd2beb7cab7de6589a	payto://x-taler-bank/localhost/testuser-pc10aumb	f	\N
-2	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	payto://x-taler-bank/localhost/43	f	\N
-3	\\xdcd64d0315f126bffea43abc7779ad044bee42a64ba4c827d4005d1d0eac966d	payto://x-taler-bank/localhost/testuser-5saj9erp	f	\N
-\.
-
-
---
--- Data for Name: work_shards; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.work_shards (shard_serial_id, last_attempt, start_row, end_row, completed, job_name) FROM stdin;
-1	0	0	1024	f	wirewatch-exchange-account-1
-\.
-
-
---
--- Name: account_merges_account_merge_request_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.account_merges_account_merge_request_serial_id_seq', 1, false);
-
-
---
--- Name: aggregation_tracking_aggregation_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.aggregation_tracking_aggregation_serial_id_seq', 1, false);
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.app_bankaccount_account_no_seq', 13, true);
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.app_banktransaction_id_seq', 4, true);
-
-
---
--- Name: auditor_denom_sigs_auditor_denom_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditor_denom_sigs_auditor_denom_serial_seq', 424, true);
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditor_reserves_auditor_reserves_rowid_seq', 1, false);
-
-
---
--- Name: auditors_auditor_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditors_auditor_uuid_seq', 1, true);
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_group_id_seq', 1, false);
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_group_permissions_id_seq', 1, false);
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_permission_id_seq', 32, true);
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_groups_id_seq', 1, false);
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_id_seq', 13, true);
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_user_permissions_id_seq', 1, false);
-
-
---
--- Name: contracts_contract_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.contracts_contract_serial_id_seq', 1, false);
-
-
---
--- Name: cs_nonce_locks_cs_nonce_lock_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.cs_nonce_locks_cs_nonce_lock_serial_id_seq', 1, false);
-
-
---
--- Name: denomination_revocations_denom_revocations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.denomination_revocations_denom_revocations_serial_id_seq', 1, false);
-
-
---
--- Name: denominations_denominations_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.denominations_denominations_serial_seq', 424, true);
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.deposit_confirmations_serial_id_seq', 3, true);
-
-
---
--- Name: deposits_deposit_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.deposits_deposit_serial_id_seq', 3, true);
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.django_content_type_id_seq', 8, true);
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.django_migrations_id_seq', 16, true);
-
-
---
--- Name: exchange_sign_keys_esk_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.exchange_sign_keys_esk_serial_seq', 5, true);
-
-
---
--- Name: extension_details_extension_details_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.extension_details_extension_details_serial_id_seq', 1, false);
-
-
---
--- Name: extensions_extension_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.extensions_extension_id_seq', 1, false);
-
-
---
--- Name: global_fee_global_fee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.global_fee_global_fee_serial_seq', 1, true);
-
-
---
--- Name: known_coins_known_coin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.known_coins_known_coin_id_seq', 7, true);
-
-
---
--- Name: merchant_accounts_account_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_accounts_account_serial_seq', 1, true);
-
-
---
--- Name: merchant_deposits_deposit_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_deposits_deposit_serial_seq', 3, true);
-
-
---
--- Name: merchant_exchange_signing_keys_signkey_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_exchange_signing_keys_signkey_serial_seq', 5, true);
-
-
---
--- Name: merchant_exchange_wire_fees_wirefee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_exchange_wire_fees_wirefee_serial_seq', 1, true);
-
-
---
--- Name: merchant_instances_merchant_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_instances_merchant_serial_seq', 1, true);
-
-
---
--- Name: merchant_inventory_product_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_inventory_product_serial_seq', 1, false);
-
-
---
--- Name: merchant_kyc_kyc_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_kyc_kyc_serial_id_seq', 1, true);
-
-
---
--- Name: merchant_orders_order_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_orders_order_serial_seq', 3, true);
-
-
---
--- Name: merchant_refunds_refund_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_refunds_refund_serial_seq', 1, true);
-
-
---
--- Name: merchant_tip_pickups_pickup_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tip_pickups_pickup_serial_seq', 1, false);
-
-
---
--- Name: merchant_tip_reserves_reserve_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tip_reserves_reserve_serial_seq', 1, false);
-
-
---
--- Name: merchant_tips_tip_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tips_tip_serial_seq', 1, false);
-
-
---
--- Name: merchant_transfers_credit_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_transfers_credit_serial_seq', 1, false);
-
-
---
--- Name: partners_partner_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.partners_partner_serial_id_seq', 1, false);
-
-
---
--- Name: prewire_prewire_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.prewire_prewire_uuid_seq', 1, false);
-
-
---
--- Name: purse_deposits_purse_deposit_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_deposits_purse_deposit_serial_id_seq', 1, false);
-
-
---
--- Name: purse_merges_purse_merge_request_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_merges_purse_merge_request_serial_id_seq', 1, false);
-
-
---
--- Name: purse_requests_purse_requests_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_requests_purse_requests_serial_id_seq', 1, false);
-
-
---
--- Name: recoup_recoup_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.recoup_recoup_uuid_seq', 1, false);
-
-
---
--- Name: recoup_refresh_recoup_refresh_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.recoup_refresh_recoup_refresh_uuid_seq', 1, false);
-
-
---
--- Name: refresh_commitments_melt_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_commitments_melt_serial_id_seq', 4, true);
-
-
---
--- Name: refresh_revealed_coins_rrc_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_revealed_coins_rrc_serial_seq', 48, true);
-
-
---
--- Name: refresh_transfer_keys_rtc_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_transfer_keys_rtc_serial_seq', 4, true);
-
-
---
--- Name: refunds_refund_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refunds_refund_serial_id_seq', 1, true);
-
-
---
--- Name: reserves_close_close_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_close_close_uuid_seq', 1, false);
-
-
---
--- Name: reserves_in_reserve_in_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_in_reserve_in_serial_id_seq', 2, true);
-
-
---
--- Name: reserves_out_reserve_out_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_out_reserve_out_serial_id_seq', 26, true);
-
-
---
--- Name: reserves_reserve_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_reserve_uuid_seq', 2, true);
-
-
---
--- Name: revolving_work_shards_shard_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.revolving_work_shards_shard_serial_id_seq', 1, false);
-
-
---
--- Name: signkey_revocations_signkey_revocations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.signkey_revocations_signkey_revocations_serial_id_seq', 1, false);
-
-
---
--- Name: wad_in_entries_wad_in_entry_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wad_in_entries_wad_in_entry_serial_id_seq', 1, false);
-
-
---
--- Name: wad_out_entries_wad_out_entry_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wad_out_entries_wad_out_entry_serial_id_seq', 1, false);
-
-
---
--- Name: wads_in_wad_in_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wads_in_wad_in_serial_id_seq', 1, false);
-
-
---
--- Name: wads_out_wad_out_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wads_out_wad_out_serial_id_seq', 1, false);
-
-
---
--- Name: wire_fee_wire_fee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_fee_wire_fee_serial_seq', 1, true);
-
-
---
--- Name: wire_out_wireout_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_out_wireout_uuid_seq', 1, false);
-
-
---
--- Name: wire_targets_wire_target_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_targets_wire_target_serial_id_seq', 5, true);
-
-
---
--- Name: work_shards_shard_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.work_shards_shard_serial_id_seq', 1, true);
-
-
---
--- Name: patches patches_pkey; Type: CONSTRAINT; Schema: _v; Owner: -
---
-
-ALTER TABLE ONLY _v.patches
-    ADD CONSTRAINT patches_pkey PRIMARY KEY (patch_name);
-
-
---
--- Name: account_merges_default account_merges_default_account_merge_request_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges_default
-    ADD CONSTRAINT account_merges_default_account_merge_request_serial_id_key UNIQUE (account_merge_request_serial_id);
-
-
---
--- Name: account_merges account_merges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges
-    ADD CONSTRAINT account_merges_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: account_merges_default account_merges_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges_default
-    ADD CONSTRAINT account_merges_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: aggregation_tracking_default aggregation_tracking_default_aggregation_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking_default
-    ADD CONSTRAINT aggregation_tracking_default_aggregation_serial_id_key UNIQUE (aggregation_serial_id);
-
-
---
--- Name: aggregation_tracking aggregation_tracking_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking
-    ADD CONSTRAINT aggregation_tracking_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: aggregation_tracking_default aggregation_tracking_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking_default
-    ADD CONSTRAINT aggregation_tracking_default_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: app_bankaccount app_bankaccount_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_pkey PRIMARY KEY (account_no);
-
-
---
--- Name: app_bankaccount app_bankaccount_user_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_user_id_key UNIQUE (user_id);
-
-
---
--- Name: app_banktransaction app_banktransaction_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_pkey PRIMARY KEY (id);
-
-
---
--- Name: app_banktransaction app_banktransaction_request_uid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_request_uid_key UNIQUE (request_uid);
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawoperation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawoperation_pkey PRIMARY KEY (withdraw_id);
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_auditor_denom_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_auditor_denom_serial_key UNIQUE (auditor_denom_serial);
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_pkey PRIMARY KEY (denominations_serial, auditor_uuid);
-
-
---
--- Name: auditor_denomination_pending auditor_denomination_pending_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denomination_pending
-    ADD CONSTRAINT auditor_denomination_pending_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: auditor_exchanges auditor_exchanges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_exchanges
-    ADD CONSTRAINT auditor_exchanges_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_historic_denomination_revenue auditor_historic_denomination_revenue_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_denomination_revenue
-    ADD CONSTRAINT auditor_historic_denomination_revenue_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: auditor_progress_aggregation auditor_progress_aggregation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_aggregation
-    ADD CONSTRAINT auditor_progress_aggregation_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_coin auditor_progress_coin_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_coin
-    ADD CONSTRAINT auditor_progress_coin_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_deposit_confirmation auditor_progress_deposit_confirmation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_deposit_confirmation
-    ADD CONSTRAINT auditor_progress_deposit_confirmation_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_reserve auditor_progress_reserve_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_reserve
-    ADD CONSTRAINT auditor_progress_reserve_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_reserves auditor_reserves_auditor_reserves_rowid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves
-    ADD CONSTRAINT auditor_reserves_auditor_reserves_rowid_key UNIQUE (auditor_reserves_rowid);
-
-
---
--- Name: auditors auditors_auditor_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditors
-    ADD CONSTRAINT auditors_auditor_uuid_key UNIQUE (auditor_uuid);
-
-
---
--- Name: auditors auditors_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditors
-    ADD CONSTRAINT auditors_pkey PRIMARY KEY (auditor_pub);
-
-
---
--- Name: auth_group auth_group_name_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group
-    ADD CONSTRAINT auth_group_name_key UNIQUE (name);
-
-
---
--- Name: auth_group_permissions auth_group_permissions_group_id_permission_id_0cd325b0_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_group_id_permission_id_0cd325b0_uniq UNIQUE (group_id, permission_id);
-
-
---
--- Name: auth_group_permissions auth_group_permissions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_group auth_group_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group
-    ADD CONSTRAINT auth_group_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_permission auth_permission_content_type_id_codename_01ab375a_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_content_type_id_codename_01ab375a_uniq UNIQUE (content_type_id, codename);
-
-
---
--- Name: auth_permission auth_permission_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_groups auth_user_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_groups auth_user_groups_user_id_group_id_94350c0c_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_user_id_group_id_94350c0c_uniq UNIQUE (user_id, group_id);
-
-
---
--- Name: auth_user auth_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user
-    ADD CONSTRAINT auth_user_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_user_id_permission_id_14a6b632_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_user_id_permission_id_14a6b632_uniq UNIQUE (user_id, permission_id);
-
-
---
--- Name: auth_user auth_user_username_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user
-    ADD CONSTRAINT auth_user_username_key UNIQUE (username);
-
-
---
--- Name: close_requests close_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.close_requests
-    ADD CONSTRAINT close_requests_pkey PRIMARY KEY (reserve_pub, close_timestamp);
-
-
---
--- Name: close_requests_default close_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.close_requests_default
-    ADD CONSTRAINT close_requests_default_pkey PRIMARY KEY (reserve_pub, close_timestamp);
-
-
---
--- Name: contracts_default contracts_default_contract_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts_default
-    ADD CONSTRAINT contracts_default_contract_serial_id_key UNIQUE (contract_serial_id);
-
-
---
--- Name: contracts contracts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts
-    ADD CONSTRAINT contracts_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: contracts_default contracts_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts_default
-    ADD CONSTRAINT contracts_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: cs_nonce_locks_default cs_nonce_locks_default_cs_nonce_lock_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks_default
-    ADD CONSTRAINT cs_nonce_locks_default_cs_nonce_lock_serial_id_key UNIQUE (cs_nonce_lock_serial_id);
-
-
---
--- Name: cs_nonce_locks cs_nonce_locks_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks
-    ADD CONSTRAINT cs_nonce_locks_pkey PRIMARY KEY (nonce);
-
-
---
--- Name: cs_nonce_locks_default cs_nonce_locks_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks_default
-    ADD CONSTRAINT cs_nonce_locks_default_pkey PRIMARY KEY (nonce);
-
-
---
--- Name: denomination_revocations denomination_revocations_denom_revocations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_denom_revocations_serial_id_key UNIQUE (denom_revocations_serial_id);
-
-
---
--- Name: denomination_revocations denomination_revocations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_pkey PRIMARY KEY (denominations_serial);
-
-
---
--- Name: denominations denominations_denominations_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denominations
-    ADD CONSTRAINT denominations_denominations_serial_key UNIQUE (denominations_serial);
-
-
---
--- Name: denominations denominations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denominations
-    ADD CONSTRAINT denominations_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: deposit_confirmations deposit_confirmations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT deposit_confirmations_pkey PRIMARY KEY (h_contract_terms, h_wire, coin_pub, merchant_pub, exchange_sig, exchange_pub, master_sig);
-
-
---
--- Name: deposit_confirmations deposit_confirmations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT deposit_confirmations_serial_id_key UNIQUE (serial_id);
-
-
---
--- Name: deposits_default deposits_default_coin_pub_merchant_pub_h_contract_terms_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposits_default
-    ADD CONSTRAINT deposits_default_coin_pub_merchant_pub_h_contract_terms_key UNIQUE (coin_pub, merchant_pub, h_contract_terms);
-
-
---
--- Name: deposits_default deposits_default_deposit_serial_id_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposits_default
-    ADD CONSTRAINT deposits_default_deposit_serial_id_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: django_content_type django_content_type_app_label_model_76bd3d3b_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type
-    ADD CONSTRAINT django_content_type_app_label_model_76bd3d3b_uniq UNIQUE (app_label, model);
-
-
---
--- Name: django_content_type django_content_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type
-    ADD CONSTRAINT django_content_type_pkey PRIMARY KEY (id);
-
-
---
--- Name: django_migrations django_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_migrations
-    ADD CONSTRAINT django_migrations_pkey PRIMARY KEY (id);
-
-
---
--- Name: django_session django_session_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_session
-    ADD CONSTRAINT django_session_pkey PRIMARY KEY (session_key);
-
-
---
--- Name: exchange_sign_keys exchange_sign_keys_esk_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.exchange_sign_keys
-    ADD CONSTRAINT exchange_sign_keys_esk_serial_key UNIQUE (esk_serial);
-
-
---
--- Name: exchange_sign_keys exchange_sign_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.exchange_sign_keys
-    ADD CONSTRAINT exchange_sign_keys_pkey PRIMARY KEY (exchange_pub);
-
-
---
--- Name: extension_details extension_details_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extension_details
-    ADD CONSTRAINT extension_details_pkey PRIMARY KEY (extension_details_serial_id);
-
-
---
--- Name: extension_details_default extension_details_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extension_details_default
-    ADD CONSTRAINT extension_details_default_pkey PRIMARY KEY (extension_details_serial_id);
-
-
---
--- Name: extensions extensions_extension_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extensions
-    ADD CONSTRAINT extensions_extension_id_key UNIQUE (extension_id);
-
-
---
--- Name: extensions extensions_name_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extensions
-    ADD CONSTRAINT extensions_name_key UNIQUE (name);
-
-
---
--- Name: global_fee global_fee_global_fee_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.global_fee
-    ADD CONSTRAINT global_fee_global_fee_serial_key UNIQUE (global_fee_serial);
-
-
---
--- Name: global_fee global_fee_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.global_fee
-    ADD CONSTRAINT global_fee_pkey PRIMARY KEY (start_date);
-
-
---
--- Name: history_requests history_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.history_requests
-    ADD CONSTRAINT history_requests_pkey PRIMARY KEY (reserve_pub, request_timestamp);
-
-
---
--- Name: history_requests_default history_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.history_requests_default
-    ADD CONSTRAINT history_requests_default_pkey PRIMARY KEY (reserve_pub, request_timestamp);
-
-
---
--- Name: known_coins_default known_coins_default_known_coin_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins_default
-    ADD CONSTRAINT known_coins_default_known_coin_id_key UNIQUE (known_coin_id);
-
-
---
--- Name: known_coins known_coins_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins
-    ADD CONSTRAINT known_coins_pkey PRIMARY KEY (coin_pub);
-
-
---
--- Name: known_coins_default known_coins_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins_default
-    ADD CONSTRAINT known_coins_default_pkey PRIMARY KEY (coin_pub);
-
-
---
--- Name: merchant_accounts merchant_accounts_h_wire_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_h_wire_key UNIQUE (h_wire);
-
-
---
--- Name: merchant_accounts merchant_accounts_merchant_serial_payto_uri_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_merchant_serial_payto_uri_key UNIQUE (merchant_serial, payto_uri);
-
-
---
--- Name: merchant_accounts merchant_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_pkey PRIMARY KEY (account_serial);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_h_contract_terms_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_h_contract_terms_key UNIQUE (merchant_serial, h_contract_terms);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_order_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_order_id_key UNIQUE (merchant_serial, order_id);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_pkey PRIMARY KEY (order_serial);
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_deposit_serial_credit_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_deposit_serial_credit_serial_key UNIQUE (deposit_serial, credit_serial);
-
-
---
--- Name: merchant_deposits merchant_deposits_order_serial_coin_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_order_serial_coin_pub_key UNIQUE (order_serial, coin_pub);
-
-
---
--- Name: merchant_deposits merchant_deposits_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_pkey PRIMARY KEY (deposit_serial);
-
-
---
--- Name: merchant_exchange_signing_keys merchant_exchange_signing_key_exchange_pub_start_date_maste_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_signing_keys
-    ADD CONSTRAINT merchant_exchange_signing_key_exchange_pub_start_date_maste_key UNIQUE (exchange_pub, start_date, master_pub);
-
-
---
--- Name: merchant_exchange_signing_keys merchant_exchange_signing_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_signing_keys
-    ADD CONSTRAINT merchant_exchange_signing_keys_pkey PRIMARY KEY (signkey_serial);
-
-
---
--- Name: merchant_exchange_wire_fees merchant_exchange_wire_fees_master_pub_h_wire_method_start__key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_wire_fees
-    ADD CONSTRAINT merchant_exchange_wire_fees_master_pub_h_wire_method_start__key UNIQUE (master_pub, h_wire_method, start_date);
-
-
---
--- Name: merchant_exchange_wire_fees merchant_exchange_wire_fees_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_wire_fees
-    ADD CONSTRAINT merchant_exchange_wire_fees_pkey PRIMARY KEY (wirefee_serial);
-
-
---
--- Name: merchant_instances merchant_instances_merchant_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_merchant_id_key UNIQUE (merchant_id);
-
-
---
--- Name: merchant_instances merchant_instances_merchant_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_merchant_pub_key UNIQUE (merchant_pub);
-
-
---
--- Name: merchant_instances merchant_instances_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_pkey PRIMARY KEY (merchant_serial);
-
-
---
--- Name: merchant_inventory merchant_inventory_merchant_serial_product_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_merchant_serial_product_id_key UNIQUE (merchant_serial, product_id);
-
-
---
--- Name: merchant_inventory merchant_inventory_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_pkey PRIMARY KEY (product_serial);
-
-
---
--- Name: merchant_keys merchant_keys_merchant_priv_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_merchant_priv_key UNIQUE (merchant_priv);
-
-
---
--- Name: merchant_keys merchant_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_pkey PRIMARY KEY (merchant_serial);
-
-
---
--- Name: merchant_kyc merchant_kyc_kyc_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_kyc_serial_id_key UNIQUE (kyc_serial_id);
-
-
---
--- Name: merchant_kyc merchant_kyc_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_pkey PRIMARY KEY (account_serial, exchange_url);
-
-
---
--- Name: merchant_orders merchant_orders_merchant_serial_order_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_merchant_serial_order_id_key UNIQUE (merchant_serial, order_id);
-
-
---
--- Name: merchant_orders merchant_orders_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_pkey PRIMARY KEY (order_serial);
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_pkey PRIMARY KEY (refund_serial);
-
-
---
--- Name: merchant_refunds merchant_refunds_order_serial_coin_pub_rtransaction_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_order_serial_coin_pub_rtransaction_id_key UNIQUE (order_serial, coin_pub, rtransaction_id);
-
-
---
--- Name: merchant_refunds merchant_refunds_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_pkey PRIMARY KEY (refund_serial);
-
-
---
--- Name: merchant_tip_pickup_signatures merchant_tip_pickup_signatures_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickup_signatures
-    ADD CONSTRAINT merchant_tip_pickup_signatures_pkey PRIMARY KEY (pickup_serial, coin_offset);
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_pickup_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_pickup_id_key UNIQUE (pickup_id);
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_pkey PRIMARY KEY (pickup_serial);
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_priv_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_priv_key UNIQUE (reserve_priv);
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_serial_key UNIQUE (reserve_serial);
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_pkey PRIMARY KEY (reserve_serial);
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_reserve_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_reserve_pub_key UNIQUE (reserve_pub);
-
-
---
--- Name: merchant_tips merchant_tips_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_pkey PRIMARY KEY (tip_serial);
-
-
---
--- Name: merchant_tips merchant_tips_tip_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_tip_id_key UNIQUE (tip_id);
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_pkey PRIMARY KEY (credit_serial);
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_deposit_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_deposit_serial_key UNIQUE (deposit_serial);
-
-
---
--- Name: merchant_transfers merchant_transfers_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_pkey PRIMARY KEY (credit_serial);
-
-
---
--- Name: merchant_transfers merchant_transfers_wtid_exchange_url_account_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_wtid_exchange_url_account_serial_key UNIQUE (wtid, exchange_url, account_serial);
-
-
---
--- Name: partner_accounts partner_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partner_accounts
-    ADD CONSTRAINT partner_accounts_pkey PRIMARY KEY (payto_uri);
-
-
---
--- Name: partners partners_partner_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partners
-    ADD CONSTRAINT partners_partner_serial_id_key UNIQUE (partner_serial_id);
-
-
---
--- Name: prewire prewire_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.prewire
-    ADD CONSTRAINT prewire_pkey PRIMARY KEY (prewire_uuid);
-
-
---
--- Name: prewire_default prewire_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.prewire_default
-    ADD CONSTRAINT prewire_default_pkey PRIMARY KEY (prewire_uuid);
-
-
---
--- Name: purse_deposits purse_deposits_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits
-    ADD CONSTRAINT purse_deposits_pkey PRIMARY KEY (purse_pub, coin_pub);
-
-
---
--- Name: purse_deposits_default purse_deposits_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits_default
-    ADD CONSTRAINT purse_deposits_default_pkey PRIMARY KEY (purse_pub, coin_pub);
-
-
---
--- Name: purse_deposits_default purse_deposits_default_purse_deposit_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits_default
-    ADD CONSTRAINT purse_deposits_default_purse_deposit_serial_id_key UNIQUE (purse_deposit_serial_id);
-
-
---
--- Name: purse_merges purse_merges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges
-    ADD CONSTRAINT purse_merges_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_merges_default purse_merges_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges_default
-    ADD CONSTRAINT purse_merges_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_merges_default purse_merges_default_purse_merge_request_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges_default
-    ADD CONSTRAINT purse_merges_default_purse_merge_request_serial_id_key UNIQUE (purse_merge_request_serial_id);
-
-
---
--- Name: purse_requests purse_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests
-    ADD CONSTRAINT purse_requests_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_requests_default purse_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests_default
-    ADD CONSTRAINT purse_requests_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_requests_default purse_requests_default_purse_requests_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests_default
-    ADD CONSTRAINT purse_requests_default_purse_requests_serial_id_key UNIQUE (purse_requests_serial_id);
-
-
---
--- Name: recoup_default recoup_default_recoup_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.recoup_default
-    ADD CONSTRAINT recoup_default_recoup_uuid_key UNIQUE (recoup_uuid);
-
-
---
--- Name: recoup_refresh_default recoup_refresh_default_recoup_refresh_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.recoup_refresh_default
-    ADD CONSTRAINT recoup_refresh_default_recoup_refresh_uuid_key UNIQUE (recoup_refresh_uuid);
-
-
---
--- Name: refresh_commitments_default refresh_commitments_default_melt_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments_default
-    ADD CONSTRAINT refresh_commitments_default_melt_serial_id_key UNIQUE (melt_serial_id);
-
-
---
--- Name: refresh_commitments refresh_commitments_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments
-    ADD CONSTRAINT refresh_commitments_pkey PRIMARY KEY (rc);
-
-
---
--- Name: refresh_commitments_default refresh_commitments_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments_default
-    ADD CONSTRAINT refresh_commitments_default_pkey PRIMARY KEY (rc);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_coin_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_coin_ev_key UNIQUE (coin_ev);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_h_coin_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_h_coin_ev_key UNIQUE (h_coin_ev);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_pkey PRIMARY KEY (melt_serial_id, freshcoin_index);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_rrc_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_rrc_serial_key UNIQUE (rrc_serial);
-
-
---
--- Name: refresh_transfer_keys refresh_transfer_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys
-    ADD CONSTRAINT refresh_transfer_keys_pkey PRIMARY KEY (melt_serial_id);
-
-
---
--- Name: refresh_transfer_keys_default refresh_transfer_keys_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys_default
-    ADD CONSTRAINT refresh_transfer_keys_default_pkey PRIMARY KEY (melt_serial_id);
-
-
---
--- Name: refresh_transfer_keys_default refresh_transfer_keys_default_rtc_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys_default
-    ADD CONSTRAINT refresh_transfer_keys_default_rtc_serial_key UNIQUE (rtc_serial);
-
-
---
--- Name: refunds_default refunds_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refunds_default
-    ADD CONSTRAINT refunds_default_pkey PRIMARY KEY (deposit_serial_id, rtransaction_id);
-
-
---
--- Name: refunds_default refunds_default_refund_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refunds_default
-    ADD CONSTRAINT refunds_default_refund_serial_id_key UNIQUE (refund_serial_id);
-
-
---
--- Name: reserves_close_default reserves_close_default_close_uuid_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_close_default
-    ADD CONSTRAINT reserves_close_default_close_uuid_pkey PRIMARY KEY (close_uuid);
-
-
---
--- Name: reserves reserves_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves
-    ADD CONSTRAINT reserves_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_default reserves_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_default
-    ADD CONSTRAINT reserves_default_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in reserves_in_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in
-    ADD CONSTRAINT reserves_in_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in_default reserves_in_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in_default
-    ADD CONSTRAINT reserves_in_default_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in_default reserves_in_default_reserve_in_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in_default
-    ADD CONSTRAINT reserves_in_default_reserve_in_serial_id_key UNIQUE (reserve_in_serial_id);
-
-
---
--- Name: reserves_out reserves_out_h_blind_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out
-    ADD CONSTRAINT reserves_out_h_blind_ev_key UNIQUE (h_blind_ev);
-
-
---
--- Name: reserves_out_default reserves_out_default_h_blind_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out_default
-    ADD CONSTRAINT reserves_out_default_h_blind_ev_key UNIQUE (h_blind_ev);
-
-
---
--- Name: reserves_out_default reserves_out_default_reserve_out_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out_default
-    ADD CONSTRAINT reserves_out_default_reserve_out_serial_id_key UNIQUE (reserve_out_serial_id);
-
-
---
--- Name: revolving_work_shards revolving_work_shards_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.revolving_work_shards
-    ADD CONSTRAINT revolving_work_shards_pkey PRIMARY KEY (job_name, start_row);
-
-
---
--- Name: revolving_work_shards revolving_work_shards_shard_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.revolving_work_shards
-    ADD CONSTRAINT revolving_work_shards_shard_serial_id_key UNIQUE (shard_serial_id);
-
-
---
--- Name: signkey_revocations signkey_revocations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_pkey PRIMARY KEY (esk_serial);
-
-
---
--- Name: signkey_revocations signkey_revocations_signkey_revocations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_signkey_revocations_serial_id_key UNIQUE (signkey_revocations_serial_id);
-
-
---
--- Name: wad_in_entries wad_in_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries
-    ADD CONSTRAINT wad_in_entries_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_in_entries_default wad_in_entries_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries_default
-    ADD CONSTRAINT wad_in_entries_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_in_entries_default wad_in_entries_default_wad_in_entry_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries_default
-    ADD CONSTRAINT wad_in_entries_default_wad_in_entry_serial_id_key UNIQUE (wad_in_entry_serial_id);
-
-
---
--- Name: wad_out_entries wad_out_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries
-    ADD CONSTRAINT wad_out_entries_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_out_entries_default wad_out_entries_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries_default
-    ADD CONSTRAINT wad_out_entries_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_out_entries_default wad_out_entries_default_wad_out_entry_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries_default
-    ADD CONSTRAINT wad_out_entries_default_wad_out_entry_serial_id_key UNIQUE (wad_out_entry_serial_id);
-
-
---
--- Name: wads_in wads_in_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in
-    ADD CONSTRAINT wads_in_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_in_default wads_in_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_in wads_in_wad_id_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in
-    ADD CONSTRAINT wads_in_wad_id_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_in_default wads_in_default_wad_id_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_id_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_in_default wads_in_default_wad_in_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_in_serial_id_key UNIQUE (wad_in_serial_id);
-
-
---
--- Name: wads_in_default wads_in_default_wad_is_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_is_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_out wads_out_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out
-    ADD CONSTRAINT wads_out_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_out_default wads_out_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out_default
-    ADD CONSTRAINT wads_out_default_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_out_default wads_out_default_wad_out_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out_default
-    ADD CONSTRAINT wads_out_default_wad_out_serial_id_key UNIQUE (wad_out_serial_id);
-
-
---
--- Name: wire_accounts wire_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_accounts
-    ADD CONSTRAINT wire_accounts_pkey PRIMARY KEY (payto_uri);
-
-
---
--- Name: wire_auditor_account_progress wire_auditor_account_progress_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_account_progress
-    ADD CONSTRAINT wire_auditor_account_progress_pkey PRIMARY KEY (master_pub, account_name);
-
-
---
--- Name: wire_auditor_progress wire_auditor_progress_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_progress
-    ADD CONSTRAINT wire_auditor_progress_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: wire_fee wire_fee_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_fee
-    ADD CONSTRAINT wire_fee_pkey PRIMARY KEY (wire_method, start_date);
-
-
---
--- Name: wire_fee wire_fee_wire_fee_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_fee
-    ADD CONSTRAINT wire_fee_wire_fee_serial_key UNIQUE (wire_fee_serial);
-
-
---
--- Name: wire_out_default wire_out_default_wireout_uuid_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out_default
-    ADD CONSTRAINT wire_out_default_wireout_uuid_pkey PRIMARY KEY (wireout_uuid);
-
-
---
--- Name: wire_out wire_out_wtid_raw_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out
-    ADD CONSTRAINT wire_out_wtid_raw_key UNIQUE (wtid_raw);
-
-
---
--- Name: wire_out_default wire_out_default_wtid_raw_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out_default
-    ADD CONSTRAINT wire_out_default_wtid_raw_key UNIQUE (wtid_raw);
-
-
---
--- Name: wire_targets wire_targets_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets
-    ADD CONSTRAINT wire_targets_pkey PRIMARY KEY (wire_target_h_payto);
-
-
---
--- Name: wire_targets_default wire_targets_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets_default
-    ADD CONSTRAINT wire_targets_default_pkey PRIMARY KEY (wire_target_h_payto);
-
-
---
--- Name: wire_targets_default wire_targets_default_wire_target_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets_default
-    ADD CONSTRAINT wire_targets_default_wire_target_serial_id_key UNIQUE (wire_target_serial_id);
-
-
---
--- Name: work_shards work_shards_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.work_shards
-    ADD CONSTRAINT work_shards_pkey PRIMARY KEY (job_name, start_row);
-
-
---
--- Name: work_shards work_shards_shard_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.work_shards
-    ADD CONSTRAINT work_shards_shard_serial_id_key UNIQUE (shard_serial_id);
-
-
---
--- Name: account_merges_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX account_merges_by_reserve_pub ON ONLY public.account_merges USING btree (reserve_pub);
-
-
---
--- Name: account_merges_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX account_merges_default_reserve_pub_idx ON public.account_merges_default USING btree (reserve_pub);
-
-
---
--- Name: aggregation_tracking_by_wtid_raw_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX aggregation_tracking_by_wtid_raw_index ON ONLY public.aggregation_tracking USING btree (wtid_raw);
-
-
---
--- Name: INDEX aggregation_tracking_by_wtid_raw_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.aggregation_tracking_by_wtid_raw_index IS 'for lookup_transactions';
-
-
---
--- Name: aggregation_tracking_default_wtid_raw_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX aggregation_tracking_default_wtid_raw_idx ON public.aggregation_tracking_default USING btree (wtid_raw);
-
-
---
--- Name: app_banktransaction_credit_account_id_a8ba05ac; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_credit_account_id_a8ba05ac ON public.app_banktransaction USING btree (credit_account_id);
-
-
---
--- Name: app_banktransaction_date_f72bcad6; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_date_f72bcad6 ON public.app_banktransaction USING btree (date);
-
-
---
--- Name: app_banktransaction_debit_account_id_5b1f7528; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_debit_account_id_5b1f7528 ON public.app_banktransaction USING btree (debit_account_id);
-
-
---
--- Name: app_banktransaction_request_uid_b7d06af5_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_request_uid_b7d06af5_like ON public.app_banktransaction USING btree (request_uid varchar_pattern_ops);
-
-
---
--- Name: app_talerwithdrawoperation_selected_exchange_account__6c8b96cf; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_talerwithdrawoperation_selected_exchange_account__6c8b96cf ON public.app_talerwithdrawoperation USING btree (selected_exchange_account_id);
-
-
---
--- Name: app_talerwithdrawoperation_withdraw_account_id_992dc5b3; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_talerwithdrawoperation_withdraw_account_id_992dc5b3 ON public.app_talerwithdrawoperation USING btree (withdraw_account_id);
-
-
---
--- Name: auditor_historic_reserve_summary_by_master_pub_start_date; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auditor_historic_reserve_summary_by_master_pub_start_date ON public.auditor_historic_reserve_summary USING btree (master_pub, start_date);
-
-
---
--- Name: auditor_reserves_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auditor_reserves_by_reserve_pub ON public.auditor_reserves USING btree (reserve_pub);
-
-
---
--- Name: auth_group_name_a6ea08ec_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_name_a6ea08ec_like ON public.auth_group USING btree (name varchar_pattern_ops);
-
-
---
--- Name: auth_group_permissions_group_id_b120cbf9; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_permissions_group_id_b120cbf9 ON public.auth_group_permissions USING btree (group_id);
-
-
---
--- Name: auth_group_permissions_permission_id_84c5c92e; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_permissions_permission_id_84c5c92e ON public.auth_group_permissions USING btree (permission_id);
-
-
---
--- Name: auth_permission_content_type_id_2f476e4b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_permission_content_type_id_2f476e4b ON public.auth_permission USING btree (content_type_id);
-
-
---
--- Name: auth_user_groups_group_id_97559544; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_groups_group_id_97559544 ON public.auth_user_groups USING btree (group_id);
-
-
---
--- Name: auth_user_groups_user_id_6a12ed8b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_groups_user_id_6a12ed8b ON public.auth_user_groups USING btree (user_id);
-
-
---
--- Name: auth_user_user_permissions_permission_id_1fbb5f2c; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_user_permissions_permission_id_1fbb5f2c ON public.auth_user_user_permissions USING btree (permission_id);
-
-
---
--- Name: auth_user_user_permissions_user_id_a95ead1b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_user_permissions_user_id_a95ead1b ON public.auth_user_user_permissions USING btree (user_id);
-
-
---
--- Name: auth_user_username_6821ab7c_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_username_6821ab7c_like ON public.auth_user USING btree (username varchar_pattern_ops);
-
-
---
--- Name: denominations_by_expire_legal_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX denominations_by_expire_legal_index ON public.denominations USING btree (expire_legal);
-
-
---
--- Name: deposits_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_coin_pub_index ON ONLY public.deposits USING btree (coin_pub);
-
-
---
--- Name: deposits_by_ready_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_ready_main_index ON ONLY public.deposits_by_ready USING btree (wire_deadline, shard, coin_pub);
-
-
---
--- Name: deposits_by_ready_default_wire_deadline_shard_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_ready_default_wire_deadline_shard_coin_pub_idx ON public.deposits_by_ready_default USING btree (wire_deadline, shard, coin_pub);
-
-
---
--- Name: deposits_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_default_coin_pub_idx ON public.deposits_default USING btree (coin_pub);
-
-
---
--- Name: deposits_for_matching_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_for_matching_main_index ON ONLY public.deposits_for_matching USING btree (refund_deadline, merchant_pub, coin_pub);
-
-
---
--- Name: deposits_for_matching_default_refund_deadline_merchant_pub__idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_for_matching_default_refund_deadline_merchant_pub__idx ON public.deposits_for_matching_default USING btree (refund_deadline, merchant_pub, coin_pub);
-
-
---
--- Name: django_session_expire_date_a5c62663; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX django_session_expire_date_a5c62663 ON public.django_session USING btree (expire_date);
-
-
---
--- Name: django_session_session_key_c0390e0f_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX django_session_session_key_c0390e0f_like ON public.django_session USING btree (session_key varchar_pattern_ops);
-
-
---
--- Name: global_fee_by_end_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX global_fee_by_end_date_index ON public.global_fee USING btree (end_date);
-
-
---
--- Name: merchant_contract_terms_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_expiration ON public.merchant_contract_terms USING btree (paid, pay_deadline);
-
-
---
--- Name: INDEX merchant_contract_terms_by_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.merchant_contract_terms_by_expiration IS 'for unlock_contracts';
-
-
---
--- Name: merchant_contract_terms_by_merchant_and_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_and_expiration ON public.merchant_contract_terms USING btree (merchant_serial, pay_deadline);
-
-
---
--- Name: INDEX merchant_contract_terms_by_merchant_and_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.merchant_contract_terms_by_merchant_and_expiration IS 'for delete_contract_terms';
-
-
---
--- Name: merchant_contract_terms_by_merchant_and_payment; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_and_payment ON public.merchant_contract_terms USING btree (merchant_serial, paid);
-
-
---
--- Name: merchant_contract_terms_by_merchant_session_and_fulfillment; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_session_and_fulfillment ON public.merchant_contract_terms USING btree (merchant_serial, fulfillment_url, session_id);
-
-
---
--- Name: merchant_inventory_locks_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_inventory_locks_by_expiration ON public.merchant_inventory_locks USING btree (expiration);
-
-
---
--- Name: merchant_inventory_locks_by_uuid; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_inventory_locks_by_uuid ON public.merchant_inventory_locks USING btree (lock_uuid);
-
-
---
--- Name: merchant_orders_by_creation_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_by_creation_time ON public.merchant_orders USING btree (creation_time);
-
-
---
--- Name: merchant_orders_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_by_expiration ON public.merchant_orders USING btree (pay_deadline);
-
-
---
--- Name: merchant_orders_locks_by_order_and_product; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_locks_by_order_and_product ON public.merchant_order_locks USING btree (order_serial, product_serial);
-
-
---
--- Name: merchant_refunds_by_coin_and_order; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_refunds_by_coin_and_order ON public.merchant_refunds USING btree (coin_pub, order_serial);
-
-
---
--- Name: merchant_tip_reserves_by_exchange_balance; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_exchange_balance ON public.merchant_tip_reserves USING btree (exchange_initial_balance_val, exchange_initial_balance_frac);
-
-
---
--- Name: merchant_tip_reserves_by_merchant_serial_and_creation_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_merchant_serial_and_creation_time ON public.merchant_tip_reserves USING btree (merchant_serial, creation_time);
-
-
---
--- Name: merchant_tip_reserves_by_reserve_pub_and_merchant_serial; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_reserve_pub_and_merchant_serial ON public.merchant_tip_reserves USING btree (reserve_pub, merchant_serial, creation_time);
-
-
---
--- Name: merchant_tips_by_pickup_and_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tips_by_pickup_and_expiration ON public.merchant_tips USING btree (was_picked_up, expiration);
-
-
---
--- Name: merchant_transfers_by_credit; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_transfers_by_credit ON public.merchant_transfer_to_coin USING btree (credit_serial);
-
-
---
--- Name: partner_accounts_index_by_partner_and_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX partner_accounts_index_by_partner_and_time ON public.partner_accounts USING btree (partner_serial_id, last_seen);
-
-
---
--- Name: prewire_by_failed_finished_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_by_failed_finished_index ON ONLY public.prewire USING btree (failed, finished);
-
-
---
--- Name: INDEX prewire_by_failed_finished_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.prewire_by_failed_finished_index IS 'for wire_prepare_data_get';
-
-
---
--- Name: prewire_by_finished_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_by_finished_index ON ONLY public.prewire USING btree (finished);
-
-
---
--- Name: INDEX prewire_by_finished_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.prewire_by_finished_index IS 'for gc_prewire';
-
-
---
--- Name: prewire_default_failed_finished_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_default_failed_finished_idx ON public.prewire_default USING btree (failed, finished);
-
-
---
--- Name: prewire_default_finished_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_default_finished_idx ON public.prewire_default USING btree (finished);
-
-
---
--- Name: purse_deposits_by_coin_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_deposits_by_coin_pub ON ONLY public.purse_deposits USING btree (coin_pub);
-
-
---
--- Name: purse_deposits_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_deposits_default_coin_pub_idx ON public.purse_deposits_default USING btree (coin_pub);
-
-
---
--- Name: purse_merges_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_merges_reserve_pub ON ONLY public.purse_merges USING btree (reserve_pub);
-
-
---
--- Name: INDEX purse_merges_reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.purse_merges_reserve_pub IS 'needed in reserve history computation';
-
-
---
--- Name: purse_merges_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_merges_default_reserve_pub_idx ON public.purse_merges_default USING btree (reserve_pub);
-
-
---
--- Name: purse_requests_merge_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_requests_merge_pub ON ONLY public.purse_requests USING btree (merge_pub);
-
-
---
--- Name: purse_requests_default_merge_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_requests_default_merge_pub_idx ON public.purse_requests_default USING btree (merge_pub);
-
-
---
--- Name: recoup_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_coin_pub_index ON ONLY public.recoup USING btree (coin_pub);
-
-
---
--- Name: recoup_by_reserve_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_reserve_main_index ON ONLY public.recoup_by_reserve USING btree (reserve_out_serial_id);
-
-
---
--- Name: recoup_by_reserve_default_reserve_out_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_reserve_default_reserve_out_serial_id_idx ON public.recoup_by_reserve_default USING btree (reserve_out_serial_id);
-
-
---
--- Name: recoup_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_default_coin_pub_idx ON public.recoup_default USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_by_coin_pub_index ON ONLY public.recoup_refresh USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_by_rrc_serial_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_by_rrc_serial_index ON ONLY public.recoup_refresh USING btree (rrc_serial);
-
-
---
--- Name: recoup_refresh_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_default_coin_pub_idx ON public.recoup_refresh_default USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_default_rrc_serial_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_default_rrc_serial_idx ON public.recoup_refresh_default USING btree (rrc_serial);
-
-
---
--- Name: refresh_commitments_by_old_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_commitments_by_old_coin_pub_index ON ONLY public.refresh_commitments USING btree (old_coin_pub);
-
-
---
--- Name: refresh_commitments_default_old_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_commitments_default_old_coin_pub_idx ON public.refresh_commitments_default USING btree (old_coin_pub);
-
-
---
--- Name: refresh_revealed_coins_coins_by_melt_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_revealed_coins_coins_by_melt_serial_id_index ON ONLY public.refresh_revealed_coins USING btree (melt_serial_id);
-
-
---
--- Name: refresh_revealed_coins_default_melt_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_revealed_coins_default_melt_serial_id_idx ON public.refresh_revealed_coins_default USING btree (melt_serial_id);
-
-
---
--- Name: refunds_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refunds_by_coin_pub_index ON ONLY public.refunds USING btree (coin_pub);
-
-
---
--- Name: refunds_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refunds_default_coin_pub_idx ON public.refunds_default USING btree (coin_pub);
-
-
---
--- Name: reserves_by_expiration_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_expiration_index ON ONLY public.reserves USING btree (expiration_date, current_balance_val, current_balance_frac);
-
-
---
--- Name: INDEX reserves_by_expiration_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_by_expiration_index IS 'used in get_expired_reserves';
-
-
---
--- Name: reserves_by_gc_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_gc_date_index ON ONLY public.reserves USING btree (gc_date);
-
-
---
--- Name: INDEX reserves_by_gc_date_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_by_gc_date_index IS 'for reserve garbage collection';
-
-
---
--- Name: reserves_by_reserve_uuid_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_reserve_uuid_index ON ONLY public.reserves USING btree (reserve_uuid);
-
-
---
--- Name: reserves_close_by_close_uuid_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_by_close_uuid_index ON ONLY public.reserves_close USING btree (close_uuid);
-
-
---
--- Name: reserves_close_by_reserve_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_by_reserve_pub_index ON ONLY public.reserves_close USING btree (reserve_pub);
-
-
---
--- Name: reserves_close_default_close_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_default_close_uuid_idx ON public.reserves_close_default USING btree (close_uuid);
-
-
---
--- Name: reserves_close_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_default_reserve_pub_idx ON public.reserves_close_default USING btree (reserve_pub);
-
-
---
--- Name: reserves_default_expiration_date_current_balance_val_curren_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_expiration_date_current_balance_val_curren_idx ON public.reserves_default USING btree (expiration_date, current_balance_val, current_balance_frac);
-
-
---
--- Name: reserves_default_gc_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_gc_date_idx ON public.reserves_default USING btree (gc_date);
-
-
---
--- Name: reserves_default_reserve_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_reserve_uuid_idx ON public.reserves_default USING btree (reserve_uuid);
-
-
---
--- Name: reserves_in_by_exch_accnt_reserve_in_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_exch_accnt_reserve_in_serial_id_idx ON ONLY public.reserves_in USING btree (exchange_account_section, reserve_in_serial_id DESC);
-
-
---
--- Name: reserves_in_by_exch_accnt_section_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_exch_accnt_section_execution_date_idx ON ONLY public.reserves_in USING btree (exchange_account_section, execution_date);
-
-
---
--- Name: reserves_in_by_reserve_in_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_reserve_in_serial_id_index ON ONLY public.reserves_in USING btree (reserve_in_serial_id);
-
-
---
--- Name: reserves_in_default_exchange_account_section_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_exchange_account_section_execution_date_idx ON public.reserves_in_default USING btree (exchange_account_section, execution_date);
-
-
---
--- Name: reserves_in_default_exchange_account_section_reserve_in_ser_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_exchange_account_section_reserve_in_ser_idx ON public.reserves_in_default USING btree (exchange_account_section, reserve_in_serial_id DESC);
-
-
---
--- Name: reserves_in_default_reserve_in_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_reserve_in_serial_id_idx ON public.reserves_in_default USING btree (reserve_in_serial_id);
-
-
---
--- Name: reserves_out_by_reserve_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_main_index ON ONLY public.reserves_out_by_reserve USING btree (reserve_uuid);
-
-
---
--- Name: reserves_out_by_reserve_default_reserve_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_default_reserve_uuid_idx ON public.reserves_out_by_reserve_default USING btree (reserve_uuid);
-
-
---
--- Name: reserves_out_by_reserve_out_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_out_serial_id_index ON ONLY public.reserves_out USING btree (reserve_out_serial_id);
-
-
---
--- Name: reserves_out_by_reserve_uuid_and_execution_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_uuid_and_execution_date_index ON ONLY public.reserves_out USING btree (reserve_uuid, execution_date);
-
-
---
--- Name: INDEX reserves_out_by_reserve_uuid_and_execution_date_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_out_by_reserve_uuid_and_execution_date_index IS 'for get_reserves_out and exchange_do_withdraw_limit_check';
-
-
---
--- Name: reserves_out_default_reserve_out_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_default_reserve_out_serial_id_idx ON public.reserves_out_default USING btree (reserve_out_serial_id);
-
-
---
--- Name: reserves_out_default_reserve_uuid_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_default_reserve_uuid_execution_date_idx ON public.reserves_out_default USING btree (reserve_uuid, execution_date);
-
-
---
--- Name: revolving_work_shards_by_job_name_active_last_attempt_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX revolving_work_shards_by_job_name_active_last_attempt_index ON public.revolving_work_shards USING btree (job_name, active, last_attempt);
-
-
---
--- Name: wad_in_entries_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_in_entries_reserve_pub ON ONLY public.wad_in_entries USING btree (reserve_pub);
-
-
---
--- Name: INDEX wad_in_entries_reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.wad_in_entries_reserve_pub IS 'needed in reserve history computation';
-
-
---
--- Name: wad_in_entries_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_in_entries_default_reserve_pub_idx ON public.wad_in_entries_default USING btree (reserve_pub);
-
-
---
--- Name: wad_out_entries_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_out_entries_by_reserve_pub ON ONLY public.wad_out_entries USING btree (reserve_pub);
-
-
---
--- Name: wad_out_entries_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_out_entries_default_reserve_pub_idx ON public.wad_out_entries_default USING btree (reserve_pub);
-
-
---
--- Name: wire_fee_by_end_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_fee_by_end_date_index ON public.wire_fee USING btree (end_date);
-
-
---
--- Name: wire_out_by_wire_target_h_payto_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_out_by_wire_target_h_payto_index ON ONLY public.wire_out USING btree (wire_target_h_payto);
-
-
---
--- Name: wire_out_default_wire_target_h_payto_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_out_default_wire_target_h_payto_idx ON public.wire_out_default USING btree (wire_target_h_payto);
-
-
---
--- Name: work_shards_by_job_name_completed_last_attempt_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX work_shards_by_job_name_completed_last_attempt_index ON public.work_shards USING btree (job_name, completed, last_attempt);
-
-
---
--- Name: account_merges_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.account_merges_pkey ATTACH PARTITION public.account_merges_default_pkey;
-
-
---
--- Name: account_merges_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.account_merges_by_reserve_pub ATTACH PARTITION public.account_merges_default_reserve_pub_idx;
-
-
---
--- Name: aggregation_tracking_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.aggregation_tracking_pkey ATTACH PARTITION public.aggregation_tracking_default_pkey;
-
-
---
--- Name: aggregation_tracking_default_wtid_raw_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.aggregation_tracking_by_wtid_raw_index ATTACH PARTITION public.aggregation_tracking_default_wtid_raw_idx;
-
-
---
--- Name: close_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.close_requests_pkey ATTACH PARTITION public.close_requests_default_pkey;
-
-
---
--- Name: contracts_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.contracts_pkey ATTACH PARTITION public.contracts_default_pkey;
-
-
---
--- Name: cs_nonce_locks_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.cs_nonce_locks_pkey ATTACH PARTITION public.cs_nonce_locks_default_pkey;
-
-
---
--- Name: deposits_by_ready_default_wire_deadline_shard_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_by_ready_main_index ATTACH PARTITION public.deposits_by_ready_default_wire_deadline_shard_coin_pub_idx;
-
-
---
--- Name: deposits_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_by_coin_pub_index ATTACH PARTITION public.deposits_default_coin_pub_idx;
-
-
---
--- Name: deposits_for_matching_default_refund_deadline_merchant_pub__idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_for_matching_main_index ATTACH PARTITION public.deposits_for_matching_default_refund_deadline_merchant_pub__idx;
-
-
---
--- Name: extension_details_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.extension_details_pkey ATTACH PARTITION public.extension_details_default_pkey;
-
-
---
--- Name: history_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.history_requests_pkey ATTACH PARTITION public.history_requests_default_pkey;
-
-
---
--- Name: known_coins_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.known_coins_pkey ATTACH PARTITION public.known_coins_default_pkey;
-
-
---
--- Name: prewire_default_failed_finished_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_by_failed_finished_index ATTACH PARTITION public.prewire_default_failed_finished_idx;
-
-
---
--- Name: prewire_default_finished_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_by_finished_index ATTACH PARTITION public.prewire_default_finished_idx;
-
-
---
--- Name: prewire_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_pkey ATTACH PARTITION public.prewire_default_pkey;
-
-
---
--- Name: purse_deposits_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_deposits_by_coin_pub ATTACH PARTITION public.purse_deposits_default_coin_pub_idx;
-
-
---
--- Name: purse_deposits_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_deposits_pkey ATTACH PARTITION public.purse_deposits_default_pkey;
-
-
---
--- Name: purse_merges_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_merges_pkey ATTACH PARTITION public.purse_merges_default_pkey;
-
-
---
--- Name: purse_merges_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_merges_reserve_pub ATTACH PARTITION public.purse_merges_default_reserve_pub_idx;
-
-
---
--- Name: purse_requests_default_merge_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_requests_merge_pub ATTACH PARTITION public.purse_requests_default_merge_pub_idx;
-
-
---
--- Name: purse_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_requests_pkey ATTACH PARTITION public.purse_requests_default_pkey;
-
-
---
--- Name: recoup_by_reserve_default_reserve_out_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_by_reserve_main_index ATTACH PARTITION public.recoup_by_reserve_default_reserve_out_serial_id_idx;
-
-
---
--- Name: recoup_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_by_coin_pub_index ATTACH PARTITION public.recoup_default_coin_pub_idx;
-
-
---
--- Name: recoup_refresh_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_refresh_by_coin_pub_index ATTACH PARTITION public.recoup_refresh_default_coin_pub_idx;
-
-
---
--- Name: recoup_refresh_default_rrc_serial_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_refresh_by_rrc_serial_index ATTACH PARTITION public.recoup_refresh_default_rrc_serial_idx;
-
-
---
--- Name: refresh_commitments_default_old_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_commitments_by_old_coin_pub_index ATTACH PARTITION public.refresh_commitments_default_old_coin_pub_idx;
-
-
---
--- Name: refresh_commitments_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_commitments_pkey ATTACH PARTITION public.refresh_commitments_default_pkey;
-
-
---
--- Name: refresh_revealed_coins_default_melt_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_revealed_coins_coins_by_melt_serial_id_index ATTACH PARTITION public.refresh_revealed_coins_default_melt_serial_id_idx;
-
-
---
--- Name: refresh_transfer_keys_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_transfer_keys_pkey ATTACH PARTITION public.refresh_transfer_keys_default_pkey;
-
-
---
--- Name: refunds_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refunds_by_coin_pub_index ATTACH PARTITION public.refunds_default_coin_pub_idx;
-
-
---
--- Name: reserves_close_default_close_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_close_by_close_uuid_index ATTACH PARTITION public.reserves_close_default_close_uuid_idx;
-
-
---
--- Name: reserves_close_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_close_by_reserve_pub_index ATTACH PARTITION public.reserves_close_default_reserve_pub_idx;
-
-
---
--- Name: reserves_default_expiration_date_current_balance_val_curren_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_expiration_index ATTACH PARTITION public.reserves_default_expiration_date_current_balance_val_curren_idx;
-
-
---
--- Name: reserves_default_gc_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_gc_date_index ATTACH PARTITION public.reserves_default_gc_date_idx;
-
-
---
--- Name: reserves_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_pkey ATTACH PARTITION public.reserves_default_pkey;
-
-
---
--- Name: reserves_default_reserve_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_reserve_uuid_index ATTACH PARTITION public.reserves_default_reserve_uuid_idx;
-
-
---
--- Name: reserves_in_default_exchange_account_section_execution_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_exch_accnt_section_execution_date_idx ATTACH PARTITION public.reserves_in_default_exchange_account_section_execution_date_idx;
-
-
---
--- Name: reserves_in_default_exchange_account_section_reserve_in_ser_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_exch_accnt_reserve_in_serial_id_idx ATTACH PARTITION public.reserves_in_default_exchange_account_section_reserve_in_ser_idx;
-
-
---
--- Name: reserves_in_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_pkey ATTACH PARTITION public.reserves_in_default_pkey;
-
-
---
--- Name: reserves_in_default_reserve_in_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_reserve_in_serial_id_index ATTACH PARTITION public.reserves_in_default_reserve_in_serial_id_idx;
-
-
---
--- Name: reserves_out_by_reserve_default_reserve_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_main_index ATTACH PARTITION public.reserves_out_by_reserve_default_reserve_uuid_idx;
-
-
---
--- Name: reserves_out_default_h_blind_ev_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_h_blind_ev_key ATTACH PARTITION public.reserves_out_default_h_blind_ev_key;
-
-
---
--- Name: reserves_out_default_reserve_out_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_out_serial_id_index ATTACH PARTITION public.reserves_out_default_reserve_out_serial_id_idx;
-
-
---
--- Name: reserves_out_default_reserve_uuid_execution_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_uuid_and_execution_date_index ATTACH PARTITION public.reserves_out_default_reserve_uuid_execution_date_idx;
-
-
---
--- Name: wad_in_entries_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_in_entries_pkey ATTACH PARTITION public.wad_in_entries_default_pkey;
-
-
---
--- Name: wad_in_entries_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_in_entries_reserve_pub ATTACH PARTITION public.wad_in_entries_default_reserve_pub_idx;
-
-
---
--- Name: wad_out_entries_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_out_entries_pkey ATTACH PARTITION public.wad_out_entries_default_pkey;
-
-
---
--- Name: wad_out_entries_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_out_entries_by_reserve_pub ATTACH PARTITION public.wad_out_entries_default_reserve_pub_idx;
-
-
---
--- Name: wads_in_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_in_pkey ATTACH PARTITION public.wads_in_default_pkey;
-
-
---
--- Name: wads_in_default_wad_id_origin_exchange_url_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_in_wad_id_origin_exchange_url_key ATTACH PARTITION public.wads_in_default_wad_id_origin_exchange_url_key;
-
-
---
--- Name: wads_out_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_out_pkey ATTACH PARTITION public.wads_out_default_pkey;
-
-
---
--- Name: wire_out_default_wire_target_h_payto_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_out_by_wire_target_h_payto_index ATTACH PARTITION public.wire_out_default_wire_target_h_payto_idx;
-
-
---
--- Name: wire_out_default_wtid_raw_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_out_wtid_raw_key ATTACH PARTITION public.wire_out_default_wtid_raw_key;
-
-
---
--- Name: wire_targets_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_targets_pkey ATTACH PARTITION public.wire_targets_default_pkey;
-
-
---
--- Name: deposits deposits_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_delete AFTER DELETE ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_delete_trigger();
-
-
---
--- Name: deposits deposits_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_insert AFTER INSERT ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_insert_trigger();
-
-
---
--- Name: deposits deposits_on_update; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_update AFTER UPDATE ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_update_trigger();
-
-
---
--- Name: recoup recoup_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER recoup_on_delete AFTER DELETE ON public.recoup FOR EACH ROW EXECUTE FUNCTION public.recoup_delete_trigger();
-
-
---
--- Name: recoup recoup_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER recoup_on_insert AFTER INSERT ON public.recoup FOR EACH ROW EXECUTE FUNCTION public.recoup_insert_trigger();
-
-
---
--- Name: reserves_out reserves_out_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER reserves_out_on_delete AFTER DELETE ON public.reserves_out FOR EACH ROW EXECUTE FUNCTION public.reserves_out_by_reserve_delete_trigger();
-
-
---
--- Name: reserves_out reserves_out_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER reserves_out_on_insert AFTER INSERT ON public.reserves_out FOR EACH ROW EXECUTE FUNCTION public.reserves_out_by_reserve_insert_trigger();
-
-
---
--- Name: wire_out wire_out_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER wire_out_on_delete AFTER DELETE ON public.wire_out FOR EACH ROW EXECUTE FUNCTION public.wire_out_delete_trigger();
-
-
---
--- Name: app_bankaccount app_bankaccount_user_id_2722a34f_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_user_id_2722a34f_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_banktransaction app_banktransaction_credit_account_id_a8ba05ac_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_credit_account_id_a8ba05ac_fk_app_banka FOREIGN KEY (credit_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_banktransaction app_banktransaction_debit_account_id_5b1f7528_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_debit_account_id_5b1f7528_fk_app_banka FOREIGN KEY (debit_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawope_selected_exchange_ac_6c8b96cf_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawope_selected_exchange_ac_6c8b96cf_fk_app_banka FOREIGN KEY (selected_exchange_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawope_withdraw_account_id_992dc5b3_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawope_withdraw_account_id_992dc5b3_fk_app_banka FOREIGN KEY (withdraw_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_auditor_uuid_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_auditor_uuid_fkey FOREIGN KEY (auditor_uuid) REFERENCES public.auditors(auditor_uuid) ON DELETE CASCADE;
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_denominations_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_denominations_serial_fkey FOREIGN KEY (denominations_serial) REFERENCES public.denominations(denominations_serial) ON DELETE CASCADE;
-
-
---
--- Name: auth_group_permissions auth_group_permissio_permission_id_84c5c92e_fk_auth_perm; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissio_permission_id_84c5c92e_fk_auth_perm FOREIGN KEY (permission_id) REFERENCES public.auth_permission(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_group_permissions auth_group_permissions_group_id_b120cbf9_fk_auth_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_group_id_b120cbf9_fk_auth_group_id FOREIGN KEY (group_id) REFERENCES public.auth_group(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_permission auth_permission_content_type_id_2f476e4b_fk_django_co; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_content_type_id_2f476e4b_fk_django_co FOREIGN KEY (content_type_id) REFERENCES public.django_content_type(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_groups auth_user_groups_group_id_97559544_fk_auth_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_group_id_97559544_fk_auth_group_id FOREIGN KEY (group_id) REFERENCES public.auth_group(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_groups auth_user_groups_user_id_6a12ed8b_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_user_id_6a12ed8b_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permi_permission_id_1fbb5f2c_fk_auth_perm; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permi_permission_id_1fbb5f2c_fk_auth_perm FOREIGN KEY (permission_id) REFERENCES public.auth_permission(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_user_id_a95ead1b_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_user_id_a95ead1b_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: denomination_revocations denomination_revocations_denominations_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_denominations_serial_fkey FOREIGN KEY (denominations_serial) REFERENCES public.denominations(denominations_serial) ON DELETE CASCADE;
-
-
---
--- Name: auditor_exchange_signkeys master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_exchange_signkeys
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_reserve master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_reserve
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_aggregation master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_aggregation
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_deposit_confirmation master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_deposit_confirmation
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_coin master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_coin
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: wire_auditor_account_progress master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_account_progress
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: wire_auditor_progress master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_progress
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_reserves master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_reserve_balance master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserve_balance
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_wire_fee_balance master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_wire_fee_balance
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_balance_summary master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_balance_summary
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_historic_denomination_revenue master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_denomination_revenue
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_historic_reserve_summary master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_reserve_summary
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: deposit_confirmations master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_predicted_result master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_predicted_result
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: merchant_accounts merchant_accounts_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial);
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_deposit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_deposit_serial_fkey FOREIGN KEY (deposit_serial) REFERENCES public.merchant_deposits(deposit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_contract_terms(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_inventory_locks merchant_inventory_locks_product_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory_locks
-    ADD CONSTRAINT merchant_inventory_locks_product_serial_fkey FOREIGN KEY (product_serial) REFERENCES public.merchant_inventory(product_serial);
-
-
---
--- Name: merchant_inventory merchant_inventory_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_keys merchant_keys_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_kyc merchant_kyc_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_order_locks merchant_order_locks_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_order_locks
-    ADD CONSTRAINT merchant_order_locks_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_orders(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_order_locks merchant_order_locks_product_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_order_locks
-    ADD CONSTRAINT merchant_order_locks_product_serial_fkey FOREIGN KEY (product_serial) REFERENCES public.merchant_inventory(product_serial);
-
-
---
--- Name: merchant_orders merchant_orders_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_refund_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_refund_serial_fkey FOREIGN KEY (refund_serial) REFERENCES public.merchant_refunds(refund_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refunds merchant_refunds_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_contract_terms(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_pickup_signatures merchant_tip_pickup_signatures_pickup_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickup_signatures
-    ADD CONSTRAINT merchant_tip_pickup_signatures_pickup_serial_fkey FOREIGN KEY (pickup_serial) REFERENCES public.merchant_tip_pickups(pickup_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_tip_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_tip_serial_fkey FOREIGN KEY (tip_serial) REFERENCES public.merchant_tips(tip_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_serial_fkey FOREIGN KEY (reserve_serial) REFERENCES public.merchant_tip_reserves(reserve_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tips merchant_tips_reserve_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_reserve_serial_fkey FOREIGN KEY (reserve_serial) REFERENCES public.merchant_tip_reserves(reserve_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_deposit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_deposit_serial_fkey FOREIGN KEY (deposit_serial) REFERENCES public.merchant_deposits(deposit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfers merchant_transfers_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: partner_accounts partner_accounts_partner_serial_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partner_accounts
-    ADD CONSTRAINT partner_accounts_partner_serial_id_fkey FOREIGN KEY (partner_serial_id) REFERENCES public.partners(partner_serial_id) ON DELETE CASCADE;
-
-
---
--- Name: signkey_revocations signkey_revocations_esk_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_esk_serial_fkey FOREIGN KEY (esk_serial) REFERENCES public.exchange_sign_keys(esk_serial) ON DELETE CASCADE;
-
-
---
--- PostgreSQL database dump complete
---
-
diff --git a/src/auditor/auditor.conf b/src/auditor/auditor.conf
index 270836283..3c04d196f 100644
--- a/src/auditor/auditor.conf
+++ b/src/auditor/auditor.conf
@@ -9,7 +9,7 @@ DB = postgres
 #TINY_AMOUNT = KUDOS:0.01
 
 # Where do we store the auditor's private key?
-AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
+AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}auditor/offline-keys/auditor.priv
 
 # What is the public key of this auditor? Used for processes that
 # verify auditor's signatures but have no access to the private key.
@@ -17,7 +17,7 @@ AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
 
 # What is the Web site of the auditor (i.e. to file complaints about
 # a misbehaving exchange)?
-# BASE_URL = https://auditor.taler.net/
+BASE_URL = http://localhost:8083/
 
 
 # Network configuration for the normal API/service HTTP server
@@ -26,7 +26,7 @@ SERVE = tcp
 
 # Unix domain socket to listen on,
 # only effective with "SERVE = unix"
-UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange.http
 UNIXPATH_MODE = 660
 
 # HTTP port the auditor listens to
diff --git a/src/auditor/batch.conf b/src/auditor/batch.conf
index afd1ae1fb..cd8c64b8e 100644
--- a/src/auditor/batch.conf
+++ b/src/auditor/batch.conf
@@ -1,6 +1,3 @@
-[arm]
-CONFIG = /research/taler/exchange/src/auditor/batch.conf
-
 [benchmark]
 MERCHANT_DETAILS = merchant_details.json
 BANK_DETAILS = bank_details.json
@@ -113,7 +110,7 @@ currency = TESTKUDOS
 [merchant-exchange-default]
 CURRENCY = TESTKUDOS
 EXCHANGE_BASE_URL = http://localhost:8081/
-MASTER_KEY = X2759N3GMFX9N4PAS10ZGXJ3XHF69PJ9K2P9QAQPJMKEH413MW2G
+MASTER_KEY = 2XPQZ7B7EERWT7GR0MF30HPFG4TA1J0CWCQ3XBD48PA4K7GVDBK0
 
 [merchant-account-merchant]
 ACTIVE_default = YES
@@ -124,7 +121,7 @@ PAYTO_URI = payto://x-taler-bank/localhost/42
 PASSWORD = x
 USERNAME = Exchange
 WIRE_GATEWAY_AUTH_METHOD = basic
-WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/Exchange/taler-wire-gateway/
 
 [exchange-account-1]
 enable_credit = yes
@@ -157,14 +154,14 @@ CONFIG = postgres:///batch
 [exchange]
 LOOKAHEAD_SIGN = 32 weeks 1 day
 SIGNKEY_DURATION = 4 weeks
-MASTER_PUBLIC_KEY = X2759N3GMFX9N4PAS10ZGXJ3XHF69PJ9K2P9QAQPJMKEH413MW2G
+MASTER_PUBLIC_KEY = 2XPQZ7B7EERWT7GR0MF30HPFG4TA1J0CWCQ3XBD48PA4K7GVDBK0
 SIGNKEY_LEGAL_DURATION = 4 weeks
 UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
 
 [bank]
 SERVE = http
 ALLOW_REGISTRATIONS = YES
-SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost/2
+SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost:8082/2
 SUGGESTED_EXCHANGE = http://localhost:8081/
 HTTP_PORT = 8082
 MAX_DEBT_BANK = TESTKUDOS:100000.0
@@ -175,7 +172,7 @@ DATABASE = postgres:///batch
 CONFIG = postgres:///batch
 
 [auditor]
-PUBLIC_KEY = EK8NVJACS6PCXMZ0CY33K753MGRX5BTXSTRWPGJXWFSBNJ1PNZ8G
+PUBLIC_KEY = JG9QFRG7R7BH9701420BD6M38NZW21MV9AR3QHYJEAHZ4S26B3HG
 TINY_AMOUNT = TESTKUDOS:0.01
 BASE_URL = http://localhost:8083/
 
@@ -184,4 +181,3 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
 TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
 TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
 TALER_HOME = ${PWD}/generate_auditordb_home/
-
diff --git a/src/auditor/batch.sh b/src/auditor/batch.sh
index fed690432..bbe1be0ba 100755
--- a/src/auditor/batch.sh
+++ b/src/auditor/batch.sh
@@ -64,22 +64,22 @@ createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB"
 
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE`
-MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=$(taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE)
+MASTER_PRIV_DIR=$(dirname $MASTER_PRIV_FILE)
 mkdir -p $MASTER_PRIV_DIR
 gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null
-MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE`
-EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
-MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
+MASTER_PUB=$(gnunet-ecc -p $MASTER_PRIV_FILE)
+EXCHANGE_URL=$(taler-config -c $CONF -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-config -c $CONF -s MERCHANT -o PORT)
 MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
-BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT`
+BANK_PORT=$(taler-config -c $CONF -s BANK -o HTTP_PORT)
 BANK_URL=http://localhost:${BANK_PORT}/
 AUDITOR_URL=http://localhost:8083/
-AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
+AUDITOR_PRIV_FILE=$(taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE)
+AUDITOR_PRIV_DIR=$(dirname $AUDITOR_PRIV_FILE)
 mkdir -p $AUDITOR_PRIV_DIR
 gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null
-AUDITOR_PUB=`gnunet-ecc -p $AUDITOR_PRIV_FILE`
+AUDITOR_PUB=$(gnunet-ecc -p $AUDITOR_PRIV_FILE)
 
 echo "AUDITOR PUB is $AUDITOR_PUB using file $AUDITOR_PRIV_FILE"
 
@@ -193,7 +193,7 @@ echo " DONE"
 
 echo -n "Setting up merchant"
 
-curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/management/instances
+curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"accounts":[{"payto_uri":"payto://x-taler-bank/localhost/43"}],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000}}' http://localhost:9966/management/instances
 
 
 echo " DONE"
@@ -214,7 +214,7 @@ bash
 #    {
 #      amountToSpend: "TESTKUDOS:4",
 #      amountToWithdraw: "TESTKUDOS:10",
-#      bankBaseUrl: $BANK_URL,
+#      corebankApiBaseUrl: $BANK_URL,
 #      exchangeBaseUrl: $EXCHANGE_URL,
 #      merchantBaseUrl: $MERCHANT_URL,
 #    }' \
diff --git a/src/auditor/generate-auditor-basedb-template.conf b/src/auditor/generate-auditor-basedb-template.conf
deleted file mode 100644
index 1d18740c7..000000000
--- a/src/auditor/generate-auditor-basedb-template.conf
+++ /dev/null
@@ -1 +0,0 @@
-@INLINE@ generate-auditor-basedb.conf
diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index 5540aa3b8..8cf63fbba 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -1,101 +1,123 @@
+[PATHS]
+TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
+TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
+TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
+TALER_HOME = ${PWD}/generate_auditordb_home/
+[taler]
+CURRENCY = TESTKUDOS
+CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
+
 [exchange]
-MAX_KEYS_CACHING = forever
-DB = postgres
-SERVE = tcp
-UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
-UNIXPATH_MODE = 660
-PORT = 8081
-BASE_URL = http://localhost:8081/
+MASTER_PUBLIC_KEY = M4FGP18EQFXFGGFQ1AWXHACN2JX0SMVK9CNF6459Z1WG18JSN0BG
 SIGNKEY_DURATION = 4 weeks
-SIGNKEY_LEGAL_DURATION = 4 weeks
 LOOKAHEAD_SIGN = 32 weeks 1 day
+SIGNKEY_LEGAL_DURATION = 4 weeks
+AML_THRESHOLD = TESTKUDOS:1000000
+db = postgres
+BASE_URL = http://localhost:8081/
+IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
+LEGAL_RESERVE_EXPIRATION_TIME = 4 weeks
 
-[merchant]
-SERVE = tcp
-PORT = 9966
-UNIXPATH = ${TALER_RUNTIME_DIR}/merchant.http
-UNIXPATH_MODE = 660
-DEFAULT_WIRE_FEE_AMORTIZATION = 1
-DB = postgres
-WIREFORMAT = default
-# Set very low, so we can be sure that the database generated
-# will contain wire transfers "ready" for the aggregator.
-WIRE_TRANSFER_DELAY = 1 minute
-DEFAULT_PAY_DEADLINE = 1 day
-DEFAULT_MAX_DEPOSIT_FEE = TESTKUDOS:0.1
-KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-DEFAULT_MAX_WIRE_FEE = TESTKUDOS:0.10
-
-# Ensure that merchant reports EVERY deposit confirmation to auditor
-FORCE_AUDIT = YES
-
-[instance-default]
-KEYFILE = ${TALER_DATA_HOME}/merchant/default.priv
-NAME = Merchant Inc.
+[exchangedb]
+IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
+LEGAL_RESERVE_EXPIRATION_TIME = 4 weeks
+AGGREGATOR_SHIFT = 1 s
+DEFAULT_PURSE_LIMIT = 1
 
-[auditor]
-DB = postgres
-AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
+[libeufin-bank]
+CURRENCY = TESTKUDOS
+DEFAULT_CUSTOMER_DEBT_LIMIT = TESTKUDOS:200
+DEFAULT_ADMIN_DEBT_LIMIT = TESTKUDOS:2000
+ALLOW_REGISTRATION = yes
+REGISTRATION_BONUS_ENABLED = yes
+REGISTRATION_BONUS = TESTKUDOS:100
+SUGGESTED_WITHDRAWAL_EXCHANGE = http://localhost:8081/
+WIRE_TYPE = iban
+IBAN_PAYTO_BIC = SANDBOXX
 SERVE = tcp
-UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
-UNIXPATH_MODE = 660
-PORT = 8083
-BASE_URL = http://localhost:8083/
-TINY_AMOUNT = TESTKUDOS:0.01
+PORT = 8082
 
-[PATHS]
-TALER_HOME = ${PWD}/generate_auditordb_home/
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-system-runtime/
-
-[bank]
-DATABASE = postgres:///taler-auditor-basedb
-MAX_DEBT = TESTKUDOS:50.0
-MAX_DEBT_BANK = TESTKUDOS:100000.0
-HTTP_PORT = 8082
-SUGGESTED_EXCHANGE = http://localhost:8081/
-SUGGESTED_EXCHANGE_PAYTO = payto://x-taler-bank/localhost/2
-ALLOW_REGISTRATIONS = YES
-SERVE = http
+[libeufin-bankdb-postgres]
+CONFIG = postgresql:///auditor-basedb
 
-[exchangedb]
+[exchangedb-postgres]
+CONFIG = postgres:///auditor-basedb
+SQL_DIR = $DATADIR/sql/exchange/
 IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
-LEGAL_RESERVE_EXPIRATION_TIME = 7 years
-
-[taler]
-CURRENCY = TESTKUDOS
-CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
+LEGAL_RESERVE_EXPIRATION_TIME = 4 weeks
 
 [exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-enable_debit = yes
-enable_credit = yes
+PAYTO_URI = payto://iban/SANDBOXX/DE989651?receiver-name=Exchange+Company
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/taler-wire-gateway/Exchange/"
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/exchange/taler-wire-gateway/
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = exchange
+PASSWORD = x
+
+[exchange-account-2]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-2]
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 
-[merchant-account-merchant]
-PAYTO_URI = payto://x-taler-bank/localhost/42
-HONOR_default = YES
-ACTIVE_default = YES
+[admin-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+# For now, fakebank still checks against the Exchange account...
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+
+[merchant]
+FORCE_AUDIT = YES
+SERVE = TCP
+PORT = 8888
+
+[merchantdb-postgres]
+CONFIG = postgres:///auditor-basedb
+SQL_DIR = $DATADIR/sql/merchant/
 
 [merchant-exchange-default]
+MASTER_KEY = M4FGP18EQFXFGGFQ1AWXHACN2JX0SMVK9CNF6459Z1WG18JSN0BG
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = TESTKUDOS
 
-[payments-generator]
-currency = TESTKUDOS
-instance = default
-bank = http://localhost:8082/
-merchant = http://localhost:9966/
-exchange_admin = http://localhost:18080/
-exchange-admin = http://localhost:18080/
-exchange = http://localhost:8081/
+[bank]
+HTTP_PORT = 8082
+
+[libeufin-nexus]
+DB_CONNECTION="postgresql:///auditor-basedb"
+
+[libeufin-sandbox]
+DB_CONNECTION="postgresql:///auditor-basedb"
+
+[libeufin-bank]
+CURRENCY = TESTKUDOS
+DEFAULT_CUSTOMER_DEBT_LIMIT = TESTKUDOS:200 # dead
+DEFAULT_ADMIN_DEBT_LIMIT = TESTKUDOS:2000
+REGISTRATION_BONUS_ENABLED = yes
+REGISTRATION_BONUS = TESTKUDOS:100
+SUGGESTED_WITHDRAWAL_EXCHANGE = http://localhost:8081/
+SERVE = tcp
+PORT = 8082
+
+[auditor]
+BASE_URL = http://localhost:8083/
+TINY_AMOUNT = TESTKUDOS:0.01
+PUBLIC_KEY = 0EHPW5WEKHXPPN4MPJNGA7Z6D29JP21GKVNV8ARFB1YW7WWJX20G
+db = postgres
+
+[auditordb-postgres]
+CONFIG = postgres:///auditor-basedb
+SQL_DIR = $DATADIR/sql/auditor/
 
 [coin_kudos_ct_1]
 value = TESTKUDOS:0.01
@@ -192,31 +214,3 @@ fee_refresh = TESTKUDOS:0.03
 fee_refund = TESTKUDOS:0.01
 CIPHER = RSA
 rsa_keysize = 1024
-
-[coin_kudos_ct_1]
-value = TESTKUDOS:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.01
-fee_deposit = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.01
-fee_refund = TESTKUDOS:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_kudos_ct_10]
-value = TESTKUDOS:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = TESTKUDOS:0.01
-fee_deposit = TESTKUDOS:0.01
-fee_refresh = TESTKUDOS:0.03
-fee_refund = TESTKUDOS:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[benchmark]
-BANK_DETAILS = bank_details.json
-MERCHANT_DETAILS = merchant_details.json
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 4006addfd..bbce37cdc 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -1,227 +1,114 @@
 #!/bin/bash
-# Script to generate the basic database for auditor
-# testing from a 'correct' interaction between exchange,
-# wallet and merchant.
+# This file is in the public domain.
 #
-# Creates $BASEDB.sql, $BASEDB.fees, $BASEDB.mpub and
-# $BASEDB.age.
-# Default $BASEDB is "auditor-basedb", override via $1.
+# Script to generate the basic database for auditor testing from a 'correct'
+# interaction between exchange, wallet and merchant.
 #
-# Currently must be run online as it interacts with
-# bank.test.taler.net; also requires the wallet CLI
-# to be installed and in the path.  Furthermore, the
-# user running this script must be Postgres superuser
-# and be allowed to create/drop databases.
+# Creates "$1.sql".
+#
+# Requires the wallet CLI to be installed and in the path.  Furthermore, the
+# user running this script must be Postgres superuser and be allowed to
+# create/drop databases.
 #
 set -eu
 
-# Cleanup to run whenever we exit
-function cleanup()
-{
-    for n in `jobs -p`
-    do
-        kill $n 2> /dev/null || true
-    done
-    wait
-}
-
-# Install cleanup handler (except for kill -9)
-trap cleanup EXIT
-
-
-# Exit, with status code "skip" (no 'real' failure)
-function exit_skip() {
-    echo $1
-    exit 77
-}
+. setup.sh
+
+CONF="generate-auditor-basedb.conf"
+# Parse command-line options
+while getopts ':c:d:h' OPTION; do
+    case "$OPTION" in
+        c)
+            CONF="$OPTARG"
+            ;;
+        d)
+            BASEDB="$OPTARG"
+            ;;
+        h)
+            echo 'Supported options:'
+# shellcheck disable=SC2016
+            echo '  -c $CONF     -- set configuration'
+# shellcheck disable=SC2016
+            echo '  -d $DB       -- set database name'
+            ;;
+        ?)
+        exit_fail "Unrecognized command line option"
+        ;;
+    esac
+done
 
 # Where do we write the result?
-BASEDB=${1:-"auditor-basedb"}
-
-# Name of the Postgres database we will use for the script.
-# Will be dropped, do NOT use anything that might be used
-# elsewhere
-export TARGET_DB=`basename ${BASEDB}`
-
-export WALLET_DB=${BASEDB:-"wallet"}.wdb
-
-# delete existing wallet database
-rm -f $WALLET_DB
-
-
-# Configuration file will be edited, so we create one
-# from the template.
-CONF=${BASEDB}.conf
-cp generate-auditor-basedb.conf $CONF
-
+if [ ! -v BASEDB ]
+then
+    exit_fail "-d option required"
+fi
 
-echo -n "Testing for taler-bank-manage"
-taler-bank-manage --help >/dev/null </dev/null || exit_skip " MISSING"
-echo " FOUND"
-echo -n "Testing for taler-wallet-cli"
-taler-wallet-cli -v >/dev/null </dev/null || exit_skip " MISSING"
-echo " FOUND"
-echo -n "Testing for curl"
+echo -n "Testing for curl ..."
 curl --help >/dev/null </dev/null || exit_skip " MISSING"
 echo " FOUND"
 
-
-pwd
-# Clean up
-
-DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
-rm -rf $DATA_DIR || true
-
 # reset database
-dropdb $TARGET_DB >/dev/null 2>/dev/null || true
-createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB"
+echo -n "Reset 'auditor-basedb' database at $PGHOST ..."
+dropdb "auditor-basedb" >/dev/null 2>/dev/null || true
+createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB' at $PGHOST"
+echo " DONE"
 
+# Launch exchange, merchant and bank.
+setup -c "$CONF" \
+      -abemw \
+      -d "iban"
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE`
-MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
-mkdir -p $MASTER_PRIV_DIR
-gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null
-MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE`
-EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
-MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
-MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
-BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT`
-BANK_URL=http://localhost:${BANK_PORT}/
-AUDITOR_URL=http://localhost:8083/
-AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
-mkdir -p $AUDITOR_PRIV_DIR
-gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null
-AUDITOR_PUB=`gnunet-ecc -p $AUDITOR_PRIV_FILE`
-
-echo "AUDITOR PUB is $AUDITOR_PUB using file $AUDITOR_PRIV_FILE"
-
-# patch configuration
-taler-config -c $CONF -s exchange -o MASTER_PUBLIC_KEY -V $MASTER_PUB
-taler-config -c $CONF -s auditor -o PUBLIC_KEY -V $AUDITOR_PUB
-taler-config -c $CONF -s merchant-exchange-default -o MASTER_KEY -V $MASTER_PUB
-taler-config -c $CONF -s exchangedb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s auditordb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s merchantdb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s bank -o database -V postgres:///$TARGET_DB
-
-# setup exchange
-echo "Setting up exchange"
-taler-exchange-dbinit -c $CONF
-
-echo "Setting up merchant"
-taler-merchant-dbinit -c $CONF
-
-# setup auditor
-echo "Setting up auditor"
-taler-auditor-dbinit -c $CONF || exit_skip "Failed to initialize auditor DB"
-taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL || exit_skip "Failed to add exchange to auditor"
-
-# Launch services
-echo "Launching services"
-taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> taler-bank.log &
-TFN=`which taler-exchange-httpd`
-TBINPFX=`dirname $TFN`
-TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
-taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
-taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
-taler-exchange-secmod-cs -c $CONF 2> taler-exchange-secmod-cs.log &
-taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
-taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
-taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
-taler-auditor-httpd -L INFO -c $CONF 2> taler-auditor-httpd.log &
-
-# Wait for all bank to be available (usually the slowest)
-for n in `seq 1 50`
-do
-    echo -n "."
-    sleep 0.2
-    OK=0
-    # bank
-    wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
-
-if [ 1 != $OK ]
-then
-    exit_skip "Failed to launch services"
-fi
-
-# Wait for all services to be available
-for n in `seq 1 50`
-do
-    echo -n "."
-    sleep 0.1
-    OK=0
-    # exchange
-    wget http://localhost:8081/seed -o /dev/null -O /dev/null >/dev/null || continue
-    # merchant
-    wget http://localhost:9966/ -o /dev/null -O /dev/null >/dev/null || continue
-    # Auditor
-    wget http://localhost:8083/ -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
-
-if [ 1 != $OK ]
-then
-    exit_skip "Failed to launch services"
-fi
+EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-config -c "$CONF" -s MERCHANT -o PORT)
+MERCHANT_URL="http://localhost:${MERCHANT_PORT}/"
+BANK_PORT=$(taler-config -c "$CONF" -s BANK -o HTTP_PORT)
+BANK_URL="http://localhost:${BANK_PORT}"
+
+echo -n "Checking setup worked ..."
+wget \
+    --tries=1 \
+    --timeout=1 \
+    "${EXCHANGE_URL}config" \
+    -o /dev/null \
+    -O /dev/null >/dev/null
+echo "DONE"
+
+export MERCHANT_URL
+echo -n "Setting up merchant ..."
+
+curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000},"use_stefan":false}' "${MERCHANT_URL}management/instances"
 echo " DONE"
 
-echo -n "Setting up keys"
-taler-exchange-offline -c $CONF \
-  download sign \
-  enable-account payto://x-taler-bank/localhost/Exchange \
-  enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \
-  wire-fee now x-taler-bank TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 \
-  global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1h 1year 5 \
-  upload &> taler-exchange-offline.log
-
-echo -n "."
-
-for n in `seq 1 2`
-do
-    echo -n "."
-    OK=0
-    wget --timeout=1 http://localhost:8081/keys -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
+echo -n "Setting up merchant account ..."
+FORTYTHREE="payto://iban/SANDBOXX/DE474361?receiver-name=Merchant43"
+STATUS=$(curl -H "Content-Type: application/json" -X POST \
+    "${MERCHANT_URL}private/accounts" \
+    -d '{"payto_uri":"'"$FORTYTHREE"'"}' \
+    -w "%{http_code}" -s -o /dev/null)
 
-if [ 1 != $OK ]
+if [ "$STATUS" != "200" ]
 then
-    exit_skip "Failed to setup keys"
+    exit_fail "Expected 200 OK. Got: $STATUS"
 fi
-
-echo " DONE"
-echo -n "Adding auditor signatures ..."
-
-taler-auditor-offline -c $CONF \
-  download sign upload &> taler-auditor-offline.log
-
 echo " DONE"
-# Setup merchant
-
-echo -n "Setting up merchant"
-
-curl -H "Content-Type: application/json" -X POST -d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/management/instances
 
-
-echo " DONE"
-
-# run wallet CLI
-echo "Running wallet"
-
-
-taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \
+# delete existing wallet database
+export WALLET_DB="wallet.wdb"
+rm -f "$WALLET_DB"
+
+echo -n "Running wallet ..."
+taler-wallet-cli \
+    --no-throttle \
+    --wallet-db="$WALLET_DB" \
+    api \
+    --expect-success \
+    'runIntegrationTest' \
   "$(jq -n '
     {
       amountToSpend: "TESTKUDOS:4",
       amountToWithdraw: "TESTKUDOS:10",
-      bankBaseUrl: $BANK_URL,
+      corebankApiBaseUrl: $BANK_URL,
       exchangeBaseUrl: $EXCHANGE_URL,
       merchantBaseUrl: $MERCHANT_URL,
     }' \
@@ -229,27 +116,28 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \
     --arg EXCHANGE_URL "$EXCHANGE_URL" \
     --arg BANK_URL "$BANK_URL"
   )" &> taler-wallet-cli.log
+echo " DONE"
 
-
-echo "Shutting down services"
-cleanup
+taler-wallet-cli --wallet-db="$WALLET_DB" run-until-done
 
 # Dump database
-echo "Dumping database"
-pg_dump -O $TARGET_DB | sed -e '/AS integer/d' > ${BASEDB}.sql
-
-echo $MASTER_PUB > ${BASEDB}.mpub
+mkdir -p "$(dirname "$BASEDB")"
 
-date +%s > ${BASEDB}.age
+echo "Dumping database ${BASEDB}.sql"
+pg_dump -O "auditor-basedb" | sed -e '/AS integer/d' > "${BASEDB}.sql"
+cp "${CONF}.edited" "${BASEDB}.conf"
+cp "$(taler-config -c "${CONF}.edited" -s exchange-offline -o MASTER_PRIV_FILE -f)" "${BASEDB}.mpriv"
 
 # clean up
-echo "Final clean up"
-dropdb $TARGET_DB
-
-rm -rf $DATA_DIR || true
+echo -n "Final clean up ..."
+kill -TERM "$SETUP_PID"
+wait
+unset SETUP_PID
+dropdb "auditor-basedb"
+echo " DONE"
 
 echo "====================================="
-echo "  Finished generation of $BASEDB"
+echo "Finished generation of ${BASEDB}.sql"
 echo "====================================="
 
 exit 0
diff --git a/src/auditor/generate-kyc-basedb.conf b/src/auditor/generate-kyc-basedb.conf
new file mode 100644
index 000000000..7f4a55cee
--- /dev/null
+++ b/src/auditor/generate-kyc-basedb.conf
@@ -0,0 +1,4 @@
+# This file is in the public domain.
+@INLINE@ generate-auditor-basedb.conf
+
+# FIXME: add options for KYC here!
\ No newline at end of file
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index 2be431199..29aa74b27 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -6,263 +6,138 @@
 # create/drop databases.
 #
 set -eu
+# set -x
 
-# Cleanup to run whenever we exit
-function cleanup()
-{
-    for n in `jobs -p`
-    do
-        kill $n 2> /dev/null || true
-    done
-    wait
-}
-
-# Install cleanup handler (except for kill -9)
-trap cleanup EXIT
-
-# Exit, with status code "skip" (no 'real' failure)
-function exit_skip() {
-    echo $1
-    exit 77
-}
+. setup.sh
 
-# Where do we write the result?
-export BASEDB=${1:-"revoke-basedb"}
-
-# Name of the Postgres database we will use for the script.
-# Will be dropped, do NOT use anything that might be used
-# elsewhere
-export TARGET_DB=`basename ${BASEDB}`
-TMP_DIR=`mktemp -d revocation-tmp-XXXXXX`
-export WALLET_DB=wallet-revocation.json
-rm -f $WALLET_DB
-
-# Configuration file will be edited, so we create one
-# from the template.
-export CONF=generate-auditor-basedb-revocation.conf
-cp generate-auditor-basedb.conf $CONF
-
-
-echo -n "Testing for taler-bank-manage"
-taler-bank-manage --help >/dev/null </dev/null || exit_skip " MISSING"
-echo " FOUND"
-echo -n "Testing for taler-wallet-cli"
-taler-wallet-cli -v >/dev/null </dev/null || exit_skip " MISSING"
-echo " FOUND"
-echo -n "Testing for curl"
+echo -n "Testing for curl ..."
 curl --help >/dev/null </dev/null || exit_skip " MISSING"
 echo " FOUND"
 
-
-
-# Clean up
-DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
-rm -rf $DATA_DIR || true
+CONF="generate-auditor-basedb.conf"
 
 # reset database
-dropdb $TARGET_DB >/dev/null 2>/dev/null || true
-createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB"
-
-# obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE`
-MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
-mkdir -p $MASTER_PRIV_DIR
-gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null
-export MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE`
-export EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
-MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
-export MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
-BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT`
-export BANK_URL=http://localhost:${BANK_PORT}/
-export AUDITOR_URL=http://localhost:8083/
-AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
-mkdir -p $AUDITOR_PRIV_DIR
-gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null
-AUDITOR_PUB=`gnunet-ecc -p $AUDITOR_PRIV_FILE`
-
-# patch configuration
-taler-config -c $CONF -s exchange -o MASTER_PUBLIC_KEY -V $MASTER_PUB
-taler-config -c $CONF -s merchant-exchange-default -o MASTER_KEY -V $MASTER_PUB
-taler-config -c $CONF -s exchangedb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s auditordb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s merchantdb-postgres -o CONFIG -V postgres:///$TARGET_DB
-taler-config -c $CONF -s bank -o database -V postgres:///$TARGET_DB
-taler-config -c $CONF -s exchange -o KEYDIR -V "${TMP_DIR}/keydir/"
-taler-config -c $CONF -s exchange -o REVOCATION_DIR -V "${TMP_DIR}/revdir/"
-
-# setup exchange
-echo "Setting up exchange"
-taler-exchange-dbinit -c $CONF
-
-echo "Setting up merchant"
-taler-merchant-dbinit -c $CONF
-
-# setup auditor
-echo "Setting up auditor"
-taler-auditor-dbinit -c $CONF
-taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL
-
-# Launch services
-echo "Launching services"
-taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> revocation-bank.log &
-TFN=`which taler-exchange-httpd`
-TBINPFX=`dirname $TFN`
-TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
-taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
-SIGNKEY_HELPER_PID=$!
-taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
-RSA_DENOM_HELPER_PID=$!
-taler-exchange-secmod-cs -c $CONF 2> taler-exchange-secmod-cs.log &
-CS_DENOM_HELPER_PID=$!
-taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
-EXCHANGE_PID=$!
-taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
-MERCHANT_PID=$!
-taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
-taler-auditor-httpd -c $CONF 2> taler-auditor-httpd.log &
-
-# Wait for all bank to be available (usually the slowest)
-for n in `seq 1 50`
-do
-    echo -n "."
-    sleep 0.2
-    OK=0
-    # bank
-    wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
-
-if [ 1 != $OK ]
-then
-    exit_skip "Failed to launch Bank services"
-fi
-
-# Wait for all other services to be available
-for n in `seq 1 50`
-do
-    echo -n "."
-    sleep 0.1
-    OK=0
-    # exchange
-    wget http://localhost:8081/seed -o /dev/null -O /dev/null >/dev/null || continue
-    # merchant
-    wget http://localhost:9966/ -o /dev/null -O /dev/null >/dev/null || continue
-    # Auditor
-    wget http://localhost:8083/ -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
-
-if [ 1 != $OK ]
-then
-    cleanup
-    exit_skip "Failed to launch Taler services"
-fi
+echo -n "Reset 'auditor-basedb' database ..."
+dropdb "auditor-basedb" >/dev/null 2>/dev/null || true
+createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB'"
 echo " DONE"
 
-echo -n "Setting up keys"
-
-taler-exchange-offline -c $CONF \
-  download sign \
-  enable-account payto://x-taler-bank/localhost/Exchange \
-  enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \
-  wire-fee now x-taler-bank TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 \
-  global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1h 1year 5 \
-  upload &> taler-exchange-offline.log
-
-echo -n "."
-
-for n in `seq 1 2`
-do
-    echo -n "."
-    OK=0
-    # bank
-    wget --timeout=1 http://localhost:8081/keys -o /dev/null -O /dev/null >/dev/null || continue
-    OK=1
-    break
-done
-
-if [ 1 != $OK ]
-then
-    exit_skip "Failed to setup keys"
-fi
+# Launch exchange, merchant and bank.
+setup -c "$CONF" \
+      -abemw \
+      -d "iban"
 
+# obtain key configuration data
+EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
+MERCHANT_PORT=$(taler-config -c "$CONF" -s MERCHANT -o PORT)
+MERCHANT_URL="http://localhost:${MERCHANT_PORT}/"
+BANK_PORT=$(taler-config -c "$CONF" -s BANK -o HTTP_PORT)
+BANK_URL="http://localhost:${BANK_PORT}"
 
-taler-auditor-offline -c $CONF \
-  download sign upload &> taler-auditor-offline.log
-
-echo " DONE"
 
 # Setup merchant
-echo -n "Setting up merchant"
-
-curl -H "Content-Type: application/json" -X POST -d '{"auth": {"method": "external"}, "payto_uris":["payto://x-taler-bank/localhost/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_ms" : 3600000},"default_pay_delay":{"d_ms": 3600000}}' http://localhost:9966/management/instances
+echo -n "Setting up merchant ..."
+curl -H "Content-Type: application/json" -X POST -d '{"auth": {"method": "external"}, "accounts":[{"payto_uri":"payto://iban/SANDBOXX/DE474361?receiver-name=Merchant43"}],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 3600000000},"default_pay_delay":{"d_us": 3600000000},"use_stefan":true}' "${MERCHANT_URL}management/instances"
+echo " DONE"
 
 
 # run wallet CLI
 echo "Running wallet"
 
-taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'withdrawTestBalance' \
+export WALLET_DB="wallet.wdb"
+rm -f "$WALLET_DB"
+
+taler-wallet-cli \
+    --no-throttle \
+    --wallet-db="$WALLET_DB" \
+    api \
+    --expect-success 'withdrawTestBalance' \
   "$(jq -n '
     {
       amount: "TESTKUDOS:8",
-      bankBaseUrl: $BANK_URL,
+      corebankApiBaseUrl: $BANK_URL,
       exchangeBaseUrl: $EXCHANGE_URL,
     }' \
-    --arg BANK_URL $BANK_URL \
-    --arg EXCHANGE_URL $EXCHANGE_URL
-  )"
+    --arg BANK_URL "$BANK_URL" \
+    --arg EXCHANGE_URL "$EXCHANGE_URL"
+  )" &> taler-wallet-cli-withdraw.log
 
-taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    --no-throttle \
+    --wallet-db="$WALLET_DB" \
+    run-until-done \
+    &> taler-wallet-cli-withdraw-finish.log
 
-export coins=$(taler-wallet-cli --wallet-db=$WALLET_DB advanced dump-coins)
+export COINS=$(taler-wallet-cli --wallet-db="$WALLET_DB" advanced dump-coins)
 
 echo -n "COINS are:"
-echo $coins
+echo "$COINS"
 
 # Find coin we want to revoke
-export rc=$(echo "$coins" | jq -r '[.coins[] | select((.denom_value == "TESTKUDOS:2"))][0] | .coin_pub')
+export rc=$(echo "$COINS" | jq -r '[.coins[] | select((.denom_value == "TESTKUDOS:2"))][0] | .coin_pub')
 # Find the denom
-export rd=$(echo "$coins" | jq -r '[.coins[] | select((.denom_value == "TESTKUDOS:2"))][0] | .denom_pub_hash')
-echo "Revoking denomination ${rd} (to affect coin ${rc})"
+export rd=$(echo "$COINS" | jq -r '[.coins[] | select((.denom_value == "TESTKUDOS:2"))][0] | .denom_pub_hash')
+echo -n "Revoking denomination ${rd} (to affect coin ${rc}) ..."
 # Find all other coins, which will be suspended
-export susp=$(echo "$coins" | jq --arg rc "$rc" '[.coins[] | select(.coin_pub != $rc) | .coin_pub]')
+export susp=$(echo "$COINS" | jq --arg rc "$rc" '[.coins[] | select(.coin_pub != $rc) | .coin_pub]')
 
 # Do the revocation
-taler-exchange-offline -c $CONF \
-  revoke-denomination "${rd}" upload &> taler-exchange-offline-revoke.log
-
+taler-exchange-offline \
+    -c $CONF \
+    revoke-denomination "${rd}" \
+    upload \
+    &> taler-exchange-offline-revoke.log
+echo "DONE"
+
+echo -n "Signing replacement keys ..."
 sleep 1 # Give exchange time to create replacmenent key
 
 # Re-sign replacement keys
-taler-auditor-offline -c $CONF \
-  download sign upload &> taler-auditor-offline.log
+taler-auditor-offline \
+    -c $CONF \
+    download \
+    sign \
+    upload \
+    &> taler-auditor-offline-reinit.log
+echo " DONE"
 
 # Now we suspend the other coins, so later we will pay with the recouped coin
-taler-wallet-cli --wallet-db=$WALLET_DB advanced suspend-coins "$susp"
+taler-wallet-cli \
+    --wallet-db="$WALLET_DB" \
+    advanced \
+    suspend-coins "$susp"
 
 # Update exchange /keys so recoup gets scheduled
-taler-wallet-cli --wallet-db=$WALLET_DB exchanges update \
-                 -f $EXCHANGE_URL
+taler-wallet-cli \
+    --wallet-db="$WALLET_DB" \
+    exchanges \
+    update \
+    -f "$EXCHANGE_URL"
 
 # Block until scheduled operations are done
-taler-wallet-cli --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    --wallet-db="$WALLET_DB"\
+    run-until-done
 
-# Now we buy something, only the coins resulting from recouped will be
+# Now we buy something, only the coins resulting from recoup will be
 # used, as other ones are suspended
-taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'testPay' \
+taler-wallet-cli \
+    --no-throttle \
+    --wallet-db="$WALLET_DB" \
+    api \
+    'testPay' \
   "$(jq -n '
     {
       amount: "TESTKUDOS:1",
       merchantBaseUrl: $MERCHANT_URL,
       summary: "foo",
     }' \
-    --arg MERCHANT_URL $MERCHANT_URL
+    --arg MERCHANT_URL "$MERCHANT_URL"
   )"
 
-taler-wallet-cli --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    --wallet-db="$WALLET_DB" \
+    run-until-done
 
 echo "Purchase with recoup'ed coin (via reserve) done"
 
@@ -275,9 +150,6 @@ echo "Will refresh coin ${rrc} of denomination ${zombie_denom}"
 # Find all other coins, which will be suspended
 export susp=$(echo "$coins" | jq --arg rrc "$rrc" '[.coins[] | select(.coin_pub != $rrc) | .coin_pub]')
 
-export rrc
-export zombie_denom
-
 # Travel into the future! (must match DURATION_WITHDRAW option)
 export TIMETRAVEL="--timetravel=604800000000"
 
@@ -286,13 +158,13 @@ kill -TERM $EXCHANGE_PID
 kill -TERM $RSA_DENOM_HELPER_PID
 kill -TERM $CS_DENOM_HELPER_PID
 kill -TERM $SIGNKEY_HELPER_PID
-taler-exchange-secmod-eddsa $TIMETRAVEL -c $CONF 2> taler-exchange-secmod-eddsa.log &
+taler-exchange-secmod-eddsa $TIMETRAVEL -c $CONF 2> ${MY_TMP_DIR}/taler-exchange-secmod-eddsa.log &
 SIGNKEY_HELPER_PID=$!
-taler-exchange-secmod-rsa $TIMETRAVEL -c $CONF 2> taler-exchange-secmod-rsa.log &
+taler-exchange-secmod-rsa $TIMETRAVEL -c $CONF 2> ${MY_TMP_DIR}/taler-exchange-secmod-rsa.log &
 RSA_DENOM_HELPER_PID=$!
-taler-exchange-secmod-cs $TIMETRAVEL -c $CONF 2> taler-exchange-secmod-cs.log &
+taler-exchange-secmod-cs $TIMETRAVEL -c $CONF 2> ${MY_TMP_DIR}/taler-exchange-secmod-cs.log &
 CS_DENOM_HELPER_PID=$!
-taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log &
+taler-exchange-httpd $TIMETRAVEL -c $CONF 2> ${MY_TMP_DIR}/taler-exchange-httpd.log &
 export EXCHANGE_PID=$!
 
 # Wait for exchange to be available
@@ -308,8 +180,15 @@ do
 done
 
 echo "Refreshing coin $rrc"
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB advanced force-refresh "$rrc"
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    "$TIMETRAVEL" \
+    --wallet-db="$WALLET_DB" \
+    advanced force-refresh \
+    "$rrc"
+taler-wallet-cli \
+    "$TIMETRAVEL" \
+    --wallet-db="$WALLET_DB" \
+    run-until-done
 
 # Update our list of the coins
 export coins=$(taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB advanced dump-coins)
@@ -332,29 +211,49 @@ export susp=$(echo "$coins" | jq --arg freshc "$freshc" '[.coins[] | select(.coi
 
 # Do the revocation of freshc
 echo "Revoking ${fresh_denom} (to affect coin ${freshc})"
-taler-exchange-offline -c $CONF \
-  revoke-denomination "${fresh_denom}" upload &> taler-exchange-offline-revoke-2.log
+taler-exchange-offline \
+    -c "$CONF" \
+    revoke-denomination \
+    "${fresh_denom}" \
+    upload &> taler-exchange-offline-revoke-2.log
 
 sleep 1 # Give exchange time to create replacmenent key
 
 # Re-sign replacement keys
-taler-auditor-offline -c $CONF \
-  download sign upload &> taler-auditor-offline.log
+taler-auditor-offline \
+    -c "$CONF" \
+    download \
+    sign \
+    upload &> taler-auditor-offline.log
 
 # Now we suspend the other coins, so later we will pay with the recouped coin
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB advanced suspend-coins "$susp"
+taler-wallet-cli \
+    "$TIMETRAVEL" \
+    --wallet-db="$WALLET_DB" \
+    advanced \
+    suspend-coins "$susp"
 
 # Update exchange /keys so recoup gets scheduled
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB exchanges update \
-                 -f $EXCHANGE_URL
+taler-wallet-cli \
+    "$TIMETRAVEL"\
+    --wallet-db="$WALLET_DB" \
+    exchanges update \
+    -f "$EXCHANGE_URL"
 
 # Block until scheduled operations are done
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    "$TIMETRAVEL" \
+    --wallet-db="$WALLET_DB" \
+    run-until-done
 
 echo "Restarting merchant (so new keys are known)"
 kill -TERM $MERCHANT_PID
-taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
+taler-merchant-httpd \
+    -c "$CONF" \
+    -L INFO \
+    2> ${MY_TMP_DIR}/taler-merchant-httpd.log &
 MERCHANT_PID=$!
+
 # Wait for merchant to be again available
 for n in `seq 1 50`
 do
@@ -378,30 +277,35 @@ taler-wallet-cli $TIMETRAVEL --no-throttle --wallet-db=$WALLET_DB api 'testPay'
     }' \
     --arg MERCHANT_URL $MERCHANT_URL
   )"
-taler-wallet-cli $TIMETRAVEL --wallet-db=$WALLET_DB run-until-done
+taler-wallet-cli \
+    "$TIMETRAVEL" \
+    --wallet-db="$WALLET_DB" \
+    run-until-done
 
 echo "Bought something with refresh-recouped coin"
 
 echo "Shutting down services"
-cleanup
+exit_cleanup
 
 
-# Dump database
-echo "Dumping database"
-pg_dump -O $TARGET_DB | sed -e '/AS integer/d' > ${BASEDB}.sql
+# Where do we write the result?
+export BASEDB=${1:-"revoke-basedb"}
+
 
-echo $MASTER_PUB > ${BASEDB}.mpub
-date +%s > ${BASEDB}.age
+# Dump database
+echo "Dumping database ${BASEDB}.sql"
+pg_dump -O "auditor-basedb" | sed -e '/AS integer/d' > "${BASEDB}.sql"
 
 # clean up
-echo "Final clean up"
-dropdb $TARGET_DB
-rm -rf $DATA_DIR || true
-rm -f $CONF
-rm -r $TMP_DIR
+echo -n "Final clean up ..."
+kill -TERM "$SETUP_PID"
+wait
+unset SETUP_PID
+dropdb "auditor-basedb"
+echo " DONE"
 
 echo "====================================="
-echo "  Finished revocation DB generation  "
+echo "Finished generation of ${BASEDB}.sql"
 echo "====================================="
 
 exit 0
diff --git a/src/auditor/generate_auditordb_home/.local/share/taler/exchange-offline/master.priv b/src/auditor/generate_auditordb_home/.local/share/taler/exchange-offline/master.priv
new file mode 100644
index 000000000..85195dd8f
--- /dev/null
+++ b/src/auditor/generate_auditordb_home/.local/share/taler/exchange-offline/master.priv
@@ -0,0 +1 @@
+%I7qY���X�2@���%'1���O���J����
\ No newline at end of file
diff --git a/src/auditor/report-lib.c b/src/auditor/report-lib.c
index 8d783e0cf..d0e1325ea 100644
--- a/src/auditor/report-lib.c
+++ b/src/auditor/report-lib.c
@@ -62,6 +62,11 @@ struct TALER_AuditorPublicKeyP TALER_ARL_auditor_pub;
 char *TALER_ARL_auditor_url;
 
 /**
+ * REST API endpoint of the exchange.
+ */
+char *TALER_ARL_exchange_url;
+
+/**
  * At what time did the auditor process start?
  */
 struct GNUNET_TIME_Absolute start_time;
@@ -255,7 +260,7 @@ TALER_ARL_get_denomination_info (
  *
  * @param analysis analysis to run
  * @param analysis_cls closure for @a analysis
- * @return #GNUNET_OK if @a analysis succeessfully committed,
+ * @return #GNUNET_OK if @a analysis successfully committed,
  *         #GNUNET_NO if we had an error on commit (retry may help)
  *         #GNUNET_SYSERR on hard errors
  */
@@ -356,28 +361,6 @@ TALER_ARL_setup_sessions_and_run (TALER_ARL_Analysis ana,
 }
 
 
-/**
- * Test if the given @a mpub matches the #TALER_ARL_master_pub.
- * If so, set "found" to GNUNET_YES.
- *
- * @param cls a `int *` pointing to "found"
- * @param mpub exchange master public key to compare
- * @param exchange_url URL of the exchange (ignored)
- */
-static void
-test_master_present (void *cls,
-                     const struct TALER_MasterPublicKeyP *mpub,
-                     const char *exchange_url)
-{
-  int *found = cls;
-
-  (void) exchange_url;
-  if (0 == GNUNET_memcmp (mpub,
-                          &TALER_ARL_master_pub))
-    *found = GNUNET_YES;
-}
-
-
 void
 TALER_ARL_amount_add_ (struct TALER_Amount *sum,
                        const struct TALER_Amount *a1,
@@ -549,6 +532,18 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c)
                                "BASE_URL");
     return GNUNET_SYSERR;
   }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (TALER_ARL_cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &TALER_ARL_exchange_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    return GNUNET_SYSERR;
+  }
+
   if (GNUNET_is_zero (&TALER_ARL_master_pub))
   {
     /* -m option not given, try configuration */
@@ -580,6 +575,9 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c)
       GNUNET_free (master_public_key_str);
       return GNUNET_SYSERR;
     }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Running auditor against exchange master public key `%s'\n",
+                master_public_key_str);
     GNUNET_free (master_public_key_str);
   } /* end of -m not given */
 
@@ -705,29 +703,13 @@ TALER_ARL_init (const struct GNUNET_CONFIGURATION_Handle *c)
     TALER_ARL_done (NULL);
     return GNUNET_SYSERR;
   }
+  if (GNUNET_SYSERR ==
+      TALER_ARL_adb->preflight (TALER_ARL_adb->cls))
   {
-    int found;
-
-    if (GNUNET_SYSERR ==
-        TALER_ARL_adb->preflight (TALER_ARL_adb->cls))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to start session with auditor database.\n");
-      TALER_ARL_done (NULL);
-      return GNUNET_SYSERR;
-    }
-    found = GNUNET_NO;
-    (void) TALER_ARL_adb->list_exchanges (TALER_ARL_adb->cls,
-                                          &test_master_present,
-                                          &found);
-    if (GNUNET_NO == found)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Exchange's master public key `%s' not known to auditor DB. Did you forget to run `taler-auditor-exchange`?\n",
-                  GNUNET_p2s (&TALER_ARL_master_pub.eddsa_pub));
-      TALER_ARL_done (NULL);
-      return GNUNET_SYSERR;
-    }
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start session with auditor database.\n");
+    TALER_ARL_done (NULL);
+    return GNUNET_SYSERR;
   }
   return GNUNET_OK;
 }
@@ -765,6 +747,7 @@ TALER_ARL_done (json_t *report)
                 JSON_INDENT (2));
     json_decref (report);
   }
+  GNUNET_free (TALER_ARL_exchange_url);
   GNUNET_free (TALER_ARL_auditor_url);
 }
 
diff --git a/src/auditor/report-lib.h b/src/auditor/report-lib.h
index 8054baa46..db29abc3a 100644
--- a/src/auditor/report-lib.h
+++ b/src/auditor/report-lib.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2020 Taler Systems SA
+  Copyright (C) 2016-2024 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero Public License as published by the Free Software
@@ -28,6 +28,52 @@
 #include "taler_bank_service.h"
 #include "taler_signatures.h"
 
+/**
+ * Macro to use to access progress point value @a name.
+ */
+#define TALER_ARL_USE_PP(name) TAC_ ## name
+
+/**
+ * Macro to use to declare progress point value @a name.
+ */
+#define TALER_ARL_DEF_PP(name)                  \
+  uint64_t TALER_ARL_USE_PP (name) = 0
+
+/**
+ * Macro to use to GET progress point value @a name from DB.
+ */
+#define TALER_ARL_GET_PP(name)                  \
+  TALER_S (name), &TALER_ARL_USE_PP (name)
+
+/**
+ * Macro to use to SET progress point value @a name in DB.
+ */
+#define TALER_ARL_SET_PP(name)                  \
+  TALER_S (name), TALER_ARL_USE_PP (name)
+
+/**
+ * Macro to use to access amount balance @a name.
+ */
+#define TALER_ARL_USE_AB(name) TAC_ ## name
+
+/**
+ * Macro to use to declare amount balance @a name.
+ */
+#define TALER_ARL_DEF_AB(name)                  \
+  struct TALER_Amount TALER_ARL_USE_AB (name)
+
+/**
+ * Macro to use to GET amount balance @a name from DB.
+ */
+#define TALER_ARL_GET_AB(name)                  \
+  TALER_S (name), &TALER_ARL_USE_AB (name)
+
+/**
+ * Macro to use to SET amount balance @a name in DB.
+ */
+#define TALER_ARL_SET_AB(name)                  \
+  TALER_S (name), &TALER_ARL_USE_AB (name)
+
 
 /**
  * Command-line option "-r": restart audit from scratch
@@ -75,6 +121,11 @@ extern struct TALER_AuditorPublicKeyP TALER_ARL_auditor_pub;
 extern char *TALER_ARL_auditor_url;
 
 /**
+ * REST API endpoint of the exchange.
+ */
+extern char *TALER_ARL_exchange_url;
+
+/**
  * At what time did the auditor process start?
  */
 extern struct GNUNET_TIME_Absolute start_time;
diff --git a/src/auditor/revoke-basedb.age b/src/auditor/revoke-basedb.age
deleted file mode 100644
index 7191ca49b..000000000
--- a/src/auditor/revoke-basedb.age
+++ /dev/null
@@ -1 +0,0 @@
-1651516459
diff --git a/src/auditor/revoke-basedb.conf b/src/auditor/revoke-basedb.conf
index da440c60a..706f97347 100644
--- a/src/auditor/revoke-basedb.conf
+++ b/src/auditor/revoke-basedb.conf
@@ -1,34 +1,34 @@
 [auditor]
-DB = postgres
+PUBLIC_KEY = CK4P6P5VXR82B1A4C3PY5DCHG8HDZA1HSZR76Z8D6FD57MASFT70
 TINY_AMOUNT = TESTKUDOS:0.01
 BASE_URL = http://localhost:8083/
 
 [exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
+PAYTO_URI = payto://iban/SANDBOXX/DE717324?receiver-name=Exchange+Company
 enable_debit = yes
 enable_credit = yes
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/taler-wire-gateway/Exchange/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/exchange/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
+USERNAME = exchange
 PASSWORD = x
 
 [exchangedb]
 WIREFEE_BASE_DIR = ${PWD}/wirefees/
 
 [auditordb-postgres]
-CONFIG = postgres:///taler-auditor-test
+CONFIG = postgres:///revoke-basedb
 
 [exchangedb-postgres]
-CONFIG = postgres:///taler-auditor-test
+CONFIG = postgres:///revoke-basedb
 
 [taler]
 CURRENCY = TESTKUDOS
 CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 
 [bank]
-DATABASE = postgres:///taler-auditor-test
+DATABASE = postgres:///revoke-basedb
 MAX_DEBT = TESTKUDOS:50.0
 MAX_DEBT_BANK = TESTKUDOS:100000.0
 HTTP_PORT = 8082
diff --git a/src/auditor/revoke-basedb.fees b/src/auditor/revoke-basedb.fees
deleted file mode 100644
index d9b45a374..000000000
--- a/src/auditor/revoke-basedb.fees
+++ /dev/null
diff --git a/src/auditor/revoke-basedb.mpub b/src/auditor/revoke-basedb.mpub
deleted file mode 100644
index c947d28a3..000000000
--- a/src/auditor/revoke-basedb.mpub
+++ /dev/null
@@ -1 +0,0 @@
-9M29VNDWV6DZPGE5DXHM8Z0A41CDC6JTTE2J85C1C9V165TGPASG
diff --git a/src/auditor/revoke-basedb.sql b/src/auditor/revoke-basedb.sql
deleted file mode 100644
index 7cf16618c..000000000
--- a/src/auditor/revoke-basedb.sql
+++ /dev/null
@@ -1,16143 +0,0 @@
---
--- PostgreSQL database dump
---
-
--- Dumped from database version 13.5 (Debian 13.5-0+deb11u1)
--- Dumped by pg_dump version 13.5 (Debian 13.5-0+deb11u1)
-
-SET statement_timeout = 0;
-SET lock_timeout = 0;
-SET idle_in_transaction_session_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SELECT pg_catalog.set_config('search_path', '', false);
-SET check_function_bodies = false;
-SET xmloption = content;
-SET client_min_messages = warning;
-SET row_security = off;
-
---
--- Name: _v; Type: SCHEMA; Schema: -; Owner: -
---
-
-CREATE SCHEMA _v;
-
-
---
--- Name: SCHEMA _v; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
-
-
---
--- Name: assert_patch_is_applied(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_patch_is_applied(in_patch_name text) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    t_text TEXT;
-BEGIN
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'Patch % is not applied!', in_patch_name;
-    END IF;
-    RETURN format('Patch %s is applied.', in_patch_name);
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_patch_is_applied(in_patch_name text); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_patch_is_applied(in_patch_name text) IS 'Function that can be used to make sure that patch has been applied.';
-
-
---
--- Name: assert_user_is_not_superuser(); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_not_superuser() RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RAISE EXCEPTION 'Current user is superuser - cannot continue.';
-    END IF;
-    RETURN 'assert_user_is_not_superuser: OK';
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_not_superuser(); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_not_superuser() IS 'Function that can be used to make sure that patch is being applied using normal (not superuser) account.';
-
-
---
--- Name: assert_user_is_one_of(text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_one_of(VARIADIC p_acceptable_users text[]) RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-BEGIN
-    IF current_user = any( p_acceptable_users ) THEN
-        RETURN 'assert_user_is_one_of: OK';
-    END IF;
-    RAISE EXCEPTION 'User is not one of: % - cannot continue.', p_acceptable_users;
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_one_of(VARIADIC p_acceptable_users text[]); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_one_of(VARIADIC p_acceptable_users text[]) IS 'Function that can be used to make sure that patch is being applied by one of defined users.';
-
-
---
--- Name: assert_user_is_superuser(); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.assert_user_is_superuser() RETURNS text
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RETURN 'assert_user_is_superuser: OK';
-    END IF;
-    RAISE EXCEPTION 'Current user is not superuser - cannot continue.';
-END;
-$$;
-
-
---
--- Name: FUNCTION assert_user_is_superuser(); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.assert_user_is_superuser() IS 'Function that can be used to make sure that patch is being applied using superuser account.';
-
-
---
--- Name: register_patch(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(text) RETURNS SETOF integer
-    LANGUAGE sql
-    AS $_$
-    SELECT _v.register_patch( $1, NULL, NULL );
-$_$;
-
-
---
--- Name: FUNCTION register_patch(text); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(text) IS 'Wrapper to allow registration of patches without requirements and conflicts.';
-
-
---
--- Name: register_patch(text, text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(text, text[]) RETURNS SETOF integer
-    LANGUAGE sql
-    AS $_$
-    SELECT _v.register_patch( $1, $2, NULL );
-$_$;
-
-
---
--- Name: FUNCTION register_patch(text, text[]); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(text, text[]) IS 'Wrapper to allow registration of patches without conflicts.';
-
-
---
--- Name: register_patch(text, text[], text[]); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer) RETURNS SETOF integer
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    t_text   TEXT;
-    t_text_a TEXT[];
-    i INT4;
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF FOUND THEN
-        RAISE EXCEPTION 'Patch % is already applied!', in_patch_name;
-    END IF;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE patch_name = any( in_conflicts ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Versioning patches conflict. Conflicting patche(s) installed: %.', array_to_string( t_text_a, ', ' );
-    END IF;
-
-    IF array_upper( in_requirements, 1 ) IS NOT NULL THEN
-        t_text_a := '{}';
-        FOR i IN array_lower( in_requirements, 1 ) .. array_upper( in_requirements, 1 ) LOOP
-            SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_requirements[i];
-            IF NOT FOUND THEN
-                t_text_a := t_text_a || in_requirements[i];
-            END IF;
-        END LOOP;
-        IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-            RAISE EXCEPTION 'Missing prerequisite(s): %.', array_to_string( t_text_a, ', ' );
-        END IF;
-    END IF;
-
-    INSERT INTO _v.patches (patch_name, applied_tsz, applied_by, requires, conflicts ) VALUES ( in_patch_name, now(), current_user, coalesce( in_requirements, '{}' ), coalesce( in_conflicts, '{}' ) );
-    RETURN;
-END;
-$$;
-
-
---
--- Name: FUNCTION register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.register_patch(in_patch_name text, in_requirements text[], in_conflicts text[], OUT versioning integer) IS 'Function to register patches in database. Raises exception if there are conflicts, prerequisites are not installed or the migration has already been installed.';
-
-
---
--- Name: unregister_patch(text); Type: FUNCTION; Schema: _v; Owner: -
---
-
-CREATE FUNCTION _v.unregister_patch(in_patch_name text, OUT versioning integer) RETURNS SETOF integer
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-    i        INT4;
-    t_text_a TEXT[];
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE in_patch_name = ANY( requires ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Cannot uninstall %, as it is required by: %.', in_patch_name, array_to_string( t_text_a, ', ' );
-    END IF;
-
-    DELETE FROM _v.patches WHERE patch_name = in_patch_name;
-    GET DIAGNOSTICS i = ROW_COUNT;
-    IF i < 1 THEN
-        RAISE EXCEPTION 'Patch % is not installed, so it can''t be uninstalled!', in_patch_name;
-    END IF;
-
-    RETURN;
-END;
-$$;
-
-
---
--- Name: FUNCTION unregister_patch(in_patch_name text, OUT versioning integer); Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON FUNCTION _v.unregister_patch(in_patch_name text, OUT versioning integer) IS 'Function to unregister patches in database. Dies if the patch is not registered, or if unregistering it would break dependencies.';
-
-
---
--- Name: add_constraints_to_account_merges_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_account_merges_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE account_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT account_merges_' || partition_suffix || '_account_merge_request_serial_id_key '
-        'UNIQUE (account_merge_request_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_aggregation_tracking_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_aggregation_tracking_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE aggregation_tracking_' || partition_suffix || ' '
-      'ADD CONSTRAINT aggregation_tracking_' || partition_suffix || '_aggregation_serial_id_key '
-        'UNIQUE (aggregation_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_contracts_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_contracts_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE contracts_' || partition_suffix || ' '
-      'ADD CONSTRAINT contracts_' || partition_suffix || '_contract_serial_id_key '
-        'UNIQUE (contract_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_cs_nonce_locks_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_cs_nonce_locks_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE cs_nonce_locks_' || partition_suffix || ' '
-      'ADD CONSTRAINT cs_nonce_locks_' || partition_suffix || '_cs_nonce_lock_serial_id_key '
-        'UNIQUE (cs_nonce_lock_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_deposits_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_deposits_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT deposits_' || partition_suffix || '_deposit_serial_id_pkey '
-        'PRIMARY KEY (deposit_serial_id) '
-      ',ADD CONSTRAINT deposits_' || partition_suffix || '_coin_pub_merchant_pub_h_contract_terms_key '
-        'UNIQUE (coin_pub, merchant_pub, h_contract_terms)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_known_coins_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_known_coins_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE known_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT known_coins_' || partition_suffix || '_known_coin_id_key '
-        'UNIQUE (known_coin_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_deposits_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_deposits_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_deposits_' || partition_suffix || '_purse_deposit_serial_id_key '
-        'UNIQUE (purse_deposit_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_merges_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_merges_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_merges_' || partition_suffix || '_purse_merge_request_serial_id_key '
-        'UNIQUE (purse_merge_request_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_purse_requests_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_purse_requests_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_requests_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_requests_' || partition_suffix || '_purse_requests_serial_id_key '
-        'UNIQUE (purse_requests_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_recoup_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_recoup_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_' || partition_suffix || '_recoup_uuid_key '
-        'UNIQUE (recoup_uuid) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_recoup_refresh_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_recoup_refresh_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_refresh_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_refresh_' || partition_suffix || '_recoup_refresh_uuid_key '
-        'UNIQUE (recoup_refresh_uuid) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_commitments_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_commitments_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_commitments_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_commitments_' || partition_suffix || '_melt_serial_id_key '
-        'UNIQUE (melt_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_revealed_coins_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_revealed_coins_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_revealed_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_rrc_serial_key '
-        'UNIQUE (rrc_serial) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_coin_ev_key '
-        'UNIQUE (coin_ev) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_h_coin_ev_key '
-        'UNIQUE (h_coin_ev) '
-      ',ADD PRIMARY KEY (melt_serial_id, freshcoin_index) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refresh_transfer_keys_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refresh_transfer_keys_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_transfer_keys_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_transfer_keys_' || partition_suffix || '_rtc_serial_key '
-        'UNIQUE (rtc_serial)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_refunds_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_refunds_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refunds_' || partition_suffix || ' '
-      'ADD CONSTRAINT refunds_' || partition_suffix || '_refund_serial_id_key '
-        'UNIQUE (refund_serial_id) '
-      ',ADD PRIMARY KEY (deposit_serial_id, rtransaction_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_close_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_close_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_close_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_close_' || partition_suffix || '_close_uuid_pkey '
-        'PRIMARY KEY (close_uuid)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_in_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_in_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_in_' || partition_suffix || '_reserve_in_serial_id_key '
-        'UNIQUE (reserve_in_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_reserves_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_reserves_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_out_' || partition_suffix || '_reserve_out_serial_id_key '
-        'UNIQUE (reserve_out_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wad_in_entries_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wad_in_entries_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_in_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_in_entries_' || partition_suffix || '_wad_in_entry_serial_id_key '
-        'UNIQUE (wad_in_entry_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wad_out_entries_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wad_out_entries_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_out_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_out_entries_' || partition_suffix || '_wad_out_entry_serial_id_key '
-        'UNIQUE (wad_out_entry_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wads_in_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wads_in_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_in_serial_id_key '
-        'UNIQUE (wad_in_serial_id) '
-      ',ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_is_origin_exchange_url_key '
-        'UNIQUE (wad_id, origin_exchange_url) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wads_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wads_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_out_' || partition_suffix || '_wad_out_serial_id_key '
-        'UNIQUE (wad_out_serial_id) '
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wire_out_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wire_out_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_out_' || partition_suffix || '_wireout_uuid_pkey '
-        'PRIMARY KEY (wireout_uuid)'
-  );
-END
-$$;
-
-
---
--- Name: add_constraints_to_wire_targets_partition(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.add_constraints_to_wire_targets_partition(partition_suffix character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_targets_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_targets_' || partition_suffix || '_wire_target_serial_id_key '
-        'UNIQUE (wire_target_serial_id)'
-  );
-END
-$$;
-
-
---
--- Name: create_foreign_hash_partition(character varying, integer, character varying, integer, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_hash_partition(source_table_name character varying, modulus integer, shard_suffix character varying, current_shard_num integer, local_user character varying DEFAULT 'taler-exchange-httpd'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating %_% on %', source_table_name, shard_suffix, shard_suffix;
-
-  EXECUTE FORMAT(
-    'CREATE FOREIGN TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s) '
-      'SERVER %I'
-    ,source_table_name || '_' || shard_suffix
-    ,source_table_name
-    ,modulus
-    ,current_shard_num-1
-    ,shard_suffix
-  );
-
-  EXECUTE FORMAT(
-    'ALTER FOREIGN TABLE %I OWNER TO %I'
-    ,source_table_name || '_' || shard_suffix
-    ,local_user
-  );
-
-END
-$$;
-
-
---
--- Name: create_foreign_range_partition(character varying, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_range_partition(source_table_name character varying, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-   RAISE NOTICE 'TODO';
-END
-$$;
-
-
---
--- Name: create_foreign_servers(integer, character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_foreign_servers(amount integer, domain character varying, remote_user character varying DEFAULT 'taler'::character varying, remote_user_password character varying DEFAULT 'taler'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM prepare_sharding();
-
-  FOR i IN 1..amount LOOP
-    PERFORM create_shard_server(
-      i::varchar
-     ,amount
-     ,i
-     ,'shard-' || i::varchar || '.' || domain
-     ,remote_user
-     ,remote_user_password
-     ,'taler-exchange'
-     ,'5432'
-     ,'taler-exchange-httpd'
-    );
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
-
---
--- Name: create_hash_partition(character varying, integer, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_hash_partition(source_table_name character varying, modulus integer, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating partition %_%', source_table_name, partition_num;
-
-  EXECUTE FORMAT(
-    'CREATE TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s)'
-    ,source_table_name || '_' || partition_num
-    ,source_table_name
-    ,modulus
-    ,partition_num-1
-  );
-
-END
-$$;
-
-
---
--- Name: create_partitioned_table(character varying, character varying, character varying, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_partitioned_table(table_definition character varying, table_name character varying, main_table_partition_str character varying, shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  IF shard_suffix IS NOT NULL THEN
-    table_name=table_name || '_' || shard_suffix;
-    main_table_partition_str = '';
-  END IF;
-
-  EXECUTE FORMAT(
-    table_definition,
-    table_name,
-    main_table_partition_str
-  );
-
-END
-$$;
-
-
---
--- Name: create_partitions(integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_partitions(num_partitions integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  modulus INTEGER;
-BEGIN
-
-  modulus := num_partitions;
-
-  PERFORM detach_default_partitions();
-
-  LOOP
-
-    PERFORM create_hash_partition(
-      'wire_targets'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_targets_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'reserves_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_close'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_close_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'known_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_known_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_commitments'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_commitments_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_revealed_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_revealed_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_transfer_keys'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_transfer_keys_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_deposits_partition(num_partitions::varchar);
-
--- TODO: dynamically (!) creating/deleting deposits partitions:
---    create new partitions 'as needed', drop old ones once the aggregator has made
---    them empty; as 'new' deposits will always have deadlines in the future, this
---    would basically guarantee no conflict between aggregator and exchange service!
--- SEE also: https://www.cybertec-postgresql.com/en/automatic-partition-creation-in-postgresql/
--- (article is slightly wrong, as this works:)
---CREATE TABLE tab (
---  id bigint GENERATED ALWAYS AS IDENTITY,
---  ts timestamp NOT NULL,
---  data text
--- PARTITION BY LIST ((ts::date));
--- CREATE TABLE tab_def PARTITION OF tab DEFAULT;
--- BEGIN
--- CREATE TABLE tab_part2 (LIKE tab);
--- insert into tab_part2 (id,ts, data) values (5,'2022-03-21', 'foo');
--- alter table tab attach partition tab_part2 for values in ('2022-03-21');
--- commit;
--- Naturally, to ensure this is actually 100% conflict-free, we'd
--- need to create tables at the granularity of the wire/refund deadlines;
--- that is right now configurable via AGGREGATOR_SHIFT option.
-
--- FIXME: range partitioning
---    PERFORM create_range_partition(
---      'deposits_by_ready'
---      ,modulus
---      ,num_partitions
---    );
---
---    PERFORM create_range_partition(
---      'deposits_for_matching'
---      ,modulus
---      ,num_partitions
---    );
-
-    PERFORM create_hash_partition(
-      'refunds'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refunds_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wire_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'aggregation_transient'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'aggregation_tracking'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_aggregation_tracking_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'recoup_refresh'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_refresh_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'prewire'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'cs_nonce_locks'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_cs_nonce_locks_partition(num_partitions::varchar);
-
-    ---------------- P2P ----------------------
-
-    PERFORM create_hash_partition(
-      'purse_requests'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_requests_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'purse_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'account_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_account_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'contracts'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_contracts_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'history_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'close_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'purse_deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_deposits_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_out_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_out_entries_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wads_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wads_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_in_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_in_entries_partition(num_partitions::varchar);
-
-    num_partitions=num_partitions-1;
-    EXIT WHEN num_partitions=0;
-
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
-
---
--- Name: create_range_partition(character varying, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_range_partition(source_table_name character varying, partition_num integer) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  RAISE NOTICE 'TODO';
-END
-$$;
-
-
---
--- Name: create_shard_server(character varying, integer, integer, character varying, character varying, character varying, character varying, integer, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying DEFAULT 'taler-exchange'::character varying, remote_port integer DEFAULT 5432, local_user character varying DEFAULT 'taler-exchange-httpd'::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating server %', remote_host;
-
-  EXECUTE FORMAT(
-    'CREATE SERVER IF NOT EXISTS %I '
-      'FOREIGN DATA WRAPPER postgres_fdw '
-      'OPTIONS (dbname %L, host %L, port %L)'
-    ,shard_suffix
-    ,remote_db_name
-    ,remote_host
-    ,remote_port
-  );
-
-  EXECUTE FORMAT(
-    'CREATE USER MAPPING IF NOT EXISTS '
-      'FOR %I SERVER %I '
-      'OPTIONS (user %L, password %L)'
-    ,local_user
-    ,shard_suffix
-    ,remote_user
-    ,remote_user_password
-  );
-
-  EXECUTE FORMAT(
-    'GRANT ALL PRIVILEGES '
-      'ON FOREIGN SERVER %I '
-      'TO %I;'
-    ,shard_suffix
-    ,local_user
-  );
-
-  PERFORM create_foreign_hash_partition(
-    'wire_targets'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_close'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'known_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_commitments'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_revealed_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_transfer_keys'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
---  PERFORM create_foreign_range_partition(
---    'deposits_by_ready'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
---  PERFORM create_foreign_range_partition(
---    'deposits_for_matching'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
-  PERFORM create_foreign_hash_partition(
-    'refunds'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wire_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_transient'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_tracking'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_refresh'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'prewire'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'cs_nonce_locks'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-  ------------------- P2P --------------------
-
-  PERFORM create_foreign_hash_partition(
-    'purse_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'account_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'contracts'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'history_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'close_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_out_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wads_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_in_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-END
-$$;
-
-
---
--- Name: FUNCTION create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying, remote_port integer, local_user character varying); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.create_shard_server(shard_suffix character varying, total_num_shards integer, current_shard_num integer, remote_host character varying, remote_user character varying, remote_user_password character varying, remote_db_name character varying, remote_port integer, local_user character varying) IS 'Create a shard server on the master
-      node with all foreign tables and user mappings';
-
-
---
--- Name: create_table_account_merges(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_account_merges(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'account_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(account_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' -- REFERENCES purse_requests (purse_pub)
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_aggregation_tracking(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_aggregation_tracking(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_tracking';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(aggregation_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-	    ',deposit_serial_id INT8 PRIMARY KEY' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE' -- FIXME chnage to coint_pub + deposit_serial_id for more efficient depost -- or something else ???
-      ',wtid_raw BYTEA NOT NULL' -- CONSTRAINT wire_out_ref REFERENCES wire_out(wtid_raw) ON DELETE CASCADE DEFERRABLE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (deposit_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wtid_raw_index '
-    'ON ' || table_name || ' '
-    '(wtid_raw);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_wtid_raw_index '
-    'IS ' || quote_literal('for lookup_transactions') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_aggregation_transient(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_aggregation_transient(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_transient';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',wtid_raw BYTEA NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ') %s ;'
-      ,table_name
-      ,'PARTITION BY HASH (wire_target_h_payto)'
-      ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_close_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_close_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'close_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',close_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',close_val INT8 NOT NULL'
-      ',close_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,close_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_contracts(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_contracts(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'contracts';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(contract_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',pub_ckey BYTEA NOT NULL CHECK (LENGTH(pub_ckey)=32)'
-      ',contract_sig BYTEA NOT NULL CHECK (LENGTH(contract_sig)=64)'
-      ',e_contract BYTEA NOT NULL'
-      ',purse_expiration INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_cs_nonce_locks(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_cs_nonce_locks(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(cs_nonce_lock_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',nonce BYTEA PRIMARY KEY CHECK (LENGTH(nonce)=32)'
-      ',op_hash BYTEA NOT NULL CHECK (LENGTH(op_hash)=64)'
-      ',max_denomination_serial INT8 NOT NULL'
-    ') %s ;'
-    ,'cs_nonce_locks'
-    ,'PARTITION BY HASH (nonce)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',shard INT8 NOT NULL'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',known_coin_id INT8 NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE' --- FIXME: column needed???
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wallet_timestamp INT8 NOT NULL'
-      ',exchange_timestamp INT8 NOT NULL'
-      ',refund_deadline INT8 NOT NULL'
-      ',wire_deadline INT8 NOT NULL'
-      ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)'
-      ',wire_salt BYTEA NOT NULL CHECK (LENGTH(wire_salt)=16)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',done BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_blocked BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_details_serial_id INT8' -- REFERENCES extension_details (extension_details_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits_by_ready(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits_by_ready(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_by_ready';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(wire_deadline INT8 NOT NULL'
-    ',shard INT8 NOT NULL'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (wire_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(wire_deadline ASC, shard ASC, coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_deposits_for_matching(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_deposits_for_matching(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_for_matching';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(refund_deadline INT8 NOT NULL'
-    ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (refund_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(refund_deadline ASC, merchant_pub, coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_history_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_history_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'history_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',request_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',history_fee_val INT8 NOT NULL'
-      ',history_fee_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,request_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_known_coins(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_known_coins(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'known_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(known_coin_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_pub BYTEA NOT NULL PRIMARY KEY CHECK (LENGTH(coin_pub)=32)'
-      ',age_commitment_hash BYTEA CHECK (LENGTH(age_commitment_hash)=32)'
-      ',denom_sig BYTEA NOT NULL'
-      ',remaining_val INT8 NOT NULL'
-      ',remaining_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)' -- FIXME: or include denominations_serial? or multi-level partitioning?;
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-END
-$$;
-
-
---
--- Name: create_table_prewire(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_prewire(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'prewire';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(prewire_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
-      ',wire_method TEXT NOT NULL'
-      ',finished BOOLEAN NOT NULL DEFAULT false'
-      ',failed BOOLEAN NOT NULL DEFAULT false'
-      ',buf BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (prewire_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_finished_index '
-    'ON ' || table_name || ' '
-    '(finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_finished_index '
-    'IS ' || quote_literal('for gc_prewire') || ';'
-  );
-  -- FIXME: find a way to combine these two indices?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_failed_finished_index '
-    'ON ' || table_name || ' '
-    '(failed,finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_failed_finished_index '
-    'IS ' || quote_literal('for wire_prepare_data_get') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_deposits(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_deposits(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',PRIMARY KEY (purse_pub,coin_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by coin_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_merges(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_merges(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY '-- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(length(reserve_pub)=32)'--REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' --REFERENCES purse_requests (purse_pub) ON DELETE CASCADE
-      ',merge_sig BYTEA NOT NULL CHECK (LENGTH(merge_sig)=64)'
-      ',merge_timestamp INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_purse_requests(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_purse_requests(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_requests_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',merge_pub BYTEA NOT NULL CHECK (LENGTH(merge_pub)=32)'
-      ',purse_expiration INT8 NOT NULL'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',age_limit INT4 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',balance_val INT8 NOT NULL DEFAULT (0)'
-      ',balance_frac INT4 NOT NULL DEFAULT (0)'
-      ',purse_sig BYTEA NOT NULL CHECK(LENGTH(purse_sig)=64)'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by marge_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_merge_pub '
-    'ON ' || table_name || ' '
-    '(merge_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves_out (reserve_out_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub);'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup_by_reserve(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup_by_reserve(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves (reserve_out_serial_id) ON DELETE CASCADE
-    ',coin_pub BYTEA CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_out_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_recoup_refresh(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_recoup_refresh(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_refresh';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_refresh_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',known_coin_id BIGINT NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',rrc_serial INT8 NOT NULL' -- REFERENCES refresh_revealed_coins (rrc_serial) ON DELETE CASCADE -- UNIQUE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: any query using this index will be slow. Materialize index or change query?
-  -- Also: which query uses this index?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_rrc_serial_index '
-    'ON ' || table_name || ' '
-    '(rrc_serial);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_commitments(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_commitments(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_commitments';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(melt_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',rc BYTEA PRIMARY KEY CHECK (LENGTH(rc)=64)'
-      ',old_coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',old_coin_sig BYTEA NOT NULL CHECK(LENGTH(old_coin_sig)=64)'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',noreveal_index INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (rc)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- Note: index spans partitions, may need to be materialized.
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_old_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(old_coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_revealed_coins(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_revealed_coins(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_revealed_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rrc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 NOT NULL' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',freshcoin_index INT4 NOT NULL'
-      ',link_sig BYTEA NOT NULL CHECK(LENGTH(link_sig)=64)'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_ev BYTEA NOT NULL' -- UNIQUE'
-      ',h_coin_ev BYTEA NOT NULL CHECK(LENGTH(h_coin_ev)=64)' -- UNIQUE'
-      ',ev_sig BYTEA NOT NULL'
-      ',ewv BYTEA NOT NULL'
-      --  ,PRIMARY KEY (melt_serial_id, freshcoin_index) -- done per shard
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_coins_by_melt_serial_id_index '
-    'ON ' || table_name || ' '
-    '(melt_serial_id);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refresh_transfer_keys(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refresh_transfer_keys(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_transfer_keys';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rtc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 PRIMARY KEY' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',transfer_pub BYTEA NOT NULL CHECK(LENGTH(transfer_pub)=32)'
-      ',transfer_privs BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_refunds(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_refunds(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refunds';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(refund_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',deposit_serial_id INT8 NOT NULL' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE'
-      ',merchant_sig BYTEA NOT NULL CHECK(LENGTH(merchant_sig)=64)'
-      ',rtransaction_id INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      -- ,PRIMARY KEY (deposit_serial_id, rtransaction_id) -- done per shard!
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
-      ',reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)'
-      ',current_balance_val INT8 NOT NULL'
-      ',current_balance_frac INT4 NOT NULL'
-      ',purses_active INT8 NOT NULL DEFAULT(0)'
-      ',purses_allowed INT8 NOT NULL DEFAULT(0)'
-      ',kyc_required BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',kyc_passed BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',expiration_date INT8 NOT NULL'
-      ',gc_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_expiration_index '
-    'ON ' || table_name || ' '
-    '(expiration_date'
-    ',current_balance_val'
-    ',current_balance_frac'
-    ');'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_expiration_index '
-    'IS ' || quote_literal('used in get_expired_reserves') || ';'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_gc_date_index '
-    'ON ' || table_name || ' '
-    '(gc_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_gc_date_index '
-    'IS ' || quote_literal('for reserve garbage collection') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_close(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_close(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_close';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(close_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE / PRIMARY KEY'
-      ',reserve_pub BYTEA NOT NULL' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',execution_date INT8 NOT NULL'
-      ',wtid BYTEA NOT NULL CHECK (LENGTH(wtid)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',closing_fee_val INT8 NOT NULL'
-      ',closing_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_close_uuid_index '
-    'ON ' || table_name || ' '
-    '(close_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub_index '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-END
-$$;
-
-
---
--- Name: create_table_reserves_in(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_in(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',reserve_pub BYTEA PRIMARY KEY' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',wire_reference INT8 NOT NULL'
-      ',credit_val INT8 NOT NULL'
-      ',credit_frac INT4 NOT NULL'
-      ',wire_source_h_payto BYTEA CHECK (LENGTH(wire_source_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',execution_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_in_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_in_serial_id);'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_section_execution_date_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section '
-    ',execution_date'
-    ');'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section,'
-    'reserve_in_serial_id DESC'
-    ');'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64) UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial)'
-      ',denom_sig BYTEA NOT NULL'
-      ',reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',execution_date INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,'reserves_out'
-    ,'PARTITION BY HASH (h_blind_ev)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_out_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-  -- FIXME: change query to use reserves_out_by_reserve instead and materialize execution_date there as well???
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid, execution_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'IS ' || quote_literal('for get_reserves_out and exchange_do_withdraw_limit_check') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_reserves_out_by_reserve(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_reserves_out_by_reserve(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves_out_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE
-    ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64)'
-    ') %s '
-    ,table_name
-    ,'PARTITION BY HASH (reserve_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wad_in_entries(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wad_in_entries(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_in_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_in_serial_id INT8' -- REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wad_out_entries(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wad_out_entries(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_out_serial_id INT8' -- REFERENCES wads_out (wad_out_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wads_in(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wads_in(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',origin_exchange_url TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',arrival_time INT8 NOT NULL'
-      ',UNIQUE (wad_id, origin_exchange_url)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wads_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wads_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',partner_serial_id INT8 NOT NULL' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',execution_time INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: create_table_wire_out(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wire_out(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wire_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wireout_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',execution_date INT8 NOT NULL'
-      ',wtid_raw BYTEA UNIQUE NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wtid_raw)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wire_target_h_payto_index '
-    'ON ' || table_name || ' '
-    '(wire_target_h_payto);'
-  );
-
-
-END
-$$;
-
-
---
--- Name: create_table_wire_targets(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.create_table_wire_targets(shard_suffix character varying DEFAULT NULL::character varying) RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wire_target_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',wire_target_h_payto BYTEA PRIMARY KEY CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',payto_uri VARCHAR NOT NULL'
-      ',kyc_ok BOOLEAN NOT NULL DEFAULT (FALSE)'
-      ',external_id VARCHAR'
-    ') %s ;'
-    ,'wire_targets'
-    ,'PARTITION BY HASH (wire_target_h_payto)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-
---
--- Name: defer_wire_out(); Type: PROCEDURE; Schema: public; Owner: -
---
-
-CREATE PROCEDURE public.defer_wire_out()
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-IF EXISTS (
-  SELECT 1
-    FROM information_Schema.constraint_column_usage
-   WHERE table_name='wire_out'
-     AND constraint_name='wire_out_ref')
-THEN
-  SET CONSTRAINTS wire_out_ref DEFERRED;
-END IF;
-
-END $$;
-
-
---
--- Name: deposits_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  was_ready BOOLEAN;
-BEGIN
-  was_ready  = NOT (OLD.done OR OLD.extension_blocked);
-
-  IF (was_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_delete_trigger() IS 'Replicate deposit deletions into materialized indices.';
-
-
---
--- Name: deposits_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-
-  IF (is_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_insert_trigger() IS 'Replicate deposit inserts into materialized indices.';
-
-
---
--- Name: deposits_update_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.deposits_update_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  was_ready BOOLEAN;
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  was_ready = NOT (OLD.done OR OLD.extension_blocked);
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-  IF (was_ready AND NOT is_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  IF (is_ready AND NOT was_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION deposits_update_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.deposits_update_trigger() IS 'Replicate deposits changes into materialized indices.';
-
-
---
--- Name: detach_default_partitions(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.detach_default_partitions() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Detaching all default table partitions';
-
-  ALTER TABLE IF EXISTS wire_targets
-    DETACH PARTITION wire_targets_default;
-
-  ALTER TABLE IF EXISTS reserves
-    DETACH PARTITION reserves_default;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DETACH PARTITION reserves_in_default;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DETACH PARTITION reserves_close_default;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DETACH PARTITION reserves_out_default;
-
-  ALTER TABLE IF EXISTS reserves_out_by_reserve
-    DETACH PARTITION reserves_out_by_reserve_default;
-
-  ALTER TABLE IF EXISTS known_coins
-    DETACH PARTITION known_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DETACH PARTITION refresh_commitments_default;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DETACH PARTITION refresh_revealed_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DETACH PARTITION refresh_transfer_keys_default;
-
-  ALTER TABLE IF EXISTS deposits
-    DETACH PARTITION deposits_default;
-
---- TODO range partitioning
---  ALTER TABLE IF EXISTS deposits_by_ready
---    DETACH PARTITION deposits_by_ready_default;
---
---  ALTER TABLE IF EXISTS deposits_for_matching
---    DETACH PARTITION deposits_default_for_matching_default;
-
-  ALTER TABLE IF EXISTS refunds
-    DETACH PARTITION refunds_default;
-
-  ALTER TABLE IF EXISTS wire_out
-    DETACH PARTITION wire_out_default;
-
-  ALTER TABLE IF EXISTS aggregation_transient
-    DETACH PARTITION aggregation_transient_default;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DETACH PARTITION aggregation_tracking_default;
-
-  ALTER TABLE IF EXISTS recoup
-    DETACH PARTITION recoup_default;
-
-  ALTER TABLE IF EXISTS recoup_by_reserve
-    DETACH PARTITION recoup_by_reserve_default;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DETACH PARTITION recoup_refresh_default;
-
-  ALTER TABLE IF EXISTS prewire
-    DETACH PARTITION prewire_default;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DETACH partition cs_nonce_locks_default;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DETACH partition purse_requests_default;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DETACH partition purse_merges_default;
-
-  ALTER TABLE IF EXISTS account_merges
-    DETACH partition account_merges_default;
-
-  ALTER TABLE IF EXISTS contracts
-    DETACH partition contracts_default;
-
-  ALTER TABLE IF EXISTS history_requests
-    DETACH partition history_requests_default;
-
-  ALTER TABLE IF EXISTS close_requests
-    DETACH partition close_requests_default;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DETACH partition purse_deposits_default;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DETACH partition wad_out_entries_default;
-
-  ALTER TABLE IF EXISTS wads_in
-    DETACH partition wads_in_default;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DETACH partition wad_in_entries_default;
-END
-$$;
-
-
---
--- Name: FUNCTION detach_default_partitions(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.detach_default_partitions() IS 'We need to drop default and create new one before deleting the default partitions
-      otherwise constraints get lost too. Might be needed in shardig too';
-
-
---
--- Name: drop_default_partitions(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.drop_default_partitions() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  RAISE NOTICE 'Dropping default table partitions';
-
-  DROP TABLE IF EXISTS wire_targets_default;
-  DROP TABLE IF EXISTS reserves_default;
-  DROP TABLE IF EXISTS reserves_in_default;
-  DROP TABLE IF EXISTS reserves_close_default;
-  DROP TABLE IF EXISTS reserves_out_default;
-  DROP TABLE IF EXISTS reserves_out_by_reserve_default;
-  DROP TABLE IF EXISTS known_coins_default;
-  DROP TABLE IF EXISTS refresh_commitments_default;
-  DROP TABLE IF EXISTS refresh_revealed_coins_default;
-  DROP TABLE IF EXISTS refresh_transfer_keys_default;
-  DROP TABLE IF EXISTS deposits_default;
---DROP TABLE IF EXISTS deposits_by_ready_default;
---DROP TABLE IF EXISTS deposits_for_matching_default;
-  DROP TABLE IF EXISTS refunds_default;
-  DROP TABLE IF EXISTS wire_out_default;
-  DROP TABLE IF EXISTS aggregation_transient_default;
-  DROP TABLE IF EXISTS aggregation_tracking_default;
-  DROP TABLE IF EXISTS recoup_default;
-  DROP TABLE IF EXISTS recoup_by_reserve_default;
-  DROP TABLE IF EXISTS recoup_refresh_default;
-  DROP TABLE IF EXISTS prewire_default;
-  DROP TABLE IF EXISTS cs_nonce_locks_default;
-
-  DROP TABLE IF EXISTS purse_requests_default;
-  DROP TABLE IF EXISTS purse_merges_default;
-  DROP TABLE IF EXISTS account_merges_default;
-  DROP TABLE IF EXISTS contracts_default;
-  DROP TABLE IF EXISTS history_requests_default;
-  DROP TABLE IF EXISTS close_requests_default;
-  DROP TABLE IF EXISTS purse_deposits_default;
-  DROP TABLE IF EXISTS wad_out_entries_default;
-  DROP TABLE IF EXISTS wads_in_default;
-  DROP TABLE IF EXISTS wad_in_entries_default;
-
-END
-$$;
-
-
---
--- Name: FUNCTION drop_default_partitions(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.drop_default_partitions() IS 'Drop all default partitions once other partitions are attached.
-      Might be needed in sharding too.';
-
-
---
--- Name: exchange_do_account_merge(bytea, bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_account_merge(in_purse_pub bytea, in_reserve_pub bytea, in_reserve_sig bytea, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME: function/API is dead! Do DCE?
-END $$;
-
-
---
--- Name: exchange_do_batch_withdraw(bigint, integer, bytea, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_batch_withdraw(amount_val bigint, amount_frac integer, rpub bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result. Excludes storing the planchets.';
-
-
---
--- Name: exchange_do_batch_withdraw_insert(bytea, bigint, integer, bytea, bigint, bytea, bytea, bytea, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  denom_serial INT8;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-out_denom_unknown=TRUE;
-out_conflict=TRUE;
-out_nonce_reuse=TRUE;
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  out_denom_unknown=TRUE;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-out_denom_unknown=FALSE;
-
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  out_conflict=TRUE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
--- Special actions needed for a CS withdraw?
-out_nonce_reuse=FALSE;
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      out_nonce_reuse=TRUE;
-      ASSERT false, 'nonce reuse attempted by client';
-      RETURN;
-    END IF;
-  END IF;
-END IF;
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_batch_withdraw_insert(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, ruuid bigint, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, OUT out_denom_unknown boolean, OUT out_nonce_reuse boolean, OUT out_conflict boolean) IS 'Stores information about a planchet for a batch withdraw operation. Checks if the planchet already exists, and in that case indicates a conflict';
-
-
---
--- Name: exchange_do_close_request(bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_close_request(in_reserve_pub bytea, in_reserve_sig bytea, OUT out_final_balance_val bigint, OUT out_final_balance_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
---
--- Name: exchange_do_deposit(bigint, integer, bytea, bytea, bigint, bigint, bigint, bigint, bytea, character varying, bytea, bigint, bytea, bytea, bigint, boolean, character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_deposit(in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_h_contract_terms bytea, in_wire_salt bytea, in_wallet_timestamp bigint, in_exchange_timestamp bigint, in_refund_deadline bigint, in_wire_deadline bigint, in_merchant_pub bytea, in_receiver_wire_account character varying, in_h_payto bytea, in_known_coin_id bigint, in_coin_pub bytea, in_coin_sig bytea, in_shard bigint, in_extension_blocked boolean, in_extension_details character varying, OUT out_exchange_timestamp bigint, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  wtsi INT8; -- wire target serial id
-DECLARE
-  xdi INT8; -- eXstension details serial id
-BEGIN
--- Shards: INSERT extension_details (by extension_details_serial_id)
---         INSERT wire_targets (by h_payto), on CONFLICT DO NOTHING;
---         INSERT deposits (by coin_pub, shard), ON CONFLICT DO NOTHING;
---         UPDATE known_coins (by coin_pub)
-
-IF NOT NULL in_extension_details
-THEN
-  INSERT INTO extension_details
-  (extension_options)
-  VALUES
-    (in_extension_details)
-  RETURNING extension_details_serial_id INTO xdi;
-ELSE
-  xdi=NULL;
-END IF;
-
-
-INSERT INTO wire_targets
-  (wire_target_h_payto
-  ,payto_uri)
-  VALUES
-  (in_h_payto
-  ,in_receiver_wire_account)
-ON CONFLICT DO NOTHING -- for CONFLICT ON (wire_target_h_payto)
-  RETURNING wire_target_serial_id INTO wtsi;
-
-IF NOT FOUND
-THEN
-  SELECT wire_target_serial_id
-  INTO wtsi
-  FROM wire_targets
-  WHERE wire_target_h_payto=in_h_payto;
-END IF;
-
-
-INSERT INTO deposits
-  (shard
-  ,coin_pub
-  ,known_coin_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,wallet_timestamp
-  ,exchange_timestamp
-  ,refund_deadline
-  ,wire_deadline
-  ,merchant_pub
-  ,h_contract_terms
-  ,coin_sig
-  ,wire_salt
-  ,wire_target_h_payto
-  ,extension_blocked
-  ,extension_details_serial_id
-  )
-  VALUES
-  (in_shard
-  ,in_coin_pub
-  ,in_known_coin_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_wallet_timestamp
-  ,in_exchange_timestamp
-  ,in_refund_deadline
-  ,in_wire_deadline
-  ,in_merchant_pub
-  ,in_h_contract_terms
-  ,in_coin_sig
-  ,in_wire_salt
-  ,in_h_payto
-  ,in_extension_blocked
-  ,xdi)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and wire_target_h_payto
-  -- primarily here to maximally use the existing index.
-  SELECT
-     exchange_timestamp
-   INTO
-     out_exchange_timestamp
-   FROM deposits
-   WHERE shard=in_shard
-     AND merchant_pub=in_merchant_pub
-     AND wire_target_h_payto=in_h_payto
-     AND coin_pub=in_coin_pub
-     AND coin_sig=in_coin_sig;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_balance_ok=TRUE;
-  out_conflict=FALSE;
-
-  RETURN;
-END IF;
-
-
-out_exchange_timestamp=in_exchange_timestamp;
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_conflict=FALSE;
-
-END $$;
-
-
---
--- Name: exchange_do_gc(bigint, bigint); Type: PROCEDURE; Schema: public; Owner: -
---
-
-CREATE PROCEDURE public.exchange_do_gc(in_ancient_date bigint, in_now bigint)
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_uuid_min INT8; -- minimum reserve UUID still alive
-DECLARE
-  melt_min INT8; -- minimum melt still alive
-DECLARE
-  coin_min INT8; -- minimum known_coin still alive
-DECLARE
-  deposit_min INT8; -- minimum deposit still alive
-DECLARE
-  reserve_out_min INT8; -- minimum reserve_out still alive
-DECLARE
-  denom_min INT8; -- minimum denomination still alive
-BEGIN
-
-DELETE FROM prewire
-  WHERE finished=TRUE;
-
-DELETE FROM wire_fee
-  WHERE end_date < in_ancient_date;
-
--- TODO: use closing fee as threshold?
-DELETE FROM reserves
-  WHERE gc_date < in_now
-    AND current_balance_val = 0
-    AND current_balance_frac = 0;
-
-SELECT
-     reserve_out_serial_id
-  INTO
-     reserve_out_min
-  FROM reserves_out
-  ORDER BY reserve_out_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM recoup
-  WHERE reserve_out_serial_id < reserve_out_min;
--- FIXME: recoup_refresh lacks GC!
-
-SELECT
-     reserve_uuid
-  INTO
-     reserve_uuid_min
-  FROM reserves
-  ORDER BY reserve_uuid ASC
-  LIMIT 1;
-
-DELETE FROM reserves_out
-  WHERE reserve_uuid < reserve_uuid_min;
-
--- FIXME: this query will be horribly slow;
--- need to find another way to formulate it...
-DELETE FROM denominations
-  WHERE expire_legal < in_now
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM reserves_out)
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup))
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup_refresh));
-
-SELECT
-     melt_serial_id
-  INTO
-     melt_min
-  FROM refresh_commitments
-  ORDER BY melt_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refresh_revealed_coins
-  WHERE melt_serial_id < melt_min;
-
-DELETE FROM refresh_transfer_keys
-  WHERE melt_serial_id < melt_min;
-
-SELECT
-     known_coin_id
-  INTO
-     coin_min
-  FROM known_coins
-  ORDER BY known_coin_id ASC
-  LIMIT 1;
-
-DELETE FROM deposits
-  WHERE known_coin_id < coin_min;
-
-SELECT
-     deposit_serial_id
-  INTO
-     deposit_min
-  FROM deposits
-  ORDER BY deposit_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refunds
-  WHERE deposit_serial_id < deposit_min;
-
-DELETE FROM aggregation_tracking
-  WHERE deposit_serial_id < deposit_min;
-
-SELECT
-     denominations_serial
-  INTO
-     denom_min
-  FROM denominations
-  ORDER BY denominations_serial ASC
-  LIMIT 1;
-
-DELETE FROM cs_nonce_locks
-  WHERE max_denomination_serial <= denom_min;
-
-END $$;
-
-
---
--- Name: exchange_do_history_request(bytea, bytea, bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_history_request(in_reserve_pub bytea, in_reserve_sig bytea, in_request_timestamp bigint, in_history_fee_val bigint, in_history_fee_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
---
--- Name: exchange_do_melt(bytea, bigint, integer, bytea, bytea, bytea, bigint, integer, boolean); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_melt(in_cs_rms bytea, in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_rc bytea, in_old_coin_pub bytea, in_old_coin_sig bytea, in_known_coin_id bigint, in_noreveal_index integer, in_zombie_required boolean, OUT out_balance_ok boolean, OUT out_zombie_bad boolean, OUT out_noreveal_index integer) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  denom_max INT8;
-BEGIN
--- Shards: INSERT refresh_commitments (by rc)
--- (rare:) SELECT refresh_commitments (by old_coin_pub) -- crosses shards!
--- (rare:) SEELCT refresh_revealed_coins (by melt_serial_id)
--- (rare:) PERFORM recoup_refresh (by rrc_serial) -- crosses shards!
---         UPDATE known_coins (by coin_pub)
-
-INSERT INTO refresh_commitments
-  (rc
-  ,old_coin_pub
-  ,old_coin_sig
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,noreveal_index
-  )
-  VALUES
-  (in_rc
-  ,in_old_coin_pub
-  ,in_old_coin_sig
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_noreveal_index)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  out_noreveal_index=-1;
-  SELECT
-     noreveal_index
-    INTO
-     out_noreveal_index
-    FROM refresh_commitments
-   WHERE rc=in_rc;
-  out_balance_ok=FOUND;
-  out_zombie_bad=FALSE; -- zombie is OK
-  RETURN;
-END IF;
-
-
-IF in_zombie_required
-THEN
-  -- Check if this coin was part of a refresh
-  -- operation that was subsequently involved
-  -- in a recoup operation.  We begin by all
-  -- refresh operations our coin was involved
-  -- with, then find all associated reveal
-  -- operations, and then see if any of these
-  -- reveal operations was involved in a recoup.
-  PERFORM
-    FROM recoup_refresh
-   WHERE rrc_serial IN
-    (SELECT rrc_serial
-       FROM refresh_revealed_coins
-      WHERE melt_serial_id IN
-      (SELECT melt_serial_id
-         FROM refresh_commitments
-        WHERE old_coin_pub=in_old_coin_pub));
-  IF NOT FOUND
-  THEN
-    out_zombie_bad=TRUE;
-    out_balance_ok=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_zombie_bad=FALSE; -- zombie is OK
-
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_noreveal_index=-1;
-  out_balance_ok=FALSE;
-  RETURN;
-END IF;
-
-
-
--- Special actions needed for a CS melt?
-IF NOT NULL in_cs_rms
-THEN
-  -- Get maximum denominations serial value in
-  -- existence, this will determine how long the
-  -- nonce will be locked.
-  SELECT
-      denominations_serial
-    INTO
-      denom_max
-    FROM denominations
-      ORDER BY denominations_serial DESC
-      LIMIT 1;
-
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_rms
-    ,denom_serial
-    ,in_rc)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- Record exists, make sure it is the same
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_rms
-       AND op_hash=in_rc;
-
-    IF NOT FOUND
-    THEN
-       -- Nonce reuse detected
-       out_balance_ok=FALSE;
-       out_zombie_bad=FALSE;
-       out_noreveal_index=42; -- FIXME: return error message more nicely!
-       ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_noreveal_index=in_noreveal_index;
-
-END $$;
-
-
---
--- Name: exchange_do_purse_deposit(bigint, bytea, bigint, integer, bytea, bytea, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_purse_deposit(in_partner_id bigint, in_purse_pub bytea, in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_coin_pub bytea, in_coin_sig bytea, in_amount_without_fee_val bigint, in_amount_without_fee_frac integer, OUT out_balance_ok boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
--- Store the deposit request.
-INSERT INTO purse_deposits
-  (partner_serial_id
-  ,purse_pub
-  ,coin_pub
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,coin_sig)
-  VALUES
-  (in_partner_id
-  ,in_purse_pub
-  ,in_coin_pub
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_coin_sig)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: check if coin_sig is the same,
-  -- if so, success, otherwise conflict!
-  SELECT
-    1
-  FROM purse_deposits
-  WHERE coin_pub = in_coin_pub
-    AND purse_pub = in_purse_pub
-    AND coin_sig = in_cion_sig;
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-END IF;
-
-
--- Debit the coin
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
-
--- Credit the purse.
-UPDATE purse_requests
-  SET
-    balance_frac=balance_frac+in_amount_without_fee_frac
-       - CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    balance_val=balance_val+in_amount_without_fee_val
-       + CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE purse_pub=in_purse_pub;
-
-out_conflict=FALSE;
-out_balance_ok=TRUE;
-
-END $$;
-
-
---
--- Name: exchange_do_purse_merge(bytea, bytea, bigint, bytea, character varying, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_purse_merge(in_purse_pub bytea, in_merge_sig bytea, in_merge_timestamp bigint, in_reserve_sig bytea, in_partner_url character varying, in_reserve_pub bytea, OUT out_no_partner boolean, OUT out_no_balance boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  my_partner_serial_id INT8;
-BEGIN
-
-IF in_partner_url IS NULL
-THEN
-  my_partner_serial_id=0;
-ELSE
-  SELECT
-    partner_serial_id
-  INTO
-    my_partner_serial_id
-  FROM partners
-  WHERE partner_base_url=in_partner_url
-    AND start_date <= in_merge_timestamp
-    AND end_date > in_merge_timestamp;
-  IF NOT FOUND
-  THEN
-    out_no_partner=TRUE;
-    out_conflict=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_no_partner=FALSE;
-
-
--- Check purse is 'full'.
-PERFORM
-  FROM purse_requests
-  WHERE purse_pub=in_purse_pub
-    AND balance_val >= amount_with_fee_val
-    AND ( (balance_frac >= amount_with_fee_frac) OR
-          (balance_val > amount_with_fee_val) );
-IF NOT FOUND
-THEN
-  out_no_balance=TRUE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_no_balance=FALSE;
-
-
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (my_partner_serial_id
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
-
-RETURN;
-
-END $$;
-
-
---
--- Name: exchange_do_recoup_to_coin(bytea, bigint, bytea, bytea, bigint, bytea, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_recoup_to_coin(in_old_coin_pub bytea, in_rrc_serial bigint, in_coin_blind bytea, in_coin_pub bytea, in_known_coin_id bigint, in_coin_sig bytea, in_recoup_timestamp bigint, OUT out_recoup_ok boolean, OUT out_internal_failure boolean, OUT out_recoup_timestamp bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
-
--- Shards: UPDATE known_coins (by coin_pub)
---         SELECT recoup_refresh (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         INSERT recoup_refresh (by coin_pub)
-
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-      recoup_timestamp
-    INTO
-      out_recoup_timestamp
-    FROM recoup_refresh
-    WHERE coin_pub=in_coin_pub;
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the old coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+tmp_frac
-       - CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+tmp_val
-       + CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase old coin balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup_refresh
-  (coin_pub
-  ,known_coin_id
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,rrc_serial
-  )
-VALUES
-  (in_coin_pub
-  ,in_known_coin_id
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_rrc_serial);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
-
---
--- Name: exchange_do_recoup_to_reserve(bytea, bigint, bytea, bytea, bigint, bytea, bigint, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_recoup_to_reserve(in_reserve_pub bytea, in_reserve_out_serial_id bigint, in_coin_blind bytea, in_coin_pub bytea, in_known_coin_id bigint, in_coin_sig bytea, in_reserve_gc bigint, in_reserve_expiration bigint, in_recoup_timestamp bigint, OUT out_recoup_ok boolean, OUT out_internal_failure boolean, OUT out_recoup_timestamp bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
--- Shards: SELECT known_coins (by coin_pub)
---         SELECT recoup      (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         UPDATE reserves (by reserve_pub)
---         INSERT recoup      (by coin_pub)
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-    recoup_timestamp
-  INTO
-    out_recoup_timestamp
-    FROM recoup
-    WHERE coin_pub=in_coin_pub;
-
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the reserve and update reserve timers.
-UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac+tmp_frac
-       - CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val+tmp_val
-       + CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END,
-    gc_date=GREATEST(gc_date, in_reserve_gc),
-    expiration_date=GREATEST(expiration_date, in_reserve_expiration)
-  WHERE reserve_pub=in_reserve_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase reserve balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup
-  (coin_pub
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,reserve_out_serial_id
-  )
-VALUES
-  (in_coin_pub
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_reserve_out_serial_id);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
-
---
--- Name: exchange_do_refund(bigint, integer, bigint, integer, bigint, integer, bytea, bigint, bigint, bigint, bytea, bytea, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_refund(in_amount_with_fee_val bigint, in_amount_with_fee_frac integer, in_amount_val bigint, in_amount_frac integer, in_deposit_fee_val bigint, in_deposit_fee_frac integer, in_h_contract_terms bytea, in_rtransaction_id bigint, in_deposit_shard bigint, in_known_coin_id bigint, in_coin_pub bytea, in_merchant_pub bytea, in_merchant_sig bytea, OUT out_not_found boolean, OUT out_refund_ok boolean, OUT out_gone boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  dsi INT8; -- ID of deposit being refunded
-DECLARE
-  tmp_val INT8; -- total amount refunded
-DECLARE
-  tmp_frac INT8; -- total amount refunded
-DECLARE
-  deposit_val INT8; -- amount that was originally deposited
-DECLARE
-  deposit_frac INT8; -- amount that was originally deposited
-BEGIN
--- Shards: SELECT deposits (coin_pub, shard, h_contract_terms, merchant_pub)
---         INSERT refunds (by coin_pub, rtransaction_id) ON CONFLICT DO NOTHING
---         SELECT refunds (by coin_pub)
---         UPDATE known_coins (by coin_pub)
-
-SELECT
-   deposit_serial_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,done
-INTO
-   dsi
-  ,deposit_val
-  ,deposit_frac
-  ,out_gone
-FROM deposits
- WHERE coin_pub=in_coin_pub
-  AND shard=in_deposit_shard
-  AND merchant_pub=in_merchant_pub
-  AND h_contract_terms=in_h_contract_terms;
-
-IF NOT FOUND
-THEN
-  -- No matching deposit found!
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=TRUE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-INSERT INTO refunds
-  (deposit_serial_id
-  ,coin_pub
-  ,merchant_sig
-  ,rtransaction_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  )
-  VALUES
-  (dsi
-  ,in_coin_pub
-  ,in_merchant_sig
-  ,in_rtransaction_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and h_contract_terms
-  -- primarily here to maximally use the existing index.
-   PERFORM
-   FROM refunds
-   WHERE coin_pub=in_coin_pub
-     AND deposit_serial_id=dsi
-     AND rtransaction_id=in_rtransaction_id
-     AND amount_with_fee_val=in_amount_with_fee_val
-     AND amount_with_fee_frac=in_amount_with_fee_frac;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but have conflicting refund.
-    out_refund_ok=FALSE;
-    out_conflict=TRUE;
-    out_not_found=FALSE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_refund_ok=TRUE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-IF out_gone
-THEN
-  -- money already sent to the merchant. Tough luck.
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Check refund balance invariant.
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   tmp_val
-  ,tmp_frac
-  FROM refunds
-  WHERE coin_pub=in_coin_pub
-    AND deposit_serial_id=dsi;
-IF tmp_val IS NULL
-THEN
-  RAISE NOTICE 'failed to sum up existing refunds';
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Normalize result before continuing
-tmp_val = tmp_val + tmp_frac / 100000000;
-tmp_frac = tmp_frac % 100000000;
-
--- Actually check if the deposits are sufficient for the refund. Verbosely. ;-)
-IF (tmp_val < deposit_val)
-THEN
-  out_refund_ok=TRUE;
-ELSE
-  IF (tmp_val = deposit_val) AND (tmp_frac <= deposit_frac)
-  THEN
-    out_refund_ok=TRUE;
-  ELSE
-    out_refund_ok=FALSE;
-  END IF;
-END IF;
-
-IF (tmp_val = deposit_val) AND (tmp_frac = deposit_frac)
-THEN
-  -- Refunds have reached the full value of the original
-  -- deposit. Also refund the deposit fee.
-  in_amount_frac = in_amount_frac + in_deposit_fee_frac;
-  in_amount_val = in_amount_val + in_deposit_fee_val;
-
-  -- Normalize result before continuing
-  in_amount_val = in_amount_val + in_amount_frac / 100000000;
-  in_amount_frac = in_amount_frac % 100000000;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+in_amount_frac
-       - CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+in_amount_val
-       + CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub;
-
-
-out_conflict=FALSE;
-out_not_found=FALSE;
-
-END $$;
-
-
---
--- Name: exchange_do_reserve_purse(bytea, bytea, bigint, bytea, bigint, integer, bytea); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_reserve_purse(in_purse_pub bytea, in_merge_sig bytea, in_merge_timestamp bigint, in_reserve_sig bytea, in_purse_fee_val bigint, in_purse_fee_frac integer, in_reserve_pub bytea, OUT out_no_funds boolean, OUT out_conflict boolean) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  my_purses_active INT8;
-DECLARE
-  my_purses_allowed INT8;
-DECLARE
-  my_balance_val INT8;
-DECLARE
-  my_balance_frac INT4;
-DECLARE
-  my_kyc_passed BOOLEAN;
-BEGIN
-
--- comment out for now
-IF TRUE
-THEN
-  out_no_funds=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (0
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  out_no_funds=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
-
-
--- Charge reserve for purse creation.
--- FIXME: Use different type of purse
--- signature in this case, so that we
--- can properly account for the purse
--- fees when auditing!!!
-SELECT
-  purses_active
- ,purses_allowed
- ,kyc_passed
- ,current_balance_val
- ,current_balance_frac
-INTO
-  my_purses_active
- ,my_purses_allowed
- ,my_kyc_passed
- ,my_balance_val
- ,my_balance_frac
-FROM reserves
-WHERE reserve_pub=in_reserve_pub;
-
-IF NOT FOUND
-THEN
-  out_no_funds=TRUE;
-  -- FIXME: be more specific in the returned
-  -- error that we don't know the reserve
-  -- (instead of merely saying it has no funds)
-  RETURN;
-END IF;
-
-IF NOT my_kyc_passed
-THEN
-  -- FIXME: might want to categorically disallow
-  -- purse creation without KYC (depending on
-  -- exchange settings => new argument?)
-END IF;
-
-IF ( (my_purses_active >= my_purses_allowed) AND
-     ( (my_balance_val < in_purse_fee_val) OR
-       ( (my_balance_val <= in_purse_fee_val) AND
-         (my_balance_frac < in_purse_fee_frac) ) ) )
-THEN
-  out_no_funds=TRUE;
-  RETURN;
-END IF;
-
-IF (my_purses_active < my_purses_allowed)
-THEN
-  my_purses_active = my_purses_active + 1;
-ELSE
-  -- FIXME: See above: we should probably have
-  -- very explicit wallet-approval in the
-  -- signature to charge the reserve!
-  my_balance_val = my_balance_val - in_purse_fee_val;
-  IF (my_balance_frac > in_purse_fee_frac)
-  THEN
-    my_balance_frac = my_balance_frac - in_purse_fee_frac;
-  ELSE
-    my_balance_val = my_balance_val - 1;
-    my_balance_frac = my_balance_frac + 100000000 - in_purse_fee_frac;
-  END IF;
-END IF;
-
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=my_balance_val
- ,current_balance_frac=my_balance_frac
- ,purses_active=my_purses_active
- ,kyc_required=TRUE
-WHERE
-  reserves.reserve_pub=rpub;
-
-out_no_funds=FALSE;
-
-
-END $$;
-
-
---
--- Name: exchange_do_withdraw(bytea, bigint, integer, bytea, bytea, bytea, bytea, bytea, bigint, bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) RETURNS record
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  denom_serial INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=0;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- We optimistically insert, and then on conflict declare
--- the query successful due to idempotency.
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- idempotent query, all constraints must be satisfied
-  reserve_found=TRUE;
-  balance_ok=TRUE;
-  kycok=TRUE;
-  account_uuid=0;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
-
--- Special actions needed for a CS withdraw?
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      reserve_found=FALSE;
-      balance_ok=FALSE;
-      kycok=FALSE;
-      account_uuid=0;
-      ruuid=1; -- FIXME: return error message more nicely!
-      ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_withdraw(cs_nonce bytea, amount_val bigint, amount_frac integer, h_denom_pub bytea, rpub bytea, reserve_sig bytea, h_coin_envelope bytea, denom_sig bytea, now bigint, min_reserve_gc bigint, OUT reserve_found boolean, OUT balance_ok boolean, OUT kycok boolean, OUT account_uuid bigint, OUT ruuid bigint) IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result';
-
-
---
--- Name: exchange_do_withdraw_limit_check(bigint, bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean) RETURNS boolean
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  total_val INT8;
-DECLARE
-  total_frac INT8; -- INT4 could overflow during accumulation!
-BEGIN
--- NOTE: Read-only, but crosses shards.
--- Shards: reserves by reserve_pub
---         reserves_out by reserve_uuid -- crosses shards!!
-
-
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   total_val
-  ,total_frac
-  FROM reserves_out
- WHERE reserve_uuid=ruuid
-   AND execution_date > start_time;
-
--- normalize result
-total_val = total_val + total_frac / 100000000;
-total_frac = total_frac % 100000000;
-
--- compare to threshold
-below_limit = (total_val < upper_limit_val) OR
-            ( (total_val = upper_limit_val) AND
-              (total_frac <= upper_limit_frac) );
-END $$;
-
-
---
--- Name: FUNCTION exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.exchange_do_withdraw_limit_check(ruuid bigint, start_time bigint, upper_limit_val bigint, upper_limit_frac integer, OUT below_limit boolean) IS 'Check whether the withdrawals from the given reserve since the given time are below the given threshold';
-
-
---
--- Name: prepare_sharding(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.prepare_sharding() RETURNS void
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-
-  CREATE EXTENSION IF NOT EXISTS postgres_fdw;
-
-  PERFORM detach_default_partitions();
-
-  ALTER TABLE IF EXISTS wire_targets
-    DROP CONSTRAINT IF EXISTS wire_targets_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves
-    DROP CONSTRAINT IF EXISTS reserves_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DROP CONSTRAINT IF EXISTS reserves_in_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DROP CONSTRAINT IF EXISTS reserves_close_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DROP CONSTRAINT IF EXISTS reserves_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS reserves_out_denominations_serial_fkey
-    ,DROP CONSTRAINT IF EXISTS reserves_out_h_blind_ev_key
-  ;
-
-  ALTER TABLE IF EXISTS known_coins
-    DROP CONSTRAINT IF EXISTS known_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS known_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DROP CONSTRAINT IF EXISTS refresh_commitments_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_old_coin_pub_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DROP CONSTRAINT IF EXISTS refresh_revealed_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_revealed_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DROP CONSTRAINT IF EXISTS refresh_transfer_keys_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS deposits
-    DROP CONSTRAINT IF EXISTS deposits_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS deposits_extension_details_serial_id_fkey
-    ,DROP CONSTRAINT IF EXISTS deposits_coin_pub_merchant_pub_h_contract_terms_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS refunds
-    DROP CONSTRAINT IF EXISTS refunds_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wire_out
-    DROP CONSTRAINT IF EXISTS wire_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wire_out_wtid_raw_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DROP CONSTRAINT IF EXISTS aggregation_tracking_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS aggregation_tracking_wtid_raw_fkey
-  ;
-
-  ALTER TABLE IF EXISTS recoup
-    DROP CONSTRAINT IF EXISTS recoup_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DROP CONSTRAINT IF EXISTS recoup_refresh_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS prewire
-    DROP CONSTRAINT IF EXISTS prewire_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DROP CONSTRAINT IF EXISTS cs_nonce_locks_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DROP CONSTRAINT IF EXISTS purse_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DROP CONSTRAINT IF EXISTS purse_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS account_merges
-    DROP CONSTRAINT IF EXISTS account_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS contracts
-    DROP CONSTRAINT IF EXISTS contracts_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS history_requests
-    DROP CONSTRAINT IF EXISTS history_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS close_requests
-    DROP CONSTRAINT IF EXISTS close_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DROP CONSTRAINT IF EXISTS purse_deposits_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_out
-    DROP CONSTRAINT IF EXISTS wads_out_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DROP CONSTRAINT IF EXISTS wad_out_entries_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_in
-    DROP CONSTRAINT IF EXISTS wads_in_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wads_in_wad_id_origin_exchange_url_key
-  ;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DROP CONSTRAINT IF EXISTS wad_in_entries_pkey CASCADE
-  ;
-
-END
-$$;
-
-
---
--- Name: recoup_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.recoup_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM recoup_by_reserve
-   WHERE reserve_out_serial_id = OLD.reserve_out_serial_id
-     AND coin_pub = OLD.coin_pub;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION recoup_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.recoup_delete_trigger() IS 'Replicate recoup deletions into recoup_by_reserve table.';
-
-
---
--- Name: recoup_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.recoup_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  INSERT INTO recoup_by_reserve
-    (reserve_out_serial_id
-    ,coin_pub)
-  VALUES
-    (NEW.reserve_out_serial_id
-    ,NEW.coin_pub);
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION recoup_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.recoup_insert_trigger() IS 'Replicate recoup inserts into recoup_by_reserve table.';
-
-
---
--- Name: reserves_out_by_reserve_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.reserves_out_by_reserve_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM reserves_out_by_reserve
-   WHERE reserve_uuid = OLD.reserve_uuid;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION reserves_out_by_reserve_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.reserves_out_by_reserve_delete_trigger() IS 'Replicate reserve_out deletions into reserve_out_by_reserve table.';
-
-
---
--- Name: reserves_out_by_reserve_insert_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.reserves_out_by_reserve_insert_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  INSERT INTO reserves_out_by_reserve
-    (reserve_uuid
-    ,h_blind_ev)
-  VALUES
-    (NEW.reserve_uuid
-    ,NEW.h_blind_ev);
-  RETURN NEW;
-END $$;
-
-
---
--- Name: FUNCTION reserves_out_by_reserve_insert_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.reserves_out_by_reserve_insert_trigger() IS 'Replicate reserve_out inserts into reserve_out_by_reserve table.';
-
-
---
--- Name: wire_out_delete_trigger(); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.wire_out_delete_trigger() RETURNS trigger
-    LANGUAGE plpgsql
-    AS $$
-BEGIN
-  DELETE FROM aggregation_tracking
-   WHERE wtid_raw = OLD.wtid_raw;
-  RETURN OLD;
-END $$;
-
-
---
--- Name: FUNCTION wire_out_delete_trigger(); Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON FUNCTION public.wire_out_delete_trigger() IS 'Replicate reserve_out deletions into aggregation_tracking. This replaces an earlier use of an ON DELETE CASCADE that required a DEFERRABLE constraint and conflicted with nice partitioning.';
-
-
-SET default_tablespace = '';
-
-SET default_table_access_method = heap;
-
---
--- Name: patches; Type: TABLE; Schema: _v; Owner: -
---
-
-CREATE TABLE _v.patches (
-    patch_name text NOT NULL,
-    applied_tsz timestamp with time zone DEFAULT now() NOT NULL,
-    applied_by text NOT NULL,
-    requires text[],
-    conflicts text[]
-);
-
-
---
--- Name: TABLE patches; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON TABLE _v.patches IS 'Contains information about what patches are currently applied on database.';
-
-
---
--- Name: COLUMN patches.patch_name; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.patch_name IS 'Name of patch, has to be unique for every patch.';
-
-
---
--- Name: COLUMN patches.applied_tsz; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.applied_tsz IS 'When the patch was applied.';
-
-
---
--- Name: COLUMN patches.applied_by; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.applied_by IS 'Who applied this patch (PostgreSQL username)';
-
-
---
--- Name: COLUMN patches.requires; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.requires IS 'List of patches that are required for given patch.';
-
-
---
--- Name: COLUMN patches.conflicts; Type: COMMENT; Schema: _v; Owner: -
---
-
-COMMENT ON COLUMN _v.patches.conflicts IS 'List of patches that conflict with given patch.';
-
-
---
--- Name: account_merges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.account_merges (
-    account_merge_request_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    CONSTRAINT account_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT account_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT account_merges_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE account_merges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.account_merges IS 'Merge requests where a purse- and account-owner requested merging the purse into the account';
-
-
---
--- Name: COLUMN account_merges.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.reserve_pub IS 'public key of the target reserve';
-
-
---
--- Name: COLUMN account_merges.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.reserve_sig IS 'signature by the reserve private key affirming the merge, of type TALER_SIGNATURE_WALLET_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN account_merges.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.account_merges.purse_pub IS 'public key of the purse';
-
-
---
--- Name: account_merges_account_merge_request_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.account_merges ALTER COLUMN account_merge_request_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.account_merges_account_merge_request_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: account_merges_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.account_merges_default (
-    account_merge_request_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    CONSTRAINT account_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT account_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT account_merges_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.account_merges ATTACH PARTITION public.account_merges_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: aggregation_tracking; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_tracking (
-    aggregation_serial_id bigint NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    wtid_raw bytea NOT NULL
-)
-PARTITION BY HASH (deposit_serial_id);
-
-
---
--- Name: TABLE aggregation_tracking; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.aggregation_tracking IS 'mapping from wire transfer identifiers (WTID) to deposits (and back)';
-
-
---
--- Name: COLUMN aggregation_tracking.wtid_raw; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_tracking.wtid_raw IS 'identifier of the wire transfer';
-
-
---
--- Name: aggregation_tracking_aggregation_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.aggregation_tracking ALTER COLUMN aggregation_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.aggregation_tracking_aggregation_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: aggregation_tracking_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_tracking_default (
-    aggregation_serial_id bigint NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    wtid_raw bytea NOT NULL
-);
-ALTER TABLE ONLY public.aggregation_tracking ATTACH PARTITION public.aggregation_tracking_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: aggregation_transient; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_transient (
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    wtid_raw bytea NOT NULL,
-    CONSTRAINT aggregation_transient_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT aggregation_transient_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-)
-PARTITION BY HASH (wire_target_h_payto);
-
-
---
--- Name: TABLE aggregation_transient; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.aggregation_transient IS 'aggregations currently happening (lacking wire_out, usually because the amount is too low); this table is not replicated';
-
-
---
--- Name: COLUMN aggregation_transient.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_transient.amount_val IS 'Sum of all of the aggregated deposits (without deposit fees)';
-
-
---
--- Name: COLUMN aggregation_transient.wtid_raw; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.aggregation_transient.wtid_raw IS 'identifier of the wire transfer';
-
-
---
--- Name: aggregation_transient_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.aggregation_transient_default (
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    wtid_raw bytea NOT NULL,
-    CONSTRAINT aggregation_transient_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT aggregation_transient_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-);
-ALTER TABLE ONLY public.aggregation_transient ATTACH PARTITION public.aggregation_transient_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: app_bankaccount; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_bankaccount (
-    is_public boolean NOT NULL,
-    account_no integer NOT NULL,
-    balance character varying NOT NULL,
-    user_id integer NOT NULL
-);
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.app_bankaccount_account_no_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.app_bankaccount_account_no_seq OWNED BY public.app_bankaccount.account_no;
-
-
---
--- Name: app_banktransaction; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_banktransaction (
-    id bigint NOT NULL,
-    amount character varying NOT NULL,
-    subject character varying(200) NOT NULL,
-    date timestamp with time zone NOT NULL,
-    cancelled boolean NOT NULL,
-    request_uid character varying(128) NOT NULL,
-    credit_account_id integer NOT NULL,
-    debit_account_id integer NOT NULL
-);
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.app_banktransaction_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.app_banktransaction_id_seq OWNED BY public.app_banktransaction.id;
-
-
---
--- Name: app_talerwithdrawoperation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.app_talerwithdrawoperation (
-    withdraw_id uuid NOT NULL,
-    amount character varying NOT NULL,
-    selection_done boolean NOT NULL,
-    confirmation_done boolean NOT NULL,
-    aborted boolean NOT NULL,
-    selected_reserve_pub text,
-    selected_exchange_account_id integer,
-    withdraw_account_id integer NOT NULL
-);
-
-
---
--- Name: auditor_balance_summary; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_balance_summary (
-    master_pub bytea NOT NULL,
-    denom_balance_val bigint NOT NULL,
-    denom_balance_frac integer NOT NULL,
-    deposit_fee_balance_val bigint NOT NULL,
-    deposit_fee_balance_frac integer NOT NULL,
-    melt_fee_balance_val bigint NOT NULL,
-    melt_fee_balance_frac integer NOT NULL,
-    refund_fee_balance_val bigint NOT NULL,
-    refund_fee_balance_frac integer NOT NULL,
-    risk_val bigint NOT NULL,
-    risk_frac integer NOT NULL,
-    loss_val bigint NOT NULL,
-    loss_frac integer NOT NULL,
-    irregular_recoup_val bigint NOT NULL,
-    irregular_recoup_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_balance_summary; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_balance_summary IS 'the sum of the outstanding coins from auditor_denomination_pending (denom_pubs must belong to the respectives exchange master public key); it represents the auditor_balance_summary of the exchange at this point (modulo unexpected historic_loss-style events where denomination keys are compromised)';
-
-
---
--- Name: auditor_denom_sigs; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_denom_sigs (
-    auditor_denom_serial bigint NOT NULL,
-    auditor_uuid bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    auditor_sig bytea,
-    CONSTRAINT auditor_denom_sigs_auditor_sig_check CHECK ((length(auditor_sig) = 64))
-);
-
-
---
--- Name: TABLE auditor_denom_sigs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_denom_sigs IS 'Table with auditor signatures on exchange denomination keys.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.auditor_uuid; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.auditor_uuid IS 'Identifies the auditor.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.denominations_serial IS 'Denomination the signature is for.';
-
-
---
--- Name: COLUMN auditor_denom_sigs.auditor_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denom_sigs.auditor_sig IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.';
-
-
---
--- Name: auditor_denom_sigs_auditor_denom_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.auditor_denom_sigs ALTER COLUMN auditor_denom_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.auditor_denom_sigs_auditor_denom_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: auditor_denomination_pending; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_denomination_pending (
-    denom_pub_hash bytea NOT NULL,
-    denom_balance_val bigint NOT NULL,
-    denom_balance_frac integer NOT NULL,
-    denom_loss_val bigint NOT NULL,
-    denom_loss_frac integer NOT NULL,
-    num_issued bigint NOT NULL,
-    denom_risk_val bigint NOT NULL,
-    denom_risk_frac integer NOT NULL,
-    recoup_loss_val bigint NOT NULL,
-    recoup_loss_frac integer NOT NULL,
-    CONSTRAINT auditor_denomination_pending_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64))
-);
-
-
---
--- Name: TABLE auditor_denomination_pending; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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).';
-
-
---
--- Name: COLUMN auditor_denomination_pending.num_issued; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.num_issued IS 'counts the number of coins issued (withdraw, refresh) of this denomination';
-
-
---
--- Name: COLUMN auditor_denomination_pending.denom_risk_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.denom_risk_val IS 'amount that could theoretically be lost in the future due to recoup operations';
-
-
---
--- Name: COLUMN auditor_denomination_pending.recoup_loss_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_denomination_pending.recoup_loss_val IS 'amount actually lost due to recoup operations past revocation';
-
-
---
--- Name: auditor_exchange_signkeys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_exchange_signkeys (
-    master_pub bytea NOT NULL,
-    ep_start bigint NOT NULL,
-    ep_expire bigint NOT NULL,
-    ep_end bigint NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT auditor_exchange_signkeys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT auditor_exchange_signkeys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE auditor_exchange_signkeys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_exchange_signkeys IS 'list of the online signing keys of exchanges we are auditing';
-
-
---
--- Name: auditor_exchanges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_exchanges (
-    master_pub bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    CONSTRAINT auditor_exchanges_master_pub_check CHECK ((length(master_pub) = 32))
-);
-
-
---
--- Name: TABLE auditor_exchanges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_exchanges IS 'list of the exchanges we are auditing';
-
-
---
--- Name: auditor_historic_denomination_revenue; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_historic_denomination_revenue (
-    master_pub bytea NOT NULL,
-    denom_pub_hash bytea NOT NULL,
-    revenue_timestamp bigint NOT NULL,
-    revenue_balance_val bigint NOT NULL,
-    revenue_balance_frac integer NOT NULL,
-    loss_balance_val bigint NOT NULL,
-    loss_balance_frac integer NOT NULL,
-    CONSTRAINT auditor_historic_denomination_revenue_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64))
-);
-
-
---
--- Name: TABLE auditor_historic_denomination_revenue; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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.';
-
-
---
--- Name: COLUMN auditor_historic_denomination_revenue.revenue_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditor_historic_denomination_revenue.revenue_balance_val IS 'the sum of all of the profits we made on the coin except for withdraw fees (which are in historic_reserve_revenue); so this includes the deposit, melt and refund fees';
-
-
---
--- Name: auditor_historic_reserve_summary; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_historic_reserve_summary (
-    master_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    reserve_profits_val bigint NOT NULL,
-    reserve_profits_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_historic_reserve_summary; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.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).';
-
-
---
--- Name: auditor_predicted_result; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_predicted_result (
-    master_pub bytea NOT NULL,
-    balance_val bigint NOT NULL,
-    balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_predicted_result; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_predicted_result IS 'Table with the sum of the ledger, auditor_historic_revenue and the auditor_reserve_balance.  This is the final amount that the exchange should have in its bank account right now.';
-
-
---
--- Name: auditor_progress_aggregation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_aggregation (
-    master_pub bytea NOT NULL,
-    last_wire_out_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_aggregation; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_aggregation IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_coin; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_coin (
-    master_pub bytea NOT NULL,
-    last_withdraw_serial_id bigint DEFAULT 0 NOT NULL,
-    last_deposit_serial_id bigint DEFAULT 0 NOT NULL,
-    last_melt_serial_id bigint DEFAULT 0 NOT NULL,
-    last_refund_serial_id bigint DEFAULT 0 NOT NULL,
-    last_recoup_serial_id bigint DEFAULT 0 NOT NULL,
-    last_recoup_refresh_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_coin; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_coin IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_deposit_confirmation; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_deposit_confirmation (
-    master_pub bytea NOT NULL,
-    last_deposit_confirmation_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_deposit_confirmation; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_deposit_confirmation IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_progress_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_progress_reserve (
-    master_pub bytea NOT NULL,
-    last_reserve_in_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_out_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_recoup_serial_id bigint DEFAULT 0 NOT NULL,
-    last_reserve_close_serial_id bigint DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE auditor_progress_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_progress_reserve IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: auditor_reserve_balance; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_reserve_balance (
-    master_pub bytea NOT NULL,
-    reserve_balance_val bigint NOT NULL,
-    reserve_balance_frac integer NOT NULL,
-    withdraw_fee_balance_val bigint NOT NULL,
-    withdraw_fee_balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_reserve_balance; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_reserve_balance IS 'sum of the balances of all customer reserves (by exchange master public key)';
-
-
---
--- Name: auditor_reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_reserves (
-    reserve_pub bytea NOT NULL,
-    master_pub bytea NOT NULL,
-    reserve_balance_val bigint NOT NULL,
-    reserve_balance_frac integer NOT NULL,
-    withdraw_fee_balance_val bigint NOT NULL,
-    withdraw_fee_balance_frac integer NOT NULL,
-    expiration_date bigint NOT NULL,
-    auditor_reserves_rowid bigint NOT NULL,
-    origin_account text,
-    CONSTRAINT auditor_reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-
-
---
--- Name: TABLE auditor_reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_reserves IS 'all of the customer reserves and their respective balances that the auditor is aware of';
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auditor_reserves_auditor_reserves_rowid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auditor_reserves_auditor_reserves_rowid_seq OWNED BY public.auditor_reserves.auditor_reserves_rowid;
-
-
---
--- Name: auditor_wire_fee_balance; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditor_wire_fee_balance (
-    master_pub bytea NOT NULL,
-    wire_fee_balance_val bigint NOT NULL,
-    wire_fee_balance_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE auditor_wire_fee_balance; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditor_wire_fee_balance IS 'sum of the balances of all wire fees (by exchange master public key)';
-
-
---
--- Name: auditors; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auditors (
-    auditor_uuid bigint NOT NULL,
-    auditor_pub bytea NOT NULL,
-    auditor_name character varying NOT NULL,
-    auditor_url character varying NOT NULL,
-    is_active boolean NOT NULL,
-    last_change bigint NOT NULL,
-    CONSTRAINT auditors_auditor_pub_check CHECK ((length(auditor_pub) = 32))
-);
-
-
---
--- Name: TABLE auditors; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.auditors IS 'Table with auditors the exchange uses or has used in the past. Entries never expire as we need to remember the last_change column indefinitely.';
-
-
---
--- Name: COLUMN auditors.auditor_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.auditor_pub IS 'Public key of the auditor.';
-
-
---
--- Name: COLUMN auditors.auditor_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.auditor_url IS 'The base URL of the auditor.';
-
-
---
--- Name: COLUMN auditors.is_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.is_active IS 'true if we are currently supporting the use of this auditor.';
-
-
---
--- Name: COLUMN auditors.last_change; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.auditors.last_change IS 'Latest time when active status changed. Used to detect replays of old messages.';
-
-
---
--- Name: auditors_auditor_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.auditors ALTER COLUMN auditor_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.auditors_auditor_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: auth_group; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_group (
-    id integer NOT NULL,
-    name character varying(150) NOT NULL
-);
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_group_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_group_id_seq OWNED BY public.auth_group.id;
-
-
---
--- Name: auth_group_permissions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_group_permissions (
-    id bigint NOT NULL,
-    group_id integer NOT NULL,
-    permission_id integer NOT NULL
-);
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_group_permissions_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_group_permissions_id_seq OWNED BY public.auth_group_permissions.id;
-
-
---
--- Name: auth_permission; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_permission (
-    id integer NOT NULL,
-    name character varying(255) NOT NULL,
-    content_type_id integer NOT NULL,
-    codename character varying(100) NOT NULL
-);
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_permission_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_permission_id_seq OWNED BY public.auth_permission.id;
-
-
---
--- Name: auth_user; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user (
-    id integer NOT NULL,
-    password character varying(128) NOT NULL,
-    last_login timestamp with time zone,
-    is_superuser boolean NOT NULL,
-    username character varying(150) NOT NULL,
-    first_name character varying(150) NOT NULL,
-    last_name character varying(150) NOT NULL,
-    email character varying(254) NOT NULL,
-    is_staff boolean NOT NULL,
-    is_active boolean NOT NULL,
-    date_joined timestamp with time zone NOT NULL
-);
-
-
---
--- Name: auth_user_groups; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user_groups (
-    id bigint NOT NULL,
-    user_id integer NOT NULL,
-    group_id integer NOT NULL
-);
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_groups_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_groups_id_seq OWNED BY public.auth_user_groups.id;
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_id_seq OWNED BY public.auth_user.id;
-
-
---
--- Name: auth_user_user_permissions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.auth_user_user_permissions (
-    id bigint NOT NULL,
-    user_id integer NOT NULL,
-    permission_id integer NOT NULL
-);
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.auth_user_user_permissions_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.auth_user_user_permissions_id_seq OWNED BY public.auth_user_user_permissions.id;
-
-
---
--- Name: close_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.close_requests (
-    reserve_pub bytea NOT NULL,
-    close_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    close_val bigint NOT NULL,
-    close_frac integer NOT NULL,
-    CONSTRAINT close_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT close_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE close_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.close_requests IS 'Explicit requests by a reserve owner to close a reserve immediately';
-
-
---
--- Name: COLUMN close_requests.close_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.close_timestamp IS 'When the request was created by the client';
-
-
---
--- Name: COLUMN close_requests.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.reserve_sig IS 'Signature affirming that the reserve is to be closed';
-
-
---
--- Name: COLUMN close_requests.close_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.close_requests.close_val IS 'Balance of the reserve at the time of closing, to be wired to the associated bank account (minus the closing fee)';
-
-
---
--- Name: close_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.close_requests_default (
-    reserve_pub bytea NOT NULL,
-    close_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    close_val bigint NOT NULL,
-    close_frac integer NOT NULL,
-    CONSTRAINT close_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT close_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.close_requests ATTACH PARTITION public.close_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: contracts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.contracts (
-    contract_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    pub_ckey bytea NOT NULL,
-    contract_sig bytea NOT NULL,
-    e_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    CONSTRAINT contracts_contract_sig_check CHECK ((length(contract_sig) = 64)),
-    CONSTRAINT contracts_pub_ckey_check CHECK ((length(pub_ckey) = 32)),
-    CONSTRAINT contracts_purse_pub_check CHECK ((length(purse_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE contracts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.contracts IS 'encrypted contracts associated with purses';
-
-
---
--- Name: COLUMN contracts.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.purse_pub IS 'public key of the purse that the contract is associated with';
-
-
---
--- Name: COLUMN contracts.pub_ckey; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.pub_ckey IS 'Public ECDH key used to encrypt the contract, to be used with the purse private key for decryption';
-
-
---
--- Name: COLUMN contracts.contract_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.contract_sig IS 'signature over the encrypted contract by the purse contract key';
-
-
---
--- Name: COLUMN contracts.e_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.contracts.e_contract IS 'AES-GCM encrypted contract terms (contains gzip compressed JSON after decryption)';
-
-
---
--- Name: contracts_contract_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.contracts ALTER COLUMN contract_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.contracts_contract_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: contracts_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.contracts_default (
-    contract_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    pub_ckey bytea NOT NULL,
-    contract_sig bytea NOT NULL,
-    e_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    CONSTRAINT contracts_contract_sig_check CHECK ((length(contract_sig) = 64)),
-    CONSTRAINT contracts_pub_ckey_check CHECK ((length(pub_ckey) = 32)),
-    CONSTRAINT contracts_purse_pub_check CHECK ((length(purse_pub) = 32))
-);
-ALTER TABLE ONLY public.contracts ATTACH PARTITION public.contracts_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: cs_nonce_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.cs_nonce_locks (
-    cs_nonce_lock_serial_id bigint NOT NULL,
-    nonce bytea NOT NULL,
-    op_hash bytea NOT NULL,
-    max_denomination_serial bigint NOT NULL,
-    CONSTRAINT cs_nonce_locks_nonce_check CHECK ((length(nonce) = 32)),
-    CONSTRAINT cs_nonce_locks_op_hash_check CHECK ((length(op_hash) = 64))
-)
-PARTITION BY HASH (nonce);
-
-
---
--- Name: TABLE cs_nonce_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.cs_nonce_locks IS 'ensures a Clause Schnorr client nonce is locked for use with an operation identified by a hash';
-
-
---
--- Name: COLUMN cs_nonce_locks.nonce; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.nonce IS 'actual nonce submitted by the client';
-
-
---
--- Name: COLUMN cs_nonce_locks.op_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.op_hash IS 'hash (RC for refresh, blind coin hash for withdraw) the nonce may be used with';
-
-
---
--- Name: COLUMN cs_nonce_locks.max_denomination_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.cs_nonce_locks.max_denomination_serial IS 'Maximum number of a CS denomination serial the nonce could be used with, for GC';
-
-
---
--- Name: cs_nonce_locks_cs_nonce_lock_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.cs_nonce_locks ALTER COLUMN cs_nonce_lock_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.cs_nonce_locks_cs_nonce_lock_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: cs_nonce_locks_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.cs_nonce_locks_default (
-    cs_nonce_lock_serial_id bigint NOT NULL,
-    nonce bytea NOT NULL,
-    op_hash bytea NOT NULL,
-    max_denomination_serial bigint NOT NULL,
-    CONSTRAINT cs_nonce_locks_nonce_check CHECK ((length(nonce) = 32)),
-    CONSTRAINT cs_nonce_locks_op_hash_check CHECK ((length(op_hash) = 64))
-);
-ALTER TABLE ONLY public.cs_nonce_locks ATTACH PARTITION public.cs_nonce_locks_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: denomination_revocations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.denomination_revocations (
-    denom_revocations_serial_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT denomination_revocations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE denomination_revocations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.denomination_revocations IS 'remembering which denomination keys have been revoked';
-
-
---
--- Name: denomination_revocations_denom_revocations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.denomination_revocations ALTER COLUMN denom_revocations_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.denomination_revocations_denom_revocations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: denominations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.denominations (
-    denominations_serial bigint NOT NULL,
-    denom_pub_hash bytea NOT NULL,
-    denom_type integer DEFAULT 1 NOT NULL,
-    age_mask integer DEFAULT 0 NOT NULL,
-    denom_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    valid_from bigint NOT NULL,
-    expire_withdraw bigint NOT NULL,
-    expire_deposit bigint NOT NULL,
-    expire_legal bigint NOT NULL,
-    coin_val bigint NOT NULL,
-    coin_frac integer NOT NULL,
-    fee_withdraw_val bigint NOT NULL,
-    fee_withdraw_frac integer NOT NULL,
-    fee_deposit_val bigint NOT NULL,
-    fee_deposit_frac integer NOT NULL,
-    fee_refresh_val bigint NOT NULL,
-    fee_refresh_frac integer NOT NULL,
-    fee_refund_val bigint NOT NULL,
-    fee_refund_frac integer NOT NULL,
-    CONSTRAINT denominations_denom_pub_hash_check CHECK ((length(denom_pub_hash) = 64)),
-    CONSTRAINT denominations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE denominations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.denominations IS 'Main denominations table. All the valid denominations the exchange knows about.';
-
-
---
--- Name: COLUMN denominations.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.denominations_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN denominations.denom_type; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.denom_type IS 'determines cipher type for blind signatures used with this denomination; 0 is for RSA';
-
-
---
--- Name: COLUMN denominations.age_mask; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.denominations.age_mask IS 'bitmask with the age restrictions that are being used for this denomination; 0 if denomination does not support the use of age restrictions';
-
-
---
--- Name: denominations_denominations_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.denominations ALTER COLUMN denominations_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.denominations_denominations_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: deposit_confirmations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposit_confirmations (
-    master_pub bytea NOT NULL,
-    serial_id bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    h_extensions bytea NOT NULL,
-    h_wire bytea NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    amount_without_fee_val bigint NOT NULL,
-    amount_without_fee_frac integer NOT NULL,
-    coin_pub bytea NOT NULL,
-    merchant_pub bytea NOT NULL,
-    exchange_sig bytea NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT deposit_confirmations_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposit_confirmations_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT deposit_confirmations_exchange_sig_check CHECK ((length(exchange_sig) = 64)),
-    CONSTRAINT deposit_confirmations_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposit_confirmations_h_contract_terms_check1 CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposit_confirmations_h_wire_check CHECK ((length(h_wire) = 64)),
-    CONSTRAINT deposit_confirmations_master_sig_check CHECK ((length(master_sig) = 64)),
-    CONSTRAINT deposit_confirmations_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-
-
---
--- Name: TABLE deposit_confirmations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposit_confirmations IS 'deposit confirmation sent to us by merchants; we must check that the exchange reported these properly.';
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.deposit_confirmations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.deposit_confirmations_serial_id_seq OWNED BY public.deposit_confirmations.serial_id;
-
-
---
--- Name: deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits (
-    deposit_serial_id bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wallet_timestamp bigint NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    wire_salt bytea NOT NULL,
-    wire_target_h_payto bytea,
-    done boolean DEFAULT false NOT NULL,
-    extension_blocked boolean DEFAULT false NOT NULL,
-    extension_details_serial_id bigint,
-    CONSTRAINT deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT deposits_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposits_merchant_pub_check CHECK ((length(merchant_pub) = 32)),
-    CONSTRAINT deposits_wire_salt_check CHECK ((length(wire_salt) = 16)),
-    CONSTRAINT deposits_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits IS 'Deposits we have received and for which we need to make (aggregate) wire transfers (and manage refunds).';
-
-
---
--- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding in the materialized indices. Should be set based on merchant_pub. 64-bit value because we need an *unsigned* 32-bit value.';
-
-
---
--- Name: COLUMN deposits.known_coin_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.known_coin_id IS 'Used for garbage collection';
-
-
---
--- Name: COLUMN deposits.wire_salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.wire_salt IS 'Salt used when hashing the payto://-URI to get the h_wire';
-
-
---
--- Name: COLUMN deposits.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.wire_target_h_payto IS 'Identifies the target bank account and KYC status';
-
-
---
--- Name: COLUMN deposits.done; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE once we have included this deposit in some aggregate wire transfer to the merchant';
-
-
---
--- Name: COLUMN deposits.extension_blocked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.extension_blocked IS 'True if the aggregation of the deposit is currently blocked by some extension mechanism. Used to filter out deposits that must not be processed by the canonical deposit logic.';
-
-
---
--- Name: COLUMN deposits.extension_details_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.deposits.extension_details_serial_id IS 'References extensions table, NULL if extensions are not used';
-
-
---
--- Name: deposits_by_ready; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_by_ready (
-    wire_deadline bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_by_ready_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY RANGE (wire_deadline);
-
-
---
--- Name: TABLE deposits_by_ready; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits_by_ready IS 'Enables fast lookups for deposits_get_ready, auto-populated via TRIGGER below';
-
-
---
--- Name: deposits_by_ready_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_by_ready_default (
-    wire_deadline bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_by_ready_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.deposits_by_ready ATTACH PARTITION public.deposits_by_ready_default DEFAULT;
-
-
---
--- Name: deposits_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_default (
-    deposit_serial_id bigint NOT NULL,
-    shard bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wallet_timestamp bigint NOT NULL,
-    exchange_timestamp bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    wire_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    wire_salt bytea NOT NULL,
-    wire_target_h_payto bytea,
-    done boolean DEFAULT false NOT NULL,
-    extension_blocked boolean DEFAULT false NOT NULL,
-    extension_details_serial_id bigint,
-    CONSTRAINT deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT deposits_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT deposits_merchant_pub_check CHECK ((length(merchant_pub) = 32)),
-    CONSTRAINT deposits_wire_salt_check CHECK ((length(wire_salt) = 16)),
-    CONSTRAINT deposits_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-);
-ALTER TABLE ONLY public.deposits ATTACH PARTITION public.deposits_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: deposits_deposit_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.deposits ALTER COLUMN deposit_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.deposits_deposit_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: deposits_for_matching; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_for_matching (
-    refund_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_for_matching_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_for_matching_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-)
-PARTITION BY RANGE (refund_deadline);
-
-
---
--- Name: TABLE deposits_for_matching; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.deposits_for_matching IS 'Enables fast lookups for deposits_iterate_matching, auto-populated via TRIGGER below';
-
-
---
--- Name: deposits_for_matching_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.deposits_for_matching_default (
-    refund_deadline bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint,
-    CONSTRAINT deposits_for_matching_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT deposits_for_matching_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-ALTER TABLE ONLY public.deposits_for_matching ATTACH PARTITION public.deposits_for_matching_default DEFAULT;
-
-
---
--- Name: django_content_type; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_content_type (
-    id integer NOT NULL,
-    app_label character varying(100) NOT NULL,
-    model character varying(100) NOT NULL
-);
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.django_content_type_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.django_content_type_id_seq OWNED BY public.django_content_type.id;
-
-
---
--- Name: django_migrations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_migrations (
-    id bigint NOT NULL,
-    app character varying(255) NOT NULL,
-    name character varying(255) NOT NULL,
-    applied timestamp with time zone NOT NULL
-);
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.django_migrations_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.django_migrations_id_seq OWNED BY public.django_migrations.id;
-
-
---
--- Name: django_session; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.django_session (
-    session_key character varying(40) NOT NULL,
-    session_data text NOT NULL,
-    expire_date timestamp with time zone NOT NULL
-);
-
-
---
--- Name: exchange_sign_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.exchange_sign_keys (
-    esk_serial bigint NOT NULL,
-    exchange_pub bytea NOT NULL,
-    master_sig bytea NOT NULL,
-    valid_from bigint NOT NULL,
-    expire_sign bigint NOT NULL,
-    expire_legal bigint NOT NULL,
-    CONSTRAINT exchange_sign_keys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT exchange_sign_keys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE exchange_sign_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.exchange_sign_keys IS 'Table with master public key signatures on exchange online signing keys.';
-
-
---
--- Name: COLUMN exchange_sign_keys.exchange_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.exchange_pub IS 'Public online signing key of the exchange.';
-
-
---
--- Name: COLUMN exchange_sign_keys.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.master_sig IS 'Signature affirming the validity of the signing key of purpose TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.';
-
-
---
--- Name: COLUMN exchange_sign_keys.valid_from; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.valid_from IS 'Time when this online signing key will first be used to sign messages.';
-
-
---
--- Name: COLUMN exchange_sign_keys.expire_sign; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.expire_sign IS 'Time when this online signing key will no longer be used to sign.';
-
-
---
--- Name: COLUMN exchange_sign_keys.expire_legal; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.exchange_sign_keys.expire_legal IS 'Time when this online signing key legally expires.';
-
-
---
--- Name: exchange_sign_keys_esk_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.exchange_sign_keys ALTER COLUMN esk_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.exchange_sign_keys_esk_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: extension_details; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extension_details (
-    extension_details_serial_id bigint NOT NULL,
-    extension_options character varying
-)
-PARTITION BY HASH (extension_details_serial_id);
-
-
---
--- Name: TABLE extension_details; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.extension_details IS 'Extensions that were provided with deposits (not yet used).';
-
-
---
--- Name: COLUMN extension_details.extension_options; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extension_details.extension_options IS 'JSON object with options set that the exchange needs to consider when executing a deposit. Supported details depend on the extensions supported by the exchange.';
-
-
---
--- Name: extension_details_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extension_details_default (
-    extension_details_serial_id bigint NOT NULL,
-    extension_options character varying
-);
-ALTER TABLE ONLY public.extension_details ATTACH PARTITION public.extension_details_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: extension_details_extension_details_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.extension_details ALTER COLUMN extension_details_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.extension_details_extension_details_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: extensions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.extensions (
-    extension_id bigint NOT NULL,
-    name character varying NOT NULL,
-    config bytea
-);
-
-
---
--- Name: TABLE extensions; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.extensions IS 'Configurations of the activated extensions';
-
-
---
--- Name: COLUMN extensions.name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extensions.name IS 'Name of the extension';
-
-
---
--- Name: COLUMN extensions.config; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.extensions.config IS 'Configuration of the extension as JSON-blob, maybe NULL';
-
-
---
--- Name: extensions_extension_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.extensions ALTER COLUMN extension_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.extensions_extension_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: global_fee; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.global_fee (
-    global_fee_serial bigint NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    kyc_fee_val bigint NOT NULL,
-    kyc_fee_frac integer NOT NULL,
-    account_fee_val bigint NOT NULL,
-    account_fee_frac integer NOT NULL,
-    purse_fee_val bigint NOT NULL,
-    purse_fee_frac integer NOT NULL,
-    purse_timeout bigint NOT NULL,
-    kyc_timeout bigint NOT NULL,
-    history_expiration bigint NOT NULL,
-    purse_account_limit integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT global_fee_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE global_fee; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.global_fee IS 'list of the global fees of this exchange, by date';
-
-
---
--- Name: COLUMN global_fee.global_fee_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.global_fee.global_fee_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: global_fee_global_fee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.global_fee ALTER COLUMN global_fee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.global_fee_global_fee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: history_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.history_requests (
-    reserve_pub bytea NOT NULL,
-    request_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    CONSTRAINT history_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT history_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE history_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.history_requests IS 'Paid history requests issued by a client against a reserve';
-
-
---
--- Name: COLUMN history_requests.request_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.request_timestamp IS 'When was the history request made';
-
-
---
--- Name: COLUMN history_requests.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.reserve_sig IS 'Signature approving payment for the history request';
-
-
---
--- Name: COLUMN history_requests.history_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.history_requests.history_fee_val IS 'History fee approved by the signature';
-
-
---
--- Name: history_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.history_requests_default (
-    reserve_pub bytea NOT NULL,
-    request_timestamp bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    history_fee_val bigint NOT NULL,
-    history_fee_frac integer NOT NULL,
-    CONSTRAINT history_requests_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT history_requests_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.history_requests ATTACH PARTITION public.history_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: known_coins; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.known_coins (
-    known_coin_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    age_commitment_hash bytea,
-    denom_sig bytea NOT NULL,
-    remaining_val bigint NOT NULL,
-    remaining_frac integer NOT NULL,
-    CONSTRAINT known_coins_age_commitment_hash_check CHECK ((length(age_commitment_hash) = 32)),
-    CONSTRAINT known_coins_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE known_coins; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.known_coins IS 'information about coins and their signatures, so we do not have to store the signatures more than once if a coin is involved in multiple operations';
-
-
---
--- Name: COLUMN known_coins.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.denominations_serial IS 'Denomination of the coin, determines the value of the original coin and applicable fees for coin-specific operations.';
-
-
---
--- Name: COLUMN known_coins.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.coin_pub IS 'EdDSA public key of the coin';
-
-
---
--- Name: COLUMN known_coins.age_commitment_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.age_commitment_hash IS 'Optional hash of the age commitment for age restrictions as per DD 24 (active if denom_type has the respective bit set)';
-
-
---
--- Name: COLUMN known_coins.denom_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.denom_sig IS 'This is the signature of the exchange that affirms that the coin is a valid coin. The specific signature type depends on denom_type of the denomination.';
-
-
---
--- Name: COLUMN known_coins.remaining_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.known_coins.remaining_val IS 'Value of the coin that remains to be spent';
-
-
---
--- Name: known_coins_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.known_coins_default (
-    known_coin_id bigint NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    age_commitment_hash bytea,
-    denom_sig bytea NOT NULL,
-    remaining_val bigint NOT NULL,
-    remaining_frac integer NOT NULL,
-    CONSTRAINT known_coins_age_commitment_hash_check CHECK ((length(age_commitment_hash) = 32)),
-    CONSTRAINT known_coins_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.known_coins ATTACH PARTITION public.known_coins_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: known_coins_known_coin_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.known_coins ALTER COLUMN known_coin_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.known_coins_known_coin_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_accounts (
-    account_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    h_wire bytea NOT NULL,
-    salt bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    active boolean NOT NULL,
-    CONSTRAINT merchant_accounts_h_wire_check CHECK ((length(h_wire) = 64)),
-    CONSTRAINT merchant_accounts_salt_check CHECK ((length(salt) = 16))
-);
-
-
---
--- Name: TABLE merchant_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_accounts IS 'bank accounts of the instances';
-
-
---
--- Name: COLUMN merchant_accounts.h_wire; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.h_wire IS 'salted hash of payto_uri';
-
-
---
--- Name: COLUMN merchant_accounts.salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.salt IS 'salt used when hashing payto_uri into h_wire';
-
-
---
--- Name: COLUMN merchant_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.payto_uri IS 'payto URI of a merchant bank account';
-
-
---
--- Name: COLUMN merchant_accounts.active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_accounts.active IS 'true if we actively use this bank account, false if it is just kept around for older contracts to refer to';
-
-
---
--- Name: merchant_accounts_account_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_accounts ALTER COLUMN account_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_accounts_account_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_contract_terms; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_contract_terms (
-    order_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    order_id character varying NOT NULL,
-    contract_terms bytea NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    creation_time bigint NOT NULL,
-    pay_deadline bigint NOT NULL,
-    refund_deadline bigint NOT NULL,
-    paid boolean DEFAULT false NOT NULL,
-    wired boolean DEFAULT false NOT NULL,
-    fulfillment_url character varying,
-    session_id character varying DEFAULT ''::character varying NOT NULL,
-    claim_token bytea NOT NULL,
-    CONSTRAINT merchant_contract_terms_claim_token_check CHECK ((length(claim_token) = 16)),
-    CONSTRAINT merchant_contract_terms_h_contract_terms_check CHECK ((length(h_contract_terms) = 64))
-);
-
-
---
--- Name: TABLE merchant_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_contract_terms IS 'Contracts are orders that have been claimed by a wallet';
-
-
---
--- Name: COLUMN merchant_contract_terms.merchant_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.merchant_serial IS 'Identifies the instance offering the contract';
-
-
---
--- Name: COLUMN merchant_contract_terms.order_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.order_id IS 'Not a foreign key into merchant_orders because paid contracts persist after expiration';
-
-
---
--- Name: COLUMN merchant_contract_terms.contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.contract_terms IS 'These contract terms include the wallet nonce';
-
-
---
--- Name: COLUMN merchant_contract_terms.h_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.h_contract_terms IS 'Hash over contract_terms';
-
-
---
--- Name: COLUMN merchant_contract_terms.pay_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.pay_deadline IS 'How long is the offer valid. After this time, the order can be garbage collected';
-
-
---
--- Name: COLUMN merchant_contract_terms.refund_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.refund_deadline IS 'By what times do refunds have to be approved (useful to reject refund requests)';
-
-
---
--- Name: COLUMN merchant_contract_terms.paid; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.paid IS 'true implies the customer paid for this contract; order should be DELETEd from merchant_orders once paid is set to release merchant_order_locks; paid remains true even if the payment was later refunded';
-
-
---
--- Name: COLUMN merchant_contract_terms.wired; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.wired IS 'true implies the exchange wired us the full amount for all non-refunded payments under this contract';
-
-
---
--- Name: COLUMN merchant_contract_terms.fulfillment_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.fulfillment_url IS 'also included in contract_terms, but we need it here to SELECT on it during repurchase detection; can be NULL if the contract has no fulfillment URL';
-
-
---
--- Name: COLUMN merchant_contract_terms.session_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.session_id IS 'last session_id from we confirmed the paying client to use, empty string for none';
-
-
---
--- Name: COLUMN merchant_contract_terms.claim_token; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_contract_terms.claim_token IS 'Token optionally used to access the status of the order. All zeros (not NULL) if not used';
-
-
---
--- Name: merchant_deposit_to_transfer; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_deposit_to_transfer (
-    deposit_serial bigint NOT NULL,
-    coin_contribution_value_val bigint NOT NULL,
-    coin_contribution_value_frac integer NOT NULL,
-    credit_serial bigint NOT NULL,
-    execution_time bigint NOT NULL,
-    signkey_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    CONSTRAINT merchant_deposit_to_transfer_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_deposit_to_transfer; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_deposit_to_transfer IS 'Mapping of deposits to (possibly unconfirmed) wire transfers; NOTE: not used yet';
-
-
---
--- Name: COLUMN merchant_deposit_to_transfer.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposit_to_transfer.execution_time IS 'Execution time as claimed by the exchange, roughly matches time seen by merchant';
-
-
---
--- Name: merchant_deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_deposits (
-    deposit_serial bigint NOT NULL,
-    order_serial bigint,
-    deposit_timestamp bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    deposit_fee_val bigint NOT NULL,
-    deposit_fee_frac integer NOT NULL,
-    refund_fee_val bigint NOT NULL,
-    refund_fee_frac integer NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    signkey_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    account_serial bigint NOT NULL,
-    CONSTRAINT merchant_deposits_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT merchant_deposits_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_deposits IS 'Refunds approved by the merchant (backoffice) logic, excludes abort refunds';
-
-
---
--- Name: COLUMN merchant_deposits.deposit_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.deposit_timestamp IS 'Time when the exchange generated the deposit confirmation';
-
-
---
--- Name: COLUMN merchant_deposits.wire_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.wire_fee_val IS 'We MAY want to see if we should try to get this via merchant_exchange_wire_fees (not sure, may be too complicated with the date range, etc.)';
-
-
---
--- Name: COLUMN merchant_deposits.signkey_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.signkey_serial IS 'Online signing key of the exchange on the deposit confirmation';
-
-
---
--- Name: COLUMN merchant_deposits.exchange_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_deposits.exchange_sig IS 'Signature of the exchange over the deposit confirmation';
-
-
---
--- Name: merchant_deposits_deposit_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_deposits ALTER COLUMN deposit_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_deposits_deposit_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_exchange_signing_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_exchange_signing_keys (
-    signkey_serial bigint NOT NULL,
-    master_pub bytea NOT NULL,
-    exchange_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    expire_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT merchant_exchange_signing_keys_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT merchant_exchange_signing_keys_master_pub_check CHECK ((length(master_pub) = 32)),
-    CONSTRAINT merchant_exchange_signing_keys_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_exchange_signing_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_exchange_signing_keys IS 'Here we store proofs of the exchange online signing keys being signed by the exchange master key';
-
-
---
--- Name: COLUMN merchant_exchange_signing_keys.master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_exchange_signing_keys.master_pub IS 'Master public key of the exchange with these online signing keys';
-
-
---
--- Name: merchant_exchange_signing_keys_signkey_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_exchange_signing_keys ALTER COLUMN signkey_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_exchange_signing_keys_signkey_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_exchange_wire_fees; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_exchange_wire_fees (
-    wirefee_serial bigint NOT NULL,
-    master_pub bytea NOT NULL,
-    h_wire_method bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT merchant_exchange_wire_fees_h_wire_method_check CHECK ((length(h_wire_method) = 64)),
-    CONSTRAINT merchant_exchange_wire_fees_master_pub_check CHECK ((length(master_pub) = 32)),
-    CONSTRAINT merchant_exchange_wire_fees_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_exchange_wire_fees; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_exchange_wire_fees IS 'Here we store proofs of the wire fee structure of the various exchanges';
-
-
---
--- Name: COLUMN merchant_exchange_wire_fees.master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_exchange_wire_fees.master_pub IS 'Master public key of the exchange with these wire fees';
-
-
---
--- Name: merchant_exchange_wire_fees_wirefee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_exchange_wire_fees ALTER COLUMN wirefee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_exchange_wire_fees_wirefee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_instances; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_instances (
-    merchant_serial bigint NOT NULL,
-    merchant_pub bytea NOT NULL,
-    auth_hash bytea,
-    auth_salt bytea,
-    merchant_id character varying NOT NULL,
-    merchant_name character varying NOT NULL,
-    address bytea NOT NULL,
-    jurisdiction bytea NOT NULL,
-    default_max_deposit_fee_val bigint NOT NULL,
-    default_max_deposit_fee_frac integer NOT NULL,
-    default_max_wire_fee_val bigint NOT NULL,
-    default_max_wire_fee_frac integer NOT NULL,
-    default_wire_fee_amortization integer NOT NULL,
-    default_wire_transfer_delay bigint NOT NULL,
-    default_pay_delay bigint NOT NULL,
-    CONSTRAINT merchant_instances_auth_hash_check CHECK ((length(auth_hash) = 64)),
-    CONSTRAINT merchant_instances_auth_salt_check CHECK ((length(auth_salt) = 32)),
-    CONSTRAINT merchant_instances_merchant_pub_check CHECK ((length(merchant_pub) = 32))
-);
-
-
---
--- Name: TABLE merchant_instances; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_instances IS 'all the instances supported by this backend';
-
-
---
--- Name: COLUMN merchant_instances.auth_hash; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.auth_hash IS 'hash used for merchant back office Authorization, NULL for no check';
-
-
---
--- Name: COLUMN merchant_instances.auth_salt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.auth_salt IS 'salt to use when hashing Authorization header before comparing with auth_hash';
-
-
---
--- Name: COLUMN merchant_instances.merchant_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.merchant_id IS 'identifier of the merchant as used in the base URL (required)';
-
-
---
--- Name: COLUMN merchant_instances.merchant_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.merchant_name IS 'legal name of the merchant as a simple string (required)';
-
-
---
--- Name: COLUMN merchant_instances.address; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.address IS 'physical address of the merchant as a Location in JSON format (required)';
-
-
---
--- Name: COLUMN merchant_instances.jurisdiction; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_instances.jurisdiction IS 'jurisdiction of the merchant as a Location in JSON format (required)';
-
-
---
--- Name: merchant_instances_merchant_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_instances ALTER COLUMN merchant_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_instances_merchant_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_inventory; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_inventory (
-    product_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    product_id character varying NOT NULL,
-    description character varying NOT NULL,
-    description_i18n bytea NOT NULL,
-    unit character varying NOT NULL,
-    image bytea NOT NULL,
-    taxes bytea NOT NULL,
-    price_val bigint NOT NULL,
-    price_frac integer NOT NULL,
-    total_stock bigint NOT NULL,
-    total_sold bigint DEFAULT 0 NOT NULL,
-    total_lost bigint DEFAULT 0 NOT NULL,
-    address bytea NOT NULL,
-    next_restock bigint NOT NULL,
-    minimum_age integer DEFAULT 0 NOT NULL
-);
-
-
---
--- Name: TABLE merchant_inventory; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_inventory IS 'products offered by the merchant (may be incomplete, frontend can override)';
-
-
---
--- Name: COLUMN merchant_inventory.description; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.description IS 'Human-readable product description';
-
-
---
--- Name: COLUMN merchant_inventory.description_i18n; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.description_i18n IS 'JSON map from IETF BCP 47 language tags to localized descriptions';
-
-
---
--- Name: COLUMN merchant_inventory.unit; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.unit IS 'Unit of sale for the product (liters, kilograms, packages)';
-
-
---
--- Name: COLUMN merchant_inventory.image; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.image IS 'NOT NULL, but can be 0 bytes; must contain an ImageDataUrl';
-
-
---
--- Name: COLUMN merchant_inventory.taxes; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.taxes IS 'JSON array containing taxes the merchant pays, must be JSON, but can be just "[]"';
-
-
---
--- Name: COLUMN merchant_inventory.price_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.price_val IS 'Current price of one unit of the product';
-
-
---
--- Name: COLUMN merchant_inventory.total_stock; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_stock IS 'A value of -1 is used for unlimited (electronic good), may never be lowered';
-
-
---
--- Name: COLUMN merchant_inventory.total_sold; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_sold IS 'Number of products sold, must be below total_stock, non-negative, may never be lowered';
-
-
---
--- Name: COLUMN merchant_inventory.total_lost; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.total_lost IS 'Number of products that used to be in stock but were lost (spoiled, damaged), may never be lowered; total_stock >= total_sold + total_lost must always hold';
-
-
---
--- Name: COLUMN merchant_inventory.address; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.address IS 'JSON formatted Location of where the product is stocked';
-
-
---
--- Name: COLUMN merchant_inventory.next_restock; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.next_restock IS 'GNUnet absolute time indicating when the next restock is expected. 0 for unknown.';
-
-
---
--- Name: COLUMN merchant_inventory.minimum_age; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory.minimum_age IS 'Minimum age of the customer in years, to be used if an exchange supports the age restriction extension.';
-
-
---
--- Name: merchant_inventory_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_inventory_locks (
-    product_serial bigint NOT NULL,
-    lock_uuid bytea NOT NULL,
-    total_locked bigint NOT NULL,
-    expiration bigint NOT NULL,
-    CONSTRAINT merchant_inventory_locks_lock_uuid_check CHECK ((length(lock_uuid) = 16))
-);
-
-
---
--- Name: TABLE merchant_inventory_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_inventory_locks IS 'locks on inventory helt by shopping carts; note that locks MAY not be honored if merchants increase total_lost for inventory';
-
-
---
--- Name: COLUMN merchant_inventory_locks.total_locked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory_locks.total_locked IS 'how many units of the product does this lock reserve';
-
-
---
--- Name: COLUMN merchant_inventory_locks.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_inventory_locks.expiration IS 'when does this lock automatically expire (if no order is created)';
-
-
---
--- Name: merchant_inventory_product_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_inventory ALTER COLUMN product_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_inventory_product_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_keys (
-    merchant_priv bytea NOT NULL,
-    merchant_serial bigint NOT NULL,
-    CONSTRAINT merchant_keys_merchant_priv_check CHECK ((length(merchant_priv) = 32))
-);
-
-
---
--- Name: TABLE merchant_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_keys IS 'private keys of instances that have not been deleted';
-
-
---
--- Name: merchant_kyc; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_kyc (
-    kyc_serial_id bigint NOT NULL,
-    kyc_timestamp bigint NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    exchange_sig bytea,
-    exchange_pub bytea,
-    exchange_kyc_serial bigint DEFAULT 0 NOT NULL,
-    account_serial bigint NOT NULL,
-    exchange_url character varying NOT NULL,
-    CONSTRAINT merchant_kyc_exchange_pub_check CHECK ((length(exchange_pub) = 32)),
-    CONSTRAINT merchant_kyc_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_kyc; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_kyc IS 'Status of the KYC process of a merchant account at an exchange';
-
-
---
--- Name: COLUMN merchant_kyc.kyc_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.kyc_timestamp IS 'Last time we checked our KYC status at the exchange. Useful to re-check if the status is very stale. Also the timestamp used for the exchange signature (if present).';
-
-
---
--- Name: COLUMN merchant_kyc.kyc_ok; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.kyc_ok IS 'true if the KYC check was passed successfully';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_sig IS 'signature of the exchange affirming the KYC passed (or NULL if exchange does not require KYC or not kyc_ok)';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_pub IS 'public key used with exchange_sig (or NULL if exchange_sig is NULL)';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_kyc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_kyc_serial IS 'Number to use in the KYC-endpoints of the exchange to check the KYC status or begin the KYC process. 0 if we do not know it yet.';
-
-
---
--- Name: COLUMN merchant_kyc.account_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.account_serial IS 'Which bank account of the merchant is the KYC status for';
-
-
---
--- Name: COLUMN merchant_kyc.exchange_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_kyc.exchange_url IS 'Which exchange base URL is this KYC status valid for';
-
-
---
--- Name: merchant_kyc_kyc_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_kyc ALTER COLUMN kyc_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_kyc_kyc_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_order_locks; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_order_locks (
-    product_serial bigint NOT NULL,
-    total_locked bigint NOT NULL,
-    order_serial bigint NOT NULL
-);
-
-
---
--- Name: TABLE merchant_order_locks; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_order_locks IS 'locks on orders awaiting claim and payment; note that locks MAY not be honored if merchants increase total_lost for inventory';
-
-
---
--- Name: COLUMN merchant_order_locks.total_locked; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_order_locks.total_locked IS 'how many units of the product does this lock reserve';
-
-
---
--- Name: merchant_orders; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_orders (
-    order_serial bigint NOT NULL,
-    merchant_serial bigint NOT NULL,
-    order_id character varying NOT NULL,
-    claim_token bytea NOT NULL,
-    h_post_data bytea NOT NULL,
-    pay_deadline bigint NOT NULL,
-    creation_time bigint NOT NULL,
-    contract_terms bytea NOT NULL,
-    CONSTRAINT merchant_orders_claim_token_check CHECK ((length(claim_token) = 16)),
-    CONSTRAINT merchant_orders_h_post_data_check CHECK ((length(h_post_data) = 64))
-);
-
-
---
--- Name: TABLE merchant_orders; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_orders IS 'Orders we offered to a customer, but that have not yet been claimed';
-
-
---
--- Name: COLUMN merchant_orders.merchant_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.merchant_serial IS 'Identifies the instance offering the contract';
-
-
---
--- Name: COLUMN merchant_orders.claim_token; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.claim_token IS 'Token optionally used to authorize the wallet to claim the order. All zeros (not NULL) if not used';
-
-
---
--- Name: COLUMN merchant_orders.h_post_data; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.h_post_data IS 'Hash of the POST request that created this order, for idempotency checks';
-
-
---
--- Name: COLUMN merchant_orders.pay_deadline; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.pay_deadline IS 'How long is the offer valid. After this time, the order can be garbage collected';
-
-
---
--- Name: COLUMN merchant_orders.contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_orders.contract_terms IS 'Claiming changes the contract_terms, hence we have no hash of the terms in this table';
-
-
---
--- Name: merchant_orders_order_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_orders ALTER COLUMN order_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_orders_order_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_refund_proofs; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_refund_proofs (
-    refund_serial bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    signkey_serial bigint NOT NULL,
-    CONSTRAINT merchant_refund_proofs_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_refund_proofs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_refund_proofs IS 'Refunds confirmed by the exchange (not all approved refunds are grabbed by the wallet)';
-
-
---
--- Name: merchant_refunds; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_refunds (
-    refund_serial bigint NOT NULL,
-    order_serial bigint NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    refund_timestamp bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    reason character varying NOT NULL,
-    refund_amount_val bigint NOT NULL,
-    refund_amount_frac integer NOT NULL
-);
-
-
---
--- Name: COLUMN merchant_refunds.rtransaction_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_refunds.rtransaction_id IS 'Needed for uniqueness in case a refund is increased for the same order';
-
-
---
--- Name: COLUMN merchant_refunds.refund_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_refunds.refund_timestamp IS 'Needed for grouping of refunds in the wallet UI; has no semantics in the protocol (only for UX), but should be from the time when the merchant internally approved the refund';
-
-
---
--- Name: merchant_refunds_refund_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_refunds ALTER COLUMN refund_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_refunds_refund_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tip_pickup_signatures; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_pickup_signatures (
-    pickup_serial bigint NOT NULL,
-    coin_offset integer NOT NULL,
-    blind_sig bytea NOT NULL
-);
-
-
---
--- Name: TABLE merchant_tip_pickup_signatures; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_pickup_signatures IS 'blind signatures we got from the exchange during the tip pickup';
-
-
---
--- Name: merchant_tip_pickups; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_pickups (
-    pickup_serial bigint NOT NULL,
-    tip_serial bigint NOT NULL,
-    pickup_id bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT merchant_tip_pickups_pickup_id_check CHECK ((length(pickup_id) = 64))
-);
-
-
---
--- Name: TABLE merchant_tip_pickups; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_pickups IS 'tips that have been picked up';
-
-
---
--- Name: merchant_tip_pickups_pickup_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tip_pickups ALTER COLUMN pickup_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tip_pickups_pickup_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tip_reserve_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_reserve_keys (
-    reserve_serial bigint NOT NULL,
-    reserve_priv bytea NOT NULL,
-    exchange_url character varying NOT NULL,
-    payto_uri character varying,
-    CONSTRAINT merchant_tip_reserve_keys_reserve_priv_check CHECK ((length(reserve_priv) = 32))
-);
-
-
---
--- Name: COLUMN merchant_tip_reserve_keys.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserve_keys.payto_uri IS 'payto:// URI used to fund the reserve, may be NULL once reserve is funded';
-
-
---
--- Name: merchant_tip_reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tip_reserves (
-    reserve_serial bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    merchant_serial bigint NOT NULL,
-    creation_time bigint NOT NULL,
-    expiration bigint NOT NULL,
-    merchant_initial_balance_val bigint NOT NULL,
-    merchant_initial_balance_frac integer NOT NULL,
-    exchange_initial_balance_val bigint DEFAULT 0 NOT NULL,
-    exchange_initial_balance_frac integer DEFAULT 0 NOT NULL,
-    tips_committed_val bigint DEFAULT 0 NOT NULL,
-    tips_committed_frac integer DEFAULT 0 NOT NULL,
-    tips_picked_up_val bigint DEFAULT 0 NOT NULL,
-    tips_picked_up_frac integer DEFAULT 0 NOT NULL,
-    CONSTRAINT merchant_tip_reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-
-
---
--- Name: TABLE merchant_tip_reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tip_reserves IS 'private keys of reserves that have not been deleted';
-
-
---
--- Name: COLUMN merchant_tip_reserves.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.expiration IS 'FIXME: EXCHANGE API needs to tell us when reserves close if we are to compute this';
-
-
---
--- Name: COLUMN merchant_tip_reserves.merchant_initial_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.merchant_initial_balance_val IS 'Set to the initial balance the merchant told us when creating the reserve';
-
-
---
--- Name: COLUMN merchant_tip_reserves.exchange_initial_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.exchange_initial_balance_val IS 'Set to the initial balance the exchange told us when we queried the reserve status';
-
-
---
--- Name: COLUMN merchant_tip_reserves.tips_committed_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.tips_committed_val IS 'Amount of outstanding approved tips that have not been picked up';
-
-
---
--- Name: COLUMN merchant_tip_reserves.tips_picked_up_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tip_reserves.tips_picked_up_val IS 'Total amount tips that have been picked up from this reserve';
-
-
---
--- Name: merchant_tip_reserves_reserve_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tip_reserves ALTER COLUMN reserve_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tip_reserves_reserve_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_tips; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_tips (
-    tip_serial bigint NOT NULL,
-    reserve_serial bigint NOT NULL,
-    tip_id bytea NOT NULL,
-    justification character varying NOT NULL,
-    next_url character varying NOT NULL,
-    expiration bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    picked_up_val bigint DEFAULT 0 NOT NULL,
-    picked_up_frac integer DEFAULT 0 NOT NULL,
-    was_picked_up boolean DEFAULT false NOT NULL,
-    CONSTRAINT merchant_tips_tip_id_check CHECK ((length(tip_id) = 64))
-);
-
-
---
--- Name: TABLE merchant_tips; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_tips IS 'tips that have been authorized';
-
-
---
--- Name: COLUMN merchant_tips.reserve_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.reserve_serial IS 'Reserve from which this tip is funded';
-
-
---
--- Name: COLUMN merchant_tips.expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.expiration IS 'by when does the client have to pick up the tip';
-
-
---
--- Name: COLUMN merchant_tips.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.amount_val IS 'total transaction cost for all coins including withdraw fees';
-
-
---
--- Name: COLUMN merchant_tips.picked_up_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_tips.picked_up_val IS 'Tip amount left to be picked up';
-
-
---
--- Name: merchant_tips_tip_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_tips ALTER COLUMN tip_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_tips_tip_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: merchant_transfer_signatures; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfer_signatures (
-    credit_serial bigint NOT NULL,
-    signkey_serial bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    credit_amount_val bigint NOT NULL,
-    credit_amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    exchange_sig bytea NOT NULL,
-    CONSTRAINT merchant_transfer_signatures_exchange_sig_check CHECK ((length(exchange_sig) = 64))
-);
-
-
---
--- Name: TABLE merchant_transfer_signatures; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfer_signatures IS 'table represents the main information returned from the /transfer request to the exchange.';
-
-
---
--- Name: COLUMN merchant_transfer_signatures.credit_amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_signatures.credit_amount_val IS 'actual value of the (aggregated) wire transfer, excluding the wire fee, according to the exchange';
-
-
---
--- Name: COLUMN merchant_transfer_signatures.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_signatures.execution_time IS 'Execution time as claimed by the exchange, roughly matches time seen by merchant';
-
-
---
--- Name: merchant_transfer_to_coin; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfer_to_coin (
-    deposit_serial bigint NOT NULL,
-    credit_serial bigint NOT NULL,
-    offset_in_exchange_list bigint NOT NULL,
-    exchange_deposit_value_val bigint NOT NULL,
-    exchange_deposit_value_frac integer NOT NULL,
-    exchange_deposit_fee_val bigint NOT NULL,
-    exchange_deposit_fee_frac integer NOT NULL
-);
-
-
---
--- Name: TABLE merchant_transfer_to_coin; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfer_to_coin IS 'Mapping of (credit) transfers to (deposited) coins';
-
-
---
--- Name: COLUMN merchant_transfer_to_coin.exchange_deposit_value_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_to_coin.exchange_deposit_value_val IS 'Deposit value as claimed by the exchange, should match our values in merchant_deposits minus refunds';
-
-
---
--- Name: COLUMN merchant_transfer_to_coin.exchange_deposit_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfer_to_coin.exchange_deposit_fee_val IS 'Deposit value as claimed by the exchange, should match our values in merchant_deposits';
-
-
---
--- Name: merchant_transfers; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.merchant_transfers (
-    credit_serial bigint NOT NULL,
-    exchange_url character varying NOT NULL,
-    wtid bytea,
-    credit_amount_val bigint NOT NULL,
-    credit_amount_frac integer NOT NULL,
-    account_serial bigint NOT NULL,
-    verified boolean DEFAULT false NOT NULL,
-    confirmed boolean DEFAULT false NOT NULL,
-    CONSTRAINT merchant_transfers_wtid_check CHECK ((length(wtid) = 32))
-);
-
-
---
--- Name: TABLE merchant_transfers; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.merchant_transfers IS 'table represents the information provided by the (trusted) merchant about incoming wire transfers';
-
-
---
--- Name: COLUMN merchant_transfers.credit_amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.credit_amount_val IS 'actual value of the (aggregated) wire transfer, excluding the wire fee, according to the merchant';
-
-
---
--- Name: COLUMN merchant_transfers.verified; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.verified IS 'true once we got an acceptable response from the exchange for this transfer';
-
-
---
--- Name: COLUMN merchant_transfers.confirmed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.merchant_transfers.confirmed IS 'true once the merchant confirmed that this transfer was received';
-
-
---
--- Name: merchant_transfers_credit_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.merchant_transfers ALTER COLUMN credit_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.merchant_transfers_credit_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: partner_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.partner_accounts (
-    payto_uri character varying NOT NULL,
-    partner_serial_id bigint,
-    partner_master_sig bytea,
-    last_seen bigint NOT NULL,
-    CONSTRAINT partner_accounts_partner_master_sig_check CHECK ((length(partner_master_sig) = 64))
-);
-
-
---
--- Name: TABLE partner_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.partner_accounts IS 'Table with bank accounts of the partner exchange. Entries never expire as we need to remember the signature for the auditor.';
-
-
---
--- Name: COLUMN partner_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.payto_uri IS 'payto URI (RFC 8905) with the bank account of the partner exchange.';
-
-
---
--- Name: COLUMN partner_accounts.partner_master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.partner_master_sig IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS by the partner master public key';
-
-
---
--- Name: COLUMN partner_accounts.last_seen; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partner_accounts.last_seen IS 'Last time we saw this account as being active at the partner exchange. Used to select the most recent entry, and to detect when we should check again.';
-
-
---
--- Name: partners; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.partners (
-    partner_serial_id bigint NOT NULL,
-    partner_master_pub bytea NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wad_frequency bigint NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    partner_base_url text NOT NULL,
-    CONSTRAINT partners_master_sig_check CHECK ((length(master_sig) = 64)),
-    CONSTRAINT partners_partner_master_pub_check CHECK ((length(partner_master_pub) = 32))
-);
-
-
---
--- Name: TABLE partners; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.partners IS 'exchanges we do wad transfers to';
-
-
---
--- Name: COLUMN partners.partner_master_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.partner_master_pub IS 'offline master public key of the partner';
-
-
---
--- Name: COLUMN partners.start_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.start_date IS 'starting date of the partnership';
-
-
---
--- Name: COLUMN partners.end_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.end_date IS 'end date of the partnership';
-
-
---
--- Name: COLUMN partners.wad_frequency; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.wad_frequency IS 'how often do we promise to do wad transfers';
-
-
---
--- Name: COLUMN partners.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.wad_fee_val IS 'how high is the fee for a wallet to be added to a wad to this partner';
-
-
---
--- Name: COLUMN partners.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.master_sig IS 'signature of our master public key affirming the partnership, of purpose TALER_SIGNATURE_MASTER_PARTNER_DETAILS';
-
-
---
--- Name: COLUMN partners.partner_base_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.partners.partner_base_url IS 'base URL of the REST API for this partner';
-
-
---
--- Name: partners_partner_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.partners ALTER COLUMN partner_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.partners_partner_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: prewire; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.prewire (
-    prewire_uuid bigint NOT NULL,
-    wire_method text NOT NULL,
-    finished boolean DEFAULT false NOT NULL,
-    failed boolean DEFAULT false NOT NULL,
-    buf bytea NOT NULL
-)
-PARTITION BY HASH (prewire_uuid);
-
-
---
--- Name: TABLE prewire; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.prewire IS 'pre-commit data for wire transfers we are about to execute';
-
-
---
--- Name: COLUMN prewire.finished; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.finished IS 'set to TRUE once bank confirmed receiving the wire transfer request';
-
-
---
--- Name: COLUMN prewire.failed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.failed IS 'set to TRUE if the bank responded with a non-transient failure to our transfer request';
-
-
---
--- Name: COLUMN prewire.buf; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.prewire.buf IS 'serialized data to send to the bank to execute the wire transfer';
-
-
---
--- Name: prewire_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.prewire_default (
-    prewire_uuid bigint NOT NULL,
-    wire_method text NOT NULL,
-    finished boolean DEFAULT false NOT NULL,
-    failed boolean DEFAULT false NOT NULL,
-    buf bytea NOT NULL
-);
-ALTER TABLE ONLY public.prewire ATTACH PARTITION public.prewire_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: prewire_prewire_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.prewire ALTER COLUMN prewire_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.prewire_prewire_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_deposits; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_deposits (
-    purse_deposit_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    purse_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    coin_sig bytea NOT NULL,
-    CONSTRAINT purse_deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT purse_deposits_purse_pub_check CHECK ((length(purse_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_deposits; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_deposits IS 'Requests depositing coins into a purse';
-
-
---
--- Name: COLUMN purse_deposits.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.partner_serial_id IS 'identifies the partner exchange, NULL in case the target purse lives at this exchange';
-
-
---
--- Name: COLUMN purse_deposits.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN purse_deposits.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.coin_pub IS 'Public key of the coin being deposited';
-
-
---
--- Name: COLUMN purse_deposits.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.amount_with_fee_val IS 'Total amount being deposited';
-
-
---
--- Name: COLUMN purse_deposits.coin_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_deposits.coin_sig IS 'Signature of the coin affirming the deposit into the purse, of type TALER_SIGNATURE_PURSE_DEPOSIT';
-
-
---
--- Name: purse_deposits_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_deposits_default (
-    purse_deposit_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    purse_pub bytea NOT NULL,
-    coin_pub bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    coin_sig bytea NOT NULL,
-    CONSTRAINT purse_deposits_coin_sig_check CHECK ((length(coin_sig) = 64)),
-    CONSTRAINT purse_deposits_purse_pub_check CHECK ((length(purse_pub) = 32))
-);
-ALTER TABLE ONLY public.purse_deposits ATTACH PARTITION public.purse_deposits_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_deposits_purse_deposit_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_deposits ALTER COLUMN purse_deposit_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_deposits_purse_deposit_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_merges; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_merges (
-    purse_merge_request_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_sig bytea NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    CONSTRAINT purse_merges_merge_sig_check CHECK ((length(merge_sig) = 64)),
-    CONSTRAINT purse_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_merges; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_merges IS 'Merge requests where a purse-owner requested merging the purse into the account';
-
-
---
--- Name: COLUMN purse_merges.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.partner_serial_id IS 'identifies the partner exchange, NULL in case the target reserve lives at this exchange';
-
-
---
--- Name: COLUMN purse_merges.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.reserve_pub IS 'public key of the target reserve';
-
-
---
--- Name: COLUMN purse_merges.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.purse_pub IS 'public key of the purse';
-
-
---
--- Name: COLUMN purse_merges.merge_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.merge_sig IS 'signature by the purse private key affirming the merge, of type TALER_SIGNATURE_WALLET_PURSE_MERGE';
-
-
---
--- Name: COLUMN purse_merges.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_merges.merge_timestamp IS 'when was the merge message signed';
-
-
---
--- Name: purse_merges_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_merges_default (
-    purse_merge_request_serial_id bigint NOT NULL,
-    partner_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_sig bytea NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    CONSTRAINT purse_merges_merge_sig_check CHECK ((length(merge_sig) = 64)),
-    CONSTRAINT purse_merges_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_merges_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-ALTER TABLE ONLY public.purse_merges ATTACH PARTITION public.purse_merges_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_merges_purse_merge_request_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_merges ALTER COLUMN purse_merge_request_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_merges_purse_merge_request_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: purse_requests; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_requests (
-    purse_requests_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_pub bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    age_limit integer NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    balance_val bigint DEFAULT 0 NOT NULL,
-    balance_frac integer DEFAULT 0 NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT purse_requests_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT purse_requests_merge_pub_check CHECK ((length(merge_pub) = 32)),
-    CONSTRAINT purse_requests_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_requests_purse_sig_check CHECK ((length(purse_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE purse_requests; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.purse_requests IS 'Requests establishing purses, associating them with a contract but without a target reserve';
-
-
---
--- Name: COLUMN purse_requests.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN purse_requests.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_expiration IS 'When the purse is set to expire';
-
-
---
--- Name: COLUMN purse_requests.h_contract_terms; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.h_contract_terms IS 'Hash of the contract the parties are to agree to';
-
-
---
--- Name: COLUMN purse_requests.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.amount_with_fee_val IS 'Total amount expected to be in the purse';
-
-
---
--- Name: COLUMN purse_requests.balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.balance_val IS 'Total amount actually in the purse';
-
-
---
--- Name: COLUMN purse_requests.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.purse_requests.purse_sig IS 'Signature of the purse affirming the purse parameters, of type TALER_SIGNATURE_PURSE_REQUEST';
-
-
---
--- Name: purse_requests_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.purse_requests_default (
-    purse_requests_serial_id bigint NOT NULL,
-    purse_pub bytea NOT NULL,
-    merge_pub bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    h_contract_terms bytea NOT NULL,
-    age_limit integer NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    balance_val bigint DEFAULT 0 NOT NULL,
-    balance_frac integer DEFAULT 0 NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT purse_requests_h_contract_terms_check CHECK ((length(h_contract_terms) = 64)),
-    CONSTRAINT purse_requests_merge_pub_check CHECK ((length(merge_pub) = 32)),
-    CONSTRAINT purse_requests_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT purse_requests_purse_sig_check CHECK ((length(purse_sig) = 64))
-);
-ALTER TABLE ONLY public.purse_requests ATTACH PARTITION public.purse_requests_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: purse_requests_purse_requests_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.purse_requests ALTER COLUMN purse_requests_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.purse_requests_purse_requests_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: recoup; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup (
-    recoup_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    reserve_out_serial_id bigint NOT NULL,
-    CONSTRAINT recoup_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_coin_sig_check CHECK ((length(coin_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE recoup; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup IS 'Information about recoups that were executed between a coin and a reserve. In this type of recoup, the amount is credited back to the reserve from which the coin originated.';
-
-
---
--- Name: COLUMN recoup.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_pub IS 'Coin that is being debited in the recoup. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-
-
---
--- Name: COLUMN recoup.coin_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_sig IS 'Signature by the coin affirming the recoup, of type TALER_SIGNATURE_WALLET_COIN_RECOUP';
-
-
---
--- Name: COLUMN recoup.coin_blind; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.coin_blind IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the withdraw operation.';
-
-
---
--- Name: COLUMN recoup.reserve_out_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup.reserve_out_serial_id IS 'Identifies the h_blind_ev of the recouped coin and provides the link to the credited reserve.';
-
-
---
--- Name: recoup_by_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_by_reserve (
-    reserve_out_serial_id bigint NOT NULL,
-    coin_pub bytea,
-    CONSTRAINT recoup_by_reserve_coin_pub_check CHECK ((length(coin_pub) = 32))
-)
-PARTITION BY HASH (reserve_out_serial_id);
-
-
---
--- Name: TABLE recoup_by_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup_by_reserve IS 'Information in this table is strictly redundant with that of recoup, but saved by a different primary key for fast lookups by reserve_out_serial_id.';
-
-
---
--- Name: recoup_by_reserve_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_by_reserve_default (
-    reserve_out_serial_id bigint NOT NULL,
-    coin_pub bytea,
-    CONSTRAINT recoup_by_reserve_coin_pub_check CHECK ((length(coin_pub) = 32))
-);
-ALTER TABLE ONLY public.recoup_by_reserve ATTACH PARTITION public.recoup_by_reserve_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_default (
-    recoup_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    reserve_out_serial_id bigint NOT NULL,
-    CONSTRAINT recoup_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_coin_sig_check CHECK ((length(coin_sig) = 64))
-);
-ALTER TABLE ONLY public.recoup ATTACH PARTITION public.recoup_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_recoup_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.recoup ALTER COLUMN recoup_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.recoup_recoup_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: recoup_refresh; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_refresh (
-    recoup_refresh_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    rrc_serial bigint NOT NULL,
-    CONSTRAINT recoup_refresh_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_refresh_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_refresh_coin_sig_check CHECK ((length(coin_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE recoup_refresh; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.recoup_refresh IS 'Table of coins that originated from a refresh operation and that were recouped. Links the (fresh) coin to the melted operation (and thus the old coin). A recoup on a refreshed coin credits the old coin and debits the fresh coin.';
-
-
---
--- Name: COLUMN recoup_refresh.coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.coin_pub IS 'Refreshed coin of a revoked denomination where the residual value is credited to the old coin. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-
-
---
--- Name: COLUMN recoup_refresh.known_coin_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.known_coin_id IS 'FIXME: (To be) used for garbage collection (in the future)';
-
-
---
--- Name: COLUMN recoup_refresh.coin_blind; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.coin_blind IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the refresh operation.';
-
-
---
--- Name: COLUMN recoup_refresh.rrc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.recoup_refresh.rrc_serial IS 'Link to the refresh operation. Also identifies the h_blind_ev of the recouped coin (as h_coin_ev).';
-
-
---
--- Name: recoup_refresh_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.recoup_refresh_default (
-    recoup_refresh_uuid bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    known_coin_id bigint NOT NULL,
-    coin_sig bytea NOT NULL,
-    coin_blind bytea NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    recoup_timestamp bigint NOT NULL,
-    rrc_serial bigint NOT NULL,
-    CONSTRAINT recoup_refresh_coin_blind_check CHECK ((length(coin_blind) = 32)),
-    CONSTRAINT recoup_refresh_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT recoup_refresh_coin_sig_check CHECK ((length(coin_sig) = 64))
-);
-ALTER TABLE ONLY public.recoup_refresh ATTACH PARTITION public.recoup_refresh_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: recoup_refresh_recoup_refresh_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.recoup_refresh ALTER COLUMN recoup_refresh_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.recoup_refresh_recoup_refresh_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_commitments; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_commitments (
-    melt_serial_id bigint NOT NULL,
-    rc bytea NOT NULL,
-    old_coin_pub bytea NOT NULL,
-    old_coin_sig bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    noreveal_index integer NOT NULL,
-    CONSTRAINT refresh_commitments_old_coin_sig_check CHECK ((length(old_coin_sig) = 64)),
-    CONSTRAINT refresh_commitments_rc_check CHECK ((length(rc) = 64))
-)
-PARTITION BY HASH (rc);
-
-
---
--- Name: TABLE refresh_commitments; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_commitments IS 'Commitments made when melting coins and the gamma value chosen by the exchange.';
-
-
---
--- Name: COLUMN refresh_commitments.rc; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.rc IS 'Commitment made by the client, hash over the various client inputs in the cut-and-choose protocol';
-
-
---
--- Name: COLUMN refresh_commitments.old_coin_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.old_coin_pub IS 'Coin being melted in the refresh process.';
-
-
---
--- Name: COLUMN refresh_commitments.noreveal_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_commitments.noreveal_index IS 'The gamma value chosen by the exchange in the cut-and-choose protocol';
-
-
---
--- Name: refresh_commitments_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_commitments_default (
-    melt_serial_id bigint NOT NULL,
-    rc bytea NOT NULL,
-    old_coin_pub bytea NOT NULL,
-    old_coin_sig bytea NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    noreveal_index integer NOT NULL,
-    CONSTRAINT refresh_commitments_old_coin_sig_check CHECK ((length(old_coin_sig) = 64)),
-    CONSTRAINT refresh_commitments_rc_check CHECK ((length(rc) = 64))
-);
-ALTER TABLE ONLY public.refresh_commitments ATTACH PARTITION public.refresh_commitments_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_commitments_melt_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_commitments ALTER COLUMN melt_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_commitments_melt_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_revealed_coins; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_revealed_coins (
-    rrc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    freshcoin_index integer NOT NULL,
-    link_sig bytea NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_ev bytea NOT NULL,
-    h_coin_ev bytea NOT NULL,
-    ev_sig bytea NOT NULL,
-    ewv bytea NOT NULL,
-    CONSTRAINT refresh_revealed_coins_h_coin_ev_check CHECK ((length(h_coin_ev) = 64)),
-    CONSTRAINT refresh_revealed_coins_link_sig_check CHECK ((length(link_sig) = 64))
-)
-PARTITION BY HASH (melt_serial_id);
-
-
---
--- Name: TABLE refresh_revealed_coins; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_revealed_coins IS 'Revelations about the new coins that are to be created during a melting session.';
-
-
---
--- Name: COLUMN refresh_revealed_coins.rrc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.rrc_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN refresh_revealed_coins.melt_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.melt_serial_id IS 'Identifies the refresh commitment (rc) of the melt operation.';
-
-
---
--- Name: COLUMN refresh_revealed_coins.freshcoin_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.freshcoin_index IS 'index of the fresh coin being created (one melt operation may result in multiple fresh coins)';
-
-
---
--- Name: COLUMN refresh_revealed_coins.coin_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.coin_ev IS 'envelope of the new coin to be signed';
-
-
---
--- Name: COLUMN refresh_revealed_coins.h_coin_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.h_coin_ev IS 'hash of the envelope of the new coin to be signed (for lookups)';
-
-
---
--- Name: COLUMN refresh_revealed_coins.ev_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.ev_sig IS 'exchange signature over the envelope';
-
-
---
--- Name: COLUMN refresh_revealed_coins.ewv; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_revealed_coins.ewv IS 'exchange contributed values in the creation of the fresh coin (see /csr)';
-
-
---
--- Name: refresh_revealed_coins_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_revealed_coins_default (
-    rrc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    freshcoin_index integer NOT NULL,
-    link_sig bytea NOT NULL,
-    denominations_serial bigint NOT NULL,
-    coin_ev bytea NOT NULL,
-    h_coin_ev bytea NOT NULL,
-    ev_sig bytea NOT NULL,
-    ewv bytea NOT NULL,
-    CONSTRAINT refresh_revealed_coins_h_coin_ev_check CHECK ((length(h_coin_ev) = 64)),
-    CONSTRAINT refresh_revealed_coins_link_sig_check CHECK ((length(link_sig) = 64))
-);
-ALTER TABLE ONLY public.refresh_revealed_coins ATTACH PARTITION public.refresh_revealed_coins_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_revealed_coins_rrc_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_revealed_coins ALTER COLUMN rrc_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_revealed_coins_rrc_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refresh_transfer_keys; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_transfer_keys (
-    rtc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    transfer_pub bytea NOT NULL,
-    transfer_privs bytea NOT NULL,
-    CONSTRAINT refresh_transfer_keys_transfer_pub_check CHECK ((length(transfer_pub) = 32))
-)
-PARTITION BY HASH (melt_serial_id);
-
-
---
--- Name: TABLE refresh_transfer_keys; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refresh_transfer_keys IS 'Transfer keys of a refresh operation (the data revealed to the exchange).';
-
-
---
--- Name: COLUMN refresh_transfer_keys.rtc_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.rtc_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: COLUMN refresh_transfer_keys.melt_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.melt_serial_id IS 'Identifies the refresh commitment (rc) of the operation.';
-
-
---
--- Name: COLUMN refresh_transfer_keys.transfer_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.transfer_pub IS 'transfer public key for the gamma index';
-
-
---
--- Name: COLUMN refresh_transfer_keys.transfer_privs; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refresh_transfer_keys.transfer_privs IS 'array of TALER_CNC_KAPPA - 1 transfer private keys that have been revealed, with the gamma entry being skipped';
-
-
---
--- Name: refresh_transfer_keys_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refresh_transfer_keys_default (
-    rtc_serial bigint NOT NULL,
-    melt_serial_id bigint NOT NULL,
-    transfer_pub bytea NOT NULL,
-    transfer_privs bytea NOT NULL,
-    CONSTRAINT refresh_transfer_keys_transfer_pub_check CHECK ((length(transfer_pub) = 32))
-);
-ALTER TABLE ONLY public.refresh_transfer_keys ATTACH PARTITION public.refresh_transfer_keys_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refresh_transfer_keys_rtc_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refresh_transfer_keys ALTER COLUMN rtc_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refresh_transfer_keys_rtc_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: refunds; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refunds (
-    refund_serial_id bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    merchant_sig bytea NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT refunds_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT refunds_merchant_sig_check CHECK ((length(merchant_sig) = 64))
-)
-PARTITION BY HASH (coin_pub);
-
-
---
--- Name: TABLE refunds; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.refunds IS 'Data on coins that were refunded. Technically, refunds always apply against specific deposit operations involving a coin. The combination of coin_pub, merchant_pub, h_contract_terms and rtransaction_id MUST be unique, and we usually select by coin_pub so that one goes first.';
-
-
---
--- Name: COLUMN refunds.deposit_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refunds.deposit_serial_id IS 'Identifies ONLY the merchant_pub, h_contract_terms and coin_pub. Multiple deposits may match a refund, this only identifies one of them.';
-
-
---
--- Name: COLUMN refunds.rtransaction_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.refunds.rtransaction_id IS 'used by the merchant to make refunds unique in case the same coin for the same deposit gets a subsequent (higher) refund';
-
-
---
--- Name: refunds_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.refunds_default (
-    refund_serial_id bigint NOT NULL,
-    coin_pub bytea NOT NULL,
-    deposit_serial_id bigint NOT NULL,
-    merchant_sig bytea NOT NULL,
-    rtransaction_id bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT refunds_coin_pub_check CHECK ((length(coin_pub) = 32)),
-    CONSTRAINT refunds_merchant_sig_check CHECK ((length(merchant_sig) = 64))
-);
-ALTER TABLE ONLY public.refunds ATTACH PARTITION public.refunds_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: refunds_refund_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.refunds ALTER COLUMN refund_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.refunds_refund_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves (
-    reserve_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    current_balance_val bigint NOT NULL,
-    current_balance_frac integer NOT NULL,
-    purses_active bigint DEFAULT 0 NOT NULL,
-    purses_allowed bigint DEFAULT 0 NOT NULL,
-    kyc_required boolean DEFAULT false NOT NULL,
-    kyc_passed boolean DEFAULT false NOT NULL,
-    expiration_date bigint NOT NULL,
-    gc_date bigint NOT NULL,
-    CONSTRAINT reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves IS 'Summarizes the balance of a reserve. Updated when new funds are added or withdrawn.';
-
-
---
--- Name: COLUMN reserves.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.reserve_pub IS 'EdDSA public key of the reserve. Knowledge of the private key implies ownership over the balance.';
-
-
---
--- Name: COLUMN reserves.current_balance_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.current_balance_val IS 'Current balance remaining with the reserve.';
-
-
---
--- Name: COLUMN reserves.purses_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.purses_active IS 'Number of purses that were created by this reserve that are not expired and not fully paid.';
-
-
---
--- Name: COLUMN reserves.purses_allowed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.purses_allowed IS 'Number of purses that this reserve is allowed to have active at most.';
-
-
---
--- Name: COLUMN reserves.kyc_required; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.kyc_required IS 'True if a KYC check must have been passed before withdrawing from this reserve. Set to true once a reserve received a P2P payment.';
-
-
---
--- Name: COLUMN reserves.kyc_passed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.kyc_passed IS 'True once KYC was passed for this reserve. The KYC details are then available via the wire_targets table under the key of wire_target_h_payto which is to be derived from the reserve_pub and the base URL of this exchange.';
-
-
---
--- Name: COLUMN reserves.expiration_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.expiration_date IS 'Used to trigger closing of reserves that have not been drained after some time';
-
-
---
--- Name: COLUMN reserves.gc_date; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves.gc_date IS 'Used to forget all information about a reserve during garbage collection';
-
-
---
--- Name: reserves_close; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_close (
-    close_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid bytea NOT NULL,
-    wire_target_h_payto bytea,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_close_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT reserves_close_wtid_check CHECK ((length(wtid) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves_close; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_close IS 'wire transfers executed by the reserve to close reserves';
-
-
---
--- Name: COLUMN reserves_close.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_close.wire_target_h_payto IS 'Identifies the credited bank account (and KYC status). Note that closing does not depend on KYC.';
-
-
---
--- Name: reserves_close_close_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_close ALTER COLUMN close_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_close_close_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_close_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_close_default (
-    close_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid bytea NOT NULL,
-    wire_target_h_payto bytea,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_close_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT reserves_close_wtid_check CHECK ((length(wtid) = 32))
-);
-ALTER TABLE ONLY public.reserves_close ATTACH PARTITION public.reserves_close_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_default (
-    reserve_uuid bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    current_balance_val bigint NOT NULL,
-    current_balance_frac integer NOT NULL,
-    purses_active bigint DEFAULT 0 NOT NULL,
-    purses_allowed bigint DEFAULT 0 NOT NULL,
-    kyc_required boolean DEFAULT false NOT NULL,
-    kyc_passed boolean DEFAULT false NOT NULL,
-    expiration_date bigint NOT NULL,
-    gc_date bigint NOT NULL,
-    CONSTRAINT reserves_reserve_pub_check CHECK ((length(reserve_pub) = 32))
-);
-ALTER TABLE ONLY public.reserves ATTACH PARTITION public.reserves_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_in; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_in (
-    reserve_in_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    wire_reference bigint NOT NULL,
-    credit_val bigint NOT NULL,
-    credit_frac integer NOT NULL,
-    wire_source_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    execution_date bigint NOT NULL,
-    CONSTRAINT reserves_in_wire_source_h_payto_check CHECK ((length(wire_source_h_payto) = 32))
-)
-PARTITION BY HASH (reserve_pub);
-
-
---
--- Name: TABLE reserves_in; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_in IS 'list of transfers of funds into the reserves, one per incoming wire transfer';
-
-
---
--- Name: COLUMN reserves_in.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.reserve_pub IS 'Public key of the reserve. Private key signifies ownership of the remaining balance.';
-
-
---
--- Name: COLUMN reserves_in.credit_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.credit_val IS 'Amount that was transferred into the reserve';
-
-
---
--- Name: COLUMN reserves_in.wire_source_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_in.wire_source_h_payto IS 'Identifies the debited bank account and KYC status';
-
-
---
--- Name: reserves_in_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_in_default (
-    reserve_in_serial_id bigint NOT NULL,
-    reserve_pub bytea NOT NULL,
-    wire_reference bigint NOT NULL,
-    credit_val bigint NOT NULL,
-    credit_frac integer NOT NULL,
-    wire_source_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    execution_date bigint NOT NULL,
-    CONSTRAINT reserves_in_wire_source_h_payto_check CHECK ((length(wire_source_h_payto) = 32))
-);
-ALTER TABLE ONLY public.reserves_in ATTACH PARTITION public.reserves_in_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_in_reserve_in_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_in ALTER COLUMN reserve_in_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_in_reserve_in_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out (
-    reserve_out_serial_id bigint NOT NULL,
-    h_blind_ev bytea,
-    denominations_serial bigint NOT NULL,
-    denom_sig bytea NOT NULL,
-    reserve_uuid bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_out_h_blind_ev_check CHECK ((length(h_blind_ev) = 64)),
-    CONSTRAINT reserves_out_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (h_blind_ev);
-
-
---
--- Name: TABLE reserves_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_out IS 'Withdraw operations performed on reserves.';
-
-
---
--- Name: COLUMN reserves_out.h_blind_ev; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.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).';
-
-
---
--- Name: COLUMN reserves_out.denominations_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.reserves_out.denominations_serial IS 'We do not CASCADE ON DELETE here, we may keep the denomination data alive';
-
-
---
--- Name: reserves_out_by_reserve; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_by_reserve (
-    reserve_uuid bigint NOT NULL,
-    h_blind_ev bytea,
-    CONSTRAINT reserves_out_by_reserve_h_blind_ev_check CHECK ((length(h_blind_ev) = 64))
-)
-PARTITION BY HASH (reserve_uuid);
-
-
---
--- Name: TABLE reserves_out_by_reserve; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.reserves_out_by_reserve IS 'Information in this table is strictly redundant with that of reserves_out, but saved by a different primary key for fast lookups by reserve public key/uuid.';
-
-
---
--- Name: reserves_out_by_reserve_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_by_reserve_default (
-    reserve_uuid bigint NOT NULL,
-    h_blind_ev bytea,
-    CONSTRAINT reserves_out_by_reserve_h_blind_ev_check CHECK ((length(h_blind_ev) = 64))
-);
-ALTER TABLE ONLY public.reserves_out_by_reserve ATTACH PARTITION public.reserves_out_by_reserve_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.reserves_out_default (
-    reserve_out_serial_id bigint NOT NULL,
-    h_blind_ev bytea,
-    denominations_serial bigint NOT NULL,
-    denom_sig bytea NOT NULL,
-    reserve_uuid bigint NOT NULL,
-    reserve_sig bytea NOT NULL,
-    execution_date bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    CONSTRAINT reserves_out_h_blind_ev_check CHECK ((length(h_blind_ev) = 64)),
-    CONSTRAINT reserves_out_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.reserves_out ATTACH PARTITION public.reserves_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: reserves_out_reserve_out_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves_out ALTER COLUMN reserve_out_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_out_reserve_out_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: reserves_reserve_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.reserves ALTER COLUMN reserve_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.reserves_reserve_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: revolving_work_shards; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE UNLOGGED TABLE public.revolving_work_shards (
-    shard_serial_id bigint NOT NULL,
-    last_attempt bigint NOT NULL,
-    start_row integer NOT NULL,
-    end_row integer NOT NULL,
-    active boolean DEFAULT false NOT NULL,
-    job_name character varying NOT NULL
-);
-
-
---
--- Name: TABLE revolving_work_shards; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.revolving_work_shards IS 'coordinates work between multiple processes working on the same job with partitions that need to be repeatedly processed; unlogged because on system crashes the locks represented by this table will have to be cleared anyway, typically using "taler-exchange-dbinit -s"';
-
-
---
--- Name: COLUMN revolving_work_shards.shard_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.shard_serial_id IS 'unique serial number identifying the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.last_attempt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.last_attempt IS 'last time a worker attempted to work on the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.start_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.start_row IS 'row at which the shard scope starts, inclusive';
-
-
---
--- Name: COLUMN revolving_work_shards.end_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.end_row IS 'row at which the shard scope ends, exclusive';
-
-
---
--- Name: COLUMN revolving_work_shards.active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.active IS 'set to TRUE when a worker is active on the shard';
-
-
---
--- Name: COLUMN revolving_work_shards.job_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.revolving_work_shards.job_name IS 'unique name of the job the workers on this shard are performing';
-
-
---
--- Name: revolving_work_shards_shard_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.revolving_work_shards ALTER COLUMN shard_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.revolving_work_shards_shard_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: signkey_revocations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.signkey_revocations (
-    signkey_revocations_serial_id bigint NOT NULL,
-    esk_serial bigint NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT signkey_revocations_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE signkey_revocations; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.signkey_revocations IS 'Table storing which online signing keys have been revoked';
-
-
---
--- Name: signkey_revocations_signkey_revocations_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.signkey_revocations ALTER COLUMN signkey_revocations_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.signkey_revocations_signkey_revocations_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wad_in_entries; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_in_entries (
-    wad_in_entry_serial_id bigint NOT NULL,
-    wad_in_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_in_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_in_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_in_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_in_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_in_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE wad_in_entries; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wad_in_entries IS 'list of purses aggregated in a wad according to the sending exchange';
-
-
---
--- Name: COLUMN wad_in_entries.wad_in_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.wad_in_serial_id IS 'wad for which the given purse was included in the aggregation';
-
-
---
--- Name: COLUMN wad_in_entries.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.reserve_pub IS 'target account of the purse (must be at the local exchange)';
-
-
---
--- Name: COLUMN wad_in_entries.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_pub IS 'public key of the purse that was merged';
-
-
---
--- Name: COLUMN wad_in_entries.h_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.h_contract IS 'hash of the contract terms of the purse';
-
-
---
--- Name: COLUMN wad_in_entries.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_expiration IS 'Time when the purse was set to expire';
-
-
---
--- Name: COLUMN wad_in_entries.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.merge_timestamp IS 'Time when the merge was approved';
-
-
---
--- Name: COLUMN wad_in_entries.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.amount_with_fee_val IS 'Total amount in the purse';
-
-
---
--- Name: COLUMN wad_in_entries.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.wad_fee_val IS 'Total wad fees paid by the purse';
-
-
---
--- Name: COLUMN wad_in_entries.deposit_fees_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.deposit_fees_val IS 'Total deposit fees paid when depositing coins into the purse';
-
-
---
--- Name: COLUMN wad_in_entries.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.reserve_sig IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN wad_in_entries.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_in_entries.purse_sig IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-
---
--- Name: wad_in_entries_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_in_entries_default (
-    wad_in_entry_serial_id bigint NOT NULL,
-    wad_in_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_in_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_in_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_in_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_in_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_in_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.wad_in_entries ATTACH PARTITION public.wad_in_entries_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wad_in_entries_wad_in_entry_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wad_in_entries ALTER COLUMN wad_in_entry_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wad_in_entries_wad_in_entry_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wad_out_entries; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_out_entries (
-    wad_out_entry_serial_id bigint NOT NULL,
-    wad_out_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_out_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_out_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_out_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_out_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_out_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-)
-PARTITION BY HASH (purse_pub);
-
-
---
--- Name: TABLE wad_out_entries; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wad_out_entries IS 'Purses combined into a wad';
-
-
---
--- Name: COLUMN wad_out_entries.wad_out_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.wad_out_serial_id IS 'Wad the purse was part of';
-
-
---
--- Name: COLUMN wad_out_entries.reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.reserve_pub IS 'Target reserve for the purse';
-
-
---
--- Name: COLUMN wad_out_entries.purse_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_pub IS 'Public key of the purse';
-
-
---
--- Name: COLUMN wad_out_entries.h_contract; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.h_contract IS 'Hash of the contract associated with the purse';
-
-
---
--- Name: COLUMN wad_out_entries.purse_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_expiration IS 'Time when the purse expires';
-
-
---
--- Name: COLUMN wad_out_entries.merge_timestamp; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.merge_timestamp IS 'Time when the merge was approved';
-
-
---
--- Name: COLUMN wad_out_entries.amount_with_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.amount_with_fee_val IS 'Total amount in the purse';
-
-
---
--- Name: COLUMN wad_out_entries.wad_fee_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.wad_fee_val IS 'Wat fee charged to the purse';
-
-
---
--- Name: COLUMN wad_out_entries.deposit_fees_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.deposit_fees_val IS 'Total deposit fees charged to the purse';
-
-
---
--- Name: COLUMN wad_out_entries.reserve_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.reserve_sig IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-
-
---
--- Name: COLUMN wad_out_entries.purse_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wad_out_entries.purse_sig IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-
---
--- Name: wad_out_entries_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wad_out_entries_default (
-    wad_out_entry_serial_id bigint NOT NULL,
-    wad_out_serial_id bigint,
-    reserve_pub bytea NOT NULL,
-    purse_pub bytea NOT NULL,
-    h_contract bytea NOT NULL,
-    purse_expiration bigint NOT NULL,
-    merge_timestamp bigint NOT NULL,
-    amount_with_fee_val bigint NOT NULL,
-    amount_with_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    deposit_fees_val bigint NOT NULL,
-    deposit_fees_frac integer NOT NULL,
-    reserve_sig bytea NOT NULL,
-    purse_sig bytea NOT NULL,
-    CONSTRAINT wad_out_entries_h_contract_check CHECK ((length(h_contract) = 64)),
-    CONSTRAINT wad_out_entries_purse_pub_check CHECK ((length(purse_pub) = 32)),
-    CONSTRAINT wad_out_entries_purse_sig_check CHECK ((length(purse_sig) = 64)),
-    CONSTRAINT wad_out_entries_reserve_pub_check CHECK ((length(reserve_pub) = 32)),
-    CONSTRAINT wad_out_entries_reserve_sig_check CHECK ((length(reserve_sig) = 64))
-);
-ALTER TABLE ONLY public.wad_out_entries ATTACH PARTITION public.wad_out_entries_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wad_out_entries_wad_out_entry_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wad_out_entries ALTER COLUMN wad_out_entry_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wad_out_entries_wad_out_entry_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wads_in; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_in (
-    wad_in_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    origin_exchange_url text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    arrival_time bigint NOT NULL,
-    CONSTRAINT wads_in_wad_id_check CHECK ((length(wad_id) = 24))
-)
-PARTITION BY HASH (wad_id);
-
-
---
--- Name: TABLE wads_in; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wads_in IS 'Incoming exchange-to-exchange wad wire transfers';
-
-
---
--- Name: COLUMN wads_in.wad_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.wad_id IS 'Unique identifier of the wad, part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_in.origin_exchange_url; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.origin_exchange_url IS 'Base URL of the originating URL, also part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_in.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.amount_val IS 'Actual amount that was received by our exchange';
-
-
---
--- Name: COLUMN wads_in.arrival_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_in.arrival_time IS 'Time when the wad was received';
-
-
---
--- Name: wads_in_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_in_default (
-    wad_in_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    origin_exchange_url text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    arrival_time bigint NOT NULL,
-    CONSTRAINT wads_in_wad_id_check CHECK ((length(wad_id) = 24))
-);
-ALTER TABLE ONLY public.wads_in ATTACH PARTITION public.wads_in_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wads_in_wad_in_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wads_in ALTER COLUMN wad_in_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wads_in_wad_in_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wads_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_out (
-    wad_out_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    partner_serial_id bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    CONSTRAINT wads_out_wad_id_check CHECK ((length(wad_id) = 24))
-)
-PARTITION BY HASH (wad_id);
-
-
---
--- Name: TABLE wads_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wads_out IS 'Wire transfers made to another exchange to transfer purse funds';
-
-
---
--- Name: COLUMN wads_out.wad_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.wad_id IS 'Unique identifier of the wad, part of the wire transfer subject';
-
-
---
--- Name: COLUMN wads_out.partner_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.partner_serial_id IS 'target exchange of the wad';
-
-
---
--- Name: COLUMN wads_out.amount_val; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.amount_val IS 'Amount that was wired';
-
-
---
--- Name: COLUMN wads_out.execution_time; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wads_out.execution_time IS 'Time when the wire transfer was scheduled';
-
-
---
--- Name: wads_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wads_out_default (
-    wad_out_serial_id bigint NOT NULL,
-    wad_id bytea NOT NULL,
-    partner_serial_id bigint NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    execution_time bigint NOT NULL,
-    CONSTRAINT wads_out_wad_id_check CHECK ((length(wad_id) = 24))
-);
-ALTER TABLE ONLY public.wads_out ATTACH PARTITION public.wads_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wads_out_wad_out_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wads_out ALTER COLUMN wad_out_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wads_out_wad_out_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_accounts; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_accounts (
-    payto_uri character varying NOT NULL,
-    master_sig bytea,
-    is_active boolean NOT NULL,
-    last_change bigint NOT NULL,
-    CONSTRAINT wire_accounts_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE wire_accounts; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_accounts IS 'Table with current and historic bank accounts of the exchange. Entries never expire as we need to remember the last_change column indefinitely.';
-
-
---
--- Name: COLUMN wire_accounts.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.payto_uri IS 'payto URI (RFC 8905) with the bank account of the exchange.';
-
-
---
--- Name: COLUMN wire_accounts.master_sig; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.master_sig IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS';
-
-
---
--- Name: COLUMN wire_accounts.is_active; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.is_active IS 'true if we are currently supporting the use of this account.';
-
-
---
--- Name: COLUMN wire_accounts.last_change; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_accounts.last_change IS 'Latest time when active status changed. Used to detect replays of old messages.';
-
-
---
--- Name: wire_auditor_account_progress; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_auditor_account_progress (
-    master_pub bytea NOT NULL,
-    account_name text NOT NULL,
-    last_wire_reserve_in_serial_id bigint DEFAULT 0 NOT NULL,
-    last_wire_wire_out_serial_id bigint DEFAULT 0 NOT NULL,
-    wire_in_off bigint NOT NULL,
-    wire_out_off bigint NOT NULL
-);
-
-
---
--- Name: TABLE wire_auditor_account_progress; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_auditor_account_progress IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
---
--- Name: wire_auditor_progress; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_auditor_progress (
-    master_pub bytea NOT NULL,
-    last_timestamp bigint NOT NULL,
-    last_reserve_close_uuid bigint NOT NULL
-);
-
-
---
--- Name: wire_fee; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_fee (
-    wire_fee_serial bigint NOT NULL,
-    wire_method character varying NOT NULL,
-    start_date bigint NOT NULL,
-    end_date bigint NOT NULL,
-    wire_fee_val bigint NOT NULL,
-    wire_fee_frac integer NOT NULL,
-    closing_fee_val bigint NOT NULL,
-    closing_fee_frac integer NOT NULL,
-    wad_fee_val bigint NOT NULL,
-    wad_fee_frac integer NOT NULL,
-    master_sig bytea NOT NULL,
-    CONSTRAINT wire_fee_master_sig_check CHECK ((length(master_sig) = 64))
-);
-
-
---
--- Name: TABLE wire_fee; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_fee IS 'list of the wire fees of this exchange, by date';
-
-
---
--- Name: COLUMN wire_fee.wire_fee_serial; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_fee.wire_fee_serial IS 'needed for exchange-auditor replication logic';
-
-
---
--- Name: wire_fee_wire_fee_serial_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_fee ALTER COLUMN wire_fee_serial ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_fee_wire_fee_serial_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_out; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_out (
-    wireout_uuid bigint NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid_raw bytea NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT wire_out_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT wire_out_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-)
-PARTITION BY HASH (wtid_raw);
-
-
---
--- Name: TABLE wire_out; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_out IS 'wire transfers the exchange has executed';
-
-
---
--- Name: COLUMN wire_out.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_out.wire_target_h_payto IS 'Identifies the credited bank account and KYC status';
-
-
---
--- Name: COLUMN wire_out.exchange_account_section; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_out.exchange_account_section IS 'identifies the configuration section with the debit account of this payment';
-
-
---
--- Name: wire_out_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_out_default (
-    wireout_uuid bigint NOT NULL,
-    execution_date bigint NOT NULL,
-    wtid_raw bytea NOT NULL,
-    wire_target_h_payto bytea,
-    exchange_account_section text NOT NULL,
-    amount_val bigint NOT NULL,
-    amount_frac integer NOT NULL,
-    CONSTRAINT wire_out_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32)),
-    CONSTRAINT wire_out_wtid_raw_check CHECK ((length(wtid_raw) = 32))
-);
-ALTER TABLE ONLY public.wire_out ATTACH PARTITION public.wire_out_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wire_out_wireout_uuid_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_out ALTER COLUMN wireout_uuid ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_out_wireout_uuid_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: wire_targets; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_targets (
-    wire_target_serial_id bigint NOT NULL,
-    wire_target_h_payto bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    external_id character varying,
-    CONSTRAINT wire_targets_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-)
-PARTITION BY HASH (wire_target_h_payto);
-
-
---
--- Name: TABLE wire_targets; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.wire_targets IS 'All senders and recipients of money via the exchange';
-
-
---
--- Name: COLUMN wire_targets.wire_target_h_payto; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.wire_target_h_payto IS 'Unsalted hash of payto_uri';
-
-
---
--- Name: COLUMN wire_targets.payto_uri; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.payto_uri IS 'Can be a regular bank account, or also be a URI identifying a reserve-account (for P2P payments)';
-
-
---
--- Name: COLUMN wire_targets.kyc_ok; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.kyc_ok IS 'true if the KYC check was passed successfully';
-
-
---
--- Name: COLUMN wire_targets.external_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.wire_targets.external_id IS 'Name of the user that was used for OAuth 2.0-based legitimization';
-
-
---
--- Name: wire_targets_default; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.wire_targets_default (
-    wire_target_serial_id bigint NOT NULL,
-    wire_target_h_payto bytea NOT NULL,
-    payto_uri character varying NOT NULL,
-    kyc_ok boolean DEFAULT false NOT NULL,
-    external_id character varying,
-    CONSTRAINT wire_targets_wire_target_h_payto_check CHECK ((length(wire_target_h_payto) = 32))
-);
-ALTER TABLE ONLY public.wire_targets ATTACH PARTITION public.wire_targets_default FOR VALUES WITH (modulus 1, remainder 0);
-
-
---
--- Name: wire_targets_wire_target_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.wire_targets ALTER COLUMN wire_target_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.wire_targets_wire_target_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: work_shards; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.work_shards (
-    shard_serial_id bigint NOT NULL,
-    last_attempt bigint NOT NULL,
-    start_row bigint NOT NULL,
-    end_row bigint NOT NULL,
-    completed boolean DEFAULT false NOT NULL,
-    job_name character varying NOT NULL
-);
-
-
---
--- Name: TABLE work_shards; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON TABLE public.work_shards IS 'coordinates work between multiple processes working on the same job';
-
-
---
--- Name: COLUMN work_shards.shard_serial_id; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.shard_serial_id IS 'unique serial number identifying the shard';
-
-
---
--- Name: COLUMN work_shards.last_attempt; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.last_attempt IS 'last time a worker attempted to work on the shard';
-
-
---
--- Name: COLUMN work_shards.start_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.start_row IS 'row at which the shard scope starts, inclusive';
-
-
---
--- Name: COLUMN work_shards.end_row; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.end_row IS 'row at which the shard scope ends, exclusive';
-
-
---
--- Name: COLUMN work_shards.completed; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.completed IS 'set to TRUE once the shard is finished by a worker';
-
-
---
--- Name: COLUMN work_shards.job_name; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON COLUMN public.work_shards.job_name IS 'unique name of the job the workers on this shard are performing';
-
-
---
--- Name: work_shards_shard_serial_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-ALTER TABLE public.work_shards ALTER COLUMN shard_serial_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.work_shards_shard_serial_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-
-
---
--- Name: app_bankaccount account_no; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount ALTER COLUMN account_no SET DEFAULT nextval('public.app_bankaccount_account_no_seq'::regclass);
-
-
---
--- Name: app_banktransaction id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction ALTER COLUMN id SET DEFAULT nextval('public.app_banktransaction_id_seq'::regclass);
-
-
---
--- Name: auditor_reserves auditor_reserves_rowid; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves ALTER COLUMN auditor_reserves_rowid SET DEFAULT nextval('public.auditor_reserves_auditor_reserves_rowid_seq'::regclass);
-
-
---
--- Name: auth_group id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group ALTER COLUMN id SET DEFAULT nextval('public.auth_group_id_seq'::regclass);
-
-
---
--- Name: auth_group_permissions id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions ALTER COLUMN id SET DEFAULT nextval('public.auth_group_permissions_id_seq'::regclass);
-
-
---
--- Name: auth_permission id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission ALTER COLUMN id SET DEFAULT nextval('public.auth_permission_id_seq'::regclass);
-
-
---
--- Name: auth_user id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user ALTER COLUMN id SET DEFAULT nextval('public.auth_user_id_seq'::regclass);
-
-
---
--- Name: auth_user_groups id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups ALTER COLUMN id SET DEFAULT nextval('public.auth_user_groups_id_seq'::regclass);
-
-
---
--- Name: auth_user_user_permissions id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions ALTER COLUMN id SET DEFAULT nextval('public.auth_user_user_permissions_id_seq'::regclass);
-
-
---
--- Name: deposit_confirmations serial_id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations ALTER COLUMN serial_id SET DEFAULT nextval('public.deposit_confirmations_serial_id_seq'::regclass);
-
-
---
--- Name: django_content_type id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type ALTER COLUMN id SET DEFAULT nextval('public.django_content_type_id_seq'::regclass);
-
-
---
--- Name: django_migrations id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_migrations ALTER COLUMN id SET DEFAULT nextval('public.django_migrations_id_seq'::regclass);
-
-
---
--- Data for Name: patches; Type: TABLE DATA; Schema: _v; Owner: -
---
-
-COPY _v.patches (patch_name, applied_tsz, applied_by, requires, conflicts) FROM stdin;
-exchange-0001	2022-05-02 20:33:08.632456+02	grothoff	{}	{}
-merchant-0001	2022-05-02 20:33:09.495945+02	grothoff	{}	{}
-auditor-0001	2022-05-02 20:33:10.025629+02	grothoff	{}	{}
-\.
-
-
---
--- Data for Name: account_merges_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.account_merges_default (account_merge_request_serial_id, reserve_pub, reserve_sig, purse_pub) FROM stdin;
-\.
-
-
---
--- Data for Name: aggregation_tracking_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.aggregation_tracking_default (aggregation_serial_id, deposit_serial_id, wtid_raw) FROM stdin;
-\.
-
-
---
--- Data for Name: aggregation_transient_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.aggregation_transient_default (amount_val, amount_frac, wire_target_h_payto, exchange_account_section, wtid_raw) FROM stdin;
-\.
-
-
---
--- Data for Name: app_bankaccount; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_bankaccount (is_public, account_no, balance, user_id) FROM stdin;
-t	3	+TESTKUDOS:0	3
-t	4	+TESTKUDOS:0	4
-t	5	+TESTKUDOS:0	5
-t	6	+TESTKUDOS:0	6
-t	7	+TESTKUDOS:0	7
-t	8	+TESTKUDOS:0	8
-t	9	+TESTKUDOS:0	9
-f	10	+TESTKUDOS:0	10
-f	11	+TESTKUDOS:0	11
-t	1	-TESTKUDOS:100	1
-f	12	+TESTKUDOS:92	12
-t	2	+TESTKUDOS:8	2
-\.
-
-
---
--- Data for Name: app_banktransaction; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_banktransaction (id, amount, subject, date, cancelled, request_uid, credit_account_id, debit_account_id) FROM stdin;
-1	TESTKUDOS:100	Joining bonus	2022-05-02 20:33:19.710863+02	f	55d53162-0d60-4f87-95a1-a30a36a7c617	12	1
-2	TESTKUDOS:8	CDMQCHRC8MTHV2T34NXGSCM9QNJBT73GHRYT7K2QDS1XA8NET490	2022-05-02 20:33:23.213741+02	f	89d148cf-c9a9-43bb-9a17-003cd5338715	2	12
-\.
-
-
---
--- Data for Name: app_talerwithdrawoperation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.app_talerwithdrawoperation (withdraw_id, amount, selection_done, confirmation_done, aborted, selected_reserve_pub, selected_exchange_account_id, withdraw_account_id) FROM stdin;
-f2ffc636-d7ba-4f83-b5d7-2c3c9e157746	TESTKUDOS:8	t	t	f	CDMQCHRC8MTHV2T34NXGSCM9QNJBT73GHRYT7K2QDS1XA8NET490	2	12
-\.
-
-
---
--- Data for Name: auditor_balance_summary; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_balance_summary (master_pub, denom_balance_val, denom_balance_frac, deposit_fee_balance_val, deposit_fee_balance_frac, melt_fee_balance_val, melt_fee_balance_frac, refund_fee_balance_val, refund_fee_balance_frac, risk_val, risk_frac, loss_val, loss_frac, irregular_recoup_val, irregular_recoup_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_denom_sigs; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_denom_sigs (auditor_denom_serial, auditor_uuid, denominations_serial, auditor_sig) FROM stdin;
-1	1	82	\\x148db4e721b797b96cbe2af707fd739af3a821670254b641b65c96074cfc9c0878deaf21315770de8079a326a063f94c0f97fb6f3cccc9b8b0ee3ec7af95af07
-2	1	170	\\xba0dd58ffa5a51e8ea064c3bffeb0366a5df876a80d6c3d1414dcdc36062c86dd139038380768b165c75b8435b7c31fa8a675bbdbb52399603f279847d9f1709
-3	1	331	\\x3c220644b63503c10b71489686442ae23b37b0ded42bed68a59460955c7962b2c87c8c619f1daa9f3331eab924a9f61bf6ba204e977560ca23d9f08d536a1c0c
-4	1	104	\\x06ba63a59d1b6b16aebdcfa06a572124499d97d59c0bc9b4f176ebd59f30ca5b27edaf80e85b7ccbec341a9682e43303d7f01fb4f08ad28452229fe13014ab03
-5	1	246	\\x850724ba9122a0201616f2ce32f9f66df47f492c483c0c025f60aae86e0fd4a9d02eacf8961f5c0a9574724a9b3d5d75a78c664887965f6fde662b089f9fc30d
-6	1	260	\\x86f46f901b9df2bd4d55d7216f4b7c0e93f5269f8b168a43e274e8a07d6a1c2dbdef0f88b9d208ae290fd8c29a540e00f9ea472a29fadbca91ca0f206eb66b04
-7	1	276	\\x381b4c5a692b436487060d854d659fdd28716e84508c120423d4675755c7f35468d04b032061926bf29daa3a949bae09d19950c7e8dd551e257562233c3c3b0c
-8	1	407	\\xa350e8aff07a3c7540c0aeea74100b195d55b042d86be11b72676622ed5f5ba7044eb2778108c1036f6bb84fa10b42de0c88d72087bd6b9be57e1160fb482808
-9	1	227	\\xf6227bbc19661acce2bdf966103520a5453de7ce2ed5350d3083152f13bf2328429c020d740410cd81b8a7feac2a91016c0647b45b6b8171a5ff4ff2f082650f
-10	1	287	\\xf75a67bb2291cb9e4ff0b5e0c02821f6b5a09a3103d99c823fe84d2923c388d847c68d8af14e18db0ec02913ed6964b35541a313831b0f3f429a1c4428a1800d
-11	1	247	\\x02a6c21bcc318e021a7836f8ca0eaa7f2057b77208710cf309bcd0b3123ae6fd466c3f2f02d1cf5a8547f3edd0888d3de9092dec048ad4dc5aaa87f10dbf0807
-12	1	17	\\x0f39b94e1d9215b5bf5c14813011d7f45658629332af9e0b2f4a7e0508632f8c0e08032ad555be2d0f33d113a34deeed3aeb26c2ad34b74d2fc913d593b4ac07
-13	1	24	\\x19357e6a07e3094742b528714fdd498534f198b136bd397321a75db7ca6805ca51e8664678ed5497581ff03638c89f1d15e9bb17205db5d38456efb88c1c8f04
-14	1	34	\\xf02382bbee8f54d541e8b3784b1d1b36045ed3ba998fa225e6f927037f2f3d8f16c9f9450d09811ba16813201bd8ddea60cb473fff4df2baab30a05f0a08540b
-15	1	265	\\xe04e19e4f656fefeca9a88ec97eb8ebfea0a625508c6ea6d0c45650097d7c9520f6036d72cb0e427445e22b75cc0c78b4f7a7d78a63d7c4f2a2237be9d50c90b
-16	1	306	\\xe7f675708a9afbf635cd145d006da38a8cb2f130f6bc0822f90f8cf7b4516d1b87db80b2e208d9984d1879f419e0177bb103a52a761b712dba50646b8d887d04
-17	1	297	\\x62db426318a3af2a76c45e974f981523b654f07c8799ba9d1de779e7de0dcb04aef92993948481239ec42dffbcd4a49a4d9df44699b2370c2bcce7fba7c52408
-18	1	137	\\x5efef1bd7ffc2226c93b5f953aeebfa3b5905e7dee8e7f2b77cb75b5235ec40c577091503f23e971beaafd8235aedd63abc5b3ba0bce24dbc563c59d7aff9203
-19	1	100	\\x7be7830767db3987f760ffd0514352eddc4da78cf416646a156883f5d1789b27af939b9ab6b2eb03676593c39e471ae6f63ddd14c1813c8ea376f8b352758202
-20	1	303	\\x7c065828bb5f37b0c6349a293c2f428a1f299aa958ce0fb8a922fb6121ea13a424082b8a5eab46f27e99f15a1ddeee8a057d5b09896b6173b9c2eb22c86fd70b
-21	1	378	\\x439105de2faa56c673b5a0734aa85ceab74408009bf4d37bf443a64e81d1b6c56295fe14414f7ea2073923f23c946d288f97b236f52868837021f9a12dd40609
-22	1	68	\\x76c9ef6f6f7304f9d66a6146b3bd5fcc1ca16f4a8f20943a1fc25b3b3c1662735e777a50fcccaf26d0507b12586b7067738e40c3ab7773a564eeb0366ca74b0c
-23	1	384	\\xbf6e886af88b32f16932b7dbdf4e1dca22485b0134bb9d016977d19891e6ddf6d7af326d26064f9577c7944da4edccee38af15c3c919eb65806d7312401ca203
-24	1	424	\\xa7debcc6bcfe592b2d6cff752aa7c6d8b15815b99834c93a0e8d41181817820e91124751ab8a4f0fcac15f12bf402934b91eb838f13d74c0fa79bc038d51dc0e
-25	1	63	\\x99bf8ac8433946201578580620ec2723295375c5cbca04dee1483eea79b69d379bbb7c97c7f7e643e4ca154b7a0016596c3b8980a6212b9b75b035f503b32103
-26	1	326	\\xa31e4e5fee6e671c6d449181ea699b6af807accc956f93bcdf078433cacd12e334f7ba5291fe2f373b0b1ff97041ba11403ff6d7859fae20b7e2b9eb852f2f06
-27	1	173	\\xedee540955ccd603b35f13285c045d4d0068df6417e917d035a955e66842937f180875c2fefd327acab41ced1c25533a0f8a0382a03a235a8a8ded7ad0bd3705
-28	1	336	\\xb6a51478a9f7ea0f5042a03fd085035e1b18a2960c3e66e6ef3e18c70d75ca6a1f3a7dc5c9d6b06f997dda913ff9c206d1d5c370690d7c85caecba367d14220e
-29	1	296	\\xa102175fbca9cc722734c4258c82b14c29e8e6cde1300b12e75909f079f62a193695e13b9c66deff05ce7b3622d86534290bc55534af7967a6bb77a034a29c0f
-30	1	201	\\x2fe539faf7771dcc34fd46da896901c48d0796c127e5942d22fb20ab1a52c69bb7a0177b957628ae4eb2858e4164893e5a2575c599422be937ff5d3d1f9b1e0a
-31	1	254	\\x09ff7bdad5fd36628c300f95244a77233786ac43a5cde11972e8b21f306b9b71c5068b0489db27fa9ba40970262c2a2969978a8b3fa8ec074c1629670ced5804
-32	1	252	\\xdbcaabf5424c48302a74f9c7f1b65d95c3f3e27457d6a35e02f3fdd89ee80f8d32d2e77c0f788f8d52e0b64dc9dd0ad38034216dd203681264a62fce3e656006
-33	1	158	\\x0c6cfeff038bdaf371ceb47a53347c8bbc4256cf07b85225d894651c62bcc65246f49f44ee10d1b66e0cd02bad4397c810774645ef27366b56b192133a909400
-34	1	178	\\x81f5498e9b653a61e1fe1cf98020620b783aecf98aa4c42d0495b83c8658e75319366e6b5536d1463b5ff24a5c2532a86905ceb8fb1941b1b179634c824ca101
-35	1	88	\\xaee93925716102dad82f3388aeed7b35d4f52fe8a882c13866e5e03069fa42d59502ec2745f1075ddc35dc0bd19225adda34e024ea73333663b80100edeb370d
-36	1	190	\\x65ac5d7fd3289a6f0de7c8e64aa4423de23173579c5a06beedb8cee0097afc462ff6ae62ace3193800ab9df90c8e74aecaa32b2d9eddcbfed27919f3a377e303
-37	1	77	\\xa4b1de97409a7ff9e1c4253abdfd1123384a7c0f8736c4f47d54343edaa6627934f48dbf4adc1aa011805677fbdbd6ca885c412e9fe1ee3995bdf2c211f6470e
-38	1	298	\\xf0dd9182157607729910a4176b6b624a85bf4fc5ba11f805264cf896a7627740a85662811cbae9df9974c8ba440fca15e27820a99856510378ee22062f012e00
-39	1	211	\\x76c4e2f18f9567ce78c47c3dcd6e63b37fe57b1b5c980a59981194ee10f416d16cc845e08e29fed591bb51a29cb8d8d6768b6acb5481de9af1ce3a6b54858900
-40	1	41	\\xa4c364673c9a2c1cb6325f75309d03df06080ef6b0c8982991db21051b1e98c7ffa0d5852bb11c84e96a367330a10eaf2f57f11cdfdc1f94a8d588266634a407
-41	1	19	\\x98a8695f11983994d8f7753eeffeb13e6237368289a04558b907150d48e743573ef42ae0d7e1798b78f1b5464fbda6252f2c94ddc1c0c0588d089891db9bd008
-42	1	335	\\x5169b96eff456f8a56d068af4a0cd95a3272504bc6c82d8830dc8cb17c638a02e80326ebcbd12f6e0c725fe0ffd0eecd4419e8e423ae844614d7bc70ca294508
-43	1	91	\\xfda0917ac08f905ed4f625e204680f8c6ec7da988972bf4c273816502b1871b353945ece72585850cae2dfce6a740e2c396173dedda0493409b2c519fd7f0b0c
-44	1	240	\\x4ebf817da5b58eaf3b13d587cfc6be826dc024568bc2bf5bdc51674d975fdddba00dedca01e92988ce4000fd8af9e9ba3f0dbb5d93d1da0686cb17f741257a08
-45	1	413	\\xb17c12ef0b8e269a933e956c794846f1be2197ba0c4049e85573bf15936779d985033762474eb973a7933b8ef1332e27aefe44e1085989f39b1c567631f61707
-46	1	243	\\x0fe31860fc6435e140c2cb81b77fa62a93bd2e685311d067bbda89397f3fcbea957b657b48cec734c53fd7eae3bdc2ce8646287f016e5bb74abc24033f08d903
-47	1	154	\\x62185cdc04eb4bbeab6c573b5048eb2ed352f873025a848a958205ea07fc8e1bd899c02a708255387124b99957373931da1b492a44d48a300b75dac92e75370b
-48	1	128	\\xaca3eb6afe5c23352ab802f6cacec6af14de704da734506f953bcca3e5ab3a3686f3338376872f5098700072f2c689e26726fcc96f218df12af693db0e55a50e
-49	1	26	\\x91f02e10d18e7681f0d9cbc921b6674aa5012352d352d00dfeb69fa7396d2ac07d5f2c9a428ccd95b24bc798fe04871e56f2c01b1c90212da731ee84b02d460c
-50	1	169	\\xbb69878c8e35bbc0e8fd582506ebe80c84060eb4a64745add319657af584901d8e5767090803c7d465c64021b0656917585bb2b97e1f9212eed3790dde32520e
-51	1	340	\\x2e7dd5c10bd46cccb909e5271357ffd31aaf6a3271c571ed643e0e5ab2e99f1a715f8fbb138089867b1c6a9b94cdd56a832b71d93f24777cc04d441624b1f10d
-52	1	405	\\xe714511755a74c56d4a3fac68d3085603b1005212efcb57e04842b9bee1faa57b72728318f4fa901dd8733d9fd1d8e833a1ec20775e156671ad35f93f5586308
-53	1	272	\\xfd0c0c87ce70f55729c0344f95e2eb966237ae6d0e1428895de96cd31273b27d2b0cccf64b916067357b6621acd6950bf7ba52c7bcb88b7c7f44a275fef1100c
-54	1	311	\\x2da23a254e0ba65bd67638613ea23b06a037690f564457ee74f81a064800fb399a3bb7f0e652564a6806d496632017df629b51102fee5f845d55d47470cc640f
-55	1	80	\\xe771e816004161360ff21bc2ff9a6f1c929772de1504aabef6b1505d897c837ff25c70ffaffba96be7990daff29526acc4a64aba0995f2f07ce3feeb8202ed0a
-56	1	1	\\x3df22147066e980bb915c9c0207c46c62d061a2b7356d84f29b827c533710077e9d538c0feab7aa9b8e62ee75407b220597eed386042f90ec8c2648aad6ba800
-57	1	360	\\x665dd03b840b76bd0f925a9de8bed71fb71834a50f430dbbb86f7d5fa13eaf5d069d67fc588cddcaf3c20e1312906217be24d94b6d4a2929b9ead4c1aa94e503
-58	1	56	\\x07adf319ddf7102ae0e21604e8535dd43c5667e412a8e4d3c2f46a298fa56c7c657e155efe34366264b4f5e2c175afc72ffad95111c2d309e36ddd6f52a43c0c
-59	1	10	\\x45f07f93cd48aa3f7cf6347adb3cf1be5f0cfc3a74ab2a4c8d851adcff55b5377aaa5cf967daf51b7571056d23ad925bb06ed1a5be44e8df5b62486e67735908
-60	1	350	\\x9a5458405f2094f4a6e028757f3b71c17752e49b46aeb96cb37dbb657801fecaed1d607ad3289bc13c0ab7e4f64767e5d2e644f6d2f93ed146c9a83b6ccdb103
-61	1	95	\\xc5ce91f1bd5d436f50287d36572a587280ce01a6a1aafb374a19806e5b3f459f2a7eac5b382043c9b9eb342fa5e631e14754848bb3d95d20b06d45294f6c7c07
-62	1	363	\\xb1746ac33955c9eb20bb0a61b149611c1182b2a57746b388469eb9d618cb4556392c64579f25a5dff0a32493e35bc2c5ccbebf268353071cebdfbf305cf0f502
-63	1	174	\\x5acc0500c600d9d9f122a15393f1d5f814274e962e96e53feb75367c509da86e0614301daaf6c849a3aa67e69486f3612a135e6ee748f8c666d991f0cc32db0a
-64	1	390	\\xc0f418868450228abdf38434a53a7d9639f7051bdba3eb0bfe5f490d867259a9400d26cddf90d8628be2774e54c04999a49cb936faf828e7a03282bfafc4f600
-65	1	25	\\x0365e563b6fcce85a03f689f5d7e4ad81d16edb760ee26d7bcaf9ed5b069207255c4cc1798df0e10f3317af37cc5f68250f5b32ed4e74a7ee204303955c74705
-66	1	357	\\x83d94dcd5926879ae7dbcda546c35c9c5d75994c34b7923f8b707041875ef7d62fe574dae666b18403614999e3b0c6a8593e79711395d8fc7ed42deab097d50d
-67	1	310	\\x62247f26657ba74fc30dd1917d46a50153d7c2963b60cd8e31787bfe5d6137e5647fec52ff379c2fc050cd570014a1ac7485321a580a28aaec433f4f42c95d04
-68	1	69	\\x6ed2d376a199e1b180bcdf790ad77a02e765f45b6c3fef24dbb793cb3f594fd99359b59a226f2eb12dfde1688e4c7a2f06dbe327e175abb550f1380e7d1c5f0e
-69	1	62	\\xdc4d3e6c0b53316a7710c3a6f586cef07bb2a56085872f3de7261980538b787ada0c8708acedf062d37891a78ea67bf95db96479122ee27802edc72c2a794005
-70	1	402	\\xa8b7dd455bbec0633d0d08c89d7f2c89dd9aa3f2d8dbc38db9f13c5c910bd05a9880736cf9c4ecb16b21993f2c7c750b4f26fa98bb2fa775ccfd8340efc8cc05
-71	1	223	\\x2067265c0ee1695f5a6789500ccac020b982173e40f8ab97db1adfffc3fcdcff16b06da6d5d6aa4104cf8f98d3bbf6ff2bd49ea809977b820ffe4da29e9e8503
-72	1	379	\\xedbf25c971f937ca6687c0c48dea23c3f69b8c33c70770c4a138b012685d651a1f869346f6c8fb58c9ab7e0d9de7c43cc55b7d2942428cd647ee881ea9664a07
-73	1	79	\\x7705a4d4c93a9ecd268baba9d8f7ff15b4b2eb59ae2e93de284b9ce8673c41a421221c364ed737134a68e96828f66f9625a7d0beb8809f6cb888775e6b2a7f0d
-74	1	54	\\x20343bf992c277cbee499723b40ca38b4964bfc56b82c9423b441e698ab4a306117d8d99f2766af70cb828f1d5b574fcd444f13abc38590bb6bf75e8da0bc908
-75	1	93	\\xa31ed6fc3063b160c3cb93a8c055747c3616a6b3f0445e0edd9d491720d2ac989819ce9a4f7556a3e74112f624d57ef457035fa1d06f477cce5340acbaac190e
-76	1	42	\\xa19c77273919c2b266fca4a022f77c44edc6c9193b08050be6f4a4561a298f451d0f14a0a6bb2636cb0dd391068ea95764abb880ac1fd7d3c3532bff40835202
-77	1	239	\\x5e7635a0f5fa5732e1c9f08c6d68722838a88a2c42c51ef6668b4de3ba423d15b174c1f1eb95fed6e192e02b73c5075cba9558bebacc62a5144a3384f5a5b603
-78	1	349	\\xbd54a00311111bf334cda65552456a7f00bd0ac4c34027e0c1cb6d325875e858f3340b2346f8e0e07e3c51ae7e7de918967852cd75741b40d74385a12f0dbe00
-79	1	251	\\xc7b6149127159e3a304894428f41e5a676fb5b98d12db03ad185d91648f574c7faf96f2217a9d3fe0b8f3a82e72f8f74e8d210b9ceaf9cd88b0cd629ae9be606
-80	1	256	\\x1c51c45907fb795e923e7f4a2f68e6b03499b8fcb0934aafe572835ca4d8661fdab62fd5c42a32930acb6bb1598e76727ad6c0efd49c421eda64e1512f55ef0f
-81	1	213	\\x781b7f875b5889311121cf050e32791dc9f787114b32e1c64ab5f03ec0313680d5dc3ee141c77d72dec05a2515299292f26ab33f78d60aeae4be9d92208bf60c
-82	1	40	\\xbf540008a56baee43e5821432d569e6368d5d1d3e171058114da82d3c958fdd830c4a3fb59476217c3afd606884f8572cd266c1fd3fd4073676055c8f1f81603
-83	1	89	\\x6d54f0bb237edf33d0d52de813b07d9c3642be37dbf0b24d46f72c6ebc3f2c5bb574c5309eb87fc2a1e071727bd0748145065a86361fd4b75a66e463e44e5b0e
-84	1	365	\\xb2fe4d389b3a11e0596939d47d0d20b41fa5ec67290590fa1deb0615fa92f9ad14745c3113346088c8ceab235bc27dac2ce875fad460595f47a54b9711959f01
-85	1	96	\\x4e54414b95bd1773f89d6a332f4159751fc1cc4c5795e665611c318ec5a5be628608c30602ef4a49295a3f932bcc2bca566249e4f107e023c29e291b144cf609
-86	1	175	\\x2451847f3643fbd484bb8652c8ba96978dc970bc1d8e1bdd0af88e807bb9e61af595ba8f293a822c8e4db6f523133ac9a9251e09b1b199eee5d49f406ffcb00f
-87	1	386	\\x1159bfd3552a9dfec92f98ca009575b338a697c4c9c2dfb45830d816b440919645502088ac028fbb9c173b6ef6fe5ecb6ea20cd27aea514149e91cd64b6e4801
-88	1	123	\\x35aa17739756600ebc9efaae7cc218975c685acf4fdafd6c28d09b283a2c6539e13b3193a41648b99ff182bb91e93126cae59d4610b778bc58834d3e70e3f500
-89	1	35	\\x2eb4895bd7b7081d2c16c0fcfb05bdb157e13ea2343c73300890391eac28c7644f55e4f9f6a576d0ca1489f4f7672915782dae9a93f1385548cf1339d841f10c
-90	1	136	\\xdfa9b893916876655ef56308c08b86b3c712b480d4318286cb1adf93bfdc72f4b483448850929c372cd2fab96a6bd27cc9567aa41d50438faa14bdee6dffa201
-91	1	203	\\xd10875a62059dc560b94d242245cbe729edfa1c5ba4e739694da1c294aced24a01143761c64e9f28e0b3f9bb3c2c2e4c9f886d889f449793324a9eba2b5fd50b
-92	1	262	\\x268d657dce741895baff0fd1bf4041926b38fb2c064e32743668b9bb0b07ffe0ea9fdb3c2da6590ec209e98df21f640734d1d665de2b9441fd89bb149b69540d
-93	1	258	\\x52d0f691c31a18908b9e37732fd6fabbfc4ed93934e2ead2c82c2f721db9a02a1ced9021a55e27ba947d18c3d08b9f2e091cf4202758d474276923a95303520b
-94	1	218	\\xece537997c761b8d47c99f84e75f18bc29d26eaf6ac29ad75d1bde66228b759f9e2de33e9627ee071659237e162f188949587df0002cc21f9428a56554434f01
-95	1	18	\\xaaf708383fb842e5952d0c84d1e51486b45361abba3dd8ec9a22f60cd24d2457e29899b56c8312a8ea3af38605196563db692c96a2768f727a91fbe407bfcc03
-96	1	159	\\x00c922d7893ab1174acbdc5c7c201a20c9fef47da24d1ae9bf36e0cae9e45e6b715d3126e5de6264c1e8f4161ee385dfbcbaec1f0257a7c8b6f256cfb0ce200d
-97	1	408	\\xe37de67ba5a7c12c088fb334eb395bd8b85f2f301342f2e8dfe3e2a9367ecc57e1d9bf4fe589fab9c8865288ffa13fffa17cf871b5ccc825455adf09bb28f308
-98	1	86	\\x0ffa85c817aed0bea174a4bd7e39e167b5176c56affe38ecea28a714ba3dab9838e5d5152b9678f09ed5faaff66281218d730846c856b8b6a53b340ba52f4d0a
-99	1	29	\\x77c4ed3b45a935bc1d9bbe86b0d1cbe9667657ec9ffbbed12bca1c0e83b97a2b54f698ebf54eb7c9fbe976331d4599dd4ccbf4b0071c4a285e96ac062e9d6b03
-100	1	344	\\x6e5e8290af53674fca8a145f78f5f9d780917a6861afbcb080a3d11b190fee3d9d94dadc5991bb63a96f7c16f8bb271a534dfee13be85cc15063b6c38e26c802
-101	1	230	\\x02c675413b84d62d5d4a3029636a4b6c9a61e0f76ecf979de357b5535701d47fa4119df7d839a809ce2bbc25dd7866781e402cb4150b563bed2f2e560d2e7c0d
-102	1	361	\\x0db62d3fb74e1f4f5b8c2a54aede978ffca4c37c6be091a4bf97569469a58b1cb9be8ead7b5985ea1af378bbdee299c91d0a879e2ee7a149936502858f00810d
-103	1	341	\\x193767d67b1505d7b108e2f0e0a347532714b503b1fcbb5a44363a7a4fdb53a406c93cb803329ac300c7b09046a98f8b204eb2202b5d668e073cba3f21fd9a09
-104	1	151	\\xd578b9af178b4d1c1f894932eb51f21af0d5e6879f2bf2c570cb9af6eb1cd7a11f01e8e33cfaa4785a8d19e2e79ff93de9e6359b3a16314d867063c86938990f
-105	1	52	\\xf3d9d88573a6b38a61d525b9384b58b553798c523865b30b4e6d3458bc1aed83616186b87cb2506815c08bbf7a7f0f741f3dd7861bd1dba850f41cdf833b3d00
-106	1	179	\\x4b2c480f90aaa9e13f5777e0f23f2f4e88defc7f1a18728c3570539d1e664924c40f691d680600a8e70e3e5666861153a573820a76d2cb2fb277c4d5d57cae00
-107	1	163	\\x11292b021cac955c753300f42dca7bc1d43188c0e1c3f126b7a28775ec3556dd64d869d7e3a58b6a8661579660b724df8af69598c05c3d9f3d3009297200fd03
-108	1	198	\\xc8f9cdeed19d322a27398476abb08f56901c12103deb2b03c4996faff36037019c261aae94c9e0d986e4f5b8d7c27723b65ddad163a3b0f4ccca00d60fffea05
-109	1	294	\\x2c33d9b34fedd08b6f3a1743a2d0e22aee9313722afc76f35d83fbf00ee6a0e42efc33737a0e88a5ba3878806293cf4635eb0ffba156711ea4e4bc51b113b901
-110	1	162	\\x2f694a0e7f55b01689620f3ca7ec366a30cb9dd9be8602a65bf24194317368b08f77a48074a7ddd4a1663a49e130977af5b9e88236ac17d1dd16b7a2159d0e01
-111	1	146	\\xc43f264ecff361ad44b942ffed165cd24bbb0bd8be208cb2089424983faaad1290d19e8a99e3c1ff8d414534a4bde1019363450c6fa126b9e36a614695198a03
-112	1	204	\\x8e314e20d5746c04fb4cff77af91b297252dcc33fe9f71a1853e45b0f9d05be96a2a855ea28d3b39f1841ecf5446e08a31421e991a5a9e9c0042d3382d865c08
-113	1	325	\\x8d4b15839d795249fcdace4e6885d806c40dfc714da8d0a1af03cd789fb582078c4a76667b7cbd931f5f9d2949f6cc8a4217585a08022442501475c590361c0e
-114	1	387	\\xe4c57f483b23d1ba397aca886821e046889abdc545772273f1c961218e3a8a5df0e5c4b8e5ccd57d3d97281d33798b96c54b008a1706781d84de71fbeb5e2e0b
-115	1	191	\\x4b81e9631b13129e6bca67502e36cd6b61980bdabedcabe874f9b44ab116224cc2a4b728f643a8f29897f87d9759a58a5191b77657c42f80ad4431e743e93c02
-116	1	409	\\x3c3bd4daf9509a4e9f14e22e6732129afef5d08722700faaeeee6747535ee9e323215f31170924e0b763eac93a5ec20c7d4faa454d9ada8dfbac0fa873557901
-117	1	406	\\x7e6e5e48f5e7ff214080d73e3ec665fffae73302e8a667733e3932b9eb6944828fa9b491c100ceec912d8946c6582e596edf5ab8e47c2429c0f48ed44575e405
-118	1	334	\\x96c2b8fe3db0472cd6c26ea15c70778ecefdfe495441812a494d03b5a421ee3f1debc63e706537e443da62286c3c320298ce774e6810ffdb35fde68c0de3010d
-119	1	395	\\x177870235ec0ddf6271015a16fbdb6ae67c88f8911caf04495e8f6b495659f734680cb4441034492d029f24f1ed2bea96bd6405ce2c2d2f33de602adbb97360a
-120	1	273	\\xc63929aa9545ca47ebb8cec0ef155b9f58a21afad6987fc094f917c3309f74cb465193aefe8cab36ef1cadc0d9f683480690418b9e1568ac4eabad373d02ec06
-121	1	388	\\xb651ee72a70fda5610ba4ccf7d51ad7c56031ab28039cdb0b9441f77f2b0ca31772bf899f21b17edee117ed68572b6e230c1dc599bb80d448a25f24345a35709
-122	1	255	\\x9df888d84ccce92950c1736b4e5b349262b6b0e8edff9d4c567a7cbc827d7e716cbc646d50abad96ac66a471a88174feecba9310f1519a4313fa49645968ca08
-123	1	353	\\xb53368a38255659cef0407da744f8ea402301eb922f4ab1809cd28cf32402421e5ebacf0ea114b94257c0408875085e855b27ddcdbea8d1d33c81646b1ce4602
-124	1	237	\\x5376b80a7f7bccf49f941bf35bd1dd1ac61673673f338dcc38efd20edcc841e1a8082670ace28368277e400b06a4d57f6e6863ab9bd76403c8aa5be898d8ab0c
-125	1	290	\\x50bcde93bc4c503d7d72a2c066511246a93893e02ee3d79d7b5dabc15d8b9d93032ceba873efe626e7645885f3a87300d35787ba0c4a8d435710038396259f06
-126	1	65	\\x9c5973b71930da152fd2b8d610299eace7ea48c72ef639b83a41b3a7f801ce1f72f46646dcbf95f8dd4885bdabea02cbc83e88bc362adc08919d1cfc04382a07
-127	1	51	\\xc965a09be31fda585007eb97167703092bf4fd47b83741aae0bd69c8cecbd9b5240c9ceec26ba7a49885369bc09ce056824f3ed32ca7345e9827b6cdf66eaf06
-128	1	196	\\xd840216ea64056ffd5b1dd876cdc15eb8ccbf7cfa3ab674ddb535ceb5161d4d49a4dfba4f95ae2869781f0944f5ce1b7b21c75b3c104289a04d1031612a77306
-129	1	184	\\x883c1ef81fcb10539794350afdff84cd84518f553d8f6dabd52289b9e381d53b623e72cf4aea2b0bb2e4d974a6519a94ee1c8e5f16fd8d0aaa36c37c68d4db02
-130	1	278	\\x628fc244f19f2616508ca8be9816e75e49e0f341b2e6cc59ae60425d9178957482396eac7caf0a3dfdc87321d459c6aadf125734c47bb18a36e18f914c480a00
-131	1	233	\\x30c9346b9d9cb1ed0ccecf186ffbf60dac3e38883abfd05dbe9f274370f6d151b4eaf396441efcf7f1ce0f6ab261ff3ef2f480c7721a13f4c4f451f3e98f9907
-132	1	153	\\xc340e42f0c42a4cb3cde90f1177d31dc5d8aeddc2ec8f581b1589bbbcb15e42ea7a11a37ed147bf52d9f33d044751137fe214c6aa12e9466c8b6f476ad7ed207
-133	1	195	\\x0b92d852d7998fa547c0107dea9d9dcca2f439c95f7047a80ef0ee2e5d2d4f3db5e2db3872004b9ec00fda6e192d8d8806a9aef4687de82a089524a1927e3003
-134	1	248	\\x7e49e9ecc51b5de856094bc9193428635e7b470a2b9b0349ee75a8e8eed6c934674edb1d1e745bf2857c3b88bc584b82b3158268bc29ec0d62818b1857914503
-135	1	149	\\x0b68c947f2b359b8bb365dfd4db79cc310d4cacf77fabbff517c0c4eb3f176cc1e7bd6a478c262750e2892075a224b23011cb2bf6ae857ca793b66be2b62a206
-136	1	150	\\xe563e6eb99c07efa6e77616f33dce29805531b3fb8e9ce4b3b3c4e95884f112c33b8dd12b1ca3045d08307dfe0eb275a0a56ebe9d0085fa97f27d37d2c9a870b
-137	1	194	\\x8686404874fec5faaac09636fdc99ca51b3b47acca4dd5e99fea2b6d85e4d202433595f3cc79c2360dec1fedad4640cf338820bdf99b07151940692891a82702
-138	1	253	\\xa167d695c8eed79c598cd10896277af8eca3339ee638e78a02fc1018b337d475fa216d50df1e025837749f10ba929ab73ca05445fbb05f507ca236dc4ee81b0b
-139	1	139	\\x315fc9cb9e7cbcd1794813892bf902c67019fa2d81e1a0e2e6df11a0bd4229322c78af3c156c14b28354eedae50bb15549aea68100379b6a76c50892b1648908
-140	1	47	\\x2e1c540097db59300d77ba09f183998bcec911679feceffd989ba81bb4ff552e0de2ae8471edcb12bd29527c236cf52e958cd3540ec4b5a987b63da0fdd89903
-141	1	232	\\x7fb9d960ab49fe7ea99496e89cfc0eff6fbed1f1c30d4b79057321f33c2c0036a50f8705334e7af06310ecc5fd57fd9f99105ed3877607351f31062b6c066505
-142	1	337	\\x770b3615009129750c53cf6b213782df3a09cb4b317263649de1d7e4d589ffe9d4d004ef937a2ec6a3f9143378f64c9187ff936c537d1403da735ec65cc82d08
-143	1	327	\\x0536e7d6bb877b9cbb65e32d898b9634fb80e213864d7da18fcb4a2c9c39aab80e1829af424f6578a35c77a85cc7ef61d69547f5e73c4adea01fdd8e78a01b04
-144	1	30	\\xc5cef7f548a9fffc2edb6a1a0571053760b23b2d6c3f37dd2d1d56479425b861b3557c77b4c29646ecaef32b9b39a4248bfe266cadf7b4f235cace462886b001
-145	1	333	\\x2d9a999ffc31ac0288d69f4441dea1c934a0372a816f28489fe92906273e9b2c388c33f1fccfeddc2cb7b2854996e6fcaf87a33aba1f78415ece72e561fa150f
-146	1	5	\\xc00d3c93d77b4c120ba2a64dac5059ef101deb49d9d59bc7a6df49b5d2f2011d8205b51c742e4f1ac52ba5d45edfa848c9c7d5d1b9b10d3ba1d9b25b3d9cff02
-147	1	15	\\x91d8b3aca41c5199397237c39f5fdad47c73807f3d61f8cb33da8b52858c1ee0d51071a3ad1a272ce7fac6c4bf6715f6e3a0da342ceb0a2271030fe0d5743500
-148	1	317	\\xc3e29af0f3657c6a62477cc7b0c6dad8d6a72585029f74143ac9ea7aee7a5f232b013e5faa5b1ca6e78a8da8589321b2ba0abf38d75714e1b5c270ed82290109
-149	1	53	\\x5a37810cfa69b4ee07290291e561748a29571f49a3b3f1fcdd4993adab371adaf1f0d0f6c5f7ae5bb57855e250419fc13148407488c7f9f14eb891cc8c86b90c
-150	1	314	\\xad22d20322cdf2f0106228dab3233093264c7275840e40a4920df4518f2bb97e25dcf313651682fa17aac9ad9014c97ad67d096f94ed121f7ffed43d2808b308
-151	1	355	\\x490dbadab6ffaeb446289be55158115cd67b28c1d3d092f856754bc3b394bbb5e940eb344f6b41280d0ce3595885a9c6ea9330b568e19291b45e2d08eb6da100
-152	1	192	\\x95516fab5967e66852073c1745337076e53d64dd32f7843fffe76b5f200b641356a2be63475295b9eaab3c8da0a322019c692b54486acadcd461493716ae7f08
-153	1	312	\\x77cd41456b32ca3711df80af5a5027b5cf87b7ca49fe4da6ae05a1ef98994644670c5ae748b842993f050a87257ba741cb43159034bd4f8bdfafa1c587c70d0c
-154	1	323	\\xd989d6eabfac52fc6f3d3c49af2f3352f1f0376b94f0b92425b3d565d3a7a3fc60ce4d247fc6988c035d638fd9ff1cdc254b4cdd128a7160c5c3865cf11fa20b
-155	1	313	\\x0bce16e993b8a3668e41eaef86d7dfc581eb49a1a332139702bbba61e740334d77a9ea8f503981c224673f24966c5838ca03beb2be9321e5b74458552c8cb108
-156	1	295	\\x3aa1c3250003ca9f6f077c566f6df69967131e071d02c137db18a8aac2149c529b02fa349b848fe21ce3e8c74bca68669f06c9e5490fdfbc46c9d916ddbaea06
-157	1	364	\\x828663c68d15b5bf04dab5e11d0d54ae46d61a44a863cf059729d14f9c38132b530c024fc1df624a08b3eb20b873ea78b6ea1383067e9148283cbab8442e5c02
-158	1	171	\\x130e4fbd32748dee72876f64ae4b6d0fc38b802e6374640078e4ea4dd4c96ca25e68fbefb1f257614c2be5c23a712472c8b40fb1bd67b8c4a21e64ad38f06f0a
-159	1	133	\\x855163031c63721afd67b86a9891180b0e8fe3d940c670da6c6645ac4d3e55cc8e44c263948ff97727d11fd0faffdda7becb0c85cab8cbad9a2a76bce62cdc04
-160	1	4	\\x1307c113ea7760171f422cbf0496effea426a9fb4553a14b822aec41be88693e3819b00feb691209e902ec495bf9f602b8610265a13bfa67d948bc7ee24dbd0a
-161	1	108	\\x7fd5ab753d956595a48439e9e985063d298e5820c5ce86f0cc74261242c6e0b5f63b3249d2020bf77e68de101f2cf1fe4494410f34e963b3a1d8c79737b73b03
-162	1	113	\\xcee006fd05760bd71c7b3f5988b49735e3e7b0d4445a6221d75d1998f09b8a22f0d4a89c205b31b2ed6a5f39bbbaef037809a0dfb5d4d2fb87cf85859b803b03
-163	1	160	\\x5e8eb311ca6febd61bdafcd095729a40b441d85ce8f68832d6fcf1c1d2d6c1fb2b550c8fb8adaca0f2ecf998aea9aabd04d06c98222d454a875bc511946dc00d
-164	1	214	\\xde2bacff72f2f478fb81cb40f77ef1484d4ca765c5b881c374a11f14d0d12899520e31eb1a93b317ccbaa490e1b3bba8b0fb42277164c2c12543b9dfc2c2ac09
-165	1	57	\\xdb7c7e588255b1aaf97c4453eca81d71a77e12ae48571e470fde03c623717626d7ebacf0fd26dfb5db42f1c2e50ed769a26ed5b133ae189ff1f7a11c9fb52b07
-166	1	259	\\x334cd5fa01406d76dd114a4b6fcf37766597c7442d6ae35d4f70cc9fa8d25b05bba9f100da2a76034b5e540513e78547ff2d883320ecf914f4710dffe1ce260f
-167	1	321	\\xf7555f591e9702937b4a5608e9a8ceb8fe07363f4ad2966773f7bfecda918d097eaf80453aff9bf7a0bc62ffe7503b47152f3f2341adc27482b7099595aeb404
-168	1	375	\\xd220c4aeb3e5514fd65dd418a191ddaddb5b5f97eb0d91fabc4cf3e3a0da87bbb6df6227fdcbf737ab08d084b03c79fe6f15c7058d159489b2db0b0c16b25505
-169	1	172	\\x16f60991f302ad75c90b616708547f1ffa63ec3d0d49490480d20c1b71f2437ebad4b34e6d6ac1a81f829233398b8f36949124e0d2a5c5da440ae1b3077fd109
-170	1	87	\\x74c2293a823b1ce99e1dbac3209882e2c15527971430d71718b6f91fcc55aff7abbc997f72d78e46405182d73b7e65fcd9f43fc1fe939a49600b67fc2c1db009
-171	1	182	\\x20f6e2b653bc32a6f0675cac1cf4e8e4a552e49d6cba0087f323a0d1bf1d818027651b12c257ffcf280a54d6e21d874ae02a232b81b2cffd28b515f137d58c01
-172	1	281	\\xf72cc4de82d2aa0370073714ecc87a2a262abdd552cec321cf750b18ef709e481fb438adce786a5bf2c46345d81f0566c1620e40802d2030a342c181a6a68307
-173	1	316	\\xb0bee147f7368fdb0c6cc70d37240b8c15cf5cae6cf3ecc99b365a3dbb5c7cc42c33fca17dfe8e639059c53b4f68316e87d0a7b4ac6e4ed9e1f8b0a017a6040d
-174	1	410	\\x9544a67e2f94a28cc02aaad0deb3850945113d2f329cffdb20d5db7b7f175eba6c0dbef356e86150de7be0061f03a5cf6a3f1244eb5075cc929246a80b5d3204
-175	1	288	\\xd9652e6d460d474a0b830ba6c5267342be20280c108d78fcdfba1a1f6e19a8bd3b48a7ab9dedfe6fced38ad1382e211d5096a45438430bc6a042b3add6a18a09
-176	1	144	\\x16f2b2c2c77ff6d683f3184a5920e677217efa3f5e99db926bfbbe7dd5d6f86a79f0b41064035cee643a450f251d9dc59a17e2af71abdb493187ef2146dd730b
-177	1	135	\\x79eef86cf7c985af2e2be51e4eefa7f462a24d718fd4f0083d1b2852bd9602a86dd1146d3df5dd7c5b859c001205bb08e960588362002053fd60299ada941103
-178	1	319	\\xee9275fb55eef19d82b4a1b91b0ed7435a0f3253c9e2dabc45f8ba167e4520a424329e7bbf5c6587505d9ed0741481b00fc92e1f5df7cba73d02d4d2f33ac504
-179	1	188	\\xf7c0fe504692a60b426dc3009a05d72ea603534573ace1055ebe556672bed0e3fd54379a7ce105fc175cad6774f422d3a4906dd240bd1ac184767374a992130c
-180	1	270	\\xdec12e7884f77784b18e1baf8292d919280d6eb560a62c453249804257e26fe9a95e8e370c5c76ff5061be73df4a4d454e7e72c7116afaea013676c7af32c906
-181	1	12	\\x5c68d3c89a6b4db57f222db7db644a361114e07422b20f70c230eaf5c04c0141b13cbf01532c0270e122520e85e1ad9ae61c0d1030fa0bc91137a22a508a4401
-182	1	127	\\x107bd5d4c326a35d480dab4fa73f46d64fb18b971535244d3ab075994f90d6af9a647e83de1e846b61977d67d6e24a73a62c140b15a4b9455854ad25850ec507
-183	1	67	\\x4f58e48a21e320dac381407418b1c844d5b6d727bb7d1e646f403b867a59cf4decdf61d451cbf8c201b2c9251f63f0d994706eb111ca347a353e936ea19e8308
-184	1	261	\\xfa719325c7a07a5931507e1eb9ad61ca17d3f781751fad52be1ac2391912f754a68a6de95a75307ed77f907981ef3126bbaba05d1608f5d176e734db0598ce0d
-185	1	132	\\xcb8a91fe91c1c2a8077cf08d333be4476127c7fc699c162e1b23bc68722f02974840705ee0805416f4c866bc9c1e8b168347e2d2ebfd78b4d3b5568e1014e60d
-186	1	366	\\x27c187a352d86c0203578d4465f5d42774faa710e0b34b622ae592d4bb05d321ee3dc5e97e5e455d13c22c0d6bd21b4bee125bdd2c41b399188fd74e1f13750b
-187	1	231	\\x02e5395b8e3dd92f8df05ef628f8269506926058ad18d4edf18c72ea40b079940e106d74e5913c0c4fe79363435217a532f590c03f9f31b66d60feaf23c34a09
-188	1	371	\\xca999c1e34c27f5c829be149b1e19e49dd844eb9b7d79f405a11e9e8798c5875b5b80900f3de464f9cca30179a3a38b2202574c898fa64b46776d38bf008b60b
-189	1	138	\\xf3e736d00b4242bfe9cc299879eebcb06bca6b88cb0099b3a24e8f1c6f8fa93825ab156554d529cc539b7267b7af35d5912996d68bf7df1f9ecfab600bd54006
-190	1	105	\\xf7f932c89585f253a82651c8722a36d94f925c16b3cc4b18006c21fea95e4bae7f8bfab72767671f4462e45b0c0b4ff140e410dcd49de4b5e12db680a6d7190b
-191	1	245	\\xaa35aabad330c83de015f1923a16e9c2699c099d7cd2a35dccd70d3ccacbae3e6688128aa0dd6f3588e7d9600272f903c6a8c434ffb5b5f6e3779fc9bef65f09
-192	1	234	\\x7b9243da23e19f529c22695914134c74174e9f73bdc0cc49e944915b8768e49473913577984276cd571c2b0386cc254a208731fa4074a37ce9c5ae6de993530f
-193	1	267	\\x695fbcfd1bd6d5391ca6e7a4267627bcb9691c6b5fa834b3ac8a29002fb981e7181bc41548fbe72efd13ffc09032cd71301e1e61ad12c6a11624aa5aa400f30d
-194	1	301	\\x3445fcabe03bbf8d29cfa9cf55a2cad98ce50707cd30d939219c05f44695f98eb0be2d3fde27ebe1703adb7f12907e1cb0a5b792cca1ff7061ce0486fac1af0b
-195	1	277	\\xdce5c31552e38eb1d30eabfc7cc2ce9377ea52e507a6c8af3bda3d5a0dcc32fbe5e04fcf9a6eca0b30f271dd471957d1adbdb99a09a5d34c63a6dec1453a6507
-196	1	16	\\x79c38d3b6420f5b0a6b328a4a6241ff12abc02ba3abc9b1095ca7bc5fec5863fb37383f15a639a0280f9573cb795ac9ae79bc49e993a3e83fa79ab843276e800
-197	1	6	\\x90cd5eb53e175b27496e47167ef04f98002fd0cf8788fe5de79f0c008de7f32e8fc73894af423cd3403f4e12df82eaa83930cf313a5fbf214f0c8711f1be8f0f
-198	1	421	\\x9d95fcc59969fa816a652f1eee955f6bddb3648b12734f6658cf1ae35b564d907dd182bba149ac1032895570beb234b39db6ed4745f0acfb47e8ee051def2700
-199	1	129	\\xa00c2068f7ed7424c21e602e2e0598cfe0ba18365cd4dd11fda62c1c610f52cbd8e71dc7a51dae76f04961a59b286b7cfd466ee169284f4938790ea8f1207900
-200	1	39	\\x0d6155d494a46957c37b662f735af77935e4b76648ab613dec08068ea85f2fb3b5f895d020fdb2fb09d871edb4671b80db2028a4b4bee09569d9a298398e6d03
-201	1	102	\\x6fe600c8780732f4b823cc1d02826e30937051dee3ccbbad0e95ed570398f22f76232a4a1bb2ce66b7ba222afb1ea5efa4ca88177cf20422c4413773c8456b05
-202	1	362	\\xbfa31646f514da3e09089d03de4ad20d729e572bc96d8be384ed07269a5e0a3d68882e8b7e0bf864c71029f068895887c0e3f356d4cd89a84e964dfb7e61c506
-203	1	271	\\xabd6f90be35df4a7498e169050a532bc17e530faa99008a6d733b94418199065363f0b8b3d166a1edee139beecfed217b994429ca6f495334d2951de1bd8da09
-204	1	73	\\x59ab57e2dfa5c1af86a8025b1be5bc81806e5d73a600197537331ab4b8cf9e290058f6594aacd449e35ad9486f56e78cf204c091179e9641d2915ed6415ea001
-205	1	28	\\x02c8e944c6e655926602d766c79ee093c4ebb4b582de74e886dcb60c67f5b066072282800dd259f6d6dea4d567a238d8199620765e7daf66d50eab751c025b08
-206	1	419	\\x48fe79213d15321726bc85ae1de3286ae6181f55da376a17f9072a912441037e3207d21675669d6e2032e5e48acb0380d275cbacc517de205bf72d2f6d93ce05
-207	1	3	\\xe134bfd9c3f010f905db042f3e8009ae77b8c12b4362e596dd2f6eb4c1f9e2f06d84a29e5653dd87b83ab7ad0c48188796b517d731095dbfdda32f7932377804
-208	1	423	\\xeb37072737147763c4b69e4ff741b334084ee4772a6dba766d0689ccd5a4ebe5a7e8fdbde6c487c33a8d41af1aa151aeafb979aa45ba53455247090bd8d3120b
-209	1	101	\\xab3bafd3d6358c6a7f735a0f34b80a85c4cfa46cf3b140ccc22715ccbc426ba2de379ca4148b1b88fe3354818c36c2e81efdbef33a4aab1cbf4b4a9f06c56107
-210	1	48	\\xc36396d375e7d185967175886ec76a9ef86c4bf47657f627fdcf3e3aef041a33ddcf0c9c661cd0ec20e1a4f86620210cbc3b5596796941128463d3356d708b09
-211	1	263	\\x0d1d27c649ad14213eb921b7f80cebba85077647955c2e01b63d512d914debfb9d43bb2b1c2d0248c45805c04a175a69c6963afc63e78449b9a7344bb51f4203
-212	1	119	\\x37987927b322f2520f4e2924fac6ed35c446f9137bd563caff1d1dfd80b8b0b2edf704b8147eaccd2e0189a552eb2c671a3502016d6507deb57e60bf30d8690f
-213	1	207	\\xda1053040a7baef552a52bc5735ea580eeeb28c359bf51e869280638ef1a96dab4d090f1b1a63e2053d36c3ca1773d34d10fd06871bf659ee9b6ceb5d81f7e06
-214	1	352	\\x6db9def4db5133946099ae3de64099e68008562b267ca135fa5d1638cdffab20232b7add65db43cd4795c79c782c2b0ce36743d04adcb6f7f0441577fe9ccb07
-215	1	264	\\xb60c358ba18166f82f1645e8c4f26777505a88de21c6d22a4b5e925499550e5ee94f4825f09d90ede7b2e0864db6f732c9b7747179c5218988a8d9f6daeb110f
-216	1	114	\\x8dece950c41f8a39ac7a3285a846abd46475b8c91661b33c9e700ac3e05196d3603ecd7ea93af65d833970c1edcf5274b18970e97d3944c4dea4cf9ae824df05
-217	1	111	\\x888978574af2f5a448e9cc0ce014fe6e674d30c39b02d2c59b31b4e359c70e1f25f44a9037e7bd706bfc95e11001a558fa110fddd8ceb7ed1785d8dafb4a1809
-218	1	71	\\x10778c60ae02c22592654b30bbc8c5080b4902bc2072046173e3cacf196450c169632186b488addba752a2072857f33e284ccab61b540b1688b674ff33f7460e
-219	1	83	\\x3e7bea11dc09f6255ada93d6b421fc48361ff795182e9e800edc52de33879cebcfc9ec3decd9e9a784cded3541835d07734f6802dce2d130e773386a841fba09
-220	1	220	\\xa4c5648e79e6c4d6c483f9b085f965875a6bd5e6d049677a65e8fc6830b7af61b127a00e2807068120d786b24ab46e76c0bd419f0d18971e1f20b115c12f1901
-221	1	416	\\x87d6c02548175b20f8e20c3d30ed4be52e9e0a565c7fc4a4af68e18b5ced7deef8323596157ab567567f773080f546d18383796118714d9860de2f096968ce00
-222	1	284	\\xa9ed7ebff702a89be843f9eaa4bbc18d1babf02d6dc6ecc344e85c3cc24f000675bd777a5992473a8a933a3af5e9f4a0604a460efdf039516eb9a2fd45145f0a
-223	1	417	\\x0913f7ef3efc6c2ef8326ea03e835f31c6cc1a5b3efd8ca45d2cf6027e34f881241145c425d5adb1edbd4ef12b7b32087183a1cf502daa0df374a3c703d61505
-224	1	226	\\xf8eadb3898b67bd9030ef22f4b9b6ab47576baa9a9da74aaca1e223441d6d0a0c4cf33bab3d77de86dbb043e5d3753ee6c4c77b8fef04702ca6a7e2009cb5807
-225	1	120	\\x700968d383ea05a60d30a75da681e0858450e837766ab7291a2eb627dc2fceb84791ff1cdabc52676ab3a58e756d5520e38ee4338450a4c5af4180b2160cc10a
-226	1	110	\\x6b1e023b8930e116479c74e6df7d892f1ee02405f0c93d48b1eaee5ea19c6afb047cd0bc585f5c9564c913d2106784b8c0917dbba124603194fd8e8f47ddb00c
-227	1	356	\\x3160f7bd6fe14e8b4ee77ed183e6ddd1d67fea3a4a6d51f7ad00de04fb23532e40c55693a6553c0475aaf5db54175910c9b762e52e3159d3af38850a46d6100d
-228	1	31	\\x81f43cfcf561b721ef253ec9863611d8b3bc295b4d7854b9e57f97e33df1ad03483322f0b8cf07bbe79b5839f2d51f152d224a9c874061c4fa61094e37c75c0e
-229	1	167	\\x063fea6af822d8494814100e96994367978a653fd3298715a37bf7ca47a8c02bab7009c75407b743bbb6db72ef519d6f0bcf2b3321e6cdf7c2b7bd58c5f3830f
-230	1	121	\\x70f5873252d421732f8799fe928bdb688e6b6567568dadf9bbe9ed1a4c0dc70a9abb4d9b1aacb18959f73e34aeef62a81a41278c93876d049e19813be8dfc003
-231	1	358	\\x0ee5909843eddb7bc8b99701cf4669f114fe2e85c8ca4490a7ad94c31784afd0002f85d1e14ecd408f1567959e1a0ee1fe56a68f7e4592099babdc68b16cd107
-232	1	285	\\x5384d51eaa9759182661096efab6f4962bf02c71c041f5e7dc4c84a04f105c6c3fc35b3728e7ffe60f1619848583aac8bcec3f9e61ed8df9bd40f34653149900
-233	1	117	\\x9c2ef19a05ceeea1874ad56e3471033401b6ef714d54054f43c8d8ee93143581355bfc694dc184f0f311259735537650d4238e075d2b5bd6c0b3c1fdc78bfa01
-234	1	367	\\x33c07eba3e8fa15265dd595f4536c48e5677f4963d166d5220f3b88011b3dd8483c1c2efb396afcde55a6aedf2da7c7792777f1ae15c3dfd5065cf855c622f08
-235	1	200	\\x2d8b2ad5dbd3e7a23eb28dd75d04c9e4666839ab5d84638959aad7828731311e1201dbff786d11a2accf1a2454d26202dafb6f5b95ff4721ab78a660e50b770d
-236	1	147	\\x376135c9a51f823ac248cb12d99fd26dd4e4e91cd4a339d6bb0bf1d4764f7dd596184b36657ecfa9cf38016ab63d3de12f100eabd3e3f8491fbab5b523652105
-237	1	332	\\x07b5cba414811c4e2b29dea13602acf3fc9cd0f525d0741f70f48e9a3ecc86c7c72305e06b65fea62a4c174cf66ac7d4a0a11e39092cb59d719cabfc5c0a5908
-238	1	165	\\xb3c28ce399bf8fc36b8513d9a137d515abf77a36b4a3c1ee575cae26053f707730b06377db419f9a9e4a6f406429774ad471f85affa12af2a2c8788dd61fe103
-239	1	64	\\x5fab5d500968d6daaa203d56ce118642a0b3bcf0a35931d74fd752024ee4d5fefb94afd7607501548a5629de0106837b4f0ec01919b8597111a4c83e40ca6206
-240	1	177	\\xb763b00598a6760bbf87ae87f9fe755ed72483fd55d157f7bebab2fb256bccc5ba2d90940e5630ed15de18335d6fbad68e1b6fefdc581c0d702ad9ce0afe7a0e
-241	1	60	\\x3927e3351d55d1e39e072e9b8756fd158b886df9d8b7b6b59cd0cdc2fb74f708925cbaa9f841651e6568c28a1d632b68eb2f7a543a6d59d50216ede8f16b4003
-242	1	193	\\x1c539e82a58e42178f725c8946e409e7a345c30eca9d003d28baeeb8738f028ca6320d09caf5f7bc20b596e63ca465e30602a6c46ef5d18be4cad516cbc13b02
-243	1	134	\\xece0aad4e4a2b149917e461758f2ae3d40134deed7978a770f894fdbc4b77140319054b0464d2413b496c3fbe5f29f437b4c1a771abddc646466711484c07209
-244	1	45	\\xbc0e3e74a2faad9d90f6fe568299370c6bdb78f3e4a3db126c5d665f1ae8546d3c5364431b73d1570bfb194f5ea856777f226d92eee66e965df9a55cf49bac08
-245	1	238	\\x6f93e51af60b6660ada87e29973e2283f78f671a40c2722454dbba2bea7fb37d4044dd427175288f5af39f2f74f14e5e44707441ddd71e46cad2a54735c5a007
-246	1	279	\\xa810623ec3529d424f4cc83dc72cc32884f59376900533c4b4646393fafe97bb8e12a85017cb8059ca64466ce20a76170a4f2bc682790273007e81bf708c350d
-247	1	46	\\x02d6c57f783e89a429feb3eb1b474da6b05bf25c168d8027a019051bdc3e6bc555ef6355e014cb4f17202ef352c8bfbb2a6fe69fa593de4518b8a29b62fc1e03
-248	1	286	\\xb2d0665094d955453d131176065e3de794572f647a41aaaa0e3c6ba828d899622e704ce059a6817ae9755a087db11c4d52c54157ad09ba61b52c9ff93053b508
-249	1	49	\\x247e432caf237888cbe19a8ccce0e85d4c289a6aff9b7368780a27a81f47b8a9c5bdb5d5ef1aad3957d5cd869005a41b947c1eef8caf1e368aaa0cfa31807f01
-250	1	74	\\xfe2275fa4f8aede42bf8c0df5b46adb59126874876dd160fe36ff40a58d3743bca1851f4b16e8be7e8bf02a8138ee3bcce344b21a908baba63fc2bd308d68606
-251	1	199	\\xad08068a02fa53bd04226e15258719348c93d6042b997e9ae750141ed25d3647ce3963cfa1dd805b961e46051b81561fea5ca2e2f6feca6940e7183ecd60960a
-252	1	50	\\x7fb767d7995e30ea96b6122038e216686a87db7570106e8c4f3401f7f0b640af47c1704db05ba34f2e5594bc1472f4c2765ef15c59167d9e159409cbdcdd2103
-253	1	94	\\x9fb603a3df2838e72a12643435af32b2d0dbdc312bae6f1dc7263212311f62301b0dd7d1d02399f42392f1e4399e7c6407a00e4fbce0555fc572c9abe6f24d0a
-254	1	269	\\x7a02f3690841d0548bd8e6d53e4b112193361dc2d400cac95df50d5859dfc8749ab5d853123c75319da9408a0dda801e019f0e13c8b56db080271438b557b601
-255	1	142	\\x67f1f4bef3157518f2dc1830f33ab5143eaab5835b05f44ed1e3cce7bf9793169e637443074182a4e0dc50b82db554f2d56fbc84d393497ac39eb3ae1944a501
-256	1	61	\\x44b5013ddccee213e0b1c3eff26826b97238454a52cbacb108a730439394ef4c8e3fdfc900734b1ff398e92058e0aea4b40a35ab592a03fea23607fe8be06109
-257	1	103	\\xc88d1ba8820d3c6c4724394cf2f644542053071fa7ca6101dd89afbe1f40ec2e4457b7894e229ad8934df4ed48ef84845db018a4d666e7a1d8ac8fc5e8959801
-258	1	318	\\x87b2f5c72d303cd74135f16365d97ba00ca1bd2adb3a5b457142678cd965b5292d82f7adb48ab3c4bdbdc44e95853894c7454b9c8b09b052afbc739559c47007
-259	1	397	\\xffc9cee60b7375666bd4d9311c07f9d5affd1edaf5ee4498483b69098c21f098fb779cd7b967c1586e2efd7cda4ee21a5a832624701ba4149f7737ffd0ba6c04
-260	1	274	\\x4e322c92a753e1e5a0c2cf3fab87245cd48ec58b5b3b30a51f8cb0a4f232a5d7ae45d508e8f55a92e08e05e47ad1cf2a72c169722eb8679e9346eac20d410e08
-261	1	131	\\xc3cade3cb07d992e7fc22e4c54dc2e85a49e66a41988cd47a238ec7092b9009c1861cebeec4074631c38ee371bb733a59ec4e2a21fa074e3684ed5883a29ea03
-262	1	202	\\x02b186d9bbf8a7fdb50213c9436d2208f90c3c2d58766654a149cf579a8f61da58fa238bd4b54baa48693780a76141dfbb1005e32429ca613952c5d45be1cf03
-263	1	302	\\xe00b935d144d9821697710cf2eb318d663c53135b9354eb5d80d60f3dec727cf63bbd4cfb7691e8027734b0943757887b6df0d7efcd9f5d56df4a107cc64d709
-264	1	229	\\xb207fb29027c6cdca24198cf765ea62c15b03d3848fb3f02fad62c417eaee1629b82b6cc5bc20973003f2d5fbdc9c4e66d1b78f170449556af83fa95335b120c
-265	1	412	\\x76cbeb58bc6753073c08157cb52e76602b026141aea2d77a46ce787e451c39ad1deab77b7a51da2934894241f90b696acfe0d05234fa3ae18fdd2780139ade0c
-266	1	242	\\x49e0f827619234f5b4f1a8fc007a889203fbb74d79c712884f1e912b9541af1df9f7289a07a238667d992a9cce029cdf4f069d5b9f1d4a2d51ef87063eb6a909
-267	1	166	\\x60681000d75d58fe78372d80327667909151b26183096ed85fbae6021e4beda96194a2011dba86fe37db51c0365531fb7ddebfd94901cfa983ed485fcbb5c902
-268	1	280	\\xbcbd14134deba578cb8fd10ce382c6be129033ccd0a8366280041409762174c18cd5224d0dced9d004e2a44f01f22a0aa4acd3b42a108736b56c1415f2610a07
-269	1	13	\\x4b9824a4c39b5a46b9a655a0970405a5082048de965f9ffb38dfdd1bfbad0edb8c6c087f380bfd6e496295c028135dcff20d415984292a642ce0929f37795b0b
-270	1	268	\\x59cb944a82b01fff46b33950a5a1e37fff99402062e49eeae1037ca790d82baf546a45ba968a4bf53c8de39a73f940c95ffb00d889dc408efbaccf4705fde306
-271	1	235	\\x478e5fa28ab6b97acacee32b01a123d5910127595f244f21354cec38f0e76eeaf51ebc2b0e8b9f26b57bf3179f075e4fb1232da7518eb343cc6fbd7a8db7eb0d
-272	1	289	\\x751085aeb60ee80d21802e72176ced465813bcd23e974431a4bfbce87983616398378160add45920c3d723e6a168493c83e18729c9d1ced5d939acdb0134a707
-273	1	398	\\x62c177fbd0b475c9bade11c49648586aa9218d9432700a16a8915615cc8ccadb771361c5efbed7afa699fdd08377e7a00df39fdd75e51b9176ee2f965dbf2002
-274	1	70	\\x63fcbbd232a5e9581dcb4f8c63385deefc5ca1d1613b315bfa88817293895e08b464d67c6994bc047a58233ab33c668caef82cf87595a463c855cbee969c0604
-275	1	112	\\x09e9af1f9c3b51e634f81614d2a8128d6d98837c47ebbc1aea789524097b3d62989ea72d56171175e7e29004548dc018bb333bd10de37a53a29acd927b71e109
-276	1	59	\\x371a5294bf4b4e957b3894f2d6df2cea05653c09adbdd0f8b8bbab29a7cda657c8005741bd0417b614e99107081534d3760431b7a3236a390e59af3bc3638e06
-277	1	228	\\xdc30f3276cc6f8a13eec79a972724f261b95d5515534c9bcc20220ec4d793ad27dd1e3e42dbe58f6ce32aa5bef22a85e74687a377e9575359d49f42388602a0c
-278	1	345	\\xe9c9a699e9470c30e543a85ac3e73417810466088080f473f62d2700b7b4475778d90ea2b41f8e13b02e7bf82ef29802dd5b5aac04cd5fac4827736a81ee640f
-279	1	155	\\x9dcc6e678b65b2f5489198cbc69118cad7725c0b5f8f71465b256efb492ca99e710646a12a80ffe709654302f6bde2c8732a721a5e19a1e2c90a25c80dd65605
-280	1	98	\\x40a99a5dbb5997cef03d3e412f995424aec3463b8fcf4b0d0f875768a4553bb5b7496548510ceacb0722aa7928f7261021a528627b4910950b9c47965ae42800
-281	1	145	\\xabbb468fbc9673cefc6f7d6bf9a9b8972ffc57415f61f2faa518cd50c67130d70863ec0fd392a05735c21503c215bbda08f0912e3e00862c5ce4d639b7f2ff00
-282	1	396	\\xe0a1bc4394877ee8d0028f0eadad2af6994723055e905e37104388f3b201983283dbe271131c135e363a543ddcb79d20e6171c311690a6771c4e21bc31793e05
-283	1	315	\\x8d5a5873043e5e1d4ced676900693e88d7be438d0ec2d53b5bcf98f7d7f2e105b46009390d637a22ac7be4fe85c848947a8922a3ec9877407daf9f6f620b830e
-284	1	216	\\x18b44e93ab4c04f33e624dba1953caaa6924e82779fc0d7d7ae75a7cdeddd758dfee425d0001b68428c8c84ead4e74474fa8b1e2fd7230d8da99e9169a1e6c03
-285	1	156	\\xb64e61113834f945ab400f7103dde2e4cc897c784a42ab4158fccac51c37412a520ec04dd2e68f2c17ffa2e39d7ca096898fdd15d2cf26b223fb57b0710acd08
-286	1	283	\\xad80fc7f4b64ee3acffa630e766a0d4d0995c8a24299205ae22f6f86626053fd095773a578ef84013c26562d29170ad7b564c5a04b467a8f4fa305de9ab74108
-287	1	328	\\x790d5038d5fd474c0697153f1090669eebe6a8db874281c194b228c3783d3d4fdf5183281195f2aa4c6f0dcd00b01e63b02866d28a40c77603687f1d9e4e460a
-288	1	97	\\x58e994a4bc81fcdb78cff801b51d402b0b76705b493de19626a63d31ed132c3d6493484c747978d5da18da42aa0db927805b73b4d2780d65aedfffab0727630b
-289	1	14	\\x6670e7cd0c31ef5b3adc26adeb5286713a626fa03a2c04ac695cc0a714610f67ad6f6a5936144d0fa6f9be2999b7312dd079cd1e68452309f31eb0603375b90d
-290	1	148	\\x1f2b95273ccd05e2cf14ad3f3c72ee7780062165b94e4c65e1863ed5d1b25eb879df4448fd73b6607e6521de137f29d38c658c4e423efe0cdaaa706911d2da0c
-291	1	206	\\xa73a22b8b837b1753381f944ed9309ec67ce619dd441ece667575ec3faff9df664b9a879440a353e515104eb72f504d58a596b41951ffbf18f2562a010467d08
-292	1	186	\\x85b3222397e26beb580a91500f5e68bacadba211bf580032cec0192601fc45a5e895ebf36071b7846d2fec248672bbdb8652f84d8b4bc0c4a7de1a6a490b4409
-293	1	189	\\x7bdf23b58834cbc42fd25b9b9d6e25a40a36dae0f14652a894eeae924f5ccf375782d0e266465dd466b37e597e732876537e1055396421c0c45b90e0e5107b01
-294	1	354	\\xbf86f6768190881fce2a3b79fbd1f659495a2037068c0c060df44b478ce914bce73b64a9797d79198aed8008b9c89d2fb4fd09b346e3a25f019c44231a52c90c
-295	1	372	\\xf04d6d99cc85956f279c0662428504672cb7b8cdc62f741d16cdfb3f6f569a8e2ebfde2ea87061962183294dbd12a0180d61c6634234e2bfa102258e69201204
-296	1	422	\\x6fec180f61c76823c6a0833d84af78b8d4ed02d22d18c381786e543673519bc57e87f55dfce4943796dd39a1e280aac66683569c96a36a3968a8bf7ea616aa0d
-297	1	418	\\x640d1b603e3c237beae740fd64e97f34053f52055fcd3203e5aed19726f903e016e715c9c7d5ac118ebbee4c3cc32cb770f6cab7c7e1596ecce0418b45b05708
-298	1	81	\\x3559d072ab5e3ad01d85f72ac14159b981e4aec9b23a0dba03eb0105e7e88b513dc458040f9560dcb95a37967e087c210ee93fad4fd87b42ec0a5763f7e0fe07
-299	1	236	\\x72854b868e207f160f691617be818bb2ee5deb36997ad0263579570311847f8e8523bb0578d133c158c3fe3e97d7f646b7116bbcbec496362dff18ae97d0ee08
-300	1	197	\\x5468a51ffdd850ed3c6a0a54a15cae8b0548aff90c41e5b3a5d1e101656d5caba3a102fd244183594f46db1d0d523b490c665037f416725ce8dd4428b4f87303
-301	1	23	\\x1692badc641ce2dccd38a3f1486616d568cbea9f347b6de1c6bde4c15876823a4c21fd56c482b6d5cfebd26ed4a9cf87029ce0deedebec32142b978006d1dc08
-302	1	324	\\xeb3a491be932566b9305e8bd572dee4edb7b6b953eb4e0ecdd96b72eca1be52bf82ef6a5bc32906b831fd3e06caff73697a9583782c4108ee982df6a31aa2c02
-303	1	187	\\x2be6c6b6387190ebb02ef7cb9eff733ec9c060f242f37ad6e2e53bc3a983f8eaac8d81747c796232cfa5e2d38c206cb7ac49b54dfc0d34ace55a150a6a29220b
-304	1	266	\\x1603be7f158ca72fc85bef93bf4c1e9b798a4b1ec316d673f0d011812e3f7211f0b78a94a45500c6ff545d629ba4d98581107b62fa77b0c51db948f0b494f608
-305	1	21	\\xe9e2e8929722aa33da7efbc857aa44e7e94a0a013c164a72fbd2b22bbc18f38adc65a136994cea00945d7eea683f6fc8d57caa0f20d4a76cdee765d7180e130b
-306	1	369	\\xec31bdd6c119b0ccc13dba31bb751bbb0863c455e8ecb916c2c07ed567c8bc703dd7b1b6cbd6ad720a63d7cae987b47bb2ae24ff0f70054387ad4dfc7933c10e
-307	1	343	\\x7ac7caaa33137cd9d845561d8f2eb5e6f1c3b7cfd93f6ffc539956676db0b3b217025fad8938983506fb83217c63cbac248d85c58ebce873fb0ff8d0be3e750c
-308	1	164	\\xfc2c538f73dfc815daa54c147b644347547d5f372be01f83b27bad3d899bd97ade2cf30ca5408d47d8493d535ca05724da6eb149364eef3eaf0418d2cbdd3b08
-309	1	368	\\x7dd8518444937a548b5e860481bd2241cdcda4fda58a1c0cdc37ac0888be5cbd39313f7ba4303a8a798bb203290fb375eb56fb94b42f060c50f5247f99d3db04
-310	1	33	\\x4a17ef7f066705daba868cce3d39ca62496ac2804f043deaa118017ad9101ef2d7c3c83c6857e096586285e4cc7f700075d04f6997464bdd6ba05e6ac83f070c
-311	1	399	\\x4c518f09bbe9da3e7ce9be25b9a880eb4a30047ea7c7ce816c11529681d3377ea92f3580dcfa2a3cfa4bbe81fd0e0aa99e31b32a5ee9b70ee8bacdc79abe590c
-312	1	415	\\xa829b44ec1fe7f5379cbe14027ebc922c1e7bf001b58980d9b10e7e65b01d4c37ce4315d345a0116eaae00e2e19822c9c3fccb3e6492dd2d8dcc2b434c32bb09
-313	1	322	\\x21d298914946acd7d46932bdfa6f0e521afc0060e616d2ab37c32ff4b9a9352699200a0362baa90a024d541a9a27fff66e2e176c008af40d85a756e3b9dcdf03
-314	1	293	\\xfefc084d65749b1ba2255ac0a5c87d3e1f765c01744174901d9c4a8e11a3b39f8892536bfb0cadd9304243a725bc4ed116960d543c0f307533c281ed672e790f
-315	1	217	\\x238dda771acbe8d042a50a16bd2ad062b27cf94475cd875b6b488a1ed5768d56b0d1777376214b2793af3ba9cb6adde0fdcb909a3536d716d136ab0630141d09
-316	1	224	\\xca3a195202cf7c4ce97494b15835a0e02a6a02bf81568be338a133297f403e5b1379c648faafbfc595d8b838533637452fc05eb0cc8ded908289c8d00f430f0e
-317	1	55	\\x45b1826a5376514d262bfe77d89065971b34144fefa448ca683893d48c23622a4188e79b09b56e948e0c039c3d012f03c3adc69a88233d0b693bfb2fc6544c06
-318	1	403	\\x7854e45fe0af042d3836e9b3f2be9a7d12fdb4e89424d5d1c0cfab8e9159df1c295dd170da9fb1ab565502ea92cdfd785a1ddfacdb215fa9bdf47fc0f9a34403
-319	1	176	\\xe7ba9f9ddd025d0ca9bfd0fa03cfab65ed853d2f0f8d28b152884ea1bc7d1b0f1194fe4e1a646fa4ebb6ec7d78b8a82695e700e845134831be330792a9732601
-320	1	300	\\xa982cbfaafb9ebfd0ef0c3b35b05d0be12bc283c275be8bd1fb2bb63d4775ab2bbcb5d330d92d72f1e65d626df15efd50b2b44015cfdcdd075396a78f96df006
-321	1	9	\\xbafd317b9a062884c18bab8318ad06259b7286de70e74e8e90ee896e1594d6f2f332420a579ba8781bb5ab165e721e47db8179722e09d70cc84b4827a3dae105
-322	1	125	\\x5f76c52fb8fd95d873ec22b15069d2eba6beff0e2361ce5c212605be44db664a2fa95d14791bb355d4fd48c94ec0ae9d17a64b5906bfdb3179f085267bf8af0a
-323	1	107	\\x0c93a918cc85badab7f3cb320b75b3f5046cee99706398a35df68f41d692c997eda6d2fd75ba81e07279c5c3811bb0edeeeaacc7618a1e9b6f5aa9decca0470b
-324	1	249	\\x646ed02fcacd59c7bc5c899875e92ac94727058dfe7fed73774370451236f6ae1867d3c5a935a7a96f7797b0587178d3683a8dd976b3ff7143c6628b502f2906
-325	1	116	\\x19c5fcc9893bca1348b51eb09725c483a2359315397d755ec592d3d3aa0673aac8c1e083e99a287b356f84be4407cf6674ade3e30930e34bd6257b9515fa2003
-326	1	215	\\x794a5a06c8ec0d62411a5d68ac5e1e2a2497574244609f7ffb61addf66eea3f323b988d6fb21457c697f61c5719e9732da56bcf90a270fa7358b54b2794c1009
-327	1	373	\\x5420a917dc181a6dacdda86485de71f3d8090f1cff8427846b3aed108a173542231ac19d5d9c8accc6be57fa8789fe6389ba73d37ecedb65d4f6a2220564d801
-328	1	168	\\x8c87c6ccf7f5964ba8aea3e8359caff5af49ac8409c9b71f9ada70b4ba63fb67aab7962f6f2acecc5b3d266b4c9104e3fac39910b8c1d0643079c9ac37342b04
-329	1	37	\\x68faf68b1b8c3cbfbd3254648548dc5035889911155394b184a27173871f45ce7443dbde85e6817e41d73755845b17e83971076f6ad928d33ee0772c780d8706
-330	1	36	\\x29695b9c3d498817b71c474954811f74f84c86a8a0e2783f069030206465a88612fb697906df716456cbdf7a33a669722b81c44b41a3ff066d5a7cdf0bf77d03
-331	1	99	\\x929928a1b85525174cc1f722568ef31e19ef1e4fd9b1e337eadd879e6b5c296723e9b2ae245da326aec8c77c3820ff2484bf7e90eb11037e4f9f22a026270103
-332	1	329	\\x014e405bc03f0055d66c01aabd8e39d5e69d323aeeb1b50a4b2e26f401ec6bbacc80e0c6249ecfb138ef40e0e2d46875d010e2a74bba1f8b989f6fb34c242a0c
-333	1	130	\\xbadd14bb597e3d9e3aa4de9a29126f6593c9c0b0f8349958cb529e3a0686d7caf45c75beaf07be590c7edbf13709541f797cf3d58370321d27ef835238b39c05
-334	1	305	\\x27e189dc1ee434fa83bd929e80b4af5cc08c332b5ad111d51f819aa7fa246a8db98e819c4af14a543ba8fc1bf6dba6d14f44897404be121f1e374ed7bb9e370f
-335	1	392	\\x85a4ae924869a496e85a99e44f27a408780f2ba3a4a6f7f4f0ea9cde5788e9ac04b50484a6606176a40362e16920d1774a701af950071bd7bbe80f69b8c1cf0d
-336	1	205	\\x2ddb3ec91f38ec08bb617eec74993e55d9bb03378a0537dbe0bbaa88c48287bec63114f9652ac849b9bfd88445d1216fa77e7af909cc04fc04b4a703014be908
-337	1	389	\\x50d50c430eee17aca15c725735092d2bbb5cb20ed51143a24468eecc179e993cd771d31bcbd3e309e21a7780adc709312b1fa1eadbf0310672af57564ce82205
-338	1	115	\\x7b55656f9dce9f0fe2364156fef246d6c26e62140fe831a819d4d01104256bbd9034369763f9358dcc0c36bc7d3ad8df0f18b1b85edb4e9be31f9bc311f95d0b
-339	1	43	\\x216627a922b7c583dab1174e5160b89a6913ecf20f2434a42ae81bae7c8cc2af0df126d286a69c980aa8d31740823fe4b22a143452457d172d5152c0a750850a
-340	1	58	\\x7a6bfac4eda738096edd7dfeba00b3878dd4516b20f19fff2f0b870e424119831be4ea517251c7dd4c845cd30ebdb23a3d131afebb4a45f0534d6bb8fc42e607
-341	1	307	\\xc269fccea67a0d413626bdfc4325004f6180028a06186b93cfa6258d0aaad72a3dc368d1ce098ca5f7aa78e09d13791e35116f7545fd6e8f5f6463c6b2ff0907
-342	1	394	\\x3b2f4c7aebd32bce4e1d6b9984e77cff34203a2f44fa79c9b65f23bc3580b5ecf8e0637f6553ef2b7db710a7f65accd1ca505ca5dbed8afdba955c5e1426b805
-343	1	78	\\xf9893136ee9a3da8c234e0d8e17c1547e285dc064087980e0e4fa83bcb8d0f7115d65940d0bb345dd73efe500f4675e42e99dc62b085ae73054e143fea27990d
-344	1	208	\\xf637f38975b3fd4e29749b5dd34265061d6e1ddfedb6c64c0ba68b1d4416c8f1a16304502f11831274f7809a0d6586a3ba44477e2c260fcbc94de305c4fe7206
-345	1	359	\\x52c82bb99e63fcfd827bbc8a2a28337a3181476d6fd4b91ee4d707d306cc822766b0d0eb4af657052beb8a6dea549b81b6cd8aad380347cffd8f905985ac8b0a
-346	1	282	\\xc149219b082115bcfb62708a5f58e928b144d0bce83668b6fe40944cdc738afb4bb00cd9229801c4484fe2a810a07ec2408a741d16e34b25b3728aad52bd4c06
-347	1	338	\\x193f32bb367aa31261ada29f68688a2b2009266fbc2a65a058999174a512ccebe21e7e109da902c97fd04bd29fc6889ed328d43920d0cec51179bfbe462d610d
-348	1	143	\\x55d372f8f111f6da209256e2129af7cf4259575bd5eef8e4e7e201c4f6c5bf2cad080f227e2180ac4599997a229f5fda0467f3730cd0418d3a30325b82d1520f
-349	1	393	\\xdd3fc656005fdf7f4a913099354b3e830c15e991434ca9f4664243407a93f12702802aeb49ef4e686809d85850e09a718df45b6aa2e364cef0f1d190f78d390d
-350	1	411	\\x8b18b97df7111e5e4dfc82727424f9b904ab4a3df45322ac43f10408f1cdbb93632efd3ca7dadf35a2573012adf59017649e9446ebebe6c5b28e15e859f3b003
-351	1	391	\\x71c371192740ac12215294d8f44b49ba8a1dfebf3c60592aa53d586ab835ce0fd87a29fb22d2fd4e4271ea583403fb9e76f15928c822becf44630950eeba3808
-352	1	225	\\x96e22a90c8f5ca6a42599d406871edbb85170412d7eb93534223157190f230f698a8005ee66625f2f47d8154516cc904975408f0cedd5586b5776994bd62e907
-353	1	291	\\x2ee5632c3210df7921682e7823b12e0c5b3f55b6e8853ac6173577b65ceef4a0ab4f45ef2f657315798834e8447613968cad49793173179bbc678fa8c0733301
-354	1	320	\\x82879b34b857f9f66d35534a582e7ae5f44d960b7479fc8708b8b8da60f3d87884e742dfe8d7d82527b9de36f5e58d3e19715f491b4ee9c2e0657d8a9137990b
-355	1	7	\\x9a30147286286d7efe61fa14612997385788679fa9966b7eee2d58a9dc1418e1651feb810596c11dcfaa969f2c2d40d05c4d488e9086bf19c3ee92dc871ea80c
-356	1	185	\\x74d0064e0997337f450b625f33ff56201adbc2c594afb6da675b4dfff8997486a3251dc8d35b32ce9dc9a119bd9048511954570fceed93d9af7b8af93a394802
-357	1	330	\\xfcd850956a4061f56f266bd4a4940435f3cf85da2014cdd0881fd0a45888c5c1e58caa29ace6355e28adfbb0917847ee0e4e03cb866c84c93a56f2a888799901
-358	1	122	\\x1cfb1ed43e967d14ae2ccb9d5c2ce410c264167e7ec97338cedb632379a358af8516dbaf6844e683dcfcaa1db2df0d12ac029bbe49304ec95e2405c9e0d11c0d
-359	1	221	\\x9dbe0ae544706865f19922b2553a5d795011b9ffa9f7e2b2856c33fbf4d91a45f3bd1a9d524a9365fa191f43e5df04cdaa1df36e5a7a66620f4a46d02a34f00b
-360	1	383	\\xc3c47663410f8cab2c96bb0da41502adaae64bee3684395e9459dd6ce70a862ae0be5121c63a4da31ad87287680695a0123a75eeeb9d1a2f590ef0b4e0b86b03
-361	1	377	\\x680aa7912011df1b1ab2213fdec5a87705bc82e0ecd44def5b86d1d59fb6d7c20d184e91c4e9fbea25924a6ee2fb1ddcf3ba260f55600427a8aeb3daf5d96504
-362	1	27	\\x17e6ce83cb5097c0e6bc267005602b200b55b7c71318d1e43958305e81b921169db78189b66f60e49ee548aa538185323ddb33c5b3c45cc113a4a9ae7706d30b
-363	1	304	\\x60645c2ff29d6a55c4b98b795142e1050b7f55ca202a59234d4c4269084f41f3674edce84183f364b690f292f2a3d49f920872d9e499e8d00ffef8163bda000a
-364	1	22	\\x0aaf918057dd1601aad782c075346a9366054b4ef05a7f7faa3bd52d2fdd48411b2b6432e9ffeb735ed58a762c698059433d455b037c7c132a5cb9814b75e904
-365	1	11	\\x9fd0e932028069fa4fdaa042daceda2e9fb60d9610d1ee45013c9d43e79e5cb4140c8e5061ff7396bc88557bfb3c22716b22d83004e1d5080f04537a64307305
-366	1	32	\\x0a4af9ac46e4526993698565025209a601285a49e8b9e93fdbb73aa35f6af675c4f5fdac146750005ed3e43f757de89f6e6bad2a1344d98bbf35a5a58821130f
-367	1	374	\\x65ce8247ea1465e2443409907dc5df4664ea515afa82d9c59e7ebc2f89f9e4fb889d09cb8dca4cc0d3de04bf0c988788f5b838b3fd28fc7c552edea47db7a80c
-368	1	381	\\x65d1889bafdce7501175d2700d7ca6c9987cffb80998fe64908f14d2364b417842b07650ba90caa11a623447cb0acd06c677db82d70a69ed264dc7ddd8370909
-369	1	157	\\xf83492e3226921bfdcfeae65aa590329c7cef2234c94440577cd97e0cd5aa91bcd0237a2ef1e3410465123fb7c2c171eb506237e6ba1bbe4c88a7a68c763e60a
-370	1	72	\\x4ea07320d1d5066b96a773d4675f0feb3e1780cbdc65565f33a98096886eaeb77aeb78d11513dd74e3ef6bdef6693f9207abe0fc748876b36ea9c72c0dcc1603
-371	1	404	\\xfe3d2f5814a44c62483c1c01a09ff251dcfc6b862d66de9a4abf701a2c14d46f278c3509716bb7c8ba91a4437d87694bcedc9c9a2ffd78bc1f9a71030a424d0a
-372	1	348	\\x4969be60e7d7524f3f215d3b5626dc03e623cf53953b0c14a1eef9cf85ca331f2a8ee59b1823aa1e8be41ab98e1a68e5bc379557ffd1c59c7e7ec3f7b21c3406
-373	1	38	\\x8364aedf8af082ef58ac502d4bc9052b94c554c9bd940e885590c9d6a8a5bb52da2123d4fcd181010d08325059bceedb7c50a7129ee0c06ca2d3e4f37c7f3f06
-374	1	209	\\xc56fbab5814e1464279ed87907ca925b30c3972f56b5e049975f4ac2bd84dc9ad1f2cdfd03a2e195e6f181820fab8118dd4634da0b6a55f3a89adc95b7f3cc0b
-375	1	219	\\xef07ec00a509b39c046fe6a165a0f687d1d54ca11e45f3305b27d90a6fd92da447dd6728300b969ae80a6b557bff76018eba6bc10267f99271d537d7d5f9f500
-376	1	20	\\x90845be9591de2501032dfc98e3c4869b4141a6284858ac2cf8918834abd44ce89718393bb0cbc36fbed16312a249d4c703e97dc187da415381b9b627f731407
-377	1	90	\\xbb9bf414bceb8a95e771c593e4c0cec93f0b35969ac5369eb172ade71c8e20219833c960db9b722eedb8e74747730aa83c29d7e0631fccfaf96df2abf78ff00d
-378	1	140	\\x7a879cdfb51ca58d35f8ec81eed68539bdcce23f762be528754cf18cb70c754f8c0c8fc03e590adc767b6b114553b88d7837f93da791de2f5fc1c5c0c6660d07
-379	1	44	\\xaa8f298d75838ea9e1697d95fbcef6464b67c41a95d2eca8eb3de9c5541f44753f85736971acb29587165a3c013fb0c50b4351c6dee9799960ea4eb01e7d430a
-380	1	250	\\x11f7ecfcbefbb0ba8f75b0b51bd6c30c54bbbaf10b7f13eb4694ded6645814efad5f6fdfa09536c81b3e0865f82e8b6d79aaab073400ff6ce5d3ad5b25fa4406
-381	1	347	\\x4f0d44615c6585518e6851456ba2e94995faf168f774bcff689475d5c54ad890d81732fe6576f1bc4e58c74f185a39aa1b2deaaf7afc736c78bc200aac61410f
-382	1	385	\\x5322bc85f99d6c8b26ff385a1568a913fa138f4e69858a264249c98a63c115247d3bd6cb4aa608fe5d3c8f3bc3d382547333dc4ef296c59b94be2c35d6f80601
-383	1	241	\\xa9d149fe43d95bf537dc67900abb84795176ed6440b6e21476ec8f3af8e8d23ca6be4e4a3493c63b4be1d69da4573f23230fd01e3b00ead881dd1f44f285da04
-384	1	414	\\xbb454acab0d6e07e2c639968b5b77dc5bbbc8d6c607a7ab47925f77f32cb81942f8a48c657b4a2f2337e84b1c2e3d107ab4d4811af8d35b161a3f85d0054780b
-385	1	106	\\x3f978dcbedfd9f0c4017a617f5ba2ee6776347baf2b59627ddf501efbacff8287706d5da86e3c32580a2004a39dff898987aa78329eb068fa207c3fd74195b06
-386	1	76	\\x6d53eaa7c03caf210d9d4c433ba1beac570ad3e2d60016485f405140dc86ca055ac93d43d4b90d6ccd4c1dbec61875d41bb01262ec49305c78ae14f226329100
-387	1	309	\\x25939daaed4313a17a1bd017f48ecddb7a134266ee331bf0c2e84560c6a57590fdbb8a4b33de85ebb792d3c507cfe6b66e364b6f89c6aa7be5b46337198acb0c
-388	1	420	\\xf90ecf8acd052f4ff19da004989bc9533f73f7f1037342e9c3871d6827cf5dde783c7e4359d6baed09a67999db7780ac74ab856d2f332315499a7b6f9909af0b
-389	1	181	\\x403638353ae32ea0e6bc3e278f8289cfe1bee95add0a0e76b24ce035f7d578b69f691c490b2d6652be0f1e3aadc75a11db168d05a7190b6ec94333dafc344704
-390	1	212	\\x89afb1e15a84ffeead8e62bad326e7e0de092f6863addd556328801ce130d2bed6efe3bb99591e4d9b8b417aa0a2861274a17893dbb311e6721e250fff99d40b
-391	1	370	\\xc5fb63f3b08aebb1168ac4b4332242e6b89d6f798d0a9de5aa682cffeae0eb465711e2a920cd611255223908367daa231b4f453c271f1e3d9f897d8f1ad3890b
-392	1	400	\\x6b1bf2ba703a158d957fafa75e2d2e029b9d491cd65db2b54ade5587757512abb7ad2abae8227b027cf176f53439e5b5f28e24d71228ec1503833b862dcef208
-393	1	342	\\x63133f50ea01aea33cb0cc7eb4b66804e395e0ec22b67e0f636234b57454a4cb5e18195d26610bf9ae9e067450069f323c11b071a26d0f4ee80f49cd70ee8304
-394	1	351	\\x7a9621df0be09d6bea2c164347a2105091de3f5f07d4ca4306073d65f9c9d59cc34a84b488492ba640eb710f9c16c54b0710406ec3eae9481b8113a62ed92505
-395	1	92	\\x4a11b8853fdbe5c05dfabd881f70c22c30700d62e451bd3f96a367a571a800c614bc3522a81e9e3e933a8d6a69b10c0a795f173fc74d15ec805ba1135d0a0502
-396	1	292	\\xb3a753388827687c33009cab22bb7b0abeda8e213c88580acb49c8eb0d57f9defcb3d81cadb1e6cde8c09d0fef3b4c42ceb35a2dca5a9b947fa58647c3a1220d
-397	1	161	\\xee774866ff1a72906a81b4e3caaa79c38f70cab92b94e7a90af5da5cc0c49f75e749295c2766d79163608689eef6f829b441df145ed8674a4a1786b2b88a8d02
-398	1	183	\\xb775d52b6475a0f570685363c299d0fca781ee5a6f2a263ffe411926ec4ac25be82fe3e82200296402d6593aa865f4bfe65d1b9a78782cf1db3687398e1b0802
-399	1	257	\\xb5a37aa4d31df2ed95c809b0cb7b36b2a35de065853c321fd2be0cb5b3ee9a7a3cb904259e0d51ce870382368cc1c5ed234e4905c5af5e51569ee70f074b7b0a
-400	1	141	\\x17acf2148c44a78404413631241e445e6418ceab8256e22437a48fbc8a97974b9069a564509b988e7a5560e608949e14b2c6daf5b3ccf7ef1572dae80218a206
-401	1	84	\\x04017c9cff61b106284d24725c18fc4a4a2f2b3f96b7ffbf42b461ef7853f28b94f066cce5611bdcb482dd626cbeef4206b21d6b60076434db8c965bbe3f0d03
-402	1	85	\\xbf7dc046df475e2f945404478dbc2acee36b4261a622fcd88fbce21761a839289c27347c161b2bbae698c5bd8ffc2bc5177bcb0f22e64e7b7d9aea467e5dc40e
-403	1	180	\\xbb1887f5e6b2d9c22110e0ec22f82add94e5308126005c49c8c8aff505832f9e20053f7aa096d67c6b3a430ba77b70ee3bd12ed233df2e8ee3ae44f257c3fa02
-404	1	126	\\xde72b43db6d3475d13d008ccd37f1db6f0ae8b0b774a3c47b65da22e63f1add16c31193546b9d8ddda0f8b87695aded1a4ec4c57166e98cd37135704f97e370b
-405	1	339	\\xf542910eb33fb7601cc6f9d11cc5ce693b3d2f2b85d8b6a857adec37eb328304b2c2ab1b2825116e7f17318582e1f221937dd14fe4832c581293969b54bda305
-406	1	401	\\x50989810666452466b7aa42d142e5c2cb8fb0ef5b87a975c9a5d074f2a9867001a9a71a1e1f1016676c145a9c0e42b800e5903a219e7164e35c942e98b54b803
-407	1	124	\\x39c69a33a7e1c2e7a16abe49f48967c1724ccf4c303e393fcd2a2974822a9c7251ee161ab68faee7f1004f84bd8906abcc4d4bf6f592ead821541cf83e99750d
-408	1	66	\\xc4a66691b890611f95df6d08d2502d1e694f0c9ca57776c023d1fa3af16aea6d7bd14282b39ed917f50b6482d8436fe1278a359f393c677cb3775afe4dbd3c05
-409	1	376	\\xafe5aafeab998c768107c1e7c51d3c968037e0cb304e0375dc54733d7ee0298cf3ddfc65cdda1ce6f8d4f857a4bfb8bc8ad879504a1ba54a274fe5ac540c5b08
-410	1	244	\\x8923bdecd2e2e8693efe30034d344f897fe9013f46eb1d1e456050937678f1cb04fb682cd0360b2ebcf5182f42057f37c423bdae9fbf4dabd34b0568cf18a80b
-411	1	382	\\xe322e111832c2f3d2192e607b62dc6d0091605519bed0c207c94303e3a78c6d485fad10f841731789413b2a608bb73925c9558ab2bc25e4ee7f5a93038b11900
-412	1	210	\\xc8e2765a204d379e056ab189a5947f3b8e6fac642bd4ef897a7e34b935d96b3d288f276b4321e5509be9dc3c1c12be88fcb96fc7015a596d48f9f0c27a11ee06
-413	1	308	\\xb012d1bac642b25c7578732d7a571e607cd0bab7e71ddf6e13176733ab56542bf4a45b6f92d6f90c374c2aeda8b8e3e2fd157b4491fb60d38b8628b4e8f06d02
-414	1	8	\\x93904404013f25dd6f1b0aa4b9968daf95f67238cf2678962c67a9a4852a81d1158fe8a3e5ebf142227ee77bad12544e6d4984f255a187fda6f345b9c674d003
-415	1	346	\\xe0480e289d6598f944024b03504e53172c4f027f88dc9cc9b9689d5011a070bc13a1845b5bf7d17374427a9c3c463b3396cd9765be3c665e27d07aa9d8e4e90d
-416	1	2	\\x8ada1038f0d0e599688055a9bb5d71d0b22b6d9e573c8ddf2f2309f2e3c17ef38aa13f9b12513983770f52904525f6f80d3af62f9b11eac0d2e12d44f3967300
-417	1	275	\\x1e9fc939b60d6b83b773c444e97d381deff2af1971f10f615a3d275eea86f849bfe451446b73686acb97a1aa241ae90a0bec1ee99bef2d3b2a0d74a0b587aa0f
-418	1	152	\\xf18569f97f370507ef6a59c1287f02971ddba531a64ba912d2621c4a5e8e263ef4539dad33968fab5343299e184e2a654972f5ed6b7d8f20b98516968ba6d608
-419	1	75	\\x2f293675e44688f0fe753dd8e3938e26c96503f072d9e42485634d39e566e91c8db37b1d0642b9329442e53bea8a55315283d53937314c49a5cb00c6ddc4d809
-420	1	118	\\x904ea32af7897a294f42fa165a1aaf6de2496cd9c434635a907920f67044254f93a8fd7abc97065bbe7381156003f38ce23fd6f00d96771e1a5cd8e394f60304
-421	1	299	\\xe2be615a27ba28db4f3f8e9904ed1838b11ca310153fb82f3e84a810a0f2a8816c7787f7e9234bb812a6d74b58039e43822b1758c0e037e3ce8e4f6e0b318f07
-422	1	380	\\xb1a511b5b906d1d3324a05c581f9d3a7e65abe3b0a221779dc7ba5f6d04894205ff08eb2713f67c44f8e577c2c17121ea56afc719147b165afeb7c2316780e04
-423	1	109	\\x8d289f1c7a197e706e9878c02f0ecfc313bcdd7b03aaff6344ee6482ba3f7db6a4b3a9c22ad4091b47b377b89385ee7c64fd1f79be17c216c57d41ec5876820d
-424	1	222	\\x5d390334afc6fe298ff89534e362ff88e8cecbc362669305196770d726f95b8dacda3c65506ca93876ed7aecb6cd6edc0f1e8f315c17389437d0fee4daf68008
-\.
-
-
---
--- Data for Name: auditor_denomination_pending; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_denomination_pending (denom_pub_hash, denom_balance_val, denom_balance_frac, denom_loss_val, denom_loss_frac, num_issued, denom_risk_val, denom_risk_frac, recoup_loss_val, recoup_loss_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_exchange_signkeys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_exchange_signkeys (master_pub, ep_start, ep_expire, ep_end, exchange_pub, master_sig) FROM stdin;
-\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	1651516390000000	1658773990000000	1661193190000000	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	\\xbe18532731b429ee445c8b367e4d56ce354f1f06384fe30567806ab41b300889a5dccb672b47953482d4506e9fe954188db1f3591429ef8e6b51aeaf658ab30d
-\.
-
-
---
--- Data for Name: auditor_exchanges; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_exchanges (master_pub, exchange_url) FROM stdin;
-\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	http://localhost:8081/
-\.
-
-
---
--- Data for Name: auditor_historic_denomination_revenue; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_historic_denomination_revenue (master_pub, denom_pub_hash, revenue_timestamp, revenue_balance_val, revenue_balance_frac, loss_balance_val, loss_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_historic_reserve_summary; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_historic_reserve_summary (master_pub, start_date, end_date, reserve_profits_val, reserve_profits_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_predicted_result; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_predicted_result (master_pub, balance_val, balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_aggregation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_aggregation (master_pub, last_wire_out_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_coin; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_coin (master_pub, last_withdraw_serial_id, last_deposit_serial_id, last_melt_serial_id, last_refund_serial_id, last_recoup_serial_id, last_recoup_refresh_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_deposit_confirmation; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_deposit_confirmation (master_pub, last_deposit_confirmation_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_progress_reserve; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_progress_reserve (master_pub, last_reserve_in_serial_id, last_reserve_out_serial_id, last_reserve_recoup_serial_id, last_reserve_close_serial_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_reserve_balance; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_reserve_balance (master_pub, reserve_balance_val, reserve_balance_frac, withdraw_fee_balance_val, withdraw_fee_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_reserves; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_reserves (reserve_pub, master_pub, reserve_balance_val, reserve_balance_frac, withdraw_fee_balance_val, withdraw_fee_balance_frac, expiration_date, auditor_reserves_rowid, origin_account) FROM stdin;
-\.
-
-
---
--- Data for Name: auditor_wire_fee_balance; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditor_wire_fee_balance (master_pub, wire_fee_balance_val, wire_fee_balance_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: auditors; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auditors (auditor_uuid, auditor_pub, auditor_name, auditor_url, is_active, last_change) FROM stdin;
-1	\\x37fee5c036fb332e17758fbcb953bfc3d67b47d732d1447cc4631f6db4341720	TESTKUDOS Auditor	http://localhost:8083/	t	1651516396000000
-\.
-
-
---
--- Data for Name: auth_group; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_group (id, name) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_group_permissions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_group_permissions (id, group_id, permission_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_permission; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_permission (id, name, content_type_id, codename) FROM stdin;
-1	Can add permission	1	add_permission
-2	Can change permission	1	change_permission
-3	Can delete permission	1	delete_permission
-4	Can view permission	1	view_permission
-5	Can add group	2	add_group
-6	Can change group	2	change_group
-7	Can delete group	2	delete_group
-8	Can view group	2	view_group
-9	Can add user	3	add_user
-10	Can change user	3	change_user
-11	Can delete user	3	delete_user
-12	Can view user	3	view_user
-13	Can add content type	4	add_contenttype
-14	Can change content type	4	change_contenttype
-15	Can delete content type	4	delete_contenttype
-16	Can view content type	4	view_contenttype
-17	Can add session	5	add_session
-18	Can change session	5	change_session
-19	Can delete session	5	delete_session
-20	Can view session	5	view_session
-21	Can add bank account	6	add_bankaccount
-22	Can change bank account	6	change_bankaccount
-23	Can delete bank account	6	delete_bankaccount
-24	Can view bank account	6	view_bankaccount
-25	Can add taler withdraw operation	7	add_talerwithdrawoperation
-26	Can change taler withdraw operation	7	change_talerwithdrawoperation
-27	Can delete taler withdraw operation	7	delete_talerwithdrawoperation
-28	Can view taler withdraw operation	7	view_talerwithdrawoperation
-29	Can add bank transaction	8	add_banktransaction
-30	Can change bank transaction	8	change_banktransaction
-31	Can delete bank transaction	8	delete_banktransaction
-32	Can view bank transaction	8	view_banktransaction
-\.
-
-
---
--- Data for Name: auth_user; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user (id, password, last_login, is_superuser, username, first_name, last_name, email, is_staff, is_active, date_joined) FROM stdin;
-1	pbkdf2_sha256$260000$tmAQElYisF5E0ijCJmINqO$wvPhjFwky2USL4S2jr7Re5ZZu1B99ikFmMcbSRJKJjE=	\N	f	Bank				f	t	2022-05-02 20:33:10.893062+02
-3	pbkdf2_sha256$260000$EOfF9qjOwaA98HPdDkZY6o$gv1q6HAs7BC1BASrIXW5pK6OzYTQWGM+FZqmLetqZ2M=	\N	f	blog				f	t	2022-05-02 20:33:11.081951+02
-4	pbkdf2_sha256$260000$Xfu2ZitqJbSvOX3wkb6ulj$9zYhKpWO7yzpKLiz1cYSuGcvvwrH8KKd8/+MBvu6tLk=	\N	f	Tor				f	t	2022-05-02 20:33:11.175804+02
-5	pbkdf2_sha256$260000$97ZZAEUxi49jHPANbyDJ1r$5llbYb0LfOKS+M3XjN4AkscAALGTqxMt1wmiyFVMvTA=	\N	f	GNUnet				f	t	2022-05-02 20:33:11.272562+02
-6	pbkdf2_sha256$260000$I1w8Ty0XVi80DOBUXDBwZg$1LsY2x+omJSnXDzx7jU9U/9oRGkIJMjMHBn9GG9jyqM=	\N	f	Taler				f	t	2022-05-02 20:33:11.369859+02
-7	pbkdf2_sha256$260000$o3mijM4nCuPxHlm6Fg5qKm$zjFCbw7S3NlHPAwZb4CSmsBZNELGG6/JP4PzlYGYzXI=	\N	f	FSF				f	t	2022-05-02 20:33:11.465711+02
-8	pbkdf2_sha256$260000$ytl8iFzcwozShli24pMjaG$cOnkgup2zoWCyGvmhnCOjbb3ubunL1IHLjAXIqxrW/4=	\N	f	Tutorial				f	t	2022-05-02 20:33:11.562902+02
-9	pbkdf2_sha256$260000$BLJcw4bDrLy2kglZUo2WVn$KSJUk92ScPti0X0tJSB2taQVPXveASN5TcdtahgPDds=	\N	f	Survey				f	t	2022-05-02 20:33:11.658226+02
-10	pbkdf2_sha256$260000$shkywwwTBeVhvuOGe8Kl8h$IGVo6J6zra0Zmw8LQS6L/4DFWFHalo8ftpKDgdPfyUU=	\N	f	42				f	t	2022-05-02 20:33:12.107885+02
-11	pbkdf2_sha256$260000$jCjSykTeQFPz0vKIbxc4xB$nZICGJ5llfGI0pJQudv0Lv0cIczgJUGcUb7P0tM3GB4=	\N	f	43				f	t	2022-05-02 20:33:12.566959+02
-2	pbkdf2_sha256$260000$K3jdHDdJ27Xl8BqdhlJgsu$SHIhv+piYkN4N3aT9+mT/2BMZSJSBGBGopvdgef8lG8=	\N	f	Exchange				f	t	2022-05-02 20:33:10.987938+02
-12	pbkdf2_sha256$260000$qouz7nIUDG1e6HlmFn0kNf$+ngIn2KffZdxitSz1qpWGWVZpP11lGkCGWussS4opiw=	\N	f	testuser-zzeu1aog				f	t	2022-05-02 20:33:19.585113+02
-\.
-
-
---
--- Data for Name: auth_user_groups; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user_groups (id, user_id, group_id) FROM stdin;
-\.
-
-
---
--- Data for Name: auth_user_user_permissions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.auth_user_user_permissions (id, user_id, permission_id) FROM stdin;
-\.
-
-
---
--- Data for Name: close_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.close_requests_default (reserve_pub, close_timestamp, reserve_sig, close_val, close_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: contracts_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.contracts_default (contract_serial_id, purse_pub, pub_ckey, contract_sig, e_contract, purse_expiration) FROM stdin;
-\.
-
-
---
--- Data for Name: cs_nonce_locks_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.cs_nonce_locks_default (cs_nonce_lock_serial_id, nonce, op_hash, max_denomination_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: denomination_revocations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.denomination_revocations (denom_revocations_serial_id, denominations_serial, master_sig) FROM stdin;
-1	152	\\x024ff7b493a5e689a0d6c9b533859b3e7dbedb2a7bcab1c6569af4e19754f24b4d5c198501d4c34354485051ec5161247991da6bf06b729e1b7379e86e0d3b0e
-2	244	\\x41ecbc6621bc2ab3bdb1a15174766f277534395cc8384c833e8a96a72ad83ebac9c9a6974dbf179e6818cf0e782220ab6b70f7491087194e14ee9e14b76a0207
-\.
-
-
---
--- Data for Name: denominations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.denominations (denominations_serial, denom_pub_hash, denom_type, age_mask, denom_pub, master_sig, valid_from, expire_withdraw, expire_deposit, expire_legal, coin_val, coin_frac, fee_withdraw_val, fee_withdraw_frac, fee_deposit_val, fee_deposit_frac, fee_refresh_val, fee_refresh_frac, fee_refund_val, fee_refund_frac) FROM stdin;
-1	\\x01f4b242f370231dcd9dc623b24b48b4e3034fac937e4d4f625102d1ca0264999bf3360d79a44c165f8d4bd1c82ec55f56d575ef6678cd82295f1c26d5d7b174	1	0	\\x000000010000000000800003f38cd6a481acef416652df92fa2181c4c0a6b4021d8b1d97b8a91e779d1911b0e253598acd724219238ec81428f0079c6fe082b12b07806fcd65b04691503dcca48a1714668003eb12e636cf63710ab41e86edd4b48f9a9f1c6166093d240c6b1c85751d1d0fa10e2341d750d508f0812317dfd4badcd89bbec5224c3d6c987f010001	\\x69a85bfbee734b5c4785ba2ae16fe69358e82f2a4482061d7a0ddbb6070467e927e331a6afd7169200c55068bf0039753a634ad87835fd972b692885815a0b08	1679323390000000	1679928190000000	1743000190000000	1837608190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-2	\\x03f89f021f1acbc2ad83de9c15b4af71b56bcdfc619c35ad345d1cb4dc6c16b01c3c1cc02d5dce8d30b5e246bb1f21dc08050c543b87a8613e82ef89c31102f3	1	0	\\x000000010000000000800003cb18d3ce9633ce13eda8a31d84723effaa280af91916994ca1d8b97be3efaa106c0e67a60ce5210ac46ebea9fe2bd83e89c7e6024a022ba6955d8fc89af23033c9292975105050ae5c3ec2f53e473b0a1f89d302b4c084cc729eb2af9224e33df4dcab6677a8a54fa0d97a73c641dc850314890a1a91b07f582f06d5a3bc27a9010001	\\xb605c4850f1de015224b1b2773e0a56675d7dc86050d1c6b89de6b9e3dca7016ce12a1914e70f28224ea0ad284b428e18816f23c33209d86c3b2ef580e2d5808	1652120890000000	1652725690000000	1715797690000000	1810405690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-3	\\x05acffb9d096153a6ac49c946bac3d0d2ae6fbb695bdda640b8cc3188afd574e2bd5b63be9436fcd8f4400561b41bab632631f35f4f7013107513e3e48eb0f0e	1	0	\\x000000010000000000800003ca086eeaf7c9c6a4094b81bfb4089823133106446fe162a899a14a1eb685dbdb4098add717c2353756d68a0d659441b5e323e1f4ccd6a388afacc8f9d4fcdef87b5481b7f7c33f429418f93e065211b8415c86a520f30cc865af6b7ead471c63d3f8744e0cf73d51ec28328f52ce10e63679871ee1559e96f83acb49ec804b87010001	\\x77a9ca83d59f8afdd3c3e4670b663cd0e02ce15c1cf4dbaa726f4261dd3122295aa0bd6187345a9d0b1934036c8d28d9d1fa2512009e673be68f5530b342f700	1667837890000000	1668442690000000	1731514690000000	1826122690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-4	\\x088c69485661c08facd25eb9ef828c0a4a26cd9c39038412f3dc7776643de473b790d9c357a4ab0271c2ce624e8c5203214bb4ad4410374c5efd239a249aa6a7	1	0	\\x000000010000000000800003b70c4e5b490edec20a66322bfe3bccc916e4abe9609d002bb65e99d85697132741ee4383d5b09bc40a83f3647996d833b82291f049d31774065e40fdaca18ffa78066ecd9911623874592d77b5c9f4427be5c81ebeb8b13dd120b79cff8ce7269a154f8dfc23b1938bfb5fca2aa8d570add625f20fe74245bd59c987e89bdb65010001	\\x2dc4e22315126b688450112be911df3c7e62ca789362542b77030057e7a46fe12f681244f686ab7e34c81cb5428d850ad4adfdb827c46180ef5f6a560f6a7608	1671464890000000	1672069690000000	1735141690000000	1829749690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-5	\\x0a98d5bd1f6d12d85212b5d25121150cfc3947e31edd8c38d53f902f90c39f91916f141d0b3706c5628a6ee6fda857b19c35e132c49ac81616497e6a58ffdad9	1	0	\\x000000010000000000800003a0be5ebcd66737602dd3bdd5f15a8e7389707a5220bd767aa2d96675523812bf88206caaa15a7655ec50643e8a4143a6029e94341c18dfe0697a8af67c295c9c56b0e887ca7304761b9c2e1881129e7853cc5049dd8478e07ceaf2dd3dea5f53a8a1b24445c1c57283e7f0833776d0b5a8ca2d26357ff481ff2046594142cec1010001	\\xf4ac2ed60232189d760b56d38ca6e9c7e6accfe3a7d2ecd0083984bae91573a02c0c4fd5f559d3d411bdf4ff87baea5dccfc2c8cce29e1dc209d3a9ad5b3160d	1672069390000000	1672674190000000	1735746190000000	1830354190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-6	\\x0e54f55c6151fbb6c4c3d28c5902cade79f153285210fc8ba4db30f42ad8372c20fbed16de969bf02c97d81b74c9b4974fc326e9c715c8601271301759dcad40	1	0	\\x000000010000000000800003b82e4630bd8a148aaacaf3c980d92b88ce3bb8635a715c21d7d6cb3e6dadbfc10cc5f21aacdf0743583d5197cfe832ba2520281f2b178b6ec312083fb872a2242c28e8667104423fff5368f6778f88d24d98fc002334b02dbc7f659f1204e2763dc4cff79651164179325d315647a219de515114aa593a2bb4b15321ccb062ed010001	\\x61d1a02b0de0cbcaebba326cd7a8231a894ac4a8490fee7bf18eb7d3bdc9a7b39f2f29896401fc231a39096bb3fc946a60d12f25f20716e06e901057418d0b0c	1668442390000000	1669047190000000	1732119190000000	1826727190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-7	\\x10248537ad4ae72cbcd004a510b87f90ba49fc976bb13a62b1b35e9518ecb6b44e42a3a45155dd209f389601768acae777441f67bd69a84ea6751fe948333ca8	1	0	\\x000000010000000000800003caf5e0e7ae348950334d70035beb5ed125e4a8679e58bee63a5a3a92bede22027954c31873e45ff7fc4968928f2281dd4081902f94bb1cc88cdf096f4091273bd6d8d88901be7c6be5a4ae0bcd8f07dc55e07e887fef7353a15261bd722688b727dd91b5367232b7772e6e6e86fdc1b8c52a7c37370a6c022c1baccc913569cf010001	\\x8ad470326c352210a8900498cd1cd9b570034c4b41dd9d597e104c8129e6ce56c0c86c1b0f41e1bffacc52bee86380e3d83ab46a3123ac37c40eec529b3c5a01	1656352390000000	1656957190000000	1720029190000000	1814637190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-8	\\x1448f784b97c06c68d6f8a85704826724c1bea3107bbd3dd934e680e6c6b248a3661e4927b75f003b3979a47325dc08caae001be81cad50b3d834aa31f6ca442	1	0	\\x000000010000000000800003bc75366a44685a583b82ef28d8c24f5f0efa845fb8fa1a317b1091dd05a6e3ea8f36fc4591af3b968464f73bc951532f02b58fad4691ee3867357bb7813bf328fa16f8c640a19beb6a6eb9399de79212eacca72fcc15715048304ed22f23781e9b5aa2389ebfceffda793810589fe47c1cbb3226bc420287f6a65cdf697b2eaf010001	\\xc1f7013e1d6cf6a4937c1ac4175fac32196b22db1f76dac45ed434d81e0b85c90bdfb655ba9d0585d09dc6f3e4d7b09f0f13b1ee77b3c5956e8b2f9c5f33d00d	1652120890000000	1652725690000000	1715797690000000	1810405690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-9	\\x1524c0578ce8601ab790219949557153875f23af183634258e4af801a1a25da97ab5aae54119976decd396193d8f8d2f88df71a35d193cabe088d668694a2552	1	0	\\x000000010000000000800003b4dc113e403fefbeca1b2642f860bed0fa8ffcd7e361b1871d47567652195c45dbe640da8f696d0a94b968bfd3c4d4514be0083b6db628d91ae46e9a9938f05f74cdc986b39bb438633d6dad3a5d3b122681461d3c5e42330d747d9e63bab4a62395f5e52a9bc0ce45a21f974758daf0d905ba124a247188edffb973355d96d7010001	\\xf9261edb9972f45ff9e3a776b9416db2bd79da898b512af0ec12960edcc152ad28b50cb65ba95c86a936bc3382a1da81bf6d2bff6fcd1cc41145c99c55bf0701	1658770390000000	1659375190000000	1722447190000000	1817055190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-10	\\x169c5f4e17f3a111cba3759f4a7154c7a204105c9bf50fe53e3e98ea9271cceba3ed62df84c39fdf95b956844d9422c8939c771763ec3f9d01661fc2e9f89724	1	0	\\x000000010000000000800003c1fd0055e229ca3469ae822931567cbab5d74902839d09e71e36c59a49fb5d0f49c29373364da294d7007ddb7556cb71601239497ad7f8ded5d83a65ac1b8272e74e2fa561f920a5cdfaa3553a51a23bc6e2298b6b9253b831323af613ee685567125ad6785b8777734eac4298ca8b66980abe815a0b214f1475b7915f8c8d0f010001	\\xea16eb4b055228256850d55f24f6c5d12213f005f6647cbe50767f3cc27bc4f816b8c7e8d54b8d80dd67aaa2219c7af458ad8c9ddf450f75dc940fd1403e630e	1678718890000000	1679323690000000	1742395690000000	1837003690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-11	\\x19ac85e705067701dab9a2a938ed65961113341437884a9bf418cfcadddde8efe93bf4aa32c33ad43d5773155f96e2ca708f6cb7dfe82160dd5e519b65f99ed6	1	0	\\x000000010000000000800003d958351c3f1ac89e21334f32059c795a9870efb71bcbf1cf8cc656f16f0a3f6f159653da9b7ad5ec825f7eccca56c32a7783d0ed560577dcf23266599b5bf558605c9d9ac50ae87c95d01a767cd55015e857ac87bc7b88f8db4e86412eeee9f8355ca1ea8daada2024aa2ef21cc7d221670244e66cef71f6b0d446e0ed963e79010001	\\xa3a6c42b678a57f5a3420ed1c1c42882d815c035097716493b3ccad73319ded200af5123c322d335ebc717b8d12e9fc0b7d2f7382534b20d5831a1418bae6b00	1655747890000000	1656352690000000	1719424690000000	1814032690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-12	\\x1ca037ad1b175a0492e272e299553751955cb13a46e76dfa8b20bdc49f8df930dce72656301b38e21fc86354e1026ab4af5e40d4c291a19b6219b083486149e7	1	0	\\x000000010000000000800003df3eb50e23533f0bfdea20775576332ff391c99ce4d4f8b05809a959d71fb8872e3828d1b0a558e2b2920d5801f63c0284e06411e27f4d02c0a80fd76c73e05e091c70c62842bbb1d4a5f82b91f7a14c3a1245e0dde466d6ca3c93b92bee72822f5f218072f17c78ccc18ea9c05e67b0643c0570f5575274643c182ec12a7af5010001	\\x396938f8624bc9871d382bbfc288ab2de622a72f00065b21eb8eabb82da3abbd2dfc83423fecc0fa9e6422c16fbd02a47f3459a0ff9a4feec0610f618bfd9009	1669651390000000	1670256190000000	1733328190000000	1827936190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-13	\\x2174bd6a177303e111d35202c39a54f3c1f7f3903c013bc226beb8eb432a5efa133761b175fae61e3598c17410e8db4b5257ab5168c65abccd1829d638a5fe0a	1	0	\\x000000010000000000800003ba6621b114da75843fe6419d8e077a556f5e15ac3cfae5ace64a2af53b5a17a881cc47fe6f3f234cc2156a94d3914e6dc53922ea403aee1e5077698789910da58ac4cebb5f3b99cd522d16502e5fc0591806ea52d414c769339f7e44a6311c2a22347ddae222538f6193ff5418280520b82918d339aefcaa46e7b6af37167caf010001	\\xbac6026e2613eba482082ca15a44be79e17059a7c80928560b5caf3fab9533e614cb6f1391fcfb77be35bb865b17a3fe8c4231a5113a4a84cae634c74b0bb90a	1663001890000000	1663606690000000	1726678690000000	1821286690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-14	\\x2118914df520c7e20bf0cad1e5ba04efe6448252e5f113c9fea18575b88dad7a205493f19501fc937c20d79bd27957c3443c295e9a2cc85f3dd04cabd3213502	1	0	\\x000000010000000000800003dba3c511b65f4155d9ec93bd2c668b189d53b22480404e7224c53b12b8cd93b31fabdf634803837ed0051170d43e00f7ef7e215c42344331a86c0077835dd154f35b9a197631416394d83c3d8f31dbc546cb81360950b13992529d2dac6398896d9fe93b3ca8911b2a193f524f22f54bf8cd8e4666619264fcf7bf475fade51f010001	\\xa3da375d44cbf6fdc869c6d343433d32446cab43b73b2ea0fcde5a855008e3761b93a4b1520072288ee53d51f8e87303e60e6639444be62f93dbfb18c34f8f05	1661188390000000	1661793190000000	1724865190000000	1819473190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-15	\\x26d84e909f588c0b7b099759e4d0cd33f6f1f2b825e3fa1f2a78a6593f39f3ec727c09aaf62a44ea5878206e12457f63531f07ecaab6fe58b22da1c0c1722bb9	1	0	\\x000000010000000000800003c195e19e945374ea71a24f7868143161fc4a40e863f0b9faab1d92ae518a7eff85b6b7b021fc8c1a2635569cbe4fff406f589965576bfd72fafee93fdce78ec87ce74f49fe74543b8e42c1e4a267dc18cd6b8e1460104b1998d4097f43cdeb6aafd6f1ca6ec6e4626722f418bc8f43b4d7692a90c99bbddbff1171a8ec19a49b010001	\\x85f267945613a2bea5e529398695868ede3665a026bf0f195f302915c142c096d2f3a31ddae3071df277a673c396e43250c696d250cff7ac7d0d684a9cbd020a	1672069390000000	1672674190000000	1735746190000000	1830354190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-16	\\x2fb064fd3d74febf81e9f4f90bbcd762ae152911fcf7605019e4239a2bfe23fffc2abb9b262ef32cb4db9a34d635b3824a84bd65e5dd52d8eda6acc2db9244cf	1	0	\\x000000010000000000800003cd7fe6de42efc5cef3a1670206fa9af89da9eacab2a59ca4b4ea49d95e3dc34bdd349be0c104f4bd67a2939129d89dfe13dc313cac62992ff9a7be4d9076385f467cf468b5efd68e238614e89ad8baf6734040f3b12600a3e0ef5977fe27e47f9b323bd089283ccd02c4e01c9f3ee79c55f3ee8912e70cdf5bc6898b90c138f3010001	\\x80c9f68b43ddd25fd5fc3a9f7f80a2705db8838a03ea961d3bba4a45327e74541227c0e421ea601eef28af368c0a42673462a172029ce0f889d35ab0b5afaa05	1668442390000000	1669047190000000	1732119190000000	1826727190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-17	\\x31fc95dee14d22c79cd35130e32e06230b8098c069054840cea4b98b8f6757cbbea1741a738d8db2c1bc792be0243f766cf8161432c973a1f45681354fe62fdf	1	0	\\x000000010000000000800003bd69b15fed77f16bc21cb4996c19ccd9d93693f6876b7d69f51d89c4f525a4fcb693fa2df4c9e625d2148490f5754670f54e47436d9dd6a9e672e5431b08b3302baee938a3b7a569a00809443b96880a8ffa1cfe0e755d1553e0e9359a7d27d58d57246284804cab9dd849e85792ff1b69d9c436cd60e8f6ec358ce98c2c406d010001	\\x527201eb76729daa276610c23490bfd62ff8535b020d112ad456cd6840c1aa1da967a12f3480dbcc5eb0770a1d6ce5e70e52e6fb995d0a3a0a94b4d4f7d0890a	1682345890000000	1682950690000000	1746022690000000	1840630690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-18	\\x34fc34fac359c7f592846a290f43ad58a0e31ed8f801004411d4b403a0c777473573d1d96848e44c9bfa0f0e13b5443ac49489efa83e5df73412f854e412faae	1	0	\\x000000010000000000800003b17560dc67140beb2a07aefc148bea5bc141073573d28c1a8f288e38f875fce0afcb0409b076e3825b60449bd6e8756802b2face652ca18fef75647f1ddba2cbfe9cfa73f2e56118ebd3f92221c96ee6763c6fd1076e3f780b5234caac0e2ba2783322e97096f9e388723e677ad4f18e02a5ccd752d1762a64dd745a7b294745010001	\\x755739edf6a8d362adc71ec88b0e6b7bc62c0d46c884821968b0de1616d9a13e406ed267e252d71f46fa41ca19c3994dd7d3708279e71b764cee009e01dc1c07	1676300890000000	1676905690000000	1739977690000000	1834585690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-19	\\x36c0ccd1f09e895096a015013ca80cfeaec7603474caa4ac21a2cfcf2646ae5ebed170617d446abebc0e66fbfe59ceebe57f1197950735803dd962070742a27f	1	0	\\x000000010000000000800003cc62b5f71366af41ff75e3a049e9d1c4f37e2d1f20ff709681133d704afaf58c9b6a7c02b0190cd5dffe450ad26bd814f42d046eec5ee8f826a931204a81fe86fd3ad22c4e063555c67caf16b2536a08a102c17e3e160aeb3748bb4b0bb57ae467c4065b70e2a37fff0c596a9110b91459e23d25ad69f6540784c1334dd78017010001	\\x104e06f058490a68116b7399683254d3556492b98044fbcbfc09eed07b453c30eb04d2a807fc2560272c58b29b18731d92fb3d4ae6b6dd3a91ddc395cdc77703	1679927890000000	1680532690000000	1743604690000000	1838212690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-20	\\x371c6a724a21464388cabf26ebd78af850e814827bd0561a6bd853353c01f3ed5c6d539e9c3158ec72e248ffcc6629887c3d27b3be2198cbf0a2cca58e136daa	1	0	\\x000000010000000000800003ac679ce27972b0d9248a87ed89dcb4bb2d545d166c36536eedfffface5e7d23006943e35a3fca7cbabb7474def04ffac2ae1e40540fc02dc6a2f1637c56c1e3d97a64868f7596a5c8edb5c7ec493ed23c1343f0e115cf5b4610e9e5eae0f8d6ee9644c452e23fc915b798028f179fc46ce06883487e02f0d50e2be7969e544c5010001	\\x85668a1b7f83a20fb6e086daf7a8092a9a8adcbe4a9618003c93105cc83bc00e899d0165310c82cf53e1bccce0e49a121feeaa90f856d33f3f0539b1668e300b	1655143390000000	1655748190000000	1718820190000000	1813428190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-21	\\x39002ec78f5bee8e77b20776252c984b0521b0db3950fd33359d14742c7db92891b9fe7d9d81be7afa60d52add1f509b6ef9681d17aeb13b5fb1275828d26f7c	1	0	\\x000000010000000000800003cdc98ec90633ed875d4ccc5f444588970bc17cca75d58f5d3ff4afedc3e5f05969ea625858389e46ca3a43491032f3a16c01ef95589275e2a5fc7ef07583b060110e1b1c093bb5f9f467af909257b99a3e5120e71e68610862103fd46ac562b826f939bbb5457dfead3704649b99f673cf740c04d216803591b4e9242cfcce3b010001	\\x194f9542894323eb64d159df564782b6a79455b63bafe935746e149be8682f19f242272141dc41e34c0a0b40ac5fa033ed34caa636c97d67ac972c30fe637302	1659979390000000	1660584190000000	1723656190000000	1818264190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-22	\\x3988644a4cc6e3ce4cd28224eb334aa3025328add9c629c1306ccc413b6a8f6712a8a78af8ca9c4d9bb1e1860c7d0064f75c09a6535fd20bdc372c8eee0563de	1	0	\\x000000010000000000800003c8aa86e8470e376645165b4aff0a8d8a0c30a2f70296bf07fbe3a158921e8d0ce854a87ff5e80236afe3e237c28a709278cd097382465247925eb5c42ea018c57cf5c67c82b24dd454fb10eeff1a48a5a0ca9a19492eabcb20edf070aee47d0a5e16a3e096207613ba1d37f7b7fb12a0b8191d8349527d3287cf7af596a52c89010001	\\x7d77e3dca57630701c909c069ed574dd36b835a42895e7cb4ec508895911280da93f89b447951ad271bac8866794f3431ec8962dc1e6095df454d15e7d5d4402	1655747890000000	1656352690000000	1719424690000000	1814032690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-23	\\x3e00d70cf7daa441f5f2c7112f456bfe9b060710c7845f728f3f7b0f4ca1fa06939d43e4aaa67fe762e9fac6e1bb16b8244b36d7b9791b4940105c3520be44f8	1	0	\\x000000010000000000800003b73dd1852b2811ea5913f0cd7e20e570e34ed4c96f01e0e823d7a18d4370a86c5f9e4adb8fffc40625ccf918c1263a1c23dacee7758d4a4c253698d1bd763ae1d7816da95b1bf42a39d1828c7c295842587b46dfd0ef6129d075b3c8a59e0d9d0747c2d34cf2ed5cc1e2de81b71cd7c4acb13e8cf55da6a33e7269550e30ff9f010001	\\x7a78f246d1badc3e7a73ff30e72b944f99066473188862edea0fb8e2728e5622e14122fd5417389925a60e7ad53032a6f2300ac7a9eecb82056ad82c955b2a01	1660583890000000	1661188690000000	1724260690000000	1818868690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-24	\\x4184d52bdbf2bcd9a6e2c4e45ad293216251094f438519666e2051b597811a7e271c900b0dafb06e162157a3e2a19fd55ff21b8a14591d0f071f3236b9aa1d2b	1	0	\\x000000010000000000800003d788fd2bd4b78edcea12660843ecc4d42bad9fceaae9e6c26eaea4bc98573e6c204018440cbab650b88306acb697c39e262cca5461c838473822c5fde55db8d9e6627171941f568916e256096593016ac1078b4a4d5a53008b4950ea3c15722fdd5b7e2f3a9f05de51524123bc63c4dd29c210b9c55c887aa3a26f4015c68989010001	\\x07e8264987812abc238eacd911c396c5dd70da751cc65605a2389d58b0cb7c8a2da45f919b93a051b5faf3bcd5e5a5d866b797f05ed9f74b2ca9d5db59d5320b	1682345890000000	1682950690000000	1746022690000000	1840630690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-25	\\x47c431d372c2d88ac563fa5545268776f37c580c9a4d2b034a29de51c528a378f9c7abb6e1dea13e001c555d18961a26ca041810e9edf4e4a5f042addeaea073	1	0	\\x000000010000000000800003e1f7e9609d1f92d9e98d383611a7c272beecafd7a68b81345d368f4b54faff17039469692c0692d037016c676f137267067e4fa50104b5251c737df49a287b71ec427e979244f5e970eaaaba5a758f82b3276fd262068ec33a1ec202eb54a7e0bf49cbc1d2615e49aa5511458d0da9ca71949cd76f9510cd49ad77ed68a6fc85010001	\\x7b1193e2e0762264e0d8a5cff148980de60d85eb8282e2b2493e53ca36b81d02a0d11c62b4d4c9ad604d17a9a8f43be3d2b74a172baf9bddefbbd959f5b88501	1678114390000000	1678719190000000	1741791190000000	1836399190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-26	\\x47d4d187ef60ccbb0f8161fa7309d0bdd78c0fade6ede99d212cf986ff0d363c54fe3772dbdbfac9f42bc1dd5393a61af6916772a59d12363b1d06673173cf49	1	0	\\x000000010000000000800003eb5678ebf91259a1dce43b9d96bab6b1592e61893c4b593d7a0e4d3c325084615295f93748888dc27ad5670b8287ee9b4237e42b2071efb78da94452b81f2825c02409e696ecbc9df2f87ed9d6255b784003b977aaef5853937d8efc1d3efa51dbcbf6c34927d2a1bc80f19f3a4ba28be73bc1d3c9c4ea04075935c7eb0a10f3010001	\\x51df572380c93352d6610e799cb20892a4ef1eac787642db5a3b9eb84189daccbf105ac8059a2965634142cb4f37800d31db288523d3eb5821c272c64207e60d	1679323390000000	1679928190000000	1743000190000000	1837608190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-27	\\x4da0b08672fb7d0b880f50f4ebfaa3a01efea3efc706f460499d78f56553f5e2ebb798fb1c9675406b3e554f63e14e335e953d264a302e4a429149d615f4a7e4	1	0	\\x000000010000000000800003c9ed65ed531b29d9e3c006bfe96400fff24b91efd6271822f49e859bdba3f0a6a8e26d70b3d8b3348a2d3f02c4009f6f85254c0e45d74496a582a2ac61f178dbf7c906bfbed241d4d521525716437c54977df8c8e0e5d6047fd3bff46e4bc05fed8cb8c5b948ea1e9375c9693b26c9d3fbcd4f8fdee805c82e975771ad0733c9010001	\\x368740e6c2098a992f6af9596ad1c0bc3bb15ff7dc6d4a8280e2d75e767df96c1f21a6eebcfdd617b36b8e56538caddbf219b1872d5758f7c363fa619ad79000	1655747890000000	1656352690000000	1719424690000000	1814032690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-28	\\x4f48eb3ad7ddabdc6cdc31501bda0fee8f88849ca4a95b0eb91126206dcde9641ab9d49521fa4bcca2c5981974cbf71d1d63a266d2d0877724c4d61e1ef600ae	1	0	\\x000000010000000000800003cd0cbe3fcfaa9d71f6b8263f1fd15fb1c394c0667540e63fc584e51b5bdcad682e8cc18ea8476e39b37881e971c1388d9556131767f122912ba48629cc6b260cafde79d620fc64923a9b62d8c5e6325db5f6051a0f0012d6c8b26e73ef042812d9e85bb765470c7761c2d1a7dbd1a9adb3c9e6531deaf7079f893ca650ce1157010001	\\x76ed69584aaaa4204681de5df9ebc9557e5adad4c41768ca16ff0a25b914eb77f23ca759b4dea504bb6324776adc8155cac2331d7f1184b8c268f3c3c255e20f	1667837890000000	1668442690000000	1731514690000000	1826122690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-29	\\x51306784c550289d0f2e09e7ab77d959ff8855a9afd1fec9e54b421fcb59d1ba1944037cb9e431c549404fad10c0eda0fac15a3265dbf82960e10be900053dc7	1	0	\\x000000010000000000800003afe4f14ad02f24d1840960338b3f3ae7ebfdb37373a79e7517f9534bc8a8e2cee61a088605bbb1184b1b08ce457fa136a84884551e53e9e90c2aead4a1d9a985c16fad3e821b758ec04982464cd5e7a80bdcc73121cb74889823b647bc6dcf4ff275e9b0307e1c07e809f29192d803a55de3a88edc8f3209d150c305ebea5799010001	\\x94d057513593aa8a3347938d902736938a558c7f95abb21bdf778fd14fac4a1f7ce830db3e569a36f6aebf874fab7d887cfce3f5ce2bcdf8d1d6a76b413c3903	1675696390000000	1676301190000000	1739373190000000	1833981190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-30	\\x522c849230386f1715dedd141a682190332783cb73d5b40e4dc228694485b74d2c4cdc351f0647310ead171a62b55ae7ab0fe67d2ca888184418e9318beac8fc	1	0	\\x000000010000000000800003e77274d1836fac8fc8ca5e2a7ffc5d18370ad43973761106bad2dd777cd40b332405465db2e925d56bc90de1ac2a332c11335512a123cd69be6ca96135e03db5f40ea0247a7f22d0d4c127d5e04d475520f97e216f13c5f01f78103bf6763b48198f21b397221adb8d8ceca149e56c9df063bf84e0a2fc26f164ef645735e807010001	\\xbd7ba5ab0c7a7f0835ff1f98673a6048453a96f5934ecb0bbf6921fdb63b38a3e3f4d83a2b358e1918d0aa0578fffd2e76580426d09640dae20d1acae8614a02	1672673890000000	1673278690000000	1736350690000000	1830958690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-31	\\x52ac9db1803029346232e2bf4fe31dcefbb01d48caf005bc2f48890e220d71993e0b16c410153dec6c6cf53b72b2852d0fc9bd8e303fcfbe30faf87a8af8975d	1	0	\\x000000010000000000800003cd87cbd38d8a2075f3cade845e64a340ab501f880ce6f6a042f4a2f0f19dee07915e74a384fdfef71a2df0138f45fd11e28a3897d78a8ff6a0666a2d0e0770e265d30743fffa5a71114e8d1f5c7381894075fb0d7aa27f3e35c2c4d6d473689be1e096d7723c7493580a5db78c53f25cb901d955c4be9d6fac7325b61ba2ad57010001	\\x2acca4df601365ac3b43fb9e03ba491cb434a4b086761763bcd8f12da218f97b57d46403d9e77e8ea0d6a007225815fd8d4cb6fee6ef052f2b99e1f968e7820c	1666024390000000	1666629190000000	1729701190000000	1824309190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-32	\\x55d85c47c17d8a6e910dbb2f794e49a5c71f52ec7153706b908632104ae932a99f77fa46bdc9ca965525063b2870daa0d3e8909bda8f1b80930c925fca6d9c31	1	0	\\x000000010000000000800003aa65200c0faaf982a92b95c3cc8cd46ad6f6dcc58bc965f21427f6fed350a04a1438aee493d9eba4719ae36fee92676041b8f946eaf3b40270512e328e32ac0d854eba3e93ec5a9b2de09a75b0288d79eaf72d45855336a53637755a38862193b60954c3b5f7e1c1a3e0a8d3e7ca5a1e69fab24b9479d9632995f03ca977cf23010001	\\x92a0c3cfe45428040441b51bb0d61dc037905bf50a51633028e0c6a91099bc016aea27dbfefafa2a26a6f3059b85817b034f0fced70e191022a2feca7849ff09	1655747890000000	1656352690000000	1719424690000000	1814032690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-33	\\x56e059429d696ac9a2649a5ed8346f601e2b8b814fb02e65fb7f11641e86496eef62a80fae0e0eb46b0b78bccd7ea84e75c343c66fd7b6aa646c1dce961afa5a	1	0	\\x000000010000000000800003ada824aeaacd22acf2768679c4ff0640296eeb5b0ea8e0667da3be017f9cdafaeff527a81d8bfad279200153b6b58c592a8343b5f74960d1e67ddb8786460938df12959ba462bf6e484f1fc64677e32cda1a94d870bd20b8c09d3e5ceb8c058cbd8ddba65d4703be860acd0fc97b801ed797f62ff3135965cd10a0f424eaa687010001	\\x01c5a91fd6a4b95f3f7330e336385f9a468545b08ba5e46c636e115698edccf99c81e8a3c5db10f2ed25859d469625c7742ac0b120a13cd507fef5f310fc2b0f	1659979390000000	1660584190000000	1723656190000000	1818264190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-34	\\x57002c31fbf68474e379f4f649b31f400c069f3ca9bd4b393a39ae0770ab6e7161ebc6368f5acf7aa905da01694a7f0b3dd9ad41805e087e88f5ab5351150549	1	0	\\x000000010000000000800003d307efb21091c0d699242598245addee9c0ffe9fbff5174388da1f2fea71976b09b575486c3a6312bfcd16ef176b426d8c9caaad9881cae780ea789062fb3b485950d61e2d8b43c574998d5fe70a7758fde03e24e93f11044f6d9baa6748a29e83f6185bd2f3b47adab650c54631d5d8a006712b45524511a21dbfcf55fbe9dd010001	\\xb059323746412fc0e52449be0996365d9ceace9d5b499ff76067d76261c7c4984f4bbf76f2a2050d8e95c8da94de0840305e3018e80531c422c2fe0916460b02	1682345890000000	1682950690000000	1746022690000000	1840630690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-35	\\x5c44978f20f8a16f53148b3ad1e77903bcbb9fb0e2e3056afcb388075552b19a9cf4a4cb1a9aa13f28d58badaab62215e9dbaa000720d94c44b760380ae2ff90	1	0	\\x000000010000000000800003d36c73b0d94ccc0e56c971ca0e4862e6d4cd94dcd73358d166d74a0513a986d42c42331f6856283586940842013f54fa4d9fa7bd9f5e1e58c5b6b93228603ade61e89830a204843ff1b9ab751d832f25c8f4568c3a08c4f198991e3b7653ea2a4e1176f44e103065c41ee699c40581960444e2f50a956b762aebede6648ea651010001	\\x673d557af016a1c586fda6af7b5aa61614488e0ed7010f309054e7ef2bc42fc8b193d06d33c6b4ae6cafa035fbc8afb4d8b4c1947c7410233aef5929c4975407	1676300890000000	1676905690000000	1739977690000000	1834585690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-36	\\x5e3c4505e825d40fd22f133ed2103cd385e87f087db714dce42b46b6767a7f0cd81d32e3db965312df7e2ead8d85a1eecf070cd86ab8cd0486e505e21950aac8	1	0	\\x0000000100000000008000039e3c29a0d119fd982ac7cca639252e887842026dbe542c96a39a0290c29b91671532a547b76f6c3208cc027acde21b407bc9dd33141199ad919730d44403328c093329097dbbb5ba2bc4b57a42fcda33bb9ea5f5f25943e3cde5258b6686c73ee0d7fffb80c24f48df4e3ec906d5a6f121195a13858c8b89e8cbacf0c12347c7010001	\\x67b88301554835ac735b47afa3c16357167bd53c5d05ff52deb4ac306398c0e4481337713359838eb4e5e5d5c5a7b9f6cd04c07100175563937117b8b438a50d	1658165890000000	1658770690000000	1721842690000000	1816450690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-37	\\x60383f162d1ac270a26fb1dfbd806a17e6e895438be6ad52e97a2f25ddf14bd550a6195b234c8705af127a94f450dcf5160935b60e39bd2d92968498c4b5e26b	1	0	\\x000000010000000000800003b86db29bce8c9eb07a03a8aac80f618de5cba209a37ef63a20ca3e9fc78d3f402043e5f243a3557834e4ea9470be3bd38fad808355eeb62761aa5c9ba188d34e801da4b791a97dc8413df6e619d2de6d577d6c21949f2a5c4ddf64606c7aeaeb01abb7994e3b2c304ddf0c5f87809125d0eb375bd8820d16da932fc1e783cc51010001	\\xc6369d9c98ca217fff053b2a0a308c31f0370707aa3e23998677627ae76cc345eb3a464f6961d07894fb28a9ae3d9832ecb9578b168b906a1a1a28e836c32d06	1658165890000000	1658770690000000	1721842690000000	1816450690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-38	\\x63849354989826f38e3f2885f575db39ec507254d41f0232886973b3fd3fa4f731f88fada4aec19c4c356cbcd480effa3dd3b0f096a2d94a5c54b32d95476e27	1	0	\\x000000010000000000800003c9471616a4e6b4ea08c75756c9650c9aef024e7cb0dfd5d24967cba611ad34fbd37da2c6ccb0a4f389414e81a476bc2d24e028987751d0361e01f1b0a12aa82f5019a70dd0e8be09692ef6954ded633f5639e1b67751fa195b687f4f4273ddd0d28e458a3dd9e8c407c78872adcf8e5588b9df6dfea638fd6f90eb7b58294abd010001	\\xef73f1fe3b513a91b5430bdcba7e7bc436e9ddb7c705a8283bace780c232b14c977c9768d40b8aa2de9821757249c06edbcd85e382109b2d72b45da57d5a0c0b	1655143390000000	1655748190000000	1718820190000000	1813428190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-39	\\x6648e6686a264d7511af0e76d32be7323bbed45ae3ba752f3dd879230bee485ca9e4c4ca443238d2294fd1218894f91c5479778fffb33edae278e5f99061c95a	1	0	\\x000000010000000000800003d4af37ef42fea705852b7bede4f56cd2b13bc1246ef7acdea72e177240a089aaa028fd797107f8c052e9507f7e882189c2e4addc16824a39335c3b4c8f2efef8a58282399aa105ecd9f7e4e60e887c68c73b301a8762b2dba7f0f20c6e6536b28f84c8a5f16aa503e70c40e94932713638bdf02e8053468bb89fcb6e6ada9a85010001	\\xcaf5c2fbc9eb5307d69cf7f8ac70b5654c1d59b39ba7828cd0aae436f14a06c922914d1c52d05a183a4091adf87a1a0dbba5f2514e6540c92bc382247b102500	1668442390000000	1669047190000000	1732119190000000	1826727190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-40	\\x670c396f99e5118cf2324764a94a7bba0ab8aef1716deddfc9cb17f4d408ed044018d4bc8e0f537c26ab1d27821e7b6ebccf89ad8f15b3d8f3dd5127f2a4ef3a	1	0	\\x000000010000000000800003e52769acccebfacc1e3c1fa78653f096a49933a08d7d435580bd4ea42374b4362f394b79a7c13a764e1bee240d6a849f00b4831c79e9082d83368cedd29faa567c704cf7f1286a79be54a61cbe7e8bf36b5a0d6337d83f6513a7d13cf0f5e31bf6a6b69ffb3b4d634c669614f901fb7db9f4dbf7e13c34e49be172f3bcbecdcf010001	\\x9a22384dcdd52e4b245d4a7ba58b725f92321cae993a6e38cdcb0ef1a7f16b87794a723755a0f9f1b956bd2390a2326332400e766dbda1ab969ce999b7a74900	1676905390000000	1677510190000000	1740582190000000	1835190190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-41	\\x67a0766f715680b07db330f8022207f3a43c9ee38c6f1bbc23d450c340ce4540608e60611039e8c7a17c72b96ed123563d45fbb51dcd06afc6124bc4ac29f4fb	1	0	\\x000000010000000000800003bd66469b7758b0dedfecc563479ba1e04318361424a5d6db75bf6946b0e4ad6559dc9530186af60fd8a4fa420489a4b3d7371df6410bd3fc12f5b18f12cd734326d7197f1b173e3fa25fe0b0051a6f81550b16798134fd6f0bfb8960b34b3cc37829973d365b3a80963bb66225cdf5c2de07cac5fc2c887cf7e64ae3b8809ec7010001	\\x4e180b0c16ecdb203055b7d48d93cc8ac0fc8404a09f6346679892da78b318fb0b78c5836f1635817947e673a6d38f80b9a73c6116c88cb6da09c8c37687f207	1680532390000000	1681137190000000	1744209190000000	1838817190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-42	\\x6a5caf61a90ff192c036ef56bc0f2ce8e7ae770611ad232af683e18ff61830db01e4035fead932e580e84d30338821c7250c8b7593e626333aa8203745f28a74	1	0	\\x000000010000000000800003d0887e0014b1c1452b5d28bf13ce844c6b80f3a93e3ada4fb6c6e4fc8a02e073269123f56734dcc226665a0abbb537f489316af14a9ca9b158a06b2872ca96a607898df7e8858d9586dafcd43d0e23e137741328a4cb293b63942f121461b11c3cdf77cc259a94cff787d60d56771acb324366f527d606749a6aa712b5187ed5010001	\\x0204c014eb5483e1d75785805374ea9c425f3b17aa2802dcebc1a63c49b06bddeb764493f93f7a38721c8026ac263713e52f2fb0a7f25f184eeadae3ddc3a50f	1677509890000000	1678114690000000	1741186690000000	1835794690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-43	\\x6e28e613d0b1ad2e14afcef304985ab3495579b4b3b9041a8b091b353139412e8347547acf682d3f6aaadb1e9127ee26099d37937e4536676cbe93e7639e1cd1	1	0	\\x000000010000000000800003a3f8563f45d78b6de1c05cde77caf814a53cb5793b231e2f90c605bf106f859da0add682be6a4ef05a68c94c90350277160e83e4a401447c630bc94374873ea2841b797ec6b98f27ca9e84ae1aeb59c472c59acd3dd3599f478a7e7144029b0d909cf25516c3921df4029be2bfed43e40a2f1ee0b16ec3d509a9d8ee4da93bc5010001	\\xb85bf76a29e3100ad60ba2934bea5dffe3cdd6f6383f9203736f6f68ba64e66ed50029f3537b73d3e1149c07ef66e9a9b94b9d98a7fee5b456cd8918db7cad08	1657561390000000	1658166190000000	1721238190000000	1815846190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-44	\\x6f1822b50c0bd68cf30f4333d50ab4bed92b4dd08029666dce8edb36f8368eb7b0dd26b0d4dd45b377ff3bc758f1dbb5d3922309e135efa719c7a7381fc78b6f	1	0	\\x000000010000000000800003bc4d5e57285542bb3338ab9fd8fbfe60dcc28efa7c37860b48fcc7bceb6c3dc77677866a89814402b4dded1499174541564ce827163668b55100b5eca8fa1d2be3e0e95bccb7edaf46ad61214765b0179a1aba4abdc6523fae2ad9cd840b2408fb6abd62ad2170e9d37a5a9526ca2a2231243b4d718594af93aa179b8a950aa3010001	\\xb968c90a2c503176129436cd344effa9d44df02aeaea638a0559d2f0a266e97d66d4d3f7bd861c8059d65c843462a4f13b69a9cece416bf468941972601b5d0d	1654538890000000	1655143690000000	1718215690000000	1812823690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-45	\\x73c4e0ddb35b98f825375e305af7c53b9bcc449e6849218c11764ba4fe1217dbedb05da4adc06af5b13338c68b84480edbf2eac88cb88809b4a60b226115785f	1	0	\\x000000010000000000800003e294aa5fd656952f92d387671788eda1181dfffe908a995faa320a61d937ce46aa865e0bbf32b6dcfa5f98d0be3303c1f2db0cf5d8241f72e8ccfca14d84f973e99f9fe3db762eb2083a225914e5716ba6f83c06e16e9dccc7668f89ae1ede4644528c0dbe3fb9d1c854840a2baa1dbe5c96fa81922b031825ae15cc48424f29010001	\\x9b1a831cb587570d200383d899f0d81074d7dcb3f3ea508813d36eb91f23f5583f53d84809dda6d0eec937d20ffa97f5b20746bc262e182a0c2223c5bc0b180b	1664815390000000	1665420190000000	1728492190000000	1823100190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-46	\\x77208034d16ea8c94872cbca4ddb4556572799af298a3776704d25f66fb3d848f508ef5fdbf6381e9839ea31678fc5dd763ad1b5f2df74753fc6222fe5240a9b	1	0	\\x000000010000000000800003caad6bba49c2fb6d6f9725c639e313d1d8273418f77829c74f1e1ba3ab3e8df5b7866e869f364537f42d8443f208bd7ff0628c4d39acb0c59366a8583bad375522260edb8fb78d0176bf358476fed6455b27f42bf1050e6b3a5dcac532c3c13b28b3a0cbab5b477dd12a87bfb948a02f83998ae3036e94bdcfbfab0015323ba3010001	\\xf4fb4f4f293b7cd7cfe606980304d1996529a32c96bcbec1d97617d3d6cf4a89f08c96b77b448ccc1c229b2ec7aabfc3243a4db4588359f0ac8fdda1ea8cdf0a	1664815390000000	1665420190000000	1728492190000000	1823100190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-47	\\x78140a6ada95a22d0b44d720faf92662a0deb3bcf7a05e122ff28d12d11fb7e62deb4d75ba250d5e496f2fc9c8e2740eae2a5693c6d17e5d5709bad3c93cd43c	1	0	\\x000000010000000000800003c6d3ec4828c4b6bfd921069367d479d9d0a0aa54cbc47b0b4f4908099a5604be1358e7be90bf19be1a9f99244fc27c2563314017ceee87f36830f0c307cc0faf1bed4a59aab5cda77ccdf5e7352214ec4ce90f6ac46c876c45658eec4460f146eb9abb203de70a6d10f412da90adc63cd88b08491ba26b3e78b5bf3cf8ce9c93010001	\\x95b45024bc9537f144c23f5b14cf12adea896284ef39d0f40dd376feda8c093ca68589695d6ed72eecae1187bceb429932182cc5ea45db9cd4590c4535bf5207	1672673890000000	1673278690000000	1736350690000000	1830958690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-48	\\x796424d6f9ae7b26242f525e8c20959c666b25aab75c4c637266aaf83b57002e7eea3355ee7739989e708869fb380a2cf3d92c77841e480bf190329821f8e84d	1	0	\\x000000010000000000800003b6fd2a1520ec5d57291a9d55e584025b7983a83ec5be113d0bc7f08f34042216e25d8edfc9cd4015e81c5e7e08ebc04f8323d9c77914c6bda985a840d5e709bf1c44e71b003b6482f089988f679703967e13dcfc487e3156ebb19d72026c91c2f2ee2156ab7a28f4c7205f0802c96d3ce4fdacebe4258ab2ea36f75f78273d63010001	\\x70c0c541433bfa9dec0e8a9485b3b33d4f13a7e210b097f7cce21f0878cadb4acf5d5985896c411cc104d74a88227525a1b305e9668a1d8880aec9cd27abf003	1667233390000000	1667838190000000	1730910190000000	1825518190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-49	\\x7a80fae3b5f4b8bf4c6eb798ade668c09fe56573cef0293b30a8abcc0cfdbaf62d32f256ade7400e02c2c89ec4842618e45233b17a9c5c443fe6788ae3cc23b0	1	0	\\x000000010000000000800003c108be76908a9eea54ffed30ce2c91aefa2155e518a999a8d9fd8c1b5fe318da9cff6890074e813d6773682e526d687b411675cad1ac72e8fb46eabb5fed61381a318ff827341e4940ce62a4f103c1f5bb976a8a65281a070adea45eac3bb81cccf264fd27d91771a191edc5addf19babe7d94621cb30c6d44c124a70ff6ad0d010001	\\x123c3fdeb39ec8c7e47d30a611f360d3d4ba82875c395626745c91cfc04f27487963768b21be946632ce5f05d2aa760f0657a1a0acab60ff48c0896297328e00	1664210890000000	1664815690000000	1727887690000000	1822495690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-50	\\x7af8759d164332867f606ea5f5ba9eb90908c0a36a4469f9560085733ca5465dacfa2072ab6e0c5712c4de4b80b9951f8c7e144f6cfaf38fae7f0c67e6fdceb8	1	0	\\x000000010000000000800003ada47d98fe49e8aed8f85a7181bd5ed171fda3d1da044cdadec999b9cc851f42825f6d3894e7d7ac2686d4beeab3e44d56416287fdc22887bf2a4981f3725978d891f8e0a517e8819323f316b05dfc6a8f71eee3b47e36a0249cffd573b7c5d8b7c102387c46e30438dc7fbe18e0e53f0354c177cc14b4d5a5f49f6422169c53010001	\\x7005cd648fda74ffe848a82b0426b720f4accf55d00525213603c8bc5dd72da0073a1920198dec19bb8fe5e5f6b0de6a38e6ab0a6cdcb8ce58f44f9ed32e350e	1664210890000000	1664815690000000	1727887690000000	1822495690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-51	\\x7dfc34f86dd053e088c24edfd2a82ece943810ca9134ecedb453e10b3486f54984c1cd0f331c24dc662381908178f26b481625d37d0fa321d1f74cdf8ebb7ad8	1	0	\\x000000010000000000800003be0394e2f293befe7c99a366c7752b4989291605ad0149bfcc4ca7ebb198dcf6651bbcc569f58cd982831928aa1be987775d628db827cdc336af375f569e4945c28aae7bb3dc8026d63c1f05f5c669ff59d188680664209975f19767d727bac462b9ea4ceb6e7008ccb74d6f9c8ae53e53999e6036704f6de3bea3e15ac682a3010001	\\xe9dfba062559e82f1646f7f949a7c3e1f9189e903f04ec340a653f338565021d9e54b42675e41f8d7290b85fad74da1f0f5af95edcb7048a502043cea21ede03	1673882890000000	1674487690000000	1737559690000000	1832167690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-52	\\x7d446be3b2ef15b3c9b2164902a340b3e494f6644863a6e575445a8faaea032e141224a0ff60a8bf90f470b92071604985eb2c762f10da752f4071052e114b65	1	0	\\x000000010000000000800003f9fa38bed03836237fd5f5921abfc871a0d9d862924c5726795495d42acd3a05bb2da29a8040275c74a4681c3776cf0ebf8ee68177328de0c6709edabae4190099877a17cc824bd8a8aaec0236b8879dd8d56f313a305891c48268e71960fa0223eeee695bf19ce6ccedfef3b88199c4a0c084ba5f11429040682d36b394f33d010001	\\x20cdbdfcbd9be7011589663f3a4b41516f9b11cf80ac4c2ed8b1871fe689c55d2c57ecbe852b86967fe33fd284d2c4fed1b62ab366791a8ff8fab0b4011d2808	1675091890000000	1675696690000000	1738768690000000	1833376690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-53	\\x80a4ac7bbef9435b32419d33509710ac73fda1d8c8d450ebe94eb769d7d13de017e5be2ad472d42272363e1eabdd8639eb0162e9213af02ceffa85e453a52160	1	0	\\x000000010000000000800003cbb8423c26d9361a5d5cf73bd9528e7b74d4a0de948bc412e1d71da873c031bfd86c9ead88d5fff4d79eb69272b75a2ed0e0e07be7bba8fb85a60d2c04d66117efa22a40a240b84b02a7c4611311a1434dbe6123736a987b3950005c2fd3b48b6b866daf7986577444b33bb0b99cdd19e8989b9b5ac783d415bc8360af27615d010001	\\x87266b9c756699f3932248475ec49da376e1eed61af1236858ef037cb454ad8f8b8e231f1c98782409265364c67182ceb499c290b48c739e1fa387021e298508	1672069390000000	1672674190000000	1735746190000000	1830354190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-54	\\x80b82f0daa429980b438201cede63719286f41f8407414f05d2282553459ad2f7c62fef53870302761b46c762c15ce3922b7cc3b83ae945e084944a3a30f7516	1	0	\\x000000010000000000800003b74abcdf8fb6f73c589213c453bac244a3eb27227458be7d3819e91eadac8bbb34df07213ac2c9366bc2100d6fc966caa85e9e33580f06c5c715155b80edf590dcc79d441f9372addb90fed5e9d61c2d6c019188342ccbde9cc7cc57f2f51e78a370d43d41aea9d7504904afbd595b357d6a20aaa227767cf8eb209d3183102d010001	\\x63292ccb24640cd6068cad64cb8ea722219bad800468f9e664d13f8f258e034f21d91591e7c2a96b4a0e9a6358a33685ddcf7f9b787b9038271ec8e57b75fd00	1677509890000000	1678114690000000	1741186690000000	1835794690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-55	\\x8100b851948f7a637030eed0dafab816a57b82ffdfaab0edbacb237ce75afb915fc6ff80ca66e2501aef240f72b8e7d451070b96fd2c7a7d86ec688999de32d3	1	0	\\x000000010000000000800003b70aa4fb84397765266035c3de76304c60d662dbd14042551150e4e20df06bf37e492de5645db1ff61c84f0dc8446d33ad7a0db0e6875ffa1c83baea45f281d5daef9dd378478558a9df006e8dd772304b1663ad35d2ac4f9ea798cf19befa525618a22dd3cfbebbee93f998c596a31ac060085e95d5cc0684daefd21960655b010001	\\x11eeefbca42885b518e4f12a873da18860eae0ed0debf2f9d2fa9b6ddec909e67a32658d898a2c27627c8581200ebd1145e1bbdfcc9cc45e192749e15576e801	1659374890000000	1659979690000000	1723051690000000	1817659690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-56	\\x8938d198a21b051e9192020889b793a1be1903e7b66b8b200f58b120ab675d06fe91fcac735a9922007ea0c9e4a54ddff92b76897afb4832f4e083f69329ea85	1	0	\\x000000010000000000800003ed525fe77ce228d152832f89026e04cc80466d03e5f5f9f66fa06920a8d53e6fba2fecb8bf31f59d66adc1a91aeb93f93d2e806882a91ad54220a252112ca5f85d12fa4006a8357cc3c25fd5f41806d7cc67c5ecafc6ad6e39ea866ddbae559dd585b23bbe8ae1634c9c6dddbb9bcee84bc54c76b01eb6e807e79f6cedcfdc87010001	\\x2cf822ab32b4bf875e6487be813b54bd8a26f9d97aeed65a4621a5b9eadd1b14162081b128628fcb4321f98295fd8877ffe4f9febb5abc8f8ff86a1cfa78f208	1678718890000000	1679323690000000	1742395690000000	1837003690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-57	\\x8d20714c4e5bdf7492e6a36a8ec571d4e336d2efd17196400070325bcb14109906e728e4554c570c2045a4804c6ef505f3f8c716e2b837873ee2fdbb1373280e	1	0	\\x000000010000000000800003baccc5e684a1fd1cf0b48ed4e5c031287f195903b937c8ecb544497dbcd8593dcfc326c3a70c2191439e6fb9dc23bf26f23d1d9c5219519d69d2daf57c8982d0aec79387cf45cc4a20f767a7d97abf8c46740d5b10dd4de43e1d18ac725dc3ee5ff66d4106c9e9e543529fe54cea37cd400248f31dcbe92a7c88a1b0edbe1f93010001	\\x7347050ac36fe623c9e52bb944a750e19557a9ecb6490e0a7fd8e5b4a89a3d35f3a7d03d658d2d10655a9d0c608d78ea36b178bf3d04f081e82824d8bdd86109	1670860390000000	1671465190000000	1734537190000000	1829145190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-58	\\x90e48f3ca16a0999ba1dcd4af5e82b8c8125080372300d2f5fbff48673e2ff33484e7953bb4e215f05f4ee6b81aff9ac49dc73c59c62c0b33439ea5f67a331cd	1	0	\\x000000010000000000800003cf35f3e8d19329c587949b6eb16878c58441931e405301bea62b2494019edeedf4fbc05600efeed359b445d9caf29e8dc139783eacddc2411b6b5125fed2738ab17ee4be2015625e4baeab3a3675e520932bdd6ad99567fc003f553f954cdfbb8123967a9412579326567d11f6c6bcc3d79014833219cea76dd8dc33d8b50bc9010001	\\x7cd6b103279ab43a01a3370bcf6638307c3d603abf028e9c529c32bb81b69d7f4b6679288bb78f3670af277d30e9a185323de71c11dbcf572d4c0e318bdb2309	1657561390000000	1658166190000000	1721238190000000	1815846190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-59	\\x93c0f687a2ca97d389857a50145f77464ca650077467e680f5a523fbb7df080cbb1840de39daed3a1229eb1bca21e9cf3c1698c78ed8719b3f13f69aa2893053	1	0	\\x000000010000000000800003ab21fe6b13485cd79b22b4d37ce3927a95ccfa264fdb95dc7d96aafd45953a104046c2fb60a89ca6cc65859b49e31e4e2d2d2c51b5a9de46d5d75936a3787a88c7b0f006604bdc8a795a9ae2e151a91ec0324defd360b556b15a5c6d37fd981e6316df345df0444d0d91b508f0d37fe31fd64a291740f97ac8ad02b9ce4a924d010001	\\x6f0f10163513f55e5509b92e034c9b9303560a5725a410dbbd7f9f0816472ad411222d73d4004b23767923a71ef4a9fe63cdba621cbfea1f7da47d9c8a0abf04	1662397390000000	1663002190000000	1726074190000000	1820682190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-60	\\x93f456132e435b554e80986f6871ed29773ee87124d6f07a60bd19ce74446088a5c58f6504ee5ba5f74e42a12e5986b27eab5d2db41adaef2556f6d5d540769b	1	0	\\x000000010000000000800003a1ee837596e17c815f459a9d2da3b149f24c0d25574c74c00d4cf077a5c098e98910809530ce1f65b62c9dce1f696d65e0a957902be3b00623ab9f390e0f4be5be95a41cde15dde1adc69c25d8f140ddd630fdde6dd72a722dbc007bc32b15d826fd86b3634be876874c5df6bbc9881feeacb87559b31b4e4affad49f1911d5d010001	\\xef2ac89696ee5a722bcd8a4da11a48779d3b0fb1332755f33e982c1d1594ef98b3636eb85466dc7c2b5b131adff1385b683b691835d86d23c8ad07e5fc01e107	1664815390000000	1665420190000000	1728492190000000	1823100190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-61	\\x97840e3094b9fc50c6e2aca01f885a08289f23f1488890218066dc16c5c8878a9123051e55eef2b5141fe06ba0d93211432f6c7c423e33bd7439fe97951a9020	1	0	\\x000000010000000000800003c1ceccb7bd9526183cb30ab7d61b5e779415631d93814e1a590dc694c4841ac7bd999d384271cec9a01520a6579901bddd8165ee0828d6a19c2995801c16905f20af3f82f47843d3bca08965824b59939c19d9be41bb29c8826c78d5e51bcf37fdfdb6647ccad38558deae74c77b9a924553bd288e6d5feefa3bfbce3557b497010001	\\xebc4aaad2f5d03dd8c4c862726259658e95720b60f4cd1bb1c1c61bd1a348368e8dbbf86ca1ca4124474e4361ec1e393179fecca3e2ec0fb497d5dccb5136f0c	1664210890000000	1664815690000000	1727887690000000	1822495690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-62	\\x9810e6c1af9897bf074c3a8f34cd02aad45205e52bd79d4aa706abc6d84653978a96da8b0403b8c4e2e77b98af8648719db45e655fd3d4c486ebbd24bae5fb88	1	0	\\x000000010000000000800003c21a8b8c128d3ee7163e7344065ffc77971b77caa418852cceb1415941c64f54e79c90f159fd63c59c6d6b5b11f7b1364238faedd4fa9e96ba358b7bee7324cdc5b6a66cc10cdbb2abfb387564a6ac7e2867bb51d3e653e2616b43a1526bfb2d876ff869e5508f2a89a3b3b2ca5b9f2f4b1d108ed5fdb70d6fb5bb22e54a029d010001	\\x90f30892b254232baf5a2c5e81b0c2ca00d1ee691e15065e577dedf181e3de1e8eedacad98cb05284c28a44c1410626363f0853e72209af6187f78d8a0375e09	1678114390000000	1678719190000000	1741791190000000	1836399190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-63	\\x9b28290faa75a4ec1c25dcc965621f83a49d43fcd9b70131d82e72e615960bca4610461b232c9fb3433455cd960bca17341ab2b0e458d35388ed45a85cbcfd46	1	0	\\x000000010000000000800003cac09d6b366e4f9ca02d7c64fe82e038631752b66ec9c2a20af349a40c9dedd3a7576fea3988d753280183ce7bf5801bfcb661130876bece6dcf196886e4bf2bc7b528703149b5906ed8bc0ef1f7d2ef5a4515576783292c131f28da413ac234bf742d2c01f064e5cb4d31d52d7624e3c9db1fdc2414bbb1fd19926e9d69b783010001	\\x35589408033cbfcc5f9586670ed00694e6e21f1291a0a6a31e13d6074aca585a8d7728b570abc5193c67d63934a784b95869d0bdb42e27368a92e4815d11ed04	1681136890000000	1681741690000000	1744813690000000	1839421690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-64	\\x9b6c8b4ae9585d999298b242a5a090be6b538a89e4872051baa96690b75280a6d094a511b5f26e8349ed18e789f1a9f6033391902e01d826dc116aa3fe626ab7	1	0	\\x000000010000000000800003c8bbf88110b4c104e1eb794a9e962862c80ec04d361fab286405658dfe219a9b4799981c74c98ecbcda6999d2b923d6b8bbfb4e6c67eb9f8585fecccd9711918305ad486ff200a4b70eba991b49b1e5c80f9c101c572ade3b0ff07cc130545fb6395c1371e42c85a441a386dc0bf8bdaaf87dc37a598a792547de660f28d22a5010001	\\xc96f3f61d30faddc758498f0ed4b63b68b912089232bfcc25b48d8eb5c4fea53ea01de8f62eb056c323a5bee7069d13adcf756a3a3a1fd39e03c9c3faabafd0a	1665419890000000	1666024690000000	1729096690000000	1823704690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-65	\\x9f30d4a03ac55a4eff9c17f18352ec5fa3f92a387e5ba3ffa3891053191025084ce6a65f0fdf0d8e49ceef37bbc72e1ae48d429a78a8b7fb501b42dbc27a5c70	1	0	\\x000000010000000000800003c1e1490522e10ac11cee49fe48f297377c13d4007d796e3327829e14abf18380a128f172c378b11750f2dc30b46a756e075fed140872af4382ebd1bbe14623aaea758525aa00c9669bb541e34e4de6b6384478a1025a098c9cdbcd89de68d29c763f3a75466f468bc233f5fec3d80b6cfbf6cfd9d7ee2984404f1166eed53a97010001	\\xbe05d3e21ccf2be14b8da6be8591dced0571562605a5c102d946b4f0299de00e3e404dc0bd5b5e58347af6a6e9f5c23c4cfc9836dec88953bed71e07b2829402	1673882890000000	1674487690000000	1737559690000000	1832167690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-66	\\xa2a8a6cec2c0fc4a4bd5aa96bb5bc0da048dde26c1aaac51fdb7c16d96b325cbb88382b5de1590d60f647c83142f40717b097a452da1c43a53df9e35d5fade15	1	0	\\x000000010000000000800003c080c15793d3cea052c50eb86e0bb18c02f3c41f636225147ef68fa64287cf626f3f8a82333d18aa604d59a29efe519653d6d3fd0fb362f32d835133ec9bf40c08f2adc0388b451811736a4c3444b672de3e19292e1fa5841b6f8d6a6b8b2a0d4426ce078234cd6f00a7b77e5360fcedcfbd8e5b210a3acef24bdedd460418af010001	\\x4ffd3ee416f8c1e8475390054bca6c8bb64d1b40e11fffc678d8171ebb363e41c0b9b799cbabdfb8e7acebdf0348cc6afd385e35a13949d2ad6bf1571f4bc20f	1652725390000000	1653330190000000	1716402190000000	1811010190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-67	\\xa69c19ef0b8d47540f1778f3587a0ad526d2c539385306c2e31fe49cb64fe44952a70414d7444ac4ac0252e1be2bf42b52696ddc2251931104db17888c9c56e0	1	0	\\x000000010000000000800003ab9281f853a48c12887277270be65ebdf910a0f7bf67971e2b466c366c9809f6d44ab83c79a81aa2cc7da42113c9092a78db691f597b574a1dfcfa814132ab4907fbd890d0444b35c1221df20c343d85f8b1b1571563b960fd4ef7475eab19718ebc6a937e2c630af4e98fce528a6714e56272b041e314acf64f8126446f32bd010001	\\xb6c1cc3da9ed690b83ca5a8ee790c55940be2d2257288de2c659c9ba8815ce545d816620ab4ebb43b3bdf17ad456d7cd1cfefd4b37f747d7a9738181b6fabe00	1669651390000000	1670256190000000	1733328190000000	1827936190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-68	\\xa7c84cf8db7ba658dcc417c283f633ef0d9519758ea3943d87bd8ca7f491844a3b54df0de6ba9c1194e8dfd994c59eb0f5f0d4d96e55e971414ec7ae4469bc7f	1	0	\\x000000010000000000800003f4fbb39f934bdccf7f1cdf721b3473083b269ebc0618915aabc8ff21bfe146e6e3d594389d1c59adedbef4a13ca8df03ff4d6aa6fffe2ad2e736f5f5549a12625a63be6dd7e73ad41c706849642b631d31d883b34d5f4ddf0099c42aa303f65b93fea1c218fe89bf0dd2da14b3e0f2912b473a272d343e94a7f507315b0fb153010001	\\xcf772fc4e9b74ad7a76799b904e4c6a01e8e84ea1a76e2d2ee6a8d6ae4b12cd4483f5977004b53da217d30166e196e5915a846775753981b885bd27cc06cba07	1681741390000000	1682346190000000	1745418190000000	1840026190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-69	\\xa804768f7c76a602be88b37cf000cf41357a1e60930cf8879f02404cfb6ce66b6f4d24c0021b151895a3432ecc80a1ff8c9bc91eb77d95edfa813cd2307206a7	1	0	\\x000000010000000000800003cfb89ef9d839fc2afd9ddbf23a4b83db9b81607f01c3f0fdad2167994c7994d87912e668ee913a0aecc72a6f62219d0f8cf80e01bb6e4ab9a4a9e4202b1d1dd142daf650d9e6d3af61023290947ab0343d71fdac78d30ed25fe50226ed930a57633a12e6fcc1f7aca25bfed232d880b5fdf33cba6a8bea7fe3cbdd39358a88ed010001	\\x08b37ad0b9ed62a304d8f4a7d03970919798e5b44098767b23802d362c912485a0acaefa8127b69e6db1d5ea13ed15730e9198871c9a89dab7e63491a85c9c02	1678114390000000	1678719190000000	1741791190000000	1836399190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-70	\\xb32422981521a5c6c2f563f7fa3ea9fca9a4e805defaef900d55e8d06d8a37e46bdef17136fbccf84b06f8b040a54db98277396a734418bdb8ae38ca76624fba	1	0	\\x000000010000000000800003ab9c1fdec9e403be5d72b61a9baad128e20a99832b1618d2a4190a086849905638662e37b3c83930c30835b2106921efe95c8cbb8138203ac0ddd3e2ab74f479af2b352ba605c7c2353681a8cab9e930edf012c8c274e976793f6ff9cb7fce60fc79da7fad00011c4f6fefdcc9c63b0b93033bbc6b80e3164de705c0aa674747010001	\\x5af8b10bae19275770a50a47e7fd57391f7652c3d9f409579594a7f70909dfab40a83e5a4e9f271503002e5ad8b3ea725cfc767a124001f4c6794f66b45cc106	1662397390000000	1663002190000000	1726074190000000	1820682190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-71	\\xb5d80430653dc9f62f412a0daaf401df172d03c197f6f1673910ac9dc95bab5897e7d507fb7264b38b78491db9e34683fce1761d95163ea359edd30963110ebf	1	0	\\x000000010000000000800003cdded49e36beedf8d4597e7ad6d43de4ae1d50a4f76e576c32a4f22af209feb7f13ed28045bbbecdb0ef7f9298ada758de485d200d51ff2ae19a1b2bd565ce6d91e7c11bc8020373092c353403001f18a60756f5156afa7a1730187505e70707feb2ae9c5ed4f7a6ab5a0f8cf1fff0d56381d3ca6e28d9da1579d64e18b58a49010001	\\xd2d022f34bb0d27142a8fdfb4837282ccbb58301c6fe1ce31b7fe8ffa090a6471d2ad9e4ca41ede79a7f9404d2ab2576bff8db1d39268670fdcf95604ca0b604	1666628890000000	1667233690000000	1730305690000000	1824913690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-72	\\xb6e480ca9f1a693d4f075bfd8dfdb2fb3fc06b0e6c23e02faac200070a8d878be8b127cddcf99923fe8122f8b2cbc8738159d863039eb8353da149dfcb3c1b3e	1	0	\\x000000010000000000800003fabf9051a1c6b22ab84cdc6939352cbac4dc3f8931afc51c62ba86c5f72dd58b5e7d2940dbc9d8e7edd2450f88b606f414bf3895027b087c62718e2cfe702dff909acf75b51e14eb410cc92f3d47f67073d8c21314ec051724f51a95d4ae9291573027a4ed3a0eda385bc33446048afb8c31e05fd03d348b01b63f0b00bde57d010001	\\xa3effff88584b1a320cb467b90a120a1340a4642da84d1da62ceaa60ba61ad9dffb9b7f25dd69db8b8fdecbc487affc94380da25d5f9dec1dd529f43f2534a0e	1655143390000000	1655748190000000	1718820190000000	1813428190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-73	\\xb818230d317d6ecff533e83fd9432b4dfda5be624c551f5b37a52fd51800b4f3deb74d81f45b8bda8e1694eaa43e4f593defc58649aacef10f4fc74fb0bddc76	1	0	\\x000000010000000000800003a0da2d652fd54119eb9c06d2ff9b88da83ae06673605d68d9516a49ebe4cde00bc56d1d8ae769fb492ad5568f992c61e1347d116876574e0233cef7da75af8bfa952b39594cb66be1dfd42d506b72cf3af2eb143d14e8aa705d5ff5fd720e6e29b47d1a9585c1b1499a39ec44ecf54703f7a79e60f478693edb7a1f2a5604835010001	\\x6f35498570db3f951347ac7a2aa7cdd2ebbad9882539b984ad897421f2aaa8ed4cfc60b200b9dd752e00c0bb63248ae745557b9064870e287c53dee9dd483c0f	1667837890000000	1668442690000000	1731514690000000	1826122690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-74	\\xb8445f12b38a9e48cb6dc192432b0a2afa261c4b2fb895e0b72c32685648fe483f6c38b53988846c734028ad99aeac5897d817a90adfbfb3e94ca7d8f30256d2	1	0	\\x000000010000000000800003b8f8ffaa51a07000b35051ad84eeb9b1ea25bd8167113a5bf4c608ce17b79ad1afa393083bb5d27c60ae3dacf132cb13ebcbe9dde43c76ce887f4650187076eee7bd75d66f65f73c5f572242823a5669e534ca4da09c1da0077b1a7cddea98b9143e4e8ef59998ce0870c8fba594e4213eb85008fb547acf49f4a441480df0d5010001	\\x38b8a1d6d8be0568fd9d44d0aaf44642147b9646c37d8de1158870bef1ce54190c0e56fae8b8690134d7e8d30ad10d6779eeba35b9c1c63c38816eed5d3d9209	1664210890000000	1664815690000000	1727887690000000	1822495690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-75	\\xbc8c07a17b043246d7287448e32bf7203529205ced27f55bd8ba8e1c6439d1bc948130471be0bbfc1bc1727100a1114429a471be5308de7d741515fb4effcd92	1	0	\\x000000010000000000800003c24ec4c96f661bdc502779267e7fcbba6cd35b928e43dd0065225b39303e9c7d587e90a3ce29146744126d09d2a73f974280dd201f869b554eb2fd832de5758657b54e93c144d110643cfb3bf909fc56dd60db44e56685434afa285ebf45a4371aa3abdbcb63905e5dec6aa1ff9280a57f2131f2972718d39209f5790b645b29010001	\\x4ade92e3e080cd96b3b56471f5e08305590bc9baeb3fdaa7f3af9ca443d1749de23778d95d617e8faf5b574f382008495e9eb697c81f9f8f3df4dbddec71740b	1651516390000000	1652121190000000	1715193190000000	1809801190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-76	\\xbd8c429c1e1ccbfd33580a5518ef4a4a52f0528999248786023ced7c51f48bb7abf54f69583a666d7f02fb370a93612d96503b921044ccfcd71189919572a885	1	0	\\x000000010000000000800003f258849b5825900708f1926b81675a9112c2b22f013ee100d53da6e489233bce2d6b0f386bf7aadd66c8b0b34cc04ea70893a9ef4e5c5b115c266d733148863a52ca8191d0614e2fcd89113a4e74c8a7fc39cd01be0e02b39b975fa4dff6d0fdf95b0c94c7e86f309bdab8a7b2586da8734a2d88045434925d19dbfac7b1c3fd010001	\\x267fab8f6ae9fd9aca934d5f7fee12eb50c1c099ecd39b3d7873f50409f2997545ea9691f22b2596e3af8c4047a0ff8f516c84d3394fd946753b4a4c70514c01	1653934390000000	1654539190000000	1717611190000000	1812219190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-77	\\xbf2cbf13b34f7727ef49c3129b45cab33b32418d286998634bc3dd04ccaf05cef7525c1c052085276dd37fac418e7b7a004c32a3a234a435722b6cd9560ec661	1	0	\\x00000001000000000080000392ec797bcf4de77fb84d205ef44628e82f6a8e3452c8fe5337395fb164f660276fde6e616de28ebd8532ad53d3e1aef85077a3592d0dd4f606c6212047593046f5fc94c26bbca39b68f72db69a2c91a858167aeaa3cb085bf25ecd043dcc471d22d0f985343b64b514ce92f943f4d160178d65ec894edd25d1df50f2438dd585010001	\\x18871b266617a5cc18e09c680581e00601889b4252584e60cf34d7662b9a22cb49e028b5a06036314d88b362323ad6bffbb777013e620eb82a41ec30cc7c5a09	1680532390000000	1681137190000000	1744209190000000	1838817190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-78	\\xc12414996771ebee5d8d0d6d57d1a218ff7161ac49fdd1312a5ef0ddc82989eda916cefa35b1ad968f890e2799b4b478959633839a04ac6c583b7e1f18a0603d	1	0	\\x000000010000000000800003ccb9f44977e3953c5152fd9dad4dd58be98371184d034a3c16e15c0213892cdc0645dbb41a3426ac72df32b9a3fe22bcf0be1a4c22990e1825eafa272ed27a9dbc9407a624474d65cfd2282f3e92d7d7c0be9c86afde25a4206aea833fa237a54ce3fe2c40ba989b76cfa12089569dc444be6343286302603b97b090a981dbbf010001	\\xc5aee11c89ea513f03734b552d6bc9b511431acb268aacf0a7a018a3ead041fced7ddbe403e983469395c7d1fb3ce092f8cb20890382ebcd935488a839d4780c	1657561390000000	1658166190000000	1721238190000000	1815846190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-79	\\xc110a3fe368c9c95680417a122b58e96ed839e8eef7b0a3971093953d95a8538c903e79673fa2ec40d43fbdea03f864481ce069ef2a986c47f10e91d53689b4a	1	0	\\x000000010000000000800003f0c9a000167206dffa7b5edb202b8b6e10243218cab23aa08bd10102227957b04588c14ae784841c21f0bede7e5604ff9723be07152fc35b36762777d1c33130aef5155b4088494d0f3032e8399b5f0d18eb467e8c27852916caad23f7abf849aa30dfe7d884c54f09146d38933b64af6e08b223ec464b90d282f24a890858bd010001	\\x2acc9cbd73b71aa947665978ee358e14bb1e4ab6b3ed791adb0e8b8062420612a688cc2e764bd6155381421dee8acb6044771df83f5ac3c3645c0da8fa115603	1677509890000000	1678114690000000	1741186690000000	1835794690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-80	\\xc498e7344b13fa7cd4162fb5fdf7638b5c66e7bc86f7e42169b98879c11435b729e635460d2e5f5995af3cf0bbe7b2af413a3ca1c192662fef212435a28909cf	1	0	\\x000000010000000000800003a1b1469a154ee3024493fe2d3872a31ea38ef8466495f6efb59e72a65a83f594fe8e4e4ab6f69d0c6998f0d8082cace7aaf098fca0a8addd26ccc3be9c7a6224b3cd894314dc22935417607ea21138830b856ecffd442e31919c4b444b1e45b72d6a9969a44cd9df076b372c47bea89a0387b2edee6c32e1d6c168a917238a4b010001	\\x5300abe73ce111eee833b9b8e28a3ba46482fc761619708ca30f6e284e097b743861c3ede92193680d09dc1139e13a1d6add305b925ac92a5830052a513a1a09	1679323390000000	1679928190000000	1743000190000000	1837608190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-81	\\xc5ecf1f721f74f7d8e3d45328c1b904ab3efc90695aeaf2843acfd742ca9d08e6eb51646d26276a25800f3d2aaec61e9500f71af4b19b496d3fa06f70dcafe30	1	0	\\x000000010000000000800003be186c931759325731826a49749f14f73be38a58f3cca92ea688f05fbcd60379ebc1648c6ad14e6bcaaa678f00d277d45fca21f333eb17bd364b8b24762ee92314539b04121939287e5a3c4905364da5b05840de0837017a1548ddd28f25a5a8081cd39e85f1b5e3fba679dafa35d205d58c134f575b6d83d6066a558bfe91f9010001	\\x1a33cdc37a95ca150cb3067463fd2b288a66292ff12ab33dadb6a69c9e19007309cdfd7ac7b3b04e5c0c4ea5578f2d85d480a3adacb05b270c46553110d9c906	1660583890000000	1661188690000000	1724260690000000	1818868690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-82	\\xc51c97b3f2bff7ccd57bc12e283cc3d5d4c300bf29a96dc524ce30df163a020271afd8a1e190b2561f457c7b6bd19498630e0afdfe7e1be6d633e1ca4cfa5f3c	1	0	\\x000000010000000000800003b6d110aa27c28120c4fa5f72ba5a39dc2da18949763d7e8ed45e5f6508230bba5d7626407b39eea0c876f168352c59b806f96827f4426c99120b71e521a2ecf093bccaf2f2c5b3407329280ec3e2dc861a188550a25ed57659a101483ca4f5a20b4d012915e6e07bdc79c1c475c54c93384a31be18f617d0bd09c6d9f3d5b749010001	\\xd71423175617414053622bbfe927374bf243693ca90bafa0e2dcc7711b78ef762dd2f455ff07b397db83348d66809d4e13a7b8a20c50014ec476212e32054009	1682950390000000	1683555190000000	1746627190000000	1841235190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-83	\\xca3caa0dde5fa209d9a3691c91d059361f605b110578f37b13b5e7c0a4b0ad835ec7daa420224afce5e672e68244da2ca94018da87f14555380c33a5af6c497c	1	0	\\x000000010000000000800003a74ccd4272ef439efa1a6356e2bc6692bc324a6cedc217e9f7dedb33fd87ac0ac82d8ac957076edfc2bc79669fc0b601ec635c11ab65ccea83cc7d183afcebdb1621031056701519253fa40dedb20b467900185abc7d2c21b05ea04401867ea0b59620f2355cddb7a233f649c5291842d5cbf5324cd2ccc2fcbac2a34dba7fdd010001	\\xea356fbcb3f1bea1bc5b51eeefd34b4a4644cc16669730f54dec4811fce3a42dd03f6c0b16520bed7cc4686ad9040ead922c29764a64353b57b9d5134ced6f07	1666628890000000	1667233690000000	1730305690000000	1824913690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-84	\\xcc3878803df68c6ecf9b1ff4ab178da130b0b6e23d4dec469de8147bfd24e79ac76d1a2e0c4f9fc031b9d54c3878a0eaf3db9d8bba35216291724c547b69e61d	1	0	\\x000000010000000000800003945f694b0fb298a530bcbac4e53e6627e0f8868c3e14bd0225198454d2b705961d22311d1dcb14d5572e154cd8982d40aaa4a6cc2b2eb2c8ccf310f60c867baca9c6bd5fe02d0437ac462cf3843b5815bc5840ccc079a5276cb8e78720381be7abef8619f96e33ac17b63829b98bd314ea44fe8ef1f324a5b7ca8c97ae06c7f7010001	\\x27ada57bdaf838ae9f4270ed0ecda0213e908fb4b13996b9bf8777f8a8563d87e7ac1b99d73a3345424e217e663efb277fec219e75bef6d573d50d3f22032506	1652725390000000	1653330190000000	1716402190000000	1811010190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-85	\\xcdd08b4b12df50a5414ab1ac835e796369e261e7a343287374f46153bb70e12bf4fb9f8d451ae2b71f6289fe75faf9e31140683d22758c11782d0f543c7875c6	1	0	\\x000000010000000000800003eef2a8d858b087d2d1a2b8fca126a06a43d1497815e9e89bebe8c1d2e9ba42072c3b3d8820a637c2aa42f437606e7d6efd04537e9a5a744b50919dabceef3554a80507df31b669e4eda72a2d7a8aed34169c5e84ee19eb61e7e2bd9a5c03d88ca3d239a90193d123a643f2b1ba672fe866a124d6c6e81a3fd04252bf2712bae7010001	\\xc44cc94a41c77b9168e257ba02707db1434d8a71970313dc4316e775e5551d114ce45c86aa10c23323e17eaa3c661b19518110b12a43ef25566b8b627e00cc05	1652725390000000	1653330190000000	1716402190000000	1811010190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-86	\\xce34adb3905f5b5c41f7fe0050d48cbd22651791c8bbb2347d6258cec8c4fe5548b03bcc6da0bb7ba1a9ecd8f3325758005f670a0440c0e3a4f29a6693b49507	1	0	\\x000000010000000000800003b0a8e4a4294ecba5ee31a80e4ff5dcd8ef3fd71341786c371083dd9ce5ccf86fc3bf7a43a99d674ae01720b0b2d11fa37b8622d3159dc560e058c5e3aa7b728d52b3436ff5d4c768593db8677a542a8f91083a8b8f5c837f275c51c208148b2fddd6d3f4aaefd210b670fbdbe54220ab8d0f84e7467923cd899b5b2c09f5e5b5010001	\\x165ba84f8ae7228c0060586c23a96ec9f24775bc115917e1178ae9688b27409e21876e0258538a9e9504074953a1b5b889a74971c900d46af856863e33eb6f09	1675696390000000	1676301190000000	1739373190000000	1833981190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-87	\\xd210136da5653f8bcd8b01d39ccd317e39e13e1379cf47fc48c9d38576dc06986d9990b86fdf881a18dc62c356f19bda9508ecdbec78e0da08f5d398e4e3285b	1	0	\\x000000010000000000800003beea8be0ec943fa9d1ed09211cad6be8f90aa598ca55dc1cf002c67f0a6cb0688d287a77c11ec32275c3427636299b77fda3519f77dcbf7cc1b94e3c595d906b8558f30a0a58a90818b38b22d40878a42ef3c3db26171d35cad1716ffc8bb70530f2e156a162276a8a846a38a187599ef4ea1f1b1d92582c76535dd1d1217ced010001	\\xc23e6798ac3512ba0e895278f84877ab6f4b3ab4ba60bef24fe9bf09394d343c97ac8178fb6583535987c5b50f25b0dce99aa6a9f67b65a921a030bcec05010f	1670255890000000	1670860690000000	1733932690000000	1828540690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-88	\\xd23c0f1064942e15ca9a561004c35cd9898fe2ace044184f4c4e7f9a9917f469a258a4c7cd68fec956b70d6e99626a6b969b367fc77b4543b1e96d9b640d78f7	1	0	\\x000000010000000000800003cf8013ef56184cfa2479e2baa1ad7929b4f952b2ea5f94e32999f8fe34ddc01dda3738a1cd0375f33e8b3f9a5c5f5639d8d9a18726a9442330331b85965738e8f78479d84789f0eb8b9b7187368561753f53025730f327c336060e703712e13ac50b328b5762b429d500117223e7176e0a44c32208a5a4a2381ea4e129306633010001	\\x164d37dc1237d96615fc7b63b970fcddd5b7d0e4b3f7df9bb968d53fff8c6ce31e1c3edf9f56026907c0ecde6c0198171dfffa783aea4798409a0ed61bc83806	1680532390000000	1681137190000000	1744209190000000	1838817190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-89	\\xd2b866c8007abe116f7ebfab4fc5f958c5beab940129023937e10c961aca8c11b6326c643557f3134172faf763d6627a08d5fce721e613fdf126326f719c7b8f	1	0	\\x000000010000000000800003d3f971ee38d33e51e37ef033ed152444defc6ac8d2711d30e7755bb699a548e0cb04de0b0054c3b7c3a3bd7158be9842fb14fb124f254cf256a8e099e0f736b7d774c496b1a7d16377d5a83d539ee2509ef2c0de18fecb35d59c2696f827c18b272b89320da5805bbd393f964cfc23fef5b9fca5092d5070bff190f5fcbba18f010001	\\x134f90ee908b81a122d769e64dba19ea5c4945f5b8cbc7c42f7004ef59e4b3e3d040ad8a20c90321f70fc4349d8522f7c8342eab00288ca938d9abba85bc4406	1676905390000000	1677510190000000	1740582190000000	1835190190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-90	\\xd538a59cc6c4ca9f6d34ac3533d125e129972f41674d6a3276cec657fb83732a938e02d488352efad5447777cd0f907fb0f47dd1266eb7bc4aeab5c322067ebe	1	0	\\x000000010000000000800003d7a0fee12cdd4a36f61d587b0a79d9eee30d7e09578ff90885ba6bd03ecd0be06d7d0f67312469718352be61b4c52c7e26b1f704a3efb6508ae665e1fe8bc6467a09ef3b22a74cfa53e0429644e66136e828019583cb64757d45b8ceb145d424077a9a966998ca326110e29d57923d55addb79477383ae795c7c06cfcefecbb3010001	\\x55317e817ef474a8752f0d808435f967dfb242d9b8143e5d74904c3a5eabd86a8a7f1f89ab434bf6c5063c67c36978789b5782ca8e44d5dbfc057a3bdd5ba502	1654538890000000	1655143690000000	1718215690000000	1812823690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-91	\\xde98b6f769579d1e5e34e3dcc0ba1b4256721e71e2663694b51cd712dbb0c7c4556c52bf205b9c726ae5434922dc471b290661ffc71312cf63344be4d2d5f381	1	0	\\x000000010000000000800003d34d64afc5571ddb3a4b0c61cfa6d47f2bf310c0a75c9e6ce8d4893126e6f9250fab1a2ebd6b31cefad1e9b7ca3aa91fdf55ceee8b3c8a5daa070d5b8e9acfb794589692d243500f2ec9c8dee86e311dec10c10080fa8402edfd73a98849287ec04eceff89ee517bec88474541d8aab60568bda5ba5eec439bc61c5bb88d96c7010001	\\x55e87abd34fcaf663caddb1938d129ab097f64fb4df10de9fe2ef352ed0a10cc0b134e17b8cc7804f594f1b166792d83b8585b604b1614f978712640c698db05	1679927890000000	1680532690000000	1743604690000000	1838212690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-92	\\xdfe8ca81a5bc280b6e7b5083e1a6763a17e7d9ae4557fecf2b4c27ea33c91d96fc6f87ddb1f2787e4ad330f10efe1bcf56fcc1451e031f9409a8bb3039e9a590	1	0	\\x000000010000000000800003c7d98e017b6f6bcc971c98f677e180c307a4d1d3ea6e5fab733dafe7306a1b06378f23a08281c38692300f83c9082e40ce90290f3bc1761df064722df57cfbadb9d4e6b97b9ebd62ec315932b41d8d94be5df983cbbb82b51c04d2837fd72fb893ccd6e9ce894a26b6da829737e1f2ba1e3b56e0ab0a6a43864f841a376ac71d010001	\\xb2d57d3d81cd6dda060c78dad02f09c521cc234cf70317db022421b83d80c04f5f73d25501ed5c24e5b01e358b55ea365dfb03c3ad9d7da10d5824971ef16b01	1653329890000000	1653934690000000	1717006690000000	1811614690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-93	\\xe03435728ebdc4c45606b67d5dfaebe3cef74d6af70c8af667db245b5a0b56fd45bd50eec829755a65fd8d1d6a1dc295e2028cbd9a30529dfd60d2460981c0ea	1	0	\\x000000010000000000800003d42c555103c268766180b8ffd8a3e2679190a8e957e267755f02ed57f403f4cc48dbe32757d495219bdc94b77e364f322e1c619a5a01d83920ccbbf2086fb3f2d028b2ad14b257d0b75259da1482cb8d44a05e04a61ef796d1c545fbad2e2f2cfa40c30aa87c966cc1715cdc50c2facbeff55d7240cc2b1743634986e161b7f5010001	\\xa4ac905df47ba9d6b0c5641ffe0cf78591cd77be052af2e0cdc4e27a0fbabf044af448ccd5eb3bcadc5fb84d83a1f0fd13c1dc460846010400e6d352fa09bf00	1677509890000000	1678114690000000	1741186690000000	1835794690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-94	\\xe0c8543f7d8e6d86a49ccc71b8ff7a5c47394f66ad54b7477354d4bd83c2aecbf03277cdbecec96ecd79e0772642f3dec43cab637a21a89e02ad431710b165f2	1	0	\\x00000001000000000080000399fb3b0e1df77fd82c8800ce9823a4d172ccd104b0999f97c279f423ce817bf98e65fa1fd0f2774d020f00d7edd19e050e820a5d030383b971f3127e9a0b8ee07964c613114799cef79eedc01e5103eda1caf28e09e3d1123debf7659fd15ddff2dfa91af7894a8e1b4d42b9c7a3006a9a422219fae8eff7e8c6b6559a983193010001	\\x66c6f0bf69df4e1d357e383e1f622c773a349e69a012091805b9d099dab6722946369412a5ccf00b45e2c1cae418afcc5bdee12ebde66c7d0053a0bb6534810c	1664210890000000	1664815690000000	1727887690000000	1822495690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-95	\\xe3488591c5fe9ef6b179727d00c83146eb6e7091a1fdf9b695f6e09de198bee3aaee50d17b94b2cc1d98de4c9cee959e63878763bb89111512e1fbc8ffff2074	1	0	\\x000000010000000000800003a7620ef1ae7a550c33201238431221a94bc98fc6516838281ecd64db32f5485661a9e5121bfdb19e465cb01730aa1a056eafd15aef059184e91be7e28bc07aa0538145220265389bb1d1d426aae458391ee31111417fb2069c260f06088a0f8bdd18d4d9d613231fa9a03ef7fcd931ceaf15933db05d9001f5dbd1991a689645010001	\\x1c0d943cec97fa373ba15d17618d0f04d56130b50e7ff3f101fb3f011dae8a5ce08e30edd06d1163ef228c184640e6b23d71f892f8bdaef6b418b32cc456a10f	1678718890000000	1679323690000000	1742395690000000	1837003690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-96	\\xe3d46227295aea952dfb8079bd6f89565dc1351ab6b5c301b2c29fba080d4af5e411d1a296b2cc276b62717149c01fb246b52d1aa81fe131832605175793cdf5	1	0	\\x000000010000000000800003bec7447e15e1be678a51eb10069246f26f2980eefe5144fe74e540bdea8a62f0ed7a5f8df56287fbc9c472bced61bfb8c0fea17928bdf161eeadc76f7b64962970ebc56107e3ce79c454448f33a85560b83c189b3398df12097d307b6019d8d86a2b29bfc21c341484f0b73be226f13fb3f983afeaae777475773b009ab08079010001	\\xbc86c0d61433166fb9f7dbdf1941c0837b88bd751e3d011d8cc6131b378230b79292e98e205153e045c2d4951307bc7deed8442692acdd8d416779df3f54f40d	1676905390000000	1677510190000000	1740582190000000	1835190190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-97	\\xe3b8cc44334f75da48fe2f6d7e05170c509dbeb04c9e525b0b4b3c964df7d6d383d039a32c49abd566e03db2224c9ae95108b87edf0292c06162ba8b0fe43c28	1	0	\\x000000010000000000800003bfa94b9bf417e6cfd209c4883217b5c2e271539e1ea36dcdad814f38c5bb07a031d8d8f93a02c5a07225675195297ca8c3d79105c160c06fec7d50a0a176da09f29c924b9040544b5610868695f38b800cf2ad2feb7d4a913ffa032c5ec80505ed061aee1e2fb8b10871f7a3ad9b5d1cf753073ca77b96fee101639d6976b0c5010001	\\x5e5dc0551e2c7f08dc8f3fc4bce8df3029c4ee23a271d5766a900d1be231fe64119c2d19d523a8010daf3fa4ad8f893d1557f7b74a9bdfe3e2c2efd4e88be900	1661792890000000	1662397690000000	1725469690000000	1820077690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-98	\\xe48074f797915b7bc18171f266d6e181c099fa52e1f4b061e0b662a2de7428aaf38940a2431a4dd9a85b5df55c97198e0af7278428151844164e27eaa61ba51f	1	0	\\x000000010000000000800003b40078598a1d1ca0a2ac762b2cb7f8c160c7514e7a625ce13d8aa37cf99c3df7be313c2c32d73742c8e468295f9ba19c91fc555a05d01a6b3c88567fa4b5710ae9c1d949bc6cb72b876ac72aebcc4c4a27c6609913efd002207ecfe2e526f37959680b64ff1c495a3d1066188a50077ee7686a3af43b0acb0047a2d178242bd7010001	\\x22f820af4c641d2dbd72d4fdf9012652e689ca3e5aacccbcddd4a41ccb12e27f181ff7a05040520b6134580224ecc59a40bf7514fa9f5df6e7d15da5966d5e0e	1662397390000000	1663002190000000	1726074190000000	1820682190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-99	\\xe520f061fb84615630dc42c547a54a48671c1c2b22ad39fad05bb5b8620a35c4ec99e88af7f154d412fbb343a94110c7e70a3392f2874445243d20823251eccd	1	0	\\x000000010000000000800003c090d39ed3ce6e66f0083b25193e166ec519ba5c07bd6976d40fe2b7a64b3995dc7bfc1b0ab6fca162b2b66efa3a90f68e758f721b8e9d8e7b0be1e9149afb5933f927283fc36cddfcbecd1df0bee1a13e8d4bea71b954a3202f027295ee518fdde60962f56369371afe64e2651b84b8bb996a97e53192f9ca611a4518f6c367010001	\\x20e0ed1c81331966ea701171d577965fd6009d5ab7163f0f93f5be7d990d3aa33c3622bd0049d4e296175ec0d9a9ced6d9f5c708d400995fcd1a587fbdd17002	1658165890000000	1658770690000000	1721842690000000	1816450690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-100	\\xea544efdd4f80f1a6a3130d1e4b201e75f471f0ded68711b8beb183d156e2e1dea46a39211b8e41c4fd971903948fae20a5e22730640366add5bfc401195b5fd	1	0	\\x000000010000000000800003b2a0163913d6563b573411c0d8b942e95b1267b127e97dc4a33b63964d40616952733b41d7351a2b8f64066351f73ecff2ca9974ad2d7fae8f898957c191fbc96289e39492f91d3e2ec93e6e0ed58b32f9dae897ef7718893de510ddc13db05accb4af90c12d1e4130d1117e0ebf2a59a4e5f4decedb98f8b0c0f2727775f4c9010001	\\x51e07bd8b7cbf6f211769f1b03439157dbd2619194d3c8c70df8c008b248803868a591dedb1921db9d237b63e33803f13362407e19dcd5c99998129433f9260b	1681741390000000	1682346190000000	1745418190000000	1840026190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-101	\\xebd033e858c4995082d0095bf9ddcd56a915837838e075060e62ca39d86fc269b83b55d50721c1140c2b5a0fb959ea7dd5d8f2655f8b9586c6e574c44ee8e739	1	0	\\x000000010000000000800003a2b6bf538da6bc3428ffad834a6b9fee4c4af9ae7913cbcf41758019640cd4fbdaa32e970b372272eae1f5f23609d0dca6086fc9049e77bc660287f8198460231a3509a093e7aa669668d6794ecd9e7267a9c8db940f0a96c74b560efa1354746043e590e4fa6cd586d09698a95746b5b398fa27f842c67f251d920540d57c53010001	\\x9f94f8845b8d920c68ad544f82771e3525f08c0f72a3ba5987824f2b51d61be0003b1445d677d58e25af4d6d355cf1864b3209fb7f572cc23f59a1d3ed0e5609	1667233390000000	1667838190000000	1730910190000000	1825518190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-102	\\xf584264a2869a3360584051782b5b49d68e6a5f6fde5675e91c059b798949053fabb13c1c424b76e0e553b5268e20b2e8fca8cb4c1b4187bdd1bd8e2673fda62	1	0	\\x000000010000000000800003d75e97e6eede0138984bd86ffdad706baea49d13d1f770cf668956294ba67b93afd1fae2b7186e82861c271c828a9e9a0d92b75b7240bc9a20864c8a34bf17580f4171eb29aa5475ea958bc1c012f09432f94ac0ea1443778c364b8736a3af9448abcaf97899478688cccf8a8615e68d6805370f45368aabf32717d533abc083010001	\\x7c5e01447e623a235cfcb28cffb488f2cc4f892e4251c1535eb1d4b8dd0bd9b9b6e57155f667a9f154b4263fca7d82a30218abb14012f89253350d4f13984a00	1667837890000000	1668442690000000	1731514690000000	1826122690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-103	\\xf76420c9b32ff7ef7834e5f224bbc9d78025adf5a70f085bde4cb9030ccda9aab8dfef98558744ba79c821dcac1441fd11d61b6b300a965cc6dab81bf8e44a3c	1	0	\\x000000010000000000800003b000f0b9642561bef99f8f201452fcd6daa04455fd18dc32915cc005ebf465ad720ff7cfb1a8cfb5a6f5e12d764296dcba0c50a34f30e306f4c28ffbd44d1826615a1914e6f9bda9ee4a8ca6d3d9d01c464ea71f89fbb05d4d18d3c3dc64708c908f530c38d73b20228b208a23f135526b7fde331cef9186fed592af578b54f5010001	\\xd4b8fd85c2c7fcb8cc37fa05131e90efb9462c1d7bb1303ae04a826e4577a9761896f035befee3ea3f6f3bc880b16a3454e2301e1ab219b49401c36bb3cca107	1663606390000000	1664211190000000	1727283190000000	1821891190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-104	\\xfdf446f1caa09b77e59c11ba4430fd59d7291e040b419bb393a3d6db24b42218e345d91724aacdbd0f6574c84dd8ed84d1607467be121b35ab7c3da2c554f825	1	0	\\x000000010000000000800003e086260cc208f82a3038ddff40c00e0ec9802547bb254d28eb46b6020a5b44c5dcb4e173c87dc745545247d8ede5569d8018749ca00a63a5d2342f247bc0440d133ba2e737c3281e93b157d63f1dd2cbbccdff0ca2944d812f8ff5325d9de600aaf5333a52b750bc62066b4c8b9b743a5666255a331d57fd74fe47c0c4ba1599010001	\\xa4ee943ddcd24589d2cafe5f7f9de3025d4fbe72b50ad33712245c1fd907470b4ecae46ca6ca30eddf2de7947ef992f4fc52c408f5aa5c6f7ab79b1b5e139b00	1682950390000000	1683555190000000	1746627190000000	1841235190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-105	\\x00d51b0dc5f1b5d6537d4f9799f3226896aa528587d39acab2719de6f42c621ac4872a909493de46534dffc01a7ff4228ad937b02c4d83b8a2715a2f045469c0	1	0	\\x000000010000000000800003ba790625919d564e783aae55ef5a7f54fd2eec27cf5c28f58fe16b34e03087f9c7400132478ffc45679748f2ae28455874e3a34ecf28408f482c8b19edc14cbc1ba4b183ba67e2c49d1d9359d3487102cf1bbaf9498bf05c32aae4680984e8a6740e2428727bce1721604157ec93d8099ad27fe5c6224440a31a65ddbbd74f9f010001	\\x01e51a77a64fea9653bd20753ecdd21cfc272c0a59b9c04ffb870f365e54e54c84fca5ea5bbc9ad2191fb2831d30ece1f29ed5fa69429fd796f9aa0b66c23e0f	1669046890000000	1669651690000000	1732723690000000	1827331690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-106	\\x03e50c81cced02f6d6f54c055cc51810259aa59eeb858f7dfdfafb28d7c3ed9cbe6361a6004713490ac37c78dc0d33d089b8b6152d656eb4347c235b58eca0f7	1	0	\\x000000010000000000800003bf29a9c70e6937599e11834287df0bac73b49778b2c2194ff415218f5ce8821013b5574129fadf1d423dafe7cdb31642416c22a8fec46d30c29a4a1dad7cf18bc08fce97c77d0d2f045defcad72f135bfb8efa192abce2bf467b72e1c946ac7702ee657f2b14d9ffe8657346f7d9443b1c9cb21688cedcc9433d0cac74a37499010001	\\x3ee593681711908b4d5bc15bfa73e0b3fe44d8e813616cc14c6d29496b637f67612f8cd3fcbb4d43dfcddf5e267bab8bf14d9b51297acb240eb39db264578006	1653934390000000	1654539190000000	1717611190000000	1812219190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-107	\\x054148d04d8cd76f385e97be6e0fd2706e7cebb56b455f76bc0d96ae04587cdaac98e4aac6303c665e6c4e9854521d3ebd160693351928af64a49959de2e2c84	1	0	\\x000000010000000000800003bacb6b12aeebb4ca5471b54f7441f4a097fd9c9f81d93fb860536b3a9535db28d5b6e66e34ab4e8f811c5eff5e6a8d3b8611b2c24011d82c474cf27693ea98857553e9d20141e531bbf1ca60aea08a7bad8f6f0cad60c4b68e46756c97da8fcb8e87709648ce962c7e5ae3b0919e7076ee6d84e8a1861d70ff6b11ccb1bcb8d9010001	\\xfc9c4a8a10cfa5f21324db4cc6a7897d32eec49744f74dbddcab53d9fe14666a403e5df68833f39644764eca8fa3ee9aef740077bbc6f673ad2b753b46d0eb07	1658770390000000	1659375190000000	1722447190000000	1817055190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-108	\\x065db3838d661ec487e081305333d5798d30344786b4cba6c25a157705bafe882d1eac9314cfd5185c705e0240af72411f6fdda17b7cb1c47b4c5195e4717c98	1	0	\\x000000010000000000800003d3f14629d36e16288583f8097e9a67e077835f087609b7754055276e0b3232e6a081d3108c34c143760e5845a66fd897fb2a4b8d14c9c1e5b722a5c3378c329dddd5dad25c86167ce95d873efb2416a24a385f7e1211c79cbe8a5bea353b76c34cdbb40950b71580a082d7c9320987ce390c0470bbbc3e0567ecb4c0064443f5010001	\\xbc7efc6b10f47ef83b0412cba5202064fcece6ba346de2c80b9fcde19d3649cc34d65a9a6bbda8bd88d09ae9a495b3b459de3cfeae6d82c31382e1610fb95106	1670860390000000	1671465190000000	1734537190000000	1829145190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-109	\\x08e976eb2fa889044212e984fb613ec1c17a8c3df2bcb45a7636eabd0d3a4f88166f78b49fbe09cdd995ee08db05a8e53a04ad3b6abf4f6e77b260bbb6a48d03	1	0	\\x000000010000000000800003b4ca58faf0bfe0163bb4719eefd2560ae2c2e8373379985cd853211824aa55238691188a987ee7c4ec2ceea293e91d7461a226735de6d47746140663ac5cab0fbe49e75a1113cc7c71434e3c4fdb97c52f1f62c22dd25f6c161214a65b46fa16f0e918fa271a6a57f62841f89d66a050847eecdf4f9fab5777ead38bf0fac2cb010001	\\x59ec60d951415b0f50a87803c878a2ace9857b287fa36562573689543ce6b6e3532de814f11a5d912c189650c01b7d2ed407b08c0c4f689eaec67efdd57c1a0c	1651516390000000	1652121190000000	1715193190000000	1809801190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-110	\\x13957de0e5318d3c567a00b6101f1daf282673577054b092207f589a3222bfb322388d92b126431a8b630028c826441effc8fa4f44655793362f75fee9f11179	1	0	\\x000000010000000000800003a1a4fbca158655563d23b2a604541d99ba7c214016a2fe0407cb60950153ca754666c904bb9059b5c39fa843453a8f433ade85befc386b26eb29b10bfa6a659a72b48ece55977beee83b76266f7699306f451526dc602a8c13e8646509d910fe7ca81154a32972bbf0d7de2ea7f30c07fba4fad5b50623f9036604b07ed14ebd010001	\\x93c404c7acfe09553aa5c4a5e49a916bfadeb3f169282811a303bab48ab62a116bb21ff48c8a17e20e6c2aca367bfd6f02965d3084219c985fa87bc522594502	1666024390000000	1666629190000000	1729701190000000	1824309190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-111	\\x16857edc4e271cfb1f6573ce0eb89c25cfd5c5f9e8797fc6b93f585346498619011f1075aa567de809b4dbb9a67a98bc085f47d61f87098f5763a999875bb1b9	1	0	\\x000000010000000000800003eede6846394a3e7328a06151d7ad41d0e201aec3cbccb79775674b1c97f57fece627c63cfd2ca5f211a94904ab1dc6e02368ae3d36f325408a90419998010e53a2279d3410a7fe032656ac7bd6a967bb3c174d5970d589d1dd9c78eb1d5e36e695c671d8f0ac2e96b95ab244f7796605123bca604a379dc33e22d396c9599a93010001	\\xc4cdc9e91fa26f1b7fd7bf16e7497fa06542d11aced45f9499d3adc68bd28224198205981acb01ed76daed8ea33206d61ba0b129acccd19d1535e489d16c8a04	1666628890000000	1667233690000000	1730305690000000	1824913690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-112	\\x16a5e3aa9787b532b24a13a378fcfaa4abd6ab08ed962e4b291d80610ee2dcb4789c30de689a52a730eedd11c38e0e8e78d3912b3790be4e57f04b6cc5f871ee	1	0	\\x000000010000000000800003dc852222e0fa5a8682db49439ed661f8e25399d06bd70a39fa0a774372fb1c5f27ea084f9d3175a94f516e12d905ae49b8e5a3bceedb3a361b9f6ccf63b389ecde7eef5e24b2083bd6052fed089f782f6d6cde962fd59bfa0767ba01d5ea1dead5cddbf6cbe103cf86b24f2910ad07bc4d5c4d5a60995d31d37d241b8100f7d9010001	\\x00e128956a7a01a5152f1a68adb50a625fb6dcfdf080135644a2d7093010f1d3c34e6b70f3eb539e3408ee024688ec97e5e11c4fc3f77f98926e4a46a0736201	1662397390000000	1663002190000000	1726074190000000	1820682190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-113	\\x17356c5521b4c5957bbbd43cbea68599a1079844095582bdd02f1f16ba28da446812c96aeb27a0934a555d26de4527aacf662608ee97264931d5d3f2714c76e9	1	0	\\x000000010000000000800003baf33635dd9e5989ab5cef756fc7f8e89d97143f56f943cfeaeec453c3c8a4d4d97a1ae38e151778ec716e96b8bb38b660a2ba92000c79c55db29369f81e58ab8d0952130d0736e5ba5056a2648e000cc2a81433504e7a4cff20c15e81f868eb252bb41f48efccc66c1f516a751dd02c8e2bb042d0de791f3e113d9a5011ea49010001	\\x7ba06e58f9e85afa3be68015a9f11c0f83f440095cb0283af05a5dde8dd5f1500b4d80cd955c953272d35f0741ac1a8ae2989649c116d965a2f0e49d66c25d0b	1670860390000000	1671465190000000	1734537190000000	1829145190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-114	\\x1845db4909861698aba456e107be817a17f3b3b071c70ff8041dedd8b576179c1d74a796a80915427f61da56d279e17335f0ace3054dadbd5b3665d35c7e12aa	1	0	\\x000000010000000000800003cd5f9fee4ddaca91d6790667d33251d3f0d7111b660ab34684fe74b5679cb4c46af198d024ac21a00e7859b1daad2343974e650cd07e3b638b00e2f93311eceb71cc5ddf3ffa4ef294d59430ff3e0ccd9dfde4505be2b5f56307e840ff5f29135c612344b18216c9dce8a54a80101e9103a4f31365229dea76faea7ef44d1ad1010001	\\x5c76987e80f53ac7cf293fc43136176dde0e7cdccad9c3b5ad322fe846659b8b8652bcab404652d7f1ead3d0a4dd868f85fad5718fc9550c221a835d1a208c0f	1667233390000000	1667838190000000	1730910190000000	1825518190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-115	\\x1a6da4bd9075e61e3d38ccafe54a0fdc60c80a40362783a1b278d9bdb5ed4300bcac4c657096c63841729a854ac0357b7e3d80837b5f7dac7c93e221dbe361c6	1	0	\\x000000010000000000800003d6f9efadb03fb6d827fb6b09e3ca63c736bd6884293c8ab14c4a2375ebe39c89f3e505320b35cf87cbcafa6d5b30085c1891c92da17d752ac39a586f6f8348a7ec5dd27f77d27d9b133f4f9be292e11220b6b33658f587106720aba71aa6402c0190e5c4728f03cf7e1a4790e543f3cf607f3889a608e0ab3859af2a5934e9d1010001	\\xf75e329aeaf61ea0c1fc3c2fa5065ca8e4f1ff2ee921d9a4276e53b8e26cfbc940d4baa97f248cd0a67ed36b74512852e9f53893482f1ad759b59cc487e86201	1657561390000000	1658166190000000	1721238190000000	1815846190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-116	\\x1d017e57685c698589f93357231a0b9f98b91e3c0944465a1bfd3ad7462e2abb1e9b16ec1c5a596f6f9149712aef86a9e947abe3cea927ac073dc0822cdee5a2	1	0	\\x000000010000000000800003cdc74ba5b1c32998c8a38a15e1f3cd37e57afbe10f3d1fc5e47388c5a27b2d1c8c40c71c8e0e55e8662cbd151070a944da4f53cf2654b1a33d4df946fcbbb952a1deccd53ec9f264b1c6bb378c0990ff95514888f9ac161bc2bae3734ecf7d39af84b4522f2ed698ab0bd1454633648d50d026c1d68df099b42489cfc991cee1010001	\\x2a8c60ee1353e6bea039df6dd873faf11edc5d9ee9f23e886cffcaa3a6bdc4422e7c47752f30c706af6ef5864ab72971afa080644c2a6ffe8d1de5191443db07	1658770390000000	1659375190000000	1722447190000000	1817055190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-117	\\x1eed8932a444bb2fd953181da557d0c814bdb3d421fd39127a583de8898672ee2b214cac036cdb2db128fb368ae768bec7f1bcd6a9517ec470b4c274df81c28c	1	0	\\x000000010000000000800003adb03ed771b11728173b3b96933d2d0316416731a146b12fa9c19a5ec55eb1f2822d6971cb8998d186e4132ffdd9411946033d1ec1cd09108e88c908ea903dc740de562cf935793a0673c32c199650fb9276bb80cf183965a5e407da4e6acbd6b7fd3352781af857cee91d9a85c5a3e902c19ac59fda6b511c554c75d0c98a57010001	\\x2a6320ae62d0f22eda345e949af7c66d1df5053b55154fb2a660b4fe23be0a00253c7e659ed06e3203be1af47ab9e36803c3574c1c92eb6188638d2ea4301e09	1665419890000000	1666024690000000	1729096690000000	1823704690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-118	\\x1f99af7b866376a6c7a9bbd1046e83dd626cd682cfc17e6091ed340db939850a49fd33cdbcbb8f64aefe8e172a455d86084fbfc19b1799f7fd82b63b7fa73dcb	1	0	\\x000000010000000000800003f4c75f7fef9edd21d0c97c24519eef18fe4bbbd453d7c68a1d8bb92aa96e48aee22e04ad1355685e6b953be8e9c2733ec5364a16ea826416422d17b187d11c406ba0f7efdc2b7659b05ec70a4ee600eeb413641ba69ca08b830c2f39bea633ea55419a8d132d01f8b9fa2b0d3b6b774cda2eb41a58e85f42ffc6ea170b57a535010001	\\xc0970f34f398d03bd633ee913dbecbad3f1d92a68f501a4190fd6ba5a3778d15eedd34189d81e655e645afbcbb1013645a0ff0624b6414baa5d4c153a7e06e0b	1651516390000000	1652121190000000	1715193190000000	1809801190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-119	\\x230d36540b344a5afef46c38d973f3bcba840de39a7d581ca51acc2af93dc56ba109eb8828f7cf151f6532c66267d863a0c0d9f75fc3716a8cd10923033388eb	1	0	\\x000000010000000000800003b57d45435186a2fd9ad518de38cf8f0ea5efd975e8f73e55d56523c9be13c9f0f0441fda148cd4a681c798ffe0ef2c35f28666695534d285d91a450acd2784e1fc38b7547793836baefc7c3203d08479dfc384bbce844aba5f5f7a077c5bdfff148888202975b794735737ed5fd7ce6c034af97b977c2bbd8fbe6643e62d795b010001	\\xfdd5102d477a423a8cb37c28661f5778e432260b5708dce7de7d7c0776a43da98e3682d269db5b63b99c29ba2e606c1612a6c6b57a214ae32f2813b24fa0d803	1667233390000000	1667838190000000	1730910190000000	1825518190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-120	\\x24b5a157b761ca6f14b2a39863ea3509a5af0ac505e5ce7c5d3814c26b053e01c211f130cfc49fad83ce73cd15ec44862cbe81ce1ef3dad8894b331d62605d88	1	0	\\x000000010000000000800003d9b4f151334f4d43b7af3cc115a7e6342e098566a4c9e346fe85e2e6f58edd5889570a3a44ae264862fa5d3fa51cd4cc75ece7e11885cf7e90fd4c80e9534e2816911684dadb69dcceeb36508d57e99b25c216221c9adb052cbfa300bc9d1cfb90a254f70ccc6a62a6df1dc93612ff454a11d790ac4fc68e3c126de735df2a91010001	\\x71de74acddcd2e77f26fdd2b78b1ee8f1821c8bfba54a26ae31c3a154119f8c70fb4b98a8d72a3e76c4a9503a9531c757383d4a15b958e14bd0bc1034604bf01	1666024390000000	1666629190000000	1729701190000000	1824309190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-121	\\x27fdab3c3d383d329444f19fbe53b7742a5209955a44329b18e62a90bc144a045c86f3881106d23cc8cd2decec693db44d4a92079211ec732b3160d87a9fe185	1	0	\\x000000010000000000800003dc4e4ee126e0e6d3f7858175126431f689a50b4c54e59da4ce9c46beabaae93c7adb85062fa2cd799cb26167d8c1e34d8052c04468268d9dcf0f449f84ffdbde4f6e6505a6ddec97f08bdd099ac521504d90400fc948a15b989c78bac75ad192152261f01fd9586a1cbcfcf98f8d774695850712ea333288dd58b7dd03461ea7010001	\\x9ae4968355ecd8008ebb437ff069d0f190dbc9f03f93ce2f133c77a2a40527721784d74551c4cef878fde074b16626a826a7129eddf3286d37835f11d3f17702	1666024390000000	1666629190000000	1729701190000000	1824309190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-122	\\x2fbd47d1c1b355a368ad46efed994419a7d79a63076be2ad7d16ab03c77e76d452a62003ee0917730477df97880292bcf68ea5e8469663ad46d0bd7a337433d0	1	0	\\x000000010000000000800003ae031ad10d93b14230a225065beaec814735ad3404bef1cda616efadf3202486ae4bced6eadd673032cdd15fdbb85f620dc08aa153aae6b3c6eeff9ff760fcbdd8b759589e16274c43addc5703f799afc42414d35f60ceb652337d7080bb54926a4ba343a11457fd98ae482b26e0451574fc03c86f9330bfe4cc22b97b29eef1010001	\\xfc3675c005e82b07ed6e67328c39c153637d1ae4dd92e885d7aa3debaae0c46963f8acf9d269bdbf96466b91ceb392c053ba8b67fd7f966977527ac0cddf740b	1656352390000000	1656957190000000	1720029190000000	1814637190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-123	\\x31e1c6fdc4cb471b4037b5f11e09bc88e6f1c4c499dee0d4fbe28b62cf7b3327892516fda4cdb311c1e53dc1fd52f83184cddf5ffb9cf993256c2ea7ad189fe1	1	0	\\x000000010000000000800003b02f504d4088bf698d3023307c5376cd6a45f2e0a2e1768b0cbdfacc88e3d2297fcb8a479b9403c250b5c1f9af0d8dd0ed3981e49b100493c738b17a182805f998ff42f02bf46d1160e73ed3163bca4ea67255e02560d7d79d63d15b4f13555c0dbedc3e0ae87fe9c1fb63c44098342f0b4bf7d7c59f5b3c49e89ca255a6f7b3010001	\\x04eec47d40fd464c23bcfbfc6dc22707f28518b9a8dafdfcc822fdc6c55dcfdd14a4e03dae64eb096b39ab175ef35fe6cf8a089e0bbfd387dc28c82b0c6ac901	1676905390000000	1677510190000000	1740582190000000	1835190190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-124	\\x31991f33eb074df03f6c067b7e9200d92bac076fcddf5840efb59a96cb0277666c5419f1cec3de8d4e154765aba73ede3652a5ac6f14e553e6447f42f74911f5	1	0	\\x000000010000000000800003b507d43da0927cc086207637b06595640af98c4c515bf4e411f9cb6b3b6b9db4f43529bdc7313823c1fbb529f80dc60185265cf152295a21cd741b2ed0a7212d683f68331470ec5d4d005e4eaf30c32a81614a0813b4275280d7f7a274dd9c29af189bfb1f06f5bc0c4b6c8a960b4c2758b058eec51f9f50b5baea5e2febaa27010001	\\x86c386534d8d67aac35ca4c2aabbc2087dd4ad122abc0231edd905ed9952eb6d8798672cd1f6fcbaf8890f3ce45877d71161f4456c7080a256a3ffabc1792502	1652725390000000	1653330190000000	1716402190000000	1811010190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-125	\\x32415decffacb7933fa129191d8183ed06d861764073f94ed6004fc0fc80eff3e7e2fce52d8ef67754e3c18b34b77419ee83483d21b294827bc8809763a8b268	1	0	\\x000000010000000000800003916bc2e5097431758f8105533d0970402324e7edb7855c816cacd5fea1e548f741ccd9fa7e0719898ad591292b2b588b4559676d262a3bab1448793daed1cff79383ceec580837278db20e5c5dcd7d1d280cd05ef51a199ed77180bfda9daabbe1418aea3802e082a5541f3f853a09812d233e2e22f2ea21977b801d7ed2d123010001	\\x2d8ed6bdfe6cc2174e51607281685efaf4a7cef5a52b65be5dd43192b7f7b0a6832a6e1ebcb35af8bf8af7d0793d05b02b4b32dfb4bdc80f4decf192b6e7c304	1658770390000000	1659375190000000	1722447190000000	1817055190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-126	\\x339d6142403d8c728b616c5165f3b102b0c7e626aabd309ef803a0b0be9da8f176cef9d3fac3c6a1cb688d60e407175f699cb80ed8c61ca37ae8373249c8d84c	1	0	\\x000000010000000000800003c61a1dcd80f8afa81d7753458326f723eac29b061f65030b1e05dc7942208f3842b130a7ccba412cc8a22bd34892d4d20b7d3b9368bd5c0d0b16323017523c08058cb095d860c75dda98e7a4185baefee6179754cfca8a4f766d63008d4c059dcc2f24957142435b995b6470fc88a1c90ab099a86b4689c8a814f3862e979a09010001	\\x8a9abc50dc93d713793331a89e5846c22f24abf47565c377719e1b0d3475b854935d614b3afd616305c15546b96e8b914a69ab3eb5987e61d849637e6a706b01	1652725390000000	1653330190000000	1716402190000000	1811010190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-127	\\x3311d2dd6c499352f9ec849d6bf6e9612945eabcfcc756d1b77697c92098449323ac8ce734d058d59cc38193463b33395954b12ff792162d56334790ad3a6143	1	0	\\x000000010000000000800003bb3277f4668895a4d644dd25acf400614f81e049e3b80705b67237a0dc0a8045cd3d1fa71bcf01b6e4478cacdf2b1e3d1c70d19faa22b4f6d2d5ffa5688b0eec67b843018bf650f857561153e9690c677bdacd4a43cafd5f14cbed9d4c5e0be13c8f976044cb345c9164d3325c206de7f729060753fd333743c13d1d1154d905010001	\\x417cb45582b135911eb44fdba9ff7e57f098c948dc0ff23d2639c760a63ea1deffcc944bc6f92883c12d3e7b90c1e5e73d3c7fb509508a7a95306cb7c3232805	1669651390000000	1670256190000000	1733328190000000	1827936190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-128	\\x34315c2728c77a5861cb4f30dbd22b206328cabe42c8d76d620912269ddf62a25d740d5b93f1f671df7c59bc878cb283d6cbae753c6e4748d4dad9e4bbc3fda4	1	0	\\x000000010000000000800003ab0473a3130d6b2d8ff66ba2d2940b56d37c0fe6dd081f05b84627a1695c6b3efb54763bd9de6a9d4539c21f24fe758c7d07cf54be29d22f1ca0026fa9eb3f4d8b24b760c1c4083ead93f59b22f3d15feff7181071fc7bf748713657590ea85ebbc55a0be08a724af8343c8fea77a3634f22b6db3c8bf50c222a2061e884db4d010001	\\xdd45e28bc25dadd9a2ee2d5f516047563c8a6ead37e7e4b4c68c1f0e0f919707d4a06dc36a100ae07ea14e1683a21a8eaca60fe8af4026f1fc3a3a74d7fb1b08	1679927890000000	1680532690000000	1743604690000000	1838212690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-129	\\x340989fb94c9c84262ff76a555e0bd6782d409442b42ab6e248fc281833a1c28d57b14ed8030d06d89ed4cbb108e9236e03df69aac1cdb2137fe44a27fa26a66	1	0	\\x000000010000000000800003c3af4f243a4156da73462248fabafaeb4dd7de1e9dda9f0379a9651c5765700d6a25e571b5dd7c939d808d3a88c4024edc49e2dc46c2f638592ed1d1cc4e5dc27b2b89c6f94b373ffb6a08daa268c611bf08a1235df2376a4c1615afadf9488fbab118ad10901cc89a966118893bd69528f0e45c97a0400f79c52803027c2199010001	\\x60833dd586090a074dc1eb95951e6cbb6af6a4bff5cbff84938f4d80e086b7e70231f774a764dfa38912e20b47b4a9e08c0d103e5d057959b8597c868c814306	1668442390000000	1669047190000000	1732119190000000	1826727190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-130	\\x377d6ecb97bd2fc2d474b17690f6deb7471779de07a6fe827801c07f556cc281bbdabb4e987f8873762c0fc26185d65162f18895e64f6ae13eaa23d6b34760a0	1	0	\\x000000010000000000800003b651e5f6ea4e30fa78687583a8d20000986f65cbed8ec85fda7770b5b2255840c01759c25431b2feed203d73d0a7a703a89939fb39e1d584b0844b4581f69b37adab5cad6db04b7717be116e6bf8de070156dfe8c80e4e0f0240481c8d9f76b806b7372f216caa906fd8ac4e228e8d93b66cd71d8ddffec2c59ef6b208ed25e3010001	\\x218064ecb35c19519248b166fe45dcacd87532efe81a422a4705f418a60eceaff40846e18a49a0e102b3402801ecea75ed968ec1c2116b26dbd061bc14fdf90f	1658165890000000	1658770690000000	1721842690000000	1816450690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-131	\\x378d99b87ee4a593c9bc3561fe1936e16395bd58210e46ea715084b364561339168fe4992423e29d09e5530a6c9cec08656c5da5be6eeaa9ad61627e2b3d5d79	1	0	\\x000000010000000000800003c5a5a573589bc316bd04b728aaa802229f7880e0f1aa32a4c9bcb41f1401fc298877a8e583b100ae094308c42320ebff1921de4b20ef3fe0c06ced3565ce98a4d18abd0a837d49f6bc96ff8611054b78576d28127af66ef03cce2caad2c8a451c39aaa8024780adbde45059af4e1c39076078c504a22b60c9c7978e54369b06b010001	\\x00c5f60f8d032ebe6a73010b5dc4770bb7fc6fe0f8159e5f516ede59651ae05f05df8288cdbe34388c0cb8c96f7b7aa5478728cb27ff4bcde3717d38379ffa0c	1663606390000000	1664211190000000	1727283190000000	1821891190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-132	\\x37a9d0f087725ed628b60016dc295603a7a2ee320355f123ea32e1053faeb9c8571ef4637ff5b83a3ceb2efc5f445145a0cd12be3f3eb05eafc185d715ff4c35	1	0	\\x000000010000000000800003d16e0b0ca6a1de122722fd5b8739ccf9d8e0ea83096de465a6739efa0cd2320258a5f7a476f0ee4770e0cd1287473e05c761d22ed656cb52b9ba2f5f256d0f86f292f0334ed0743bff1ce04ed65ad71ad43b9fafba0738825899014a2131d4ae961a3340182dc9a61b50ba94605e945f3f3aa704a3243c6206cfa9881b800cf7010001	\\xe6d46684d46df291e8e80277c3198f02a3bd0f982c59aee3e1fe91bfecc02ed2f0398676356b006c4e8bd3c28a81035865cb23b8ba6203608a77375b49baa20e	1669046890000000	1669651690000000	1732723690000000	1827331690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-133	\\x37016d65120a4aba84a2abe2cb73d0bcdcb1150d5e629f32d8876076f94f30520598cef033278c3130c51251dce1d6467865f3f4fb4a068cb4d21a1778ca4e9a	1	0	\\x000000010000000000800003d55c63db120aa70db00c1cd779c86c981c5d2a705fa9eb78d6077c8128e48f2a6b709f61e506b6a526f2d0a1f95cca9e831ce2a3830dba487b95cd43f3191550691dfab3544a4d165eef036b46c12ff41fc4e1634eb1c35c577d9a34456d691cf58b58c6c6f231cd2e3b47d0e9dc5bcc66b2b3814e6ecef6ed2386fdf39f86af010001	\\x74e401c7940e4f3387edafa80ad8d22186c8ed6c4606d5aa3e22c241a70f2ed24bef3f472122937da7a2776f4d2e920becba01337a7d186256dee83e77933e07	1671464890000000	1672069690000000	1735141690000000	1829749690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-134	\\x3bd9eaa795d46f45a20a9855424ab35955d566b01a944d0cc6e3f892ed1bed3417d6dfc14eb0b78715de68560bb7d604878f740d03a53004ad0b640c00ff0d96	1	0	\\x000000010000000000800003c7aed69bf28038296e5f2d8f4c5fe6ffe00aa5f1e15ada289d023b9b88ae27fdbb2efa8c25eb3c0874d3d4b70a62c861ac38844381fe15d5590df6cd4fe9f624d55124abdb8f3647a13311f84a4f2e74c56b2a5c23d0b5925526220856cd938f0536f6ac24f8188027a9738eaedeec12835400fd2a24ebf1f04b6e0e1fddf019010001	\\x9dc8d57a6732b099e3ae0356abe3e69e188b30576889e41d3de9e830f730e15817cf9696c0a2f3e5cb10b5fe6f117cdf1b388998af1b83caf8e7784859cff90d	1664815390000000	1665420190000000	1728492190000000	1823100190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-135	\\x3d21d3fcea35966f1a0af10cd36376359c92cb6ecf863327edc34675805d715dc47a1660313bf5caf75574fbfdeb8f5b9eeb78e0905eeb1b5882983a68040003	1	0	\\x000000010000000000800003a74860cd002707981c9faac21a1ed93c62b55e5347b1b5c328d7902e6d14890d8bfdc89d21f7d46fcbddd526cd63583fb596298201d06f5fec9f6c27ace98e4623a540995834ff9b3ccd4dee80cbf9b0ebe9191dfd89966ed566576edda7c628107a7eef943b5f6f4b4c9d8fb1ade8f03cce06c1845d908edfa56ee179ddaa27010001	\\xdee376ec6c320fab3daba3502a1bb7ca6ea30619917cc93f49ca841f7f55fa596503613bb1334d604004ff6b8c881d5451e0074299ffc3e2748b0b971d1b3f0e	1669651390000000	1670256190000000	1733328190000000	1827936190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-136	\\x3df18932763d6988fcd500994ba6a263d65a18a252ecb375a809fccf8bdb9b379b85c2db32013b607921b3dbf6ef66c0d90dac897fffde34d8f960fab48f056c	1	0	\\x000000010000000000800003cefa3f36a707b6d4cb5a4fddea7e295705dbec1d1d8ffda6914b48a97bf9aa66da6ef152b6b674d61312f83e9f67ece2d0fd018c23bad9ba73c8378af95945bd4be39945bb80a387902ed6c7515c1cf9125ce878118a0a7fe03097d291f5f2d117967607dc8e76fb05f68a615a12121c4adee177ef0de71d2a8744bf0f102085010001	\\x6aee813ba8ee2820439137b22b2653bd1d0a422ba25948910d2cd262a1579870f6c349636a0deff93a3ffa3418486bc048bfecea8ac2b33c8c75186660d23100	1676300890000000	1676905690000000	1739977690000000	1834585690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-137	\\x3fadebfffdb03584c8c51ead28e573c5e87862ba28ce18b391786cfd0533f3bca64644a6abfc66874105355a7525044e47d2cd1ee1a6fdda128649d2c29b018b	1	0	\\x000000010000000000800003a6de778b6437e8e17181b276f7aa386fadc71e016f42ae20fff3365c18161587d105680c2bdade72d084965d437dca0bb4a558261d65c3d042028fff363433f1f01333576c9dc0fd145545f9d6909a77b4c872f3a54fc04e84ee52ed8ea70b6dcf4fb2d56f14aa1bc3a0a47528060ecde3208d292d15cc96d7d012804cc28fa9010001	\\x1ba16cab3a5d65a0713ee14e8e7453b4c0d8be7c500d6ed7d7eb5c20bbb8c837c39b91e21f10e45b5e451cfc355f355234948bde32cb19af21b60ba501378f02	1681741390000000	1682346190000000	1745418190000000	1840026190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-138	\\x44ad3dcf64d355df08131738cee4e4ff767e9b20eda78ea857508909f9850f38237006454d56a952d72a96af76890e14d801a311007af635deef687e8154f89b	1	0	\\x000000010000000000800003d1d6a1e4f2cf02bf6c58ae32fdb1bb1fa7e179f93b20596e679551b268d4911556ae5d3971ccdac82fe1a592529879a0dc74e33d9dcd9d03168f72f1622dabd459e37f8c1d418bad3526d98cdf21d0a933d9381cd8df713e7a5ace58d78ca8368f54f837e8363972b01d86c5cbf8ecbe1b259ed24a5aad912efb1c3700bc1845010001	\\x76a1c0ac11deedc6b2525c6822f98b722ec20366182ba12f38a2e50b5850a0ac2b0fffde6ec7cde97d43a697bc8019f6c639d64994bb43a82e5ed2cb2620e20d	1669046890000000	1669651690000000	1732723690000000	1827331690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-139	\\x48edc7f0df727aca134c6eec4d604090abea09e1e67d800099bf69d8e2f04c46172e0f2232e94881bffce2e1e52bcddf3a26c56e5cc2ccb695a1a3fcf1b0d464	1	0	\\x000000010000000000800003b48df92a36bcedfdc094c9451c60c9b121e5453f8f30b6f9b1c91603573a77cc766ea37184641765ea6dd9c030812264f349b13b391e94abf05054a26b540a2c5e8e02149ab5d4ec240538413c166effaa0b9098b8a4b684d2187d95a10e905c6cdcc82edc839c0e44770504998b74c3ba33b42bf5145ae47e1cccec9bf3e15f010001	\\x6b9e77b3f294ff8b0c80f5adff7b6a24296a1fb47290a8dfafc0a90403e0994bbc8c7226718f25307c8662427115482ea9dd10c4c524bbb0c7a35e4bf5c19b00	1672673890000000	1673278690000000	1736350690000000	1830958690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-140	\\x4d218fcb275243db25bdd8c95e327dfbffc47e191ea84b400250a37743b6f26e3e613c184b114b092544e868ffafcd334551d84ec79cde4b5048120a83df1e99	1	0	\\x000000010000000000800003a9c641fd5be9c64d723b65883ff8e480eb395c765c81c7fa282bbf66cbc1f22a9d76a3916b4491dc4201f86409771a61f6f4bfa2b184d24dc1b8e24e75b29a265bc0db45aac83c8f9146cf8bf0973e11056ac96cdb68d5b384ce85cb8039176ca4c5ff96ba5b2e08fe7ab25028615a0d81d2c8097f12c63b4be03d15b89ad695010001	\\x2e3293f0cf3147d71877366bc95922e01a63f551d0186ab34966b871d3ef688930aaeee845b12eb2e745a52e755b44e585a35208f85acd0360abad328ff6d80c	1654538890000000	1655143690000000	1718215690000000	1812823690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-141	\\x4e39b54a5f63185169d61ec41417c9aa7ca68c3f613c74bf3fab36e43f536cba6f0dc018aef79ce2b1af6666b02499d7da2ba4aa21af974eee77560e589e4f4e	1	0	\\x000000010000000000800003b2e431c95c45bdb597d4f5362d7300a7feab5a81dd18915614bd6509e950a8e3167361dac8003425428afd8431e6d8e90cc25680eac99c0276de71d6d4b18413713a9da8dd4f6c6f8b251b075bb45837687691b93172c61262f1d1d8adba337decc790f776f3c9b55860307181e0ecff39f0a9b33688ae3b38d66614ade7ba2b010001	\\xa00a1eac54d3010d6b2ba7ecff6e816f2b0aefd8319793ef3796bc4115284a74f60f2362325a285f30f19520bd5f7b35f12b3bb6b0f49f55565510e68a4caf09	1653329890000000	1653934690000000	1717006690000000	1811614690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-142	\\x4ef13b581ce1ffb25c039026dcfd2cc345178ba7a0a2a6194c6727d8d643220438adef36a4f3bf6427c0e9962ee2f4dc86a67c5cd3a062a26d8a310bbe0e6508	1	0	\\x000000010000000000800003bfc5b46854e6994ff61d9a7c51652bf7b24d7527e2457d4f351d819a1d57d17f9cacb4c7d91e48c0aa2217a21b4587cf82191068f8a711604e87edcade5695fdd5c35819a12652dba6483ec3aabdd4d09b55e407fc0d74dec1c3f22ccd4df80086821ec1791e7e0302d2d3c2a1e9507edb65ffc229beeb076b83c36dcea7a497010001	\\xe6a14a35bf4dfdf5c2c13cbae1a5c4532d96718bbb4bc5e834087f68bc6bba2cc989fa04eccc733f1a4709c767a50ae736807dca99d901562fff350b18a99706	1664210890000000	1664815690000000	1727887690000000	1822495690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-143	\\x50c9854b5ef87cec847cc8489593bb931bda4f6e3693aeeac203d68dbe4202336b5a8717570ead6b6ef01897b8f36b618686a6f5fefa2c5222c92bd1fe85f95f	1	0	\\x000000010000000000800003a1732cc6a3ab85e3d640921bc0edd35fd2afa4b06876be8bfb0031748bd36d9a740f90597a5bd1f1842376e547ce9e175938aca5fd8569529965c0011b91b87893572149217e34daebd6fbb6d1da4ae2c35c48714fe62ffa5fa493ec0ffd8b8f6008edae6c9dcadfcd0d44e2a02f18c851cc4e648c7d6a4e3970f3f64c79e451010001	\\xbef71031ce2016b37c97b25ad1e1df17e3e31cc0bfb0e66ae154d4b6bdcb983db6c4dc9590b164e95a92ccae3fe93d209916e5d6875df48b8edbbd0d4349f00d	1656956890000000	1657561690000000	1720633690000000	1815241690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-144	\\x503926c631cba6973f836869320d79cd1002501b39e6aaa402f0837d5ac3cf8ecb1dddf76a287de49e173d42694f051fd6e6583eb8b15316f18a6e6691c621a8	1	0	\\x000000010000000000800003ca8c258f8818cb1cbbd4ed6cb6c69063713fc20326898062c706f2fb26e4a0793685887812a2735ee18df983109516ba36287bcd3b242cde3812a728b1746911d1c5121f0bdb81778aa24b9932becd6f2046163e0884ddeea3ddfc6c82bc5a75d6d987281f8b4339f1cba28dfc299d9658941c924fc5933ebce74d7d352f8ebd010001	\\x9b350a5cd2cd6c6b10ed288da168dcf0ec19632b198e112dd4e46edfc30b79f06264a3852c4b4b08d47cbc5f35b9ad1856ce642f0fb0d2c43e38b5c232604207	1670255890000000	1670860690000000	1733932690000000	1828540690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-145	\\x522981b4d7dbfa2b84ee28db128a6808738391471e54e00558f144f452ecfef9e88196f3166e8122b0684d934a0f319bd7616d68ece5d36ea04ff233f41d60df	1	0	\\x000000010000000000800003f124e57974d8d6c1bf16abfc0ec97cde68ac3f6543f276b4ba7654775671f858bee470dc9162660b11f5176d47cf4d567cf3588511a846ef9e4558527afda13e0b67e35c47b47cfbb4f3fbfbccaef3881cc0537e711f8e070c983e0212091d8d40600deb8d19d83f2a02c3fe29e3c92abfa8e8b226856496c12d39f932f50c49010001	\\xdecb7e485c72d5189943f1d3b83c8b7ea282c8a62e54706cb11015d9e3f9f2bdc748d10532d6a2d8239fac994432cb0bd8b6e384debbeaf1bd5257f519187507	1661792890000000	1662397690000000	1725469690000000	1820077690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-146	\\x5429a1d02bb438646ce1353cb9c0953889b4b30582c72dd97b12c27d6dab633f7812c9a2eacdee725577e8f65af16e60a6019f1e30f88206d498865f7b3f5076	1	0	\\x000000010000000000800003af0b77be98f5d53864f6728d7b1ef1e4440d6e76ed7ea4d12db1f2998cf47873b474d23c4b7b7412b1f90028306d47772ba99047f49d4cfcbffa33cf266f2abd26359d591778d6361e7d5c30f187709cd8055794f0e0bd380a37385befb9b925cee88de404f8efdaf4729ba5285520fd7af00cc3e6f44b691eda689bbc6a7a99010001	\\xd29310d526bbc622e0a9274711363a9fa3ee5322b741d84dc8b4611dfd169ee1b595889dfeeae1ece9dff64c0d146e97e6654faededade8074c1808856d39f04	1675091890000000	1675696690000000	1738768690000000	1833376690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-147	\\x586119b77bf656768932c7cda08caaf154dca33280167918879c9935567402b0d2b320c89c55ed351e98db94165a98db98aed771a2d4becdf92335ac268bd20d	1	0	\\x000000010000000000800003be731f63a335a7856dbf6ea68f3d0091af766be7e193c79595d2e8f906c4ad9eb218bfc7c5a6047963be00823bd32cc9ce637b0bdaf51109c28c15bac34694ab341ce4755423bb643f3b876243b3fbd6c4d86d34d2f7ef5f4c71509dc0f1993c61a2ce7dedc1178c71a637f7d3301239d9651b2cf9b4ee798ddad228019d922d010001	\\x597c5695748073ce7eae45e7079f6571666e81861bfb1668f529c9ad5e5b0eb21461d7999275ea8184717dc4371caa6fe0d6e44cb90ef0869b60e5e4530d680a	1665419890000000	1666024690000000	1729096690000000	1823704690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-148	\\x5a696df6556da5eea34fc23410e952b01b826c2d150cd0f9b1a539fc77b46eebeda7762738110a3053989270f262121ea94d04ccec07864c069d0d53444fb0b6	1	0	\\x000000010000000000800003a764061e797ff17c88ff647fc217ec795ca64f2e5267dabb2bb4c83cb28895214f8484939ab21ff0878a61e28ede57489d6b784f283c6a3dd7bd3bd615c7deeb240eb7ffbb55a6404d81c9bd1a7dc008db550ea7d218b3e484e9fab67d22f7da4eb3196c0015d46e4de7c780e15cef75a0e5b8806058e82a43d51aabf21c24dd010001	\\x27bbc44b27c53d9be0e648341608ba85c3b3009815fc510cf0471bf66109b6d266fc3a39c4c72bd6fdb0d833803bdb333cb7df07499476db4a404d5e7bf20a0c	1661188390000000	1661793190000000	1724865190000000	1819473190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-149	\\x5a3968c8705d3042f8e0c0a6af6c78ce845767e2c5118d8da200671c1a9ac67ccaddaa55173dec0c9c9d18f4055856ee7c45eb72831e96ead1046ab6ccff408d	1	0	\\x000000010000000000800003eb9c917dbb33cc2a7996f9133393e6b9f7abcbdc5f26a939473fcbaa0ba53df83e1e7017a686cc2b123a14d3cfe9f613a78a0909c873dcd26258c1ff8557a158b7680130ba00e5a04b0b5adc6d668d2c3aea9e64a1d387104f886824aed90088a21372810779dc89a10809197d9abfba1ea2aca9080ace89a37fec5e3d6f3a75010001	\\x89d48c491904c82e06e5c1ad26b0bb1500e9d7008ca23f131bac9ccf292cf9f26a9fe6b18ca2a9e39a30cedbe560e0c0b7b878425cf700055d45d84d03c22b0f	1673278390000000	1673883190000000	1736955190000000	1831563190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-150	\\x5fe1f37dc3734fcaa6fc4e8a15ec65e2de2966202f28587d8e94d5b9790a57ecc1c5da7e0b79e74748dc6442ab5d3a8b88cebce66942a9e71e65828d02d989b4	1	0	\\x000000010000000000800003d1e18b0eb0ee39f83763f9f47bbb21d5f526cbe271fb0640d78acab72ac845e745104573b8063c0dfb2d7e30c520fb36f5f6c2d9aa57215fe8c09d3cd118512d1255214d4d284d21c37ad45ddd57a913f16458c4ff3cbafef67607f3ed360be910e6c13b01a23493d64f4b7b68f1c0a4fe3563d70a36e279b8f6aff819491619010001	\\xf6dc4883be106249789feddac18347b57c647ebd7defced59ea90feb1faab8695932392dde0e736feb50e0ec0057ea083276becc72e46c0dc4b3ea6fe52aa407	1673278390000000	1673883190000000	1736955190000000	1831563190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-151	\\x6191405ae21df846f7dff380bdc28baca1380de5008f14060af00b5f6e20ca48323971180ea0ea7ded573f4709078a60c87e9e657ff1d3c4346a6e30af0f2240	1	0	\\x000000010000000000800003cfcd87b780f3952f72125b102827fce268fc9358899acaa0da32f69b692e1116e8993b1c916ff64c63478e495487ea9d756d313205ff03d3d775d7949b5aab2459882dcd34f7361ce5e20812f9f8052839119ea3f3f81acecad81a36e2aee73370daea1a6367ad446f507c43f9b3202b0645f5659e2155029b7e9c7cfb76c545010001	\\xce68025a379d828743fa2790ef3733be41c07991c32f414aeeade141a1d954146cb46a236af8b2c6bf879a4a0254709ce48f1dab16afcdec0c60117232daeb04	1675696390000000	1676301190000000	1739373190000000	1833981190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-152	\\x62a51f04c730929565ec24c9129a87b7beaba8c991bb2c996383325e6deeaae92a7281bef1506620756e811cc86a6d264539d10760a355b9fbf8944c1df705a1	1	0	\\x0000000100000000008000039adecb706e46c246bb28e86ebac0673424fa13a45508c314cd78dd9c9ea38cc39e487a01782835bb66023b1126d116d9e6bef7d426e04c1941c98847a51ba9ef3e4e282533c6a7e363fd50219459d192b8f0599ae0251fb7d89931538d969a171e17315014f256a538b570317ff06c2059778b1af67328d8a691cbcab1e77df9010001	\\x8b63cc015be3f940e7c9c9783c8053442e9da4ca16200c6a73af22a76b9e30df8d129b8b1cfaeac139bf90828379caaa1086362c29aa508ca60a7a2ad4de8c04	1651516390000000	1652121190000000	1715193190000000	1809801190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-153	\\x6635cf103908fbbb5e62b2c8b352d468702901504de2c1f4ea8a527b5b2f09ca3f03d4e781c71d1b23ffcb26416ed1d65fe25abd49b554860e0138b0ef8e7f2b	1	0	\\x000000010000000000800003bf72642c6bea71744087b3e295eefc433e8fd188a53662d47a14f5d675a111e99dbf34dee2cdb6e1db23302e579eaf28cbdb3d60b87e52de8d1adfb9d22ca60dc5ea18c5350457b67821c01bc854b3db6f9cf9f85e40e257e77e7e27498dae346603663f67a4c220488ddb1ab429e01a51846c3cb1ab1839b6e555906a1a6e41010001	\\xfac21dee67cfc7767992d2d3e77a6aaa14c7e17d2e830bfe784d149966cc04dd795dbc25d35a4a979a2e8ac9c98d62aa0293ca2880c275cdec77680f2e71350f	1673278390000000	1673883190000000	1736955190000000	1831563190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-154	\\x687d710c04401577412ae894e3bd3944496347126de943657303b1522a757a2e07787d86d27cfb6eb8f5c753fe3de990459099b1653a3d2db57eab813f04f57a	1	0	\\x000000010000000000800003cf8ba00e327c6f5d151b31192e90985d8c20d812636959089f0a1f4c2cb4517ee1406eb584c19b2b793da94ba19679e3e2a68b1a74b29606d1ed03cde1585c1f5da95da82a794a8d54a47fbf247a690abd109dba18dce741d5e75edeba67595aeb6bc62bc1cd3c651ded9dd57ecdc7609dbed11fc6c8e9c7a098537dfcea3003010001	\\x52633e53828e01445a53f61835b0a450872bdb2485bbf33687da9f88fa5d4fd2640570d5568b0e4b1f445047fda13398a8e0b835dafc3fff81aa2493800de20c	1679927890000000	1680532690000000	1743604690000000	1838212690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-155	\\x68c502ccf662081c6bbcf330bb5d641a6219ed03f464032f3f7daacd6d946f0e65987b561eb24a8c2d847bef6d2fcc10f5f60d9b6a343bd1e29ad620e7cf38ba	1	0	\\x000000010000000000800003b094d1ef15609fe9892391e21cc317fe3e354e1c8c56fad401ff2c19007a20c71ec1712824e8367f86f6c04a4be219935a6d4b5435a7368624d14587be1cfb03bb0554430a255a7e5ec78e8d5eb679cd47ae3fd4c583e2acb80d45cf72271285ecede0ee762e2698e32d3b4fb54346467d7b4eee50c50fceb4a97050c48382e7010001	\\xabd0452e6e1477aa15a33d29caa7636a509cf3b9f6ffea7a6241e8444a0fc3b0dca6c3b58714920b9f253f4817e2c7fadde3483b2307eaa74820c5ec6171d404	1662397390000000	1663002190000000	1726074190000000	1820682190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-156	\\x6b355a720471c650eac9cea55a7598329f46585ac0352a736ae9d713d6b0fbaf61a45abf62ad4868d660a372d88b49e9cc4f8b2651fc6ec8c78e60534fd34eb6	1	0	\\x000000010000000000800003dc2ebd20c4daaf18b63e045d21270c0dc251fb725429ba40eedc5238dfe40ee880ae3cc21d4054221b279f690608ebb22f9e5d0803f3adc7a54885ed3dddd992193d67f43c4ea994cae4d180a42cb51940008ccf43bee0eb08486cd901dbde7afa808d0af60f817ad3bf8c9c3d4fbff852d822532ab9f8b54d704e4497e1c073010001	\\x4b8e8ec51755e777faebb1a1b09d523839d04fa4db44d44d11a8a8f6b5f97a7bddffdcdc2a5fed3501e8bb3a31da7614606aa360a464c5f3ceecbf51a6739303	1661792890000000	1662397690000000	1725469690000000	1820077690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-157	\\x6b9554c124cfbcf5e812259ba7a9830068f2538e443bbbf4fdde444efa77b6306453d0ffabc235c5d351a76d0372ec70ab8867408d8e3025c7cc63d1ada2fda0	1	0	\\x000000010000000000800003b2b374f9510c40ab45b0aa6ef0ef89f4cd129b1eed0fc9e1e970fac61662b15bf577fcb698f19bf6a33eb3e12e591986eb40fea9ea59c00a0d67c180de8684a16b6a55f78e944a47cf421e448a5e7c8f0ae0751c1324581e084ff32645e69eae40a8d551ed35a0f127a9717ba7e1d3bfb1dddf31c22144a595bb951faccf4a3d010001	\\x3ea5c816a6efb62db2ee9a3521e61bb50a6243bbb8a5a9ffd6831f9280817edb860d2892d7b587207bf9e3938e7c490cf8ec39ae0c38e281d6360d23784fd90b	1655143390000000	1655748190000000	1718820190000000	1813428190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-158	\\x6eb1a3de7c191af210415259ccdddd4d65c0e4c8ed8e2c66ef80b3c6a0b5e1b758f2b90245881e32fb4f53b7b01cfc51c6e5520ba30013a74b325c853c4fef1d	1	0	\\x000000010000000000800003b84bd60cd5a846ebd0ee5549df468839cd086f022212a20c20bfaaaa6c5ce3ed4c806e028779b27863f7c9a5830826d71f3e048461f433fef321a72d1f1c85bce77efe59956c67df7298d1ef055e32d7dd77c6a0c4f5a1013afd533518a47da8e5c8f817378d73e8acf9fda029e914dd701a97ff1a98b6bad8e0b3fdfa31e091010001	\\x373e84492b87f68a1977c3bee6eecaa16c0cb1983c5ec4c34976f5e83d8e6af84d6fcc6eb6772116bff084a44aea08a376f00c357b82a23dac2011faeab9db06	1680532390000000	1681137190000000	1744209190000000	1838817190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-159	\\x6ed95bf5f84a72c23833d6dd9608bed181e9ee8aa9aa137fd16ef90979d7b94dab6b3bb4459fc08e1e9e8a555de60ad6089b719f846558cdb722946459a21af4	1	0	\\x000000010000000000800003bac24394d0c9f1503449bb50dab05430b9dc80d139b7f5332a2ce1e8bac675eeb9effcad4002192096693b66e19b5d745682ec1d354a6b8f0ae1292e7f671cc039700fa110527ee3d0b825bbe20edb3f42c0345c89d3970f9f28bf43462b18a72f3868119c9034eb216f6be06a00cfdfb7364d93c5c4dbe0a45ea062056e13ed010001	\\xb244b254939998064ac2549ed552e8be4d16d9979f69eeb635c182638025898d28cdfa9c87e62c255ee0e76e3f57869e8cd1114fb3186e7a41472bf2a7237607	1676300890000000	1676905690000000	1739977690000000	1834585690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-160	\\x6f3da2446085b5c23c4c6c4854b65ec61318d4e4371496d94b57688f36323bfeb60c09f4c6da4fc65fc8cfe30de5197ad5d5299d70de131601e4f51157d14c08	1	0	\\x000000010000000000800003ce85679764d5d74e86624676804f5c3bf8cb5508fa7c4839be5c259cc8374cf1b518940545a1810e7ab663a309e2173580ca75d914d0e116394540b9d3cad7bed494268966ebdfc21cf9a582974ce6820533fd908b9ccb2d8bdd10c80f639c88a28e149e87b20997c3ca9652c297f7efd7d5d17d21688b524adfce41e61f4fe9010001	\\xeb64145cd3c79f5cfac072328db8a4c10a1a150dac53ef3d5d858960c5e548801a873e4c42747694b5c0c9ef213fd6a32f0137764427b1ee58391079a4924f02	1670860390000000	1671465190000000	1734537190000000	1829145190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-161	\\x7361f7ad77237ee7900b2c21fd3aaf6f7a505a48c6cd57770fb69579d2208a526108fcdb2367f8f03d23c62c494bcb38a440cb27fae5ba62074c75541e60b1ce	1	0	\\x000000010000000000800003e4b1a1e4923ac2f318ae321f3a651730fdca9505103974431ccc7f6a205f733353d3fd92459fe5f6e4de1b72bc79c689fc154065b3371f3a5f215e4a98ad0840764094a188d206a60ec941606a808ea417e0277c618726573369092de7160a38d1a5f2fa2b146aad780eb78914c7a079e7ee1439f8d1a35ea036ae6815dec15d010001	\\xfb8489dd6369f4c1cbc7866b774fd0b742abb4dd96d1c85470b0a59618896c9c76c1a2393ee39e6b9fc9cf3102f23865b4ba4546da7112c66bc1d10d9f774d00	1653329890000000	1653934690000000	1717006690000000	1811614690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-162	\\x74cd75482418128da48bfb5cf58eb8b8394c9abb29d45229d5bee859844b146f732926f5d3ddd7ad08f940d049381a001570601e4cd2eb7f47e3ae9b8684d78c	1	0	\\x000000010000000000800003ab44e3d160cb2f39a145f9cf5b4a7b67ff7e3e3ebb5531ab47086f5c651a839f83491674b14017cf8fa3bbfceadd2354a8e2f16ea7d4e9aebeb65c3a46d540f5d12bc00dbd43313e25fe8940b94d9c6ba81ed7ff13845028964bc4b7545470e2a015bc9b82c040be34ed7bc320d32ffd07d5ca02f975dc96f8296d5db04033bb010001	\\x7bf1f8a2b4a1cf74649e1f24796bb8d5fc286eb94c7c9559e04e81db8810b1c906dcc024e8edcf92f9cbe0a3cadfeaa1f5fb99cfdefa3564c1fa04027c9bff0c	1675091890000000	1675696690000000	1738768690000000	1833376690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-163	\\x7919570a5829dc8706b93188d639c871d7daa5f0adc0cfedad7eada9eb2fdfffb18902eff6d2c23a6c7634fdee77e0c3aeabffa4e9ac50521a0030a2e5705b39	1	0	\\x000000010000000000800003d4384d52762ac9a7c3b047825a92be76f3abdfe9daaf75414db1d3c7be77a0498c36e798eaf74d3da75118082b192053bd32c2684c9d9673884e10a738dab012a19b44f68387bf1a3216b33dbd9dd4f758fd4a8222be1ed4bba5a9e335e75491d2fa596f99ac230a89d6afaff48121f6c758fe2294daa8f6c0ea036b0e1e4111010001	\\x45fb039d2996d8543aac3234e2d19a4d7dceca353ae71ba8d0019eccaf79b48cf55e5d167847029fed091f6a505fccc64691d476392558818387defb54f7ed0d	1675091890000000	1675696690000000	1738768690000000	1833376690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-164	\\x7b1d03ccc9cf362e9602e5a4bbdd7cb4f31e0cdb68bccf52f29347d6cf6213af99eb2c5a86dce2c01004a7c600f317f41fcf7fa639c5c66f48f321871e538f29	1	0	\\x000000010000000000800003c8aa2ec4faa0061460c70cc2041ee57a4a1032886884eec66f346c0a97413753d89c6fc3f0cda290a31bd29698410e4ae992e897d044c930c1c5006317bc4330075433437c384c8bdf87c07eab5a33620f07fd2fa9773ea2995d6910308d367f4b1ce0ea772a0073210a384cede2af31cc14f67842f57ce8a5f46d77211febf3010001	\\xd0bf79299ff8f83959bd8abae3171cdcc303be20ce253cf573badbe97d74f83c6a012cf44979994b85f7559465a31b229212a588f62c68ee5c123039a3c1b10f	1659979390000000	1660584190000000	1723656190000000	1818264190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-165	\\x7b8dec626935fd3e8eb509f3cf613b6c4eb0af168b0275e286d23c1e804e07c66c59f1be4d77914950ebbe53b52ec67e9a7ef72892b2c8d18ae314fcc86663be	1	0	\\x000000010000000000800003ce7ecb7d2efd629c1331783fa547746006aa2ebc784373d3c693345db60baa0251d8ac44bd89ccfaf3e72d234e10ed62eb1f9096d2a04caceea7ea3f36b09b1fc5aba603e494a46d8464781143d3be2de7c79a881e1ce0470ea806e9071d1dac59c406f59c3e0cfd51a6aef34fd8dfb683abbcc069b84402f03cf643a397aa1b010001	\\x43b7802128d58ec63e7947681223de83172e7aadfac4597200249c2fefe8c5c2633e92ddf7f8b919f32ca59b51173162a6bcb738967785cf943396ab76aa1906	1665419890000000	1666024690000000	1729096690000000	1823704690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-166	\\x7cad359dc2abe2d27cc35ff8e6fedb725daea684f8029460412f2e7791a6e5e2cce6935ceb3d63cd399d7cfd60016f43328ef0e6c2cc27f0754f871469da5966	1	0	\\x000000010000000000800003e91bde5e5376459c212d5c9554363f05df76b6ee94237de1a4289aec35c875bf4a2852f7cfbdad980f2faa65ddb57ec27be25f78e1738471a460da90905479d6545f6a750482f1dc8d65ec725c15a57166e87146f9aa505d2b4444b21ce51129f993a8227139ee8e9c97330a38ed00688aa443b498e48b0e53d7ac6ac543ebbb010001	\\xc71b7f68e4f009b612d273933b1d59d9c5571427548094e7a5289fe85d0c40feaa15626c02532dd1467740c9cde6c971de1b333ade99b78c5f7b738eab1fbb06	1663001890000000	1663606690000000	1726678690000000	1821286690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-167	\\x7ead6592a6a4bc22958e180d3433533e62df75c7bbc750887a48f1c507f47536ad883ba79eff262b775ce2ac1920310cf293d688861326a0e518e6eb1b876a19	1	0	\\x000000010000000000800003bf6e22b372cdb05031fcd489e8bbbed857e054e23156419a06922064aaaa6352f4d38556beb2af1a12678f827a67ee0d9017847409cb28170cf921479d699f9de033890b7318b2e3d4c3873d799e89ba0d89fe6796614dba4d515e13fd107a5c28c1c576a68fb5b8a23976975fdc6d6935e9bbb83c6e29945ac1a8eb3aa657cf010001	\\x3edc806b30efa36caedccd245afb7941c712c109ef4d5ccd924b0cde2893ba5535a6015992bceeb88f93860b7417c86e8afffa7f945aa6fb87951e09c0d34305	1666024390000000	1666629190000000	1729701190000000	1824309190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-168	\\x7ff9a221f3233649876a9f028fcb3578c111449e8e4a45499e741daa8a6328a6d02d7788f5d04d81ff095aa7b2a3bc1427d3ac32b74ded595c726ed114fa5460	1	0	\\x000000010000000000800003e5dcd0a4bfec9eb4289016c836e1d77679eeb70056363b4b9e056db5a14c9526cdb744d75e7eb21aafcc21b079621383cbe8fd9d811529206f0f51f7f5239ea7b510efc7cdc51c1c0c68ea150723847cc0912a85996b395a6e5cd92b8e2718c32fd5635c1ba60b8606ba1c93be0275fe892961db244543796c0e8b118dfd277d010001	\\x7cafd2e86923ffdaceb08aab023342f1e57593638d19a1932c3c478a88cff5d94297eb63fac3d09f9036acafc8c71dc7f8a06f19d5f845a24da291fcd8a86f07	1658770390000000	1659375190000000	1722447190000000	1817055190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-169	\\x80b52e0c17b6e9e7afee59d42861868b7da94cb6d296ec4bd83b904a4322e65a3c06a302641472dec9a748a524f72556086da30e988cbf71480c616b6bcf365b	1	0	\\x000000010000000000800003a9ab52ba6babd88f5aad42b46d78a7d66a5217143e095fa163780e95611322d89a11713f17cf7b5cc5e430a3f1d4863d4d47497e27389739a1ad9af063c974e07210aad7eef3939c1e2c73748b9a9581161ff2639253bbbd1d1b1877ebdce4e0e276053a13a7f8d42faeec8f10cfe05e81a4b56d4d264e99e72a43f6c92346bb010001	\\x6286fcd25e378858c1407aad840d039cdaab7d2b542e4a408d9a779556f84c8088fefb02312511ca41a68dda7c7f3f91c5b173789d71b21d5f93d9226125b30c	1679323390000000	1679928190000000	1743000190000000	1837608190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-170	\\x8025fc8a1f3e7fa7d0032fc6145c7d69dbe283dc8fbcbf3d74b4ef0c4af61107f565cafc052567afd17485f679c49d774dd6a93b357a1fcc723ffd5f51b9fa88	1	0	\\x000000010000000000800003ce40d8bea51a63cc9834f85aa6d40c1905507d829fbb53f5eb76f2069ad28e93d625a300799d43adb56af62804b3fe0309dddb2f31f811abe06fdfc4071fd75c6a4cbc747dba351289a45e6cbd60c540f05eff656475683cb338e59566f6c063cbcd931891abbc544de6773fef7bfc29d472a9d76c17e2b20c33de3ca12bf381010001	\\x6da06584b8e1a98a85c005774a3ea55ad167a005477bd940347c23f6a3e71af7146dcdd4d5be30add3e97cadcf2c381eb78c9753832a8c45bb66fb7570ddd203	1682950390000000	1683555190000000	1746627190000000	1841235190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-171	\\x830d712af43417276b9b0fb079941f644482bc3de4dbc632ba5300b1b9049905cdcf1f6c8dfefd60d9874da9aac0071252a91953201e02e5438a476347b77c3d	1	0	\\x000000010000000000800003ae3a2bc52a38a51d6abce41aa82c1b7ea4830abcb21b9ccaa008fa11fbd6954a75f6120c9d47fa5b53da85773eb2dc29f4fbdf68a55133d2dd38fa4eeee59249ee993fa2b1d0196debe43ae449896700b55266e61d0160869618c2c9c878621d0835d43e6e666ece0612786bb6daeb6422b8db99937c4a30ab71d5080b4b8b8b010001	\\x42331c12921b09cd870c518dff05cc7ea341b296ec28f5d1eb810f87d5ef3e407945c3bf1c8af7337efba6b8c77df50cab6c6482906734f4d84e169fd5492f02	1671464890000000	1672069690000000	1735141690000000	1829749690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-172	\\x8655445d2fd6eac3e5d347f315b2a3787fcd681c909cbcce50a34e3c676b1146e64bef619c6e4d0bf95332fd4fb8710d48b695ca4106943ccb67bae6dc622e5d	1	0	\\x000000010000000000800003a1987f033883da2a3146ba189c03b8bf54fcd2a2cf68fc8d36db4e4a92f3ab4906d549eaa3237d7dced6ad48efaaa2d170612c4cdd287305fc0738beec30cc2aa9c4b51b8f85a6d83cdee3966680da50f6a76406f33eeb680bea62666ac69a3e8f112a0a576ee0469ccc8f58ebb724ddf42d9d2ba680c81e6af0170417875885010001	\\xfdf6274fd702dcfcdce52e41ded2cc691c67db4e3b45bdae807a40764142de3c43338c646a83fa10eb44edf506c894636e4c66f042ba3e6280b928c47fa2780b	1670255890000000	1670860690000000	1733932690000000	1828540690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-173	\\x8a81d42582f302023c5ca32f7bc8864ca682c96daca7d1efca4913a76e231818b41326f7d9419427a2c33d704c07ef18db485897a790063ff580632c9f0cd840	1	0	\\x000000010000000000800003baa638a5a9a7fb313fe601f416115a40bd080e3d3188e715894102d125c39a8c257ad1f98dd66ada10ac5dbaeb2300812f29f7830580559af604e27d9d520ef0e9244d97b584481d4f14a7c057b6ffae073f9aa3877a470303bffb98912e809b323a0d0779a3f906eda4abdead466d9516ae6f165208a5c523da2f184750c79d010001	\\x0b991ffa48d7ca5b548f7808fee12a1cf4917f82bb9d496f24266b0703fc7b98d14de7c4ab1a1c94230398b23ba720978d666789ad8f4b4841e0eff1006fc002	1681136890000000	1681741690000000	1744813690000000	1839421690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-174	\\x8c69618275c73c0512ca844e308b24c9d7130a884b96a5d13da5100f44c70904109dbaf16a4a6ecaaa42c0fbd343751ae31d767b02758b65da0bbf19bb3cca34	1	0	\\x000000010000000000800003bbf793bd7b8d6cc658a01551c525ab7acc0daae405f011b4b6e5a47e606e117b65320a04553816b0a667f77b74b04958406e011382c7e36578aef72f22ad9f2df3e3285d453f51f57a4685da47dc096625e94dfc22d5f91041f82fe8aaf8e3925512d1e808a05bdf9a06ae9af43b48ebe9821795f940e3a61a7645ede1810221010001	\\x65633b09dd5f0123b86b234d9d1ce4c7545a975ca5ae70f3051212adbfac9c868d5fba99facf93df8b229c621ae4d11540a5797c92dbee77510e1c8de742aa0a	1678718890000000	1679323690000000	1742395690000000	1837003690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-175	\\x8d85512fc573ebf8430167f74a29756d6aa50379d587336f439a7e42e3b361646e72eec485116952dc6b0391093bb06c76a7ce4b5f57cf77275fb25b804022ad	1	0	\\x000000010000000000800003be5ba18f9bab90b6ffb71a74bde12da2aa7ce5f8d1b5ef17276bdbbdd3b8fabdafbcf2435338aa480ab0d245c310f0eff9f11685dcd3112b0f74d3e91b2e3efc711931e780ed2b41acd60470c01f262d2571b038b1fba199d0edba4e639a241526d7b81772e8bfc1706a581278e186bcd539b9651039656fe51f9e5c8a9d3a89010001	\\xb40de38782efdf6754eb767590e97066a371c8d9a436d8cecda829963c23712bb2c5eeb2f8eb86c94ce4a79e5848423115f5c18a4e529cde20673c207693c409	1676905390000000	1677510190000000	1740582190000000	1835190190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-176	\\x8e69f5822a980c2eb392f3a6a47baf16751fabafc250daac131954a4b680948296836988e24be00c0ebbe6d47687a426f39e0c68c9bc4eb51a6658ddafe0cfef	1	0	\\x000000010000000000800003bb5bc5cc959f0935d32060e09d5e8937ea72f7badfbea9a20340e764b2f3fa2fc0db7d238d4eb042a01444682599d454e9fc0d3179263ced391fcf2ce4f7a318a03be77e0fde62061eb0d77bcc34e621217bca30757354c3dc32a7af126ae83b5652b85781d2b4e85c681cb434b41bdcadbb60c47df47bda473b90af7c27e405010001	\\xe2e65e21c5a65788e37722990dc8069b631c69098209381727fb239b7f1af170fb0773d81ca6b0ea02961c5c0e273028bed17efb4d164ccb01b5a3d8e54baa07	1659374890000000	1659979690000000	1723051690000000	1817659690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-177	\\x93ed89598f9478486be48a30401bba668996651581bbacbbf3970de39d77144290690492bbda6b25a2178bc93208418baa5b051e02a118a15c0beb9c491d8294	1	0	\\x000000010000000000800003c08a461763c608300610f05131944945ab95ab44939123ac057b9af8f4261127cb4e9439b9f044ecf4a651e7505dd83dd052df1b19b428de177cb50bdacc81f12d8859ab41803348340520dedebc7179d08cf8528ffb5305dc69079cb0037cc90a58c5d6463fb4171db28daf91ad5bd052d42123721bce8048d84056040b599f010001	\\x6ca9f075a9659f4cf99164fdaabdd35c02c854905e820013b3b78e40f5d6940820f2143e7605935d25f6988836a1ca33cb6bee537dbadffcf93ae12261a63a0d	1665419890000000	1666024690000000	1729096690000000	1823704690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-178	\\x96210d046d3c1cc8024813a9b60311b99fbd7166b37c9d6bf9c4377b88ae34e7cecf5903a19964260df9427d7d4e18899aaeea4e709116a150ecb3cb8a878325	1	0	\\x000000010000000000800003a9fd7a2879c5a22ddfdbfc50758b47b4191135195d9438bfd4f8abed9d216de71fb0bd74ff8c2ddee934bfbb7d3086c2d21f5eb87e79af8620125137bf6bb7572e941abe17a45a4acb93d3dfbfb6703fcf6ee179411dffd5fb856f92ad83f8db697a84cad2e0f5995dad76883e6bea34329a402eac5b5996cd65acb3b58f4b8d010001	\\x12333046364f71fc225fa4ba7d93578163ed6bbdd7776965837991695ab584c7e6129e5a0652174535473fd2e6c07c3d45e3e048770cb8a1671216d8f5c87909	1680532390000000	1681137190000000	1744209190000000	1838817190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-179	\\x9bbd84ed51955db2b91d278bd762116f294a7dfd6cb9f3de4911632d73618d7c495a1c1c4d9ede948cbe203bbee93031bbf602f26e82e3d54b61da818f59965c	1	0	\\x000000010000000000800003ce6a4f62e71c998c04906213f89741ad21c62275f7fe055668d5bef4ef77ccee4cec6d8fabeaf58429850068189968619b61c5c6801f0d67f13e05af5087aded6ccae7855435f3f8f3b5c455c23198c72a2111022c66754913237c05d7b3c865ce7283b500f68d751666f04db6482085e65e7b23be2a220e4b86f368cf421597010001	\\xe239d1208a484baa7fb5467844f3d2e551189e0fa6aa0961098ebbd3231b6a7d77b49a266f67406eaa6321d5d6a9bd0464212aa1a1657bd25a2ce2cc0fc4b70d	1675091890000000	1675696690000000	1738768690000000	1833376690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-180	\\xa3b5ea0030b7a2fbad63c9cd1831baa34abf5acee8cee93081d7913fbebc5df1f2704395bc5c02e21e89a225fd30a142925675d71ab23abcf4a5254c09e2ef92	1	0	\\x000000010000000000800003e70060917ef227fabbc8bcb73eb6e697b51563df7e891a770b9d0e04d30a1fb989d8f36e8c7f5d793a9c4833a14c660c9171b03a96d88f99f646b61a1bd7d07ad0592793fe61a9c6b33fc0913ab3ce5b8f19f6653b73f7ee956b480f349b54973d0aee9c4bcd8c8468afa4266bece42186b030ee564e653867dd33206b5451db010001	\\x6f719f784ea6de2e3955225de7adadbf6310fb4ca4d418642a73715764bbc02996e6ebd52ab55eb429591a9b42d455451db8ed0f96937d531b05b46f0a63db0a	1652725390000000	1653330190000000	1716402190000000	1811010190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-181	\\xa6b9a487e842b4dd1cf6fd254fe5f5cac7835a8a12e17c577fba00133468b04926294e371efaa7fa70fcedad84d704197f721ec758742681355693ab55d137b7	1	0	\\x000000010000000000800003cf3d6a956a6f90de6aa7ad7825320ca11c0c44e3ae2bbefb23cdf35de336b5d134fe40f43db1dac2b4843b236505a90c5d837a2ab617ba6b6d78e926955fbfff26b90fff21d976bc50d70471cc246acd5c38506db046e5a052b03e2590eb59d539334b4b3feddcbedd664907c920a9001abf20f74fb4b225efe41cf066ceb8b3010001	\\x9685cba9a89ff4a103583f693a2dba030ba3fa1d7926885fd155180254f7d913f0b4d332164b6f2f1fb3a9ede779ff452774cc146011765e37422bbf39393a0d	1653934390000000	1654539190000000	1717611190000000	1812219190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-182	\\xa8a51ac2e06b710580ecb2016bda2edfb1668e919476881389b6bb58b6298b453fe00f1f63c9365622f5e06a53950cdcb59afe767c985bd37f9c34f36510be40	1	0	\\x000000010000000000800003a414e310d526b30b361b80d29f2aabb9a967ba6ab1ff21dc91ea165a9441bdf982eeefc99353abaa1642d90f9d271bc09fa0f96a1b0983c1ae74c9668c4368857748779050f464e3149e47ef7a8ed0145221e146894c000ae04048a35d129685c0a18c999d6eaeb860503e0336e0a385563c4b4715f49eeedda6833f857f8ec5010001	\\x72766ff16124166144b92bc9cc266e53c6426f380e108457d4af2f1cf3da007ba104a589e49811e7f25e36c3047c8fbdde163156eb2e8e4e428b8b62ed526e0a	1670255890000000	1670860690000000	1733932690000000	1828540690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-183	\\xa899aca356b77f98c819dea99114d256f3034b28a88c83037a6778033343ba30225976df82e33e925d361078859aeaa77906be7e99db3cb2ee29ced1b2f49661	1	0	\\x000000010000000000800003cf1dc61d0cb27dacbdae5f46ebc681900ca3c5f6db2fb4aec5cd8161c291015928c97834c821292dae9321eab08f0640dcefe86812b345177d4c0b584d34ab2cd3368012b85e14d4704e47c35f2125fc7c800b9059d1f695200df1cf5c3654991a01e3402960ac31714a9ba8c3f3a052087c5e416edf1183218a64a887768e47010001	\\x8b2b6ac57cded09a33fcd3e361486169a218033505dafee49cf5217123eb82edd5624ef3bebdb5e3c374339acee4d6412aa490628325516232ea126917b87603	1653329890000000	1653934690000000	1717006690000000	1811614690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-184	\\xac519b84c0f0dacb27724936a30ef7f087031519923ac6a37a66e3cca6cec13a3457a3b19375bc3cad91ee520f453c358ea8fcf008767387739fb6e24a28e3e3	1	0	\\x000000010000000000800003da5c81d4444aafb84be9dfdc7d6804bd16e5cae54700a17a24ae934914a6bec92303424f183a00e5ce3162249a17ca2e78e6d4f9cf26b6e1b0b5d63b1e533b50ffbcfd4cfa31cae83aac2ebc4360505ab44546627fc5c64ab013500cbbbeb3bc50cd1268cc6d3bbf2c308bbf02803171b7bc17598bc4c9c9f5dc919436f76553010001	\\xcf2f0118983000c16eaa9b7e125c1db11b4bdd701a1b370b924a237d2a3a5b42a16ebf4fd4779830b02a046e86fb40577c0e12dd27ceacc5e9990a597fcb4905	1673278390000000	1673883190000000	1736955190000000	1831563190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-185	\\xad31e829ab44a9fbfa844025af5f0aca40efd3df74586446a1e575e6243bf04c4fadbb0f614325744ddf144bbdc23861213f3f12d35c0a24d60a75b126841749	1	0	\\x000000010000000000800003ec1212a45e95360c4ea5eafa6b404909be79e69490306cde18f0779ce6ec3ef27fc24d013ccc9f05701f093225b5adcd5b27d1c3039a3d34962df4446737922b058cae83c455d6964789c95c128ef9843e6c15204f3e4ceeb7b1d8ee1a171a40677264db6a9aada1c03005114a6a4423f6d2b05e7aa74ba9fd77a4b000a68fb1010001	\\x66bd7a34fbaa61db40c94e95d7fbff0edd926910a095bafe805be328151c51024db6a0b434192599066e860b843d99a1d0330cfca375d80faa32cf7a1177980e	1656352390000000	1656957190000000	1720029190000000	1814637190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-186	\\xadfd8ff7cbb955c4172b531f64a4d7bd342f762eccda820158ff1e2ced4898aab13162f5ef166ddb1c2d29344d2aa503a3ba46e4f1d0de6a186e2d072c6b1a03	1	0	\\x000000010000000000800003ba133ad78883068dc67ea2cb4b6fde00b56f4525602c3d99207690a19a2d917e574bc996a2e1aeccb0231820fa6864e60c25d6463135f4849db57e290e453e5a987d325bfa76cbc56a5499f8bb73e8376196175c36a09182236438e7bc4d6ce7a6e9143269a348924b6bac08e9c48ff567ec49a7b8704a405a476955ca4edbd7010001	\\x37daa68f2071b09a387cf5907961c1681008ee543c6c8baaf61e0c0da2f94915b69515b04547c9b9ca9679bb3fad0780f7ba39e6bfa28d037e5b5467bf014b04	1661188390000000	1661793190000000	1724865190000000	1819473190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-187	\\xad1daf8e7a4d4f7b61264b9456b0668626601d2a6f9c55a4e393c6ec9824682a90299178a608c42967de21b5e38f0f28b6353acc2c2a00ec9465de1bc0eefb83	1	0	\\x000000010000000000800003b7d13b6c38dbcac80d99f1b11f19e1808720f177380d4427232c66d2451d783d0f0861dad2ed62e1e5c3dd7d79536fcaf84ce55cc92f119cab7b75ac5ed6142551c97105b608869fe3beab51795ae2917ae936e426912db4a803439d103c096f439cda22da2859ab99b2816a12168208a595ae235224e6fe0692712ac2b9fadf010001	\\xdd02c826fce08ff82b70e38e6280fac56a75c8c342c8229aeded23e133dbdc62711015f2de1f3ef3931c51de5793d5954d59764f4285a4013e8d9cad2031c30e	1660583890000000	1661188690000000	1724260690000000	1818868690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-188	\\xb765fe0767eacadfeb44fee53031f641d30ca830ecfbd46386b2fdc1803ddc37d490b3e54ab9a3ece336a363a6f3f3ca39c0409de496f1ec74364a1b1338bb24	1	0	\\x000000010000000000800003b76441472fb97aad6806966fcf22cc61a19520cb16810480acd22c100166047436af3503364ab6da473a2d5d06a4453dc23024be8affdb1625b7faf6e9654a6b5a0c0382284e2f31f7dd12f337072310c56bc2693496b8747544858d97d2c3fa31cf5cc2a4dc8c8a95485d62f00a1d60a915185fa90f5bfd1cb4f258ce941f1d010001	\\xdc856df6a3e7a8ab111189208b202e851b93a843648ac76d16fee209e7914020aae3bee118767b215f27d82ac8eb0d8207503ec3d3d19eb06af65b2b1a0b9c00	1669651390000000	1670256190000000	1733328190000000	1827936190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-189	\\xba25976233a477effa17e4c42c5d60db801a3dd03639f4ee9cf89a8dcad44c5e63b0302389800e7f65b6fdccadb8dd55e4bb270b0467cb2bb65d507d3f2a004d	1	0	\\x000000010000000000800003e06db897c5712fce1b591818ed8d696898b0b33390170aa50823bd06470dee1451885084da8e6cdddb35d62bde860f7cbf76bb25335963aa20ce4c4598aed801e6f2849ffb7693abfb1926655fd480c94746f99a5fd8f9802e7a166f53bd9bf0cab51a660e2f99c6a5df89985047932575cfd7e80217f77840e9389c52cf19c5010001	\\xf40a9230b86c3131f6df8c046bba5b49dd44c999d8c92376eaca36d3392f5f5b947927b35f640e514ca8867c22d9da7f05aa775680e7af82d2ae1916e935e102	1661188390000000	1661793190000000	1724865190000000	1819473190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-190	\\xbfc965b6ef6d21a53c0993d7dcfb61a794b0304fbbf4309307b2e54f441b190ba0c8591d407cac9cdec351f34549da169e95729296ac37cb3193fbfe0d9725c6	1	0	\\x000000010000000000800003ccadd0d9f636b405ab52b6edacca2c0a81f80081c9c74afb205a9c2a22a437b3d0b8271280b64f6472839bfb4991a8f1d3532f1bb9dac5f9c1868f3fae274c970c0720e812e8540f09034ba1e6c135cda65468f96a9cbcf46ddb3ab5cc465347549a5dc3adee143430bbecb5c6f62901d96fdad51646d1d5a21a27140f2f1a27010001	\\x7b9021c53efa26b7d2be3d13e14e8b35707e531451aa09d2fa1c8094d2144ca2c47728095f6443c96a48d40cd69a6ed98d1b195f243029005deb2f63422efd0f	1680532390000000	1681137190000000	1744209190000000	1838817190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-191	\\xc5cd07c4ac756cf075b582f7faa1563ff82cdf293ae0795ce7f1011b0dbc8d90723b517a658132a932a13c657a6685d272400f213d3d80a40bdbd97b001b90bb	1	0	\\x000000010000000000800003952541abc0435a86d1b0f1e8403d25627f38b86473bcb0c4f04612b5f7b03a9d5a9a33ce8982150ee16122ef95e8a739ec98639d0c2d15c45d7ef58d016f86fdeb8944cd8e3bdb34ce30ce687b4c48c8b70defa1dbaa3a8a74f334fdd5e0c49cb6adcb9522bf0bceba48ba62626f57a2f2f7ade3dada0b2197181a2c0d3689e3010001	\\x27b07189358639e5416762490d14e8c56a544effe8738dd07e0605464581e91e496f56ee59b62d2823b5ec7039464cc635f45f690add1fc37195c94332d93f0c	1674487390000000	1675092190000000	1738164190000000	1832772190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-192	\\xc95903c744b7c2fb300964903d66d7839758e61cbc99a4cadd909a5868230c5f49a91b486e8ed90fc181ce33d1966fe9bffe9c45f0e365a4a8bb7b89c1a05396	1	0	\\x000000010000000000800003cc06e614a3deadb7e37423c5258447d51fa8918b5e6544dfec251e6aec3f7572601188566d756b10b1d34b41bf3ec0d8ba0cf86a6b38e1a514601c2a7b2177da2991ca3d98280db7fc48a39c4087899206bbe502c483eed5768231abb28ff825eb67d68c12a82a75d9a9de534a3bc062221f5bf70c18b7e35b4d60145e972437010001	\\x2b8ff6bbd3a6773803481ea77ba8fd3072f9101a5e56e9414df7be3128b1b583455df6c9c880cdb2959cb4ddcab54bd01073e8a90d86bb8101f71853f3696405	1672069390000000	1672674190000000	1735746190000000	1830354190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-193	\\xcb817e50ead0ae3557bb7d58f984b0961a0773f5798dd1acc96915f6e9ba7fb4b806ee81158542c8376031965e55ee33842f9be3f061fc47a3bbc9cbf9177ee2	1	0	\\x000000010000000000800003a2f521316fec42639c40a3e96ed717e3e1178cbac333c0ccee474df095c0f25fdf43afae8834e85622bebe01da790827b85efc795dc045e9c07b8a21fc25a289cb1b57e9ee54ef76cceae0ea237577ec45cfad4a30ce62e30fe8b8a604ad7a61f67f221ea8781e43bb7f5dcc87c0a8496732a62bc53b004340b657a168750c49010001	\\x1e2fe0b983e05ad7740e92d44d6c4ad71a8d8c35263507c3a7acffdc4724b4857fef961e0b84e7c301557f75a981c335b2e52eb35f0b67128ffe1979feac7905	1664815390000000	1665420190000000	1728492190000000	1823100190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-194	\\xd0410f681aced873fb5454ffa718658017586ee558bfeff60e3f06da4d85ec073a403440c9fae44a2fa24ba69b0dcb508629e100812dbc555479941a44e95f15	1	0	\\x000000010000000000800003b7bbff6a10c9c29d95bc214a7ae19883beac3a4281b95ad9c4ab3fdd7b80faa6aa5b799b87987fc60e0ffc3f4c0357cfa689a96d3527b83b3f6f62571849ec3f6a7e5b3880f0fd1fc763f5e3f4820ce789a056ed648e281e201c5985f3ed8c6f2eb69844f8d361cd5596b00a13b6a6ab1c3fe658febec77e9883f37eff03edf3010001	\\x0b262444bb9e54f693027f8b99059f60606f74c0b9192a5162596c5b25a8053491494a88f126955e563a16e1009a4ecaeaa55cc676691d1db141f74ea96d4b01	1672673890000000	1673278690000000	1736350690000000	1830958690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-195	\\xd7edaf9eb2bc42a46295ca4dc288361123c27a67cf55724394489f0e80a898c3ea96aae9cccf033c42ba89ce33106605398b541f95aaefbd8a2e504df1fadbb9	1	0	\\x000000010000000000800003b58d07921b683bade8fa3cd6fd024a24829871c7f2ebe215e82ebb2719fe3b1fcd207dc3a77e9fae64fddd7b579df7ed199a08777d2ebf65665fedaa40e42619a26f91841635a42d4b7d7ddf44a37ae1237523babf82c7f269b3e2bb5bef37c6b31e3bad0d535b50423e033e1463c765301db0c5af77f281e9442df61307836d010001	\\x17d16aae8d7fd107964d59b90a05f1f1f454a6dfddfd92d3787e07d8dd273467824babe205485da74daafa00e37a459231f627ab49a0c357b3e2557bdfc7180a	1673278390000000	1673883190000000	1736955190000000	1831563190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-196	\\xdae119d876f120973b799d8e4190d3e7867f7337f3c5eb54db5d79b819827f15bcd21978b946df7c0f761274e66e3547257985980cbbdb7696344bbd05c1c0ee	1	0	\\x000000010000000000800003ade20cadd680aa55dd391937c91a0eeb7b8f8ab4e194bf08afa02b89512636fcdb6732dad5e963e79946ff87b1260dcd388e8cb33f5a527666026812e007e4d15550bc6381e8142b91567733625a917984db61bab92367c02e2a6bfd87f782c302a2cf73a745a635ceb38f17379a70b84ce2a917998b3b3a2aba9257176d2bd7010001	\\x9af3198a7a615149b63d5770df192f0d44704b58ec39091e15c7cf2f1fddf0ab3572cb4fa2665591f8859f3b090082ebf1508f9fd9bfccccf3faa0539732d501	1673882890000000	1674487690000000	1737559690000000	1832167690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-197	\\xda410d45bb8951ff2d82d6456b618d081f2e9ab6b58c36eaee16f7ccb5ad78ac6afb3cf8fd12e644b8ca80ee50a42c408fa2dcea44544de1e89630d70784234d	1	0	\\x000000010000000000800003cc2223b458fdad18eb1a858ba83347c7db928a8f8cea068dfbb9668fc441999bd1c6918a69453eda332a625977360d18acae04fec95fd615af8f968919babf2ee687db7b43e912491b7be07046cc7dbf780a4ac61d6a6fa48711a0dc5be54f7e0f3ae2233e949c323b1e2844db00f78354ed855ff6ff052ed30f0d3ae0e6930d010001	\\x221e94022e31ede4018f198727c75e5d2878ad65f4d5a9f5a90986c8a2d939633867c59553349b2fcf99e49d832ae839aa1f438c1714550807db98000d310e0c	1660583890000000	1661188690000000	1724260690000000	1818868690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-198	\\xda51c4364790694f93b7663048003fdf5c531726b6932222e1b380dec55b31d64b3fffcbdaca7b674b43929adc4731830de4a550df0c8a26e752f42791c482e2	1	0	\\x000000010000000000800003c9fee95d9b89b073bbd83ea7b5bd0625736436173204e0ff8de35e4900afd9bb39666338bf861c0cf4c67eb8e7e61e231cfbe8c03e6c1c3ca028b7dcec2787b8e7e69eca1cf17d44af05bee20e49f01b95061e73adedc29a6d36e66ffb8a946165e30c4da7777e78832a6fbb2c1053c4f1012339c366b6eb99b14c76fd746ee5010001	\\x17e33f13d0883a8341576e45d775db31df457899db7e4747eb3de292552afab16b05c68d548cb258b16999cb2dd27284e9f14fddbe1bb16b03628f9a2bdfb001	1675091890000000	1675696690000000	1738768690000000	1833376690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-199	\\xde71cd9c75a360cd3e197d21829dbb8974646408472296892edf90230462606c1de928a6731c7b51fa459de3e5ef7d2ed3026ac4ce266796ab45508431359da0	1	0	\\x000000010000000000800003b0ea5b93c8df8e9ef9739cdeefeee2407f7f66c7868d28804735351bd422a343667a13b066e1c035e45919d3f53858fe8c405320d8f0a308243b999d8c6ee9bf9b5bcdd62b27b1533b5515777f92181bc7ed814baba06fea81956b291ba11bcef3d296b1913a02044922048f718372bb9b18973da3f91d5b53da8f30df53f1ab010001	\\x77eb45c2d2ca47567935f763dd24b23ff8ccc7aeb1486c9eb370e93ae33a3b195d7994d157c22374188f1844b403741f3abccab131e28cfef9b8a8af86e29d0e	1664210890000000	1664815690000000	1727887690000000	1822495690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-200	\\xe91171dd9b69841dd15d938352255152ef10e83aab39b73a8c339cb3addd7ac9a3b829735e95c5ae072ecf313971665dbaa726bc8025daf74eab13ccd0f64e94	1	0	\\x000000010000000000800003b6b40c777b6dc2d9c226e6ba2f20cf181380aa83ce036999d046c6765fe1b02b904b094ea12c631b5134a8dfa8941d06335e0993155506eb39bd18e77556b10b9d417c870a3b582f22b2fa7691db3029b05ba8a5e1b32b1021f09d31b1f4c15d6b4fb9b2f5437c04fd0f318a3495864790610e0982bf39cfed6207bbbdecb863010001	\\x89d411bc99bf7bfbf28a8738aa09270ecf4aa323d5652c47e96b089a4b8673c21714830509de26ef44a152322c902cd0c4dc59b12296c6ec41d078785ff6070b	1665419890000000	1666024690000000	1729096690000000	1823704690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-201	\\xece1bdd8e87cb4d4c1d9018d051f9221dc732ead43108ae714fab52eaa80f75535a46c2e5105291408ade74ec2b56c4627c1de0d2c5679e8238c1b6d74b60d8b	1	0	\\x000000010000000000800003d94c9e2ff680eacb31319ebac7518334911212f3c1861baf9b6f657cef71c381d508a4a199385a296722ca26740eadac50094bd4d791a2d9ce60e903ee7c636bdb4d73a2e9b9a980a65d4adab5a03822201f848f65719763399e1930782f20ed4369f91852c97408bd3c34f6acc5b47e2be3daa5c77faa63f7e722037a41c49d010001	\\xaaa5276be512fc689f1b55a44ba64adea24a2d28ae225d01e6f26bd1cd15187594af16994163584a959c9b7299f42bfca24b3bd8bab842d281df4fd3abad1108	1681136890000000	1681741690000000	1744813690000000	1839421690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-202	\\xec813b3af6765d6965384d4eb8dd6cc1adec540353f37b60335afd1650eb488445f116a26e449093764a8a21ba6c7a4ff14e32e5b8cd6cda0eaddd63d2718110	1	0	\\x000000010000000000800003c175eb4dc8b213d499627b1d2d904c38085fd53546f52638db8bcf5a0a871c6c50982b18c69231c682fe99035b6cba284bad6bb03fac657cea051f08b070b50081061101b0255fe564955114f2824b065479632c09fc2202081d17b546a82e2791a6b641f6122c5ea1e091d3803279efdb8cc31d54f52cd6993cbdea3c660ec9010001	\\x37bdb9397f050ab8af4ddfdd7b8cf503a5f27bde8787dbe35cb53d2049128ed5d14333cad965a512872740e605088a71bb3fa164710afca1611a7b26392fc40b	1663606390000000	1664211190000000	1727283190000000	1821891190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-203	\\xedd59333313f03e24d7c1fd490a544213828d502ef19ca311fe8a014c87e9aa73933083e5721046074ec2b1007ffc43ecaa5927e5407c980fb56edbfade59289	1	0	\\x0000000100000000008000039daaef06eecf30b2788715cc9f4bff1ed061cc70a93aa3ebf60db004e847f034c9956603da50f3d16456e8a06b611e949b4c3d2bb0644dcaa32f04068274a2a5683a5d7511c6c60888b3e26660e4b37acc26a68575a5dc847eb3235ce92b4f29ea203bb932cef9346ea6cd45d38fbb2aea395a22b40c7b7427039cf4dcb43899010001	\\x08709643feb08d682e9684bb0ce2e935f0b966b2ed276566d3dfdc096d8e5a3806c59bb993441263a9c5206ac98b48c16cdd3e34cd2554d27b3b688422a9700b	1676300890000000	1676905690000000	1739977690000000	1834585690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-204	\\xf2ed4e68bb3eac329c11443934a3a17419dff158ef8779d756c7617a63b1d4f9355e5af44c56c1e5bc0011205c807b63b4af88db999be6733ae88ae5cc790046	1	0	\\x000000010000000000800003b271504f2e5e330a25e91b7486f1ca4102810a1d5a9c9cb746f139b3b5093b24c1d6a189aacd8699b3c2724a5db40598175df85e83192a8086fa59003b9a404220829250fdcde329a3e0faf1db3ef319309131399d603493b1f9de19884de2fd5f286a24487c8b9b6184849f3e847a558789d8c80ea24e93184b073e472952e1010001	\\xfbb0d14a634af2ce7f1f5f7a42e671ff03676385a9480f2ecda9327c2a68dfbb867c3cea343f00ab37a0b482ee3c39105f5af3f72174e0b899f69418700d9c0c	1675091890000000	1675696690000000	1738768690000000	1833376690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-205	\\xf2b1cbcf94d531b6b48e4c7efd2248685bf5c0e5487dcbcdb1aad516f1e485f4e9ee7662f8d7b20b64cf97e916b1563b1e3c0a6393da582908d363a8001e4f32	1	0	\\x000000010000000000800003cbeb3e7379fffcbd94bc64a5c102d9bb38d97156930bd698040a0eccedf4e8e60cce0325ef480fd5e653d434514ce6f598df4b51d1d29cd2e1f893706b85b5c4b8924ca3b8d431f7c2f57af6e4781cd9ae1d04a0a90d567ed0f2e114493e8ed1986025b8f95a25304b101342915d6293e396177ecff08e7b86cbb75e2c3011f9010001	\\x647bf32ada549890ef044c2f59ae16627ec94bdfe3455ac630797b1db8b03a6babdec680ad85cf29480fca87b1c2d69a20e3bc735d3778e5b56843a6d1f76406	1658165890000000	1658770690000000	1721842690000000	1816450690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-206	\\xf645d5f97b2caeffa8aac271139abd079ed9365aa8316e5cc7b1876b9aecbf1a5bac14b605aed0096f1dd5ae3862113c9ca7140ece71f11591f9ee4eb0b69758	1	0	\\x000000010000000000800003f57ee99b508c1a83dcf9460cc8a17f0d417ebc14d8447e01e036a748f0e824e929e83528d55028b62067e3571e48749b86b118c10e3d834e547538a4501e916ec0f7c4f507386d1096b683f9d1ef31eba02821a81aaf59fab9bfc336d8a8f6954e77019ee4cc0303f7ce9d1a318651241c90f939c1098ba86900cfc0beb6a5f9010001	\\x7678bbab6d77b89b6504021e3e1002fcb7c54c83c05a164cc8bbbd88d138e6068cd6b7542c89368da80625074f46c122e336197bb906b01c3e6131ad43939101	1661188390000000	1661793190000000	1724865190000000	1819473190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-207	\\xf629afaa7fb030aeaadb1608bfedd8e0068d8c2c3d04a289e0ca26b0ddf715ac802b39d0f26458eee4435183163b160e8ef1a62ec3b404d2d49b61ebce486dcc	1	0	\\x000000010000000000800003bfec9dc09bed86ee95e9e1972d4924053853912729af7130efd32a2e64e9e9b75e7f785b18eb1fc242be9d6cccc17a829a5c6e3d32d17723b46c9a3371499c7b2b8b86709ac0cc43299db9d07331062e2f5e14474b45ee6c83b7e9389a17928d661a3bcf0151669220985657ec6d4b9d00e98384ff578ca38e3c433746c05f49010001	\\xaea240a30f723ff619eb2fdd15d4557b50a2015b1c6592273b474abf9c00a3da4463ddff2186c62b9f676aed9b09ce596a83b3c44b33cad2c6fc079f094ec409	1667233390000000	1667838190000000	1730910190000000	1825518190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-208	\\xf9c5e11fa3ae57610de04f835c1d1c27359fb58f1fd92d5eb44f24c6c463fec156a24ea0197c6bf04f620a219da0cc20c836e202ebaa79bd17ed8a94978797b5	1	0	\\x000000010000000000800003c00241c7cdda399033ab3fefdb051c3e27eb512424d86ca1ce9979777b8b1ff95c71e1c2dd2e5758b1d8fc849ff7d62d09fc1686e676465edca1c1fc33ffd57c0818c41d803c16e33448c749318661c8c381d37dc8b42f362d94fb79b761a0b4bb1cb0dba28f0b02edb041bb75dc8f23a3146a98d1cc1e8c9972e9d3fe8c024b010001	\\x8bdfd0ca23cd064a359053c2e0ee99b52775d15afce390c68940558980be9586fe4985a933ec0c090519272d22d9f9cd24b59edfa09749e70503b51b3e83a40a	1657561390000000	1658166190000000	1721238190000000	1815846190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-209	\\xfb21f800fa3a6d102ad3dbff49317b4eb5af77af4d00825137232ca67830b72d200037c73d242e8887de6235136a56061a8d0ac73860d4790c407812dbc37a6f	1	0	\\x000000010000000000800003e6da52bdea40208706684e30bb7e338ce471c93fb02249ce8a55402211e422ce887dc86967ba41f1f00c52edf5427640d12e6704fc17c0b825f552f03de00df016016c48613612eacde80024c1f154a2a669c7a351015d90ebf7462bc8a2519d6f9deb72bd672115403899eec7eb9495f0b6d8241c6b006ce325d9a79b4ade03010001	\\x07c5abf98b5fee80191079ef30a767074e269748b666bfb1323f723eab2e013f5ad39334ffd44964364a3130351eb9508bb05efe24291d568cd81980fd97d00d	1655143390000000	1655748190000000	1718820190000000	1813428190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-210	\\xffc93955ae6a6856542427341d17bed9bd9db3b4858ab48e48645d3e86c84698a6253da05c5f23888570103ec95dd92231fc8346d70d8418a75349ceee35e432	1	0	\\x000000010000000000800003b067fc6cecf9d885a70be4c81d08370e4c7a5d4e7c89e25cc535947ea3a706c3a7e4de11ad8081b90f81e099d7f0358856cf049fce68471f1362f82d7ba60e9d4c21fef999d308af7b2b836385d13fd2908dc40d922e62cd9754c6c6d0bd6f35eec42868adc4db5320a694406a480ed82a656f195cdeddb405b98633c3eb6b87010001	\\x5e30f85df863e399b3120d1e9b93a74f4023d8bbcae80a735c1a00550a23a868edbe01a300e18594be22b8ccd9657490840c32c12e6412274572a03f58a1ac09	1652120890000000	1652725690000000	1715797690000000	1810405690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-211	\\x012e9cd2c3aee45f6536f2084ee18789cd8e5bd273f12d853a23a3ba1571d0f52376368c74ce8ec7ecd3ee687b1e7a97070b31cc354ce6e6620eea28e5869629	1	0	\\x000000010000000000800003b861e6a10d45f7f894edd0830621c5f5abae90d4c684b782e518a63e228147fdc4418a5200c29f20eb1f4044205bdcbe00cc443c5acd586b1b9f0df570a8a248bc2bcbe92e2172719de7ad1ec4d4dacb156a53ccd6768a80b598bc31dfb5f07838b8be81026ee684d11d94854bd8b34ac4aa4f6367257f74a0d55610b0970449010001	\\x110fd92b3ef13407daef4dca1935b1817490fc662f92d2020adbbb3e160041d22f308fdcf4c160ed463e0d1baad17f53e9b180441a4b59fa80918ca6cdfd220d	1680532390000000	1681137190000000	1744209190000000	1838817190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-212	\\x026a3d4ac34e3b34cad93b4899579e6116004f8c831d22ed2c9792c683db410f563b840fbe05d11e998d19ffe68c7edfc530d70bb068aca511abb0971a276ca7	1	0	\\x0000000100000000008000039eb3e47a8bbeabcc882820b65f4af7da9d9264694b4ba5958641c26994c6c058af601c0b3ed1bc0886770bbbea5fd8f2d484697812b53b62018f9b3c935598f8af71845fea5d5e9dc7f98542521bec7dcbe1b05ce0faabc8e45ac3a714374050d0841e094fb3173cfd4992631eaebe2328c938bf7075746999a0fc4208a3b58d010001	\\x149ef7e66a005c98496533ba89a433e444ccba3e028bb2e3afb5ab2533ec67e2f1468e8901bc40e5ab012e90ab4034349777e08100471caf0b0c852052fdbc00	1653934390000000	1654539190000000	1717611190000000	1812219190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-213	\\x04a21689817343c60f3e7b435494792a2d7314d1ae6f5be6982f25335c1dcc42914670d144420275c34c1a82621108eb80cf72e06c0e6c22e3ce5249d957319a	1	0	\\x000000010000000000800003e5a6d29db20f0b63c8ce94b7a42400e9184f354bb2aa5198929539dab1f6fb6cb9e41e37728d387c8865f17b1a97d41505cb5e783e2e64039fd089f70bbdd092c436dc28a0611b4973391ca00073536c6d659ed7d7910a586681143f94e9867754f3cb984a0842034a1b3aa8448a7c4efb9941345f39ef6b70af2b2902e9147b010001	\\xd9998e7118909e4577f4cde4abcef79ce02eef2405070abf1972ca78e43e967b74a99f908af29f7d7c8b4c213c7eb7b5e8baceca341012c6c6dea7bf13d4d009	1676905390000000	1677510190000000	1740582190000000	1835190190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-214	\\x048aa407a88885c0e289a2c7a9506ddf4fc36bf2913a7533e3745cc88a900e061ac8fd3143406067e36946b0822875f00bef20286b56f364aa92ee4a1354c29d	1	0	\\x000000010000000000800003c39612e051987e499355c2dab4bddcfab5f4f60957847422b83e924062b09e281566295876c78ed80a9af14b1e4254f6c8e39d6b30efb8784c6bf109de4539a51d985b3263c88e4bb6bfe8fa05d1e9445e699297c9e906b2820dc1aa3533161ac6ab4ca2b516fd7f801958ce5b472b3e0a5cc38fc6c60612e2362c3d12beff4b010001	\\x30a68254b0780542371c59e6228209fd75c58f964b472a3dd5567920e60dde70acef1f313abb683f3c944395b4ec1fb108d3480dcc036f2344cacaab8c23f50c	1670860390000000	1671465190000000	1734537190000000	1829145190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-215	\\x07eeaefb8816aa8b0ff65f2bbe7d9e755384876331ae272f3b553a597caf769351d3a78e3cadbfb37688962ec0f5b5a8080ab436c86f6b96983072b725d24413	1	0	\\x000000010000000000800003be09fdb63eb17194d9562b7f3fd3c862fb07517d1b7e2d568d495159e149d149403a24c31dcf16b6edc696fbcf8076780d47af358129ac34d674bf234963b1bb9842182388c7e769db7841c29ebf741d1c6b5dd8e1009da5d4248ed404a08b2b2439edd8cfb0578c2e730a4e7fd9c3d7d5ffe939ee40c397b7c86da5acea2139010001	\\x1f373dafac974d390017493590c3e1293ae3f18060b67204c1141bd53b9cf71a61ddf8d1bfcfbc6a838ebf6d36d233f33388920e0751c392523f71dd0601720f	1658770390000000	1659375190000000	1722447190000000	1817055190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-216	\\x07d6b2c4c2c57a9ccf5f68b016e3905e56ffde52d862643ecb0e938988da9337abc2115b4e3c2d8cae83445bc95bdac421d67699055332fb6ec8b5dcbfd578b8	1	0	\\x000000010000000000800003a687c8b1880623f5cbbfbeb2c4009e2c8f1337d65e7b42cf1e7fff6dd85dd797b157b0c6c47b43fb1dcf0551625523e1a4047c696efb0e59ffcca1a58b28e5e1ef571eec579854e8a4c03b392bed056f293ee0279be718cf36513396ada2f14c11c69d61d8a6a99a09ee8a253804843c359048206dad0a10528645c86eae3977010001	\\x02bd54ea040b23b39c05d1ed3219596a136558698f6394b628ba5e4f1b496f1a630611ed9e1a04f62cd7857ad0d3ed3841b5bfc50ab9fc99fbedb02f55f4990e	1661792890000000	1662397690000000	1725469690000000	1820077690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-217	\\x0bea98efd2bbcb92e38d267fbdcb7f4c0cf029e41d7ccd9104474a5ba5241a5b0859e635a43c32f7c894dd66e310d8d9d42d5c4556d1fbf6922233262e11492f	1	0	\\x000000010000000000800003caf28b7b81f2dbba78bd8e6f70a1bc4e261d3d55b5ebfc9992eef381a7f62e76f27614a4b74e72a8b8d0f7603d58ecb76f4476602b28ec163dc60b70b3c5b46ab28ecc5b26ba21ec569d41fb2ac6f0469290354b36965d8bc998aacbf77bd041b88b8f39bcfba701c332bc66b4652a1014b97b29b32fbf6e6e705e52f3323a0f010001	\\x5bb69b653bd94b534608714c161afe3392445496af4fdbaf64119c4f21d1191fb7d910ded99c59efa969318daed7548b5ed1dc60e598bfdaeccadee6ea647108	1659374890000000	1659979690000000	1723051690000000	1817659690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-218	\\x0daea73c18e642e1bd15cd424865d09245f6b4d7e50514ed5681ef2e6e0cb3d7bd3ca789c5648e2c0fbc62fc795e6bd6c09cfc2005019633144217ed0dd58631	1	0	\\x000000010000000000800003e55e6249d8aa4eb9e51b1b2f0409a8447380e515b3ff9bf9443c0fb83301f8d69e4fdabda03bd6ab84011ac34f22ebf090f1f78c2be8abd01a641ebaa978a5218eeec9cbb2fd95660ead49faa5c09b91a1a3a1df0532c4a18ced40797076bc8fded00b1363bdad706d21af404a8f9a60576e8654b3089042ce3b4a80aa07f0f1010001	\\x2e9ef52a54b704147b2172f2cf5b72bfc479bf61ec98d40d03b3e0cab4e051b75ae3b9860333720412872369836f3e9ff32231c2e48f3272518f3aef8f04f50d	1676300890000000	1676905690000000	1739977690000000	1834585690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-219	\\x13aae4e9a0dbb470d6381de92c6fbfbc7637e26ace71a58d1e00b1396f684372f38097bab6630c8ab3058edec9a0b35c22c6d9724a4f581eb4b4bc7c375c0217	1	0	\\x000000010000000000800003e6d10f7984296c984cbbb3ba411444fa2a57f494de5618165dc2448be6dd92c642626726dd3ed757c24088c409b8cf840c5b444534b206d63ab568a576ad18b8321149028c7219a6914b7140c3770bc7bf7938f763b47b20a088fd3335bd152af7de763ab0987ce821dfbbb35f2297617d9397c0d96ad86ec1957bf345b3aaef010001	\\xfded99cb1718b1de2fd4dcafd3cdb14bd638bc7fecb739592c18118ebc11da7b5caaeef9e7268708d3be9bdea5cc43ab3b808afb51ddacaa3003dd2b3c9b5007	1655143390000000	1655748190000000	1718820190000000	1813428190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-220	\\x13aed10e8b3052ff31febfd3edc4a0918fad489ecf73f84a79e74360330405a26b208a22d6868cfce6e06602b907579366808f25055b7492f3e14cb04a56ca53	1	0	\\x000000010000000000800003b4b27306da3fc0343f23568a1a1fd09712e7f6e49f57d7e1261833c21fe8eddcffbc2a965ac997bb252912031904b088b0b18590464a7bf6ce0aded6e3b707303e2ac7ced958934dd5bb520ed02b2d7bd7c35dc8d29c22951c28c7615f6ad1f2ae3f55ef241d19dd10592f328c129246ff8c54e0736e8c4b47a317dde6845c3d010001	\\x64b8a43e387ad600905136745956a574ac9551ec4fa1db475241b2f64f14946b3d230821060ee34544dfdab1b07bde53490f55d1d07d1d28c3f3328444509a0d	1666628890000000	1667233690000000	1730305690000000	1824913690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-221	\\x1682a016b14d2c0c3de009d18e1baf1b1ce6ba574b37bfb477fb1c00450d3fee5fe9d48a9c8f0948b02322997430dfe3be90ea43e15424c013867495926d8907	1	0	\\x000000010000000000800003b5c4784d4c6ac1ac6031a1072ddc5ce7bd1b0d999d1a662c3b12a045cca2616acfdfdbec92c0419c5d6f81821a98f98df6066b435a87c37cee036f25062e929bb63360c971696543e07e5b015024035012cd5d490123686e4d949e1c0aa760fe737a81e99e810ef16552b59cf4394f217714bdb81853df21dfe7a964a73ed5b5010001	\\x4cce3000081e5eaac44229e08e54a15686e66421bef2aa06a84f19e694e6a4e132664e3614dce4059a1b129dcdb72a542f30c6a748e564b93f21a8c6d0f65409	1656352390000000	1656957190000000	1720029190000000	1814637190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-222	\\x1eaa333c50483baf1087d3f95a2dbecf13bf597cb0d0675d3d89e4b7d15b9d73de85a877999c1f95b37fa6584302f6b283070c749f3d5e1f4b9bc16a9b805b65	1	0	\\x000000010000000000800003c02255621afb8462b0ba03c24aa3d13375a9c6d916cafd9a453514d19fba23d616e052ececc8fdaa28d6d7485f4208d1a777f86d9a37c2f2eaa2d56b9e0ace7c65541ee1b4f322449e7df6cb484510cc9207ddab448cf64b3dc65d15e45826e35c83525563654537f8a2e0e3b2e3c7e9c8d94364bd72a72c2c35157fd0b059a5010001	\\xa9bf0d89031c9695e977e46701091787ea101552fe841f14b6822c6e7d998c4bf985f6f163f63af367f3d3ccb265e86caabd0231491fa35ebd51641f77b4540b	1651516390000000	1652121190000000	1715193190000000	1809801190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-223	\\x1f7a416d5d28afdd728756ddf08812686edef077cd8b625f0a81c79655f0326d962e30738c883727087b1bb6a1fdcff5f77b8de31402d39850b919762a15b41f	1	0	\\x000000010000000000800003b5524a9053f658d1aacbfc0ed5f495df35e87167cb3f05cbbe3caa41de645026ac944d8108d793f770b22b7de9f15ffaa1b7204479febe188d41705ee573d8d26580ac45ecc930828a02cd5d54e1e455e7ae96d113065845496cb4fd83a45efcfca839f9f6c503852bfcded90d74b6dfb19f2ce6895d7ffcb40c95133c174acb010001	\\x307bf94bf129dbdc84b9f1a2787a508a5a8021699992dd415944cc8ff1bbb6fa13242f30676f4c3fe73174bf67431b2a8570d31a43d4d60125c6b98a22ceb80e	1678114390000000	1678719190000000	1741791190000000	1836399190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-224	\\x1faef17bde25859867e169d33b987a73e5e5de7486b48ce04d3494ace69d3d0adfb6850d9ce3f0606f24c54f390237386ae42495c493125e1a07e917950f87b1	1	0	\\x000000010000000000800003c882a4d88341b87e6d2c99945785f7b08a204ee6d59a7ce3d8f5883f741a5fe052148d70ae739885aabd044cbeb46f131e24394fb1e3218214874b314570bd243258c3ed3c3f05c1ea50d8663f6132989c9525076f85b4e5999bda98f260f6c10f765defe9599a954c391fdfd07daff384d50394350fcfb52ceb263addb871b1010001	\\x877fdf7a100c752b61d65179882d5374303963ea5207ebdcfdcbef764f171a0fe889879de34ac36cbbfdad7b26a3b471f3659104432593c2ea0bbe16e357df07	1659374890000000	1659979690000000	1723051690000000	1817659690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-225	\\x1f569dbc3e04f09088ba0954989cf09c02a2b10f85c9ca30e10440eb2ec195b56d48804922fbd94624868367aa3c1a54c7f626db63bca431c2d342f939302d58	1	0	\\x000000010000000000800003cb401ec4b797b9f3eb0399f77cf11674c5a784ae90ccb5d0e916b3eee0f2aa8a2c45fb68c0316613ad74faa55428c8c9cc5e63977848938236f79e252a7e4dc6d1ad2205a7afd53239654db3a782cbb79c668c47417f1d16547b566ecb93da4752e293b4d733f30514e024574165dbc14ba9d39dffc2709522325754a3fdcdcb010001	\\x4f808fe6255eeeef823dce1f5b51c5e50f0f7621b92374b7c9bffa90f5db7816945931fedc00451aa929ac82eefcba6213b2160f4d38df12333266d0d46cf106	1656956890000000	1657561690000000	1720633690000000	1815241690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-226	\\x210640fb75a3b6802c7fb08f2c6228ba33c29f107bcb036e0800488ed5b12ae5fb073d64758a6b10f1d9621c1fe883d8c86aadf9f23b0db55569d205ce88489f	1	0	\\x000000010000000000800003c0b994a608b1bebff80038f36316f1252031ad696c42794a1fbbfb8a3da625732876b53f1bbc89d2f897a06504b262d0d21b9f4cd5bed4f371d8f5e98e552017664ed5b4f5b08e1bcbbfd392f3cb8b9940ed7aba45cf1822e96eca5bf23f9f83ae5d0fec51b263e8e4dad8afef07c7a547ebfff899afd5751936e872b37f5e75010001	\\xdea4e34319376e6cda272c1713909d9608713bdd2adc033522d296b402480165da6d304ae5bf92a68638a14f7f100766af82e7bdee53a98e342d46ac4255ed09	1666628890000000	1667233690000000	1730305690000000	1824913690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-227	\\x25b6b2890775f7098b7cd7cbeadcf8628363f747b10f11127101103de072e24e17da0e8f1b2abf8c0c7f6315cb149f442a2b3a85d431e7bf8600465c2ff7cef2	1	0	\\x000000010000000000800003c0b62b6a34d3cf492d241dff034c7e8d9176b97e8bab67b382a3685697658f316dca314bd382318ecdbc73eb4b1941bb6469f1ff829a508bb075effb5d624b771f05b555570fb9af6d4218a5d5bcdf395152c66bb816318c40c7f963c3b69df0f408199ccd3a414159f3cae40329a31656765ba0a1bc16aa1db008659b0e2b57010001	\\x6a3e43c9bee090e4025b72fd8a44a5b49e1232b41a94cf745991656667653210fc53576acbe20045fea7da2bbe4be6ec2469e2c6c6c5f2a748d00b0291348301	1682345890000000	1682950690000000	1746022690000000	1840630690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-228	\\x26863c7a7ada5f775041a39230dfb1eae8e63530251a4a455b1988dc1da28e7763b77e13627b64919359ee2a965ec3f4414593e0b5bc5e7754aacd33eb31fcf8	1	0	\\x000000010000000000800003e34af8b2dbdd44257bc071f7ee6b891db02f4235ef6d500fc9bda3b943e5acb60672f0a84e7b68a2dc41737d225fa9cb71b918ce5b820cdc1b03731cf9f375ac9080e69505b448657b681648e52ad5efc71db1ff43ba70def6baea3df168db380a0078a7b720864e5135c9cf5f5c428691ae4ada9a9e1e8fe38d720b18c4e8ad010001	\\x2e5923ea33ffefe5104f1f63a1fb384d41639d2fb60c5e871cd29ad4d92b427fb3ac850d6cb4b660f2a7a2f298873f6378fcd764afcd09e8bf0a9ca5d0d7f707	1662397390000000	1663002190000000	1726074190000000	1820682190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-229	\\x279ac1d3eb35b928d19bc8a7e15a96daafc535f8160081a584c322accbab28565dce03a1d4cb79b1602eac935ecb2d50b156bfd84508b44bcdddd4bbd7bf6bd9	1	0	\\x000000010000000000800003bb075e19365050643eefbda9fe562ee69173ce0fbece475fc2d70e613fc086e1f0d7084d45869bdfb7171735a78b7bb59471ec255018a6f5cdb13591961c92bb644601f51ad4219953c9e5cba8072972880c950e38c3e64d182c96813e16dbe63c3615dca94e1691685b1ca0e90bd2eb06c309ce3424dc95db76e5540d146623010001	\\x2d280c0f5e8e7d8b6ba5d8b70c968ea6fd2b0c207453d85033a06de3e678b630915175d1e65bf7f029b9cfff2ed962ef3d814e17ef38e075699e0a6eb4669404	1663606390000000	1664211190000000	1727283190000000	1821891190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-230	\\x2a9ede394457aea44c6514b7fcb567d92a3a9e43e19fac3461ec6daeef4c9dcc53d80ee5a60bc4ee8c1265a4dcdd7955a2e320772047121c07a56357b51a243c	1	0	\\x000000010000000000800003da364bb739b4e4936261248e05323197db9a8a23862a1f999708012437327b186ba67cc44324c14fe2b1a498e0503d288ad7ac4bfec80ab56f931f9fa9e6d66f37b5251ee20a9cf28d6d3e750a5327e7d9b2432261f3282eaba031838ef2aa145ea951f74329a5ce6722247c28926c852e1e8e8912dc5ade3267beec0d6e0bdf010001	\\xbf8de60505fcc868fe82b9dafe79134822698651f659e60cb327a4ddef03fa55e2c90dac493141541b7528933655c998d31e5acee02400541c74c7a63c4f8605	1675696390000000	1676301190000000	1739373190000000	1833981190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-231	\\x2baa2345537454090ffc2734f790ef1c3d1462bd867c617b9d01c27daa1a25fb604306f6bd5510d37f9ffb6dd4f980ecd3b2918d55cf794757704384e9ebf2c1	1	0	\\x000000010000000000800003c6bf03f6ef2576fe9968a00a0f1414c180945540712f991653dc1104f70dd82b1161bc6a005dd097f1f589a2a88a47f08b86d90ac4fe7b4d74b38bcacd2bf0e9f254a9c4e5ef92e6effbb37531b76541a23f57762f7562b1592ea9a361078e944767485d46b16fff93c3c454db6d2613074dea20eb8aadbd23a55e342dfdc439010001	\\x07861f5a76ccf02c42630f48923aa967f0cdb6f1476613617ff2579d886d230d010aea507ae115fb0fde426da3a041c07f41908932e8b78272165ed21ba89508	1669046890000000	1669651690000000	1732723690000000	1827331690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-232	\\x2dda74b1a0f3de8f8374289200921f8f1a9f8932cd05325bfcc798faaff4f6fed7dfc1dc3e3c86741c1e8ae70802660d5730214b7e5e3af32d79ba627e510896	1	0	\\x000000010000000000800003d9d1589c68ddd8510be95375e13423b0b3f4d600a0d2bb39e49d1cf6286bf7ddbe9d5744750eb103a58394eff6fe031661861f3ea2c69d08a59389074294ce0cd5c7e6bc7e23db40e199b338756d37e2999427cce2d7bc9f3e86a2f266d5d7eb20f45fb79554cee9b4bdea03b46092f6ec48f4f457b8a4afcb29796df0295e3b010001	\\x28d9fbd3e5cb57ec2e5f9269f94eb6544d8046aa0a4f6137e2ffd3ee1e18e227e5d693414caef9664d1de4ad57c5cebbf8d4915a82cc39e0ebb1a26628ef1f09	1672673890000000	1673278690000000	1736350690000000	1830958690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-233	\\x320a9668cd8c2ee3954cdd0abf30a0bbe59fae284f2c1eabf4a6e9f191cbf5a97fa8cccb56c8af0ca337eff2ec83e5863383cf8ef56124a672330d049bb35894	1	0	\\x000000010000000000800003ef8ee82387413b0386c31bd16cfa52388f5bcc2f863a2f4b75cbf2737b7e8ffcf71ba00027c49dc15183c2e0f36a7e0d6454a0305668eb671e61571cd95b05727fdf4770d08233f2ab48ee66dd279d08c9eac87a5b55db1016d70e0e71b63382965c105e8ab2b03a86ecee2fb5d04173f22eba81019f9118f55436d1a9515a73010001	\\x53b097665fee960bcfc017d3963cfb189ea65d86413016ed2dc282e98453d5c2c82466efb91a8ad90bbffc028a552023e3727873b54ec6ff45216e725ffb6c0e	1673278390000000	1673883190000000	1736955190000000	1831563190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-234	\\x33caa548352791bfaf96f49d58953ab2cb3a57a6398097056559cfb18bd30b14d031d4ad69ce4c561e2d525f1269ae5ee33de738b8c80a5a25ba2fb6ee2037b4	1	0	\\x000000010000000000800003a5743ce05b05f4c98dbd1a0ea0e5ea080e406003212ac7373ac6f9ff119cfff1c2290cdcacd1144d0bceb6e34b396f7eb54011b390c31dda70f37e4adb8dd93e0cb36170457b7f0f91434481473284119cc13e3d66cc1e7509bcf06cf9da6630a7615c720467700172a08ea8f90a72f16e882eb7ac8a77e33afe927049e7b5d9010001	\\xcad3f0379688d61fcec06cf01a5409a2fa1a13b9ccfab14ab23d076318ccefcb69a4d2a6c936cb4cececc36e8560a70b2dbf17c1b3d1ad46fe016ba40339fc0d	1669046890000000	1669651690000000	1732723690000000	1827331690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-235	\\x338a826aada88bb6c840e0f45e367131b80ede7f8ed5134f01da3b113623ae7d10f0e7476b07194f73ed616c7f6bc4ef465b251f4e480647b8cb77becf45f4cc	1	0	\\x000000010000000000800003d8bee65341f6b5f2bd90e85b01775853555d41f6aa81e37d300646132f6cb0e4b587858c09e08332431dc97f70bf8d65e950c35dacf7e6c831a9d74a3838bcdb7281b88f132e4a53e952106b1c0f0e1b7fa7adeacceb1110b78b78199d8f81bdbc99104d8ddab39b2f888dda57f9b5499f6450330d9e880294db9a27066a5f13010001	\\x80ec98ab18408bf9f65c1415e4d546102a9b74d493ef1012aa3044c416112c746a4f0871bea7886d3fd5d7ddae5e29696465559f6053149649ede07657c2d30e	1663001890000000	1663606690000000	1726678690000000	1821286690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-236	\\x38de80e2cdc295644a2154036c36c2b7f44c82216aa298ad1f6205dec99e9c4b6f321e1be9a793a254be3e1ec812128e0bedf4abe375fdea48559334fea82bae	1	0	\\x000000010000000000800003d448824ed087b951f464d447d31b82c44b75a2e389b92ad67969d7f7fe4dd75551b8079200ab802b98686b07af45acdf62ae5774213f24a22f7b8ac0a329750b5605242e37e21a84a4dde964f4c7413292105f4beaeda166f785f3c7f6630ea1ea6ceea98f65adcf058a17601d8622232475668df7fb2a059a00f6d32d341371010001	\\x48cb80aad6e504a7f7cbd0d95bafd904f0df6cb0862b62f9993382b0655a12d6c4ab8960fbd39aa9d1a7a41788ec608e0c415ed90af6523920e24c5859877f08	1660583890000000	1661188690000000	1724260690000000	1818868690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-237	\\x391a4511cbc1c8f12e70db0174531c991a7207da33ba5a0354872b26973074b302b81818c87dc339f4bc9088b144972989ee23edfcf225cd9ee8fe4617c821df	1	0	\\x000000010000000000800003d147f4afd0746bb15b03f5e0e69949d2054db3633e2a0a7d7ddeabcffa6dfab1e7ec25aed1705c69cac0bf93406637b782391c9edaa324aeef728775399e082a5ac53beb334ffa623126bd60f4dfc0a15dcc77948f9bd41cb8781d634249238b2b3222999e61c676912d87ec2cfad588c2236eb62518b0f58f0698e62cac7ec5010001	\\x064f1e1f198d7d8833050d01d8997b52fed5d0424d13be41a6f1e4745d8b5d05027017c77c4fef6fe784c6faac661c387680ab030529939681355495626bf907	1673882890000000	1674487690000000	1737559690000000	1832167690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-238	\\x3ac2628e11591c638065cd59b4766a87b850b2b2b014791eb6f947c74c2d005dbf5bdd0859bbcdd3c89540292e4b9361b82f11872ef216d59d01b2875d913aed	1	0	\\x000000010000000000800003d3be496ad2c97f161a34a46c461955d65cb9415e4bc8106f015027c5bc1653caf6b4b5c5770ae5ff59f54957b1a4a2bb6a4cd6553caf627a644068e804c3245268f755f534a91f433dc2052b0b4c12ee58d297ef676434fc9687621838eae1aeb50c9ccb7c10598d2fb4434ed9649211e9b521b586835670845e6b602295807b010001	\\x721ba89732cb6659a472a69198d08c1fc317851e7a01bef910a4a090ac8bb887806ae082ec5275f179f4b31f79f54a7f742dc0432ca136d28668921f60d3ec09	1664815390000000	1665420190000000	1728492190000000	1823100190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-239	\\x3a9e3e00345c25460efdda05ee68375bb36e0ad83a46be19bc147239a517257d8f87c838b6719fddde30fcd7b27fd967dd3f9199869f0ffe97301776e225551e	1	0	\\x000000010000000000800003b8fcdad92ab2d4e892bdd50ddfc2b7213a955ed64ed7a25ff3fd46689b4d70e2e436d19e96d072ce49b3f0fde64265c610f93024f51cb3ebd3d8a8f8b40a73798ff6161004df990140ccb210e3d2b3243e54e0e8654555aa4f7995b27e087af1f5f9b39072ef2ad9c7be0494282b26bd4a8d8c7d1839233ee11ad253febaefa1010001	\\x15dae91d9731ca621709b60df56008e9936a1dbd635fd4993fbdfa728038b0db38d4ffb0a1ac85e3cf0100ad997219fcc0932f43b6a290ab2da39ccca15d5f0f	1677509890000000	1678114690000000	1741186690000000	1835794690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-240	\\x3a6efddd58efe1693f69bf72fd7129cce61f185240dfbad30f876b98d31d24e997b9b26935115daa2d80a1c4692575839d1601ff7a5d030fee3b320d0317b665	1	0	\\x000000010000000000800003dea17f9290ede1985094a4c366d88b366debf9a6265052f3d23563d1204e475b9cb25808b9450ed1315f0c80f44f45f3f443cdad5a4aa16e53883c23087a2f403dc81c935bc6feac2f30a49d6daaba46eb8c57d595f4b3d4a772a21bac21f1a63f8ef1690a958444536ee599153a7707189788096964a59476a6de8fcc2ca725010001	\\xa216400895d2965bf6b9e2422ab1058d3912ba874dbecb11333418b621e62ebd5def120c3f6972fa4d77e4539c7d56452a87cc5627345c5f84b3aa93efb0530e	1679927890000000	1680532690000000	1743604690000000	1838212690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-241	\\x3a0ae4c77d90d5b3aa68ca52cde90ca639cd009decdd2f34522a76ee573e9bb38e7e55806591048e4a1c9ab61d53d77f1ff31c3327b7197c93c5037cd15298db	1	0	\\x000000010000000000800003df042632daaad48360a3b7d436a8b198e348ba384fcd16b4d2782f0835b51962cb6275d4adc81779e7ef1610a9147f857b34b99d7f295ba1b6f619e6076931ea194f7123933631052515f9185d2d7165a5bfc8cc25413ad1048ae06a12034f3b11036c0c2ae196ac316602ad533864915920f2872f0f8c5a3ba988943d2a50d1010001	\\xe3df8e508468a987b8c4d3cc13026b7a992d5abba9f7062b06a5eae676b0790729eab65ed4ec63e1dcb2f5cc4a8bf45ed0d302fce62fdede5323e20df210dc04	1654538890000000	1655143690000000	1718215690000000	1812823690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-242	\\x3a7a864ac79eb92fb56e13626a4f795ddb8dea82a060c1d4fc6f950e3c7eb2693f8e9902dcccabdeebd0e400b51748c9bc36eeca0eeac45ade3fd29b03fb5df1	1	0	\\x000000010000000000800003ee594ebc8dc6be625ffadf5001cd17cd79bbea6fa7f53a14672ab204fe770dc7f2d25ba026502c62d1c6649d2c313a94f249d54b18f505979e2c58df952d8aadb77831aa16bd8a4a79a62f8011f8a2758f1fe7425b7ec5951ccac507c0c37f4ca464b51213a701bf5ff58dbfc313690d99d4362c539f9bba0b0f6c840e37b63f010001	\\xa4f295ec4cb3ec9511835f473efe7c0b1a538036a15b208057a0dc11387e8dcacd639bb8f8a49f894a74291e41323f484d9d8fa4990c4899e1b8fb444575260a	1663001890000000	1663606690000000	1726678690000000	1821286690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-243	\\x3b2acaec6eefe7253ccb273bad4f76d3c037f4606b8f36778eacd46039228347ea178a0e5c3324fce9192070b3a9854e8a48c0ece9f513031462f9ad0dfb8b7a	1	0	\\x000000010000000000800003b7fb823e560774bf305202ffae92b80948058de35067c63bedade1df81413f5be29ed7cc470ae608cf4586be99cdd2e5d5f074e8cbb1c68a232f437dedafbd3b21121dbf0418b80e3502389b71e13e73b83a7941bce23cff5bc2e0cfe5ce9a95cdc4bfbb22718afab050aee635dffd1fbeecc94d45d99b1ed038fbdb8b81bb03010001	\\x1e7e7417b8c448684230c81982a97f221479c6a27b8b56dfe5f74a94228113419564655db0ec27ff65667f9331d97e2a557bf9a3b7c266f141667645fed22208	1679927890000000	1680532690000000	1743604690000000	1838212690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-244	\\x3f0ef61b4206cc211314b74f11cc40377694317affb2a21932dd8d50b80abc655e91b4efc028860264f7447859a5a5180e6fee26593316d560845599fc265bc0	1	0	\\x000000010000000000800003eaf13c931ae50d64e7c13860d8f7bd493bd9fbde114221b456565cc1bb309b0f5180265979208f4416435a6bc4f71a6442da0cd29356959acdce070f9cdd5473cb2e6a6bd937889ac3d4e871597aff51caa387afcb59754766755b77924634f9bb23a26068be105cc2f17da24fe60a8f19c9ec56acc737fa525c70d5638ab2a9010001	\\xfb82c5e862900607de24103a07a0f76323480c019155c0b68fe36046966336fdfad565a6d3a647b489014c4cc42bdcc5ee290016476cb9830d789233bd2cbc0a	1652120890000000	1652725690000000	1715797690000000	1810405690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-245	\\x407a11b5282e5f4bbb5b6a6d0e164e50fdd155fe1531300eac5c3281b87358c952b51b665c82f0213f8fae7f594a0462a6ee1330336ccfa1ccc733e6cc36d47a	1	0	\\x000000010000000000800003ecc2e7ce66cd5f6c5db92e101f8645bc075854149c16139781e1211720442c6c1fecbaba13060f3514aa864b079e9bb3cae2352d079ed88d86880f0eafe1c256b4a5220da6fcf0c8b979ee52b2537162c3474b917572e5ddc18e58b34bbc600302d9e1d2d088e2043756dae3c009947b980370be76dbf0161f213b4a3cbc02c7010001	\\xe62942762e47abe1c5d8b0b5d3fbc5d67415ceaa25c2645b69647d3e93f60d5d84be1a78e1c4bd1d5d5d47f5ed4e4252fd9dff84f3e0c6aeba4982e022460f0f	1669046890000000	1669651690000000	1732723690000000	1827331690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-246	\\x41727ca0c889f466a6cba2fb09885899e7d067980142206481013052d3dc81bf086017f725fe14bd05df413627914d8228c48b4e79b3af30628893128989caf9	1	0	\\x000000010000000000800003bbf9f5f537943565c0e051292a009119c79db240b1c3faa8928fdfc6f30a97abb5f23ccef8db5fbade10a21eaef9fdad85e293414175c0774a3e4e036f5769c0488b576f27239fde9a106965e33f11f511c9f888864d487168c9cc1488992d924084810b860a66c5a1bfc53279ae9dd9773966b644162bb9260e37f64aadb3d5010001	\\x293c47a179110590743c64a135360cd55812954bb2dc4d7ffc23db64d83a27357b8ada7b87f08d4ccec375b808a3aedc15be7232d0a270134062472d288a9f0a	1682950390000000	1683555190000000	1746627190000000	1841235190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-247	\\x4392288f1e0a315910a8077a9b4338558b6300e47fb8b893c8fe7ef24bc45d835338583277560b4952fca7ec24ae4e20c3b372d66e8ea5d4f015cb5947738512	1	0	\\x000000010000000000800003a537a8f15b52c5ce1ae7818499ac55d9bfe77436ef260c20c6681048ec71c6179b5a633c1ff5031c63e9cd23752b4d6ba61ad3ab89d98726ec38cbd96491d7fe92f1949e640c0ca5b67ddcef1f6e70c4e76f5826e1a6f1234f62b4dc6257d8948c5e2b3c6568b8111033152d01884a3d8e365c01df96a37bf814b6e7f7aa787d010001	\\x2eeb437fc7104b8ac22a30222839f74cdcd66d4f8c39fd86a086b4d7ad4b2c7a6847e4ba42f4e17a32effd50491a7637e8a10438e50a89fc882b56e1cc2e8b03	1682345890000000	1682950690000000	1746022690000000	1840630690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-248	\\x45b6aef94ee6962310b798d6f34e2de702c7c40125af8798504f7660ab49339a95cdc570387851d2f27f4e24301276914142271451105f49e08a523ee23d34e8	1	0	\\x000000010000000000800003b98da0d69e0da315b5c21d3061f1b6b8035918a42895063603fdb9a11d0de002764911caa470ad2c32382cf2dbabb654dd0e5b7d65d163ec07c38f06dc39b59bfea22d65dca846e0aa01ba75b5052bf79c9ceff9d2822265785c5359aaa8433275ea06c0ed49baeca5da556a193b8369e2c0e4f668cee7568b046b96d2e6f069010001	\\x5b68b324eb259ce3f2a778e7d49d33a31c1d5b118202a7521ad7d812fe55a6dd3de8cd92afe71dbc19219b79539e6797673edc25b4586abdcbc4cd98abc7130a	1673278390000000	1673883190000000	1736955190000000	1831563190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-249	\\x459a86bae8b08c9998b1f7b88cb1abfb4f53f344dde949706ff7fd94de6c84ec2eba5234bf2772bb553156ba1fd4a5f471cd8f8ba36d6a1f809723fd17607ead	1	0	\\x000000010000000000800003d35f79b60ad123423b770955ad1e8271ee827135b1645049261bb9850d82b953bbf47967ec5bfd78b3f9be102c215af71223bd684aed1c4b21c31ada54737e10bc9c86f5a64159386a4620068ce88fc25468b1ba2859e5bb8e9705e34912a5e3790cbf98e03878783bfd9dd4b9bdc55c0825a4bfb4af3d09c6461745be4b1add010001	\\x57a19edef468425594fc49ee6e6018febe6f460fe3e6413fdd472ab82b1085b2ae9ecccb71cb726574a390b9f42f76cd55e585917be4eca95e15650f19902b04	1658770390000000	1659375190000000	1722447190000000	1817055190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-250	\\x46eeb825c01cde9a3abebd74aa42d69a1f5d4a6db49a40a1d6d6dbf02b78cc93ead217a7d45417d2abe3c5ceff695866a265da2c9036107ed0ef48c4ac3577c2	1	0	\\x000000010000000000800003ce02ade6eeef68c78761f8e9bc01e79f53fea3b2e77f083879e6355b5671a6a0c80f619edead6fa60199a2e513bc5c32c158b5026b3355100244c159c1d5ef164a4abdf150c2121f98bc6c6597d0b1144e265a2f8bae9d5c8c34924c8f81a5d533c658f7ef8c7509e6b203684e5aa74cdb1cae8148513fe6de09e80cabe29117010001	\\x6bfbc19b8dde109a9e0867d047d21dd2c7c1ac1c21a1eab8e76a966994a01cc7d6514293b32504fbf30007efdd1ad4d528ef390232427bf3f0b2e2a0b603ba01	1654538890000000	1655143690000000	1718215690000000	1812823690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-251	\\x49762322f1ef75ad0ba091dcb991535b7e7c76fc6ad60655796785c2f470f6ed1b7f65ef6401a7707116dd0d6cebd594e51c9f54b300458397f90360fc88a0c5	1	0	\\x000000010000000000800003c3562caf32c33688523c846a4628d3fad061c7831098f95f463b067c887904a5d147219fe3600ed47f8d28e2e9fb4982b0737e5b6747db5a9195bacf16a7021f9221e41ffb4178a80140b7a7982c04c74b5f36deb8609ba767543066cdabcdf252d6cda9795853bab3bbbe5dece32650233bbd810663220504e8b2cf850d3715010001	\\xeeb0ea8112fd498a68da68088132305181a3704b3c628747b6a9186a40ff2b421470be60c09e1c1bc9d7cf87af959982d3374068d6ae5dbc9b51bdc7032d3205	1677509890000000	1678114690000000	1741186690000000	1835794690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-252	\\x4be698b9e11e89404928764e9b46e43fe0802aec7f0e543f1c898f3415c804a4eb200bd988185897a7453b60dc07ad71ed24395dbabcf712bd0d5050e6c2f454	1	0	\\x000000010000000000800003bb8b242d8c9ccd5fc820c98cbd59759052609e4b15d9de48ee1b9f144762faa7f0373de9e2df5b508f080b34d4e3bec66d96412fe4a782fafb2c8b9722822cd916d004b1d4c1ab116df4bbae49823dc83a7b89ab1c2ebfb8e49a3a566e75a5e38386561ab3e1327f05dfe9292a482e41ac832282aa9a8a1a95079c63a055b309010001	\\x4e2bd69869c4b79e952458e1846d506664cd9d2e7e4cfc3be953fe594ea89eeba6d239e5b1744535b14dbd3e1b32dbc4852250b84b479fe822ca315071df7c09	1681136890000000	1681741690000000	1744813690000000	1839421690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-253	\\x4eba5cedd38173eb07dc81e0f7272b994fa3a2e7d0206e5e386a2c0b8bb868e9b0e3fdcc66e9ec785f8514f4f5f82d12e6a3bafcd8aa549dee799bc7fbf02d2e	1	0	\\x000000010000000000800003b4eca8918fa96115ce36ca2e6c045b0fe26c7662e9962edbe28e0bda4263de3d9d9ea70ec5efa1272f92a99dc9a36117f7e33369ec006f0c5b2b3d7399ba0d6969dd80472df53c49660ca3775470c6b84ca07d14297d8b99298300eda0cbc057e4f7c2843603fb97da1773206eccd06fc91c68453ebc30ceb75862f57919386d010001	\\x9f2621799e3344b70d1dbcce35eecea6ccbe47a7d0ec1c47b8c67e31bc7259daf6989dbe06cacb9f24f0191cec00270315ec61fed875c22e8b6eddc8b910f706	1672673890000000	1673278690000000	1736350690000000	1830958690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-254	\\x50466bff2da4d46552bb7140283939e3ec6f669669234f3868376c3e9061847e7c1539de15e5250906443c7d405fcdf8fd82ab559acf7ddff50d8d60427a4010	1	0	\\x000000010000000000800003a5dc9cc9c8b02a9e634706792e471aae5e12df0b5862659a5abb7a17c5117ff79b989adcf0501bff02cc88671aabc05b1ce5eb682e1a39043aa3dba0cd90bedd10355f2cd2e54384f85937aa9e9eef988d5398d24a2308f60b3117c9333d014f7270572d2f3a5ed0d9fbcac116843beb5def5af3b26de1aa7620d813013b92c9010001	\\x132d680524ea3295ed9be00ad9bc1d7cfe49670e44239684f71a6eca200dcc00bc467b64f5df170beb4ebb9cc7bf4b7a8e484418f50d52151518f5cf7fe33608	1681136890000000	1681741690000000	1744813690000000	1839421690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-255	\\x5282d2868abf5ab6b6db0887eea83b6b3f5576dac6239c8c4786a16e483dcb686869d5cd1ac3b3c96cb3f1cf46bf1277a2487926c1034cedf94560dba72c685b	1	0	\\x000000010000000000800003e2abc7ad096783d518275fe1409394698aa7b48aed04965c899e12811ab18bea275eff9355aa20e650fab3c6b40a35faa5ce042ab706e1e73fde76d15927efd45dfbf7a33d8c04ec7cc7cff96dbdeb3c3d3a8f14ad495d5860c9dba03793a59899a3451a38754408569bb7e90ecaf09e5eab65b0c63ae7aa4a087fec90ef6a39010001	\\xd9deccbeec6c6d71721b3d2e9e7b9f64591725c71d91092684fa385807cc32718713efcf76048e64bd44a4f3cff2f7e69668b755a226ff52223e6710bf659b0c	1673882890000000	1674487690000000	1737559690000000	1832167690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-256	\\x54564544d3e1ef5c9c0242a5db9496f385a1140ea2a534a70ba3ef215bfea0d91bdaeb0d4f639c1d75fb1a8b836ed2f15edd99b5f637483b4768a3f6f6944e88	1	0	\\x000000010000000000800003adb5e3407893101faef42eea3bd35796c16a3988647b6d2aa7b86948e545eba929ef82610ca3c789dc2f4fab317a2fa43d7fc0cd9d3958a79b251d686f9edb504d70ba990e8fa3fb887586464502485bf761037f15161bfa08e8ff2616bdb0ae5ee5605e400356a709fea0c06d1555b785cf5fa2faef473f6bcb5e6697254d6b010001	\\x30f7ce9458ed95aec05b6d98dd791fb0d1b4e4298ee350ec38baaaf20b6e2b24474e4e2095c471f097cf453b201118ca1b4af0871ea202df16710b46e1293b04	1677509890000000	1678114690000000	1741186690000000	1835794690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-257	\\x5456a7bdcf0893e8b2105177899d58942d92bf9541ec45aab3d1d833f50b759581ac50d702b0c166482e526eb7e29c84101b20848c525375479083e70b3ce15d	1	0	\\x000000010000000000800003defef28b686b0479e085f7ffe14b7577696cb389ff3d96b0018e3df598856f3e2ea88fb4a4b0fce82cc5424e5817cdc457c78865911d9cfe7da0bdeab5b1fcc0d4db93947751d6f0202a11a48edf39486bf725ae00c094138461b6f3fdbbcb7475be11e66e0b0333778668d919704306d77cbd4a744d6b537db975a703befa33010001	\\x8b7cebf880585e8655ffd87527a24df72d9383169a0ac8edffbc5a77b4fb37879d8f321206b894b75607c705e2357b564beff518f7342fddcdb794557514600f	1653329890000000	1653934690000000	1717006690000000	1811614690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-258	\\x574695e2e53eb43b59b1aa414596ebd44d2321962a4d1b0dfef76dac6442ffb3e009e1b0adcb91935c3f06c2932b04e3823c0ade3cf36a4f1fd8d5d265bc4798	1	0	\\x000000010000000000800003b197f5ac349524f7d36ea816ffc6378d6f9cdc0fc9cd5043529f50d09a2b7ca99dd2dd3ce890140db967d9a9a780b41522e8dbccb4990fcf63f22519418f3dfa5d131fc4b6a6ecf6dbb391b8763b5a4f4e3cbd78ecfb166057db8a6207ad7eaf1461f1033cb3d4301188f4d5b28c96470fd016d7a1a05bfbe57a9d8eecbd73e7010001	\\x13aee9f506737b19ac51b641c76b0b0df50cffa86f2d696d247dc0cbca547a0b01174f529e11eab0003fa2940551d36d1500b9479f8a7d8867618936c08a620f	1676300890000000	1676905690000000	1739977690000000	1834585690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-259	\\x571e7d86e6ecc7474dec6d8280aadf17e79833bf90cb5beddc439a45f741aedc0bdc74cecd317e853a1aa2d48d2ffc204d8b820ca2d3ff82a785cd43e240a64e	1	0	\\x000000010000000000800003c5d9828d1aff53038a1ebfea50987f629935782a9415892f33e7548baeb86d34c1533fa4389c92134c931e1091bb08f90971f07d7f3bed297614f1e11e67e1aceb17273e6acb3b9f1dc0da242412acb3f0fd686bb1d1da8329d48f3a8f5fcf9ff52a1505afcead2b6c3c405a4b24860b1f54fe6f8650184d3ffa1eb3d53bd4f5010001	\\x2b83df3976d2a73d011462e0be4731eb0172f7da7a883ffa9080822425e122e0bd544e2dbf17659acc64bc494e45ce81fb393e665f9f64d774d48a0520eb7402	1670860390000000	1671465190000000	1734537190000000	1829145190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-260	\\x5f8a0b3a5e299104dbf2833e17d7f08d4cbecf36864e64f5e82c876f339bf0bd882ba47fcccb4684da893672b341524d67b31daf7699412b4b71b70992312f45	1	0	\\x000000010000000000800003d471aa910301aeb9f108651b9ac940012cb6a813c0b2e63229a5fa35670ecfe3bc642613b59994535adb5c458a73c002cd9b37367a0f5866baa7b6b243a1c6e8f5a4a7c4e39c6d1719d25d9092f1625093f6fe010fa7af222340cd00ec8e3be2f4cff3b5cae9cd3f3b2a453fe601bb53c77f16aadd1dd5dee4abd3a60bc6be89010001	\\xa1bed8989484ef851bbd17be10306eb3a6c8773826176fdf132583077cd366db8542fc1233669ea2650c366953c1936a50d7cc93cfab3a09410867a2ee2f4604	1682950390000000	1683555190000000	1746627190000000	1841235190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-261	\\x60d26a427012c73221356cb63fb028c520c8d80acabfed19bb8400a710726ff515238ddb7e8c0cb5b559713a2624d2c2478df68d432d8d3b0b77792da5fff0c0	1	0	\\x000000010000000000800003c48341dae5133828b448be6d82627382c8acccb4d3036ef6236e199c3646aa0823155fabc3b3a61899d6b03de8028c5b916212f337989cbb96f07b330f0aaa93d19d7d51dc53090df9c5e3b886ca6b0d7c7948731a55e7e3c0a557632d54c295f901216968b05678660ad9268246a1c7afcc45090c9bd69b289cf37711c0e2db010001	\\xad374a035da6aa117ae927e9e8b6c753e67ac9492da53967135f3979c59d7cfe92be20bcc0dd120cb11d2f840e5a281b7e3815557a65ca91e07b637f98c4ba07	1669651390000000	1670256190000000	1733328190000000	1827936190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-262	\\x637a25692f6116815aedb53385ccaa8c833bf8383e20de045315dda4b0b32df44896dc772dbb15ae4244577ccf21cf45ff44414d9d48ba8d1a7d9068d5638e0e	1	0	\\x000000010000000000800003bcffd9108e5728300bd9291cf619d2e48b10fb8f3741e544cc441e3737049e207bf20c3b72e872105d3b4d4749868829e09ee0ec5f35afeb5e64f9575bb37228a2120a4e1b136c9115252897ff7112ab8bf62971d2e2e68207bd840aac588b76679f142e6e2cd334e85a96acad9a4c2bec977a2eacda9544005bb4a4bf710065010001	\\x7114f19f1de238126f13f7b58dd52336be3afba7ffa7078750d87e0fea15a3dad230f4f5d984d3ca86975d4d4a079aa4596a7489655ffa8acfaf85ab2d3fa70a	1676300890000000	1676905690000000	1739977690000000	1834585690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-263	\\x64da0cc8355741f195407e1837da26d001ca5020083b7fe03562010643b3dbd41d76073101c9f414b194656384adbf4842a7454c26e2019083cb3eedbd941846	1	0	\\x000000010000000000800003a06c05a7956769697f119214d247e1e5c59a74659a62fa1c75d3bd489dfb14b3965a5c9f7d38dd5d00612884b737473327a3f554d4df4486b5f8a1d66544b05bb5628ea4e5ad6267528f7ec701329511668041d59234a49fd8963ef453e77d2afd47edd744999355d39d78a0689a698854c922f35bf934ee61f836aa848338d7010001	\\x21786cd2501d65ffd3d4f46536deb25ee9899fdd01d47c94df9f1db6685982ed5ae2cce1282180c5ff927c1e61648bb9c871328680d9e9a6b52f435788ea8e07	1667233390000000	1667838190000000	1730910190000000	1825518190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-264	\\x6736b544a1cb9dff71cb65e66fb56a9ad3cd7afb67fd468dc5197fc48b94e6c0e02adbf21ae4fa8845a98e2e59cf4702f78506262c515e0adacec68c6552cc47	1	0	\\x000000010000000000800003b8173e00a3842a4a49357a1ff645d301c8d7a068b4b676a989e303053b512e394236e2410c3cf0caf4dd5ee1e2f2632fc54746a4c9bb37f19011cf06f56656882bb1f21027b42468c4149eb9bd2b1ff52af201b29678c4b09b17642946e85f7124abf509f7878bdadbb6dbd59869bcd853936fab6bd4ec30faf3a45669433343010001	\\xdb098986235fb8a2b1789f7f78d69380ef4db4591dfc9b22c1440f20b24e5c24c05abaab34c964aac5b30f4649f13e63de6aa6bfb5e90def86c10afb0b21d600	1667233390000000	1667838190000000	1730910190000000	1825518190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-265	\\x68deab112286e15cfb159a76a8bf9388f383181c4816c31eb27e46d4bc1583b0f7cdc9c33a708185e77b1c5969ff647a917252743a22bf07760d71c5587217a3	1	0	\\x0000000100000000008000039a33f8ae693c0b2b67ab3308a5b5c794260b63ad86750a3bbff2e7b2395bced6b3527e94312a0be6d2f3e2230df2c5891781a839db5c0d5af76b93468a3944af5818997a304f72536a050a3cdc8570574fa5fdde36923ef04c09bfcfa027bab33a15ac3cb5e24df89ac5b87da2fe082ed3d58dc12ea7ba825a1e7bf53fec79d5010001	\\x9f687f631d768fb9ff385b782acd5af2da1b2790cfebeb5802221dab256bc904a74abf87d1b9b8be998b9b50465374f30f8da0f403884a9fb9153bc32d2e1a0d	1682345890000000	1682950690000000	1746022690000000	1840630690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-266	\\x68eeeb5d7c6e1aedf52991450e428c18affb03bcac0833b58c3cfc2bec22ff1e210455715e73bd43866ff1b225927d8a5c813556dfe88de720a344f86973b757	1	0	\\x000000010000000000800003ce782f5890ae5592e973051af72789c2bea69f6de6c1ca45ffe5730803d3560e37015272a8814ce50b9ded5a774ffcb3a89845214ee0703f3157e5f6adc3edd3e1558366bb83b983143b7bbb863ed113448035a0b0888c20a1a1e054a142a2bf826cc9d7f5f9559da9b1e8b0680d1b74b1bb412837ea4b57c2dd819086c097cf010001	\\x3fb0fef527d52d4595682d0eef6edf91ce3bc4fd1dfea8d3527ac9b3874af9d47e5919f7abaaaa35094378ddf37a0c1c7ecba0f82438513f199244f4db8dd00f	1660583890000000	1661188690000000	1724260690000000	1818868690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-267	\\x6ac67f9e85ba8a6bea1002556bf18ee5682a82497ef204623ca6d37c6c8df19bcfd976f82a005d879c0e87f73dbfffea32e5b30fa8cdc413af740e423fadc5e7	1	0	\\x000000010000000000800003f8927065fb7ef7138505c41fed13e3fe5042f6c46e508e415cac0f62bf9857fbfa2179c5535155ead2c508dff8ac59407067b4482de12d16839f0aeeec46f76b2452f65e3df4d434d3d6a85e0c4f1fb3d8ea48c57c885245ee85c40e17f42a4e21ebb29932e52ba838892ce003870a46e5893ba61363cb5491d9c90b71ae781b010001	\\x03fa6066b103b4d574304b5e6de46fc58b0a855e13834984bda5529179327c2b3d1a879572039c36f3175ef1274caab981f1f7bf1954b7db4e2c227b8af8bd09	1668442390000000	1669047190000000	1732119190000000	1826727190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-268	\\x6bbae4334eb1aa1d82373c20f67c754b0ff2710e4d8d4be03515bc1a120b88c53e0bef6a34221625f4d766ac359e3bb4d44e0f2a28702c1142713b601d4e3af8	1	0	\\x000000010000000000800003c8520aabedc1b60cbd65856bf909db4929282ad27e1bc0d6aa2c14a80ded97f15ab34dcee756c1f82392db11500188810866009e2a259e7e47663506f24eb6510f2585507103db38266a7f6c8efc019ec17b58c8915b5421070f15a5e392af60b82ff6621c4bea7ca7c9deef83fabae7e24618c93eab23a71b4c3f15e29434a7010001	\\x995b71b4acf0981a5e77a1b525e89ea1b45d3f37130dbe4285d8293fc6e0b4b8cf5405b44ba82322fe0dddebca8145d3915d89661c0a0c03b29c47bfa16ffa01	1663001890000000	1663606690000000	1726678690000000	1821286690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-269	\\x6fe6a2772179fc768d9a32d1552d2cf0cb847784c9910b1cac6831805797cccb7cb6ec472330ab1083d3e343b60d35b30fe93951cf8f27061cba02988c4aaa62	1	0	\\x000000010000000000800003eded61021e419e4558d5ffd935e089c6212fd1a42ae4536f66bb4030c4512e63b7c998b298d026b8376d81eacb31cd17c30602effefdf9661c7d6636584138ad227892909395e3b596f107e4029ef25dd53485f5d04883fa9d8671bf9f68677845c90f8f2e29e0bbdd84d2034fe07db59d87e2e63972dff4230ced6a96478555010001	\\xb2f378b8d112cd7f31df71228850c4472e7912def4a2a065557c8bad7a641514059dccc3d5ce1ec1e995bc92eb5b53a80f01b7a79003551060cd82e0a3b2310f	1664210890000000	1664815690000000	1727887690000000	1822495690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-270	\\x725eedb5c86ae9515482b90e6f7fc4357a330bf3148a28b8b0cb34597db05c869466e9808ee69cd22fca565070443b518b9da0fd1aa21b7fdbb0f98a26321d86	1	0	\\x0000000100000000008000039b62fb60e96c51981366134e59d860fb52abf12ef500d2da6a5b6e6bbc090ebdb070dff23909a5bcc732f3eb9d7cbbfa2ef41336b030686247ea2c26b40ff0f5f05caf1de159544dee41b04bb7a3637ff7369641d1803ab307d6701957783afc46fbf494baf50b792f7c3d50827f5f528ad6c4d746c5bf2fb031d55f12b5d451010001	\\x9e73960e407b345486c3d28411c7c70ad3ddbd7eb62892cf23d18e7df86cce52cdf7ae53addff4181233643cbc9ee461fe71572931d7f848eeb11c781e3d1e0f	1669651390000000	1670256190000000	1733328190000000	1827936190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-271	\\x7346a97810e8f37a9320e7e2b1de9e8e46e385940d53d6b836d93e82ed34d6e324738c1132362381ce112f2fc2be9dfb931e5c28d00907d6c500c96f99b598bd	1	0	\\x000000010000000000800003e0b0680868ce1004ccdf979b0312efc7f40d8ce8e3a28449e069207f45e8f0c620b531c8b96da8f3843356b41d9ade5239ff7e36a0776cd6ccff09c72fa12f38ee0304e53df6b2b064d9d50314dac9182ba0598a3fcd53db973f7d83a7dbeab8b07fa13aa99e887e5646e71d292b3516180e3331efc2ae61722522018db574cb010001	\\xc7003097136b9f71ac0530481ef530a8a0234ce48b43f2acac441de90406bf32578b3e5437361b297b6d38e206e1c856f1d0f0d8c68363640b6cdcaf2e2d4302	1667837890000000	1668442690000000	1731514690000000	1826122690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-272	\\x797af09728527c2b4b8149c374a147ef04ce136ef5c642f874c5798b099fe6fe14d06cafcb777fd96d8da59c14e7309a3ae547797eb69664bbbd04f2bf825bf7	1	0	\\x000000010000000000800003e41d33ff21311cf22fbc96d69379364f3b4e8f01ac1a8d3fdc6fd0c0f74ad14ce756d882a7153d90f75938c0fc6bf1ef9b684968c53d6879e36e6a3a8ca7f0099623eec8382b5348f161a961ced1f950a5fb9a20cac8b5c18a56e7156cae6dbd15b8cc1de578003f19f8b338f712a56169d5381a235961f4c0ca0ba8c2ff9943010001	\\x27bf72b60524da8b8456d51128155ca03ef3ec3e50cc032004cdac653e385c493fd2db6f869e0744d9ce2efdfd32679f57894a2f6eeb2e68f7549f30e947470d	1679323390000000	1679928190000000	1743000190000000	1837608190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-273	\\x7a2e17677d08fad702988101c5c825bcc92a94b0052057a11a0d733c42aaa17aa431d00001444a559891aecc86ce6fec15d809efe1ffd9a98d656f883a6c093c	1	0	\\x000000010000000000800003bef451a54aac754bc11f1a2ceb88834a0c151ce4fd05f3c1a9db265ca05914bf498ffb717cf59c22e0df12881a1247034fe666565406f5d30e73be0692340638ca4af93a5d26ac1b4e1fb99cef955446b65be1b2d47424087008a0c32a7dafe90e9e8d90fef8cdfbff08e1cb560dd7c99e06fbfdbb45c01a01f69995cb58d573010001	\\xc09f2d6aa72166defd6792bbb9b2937a8377c572d7f5dc5b3caeda9bfff89efb91020aa57f35958a43854379b9cbbb4920f475de36777992be4dca4a6893c604	1674487390000000	1675092190000000	1738164190000000	1832772190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-274	\\x7d32fa498fb80f2677c4888f17a2eb8ae702bb0eb42efff6221d20d1be2ac58a00b4e84bbc958f06e491798b099b3b490106b6f4627b7c577ffa7ce685c7963e	1	0	\\x000000010000000000800003b64042f126a7fc64401cc12eeaf5d56ef7fc8b5fdca0d63bcf6ac584c7d99931f439cac3982152639b067d14d4af21fe5560a6111bbc77a6627a059746f01a2c0a8621f5ae2344828c29e2a10bb5d7245714026ed43feefa84c3578ddf51f7f692f9a3a0738fc9a62db5251a23a1e1865f1fba4bbf62cd93bf2ee9bcbe90a8ed010001	\\x8938636a81c70f961282d1a66fab60723ba6777fe64bc4897bbf96debaef6f40d7afda9671b688cec64ea943d4c3a0f5f3ea5d334890d5f41efef53a10cd460e	1663606390000000	1664211190000000	1727283190000000	1821891190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-275	\\x81a298836d289f8e8ec1c11072c0ab26fa31a9b207d6945232b72cf67e17f7cd4615103561d3aea8dd1cda77ec9a1f7157a99c544382f2b062937ea83807ad92	1	0	\\x000000010000000000800003dec6197ec5b8bd5a69d92ab3ca7dedf8bccd1c11ed46105a823b4b5c9d357ba1cf3286bc3bad26ca1edc8acd6c9b283c2bfd1010a4d62717e4ceb1865c96d5d8ea96788c43632ff820866ee0cc366ff87028e74c04a9086a83fdcf64871cd0c0c1468ce1cd495cb44701870727f03a1cc9e32f5175f1cfa70bfbcfc978636527010001	\\xbf448d21fe05dbdf797c44897976f7f66548bc73cefdddb60d6aad9b30c898513ec8b45ddf79d135a948ac3d69a239185795e4cc95227f77295674b27b383a05	1651516390000000	1652121190000000	1715193190000000	1809801190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-276	\\x880eab9107c2330e8a6fc11b8aa2c90c66fc51b8cfa928ffb6090ce147df5e90d6c8eb4dafd3a0d83e965b60f3b42a71a1be0a3b61d87d380ef4557bd70d30d1	1	0	\\x000000010000000000800003c4d1c734ae196f0b8236dff16b3fcd35bbbacd317c0269b12335f758d71c4119d04bc3afbf8248467d3bd98331b94725afdf7e46c7353a910c2405f41345fcded817d43eeff7d48113086169eb1371d1a5410bdbdb02a2c6fa28b25a8fb7d9facf0e108dbe0fd67b6a504493b90c1b54405c024f49b0407df8c7031f8ec09d01010001	\\x3b4bf337fb5087f7efb4de4529536f5c5abeb32ff6c67abf486c8d07a07c3175faa057eb4fb98d27eb47ab9661f9c8e47900d05abe9d1497715535332feaac01	1682950390000000	1683555190000000	1746627190000000	1841235190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-277	\\x894a4659db515cb7331510ff26db98894b158b6f2555fe22f6dc971fb89b6bc19c7a010b1765cd7dc795f3a183403ec473e806363c12b7554e2dfb1acbbfca23	1	0	\\x000000010000000000800003b6d3fe241b424dd6cad30038f129b504bb10a4c01711766d3adebdc8b58428a4593a5d703326c55f18910ae28bad0391b8c6acf217a1fdbc979a7017dcc3a13a23f6e3aad30281cfed5ede1424f5361482dfaf63f19515d052c7cb977302ece747e3dc406485c946daa3be795aaa8a68da7d17233bed36a56fb1d29fc7e70055010001	\\x92b5de78b3215faddbf5f4e8cd028fef921b0e3f7b4a9a917fb028f7117a6d94db07313eeabb5c2cab38b4ce3e8f35b31df719fcb4c755e98d5b42046c8e7c02	1668442390000000	1669047190000000	1732119190000000	1826727190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-278	\\x8ac618a58442d37424ceae1e4b90cce15157a79424b68b63645cfcca40047b8252dccf1c75891326b601cc00a0a8bcb72c1b3c7e1a2bb3e3f0c4bdeebfecc872	1	0	\\x000000010000000000800003d172a1203a0324dba7888dff8e824388f05d71723f252eefc60210b1ae5ba8372ec2249834bea0c479270fdcacd504ae9e22483aaacbc32fef8a542bae3f687b8b6790e6f405eaf35e07b9fbf7e6e6181b78f8fd4d80ef1348066af77ab0a48ee38c95e362679811db0a66d54cffe2ad51d14d14aacc460e486c46c580bf24a7010001	\\x2d5fba07b56579386097d68358a4d7a7733f4825c1eba20e57ea4d7001e2aaed320f04fa7fda0b4ff8e82371e355917ef159de466ad97cf840375ce5971ca70f	1673278390000000	1673883190000000	1736955190000000	1831563190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-279	\\x8d9a0f4ee275205f68d35654e4ffa0bc9f457243f36502602ed87ea3c691f6e0b1636f324b078ac804ad1329a07d80265d787f3f9ff930ef3dba99504e2fec90	1	0	\\x000000010000000000800003b66823050ef2e1685f60d10e6fdf8cbd30a582f1fad39fe079c4b2381dbd2a84180988821f3d8e7de67f90dbbcbfd11208c71e5c1a6ed7e849fbe60514bb82950d27591bc15cd91967c56a445f6ae8f800c8226edab403dee53ab485f228581694da5b7f58cf6fffc242fcf09b667a43542e07f33400bfb58fc2f200611b1a57010001	\\xae917eead4c8bec4377065ea49b9813175fe1f173f1cf32aea693c1ad0b9887d504e671358db08cdd62f75c2138a145b9209378fb54f2fafc57a46e215b39809	1664815390000000	1665420190000000	1728492190000000	1823100190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-280	\\x8f7648fbba638f8bb66215f7c23ff3a61d58afc950fc30fa972d8c8a770cb62bd9d2cc077fc8d65ed0c9977792972697535fded1c8ad6c5d4d969428d71926a7	1	0	\\x000000010000000000800003c3c18d0447d7d7b560abc5d864dee0a08d872ae7860cd144396d7c130a6870cd1f40099891d83f893fee2e4727e37ee2bce5dfd9f99c4374c43e357fc20a47ec7bdb95c71412da816a77491b75c1e438f076d04f478b0a78797da56374ea14ec70abd91d87897f44dd96cad601624298463a22aa5d45559b7a27c2ecc851a845010001	\\x99a144a11fd335b21a08b69275f2cd03a6d03968032d8e559caab73cfd1236ad3f187542a627a1db8474f82425cbc831d545595a0ed7da2775d9ef45a3370e06	1663001890000000	1663606690000000	1726678690000000	1821286690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-281	\\x9056757e96e4eef014c86f93e96cc509998dc593d35f48dc05e8de462b9b3ccbedec6807bdaa51ba26b03b6024d314a075ce52a65393b76e2a3f201b0c6bce15	1	0	\\x000000010000000000800003e9ba68975466c1cce9800877bd99807d7b1434c908ebfaef9283157386a848ea557629db026a80d468937c7d051d1976aaa3199b8a06383bc87733c0a232ac1ea10cec0deb8043880db76b2f13ce399f89914310ce2c772ed9be4460925c2fe004b1f36eaad35abebb942888322f5869acc56046ac4cd65499e17e5cfaa0392d010001	\\x09bc35b4d96f1fcb5b142c48e8afbbca8c769fd169ce1ebd7c536dd1f677a65421aa17368c257bfaac9e7bf938f1f2177ec7ee9e884488dbb95d02baff2ad502	1670255890000000	1670860690000000	1733932690000000	1828540690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-282	\\x9416d3cd931c6a8d2c258308ebc379fbbebcf3d09897959bca6374112badf858883b887bed677454e634d1b2ed9f371aad85a7082009bf6861d53dd457f75299	1	0	\\x000000010000000000800003c9b1467bca665772d7d5ae7fb659ba73f8709071b25e68747cc3b9de944b594702a2534b8611ad317b4ea0c876cf2529359dd2a2dcd11a6312c8d9fa3adcd9bf4f7906b194129498798e69dc7d5272389776645e0fcbccb799687ffc1e6d451436c04ee04a9c010faeb26a5e35bf85b29fdb838b6cc0cfea6019373aa3764d73010001	\\x558d4449c952d46c088fd533e60bae13f3ee9db2e0af8eb59fa75feeddb664ecd090e8ec2a6effe698cee305044f4a385fc0f5a4cabbb40f0bfce0ad16dc430b	1656956890000000	1657561690000000	1720633690000000	1815241690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-283	\\x945ae261cde10dc647af3a8e4464784b09a42975ad1cd512469638a2951f0b285fb016b47d707613f28d2982f74680fffdcf82c616173bdf159817481e488bea	1	0	\\x000000010000000000800003ae7c56e8255de611acad1969aa05e84fc14304bc1459a28e6fc5296c9e061adc555ff68a457cb5e6ff77a1f71fbfbf0ffc7ec2f2edb24583e45e0d8d39c490468481c4bdd6094aaa02394a1de2f4f0e43168987029f0ce0bfa63951565a62bcb5a15b8e7456b11e62e4855a366963b6bdd51c137b2c405e219b9db4856043469010001	\\xa8c9e5b1b58cd0e72941c9b4431c694857422e6bc4742bc3c774940dc32a1fe412ab558dc40103ad79b4979dfe13c7bd4906ef0e0658112e967bdd57a39bfd0b	1661792890000000	1662397690000000	1725469690000000	1820077690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-284	\\x96baf7242115497e18bc963546c2a48eb810b5d3fbf13e8634ea5cc1f390eff482fde36ef646cec107de97aa6da98d41ef042cbe69218b5bc3ce664afe554f9f	1	0	\\x000000010000000000800003b221534c4eef0f293f00557cec013e3327eae1e05a4721355da2676f4e2b91958b78dd0c888e6b591372d4feedbb2a66ed0d83175c790a33995c93911a7d684e33bf8153d610db577887f510b5ab52977fb58eb20d9fea1dfd4f08a1db95bd4d31cda833e9473916954eadce41199f21f5e3f47c1b7513e74dd718c993128145010001	\\x6c82ec441d7007639bb22137a5da7833cbf03b3a8c5c9a2464d3b55d7a84d00e44660a3f35dfc69772095c797d32b08e85579aeb8544c473beff248ab0dab80b	1666628890000000	1667233690000000	1730305690000000	1824913690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-285	\\x99ca85752e38acffd343f7675e67a7c164a0844a3bfb85266827222fecd368408138cba11e9b176f34b97e2717a3c558708814640634ebb86cc6558efdbf1f21	1	0	\\x000000010000000000800003eb034746415bfec0ad4ebcd10e00a7f3d77070a445c1ab58f85df7cb35eb63c06f9ade1f26d021770edca9fc636b3df72a9465a4558263fea88e04c516a8d78aaf1c772ff1d208eea1af00fd9aa221c968081baa366c28f4af9952c7ab53dc0288933e3c07292e1921cf2bf1c66aaf0053cb51afb7667e76ec3dbeb64006f45b010001	\\x4a518ec63f087b9ba43bd03919914aa84e09600ab0541b449936ebe72a5dd40d4976ce2020fbbb98a18bfc8ec5107636996c22e08e66fb1205175ad1c804c106	1666024390000000	1666629190000000	1729701190000000	1824309190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-286	\\x996a1611212283aa781b5fb8c9aecfb812f2ad2103fabbca62b6b50165ac0a64fd2b248cdd01fec619d7257c96d0197354093de2c6d1df9b27292ee712aa2703	1	0	\\x000000010000000000800003de7dd5a7142e081ccfef4c93f2a12f7ba5da8441139465e68e32f76b6049029b5ba99796220ce7c1a6487daee53d19fc756a5e1e235cd4bcfc9dbff65ed6f2ecbac2ce70bdf07879bbdb40d8a622ca237a7ae6a1393f00188a4f742280fd97269be4158408ac1b54a8d648cea2f0bfe7627312990e23925513c45d84c5b7a4b5010001	\\xd1e9b130a482ad63c43c0f8cbf32b03152b0058c20fd2b12f9ffca582d9a2fb0b6a805339234e4d5825ff5b0c92d52d83f4da43e2f315abecade0d553ddc8903	1664815390000000	1665420190000000	1728492190000000	1823100190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-287	\\xa5524399b57dbf4d1ee78c73721ba52a689887cbb4d5afd364ed997b4bde299000d3fdca1490171d9356734b0cf125f4a7f4821a9737f223eeea1adf8ea08084	1	0	\\x000000010000000000800003e5bde262ef0bbf3dacbeeb6695199f8fcb54409dd630655be5857dd097733c2b13b2fb8b86020210129be4e317b37d6f749424a5e91e9d55cdac96d469f6f03c59b678d26022fb6b317d6008ea54281a09ac6fd2c1ccca16621826075fa7cbc556ba5f0d1ebc1b9b632a3501bbfd9fd2f26cb7a020f5c0c8d234f1c1c43a41fb010001	\\x1c8a5700ae4c0bf202c15ad30aff63fa13efb36c08c683fc7d94e22d85ab13fa326e624e818089507fb702a70c19b9fd45d5e5f4116733b94746752d40359107	1682345890000000	1682950690000000	1746022690000000	1840630690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-288	\\xa87a5350828de107033e9df2bd04db89260a5ba0de8332c5c057cf22607073e8be33f3175195836d0f192a79f659e4213619388b35ac8e1d51429696bb2a69bb	1	0	\\x000000010000000000800003bcbdd09201e399e172734c75336acb8d7486adda3c55deb49af0397bce34ff064ee878d8bc34b6a22e4aed743fe119859bc27baeedc31b131c2f4a24d1bff8967f0645441acfab30f8d6fff10acba5e759a3193021110c806e4bffa4a32c4fc0001d050c10f6a91d5fbeb919a7f86950b8a611be946d3457421fbefc0e1daa95010001	\\x10130da3befc25eaf1a7940fbb34cc02671d7e51893be539d0ffa45ff2266faa9bbf227b1c44c183117b4f73737d497b84e4d3b5fc05b3c2186da4d972405906	1670255890000000	1670860690000000	1733932690000000	1828540690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-289	\\xa87af666e6cd0a1e5bebaae42616a8c25cc0f7b8aa0c8323c6be05a1988d6b3a71693c0e79c666f8c34295a3fcb5e0fcb2369ce4b6a0819b03f5323815d0f3d1	1	0	\\x000000010000000000800003bb6d04e307a52819ad04234a52bceb01e3f97be5b352a38ffbe1b23a9a483463fdd83497cc19c399278d450f7ea245dbc8d8e3955c9059961072f0523be161791b5235c6807052debaf5292ed1a5c12d06e53efd5b1d4046a216aa5dfd29613a3d3c6b2546f2cb22f737939b44f7524100fd2676f33e957e9c96ffbea2f13b33010001	\\x77b595c15bbaa7809703b5e2ea89397d53fac3a6de403ff96ef5df1d1327abaeed21b21d7d33b404ae9b6829d6d0f955386a6206cf29671b5727d94bfb92ec0e	1663001890000000	1663606690000000	1726678690000000	1821286690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-290	\\xab768d2d800ad091466e93e1db603bd0aa9a85bf67682b8c3f35b33eb41b0e98be6be14e50eddb9c35aa4a5cd454cb7f8e3c53c28271946c9f2864295259f4ec	1	0	\\x000000010000000000800003b710cbac5645bd47ea3da1624d5994392aed11d66fdb90142eddd56a4ccf282353a354f229bd1bfb7291d04406345bcd2e94a3cd116c308d7100599503ca3355fd0183b9bafc91e0a481c4b8b5c509e29576429e191130f1435963abd051d3399e9a732ceb9895bd96c5173d66b0468384d5cdb9fe3a4e58944766428c28c797010001	\\x7d064913cd345abbefcb6dd39b21a466469a93bb070e3122476ce14a76e98c9340474c37895f8a9a2cae081101482a0c2f6b0d4355ed90003aa6bd4832c9ed0c	1673882890000000	1674487690000000	1737559690000000	1832167690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-291	\\xb276d70815969a9511e497606e162f312b5040a7af82d0771411f52d4c36c113cdf3a8a5948d0ab752549ac5eeb94aedbd4764aa1cfe1db149e03b6947508e49	1	0	\\x000000010000000000800003df5dfb8ce2b22d5ad7d1ddba694c19007ad8d35ad9833b2c273d4ecdc22123eb22739d35bbc0218a6d094d73ff6e66c9541bd70ecd9db6161d3b11b876cfc0b5453a7ab627bc9d01f26dd6d95a98cbcbbba91ee07aea06a49a2356b10893746251b6ff9b8d406f73ce15b8574ffacc312c22091c1e76c5da175daa3fa5dadb7d010001	\\x9f0a142bb64984dd1d17b61b9ca9aa10b50e5153853c3a36e9059c3329e6f39c31b524d896f9382ece255040ebb2a8feb113f0d575a141aa0fa82c287bef6404	1656352390000000	1656957190000000	1720029190000000	1814637190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-292	\\xb366f9d4db8472423ae08dbcd0332d985ecc128622d301707ede56efe04e11ffed1724b0b2b11b3542f01b1392c40043b7744b55b268a646db5953d9d6e2c22a	1	0	\\x000000010000000000800003dbb5569d2763f06d1ee4623030cd25af7cb11ca3c6c50ed79934c71ea430b0c3e1a9d6d703f54d0102d1056c323b167607ba1e33976aa3a7329e2196a822a3892c25cf4cd10c58c820c202ad3e6f3afd7282460c598383769428fe7c040c8725191f73dea4366ee5de87c658bc4633379876d8e5050ed0f4e877e94d98e736af010001	\\xc9b9ec9b438b87e5dd26b90a1e2d3f4f3f6d3db82a3afe35f6a111eb5f7346069c09079ffaf95c5d6a33afff6ca004c5b4254501456d284fd746b754ede43d0a	1653329890000000	1653934690000000	1717006690000000	1811614690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-293	\\xb7b62e9dcbaf6daf8353f999b41205433db8381994bdfab71052471bc2eb8009b4accf96b31625edb29cf1f133072a3cc636ef8a7115c782b4797761a2d0f62e	1	0	\\x000000010000000000800003e9ef9d28eb8e2408570c9a654aa4fa04783c9740e693710d43bd241ef29af74772d364be1a811409dd98fdba5a4105ebfd67b940ff53e99a4f16d0631e18efdfdb0631a9d2785683138a304dec2af70699cccc0f4634d31b201203441438ad5b12beac56705164c22ccb2998324f413e4e75eceed287d05f17b0347502a7352f010001	\\x1f64981969436c65eb835df5d4c4fb3eaee04786ccc57f33e3b6198a583b4b1df395fa5873fafab036e94f82128d64cbac4a59d46dadce2451bb35accf4a5a0e	1659374890000000	1659979690000000	1723051690000000	1817659690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-294	\\xc1e65e73218db6c6bfe68d0ad8dd91c9bb08ba6b925883bf84cd53303a4c27b8394d56180125c8f4a88b1994b03996c40c4af2a5f1ece94b4b1aba236af13e18	1	0	\\x000000010000000000800003b79839fd6567301b86f66af13bb91b8f0ca5236997d812892e587afd794db90fa68f0df87f7434ca13a33f669e3529c59b50da70125ed3466bbb008d5560140a5222f0f0bad3733e925ad91d5851b4877b5258cb73fbd7b6152bf876e3fb5b7905fd867f915148c54c8adb02968f6bfd28369d9f582e3db8018c8b011829abf1010001	\\x5996df29008bdcb3458adb278a0e4b40da662f0f8e5cc05df1a57b474a015cf93d5700dc969bbc7577c1b27b5936ad76391fe99a0dde48321ff17c886984ed0a	1675091890000000	1675696690000000	1738768690000000	1833376690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-295	\\xc11af31113fe50df16a2c83ff80ce1ab656b936cacdacca932ebb8458980c9c59f335497534ceb687c33e312f1bf269f6acfd199b509b3b9fb3264cb99a78d40	1	0	\\x000000010000000000800003ab62764d171c8994ce60491c31b5f9037bc5aaf8dc5571b097e19bfa337c3ab148f42860aa040ae2d9bd935390ccb7e2c6a418dc03bff2fd531a3a08e4a1b39e1203783623470e4b71ec372806add33a1fde80ff5632f054b88b07b868034a43c0881cdfe02cfbb88aef55eab6d924cacb4d80ca19cdf28c7633c0c4ee102aa3010001	\\xbc08fb6a4f1f0be42e9ff76cc6a2ad09ca5baf00c283f2e3116db84d0e83312ca2b436e565e5cc79fb516802a870efd5cc8a2dcb6f12316f4bbdea274d23180d	1671464890000000	1672069690000000	1735141690000000	1829749690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-296	\\xc2020736cb49de494cee844bb600f508fe4b7c687b03394dd99958130cd367fb44a9b1c55e1c58667a3c9fcf20ef888f393626ce5986d7881eaa2b4a36ba5e8d	1	0	\\x000000010000000000800003c803626e3a1a539dc95294c73243ba028bfc10a1ade0c9c82e09e360f6c50fe5143a18532eac0d733989ac5b3f799d8075738777f3483b74bdb6b351dfafaf679aa3a8bfb9f62b884fdac7c6896ef418f3d6827c41984e3a348a2d859750e550f7c57cd44400bb238d19031397730aba8173907d8bfa1d39dd19c30c40395caf010001	\\xf491173c15443293bccecc98d199c3d8b83b8cd01f3110093ca43af1480821e0d536a4d7229a90e5f304677dd2044123c0e63d8e094926fed5c35f219231b300	1681136890000000	1681741690000000	1744813690000000	1839421690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-297	\\xc346768cd7b90c712720b6054deb0b7bea55fb74b0536e5d952f4ff820b6369b08525507972335433708ab8573559fb108b7f44a6be1385dfb09b1f7edeba253	1	0	\\x000000010000000000800003d9cf6d73e0e5b773daee0f90b26f14ccc40a9249ef61f6ea19919d6474fbad40527b675df1b97eaf4a70f297a80ffc6c514fd4f915e8b487ed7885c6a0df296d931205a5bb6f688691bd2c4a11b408dddd3dd69ec06949b4c2b04cb12530eda3fc455f89424740c89ef80c27f4907438248a60c19fe93555979f335bc53cb4df010001	\\xb4055b483d978ae589fb66f7055911d78d59f519cd4ba85b1fcabc3c8d4bd9cfbbd43d272f5819a1ae6907ea3868d824e14ccab7688ac2dd2aaf72f99dc11f01	1681741390000000	1682346190000000	1745418190000000	1840026190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-298	\\xc4b238ef691650ee3c63804d4b88991e5e709ab87bf00d4b4eeff6b63d16e966f4d15bcaee6f166a13e93ecf5a94194ff154ed5d993e14af5b22e01d215b590c	1	0	\\x000000010000000000800003c65cf8ea8fcda3bed8b85b229679acfbad6b53b2b2c3dd1ce8ea3f8a05143f73fbd2219d2db29687db1032ab501d48b0a7e6d32e60a6bde88058cf382ed40810514a64299fc5fbd0971d86631aff7d7da7030df0e0ae45ea56bb5b2683c2da266f3795f604b4659aa2116327b0605121032d34759cc2835fc7a446ac4b553a07010001	\\xa93d40d3873138bad2f3db5f461dbdb04aebab2f02cfff018d33a8ec760536b3298e930d0055f5949a4fb79b558c2f22845fc732caa6e7db27f76013faf2ff09	1680532390000000	1681137190000000	1744209190000000	1838817190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-299	\\xc46e56fdbd49ec809c357e2bd16a587cd0f4cbb21795fede06ba3dbce4b612e80c6dea2b6f09d6ff261cf446027cffb7176a86616c834485f1d775d4791c83a3	1	0	\\x000000010000000000800003c8df1e9704bc04e3a8163d02a9c220caecba45a25383b08a89a450bb380e70125478cb10f1c27ba6aee2c9ca979e4b8d984f05472d2758c273df68d12755858d5239baaa0db72f477983048c97de016b195a169ed6b44824503a53a89f91210c3e1cf8d029eba513efbb172b43f4d1994295e2b5e92515db71c70080cd31b637010001	\\xecadd83d0e78edac359db3dc0eeb7c9ac6d905c757fcc2be391728faa852d888e20a10f10603750e9ae5ab420ccc703bd514cd928ae319fbf4945655e8be6f04	1651516390000000	1652121190000000	1715193190000000	1809801190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-300	\\xca02e97c611897b230c3005dc082381e3555870e0d672a09d3de729549ed29f78c2dcc12fd56df41ed9730d0fa131285a09c039aef2b91c135e6f85dc77f32fc	1	0	\\x000000010000000000800003c7520d999e6e2c0de4bc67827184b863df1af172c86adc65a0e5acac4fd25391f69e457aa204b484831a26f65dad61d7a520efa0b41dafaafcc4201de78e7a06727d8cb68d7a1855f9c0a26e977265f8c8b45a4b22c812cd00aa6d341533374b03fd4a3c2ade336b68a955efe68d0110928e6272e0cd700ce226cfd977796169010001	\\x99f429948f13a5d1cedf9f1d3f56735940588e8eccb055fd029dd2a807e12bbd1b0fa10faa9f52d97854bf619407339d3c93a3b6f70856a81e1c63afcfcc920b	1659374890000000	1659979690000000	1723051690000000	1817659690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-301	\\xce4eec0ece69024ded55349bccf6fcd97d7e152eeee6bcef9676bde4f8b4e6efd09fbe77f4b9242b03594752cecc2b61584f344eb7200b347de34b8cda5fe034	1	0	\\x000000010000000000800003f48d502655a759b514524cfa4c01030177a8fd2611a48c674b706c727e81bf9bcbfcae09489b3018bcb7cb2147fdb74baf068d1abd1cbc13bade85134b080deae733bf7855ebae37ccfc1bd22efc3c6dd4c24774813c38ce495d6b376770aaeedc6fe6c3620077559c5959460ec263e7b7c96170ae806af17e2033419c9a6a95010001	\\x9d1162c99f75d47c860afee3bd12dbcfad45cf6016f3585b0d0813e14b5dbca05bf54da90dc1c9fff240076247cc101fd387ea1af7e38f4fdbfb419d0e30830a	1668442390000000	1669047190000000	1732119190000000	1826727190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-302	\\xcf26e70ff7d2c99bb52286a999ec94c0566179e80067759e7fa2d54b57b3f4d51c478f4eb22648cd9cf1585cb5de420df53205100699a7a23c6cd847a910b3f3	1	0	\\x000000010000000000800003cba01d96946980fc2d5a422b322997848afb04a9a45a3ccc5dbb56409e72feb994461730248b2e07806c97c856babc5d8b37768a8ec38a2a36793c54c917312efe80b7aa0af937e72242ef62ae1b900a9f7e7fd27af39762063a445bbfb770d981d1130e97531cee2c7a296d226cb6d37b22f84aeda15a63dab459c504c7a437010001	\\x982fcb075b9603886cfad9e89797f2521d05215faa18537ac2cab19ca4a39c15de06d7330c0bbe381390d1c706c4a6f696ea57c272712400fa39e2f81abbf905	1663606390000000	1664211190000000	1727283190000000	1821891190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-303	\\xd122aa2d25eca70e9b5b115205b351e703906bd1a6458cc5260ce0bd66cdacc65bcf41aa7b47b0602d85e693042ad35ae91e07e61963d6e25fd2baab2fb7fa7d	1	0	\\x00000001000000000080000398505b5ff8d5be7acdb1360ec4988214b47ee7b8a4ef25f1dc63d14b8da24e0c03e76e17081df41ec343d1f319de9b48162eb300d39883e251bcf64c418a0d1bbff87c68f015b09cf0ffb817eacedc789b4d29edd8717b69af491baa7951b3322a82c5954600b064eda8a8a578b99685da858125ab98d0598751aab75a61255f010001	\\x7517c9f0c7bb7649c58c94c8549760f487daf26daee95e3adcbb063f3ab373355039d208c3bccc1e08d506f7b391af857d8aefc8fe3b50e61053fdc1f7206307	1681741390000000	1682346190000000	1745418190000000	1840026190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-304	\\xd33605e4668bda40925ee3ece3f20e90df1a26042d14f08abc178f8a08c419f23e4497b288598f9dae36cd2925e23f732120d54b5790f2a43e58047df060abff	1	0	\\x000000010000000000800003a32961fe30fda16e7a5aaf28ff32bee50f3a5969f8815782854ac96e55732b1c0d12e9f342e8eec42f3556c57919e55d14d7184452787c6a161914be74c855c7c0a8bb5bb1d108dafc62cfcab1c49ebb5e269ce3c8b85c1b7e9d1917c2cc9fd50109ef8caa67bcbbb39c00f5b889da6acbb9be3d72cb71a2f30e804c3011fdb5010001	\\xe10e9746d52f90b4d041c141d9dfac4bfac78eecb1cec455fc69ef1e8c3ea97fd9af8703c7a5fe94ae050272e95761d331ba3ea10956e647ce9c55947966010e	1655747890000000	1656352690000000	1719424690000000	1814032690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-305	\\xd726297c74e984806fc5f0bff58ba571c9a0716937d080118fd975471d75a26634d92dfc62b4a74bb592d24d4b9650f1ae6e7a83529af58db1bcd58ddc567e3a	1	0	\\x000000010000000000800003eb910587ddee50f2bb2d9428c73c85d6aca050f741c33522053769c076602e9d1002d9ed470715e63446a4d315b58d3a06fccfb5bbabddfad992f8bc2f9cf16afe9ecec0cc878fdaee37652695756e23139c607016251754e76d0e8b32a5a9435d912f182c7e76f549541fa9e2456ff81cf6a2caa83341eefe0f9432d75786bb010001	\\x4b485a953031c77710e8cc816bb30bf83939349c916f2778ba91a0defaff20cbf500f5c76020f1d955dd8673da0a9511eec6d8ecc2ead36e72b5c4bf65c3420e	1658165890000000	1658770690000000	1721842690000000	1816450690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-306	\\xd98a9137e145d599eebd679544698e63dcc6270234f7ed158a4267a9f9b068e155990ee25bf84c32b52331315034d588a08497c2b8dc8dcd8ff17ec9ca6661d9	1	0	\\x000000010000000000800003c063f9ef2fa554c8adcb463f4f2c16886bd0680be07badf27109b072c7db86955566bdc221352932b26e38b811a3fc4e5ac0e5435a05883cdb284848c178e4afa6fe2603916c637ecede48e8fbb10619fd33d7f4627171e4c49af199d5da033e80133f868b183c2c3efb0acc1f816148b6057c21b9d35415333d48c8ab3e652b010001	\\xeefaffe299e23900e5c65ebad5cd6265d13ba901080cb604c61799a24efa2bb68b3d5d75f9dfc3c0ffc59b67db6d4bd526c9534e33c867adc2206c72abd26d01	1682345890000000	1682950690000000	1746022690000000	1840630690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-307	\\xe3ee712c0ea298f59f3eb7ed1610a437f0f5545a7282e86683dbae7db5ac2c1788ebe56f18e7d3dde0b57b7391ebae02c55c91d9e6c44e6f2d2a6bd2c6a85073	1	0	\\x000000010000000000800003ce3f1cac8e822857ba130dc294994f262147203c73c7b0ab7bfe3d5d168e05a59ced159bcf588d88f38f93b3a17c8b5b12ba49cf67fb923b0e7f5bbd8137ce1b319eaabf4407308797d5faef0f1cc7973be8c5d9fe1eb2fa5065d4bb6a59ed5e7097914606c4f6d6da3a7d12141149bfb6e4402e1f328eefa61ab32952cee3e5010001	\\x7ef00d53dfc1343fc0d02aa49a8fb9217159cc73ae6e8c3889ba47358b386cb553aef335203416f9982a9593b0c683b751b081ba3109f791cd08e1317e6e6d02	1657561390000000	1658166190000000	1721238190000000	1815846190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-308	\\xe5dec19b42a77c5129fcecc321ed32c1bba2ae0507cee541d0ee28852fc2dfbb59c769956855d918d043a9084d961b92c4598f016c44370f4a4d4a1accdbc5ad	1	0	\\x000000010000000000800003db9d84189b5740875cbe490edceb9eb5bfc6fea1988240515b8e0efb3b2068bfb08ad7a717c2526a88858524f891663cad172f4bc7cb1c64f9b84acd753ceb7af54a789069981a31087b1941d97a7640612e71f6d2636b196de394163d17799de464ffc99c5a5ae18260a94ad47aef91209e769d4d5fdf34798f7e11f64e6f23010001	\\x0b7bef9476ddde65f53e3d8f59e7de5afe739a02b068555eb4576e45faae59d70b02f0c7e2656f92b0e865dc837dfda080dd6dd1967dfa5f8e7dafc418736204	1652120890000000	1652725690000000	1715797690000000	1810405690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-309	\\xe9e21e5df241fe2ea7487131c691d7505cafc8e8271ec381a9e04627c0cd07076bc0339598854b7b5eed61f6ed67f3fbe37a74f02a8ea100f633460feee6c6d0	1	0	\\x000000010000000000800003aca08cab834229e9c60339692da75a12843c58cc2cfdac8c2f1f56a41c66e27632e68f79aeb5c730f539cb7f217fb379175d5ec5744c92fba57cf6e6273a8a6903097e396605c6246a4987a4c629d4318d9998b2b762ef1e6646038bd46b9677f5ccaa3f61d3cbc5cbb10a120cd6bc915e385f1a48ac40d43f7da7778a8cdb89010001	\\x208d88a9f7d53fc09aadadb1636273c7699a4ad39733f5c927e8e227453b0235edeb42a4f0d60e34a804e4c0df67c44452f9ea1b9bcde2ecb35a8b633ce5a00d	1653934390000000	1654539190000000	1717611190000000	1812219190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-310	\\xea7665e6885ebc4055be11fc7445c844791328d5723036747ca4bbb51e4ecd4f6a920a45dfa9d7f72d23ada92e83e00f2ad1d80ddb16353a53b10fccfb3e5e20	1	0	\\x000000010000000000800003b505e1c1ff348fbf8dddf652b4138f467f9f2960e55df9859d512fb00a4488da62cb0cd646060b97660e2dbfbcda34e036d083cf94d24630f74bde838b0d7f1dcb1ce71dd214decc76ddf79c4c67682c48097af1a926f6b82833825504fbda64d16cfd1cca533f4f28d0e948c91290c8b7b180f867ce01407f7c4f18642f7de9010001	\\x7afa962d5a842a2d158c35d03e18a7e4a767d94f72b7164216801773aa0c724c17214c4be2f70ada39824d77b89b2c45d9841257294d5a987d77327b58c9bd0a	1678114390000000	1678719190000000	1741791190000000	1836399190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-311	\\xed2a6f79d965ad7f113b7a5a2b4b61c35ef6c0bcbf1e1aa8d50792d8a9b3ebbd381772622d302e8d49aa23e2e6130902a4883dabba9f54cfdd04d9a24ea3f4db	1	0	\\x000000010000000000800003c069c187735b897dba17aa34065abb94b5f07cc544b0158e8172838dbc57d9f41fd234893a54cf58e3f9ff95032b550136e2edfb292c811d9459615f098373829be437f893f87522c0a82da5e9dc6bbb6c0c68acc0dfb4e2c2271883a4691d9e8c2063c9e85a3e57e40bce770de2d367b7bc245650128e699204f669e9467e8b010001	\\x2f3aceb6013916497d1ad9e4d8b79ef184dbe305e2cd212b03dd5c3e45b667fdc10c92bc7dfdc93811c16ab5858356a7194fa3bb61aef623531336c7f0b9ac03	1679323390000000	1679928190000000	1743000190000000	1837608190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-312	\\xef3efedac69dc39d2ebfd4c6e1f161a56b67cacca766ad509a151fd5174694bc03a54e9366cef74f3a7edf89871310b46de38c8369daa888e686bcd2f27944ad	1	0	\\x000000010000000000800003af9e97ebc2bf1094774c5a73e09531dcdb608382fd0593fa5bf79195137c9c8ea938643ab5dc2c99ec15ef6759e735d9cb12d74ace53d426dbf1e91b46dafc5523e07bcd52da041dda16c741155ee1dfbeae2682b9721daf8844e5be3f218271f815f5bfb528ec6170a10c6cfb9aeaab6be9e7acaa1fdd154617186ee6696005010001	\\xdd9f8536b8397c4e1c67266558ac4309267952ea4ebfadbe6f1fc213e0a284cb91c436872ef177925690c7ef19187996004c2a85940ee7d97aa894ad0992ac08	1671464890000000	1672069690000000	1735141690000000	1829749690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-313	\\xf08e70d24ece0e99b2ec042e8824ec6b6db6ec940161b4cc2988a2af05bf4fc19bc91e784ccc64b30045723f1e892a42a1c2b9e7fde67c639c721a13a6b5fc45	1	0	\\x000000010000000000800003df98fb2533fb0ad6530066be0e9bc0b9cac1c175c56ee61a43d2fee5ad7f7a3d1c9799caf0c83c2c6ea72c4a53573f6d1aebf322596224f24e302628e4e18a39bf7562f6d7e31d41ff1e256b42f24ca7acd2b423c640903a67ba2147f57cd518239f3b3304d550fefe09f137bc7d5ccb604a320a5fb255925fb3f60aca06244d010001	\\x9c70c886b1ecac902f7edcdf73d9f2320f8a5b83e627396bf4efe24b23a486c34a34983efbafaa97d4a9ca4d38362c36fc94e08fa406dbd44645dfeae3da720f	1671464890000000	1672069690000000	1735141690000000	1829749690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-314	\\xf4b6239d3fdf7c9600f29818418e294ab943a3dd4c3ea5698f7f8f64292055d1ecf238ac783746f0415758f59e02c8fc649a37f39fed671af4c4f3697c7f36d5	1	0	\\x000000010000000000800003ae62a44b37b343d65b175ac6c59431862937f4c99a944e1801de7196f471ab59904217e0efd1eef8b172f6c964782c0acc4fc5546938b47c010163e50a9e72afdd36101b81f67de85b2e2d664dd8a584c633091a5d3af61601ac05819d3c5a1cbb4acf71d0492b5c160fd5b17b1ea2d534c528c8a99c31d0dc8e3c6cc1d57383010001	\\x3b0c17cc76c29ebba84a43ef8a5b2d2f34524ff6f231ea2d045828936ad1c99d72bd856e446a5b3a9b5539a1897990b811bc6747528d193106bd613bc99ffe01	1672069390000000	1672674190000000	1735746190000000	1830354190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-315	\\xfce2b987241273b87c06a6b7106cfc0cbbb4d14d69b4277a42e328c66d2b7286d973375b77043c43e290292378385e80bd81aaa4b6c40ba1fb7c4432c17742f5	1	0	\\x000000010000000000800003cd592650f68bd8ea6b6d2fecbef86845ba51dd09fb38a7d96506bdd92497fc1f092ffae65567ca4f689ca8b0b0f82388d649dde3457284a0faa4aa62758c20ec340f37e27f6d77eab47d5c6b3afe366713eca5eb434d5f218a71c63e986dd5d9f344c9f85f82e66002ac9e490fa94e0186c3906e6da8a6764ea62f2a6958ebe1010001	\\x31622bd293bef3322689caa929bb22537e21ace7904c814af13cb6e165c1c6184ea2e5ea319569abd36d07c32286deb7948a282bb45dfbe24498cdacb2e62e01	1661792890000000	1662397690000000	1725469690000000	1820077690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-316	\\x02bb3b5267b5f9353fbdec2909d7bf4b52ebbfbdaa6814f0096120bf960c9c590acc8a626e1d8919f143246bb45917049078f2f59b3b3b5d9b03576914444282	1	0	\\x000000010000000000800003a57f58f88db38fd1f96d149d8dabe1b40b6af5d2383f44f689ba807d47176ef7e48f75d8ab73811e9e13605f34167b56fce5e5b24855fb5ce86818254cb267df6ee13f769724559ef1df628461cc9d7505bf34b07bdca85551b1ebbc6c4715454c84b465a78cc7c0af37d7516b091079126cea9cb1fb173b763ce31da96e5ce9010001	\\xbefce3e35f3e7463791606f07fcaf079f344fa8bb205ec081b4302283b9a9a8b63d585b621108f1328119c60a1722fa88421338f18f6b87eadb1b754b7ec900e	1670255890000000	1670860690000000	1733932690000000	1828540690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-317	\\x055bfb133e88d35c427a24f10eba0260bbe18bc39927094126067fe21cdb0dfa63a1a58bcfd0fd01753bbd3c0fea2faa26d31b0445e93fb0e3e16e6f6b0b28cb	1	0	\\x000000010000000000800003a0b06a521c24cb826fc0359cc7c566aada558e26f676bc6401e2deab4e7bfc3db812044e29ee6e4433e846c52de38869dc80cc0ae75fdbddc5fbd178edeb7294a1695c21469d3ad98777e56a9005e64eb258dbe387f9315c2b8c5b5672f23e5a703aaf72f1b43f505e79b575119714eb70e7688d39a559e7b1ca04e935cb49a7010001	\\x13e00406ea6fe40165fb5e3f51cd79286d5e554c11a52c1cb39adf134268891f20bfd15e8912496e02ea0978b227bba6b84bdc26424262a45e163c87808dd00e	1672069390000000	1672674190000000	1735746190000000	1830354190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-318	\\x0757dd1c1b0d991fee614f5240d56e7cc5823cd9a03f772849fb0681a9b8829117a481e514854cc411237604fc6d4070c2f3c01f75bf72fea2c9cfabba7104ea	1	0	\\x000000010000000000800003ea19c7a1ca86aeabedc6a4cb24ad684cef1d72164b91867c8842ab0a073be079ba1b0024ac7e54dd0b5ab621dca976874eee240a9eb861e1cd10db9f1af53ab338234e955e6e4351703365adc597151cfabbe642268b96828075b5054544811c11d0d2a8c88637a2b9dd5f1f0c86f78e81eb972ff05abb9ef0263c1bd31af93d010001	\\x42e92af513b9ff605d6802cb259ecd109877525cb0cb4b8b4ca4c83e124999d95696be95971dfcb8a9a4e5cddcc40b79f99141ee9e2f5d1d1c731f9be629810c	1663606390000000	1664211190000000	1727283190000000	1821891190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-319	\\x0aefefa36dd7ec756d01167f44ccc8c263633e5da978e627c63fc90f1a043c4c33902c5af8cf9ff38e2da2b12b42794cd8496004603a8f9bce2cfd874e67de75	1	0	\\x000000010000000000800003c8e495fd92d7a9680d1e512a7fed449492e87906c4cbe872f380d1cea5b01240732bb30ba20a46fdb541fbf90314571d736fb790077ee5b3a02b15aba72d9bb15a081e370bc12c8542b39b837d643a40df83e57f2d33ba1b16c14e4838cc11216b172b9ea455562529318ebdda43044dcf05bad6ec8c44676f3d5493abcda715010001	\\x1e57f41f3c9256971c4e5b97dfa8b65365a04a3224c6604300bab6ae1c6a39e0efa5a951cff332541ade6412df19813a5dbd12d55458b723034aa644e67d0500	1669651390000000	1670256190000000	1733328190000000	1827936190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-320	\\x0ceb4f00f5f4d7e0619314deed250ced4215483af14d6e4c5d5814befdf5080c072fd05edd10eea2c87869b6ab72aa8c84c22d7f275af689e3fbc13a96b7d285	1	0	\\x000000010000000000800003cb724724dfe03f37db4710a86bb00b1746530c901c8ef8b88ee97cdc48dbcf0b7a16e80db4dd3ac84444f22c394c35c1aa6d125a3c85ac7904beec702178fdfbb625acb6bbcaa3dc62da057f0b342a458754114ad1503d60a569f926bd3893d503e441a8671790c237c43372ab214b51135aae2d560507f525a1b281037289c1010001	\\xe7dd45fcfa337ae99a751ebc632a8abd96fbb78a050ee8f2c70df618382b12a81ccd04df3f20353ebcc0ec6e47e17616c47dbfb31da5afb3037b0478d10bd30d	1656352390000000	1656957190000000	1720029190000000	1814637190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-321	\\x108f8a7a5ace0d085edc201beca4d9ee59702617ef78750b7f0a986d3dcc5dd8ebdaec2547f44bf451f465784966b691889a04740b81bd5a9a074328ea6a7656	1	0	\\x000000010000000000800003cd04e188f1c1ecbd6d9e32c7f3a34398456ead72283f3fcad884cc18f7d5eb359727e462f30a8c13bd16c7cf25568635886e054b64d972666e437de5b9a93b88da41631896158087b489aa54c0d1c67f97bde28e0c69132dea685523a7e203e6ebb6a0f68be21bd5d3df3fcc1febfa48839085b1ab8097f8d1eadf2a409e94ed010001	\\x056a529f02598699f10fddfa6b91bfdb7aa19e2633f4c943610e1c5e8f6edce5ab594ce651ba52180ae7c2cf2c1d6273922681435cd9f45f3de1485c228c1104	1670860390000000	1671465190000000	1734537190000000	1829145190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-322	\\x113f027f1933dd70a63dbcb44e23185666ce8ae9af8de21b994501e6665f2cfff5ff940ff117e4fa0fc5675c25151442ab0929cc51fb3f42db6772196bac13d9	1	0	\\x000000010000000000800003c70337cb75a8678a3a7a62a4f805e9d75e2f312470379f7ffd67892d5e63b70d7e7394c0229d74d8c4ace1e19f20f070fbc9222bb63acb0d122c62c6c237d208e0919c9fe70774a8abd2d7f6fe6d34ffd9ad6687620000506a0ad88e6531d40193bb868e67f8b42b018d44ba05790e99f9ae917384a280ca9db9ce56abddf099010001	\\x7dbe1429d568155e6d79787af0f74c117b0d105526af728574f9c5c5eae1e7eab04e9161b5450fcf76f39c5c1878e384367f2c499c9d4c1cda6ea5654506f00b	1659374890000000	1659979690000000	1723051690000000	1817659690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-323	\\x14637413a9d4cae245bc9f005d7379ca5b01472dfe4f3bcd12442eb2a0b08daeeb920c2c91a25fd9f1454f7c075f19b62ec0ac040195ed394979976e52579457	1	0	\\x000000010000000000800003b5c300f73ec7ffa20d8b2b7ebd53d096aa1cc5737c20447702474e39730c4fd3a5cd986c9645f0d23f664767082e0339741f067c43c4da86f4353e74bce40b543515fcd57b232ea46e0c022e4f5cd1363697179e992ee9166ea3ebae007445bf48888b8841b7a14a45775b1ef34b5e2ef0f735750203730463df61a0ed0ac893010001	\\x4f1b9f335b3b1a64b750290618ef3ae0f89a9f5b741648d5edab1c8322f44738507f9795abc13fa602f334913a6a2d6a32050ce18b487ddebf3b41ebde0ed304	1671464890000000	1672069690000000	1735141690000000	1829749690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-324	\\x18d3be54e7ac49b0160f0bbab709db9a738aeadb9830991c882f6833a7a4a0493ce6887831ae3fe3f7ee6fd9f81b8bd98772231abf7fedc8503fb0eecf3b6388	1	0	\\x000000010000000000800003d02dc156a553001b26e0f641030d464d124f633334e17d6d3e5d0d02b688c74069a0affaab59dc27cdf5b0576605bafc261d495cfbc15da78e3c79ac5808d664cca8dc5577187a51b1c426341315be45f9af98f8998928de543decc5e15c789b17802150723a40290feeefb98fa0861db419b1950f6baf6d2c348bec7dd1d003010001	\\x7d2f684fdbf497b5f67a7881ccef3aa06c51ec0dbb14369cb7bb960f75c20b7c1805cb0da40050f91a726aaa81f66f831432fe9034cd4612c77c50ddcf880704	1660583890000000	1661188690000000	1724260690000000	1818868690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-325	\\x18a72fc0b5dc44ac2be72ae4b78bcf79a5481ee6a24bce352a5e9cd395f3a045153d9c42da4fbd5423fd94e4d26a7b248ab613cd84fadd90d0ceca1f666e43a9	1	0	\\x000000010000000000800003af7958d8f7043ff5170b2899bba89ae9f7adec986d831ff931cea27efa3a910dc4808e3b76ff3c546551297594ff727e44513535760c06ad3491021fb31ddeb3881438de2fb1c2798cd599e5f67f221eefe6b4d9c6a123facd190a8eec37bf56507a9154b3ff1762034e1110387d449a7e0bdeaf97e63e338b600e841fd8d1d7010001	\\x78bb7a8bd95cf0ae3fc03895a24a98bc7964e01742db3e362f8c206cd67149063bf95487fef0f3a92fc673ee6efe61bd007bd61776348e060b969d87ea571f09	1674487390000000	1675092190000000	1738164190000000	1832772190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-326	\\x18c771e9db071cd2d3f0bd169cb71c8b5671ba7658929167f94a302bbaed6266c655da79de66a132e1ec7775138b7469abaa4d00947814f73b847a70b16fe3fd	1	0	\\x000000010000000000800003b753b539029bbbbb99b8c57e751a660a67deedef9858a9d31a7c5c34a90f086563e62337f8c3c628a48765df9999f6c0b3f9664c2828948ce14f66dadb3bd256f20ce595739fdbb18dae6fa567841b9d0ec14ebe33e230b8335b62da7570532c6f8d415ac04aaccf53a8a5f6c35ff7795d7bd274920a70662d24e2055e99f1d7010001	\\xe0ad7d556e7c73f8da582c3bd9987add19d6de63469185fe8fda1f92fc8db562edf3b1f784881f238cba3fd25fc91b8ec6658de710a8fd509fe9cb93fe14440a	1681136890000000	1681741690000000	1744813690000000	1839421690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-327	\\x197b2c0948c259ee1dd66585ba564477a507fbbb615c9ad7da9d6b168f326c1ac7a4051899150a651429ac3a44661e1cb1ff5d66bc5e3810ca07ba8eddfa39d7	1	0	\\x000000010000000000800003b20b58e2522af21a3089ccf095967e87166160a03d18d72617ded582266fd8783a1904690895235e800a159b171edfd5c845606dd6d11ee36c063bfea95c1d3988396f7125c962a45d82aa40398706a145036619d1ab0eeb97677eccae95fcc88f680de290bf158a4dadd61f10ff37c46af312405188ad61d8dda49ddc04682f010001	\\x9466f29c609739ef4b83b324b1ae614099d389163b7a0a819f7fddbd96391a3b513e3f9bc3877918116b54a9fd8a1024b1742db052b487e23786f81e6a5cff0b	1672673890000000	1673278690000000	1736350690000000	1830958690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-328	\\x1aaf52066a2030ea117526167db83268d2a5c7bfb7dcfb62891aaedb8c46d6859bd43c2320cc568007fcb970e4d6db5742812fbbc521a41bc2b54dd4da2d8b15	1	0	\\x000000010000000000800003c0efbeba403de79882dc9088915f51ccaaa36f3e59175c2ed2c415e6bd87074e0c23d91f18d0d5f06c111fc83636a3b462d71d4d74fc01d85d9392690f7ec30dce76b788340f591a267b353e155c7981fbbdf730e6c73d91e217c7fde8313081b56d43ea8ab8c78efeb9308cda92e7968dc8929720c0f616d5f95c446d1a7f4d010001	\\x9a524fb666aaf487847d3dd7be7d61afe4366dfa6ee16fed7ea139bcf80ff70eb2dddc72f57e20d80789ee235a347bcd58b702915265e0a7c30e0346e3d20e0a	1661792890000000	1662397690000000	1725469690000000	1820077690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-329	\\x1b5b6e48468ff61fef7f80727c57b75d8485deb4d96ee1ee9af60be826e41d53c3e104a935612e934a458d37daf8c163a6764854a0614b13a1d8127b9e6aa46f	1	0	\\x000000010000000000800003b262779b96789732d0866a8a4f298b09f188da2e7cb61fc8c3b21622ee91a0a0e6e673aa9d0ee343e3a56c2d5e888178c2729762df380169675a875b2e7af48612b1db5d15b5214dedfd92754dcf7960821c53a1084af26aa669252a90e85c44f0911c7477e86152ea3ab39b1e59faa64bd1660a5762acc40407c691fcd53fd3010001	\\x9ea04810db181cfbab4478a6242e911c76e210fbdf28b9ffe86b972d56f5a03297b5019adf1747c8be6f6aae4f125d8285c249f40a9bc3c998d5f17bb9610401	1658165890000000	1658770690000000	1721842690000000	1816450690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-330	\\x1c2b85ee42c09b368f05cd45042e2734ca39458c06ce1c2912a6eedc6d7a7c154e81dc1aada8d859a44d8d899dc418794270c8306df982b2472f35d6b58b7627	1	0	\\x000000010000000000800003aebfa125aa497b5740d47aca8969981c0890816be2e16a1eeeda2d34ee8ddeff293f787c8d7ced0e2c094c0db5de32dfb57616c1dd68439372de888506d64692afc9534f08eba1f7bf6a1661950f687385cd0c1f4062ef1409b57de232e5dadb1c7c6d34e96d31bc11ab920c51b13e20930e2927eba3154b5c5f0c8a0ef4f3c7010001	\\x39269f2eb19f7323beb7f0e2b2b25ac649bbe0d28cddbc2b7ce7a946058204d5cd80863b34fca535c1dbacde7706f858bec8afd0eb3240957506838d83891908	1656352390000000	1656957190000000	1720029190000000	1814637190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-331	\\x1d57905c69b7365c4dc1b01517e7a07d0cc96d06ad296825f83e9d05ebf400c7f3783e9c423874284998d6557e0287a2ce3572764c817608a3b0c0c0324f1dad	1	0	\\x000000010000000000800003be046189fad34fd793b5fdf5871bf6509785d5d599b710b159210e7570efaaaff5a09d3134f883c9cdb5e54bb6b6cfdd31047a7c5d35a7409484db873738f9dfb8119a3b1f650a01914f09ff47920a54c3daa1e58e4454d403ee258188ee6c2d31bead9ccc21a529c157da3a81384db8a75e27420cf0c3fbabc6bb07efbe46c9010001	\\x47d1782e5343d63a5b9456b3b5e90f04eb6bbcb55d82ea6702d2179b534665730bb128494416a8924a9099eb0c3feeee087efb7481de45bb8d289e811f546801	1682950390000000	1683555190000000	1746627190000000	1841235190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-332	\\x208fa7aa9e514b1102b9457cf5992f6c76f25cfc27c0f018c5f24e9823f125dc455fcd34277cc29ae2701a40b5ecf67b2e5ae3c99625be6035bcf2e6b6dc740f	1	0	\\x000000010000000000800003ca0efe18745750c4555f37c235bf1ed1a32cff4d4ebf459f0dd0e6254294766a7d98b73165e817403ce08d6009f2308d7f070d35bb32954528357434b6288ba8c500cb55990af7e6b7a1a8b637412edf9b05af04fc82969de03d2efcc430c495c1f7d73aafa551fc1c8a5fc1d8848d448e641620cf14b0d3433c9c3b7044d113010001	\\xef799892d71583fe4d7ffe5b6d15d5c2d780747350a73ea0b44c3320523e669a5a1cbf2d2d880dd8cd96cbc673cb27fb797483df9a2739cbf20d9383b597bf0a	1665419890000000	1666024690000000	1729096690000000	1823704690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-333	\\x227bdf723aa728d568ba250e5679df8b0f58c1f5faba80da6d2c131b72a8cea80db65279e2682fd0ddfd93982e1044682b07322e487122ee7882884d25871260	1	0	\\x000000010000000000800003e9087eb08523d1bf0f4b77f36d3f0a332a163bcd2827e68df5e89543881f79a6b0662d16c0aee05f6b50334675377250e6b1acb790708502209d5c2c3c85e78e3c2e655446b418c673fd2837492f4a82a66801d89f3dd9c04143f9bf8c119ce87220c0b5fd8e6b54d5fe3d0223943b180111cf1d0774c245e9a8c0f388fafe81010001	\\x014f7d2f5431b84614271ba4b58f2018c66dabd019e7fccfdb0edaa1e9bacfc02ef595f1c3b0c8e519694733cfc1b8285dbc586a4225dd5792bdd0a4f0287408	1672069390000000	1672674190000000	1735746190000000	1830354190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-334	\\x2397bb39e5e18dbd843141d776423c7cee7301164673fe15668dc0d3f3651599938e4b90f7d3ad419917051fd6db871d214ef229b705455bc70a5b03dc077a04	1	0	\\x000000010000000000800003ccc34fb4c65f7c8bee974fbe88340fbc10d65904f66933c37f188b874de7d07b1bb044a1bdb28f0f1e995b3db67177cfa1761a2dd555a2428600e568f306dfabced54777c120261255f54dcb94c3fb5f68e7a94156f44c8e648ebc77c8cc24132c228a8767ba8f2b4e86720d6aee257dfa6d65076ee092b551a6cb6a894f8591010001	\\x16abe100db2a00044731f97ea6954621ceb279926899120f147df4d4563cbe4f48d29931fd1dc9187da7a16c600be5fc4bbba3e66c2bfed55f43a9b714724303	1674487390000000	1675092190000000	1738164190000000	1832772190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-335	\\x2a27a64f91e8e6289dd8fbcf5d85a2135d1932c50f51e8ddee36c6877754755bd01fc99c12573b04c583e086f5b194af0b0138a75dc01980eb7d822dff497a58	1	0	\\x000000010000000000800003c6d4f2927f030bd29f82e2b3c35129c8f42634fb2830c9821dfaca0c1a18726698a1cf1781cada739a06b116c6475a8c30e1b4885cb050805ac633ac532b193f9d100e0cf72b7c7707e27484a6764ed6b96e94a5a68a4ccb61cbaf7d08061687c4bf4ad968aa6a9c2570b769c06c3d5c673b2700b6029de905ffd49821af91ad010001	\\xe8111bcd0ebe9c822fe395c5602f20d5694af12f953b4f357984b5a4fbf76493dc9666c6da6f028e4c1fa738f197dfe5b36f2ef39758b3620d643855bf6b6305	1679927890000000	1680532690000000	1743604690000000	1838212690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-336	\\x2b938dc7c978cc67f4c23d5ec5be23c08c1c01767058eac91676272b10b73eb016196c0e361a69955a957f76c593350e6df2e0d6d57e24a6f1baf8ba68c1b09c	1	0	\\x000000010000000000800003a03a7b29c6dc5c7755614d0d5e0a7f5afe7c5fc88556d2ade0adc0f98f18057a6e58bcbb6b6fe1d66deef3f349a0eb6ba55d2510a56dab01a5289ad1f1d32a7d184990894f29717387b18bb0906bf321d23164bfe16e2daefff2aee9295157728f058f4eb87648469273e0d1517a1b436a533d944bd5ee07158d53ab280b939f010001	\\x7cd1bc1088d7f73b318d37a3cf8a038908d0d13abc1397215540778a5c99df65a47d614f252362b927c1026013223fdc4d70c6ce215afd2bd54fcb03685a100d	1681136890000000	1681741690000000	1744813690000000	1839421690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-337	\\x2b136a4c7d8a6dae99978cb1f5656ca669949263e7cafe560dd920485734ad40393833a2be0586abee40b92dc965a7d460086c3f32de7a1ca70a5b95b4c4a3ea	1	0	\\x000000010000000000800003c22af53ae59e48a9398994e9bbd20ae80576102802f829dec3794efb34b7b2d96c42e43f90ecb76cb819bd77d7bef73ba0ce1914c84cb8f926d3556332af5b49eef3178935f00d3379758df6cd13d568ad034115b412c11905e3fb36683b0603188c2d24a23b028d59445641cfd741c55b6aed62355229a5240b694f0d39227b010001	\\x6070b87af6bd4674c0d677fcf8e2687aa3c19ef34e762b7ad640298509ba14f5c406f11cf641b162f5e6d3a387de07c445fe1441e074172f17003b8feadaed01	1672673890000000	1673278690000000	1736350690000000	1830958690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-338	\\x2ddf18d3ade2eb2368b5f98f3c15f89db2c595cc768613ecceb2d925ac8d8e06e4eec99cfa5205fec635172130caf5e4a1cb338fe1f2376ed487cb129656ed17	1	0	\\x000000010000000000800003d909ebcc4e75e9dea125a2705034a71a840f5326cea170f7facd2a9a4e24e24c993c292747bc4eab67e199d271c8006c5f8b268a125aa121053164f04d7c4252bad7fd70a50d94922fc3568a95efcf8e984185bee9ba6b7a7196c9164120839073899de01167f5e566863dda48e3886937dec7db1d8715eee85bfebbf5c8655b010001	\\x631b17dad1c755c605ecad2e335fa9c29f32a06e168f9776c5dbb265dc9c767b8661123594923e259ab75c485d42b225dad68c0530ddb921bd0bbe829ca2e90f	1656956890000000	1657561690000000	1720633690000000	1815241690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-339	\\x2e2b9196b41537d26658d319055bef01b836889b1b9a5cec27e0867172040bdf2523fc5c09905077b4f013c3d6e800f3c72c030862147638a5930a81b03360b4	1	0	\\x000000010000000000800003c4a80b4cbecf99056cb2a6aacf0d0d0b2c9b75b171b5f76c746904604b886051e701b252b1996e4003e12060ef372249c09e1e7261590dc563f8b60c45b977cb1b38b11dfdb09fe3e6e6c21ebaf33497f554fcd466e3f0f4c0927c7f8c5329efc23af872b9e46e22bf2fbf156081cfc6c256b80e073be0151c56111ad9f9a3a7010001	\\x48804824be87c8fb2195819e6200626db39a94665aaba066aea26881663aca4c5a65e761c715b3f4bd0851f19c366448bc74db73b70756a8b855604fbb258f09	1652725390000000	1653330190000000	1716402190000000	1811010190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-340	\\x302b7a70243b81a088c220b9de975c1babb8b6a9121cf3f6c1fd2e43bb4adef920623610b9159f24e562ec21bc27dd1f8e40931b4079f52b4605803aac96dc9b	1	0	\\x000000010000000000800003ae74ef41917faaee86f94ba7657980d5916864805222a79ef72fd392e0610339045c6e482d66c8ee8586298c6a8864f1be273d0c1d8639687e7aaf3543bd89e3675edc7ef598657e583afd49bf62c5034ddda9881f3d94e9fe23d58a5f788232c4160c7d8815449a1bc20a33e62895019cec0322b59c7b74e520abc6530e1201010001	\\xff3e801b8ff06d7775a76a780b4327a4f3513fca283a128b358f836d55f75ea44c6540b80ad02218036684ecefec6906a19b6ee78bb3c1bf94f2bc16340bf503	1679323390000000	1679928190000000	1743000190000000	1837608190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-341	\\x32afebe73b770f9bfac0985a6eded216fc7c4f0abc121049b5e531eb3f99c660eb34e86b34a2f3bdc146de5094e0fd3ef9bc6237c470a916cedf87477f633e71	1	0	\\x000000010000000000800003cf52226db2d4a692a1c0fb99de3cd431bdbdbdd8942a1a2feaec70144e0921e300b2dc204109a7f051a10212271c9dfff66acbad7c41c81a7f031c0d6486a0f2fbda8a9b8f481dcf07a426f4f64ea572fe06aa28567f4cf7cc88ba27cea55b740b7348086404819d870f4f5de116fe6e7f61467d19f35bf3f0b32738868b290b010001	\\x325c3da84fc141ca113bf6afc5e643458909c40711252d0de4056f921a9b579e331a7b3fee81e08ea8c46253c6224295ff8fcb57b14a97e08dbfd8b3f1fcb50d	1675696390000000	1676301190000000	1739373190000000	1833981190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-342	\\x33172291b4403e4a09832c00ecaa625155412f114afd2abf8e571b21425ecaac459e71d19baefb37d18d01ff1de17ebd68a8ce150b78df19811754c0a9786a8a	1	0	\\x000000010000000000800003c005d6b4edbf83704eed39a484c792335f9375e245729a856a947c923ae0b0970a7d132a76ba71c2867af6ca8d19ccdd54077d0538ae5ad9d92c65cbc46937897feac68d76a7a7267d8b82c5fa939cb45a1bf7e667bf594483ab1c4054ed5132461557467703ce636c02331154507fb07f3a4b64267b164e325adf29db23309d010001	\\x0abf5811310177002eeab748f7a193884ed553e2f629232cbb55e2f3b76e0871eebbc08e9479f1124fae7c4fd5e2160ac6c543bb5de812edcc06f1b406e37505	1653329890000000	1653934690000000	1717006690000000	1811614690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-343	\\x34f39c2b850f6d387dde0a19de98f9f71faf405aa8fbd2737586fc1c1335c3d71cc80b012cd08b8093d9309c50a226384ae7fbce271baca11edcba53caaff144	1	0	\\x000000010000000000800003a0046e3bb12c06d192a70e1331646040092fa32ad57ee6c5051eff3e236d265eab8d5cdc598a786d749eff804034143f3869ce2441022ee53a650a839bf9042f73a4c52bbba1f4e33910193deb7ab869d9a93bffdabefaef7ee1226b4073b2369b63b0c1554a8a7eeb9578a988b0c1b8e150de65b67b5c2150b651e6126a80cb010001	\\xfdc4c2b012535c6a2fd687edecda46565f2c7658962ac6e331cff95c1d150594fff044bda4aca99871c160482b9d063d125bf4b656658f27a87100e02bb0bc02	1659979390000000	1660584190000000	1723656190000000	1818264190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-344	\\x37cba9ff604a525e879b2027826df06a9a1aea0a5f73c7ffe619d985c136e344c6b7fb023b85c105b86304f632a900fe63ce26460377a405bc4c6fc73d3661c3	1	0	\\x000000010000000000800003d23d66fa853043c2d1f8b45811a8a32f1a47c53421ddfd0120e7d379ce58a007eb7137f57891be81cde4a829b5d4677b2126a4038decbc600ec79b5f468536a8bd43f70c5644832a96b62783fc49f40b64cc1a70baa861ef5f9e369c9f36c914358d620030017c9ad18ee861ff1b0a74664cc208ddb388435a9ff57643764df7010001	\\xadd00154617d7f175ad57cca26fd29603bd3654c311cc293cc1086b04a4dc56306f342cdf662a6f29c01d5a51be29ac1a5703f11b920c737fa29d539c12fbe08	1675696390000000	1676301190000000	1739373190000000	1833981190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-345	\\x39a7d1805e43663cfd32a963f6b45231ba2069df440d7634125dc95f7daeb6cf7108795d55a32431f4ace70cd7400389a7a8e24c3443415258260efba74203fc	1	0	\\x000000010000000000800003f9b1ac2c639284df36f128b76b6315e665d822eb78b4d655baa4c6e534a6496cd2ce9ac278cd2919c9ae18d6fbf95bc7aee5b7d7d4fe014fe02fc6daf33593152119f53cbd4874037feb3552765af748621552d6c153e7658c0ad00ae78664bca7c8e5e8c8caa32376b2a819abddf6b7a7567ccc2c4a4f6c281a5e0642a7e705010001	\\x1b9d59334387bc69615fefa4a293cc945ca40fb2ffac061866c751c9dbfbd127ba60cdf4f9baeca768a05aff7a18a95c75f07c32ba2069c02c8e2aa60040fc02	1662397390000000	1663002190000000	1726074190000000	1820682190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-346	\\x3b731dd904b5f142e2cf3e5ad5317dfa746df8f5185481d939c4c1514b0a42b5715348252ffc6d80e98dfe593d9a762e313c760ac81451e085448cd89ca8c787	1	0	\\x000000010000000000800003efcfcf494f100fcbef09ac0aac98abd74a5719af8b159ce2beb3c01f01b9efec99ff245b2299e0940f5d894d075576f656301ad725af01ec40702d841020ff6b944c371bfd0f462000c82a82bafe6326cc04d7e455fe5181e3f596e480a50aaaa71c3775f6ec0ad9cc09f31be8efc916bde128d9e2144ddacdd9ab009c619a3d010001	\\x8c22c4ca907c7301d700f2177b265331969feeb048bd0e5674acca0d1730ebb747d9dc1008e32aeb685c29563abf3e117fbc574b2e22180609d35fa75037400c	1652120890000000	1652725690000000	1715797690000000	1810405690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-347	\\x3d9b866d794045d008181bc43f5355f0b050cac733b3892ca51767ff9610df627a89d09036908793314f311dc88cf9b61651d31fc0570e64250b5e04afa4d0c4	1	0	\\x000000010000000000800003d34f534a71aefd9016c3b6b871bd5778a15913aa1de3cc09380412b9ca6d54944188cfb5ee2a3a840a97ed7929a0704535c1eb8ccbea6836c57079ec123acf75d284de1f767dd5b5cd16217ae7d26941a5d5c4359885509ed5b55c89ce06c2a5ffbbc7cd7e62cc1d16a743493185c5dad213c5f616a7c3bbc7df547263d95f5b010001	\\x2afceec070382b427257f5d8d4d3dd947321bed046781e53a18380f77e8462a68fa74c2eb1e12bba073dff888e0662c7fa3030882f34e6cc46045a2afbffd402	1654538890000000	1655143690000000	1718215690000000	1812823690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-348	\\x3f6311e6605fdedf47fca8330062823e57d257e2b63dcff89c47a2ec330db825c3253ef374e97c66a3ec4b307cdc99594d49160ef58bfc0e33806c3efee0e813	1	0	\\x000000010000000000800003aaf3d793b98b12abcf579f011e84d4af8e3d508b3daaa28cb9b1d9efd86aa2d21e038eb7bef6f1c68f62be4554916c977b365f8458396a3612f8d47be96adb576de6d4b1bace52bbd72567c4d6d89f0c3cfba854d8dfe0e966ae66fa12fd6d5e4e15a9b49f3ae755bb5c62a035905dec09ac7c7405c965b06041e84295de0adf010001	\\x858c109c874c0c4375646b3b81ba56ef8fa78ada2c39966f0d55496880719508ec17602f1ea9d9a76bb6ba5c51635581ac088e1324eadf722e722866bf5e0902	1655143390000000	1655748190000000	1718820190000000	1813428190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-349	\\x41c7f4eeb32c84c0ea6cadabe10396f09c42a088ac6840cbf9625bb1d3320f801b02851c9679e9dfce89dc15ddfb05a098c2d82ffd321213ec1e631b42b00047	1	0	\\x000000010000000000800003e3b43732d884529c67c1ca84254ddc70b6d55961e34f4f49884d5cf8562f33ef63065981db02a5521b01b8eba35e85bf632f1a6f1d9f2303763bb9219b7ebeb43b4497fb679707cabe1abe0fde6c5a6f7c3450a5754bc1e5b36c0cd8b384dd4bf94af1a855a692a89544e4a8c4e8f0d030d58f9ac1d8008f720c457049d8e9b9010001	\\x6dec0edaeb05f8af51ef74a72270d00426a9ddf4f0895c17ae761adef4336bf07ba8463923c196c9c7cef0b06d6b0e5a000521c419eff3c18e090bbe1d13a108	1677509890000000	1678114690000000	1741186690000000	1835794690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-350	\\x44cb89741a65137acc95e01514efad0a7b595fb444f2a842f341c15b75242d3ec46ae0255771e0f618db292746e7dc34a32409867e123a1b806d61159b44c96c	1	0	\\x000000010000000000800003c691a43a94be0babf85d76bbfc719b26e56ad36718fd35517885ba05699ce3d9404654cc83cb6035c732b9a562b8d7c748329d4621fb281114aa79f5dd8ddf85dcd58aa699ccf0a22aca8a210db2ebf8dde6581b6b64ad4212ef6f069fd52794a7f4ab425d9fbe2e14b3966e8923b0acfe5e8164fffadc22857bfe74fdc803c7010001	\\x5547b9cbec492d792410d16ab6240294605e3affca41a5e7db80561c2846ef4c5dd474d3774ca4b0b545a165cb3b1c4fe50821d6a0c58cc9d20dc2684ce9d70e	1678718890000000	1679323690000000	1742395690000000	1837003690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-351	\\x464b11d43097e8ec7dabe0feb964845c9620c40295143bec5334cb20599d1163eac6f6fb76720994428a53ef2c02bbd7f5167e2076cc2f0913b680b8b633e821	1	0	\\x000000010000000000800003d0b73aa760ba5e666475993e65106538c7c746aef5454e0ade74e9af13a5aeb7ead43af72288a4e2078af0362f3b6c3cc23623b4705332c7c2c8818b59f3dda3517716021057b447426c15abd7d6d76654f20c88b0b02b0e2d63711b34539425c8a7ee638162e4347851c7bbeaaada2f601d4ba25ea4002607332fe39b800443010001	\\x46a0a389eb44c9168f680d83a3fd6d5f3b65b4c924332ae8489e40a91288daef17b3dfdee9dc06f48ce84935cd3d396b029aa78bccbe07b2bdab1b20380c8c00	1653329890000000	1653934690000000	1717006690000000	1811614690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-352	\\x4bebc5c8ddd64f96938ac6e82600a9dcbeaaddc709540e93dbef247e3a238d7a779e2ff71d8a7feb3a816c0cd37c50b36a6263703c34180e3f306c45d5f01e64	1	0	\\x000000010000000000800003d861350bacd3f48fd2b6139604b290cd3855fb3ffbe270f49a5c04f61a32a9dadbba6efa95b58aa9c46d808846c4caad3c161e3c147ca65e65824aad653ad1bfca30fff04c6f7a23021cde583675e32b7dd446c4c4789e8306343d587288ac89db04cb95613809356dc02d4acbc77ef036706d7ce8e7ccc9fe8cd644e019f00b010001	\\x127ad0fe15dfae289072babe3d2f2a0abba91d3d0b4abffd0401e9a089d0c88589a6a43c586105e47e93489cb61a93427b3d5db680a864f7dffafe77864d6305	1667233390000000	1667838190000000	1730910190000000	1825518190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-353	\\x4b03f5efca411012ba2367150bfebdc6ca6ef58c1b22dea29e27e0a5a197a4dd429fdddf8e999575e584d5a7524967bc98f079d97b602243cf73d8738b204907	1	0	\\x000000010000000000800003c5d9e550b5d409c54266f86080c0d15dac5089185d238f07d1951b05a9234d5abeb70346335dc0c2c08a0021bc7390f778bbce447f1472c15ac275dae4c20b447654bd21852c652b0f79902921c1beab59980b06827a7addafab588c1ae3786ca41ffa2228f521049a1ed58b0fad738313a9232fb20ca1afd00343f11579f341010001	\\x07a3dd1aa40bd09a09a077b5b0997c2979058ce299d05afb0a7ca51a4b902786476b99770b8daa9f3f691671cc745c0125d345b3e30e7494fbc7f1a554dbb905	1673882890000000	1674487690000000	1737559690000000	1832167690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-354	\\x4b4fbd22bf9a30fec831eda7ecf153aa06018327a6c4be1e60283fa413c3de239b60286aa90ebf91e9d68d9861d09b49ca497540ce5a9fab0bed17645770cf26	1	0	\\x000000010000000000800003d0a18ac2312310a8a07934b8c9656385643b057bbf0f72af99651eef32e8a512f1dd130635417fdca6dcdef5dda0fb8fe36f3daedbe1ef0be3d826104be1f40e86e04f11a0b8a31a55965a66858dab3212a08cd8a4e1d34f1e9f76a20ae44d605318a30a02b66f87528312b991c85ad275d3f52e6b5ad72e4960007ea2a1006f010001	\\xdadec52a64228c061cb848d306cb1d00415e3bebfa67d214080c5a075b79f9b4c66f685b1ede799c923131fe217693be1d197fcb9550a967aedea8a005dec80f	1661188390000000	1661793190000000	1724865190000000	1819473190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-355	\\x4db3fe4d2219acdde5f39573464204d955c857c1f5d8805bff7d5e13cffbcebf59ad1e4226bb79d407b7abcf74ace227ac0b3fe24711c53d76317d6635f6551a	1	0	\\x000000010000000000800003d94eb4137cad6a2d1cef51de67032017266fa769af86f0eabb728a07fe2b86a56c7552e1faef99657c7298bf59a84874c2a3f288e8453dda0e906a8de7fa19e600681f4af4d49a3139f494309c97276dcfde8bb63cdaea7ba044c3aa99bc708604179e4f0d09e02e36d8eb32b963fa7446a8dc0fefdda668b8f64a31bd188b99010001	\\xc923dfad84f1d45ed4e06bf1cabf76c38858fdfbde1023a180c2b6354830d0e05c99fa76412b58f7c8024a6d7bff9ccb3bb969f2ed7b1ca606616a7c9ec67806	1672069390000000	1672674190000000	1735746190000000	1830354190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-356	\\x52a75ae48a0a7d4996f3bf9f45a1d461fcd739a7fd0ba941d3c735c70f5ebf598c2c965529dc8b0fff7ef635c9b278a9d2301ec78c19a61ca1a92c1c6fdbbbe0	1	0	\\x000000010000000000800003beb97f0210fae103ac9575078425191f8ead4f829aa28a551b042f5bcac246c66e059b608b18f7c34aec4d81094f70ab32455bc8eea978174b2a0f6dbdebd64ffc0f81039511a59984e2bc5ab8a4f550301df82daec4d85fd499d84a93e8486d2bed1eaae77cbcacbbbe747327f1efff594dce26ca333dc4b4a8ef7ece1d3b91010001	\\x49aa0cb286be0cab974754c9ce95575b3ff575c6de96f60edbdaba01b9be70bc822bb188a43407d4e9719441d11233cbaa22859f1fb2b0eace0dac6634e2000a	1666024390000000	1666629190000000	1729701190000000	1824309190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-357	\\x56d389a26c75778f613c4a5f30ca0c085cd95ae2786fbdc985557ce67bff7c57bcf876060a08e7dbb5bca862ad9a162a1cd41076af9f2273ba8e9206ac75afde	1	0	\\x000000010000000000800003bd8a38090e3c190855f21b3c4b8718702b100dd01d90c57ce85781cfa00b4aa2c719606cdaa9f1529712a8bbe427c48891c841bebb631c7dfec6e72168f3dbdd3a266f1f95e0e0188cce283127e6531bacc1a1503f85cc6298a3b3c5c9f2d60f0813dd3150adef2a4056e6ff8fbed6c378159749f46524de3de67789e9f97fd5010001	\\x25bfeb160594171fd27e00c9feebc373c113c251e6ada9a9432b9b1d1d2115d7e858bf75a142645ee1dd3452a7c1e5420dc5ab2fdc66d36645dd869394dd5204	1678114390000000	1678719190000000	1741791190000000	1836399190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-358	\\x59d70f6c59ec618da82c8ea2200db5b44bc8561d30102ab1c9fec221e2b4a6dbdb96ae27c3a9c59c77d53beb0754ddea49ced3fc942d0e11bf54efdb0c2dda46	1	0	\\x000000010000000000800003b81fa69b42eae103bb18ce44b122d889aba2d49cba8aca088dece74544ad5f61226b21fe406596e952ce0a1260e43989464fda9186c02d5afbb68cc8d5d412e7c42b582dec3d25a2ed19c86d6a3ed90e5ec65ff8fef72a64633054abf69a46c476341f6bd59af32f16592af276673677b1dda461cf441af53fa243148af446b1010001	\\x58c0976b0ff4bd7c2744a37799a1255775efaefbec42ec2a26e706fcc826b16f4e418bb902aefb1b7c8c71bbbf804d1acbc694930a4611b69a39b008f107fb01	1666024390000000	1666629190000000	1729701190000000	1824309190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-359	\\x5ab7e87e5419b314ec21197a23aff8f021422e34d2f583d824d893871ab3c74bb59a106f09cccc6194b911308f27b6010f9d425f3e7b89176ddf94819121c5a9	1	0	\\x000000010000000000800003cb0626c61d3ccc5395130259014beacd8b2411f0610e040d914ef2e6f6b2833397b9ad947803480cd4327748c00ea274fd6e9e75f5ab7d04f1d5b7ef1f3307c62b55f38789554c8defa743f3603667c7c4a2f0c8988c4ef35336fade8c3485ed447348c88ce507453b1605c5c9c415f0a4a796140158c3d2143469935019bfed010001	\\x7d59e83f54cdb4282180fb1aad32e3a029dc201c2fc40df01d56fb7ede2bd0ce2de76914fb7c6f0a1359990588fa94390b53c9a2e1b01b246624622c0958a20a	1656956890000000	1657561690000000	1720633690000000	1815241690000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-360	\\x647f0491be5c0ae87df1c6079b705926d0b4e4e4a291faea410f81c3a4a8f71dbecdff42c02059c1da9f46b4946d7ad1e009e0d3e3b2511590fbedd3c3b85b73	1	0	\\x000000010000000000800003c1cd0062268b404fdddfe4aa6344e1c12fb8834071b1f6b879fe9ef30dd807c2ba483a0efff9b4f2aac6e93f45e35efa58516fe29e9f736780169f938d013cd0632c2c0c3fa9eae5a2800b03b88768bcc03b75248d6b6d61ca649b05cd8ae90e2344f4fbd8f265679cbe62fe60295444d7b791483907629249a9bca382251f09010001	\\x13f446da003e94eea478811225265730f4bf877fbcd687eb9825ed5caf8d88a3fe3551166ec3d52ee31070bb5902eb95b57432be1f6f0fd26f1aa7d8a250e009	1678718890000000	1679323690000000	1742395690000000	1837003690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-361	\\x6a638151277f94ad71b1d2899cea036a6a707bc52b26f0f5a3903460a77f0ffc9fe3564bc6771785050b10de96c7a2766db32b991c0116bf630a08b25a35bc29	1	0	\\x000000010000000000800003e7075929e0d4dc9d9ea56e0e8c77313739261aedb86da7711028cb7bc7a9e39a82aaf79436798355c85f9f69926967c2aa9ae6aa27e2f919df0a04adf41f3f92eb99900e5670ac2e78c3286f28a15ba22f03a4729d5deabd60563ea686bc78753190faee12c343d6aecde19b5ce21240ec65c14633769ec86ee934fdb2cd35b3010001	\\x8d6791ffacaa3a4f9bfac6eefa1189f4f6fc09f041f027483a1f126930db79601d55bdea422d37985db044a1d9f990c613b099c1e672f4caa87621e180948605	1675696390000000	1676301190000000	1739373190000000	1833981190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-362	\\x707f55ccd0a6c6e892d0126918e42a4c7fdd48c1c6ef4de9f1921803d514d97ba9503c64dea4d5b80c23d754eddd6519dc7b39adff021179962b629c330c4cfa	1	0	\\x000000010000000000800003b800ab781c2ea05b0440a57b3cc37baaed6671eafa18d9f952f97e804725d37fc75e05c4faa7ef2c1eb6467a93962d5c7f2fa30e1ead9ec3a8c7a3ced16028ee00ab05d7a5c283f04c1e54100a2d3ead48c5dd2f296143ff32347d80012eeb37f079f9cf6943f0d138297db261255606e059e3c206f7fb12fbb30d3e5a94eed9010001	\\xcac668312808e62776ba934b4a870e99737d96e3b3044964d9f8d61a4021f5d7e41eeab5b92f65d8583d95ee5d0ee3ed5a364318d12d318184f82d71d7998100	1667837890000000	1668442690000000	1731514690000000	1826122690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-363	\\x73135ce22fe072b1d9f0df142ba5f87b5eb5b0ed4a2393c0d3005c2e39914c035a2541b9beb1a063658ec7747b1ff388a951286771444460bade91942e2a0b3b	1	0	\\x000000010000000000800003c3be444386997d87c901b41c03c8ecf01f42f57c21529a9dea1c6188af7bd3e9f7ca9e6dc53a6d3594c34936f0ae8ced8cbfba52b58bca2ef6fb19ea18660664ef23532220cab36697f91460b1e81f3d40abb5804b76304ba1673cfe1c26c2ea68f9ab5330894e604288e5786c442e56ac6812badacc19520aad16e7cd4af065010001	\\x3e49535caa2ebacde0e1ff9a30f95b0ba0d7f06a8c5c2dff77d4ddd6f38209790e47cfa79a6fcf9671ca90ce1182184b28162184ab73a7513499e1e6293ea409	1678718890000000	1679323690000000	1742395690000000	1837003690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-364	\\x77f71993b270fea3dac389e471a9dd2b0a9fec7ba3c305c96f5cde3779d611b853edf21f393881262ae308c36d15f98f369fc6d4ea1fc699f4a02e915c916e61	1	0	\\x000000010000000000800003e3928ef7e563f84d74cb3739b345d1a7037ce555e3580019e028dd94f02723839bb9f6d7cf6cdabd4456c057e1d6784378aa989d5242f9ca58fdabbc809d6c46f0fea9a7fe7ab23d73c46280e3ea31974ea277396998e1b5e0e8b5755e3aaf9ca14daf495d0812116aef49d0bae07fc569d887cd8ad160da8b9d66507793d7ff010001	\\x966fcaeb9d5c6400a3c8a03720c0e4f4dce1c776b422001ea802c30369bdc866328c3d103e8661cbf1ba985721bc98a408056f36cd12c0e427351e9f4b43a40e	1671464890000000	1672069690000000	1735141690000000	1829749690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-365	\\x7a9bca70f3848fde1b313043664394ce4f82477d8d7c4f958a55b5fa78859ff3a2cf80022e391348df22ca3ef86d64d554d61c52bde8ebe269f5da42fb55d5d4	1	0	\\x000000010000000000800003eef5e65463ae224b478206bdc7bf2f9f32931ed0b3e5acc49dd3bc7126816a03ef75a56c09b96c8892a48d2b6f2c97c4a988eac8c09b453cead8fd71f0f82aad5fb271f0b872555f5f0681c7436b2d78275562b20b81bf13eaa79efe816dcf5750eb05ab4daea108cfe99d1ceb981a61b2b66b542ae06afa4c8f23c29a470e9b010001	\\xb244bcbd38d09724082b10fbdffbfa23145676fec8d262c9a9bdd226b70aa7d5c41c13102d270a0ca31dd1d9835a9a1f17ee7864f968ca1aa30597701c4a2100	1676905390000000	1677510190000000	1740582190000000	1835190190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-366	\\x7ebf119fcc61a85b56944c4086ea8374e2f519f210a1b0b1a25c2db6636d23225beed192041748aa002b2849010264616cf48b3487200e1ddfc5f02b083b66a2	1	0	\\x000000010000000000800003d85220193e5a8f598e2d419e5271a4b30d0ba990417183efb5d2c45d5bfd0f73ff43ab97c5f151fb09f2c2cb3d2ff5f3eea8b24ac50be35c013d204fc1cee3c76e63705fa337f6753f10ed7a0e4e4317c2bad404a57d6700ee44453c00a648acaf641f86642d5f340be4ccbfd67c55afff8383c05e73ce946d18ae9dd4fe7ecf010001	\\x79c69bef6ec6736a2a0e1c1800463dc501ca823593808b0f39e811a95132c1f2a45b677f5b1a316c9f720c8b01b2664cad02dd575d205106f88c81609c963b03	1669046890000000	1669651690000000	1732723690000000	1827331690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-367	\\x80e3852bdfd6d556f688495e99feb615f2d09495162846c8b1876cfd405dc7bd66c0f1aa6b0298ed2067e128d29629ede22127fc19a3e507f88cb81d77c30fc9	1	0	\\x000000010000000000800003aec7797f40d0b908434295bda4616ac006e83ab82142d8e8fca4548745b5f5ab45d9ebdf8f1a11dcb323cf7181a020ee77bc92a0dbe21fb1471c2c87679b3b0d9322f8590af63df75f42149650abd0e9fd403ff5eea1dd5b33e251bfe7d20e327d296f7dc9d978aa1db31e172a380b4077970afc16700ca4e31c42a5b5161ac3010001	\\x0a847803c037227cf72ce8b238e68a4891bafe33c2b681bf730523385223fd2b4b3a0ee38e620a86e4bdf69a00ef7fa0ad827b594381a6906095df878d5d2f00	1665419890000000	1666024690000000	1729096690000000	1823704690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-368	\\x8027f2fafd786a917b7fb2863aa3110a7f8e4f772435f4bcbbe155af3b25cd0ada0c9c76d9beb24a6fb946b24c217b3df92b3c51c764e7693631de638a1bc305	1	0	\\x000000010000000000800003bc85a41cf64409b1e63dacd85ec85d365d4c401abf405df508567dc1c86f52d8490216b5c344c7abcdc7d4fb50a6cbe8bf516882231435e176be88d77b883cbc0f2b775443649346b695e0eb03e85207e2d1193901aed4321827bf7ffcb3925175cb4d1563fe93cd6c6c381ff7b3d4e23d53e1027d8fad516053bc0b8b1a586f010001	\\x5fb968837f34ba8fe7022a0bb8f09b5624fb8476a4f90dec29f11f4a92d683e91514ead90486db2fccc9ef02531ba92f0278eaa13687997ccd2fbc3e7b0d6f03	1659979390000000	1660584190000000	1723656190000000	1818264190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-369	\\x80af521776f9a40e65126b16f20f70dbffa03fc6c4d0399751580440a88ef35bfa1e83b486b1168b9116d064f1a4c13d6dce44ab30b0c9b7e4a15585ef6395b3	1	0	\\x000000010000000000800003b722c8569bf026848eb783f3a62e8ee5147780cefb80e828726254c730a26ec8e2e7a0255631c1a94885685c96b8174f6ac5259114ccb134a86d76fed6102432d9a4bc00f39ad8ae2e83c59c61a17d0eab146326f10d4cf21e8fbacb6186fb7516799cfae2dab19950123f7b1d8270ca1c31edeeba0718c813d8b5da1eea2095010001	\\x3ebd536d6fc850cc10bd14f7f5ffcc198cba66d0da5f53aabaa6a7b20b8b6a86d86fb7c12770f254cfe88e7715297042f39ba3535c41d6cbccb90193c1cea707	1659979390000000	1660584190000000	1723656190000000	1818264190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-370	\\x84abe6b0511374ac3709eb959d32236e6929cb93b46a3e30f19fa069ac19b56b23c167ee36ec227bcbc8c3fdab07be2ed3b92f673bc2c1426807a5ec34c42c45	1	0	\\x000000010000000000800003a3c2952851b47381e177e513f6097d90b95bb6ce9f1e52b986dcf09d35aaa721cfd9b614020a30e7e071c842bae5695adb2996762ddd7472081db645ea8522cf2c5031784cab3a2310b357307312c4ca5ee34e4641abf3f3b792f73f63203d49763b9b024e2d15828edbafa791b599d7582bce991964e995d2db86f5e22b988d010001	\\xa2033f8a8e35ff264cfc59e51774a0470ddcec3626abdefc440c79b465b3e58e35a91d5e102de5df6c6f17a4c67c983e0805fad7917dea5259ce5165835cd409	1653934390000000	1654539190000000	1717611190000000	1812219190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-371	\\x88a7e9c791ba7b1c61852bf36bd5c639f85cbbd306cc728547e9c914bf128a26fa437b86aa3860ad5d0343ce961b5c34edc153aa6f68609e9abb6e3af9adae33	1	0	\\x000000010000000000800003a66f03bcb46265516b0835d8c01e527c392a8bd8a508e953ee08cc5d712d1504e79b3bf8d9c6cd22faf2cb8e3332b9fd59cf0cb92028a46232c615bb6393793a2afe7a29d19d4bbeea94c9518b2099b86eff6a045b5d27630f5e3dea51da3947604c5faee2eb7a5a14821514f21cab8e21e650208b1c3064031c0e9b99353add010001	\\x1fd34d621694506a551658bca05e12748745b714241998e3bdaf01fd425f1a95dd1d6b380bad651e71f16e974467acd824cde9a979b6cb20c91954d916839b02	1669046890000000	1669651690000000	1732723690000000	1827331690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-372	\\x891781c9b464c40fa18bc9dbced8e25f4c701275433f961640b01c1cbdc4753a8ed3adcfa4830664d4d175f652c804ae9adbf21e77fd4256387ef315c71f4af7	1	0	\\x000000010000000000800003e9169c9c49ef3ab39bbad3a892c269a63c3a2dbd31a5b596c7becdfddae3f44367d9f1572b465140df54703f1db8730b604b44d712dd806fed380e3c8fb94672c1c7a82bd0f3f5bb0e6a7bc4402eb76481d1c813c4bbd526fbb21dd247f6b9b31a213e76d30e039d2e00577032549e91c6fb9353e21021123836896d06f672f3010001	\\x5684b5f21352eb2bdc533e4f9cf4ce4cda533b5456272725edc34a8c465049e26d8a091f9dab7f0b03ffcc7dce8d87818e2da3246e5da051da8094750debe807	1661188390000000	1661793190000000	1724865190000000	1819473190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-373	\\x8e03d43a0615c9f3b1133e7e5168f7c4ea5f6a9fe011e68e1843b3c71018c4c5c49661cded022c54db88b2e360676bd2e8877091153411694f36b57c4c046d8b	1	0	\\x000000010000000000800003ac39141e95e24327ee11706850b1dcd40d070bed783f15e1d0c8d925e1de896218ac4d193710da5e12877be3a8404b13cea0eda5ce3ebd6c66a42c645ce5037d16126920d90e16cae44db73e67c509598efc9e697aad4e5e5b104cadba405292ff313fb186f0b7410ee5f2bc8de10c0d72cff8aa80c2f49b7d8f06c6f9bc4875010001	\\x0e364035cfffc3d500ae43b44f24b127b036b9357ee76ea5f13316b23d56c71a32da9c41866e9de7411aad0d7d7a972a4362ee97fc922303e3bc4d11b131a000	1658770390000000	1659375190000000	1722447190000000	1817055190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-374	\\x900bc19cf81db220ad878f9be02b09900165b241663d3e48c58abe33a437a0c6389d7ca814c7ae3c9be8929d04d6a37e2a0370bc1d0c2bb6189bd214158d1e5c	1	0	\\x000000010000000000800003c2c836478ce2ea5f6a5a492d89f758b8626b2c11af76f988d06b0ea6d0ab067490ad4ba4f0f54935c3e2238536f111724c6a91aedf61e2d1395c6a029a39107732ccc3ab2353b38eec43a0b95a4f9b82ed72a7e320f3fde782a089fd8716eb9cd75512ebc408d277286082241576d2723baba0921dbc0d2ca9a8d20832ec943d010001	\\x03065952c722e8aae15fb1c2aec840b19ddc9576866c32a7e532c215e726cf9ea9d56f513ad085afe6658eed304e4e33c160b2abe59dd29bc7a28ae19c7db002	1655747890000000	1656352690000000	1719424690000000	1814032690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-375	\\x93d3f17e3f19942e6ea911b5eb4781039d02016e83d3c1e66ee3f7217ad14936e95deff4a2e6024bacb15f773ad10211d11bed51936ed511afc8081e0a4a296b	1	0	\\x000000010000000000800003e723cf239c412ccbf739145589f99c9950fa971b61f180b6357edf544fb7b51f9ae48f7f2025693d9ca3726a4fe7b8c15f15dfdac6e3aa857f5e28dc820f32013193ec0d6839a68ebb07d6556d086055a6501ef5fc80138aa760b70b69aa0dff9203b2d9d1dbe9b4d352b54ff30520c55789d083ff20ed92cade0889808dbdb7010001	\\x5b039e42f6c44ece22d0ce8a04cfd048e4dc8bb9e7ec9d04a3365e16cf8f800a16334c64e4a2ff136caf6ec0a0355bb0b49eaf9f12b010afa7b394db6381e200	1670860390000000	1671465190000000	1734537190000000	1829145190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-376	\\x97bfb4452a9ad76c60f38340c34d844327c79eb010a5cdeea926907b83a64f13daac5dc7cea5ffd905cb440471a269920191b7e082d6687e908eeb009d26db19	1	0	\\x000000010000000000800003b07b1457af908801bf349cee6e95ba5de63153264a7a84c84e6cb340be926a324589dbbf810de657c48700e29e2ece4f90a8925ba58032a1d60f7cba6e1fbf70dff9638c8712356ac29ebb13d6dabfdca626967d06930002b317900bdf72a9a60cc255107231ce3757f03e7163e7c37faac0dc599c8dce026574c900c4ab7993010001	\\x2f503dc1d794e680fd815b892b6906950f94ec3a79edf0865b15f7d99f4bda55f043cc97e12d7111a7628ea815587c6f3a8d5d208e4158b363328a3d30810c07	1652120890000000	1652725690000000	1715797690000000	1810405690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-377	\\x9c2343a33206c5071ae45fd1fcf5474cf880187714b9d5066789ea3640315c45b95bdefdaca54a1eb30a3d55ab7aae5a6563ccdb88d2f3cb217d4c9bd5504c02	1	0	\\x000000010000000000800003bb0e032490d26e5f513f0bab772e184e03a844b1cc41d77a830abddc1e3ef3de0a813b65a1c1d4e364aaf217524cc015aeb4a4e1bb911ccdb54107a4b985f851b130c1fe2087a20053b25dc54c82a990f774cd22e9d2c9a1239f0a35751a7c72146bdc4bd6dba5cc37bd22682fda2edcffa5ee64a6bb3a51dddba5e11b99a555010001	\\x116d9a32c3c9446796ba25b5674c3d348622d61b6fa67c7fc8c5f42c65e37cb857e2099c8de901ca5d8772c92bf0ba75b2584c312887a54c4c2247a40d274705	1655747890000000	1656352690000000	1719424690000000	1814032690000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-378	\\x9c9fb6d0226505132714c131d60de478e0f54e5f5b4d37159e235f47025243c73460aaf0b9e6daf52f57690db00016d0607ed6eb8f878c75bd5aec080fbc9b80	1	0	\\x000000010000000000800003be9943e5d514163ee9613b519b0e7f1fab07bd6207732cd08d14184ff0174c84f7f7d5e2a45444890eb168ad4947b84f315f857891938963ae8e5e6efd7a5aaeee80a244343459b909604d6083aab5ae7fb49979af34816273a058beef1ddee1e903c3d63e77aafc653dd69967261de0a19d2135bd592a1c7dfc796079b1c3d5010001	\\x88ae9c2f2debf72d1eb19f310504d0fb5bee98d64437bd075b74717a3a3e46b16f1abbaf9cd01cbfa9da5f5983e2acf8d95de12447ef8991338ab34e2f136607	1681741390000000	1682346190000000	1745418190000000	1840026190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-379	\\x9eb301e4146f1709af1d5dec834beee57488e317e2a8bbc5847e00f0ebb3c994dbe26b042ee9191c1b991241d3d925d04b8f9fa27608ffed2f7d317cbbfc2393	1	0	\\x000000010000000000800003b0580465893b95f33af9febb6c6e23d20f977340bc5191ece326a2df94c21e03868060fb2458fa0560dad7cc29ca5ac239ea228620b1b0442d8e218b010a0c6a8040432701842490ba2866ed3f01dfdd551a6f833c1e821a953d4fd5fb48ab2054814c0d385e36166b3beedd6f778c83fcd5e1b946f09e0c747e2f9d6d5c2c55010001	\\xe9aa5537ab70875612e322c195513830f943f6860c4d90ee22d9d72044c0cf3b76dbb2f7678da66eac12569db8dfdcfe76ed948bd3a1113d182c9c82bd972b0a	1678114390000000	1678719190000000	1741791190000000	1836399190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-380	\\x9ff7fe431fe540ee9bcad478e04011b5ac25b5021b209a749f9980a2591898a0545ad161342a198908c3a066ec083f39176eb0b674412df5ecdebec92c5ccbfc	1	0	\\x000000010000000000800003bc3a3f547dbeea09fd86c7645c97324deb4d020f2e5dda6001d3dd63a820a4f8cb5ade8af4bc4fcc72def5eca98d59941bb2b9904fa893d12c717048f36c975968348d43eb38684b29c8176b727e4c211ba80c18722346f2058fb7bad77c7ccce3c4397d83220238c5521ffd64cf449ea1c9ae086afd8a6220e0056277b2af51010001	\\x372063417a70e9072c887dacf8a8802b1ddfba29ec6865c6c3829a98fe168d05367727c9e1c0c2fa04d6979e35393a4ec04f3c7b7fb8ba214c25e63802736206	1651516390000000	1652121190000000	1715193190000000	1809801190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-381	\\xa6ff8dd7fcd3c1f855e25e0412438c9c8e891e4c6e09a522d29cd7cef2dc83c5a398bc68e7b5e89cc5b592b0c089db7b10c3270078fcac200fac661ea8d0cb67	1	0	\\x000000010000000000800003d02b6ad344fbe2a940fc949f213f794b5d5dbe54cf19dfcad744f0714fae8d2cb00040b78ab2dd92e5ac7d06703289f849d00fe159562f743f1543c0dc4b195b0ca171f53c46a506d165c3188de11ce5cb9f6e0e0c777bb349f7cec2c4f4664bded3413f5e315debbe2705423a30facdbf2ec677ffcf8e18ec8d02593ced51a9010001	\\xf31c270d52aadc07228594104d027083c685b5e419680d634f6c01facb9af6ccb0c43dee5d846f05d4881db4331eded2a73e3b9143e8c979ef91ff296b793400	1655747890000000	1656352690000000	1719424690000000	1814032690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-382	\\xa84b9e12660de5cc923c7f3b2e7542dc019b15d97417d78e1e6c8ef6c7a39f1dba6554e1118f652df8c356499091d9726ae292121640d49b668d71154c7bba6c	1	0	\\x000000010000000000800003a97a35321b835ddc6241d9921218adde8927d7899efdd909bac933044cafbf6946679c1f6703b1b13e91dcc72038d1daf837e41ed9ecd2d21ff373e6e3ea570c61c515ea8442d4637949825249b11c792756b84395c9298a3026d1c96b6e84a11da245b8575fc43f081af9600a994e278d5f8226169a8bdf611c6aa8b21a626d010001	\\x474209202703600a4d69a2400f908fc6ef747c4f165f119943d0c582249c1f1bc2599a28090c5a4c242a5160865230bdf608ddae1d277d459b7495baefe56707	1652120890000000	1652725690000000	1715797690000000	1810405690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-383	\\xad9fca2a7d4655252e2584f8a41481cb24a65f4df9700af534c6cd34332e59a7b2a12b5970c5ab9b5870e2be7ac410e007b6ba3e07de1b5aabb444d54215a25e	1	0	\\x000000010000000000800003b31446f7c439d8dfe4ab51927682e451f05f1507feae716f49705143d994cae7565386a02d405679bf4e1cf1728e6370ebab4dd17ab4d805651f249b481c6bb0275664de642f2fb5bbb2444899fd0b8aeeaa3ac0bfa864f8ce2158a1f4a75d6764b9798e609e113bb0796cf566bd1693669e44ebcba257ac768a5687194d9043010001	\\xadceca98a0710d0cc2c708639f8ba7eb5416abf57dbac017c5ed433b559b69dd27461614268c22cc29cbd8543817c130a19f35c952ecc3655e45298f9028e205	1656352390000000	1656957190000000	1720029190000000	1814637190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-384	\\xad33a9da668e68c4f867c65825a58aa5df13faa121d878a3f8bf9ccc3ec2577dba44b2d76ddc770b2f44c05fc45f1e211d78806ed937d5948c7e7f73a24b2ab2	1	0	\\x0000000100000000008000039ce5fa44a84b89bfe63f912cba062e5a662c6da02bb1f39ce25224db0dd4a314cf3eaed8813d7adf49c393bdc86c6cf7b437d9ce9d4fb184c907d6f298b811f0a234ddce19d474eeea007b341c252c3b38a314c4857c70ecb44a7e7a0bb0c1b49837b67317253df7c4621685b547b5759017b27999821c995f04971168f789c9010001	\\x0a4d133aa5b61d3ac4a9762ecd9e7b1c554385422f8c6f7647beac168d0330ae4ed1b3b4522ca5bab2c3b13de1d09f265d271628116aca6ddb553a38caee3b06	1681741390000000	1682346190000000	1745418190000000	1840026190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-385	\\xb29facaa2c741836e7ab62726fa86acc8a1ebc6d4d5679ebb3fd607661c06905b4bbb5577a4fe529ef89e17f958a6afdf18ca1bf324aae7a8b1fa6e872a8cc40	1	0	\\x000000010000000000800003ad51b57752a3bc822b41bdf4b002890323a0bc0e36ca81d44e369205467696d5451190c0609c081c38a97e35a59a5c482328642503783644600ec26cbd04906dc54d396d0d1abe4a6e92ecc453a2fbb91afadf5d2706162f03eec2e381f7e9fc534f25e6bdeab831336f8fc484e4acf74cb29516448c5b05e8d33fc22b59a413010001	\\xd3fad7e0aff7e3f8cb0ff85d857aaf00eb357562938737643a800c0d022b5f8b7ff4b6cef01ca45640155d79db7b3cd9ca920dce529ba409ad6514f8c4440304	1654538890000000	1655143690000000	1718215690000000	1812823690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-386	\\xb46772ab06272f57135b6220e701c91ee03b9863eff5f97418e02f9828212085839de7e3c6c9554a184307bd9db56f2c3878579658b00016537d6d11d5457417	1	0	\\x000000010000000000800003cee24eba5740fa95e471f5f735ab131e8a7813856c0005f5b9be2c333e496fe5566ea766b2d0f09225c4ab6693afd999cbac60cd163aa2be02934add41535a3671d472e487193543589e78f3e98cde23d5403b704bd7f7d87ea9a86bd71c41638b9c00b87142138ee1aeca5b42a1044617dbccee5b7cf723cd7605200ac104dd010001	\\x300b4888a982da3c9cc39feb3f522c2ef4c9578df4ec4cb747fa734122989b1588e7950369e1a4620c7b47839a1226f4a0f22fb79cf16ed8950ebef31fc2a70a	1676905390000000	1677510190000000	1740582190000000	1835190190000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-387	\\xb627ce8f0d184bc9c7f82c8ff94d307ee385678982ce63857cbb2d004feaba292c7f0da0e4dd5481a780664e7229841ec5cd839b3c22b0c73c304c86292618cb	1	0	\\x000000010000000000800003dfea19a96ebfb4654274853cbdb74a336c79dd37efd309dcaf020accf47d92a439035f2f4a42021eb45cd89eb0e39fa3db34cdf32697ff7a4269dca87da66c3be3dd725d20d3ec5c17702ad849ec1d2b6097c99a13a066dd8925b1c1553d13fe038e467dfea808217ba6d99872d282321b64de700113517f0685b961a4d0ce93010001	\\xf091b6e83380dbc619d9d4ed60bdc8a3dec96bb6c232067d88243d20cb3745c091d4ecc6114b1b4ac312f3413916cd616f15a226f8c556bec913a59d83bd9604	1674487390000000	1675092190000000	1738164190000000	1832772190000000	5	0	0	1000000	0	1000000	0	3000000	0	1000000
-388	\\xb61768dd82be473152151b4d2048d69bdec860c56b9466a502dbf058700c5b9180cbcca647e69555e90aedcdf9a61275b5594df159e0d77bf46e3329bf08542a	1	0	\\x000000010000000000800003de0ce9debcc485cecfceabc9a7b209474577008ee2c2cbcd503f2ba02288f38f4d69bb0cc48b6806d25dd6dd510f56be253758e001ddb2f26222ebff3c1c20c3575518d3785d50bd5e6a3be26b425a6bbac51d356f63fe4878f88944bdff6651b4edaf99c8a5cb64f26c502e60d30efbb96ed20c61af1db15529a0e92a4f9f79010001	\\xdba2f54d15e1f119bb7eaa1f724319537639e41c8f5c595bf110495c2c26d6a631d23d5d507d35e061039a152d19b2ca248ddce82a848df3eed80b88e669d404	1673882890000000	1674487690000000	1737559690000000	1832167690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-389	\\xb62b1649f9a49b83bc01b423ecf298c2b6fbd5964898502fd9b47bed55dcc912d27fd6cc88d6932f6170921e5b60a7bba275a89a5eb01f05a8ffa45273c0d962	1	0	\\x000000010000000000800003b70851e5ea1b42454f292fc75ed791438d250e828baafa6b49f594c37fcf31c98821ce8ef15d777ef8d63e1f81fef95cc05327b2e6a0d5190269efbef2d12287ae0aecb7144bbc19c80bdf523289ed4584e036c976b06af21777fd248191bd33d87413190027787e004885f164f920b7a64b74eeca2e7ee76944dbbad3d5b191010001	\\x9dd2b64ff4fe96387a3f37c6197e2a68f48727fcb4584b185078844535d1c08970ca710508868aae3ab9b4f02ae9675e16c6b5eedf472888d3e2ca54f367be02	1657561390000000	1658166190000000	1721238190000000	1815846190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-390	\\xb7b73f99c01cbbd9b0fabfd33ae9338903385563d718a5620288f1dc86ca6c9ab0c71069f9f4a39715e944f413d8081a234f05eb7a6dfb38dc900b27323ae021	1	0	\\x000000010000000000800003c5189904ce30a5f04ae306a750497edb0fd4811a418c891cd1b047ae5ba30eddeb939c17e5ff731dd7248d9cfde901c0d9f92c2ec4172b342c5b6289451a69fe6878df40f5921c2a66869695b0c6d43c779cc76d76eb67e83426287bca31e9173d5b346d8c438947837d88101de57b882bf85773a5865055633fe38817920e9d010001	\\x4669be9557b5db18ab554718734a5430172502c20258e7cbf62fa6d7f999f0d864f24dae5534f0037dabfd60ad3a614682a9cfb1aecabeac667d246f8467b807	1678718890000000	1679323690000000	1742395690000000	1837003690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-391	\\xb94f77dd672981a9d6e6e667f1ce1aa58018026eb6d2f5aaf3596777d64c1ab1a863d3403d80e20c97ec39970a1d690a5f8990f98dee3aa6e63209bcedc0c603	1	0	\\x000000010000000000800003d2f1006e9ff1fee0fc569186ffe3a60263c6020d143ca26aa6764974037ba8e82376069d91893ff062b7b1867fad9730cb6bff002cb9a7dbc736f06e3dd5930e09c3727bf25c3505538974c6dd6751ff29aa5c940b261ab728f85e40860a8ae0a80590931ad314383ece12de2af72e438beccf046f26ad4eaacf1ed54e5e51ed010001	\\x5f3a223a8ef2f01873fe7b7b3f81bb2126090fc291c29aa05e7eca47c93248947e9e6f3a3eb5cb2a235391a628ab4a00eb8e9f5d93ba258d1fd0900286a5220e	1656956890000000	1657561690000000	1720633690000000	1815241690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-392	\\xba331db60d6f74d03fa9690b368a811ce05d3b89d159d40a3f176d9e99880e7bee0ec56e816f1251e33d9095c1483810cf48f4a430138d107656605a7b35f569	1	0	\\x000000010000000000800003cd4d8c5a3b94317a1bc2267023dd05104d1e086e9efba2e927825b21b23188b9883581b29eded874b53064f066996624437b055cc0ca2fcf10ce174e0fd1a814d3a701f6b4b0feacef6460cf65c05b07b8723c8c293a7e9038cb2897678b5794218bb9739ee1d0c9e2c0a5776e2117bedfe4b367b1f9238fb97561e85731da5d010001	\\xab475d473bd597d7ac951ef10454ec1b7295e8d0fb837b70b48ac66b77110f943b75e05289ef1586ee64bd36d79bb6b35048c8656a1e4e74bbd414a104fc8101	1658165890000000	1658770690000000	1721842690000000	1816450690000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-393	\\xc08b468630b98341685893631256d349a56d2bbb9d2c8fafb91a5ce1a3a50471dbc7a7b828b8c880cf205ae6affb12208f0b30971e42914878deedc662907c08	1	0	\\x000000010000000000800003dd966c1d156a43f8a1fe2656722ed30b28ae8274f776e91d01792fe0c8776aaaf8f27ad5d181497700213d7af9bdc70fb18f42668c787b854c379259c6cc3a63d0d682642b77277ed49fd28ddfa70cdb14e9b9d9540343648913c3d431dd156218f63d79bbe0ffbedeb422b15701c31ff9e482edda1f163586162349373798b1010001	\\x787a2eeea0e22fbadb7a0368dbdf0850f192e1d90dc53eef8f7a7701bec8707e260db387317913ada70e8ee25ce90b3046559d4a0c063052a5900ae369d2db03	1656956890000000	1657561690000000	1720633690000000	1815241690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-394	\\xc2e3dbb90172f70122aa6eaff6961348894a80d1d27754e864dc0e22041ac9c88c5c3943a72641a5de88e8db60c3abe45460616d47394fcf037eb5ec12d43181	1	0	\\x000000010000000000800003ddcebd7c8d143475a05a16db1f5ba307ede35dd75c95ea94d3be42e0dc3e7ff3832df5a2755ce7cda1705df22365d9a34b8107453d81fcf38a57c34f6d3b96aa2081dfe84c8a212860dce3c9922f00b3a5fbc32c669388750ecdae1189fb72dec8a6339e31f268ca0cff9a8d1d1158c092dba6fdeee29fd3de3a6f8460c990d7010001	\\x6fc23dfe8a077a826119b69481ef606f3770981313f0d2fd5eebaceeb76959bba87d73cd06de800b3a377cd8340d83f3bc37716acc733e7b0e02cd7c82cbc603	1657561390000000	1658166190000000	1721238190000000	1815846190000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-395	\\xc3fbeb52099bc6d8df57590289a45b6257c6d0619f0a30438b54447fb1da82297491b473d49af5e78114dcd13494008e7e61710eb4f6fc804339a617e257c983	1	0	\\x000000010000000000800003b719d287e123baaeefbfa9dfeddbf3d1e72c680e570466a1246e5345dc264eb26f61aad728c103e0284c49dce56ce2c91ea9020a4fdfe538572e93eb2f0a76321b648264cbf5f359de58e0807178b2753f0ffccbcb15c25e6e687f2d63d60ab86b4c19193f9773db9d72ea3bee597bfbd0b19fd2ea849625bbacec528e854f97010001	\\xb778ee6e53c6951b58ec4170e233b2d5fcc95650505e12855bd7d677a0a6e419f1fa65beff1bf79f637646ec136cf71d7267cfb072bf128ad0a1666b6b0ec60e	1674487390000000	1675092190000000	1738164190000000	1832772190000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-396	\\xc9e7ad6040efacc22fbdc477f289810386944b413309461342e603460f6c3fc5f2ea310961c1cb6231513f1a3bfd266c0c47b5fd487251e788a2a3d123b1281d	1	0	\\x000000010000000000800003b9da07f70f304e305e8a1fb94e0ae80ac2c22053dd97b54caa7509934cff5086c20ea9afb5167f25cf0ab46d63083de0cea5a1951827577b8434ce62b1dd2a4dbc9603db445968267a770f0196d48955fb2ad5ab2d13f4d1e3baec9be4ef4aeaa4b6d4bd7e7fb3f132a8b005a92c9adbd1f4efcf9a4a1bf45b94fd876de19a05010001	\\x7866a6ca728153cb552cb9d74ddd890ba8a76283c4127744153dab5b155c755489b853dcdc4e6846ad733bd66a30c88c9f5d9f8e32857a5e162ef5023d0cc807	1661792890000000	1662397690000000	1725469690000000	1820077690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-397	\\xca3314e35cff85b65b394b484b9b5c134cee8dc932549b0562a5fb3939c901594ba248b3915a3217ebaaeb2ebd7a4c2786fb73dc01112b9ae005a7b4235b40f4	1	0	\\x000000010000000000800003b03f33cb99a64d527baa4bd92808a015fb58d773300ba9a5165d30fb0e4c1d20a3a44f380acd941c4b7237f4ed4daf2d2e339373bb191485ac29a1ea0c235efb15be6cfc1e644d29c54de40a45a8135d48352d7a854ab5d7020af122de6b68ae6a839f1fbf4eb21244305fc00b5cde278a8baf451cf7f820e2e96ea1c6ab51df010001	\\x1dd1cf90a49b0300d2220992f5cd3b4390ed8db748ebe54c71adfcc4a6d14879130a0f5a25d5b990d521b6ab72490740aa3d464b8b81f8c7899af948bcb5c00b	1663606390000000	1664211190000000	1727283190000000	1821891190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-398	\\xcc77df80a38b0b3749d1aefff55b436e28e2396a1b78353041289f31122a3d0df117300e61be621a533423c69f573e861178580efdbdd8bf4240bb4e2b1f43c6	1	0	\\x000000010000000000800003b89a472b22ec1a95d53e32283482e635c8a7982cfd1c8d5f6eb087f3ff154b6e624fb877f63f311df93b3790e9ac65bcb7dd30a74c8969b6f216baff047170a2079e1735b25b8dc82a1c9da5437de69ab147c5d7849989689be182bab5efc5853ab7ba147e349d96d4a7cf714d53ecf25795ae5889c80c95466a2337bad64a5f010001	\\xfc11ad007cc0f97da6cd7be0e334984541b2b16ff400e31e892922e98f161c506fcd1066851f6f200d2f198ae3b2dee4d81b5b56788ed59fe71549a2f5c4750f	1662397390000000	1663002190000000	1726074190000000	1820682190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-399	\\xcce7afea9c79ad97190e013705d75d50c32226fc7d6cb467ef423a74901ff3ef1507f6aaa028e0187f902b78d47b9505d42c0515c07e787986205a0ed7dae81f	1	0	\\x000000010000000000800003b2e6c3dc5f191494f76631797576269b1ecdd1ff6a7df1b6362efbd78ab99afbfe758bc13559dc9efeecf822196bca676b0d97de078caad5e057f1905c557bc39eb4fb4878cd748ffb2b1a718c9db60f4d904347520ee01a56e606acb830c62da30dfb00f6c95b691df7fdf42d42d8cba287d500c1e986e022df3554b82ca943010001	\\x4bc30ecc83b41dc7787856f85379909f86a190dadbda2cabbc8347fd377486ded0c1fe0adf740cbac6701f37bb39be09df345b1821902617dab93f9af1d8f907	1659979390000000	1660584190000000	1723656190000000	1818264190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-400	\\xce6f855bcf6e106e1868c1e27a793c4b740d2ef92934326bac1d498f4f9982efaa8267a574dd31a0d944c99c819138825ed9e3e5a9d5b93067358e3170badc1e	1	0	\\x000000010000000000800003d6e1d5334445f956848f2cd9717b14b88e627429753f52ff6ba1684df4da2878ae008b5ce2a9c8e1e509d416f7c3121808e4f6684825ea4fd176f21cff1dc346713130a34ce6516ab01a6505a135f1b9aca163adc44829e6952c0f6357e2eabc9e874e7840d0b01af533c4c4eec43ad725a62eabf4bd97b2ad3c09422ff78131010001	\\x5e39e940b06087fd964cb6833d0e5c88cd8c553c78a9676ab49e096345b28dff7b0f094c76ddea4a7684f9e3f1666ffbfd6fa6cb0a0e19c8e9328a215b323c09	1653934390000000	1654539190000000	1717611190000000	1812219190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-401	\\xd3ef74be92c78c6627a0b98c0d2f04fe3529900142989a5dda7a30cafd6453a7c720979aabb8f7eb9b6300af84700580daccef8cc576b57b851689c4a7b13f1f	1	0	\\x000000010000000000800003de8f2f3d6610c98e87a87bac14e1ed6f31840f21e657769f9f59c3cc8d883f0db9ac7bbb8f6ab5485272230410163718996e29161f6293de2fc609e34251ea4886c19c284c10ba18206391583a20b9c2fa93e67d5ab9b516652ac5f17755c791b2100c244032157fc7f9329a4c73da9db7fcbee175ec93eaa70391216546185b010001	\\x85cdfd3513363c80f9a2579e5c90cbbb8494a2445b85a9eda3f8bc019f1ad6519617c3bbce76234d93fe0117ce02099236e31e25612c5054c79ed4391198f20d	1652725390000000	1653330190000000	1716402190000000	1811010190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-402	\\xd8d7a86c1542276b9798f17a8c79872ea3ef9fff457401b39ed843d63e9c53cdb66dc12c65d9a21071bced6aab7d496ced62080a5f2210f95a3c54f52ae67ada	1	0	\\x000000010000000000800003a8a44d2cd247c0961a196a25d51760696e2cf5f157df6f15184c034ca1a57a4bc2b0d8c33becca59654909cfcc395b6e2207bb97848d9c3168046ef80311620474fc42b96f10acd38e50135f4abbc1c7c6d91b00a6689329852fc187039915f69747cb9cf2a3733e20dd020343b2d310074361a089b50658b60d938c1ccd64cb010001	\\x1265a96df664cea6a7ed8b8d059bae6743f47b613ea71145bb74a6501a3f1cb8ba1591d62658979b72437e2e49ab4b0e3bf0505dff8d5ab3e810219388666c08	1678114390000000	1678719190000000	1741791190000000	1836399190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-403	\\xdc83c4f68e2c434ada0e7bc92d1f3eac843ebcfb201e86b0e01583d2557919a7078fb72e9fba844e080f665b5a47375e748eabb45a0bf1b6148409e9adb6cf32	1	0	\\x000000010000000000800003c47fffaac6a7c5f091ed0430388d4f270d7d8f3d7f63bae322db5488dba90069a5d9e5872c0fcd745365352989434aaf284514188b7ddb9c4a146e19cb9301b974b95144bd269e0aa0f2a03808ffffd22af8d02b6bce63ecffb58438b01eb18cea420b3dacd894d91638660a6dac595f73bc662dc2c98ce90cc7c5abb91ea179010001	\\xba545585494b1d1961b02d4c0d5da65a1991ced384a5746c9fc376ec62e06c29079af2aa785783bf43afcd75036950c095439183dab274bc157c9ab3e1308d04	1659374890000000	1659979690000000	1723051690000000	1817659690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-404	\\xdef77e194dcfa7e065f0d7a9a1c5e3f6e4fae4ffeb3973a24ba8434de2dbc10c55b5b5c078bbb608797ef4c681363dbf5c0e03e6900930642f428e746999a8f1	1	0	\\x000000010000000000800003bda4f57e18135b1f3198180ef779e797162561da57681d1071856273a3c32a9334438dc7764b07c5ead5fc920e6e84a29a34772a5eee5e0ef4c5ea39bf3d05abb70d34f9f3bcd987f3b8b6091de01627d9778e7c007e3d73e8b74424ba96ed4e1a128b819e9f6feb0c3072ac8e96c36b74b57045cbf8e2f111f641af5277d2c9010001	\\xf237fec1c2895064107f73aaeb0283c4f8e74d30605b0d050dda819b27fd8a6994258c53c450972970aac77488c0f2b6bf4d62d67717f3c005cec7b0ddead703	1655143390000000	1655748190000000	1718820190000000	1813428190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-405	\\xdea7caa3ef6fe135a42ffd159656f4ad35db8d5f2bac567211682534a6a082032733ae3adace3afa184df666fcb1803770456247c55ebdf39d18e32c24983900	1	0	\\x000000010000000000800003e1b66a4879c61b472f599b00300aeb15b4ae50ab1d1bc5ae0ea8c1792df548a2cb0431627e41d2fd523868e4b29b108c909f2966806417c889abb457c8b53a1760e82f61821561bcca989f213bbbfdf57f03cc3248831d6e53c38154dc3ae0b40447f021aa1cd2bfda0644a0f3a26b44250928482cc2dbd85932f9d84e51d74f010001	\\x8d269e55912efba8b1095d856bcf10ebe76469b609252b2354f1be4c0b84c84bdee57c402303f06f550e0dc97a432dcd51b5a5b0cd2b1bc2fddd49f0b907b60d	1679323390000000	1679928190000000	1743000190000000	1837608190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-406	\\xdfa3e6d03bc7faac809cfbce2dcf50eeefaf24e4c16967b0545aecccc7e70524ea53813912e0e6e60b2e1938a97315e90e7c61ef504f2c332f361f08b922a022	1	0	\\x000000010000000000800003c1735865584f2ffe074c4484c60d177c69b33550bf4589cbc41d59b5b8061fe212ee8dd162699fa1b5a3cbb7dea7df188c91a098077d1c93a822a0689ca8e37f55055a7ffdc3626391c5c721db23f713b65ef3430fc6f0fe6763b67e1cd841097bf912dc93fc384c3ee3b28e358bbe8de99ade8d5dd2066b647b4cfb5923fdf5010001	\\x6b1cfa68e20ee0401f333383ccf9118728705505612a6caa5ee54d52ce306a3d22c4e74bcbd32954f0b97d151f79f46490107f3093b105a5f1801c5d5ea30d0e	1674487390000000	1675092190000000	1738164190000000	1832772190000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-407	\\xe1b7f0b863caee174e81ccfbe5bde712c4b522735f4abf45f7a804e72623a72f431fe73100a60b69c32d04cb4e23417184ddb00763c2ffea87c99aac16260f4d	1	0	\\x000000010000000000800003f8473cbf60b493b1940ded7204a8e60f4d042ec37ca659eaf2850381159662a293d458f586f7707fec5a9fbdb9f2a379683a7179e06ec62f55ff36a07bdd9ae53d67e5399eba0b788147d4b821ee1fafdc826597363098495c0bfd5353b27cc6eb18c078edd674ae6791a67212c70d2e321a8a114c645c8222760a21c08b068f010001	\\x07d26d0c159a0f8fc034528f727387f20896a84b2fbae447ead337ff22df31d0f0e0a080186d09fda77b715ce0593bfb43382d5021538e517656f4b85f712c06	1682950390000000	1683555190000000	1746627190000000	1841235190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-408	\\xe13f67fb8ca127183e0e53970337f0fe86963a9c3e6b69a3a9b1c2bbdd0e8bbad8650dee5b9c6fdad0c75068031ba4018f93894ee80bec309d86093c035f021a	1	0	\\x000000010000000000800003ac2ec02e74b276ffb14d0da426eb2da5a659369b549c80df3c2386be4bd02f9cc729640c0f1c70fd1c43824f24592f20cc72c5e24a9193c4f6656e11cce63f615f69cd05d277e9cd8cf70982c165ff51ec84ce389e07bedfc3ee0e0116713c88b64b148bf4b26bd4b2b66c42c6e1e4100f5b10b88d0eb5b5dabe780b5f2bbd5b010001	\\xd287127bc765099710c28c9ea146ade106cf234de69c884790e873931da127480e552d21727d6189c12a29b977d0038ad3e9ca0bacb0f6d4ef9eb06e87321902	1675696390000000	1676301190000000	1739373190000000	1833981190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-409	\\xe4234475e4a9238a6e2fb54f81d0d327b957b15fc517d948926198e24f999d6efa9504b5e1a09d5f545764c9acc4072b40f05fe4715176cf577d5ef039b09ff3	1	0	\\x000000010000000000800003f75cdba60ccb1c93e2bb8ad2d19c0413e676b49b75d6af6e1ebd69855e0c03ad3e89ca051740869b5674828de780639b4ef9694d29008aa876c7cc83c59b06cf1d0054e3c1c62faf590cf97dcc5b21086cc8c8d6df2c41f52a7371c4ae0e5fabbd6c237f54979f465092938880059cb3927cbea285c862a6b2271a3abfbad4c3010001	\\xcd4aa8467add30874b55986e3e7173fcbf7f61131c2d103d0733b95c63667afd5cc8758cf6b26e8bb589ca1ccfb1cc1e28a0e3b61cb5b32de8b56c963f431205	1674487390000000	1675092190000000	1738164190000000	1832772190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-410	\\xe5a3cee713bc953b837952f1e3594dfdba78f29c531439a2bd9cd4b5130d3c3eb32729d8b7b07cc6a8f33d42c60702b0d6b91f953bb44f1bf2bfd71050e1d2b7	1	0	\\x00000001000000000080000393b4215f50bbb8f23f7369dceec00eeca622cc67d13b28bdb5f6c02fc5811d1e5941027613de0d8e9e4eba5226640819b67fb1b2c2ba366442b2329b4575d1d6ed956881ad14651b682679c1701a5e00569071562c38e52ed91c9fc45a49e96255a4bc74a66844c33bfcc413a74bb9585f6187ec6c14924d4f2058a2c5a97f85010001	\\xda6a6e34686e57829fa437818e56efa64d615c2e2c01ab934c8dddbc24595473f7b33cb3312b4ab52f4103932076c3b90a5f391b4304c45c42b8de64b806980b	1670255890000000	1670860690000000	1733932690000000	1828540690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-411	\\xe6f39d3b82904744c886b0eb120460e995466f579cfdb14d3439f680a683da7593c545a9722e45fdde094b06027c6c30c29ba180b621ffa28a48fcd76b39c69c	1	0	\\x000000010000000000800003ddb5836d18ade98b2f2a20bd5ecbf130075940c44353d436fdf4998e553b8ab0eaa18deb7addf8d937403d086c9a53cbb6573b6f9e277998814e17235e4ae2f13efb485a23d3983fcd2e77cb1b1b8df90e327e389ba12b035955b95a86b6c24b9e50dfa730f0467dd658db93bfbc5e83ddda94b4431d69d1f19a1d31a840cc4f010001	\\x05df61a29cbbba7e73ff951fa20e566ff6e53b1e9547ffe4ef8800e749ad0d70c093c50295b1074161e827761c228fb84a012ddb1366b46d7420d3c675265109	1656956890000000	1657561690000000	1720633690000000	1815241690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-412	\\xe693126b5adf585587a60dc4f53d729f6a1064d40615d1a6508cba12b755c54730dae77c6a353bfa3355b3cfec0a2d36cd1246f4b782675fc56e6b5e54c2097e	1	0	\\x000000010000000000800003c69ed6a99d0e17b2845fc86c04e185de1e9c702bb6250e30de8f56bf44f09949ca7061e6cc51d097a25f4c0164a68ebe81bced938a22a152d07557ac0509adc72620173443f6803993cca63629ce718a0e31361af68be8e0a82dc93b12d8287483a335912ed340fee3e688ced1b050174114c36743e4e162e37b1b1471f8534d010001	\\x9eeb3939e6b0af6ac423348e9833f8c00e57c7dddf73418e47bfd488b993e2ee66c572ae99262d1f219b4f646eb2672dc03bd01bb8584e3b36a65ccd7bfeb209	1663001890000000	1663606690000000	1726678690000000	1821286690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-413	\\xe703c4c7c0bb34a28a661dbe25373b82666dd04359a3fee464b207af1477490bcb5363e95bbfac8be2d5d66aa74a3891d10353a301b99119fdc2347fe30dd70a	1	0	\\x000000010000000000800003ab66483a747b7ee9a8ec341092abd84886034e3b4ef7e94d5fb17517f8acfa95c3d6edf01ea87a4988c57f691d306c4b3e629ed20a4f70d834ee14b96518e11a3772aee14e5c7ba6af5a6fb1d52bdda562c881ce59c6ef255d3f38bc489b683e9bda42458d740146c88cefdaf7b0c0e272b01b9ae463a275343ffe9667166e13010001	\\x12bcbcb68c0fff86ee1c7de244f3f8be848200922036cb0258312671bc87977e5eaa8826e00bb77a98bd284d39e73c0cb5f5aa666abe6df75a566294c977020e	1679927890000000	1680532690000000	1743604690000000	1838212690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-414	\\xe807be652653384efe0c9b2f9f648e844b9ce1266fbceb8d4183ccac37601dbb3759128b883baafbe84f1ea3878380583cdd55a692acaf2ff75a3fe6156b0af9	1	0	\\x000000010000000000800003c34bb2f2f52b6c67b6d73ec96dd4b21857690ffb6e995a59c5512bf45cbf4f15f30c61132f7e1a9b990987978443e0761b22976d103a33ac84b601938b35acb6f7b19bac2278317034beff3c87b8855a5ce7d2a4f5d7528b6bbb6660be49120b3cc85987dab16d034ca936b8d674b25e3997bc4304e5fc6e55c8f12556b7c75f010001	\\x0b9fabc5da9cc5830d7567ffa99d3977bdf432e4fa9a28f0530bfe5347f40948eb3994e581eeaf57c331aabaae9f1d55e964d8637a78d14cd89063e50b69e10f	1654538890000000	1655143690000000	1718215690000000	1812823690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-415	\\xe8ebf5c12616123e57cebedec39ed26d766dd8c3dd38d98ccc6ae9ccb51c1a5c5b737bac0c7de2e8c338209982e9142dfba0cf085242464c121dbd50487394cb	1	0	\\x000000010000000000800003c7e10a500344569d07cebd06de28a84fc295575318ec0712a02f6eac2ca42a8ecd3f141a098ae309dd8475d8c74a6f56aff232746310c6c9b3a46c516a57add6e7751f39c2932c75918d3e5588fb61914cab03dc46430508c3e73959b3465cc4057306d9e832c6ceeb83dc3470085e5e2406c47f1f3fd9139a0f33c651c8ef31010001	\\x8d5cf183f99715bd9fa0cab741474ed6c9255cf8ece1a49830649afaf94d33b38814459dd744edea3cb3883d2920c8a9c8f141a8dc33e5cb5e34045dee5e8e00	1659979390000000	1660584190000000	1723656190000000	1818264190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-416	\\xeaab0019870f9ffb9c43d0ca04f4b541038a2a72e04d5af690f21a415ccaf398877b93934b2d6ced4eb3629a46f6f31771a3076a1f7480023e2bad7eaf95f308	1	0	\\x000000010000000000800003cf325532c47952dec526ada0d3c9909a36c512a158b507436d000d7355bd605625cc70e05d85a0fe934bfd50a87e96db3fedce3348b877341b83b382695f406d1db437753c74c8e717cd5d6ea9bfc7c27ee2e132df12af59c187a3972ecefe88bcb8a130bd00874ff75fac52847d66b5c14924059fefcbf9b94696eb7fa00681010001	\\x3bd3a932c6eb2523a8abdd746f41e81364c389152e3489398875c7563a5c06f032b26db820282c72261199cc731b98a05de8bf8095e1340412bbdb5295bf1d01	1666628890000000	1667233690000000	1730305690000000	1824913690000000	8	0	0	5000000	0	2000000	0	3000000	0	4000000
-417	\\xea1f070c5d0eb5bc9364bce7a8cb52ade84bd36c8a27d5004ff5c8883d747234b03294bdc60058fc68cd980826649bdc1afd080fd5c34542b61168a40531a003	1	0	\\x000000010000000000800003cc2c1e0aea11d0dfbae890bf67cad9d1f1212b5a4cbedb68a89711469edc27fdcaf4b46d6bb7c564cca878f954a7d1600acbfc99568a5a1801af6dd0a643a216e2809fad29ca6b28ed31ad1120c105a386bbc418c772027ecf144fe2b73f9d766f422a265fc179707c344b0b9f049c11276123039d8ff965d8fd4db22e8ba605010001	\\x1d9f2c21d3f1b80e543d1109e0d3c0992ba4b2558cc85c6b107b27ddd3bce0006630116b4f431b68b9689c58d3a8e636ac8962a437b937d2ecd6b226339c3a00	1666628890000000	1667233690000000	1730305690000000	1824913690000000	4	0	0	3000000	0	3000000	0	4000000	0	2000000
-418	\\xecef17ad8e533dd0bc8ea728ac2df416c4d9b75b6afb24bfeb0d1bc530913f040b8dd6ae353b36c128d2fe4b23d16a138c1d2002d738d576c44a2d8a5738c4c2	1	0	\\x000000010000000000800003d257036efa15fd8e3e1894286f6a2e1f47b7e077102d8ec2b9949a252a0f85abdc74274954fa2b9018a7650e4dbb71c2c1794e9ba445dfa9ab1eea351bfa110938874f6f979a4e8b387a04c3e062ca3d9b0d3e9bc2851ac1da44167ea34706b4528cd428f94fe066a9d95d589d6c1cc4eb7a5db8c27fbcfa461e05ab20517025010001	\\x70289f4f13b801ae4abedd19929ebdf2738a424c13848e931122f330b3882d5bd0092ec825b90a2a3b9f7316eab7082ae4c0818af4c785e838770297c7e4980e	1660583890000000	1661188690000000	1724260690000000	1818868690000000	10	0	0	1000000	0	1000000	0	3000000	0	1000000
-419	\\xeccb91d3d3d6d4e14a6cf1dce65526c8d02f82942335b1af9592900fcc8e5901a4d44a2dc8ec11fa921cfe27b656e4d0cb9ab3cc4bfb6109029b78d66fb5af9c	1	0	\\x000000010000000000800003c7c536f78e71b1eec2ba8e1051fbcbdfcc39fbe8bb27d8e6ca3eaae74b38527eb866b670073d3208467979d77f0dd3a42614d9889815e70499e00b75956a91af650e1c807cbc323b4110d1d87119aaf75a9c8a7b10ef34d9cb2ed30a5cdbacff996d9056e6347ad44c0a04896b0586859f9323971878f505c150411283bcf9bb010001	\\x23c1fd467a429efb5a314365c41036bfa01528638a047e3330e63c380a8a141f968a9b21f9e1f77f822c1f06def3bf02ea867750c43f7f0b65ee6db9cbbcdc03	1667837890000000	1668442690000000	1731514690000000	1826122690000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-420	\\xf12f5c5a053294a9d506dfa79b3820043ae683e94c00e00b139241752d35fef914589e973f108d4299f14a6bbf8b9e8c83f175466acf9fda50d8ed87505035e2	1	0	\\x000000010000000000800003ab096c553d3d171d8bd288644256b39733cf7e24b0c31f926bcb57695758b84fc507153ce88dc6f5da3ba57bcd49997f00666317da3602a70823df659797a63b914a7af6e48754a5e136b726658df1993e75564f5809a1a87ca19804acb7cc021b410afb35fa49c652ca90e383a50a44800284d738972647496a4416ddac9a8d010001	\\x6a56e76e1902a1cf293db72c30cdbc82b74aadfab3a8cbe6ecbe1de3774d31f4e5c5149c916a12a18a9e72e7c5c83b65c85251f4be5ae2768db82180cf9a0d02	1653934390000000	1654539190000000	1717611190000000	1812219190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-421	\\xf2877098eb9e5e4f3ffd63501f5686e656977f3831123d6f63ec63389258fbf155a86cd30d001d66182e6f7c3b30a58663ea9cd4093428eb5d9a32c0602e488b	1	0	\\x000000010000000000800003a361b005dc0ae5fb58e7766471ceb29f81a5d19414ad6c0c06df3ab7efb8e032ebbb7f8158fea5c83d398fe7c6a800294cb11a4dd14e2d74ee40e503cb294fdfc42f785c252e2e696f598e486497f22ffa9fe06035ef1aa6deea84e10cc9ada423054d2ea1f82ddebcd5f295533614ea226691faa2d77b3a718cb65001c1a5e3010001	\\x1121086c01db0d00695f7221e2a4bf9239fb1a99e43bd10316182c4893d0e902686697ea7d2f31a53abc51b12e86cc97d93c7db8860319a48542c0205858d207	1668442390000000	1669047190000000	1732119190000000	1826727190000000	0	1000000	0	1000000	0	1000000	0	1000000	0	1000000
-422	\\xf4b33fa27d38c7d90b73e7025d8812630d6b14ea55a0c95b60d34cde12a66394b6f70de3a1580e85fde178d84f3912d95085f1d51184e0de55f23aa9e246bb0c	1	0	\\x000000010000000000800003e039b77ca3f351189ed82a35b947345976c0b2b975cbc3c95846e48854bcba2d803f31d98c22da644bf13ad0eadbca9f350f76190296963f3643cb6fdf4ddd0c66fb157dfceb0109d21ea83a83c7988dec64c55f458dcc5ac54b554854fe8c0710dbd4b2c1e89e000ff050218d5843ab3e17fcb06b461d30cdb5be4a6e66fc6d010001	\\x2e093006921bc1ed93282aee1701d58125795025208955007311b3acdca801ba7545ee0261c858fe9a1f22395d420e1ddaa2a248c2a5d8d54435bb96b1d5c804	1661188390000000	1661793190000000	1724865190000000	1819473190000000	0	10000000	0	1000000	0	1000000	0	3000000	0	1000000
-423	\\xf55f9b19449793c97f6926dca00fbb74490f7c35fb06f0acf2287987e14935097c7c48ef544491ae68eadd99c5641ee5c32fad42f4b304951219882f0900736e	1	0	\\x000000010000000000800003ec651e8ee6a588857484502baf8959874d2713d5dbe3d5f0799059afba88c2481cf4e7f176e2a3509f2704442df8f685593b81f2a378b80ebfeb03d29b861f138426abf9850a1eb0ef203de2efa95fad6809c258020c203b1fdb3337692bac934dffe84784535d67de9ad5f75ffaf31291177453b78c80d3bb2954f0a7062f2b010001	\\x32fafe11d86676ca3fa854268d1de7ba8e76319ac5c1857cc613c5092b9f87349c341163825c3631eadab5b9715c3ae7f24501ef8fa1b9a82c92f15e17579108	1667837890000000	1668442690000000	1731514690000000	1826122690000000	2	0	0	3000000	0	3000000	0	4000000	0	2000000
-424	\\xf5339ea2043d2204cad54b1d4153184cb6a4226e034a7516f03424dcd83ed00fdc89f7b7b72f17750a89d24bdd077c72ef389c8d4b6c5a84816e9000a6205e49	1	0	\\x000000010000000000800003d9130390a3c09d489f165ff6430d17458549543d1e3a447a95983d3174725fdaccd9601b03f4db9746962cb6f6b998f30ef5ceeb02f94ed7b441fcd0335bb78620d8ae7d986595820ffa29e15267b291e3be0dd23dbe9e9d8b317cb33c058d81594b391b5dd574a60b68b5409b65569ab98ef6da1fae9a91de459c8a31d3eca9010001	\\x74b9a381dabcb1f62a9703c055220e203988aa701fd9c9c84aeca253c10a3998efa0d3317ab206af20e0d98ee37ac35acc9996fb108bf592e4bd8412d7a1bf04	1681741390000000	1682346190000000	1745418190000000	1840026190000000	1	0	0	2000000	0	2000000	0	3000000	0	1000000
-\.
-
-
---
--- Data for Name: deposit_confirmations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposit_confirmations (master_pub, serial_id, h_contract_terms, h_extensions, h_wire, exchange_timestamp, refund_deadline, wire_deadline, amount_without_fee_val, amount_without_fee_frac, coin_pub, merchant_pub, exchange_sig, exchange_pub, master_sig) FROM stdin;
-\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	1	\\x312702caa88ce5e161ab50bf5f84ec046f34e35885ff7357b8ed30a70a634c854257b4a682af97a007566506c16e7b1263d33468d65f45e6cfee1f35ae6d6813	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4fab48b22917badfc1e350e125e5d856b58803dae378443126f2dc71aa916ad0d9b39ad576e9930741fffe22b29813c426b12953a4a9da9ffab8bdb4c29ea8e0	1651516421000000	1651517318000000	1651517318000000	0	98000000	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\xbbbb92716a3d74d45f05685433cfe62279df0657f2d54362341120f5d1a4b687c51ef26e346f04f83096689fe1d5edecdbc29ba03800bd73e25d37bb0cdbff0b	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	\\x20f806d2fc7f00001d491b7feb550000fd84cd80eb5500005a84cd80eb5500004084cd80eb5500004484cd80eb550000200dce80eb5500000000000000000000
-\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	2	\\x5c5700ec96e5fc731ad79d3ef634c8c04b899bcae143b8a66a3c4c7d51bc2a1d272f0c9773071e46dc5ca64dc9db23b0ce47f1c27d9f1894aae9c223fa8bca6a	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4fab48b22917badfc1e350e125e5d856b58803dae378443126f2dc71aa916ad0d9b39ad576e9930741fffe22b29813c426b12953a4a9da9ffab8bdb4c29ea8e0	1652121256000000	1651517352000000	1651517352000000	0	0	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x9539b75958fd108f0895cf8b90d481efccfcdfbaf9b06492121081de8ba5279bc28ba7efd16b056c708c2408d4371fa300df9993a14fbf5be97306f5e5ea5302	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	\\x20f806d2fc7f00001d491b7feb5500001db5ce80eb5500007ab4ce80eb55000060b4ce80eb55000064b4ce80eb5500004084cd80eb5500000000000000000000
-\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	3	\\x5c5700ec96e5fc731ad79d3ef634c8c04b899bcae143b8a66a3c4c7d51bc2a1d272f0c9773071e46dc5ca64dc9db23b0ce47f1c27d9f1894aae9c223fa8bca6a	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x4fab48b22917badfc1e350e125e5d856b58803dae378443126f2dc71aa916ad0d9b39ad576e9930741fffe22b29813c426b12953a4a9da9ffab8bdb4c29ea8e0	1652121256000000	1651517352000000	1651517352000000	0	0	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x81765513b26470e6de0fab1b29d8f354f7879c9d95582ef3182af5ecf33b7da3f08512223f60be5ec50a61788714ae6bbd77572d57c95dd04d317cf74603b20e	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	\\x20f806d2fc7f00001d491b7feb5500002d35cf80eb5500008a34cf80eb5500007034cf80eb5500007434cf80eb550000b08dcd80eb5500000000000000000000
-\.
-
-
---
--- Data for Name: deposits_by_ready_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_by_ready_default (wire_deadline, shard, coin_pub, deposit_serial_id) FROM stdin;
-1651517318000000	1819058408	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	1
-1651517352000000	1819058408	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	2
-1651517352000000	1819058408	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	3
-\.
-
-
---
--- Data for Name: deposits_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_default (deposit_serial_id, shard, coin_pub, known_coin_id, amount_with_fee_val, amount_with_fee_frac, wallet_timestamp, exchange_timestamp, refund_deadline, wire_deadline, merchant_pub, h_contract_terms, coin_sig, wire_salt, wire_target_h_payto, done, extension_blocked, extension_details_serial_id) FROM stdin;
-1	1819058408	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	2	1	0	1651516418000000	1651516421000000	1651517318000000	1651517318000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x312702caa88ce5e161ab50bf5f84ec046f34e35885ff7357b8ed30a70a634c854257b4a682af97a007566506c16e7b1263d33468d65f45e6cfee1f35ae6d6813	\\x09f2f0defeeab55e120a6f2b658bed3b93811843056fb19e49f319155ce93131417c97899e5b19106cdb601f32b0dbdfd6fcec19e1d32fc5561a732c00f42706	\\xb04cd571d47d7e582f93924046291041	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-2	1819058408	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	13	0	1000000	1651516452000000	1652121256000000	1651517352000000	1651517352000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x5c5700ec96e5fc731ad79d3ef634c8c04b899bcae143b8a66a3c4c7d51bc2a1d272f0c9773071e46dc5ca64dc9db23b0ce47f1c27d9f1894aae9c223fa8bca6a	\\x211f79f665f033d80f1bc992688d4fcad6433b7f2e14ea92bd89034ad32e57a480550ba9ae3eb5368b7daed2bc7d89391c3bb13d3e46d9b20e0cc310f839790d	\\xb04cd571d47d7e582f93924046291041	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-3	1819058408	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	14	0	1000000	1651516452000000	1652121256000000	1651517352000000	1651517352000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x5c5700ec96e5fc731ad79d3ef634c8c04b899bcae143b8a66a3c4c7d51bc2a1d272f0c9773071e46dc5ca64dc9db23b0ce47f1c27d9f1894aae9c223fa8bca6a	\\xbe10b886ed008dae3e138c4fc05eacaebcb9b28971d7e41dee4b853963be0ae47a5069b6afc354184c159da38f035451baf0092fece3871eac1d28bf8abb7b03	\\xb04cd571d47d7e582f93924046291041	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	f	f	\N
-\.
-
-
---
--- Data for Name: deposits_for_matching_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.deposits_for_matching_default (refund_deadline, merchant_pub, coin_pub, deposit_serial_id) FROM stdin;
-1651517318000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	1
-1651517352000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	2
-1651517352000000	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	3
-\.
-
-
---
--- Data for Name: django_content_type; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_content_type (id, app_label, model) FROM stdin;
-1	auth	permission
-2	auth	group
-3	auth	user
-4	contenttypes	contenttype
-5	sessions	session
-6	app	bankaccount
-7	app	talerwithdrawoperation
-8	app	banktransaction
-\.
-
-
---
--- Data for Name: django_migrations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_migrations (id, app, name, applied) FROM stdin;
-1	contenttypes	0001_initial	2022-05-02 20:33:10.426664+02
-2	auth	0001_initial	2022-05-02 20:33:10.54251+02
-3	app	0001_initial	2022-05-02 20:33:10.634903+02
-4	contenttypes	0002_remove_content_type_name	2022-05-02 20:33:10.653143+02
-5	auth	0002_alter_permission_name_max_length	2022-05-02 20:33:10.666261+02
-6	auth	0003_alter_user_email_max_length	2022-05-02 20:33:10.678521+02
-7	auth	0004_alter_user_username_opts	2022-05-02 20:33:10.688539+02
-8	auth	0005_alter_user_last_login_null	2022-05-02 20:33:10.698676+02
-9	auth	0006_require_contenttypes_0002	2022-05-02 20:33:10.701434+02
-10	auth	0007_alter_validators_add_error_messages	2022-05-02 20:33:10.710821+02
-11	auth	0008_alter_user_username_max_length	2022-05-02 20:33:10.726919+02
-12	auth	0009_alter_user_last_name_max_length	2022-05-02 20:33:10.736815+02
-13	auth	0010_alter_group_name_max_length	2022-05-02 20:33:10.749678+02
-14	auth	0011_update_proxy_permissions	2022-05-02 20:33:10.760192+02
-15	auth	0012_alter_user_first_name_max_length	2022-05-02 20:33:10.771497+02
-16	sessions	0001_initial	2022-05-02 20:33:10.793458+02
-\.
-
-
---
--- Data for Name: django_session; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.django_session (session_key, session_data, expire_date) FROM stdin;
-\.
-
-
---
--- Data for Name: exchange_sign_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.exchange_sign_keys (esk_serial, exchange_pub, master_sig, valid_from, expire_sign, expire_legal) FROM stdin;
-1	\\x43b2caf21f1f69b8f3d39ddc818c831240c5b13543f3622ab5e25ccf5b0aa67f	\\xbfc068b73399671267f80e7a2db9367fdbc0ad85408b2256bbbb552e8f1d2e699983118981771876612c6fd9b4958831dd5a7fc44141f0612451a8c3a0664805	1680545590000000	1687803190000000	1690222390000000
-2	\\x23b4dc4c9aee3e39da1377d4f71c695a69260b97f6c85e1d4c3f0d9f2187550c	\\xccb45322f4e80ba85ccde353fec15d5901ffe50dc429e3da3a95055dfd815e18d1a951a1e7bc09a9e0393684dee4935e45e7112b56d0b2d58fbda6688d55100c	1673288290000000	1680545890000000	1682965090000000
-3	\\x6e334214c767617221826ff543e90c523e117283184336d9b4def326c85a6799	\\xeba1ea62e47559c9135214af639db088ec74f5efab74848a76401d8ae3138f0f5c1a41495c8159a8f4b60e3e0c77346c083af0a73769e1bed8468b1fc8d58307	1658773690000000	1666031290000000	1668450490000000
-4	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	\\xbe18532731b429ee445c8b367e4d56ce354f1f06384fe30567806ab41b300889a5dccb672b47953482d4506e9fe954188db1f3591429ef8e6b51aeaf658ab30d	1651516390000000	1658773990000000	1661193190000000
-5	\\x536a7531cbb6a84f720ed2f8924090d29c76c76a70cc42598f88bbea8ba124d3	\\x94de65944f1aa5105e8fa5a333b3497c8ce3e74178277cbd143362ffbc74176cd8bacc173667376f52312784b815face6e7277b85e639cfaeb94d2a94446dc01	1666030990000000	1673288590000000	1675707790000000
-\.
-
-
---
--- Data for Name: extension_details_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.extension_details_default (extension_details_serial_id, extension_options) FROM stdin;
-\.
-
-
---
--- Data for Name: extensions; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.extensions (extension_id, name, config) FROM stdin;
-\.
-
-
---
--- Data for Name: global_fee; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.global_fee (global_fee_serial, start_date, end_date, history_fee_val, history_fee_frac, kyc_fee_val, kyc_fee_frac, account_fee_val, account_fee_frac, purse_fee_val, purse_fee_frac, purse_timeout, kyc_timeout, history_expiration, purse_account_limit, master_sig) FROM stdin;
-1	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	0	1000000	3600000000	3600000000	31536000000000	5	\\x0630b30ae08868c844ad1915c23eccfa307ee09fdaf19390afad81c6374e22b7012297193f2d51d55318220b5081e4b1603bbaac023aced98155fe729861610e
-\.
-
-
---
--- Data for Name: history_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.history_requests_default (reserve_pub, request_timestamp, reserve_sig, history_fee_val, history_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: known_coins_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.known_coins_default (known_coin_id, denominations_serial, coin_pub, age_commitment_hash, denom_sig, remaining_val, remaining_frac) FROM stdin;
-1	152	\\x37d3a4338f21aceaa932c76a56290b36329080e26e1ace64b91e9832fca0522a	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x000000010000000048bfa9d9f4ac973a79f254e0d8d3b8cbd5abd23565fef5917aae9b4730c72dd6f3cec7a3fb5aee6add77822c1f2e6b3ee2c5d977b57d2bd0c338b135f70461e25609abda8d9e997d970610f3b1dcefa90c1f0dd24e9348c7a8b9a2249c39da96c4be1a1961da89a2e75f168616af076bb92d468119463aa291c4b06d51ef9894	0	0
-2	222	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x000000010000000005abfbc7e5412fd8e1d8ff09a51c50d7c1f3e5224caf37e4ba2642a76285eba04e030b456d449807d2dfdd16b726e23811d5273f870bed0b45e3d506f84e6f22b0eae62125716bd79124e50c894815d3e01c68ef42bcae4affc03c2f42fd10fd477fb77233cc336b1b2b8ed6843ecf5ec74b8ce7ea2cf0dca955841d0fcca919	0	0
-11	244	\\xee727cc81498e5bdef42a2877354ace3d26d2e69d9db3a21d054144c1a58e93d	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000006bccbcf0884235b97b68191377e959671b1883d6dc695df564af5d52b83474302f309d9586806e96929f33145b9c47beb5a82affaf7247fa8b0bdc660511ad3b7e4b84f64a556a8b36508e7668e5583e2da3db3e3b2c1ec5c2fb04bf07d61755a6f46de9ecb0eb424998527328526d37c30463e51857a82841fe5efe2b1982a0	0	0
-4	244	\\x2c2140d9df871ef4c412156e9465d8415015dba86d8bd09d1afaefb352eaf94e	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x0000000100000000617943b6718cf3fd3f2d15dfca27c91f6e925d0313e70a719c7921e1e5bc650064406891c51e1d0a6bc627ad00119fd8658a5dae765d2edec31e08d5431f9ea25d68af54b8773f3e08a5501557a10e1227a512b6f25fa1f79525afe5d08683d4e83188c775c16b0753631406ae9aa1f0e7e5fdb1f887ba6f89aa52370ee8c8fa	0	0
-5	244	\\x46a94bd60bd44fbcfd1ff77d5dceaa6e1d8fc7fa98569e757b2ce0bce8d5147c	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x0000000100000000d4b999926a1cc09ce20a8d7f3ad53159e71614a52d79ac195c1c89fe926fe6ab47c9a740a6fed99acba126bd3f617afab34c020f59e8887fabf7603a6cbf3ac09e0193f660ec4dace42e3a8b654f85bc5c7cf621cc2e0aa8a329cbca02fd94964e2793ca9daf06906fb30cfb3f85342daccdbbec790d24e488af8517ba16f8c3	0	0
-3	109	\\xdd75545f68ef9faddd51568747d1e48a1f5eecf5ae627d1a827aad83183db95e	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000000a7ce3315255efd9b5a22073724eeb1987127d126309a75a019f5cc9bab78839191dd8e6f8d84aa0dc22fe8bfcee93030bd160ad7a60573e84685a91ab42cd6de370c65419cd675274dff48bdeb3d82995591fbf652c8c2ac88d7b6869c364f81336714e901ec79a98463affe37144af4424f20e9e0717b884ef47af0bad9e75	0	1000000
-6	244	\\xa890fa0b8b4c403cf27db984a87366a6e00ae7dee056d9210645deb4db1b5ffe	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x000000010000000082739274d5fb740147593c439611a64a03c439bfb03dcb0be8bd1434f8beaa2b692b1e52338001bf1f4c98ad2e7ee750c239bbbd7632f5c9ceb60c420ca28212c23909a64f44fab43a1dbe96071ad3ff65b5dc86c0672c95f5a924b8ea06037c21d8f3d456d118411ff2bc3de5fac88419b5a2ff395742cdb357d05422b46aba	0	0
-7	244	\\x859e46285e61995eb4e4a4bbffba81d1326cdab1530aab30e0c58dc247528c6c	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000001b032029c5837b05ea7bb1fc04266f93ff491a09240358d147ad8a597701b46c5fb6af1fb690966f3229daa03f42bf7a653a3678ccce9c16472e3c2868ea11401e2f1a4d1f613d8fa0e6e17d425648b4e7b8741290754b5f46e9b494b2c23c9144cfb4b3ce20e853ab7ae71fc723f21686cdf8e7bb1dbf37a1fc4a0100c23cc4	0	0
-13	2	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x000000010000000009152b1f47df7fa4e6833776225cbfdc37aca57d25e28fd406a66dbc214deadcd89aaa1aaf667a2b6e460db08da5084eaccd9ddee1f93253b8f94f831ac7e3125ca8b1d6526768b88bba3f1eccc186f9e1c6c11dff4b6284321d390e242f9d3a0cf89ea21eb76a0878ff2657a810c265f034cdfb804ae7337d23e461e36261e2	0	0
-8	244	\\xde5d95fbbe7c727df79db4a7123869827bc6fe82e56b3b71c67ee96b5c2c8946	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000002c199f7cb5ac87f309f0c4954ca82064e43e9a3fe78f771f2f55a6ba5a49a05cf2d67ca85ef56d65a4a75ca1835abe2df632e86d96dac7847a849160ad5197f5a4bb377a3fae4ea947fb8ffa3b4a7a41f4a9f8cde4f53ef8fbf492f6222eb3e8705ed54af718e618594d277aa27c4da30896e94812a7ca4b676ae8a0c2c91125	0	0
-9	244	\\xcf259169d898619e0d19710f1d3eb1e10c5f369323d8c549d036fbec40ebf8db	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x0000000100000000a9059ba3a2cb53775b016313511f8456159ab99e3d9d29f334541fe72700286d267b210701ef03c5b7c4390468f0201317f163ebac8f47c965801948d36e6bfc7eadce561290dfad8aaed879a676171db9c6cd1d1c8f06d704aa778610c381db0f3b6c12d435d8739e26b6fce39ae1bf9b8b55881257bace6775a520995d697e	0	0
-14	2	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x00000001000000004c561d445476dc760ef7ef1718b6acc403ebab4b8e81ce5b7b8a3f91043a767b5ba8cdfb6b4da92cdcbd188726ecef284433286b4dc97bcab69d4420ab178491e5c92446d691ef68695e41ab98712153d8c3c7341b844e984bf7e354fe8fd95d94c71167f414c5414cf6ffbe41801fee482d0462912a47bba344637e89e3ac9c	0	0
-10	244	\\xddee2c25c1c7186cae13abcd3c8fc8c3f445bb758a315de3ff9efa0e3c8516cd	\\x0000000000000000000000000000000000000000000000000000000000000000	\\x0000000100000000abd12319b1b212d8c8c02dc7891ec0f19e5cb7ba5e5fbd314f6349b19c76f294bb5645283a5be46bcb4f9c2c083ff7b0c9d2f20af064f5de55e70c1ac7d87cca7c488d0a02cac01d8549c022520d89ee33499815f8659402746cd511c5ef9661cc17cb9dfbe88c00713c3394e9c283e5c049ed29f293c4920e37239076457be8	0	0
-\.
-
-
---
--- Data for Name: merchant_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_accounts (account_serial, merchant_serial, h_wire, salt, payto_uri, active) FROM stdin;
-1	1	\\x4fab48b22917badfc1e350e125e5d856b58803dae378443126f2dc71aa916ad0d9b39ad576e9930741fffe22b29813c426b12953a4a9da9ffab8bdb4c29ea8e0	\\xb04cd571d47d7e582f93924046291041	payto://x-taler-bank/localhost/43	t
-\.
-
-
---
--- Data for Name: merchant_contract_terms; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, paid, wired, fulfillment_url, session_id, claim_token) FROM stdin;
-1	1	2022.122-01Q4WKM66RKJE	\\x7b22616d6f756e74223a22544553544b55444f533a31222c2273756d6d617279223a22666f6f222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f73223a313635313531373331387d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f73223a313635313531373331387d2c2270726f6475637473223a5b5d2c22685f77697265223a2239594e4d48434839325958445a4746334133474a42534552415454524730595457445734384339365942453733414d48444238444b435754544e56454b34523738375a5a57384e4a4b30395738394e4835353954394145544b5a58424846444d52414641485230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032322e3132322d30315134574b4d3636524b4a45222c2274696d657374616d70223a7b22745f73223a313635313531363431382c22745f6d73223a313635313531363431383030307d2c227061795f646561646c696e65223a7b22745f73223a313635313532303031382c22745f6d73223a313635313532303031383030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22394d3239564e44575636445a504745354458484d385a30413431434443364a545445324a38354331433956313635544750415347227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224d4234535a32514d5837574132314141515451344153534a52445a59584a59515a4a5956585444333752575a314e485053423930222c226e6f6e6365223a225648544a4147585351574d364e4b48314a43473457394a4248433744343936344e5830334d4a435834564643485a354851474147227d	\\x312702caa88ce5e161ab50bf5f84ec046f34e35885ff7357b8ed30a70a634c854257b4a682af97a007566506c16e7b1263d33468d65f45e6cfee1f35ae6d6813	1651516418000000	1651520018000000	1651517318000000	t	f	taler://fulfillment-success/thank+you		\\x3f75a41cccb519f3c405344e42ac54a0
-2	1	2022.122-0388CJD7CZ1T8	\\x7b22616d6f756e74223a22544553544b55444f533a302e3032222c2273756d6d617279223a22626172222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f73223a313635313531373335327d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f73223a313635313531373335327d2c2270726f6475637473223a5b5d2c22685f77697265223a2239594e4d48434839325958445a4746334133474a42534552415454524730595457445734384339365942453733414d48444238444b435754544e56454b34523738375a5a57384e4a4b30395738394e4835353954394145544b5a58424846444d52414641485230222c22776972655f6d6574686f64223a22782d74616c65722d62616e6b222c226f726465725f6964223a22323032322e3132322d30333838434a4437435a315438222c2274696d657374616d70223a7b22745f73223a313635313531363435322c22745f6d73223a313635313531363435323030307d2c227061795f646561646c696e65223a7b22745f73223a313635313532303035322c22745f6d73223a313635313532303035323030307d2c226d61785f776972655f666565223a22544553544b55444f533a31222c226d61785f666565223a22544553544b55444f533a31222c22776972655f6665655f616d6f7274697a6174696f6e223a312c226d65726368616e745f626173655f75726c223a22687474703a2f2f6c6f63616c686f73743a393936362f222c226d65726368616e74223a7b226e616d65223a2264656661756c74222c2261646472657373223a7b7d2c226a7572697364696374696f6e223a7b7d7d2c2265786368616e676573223a5b7b2275726c223a22687474703a2f2f6c6f63616c686f73743a383038312f222c226d61737465725f707562223a22394d3239564e44575636445a504745354458484d385a30413431434443364a545445324a38354331433956313635544750415347227d5d2c2261756469746f7273223a5b5d2c226d65726368616e745f707562223a224d4234535a32514d5837574132314141515451344153534a52445a59584a59515a4a5956585444333752575a314e485053423930222c226e6f6e6365223a223943304d37394e395251334743324742525051523944325434413842455041314348375945355756475233433041513657583047227d	\\x5c5700ec96e5fc731ad79d3ef634c8c04b899bcae143b8a66a3c4c7d51bc2a1d272f0c9773071e46dc5ca64dc9db23b0ce47f1c27d9f1894aae9c223fa8bca6a	1651516452000000	1651520052000000	1651517352000000	t	f	taler://fulfillment-success/thank+you		\\x79f8293977a1df17ed7b38353ae34011
-\.
-
-
---
--- Data for Name: merchant_deposit_to_transfer; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_deposit_to_transfer (deposit_serial, coin_contribution_value_val, coin_contribution_value_frac, credit_serial, execution_time, signkey_serial, exchange_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_deposits; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_deposits (deposit_serial, order_serial, deposit_timestamp, coin_pub, exchange_url, amount_with_fee_val, amount_with_fee_frac, deposit_fee_val, deposit_fee_frac, refund_fee_val, refund_fee_frac, wire_fee_val, wire_fee_frac, signkey_serial, exchange_sig, account_serial) FROM stdin;
-1	1	1651516421000000	\\xe48798cfc252c42977fd5d2c5e2636ee283969bfa3e92b48777fea185d0f6f59	http://localhost:8081/	1	0	0	2000000	0	1000000	0	1000000	3	\\xbbbb92716a3d74d45f05685433cfe62279df0657f2d54362341120f5d1a4b687c51ef26e346f04f83096689fe1d5edecdbc29ba03800bd73e25d37bb0cdbff0b	1
-2	2	1652121256000000	\\x036509e108ca700c89abf5e7bc751f1789aa13d65eec048f4ad8e9600f2d2a42	http://localhost:8081/	0	1000000	0	1000000	0	1000000	0	1000000	3	\\x9539b75958fd108f0895cf8b90d481efccfcdfbaf9b06492121081de8ba5279bc28ba7efd16b056c708c2408d4371fa300df9993a14fbf5be97306f5e5ea5302	1
-3	2	1652121256000000	\\x1712a4ba2c33dd8f975f1232eb31f1df66bf971a1b79f809841cd0031ae99017	http://localhost:8081/	0	1000000	0	1000000	0	1000000	0	1000000	3	\\x81765513b26470e6de0fab1b29d8f354f7879c9d95582ef3182af5ecf33b7da3f08512223f60be5ec50a61788714ae6bbd77572d57c95dd04d317cf74603b20e	1
-\.
-
-
---
--- Data for Name: merchant_exchange_signing_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_exchange_signing_keys (signkey_serial, master_pub, exchange_pub, start_date, expire_date, end_date, master_sig) FROM stdin;
-1	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\x23b4dc4c9aee3e39da1377d4f71c695a69260b97f6c85e1d4c3f0d9f2187550c	1673288290000000	1680545890000000	1682965090000000	\\xccb45322f4e80ba85ccde353fec15d5901ffe50dc429e3da3a95055dfd815e18d1a951a1e7bc09a9e0393684dee4935e45e7112b56d0b2d58fbda6688d55100c
-2	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\x43b2caf21f1f69b8f3d39ddc818c831240c5b13543f3622ab5e25ccf5b0aa67f	1680545590000000	1687803190000000	1690222390000000	\\xbfc068b73399671267f80e7a2db9367fdbc0ad85408b2256bbbb552e8f1d2e699983118981771876612c6fd9b4958831dd5a7fc44141f0612451a8c3a0664805
-3	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\x8e352f9e7b1dbda4e3dd96c940287f6fa15410430ff4fe0a3f1f4978c467f837	1651516390000000	1658773990000000	1661193190000000	\\xbe18532731b429ee445c8b367e4d56ce354f1f06384fe30567806ab41b300889a5dccb672b47953482d4506e9fe954188db1f3591429ef8e6b51aeaf658ab30d
-4	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\x6e334214c767617221826ff543e90c523e117283184336d9b4def326c85a6799	1658773690000000	1666031290000000	1668450490000000	\\xeba1ea62e47559c9135214af639db088ec74f5efab74848a76401d8ae3138f0f5c1a41495c8159a8f4b60e3e0c77346c083af0a73769e1bed8468b1fc8d58307
-5	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\x536a7531cbb6a84f720ed2f8924090d29c76c76a70cc42598f88bbea8ba124d3	1666030990000000	1673288590000000	1675707790000000	\\x94de65944f1aa5105e8fa5a333b3497c8ce3e74178277cbd143362ffbc74176cd8bacc173667376f52312784b815face6e7277b85e639cfaeb94d2a94446dc01
-\.
-
-
---
--- Data for Name: merchant_exchange_wire_fees; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_exchange_wire_fees (wirefee_serial, master_pub, h_wire_method, start_date, end_date, wire_fee_val, wire_fee_frac, closing_fee_val, closing_fee_frac, wad_fee_val, wad_fee_frac, master_sig) FROM stdin;
-1	\\x4d049dd5bcd99bfb41c56f63447c0a2058d61a5ad3852415816276131750b2b3	\\xf9099467bd884e86871559a62a7f23b6e876bf084a30371891b5129ce4440d3cbe27afe387d39b2ce8d9625abd388517c81bfc8da9f2e0f8c9471bff65a802b2	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	\\xfbe39dd94c8698ca3a9d45c7f4656143ee091720b005d716e6e46e51673b6f566618e7e3aebc09c949fe6206575f221b3e262e0edf17300e839257f1fda7ad0a
-\.
-
-
---
--- Data for Name: merchant_instances; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_instances (merchant_serial, merchant_pub, auth_hash, auth_salt, merchant_id, merchant_name, address, jurisdiction, default_max_deposit_fee_val, default_max_deposit_fee_frac, default_max_wire_fee_val, default_max_wire_fee_frac, default_wire_fee_amortization, default_wire_transfer_delay, default_pay_delay) FROM stdin;
-1	\\xa2c99f8af4e9f8a1054abeae456732c37feecbd7fcbdbee9a33e39f0d636cad2	\\x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000	\\x0000000000000000000000000000000000000000000000000000000000000000	default	default	\\x7b7d	\\x7b7d	1	0	1	0	1	3600000000	3600000000
-\.
-
-
---
--- Data for Name: merchant_inventory; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_inventory (product_serial, merchant_serial, product_id, description, description_i18n, unit, image, taxes, price_val, price_frac, total_stock, total_sold, total_lost, address, next_restock, minimum_age) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_inventory_locks; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_inventory_locks (product_serial, lock_uuid, total_locked, expiration) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_keys (merchant_priv, merchant_serial) FROM stdin;
-\\xe8c1c721a457408c01bdaae848465d56f33a03f8acbb8437fba92cbdf5993ec0	1
-\.
-
-
---
--- Data for Name: merchant_kyc; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_kyc (kyc_serial_id, kyc_timestamp, kyc_ok, exchange_sig, exchange_pub, exchange_kyc_serial, account_serial, exchange_url) FROM stdin;
-1	1651516421000000	f	\N	\N	2	1	http://localhost:8081/
-\.
-
-
---
--- Data for Name: merchant_order_locks; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_order_locks (product_serial, total_locked, order_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_orders; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_orders (order_serial, merchant_serial, order_id, claim_token, h_post_data, pay_deadline, creation_time, contract_terms) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_refund_proofs; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_refund_proofs (refund_serial, exchange_sig, signkey_serial) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_refunds; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_refunds (refund_serial, order_serial, rtransaction_id, refund_timestamp, coin_pub, reason, refund_amount_val, refund_amount_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_pickup_signatures; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_pickup_signatures (pickup_serial, coin_offset, blind_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_pickups; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_pickups (pickup_serial, tip_serial, pickup_id, amount_val, amount_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_reserve_keys; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_reserve_keys (reserve_serial, reserve_priv, exchange_url, payto_uri) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tip_reserves; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tip_reserves (reserve_serial, reserve_pub, merchant_serial, creation_time, expiration, merchant_initial_balance_val, merchant_initial_balance_frac, exchange_initial_balance_val, exchange_initial_balance_frac, tips_committed_val, tips_committed_frac, tips_picked_up_val, tips_picked_up_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_tips; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_tips (tip_serial, reserve_serial, tip_id, justification, next_url, expiration, amount_val, amount_frac, picked_up_val, picked_up_frac, was_picked_up) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfer_signatures; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfer_signatures (credit_serial, signkey_serial, wire_fee_val, wire_fee_frac, credit_amount_val, credit_amount_frac, execution_time, exchange_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfer_to_coin; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfer_to_coin (deposit_serial, credit_serial, offset_in_exchange_list, exchange_deposit_value_val, exchange_deposit_value_frac, exchange_deposit_fee_val, exchange_deposit_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: merchant_transfers; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.merchant_transfers (credit_serial, exchange_url, wtid, credit_amount_val, credit_amount_frac, account_serial, verified, confirmed) FROM stdin;
-\.
-
-
---
--- Data for Name: partner_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.partner_accounts (payto_uri, partner_serial_id, partner_master_sig, last_seen) FROM stdin;
-\.
-
-
---
--- Data for Name: partners; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.partners (partner_serial_id, partner_master_pub, start_date, end_date, wad_frequency, wad_fee_val, wad_fee_frac, master_sig, partner_base_url) FROM stdin;
-\.
-
-
---
--- Data for Name: prewire_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.prewire_default (prewire_uuid, wire_method, finished, failed, buf) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_deposits_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_deposits_default (purse_deposit_serial_id, partner_serial_id, purse_pub, coin_pub, amount_with_fee_val, amount_with_fee_frac, coin_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_merges_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_merges_default (purse_merge_request_serial_id, partner_serial_id, reserve_pub, purse_pub, merge_sig, merge_timestamp) FROM stdin;
-\.
-
-
---
--- Data for Name: purse_requests_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.purse_requests_default (purse_requests_serial_id, purse_pub, merge_pub, purse_expiration, h_contract_terms, age_limit, amount_with_fee_val, amount_with_fee_frac, balance_val, balance_frac, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: recoup_by_reserve_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_by_reserve_default (reserve_out_serial_id, coin_pub) FROM stdin;
-2	\\x37d3a4338f21aceaa932c76a56290b36329080e26e1ace64b91e9832fca0522a
-\.
-
-
---
--- Data for Name: recoup_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_default (recoup_uuid, coin_pub, coin_sig, coin_blind, amount_val, amount_frac, recoup_timestamp, reserve_out_serial_id) FROM stdin;
-1	\\x37d3a4338f21aceaa932c76a56290b36329080e26e1ace64b91e9832fca0522a	\\x4632d98faa1b616be808a5f51a7c8fc7c196d59c42a13bd158ceb1b4b936cdaa0bdb21be5408704b6955b3d107a6d13242a4698dcbe70db83ac0c456188cf400	\\xc48487c627af5a5f041c503a2ebf0d895e5787020f3a1be63b90c150505c4775	2	0	1651516416000000	2
-\.
-
-
---
--- Data for Name: recoup_refresh_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.recoup_refresh_default (recoup_refresh_uuid, coin_pub, known_coin_id, coin_sig, coin_blind, amount_val, amount_frac, recoup_timestamp, rrc_serial) FROM stdin;
-1	\\x2c2140d9df871ef4c412156e9465d8415015dba86d8bd09d1afaefb352eaf94e	4	\\x6f7b063533ea5331862df3a34be3dba5e8c69d601c4068ffb7dfeea559bc6375eaf524f1ecd95da63c6ed455c113146c4e41880f8e84aca6c6ac3cded4a6e602	\\xe0a13e5c4c77910a587c4716a117fc59f0750c8fe8749e433db9259c1f855327	0	10000000	1652121242000000	4
-2	\\x46a94bd60bd44fbcfd1ff77d5dceaa6e1d8fc7fa98569e757b2ce0bce8d5147c	5	\\x0400d70018249fd2d739185259db8ae3a7595c9d929dfc139287dbd757d2d6ccf05910df0701d7729c3e7e7d621c0c1d9e662c41b38ae7dd68cab129a570a003	\\xc0b1651f471f2a6ccbfcb7316967d833c019d70b4bc1d467f4b8d35b3ca681fc	0	10000000	1652121242000000	9
-3	\\xa890fa0b8b4c403cf27db984a87366a6e00ae7dee056d9210645deb4db1b5ffe	6	\\x165af153f3f9c550d8fbbee4374cf189f095eda1d0a7debb166d87282a5e8672046178cd060c74a47eab60111e581dbc22b683ce2c1cf882cfa95390aaf6ff0d	\\x257779444159ff391e2c081fb96e1717a0c74a73824925770b1276a8a4b635c2	0	10000000	1652121242000000	8
-4	\\x859e46285e61995eb4e4a4bbffba81d1326cdab1530aab30e0c58dc247528c6c	7	\\xed971d09d4f7f02b81b7682ff8483318ddaf36fd469e6db46ce7a5cc94ec5d76da9af7b1c5017eaccedd9125bce41d6d20639e7a12c0819c6e838730f18b9502	\\xd228d819b987989c1ee967c18377d94136931ba924445d8ee07de72ab56da3b0	0	10000000	1652121242000000	3
-5	\\xde5d95fbbe7c727df79db4a7123869827bc6fe82e56b3b71c67ee96b5c2c8946	8	\\x11c8956065d1d21205cd268ac513908261d0b813d4abc1252b750a29847140e73f947cc6c75b29b56304bdcce49edbe79ebe2563d90e2842291e0597faf72003	\\x609b91734422ac005ad43cb7b7aa876c2e1c05f19cd0ae1045941334ef6d062c	0	10000000	1652121242000000	7
-6	\\xcf259169d898619e0d19710f1d3eb1e10c5f369323d8c549d036fbec40ebf8db	9	\\x77bf3fe54cc03af4756252a83ab1962a037f1d6b57e1f0e65a24e81b63b252308374e9d40a1cef386a1b3247af845507c74296b49e15f520a7c86f70375c0601	\\x5c3fc7dbc4371be2b11523ad45d076b9d66520b910b89b6f77b73c89a73e9f51	0	10000000	1652121242000000	2
-7	\\xddee2c25c1c7186cae13abcd3c8fc8c3f445bb758a315de3ff9efa0e3c8516cd	10	\\x8dd80e2fcbf034f2f1e37c748a45490af35484e7658f79266d6934bab94ace41110f0947d3295e285381c541712f3cd809104e2fd433e02e88d8067c29ad0102	\\xb1a2031b6d18a15a5292662058edd19736f2e936ba24f312f7ecba3ea0143040	0	10000000	1652121242000000	6
-8	\\xee727cc81498e5bdef42a2877354ace3d26d2e69d9db3a21d054144c1a58e93d	11	\\xba98941bafdf2ffcf82c5f90cd2a2b23671b85d0ebfddd0ce40a793125973f978636316a5544a8a235ac1854ca14a98879a501504bddf73849486ca678c22f03	\\x9d3c52bc1da63b9ba505ecb87adc15a9ef4a76a109ade33e008c724826a33ecd	0	10000000	1652121242000000	5
-\.
-
-
---
--- Data for Name: refresh_commitments_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_commitments_default (melt_serial_id, rc, old_coin_pub, old_coin_sig, amount_with_fee_val, amount_with_fee_frac, noreveal_index) FROM stdin;
-1	\\x608cee4350df48ce9e86fdb755349ebea460c1a8a81f37c36d0727f7a0ef2e7fb4cefa2d5d2728cb9abcd9685732512b9804c3fc48d983c51455dad962ea39f1	\\xdd75545f68ef9faddd51568747d1e48a1f5eecf5ae627d1a827aad83183db95e	\\xe7279b799ef5a086f27f9094eef366860637cc93d28ffd0ab2bbacf69044b503ffcb7ea64546c7eca5aa4ff4d67cc05cd7a30a96517cacec9e75f7d867d67b0b	5	0	2
-2	\\x7a923d7d2a67bd9179f77de0495bb982d3885336e2520fb7838a8d612b947586d42604241c48c9ac337cbf67b8e1dbae0333306e2a0ef425d7a56695a6c4b2bc	\\xdd75545f68ef9faddd51568747d1e48a1f5eecf5ae627d1a827aad83183db95e	\\x75e5db0c89e064baf67f2d9fed93ce8f159459e4a71a10484c3fcf96012ae266e511882cca89e70a51caaeff602685ccb60bc46bd9b24d1e94c3105b11b14e05	0	79000000	1
-\.
-
-
---
--- Data for Name: refresh_revealed_coins_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_revealed_coins_default (rrc_serial, melt_serial_id, freshcoin_index, link_sig, denominations_serial, coin_ev, h_coin_ev, ev_sig, ewv) FROM stdin;
-1	1	0	\\x85607ce3fe7b3fe18a252a19f238d5a95e48de2f08f23a3f7fe70ae08f0707001feb5625067a3168959715bd0c3219b5a2f5cf4789a069f4759d8e1c4f8e440f	382	\\x00000001000001004492fc6c81045507a45a503d2ed5bb4bb8c8ae97e9c7eb1b949821df70dfc88ed82ef634de50e7f648962be3e5b1ec84826ca66a2470e542bd10172d065073a1a9d220e7efaaacf1e1ddc5523b54268ecd19ff1d7e00509125033bca7ca9b827e87229931311c18674c5f08af4d4a3eeecea5641c33358c47b5c8eb7ef88d9fd	\\x8b782f9e222d92ef89bc9c5d843042ee90b87d977260ffcc0ee097e617d1c1bd11313a93d31b3eced14cba65951ad55628f9d4b0282ba0825185a1167a64f231	\\x0000000100000001410c32c2b958be3a1b9e20cc1b243d51f7c72a03b6d12950941d7426388166b71973300e19fd6f79bfd8de1af234b565d3fa9a8be51667da316a60452688d64b2dfead80c73ef9549ae0056cfabe6c321c0e2ea0c08bdb70fdb48941db4b9e35f182941eacf0d3023657716aa62e29f358a479052c989bc07ff7bb7b675dd537	\\x0000000100010000
-2	1	1	\\xa29978124ddb5132a2353b0a9540a8bc2782dc925b1ca43463691c28ddb8ed8c53e77bf8624d1aebb460c1211666d360bc9075767914536f62d7875318d7f80a	244	\\x00000001000001003249a888ac4494ccd118a7ac457bae90b9dd46fc6f11e2b9e5e6680a053f41c73007f50e2e3a69b307e992b1d4d949e810ecb82d4c83e9f07a0e1ebcc2bdaad11c05f987869c1e02257b23ade19e5934146d71805cd06712702a917e31c56575f6b33519c01665195bf26c556297e0238fc1e780900c4b47d5d59303e98ae447	\\xb44f60bd4c4bbd0732b74ff13c11da6fa86543b6d33cda7dfebca8b9ddd1b66626e2d5abfe78cb77e40c33c9987c46b955db65f34dc6877b294723af3bc6ab50	\\x00000001000000010eea2f2f635c84b0ebbe37c91172c3ed4c3c3a148addb2c12a6fd7aa78f1bce8744cfc3e5d838741b02117458acd0633c79abd25cf9b2a38e947875c42f5a3c0ddcde5eb33055a37c9d29d602ef8eefa71c1759eabca9971fab3261a5a1a619b8f03c18269c12d390e123cc76cfbded5aba77beb6dbb0600f9ad5b5eb8e5b986	\\x0000000100010000
-3	1	2	\\x083c6d1082d3bedc56552530ef96728fc348fea2c7ffddf006015296e416fb233bc2a74bdcfb93175b0a8150d3008d3e5c5dcdd6bbd6944a879c7e5f071be30f	244	\\x00000001000001002533ad993dd6c1f2af8e6400cb5f895da01938f3e133e948d58b1f800a994ef15cef00655f57ca5b4786256afa6a7514ea7604c9f40db215bc8caa87d6dc90ee666db321b0984e69ad357af2d5cdc50634ce0932d7ed15e0ca013d177cb291db861fb79e1f64f431612b8ecad672e4af5f2d939c5c32d05409bcc086c1bc61be	\\x81e6840ee3e23cca949cf2c270bb7984a472283f38d627d1efb11e8c3e95387584bfc7b8b1da42099f82a031a93c7caea1b5eeffffac523430e55d3a65108e02	\\x000000010000000188be2af8716c4cc2fe39a50c615e0ae11bb5c1fba08c37dc73e7058ded6da7537a8f4af6f4a1bf038ef0e4a350689eabfb9cfc83b32955bdfa0fb5100899534e41572e2e692df5abd2355fcb116da9c651d74227a737b27f47fe384940ce7120947b6f918f249958d753e1cb79147311dc7d27400d942b7f3982167f25de6e06	\\x0000000100010000
-4	1	3	\\x40570aafe14f350e6ac9e69bb88c09a8f0bd12f769d1134ae2b94fdbdeca7feba37757749873a0c989bf5f952377fda42dff37e12e706bbacfd501cbb835440c	244	\\x00000001000001002219bf55887ce6bf8c4637931bfac946fab26b8f17f7f40b71d1fb5bc849d709a8a53b6515b43af26aba9e19039b5602d2d4535092a897a3d106982684ca5d0dc800b94c96f016ee6a843a9ecb872c327e03ec3efd65008924e4072ad2b2e649b3f5e7e0f0b370a783a63bc79d41e2fde312dabd098370d690151a6b413a00db	\\x1cbdd508984ce4426e3d7b8be222bbe8e0ff69f5a79ee47721221b7271d5834603bd9260a6300256bbce3ca520e0ecf58c155ab8de5b5f106ef9f516ebfc0a72	\\x00000001000000016dea63c7eebf4af6461cf4d5fad043f433007dc6f8114434c9d79715bba6b73f2f62f4c374b0f33016a56363102cbf9ac81c8d6e41ce7d4741e5f92a040c2b4f9aedaf9c611e82197fbae3220c44c34eeb2c48949e890e9bfe395bec1b39f102c698de8103e88ec63c03443fe5a19df1ff9801a7b904f457b81b3c6067ecbcd4	\\x0000000100010000
-5	1	4	\\x46166f44e3d31e9394b7daeacb0373260841c737fe63ed8cf4569e1b3e6a88cdc8f3eed54e1bb3606f9321a09197d07fb637289043e9efacba4f61b2288b8203	244	\\x00000001000001007e026cbf9dc57e7d53d7b7b92bbdec8a1b9cdb791e7414519f0227f1db94b7fd9354ba701fa3b625db4833f2c9ffab2cd6a43e90bbdb16ec9eb2ef624e0774b9d9c7c6401556e0602d4dfc216419e35096f8dbd530480b67953a26fdd2baf053bc44f668b131a70df2d582e46f38db75b5ced42af39b9c09f2267781543f4577	\\x01b23d79c403f34d4b2d659c3090d2ebd7b7592f6f65958ae2a073277aab64fec3b2f83946f89c656697583c07c7a63a0d478b24a79a484d6b396f59b4f310d3	\\x0000000100000001ca336c77d470fda362b210203aa3f0678c71a030ef6c30665e6a48b86fa59271b841f2b3a1d3f4e7c18f2396dce49c08a1b18132253af3265b2c74be5fee9e650d243d05d54f610e9f3cbf7cdd67fd3715bf4164c3ffe0e54b9d486891de5c0b05759f7b932f2e4eb323944a69832086b8a9e4ded3fe1bec69f7bcb91b635a23	\\x0000000100010000
-6	1	5	\\xbdac2c742db0fad5d9a5b0d359e650c10039489cfa54931f27cf51a9c348041036960b4b196e68b647f238f2efa4b6d48f7fa30ee305c9e7bacc9f0f5b03eb0c	244	\\x00000001000001000bded5df8b4815adb1681ed89c138041428b750e3c80cd4e539bc9c897004603a62515273a82fb086d11f0e1e01d4b3b9438cd4b510915bc636097945a267163787bb9cf947baebcdba2fcae5c7e2d091606128a4708620fa3e196c379ffc3706dae392a502215bfac1c48dcbb47bab25fa21fe60a66efbf2c7953f0bf3dc41d	\\xa6dd4f9bb07f5f716152644784892f5108c03ce8d50a70b53803fe5917b4dbe8bc49898eb4ec61db14f4c442ad942924e9d7b2aa9825493f1e6a404f0e311e6f	\\x0000000100000001a8a5e587127b43183710b92629ee1ad6967283aede62c55dcde90e046c7ec6ec0b1c6a2b6f4a0eec51668202c021754deedaafc385b52ee1b9d8b4dedbc7f5c1384be87e49cf04db30033fa45558426960eb588099d65774f5c77ba4aced5c54cd3bfddde022fcb63d949d403ddf4add7333c703006f6f3b72a7b8a8d4297c9c	\\x0000000100010000
-7	1	6	\\xe8be481e6b9491e446b3bd62e5d0179a0f4d0f9294b4d090255e105a9297be62e63cea0badd312b2e4f0962c545fe2eec884c7d44b9c3d353d3f20d1db1d5f0b	244	\\x0000000100000100b0fc83ecd648d4e9be16e3a91a82da461c7c13486064a8f5a80e52e06c39b801f3b62e535dc1ced070b432b92220ce08ab255b9a133ebfc1eee6895e1005f90465f3df1317be962d5b29991469891c22292ec56ae496c16aa1f1c20b1180ae6d107c2bb0ab71e67fddad0fcbb792cfaceb2f88834ca8c0caa9fd852b4c64b5c2	\\x9e31a5ade1eb0e65090a04d8dd4a3c962672bbed76bb21a839e0df358ba570bcdeca38a9a94774eb483ea8ca65da1e4e7037c0289bf08dd8cae0ccc23e6a7160	\\x0000000100000001c2d63224fc9665fbbaac190851b86badc811c6a6e11af89d4f341b8eb9151c2e8e9df570d27653db2b96548228206e2a762f69b9ed7d6ab3876fcbd21af6c1cd060d802661400f09ef2ac8116a960f17f87492c5eeec85da81518e515474af66ba1afdabda09f2c917cbaee8ac91bcb2b2ac0c103fcd84480f4f769ee8789a50	\\x0000000100010000
-8	1	7	\\xb2091821a909fe0217ef1fd04fc9785839c158abedc5f50cc9e76053f0fc0e4aad6e790095c2e82d0576bae51b67fb80c3f39065b1e6a8fecef3f6938ef2c701	244	\\x0000000100000100208ee435410093b6facd5cb379b2d8903b78e69ee3fce72f1e1a8095b6fa241673136f3903b776fe9a01932d695f18c2478e45c18df5d7f578cf5753c5c378e9b21f69de859d06ba96effa62fa2e2aef2a50ae8aac0062a118bacb2bfe4d00ff123c6c2cba396fc71eebd3746a3f350c9a23a42d1824279b64999d9a9f9ae575	\\x23b4103d4c7f454f72fca37ae339a30ef5e0d611f3124a79d84de72eb01621819fa45fe796344148840a574ff00b9ba4de5def3f1eacda84f283df0c0a226f36	\\x0000000100000001112f8408d3eabf0401ced3759bfadca2f8e5bffe6825098038337165b5db88db40a95ee4b6415c821a0b2a7173045b973540fad194df58acf9ed14a6a63514f3b03c81f4c1035b1a08416c30ce1be093589f33e1810bc5602f8b6c2ab389113434a22a0cea58064fedb8912296f1321b2d5c8587b6070168b17ad5bf77ddd12a	\\x0000000100010000
-9	1	8	\\x1e374124cede56edbf728bb836a09e6bbf979a7bd9c65da0157fc8a948a36209f28fd81c557d0de43d11155ad9dd1daa891137e6fafe2a1bfabc3a9ae929fa08	244	\\x000000010000010001722fd47b14f2b353ba1a44c2761aceae5e87da625f8e5afeb6485f94eef4d6a05db6402dec25150c5793f928ea1c80f614f464481986e82d0dda1462cd9a4a8ecb1677d7b82dfa8a07728c40f098f5feac7233676014c023ff09627c6d9f913640500c7fcdcc917327d08b76c770c0f969b29f644ae033f7648ad21b5c76b9	\\x7160ba5bd2f693d3005425721ca09a09039a0c4b7ad732e7d7dd84b030dd40f2c85be17b07863ad5b0b0f93e593b7ef1c58d4648493f4076be2a188bd5d18b0b	\\x0000000100000001ad70f3b06be8a3f4c0df4e223a870ae6d90ab2d40733c764f254ff0ecd9b348c88944de2be037cd7a09c6bb20d5b2510e82ba995cc92b6e9ec870c6ed74f926e10f24ff69ef4ab5b3412bc07944834a71a857d736ab3f84390c8647bcf6abbaa6d781ccc6aa047db7771969d79fda51d6a6cd0df3c9c8f9fadbc42ef7229540a	\\x0000000100010000
-10	1	9	\\x97d9de8bae626d2f7ca1148f5112497a9c1f68af2052986ade35bef64c207f75cc9dfc77f325191704e697563f82cc1b2cce66a8522c8fcea33a80d0aa2ad806	2	\\x000000010000010026c70b50711872c1e6e2b15f693564886384fe6df32bb55dcdfe16b97c0670a48ad05dcfd09d643633f07400d75180371061a9b1cf11f789dfdfb2c0a2ec4d60aa666a0835cddc34af5e1b6be30fee19c6fb6c3319b97c2780778eefed6e3f3180f71e2979cef9eb1e4957750303e745484c7465b90e77ca84c34c46c73ea324	\\xd080ff97ba144affbb017d960f6dab203aa01f6e7aa6b6483f6f95aa03bc0523e90fe2e1569bcad0c8521f4d46b77f08674f0ad971d980e945920b95e580d481	\\x000000010000000181cfbb54ac2958e36efbcc2e1ac1a0cee1a9c8462b09ab53e2c56a48da1eb106a758ca0f6584387232e4510c146011a7353c7f9dfe0a22ec6ec5cd310b5d7ebba225f57b50802b51181f7722f3c8b201c9b697d40d1303343ebdbdd8be8014af752b8f1af71c6830ef0b59b2f721891fe966474fd59fd35deb86925e0785908e	\\x0000000100010000
-11	1	10	\\x4a1b5027e358da25458acd29b0b37c79daf5b68b2102c80f9a5de2a6323ee8966d019dd3edaebd482ba26cac7cfb4e864d6b260c6e64641f6cd71b248f30b602	2	\\x0000000100000100c20a4b491ac237a2a282097b8e0a4935caa54c04018dd3f321d717d327c3810009633d23cc921087f1c040127a6b0c3cdab869a924d42a6836dd7a0dbf0c4dc3c12d71367e2dc11dc12f5a08c81abbed44d2afaa6d68da5b4bf67e19227404a6df55d5d25cc53353faf122b81f1bee45bbb81b85e27801b1c9a1b90750532a2c	\\x6fa170958d325ac4f3eae947e8e54f7f6d7fc24ee94f409f75e4d2573a87ab86c051ae5764739b2f97311fb3b2c295e3642f430e72cd92b5e9655c3b855f6b33	\\x000000010000000163099ce169b3b133a4ab3a5852f6a832a0e8ebee961ebc6c41af71685d0460070a8681bd7ebfd583c73bc9e30f18eb90742d9b64f692d589d96606d3e8d4f73140fbdcce4e568d047cf59934d71b65eb338df08d75f93db19055debe25ce59d1e120d2ecde86f9b3016d3a0a832d4fc10cd6e0e6beaa99c38fcbe660e89574c5	\\x0000000100010000
-12	1	11	\\x1bf5c0a2ae8de86cd40524af5e73956ca52c3b38ab8c86934633d777d31bea165968e09634fb50a3dfb2fe48b991380e4fb30ee65c909e01d841d5160254b60a	2	\\x0000000100000100733481c9c49a1ae9ec40063194bd3256de07beea5028200c8f6b82c01f6112b31aab5defbb626c676ea0702469ffb199908ac7737c3e89e254616f127fe62ae46b92c94fae937a92ca1ef2d3153a7e7c3a8e15341ffd4adbfa8a9f5b957b8e24465c36a310c1dccd5d780e61a130c9578e9a59897d870195a189b769d9080306	\\x58ec1a447b877666b0b99f7603234d8dacb565c308c96397ced1d9de0e1b4b5f6507848d1ff071988080cad9a33e9bf836eadc64dd5afc5c8134b0fc4309a242	\\x000000010000000193eeb6243d3315c823f87954bed0cb4d4471a0b8dc87a6137806cb7603d2d220a1bd1a21cc8eb87d8a5bf4f19f67673164ced876bf50d69975a052b81e8d2a4d36b847709b0f6ce9c42e250f8005c0d8d7a80a58679c87e150cbb0c11c645441ab08685a53be787838a0034a512a51ee189ba1c8c12ef6047129210907a53f9b	\\x0000000100010000
-13	2	0	\\x54be7eb5f06bc313a132d396174139cbf29a5cf5d9eb14627fae4e6f7ebb9c48fd36d1b1ec3006e0ac350e04e80cdc370578220f136c3282f2fdf40d6346ed09	2	\\x000000010000010027b5d612d016a35f54d4b8db502eb2bf7426dcc2499e5cb3945db4476dbd652a81942153e0f02100c42c6c07fcd64ce9a5d81377bd880d356e6f89fd33254b79726c1ab8ea26e21d70d8e2c5428805a62f9b3396b6a6a147f42ce0100f89a705b7f5f2b9686339ab3879f50fa16faa6b870d0682e32992623af6ce18ffbea8f8	\\xdb506b45d6c311e032f6941ea720ebaa447584354e2da5585890a76bb10d64e7cf93aaa179001bc23bb9dd759ae2a8be0466f7696ef0f7a711a8199139e2146f	\\x0000000100000001abd3034c2ea23bce8cb6ecdefe69cd3a44b7255175d1d05d17a0126193705c3a576f0bc3bfe39fb0a58d161f16a7db8d1e568d64dbfd10c4c972af3ad18eb1aeaaa6c5732a87d64b168b0bfefcecf5eea37e996eb67374c6fef26af3644cfdf255fe62c58b82d07186ec610d64f6b035b3fa24687ae22cd12fcb5d443354c7da	\\x0000000100010000
-14	2	1	\\x9ccadf9230dcea9248d5c82bc054e86dbac8b3bcbf6bcb153e9eb697ac5d46ee51cad4ab660720f1b96bd4cbd319ffa7e473be9eafd4dc1e9ad3eff5cafe4001	2	\\x0000000100000100288a3e955f1f86d3df6abb09cd7dc728a68122450845896f593a84d931e0c6d278893a5536e2b1202e4539419ee05f4ccd53c06ed654f23ddca62baa1cd4302b0709eb34e2dce62a878065169df9a2818a39601d325dae81df82d17ff04d082026a37c8114c161aefaca1da14e15856ac76494141a045252b05ba86e30c53b92	\\x6eddabe9f3e6cd21394eb8e2ebcaa7dd8448e743558757b33288cabd970961dd9267136a4dc23fa38ef2a667dde22275eef73d63ed09d81c453a20af7713873f	\\x00000001000000013a0d30e3162a4a8d7779ed8bf42e6216fa5612c0977ed3b31e28ee24923b0cb4993d77066f2ee21734b9738e2baa6862b2555235d560ac931d04dca69bf02a0ac93fd03fb17fc1bc530dc979a12f27dae0f2ea74f330ec270c38a76976ee8cc232838083eaf4811cc068344a20efbc29e298216c4488191b22017473cfafc661	\\x0000000100010000
-15	2	2	\\x10253d875545e2f1817481c30986dbaaff4d76b802873490d2a8746cec40ea39829366940b876499d94225a695449582b62fc45a902ed557aa5cb7c9a7d98901	2	\\x00000001000001005a94220bbb231902e58f70e5b64c8e0984e5fb86e7c7f3ad2b1f8c6060de8c1349590324956168e9576eeaa0829a73738146cc28447785841d4ef39baaf8af5e8987ce4803577c5354d38ac4761a835ceccbc6522eb60539fb8b6d34847d333b666dcce2765f73370c9f1ac0c84222072dfc48dba063af9cc9ca89f2c1311452	\\x41cb98b136ec4a4e4598992709ea2f7b5c5d9db14975fd13d46f118a86a7a38b802f7ab00c36decafc1b24034a8f5e74637b954f24fd4fce5a4a21fd401e500a	\\x0000000100000001a8dccd21536dddad3ff06a97e2b521cabcf2c19f0432208e09694b4b5ee5ccc378463513306a0d598ab5571fc910c2c85ce539cd1e2d01d82ec167234eb265077acffa1c92cd6e03fb6f9922a87f652574b93732ddb66023b9d5d857ada0cda960748bf241bb0c0be7279370f7c765e22b20e819ef9586146703390e93856a20	\\x0000000100010000
-16	2	3	\\xda66e069e7f682b06a28014618f600bf2ae6639a73f83811d96843be20b77042f0f2d5043dfaf84e082b76e500f264910e2be6d41cd27a89d8a0b5e4693ee40c	2	\\x0000000100000100a69c52761103bfef94d63fcd8a27dbeded18115c2f013e7c7eec0f53acc43bbdd48103a5681bafed409ad97bb204cb4a6435d6abd1e8e85bb6ac3451bb31da6f05a3e1afa42a21a8e1a77be70bcaba573de1295dea56943536012d039ce28101c17910716bdfb45de49ab027b82862a127ac7ea21c27d0568511c8ca20bcfdb8	\\x27dc692200e30319dd1bcd55a632b92689a4c6a3dc80db7c7482338409a76e11b7bd61bf2639219c79b225c0e898251ad73d025a915c148ba8f104ef66191ba7	\\x00000001000000010a0891598c719c4a8b58172d572d78ab948847d4d327730af3af2927ac8d4f60d9f46f37289e511ee089f7e85602ce7e8d5ae1453eb955541da6cece4edad39bb10880475edfe1d730fa29c07dbdfd9297480a28b14efc199f7600f58194eddf460a950828beaefbe455650e5d3d33a55f20e2d43f4427c884393b78b45e2825	\\x0000000100010000
-17	2	4	\\x266a8d5103eb72194d5705ca2a9b365519a263daf79b9be559aef815c75cab656dfebead5ef2474f344aa1911ed33f5cc57ad182ad5250c19cb8e85966742608	2	\\x00000001000001001f2664d29f08d641983d8ab558b26a12586ee4b9b06987c2aca503e0cd791117bf76db46ee46a1fdf6c61f534958d4f3fb5d2f1ea719e48a4a93d9fb0abffb6c28fac14951f292d5b665872249fcfebb83d283eb8bd7b1006d316158a5cdf591f701bf32f183927b9719c9776ba754ac580093402f30cf4f0c89d91f0f2ed142	\\x31e3a51655563e3e22709b814f6e59f80b0ed9af273cd36aa3b1c08aad341202988d71dd5ff17aac0efc7d661e99599643f3ae14cc3e911a3c40a5961d0376fc	\\x00000001000000013525e28ca2a011359abc65295ad0bf093360d80ea49e850552e01f9dbb67a744f04f3f659f762610b9e7b14e14b942ffb3cc793a7ab28f900bc0c77058f3da67aa58b681bc1bc86db0212689f18dadb24faa7ab252ccc196d82c5c562c244d56cc593cf08ad891fb94122c02b9c563e358ec49348dd07850209b82393359838e	\\x0000000100010000
-18	2	5	\\x67b9af246502d0f994eed88afc37f535ac13a3f0f36c4d7d60f4d62e27649f4cefe4b4977f99073e3125755117bbe8c9e88b8c68e23a83d2c92472fbda66b00f	2	\\x000000010000010093fee280c1cf6e2ddcd086a6fc118bc83d73114c553db9e870cadd6186606b8c0748d636e4c4c4e605d09c9f7439ea9e4d366e155d23a1c0e458336c1fe24dc78a56a856cf08508f7e58a8abeba2f1c2b922fae03c81339cba1d49f035985ee06cc67403381be30dccd92ad862097949785103a5a8294fe75f69ba25aa237801	\\xc6fe062dc2eb23dd903e405a59b961036a00d2642e28e274d6871b8003c9a312ead249656437a5c2b687a50443126e4e2a5dfeba801db89221d062d6d8b677d3	\\x00000001000000019c96f17eed7fcd00ba853ea9898d270f01332f05946454e35ca8447e1d8651845c1026f9793013c8ef2340b50f1dc3b2be359a988867125d98f6e6bfafe02f3811319d840d95b7de57df5ffdc71e54fb643e27157aca2fa4b54a2b1fa93226688aecadceeee78294587500d1394f213db9d1d5f0862641c2e92c54af5c9f80ac	\\x0000000100010000
-19	2	6	\\xc5df172bdb886d1633d3e46f4616c594c55f59ac9145b8013b7624cad635420df24062c163e1058c641b98054fc65ce5a726efa59e5bc849b67c33f579abfc0f	2	\\x0000000100000100941fccb20f0be031070585e63bbdef5f0b80095144dae00cfd66dc93af35cf750b91d33f7aa79a853559fbc9e40146f6df7522e25af27cef09379ee9b95c5999a4e9db068db50998b66c26f6b5961fd972acb32428ba81eced079ae634664e4a87c7161d2d2b85cb1509ac3227175d5d195b514eb6e1efe56635bf205bce3589	\\xefda4061288a419aedcf60efdd5c3a411ee6b604aec23a528b1f9594093b2279df1aeeb88601cb85b7d947fa4aa2e7e8d33f52e084f7325ade3dba8f254e1858	\\x0000000100000001c76428049fd61cafaf5fce5bb33536d58f1e48a5d25e6ed072f68b796a8c55e450c180167a5f1629fd36e1990bb3074f8d3bcf127357a953d2d78b332e95a6926ecbdce11e1fb4458779c7539acb29a22bb007927adcc444fde0de56c6476ebe61b0ce7e49aeb3c4530deac53ffe859732e3af84d05036452bad4ece2d4e64c4	\\x0000000100010000
-20	2	7	\\x74d104dceb3a3d5ba148555c65ead19a56034a97b073eab03a4e62de6bdd1f871a312a72c6644bfc3d4bd3b4a01182574a88cd9cce6bfb11f0137d85a059d70a	2	\\x000000010000010028db7ad1f5c3d195e36d9944e551e31885396cec9042d24722149f20f5846f5059e8902d05d5558e07be7765a73a1150fe8c83810e25a0c622704ff1534ebd6fba98714899ea0e69bd29c4669e993bc5dccb6105508a61cf0cc44f6a98d1441c070006d289adce45e79ad8baf439fe570aec8b43360cec650516859d55b7540a	\\xfb41362bc5be8a8ed957a88763059a88465bd94e1a78185d90a9ab2dc3ebf6a8ad2789147d72d05efe9916e6ba5f73bb75dac776c19571b9ccb1a0be67d2c917	\\x00000001000000019cf222cf48609994ed71e4f05130463bfb2bc065a1d9bf9ae9fa6bb37f0830c64bd25b4c490346ff00293e25546eeab75a2657b36b28a7dfbd7175ff4db99cc521ee97e477b23a67653f10336e65ed5637c6ff42244475680833ae89167e58e7e3a792749944b52b32f8563c78fffa21ec68b612b3851384e4ac9ec030b192dd	\\x0000000100010000
-21	2	8	\\xce9bdffacfc507dfebfc276befe671fb8dbf9c0d63803b63b8a82b33f9f68fe628b90f0f355ddeb82170d80ed19afbf5febb44a0d165b94822fd1cf1b97d5f01	2	\\x000000010000010001138cc5a587927a52302950386dc7640fcae929ad579c2561f0bbe6f55aa5463ec248c285bc13ddea079d4462d5fcfe07137bfd87fd9db07cf7e4a17245cff24cf7cbecda6e24a281bd141f270256ec1246946645de37f6629d87897fd35bfa93763e192a22954d35af762d36d51668e1c4db43d3c1930720d0f286791e0021	\\x6369786dbb40012fea118897287bd217ff3bb5a09cd14599bf38a7560f780c106470a6250042132fa9468c62ed3ee7953c37dce6e74dcdc4fab8cb2afc9c69ba	\\x000000010000000111a8f72f1d135baa35e1b7dc8df338f4341a770619f0a72198011818fbfccf31f4d591780f0136d867b52ba49499ab23260596b2a8f7aefeac1a3e1db44c963b72579764562b5e1475a82313e70036a0df2d4ff09c5ce788bdfcfd2b48a1960583e9373cf104570f7b8271b26506ec516714b780768980d7554f0444ef4e5492	\\x0000000100010000
-22	2	9	\\x224f903529ddde5b8b77aa8ae9e0950c5a52cb2ee424adb1fe70d749f5a92ff0b7b581c2e7a31e0c376c54da4d4b0ac208ac5d9b68aaf7c7dc862124f583130f	2	\\x000000010000010031eb251a659b20e782e1465b8b7a5ff8cbcbe219ad8b87cfa16a8d74a854dcdebef89698f159cbd7413a4c67a885fb14365c2973d4c165e6572f291ff11a5ac00575463abc42d770c1d3be01ea672b69653d1c5c7738c85433e91c4a9cf6f06ab1164375e67f22ff5690ba2fb9c6f79027b432cd63f03a48ce981a005b97fb	\\x6e9a12e3d21460c4fb9957ecd29c194be654d8767cafe2329fae46295f927644e205073ab980e41785821d0c9614a6af50aef858ee67ea049e7be84fc1cdd0b1	\\x0000000100000001386bf78695de4118aab930e080838f8835672ef9703a49e94ed3f82bc6cd4ed5bd535fc1b98513970d0b571458f00bcc1b5dc28d9de0d0b8e9d70c0d80539ce6b71f9a913e7bb9b16a070af1c0e90d0ccde283281ff3ab895579b6ac1980a70baa6b6e57c14ab1dfbde85caa8ee41488d97f5922f03315b953b7fa4dc39f99d1	\\x0000000100010000
-23	2	10	\\x07f1482faf4368ae3c17227a3968f13b4bafb69796ff7ba37426a464de313ae5e821ecb4aea7e7de0aaf76fe068b2bff859de07a595d3450323bae350dbf3309	2	\\x0000000100000100738e007f16168da04a9c74846d7654fb720cb9ebde8423f5eb3ff8e266eb8976a3ff35d8f8f081e8b6357712f1f75f9700f0b8ebdf8138de28ae8a8a839e4b6c275220af8ed7340a49b5f32609e4f2e0acf4612683d477378c5fe1a9df9e09df82f0ef5964cc26ed4db5b6d7ac6f986c67bd77d71035cfc88292091acf05feb9	\\xc6d076552dd050e48560ede99e3e9ee6978cd60a3c65006dd91c196a9f2ce50248c12956d92ffe3753fd414ff242c8185709d3ba99cd57e936e679f97ae74d66	\\x0000000100000001c9e97564daeeb49f896c2ee45d1cedd94704e4ad828521ed7c65fc502880bfc2a6fbe0dfb6eb437d23a626f4897d5077cec5c51d7493d7970d1e61abec5ebaeda53f06c8cedbe955fc89aee8964658bbf934f6b3b61573135cae6770284ed6cdb3ad1bc7d36e040c3cd563c1cc9cd27d64a84040e695489feba0db52640ff326	\\x0000000100010000
-24	2	11	\\xa29a692dd253b46a5af8fa5eda28d85b199451d54c6eb110ece42f82d000f4f2097c3de14b6084cf0061709850cf2bb51fd5c211eab36cf59f7c2d4d6c32fd07	2	\\x0000000100000100088714d83743d40a4424e155b3bb758b02b09af3fa58fb435bc36c150099cc1e0d2ec233f375846048d44f0e5772991a6b55a0322c75ae612b2c3defd9ec11ba7a9841d79fe4734b55fd4bac94718721ddcafe797a2dbceec5f2cb051161e322319452d9796d3e09aca40a8ac55c04d4f5ec2be58fe0959af2939d489eaa9e4d	\\x9637e15e982ac95f52c7f41bb79ce8b137f74470227083758520cb071f9ac7651bdd17be94b340b5377350c207e1defe31c137157fe180feaa8b701e4d5ace38	\\x0000000100000001ae6ada9322f0656d7e20dce6f982ba2de58329fd0f3617fa286913d1feba5ecd7f9fdc6aa31ade9dbe0bab498aa4e5ce03eb8952ad315c3b644f6883189f00a7a204adc0da1457d6febd246b13a60a5c3000249cca09681662c9a73e433c8842abd73c1a8cafed5b72dcf8d06c43dcc7a1dd7810f9915cbd7e70d68a2239921f	\\x0000000100010000
-25	2	12	\\xa6455746ad9d15ff8a07a3561d594511c6231c55b31e86a95e276e728f5100b1c9d6200bdb5f7e61d993f4cb2dcba81806d287fc90149b088c620e3a8eaa6e00	2	\\x00000001000001005e8489148e20f55842d61d8991b9c045e675d7c649d0b319ad550a1bba8b6537aaf6c7483a1093fd5ac1283c0d0074e6a2bd4fd67656cd7af3e36bbf39b7fffc8c0a49b64451aaa14e6f11a2ff1db7d22705b02a20eadf50e61ee4245010a082468efbf3cc5f328dceb590a408fd4ab97560595a81d4d47f1da573243fe7721e	\\xf63b613facea60683375c7557b2ab9f8ff2fb255dc0f13dcd63b45e4c07f3f5072165e96bfe1bb6fb15c276a233de71108a33b08f29b6ab57c8c4c71b5eedd89	\\x00000001000000013047747bf5a2376517bf016af3787c3a78b76064e1fc1b6ec26d18f6f6ed41a0e6890d85570d0687c30b9571cd5ab2e6f49ed290092bb20d49568176944aadfe78f12cc5af2172a15728f2b5f9bb7eba55cb3010f76dd4af8b1c2b1abc90c72813d4617d8568a2ad58c2186201746094cc1cedb3786895bded0ea4f737eaf025	\\x0000000100010000
-26	2	13	\\xa6bb30e69cae9563f12f4fa69d270a3fca582ae7c7d1bfac4a22cf6bab8bfb8b97c62c3edc35d2b7e35b05f6ef5b293b33c0cb6b2755da1e05c8a5242cf0610b	2	\\x000000010000010038fea413b961c6a3a8b6660989353d2e98bd84cee6b369782b0f1924ff06696c38491128aa7f5b82d2a3ce3eb4f360bc6f1a2812b5db79c6a1aab12daae41e45ca3c94128784382bf3fedb5225f1515428602f6f05bfa77d842adbf758e7890d1871d47e7e6f6c5c0fdee99799d0291b995d77216b234f61975acf58a8fe3f7b	\\xa2b4188283c1f7f068e7f4e81c1af0da978607bb2ad34a23a0a51e8688f75992f8cf8ae2dc81a444539e99840c4582ce2a3db35f97f27cddc18c4c859885e623	\\x000000010000000171a83165307e0da4f6232f79cbb06fbc058316238abb39df82132aec1ff7cfd9fca433d2e62b9bcef7dd40cbd376fbe337dfb5002fd75b69fbfb8c58497597cd479eed4e64fbc5fcc4d4fccb5d85ee4a2f77824545f3bfe63af61d582d2a3093c0107711eab25f261581acf93a709a17ab0afe486ff9430ec8ecfa3e614e9df4	\\x0000000100010000
-27	2	14	\\x6ec6d915c1dad01ae2ce8fdf8060472a04b1351aae945fdb6d7d370bf29de1cdacd5b4883cf8f0acc8a03c04b347dee7ddc8a3111a1f71e84017084910bd1700	2	\\x0000000100000100b70f4fdc5022c5d68c144f5f041dbadc56b5adebe87c8c4347d0010761522a1d303e72d15738a78391d03891558d8849ea46da3950fa00e50c96d7c088020f76d495dfbbf21ba7be58f749194ed26445029b4982a96b87105d273c74f5783da983eee3f0f1cf0a8d667dd9da78a7c1f9d019d138d7b71a1e64e2139884fb90b3	\\xfd6d4e5926c019cb8dce2103bda5209e99d650c2c8d2c6e625c34f4555e491eedefb5589885c3a376b532f7c1f903c1313733a5e6445d7863c66569a90562398	\\x00000001000000015ba013f86af7333a89821e4cac5edbca09699f51f86ff74eb2926c9404024ea05c4b8dd3dcaadd5582e1941bcf63a01864d085f18b0783956ed4d66aff9b85eafe254027170131899e7f3ec51f2811c88a8308737482f21dee0bdeefc4b628f1796b67616c644e06376a6252bd98f01dbe97f8754376139e45310ca3821fa1ad	\\x0000000100010000
-28	2	15	\\xa0d3bbe0cc6f5803c5398bd39a6167431afee49bfa79a1f0884b2298b7636d7a9fd28e5eba9a949266bbc28c81683d88c85413da70b8e86c33d18d68e80af80d	2	\\x000000010000010044d73c9facf37608cf0a0fd189a6ba094068a578b13a9a83f91add5950ab673374ca70eba1796b53308c1f9ae711f1468772c8e59b8deb326fe72d81b6947e06e5043c5537234fdd5baf6157d687142dcdb8bf8e304bfee305f55a1c2abb64d36f27e59de8d267a51159c16c036a22de2fdecdd1a0fbb27940db91f591e43497	\\x3545b551941a5bb36451ecb0769c279361b249f8151cf3c787c75cc81648c449793c5b11f4eab98b4f14f764940c4e6c86c772ab25a2de5b85ceee9ea4752f84	\\x00000001000000013e076ff66fe130d55485cf30d6ce614e71314dc5795b75dd1f54c9ec61124e82ad24e4fc45b2b435640812729cf7095dfc7fdf961c435f29ff7fb018ec3effbadb9be7819a8683be4d9c243593ff95d587f1085e2a1edb9d649cdca205e516dc31106b4def1483bffa88148d6c4b4eb2cf1d1394ac6483921a8eda055963d922	\\x0000000100010000
-29	2	16	\\xcb321b6f078019cb8ccc331e2f15ebe6a89a46a7ad1dc9c0251166d82ff312b1edc0f9dc264b5edd33ea30cd525fc8db4bc05ab6bd44d748d48003fcd6cb0c09	2	\\x00000001000001009776f84d020eb09477cccfb22635dff33f4bc2a0d38d97204de5806fe9bd819ea216aa05a2ee328d6bd4f313f9e0bd795d51b87dc3268079b18b4b12cf3c28e771695975b33ea16c588a805a2027a1fda9ac1f4d278df62014586d94a5cf8a067b77c4737070fb14fa96871bdc9d699211ec9dedf9124e3d552331d7a3f3b292	\\x53f54f0f7857be8b9b4542baca6643617471f311a3c806b9a9c212ac58a60dcf6aef113b6295036735a387bb4ab18f877c2fe5988e874be581b5b571a7080819	\\x00000001000000014d1d897b0823be8cdecd070d1f24850c7e6c0bb289a2183111080e05c216a675595e72bd75a5749be0e5c894cf3275960d09a32d29edc77644ee462ad7e8c5a54954d2d70b4ab657169e0c5368c3bcec762c7ac2ad2c6beebc3947e08ec8a465e8fb56a416ab185718318722fa3f42feb2dabd07d98c0cd55c83f0fa463a72a5	\\x0000000100010000
-30	2	17	\\x06d4968670330ad3fa3247dd29e913d6412aded5e9637de132158022ee32177198b57a9f4a285aecbd25b700fc63858087f231373035d915d9f876b2bc6e580f	2	\\x000000010000010034adaa8c16283c12d6d6d4714f645e160ff08f2f268d0b1e39397c3ed568e3362334133eee55478bdfbe32caed72386008d803aebcd9ff0fd0d49b22e5f57798d8b2dcea10a8f40fb4bb1bb2433321b42198f9fa1412b8c03d8bf13bcdafc1c199c49bb94f5ed2dae0489fce08c117dfa60140728465acebf9250bb86b713698	\\xd4c9ead69ab929443ae39ec7657ffdba26ecebc08823d278c1b9c1bb0d6379ae837b641e8dd4e9daf178844633fdf487296f34a4976e87d157dcfb08b28c883c	\\x000000010000000139f726927a65f805f9fd2f0b3f625121c6fcf2f24ee120a61f8fb6f4873a7f12ea82a8aa2be8c802c9dbeac7488736749b5f46abcbe7c4948e9cf5b10e4d21e32810a50fd42b03eff89bda92b73cee008bf1ea2f2b5fde2209f997dfeabfa29ed2d2c388ced63d33cb04df222bc62a7e8619a60b27fc740bf8f6f9f7f23b184e	\\x0000000100010000
-31	2	18	\\x8cebda1c932e29f70ded1d7b23ec519c717a4d2599f7648c905eea9940c6ca1ee028213484b820d871cddd32a0b59cddbd77d0bfd4e2d17f1f17a44b9b1ab804	2	\\x00000001000001003f79a97d5d4b24c805c4c238685b5f741f3d4c352285c7e3bbac4f8bc6019e1b290dc51714b4592ec02d019b1167560e220f7cfb42033c396f57c496f8cd07e8ec7f608bc19aae315579a3fd504a9f547c3a80c5b48d84c9a7876d6afb2430a53ed5c7bd215f5a23ff3a44157ddba032cf5ebfef184ef625f3b84b933d3b21b4	\\xa5f667d1b44279603c1ca7b15ded0354302592fe92e1722b020e30d272adc1e887db73729060e99b7f6a6403b067b52453e9504432973d8ef265b47804fc6a28	\\x00000001000000010ddb941e0f67699c617dc61dd04ee930da8f857c9fc050d27970f4c8840e0f3097ddb92b10b80f03e34f20b6e38d8995ab1f0f66cad58df4835a5fb6c53eb04c53426e0e31ee83ef8ea0eaf7c7b6fdc2a6af0e675a4616bcf3fdc3756f0e408b5b315d199d79bd4a5529bee6efc536d5c726eca051fe13c3062c7de4533f3464	\\x0000000100010000
-32	2	19	\\xbdb6923230b0dfbd00668dd1d709f2e7962f4583e1536fd1d92cbb45e68944be37c4568830aac44b2eca68a5ae678cdf05b4833feb430268194dccc8f0aa500c	2	\\x000000010000010037263aa4d889f558bb6acc1476e10c06c18a2fbd12a86c1551b6db6abc99112d4a31227600925b0fe85d338a8205ff46a3901f3546bafc4e1a38c15b7b467fd203330ae6ee626eba53b84dcd2e82b8da2446810ef4f6af29be143f50aeb019b56eae9b15f3364a9fac0264eea7e4c4819ee61519732ec9e7690e12f1334ca870	\\x3a5e4db1065ae0ac1462e3cb0a66eade3514481d898fdbccb66ad42d168b822e39428ede07ac23bbd40d12e43701761d6473ae73fe436a8ba7dba9758dae37cf	\\x0000000100000001432392f4684ac4357ef77f07bf8fd9dfe7c64f2c39b4736aaa15e8e8aa0ac3482196575c5929f23e00c0b47d7545c18999feaebfb11536e2e449aac9e7187ad1d768a45d838c3d9aca6cc762afd1331ddfbe43fef7a2e2f32c1b47eba626f823ac9af7d36c981bc5fe57842e45dab66c5f0806934069c29eea945fb65fa0b58a	\\x0000000100010000
-33	2	20	\\xb054970ad557c15d4b1e7f625a734a09552947f5414c29ba4b44d5834756856269a1281b5113a621569b05a8a76c10ae97d93f467d630f84e1b3124a1c22200a	2	\\x000000010000010027708be73b48ed6ccf87a2d19bdacb0fc666bcdaf6b39bba68929a54d18bdec39ca59addf66ea6e191bd4f3df6f1e6a3a0e35fa906bf388a3f8d28f21f0d500d500a11cf99eb54d3cf6b8be014caabafa5b45fc927b5ab611773e03a71f0cb20c83d6caf9c8803852434bd6f0d9d5b0cfb6fd06ba57b76822dcf61c00dfc8a1f	\\x8b0c2163ed93a69af2b103b50db8f9d1c4e364d8191b202eb27ff8a43fba3f01cc079e3ea91fab81673720c3a48693005e1ebd50931cbb474238320abde43d60	\\x000000010000000150e095ad650b133403cd71c568950a6c06e0a5de9e618e42b793994564a65b3ede90d50e91131e4e9130d9d4f64e0a4d348384b743296ecd4aa48b39b1a533fafd277fe48baa2326b2c1f0cfbe533576faa505a3931f55e58cec10c91da70eafd4afeb97e8b43604d2142e07e8f54aa666ed247d8de49ad7d0361ead9b3e8bf1	\\x0000000100010000
-34	2	21	\\xe6a31d3208af2334685d81f2ba55628bd2b3591787c2a51e6bd3783d0761647515df9de6db92d54a6299c70731edb7b2ebc3647010bc582f2c22573f4b2b8f00	2	\\x000000010000010092ef7f5d9bb695bdb971ce85c1693db4be4e4611954e798481ad8d038f5599a287dce4545493773dca8246057b45278c93464e4e2d283d97f1aee8d83b58f1b37c46b438366a1c2c8405e48c8b66079ef4ce09a30f04272dd53158d60fa34d2bb0e6074dc83e28a75daae075d88f385e7a49ebaeaa1816883c707a17bc142cc9	\\x05cd360c7dda959d4dbf945083e83ac090100e62c247e8f48f2a20e368990c0837164ebecc9451c29022c55e0f6e1f5ade7f815ac5548caac5f0e1bf67cd7db5	\\x0000000100000001baef4149c37a47482863b62c5c5563f7451e56adbee6b160e30900339388e7b0739c2d5843e6622a4ec2fbd50808953971c14359d74c4b8488dd582c2f5b63ef13aeb6b75ae4153eaf10bf43949c4e11cb63004a7350caef3192684debbb63f10b045a0ba6a93d02876129069735c9eb18408bc5d2aa75d5df54ba69a0c21b4a	\\x0000000100010000
-35	2	22	\\x70063a72ed30709d12325af91a17ac0a8b98fc044d44367471304cfc540f75a4f734b22fc0d855c6811e897d2a3ea49accecf0f1149f81289e2a62ca56d55c08	2	\\x0000000100000100b93f8f647ae6ddecdb7e1dcd9f752564ed4314a909e8341e73968c62531b4e05ab8d4acb7f4573ccdcc8a365fc705fc8936bbea216597f924408807c0e199c99992f1437eed834fc6b4555084595ed9f56df59c31b0b0414e29bae34b3b11ea893a7b1bd331a67b7d1e99227aa8d653d4ff31a680d12f7aca04b5f62ce625135	\\x75b32eeb15455445117465cca51662e778e5023ed9bc1578f1b2c43cc87c210ef8ebe62006ba987c7f8aebca4ae131d48acac4418094f343b5b355837208c53d	\\x00000001000000010e0db2b90cd6b1cbaf6b3ad7228c7ce406f4e412ce0dc17ec189b716e0c423b32b417127d4a29e468d083ab94d5ac0e6ebe5d7ef25b45798872707117a7b652f01941ebff462f295e4bab7461bfcbef28997bc5ff5ea465d3ee791e0f0c5cf2106a70401c0cac52ffe366bf6e0df6bfed74bef4186fb1726a8852bdd3513dc86	\\x0000000100010000
-36	2	23	\\xa1fb5cc6f14e485a94fe218d56867761c6c9b06114cbaf86dde5f911f3ae3966e7438b32263d980713c5eaa6dcd03038d81f46392ffb3e502bbd8a32d4c8860e	2	\\x000000010000010068f544c7a6d2e3b51f5875cfc3710bf8dbc7a087e7e6e97960b1cfbd7b4119fa8ec346585e68996b207bd9b4972af0e67c1ee18e55d8c9f11f0e876378c30eceab53db5c2a59921e6b14b94d2662ecacd27f2697ee3f3931679d55bc996faf4f09a8263489e364dca12dfd81875f033982b645fade5821c151422e8c41eaf895	\\x3278ff5b3c3faedc2e005935341d361f9146949dfd4f095f0f2a0efc23a0e447e2ec7585596da58a722757a192c8739951a7dd55f00982c50c247fb9ddbde4be	\\x0000000100000001ac0f807a4772df85ea7879329cda59004b3adfdfc2f683b18588db60382431e7c5ef1a370071ad358827ac3f47fce6ebee2c5c82fdfabb1775335e5fdb8650666606f54ab2af9c8a4d32071068ed4677916c4b8d32d29cec8e3c226c4d1a68928aee83ab49bf58df0d8daf31386b939587a226f683cdbf732a7bd6aaab79e70c	\\x0000000100010000
-37	2	24	\\x52535ef43efcd23aa983a44474c78172daa7147d994713da3e80dbcaa60349a028f74def9aa6aab716af2d685a5a50e289fb368f2eb5256ecb57f4d16ab6e102	2	\\x0000000100000100173568a2e3848f6bb0a67d96b55a1d4aecfa3c6a2b18965b33b94524f5e132456efa9dd4171f7d5b886da7b8f8c00376dc34c883dd4ae662c904d0ed1e0ab6d9962e3aa4b4663725b9fd4c9cf6f6d6cf202e6cc89a0a5f1db32f4e42507f8d99dbce438b325a78a7486c99e911eab3aa96c8dad159cc1d0bf744de6713fd2291	\\xfec7bbcf7bda580083103d47ef1d70047f167c26bb3cffab278ced8077e627c222587c6ac0e228223daabebb5c4f5a60fcb8fef2988373465bfe87c6c23c811d	\\x000000010000000193a70bedd811abc08b7f7bae6a94256507a6984101059330b6a1f0110fae1f7f0ad1863d8d05f784b951d174647a0c4208dd7abd6bea806c96495a344d214b96bc3b0df5d766007b6e44602d383b964f2f10b391d1ef9faf932cb38bc5fd6d10952afcb3308c739a7afc6b68dcec3135255dc9cd017893b9f4cf45053c834594	\\x0000000100010000
-38	2	25	\\x2b176340f1d0e26a648ceb04810d06d095a6ae27612558c7de1ad215a283fc66b7a11c456d04c73cfd3f5aa5e84aaf3af5a19a02f4e6fe90916240a0d9d36a0b	2	\\x0000000100000100777de581ccf39bc86a0477e3f3e71ef1716948796823cabe948704e92baeb801eb65dbce633e8fdb65841f351790a638cf434ec0887046add9def31bbe388cb39ddb8b5d3682bf14dcbabcd266c1bf343a71a4b480ba5666508693a2c2b22c0c9a0feb1fc012baf4e6b969c72376b470194dd8184dcfd8a5c3c5e1f5e6e42a69	\\x25c85a685ba930ef953604d77f323d89edca611646c964a561575f051003de7cf6b935315a6b99035e2799834490942015de74e309af45b0031e9388b30ca504	\\x0000000100000001936f7c0a8caf8daa62b2d9c4a6faa336d921a6650c4d69976a7e0cac065ca70a851bd733e96e924134ddd7c8c8a3ff361587c561ffec376dd3d2be2ea8430fbb47da81b13ccb3761afd9418cbf0eea1435ce347434bfc72e0fd2a681beb7ba1af8e98f066ac5c26946d296eeee61a54bab0714197c88772f567dff92a308d5de	\\x0000000100010000
-39	2	26	\\x8d41e6e0b273fe9e472050b6572e78785e1004415609ab66e8a3e8c90bdf14fdad90d8091f3f55ec595a5804afc67c2e84e096c135972c1049c3e11460210208	2	\\x00000001000001000df9d560016e7aa766317b4d4b3549abc6f0399b22493320114c0b4c217599c961e7927f991fa3375bed473f538e829312e5ee73d6dcb2b8a1bfd65ff8bff37f940798533e2a5a94a5358009e62cf40d2278f72c1226da0b8ac1cbb94b12e6cbb199a02869ebe1e49c689bbdc043422fc6a65bee2065a34d1bdd55e695a25287	\\xb472198ab8523acc9f5c5e14121669f0f63ae0bff5fb89751d033f87f8cfc6bee88237b352971466046c6999c627414d6d557fe6f1a94a72e188fc3f1224cb42	\\x0000000100000001517948c14e9f383fd6ac46d8432ada1534d17d5d15eb6385c1de22d4a2c26f38c0518393905ee2253b742aef36f57b2223ac33aeefdabaa9c0847c4df49d9b9aec308e524db20d5bf2fc28d77e9819ad33ecdb99f1a51aff87fa1b3a1b114b5b0bea2d7aca76026dc0121a18b2f1401eb078ba88829213c47569cb3e0e204c5e	\\x0000000100010000
-40	2	27	\\x64d5fa7ef14e521e29e0a6679f0a5af2aa875615499badc52c36d59b0f36a267221148eb0707c3fd9cba66ef9b8d920675eaa503f9b74dafca867ce4b4d7360e	2	\\x00000001000001005680fde54efeb3c170318a9de400c16c8181f718a9bea5211ea2e38c8c180608b8907f32d3724fbee47925730b40ae187c49d021871206091d8aad2cd93df46ff537eca1de29d0680d3c8de14210ad898240fe87ea85e69a67456bf12b690494733c71e6efc707b40cff0f5048f839bcf43ed905e1413d285eac265b38fe5f06	\\xaac22e8edb9cb40549a6294b12f2962475b867909b5f3038310b57ff9331b1a9d2f99ebb8cb3c5d2dc80a84b41e3ed6e65c47b94f41171918e7718a7d58664c9	\\x000000010000000122432ff98edfa3670a1233afb97d09ebd353822858d1ec73da2aba1de48da77c8a7690a618f28da0fb005d35dbecdeb72c422c8d71b9bc317a118454fa043d608bbd49429ebd500d220ec7fd62685e91795ba5465a2938aaa330f105a492f555e3b8d249f6c02b7b361ac73ea13d2f7f23aef5ba119b0d945ad70063b5bbba01	\\x0000000100010000
-41	2	28	\\x539acb651f0c710672aff65658c90b3ba78d8c5f3a54b7d864212c706488ccb4046ac776efe0f74fbb3f00eda18c798dd13b08c872c6cd395fcd2fc0557d8906	2	\\x0000000100000100b09a420e4ec9528042b1725bdc0adbc33ae641f9b91135b9f80b75c33f6c8647a3cd05aa699c04b1f82b2c1242db8917a903460260e90f1ec40b2d30e8aa72ef2f0a68c274995f8260412aeb8a3d65dcfe70b9e35ac34df74afb9ad488035d5376be7d1571f95c1d1042c1850d7658883407a5011de09720100a207801b3f7c7	\\x76202522d6fc57d2e6fb2f271fcd801a130d01c67a27a966229e283e8eae6b7e2a879833541d17262b92092a56d885e6dd27156593592cdd6b6889bcf66de12e	\\x000000010000000141c5152dae91ee572fc81ea5359602822a6399ce982f11df1fc757ee336e8cb6ca89c685fe4afa02c608c66795e7e699d6d9ff7763b7b5bd791a8dd6761f635ccfc033797d40a8a9bf3573e6f1c2bf6015300da6f974798a67993b2e9dd98c49212ac55c7d3c90522ecedf4c1d80af76e9b78012b7cff6224a6465b4c2581f03	\\x0000000100010000
-42	2	29	\\x26a30297f82a6bea79fa6ddd6249b7fc62c20e2e6279322409b0db90c7b7efd87f742d864d02f3fa3287e0d28f306d9a2c779ca0eaf1d2ea8c78b8f269754105	2	\\x000000010000010042e8d3e47cc91d8b7e5f76ea6bd8b7024644ea6f2be6df41afee85dcba13533392527584d4d421068a9f0bca3bdb8c234bd23c50a7934e10471ff14d0cf5a90be0b3f5ce0c96fe3d7cff9417238248645389752a7c06b86ad750bb748c2facec869a8cb611dc683ef6d436675acef70662f93272fed30aa975e9ea9148172312	\\x62e6b5ec9755818032c7ae3f243bf0606be8619e2ab5b9b321fa0c6579760888d108980342ebb1f8ffc40507fc8013654b28f68e1e65d7017803a1c6b54ff8c1	\\x00000001000000016ec31eca8b423a8a78da275b0b4fcbf585f14470a227f344b8dfee4a0085068042be0af467b52b845ddcb73025216ce8efb4bf101ba40f916101c815c073cb8c68284540daff99abd4a88a6f7746b60f0a1785aa59ee03aab6cd096ce4d23f9bacc695e29262959ed7eb0fde0ac00312819158102eb40f8d7d19de4b499a4465	\\x0000000100010000
-43	2	30	\\x7bf86e4ecf418027fab4b2abe34c890e2526c66854395cec60f71c029bb1a3eda7979195afd9e44d9f05322beb1282e30c4a442cc8729c9822db9832f0b4a80e	2	\\x0000000100000100586c153e02dd2eb46c39159a9d57b7bc8c15f70851ea276b82501b76c2dabf1f1ca34dcd488df27771a9e03851a435a5dc2c050333b7c4c470b1ece60fcd8a0eac6ccac597d42eb791fcfad04399dd84647b573ed91ba91192500914db51c26dab50c87b37ab02f0b59a44f9225460bd5c7b6df3939d09a76d333db71f49d5d7	\\xb4dbbd7eefea1e942d890082d6ee3e2516474b1931ffc2e16abc174fb4ad722cd1064f6534bf549cbaee534b9677070c390d7c3ade6a45007f95f15312ea4343	\\x0000000100000001a7002d52cd61f10ecb268544184b75cf4efb0e3260d3266a84b3771595e65f102523502a87844c422e6d7d3c4ccf7132a0e7900ced638b2590179c485ee49179e47ea1ecdf4fdeb1d65db5fd08f98e2a6ae401ec4af257db7fb3d33fe1a8580bdce6a4ff7d35163793ddfe4de321d919db577799ef788fb5dc87f315a341b13b	\\x0000000100010000
-44	2	31	\\xe2453dbe16fe295e03096893b59ce2c38f3a59c1d789463dc7259469076af2b87fb06a54ee88fff8de7c5326831388fbb357b50967799ebd7175fb9a11f6290c	2	\\x000000010000010007c2ed09b481213f0a8673390e4a00cbcb04d9cc39f4fa6a75b381cf570029087cb31252bbc65539bc26cbf5964224cc3c4d8396e35c186dae05f7bff52cfe81ee4a7802bebd8b0361064d06fb5a1952eb707bae74f7e4e5fd0b5ac4b6cf8ff85364ea03a4176e4c1f8ee976440f7f0b8ee937bcebe741ab8d0e7aa8016c9d05	\\xce2805062f19f3fe455b923a485669c62741eca9e456ff177dd78717ee8dd71ff0acf2ed46b59739cd523b96581f0d8fa240001c012ffea08c3091c76e0cf519	\\x00000001000000014b9d67fc74822d3a91f1338764da749dd8f5628c2ada54cfdf31f42a6b4994e9ec869a518d6cb89f6daf0a72a6089ea264a22928ab2059bf0c2a6cfa3f260b3f00ca44702ab857466955409e81bc1c9d3b17c77d748cc7f4f91d9920178b2f8da6e629bee0e7e8ad97b2ca002f8548eb3858538d193273325fd31b9621fbbc4e	\\x0000000100010000
-45	2	32	\\xd5b36a0f21a4550de7f566ab12240dbb3a82678275178034ab4cd6ee3d76a763bc9b8c06d934378c179697cbfb3e3d719daeeb4c74a425cbbd02d2d3f611fd05	2	\\x0000000100000100ad4810afdf180a411e0800ee362b891726e97b2508e82238e6764063f1c36f1b2545283cf9131c308d3e710a2fbd70ae5a50a44917ce8bd24205d9ca8c5e799c8f0ad52d692199a3c66a169c069b2f15f10dd1cff9ad965cb5ac5a0e997d6f12e10d3066f829184011f2a2f6457fed78f1965deb5845712c8a2a52597b8e621d	\\x8f9def217c8c67242d95de68df1752965038ed6dea4a99c0a41e2373e18d9f252e7b22797c9e39ebf6370cd8e99704505f15c6d4c3f5243c3fd3c2ccf9ba6edd	\\x0000000100000001674a93fecf1047d569937e6dd1763dcef1889f04d0587c5d4d950da4438d375f7af703970b1ce1c807bce0ed7bb4c14ee5d6106295840d974d4f97686be792ed2c6968dcd2aab23cac24afe8baa1c705be03517e8b97e7f75e3e615760bb07af02d429fb19683831397eeb4b0e1cc904e487a861356ceb3ceecc47c1e81efcdf	\\x0000000100010000
-46	2	33	\\x6c67bca476c28497600ac73704e58e2207e4a9c0368e6b23f37f554857ace73ebbf4ec6345568cd65a725ff769c12a8c471e50008843fbe022f2f62f6fa14602	2	\\x00000001000001008ee99f3e89a6c88eed14fe0b792623de77f9f3efe42edf3bf8fc56b1e74fbb26816a34b45d5a0d8ce1042cb463c79dc1e55264d07205fd698f0b245db60b2422bd5e0e2a142c8b222e5fdd9412bacc9679a4f4bf198ef4e13dae08cb898ec5c35a7068c92412197644af842c435947cc39c6c026e9b2d0f7408a905e1072ebdd	\\xba031aa9905331935402c93e1ebb63ce3ba85dff38881e180a067edb7a5d1d9cc49464299a38a6ee2932e69db6fbbd711c5744cf327ed2b7e4e1fb42c8be148b	\\x0000000100000001c9e7c9319d9078528c499cf077f61b5db460b067e889ecb42fef64cc0b24089b7e7bf153a1978ea1e563c39e181bc6d4936f2af5105fa4e9bc0a5ce37480bb328e2f52d63d941dd8003713c11fefd63d9c0155b390e9591b46adff61c122535ef7b5096d1c5ab86a0ccaf87f658d05c978205daf5b5081d195501085392e0e33	\\x0000000100010000
-47	2	34	\\xb4a3201bec1bf618d7d7f6995d1e09efa3aac6495cb420be955081ec5026c8cd39315acfffd6a986bb44650ca0b2cd46cd7ea56827ec41ac3a7b3d9617494e0f	2	\\x0000000100000100140a13ef94fb631b1cb852137b96e779753b95c7f84148be3733c9ee7a66bd369e3bc3644d5e0ac3f5db9873b5b62516d11ac95ae6acbc0593ff7c663b3347495ebdbc337d9f9dd8391956ca99af8a9c94b7f5522082ba3b70e3e2a2453e3e2f12f30953e2e461f9c08f324cab4fa75163338ba0ff3615c4c872c77c4f6d9b77	\\x932f2a8e856207c54983338cb8ffbf77d673a5c40931494cb1267663f0de14259b3eefe574120ac39cbbe237e3b5629dea9e73759925b5cb590a8563b7a1ba1b	\\x000000010000000130f99969a0913e532a44e12bb0e027d2610cde8ff79072cf633e6a723dcf57459ec789d33d8dd9db72de5cf53ee2900362c6352bc10e4b3fe77813b1425b40d622c2e17a1242a2bf68910c7e9135ff2fbc2d6a7736aaa52bcb26b7290692fc46ecc762f21ef167c585d1e479d71081ec7b9e9c0c2c0355c40ce2a102ab4dd7dc	\\x0000000100010000
-48	2	35	\\xb9597608befdd0093287b108b2a3847290a2c3d1d1218447fa194a663843cb129cea15c26b6ef51c480b877642d25889099fd11ecaf7fcd93a4d076f9364260e	2	\\x00000001000001008a62e922f33af98d8c91606ba73b51da86b4240949857d3880364da16a9f82ba35db55a910a15583c949f96932e288e8d8211248af2417318049d2017e2a4921cf443b34bcfe650c40168ed6e8eb2fee58317268b4cb0f3f7d9f5b2b613b7ce49a4628897479e97133302195a012da56e422594aa456aa93620d8a0181be57ac	\\x52fd437a782479c51cddf5e7c99b77e3feb37409c35effb3897325b352fe3d5be7e09c7ab57392964492f0650fa186c20e64d7996b9a5e7de1095feb9bc11bad	\\x0000000100000001533e38ca0620b5191f9b1032a2c5dbefd86b0030e43697c3fe03199110bb3083fbfee205243040fddde6f6d4b2c9bc4751d6b007b625a28bbeba2ed58b03c807694196793571b66946d6be6e1793053928299f15ed713cc9fd7ff3ecb2e6d818a2a651d1cb552b87828844c8289b1edfed72e0d1a73eb40a0879480bb7f6474b	\\x0000000100010000
-49	2	36	\\xdd26fe818bed4213078a18c96a1a971277eb224d671e7cad4ac675501842df77699f278de314b61c752708fd8d89d5111d012fe2741c066201578663479c4209	2	\\x00000001000001005292ec1a20185340bf96bcb66050c0cf7294507ca305153188f4597e6e2eb185849dab94bfdfd2722ac6881a9a6f981781c60704590ef5fd8dbbf07f90eea238060d207980cd7533fae17399853f90f7ba7542be2c37954e64f36f30720afc644d3067b12120e7d9c8775adce2d04a25549d06932bf766cc8e7d4e6fd296fcff	\\xe1d41396aa213d9ce1ce2787ef3ba1e8bbd3372ee92b618a2de82f61257f28e1b1fb84a73843b10fdd4b16dd2aa5bde3f3850e19834186bb9bf5d53c32e06052	\\x0000000100000001b269ecb91aa82e181fda9a18c4cc72527512f175a73de6b8036b84b27585c8dc66b96ee2ca43108c51b9463bcef0d21d61a98c08ec59fc6f77c422a6aceecce455c40f41a13cc0e38cbf83d4d423d6a021fb858812cd22428b5cb348185f571e836e092f68449ab4db30ae5d4607624d8393616ebe8a86372b328f787c595bb2	\\x0000000100010000
-50	2	37	\\x9d812a8dfe3d43e0cb52982ca26989b768964491684b1375498d0274005d56816bc1b865cc689ee48d802043b99b49469dca5557240efd9408944c26d47fc004	2	\\x0000000100000100afab7cfc391d0686a17b2cdc00b7ff30c5524d1b59cc62bf90f5405d55d98aeb103b920de0e9f5ac01e8520b91401676bac62bd508da6e3be1565c1bea3ae9b81923c70cd33511cd305f449604a1a384786cd083dc5d54ec0918c49f0976aa47eee3f8bcef1ce6c9c9174924059ad349cbdfd506c07dd2a659d6cec764ff8dc5	\\xf3c4f0e5ca491216c7ef5195dbb0fec717a9e279e24ad694e844dea8473c57bf88fb3ac5774c06cee2d9e4d7ded20dcd81120b8b73862d58fae37c348e189028	\\x000000010000000130709133545ab15d15bd290b68ecf22377bf664320027c03ddcea4308a2198f2e407d5bc3c95ef898301a26060871d068e526e52d8312c80fcb974c1c423ebd077ef9938b19bf7b88625edeb1626d4e5d8d82aa4a06c0644071844403907231d19e65bd9170f2770bcfb8bef81990a3d79f0d6628f18d0b7cc49ad403616e765	\\x0000000100010000
-\.
-
-
---
--- Data for Name: refresh_transfer_keys_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refresh_transfer_keys_default (rtc_serial, melt_serial_id, transfer_pub, transfer_privs) FROM stdin;
-1	1	\\xf83d5f7daa08c0ad69dced2ff0958f29fb29a6e5934b94a74912447ffbab5334	\\x3530549f5a9ce900120c86d16be7ec7297c9075efdbe35298db6ff0f6d0d1df7f542d08d77467d22637016d157603e4063c34d058bce859642f9786b9b53dfa8
-2	2	\\xffc39bbca783f56cf958f5f69465a13feaf47393f0567870eb262ac7a2dd946e	\\x355a23fca497dd8596e76f4123f64378458a7d694782fdd1157acece8505454ee1e44c3a3916765a1a428d21cace0ad0d40bdd542b3a824508ea1fb24f47dfa6
-\.
-
-
---
--- Data for Name: refunds_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.refunds_default (refund_serial_id, coin_pub, deposit_serial_id, merchant_sig, rtransaction_id, amount_with_fee_val, amount_with_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: reserves_close_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_close_default (close_uuid, reserve_pub, execution_date, wtid, wire_target_h_payto, amount_val, amount_frac, closing_fee_val, closing_fee_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: reserves_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_default (reserve_uuid, reserve_pub, current_balance_val, current_balance_frac, purses_active, purses_allowed, kyc_required, kyc_passed, expiration_date, gc_date) FROM stdin;
-1	\\x636976470c45351d8b43257b0cb289bd64bd1c708e3da3cc576e43d522aed112	0	0	0	0	f	f	1653935616000000	1872268418000000
-\.
-
-
---
--- Data for Name: reserves_in_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_in_default (reserve_in_serial_id, reserve_pub, wire_reference, credit_val, credit_frac, wire_source_h_payto, exchange_account_section, execution_date) FROM stdin;
-1	\\x636976470c45351d8b43257b0cb289bd64bd1c708e3da3cc576e43d522aed112	2	8	0	\\x6506e969615b4c10cea61d3c3798f501407a5eaea24e4176326639c1ea1a89b3	exchange-account-1	1651516403000000
-\.
-
-
---
--- Data for Name: reserves_out_by_reserve_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_out_by_reserve_default (reserve_uuid, h_blind_ev) FROM stdin;
-1	\\x0849dca29aaf92495684302c537aa87ace39aafa5b9561bedaad4cc8a3a845eff712294a6a6d7560f6e3c8c0446ed2a72f2735356e4e6e02798d0b67a5a5be72
-1	\\x08a818c2b20e3682a7ff42cfec548d6b7d3a9fd8b7ff4710f2af804eec02a92f2db0818e76ab8961d7f2ddb8b218a53647d8eef869e92ff2e6316f15311dce7a
-1	\\xce052faf02e230cdf0acfa47ce25761f738167cae89ce290d065bc72b6279b30baa4d5bb705a3de7dff83b01d789ea52176da00fa945a6aa52826ed3b1e7ad3d
-1	\\x7bb98968d6b175cacb1eb0a3f3dedca1d9da9f1e1d526569cf04821bbb15485d83a7e9e373d66064dd1998910ebd6a0aa0e231b1d7a66776c35bcb2ea6aac7f0
-1	\\x0caf281ea8a72019498b449c760bce76a37f6a0b6fe23d7290edcdb193a8187820fc938f30f48068db80373ecf62ac8513fcfc5a709f7730c4c78bb0be468929
-1	\\x7240f894c1516804fcdb498219c4b6e0e40953ce24399512f1d3fd3ed60d9bf7381ae1741e5008f5cf7c4e1f19b6104ba733723de18cdc7d3e7beaaaa45370a2
-1	\\x689ed1b36129962c260967ca7f2c9e6ce685c6fb0c6082efecfe98d9f40739b3a8e028777d09461b09efe0e535aa0bc9f16db46b67e370c6898be5c97fefc7f6
-1	\\x160611eb63b0ff7979b281c7b3c8df7c689a28cd062f8ed000b9a660a381cc67a78082e6f4b9c6f4031fa64a9559d8f5595266aa3f03c297a0f69b151e6c875c
-1	\\xba7d2f55f29ef9275f36b4c189da7337700fd295e16c5d3cb430191e603301aeca08cec65538b6c0adfe7b0be4c59cc6bad3055fc65168f6b9aebaa70d04a618
-1	\\x01be5dc0503cee145cbfcf963a2ebed49ccd0edaec06c6f9cafa0ecc0ab80474b39c485564322a7cbb18b1dc76ac7e41ecb4c8aa2485d8ef8ddf46e286b5b0d7
-1	\\xc3bf5fc826c0340f45530ea8511296cd1153d33d204b62142f85357500155abe273244c53203854bb8fd366e9879a3f71c2c0718d378f3892809993d8d1f3453
-1	\\xc5eea6a0431bc1613c41c028582dd9d686fdd609740e7de8a6e322b09e7d985e78f5645e8dd21978e66a7a5a173e56bf0dd277bb007331db8067daaa900956b5
-1	\\x1265baa10f22e8163d990a085b28917c86599a90f591f3201f92ea9546b89345b704309cf9efe83f91185d471ac49380184fdcbcff8a1010cea08276f6339729
-1	\\x09dd376ca56bcf291aa080136f163af93506a8291ec9c44c59654773d26217cfeab8b0b031ea4c0d4962842c4b0a99b21a500af33bceebc790d1b277c2fe1f41
-1	\\xbe98a873b03f8548345558578e7a2a2362bd64c0d4982e3ae768a62b9ffdbe50062722ac3972234b77bf4502ecf3369f8a2d0b6ed616cc358ee8c253a85c364d
-1	\\x35328180e0e883fc1a8abd888e15fc7bdf30cc787221a00b8fc33cd165e8357ef5dae73971f13ac68a7d21708db85f6d711ac413e1c658edd84595a3fff702e4
-1	\\x4726bc8884901cf1870ff34f30e078bfbd1585930abc8fb8b38bd7300968ebde611228fb38b3caa0f81f49ae072e92a1eb8209452f0f1b687f85bb6bec2ace41
-1	\\x32fcaa5604cccacee75ae503e95f934ddfc82e1985096771163cba9bf8414a7ca8fea80eeeaba561d4b47cc53579858fddd9d60e81b6ca54246f62ba8204c481
-1	\\xf4c47fbc700f6ef693325a6c6c54b088f46a2770821a8484299a5dd6cedbc25219c66af01dbecdef631451bff9622d4019181acd0dd7a56614dc3f6fd8471ac6
-1	\\x9abcb5ebc9f1022f1aeae70a3f1558637a6602b517ef3cddbef5bcff9394d722ed4edae092cc899a000fc0425e111da623e568411e543ac80dd31f8180f2b66b
-1	\\xb1d1a159afa697e852cc99c63914410e04c7a428749e4a46a995ae0eafdcd75738f4bcb7bd8d96fcd627b91e408480a06cc580492b7ab56f8d9fd18b67646e6c
-1	\\x9053a065acc591e13889f10cf3733e93513851343148c09d2f5443edbcf17b28ee7a9c42fbfdd448860554fa041286a2495558936994452433a81c978108b245
-1	\\xa57efb259bd7a40b7c4ff6b127bcb4963e62ddbe458220e6e9c1444a9723c67b87c96e630bb3a394efbbcb3d8408ee4e788f37dad06f44aa1b626ac54bed7cc2
-1	\\xadb725f4d1bd64f8d3e8708289e61f02c940100f16682bf821fc69485089f3c8b32da31d462af44df45566c443fa0e68e00c56d8d06fbfe025f3cc64ebb63717
-1	\\x36a340d7187b1c8642694588ed9a64825ab2b86bc4cc9dcd35659fc63075bdd610ce07971895dbc8e1b7239e4cb96d928ff890ec8dd98f1eeae2d61be5b50422
-1	\\xe8d925503c78d85c4ece4cdf5a14bbe11374591a37d2c2ef775d92f5f29d42369e7716516db1e1ab80467d00c8c310570a3a0c0a5a9c6cada8ba37f35947fb24
-1	\\xf238c2125d57802530dddb6478ac55a10ff084e51a17e57cf7ddf5acb7bf30ed09f7848d5e9ce86ea1855acb667470b7461ef5ed77be35adb8041ebb56258b3f
-1	\\x52157e06a1af77afdee74dac64a7f0414eb654b4ee6026576fab176799ec9e3f87eb84ec411ffbccc43b45f92881afcb0ec15065669f49e06250d9e0078e44d0
-\.
-
-
---
--- Data for Name: reserves_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.reserves_out_default (reserve_out_serial_id, h_blind_ev, denominations_serial, denom_sig, reserve_uuid, reserve_sig, execution_date, amount_with_fee_val, amount_with_fee_frac) FROM stdin;
-1	\\x0849dca29aaf92495684302c537aa87ace39aafa5b9561bedaad4cc8a3a845eff712294a6a6d7560f6e3c8c0446ed2a72f2735356e4e6e02798d0b67a5a5be72	109	\\x00000001000000010c70c7ee0ded04ab20aa8a72131c0373b000dd593679143fdcf761d36a0e3f4230fe4ced07d6bcc355de3368a39cdedba8c84ae5f9eba90033d71bb55ce3f11920cec5f9130e70effd28f825262ffa56201cb50680a7df6ecc5a02beaae903fd91b55718436fdfa3c67c1a2903e03f4efa12a0862a07d29d798490987e42cafc	1	\\x0f336908f804bad59fbc03474029558b25461506abe8a52578fa0b3ab63f6c6e8b3ce17bad31f1f3290ef8036cb14fcf03e76150d0ce7db4f52ec54c53819b06	1651516406000000	5	1000000
-2	\\x08a818c2b20e3682a7ff42cfec548d6b7d3a9fd8b7ff4710f2af804eec02a92f2db0818e76ab8961d7f2ddb8b218a53647d8eef869e92ff2e6316f15311dce7a	152	\\x00000001000000010556ad92c5503019df098d904c30c7b760aa54e303bf34ad2bbf3d8e40d795c29ad3c581371ce9d336f7455cc41a0739e34a82b14ebdfe737d494698a98480ca3cb946f979d1bb642601c2e38b23ebf70993dc4226450f112296fa232723d0a17ae7a09dcba594718dcc5f91e395e67ae0a8d2afe9e1b8985f5110a76bc828de	1	\\xa8672a68706a2c6a99af6e5fcd407a3a6a96e192c336a20b66c34050555c466562ebb41c86624a515520005a1bfbf1ac44697cde4eb607fee5e0e3aac8b7b609	1651516406000000	2	3000000
-3	\\xce052faf02e230cdf0acfa47ce25761f738167cae89ce290d065bc72b6279b30baa4d5bb705a3de7dff83b01d789ea52176da00fa945a6aa52826ed3b1e7ad3d	380	\\x000000010000000124dc58cf324eab53254223b24e0bed35318ff115f539cdfb19fc40c0d7a713f8d4c4d3ad9ea4008ae74a34ac0f3eaafe7d2a5fd462af0e8415792d3295e11f6bc4b7f2f4010bdec7cf8b6fb9169b5146932de009658af6ed258b23b318006d3c3a5ac769493295a7c480b7f86612c40fd928f7a96e7f094fd694b0118859d30a	1	\\xe7866377ee86646799b874d8d1c4da3f0023e06db82fd9a62d04ecf72f30b9a7e7c84b52d3c953412537ee6f7e2847162f28f7bb57dbced1f61dadc8fdc3360c	1651516406000000	0	11000000
-4	\\x7bb98968d6b175cacb1eb0a3f3dedca1d9da9f1e1d526569cf04821bbb15485d83a7e9e373d66064dd1998910ebd6a0aa0e231b1d7a66776c35bcb2ea6aac7f0	380	\\x000000010000000181d3180a7442d0228dbf287b621f23b4007e8fde1e36e2d3a59a2e457a3e980e13020791eb15a208f7fad54de1c159e90fb665ac1fa70e992538b1d7459a996cd5525378032ff948ddc02ef29b702265e1936fbe9fd3ad8f656bd415a0c8060639faee8ce6155f1308efba520bae91f2ba8c801f48518a3de33ab08ecab1c568	1	\\x8d0e66842d52ddb6416235276afb62db08c25a81be3f9d896e32c2d0269f07a2265a21291194341c051b08d69d1aca1ace9c5feddfdcad43b45803b0929e3c0f	1651516406000000	0	11000000
-5	\\x0caf281ea8a72019498b449c760bce76a37f6a0b6fe23d7290edcdb193a8187820fc938f30f48068db80373ecf62ac8513fcfc5a709f7730c4c78bb0be468929	380	\\x00000001000000018eea9887f8a8c613a93a63864927dbcd2e558db97ad8ceec96a476c9cae3a1edd0b3628f2cbbe20f02cb206e5a0b0a84380aa5e18c32c81cd0dc1fc4157a73b264fa249d15e1cf28891064f963fdba31acd8fbf3ba690d792765e5528f339a6f1c1a430e3eea802f15884f5dc453f2f2503c960a14e07bc72f1421d70294d6b8	1	\\x714e9999d1b482bdc234ca82af057d2f70023282f3ef4b70512e75472f2130a86db256eec3fc5d0245ac68261beda21ade33804114061a76b6159dbdae53f607	1651516406000000	0	11000000
-6	\\x7240f894c1516804fcdb498219c4b6e0e40953ce24399512f1d3fd3ed60d9bf7381ae1741e5008f5cf7c4e1f19b6104ba733723de18cdc7d3e7beaaaa45370a2	380	\\x00000001000000015ec384ad053acb8508f3904039b6512f5f457b35c1f728bcabc9ff6d3bd25134433deedcd782bca82ad21e2d790a5ccd45ef68ff3fcbaf2cc6102a59900129c248611455c65659af0d81fac7a77cb383677cbd4951bb203a1040ac064e0ab2debd6118d6deb040ce3c39ad0536df18b4340524c2d52c508fb7b53878fed90401	1	\\x2d46deeacd82470e62ddf11278c374721de6a7ec0dbef5ab1b03927a341da82c3b433cef87ca41232d92687aed296353f763af6c34176e3f391ab0bcbb7c5f07	1651516406000000	0	11000000
-7	\\x689ed1b36129962c260967ca7f2c9e6ce685c6fb0c6082efecfe98d9f40739b3a8e028777d09461b09efe0e535aa0bc9f16db46b67e370c6898be5c97fefc7f6	380	\\x0000000100000001a1194dd7d15d8fa76b46946868a99da7c8a492b948e57c98831dc926a383b94e57d4d42139b1de50367e58d8c90b8db8518a87d952c74cb19fd7463296446d8b3383a205c33e4277b7847fa06421868c30f7caf891ddc2d195f01e3d5750d68d6349384f151b59efe740bab00bbc7cd8ed24da1e8529bc1e975dda5779026ebc	1	\\x4ddc395724c11a6d880e4d5d8e77d83e4cd584492e6c924dc704dd0fe4f66dcd40c297c99096e62b783b770270453aa8d04f58e47583c57c63271bd6bd992801	1651516406000000	0	11000000
-8	\\x160611eb63b0ff7979b281c7b3c8df7c689a28cd062f8ed000b9a660a381cc67a78082e6f4b9c6f4031fa64a9559d8f5595266aa3f03c297a0f69b151e6c875c	380	\\x0000000100000001b680e45ea761c48f75f39c8dcec3edc146cde7a44435f1d44672db640b964bbd0fa49648c9a0c145737502533979b10754506677c582c318890822d3f73357d30b05c87d0d2110c1c3cca6e49238a5f90673bf120f79336affe0f596627cfae035855f7957a179a9a3374c8fd3e63ddc1593d046cca29c5173427335a7aadb5d	1	\\x8b38ed8a1549ddbc7316a54e07c944bd0306508bed5797f6292cedf62cadb14cc22218b2d9a11d5e34ad74dcc95aa172b82548baec2b2d109b0977dd58748f07	1651516406000000	0	11000000
-9	\\xba7d2f55f29ef9275f36b4c189da7337700fd295e16c5d3cb430191e603301aeca08cec65538b6c0adfe7b0be4c59cc6bad3055fc65168f6b9aebaa70d04a618	380	\\x00000001000000019b779fbffd2627b8cc58e7fb7454c4524a0e4a613cfda2c141b61c3d986338fea8c328a3c9cbfbccf819fcdf9a01ec60b2eb5ca4b08be2df45f7b3d92de229df44f9feeb5c9405e29e2a49b910744a7ffdef9e08355026fd9c2b8b9af4dd08377df45cf176a10c856e52f093f5aacd4f14fe2aaab1018e7e2867a28d0acb480d	1	\\xba20e87afb14bf9ef23c85934e3999bc09adbad498282e9b9b51ab6019bac3e3a5912d36fc0f361fb8218092c28e2c2949cfe59a2f3941e43bd504e35d88e10b	1651516406000000	0	11000000
-10	\\x01be5dc0503cee145cbfcf963a2ebed49ccd0edaec06c6f9cafa0ecc0ab80474b39c485564322a7cbb18b1dc76ac7e41ecb4c8aa2485d8ef8ddf46e286b5b0d7	380	\\x00000001000000012b44554f8b31e9f3500ee2e58817b7f6fde8b82c97043cc7639b10032a47f3186114070e3e7cdf9d2ec3d47d2c61f6edda4890f42d8acd2b13634bae58803efb886b82714e5795caa95471fc597c996732be52e3a34d5d291eaa6b1d5948f3f67a4819a62e1690bc13e3e5209baf38a113064cc4b0284dbe18d522528d6bc469	1	\\xfecebf24558f0e86f12be254638f73533e44d4dd195d9e58f4e0ddc1aa5c9e94d766399d88de237535e4772a62df534108a39f498f7d09c3928f15de724b6a0a	1651516406000000	0	11000000
-11	\\xc3bf5fc826c0340f45530ea8511296cd1153d33d204b62142f85357500155abe273244c53203854bb8fd366e9879a3f71c2c0718d378f3892809993d8d1f3453	75	\\x00000001000000014241761740c69ec8615974a08fcb513702f11b447e884d7722bb164955ba791dd0919d0fc3d95eb9eba4e14794c4613df37b38be14bfb7a78d6e701e0697e98873f6d3f1e0fbfe59d288f183766375329b6c38a2b010e50f6d9d1e590e08b6a11105f6f3079627f482e67a080705d986c14c1d97709c41a37e8bd2a15d102e2c	1	\\x89745d4f85222058eee46a912f99dc7cd13ab7d97568b48b54d856ceedf44dedd7ff8a9aa2f6df29fe1be5fc091c1c708a195114380202518c424c39edecfb05	1651516406000000	0	2000000
-12	\\xc5eea6a0431bc1613c41c028582dd9d686fdd609740e7de8a6e322b09e7d985e78f5645e8dd21978e66a7a5a173e56bf0dd277bb007331db8067daaa900956b5	75	\\x0000000100000001971f87ce3a0d80bdf926181ce8da9a3472449cd167960901a6ce3eeb1b3c701efcf6c14c92dc963c09c352f556c7505cd420509cd17f65105c8009cd4f51c8d0d777878a8dd2b8b12c16c061b7af6563feb2fdad2bf27a480443a73148ba1be1b923c7bcdf75d6a21b32bc542ebe2329a555706ec1648cf0985bd9600585fb23	1	\\x70075242785e00c1746e9ce1c38217e600e94dcd1cecd4ff20b15053b4b48fcd2b9238a74eb544df912531ce67b5481a1b0c1be193fea6f441255cce5e3e1c09	1651516406000000	0	2000000
-13	\\x1265baa10f22e8163d990a085b28917c86599a90f591f3201f92ea9546b89345b704309cf9efe83f91185d471ac49380184fdcbcff8a1010cea08276f6339729	75	\\x0000000100000001572a9207abbf4f1fd966a620ee5000b80f6789903163d6164a1d91f392a304e1dad256b29a936f85d4b7bbaf247edbe24413e8820a6fd336ae66e1fcf1d58275402889cc2558202192b4237942cca1c1f2497ab126bc7f2e139320ef130016fc96df0a17ba21ce3e147c70ad22f69e467f1fb6a836a99975d486c5256e82a00e	1	\\xceffcf81dae5c7129652a7dbc5238b442ce8fdd69b552055adb7b14aff312db42cc149009f1a476bf9e303e0f8d7e876c37e6889cea3576bf6591179276b8a0f	1651516406000000	0	2000000
-14	\\x09dd376ca56bcf291aa080136f163af93506a8291ec9c44c59654773d26217cfeab8b0b031ea4c0d4962842c4b0a99b21a500af33bceebc790d1b277c2fe1f41	75	\\x00000001000000013fa80cb7fb15c392bec29b35ccac99cef0ea5ae16cf50de4a5b4c020322dc20bdbcf19e7a0fef5d27fd744d629c6e3e487e56734db191b241af904dd0a0f19f864c46a9dd88abff21d9c00400797fb679fd5f3aab4254300544697d9fb3fefaf28451e93c4095c157e236ed56d161f9d84527bee242aa4558a2149320a261967	1	\\x2a4f63c96db89df94cf09801ff2ab292d5c997e85e31570847b2eb698fcfe2ac3d1bd5cfc20a35efc0095c2e5b7cdf6230166eb494d9d266a4fe539767c70306	1651516406000000	0	2000000
-15	\\xbe98a873b03f8548345558578e7a2a2362bd64c0d4982e3ae768a62b9ffdbe50062722ac3972234b77bf4502ecf3369f8a2d0b6ed616cc358ee8c253a85c364d	222	\\x0000000100000001af0ef971e9924f5e20eee3bf2a5fd4e81b533227c0a33ebd41dba53bbeec959add5077422287c70e9403ebffc836aa39310b30624cc7d2a6f6e2cb58d3ca668635c4c71309d191f656ce07533e4bc60b40a5ab1f677d76a1beb8a7b09eb681f00184aa11a6503e9df112140a7390c9c4f61e2dec3a1ccb9034f5880bc3eaa6bd	1	\\x56548d1e1fc0081941c789609c1638bf3b8e5963cf78411acc6768a4d8c95a599455731b14a9ba551c9b3df0f8b04b09f848ed1210ff4885415030c84b4cee03	1651516417000000	1	2000000
-16	\\x35328180e0e883fc1a8abd888e15fc7bdf30cc787221a00b8fc33cd165e8357ef5dae73971f13ac68a7d21708db85f6d711ac413e1c658edd84595a3fff702e4	380	\\x0000000100000001138b02b8f050a0f814d298f3aa0e19d1fa635af066d6b6edc759643c80c059f39bb8279bf7362562505314f829b022e313fd8df9dfc1e0513c022ab6399e8e07431e01c0e8ea6020b8cf6563ec6791c19e332e1cba1f9ab9cc9f10db2bf4775bfd46ed4e491e971bb63224d459d304a3e09f0179e140443369f8a5823a3492a8	1	\\x4d333f6d279d63edd855b99e891864cb6245edef0ff178f591005c0004b5a9fc2c5d0e8d8ce760d737821020163c0addcbb2ef346a5a7e3517f220ea3f03290b	1651516417000000	0	11000000
-18	\\x4726bc8884901cf1870ff34f30e078bfbd1585930abc8fb8b38bd7300968ebde611228fb38b3caa0f81f49ae072e92a1eb8209452f0f1b687f85bb6bec2ace41	380	\\x0000000100000001770557845d07afb557ce62672303499350088d7de8e244380616a231f7eab85073df6bc60f38bdd1fce009b293165fe3c8608b2e3148da83712fca23e692bce0385823b745c1609c683d6f24db100eb2d7608179650649c33d7f7df6a9f8a05d9fb00807db946546cd5a4681c6784ed67027aca1c8f0e559aab33a93cb715cc5	1	\\x93c5551bdb8a2253bad1805440d8c1934add272a83173eeab0a8b79bc42d1f655b37840ae7c29ccfeca5ecdfdd684db7cf075ebc13007cf320cba1d25cae3107	1651516417000000	0	11000000
-20	\\x32fcaa5604cccacee75ae503e95f934ddfc82e1985096771163cba9bf8414a7ca8fea80eeeaba561d4b47cc53579858fddd9d60e81b6ca54246f62ba8204c481	380	\\x00000001000000010e1505f60ba32ee7065b43ad5283dafbc2357e38c1409370b1418dd234d15209476324de01ae05a09c6637186d67fed9a23da46fd4b347b1c3ce8f397d0f97598a78aa92bfe0beefbb1ea6783d929df82c23c7a36748a6a3223859a55d5c5a20403c2bc548022757b48a8d1dea3cf022813bf23bb21c4deb24b6dfec87dc3c9d	1	\\x8aa6e524a3c0a908deee7e502e763932aadcd00ac4f7d4f434da17671e5a94c4545d45d59219e4d32476aefa6cc26b4483c2f131529e6fecaf8830bc4c330007	1651516417000000	0	11000000
-22	\\xf4c47fbc700f6ef693325a6c6c54b088f46a2770821a8484299a5dd6cedbc25219c66af01dbecdef631451bff9622d4019181acd0dd7a56614dc3f6fd8471ac6	380	\\x000000010000000139b15073f9e05eedebff4172b1593b95deec27e24cc7a111d661835d667ea724ee9791054a77218663805a8995d228ac2936902a684756e4308267a56ceb0abc3f294dc534a150a12d9e6b5fb7558ea25b4bb7420274e6bd4c5a52cb916481c3d6c64bcb34832f7f013f83df87c9cbdb908e96c5cc3dba357034908941921b1a	1	\\x079f2cdae9e0f9f581b45af3fbd3dce1bfb7f1d503a2bdf8c4809e820e1cf45c4f7bb3f8c70d406474c624232a33eadb71eab3852a2c0e725c0e2e8a5b40b506	1651516417000000	0	11000000
-24	\\x9abcb5ebc9f1022f1aeae70a3f1558637a6602b517ef3cddbef5bcff9394d722ed4edae092cc899a000fc0425e111da623e568411e543ac80dd31f8180f2b66b	380	\\x00000001000000011eddf4f82c1ae9c22d439a8916ff77c2536d8e072c55adabb5947ee7187c1b407332160486c717628f37e8e30c5fcbf76170fd1304303a03ef4bc30cc032164d1908bc40a1341765d67e6b9470602cb8b2977c355a45a67d68ce1740d72bafbe55f1763a9b3df22ea5b94d887e2e3e658bd117a21c490ed4c85c44e2c80e7ab4	1	\\xa7b80f4c22b2c144be74a0e68d9ae4d5594d49d32bd6a7168afb17665a97b3f602de9fd5248ce6cc41410095682cd905818e136e403863b2f9cbd9a25dac5e04	1651516417000000	0	11000000
-26	\\xb1d1a159afa697e852cc99c63914410e04c7a428749e4a46a995ae0eafdcd75738f4bcb7bd8d96fcd627b91e408480a06cc580492b7ab56f8d9fd18b67646e6c	380	\\x00000001000000014b5bd24f071c39d81b1453fabf10df0aadcb4034367688d0f1fbd8519525686e7087b22421bf1ad2bffa465be24cfbc286ec2ea3108bc4b61a5fd03143642a14486ee0e14b4f07206a52b0905c184c7d1e6726ddd00612bab883b1d1724fab27321773d63efea38d161326178fab7f85768108a679769adcd1e7399891096e70	1	\\xf62bb07666b0188ad59f0aadd4018cfd5752cb875faa9ec6ab709bd97f18b6aa839f671b70b3d1e26ba75d17449b4b33374b2c2ca2e7936bccd93042977ccf07	1651516417000000	0	11000000
-28	\\x9053a065acc591e13889f10cf3733e93513851343148c09d2f5443edbcf17b28ee7a9c42fbfdd448860554fa041286a2495558936994452433a81c978108b245	380	\\x0000000100000001605af657e8ce0e96104e40fc74e9a6074582735bd860474e53405f6462e6391ecf66100dad03c72c1a2e009870eccc937cc9851d7744bab4ac7895093d74b2f5f151ccb47be68d2eec2c3778b5bd3e1b38cf71458efb3db3608930f9e239fd7aea2e79aa024504cf6439a2ebca9b5712fa3ea8bcb8531ff5a3b85f7311358dcd	1	\\x167bc328263e14e90db87890807bab083969ed211f3c27abce7f99fe976589e19ddfc02d3d9f0f721e0ce509840f177dc2436961bfe61f3b2873d18998bb7e0a	1651516417000000	0	11000000
-30	\\xa57efb259bd7a40b7c4ff6b127bcb4963e62ddbe458220e6e9c1444a9723c67b87c96e630bb3a394efbbcb3d8408ee4e788f37dad06f44aa1b626ac54bed7cc2	380	\\x00000001000000013360f639c649ea4078e20771cd00725f0abc36997fa25383dbdc36f1844e6d4a2f21f37bb0128323d55a9fb6278dc7d599921cf99b30304af699a5119fa7a59a4e914cd8074304723af2ec59bd206de756fec303d36c80cd9aa9bab5a989811807103c45e8459645a32bb415328dae5d040954e467597b0a652c315507e8aa07	1	\\xd91951e60d0e0bbe2038ec2b366a8711c4cfec25bd9fe52989bcffac3453004f830db7610e29cf9db9ca817dc56f1665a362aff853f759a520143cf0a1e9160b	1651516417000000	0	11000000
-32	\\xadb725f4d1bd64f8d3e8708289e61f02c940100f16682bf821fc69485089f3c8b32da31d462af44df45566c443fa0e68e00c56d8d06fbfe025f3cc64ebb63717	75	\\x00000001000000016be1dd562630b0eea7328c8a50bf8fe6c08ed5af67378fbff973e60ee86069da0ed10cc8a9b73b432678809cb5ecb57a359047e9f5ae7bad7587698dc7e8f61573c608897690e0ff69738a40381b9d0f19be12620519218d418c451777fdbbaaa33b0160967692fcacbb9a541b32b066579aa117f02e8e1d2558c06f14b7e8e8	1	\\x53bef47d870ad3f69f126accbcd485ae0490f0a50c7890ff2d40655e581567ce5ef9f49e52c518d41ed35576f0dd417c8516ea6e15902240eaf95469d839a80b	1651516417000000	0	2000000
-34	\\x36a340d7187b1c8642694588ed9a64825ab2b86bc4cc9dcd35659fc63075bdd610ce07971895dbc8e1b7239e4cb96d928ff890ec8dd98f1eeae2d61be5b50422	75	\\x0000000100000001159cac5c078c2e20221eff0e68b34ef85c562a511f9ce038268f4541454b3be4728e4cadc9a50db291fe542ded1245b2a4d8a31495af90f37bb76b82507cdc8761ac708de2d1863317bb05ec857cdda7f0f14e27ff350493b6e781a2ad4619c3699904fe5d695077bff4aa89c5ec1929b354a9d04c7e48a91ee1c6aefa6ed592	1	\\x6a9d6ce1e770cb3d27fb7e86e39aa6ea75f59440a42639a3b2fe8582084980f0a401d3403c3bbdea791e85f787a594d9c0685d86217f5dc6ca857ff3e0c9a80b	1651516417000000	0	2000000
-36	\\xe8d925503c78d85c4ece4cdf5a14bbe11374591a37d2c2ef775d92f5f29d42369e7716516db1e1ab80467d00c8c310570a3a0c0a5a9c6cada8ba37f35947fb24	75	\\x000000010000000136723a2a4b2d6a44cf55d778dd423c81ae0af2c3024e9e3d77817cd337fbff7b66e31e824fcbf2017c1715f2c9bf3221cbbaec9a5e1235aad9766fbb2a75ec1975a5706430f3fa6ed88c68d2b5bfd029d6732472be040179cc52b8aaf1d7282891e99a979b4e63afa2895c1bfcd907c8d0b8eaedb623f7d1432a7a86d3de6a64	1	\\x40aeefc2f4c5a13692fec697bebb0c4ddb375c8e9c887541e8b5becc62bf64860556ae84df9037b02470f4843d81601b665f183c269b84ca1e8c9dc36ebabc0c	1651516417000000	0	2000000
-38	\\xf238c2125d57802530dddb6478ac55a10ff084e51a17e57cf7ddf5acb7bf30ed09f7848d5e9ce86ea1855acb667470b7461ef5ed77be35adb8041ebb56258b3f	75	\\x000000010000000198744be13f09e279918189fc365495908d3fe77238d7383b7fdd404f4dd50eb96cfb2435fb1b0462fca76be8f2781fd4e48f00c4bc299a8fb3f64db6d58c798f0d2ca750aa4f760dde7bdc80dd79c332cd9d8a1693840a532a6f78bd4604dedc3c91e26b18cee5268a84168560d3ef165cdd65e01cd1013bf762c26af8bcae	1	\\xd84a39fd6846f45cff8f575e5c2da3da0ca6567525d9f2ae65cb47f2b97541b7664343a86357ee7a1b8c3ebf14b1108e88725426ef401c107ce4ca56bb263c07	1651516418000000	0	2000000
-40	\\x52157e06a1af77afdee74dac64a7f0414eb654b4ee6026576fab176799ec9e3f87eb84ec411ffbccc43b45f92881afcb0ec15065669f49e06250d9e0078e44d0	75	\\x0000000100000001b7b0e8043fb2f3d12e78f74a55202e1f8787acc9819aa914634d5bbb0e4690d9ca6d8af2bde5eb524082917dafd83da4a559aaa8b8a65908e0681d4cccb734126ffb4291cd55a696ba82e93ef7dfb1a9bc4437df08ae73270db9870b35224786cfeb38cc821d7c3e867aa383b8fbcc47721c686e9d24b8d193c4b21f98e78a1b	1	\\xc8ae4ba8ea168006449eaeb849a0694e4ade6d8629d3cba92aa5ff563ed173e1161fd1a83b31c707b53e953cd53518c9984aaf8fac6ebe922b047b2d7951ec00	1651516418000000	0	2000000
-\.
-
-
---
--- Data for Name: revolving_work_shards; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.revolving_work_shards (shard_serial_id, last_attempt, start_row, end_row, active, job_name) FROM stdin;
-\.
-
-
---
--- Data for Name: signkey_revocations; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.signkey_revocations (signkey_revocations_serial_id, esk_serial, master_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wad_in_entries_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wad_in_entries_default (wad_in_entry_serial_id, wad_in_serial_id, reserve_pub, purse_pub, h_contract, purse_expiration, merge_timestamp, amount_with_fee_val, amount_with_fee_frac, wad_fee_val, wad_fee_frac, deposit_fees_val, deposit_fees_frac, reserve_sig, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wad_out_entries_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wad_out_entries_default (wad_out_entry_serial_id, wad_out_serial_id, reserve_pub, purse_pub, h_contract, purse_expiration, merge_timestamp, amount_with_fee_val, amount_with_fee_frac, wad_fee_val, wad_fee_frac, deposit_fees_val, deposit_fees_frac, reserve_sig, purse_sig) FROM stdin;
-\.
-
-
---
--- Data for Name: wads_in_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wads_in_default (wad_in_serial_id, wad_id, origin_exchange_url, amount_val, amount_frac, arrival_time) FROM stdin;
-\.
-
-
---
--- Data for Name: wads_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wads_out_default (wad_out_serial_id, wad_id, partner_serial_id, amount_val, amount_frac, execution_time) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_accounts; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_accounts (payto_uri, master_sig, is_active, last_change) FROM stdin;
-payto://x-taler-bank/localhost/Exchange	\\xd457d175b23a69f3027a15b2662f9e0dbf4931aeae3a97eb9030eb460654245b528969e9a98f1f598386cbe4fde62816da5b0797475beabe16960fec2d11d80b	t	1651516396000000
-\.
-
-
---
--- Data for Name: wire_auditor_account_progress; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_auditor_account_progress (master_pub, account_name, last_wire_reserve_in_serial_id, last_wire_wire_out_serial_id, wire_in_off, wire_out_off) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_auditor_progress; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_auditor_progress (master_pub, last_timestamp, last_reserve_close_uuid) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_fee; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_fee (wire_fee_serial, wire_method, start_date, end_date, wire_fee_val, wire_fee_frac, closing_fee_val, closing_fee_frac, wad_fee_val, wad_fee_frac, master_sig) FROM stdin;
-1	x-taler-bank	1640995200000000	1672531200000000	0	1000000	0	1000000	0	1000000	\\xfbe39dd94c8698ca3a9d45c7f4656143ee091720b005d716e6e46e51673b6f566618e7e3aebc09c949fe6206575f221b3e262e0edf17300e839257f1fda7ad0a
-\.
-
-
---
--- Data for Name: wire_out_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_out_default (wireout_uuid, execution_date, wtid_raw, wire_target_h_payto, exchange_account_section, amount_val, amount_frac) FROM stdin;
-\.
-
-
---
--- Data for Name: wire_targets_default; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.wire_targets_default (wire_target_serial_id, wire_target_h_payto, payto_uri, kyc_ok, external_id) FROM stdin;
-1	\\x6506e969615b4c10cea61d3c3798f501407a5eaea24e4176326639c1ea1a89b3	payto://x-taler-bank/localhost/testuser-zzeu1aog	f	\N
-2	\\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660c	payto://x-taler-bank/localhost/43	f	\N
-\.
-
-
---
--- Data for Name: work_shards; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY public.work_shards (shard_serial_id, last_attempt, start_row, end_row, completed, job_name) FROM stdin;
-1	0	0	1024	f	wirewatch-exchange-account-1
-\.
-
-
---
--- Name: account_merges_account_merge_request_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.account_merges_account_merge_request_serial_id_seq', 1, false);
-
-
---
--- Name: aggregation_tracking_aggregation_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.aggregation_tracking_aggregation_serial_id_seq', 1, false);
-
-
---
--- Name: app_bankaccount_account_no_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.app_bankaccount_account_no_seq', 12, true);
-
-
---
--- Name: app_banktransaction_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.app_banktransaction_id_seq', 2, true);
-
-
---
--- Name: auditor_denom_sigs_auditor_denom_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditor_denom_sigs_auditor_denom_serial_seq', 1269, true);
-
-
---
--- Name: auditor_reserves_auditor_reserves_rowid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditor_reserves_auditor_reserves_rowid_seq', 1, false);
-
-
---
--- Name: auditors_auditor_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auditors_auditor_uuid_seq', 1, true);
-
-
---
--- Name: auth_group_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_group_id_seq', 1, false);
-
-
---
--- Name: auth_group_permissions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_group_permissions_id_seq', 1, false);
-
-
---
--- Name: auth_permission_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_permission_id_seq', 32, true);
-
-
---
--- Name: auth_user_groups_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_groups_id_seq', 1, false);
-
-
---
--- Name: auth_user_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_id_seq', 12, true);
-
-
---
--- Name: auth_user_user_permissions_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.auth_user_user_permissions_id_seq', 1, false);
-
-
---
--- Name: contracts_contract_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.contracts_contract_serial_id_seq', 1, false);
-
-
---
--- Name: cs_nonce_locks_cs_nonce_lock_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.cs_nonce_locks_cs_nonce_lock_serial_id_seq', 1, false);
-
-
---
--- Name: denomination_revocations_denom_revocations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.denomination_revocations_denom_revocations_serial_id_seq', 2, true);
-
-
---
--- Name: denominations_denominations_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.denominations_denominations_serial_seq', 424, true);
-
-
---
--- Name: deposit_confirmations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.deposit_confirmations_serial_id_seq', 3, true);
-
-
---
--- Name: deposits_deposit_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.deposits_deposit_serial_id_seq', 3, true);
-
-
---
--- Name: django_content_type_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.django_content_type_id_seq', 8, true);
-
-
---
--- Name: django_migrations_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.django_migrations_id_seq', 16, true);
-
-
---
--- Name: exchange_sign_keys_esk_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.exchange_sign_keys_esk_serial_seq', 5, true);
-
-
---
--- Name: extension_details_extension_details_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.extension_details_extension_details_serial_id_seq', 1, false);
-
-
---
--- Name: extensions_extension_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.extensions_extension_id_seq', 1, false);
-
-
---
--- Name: global_fee_global_fee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.global_fee_global_fee_serial_seq', 1, true);
-
-
---
--- Name: known_coins_known_coin_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.known_coins_known_coin_id_seq', 14, true);
-
-
---
--- Name: merchant_accounts_account_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_accounts_account_serial_seq', 1, true);
-
-
---
--- Name: merchant_deposits_deposit_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_deposits_deposit_serial_seq', 3, true);
-
-
---
--- Name: merchant_exchange_signing_keys_signkey_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_exchange_signing_keys_signkey_serial_seq', 10, true);
-
-
---
--- Name: merchant_exchange_wire_fees_wirefee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_exchange_wire_fees_wirefee_serial_seq', 2, true);
-
-
---
--- Name: merchant_instances_merchant_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_instances_merchant_serial_seq', 1, true);
-
-
---
--- Name: merchant_inventory_product_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_inventory_product_serial_seq', 1, false);
-
-
---
--- Name: merchant_kyc_kyc_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_kyc_kyc_serial_id_seq', 1, true);
-
-
---
--- Name: merchant_orders_order_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_orders_order_serial_seq', 2, true);
-
-
---
--- Name: merchant_refunds_refund_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_refunds_refund_serial_seq', 1, false);
-
-
---
--- Name: merchant_tip_pickups_pickup_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tip_pickups_pickup_serial_seq', 1, false);
-
-
---
--- Name: merchant_tip_reserves_reserve_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tip_reserves_reserve_serial_seq', 1, false);
-
-
---
--- Name: merchant_tips_tip_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_tips_tip_serial_seq', 1, false);
-
-
---
--- Name: merchant_transfers_credit_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.merchant_transfers_credit_serial_seq', 1, false);
-
-
---
--- Name: partners_partner_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.partners_partner_serial_id_seq', 1, false);
-
-
---
--- Name: prewire_prewire_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.prewire_prewire_uuid_seq', 1, false);
-
-
---
--- Name: purse_deposits_purse_deposit_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_deposits_purse_deposit_serial_id_seq', 1, false);
-
-
---
--- Name: purse_merges_purse_merge_request_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_merges_purse_merge_request_serial_id_seq', 1, false);
-
-
---
--- Name: purse_requests_purse_requests_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.purse_requests_purse_requests_serial_id_seq', 1, false);
-
-
---
--- Name: recoup_recoup_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.recoup_recoup_uuid_seq', 1, true);
-
-
---
--- Name: recoup_refresh_recoup_refresh_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.recoup_refresh_recoup_refresh_uuid_seq', 8, true);
-
-
---
--- Name: refresh_commitments_melt_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_commitments_melt_serial_id_seq', 2, true);
-
-
---
--- Name: refresh_revealed_coins_rrc_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_revealed_coins_rrc_serial_seq', 50, true);
-
-
---
--- Name: refresh_transfer_keys_rtc_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refresh_transfer_keys_rtc_serial_seq', 2, true);
-
-
---
--- Name: refunds_refund_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.refunds_refund_serial_id_seq', 1, false);
-
-
---
--- Name: reserves_close_close_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_close_close_uuid_seq', 1, false);
-
-
---
--- Name: reserves_in_reserve_in_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_in_reserve_in_serial_id_seq', 1, true);
-
-
---
--- Name: reserves_out_reserve_out_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_out_reserve_out_serial_id_seq', 42, true);
-
-
---
--- Name: reserves_reserve_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.reserves_reserve_uuid_seq', 1, true);
-
-
---
--- Name: revolving_work_shards_shard_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.revolving_work_shards_shard_serial_id_seq', 1, false);
-
-
---
--- Name: signkey_revocations_signkey_revocations_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.signkey_revocations_signkey_revocations_serial_id_seq', 1, false);
-
-
---
--- Name: wad_in_entries_wad_in_entry_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wad_in_entries_wad_in_entry_serial_id_seq', 1, false);
-
-
---
--- Name: wad_out_entries_wad_out_entry_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wad_out_entries_wad_out_entry_serial_id_seq', 1, false);
-
-
---
--- Name: wads_in_wad_in_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wads_in_wad_in_serial_id_seq', 1, false);
-
-
---
--- Name: wads_out_wad_out_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wads_out_wad_out_serial_id_seq', 1, false);
-
-
---
--- Name: wire_fee_wire_fee_serial_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_fee_wire_fee_serial_seq', 1, true);
-
-
---
--- Name: wire_out_wireout_uuid_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_out_wireout_uuid_seq', 1, false);
-
-
---
--- Name: wire_targets_wire_target_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.wire_targets_wire_target_serial_id_seq', 4, true);
-
-
---
--- Name: work_shards_shard_serial_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('public.work_shards_shard_serial_id_seq', 1, true);
-
-
---
--- Name: patches patches_pkey; Type: CONSTRAINT; Schema: _v; Owner: -
---
-
-ALTER TABLE ONLY _v.patches
-    ADD CONSTRAINT patches_pkey PRIMARY KEY (patch_name);
-
-
---
--- Name: account_merges_default account_merges_default_account_merge_request_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges_default
-    ADD CONSTRAINT account_merges_default_account_merge_request_serial_id_key UNIQUE (account_merge_request_serial_id);
-
-
---
--- Name: account_merges account_merges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges
-    ADD CONSTRAINT account_merges_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: account_merges_default account_merges_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.account_merges_default
-    ADD CONSTRAINT account_merges_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: aggregation_tracking_default aggregation_tracking_default_aggregation_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking_default
-    ADD CONSTRAINT aggregation_tracking_default_aggregation_serial_id_key UNIQUE (aggregation_serial_id);
-
-
---
--- Name: aggregation_tracking aggregation_tracking_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking
-    ADD CONSTRAINT aggregation_tracking_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: aggregation_tracking_default aggregation_tracking_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.aggregation_tracking_default
-    ADD CONSTRAINT aggregation_tracking_default_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: app_bankaccount app_bankaccount_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_pkey PRIMARY KEY (account_no);
-
-
---
--- Name: app_bankaccount app_bankaccount_user_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_user_id_key UNIQUE (user_id);
-
-
---
--- Name: app_banktransaction app_banktransaction_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_pkey PRIMARY KEY (id);
-
-
---
--- Name: app_banktransaction app_banktransaction_request_uid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_request_uid_key UNIQUE (request_uid);
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawoperation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawoperation_pkey PRIMARY KEY (withdraw_id);
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_auditor_denom_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_auditor_denom_serial_key UNIQUE (auditor_denom_serial);
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_pkey PRIMARY KEY (denominations_serial, auditor_uuid);
-
-
---
--- Name: auditor_denomination_pending auditor_denomination_pending_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denomination_pending
-    ADD CONSTRAINT auditor_denomination_pending_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: auditor_exchanges auditor_exchanges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_exchanges
-    ADD CONSTRAINT auditor_exchanges_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_historic_denomination_revenue auditor_historic_denomination_revenue_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_denomination_revenue
-    ADD CONSTRAINT auditor_historic_denomination_revenue_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: auditor_progress_aggregation auditor_progress_aggregation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_aggregation
-    ADD CONSTRAINT auditor_progress_aggregation_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_coin auditor_progress_coin_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_coin
-    ADD CONSTRAINT auditor_progress_coin_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_deposit_confirmation auditor_progress_deposit_confirmation_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_deposit_confirmation
-    ADD CONSTRAINT auditor_progress_deposit_confirmation_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_progress_reserve auditor_progress_reserve_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_reserve
-    ADD CONSTRAINT auditor_progress_reserve_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: auditor_reserves auditor_reserves_auditor_reserves_rowid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves
-    ADD CONSTRAINT auditor_reserves_auditor_reserves_rowid_key UNIQUE (auditor_reserves_rowid);
-
-
---
--- Name: auditors auditors_auditor_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditors
-    ADD CONSTRAINT auditors_auditor_uuid_key UNIQUE (auditor_uuid);
-
-
---
--- Name: auditors auditors_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditors
-    ADD CONSTRAINT auditors_pkey PRIMARY KEY (auditor_pub);
-
-
---
--- Name: auth_group auth_group_name_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group
-    ADD CONSTRAINT auth_group_name_key UNIQUE (name);
-
-
---
--- Name: auth_group_permissions auth_group_permissions_group_id_permission_id_0cd325b0_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_group_id_permission_id_0cd325b0_uniq UNIQUE (group_id, permission_id);
-
-
---
--- Name: auth_group_permissions auth_group_permissions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_group auth_group_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group
-    ADD CONSTRAINT auth_group_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_permission auth_permission_content_type_id_codename_01ab375a_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_content_type_id_codename_01ab375a_uniq UNIQUE (content_type_id, codename);
-
-
---
--- Name: auth_permission auth_permission_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_groups auth_user_groups_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_groups auth_user_groups_user_id_group_id_94350c0c_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_user_id_group_id_94350c0c_uniq UNIQUE (user_id, group_id);
-
-
---
--- Name: auth_user auth_user_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user
-    ADD CONSTRAINT auth_user_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_pkey PRIMARY KEY (id);
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_user_id_permission_id_14a6b632_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_user_id_permission_id_14a6b632_uniq UNIQUE (user_id, permission_id);
-
-
---
--- Name: auth_user auth_user_username_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user
-    ADD CONSTRAINT auth_user_username_key UNIQUE (username);
-
-
---
--- Name: close_requests close_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.close_requests
-    ADD CONSTRAINT close_requests_pkey PRIMARY KEY (reserve_pub, close_timestamp);
-
-
---
--- Name: close_requests_default close_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.close_requests_default
-    ADD CONSTRAINT close_requests_default_pkey PRIMARY KEY (reserve_pub, close_timestamp);
-
-
---
--- Name: contracts_default contracts_default_contract_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts_default
-    ADD CONSTRAINT contracts_default_contract_serial_id_key UNIQUE (contract_serial_id);
-
-
---
--- Name: contracts contracts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts
-    ADD CONSTRAINT contracts_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: contracts_default contracts_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.contracts_default
-    ADD CONSTRAINT contracts_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: cs_nonce_locks_default cs_nonce_locks_default_cs_nonce_lock_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks_default
-    ADD CONSTRAINT cs_nonce_locks_default_cs_nonce_lock_serial_id_key UNIQUE (cs_nonce_lock_serial_id);
-
-
---
--- Name: cs_nonce_locks cs_nonce_locks_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks
-    ADD CONSTRAINT cs_nonce_locks_pkey PRIMARY KEY (nonce);
-
-
---
--- Name: cs_nonce_locks_default cs_nonce_locks_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.cs_nonce_locks_default
-    ADD CONSTRAINT cs_nonce_locks_default_pkey PRIMARY KEY (nonce);
-
-
---
--- Name: denomination_revocations denomination_revocations_denom_revocations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_denom_revocations_serial_id_key UNIQUE (denom_revocations_serial_id);
-
-
---
--- Name: denomination_revocations denomination_revocations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_pkey PRIMARY KEY (denominations_serial);
-
-
---
--- Name: denominations denominations_denominations_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denominations
-    ADD CONSTRAINT denominations_denominations_serial_key UNIQUE (denominations_serial);
-
-
---
--- Name: denominations denominations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denominations
-    ADD CONSTRAINT denominations_pkey PRIMARY KEY (denom_pub_hash);
-
-
---
--- Name: deposit_confirmations deposit_confirmations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT deposit_confirmations_pkey PRIMARY KEY (h_contract_terms, h_wire, coin_pub, merchant_pub, exchange_sig, exchange_pub, master_sig);
-
-
---
--- Name: deposit_confirmations deposit_confirmations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT deposit_confirmations_serial_id_key UNIQUE (serial_id);
-
-
---
--- Name: deposits_default deposits_default_coin_pub_merchant_pub_h_contract_terms_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposits_default
-    ADD CONSTRAINT deposits_default_coin_pub_merchant_pub_h_contract_terms_key UNIQUE (coin_pub, merchant_pub, h_contract_terms);
-
-
---
--- Name: deposits_default deposits_default_deposit_serial_id_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposits_default
-    ADD CONSTRAINT deposits_default_deposit_serial_id_pkey PRIMARY KEY (deposit_serial_id);
-
-
---
--- Name: django_content_type django_content_type_app_label_model_76bd3d3b_uniq; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type
-    ADD CONSTRAINT django_content_type_app_label_model_76bd3d3b_uniq UNIQUE (app_label, model);
-
-
---
--- Name: django_content_type django_content_type_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_content_type
-    ADD CONSTRAINT django_content_type_pkey PRIMARY KEY (id);
-
-
---
--- Name: django_migrations django_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_migrations
-    ADD CONSTRAINT django_migrations_pkey PRIMARY KEY (id);
-
-
---
--- Name: django_session django_session_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.django_session
-    ADD CONSTRAINT django_session_pkey PRIMARY KEY (session_key);
-
-
---
--- Name: exchange_sign_keys exchange_sign_keys_esk_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.exchange_sign_keys
-    ADD CONSTRAINT exchange_sign_keys_esk_serial_key UNIQUE (esk_serial);
-
-
---
--- Name: exchange_sign_keys exchange_sign_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.exchange_sign_keys
-    ADD CONSTRAINT exchange_sign_keys_pkey PRIMARY KEY (exchange_pub);
-
-
---
--- Name: extension_details extension_details_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extension_details
-    ADD CONSTRAINT extension_details_pkey PRIMARY KEY (extension_details_serial_id);
-
-
---
--- Name: extension_details_default extension_details_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extension_details_default
-    ADD CONSTRAINT extension_details_default_pkey PRIMARY KEY (extension_details_serial_id);
-
-
---
--- Name: extensions extensions_extension_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extensions
-    ADD CONSTRAINT extensions_extension_id_key UNIQUE (extension_id);
-
-
---
--- Name: extensions extensions_name_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.extensions
-    ADD CONSTRAINT extensions_name_key UNIQUE (name);
-
-
---
--- Name: global_fee global_fee_global_fee_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.global_fee
-    ADD CONSTRAINT global_fee_global_fee_serial_key UNIQUE (global_fee_serial);
-
-
---
--- Name: global_fee global_fee_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.global_fee
-    ADD CONSTRAINT global_fee_pkey PRIMARY KEY (start_date);
-
-
---
--- Name: history_requests history_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.history_requests
-    ADD CONSTRAINT history_requests_pkey PRIMARY KEY (reserve_pub, request_timestamp);
-
-
---
--- Name: history_requests_default history_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.history_requests_default
-    ADD CONSTRAINT history_requests_default_pkey PRIMARY KEY (reserve_pub, request_timestamp);
-
-
---
--- Name: known_coins_default known_coins_default_known_coin_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins_default
-    ADD CONSTRAINT known_coins_default_known_coin_id_key UNIQUE (known_coin_id);
-
-
---
--- Name: known_coins known_coins_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins
-    ADD CONSTRAINT known_coins_pkey PRIMARY KEY (coin_pub);
-
-
---
--- Name: known_coins_default known_coins_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.known_coins_default
-    ADD CONSTRAINT known_coins_default_pkey PRIMARY KEY (coin_pub);
-
-
---
--- Name: merchant_accounts merchant_accounts_h_wire_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_h_wire_key UNIQUE (h_wire);
-
-
---
--- Name: merchant_accounts merchant_accounts_merchant_serial_payto_uri_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_merchant_serial_payto_uri_key UNIQUE (merchant_serial, payto_uri);
-
-
---
--- Name: merchant_accounts merchant_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_pkey PRIMARY KEY (account_serial);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_h_contract_terms_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_h_contract_terms_key UNIQUE (merchant_serial, h_contract_terms);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_order_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_order_id_key UNIQUE (merchant_serial, order_id);
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_pkey PRIMARY KEY (order_serial);
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_deposit_serial_credit_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_deposit_serial_credit_serial_key UNIQUE (deposit_serial, credit_serial);
-
-
---
--- Name: merchant_deposits merchant_deposits_order_serial_coin_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_order_serial_coin_pub_key UNIQUE (order_serial, coin_pub);
-
-
---
--- Name: merchant_deposits merchant_deposits_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_pkey PRIMARY KEY (deposit_serial);
-
-
---
--- Name: merchant_exchange_signing_keys merchant_exchange_signing_key_exchange_pub_start_date_maste_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_signing_keys
-    ADD CONSTRAINT merchant_exchange_signing_key_exchange_pub_start_date_maste_key UNIQUE (exchange_pub, start_date, master_pub);
-
-
---
--- Name: merchant_exchange_signing_keys merchant_exchange_signing_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_signing_keys
-    ADD CONSTRAINT merchant_exchange_signing_keys_pkey PRIMARY KEY (signkey_serial);
-
-
---
--- Name: merchant_exchange_wire_fees merchant_exchange_wire_fees_master_pub_h_wire_method_start__key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_wire_fees
-    ADD CONSTRAINT merchant_exchange_wire_fees_master_pub_h_wire_method_start__key UNIQUE (master_pub, h_wire_method, start_date);
-
-
---
--- Name: merchant_exchange_wire_fees merchant_exchange_wire_fees_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_exchange_wire_fees
-    ADD CONSTRAINT merchant_exchange_wire_fees_pkey PRIMARY KEY (wirefee_serial);
-
-
---
--- Name: merchant_instances merchant_instances_merchant_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_merchant_id_key UNIQUE (merchant_id);
-
-
---
--- Name: merchant_instances merchant_instances_merchant_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_merchant_pub_key UNIQUE (merchant_pub);
-
-
---
--- Name: merchant_instances merchant_instances_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_instances
-    ADD CONSTRAINT merchant_instances_pkey PRIMARY KEY (merchant_serial);
-
-
---
--- Name: merchant_inventory merchant_inventory_merchant_serial_product_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_merchant_serial_product_id_key UNIQUE (merchant_serial, product_id);
-
-
---
--- Name: merchant_inventory merchant_inventory_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_pkey PRIMARY KEY (product_serial);
-
-
---
--- Name: merchant_keys merchant_keys_merchant_priv_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_merchant_priv_key UNIQUE (merchant_priv);
-
-
---
--- Name: merchant_keys merchant_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_pkey PRIMARY KEY (merchant_serial);
-
-
---
--- Name: merchant_kyc merchant_kyc_kyc_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_kyc_serial_id_key UNIQUE (kyc_serial_id);
-
-
---
--- Name: merchant_kyc merchant_kyc_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_pkey PRIMARY KEY (account_serial, exchange_url);
-
-
---
--- Name: merchant_orders merchant_orders_merchant_serial_order_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_merchant_serial_order_id_key UNIQUE (merchant_serial, order_id);
-
-
---
--- Name: merchant_orders merchant_orders_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_pkey PRIMARY KEY (order_serial);
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_pkey PRIMARY KEY (refund_serial);
-
-
---
--- Name: merchant_refunds merchant_refunds_order_serial_coin_pub_rtransaction_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_order_serial_coin_pub_rtransaction_id_key UNIQUE (order_serial, coin_pub, rtransaction_id);
-
-
---
--- Name: merchant_refunds merchant_refunds_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_pkey PRIMARY KEY (refund_serial);
-
-
---
--- Name: merchant_tip_pickup_signatures merchant_tip_pickup_signatures_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickup_signatures
-    ADD CONSTRAINT merchant_tip_pickup_signatures_pkey PRIMARY KEY (pickup_serial, coin_offset);
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_pickup_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_pickup_id_key UNIQUE (pickup_id);
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_pkey PRIMARY KEY (pickup_serial);
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_priv_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_priv_key UNIQUE (reserve_priv);
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_serial_key UNIQUE (reserve_serial);
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_pkey PRIMARY KEY (reserve_serial);
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_reserve_pub_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_reserve_pub_key UNIQUE (reserve_pub);
-
-
---
--- Name: merchant_tips merchant_tips_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_pkey PRIMARY KEY (tip_serial);
-
-
---
--- Name: merchant_tips merchant_tips_tip_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_tip_id_key UNIQUE (tip_id);
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_pkey PRIMARY KEY (credit_serial);
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_deposit_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_deposit_serial_key UNIQUE (deposit_serial);
-
-
---
--- Name: merchant_transfers merchant_transfers_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_pkey PRIMARY KEY (credit_serial);
-
-
---
--- Name: merchant_transfers merchant_transfers_wtid_exchange_url_account_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_wtid_exchange_url_account_serial_key UNIQUE (wtid, exchange_url, account_serial);
-
-
---
--- Name: partner_accounts partner_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partner_accounts
-    ADD CONSTRAINT partner_accounts_pkey PRIMARY KEY (payto_uri);
-
-
---
--- Name: partners partners_partner_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partners
-    ADD CONSTRAINT partners_partner_serial_id_key UNIQUE (partner_serial_id);
-
-
---
--- Name: prewire prewire_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.prewire
-    ADD CONSTRAINT prewire_pkey PRIMARY KEY (prewire_uuid);
-
-
---
--- Name: prewire_default prewire_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.prewire_default
-    ADD CONSTRAINT prewire_default_pkey PRIMARY KEY (prewire_uuid);
-
-
---
--- Name: purse_deposits purse_deposits_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits
-    ADD CONSTRAINT purse_deposits_pkey PRIMARY KEY (purse_pub, coin_pub);
-
-
---
--- Name: purse_deposits_default purse_deposits_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits_default
-    ADD CONSTRAINT purse_deposits_default_pkey PRIMARY KEY (purse_pub, coin_pub);
-
-
---
--- Name: purse_deposits_default purse_deposits_default_purse_deposit_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_deposits_default
-    ADD CONSTRAINT purse_deposits_default_purse_deposit_serial_id_key UNIQUE (purse_deposit_serial_id);
-
-
---
--- Name: purse_merges purse_merges_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges
-    ADD CONSTRAINT purse_merges_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_merges_default purse_merges_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges_default
-    ADD CONSTRAINT purse_merges_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_merges_default purse_merges_default_purse_merge_request_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_merges_default
-    ADD CONSTRAINT purse_merges_default_purse_merge_request_serial_id_key UNIQUE (purse_merge_request_serial_id);
-
-
---
--- Name: purse_requests purse_requests_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests
-    ADD CONSTRAINT purse_requests_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_requests_default purse_requests_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests_default
-    ADD CONSTRAINT purse_requests_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: purse_requests_default purse_requests_default_purse_requests_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.purse_requests_default
-    ADD CONSTRAINT purse_requests_default_purse_requests_serial_id_key UNIQUE (purse_requests_serial_id);
-
-
---
--- Name: recoup_default recoup_default_recoup_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.recoup_default
-    ADD CONSTRAINT recoup_default_recoup_uuid_key UNIQUE (recoup_uuid);
-
-
---
--- Name: recoup_refresh_default recoup_refresh_default_recoup_refresh_uuid_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.recoup_refresh_default
-    ADD CONSTRAINT recoup_refresh_default_recoup_refresh_uuid_key UNIQUE (recoup_refresh_uuid);
-
-
---
--- Name: refresh_commitments_default refresh_commitments_default_melt_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments_default
-    ADD CONSTRAINT refresh_commitments_default_melt_serial_id_key UNIQUE (melt_serial_id);
-
-
---
--- Name: refresh_commitments refresh_commitments_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments
-    ADD CONSTRAINT refresh_commitments_pkey PRIMARY KEY (rc);
-
-
---
--- Name: refresh_commitments_default refresh_commitments_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_commitments_default
-    ADD CONSTRAINT refresh_commitments_default_pkey PRIMARY KEY (rc);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_coin_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_coin_ev_key UNIQUE (coin_ev);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_h_coin_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_h_coin_ev_key UNIQUE (h_coin_ev);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_pkey PRIMARY KEY (melt_serial_id, freshcoin_index);
-
-
---
--- Name: refresh_revealed_coins_default refresh_revealed_coins_default_rrc_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_revealed_coins_default
-    ADD CONSTRAINT refresh_revealed_coins_default_rrc_serial_key UNIQUE (rrc_serial);
-
-
---
--- Name: refresh_transfer_keys refresh_transfer_keys_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys
-    ADD CONSTRAINT refresh_transfer_keys_pkey PRIMARY KEY (melt_serial_id);
-
-
---
--- Name: refresh_transfer_keys_default refresh_transfer_keys_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys_default
-    ADD CONSTRAINT refresh_transfer_keys_default_pkey PRIMARY KEY (melt_serial_id);
-
-
---
--- Name: refresh_transfer_keys_default refresh_transfer_keys_default_rtc_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refresh_transfer_keys_default
-    ADD CONSTRAINT refresh_transfer_keys_default_rtc_serial_key UNIQUE (rtc_serial);
-
-
---
--- Name: refunds_default refunds_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refunds_default
-    ADD CONSTRAINT refunds_default_pkey PRIMARY KEY (deposit_serial_id, rtransaction_id);
-
-
---
--- Name: refunds_default refunds_default_refund_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.refunds_default
-    ADD CONSTRAINT refunds_default_refund_serial_id_key UNIQUE (refund_serial_id);
-
-
---
--- Name: reserves_close_default reserves_close_default_close_uuid_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_close_default
-    ADD CONSTRAINT reserves_close_default_close_uuid_pkey PRIMARY KEY (close_uuid);
-
-
---
--- Name: reserves reserves_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves
-    ADD CONSTRAINT reserves_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_default reserves_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_default
-    ADD CONSTRAINT reserves_default_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in reserves_in_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in
-    ADD CONSTRAINT reserves_in_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in_default reserves_in_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in_default
-    ADD CONSTRAINT reserves_in_default_pkey PRIMARY KEY (reserve_pub);
-
-
---
--- Name: reserves_in_default reserves_in_default_reserve_in_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_in_default
-    ADD CONSTRAINT reserves_in_default_reserve_in_serial_id_key UNIQUE (reserve_in_serial_id);
-
-
---
--- Name: reserves_out reserves_out_h_blind_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out
-    ADD CONSTRAINT reserves_out_h_blind_ev_key UNIQUE (h_blind_ev);
-
-
---
--- Name: reserves_out_default reserves_out_default_h_blind_ev_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out_default
-    ADD CONSTRAINT reserves_out_default_h_blind_ev_key UNIQUE (h_blind_ev);
-
-
---
--- Name: reserves_out_default reserves_out_default_reserve_out_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.reserves_out_default
-    ADD CONSTRAINT reserves_out_default_reserve_out_serial_id_key UNIQUE (reserve_out_serial_id);
-
-
---
--- Name: revolving_work_shards revolving_work_shards_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.revolving_work_shards
-    ADD CONSTRAINT revolving_work_shards_pkey PRIMARY KEY (job_name, start_row);
-
-
---
--- Name: revolving_work_shards revolving_work_shards_shard_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.revolving_work_shards
-    ADD CONSTRAINT revolving_work_shards_shard_serial_id_key UNIQUE (shard_serial_id);
-
-
---
--- Name: signkey_revocations signkey_revocations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_pkey PRIMARY KEY (esk_serial);
-
-
---
--- Name: signkey_revocations signkey_revocations_signkey_revocations_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_signkey_revocations_serial_id_key UNIQUE (signkey_revocations_serial_id);
-
-
---
--- Name: wad_in_entries wad_in_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries
-    ADD CONSTRAINT wad_in_entries_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_in_entries_default wad_in_entries_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries_default
-    ADD CONSTRAINT wad_in_entries_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_in_entries_default wad_in_entries_default_wad_in_entry_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_in_entries_default
-    ADD CONSTRAINT wad_in_entries_default_wad_in_entry_serial_id_key UNIQUE (wad_in_entry_serial_id);
-
-
---
--- Name: wad_out_entries wad_out_entries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries
-    ADD CONSTRAINT wad_out_entries_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_out_entries_default wad_out_entries_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries_default
-    ADD CONSTRAINT wad_out_entries_default_pkey PRIMARY KEY (purse_pub);
-
-
---
--- Name: wad_out_entries_default wad_out_entries_default_wad_out_entry_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wad_out_entries_default
-    ADD CONSTRAINT wad_out_entries_default_wad_out_entry_serial_id_key UNIQUE (wad_out_entry_serial_id);
-
-
---
--- Name: wads_in wads_in_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in
-    ADD CONSTRAINT wads_in_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_in_default wads_in_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_in wads_in_wad_id_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in
-    ADD CONSTRAINT wads_in_wad_id_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_in_default wads_in_default_wad_id_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_id_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_in_default wads_in_default_wad_in_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_in_serial_id_key UNIQUE (wad_in_serial_id);
-
-
---
--- Name: wads_in_default wads_in_default_wad_is_origin_exchange_url_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_in_default
-    ADD CONSTRAINT wads_in_default_wad_is_origin_exchange_url_key UNIQUE (wad_id, origin_exchange_url);
-
-
---
--- Name: wads_out wads_out_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out
-    ADD CONSTRAINT wads_out_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_out_default wads_out_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out_default
-    ADD CONSTRAINT wads_out_default_pkey PRIMARY KEY (wad_id);
-
-
---
--- Name: wads_out_default wads_out_default_wad_out_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wads_out_default
-    ADD CONSTRAINT wads_out_default_wad_out_serial_id_key UNIQUE (wad_out_serial_id);
-
-
---
--- Name: wire_accounts wire_accounts_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_accounts
-    ADD CONSTRAINT wire_accounts_pkey PRIMARY KEY (payto_uri);
-
-
---
--- Name: wire_auditor_account_progress wire_auditor_account_progress_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_account_progress
-    ADD CONSTRAINT wire_auditor_account_progress_pkey PRIMARY KEY (master_pub, account_name);
-
-
---
--- Name: wire_auditor_progress wire_auditor_progress_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_progress
-    ADD CONSTRAINT wire_auditor_progress_pkey PRIMARY KEY (master_pub);
-
-
---
--- Name: wire_fee wire_fee_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_fee
-    ADD CONSTRAINT wire_fee_pkey PRIMARY KEY (wire_method, start_date);
-
-
---
--- Name: wire_fee wire_fee_wire_fee_serial_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_fee
-    ADD CONSTRAINT wire_fee_wire_fee_serial_key UNIQUE (wire_fee_serial);
-
-
---
--- Name: wire_out_default wire_out_default_wireout_uuid_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out_default
-    ADD CONSTRAINT wire_out_default_wireout_uuid_pkey PRIMARY KEY (wireout_uuid);
-
-
---
--- Name: wire_out wire_out_wtid_raw_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out
-    ADD CONSTRAINT wire_out_wtid_raw_key UNIQUE (wtid_raw);
-
-
---
--- Name: wire_out_default wire_out_default_wtid_raw_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_out_default
-    ADD CONSTRAINT wire_out_default_wtid_raw_key UNIQUE (wtid_raw);
-
-
---
--- Name: wire_targets wire_targets_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets
-    ADD CONSTRAINT wire_targets_pkey PRIMARY KEY (wire_target_h_payto);
-
-
---
--- Name: wire_targets_default wire_targets_default_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets_default
-    ADD CONSTRAINT wire_targets_default_pkey PRIMARY KEY (wire_target_h_payto);
-
-
---
--- Name: wire_targets_default wire_targets_default_wire_target_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_targets_default
-    ADD CONSTRAINT wire_targets_default_wire_target_serial_id_key UNIQUE (wire_target_serial_id);
-
-
---
--- Name: work_shards work_shards_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.work_shards
-    ADD CONSTRAINT work_shards_pkey PRIMARY KEY (job_name, start_row);
-
-
---
--- Name: work_shards work_shards_shard_serial_id_key; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.work_shards
-    ADD CONSTRAINT work_shards_shard_serial_id_key UNIQUE (shard_serial_id);
-
-
---
--- Name: account_merges_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX account_merges_by_reserve_pub ON ONLY public.account_merges USING btree (reserve_pub);
-
-
---
--- Name: account_merges_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX account_merges_default_reserve_pub_idx ON public.account_merges_default USING btree (reserve_pub);
-
-
---
--- Name: aggregation_tracking_by_wtid_raw_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX aggregation_tracking_by_wtid_raw_index ON ONLY public.aggregation_tracking USING btree (wtid_raw);
-
-
---
--- Name: INDEX aggregation_tracking_by_wtid_raw_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.aggregation_tracking_by_wtid_raw_index IS 'for lookup_transactions';
-
-
---
--- Name: aggregation_tracking_default_wtid_raw_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX aggregation_tracking_default_wtid_raw_idx ON public.aggregation_tracking_default USING btree (wtid_raw);
-
-
---
--- Name: app_banktransaction_credit_account_id_a8ba05ac; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_credit_account_id_a8ba05ac ON public.app_banktransaction USING btree (credit_account_id);
-
-
---
--- Name: app_banktransaction_date_f72bcad6; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_date_f72bcad6 ON public.app_banktransaction USING btree (date);
-
-
---
--- Name: app_banktransaction_debit_account_id_5b1f7528; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_debit_account_id_5b1f7528 ON public.app_banktransaction USING btree (debit_account_id);
-
-
---
--- Name: app_banktransaction_request_uid_b7d06af5_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_banktransaction_request_uid_b7d06af5_like ON public.app_banktransaction USING btree (request_uid varchar_pattern_ops);
-
-
---
--- Name: app_talerwithdrawoperation_selected_exchange_account__6c8b96cf; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_talerwithdrawoperation_selected_exchange_account__6c8b96cf ON public.app_talerwithdrawoperation USING btree (selected_exchange_account_id);
-
-
---
--- Name: app_talerwithdrawoperation_withdraw_account_id_992dc5b3; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX app_talerwithdrawoperation_withdraw_account_id_992dc5b3 ON public.app_talerwithdrawoperation USING btree (withdraw_account_id);
-
-
---
--- Name: auditor_historic_reserve_summary_by_master_pub_start_date; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auditor_historic_reserve_summary_by_master_pub_start_date ON public.auditor_historic_reserve_summary USING btree (master_pub, start_date);
-
-
---
--- Name: auditor_reserves_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auditor_reserves_by_reserve_pub ON public.auditor_reserves USING btree (reserve_pub);
-
-
---
--- Name: auth_group_name_a6ea08ec_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_name_a6ea08ec_like ON public.auth_group USING btree (name varchar_pattern_ops);
-
-
---
--- Name: auth_group_permissions_group_id_b120cbf9; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_permissions_group_id_b120cbf9 ON public.auth_group_permissions USING btree (group_id);
-
-
---
--- Name: auth_group_permissions_permission_id_84c5c92e; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_group_permissions_permission_id_84c5c92e ON public.auth_group_permissions USING btree (permission_id);
-
-
---
--- Name: auth_permission_content_type_id_2f476e4b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_permission_content_type_id_2f476e4b ON public.auth_permission USING btree (content_type_id);
-
-
---
--- Name: auth_user_groups_group_id_97559544; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_groups_group_id_97559544 ON public.auth_user_groups USING btree (group_id);
-
-
---
--- Name: auth_user_groups_user_id_6a12ed8b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_groups_user_id_6a12ed8b ON public.auth_user_groups USING btree (user_id);
-
-
---
--- Name: auth_user_user_permissions_permission_id_1fbb5f2c; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_user_permissions_permission_id_1fbb5f2c ON public.auth_user_user_permissions USING btree (permission_id);
-
-
---
--- Name: auth_user_user_permissions_user_id_a95ead1b; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_user_permissions_user_id_a95ead1b ON public.auth_user_user_permissions USING btree (user_id);
-
-
---
--- Name: auth_user_username_6821ab7c_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX auth_user_username_6821ab7c_like ON public.auth_user USING btree (username varchar_pattern_ops);
-
-
---
--- Name: denominations_by_expire_legal_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX denominations_by_expire_legal_index ON public.denominations USING btree (expire_legal);
-
-
---
--- Name: deposits_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_coin_pub_index ON ONLY public.deposits USING btree (coin_pub);
-
-
---
--- Name: deposits_by_ready_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_ready_main_index ON ONLY public.deposits_by_ready USING btree (wire_deadline, shard, coin_pub);
-
-
---
--- Name: deposits_by_ready_default_wire_deadline_shard_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_by_ready_default_wire_deadline_shard_coin_pub_idx ON public.deposits_by_ready_default USING btree (wire_deadline, shard, coin_pub);
-
-
---
--- Name: deposits_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_default_coin_pub_idx ON public.deposits_default USING btree (coin_pub);
-
-
---
--- Name: deposits_for_matching_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_for_matching_main_index ON ONLY public.deposits_for_matching USING btree (refund_deadline, merchant_pub, coin_pub);
-
-
---
--- Name: deposits_for_matching_default_refund_deadline_merchant_pub__idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX deposits_for_matching_default_refund_deadline_merchant_pub__idx ON public.deposits_for_matching_default USING btree (refund_deadline, merchant_pub, coin_pub);
-
-
---
--- Name: django_session_expire_date_a5c62663; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX django_session_expire_date_a5c62663 ON public.django_session USING btree (expire_date);
-
-
---
--- Name: django_session_session_key_c0390e0f_like; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX django_session_session_key_c0390e0f_like ON public.django_session USING btree (session_key varchar_pattern_ops);
-
-
---
--- Name: global_fee_by_end_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX global_fee_by_end_date_index ON public.global_fee USING btree (end_date);
-
-
---
--- Name: merchant_contract_terms_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_expiration ON public.merchant_contract_terms USING btree (paid, pay_deadline);
-
-
---
--- Name: INDEX merchant_contract_terms_by_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.merchant_contract_terms_by_expiration IS 'for unlock_contracts';
-
-
---
--- Name: merchant_contract_terms_by_merchant_and_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_and_expiration ON public.merchant_contract_terms USING btree (merchant_serial, pay_deadline);
-
-
---
--- Name: INDEX merchant_contract_terms_by_merchant_and_expiration; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.merchant_contract_terms_by_merchant_and_expiration IS 'for delete_contract_terms';
-
-
---
--- Name: merchant_contract_terms_by_merchant_and_payment; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_and_payment ON public.merchant_contract_terms USING btree (merchant_serial, paid);
-
-
---
--- Name: merchant_contract_terms_by_merchant_session_and_fulfillment; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_contract_terms_by_merchant_session_and_fulfillment ON public.merchant_contract_terms USING btree (merchant_serial, fulfillment_url, session_id);
-
-
---
--- Name: merchant_inventory_locks_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_inventory_locks_by_expiration ON public.merchant_inventory_locks USING btree (expiration);
-
-
---
--- Name: merchant_inventory_locks_by_uuid; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_inventory_locks_by_uuid ON public.merchant_inventory_locks USING btree (lock_uuid);
-
-
---
--- Name: merchant_orders_by_creation_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_by_creation_time ON public.merchant_orders USING btree (creation_time);
-
-
---
--- Name: merchant_orders_by_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_by_expiration ON public.merchant_orders USING btree (pay_deadline);
-
-
---
--- Name: merchant_orders_locks_by_order_and_product; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_orders_locks_by_order_and_product ON public.merchant_order_locks USING btree (order_serial, product_serial);
-
-
---
--- Name: merchant_refunds_by_coin_and_order; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_refunds_by_coin_and_order ON public.merchant_refunds USING btree (coin_pub, order_serial);
-
-
---
--- Name: merchant_tip_reserves_by_exchange_balance; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_exchange_balance ON public.merchant_tip_reserves USING btree (exchange_initial_balance_val, exchange_initial_balance_frac);
-
-
---
--- Name: merchant_tip_reserves_by_merchant_serial_and_creation_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_merchant_serial_and_creation_time ON public.merchant_tip_reserves USING btree (merchant_serial, creation_time);
-
-
---
--- Name: merchant_tip_reserves_by_reserve_pub_and_merchant_serial; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tip_reserves_by_reserve_pub_and_merchant_serial ON public.merchant_tip_reserves USING btree (reserve_pub, merchant_serial, creation_time);
-
-
---
--- Name: merchant_tips_by_pickup_and_expiration; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_tips_by_pickup_and_expiration ON public.merchant_tips USING btree (was_picked_up, expiration);
-
-
---
--- Name: merchant_transfers_by_credit; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX merchant_transfers_by_credit ON public.merchant_transfer_to_coin USING btree (credit_serial);
-
-
---
--- Name: partner_accounts_index_by_partner_and_time; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX partner_accounts_index_by_partner_and_time ON public.partner_accounts USING btree (partner_serial_id, last_seen);
-
-
---
--- Name: prewire_by_failed_finished_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_by_failed_finished_index ON ONLY public.prewire USING btree (failed, finished);
-
-
---
--- Name: INDEX prewire_by_failed_finished_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.prewire_by_failed_finished_index IS 'for wire_prepare_data_get';
-
-
---
--- Name: prewire_by_finished_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_by_finished_index ON ONLY public.prewire USING btree (finished);
-
-
---
--- Name: INDEX prewire_by_finished_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.prewire_by_finished_index IS 'for gc_prewire';
-
-
---
--- Name: prewire_default_failed_finished_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_default_failed_finished_idx ON public.prewire_default USING btree (failed, finished);
-
-
---
--- Name: prewire_default_finished_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX prewire_default_finished_idx ON public.prewire_default USING btree (finished);
-
-
---
--- Name: purse_deposits_by_coin_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_deposits_by_coin_pub ON ONLY public.purse_deposits USING btree (coin_pub);
-
-
---
--- Name: purse_deposits_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_deposits_default_coin_pub_idx ON public.purse_deposits_default USING btree (coin_pub);
-
-
---
--- Name: purse_merges_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_merges_reserve_pub ON ONLY public.purse_merges USING btree (reserve_pub);
-
-
---
--- Name: INDEX purse_merges_reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.purse_merges_reserve_pub IS 'needed in reserve history computation';
-
-
---
--- Name: purse_merges_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_merges_default_reserve_pub_idx ON public.purse_merges_default USING btree (reserve_pub);
-
-
---
--- Name: purse_requests_merge_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_requests_merge_pub ON ONLY public.purse_requests USING btree (merge_pub);
-
-
---
--- Name: purse_requests_default_merge_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX purse_requests_default_merge_pub_idx ON public.purse_requests_default USING btree (merge_pub);
-
-
---
--- Name: recoup_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_coin_pub_index ON ONLY public.recoup USING btree (coin_pub);
-
-
---
--- Name: recoup_by_reserve_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_reserve_main_index ON ONLY public.recoup_by_reserve USING btree (reserve_out_serial_id);
-
-
---
--- Name: recoup_by_reserve_default_reserve_out_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_by_reserve_default_reserve_out_serial_id_idx ON public.recoup_by_reserve_default USING btree (reserve_out_serial_id);
-
-
---
--- Name: recoup_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_default_coin_pub_idx ON public.recoup_default USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_by_coin_pub_index ON ONLY public.recoup_refresh USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_by_rrc_serial_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_by_rrc_serial_index ON ONLY public.recoup_refresh USING btree (rrc_serial);
-
-
---
--- Name: recoup_refresh_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_default_coin_pub_idx ON public.recoup_refresh_default USING btree (coin_pub);
-
-
---
--- Name: recoup_refresh_default_rrc_serial_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX recoup_refresh_default_rrc_serial_idx ON public.recoup_refresh_default USING btree (rrc_serial);
-
-
---
--- Name: refresh_commitments_by_old_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_commitments_by_old_coin_pub_index ON ONLY public.refresh_commitments USING btree (old_coin_pub);
-
-
---
--- Name: refresh_commitments_default_old_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_commitments_default_old_coin_pub_idx ON public.refresh_commitments_default USING btree (old_coin_pub);
-
-
---
--- Name: refresh_revealed_coins_coins_by_melt_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_revealed_coins_coins_by_melt_serial_id_index ON ONLY public.refresh_revealed_coins USING btree (melt_serial_id);
-
-
---
--- Name: refresh_revealed_coins_default_melt_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refresh_revealed_coins_default_melt_serial_id_idx ON public.refresh_revealed_coins_default USING btree (melt_serial_id);
-
-
---
--- Name: refunds_by_coin_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refunds_by_coin_pub_index ON ONLY public.refunds USING btree (coin_pub);
-
-
---
--- Name: refunds_default_coin_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX refunds_default_coin_pub_idx ON public.refunds_default USING btree (coin_pub);
-
-
---
--- Name: reserves_by_expiration_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_expiration_index ON ONLY public.reserves USING btree (expiration_date, current_balance_val, current_balance_frac);
-
-
---
--- Name: INDEX reserves_by_expiration_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_by_expiration_index IS 'used in get_expired_reserves';
-
-
---
--- Name: reserves_by_gc_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_gc_date_index ON ONLY public.reserves USING btree (gc_date);
-
-
---
--- Name: INDEX reserves_by_gc_date_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_by_gc_date_index IS 'for reserve garbage collection';
-
-
---
--- Name: reserves_by_reserve_uuid_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_by_reserve_uuid_index ON ONLY public.reserves USING btree (reserve_uuid);
-
-
---
--- Name: reserves_close_by_close_uuid_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_by_close_uuid_index ON ONLY public.reserves_close USING btree (close_uuid);
-
-
---
--- Name: reserves_close_by_reserve_pub_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_by_reserve_pub_index ON ONLY public.reserves_close USING btree (reserve_pub);
-
-
---
--- Name: reserves_close_default_close_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_default_close_uuid_idx ON public.reserves_close_default USING btree (close_uuid);
-
-
---
--- Name: reserves_close_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_close_default_reserve_pub_idx ON public.reserves_close_default USING btree (reserve_pub);
-
-
---
--- Name: reserves_default_expiration_date_current_balance_val_curren_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_expiration_date_current_balance_val_curren_idx ON public.reserves_default USING btree (expiration_date, current_balance_val, current_balance_frac);
-
-
---
--- Name: reserves_default_gc_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_gc_date_idx ON public.reserves_default USING btree (gc_date);
-
-
---
--- Name: reserves_default_reserve_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_default_reserve_uuid_idx ON public.reserves_default USING btree (reserve_uuid);
-
-
---
--- Name: reserves_in_by_exch_accnt_reserve_in_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_exch_accnt_reserve_in_serial_id_idx ON ONLY public.reserves_in USING btree (exchange_account_section, reserve_in_serial_id DESC);
-
-
---
--- Name: reserves_in_by_exch_accnt_section_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_exch_accnt_section_execution_date_idx ON ONLY public.reserves_in USING btree (exchange_account_section, execution_date);
-
-
---
--- Name: reserves_in_by_reserve_in_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_by_reserve_in_serial_id_index ON ONLY public.reserves_in USING btree (reserve_in_serial_id);
-
-
---
--- Name: reserves_in_default_exchange_account_section_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_exchange_account_section_execution_date_idx ON public.reserves_in_default USING btree (exchange_account_section, execution_date);
-
-
---
--- Name: reserves_in_default_exchange_account_section_reserve_in_ser_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_exchange_account_section_reserve_in_ser_idx ON public.reserves_in_default USING btree (exchange_account_section, reserve_in_serial_id DESC);
-
-
---
--- Name: reserves_in_default_reserve_in_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_in_default_reserve_in_serial_id_idx ON public.reserves_in_default USING btree (reserve_in_serial_id);
-
-
---
--- Name: reserves_out_by_reserve_main_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_main_index ON ONLY public.reserves_out_by_reserve USING btree (reserve_uuid);
-
-
---
--- Name: reserves_out_by_reserve_default_reserve_uuid_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_default_reserve_uuid_idx ON public.reserves_out_by_reserve_default USING btree (reserve_uuid);
-
-
---
--- Name: reserves_out_by_reserve_out_serial_id_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_out_serial_id_index ON ONLY public.reserves_out USING btree (reserve_out_serial_id);
-
-
---
--- Name: reserves_out_by_reserve_uuid_and_execution_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_by_reserve_uuid_and_execution_date_index ON ONLY public.reserves_out USING btree (reserve_uuid, execution_date);
-
-
---
--- Name: INDEX reserves_out_by_reserve_uuid_and_execution_date_index; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.reserves_out_by_reserve_uuid_and_execution_date_index IS 'for get_reserves_out and exchange_do_withdraw_limit_check';
-
-
---
--- Name: reserves_out_default_reserve_out_serial_id_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_default_reserve_out_serial_id_idx ON public.reserves_out_default USING btree (reserve_out_serial_id);
-
-
---
--- Name: reserves_out_default_reserve_uuid_execution_date_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX reserves_out_default_reserve_uuid_execution_date_idx ON public.reserves_out_default USING btree (reserve_uuid, execution_date);
-
-
---
--- Name: revolving_work_shards_by_job_name_active_last_attempt_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX revolving_work_shards_by_job_name_active_last_attempt_index ON public.revolving_work_shards USING btree (job_name, active, last_attempt);
-
-
---
--- Name: wad_in_entries_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_in_entries_reserve_pub ON ONLY public.wad_in_entries USING btree (reserve_pub);
-
-
---
--- Name: INDEX wad_in_entries_reserve_pub; Type: COMMENT; Schema: public; Owner: -
---
-
-COMMENT ON INDEX public.wad_in_entries_reserve_pub IS 'needed in reserve history computation';
-
-
---
--- Name: wad_in_entries_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_in_entries_default_reserve_pub_idx ON public.wad_in_entries_default USING btree (reserve_pub);
-
-
---
--- Name: wad_out_entries_by_reserve_pub; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_out_entries_by_reserve_pub ON ONLY public.wad_out_entries USING btree (reserve_pub);
-
-
---
--- Name: wad_out_entries_default_reserve_pub_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wad_out_entries_default_reserve_pub_idx ON public.wad_out_entries_default USING btree (reserve_pub);
-
-
---
--- Name: wire_fee_by_end_date_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_fee_by_end_date_index ON public.wire_fee USING btree (end_date);
-
-
---
--- Name: wire_out_by_wire_target_h_payto_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_out_by_wire_target_h_payto_index ON ONLY public.wire_out USING btree (wire_target_h_payto);
-
-
---
--- Name: wire_out_default_wire_target_h_payto_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX wire_out_default_wire_target_h_payto_idx ON public.wire_out_default USING btree (wire_target_h_payto);
-
-
---
--- Name: work_shards_by_job_name_completed_last_attempt_index; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX work_shards_by_job_name_completed_last_attempt_index ON public.work_shards USING btree (job_name, completed, last_attempt);
-
-
---
--- Name: account_merges_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.account_merges_pkey ATTACH PARTITION public.account_merges_default_pkey;
-
-
---
--- Name: account_merges_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.account_merges_by_reserve_pub ATTACH PARTITION public.account_merges_default_reserve_pub_idx;
-
-
---
--- Name: aggregation_tracking_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.aggregation_tracking_pkey ATTACH PARTITION public.aggregation_tracking_default_pkey;
-
-
---
--- Name: aggregation_tracking_default_wtid_raw_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.aggregation_tracking_by_wtid_raw_index ATTACH PARTITION public.aggregation_tracking_default_wtid_raw_idx;
-
-
---
--- Name: close_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.close_requests_pkey ATTACH PARTITION public.close_requests_default_pkey;
-
-
---
--- Name: contracts_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.contracts_pkey ATTACH PARTITION public.contracts_default_pkey;
-
-
---
--- Name: cs_nonce_locks_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.cs_nonce_locks_pkey ATTACH PARTITION public.cs_nonce_locks_default_pkey;
-
-
---
--- Name: deposits_by_ready_default_wire_deadline_shard_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_by_ready_main_index ATTACH PARTITION public.deposits_by_ready_default_wire_deadline_shard_coin_pub_idx;
-
-
---
--- Name: deposits_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_by_coin_pub_index ATTACH PARTITION public.deposits_default_coin_pub_idx;
-
-
---
--- Name: deposits_for_matching_default_refund_deadline_merchant_pub__idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.deposits_for_matching_main_index ATTACH PARTITION public.deposits_for_matching_default_refund_deadline_merchant_pub__idx;
-
-
---
--- Name: extension_details_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.extension_details_pkey ATTACH PARTITION public.extension_details_default_pkey;
-
-
---
--- Name: history_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.history_requests_pkey ATTACH PARTITION public.history_requests_default_pkey;
-
-
---
--- Name: known_coins_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.known_coins_pkey ATTACH PARTITION public.known_coins_default_pkey;
-
-
---
--- Name: prewire_default_failed_finished_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_by_failed_finished_index ATTACH PARTITION public.prewire_default_failed_finished_idx;
-
-
---
--- Name: prewire_default_finished_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_by_finished_index ATTACH PARTITION public.prewire_default_finished_idx;
-
-
---
--- Name: prewire_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.prewire_pkey ATTACH PARTITION public.prewire_default_pkey;
-
-
---
--- Name: purse_deposits_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_deposits_by_coin_pub ATTACH PARTITION public.purse_deposits_default_coin_pub_idx;
-
-
---
--- Name: purse_deposits_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_deposits_pkey ATTACH PARTITION public.purse_deposits_default_pkey;
-
-
---
--- Name: purse_merges_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_merges_pkey ATTACH PARTITION public.purse_merges_default_pkey;
-
-
---
--- Name: purse_merges_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_merges_reserve_pub ATTACH PARTITION public.purse_merges_default_reserve_pub_idx;
-
-
---
--- Name: purse_requests_default_merge_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_requests_merge_pub ATTACH PARTITION public.purse_requests_default_merge_pub_idx;
-
-
---
--- Name: purse_requests_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.purse_requests_pkey ATTACH PARTITION public.purse_requests_default_pkey;
-
-
---
--- Name: recoup_by_reserve_default_reserve_out_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_by_reserve_main_index ATTACH PARTITION public.recoup_by_reserve_default_reserve_out_serial_id_idx;
-
-
---
--- Name: recoup_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_by_coin_pub_index ATTACH PARTITION public.recoup_default_coin_pub_idx;
-
-
---
--- Name: recoup_refresh_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_refresh_by_coin_pub_index ATTACH PARTITION public.recoup_refresh_default_coin_pub_idx;
-
-
---
--- Name: recoup_refresh_default_rrc_serial_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.recoup_refresh_by_rrc_serial_index ATTACH PARTITION public.recoup_refresh_default_rrc_serial_idx;
-
-
---
--- Name: refresh_commitments_default_old_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_commitments_by_old_coin_pub_index ATTACH PARTITION public.refresh_commitments_default_old_coin_pub_idx;
-
-
---
--- Name: refresh_commitments_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_commitments_pkey ATTACH PARTITION public.refresh_commitments_default_pkey;
-
-
---
--- Name: refresh_revealed_coins_default_melt_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_revealed_coins_coins_by_melt_serial_id_index ATTACH PARTITION public.refresh_revealed_coins_default_melt_serial_id_idx;
-
-
---
--- Name: refresh_transfer_keys_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refresh_transfer_keys_pkey ATTACH PARTITION public.refresh_transfer_keys_default_pkey;
-
-
---
--- Name: refunds_default_coin_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.refunds_by_coin_pub_index ATTACH PARTITION public.refunds_default_coin_pub_idx;
-
-
---
--- Name: reserves_close_default_close_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_close_by_close_uuid_index ATTACH PARTITION public.reserves_close_default_close_uuid_idx;
-
-
---
--- Name: reserves_close_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_close_by_reserve_pub_index ATTACH PARTITION public.reserves_close_default_reserve_pub_idx;
-
-
---
--- Name: reserves_default_expiration_date_current_balance_val_curren_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_expiration_index ATTACH PARTITION public.reserves_default_expiration_date_current_balance_val_curren_idx;
-
-
---
--- Name: reserves_default_gc_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_gc_date_index ATTACH PARTITION public.reserves_default_gc_date_idx;
-
-
---
--- Name: reserves_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_pkey ATTACH PARTITION public.reserves_default_pkey;
-
-
---
--- Name: reserves_default_reserve_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_by_reserve_uuid_index ATTACH PARTITION public.reserves_default_reserve_uuid_idx;
-
-
---
--- Name: reserves_in_default_exchange_account_section_execution_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_exch_accnt_section_execution_date_idx ATTACH PARTITION public.reserves_in_default_exchange_account_section_execution_date_idx;
-
-
---
--- Name: reserves_in_default_exchange_account_section_reserve_in_ser_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_exch_accnt_reserve_in_serial_id_idx ATTACH PARTITION public.reserves_in_default_exchange_account_section_reserve_in_ser_idx;
-
-
---
--- Name: reserves_in_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_pkey ATTACH PARTITION public.reserves_in_default_pkey;
-
-
---
--- Name: reserves_in_default_reserve_in_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_in_by_reserve_in_serial_id_index ATTACH PARTITION public.reserves_in_default_reserve_in_serial_id_idx;
-
-
---
--- Name: reserves_out_by_reserve_default_reserve_uuid_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_main_index ATTACH PARTITION public.reserves_out_by_reserve_default_reserve_uuid_idx;
-
-
---
--- Name: reserves_out_default_h_blind_ev_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_h_blind_ev_key ATTACH PARTITION public.reserves_out_default_h_blind_ev_key;
-
-
---
--- Name: reserves_out_default_reserve_out_serial_id_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_out_serial_id_index ATTACH PARTITION public.reserves_out_default_reserve_out_serial_id_idx;
-
-
---
--- Name: reserves_out_default_reserve_uuid_execution_date_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.reserves_out_by_reserve_uuid_and_execution_date_index ATTACH PARTITION public.reserves_out_default_reserve_uuid_execution_date_idx;
-
-
---
--- Name: wad_in_entries_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_in_entries_pkey ATTACH PARTITION public.wad_in_entries_default_pkey;
-
-
---
--- Name: wad_in_entries_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_in_entries_reserve_pub ATTACH PARTITION public.wad_in_entries_default_reserve_pub_idx;
-
-
---
--- Name: wad_out_entries_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_out_entries_pkey ATTACH PARTITION public.wad_out_entries_default_pkey;
-
-
---
--- Name: wad_out_entries_default_reserve_pub_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wad_out_entries_by_reserve_pub ATTACH PARTITION public.wad_out_entries_default_reserve_pub_idx;
-
-
---
--- Name: wads_in_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_in_pkey ATTACH PARTITION public.wads_in_default_pkey;
-
-
---
--- Name: wads_in_default_wad_id_origin_exchange_url_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_in_wad_id_origin_exchange_url_key ATTACH PARTITION public.wads_in_default_wad_id_origin_exchange_url_key;
-
-
---
--- Name: wads_out_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wads_out_pkey ATTACH PARTITION public.wads_out_default_pkey;
-
-
---
--- Name: wire_out_default_wire_target_h_payto_idx; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_out_by_wire_target_h_payto_index ATTACH PARTITION public.wire_out_default_wire_target_h_payto_idx;
-
-
---
--- Name: wire_out_default_wtid_raw_key; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_out_wtid_raw_key ATTACH PARTITION public.wire_out_default_wtid_raw_key;
-
-
---
--- Name: wire_targets_default_pkey; Type: INDEX ATTACH; Schema: public; Owner: -
---
-
-ALTER INDEX public.wire_targets_pkey ATTACH PARTITION public.wire_targets_default_pkey;
-
-
---
--- Name: deposits deposits_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_delete AFTER DELETE ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_delete_trigger();
-
-
---
--- Name: deposits deposits_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_insert AFTER INSERT ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_insert_trigger();
-
-
---
--- Name: deposits deposits_on_update; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER deposits_on_update AFTER UPDATE ON public.deposits FOR EACH ROW EXECUTE FUNCTION public.deposits_update_trigger();
-
-
---
--- Name: recoup recoup_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER recoup_on_delete AFTER DELETE ON public.recoup FOR EACH ROW EXECUTE FUNCTION public.recoup_delete_trigger();
-
-
---
--- Name: recoup recoup_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER recoup_on_insert AFTER INSERT ON public.recoup FOR EACH ROW EXECUTE FUNCTION public.recoup_insert_trigger();
-
-
---
--- Name: reserves_out reserves_out_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER reserves_out_on_delete AFTER DELETE ON public.reserves_out FOR EACH ROW EXECUTE FUNCTION public.reserves_out_by_reserve_delete_trigger();
-
-
---
--- Name: reserves_out reserves_out_on_insert; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER reserves_out_on_insert AFTER INSERT ON public.reserves_out FOR EACH ROW EXECUTE FUNCTION public.reserves_out_by_reserve_insert_trigger();
-
-
---
--- Name: wire_out wire_out_on_delete; Type: TRIGGER; Schema: public; Owner: -
---
-
-CREATE TRIGGER wire_out_on_delete AFTER DELETE ON public.wire_out FOR EACH ROW EXECUTE FUNCTION public.wire_out_delete_trigger();
-
-
---
--- Name: app_bankaccount app_bankaccount_user_id_2722a34f_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_bankaccount
-    ADD CONSTRAINT app_bankaccount_user_id_2722a34f_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_banktransaction app_banktransaction_credit_account_id_a8ba05ac_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_credit_account_id_a8ba05ac_fk_app_banka FOREIGN KEY (credit_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_banktransaction app_banktransaction_debit_account_id_5b1f7528_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_banktransaction
-    ADD CONSTRAINT app_banktransaction_debit_account_id_5b1f7528_fk_app_banka FOREIGN KEY (debit_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawope_selected_exchange_ac_6c8b96cf_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawope_selected_exchange_ac_6c8b96cf_fk_app_banka FOREIGN KEY (selected_exchange_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: app_talerwithdrawoperation app_talerwithdrawope_withdraw_account_id_992dc5b3_fk_app_banka; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.app_talerwithdrawoperation
-    ADD CONSTRAINT app_talerwithdrawope_withdraw_account_id_992dc5b3_fk_app_banka FOREIGN KEY (withdraw_account_id) REFERENCES public.app_bankaccount(account_no) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_auditor_uuid_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_auditor_uuid_fkey FOREIGN KEY (auditor_uuid) REFERENCES public.auditors(auditor_uuid) ON DELETE CASCADE;
-
-
---
--- Name: auditor_denom_sigs auditor_denom_sigs_denominations_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_denom_sigs
-    ADD CONSTRAINT auditor_denom_sigs_denominations_serial_fkey FOREIGN KEY (denominations_serial) REFERENCES public.denominations(denominations_serial) ON DELETE CASCADE;
-
-
---
--- Name: auth_group_permissions auth_group_permissio_permission_id_84c5c92e_fk_auth_perm; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissio_permission_id_84c5c92e_fk_auth_perm FOREIGN KEY (permission_id) REFERENCES public.auth_permission(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_group_permissions auth_group_permissions_group_id_b120cbf9_fk_auth_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_group_permissions
-    ADD CONSTRAINT auth_group_permissions_group_id_b120cbf9_fk_auth_group_id FOREIGN KEY (group_id) REFERENCES public.auth_group(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_permission auth_permission_content_type_id_2f476e4b_fk_django_co; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_permission
-    ADD CONSTRAINT auth_permission_content_type_id_2f476e4b_fk_django_co FOREIGN KEY (content_type_id) REFERENCES public.django_content_type(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_groups auth_user_groups_group_id_97559544_fk_auth_group_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_group_id_97559544_fk_auth_group_id FOREIGN KEY (group_id) REFERENCES public.auth_group(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_groups auth_user_groups_user_id_6a12ed8b_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_groups
-    ADD CONSTRAINT auth_user_groups_user_id_6a12ed8b_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permi_permission_id_1fbb5f2c_fk_auth_perm; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permi_permission_id_1fbb5f2c_fk_auth_perm FOREIGN KEY (permission_id) REFERENCES public.auth_permission(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: auth_user_user_permissions auth_user_user_permissions_user_id_a95ead1b_fk_auth_user_id; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auth_user_user_permissions
-    ADD CONSTRAINT auth_user_user_permissions_user_id_a95ead1b_fk_auth_user_id FOREIGN KEY (user_id) REFERENCES public.auth_user(id) DEFERRABLE INITIALLY DEFERRED;
-
-
---
--- Name: denomination_revocations denomination_revocations_denominations_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.denomination_revocations
-    ADD CONSTRAINT denomination_revocations_denominations_serial_fkey FOREIGN KEY (denominations_serial) REFERENCES public.denominations(denominations_serial) ON DELETE CASCADE;
-
-
---
--- Name: auditor_exchange_signkeys master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_exchange_signkeys
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_reserve master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_reserve
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_aggregation master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_aggregation
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_deposit_confirmation master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_deposit_confirmation
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_progress_coin master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_progress_coin
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: wire_auditor_account_progress master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_account_progress
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: wire_auditor_progress master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.wire_auditor_progress
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_reserves master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserves
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_reserve_balance master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_reserve_balance
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_wire_fee_balance master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_wire_fee_balance
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_balance_summary master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_balance_summary
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_historic_denomination_revenue master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_denomination_revenue
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_historic_reserve_summary master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_historic_reserve_summary
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: deposit_confirmations master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.deposit_confirmations
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: auditor_predicted_result master_pub_ref; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.auditor_predicted_result
-    ADD CONSTRAINT master_pub_ref FOREIGN KEY (master_pub) REFERENCES public.auditor_exchanges(master_pub) ON DELETE CASCADE;
-
-
---
--- Name: merchant_accounts merchant_accounts_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_accounts
-    ADD CONSTRAINT merchant_accounts_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_contract_terms merchant_contract_terms_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_contract_terms
-    ADD CONSTRAINT merchant_contract_terms_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial);
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_deposit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_deposit_serial_fkey FOREIGN KEY (deposit_serial) REFERENCES public.merchant_deposits(deposit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposit_to_transfer merchant_deposit_to_transfer_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposit_to_transfer
-    ADD CONSTRAINT merchant_deposit_to_transfer_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_contract_terms(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_deposits merchant_deposits_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_deposits
-    ADD CONSTRAINT merchant_deposits_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_inventory_locks merchant_inventory_locks_product_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory_locks
-    ADD CONSTRAINT merchant_inventory_locks_product_serial_fkey FOREIGN KEY (product_serial) REFERENCES public.merchant_inventory(product_serial);
-
-
---
--- Name: merchant_inventory merchant_inventory_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_inventory
-    ADD CONSTRAINT merchant_inventory_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_keys merchant_keys_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_keys
-    ADD CONSTRAINT merchant_keys_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_kyc merchant_kyc_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_kyc
-    ADD CONSTRAINT merchant_kyc_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_order_locks merchant_order_locks_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_order_locks
-    ADD CONSTRAINT merchant_order_locks_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_orders(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_order_locks merchant_order_locks_product_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_order_locks
-    ADD CONSTRAINT merchant_order_locks_product_serial_fkey FOREIGN KEY (product_serial) REFERENCES public.merchant_inventory(product_serial);
-
-
---
--- Name: merchant_orders merchant_orders_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_orders
-    ADD CONSTRAINT merchant_orders_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_refund_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_refund_serial_fkey FOREIGN KEY (refund_serial) REFERENCES public.merchant_refunds(refund_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refund_proofs merchant_refund_proofs_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refund_proofs
-    ADD CONSTRAINT merchant_refund_proofs_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_refunds merchant_refunds_order_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_refunds
-    ADD CONSTRAINT merchant_refunds_order_serial_fkey FOREIGN KEY (order_serial) REFERENCES public.merchant_contract_terms(order_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_pickup_signatures merchant_tip_pickup_signatures_pickup_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickup_signatures
-    ADD CONSTRAINT merchant_tip_pickup_signatures_pickup_serial_fkey FOREIGN KEY (pickup_serial) REFERENCES public.merchant_tip_pickups(pickup_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_pickups merchant_tip_pickups_tip_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_pickups
-    ADD CONSTRAINT merchant_tip_pickups_tip_serial_fkey FOREIGN KEY (tip_serial) REFERENCES public.merchant_tips(tip_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_reserve_keys merchant_tip_reserve_keys_reserve_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserve_keys
-    ADD CONSTRAINT merchant_tip_reserve_keys_reserve_serial_fkey FOREIGN KEY (reserve_serial) REFERENCES public.merchant_tip_reserves(reserve_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tip_reserves merchant_tip_reserves_merchant_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tip_reserves
-    ADD CONSTRAINT merchant_tip_reserves_merchant_serial_fkey FOREIGN KEY (merchant_serial) REFERENCES public.merchant_instances(merchant_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_tips merchant_tips_reserve_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_tips
-    ADD CONSTRAINT merchant_tips_reserve_serial_fkey FOREIGN KEY (reserve_serial) REFERENCES public.merchant_tip_reserves(reserve_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_signatures merchant_transfer_signatures_signkey_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_signatures
-    ADD CONSTRAINT merchant_transfer_signatures_signkey_serial_fkey FOREIGN KEY (signkey_serial) REFERENCES public.merchant_exchange_signing_keys(signkey_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_credit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_credit_serial_fkey FOREIGN KEY (credit_serial) REFERENCES public.merchant_transfers(credit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfer_to_coin merchant_transfer_to_coin_deposit_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfer_to_coin
-    ADD CONSTRAINT merchant_transfer_to_coin_deposit_serial_fkey FOREIGN KEY (deposit_serial) REFERENCES public.merchant_deposits(deposit_serial) ON DELETE CASCADE;
-
-
---
--- Name: merchant_transfers merchant_transfers_account_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.merchant_transfers
-    ADD CONSTRAINT merchant_transfers_account_serial_fkey FOREIGN KEY (account_serial) REFERENCES public.merchant_accounts(account_serial) ON DELETE CASCADE;
-
-
---
--- Name: partner_accounts partner_accounts_partner_serial_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.partner_accounts
-    ADD CONSTRAINT partner_accounts_partner_serial_id_fkey FOREIGN KEY (partner_serial_id) REFERENCES public.partners(partner_serial_id) ON DELETE CASCADE;
-
-
---
--- Name: signkey_revocations signkey_revocations_esk_serial_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.signkey_revocations
-    ADD CONSTRAINT signkey_revocations_esk_serial_fkey FOREIGN KEY (esk_serial) REFERENCES public.exchange_sign_keys(esk_serial) ON DELETE CASCADE;
-
-
---
--- PostgreSQL database dump complete
---
-
diff --git a/src/auditor/setup.sh b/src/auditor/setup.sh
new file mode 100755
index 000000000..bb17e92ae
--- /dev/null
+++ b/src/auditor/setup.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+# This file is in the public domain
+
+# Script to be inlined into the main test scripts. Defines function 'setup()'
+# which wraps around 'taler-unified-setup.sh' to launch GNU Taler services.
+# Call setup() with the arguments to pass to 'taler-unified-setup'. setup()
+# will then launch GNU Taler, wait for the process to be complete before
+# returning. The script will also install an exit handler to ensure the GNU
+# Taler processes are stopped when the shell exits.
+
+set -eu
+
+# Cleanup to run whenever we exit
+function exit_cleanup()
+{
+    if [ ! -z ${SETUP_PID+x} ]
+    then
+        echo "Killing taler-unified-setup ($SETUP_PID)" >&2
+        kill -TERM "$SETUP_PID" 2> /dev/null || true
+        wait "$SETUP_PID" 2> /dev/null || true
+    fi
+}
+
+# Install cleanup handler (except for kill -9)
+trap exit_cleanup EXIT
+
+function setup()
+{
+    echo "Starting test system ..." >&2
+    # Create a named pipe in a temp directory we own.
+    FIFO_DIR=$(mktemp -d fifo-XXXXXX)
+    FIFO_OUT=$(echo "$FIFO_DIR/out")
+    mkfifo "$FIFO_OUT"
+    # Open pipe as FD 3 (RW) and FD 4 (RO)
+    exec 3<> "$FIFO_OUT" 4< "$FIFO_OUT"
+    rm -rf "$FIFO_DIR"
+    # We require '-W' for our termination logic to work.
+    taler-unified-setup.sh -W "$@" \
+        > >(tee taler-unified-setup.log >&3) &
+    SETUP_PID=$!
+    # Close FD3
+    exec 3>&-
+    sed -u '/<<READY>>/ q' <&4
+    # Close FD4
+    exec 4>&-
+    echo "Test system ready" >&2
+}
+
+# Exit, with status code "skip" (no 'real' failure)
+function exit_fail() {
+    echo "$@" >&2
+    exit 1
+}
+
+# Exit, with status code "skip" (no 'real' failure)
+function exit_skip() {
+    echo "SKIPPING: $1"
+    exit 77
+}
+
+function get_payto_uri() {
+    export LIBEUFIN_SANDBOX_USERNAME="$1"
+    export LIBEUFIN_SANDBOX_PASSWORD="$2"
+    export LIBEUFIN_SANDBOX_URL="http://localhost:18082"
+    echo "get_payto_uri currently not implemented"
+    exit 1
+#    libeufin-cli sandbox demobank info --bank-account "$1" | jq --raw-output '.paytoUri'
+}
+
+# Stop libeufin-bank (if running)
+function stop_libeufin()
+{
+    echo -n "Stopping libeufin... "
+    if [ -f "${MY_TMP_DIR:-/}/libeufin-bank.pid" ]
+    then
+        PID=$(cat "${MY_TMP_DIR}/libeufin-bank.pid" 2> /dev/null)
+        echo "Killing libeufin-bank $PID"
+        rm "${MY_TMP_DIR}/libeufin-bank.pid"
+        kill "$PID" 2> /dev/null || true
+        wait "$PID" || true
+    fi
+    echo "DONE"
+}
+
+
+function launch_libeufin () {
+  libeufin-bank serve \
+    -c "$CONF" \
+    -L "INFO" \
+    > "${MY_TMP_DIR}/libeufin-bank-stdout.log" \
+    2> "${MY_TMP_DIR}/libeufin-bank-stderr.log" &
+  echo $! > "${MY_TMP_DIR}/libeufin-bank.pid"
+}
diff --git a/src/auditor/taler-auditor-dbinit.c b/src/auditor/taler-auditor-dbinit.c
index 54f8152a5..4cb46f470 100644
--- a/src/auditor/taler-auditor-dbinit.c
+++ b/src/auditor/taler-auditor-dbinit.c
@@ -90,7 +90,9 @@ run (void *cls,
                   "Failed to restart audits\n");
   }
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls))
+      plugin->create_tables (plugin->cls,
+                             false,
+                             0))
   {
     fprintf (stderr,
              "Failed to initialize database.\n");
diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c
deleted file mode 100644
index 04181ce3f..000000000
--- a/src/auditor/taler-auditor-exchange.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2021 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/>
-*/
-/**
- * @file taler-auditor-exchange.c
- * @brief Tool used by the auditor to add or remove the exchange's master key
- *        to its database.
- * @author Christian Grothoff
- */
-#include <platform.h>
-#include "taler_exchangedb_lib.h"
-#include "taler_auditordb_lib.h"
-
-
-/**
- * URL of the exchange.
- */
-static char *exchange_url;
-
-/**
- * Master public key of the exchange.
- */
-static struct TALER_MasterPublicKeyP master_public_key;
-
-/**
- * Our configuration.
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
- * Handle to access the auditor's database.
- */
-static struct TALER_AUDITORDB_Plugin *adb;
-
-/**
- * -r option given.
- */
-static int remove_flag;
-
-
-/**
- * The main function of the taler-auditor-exchange tool.  This tool is used
- * to add (or remove) an exchange's master key and base URL to the auditor's
- * database.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, non-zero on error
- */
-int
-main (int argc,
-      char *const *argv)
-{
-  char *cfgfile = NULL;
-  const struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_cfgfile (&cfgfile),
-    GNUNET_GETOPT_option_help (
-      "Add or remove exchange to list of audited exchanges"),
-    GNUNET_GETOPT_option_mandatory
-      (GNUNET_GETOPT_option_base32_auto ('m',
-                                         "exchange-key",
-                                         "KEY",
-                                         "public key of the exchange (Crockford base32 encoded)",
-                                         &master_public_key)),
-    GNUNET_GETOPT_option_string ('u',
-                                 "exchange-url",
-                                 "URL",
-                                 "base URL of the exchange",
-                                 &exchange_url),
-    GNUNET_GETOPT_option_flag ('r',
-                               "remove",
-                               "remove the exchange's key (default is to add)",
-                               &remove_flag),
-    GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  TALER_gcrypt_init (); /* must trigger initialization manually at this point! */
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_log_setup ("taler-auditor-exchange",
-                                   "WARNING",
-                                   NULL));
-  {
-    int ret;
-
-    ret = GNUNET_GETOPT_run ("taler-auditor-exchange",
-                             options,
-                             argc, argv);
-    if (GNUNET_NO == ret)
-      return EXIT_SUCCESS;
-    if (GNUNET_SYSERR == ret)
-      return EXIT_INVALIDARGUMENT;
-  }
-  if (NULL == cfgfile)
-    cfgfile = GNUNET_CONFIGURATION_default_filename ();
-  if (NULL == cfgfile)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Can't find default configuration file.\n");
-    return EXIT_NOTCONFIGURED;
-  }
-  cfg = GNUNET_CONFIGURATION_create ();
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Loading config file: %s\n",
-              cfgfile);
-
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_load (cfg,
-                                 cfgfile))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Malformed configuration file `%s', exit ...\n",
-                cfgfile);
-    GNUNET_free (cfgfile);
-    return EXIT_NOTCONFIGURED;
-  }
-  GNUNET_free (cfgfile);
-
-  if (! remove_flag)
-  {
-    if (NULL == exchange_url)
-    {
-      fprintf (stderr,
-               _ ("Missing either `%s' or `%s'.\n"),
-               "-u URL",
-               "--remove");
-      return EXIT_INVALIDARGUMENT;
-    }
-    if ( (0 == strlen (exchange_url)) ||
-         ( (0 != strncasecmp ("http://",
-                              exchange_url,
-                              strlen ("http://"))) &&
-           (0 != strncasecmp ("https://",
-                              exchange_url,
-                              strlen ("https://"))) ) ||
-         ('/' != exchange_url[strlen (exchange_url) - 1]) )
-    {
-      fprintf (stderr,
-               "Exchange URL must begin with `http://` or `https://` and end with `/'\n");
-      return EXIT_INVALIDARGUMENT;
-    }
-  }
-
-
-  if (NULL ==
-      (adb = TALER_AUDITORDB_plugin_load (cfg)))
-  {
-    fprintf (stderr,
-             "Failed to initialize auditor database plugin.\n");
-    return EXIT_NOTINSTALLED;
-  }
-
-  /* Create required tables */
-  if (GNUNET_OK !=
-      adb->create_tables (adb->cls))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to create tables in auditor's database\n");
-    TALER_AUDITORDB_plugin_unload (adb);
-    return EXIT_NOPERMISSION;
-  }
-
-  /* Update DB */
-  {
-    enum GNUNET_DB_QueryStatus qs;
-
-    if (GNUNET_SYSERR ==
-        adb->preflight (adb->cls))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to initialize database connection\n");
-      TALER_AUDITORDB_plugin_unload (adb);
-      return EXIT_FAILURE;
-    }
-
-    if (remove_flag)
-    {
-      qs = adb->delete_exchange (adb->cls,
-                                 &master_public_key);
-    }
-    else
-    {
-      qs = adb->insert_exchange (adb->cls,
-                                 &master_public_key,
-                                 exchange_url);
-    }
-    if (0 > qs)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to update auditor database (status code: %d)\n",
-                  qs);
-      TALER_AUDITORDB_plugin_unload (adb);
-      return EXIT_FAILURE;
-    }
-    if (0 == qs)
-    {
-      GNUNET_log (
-        GNUNET_ERROR_TYPE_WARNING,
-        (remove_flag)
-        ? "Could not remove exchange from database: entry already absent\n"
-        : "Could not add exchange to database: entry already exists\n");
-      TALER_AUDITORDB_plugin_unload (adb);
-      return EXIT_FAILURE;
-    }
-  }
-  TALER_AUDITORDB_plugin_unload (adb);
-  return EXIT_SUCCESS;
-}
-
-
-/* end of taler-auditor-exchange.c */
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c
index a212eddca..59bd849bc 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -31,7 +31,7 @@
 #include "taler_auditordb_lib.h"
 #include "taler_exchangedb_lib.h"
 #include "taler-auditor-httpd_deposit-confirmation.h"
-#include "taler-auditor-httpd_exchanges.h"
+#include "taler-auditor-httpd_deposit-confirmation-get.h"
 #include "taler-auditor-httpd_mhd.h"
 #include "taler-auditor-httpd.h"
 
@@ -48,7 +48,8 @@
  * release version, and the format is NOT the same that semantic
  * versioning uses either.
  */
-#define AUDITOR_PROTOCOL_VERSION "0:0:0"
+#define AUDITOR_PROTOCOL_VERSION "1:0:1"
+
 
 /**
  * Backlog for listen operation on unix domain sockets.
@@ -81,6 +82,12 @@ struct TALER_EXCHANGEDB_Plugin *TAH_eplugin;
 static struct TALER_AuditorPublicKeyP auditor_pub;
 
 /**
+ * Exchange master public key (according to the
+ * configuration).  (global)
+ */
+struct TALER_MasterPublicKeyP TAH_master_public_key;
+
+/**
  * Default timeout in seconds for HTTP requests.
  */
 static unsigned int connection_timeout = 30;
@@ -132,7 +139,7 @@ handle_mhd_completion_callback (void *cls,
 
 
 /**
- * Handle a "/version" request.
+ * Handle a "/config" request.
  *
  * @param rh context of the handler
  * @param connection the MHD connection to handle
@@ -142,11 +149,11 @@ handle_mhd_completion_callback (void *cls,
  * @return MHD result code
   */
 static MHD_RESULT
-handle_version (struct TAH_RequestHandler *rh,
-                struct MHD_Connection *connection,
-                void **connection_cls,
-                const char *upload_data,
-                size_t *upload_data_size)
+handle_config (struct TAH_RequestHandler *rh,
+               struct MHD_Connection *connection,
+               void **connection_cls,
+               const char *upload_data,
+               size_t *upload_data_size)
 {
   static json_t *ver; /* we build the response only once, keep around for next query! */
 
@@ -157,12 +164,18 @@ handle_version (struct TAH_RequestHandler *rh,
   if (NULL == ver)
   {
     ver = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("name",
+                               "taler-auditor"),
       GNUNET_JSON_pack_string ("version",
                                AUDITOR_PROTOCOL_VERSION),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:taler-auditor:c-reference"),
       GNUNET_JSON_pack_string ("currency",
                                TAH_currency),
       GNUNET_JSON_pack_data_auto ("auditor_public_key",
-                                  &auditor_pub));
+                                  &auditor_pub),
+      GNUNET_JSON_pack_data_auto ("exchange_master_public_key",
+                                  &TAH_master_public_key));
   }
   if (NULL == ver)
   {
@@ -204,12 +217,15 @@ handle_mhd_request (void *cls,
     { "/deposit-confirmation", MHD_HTTP_METHOD_PUT, "application/json",
       NULL, 0,
       &TAH_DEPOSIT_CONFIRMATION_handler, MHD_HTTP_OK },
-    { "/exchanges", MHD_HTTP_METHOD_GET, "application/json",
+    { "/deposit-confirmation", MHD_HTTP_METHOD_GET, "application/json",
       NULL, 0,
-      &TAH_EXCHANGES_handler, MHD_HTTP_OK },
-    { "/version", MHD_HTTP_METHOD_GET, "application/json",
+      &TAH_DEPOSIT_CONFIRMATION_handler_get, MHD_HTTP_OK },
+//    { "/deposit-confirmation", MHD_HTTP_METHOD_DELETE, "application/json",
+//      NULL, 0,
+//      &TAH_DEPOSIT_CONFIRMATION_delete, MHD_HTTP_OK },
+    { "/config", MHD_HTTP_METHOD_GET, "application/json",
       NULL, 0,
-      &handle_version, MHD_HTTP_OK },
+      &handle_config, MHD_HTTP_OK },
     /* Landing page, for now tells humans to go away
      * (NOTE: ideally, the reverse proxy will respond with a nicer page) */
     { "/", MHD_HTTP_METHOD_GET, "text/plain",
@@ -298,6 +314,40 @@ auditor_serve_process_config (void)
   {
     return GNUNET_SYSERR;
   }
+
+  {
+    char *master_public_key_str;
+
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_string (cfg,
+                                               "exchange",
+                                               "MASTER_PUBLIC_KEY",
+                                               &master_public_key_str))
+    {
+      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "MASTER_PUBLIC_KEY");
+      return GNUNET_SYSERR;
+    }
+    if (GNUNET_OK !=
+        GNUNET_CRYPTO_eddsa_public_key_from_string (
+          master_public_key_str,
+          strlen (master_public_key_str),
+          &TAH_master_public_key.eddsa_pub))
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "MASTER_PUBLIC_KEY",
+                                 "invalid base32 encoding for a master public key");
+      GNUNET_free (master_public_key_str);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Launching auditor for exchange `%s'...\n",
+                master_public_key_str);
+    GNUNET_free (master_public_key_str);
+  }
+
   {
     char *pub;
 
diff --git a/src/auditor/taler-auditor-httpd.h b/src/auditor/taler-auditor-httpd.h
index 79e56ff55..853722f09 100644
--- a/src/auditor/taler-auditor-httpd.h
+++ b/src/auditor/taler-auditor-httpd.h
@@ -39,6 +39,12 @@ extern struct TALER_AUDITORDB_Plugin *TAH_plugin;
 extern struct TALER_EXCHANGEDB_Plugin *TAH_eplugin;
 
 /**
+ * Exchange master public key (according to the
+ * configuration).  (global)
+ */
+extern struct TALER_MasterPublicKeyP TAH_master_public_key;
+
+/**
  * Our currency.
  */
 extern char *TAH_currency;
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation-get.c b/src/auditor/taler-auditor-httpd_deposit-confirmation-get.c
new file mode 100644
index 000000000..265d625c4
--- /dev/null
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation-get.c
@@ -0,0 +1,166 @@
+/*

+  This file is part of TALER

+  Copyright (C) 2014-2024 Taler Systems SA

+

+  TALER 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, 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 Affero General Public License for more details.

+

+  You should have received a copy of the GNU Affero General Public License along with

+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>

+*/

+

+/**

+ * @file taler-auditor-httpd_deposit-confirmation-get.c

+ * @brief Handle /deposit-confirmation requests; return list of deposit confirmations from merchant

+ * that were not received from the exchange, by auditor.

+ * @author Nic Eigel

+ */

+

+#include "platform.h"

+#include <gnunet/gnunet_util_lib.h>

+#include <gnunet/gnunet_json_lib.h>

+#include <jansson.h>

+#include <microhttpd.h>

+#include <pthread.h>

+#include "taler_json_lib.h"

+#include "taler_mhd_lib.h"

+#include "taler-auditor-httpd.h"

+#include "taler-auditor-httpd_deposit-confirmation-get.h"

+

+GNUNET_NETWORK_STRUCT_BEGIN

+

+/**

+ * @brief Information about a signing key of the exchange.  Signing keys are used

+ * to sign exchange messages other than coins, i.e. to confirm that a

+ * deposit was successful or that a refresh was accepted.

+ */

+struct ExchangeSigningKeyDataP

+{

+

+  /**

+   * When does this signing key begin to be valid?

+   */

+  struct GNUNET_TIME_TimestampNBO start;

+

+  /**

+   * When does this signing key expire? Note: This is currently when

+   * the Exchange will definitively stop using it.  Signatures made with

+   * the key remain valid until @e end.  When checking validity periods,

+   * clients should allow for some overlap between keys and tolerate

+   * the use of either key during the overlap time (due to the

+   * possibility of clock skew).

+   */

+  struct GNUNET_TIME_TimestampNBO expire;

+

+  /**

+   * When do signatures with this signing key become invalid?  After

+   * this point, these signatures cannot be used in (legal) disputes

+   * anymore, as the Exchange is then allowed to destroy its side of the

+   * evidence.  @e end is expected to be significantly larger than @e

+   * expire (by a year or more).

+   */

+  struct GNUNET_TIME_TimestampNBO end;

+

+  /**

+   * The public online signing key that the exchange will use

+   * between @e start and @e expire.

+   */

+  struct TALER_ExchangePublicKeyP signkey_pub;

+};

+

+GNUNET_NETWORK_STRUCT_END

+

+

+/**

+ * Add deposit confirmation to the list.

+ *

+ * @param[in,out] cls a `json_t *` array to extend

+ * @param serial_id location of the @a dc in the database

+ * @param dc struct of deposit confirmation

+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop iterating

+ */

+static enum GNUNET_GenericReturnValue

+add_deposit_confirmation (void *cls,

+                          uint64_t serial_id,

+                          const struct TALER_AUDITORDB_DepositConfirmation *dc)

+{

+  json_t *list = cls;

+  json_t *obj;

+

+  obj = GNUNET_JSON_PACK (

+    GNUNET_JSON_pack_data_auto ("dc",

+                                dc));

+  GNUNET_break (0 ==

+                json_array_append_new (list,

+                                       obj));

+  return GNUNET_OK;

+}

+

+

+/**

+ *

+ * @param rh context of the handler

+ * @param connection the MHD connection to handle

+ * @param[in,out] connection_cls the connection's closure (can be updated)

+ * @param upload_data upload data

+ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data

+ * @return MHD result code

+ */

+MHD_RESULT

+TAH_DEPOSIT_CONFIRMATION_handler_get (struct TAH_RequestHandler *rh,

+                                      struct MHD_Connection *connection,

+                                      void **connection_cls,

+                                      const char *upload_data,

+                                      size_t *upload_data_size)

+{

+  json_t *ja;

+  enum GNUNET_DB_QueryStatus qs;

+

+  (void) rh;

+  (void) connection_cls;

+  (void) upload_data;

+  (void) upload_data_size;

+  if (GNUNET_SYSERR ==

+      TAH_plugin->preflight (TAH_plugin->cls))

+  {

+    GNUNET_break (0);

+    return TALER_MHD_reply_with_error (connection,

+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,

+                                       TALER_EC_GENERIC_DB_SETUP_FAILED,

+                                       NULL);

+  }

+  ja = json_array ();

+  GNUNET_break (NULL != ja);

+  // TODO correct below

+  qs = TAH_plugin->get_deposit_confirmations (

+    TAH_plugin->cls,

+    0, /* FIXME: get from query parameters! */

+    false, /* FIXME: get from query parameters! */

+    &add_deposit_confirmation,

+    ja);

+

+  if (0 > qs)

+  {

+    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);

+    json_decref (ja);

+    TALER_LOG_WARNING (

+      "Failed to handle GET /deposit-confirmation in database\n");

+    return TALER_MHD_reply_with_error (connection,

+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,

+                                       TALER_EC_GENERIC_DB_FETCH_FAILED,

+                                       "deposit-confirmation");

+  }

+  return TALER_MHD_REPLY_JSON_PACK (

+    connection,

+    MHD_HTTP_OK,

+    GNUNET_JSON_pack_array_steal ("deposit-confirmation",

+                                  ja));

+}

+

+

+/* end of taler-auditor-httpd_deposit-confirmation-get.c */

diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation-get.h b/src/auditor/taler-auditor-httpd_deposit-confirmation-get.h
new file mode 100644
index 000000000..f1f522787
--- /dev/null
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation-get.h
@@ -0,0 +1,70 @@
+/*

+  This file is part of TALER

+  Copyright (C) 2024 Taler Systems SA

+

+  TALER 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, 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 Affero General Public License for more details.

+

+  You should have received a copy of the GNU Affero General Public License along with

+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>

+*/

+/**

+ * @file taler-auditor-httpd_deposit-confirmation-get.h

+ * @brief Handle GET /deposit-confirmation requests

+ * @author Nic Eigel

+ */

+#ifndef TALER_AUDITOR_HTTPD_DEPOSIT_CONFIRMATION_GET_H

+#define TALER_AUDITOR_HTTPD_DEPOSIT_CONFIRMATION_GET_H

+

+#include <gnunet/gnunet_util_lib.h>

+#include <microhttpd.h>

+#include "taler-auditor-httpd.h"

+

+/**

+ * Initialize subsystem.

+ */

+void

+TEAH_DEPOSIT_CONFIRMATION_GET_init (void);

+

+/**

+ * Shut down subsystem.

+ */

+void

+TEAH_DEPOSIT_CONFIRMATION_GET_done (void);

+

+/**

+ * Handle a "/deposit-confirmation" request.

+ *

+ * @param rh context of the handler

+ * @param connection the MHD connection to handle

+ * @param[in,out] connection_cls the connection's closure (can be updated)

+ * @param upload_data upload data

+ * @param[in,out] upload_data_size number of bytes (left) in @a upload_data

+ * @return MHD result code

+  */

+MHD_RESULT

+TAH_DEPOSIT_CONFIRMATION_handler_get (struct TAH_RequestHandler *rh,

+                                      struct MHD_Connection *connection,

+                                      void **connection_cls,

+                                      const char *upload_data,

+                                      size_t *upload_data_size);

+

+/**

+ * Handle a DELETE "/deposit-confirmation/$dc" request.

+ *

+ * @param rc request details about the request to handle

+ * @param args argument with the dc primary key

+ * @return MHD result code

+ */

+/*MHD_RESULT

+TAH_DEPOSIT_CONFIRMATION_delete (

+        struct TEH_RequestContext *rc,

+        const char *const args[1]);*/

+

+

+#endif

diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
index f4d89b7ca..8b449bf47 100644
--- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -31,7 +31,6 @@
 #include "taler-auditor-httpd.h"
 #include "taler-auditor-httpd_deposit-confirmation.h"
 
-
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
@@ -115,9 +114,14 @@ verify_and_execute_deposit_confirmation (
     .end = GNUNET_TIME_timestamp_hton (es->ep_end),
     .signkey_pub = es->exchange_pub
   };
+  const struct TALER_CoinSpendSignatureP *coin_sigps[
+    GNUNET_NZL (dc->num_coins)];
+
+  for (unsigned int i = 0; i < dc->num_coins; i++)
+    coin_sigps[i] = &dc->coin_sigs[i];
 
   if (GNUNET_TIME_absolute_is_future (es->ep_start.abs_time) ||
-      GNUNET_TIME_absolute_is_past (es->ep_expire.abs_time) )
+      GNUNET_TIME_absolute_is_past (es->ep_expire.abs_time))
   {
     /* Signing key expired */
     TALER_LOG_WARNING ("Expired exchange signing key\n");
@@ -129,7 +133,7 @@ verify_and_execute_deposit_confirmation (
 
   /* check our cache */
   GNUNET_CRYPTO_hash (&skv,
-                      sizeof (skv),
+                      sizeof(skv),
                       &h);
   GNUNET_assert (0 == pthread_mutex_lock (&lock));
   cached = GNUNET_CONTAINER_multihashmap_get (cache,
@@ -153,7 +157,7 @@ verify_and_execute_deposit_confirmation (
           es->ep_start,
           es->ep_expire,
           es->ep_end,
-          &es->master_public_key,
+          &TAH_master_public_key,
           &es->master_sig))
     {
       TALER_LOG_WARNING ("Invalid signature on exchange signing key\n");
@@ -227,12 +231,13 @@ verify_and_execute_deposit_confirmation (
       TALER_exchange_online_deposit_confirmation_verify (
         &dc->h_contract_terms,
         &dc->h_wire,
-        NULL /* h_extensions! */,
+        &dc->h_policy,
         dc->exchange_timestamp,
         dc->wire_deadline,
         dc->refund_deadline,
-        &dc->amount_without_fee,
-        &dc->coin_pub,
+        &dc->total_without_fee,
+        dc->num_coins,
+        coin_sigps,
         &dc->merchant,
         &dc->exchange_pub,
         &dc->exchange_sig))
@@ -265,40 +270,47 @@ verify_and_execute_deposit_confirmation (
 
 
 MHD_RESULT
-TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh,
-                                  struct MHD_Connection *connection,
-                                  void **connection_cls,
-                                  const char *upload_data,
-                                  size_t *upload_data_size)
+TAH_DEPOSIT_CONFIRMATION_handler (
+  struct TAH_RequestHandler *rh,
+  struct MHD_Connection *connection,
+  void **connection_cls,
+  const char *upload_data,
+  size_t *upload_data_size)
 {
-  struct TALER_AUDITORDB_DepositConfirmation dc;
+  struct TALER_AUDITORDB_DepositConfirmation dc = {
+    .refund_deadline = GNUNET_TIME_UNIT_ZERO_TS
+  };
   struct TALER_AUDITORDB_ExchangeSigningKey es;
+  const json_t *jcoin_sigs;
+  const json_t *jcoin_pubs;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
                                  &dc.h_contract_terms),
-    GNUNET_JSON_spec_fixed_auto ("h_extensions",
-                                 &dc.h_extensions),
+    GNUNET_JSON_spec_fixed_auto ("h_policy",
+                                 &dc.h_policy),
     GNUNET_JSON_spec_fixed_auto ("h_wire",
                                  &dc.h_wire),
     GNUNET_JSON_spec_timestamp ("exchange_timestamp",
                                 &dc.exchange_timestamp),
-    GNUNET_JSON_spec_timestamp ("refund_deadline",
-                                &dc.refund_deadline),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_timestamp ("refund_deadline",
+                                  &dc.refund_deadline),
+      NULL),
     GNUNET_JSON_spec_timestamp ("wire_deadline",
                                 &dc.wire_deadline),
-    TALER_JSON_spec_amount ("amount_without_fee",
+    TALER_JSON_spec_amount ("total_without_fee",
                             TAH_currency,
-                            &dc.amount_without_fee),
-    GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                 &dc.coin_pub),
+                            &dc.total_without_fee),
+    GNUNET_JSON_spec_array_const ("coin_pubs",
+                                  &jcoin_pubs),
+    GNUNET_JSON_spec_array_const ("coin_sigs",
+                                  &jcoin_sigs),
     GNUNET_JSON_spec_fixed_auto ("merchant_pub",
                                  &dc.merchant),
     GNUNET_JSON_spec_fixed_auto ("exchange_sig",
                                  &dc.exchange_sig),
     GNUNET_JSON_spec_fixed_auto ("exchange_pub",
                                  &dc.exchange_pub),
-    GNUNET_JSON_spec_fixed_auto ("master_pub",
-                                 &es.master_public_key),
     GNUNET_JSON_spec_timestamp ("ep_start",
                                 &es.ep_start),
     GNUNET_JSON_spec_timestamp ("ep_expire",
@@ -309,13 +321,14 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh,
                                  &es.master_sig),
     GNUNET_JSON_spec_end ()
   };
+  unsigned int num_coins;
+  json_t *json;
 
   (void) rh;
   (void) connection_cls;
   (void) upload_data;
   (void) upload_data_size;
   {
-    json_t *json;
     enum GNUNET_GenericReturnValue res;
 
     res = TALER_MHD_parse_post_json (connection,
@@ -325,28 +338,94 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh,
                                      &json);
     if (GNUNET_SYSERR == res)
       return MHD_NO;
-    if ( (GNUNET_NO == res) ||
-         (NULL == json) )
+    if ((GNUNET_NO == res) ||
+        (NULL == json))
       return MHD_YES;
     res = TALER_MHD_parse_json_data (connection,
                                      json,
                                      spec);
-    json_decref (json);
     if (GNUNET_SYSERR == res)
-      return MHD_NO; /* hard failure */
+    {
+      json_decref (json);
+      return MHD_NO;       /* hard failure */
+    }
     if (GNUNET_NO == res)
-      return MHD_YES; /* failure */
+    {
+      json_decref (json);
+      return MHD_YES;       /* failure */
+    }
   }
-
-  es.exchange_pub = dc.exchange_pub; /* used twice! */
-  dc.master_public_key = es.master_public_key;
+  num_coins = json_array_size (jcoin_sigs);
+  if (num_coins != json_array_size (jcoin_pubs))
   {
+    GNUNET_break_op (0);
+    json_decref (json);
+    return TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_GENERIC_PARAMETER_MALFORMED,
+      "coin_pubs.length != coin_sigs.length");
+  }
+  if (0 == num_coins)
+  {
+    GNUNET_break_op (0);
+    json_decref (json);
+    return TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_GENERIC_PARAMETER_MALFORMED,
+      "coin_pubs array is empty");
+  }
+  {
+    struct TALER_CoinSpendPublicKeyP coin_pubs[num_coins];
+    struct TALER_CoinSpendSignatureP coin_sigs[num_coins];
     MHD_RESULT res;
 
+    for (unsigned int i = 0; i < num_coins; i++)
+    {
+      json_t *jpub = json_array_get (jcoin_pubs,
+                                     i);
+      json_t *jsig = json_array_get (jcoin_sigs,
+                                     i);
+      const char *ps = json_string_value (jpub);
+      const char *ss = json_string_value (jsig);
+
+      if ((NULL == ps) ||
+          (GNUNET_OK !=
+           GNUNET_STRINGS_string_to_data (ps,
+                                          strlen (ps),
+                                          &coin_pubs[i],
+                                          sizeof(coin_pubs[i]))))
+      {
+        GNUNET_break_op (0);
+        json_decref (json);
+        return TALER_MHD_reply_with_ec (
+          connection,
+          TALER_EC_GENERIC_PARAMETER_MALFORMED,
+          "coin_pub[] malformed");
+      }
+      if ((NULL == ss) ||
+          (GNUNET_OK !=
+           GNUNET_STRINGS_string_to_data (ss,
+                                          strlen (ss),
+                                          &coin_sigs[i],
+                                          sizeof(coin_sigs[i]))))
+      {
+        GNUNET_break_op (0);
+        json_decref (json);
+        return TALER_MHD_reply_with_ec (
+          connection,
+          TALER_EC_GENERIC_PARAMETER_MALFORMED,
+          "coin_sig[] malformed");
+      }
+    }
+    dc.num_coins = num_coins;
+    dc.coin_pubs = coin_pubs;
+    dc.coin_sigs = coin_sigs;
+    es.exchange_pub = dc.exchange_pub;     /* used twice! */
     res = verify_and_execute_deposit_confirmation (connection,
                                                    &dc,
                                                    &es);
     GNUNET_JSON_parse_free (spec);
+    json_decref (json);
     return res;
   }
 }
@@ -371,6 +450,3 @@ TEAH_DEPOSIT_CONFIRMATION_done (void)
     GNUNET_assert (0 == pthread_mutex_destroy (&lock));
   }
 }
-
-
-/* end of taler-auditor-httpd_deposit-confirmation.c */
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.h b/src/auditor/taler-auditor-httpd_deposit-confirmation.h
index a7c331916..1226dda69 100644
--- a/src/auditor/taler-auditor-httpd_deposit-confirmation.h
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.h
@@ -56,4 +56,5 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct TAH_RequestHandler *rh,
                                   const char *upload_data,
                                   size_t *upload_data_size);
 
+
 #endif
diff --git a/src/auditor/taler-auditor-httpd_exchanges.c b/src/auditor/taler-auditor-httpd_exchanges.c
deleted file mode 100644
index f9a9e9e60..000000000
--- a/src/auditor/taler-auditor-httpd_exchanges.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
-
-  TALER 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, 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-auditor-httpd_exchanges.c
- * @brief Handle /exchanges requests; returns list of exchanges we audit
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <jansson.h>
-#include <microhttpd.h>
-#include <pthread.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
-#include "taler-auditor-httpd.h"
-#include "taler-auditor-httpd_exchanges.h"
-
-
-/**
- * Add exchange information to the list.
- *
- * @param[in,out] cls a `json_t *` array to extend
- * @param master_pub master public key of an exchange
- * @param exchange_url base URL of an exchange
- */
-static void
-add_exchange (void *cls,
-              const struct TALER_MasterPublicKeyP *master_pub,
-              const char *exchange_url)
-{
-  json_t *list = cls;
-  json_t *obj;
-
-  obj = GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_data_auto ("master_pub",
-                                master_pub),
-    GNUNET_JSON_pack_string ("exchange_url",
-                             exchange_url));
-  GNUNET_break (0 ==
-                json_array_append_new (list,
-                                       obj));
-
-}
-
-
-/**
- * Handle a "/exchanges" request.
- *
- * @param rh context of the handler
- * @param connection the MHD connection to handle
- * @param[in,out] connection_cls the connection's closure (can be updated)
- * @param upload_data upload data
- * @param[in,out] upload_data_size number of bytes (left) in @a upload_data
- * @return MHD result code
-  */
-MHD_RESULT
-TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh,
-                       struct MHD_Connection *connection,
-                       void **connection_cls,
-                       const char *upload_data,
-                       size_t *upload_data_size)
-{
-  json_t *ja;
-  enum GNUNET_DB_QueryStatus qs;
-
-  (void) rh;
-  (void) connection_cls;
-  (void) upload_data;
-  (void) upload_data_size;
-  if (GNUNET_SYSERR ==
-      TAH_plugin->preflight (TAH_plugin->cls))
-  {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_DB_SETUP_FAILED,
-                                       NULL);
-  }
-  ja = json_array ();
-  GNUNET_break (NULL != ja);
-  qs = TAH_plugin->list_exchanges (TAH_plugin->cls,
-                                   &add_exchange,
-                                   ja);
-  if (0 > qs)
-  {
-    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
-    json_decref (ja);
-    TALER_LOG_WARNING ("Failed to handle /exchanges in database\n");
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                       "exchanges");
-  }
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    GNUNET_JSON_pack_array_steal ("exchanges",
-                                  ja));
-}
-
-
-/* end of taler-auditor-httpd_exchanges.c */
diff --git a/src/auditor/taler-auditor-sync.c b/src/auditor/taler-auditor-sync.c
index 7641325c9..e4022d325 100644
--- a/src/auditor/taler-auditor-sync.c
+++ b/src/auditor/taler-auditor-sync.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-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
@@ -92,9 +92,13 @@ static struct Table tables[] = {
   { .rt = TALER_EXCHANGEDB_RT_DENOMINATIONS},
   { .rt = TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS},
   { .rt = TALER_EXCHANGEDB_RT_WIRE_TARGETS},
+  { .rt = TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES},
+  { .rt = TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS},
   { .rt = TALER_EXCHANGEDB_RT_RESERVES},
   { .rt = TALER_EXCHANGEDB_RT_RESERVES_IN},
   { .rt = TALER_EXCHANGEDB_RT_RESERVES_CLOSE},
+  { .rt = TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS},
+  { .rt = TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS},
   { .rt = TALER_EXCHANGEDB_RT_RESERVES_OUT},
   { .rt = TALER_EXCHANGEDB_RT_AUDITORS},
   { .rt = TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS},
@@ -104,7 +108,8 @@ static struct Table tables[] = {
   { .rt = TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS},
   { .rt = TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS},
   { .rt = TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS},
-  { .rt = TALER_EXCHANGEDB_RT_DEPOSITS},
+  { .rt = TALER_EXCHANGEDB_RT_BATCH_DEPOSITS},
+  { .rt = TALER_EXCHANGEDB_RT_COIN_DEPOSITS},
   { .rt = TALER_EXCHANGEDB_RT_REFUNDS},
   { .rt = TALER_EXCHANGEDB_RT_WIRE_OUT},
   { .rt = TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING},
@@ -113,7 +118,20 @@ static struct Table tables[] = {
   { .rt = TALER_EXCHANGEDB_RT_RECOUP},
   { .rt = TALER_EXCHANGEDB_RT_RECOUP_REFRESH },
   { .rt = TALER_EXCHANGEDB_RT_EXTENSIONS},
-  { .rt = TALER_EXCHANGEDB_RT_EXTENSION_DETAILS },
+  { .rt = TALER_EXCHANGEDB_RT_POLICY_DETAILS },
+  { .rt = TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS },
+  { .rt = TALER_EXCHANGEDB_RT_PURSE_REQUESTS},
+  { .rt = TALER_EXCHANGEDB_RT_PURSE_DECISION},
+  { .rt = TALER_EXCHANGEDB_RT_PURSE_MERGES},
+  { .rt = TALER_EXCHANGEDB_RT_PURSE_DEPOSITS},
+  { .rt = TALER_EXCHANGEDB_RT_ACCOUNT_MERGES},
+  { .rt = TALER_EXCHANGEDB_RT_HISTORY_REQUESTS},
+  { .rt = TALER_EXCHANGEDB_RT_CLOSE_REQUESTS},
+  { .rt = TALER_EXCHANGEDB_RT_WADS_OUT},
+  { .rt = TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES},
+  { .rt = TALER_EXCHANGEDB_RT_WADS_IN},
+  { .rt = TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES},
+  { .rt = TALER_EXCHANGEDB_RT_PROFIT_DRAINS},
   { .end = true }
 };
 
@@ -143,7 +161,7 @@ struct InsertContext
  * @return #GNUNET_OK to continue to iterate,
  *         #GNUNET_SYSERR to fail with an error
  */
-static int
+static enum GNUNET_GenericReturnValue
 do_insert (void *cls,
            const struct TALER_EXCHANGEDB_TableData *td)
 {
@@ -376,7 +394,7 @@ do_sync (void *cls)
  * @param value actual value of the option (a string)
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 set_filename (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
               void *scls,
               const char *option,
@@ -588,6 +606,9 @@ main (int argc,
                                    level,
                                    NULL));
   GNUNET_free (level);
+  /* suppress compiler warnings... */
+  GNUNET_assert (NULL != src_cfgfile);
+  GNUNET_assert (NULL != dst_cfgfile);
   if (0 == strcmp (src_cfgfile,
                    dst_cfgfile))
   {
diff --git a/src/auditor/taler-auditor.in b/src/auditor/taler-auditor.in
index c8ea6b0c9..ab3d8d202 100644
--- a/src/auditor/taler-auditor.in
+++ b/src/auditor/taler-auditor.in
@@ -11,6 +11,7 @@ Arguments mandatory for long options are also mandatory for short options.
   -h, --help                 print this help
   -i, --internal             perform checks only applicable for
                                exchange-internal audits
+  -I, --ignore-not-found     ignore problems with the exchange bank account not existing
   -L, --log=LOGLEVEL         configure logging to use LOGLEVEL
   -l, --logfile=FILENAME     configure logging to write logs to FILENAME
   -m, --exchange-key=KEY     public key of the exchange (Crockford base32
@@ -28,7 +29,7 @@ EOF
 
 function optcheck {
 
-TEMP=`getopt -o c:hiL:l:m:T:v --long config:,help,internal,log:,logfile:exchange-key:,timetravel:,version -n 'taler-auditor' -- "$@"`
+TEMP=`getopt -o c:hiIL:l:m:T:v --long config:,help,internal,ignore-not-found,log:,logfile:exchange-key:,timetravel:,version -n 'taler-auditor' -- "$@"`
 
 if [ $? != 0 ] ;
 then
@@ -43,6 +44,7 @@ DEBUG=false
 MEMORY=
 DEBUGFILE=
 JAVA_MISC_OPT=
+INF=
 while true; do
   case "$1" in
     -c | --config ) shift 2 ;;
@@ -51,6 +53,7 @@ while true; do
         exit 0
         ;;
     -i | --internal ) shift ;;
+    -I | --ignore-not-found ) INF="-I"; shift ;;
     -L | --log ) shift 2;;
     -l | --logfile ) shift ;;
     -m | --exchange-key ) shift 2 ;;
@@ -74,16 +77,23 @@ done
 }
 # End of function 'optcheck'
 
-
 optcheck "$@"
 
+# Remove "-I" from $@ if present, store result in $ARGS.
+ARGS=("$@")
+ARGS=(${ARGS[@]/$INF})
 
-DIR=`mktemp -d reportXXXXXX`
-for n in aggregation coins deposits reserves wire
+DATE=`date +%F_%H:%M:%S`
+DIR="report_$DATE"
+mkdir $DIR
+for n in aggregation coins deposits purses reserves
 do
-  taler-helper-auditor-$n "$@" > ${DIR}/$n.json
+  taler-helper-auditor-$n ${ARGS[*]} > ${DIR}/$n.json
 done
 
+taler-helper-auditor-wire $INF ${ARGS[*]} > ${DIR}/wire.json
+
+echo "Generating auditor report in ${DIR}."
 taler-helper-auditor-render.py \
     ${DIR}/aggregation.json \
     ${DIR}/coins.json \
diff --git a/src/auditor/taler-helper-auditor-aggregation.c b/src/auditor/taler-helper-auditor-aggregation.c
index 20edb5f3d..a0f2a190f 100644
--- a/src/auditor/taler-helper-auditor-aggregation.c
+++ b/src/auditor/taler-helper-auditor-aggregation.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2024 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero Public License as published by the Free Software
@@ -34,17 +34,26 @@
 static int global_ret;
 
 /**
- * Checkpointing our progress for aggregations.
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
  */
-static struct TALER_AUDITORDB_ProgressPointAggregation ppa;
+static int test_mode;
 
 /**
  * Checkpointing our progress for aggregations.
  */
-static struct TALER_AUDITORDB_ProgressPointAggregation ppa_start;
+static TALER_ARL_DEF_PP (aggregation_last_wire_out_serial_id);
 
 /**
- * Array of reports about row inconsitencies.
+ * Total aggregation fees (wire fees) earned.
+ */
+static TALER_ARL_DEF_AB (aggregation_total_wire_fee_revenue);
+
+
+/**
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
@@ -102,11 +111,6 @@ static struct TALER_Amount total_arithmetic_delta_plus;
 static struct TALER_Amount total_arithmetic_delta_minus;
 
 /**
- * Total aggregation fees earned.
- */
-static struct TALER_Amount total_aggregation_fee_income;
-
-/**
  * Array of reports about coin operations with bad signatures.
  */
 static json_t *report_bad_sig_losses;
@@ -398,9 +402,9 @@ check_transaction_history_for_deposit (
   struct TALER_Amount expenditures;
   struct TALER_Amount refunds;
   struct TALER_Amount spent;
+  struct TALER_Amount *deposited = NULL;
   struct TALER_Amount merchant_loss;
   const struct TALER_Amount *deposit_fee;
-  int refund_deposit_fee;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Checking transaction history of coin %s\n",
@@ -421,25 +425,34 @@ check_transaction_history_for_deposit (
      to reconstruct the order of the events, so instead of subtracting we
      compute positive (deposit, melt) and negative (refund) values separately
      here, and then subtract the negative from the positive at the end (after
-     the loops). *///
-  refund_deposit_fee = GNUNET_NO;
+     the loops). */
   deposit_fee = NULL;
   for (const struct TALER_EXCHANGEDB_TransactionList *tl = tl_head;
        NULL != tl;
        tl = tl->next)
   {
-    const struct TALER_Amount *amount_with_fee;
     const struct TALER_Amount *fee_claimed;
 
     switch (tl->type)
     {
     case TALER_EXCHANGEDB_TT_DEPOSIT:
       /* check wire and h_wire are consistent */
-      amount_with_fee = &tl->details.deposit->amount_with_fee; /* according to exchange*/
+      if (NULL != deposited)
+      {
+        TALER_ARL_report (report_row_inconsistencies,
+                          GNUNET_JSON_PACK (
+                            GNUNET_JSON_pack_string ("table",
+                                                     "deposits"),
+                            GNUNET_JSON_pack_uint64 ("row",
+                                                     tl->serial_id),
+                            GNUNET_JSON_pack_string ("diagnostic",
+                                                     "multiple deposits of the same coin into the same contract detected")));
+      }
+      deposited = &tl->details.deposit->amount_with_fee; /* according to exchange*/
       fee_claimed = &tl->details.deposit->deposit_fee; /* Fee according to exchange DB */
       TALER_ARL_amount_add (&expenditures,
                             &expenditures,
-                            amount_with_fee);
+                            deposited);
       /* Check if this deposit is within the remit of the aggregation
          we are investigating, if so, include it in the totals. */
       if ( (0 == GNUNET_memcmp (merchant_pub,
@@ -450,7 +463,7 @@ check_transaction_history_for_deposit (
         struct TALER_Amount amount_without_fee;
 
         TALER_ARL_amount_subtract (&amount_without_fee,
-                                   amount_with_fee,
+                                   deposited,
                                    fee_claimed);
         TALER_ARL_amount_add (merchant_gain,
                               merchant_gain,
@@ -474,88 +487,155 @@ check_transaction_history_for_deposit (
       }
       break;
     case TALER_EXCHANGEDB_TT_MELT:
-      amount_with_fee = &tl->details.melt->amount_with_fee;
-      fee_claimed = &tl->details.melt->melt_fee;
-      TALER_ARL_amount_add (&expenditures,
-                            &expenditures,
-                            amount_with_fee);
-      /* Check that the fees given in the transaction list and in dki match */
-      if (0 !=
-          TALER_amount_cmp (&issue->fees.refresh,
-                            fee_claimed))
       {
-        /* Disagreement in fee structure between exchange and auditor */
-        report_amount_arithmetic_inconsistency ("melt fee",
-                                                0,
-                                                fee_claimed,
-                                                &issue->fees.refresh,
-                                                1);
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.melt->amount_with_fee;
+        fee_claimed = &tl->details.melt->melt_fee;
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              amount_with_fee);
+        /* Check that the fees given in the transaction list and in dki match */
+        if (0 !=
+            TALER_amount_cmp (&issue->fees.refresh,
+                              fee_claimed))
+        {
+          /* Disagreement in fee structure between exchange and auditor */
+          report_amount_arithmetic_inconsistency ("melt fee",
+                                                  0,
+                                                  fee_claimed,
+                                                  &issue->fees.refresh,
+                                                  1);
+        }
+        break;
       }
-      break;
     case TALER_EXCHANGEDB_TT_REFUND:
-      amount_with_fee = &tl->details.refund->refund_amount;
-      fee_claimed = &tl->details.refund->refund_fee;
-      TALER_ARL_amount_add (&refunds,
-                            &refunds,
-                            amount_with_fee);
-      TALER_ARL_amount_add (&expenditures,
-                            &expenditures,
-                            fee_claimed);
-      /* Check if this refund is within the remit of the aggregation
-         we are investigating, if so, include it in the totals. */
-      if ( (0 == GNUNET_memcmp (merchant_pub,
-                                &tl->details.refund->merchant_pub)) &&
-           (0 == GNUNET_memcmp (h_contract_terms,
-                                &tl->details.refund->h_contract_terms)) )
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Detected applicable refund of %s\n",
-                    TALER_amount2s (amount_with_fee));
-        TALER_ARL_amount_add (&merchant_loss,
-                              &merchant_loss,
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.refund->refund_amount;
+        fee_claimed = &tl->details.refund->refund_fee;
+        TALER_ARL_amount_add (&refunds,
+                              &refunds,
                               amount_with_fee);
-        /* If there is a refund, we give back the deposit fee */
-        refund_deposit_fee = GNUNET_YES;
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              fee_claimed);
+        /* Check if this refund is within the remit of the aggregation
+           we are investigating, if so, include it in the totals. */
+        if ( (0 == GNUNET_memcmp (merchant_pub,
+                                  &tl->details.refund->merchant_pub)) &&
+             (0 == GNUNET_memcmp (h_contract_terms,
+                                  &tl->details.refund->h_contract_terms)) )
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "Detected applicable refund of %s\n",
+                      TALER_amount2s (amount_with_fee));
+          TALER_ARL_amount_add (&merchant_loss,
+                                &merchant_loss,
+                                amount_with_fee);
+        }
+        /* Check that the fees given in the transaction list and in dki match */
+        if (0 !=
+            TALER_amount_cmp (&issue->fees.refund,
+                              fee_claimed))
+        {
+          /* Disagreement in fee structure between exchange and auditor! */
+          report_amount_arithmetic_inconsistency ("refund fee",
+                                                  0,
+                                                  fee_claimed,
+                                                  &issue->fees.refund,
+                                                  1);
+        }
+        break;
       }
-      /* Check that the fees given in the transaction list and in dki match */
-      if (0 !=
-          TALER_amount_cmp (&issue->fees.refund,
-                            fee_claimed))
+    case TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP:
       {
-        /* Disagreement in fee structure between exchange and auditor! */
-        report_amount_arithmetic_inconsistency ("refund fee",
-                                                0,
-                                                fee_claimed,
-                                                &issue->fees.refund,
-                                                1);
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.old_coin_recoup->value;
+        /* We count recoups of refreshed coins like refunds for the dirty old
+           coin, as they equivalently _increase_ the remaining value on the
+           _old_ coin */
+        TALER_ARL_amount_add (&refunds,
+                              &refunds,
+                              amount_with_fee);
+        break;
       }
-      break;
-    case TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP:
-      amount_with_fee = &tl->details.old_coin_recoup->value;
-      /* We count recoups of refreshed coins like refunds for the dirty old
-         coin, as they equivalently _increase_ the remaining value on the
-         _old_ coin */
-      TALER_ARL_amount_add (&refunds,
-                            &refunds,
-                            amount_with_fee);
-      break;
     case TALER_EXCHANGEDB_TT_RECOUP:
-      /* We count recoups of the coin as expenditures, as it
-         equivalently decreases the remaining value of the recouped coin. */
-      amount_with_fee = &tl->details.recoup->value;
-      TALER_ARL_amount_add (&expenditures,
-                            &expenditures,
-                            amount_with_fee);
-      break;
+      {
+        const struct TALER_Amount *amount_with_fee;
+
+        /* We count recoups of the coin as expenditures, as it
+           equivalently decreases the remaining value of the recouped coin. */
+        amount_with_fee = &tl->details.recoup->value;
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              amount_with_fee);
+        break;
+      }
     case TALER_EXCHANGEDB_TT_RECOUP_REFRESH:
-      /* We count recoups of the coin as expenditures, as it
-         equivalently decreases the remaining value of the recouped coin. */
-      amount_with_fee = &tl->details.recoup_refresh->value;
-      TALER_ARL_amount_add (&expenditures,
-                            &expenditures,
-                            amount_with_fee);
-      break;
-    }
+      {
+        const struct TALER_Amount *amount_with_fee;
+
+        /* We count recoups of the coin as expenditures, as it
+           equivalently decreases the remaining value of the recouped coin. */
+        amount_with_fee = &tl->details.recoup_refresh->value;
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              amount_with_fee);
+        break;
+      }
+    case TALER_EXCHANGEDB_TT_PURSE_DEPOSIT:
+      {
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.purse_deposit->amount;
+        if (! tl->details.purse_deposit->refunded)
+          TALER_ARL_amount_add (&expenditures,
+                                &expenditures,
+                                amount_with_fee);
+        break;
+      }
+
+    case TALER_EXCHANGEDB_TT_PURSE_REFUND:
+      {
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.purse_refund->refund_amount;
+        fee_claimed = &tl->details.purse_refund->refund_fee;
+        TALER_ARL_amount_add (&refunds,
+                              &refunds,
+                              amount_with_fee);
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              fee_claimed);
+        /* Check that the fees given in the transaction list and in dki match */
+        if (0 !=
+            TALER_amount_cmp (&issue->fees.refund,
+                              fee_claimed))
+        {
+          /* Disagreement in fee structure between exchange and auditor! */
+          report_amount_arithmetic_inconsistency ("refund fee",
+                                                  0,
+                                                  fee_claimed,
+                                                  &issue->fees.refund,
+                                                  1);
+        }
+        break;
+      }
+
+    case TALER_EXCHANGEDB_TT_RESERVE_OPEN:
+      {
+        const struct TALER_Amount *amount_with_fee;
+
+        amount_with_fee = &tl->details.reserve_open->coin_contribution;
+        TALER_ARL_amount_add (&expenditures,
+                              &expenditures,
+                              amount_with_fee);
+        break;
+      }
+    } /* switch (tl->type) */
   } /* for 'tl' */
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -565,11 +645,15 @@ check_transaction_history_for_deposit (
               "Aggregation loss due to refunds is %s\n",
               TALER_amount2s (&merchant_loss));
   *deposit_gain = *merchant_gain;
-  if ( (GNUNET_YES == refund_deposit_fee) &&
-       (NULL != deposit_fee) )
+  if ( (NULL != deposited) &&
+       (NULL != deposit_fee) &&
+       (0 == TALER_amount_cmp (&refunds,
+                               deposited)) )
   {
-    /* We had a /deposit operation AND a /refund operation,
-       and should thus not charge the merchant the /deposit fee */
+    /* We had a /deposit operation AND /refund operations adding up to the
+       total deposited value including deposit fee. Thus, we should not
+       subtract the /deposit fee from the merchant gain (as it was also
+       refunded). */
     TALER_ARL_amount_add (merchant_gain,
                           merchant_gain,
                           deposit_fee);
@@ -687,6 +771,7 @@ wire_transfer_information_cb (
   struct TALER_CoinPublicInfo coin;
   enum GNUNET_DB_QueryStatus qs;
   struct TALER_PaytoHashP hpt;
+  uint64_t etag_out;
 
   TALER_payto_hash (account_pay_uri,
                     &hpt);
@@ -699,10 +784,23 @@ wire_transfer_information_cb (
                               "h-payto does not match payto URI");
   }
   /* Obtain coin's transaction history */
-  qs = TALER_ARL_edb->get_coin_transactions (TALER_ARL_edb->cls,
-                                             coin_pub,
-                                             GNUNET_YES,
-                                             &tl);
+  /* TODO: could use 'start' mechanism to only fetch transactions
+     we did not yet process, instead of going over them
+     again and again.*/
+
+  {
+    struct TALER_Amount balance;
+    struct TALER_DenominationHashP h_denom_pub;
+
+    qs = TALER_ARL_edb->get_coin_transactions (TALER_ARL_edb->cls,
+                                               coin_pub,
+                                               0,
+                                               0,
+                                               &etag_out,
+                                               &balance,
+                                               &h_denom_pub,
+                                               &tl);
+  }
   if ( (qs < 0) ||
        (NULL == tl) )
   {
@@ -1001,8 +1099,9 @@ check_wire_out_cb (void *cls,
   char *method;
 
   /* should be monotonically increasing */
-  GNUNET_assert (rowid >= ppa.last_wire_out_serial_id);
-  ppa.last_wire_out_serial_id = rowid + 1;
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (aggregation_last_wire_out_serial_id));
+  TALER_ARL_USE_PP (aggregation_last_wire_out_serial_id) = rowid + 1;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Checking wire transfer %s over %s performed on %s\n",
@@ -1089,8 +1188,8 @@ check_wire_out_cb (void *cls,
                              &wcc.total_deposits,
                              &final_amount);
   /* Sum up aggregation fees (we simply include the rounding gains) */
-  TALER_ARL_amount_add (&total_aggregation_fee_income,
-                        &total_aggregation_fee_income,
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (aggregation_total_wire_fee_revenue),
+                        &TALER_ARL_USE_AB (aggregation_total_wire_fee_revenue),
                         &exchange_gain);
 
   /* Check that calculated amount matches actual amount */
@@ -1162,9 +1261,10 @@ analyze_aggregations (void *cls)
   (void) cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Analyzing aggregations\n");
-  qsp = TALER_ARL_adb->get_auditor_progress_aggregation (TALER_ARL_adb->cls,
-                                                         &TALER_ARL_master_pub,
-                                                         &ppa);
+  qsp = TALER_ARL_adb->get_auditor_progress (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_PP (aggregation_last_wire_out_serial_id),
+    NULL);
   if (0 > qsp)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsp);
@@ -1177,18 +1277,19 @@ analyze_aggregations (void *cls)
   }
   else
   {
-    ppa_start = ppa;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Resuming aggregation audit at %llu\n",
-                (unsigned long long) ppa.last_wire_out_serial_id);
+                (unsigned long long) TALER_ARL_USE_PP (
+                  aggregation_last_wire_out_serial_id));
   }
 
   memset (&ac,
           0,
           sizeof (ac));
-  qsx = TALER_ARL_adb->get_wire_fee_summary (TALER_ARL_adb->cls,
-                                             &TALER_ARL_master_pub,
-                                             &total_aggregation_fee_income);
+  qsx = TALER_ARL_adb->get_balance (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_AB (aggregation_total_wire_fee_revenue),
+    NULL);
   if (0 > qsx)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsx);
@@ -1197,7 +1298,7 @@ analyze_aggregations (void *cls)
   ac.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
   qs = TALER_ARL_edb->select_wire_out_above_serial_id (
     TALER_ARL_edb->cls,
-    ppa.last_wire_out_serial_id,
+    TALER_ARL_USE_PP (aggregation_last_wire_out_serial_id),
     &check_wire_out_cb,
     &ac);
   if (0 > qs)
@@ -1223,30 +1324,30 @@ analyze_aggregations (void *cls)
     return ac.qs;
   }
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsx)
-    ac.qs = TALER_ARL_adb->insert_wire_fee_summary (
+    ac.qs = TALER_ARL_adb->insert_balance (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &total_aggregation_fee_income);
+      TALER_ARL_SET_AB (aggregation_total_wire_fee_revenue),
+      NULL);
   else
-    ac.qs = TALER_ARL_adb->update_wire_fee_summary (
+    ac.qs = TALER_ARL_adb->update_balance (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &total_aggregation_fee_income);
+      TALER_ARL_SET_AB (aggregation_total_wire_fee_revenue),
+      NULL);
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != ac.qs)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == ac.qs);
     return ac.qs;
   }
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
-    qs = TALER_ARL_adb->update_auditor_progress_aggregation (
+    qs = TALER_ARL_adb->update_auditor_progress (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &ppa);
+      TALER_ARL_SET_PP (aggregation_last_wire_out_serial_id),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_auditor_progress_aggregation (
+    qs = TALER_ARL_adb->insert_auditor_progress (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &ppa);
+      TALER_ARL_SET_PP (aggregation_last_wire_out_serial_id),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1256,7 +1357,8 @@ analyze_aggregations (void *cls)
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Concluded aggregation audit step at %llu\n",
-              (unsigned long long) ppa.last_wire_out_serial_id);
+              (unsigned long long) TALER_ARL_USE_PP (
+                aggregation_last_wire_out_serial_id));
 
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
@@ -1291,7 +1393,8 @@ run (void *cls,
               "Starting audit\n");
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_aggregation_fee_income));
+                                        &TALER_ARL_USE_AB (
+                                          aggregation_total_wire_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_wire_out_delta_plus));
@@ -1385,14 +1488,14 @@ run (void *cls,
                       "total_arithmetic_delta_minus",
                       &total_arithmetic_delta_minus),
                     TALER_JSON_pack_amount (
-                      "total_aggregation_fee_income",
-                      &total_aggregation_fee_income),
+                      "aggregation_total_wire_fee_revenue",
+                      &TALER_ARL_USE_AB (aggregation_total_wire_fee_revenue)),
                     GNUNET_JSON_pack_uint64 (
                       "start_ppa_wire_out_serial_id",
-                      ppa_start.last_wire_out_serial_id),
+                      0 /* defunct */),
                     GNUNET_JSON_pack_uint64 (
                       "end_ppa_wire_out_serial_id",
-                      ppa.last_wire_out_serial_id),
+                      TALER_ARL_USE_PP (aggregation_last_wire_out_serial_id)),
                     /* block #4 */
                     TALER_JSON_pack_time_abs_human (
                       "auditor_start_time",
@@ -1422,11 +1525,10 @@ main (int argc,
                                "internal",
                                "perform checks only applicable for exchange-internal audits",
                                &internal_checks),
-    GNUNET_GETOPT_option_base32_auto ('m',
-                                      "exchange-key",
-                                      "KEY",
-                                      "public key of the exchange (Crockford base32 encoded)",
-                                      &TALER_ARL_master_pub),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
diff --git a/src/auditor/taler-helper-auditor-coins.c b/src/auditor/taler-helper-auditor-coins.c
index ad9048a17..f88f39eaf 100644
--- a/src/auditor/taler-helper-auditor-coins.c
+++ b/src/auditor/taler-helper-auditor-coins.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2024 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero Public License as published by the Free Software
@@ -17,9 +17,6 @@
  * @file auditor/taler-helper-auditor-coins.c
  * @brief audits coins in an exchange database.
  * @author Christian Grothoff
- *
- * UNDECIDED:
- * - do we care about checking the 'done' flag in deposit_cb?
  */
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
@@ -48,14 +45,37 @@
 static int global_ret;
 
 /**
- * Checkpointing our progress for coins.
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
  */
-static struct TALER_AUDITORDB_ProgressPointCoin ppc;
+static int test_mode;
 
 /**
  * Checkpointing our progress for coins.
  */
-static struct TALER_AUDITORDB_ProgressPointCoin ppc_start;
+static TALER_ARL_DEF_PP (coins_withdraw_serial_id);
+static TALER_ARL_DEF_PP (coins_deposit_serial_id);
+static TALER_ARL_DEF_PP (coins_melt_serial_id);
+static TALER_ARL_DEF_PP (coins_refund_serial_id);
+static TALER_ARL_DEF_PP (coins_recoup_serial_id);
+static TALER_ARL_DEF_PP (coins_recoup_refresh_serial_id);
+static TALER_ARL_DEF_PP (coins_purse_deposits_serial_id);
+static TALER_ARL_DEF_PP (coins_purse_refunds_serial_id);
+
+
+/**
+ * Global coin balance sheet (for coins).
+ */
+static TALER_ARL_DEF_AB (coin_balance_risk);
+static TALER_ARL_DEF_AB (total_escrowed);
+static TALER_ARL_DEF_AB (coin_irregular_loss);
+static TALER_ARL_DEF_AB (coin_melt_fee_revenue);
+static TALER_ARL_DEF_AB (coin_deposit_fee_revenue);
+static TALER_ARL_DEF_AB (coin_refund_fee_revenue);
+static TALER_ARL_DEF_AB (total_recoup_loss);
+
 
 /**
  * Array of reports about denomination keys with an
@@ -70,7 +90,7 @@ static json_t *report_emergencies;
 static json_t *report_emergencies_by_count;
 
 /**
- * Array of reports about row inconsitencies.
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
@@ -115,40 +135,6 @@ static struct TALER_Amount reported_emergency_loss;
  */
 static struct TALER_Amount reported_emergency_loss_by_count;
 
-/**
- * Expected balance in the escrow account.
- */
-static struct TALER_Amount total_escrow_balance;
-
-/**
- * Active risk exposure.
- */
-static struct TALER_Amount total_risk;
-
-/**
- * Actualized risk (= loss) from recoups.
- */
-static struct TALER_Amount total_recoup_loss;
-
-/**
- * Recoups we made on denominations that were not revoked (!?).
- */
-static struct TALER_Amount total_irregular_recoups;
-
-/**
- * Total deposit fees earned.
- */
-static struct TALER_Amount total_deposit_fee_income;
-
-/**
- * Total melt fees earned.
- */
-static struct TALER_Amount total_melt_fee_income;
-
-/**
- * Total refund fees earned.
- */
-static struct TALER_Amount total_refund_fee_income;
 
 /**
  * Array of reports about coin operations with bad signatures.
@@ -156,15 +142,10 @@ static struct TALER_Amount total_refund_fee_income;
 static json_t *report_bad_sig_losses;
 
 /**
- * Total amount lost by operations for which signatures were invalid.
- */
-static struct TALER_Amount total_bad_sig_loss;
-
-/**
  * Array of refresh transactions where the /refresh/reveal has not yet
  * happened (and may of course never happen).
  */
-static json_t *report_refreshs_hanging;
+static json_t *report_refreshes_hanging;
 
 /**
  * Total amount lost by operations for which signatures were invalid.
@@ -210,9 +191,9 @@ coin_history_index (const struct TALER_CoinSpendPublicKeyP *coin_pub)
 {
   uint32_t i;
 
-  memcpy (&i,
-          coin_pub,
-          sizeof (i));
+  GNUNET_memcpy (&i,
+                 coin_pub,
+                 sizeof (i));
   return i % MAX_COIN_HISTORIES;
 }
 
@@ -248,8 +229,9 @@ get_cached_history (const struct TALER_CoinSpendPublicKeyP *coin_pub)
 {
   unsigned int i = coin_history_index (coin_pub);
 
-  if (0 == GNUNET_memcmp (coin_pub,
-                          &coin_histories[i].coin_pub))
+  if (0 ==
+      GNUNET_memcmp (coin_pub,
+                     &coin_histories[i].coin_pub))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Found verification of %s in cache\n",
@@ -471,15 +453,27 @@ check_coin_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
   struct TALER_Amount spent;
   struct TALER_Amount refunded;
   struct TALER_Amount deposit_fee;
-  int have_refund;
+  bool have_refund;
+  uint64_t etag_out;
 
-  qs = TALER_ARL_edb->get_coin_transactions (TALER_ARL_edb->cls,
-                                             coin_pub,
-                                             GNUNET_YES,
-                                             &tl);
+  /* TODO: could use 'etag' mechanism to only fetch transactions
+     we did not yet process, instead of going over them
+     again and again. */
+  {
+    struct TALER_Amount balance;
+    struct TALER_DenominationHashP h_denom_pub;
+
+    qs = TALER_ARL_edb->get_coin_transactions (TALER_ARL_edb->cls,
+                                               coin_pub,
+                                               0,
+                                               0,
+                                               &etag_out,
+                                               &balance,
+                                               &h_denom_pub,
+                                               &tl);
+  }
   if (0 >= qs)
     return qs;
-
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (value->currency,
                                         &refunded));
@@ -489,7 +483,7 @@ check_coin_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (value->currency,
                                         &deposit_fee));
-  have_refund = GNUNET_NO;
+  have_refund = false;
   for (struct TALER_EXCHANGEDB_TransactionList *pos = tl;
        NULL != pos;
        pos = pos->next)
@@ -517,7 +511,7 @@ check_coin_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
       TALER_ARL_amount_add (&spent,
                             &spent,
                             &pos->details.refund->refund_fee);
-      have_refund = GNUNET_YES;
+      have_refund = true;
       break;
     case TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP:
       /* refunded += pos->value */
@@ -537,8 +531,28 @@ check_coin_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
                             &spent,
                             &pos->details.recoup_refresh->value);
       break;
-    }
-  }
+    case TALER_EXCHANGEDB_TT_PURSE_DEPOSIT:
+      /* spent += pos->value */
+      TALER_ARL_amount_add (&spent,
+                            &spent,
+                            &pos->details.purse_deposit->amount);
+      break;
+    case TALER_EXCHANGEDB_TT_PURSE_REFUND:
+      TALER_ARL_amount_add (&refunded,
+                            &refunded,
+                            &tl->details.purse_refund->refund_amount);
+      TALER_ARL_amount_add (&spent,
+                            &spent,
+                            &pos->details.purse_refund->refund_fee);
+      have_refund = true;
+      break;
+    case TALER_EXCHANGEDB_TT_RESERVE_OPEN:
+      TALER_ARL_amount_add (&spent,
+                            &spent,
+                            &tl->details.reserve_open->coin_contribution);
+      break;
+    } /* switch (pos->type) */
+  } /* for (...) */
 
   if (have_refund)
   {
@@ -589,33 +603,9 @@ check_coin_history (const struct TALER_CoinSpendPublicKeyP *coin_pub,
 struct DenominationSummary
 {
   /**
-   * Total value of outstanding (not deposited) coins issued with this
-   * denomination key.
+   * Information about the circulation.
    */
-  struct TALER_Amount denom_balance;
-
-  /**
-   * Total losses made (once coins deposited exceed
-   * coins withdrawn and thus the @e denom_balance is
-   * effectively negative).
-   */
-  struct TALER_Amount denom_loss;
-
-  /**
-   * Total value of coins issued with this denomination key.
-   */
-  struct TALER_Amount denom_risk;
-
-  /**
-   * Total value of coins subjected to recoup with this denomination key.
-   */
-  struct TALER_Amount denom_recoup;
-
-  /**
-   * How many coins (not their amount!) of this denomination
-   * did the exchange issue overall?
-   */
-  uint64_t num_issued;
+  struct TALER_AUDITORDB_DenominationCirculationData dcd;
 
   /**
    * Denomination key information for this denomination.
@@ -623,22 +613,22 @@ struct DenominationSummary
   const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
 
   /**
-   * #GNUNET_YES if this record already existed in the DB.
+   * True if this record already existed in the DB.
    * Used to decide between insert/update in
    * #sync_denomination().
    */
-  int in_db;
+  bool in_db;
 
   /**
    * Should we report an emergency for this denomination, causing it to be
    * revoked (because more coins were deposited than issued)?
    */
-  int report_emergency;
+  bool report_emergency;
 
   /**
-   * #GNUNET_YES if this denomination was revoked.
+   * True if this denomination was revoked.
    */
-  int was_revoked;
+  bool was_revoked;
 };
 
 
@@ -678,11 +668,7 @@ init_denomination (const struct TALER_DenominationHashP *denom_hash,
 
   qs = TALER_ARL_adb->get_denomination_balance (TALER_ARL_adb->cls,
                                                 denom_hash,
-                                                &ds->denom_balance,
-                                                &ds->denom_loss,
-                                                &ds->denom_risk,
-                                                &ds->denom_recoup,
-                                                &ds->num_issued);
+                                                &ds->dcd);
   if (0 > qs)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
@@ -690,28 +676,28 @@ init_denomination (const struct TALER_DenominationHashP *denom_hash,
   }
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
   {
-    ds->in_db = GNUNET_YES;
+    ds->in_db = true;
   }
   else
   {
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (TALER_ARL_currency,
-                                          &ds->denom_balance));
+                                          &ds->dcd.denom_balance));
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (TALER_ARL_currency,
-                                          &ds->denom_loss));
+                                          &ds->dcd.denom_loss));
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (TALER_ARL_currency,
-                                          &ds->denom_risk));
+                                          &ds->dcd.denom_risk));
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (TALER_ARL_currency,
-                                          &ds->denom_recoup));
+                                          &ds->dcd.recoup_loss));
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting balance for denomination `%s' is %s (%llu)\n",
               GNUNET_h2s (&denom_hash->hash),
-              TALER_amount2s (&ds->denom_balance),
-              (unsigned long long) ds->num_issued);
+              TALER_amount2s (&ds->dcd.denom_balance),
+              (unsigned long long) ds->dcd.num_issued);
   qs = TALER_ARL_edb->get_denomination_revocation (TALER_ARL_edb->cls,
                                                    denom_hash,
                                                    &msig,
@@ -736,10 +722,10 @@ init_denomination (const struct TALER_DenominationHashP *denom_hash,
     }
     else
     {
-      ds->was_revoked = GNUNET_YES;
+      ds->was_revoked = true;
     }
   }
-  return (GNUNET_YES == ds->in_db)
+  return ds->in_db
          ? GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
          : GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
 }
@@ -754,10 +740,10 @@ init_denomination (const struct TALER_DenominationHashP *denom_hash,
  * @return NULL on error
  */
 static struct DenominationSummary *
-get_denomination_summary (struct CoinContext *cc,
-                          const struct
-                          TALER_EXCHANGEDB_DenominationKeyInformation *issue,
-                          const struct TALER_DenominationHashP *dh)
+get_denomination_summary (
+  struct CoinContext *cc,
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue,
+  const struct TALER_DenominationHashP *dh)
 {
   struct DenominationSummary *ds;
 
@@ -826,38 +812,35 @@ sync_denomination (void *cls,
     else
       qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
     if ( (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs) &&
-         ( (0 != ds->denom_risk.value) ||
-           (0 != ds->denom_risk.fraction) ) )
+         (! TALER_amount_is_zero (&ds->dcd.denom_risk)) )
     {
       /* The denomination expired and carried a balance; we can now
          book the remaining balance as profit, and reduce our risk
          exposure by the accumulated risk of the denomination. */
-      TALER_ARL_amount_subtract (&total_risk,
-                                 &total_risk,
-                                 &ds->denom_risk);
+      TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (coin_balance_risk),
+                                 &TALER_ARL_USE_AB (coin_balance_risk),
+                                 &ds->dcd.denom_risk);
       /* If the above fails, our risk assessment is inconsistent!
          This is really, really bad (auditor-internal invariant
          would be violated). Hence we can "safely" assert.  If
          this assertion fails, well, good luck: there is a bug
-         in the auditor _or_ the auditor's database is corrupt. *///
+         in the auditor _or_ the auditor's database is corrupt. */
     }
     if ( (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs) &&
-         ( (0 != ds->denom_balance.value) ||
-           (0 != ds->denom_balance.fraction) ) )
+         (! TALER_amount_is_zero (&ds->dcd.denom_balance)) )
     {
       /* book denom_balance coin expiration profits! */
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Denomination `%s' expired, booking %s in expiration profits\n",
                   GNUNET_h2s (denom_hash),
-                  TALER_amount2s (&ds->denom_balance));
+                  TALER_amount2s (&ds->dcd.denom_balance));
       if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           (qs = TALER_ARL_adb->insert_historic_denom_revenue (
              TALER_ARL_adb->cls,
-             &TALER_ARL_master_pub,
              &denom_h,
              expire_deposit,
-             &ds->denom_balance,
-             &ds->denom_recoup)))
+             &ds->dcd.denom_balance,
+             &ds->dcd.recoup_loss)))
       {
         /* Failed to store profits? Bad database */
         GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
@@ -874,8 +857,8 @@ sync_denomination (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Final balance for denomination `%s' is %s (%llu)\n",
                 GNUNET_h2s (denom_hash),
-                TALER_amount2s (&ds->denom_balance),
-                (unsigned long long) ds->num_issued);
+                TALER_amount2s (&ds->dcd.denom_balance),
+                (unsigned long long) ds->dcd.num_issued);
     cnt = TALER_ARL_edb->count_known_coins (TALER_ARL_edb->cls,
                                             &denom_h);
     if (0 > cnt)
@@ -887,39 +870,31 @@ sync_denomination (void *cls,
     }
     else
     {
-      if (ds->num_issued < (uint64_t) cnt)
+      if (ds->dcd.num_issued < (uint64_t) cnt)
       {
         /* more coins deposited than issued! very bad */
         report_emergency_by_count (issue,
-                                   ds->num_issued,
+                                   ds->dcd.num_issued,
                                    cnt,
-                                   &ds->denom_risk);
+                                   &ds->dcd.denom_risk);
       }
-      if (GNUNET_YES == ds->report_emergency)
+      if (ds->report_emergency)
       {
         /* Value of coins deposited exceed value of coins
            issued! Also very bad! */
         report_emergency_by_amount (issue,
-                                    &ds->denom_risk,
-                                    &ds->denom_loss);
+                                    &ds->dcd.denom_risk,
+                                    &ds->dcd.denom_loss);
 
       }
       if (ds->in_db)
         qs = TALER_ARL_adb->update_denomination_balance (TALER_ARL_adb->cls,
                                                          &denom_h,
-                                                         &ds->denom_balance,
-                                                         &ds->denom_loss,
-                                                         &ds->denom_risk,
-                                                         &ds->denom_recoup,
-                                                         ds->num_issued);
+                                                         &ds->dcd);
       else
         qs = TALER_ARL_adb->insert_denomination_balance (TALER_ARL_adb->cls,
                                                          &denom_h,
-                                                         &ds->denom_balance,
-                                                         &ds->denom_loss,
-                                                         &ds->denom_risk,
-                                                         &ds->denom_recoup,
-                                                         ds->num_issued);
+                                                         &ds->dcd);
     }
   }
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
@@ -981,8 +956,9 @@ withdraw_cb (void *cls,
   (void) execution_date;
   (void) amount_with_fee;
 
-  GNUNET_assert (rowid >= ppc.last_withdraw_serial_id); /* should be monotonically increasing */
-  ppc.last_withdraw_serial_id = rowid + 1;
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (coins_withdraw_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_withdraw_serial_id) = rowid + 1;
 
   qs = TALER_ARL_get_denomination_info (denom_pub,
                                         &issue,
@@ -1016,22 +992,22 @@ withdraw_cb (void *cls,
               "Issued coin in denomination `%s' of total value %s\n",
               GNUNET_h2s (&dh.hash),
               TALER_amount2s (&issue->value));
-  ds->num_issued++;
-  TALER_ARL_amount_add (&ds->denom_balance,
-                        &ds->denom_balance,
-                        &issue->value);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "New balance of denomination `%s' is %s\n",
               GNUNET_h2s (&dh.hash),
-              TALER_amount2s (&ds->denom_balance));
-  TALER_ARL_amount_add (&total_escrow_balance,
-                        &total_escrow_balance,
+              TALER_amount2s (&ds->dcd.denom_balance));
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_escrowed),
+                        &TALER_ARL_USE_AB (total_escrowed),
                         &issue->value);
-  TALER_ARL_amount_add (&total_risk,
-                        &total_risk,
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_balance_risk),
+                        &TALER_ARL_USE_AB (coin_balance_risk),
                         &issue->value);
-  TALER_ARL_amount_add (&ds->denom_risk,
-                        &ds->denom_risk,
+  ds->dcd.num_issued++;
+  TALER_ARL_amount_add (&ds->dcd.denom_balance,
+                        &ds->dcd.denom_balance,
+                        &issue->value);
+  TALER_ARL_amount_add (&ds->dcd.denom_risk,
+                        &ds->dcd.denom_risk,
                         &issue->value);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
@@ -1134,13 +1110,13 @@ reveal_data_cb (void *cls,
  *  #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
  */
 static enum GNUNET_DB_QueryStatus
-check_known_coin (const char *operation,
-                  const struct
-                  TALER_EXCHANGEDB_DenominationKeyInformation *issue,
-                  uint64_t rowid,
-                  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                  const struct TALER_DenominationPublicKey *denom_pub,
-                  const struct TALER_Amount *loss_potential)
+check_known_coin (
+  const char *operation,
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue,
+  uint64_t rowid,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_Amount *loss_potential)
 {
   struct TALER_CoinPublicInfo ci;
   enum GNUNET_DB_QueryStatus qs;
@@ -1185,8 +1161,8 @@ check_known_coin (const char *operation,
                                                 loss_potential),
                         GNUNET_JSON_pack_data_auto ("coin_pub",
                                                     coin_pub)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
                           loss_potential);
   }
   TALER_denom_sig_free (&ci.denom_sig);
@@ -1195,6 +1171,65 @@ check_known_coin (const char *operation,
 
 
 /**
+ * Update the denom balance in @a dso reducing it by
+ * @a amount_with_fee. If this is not possible, report
+ * an emergency.  Also updates the balance.
+ *
+ * @param dso denomination summary to update
+ * @param rowid responsible row (for logging)
+ * @param amount_with_fee amount to subtract
+ */
+static void
+reduce_denom_balance (struct DenominationSummary *dso,
+                      uint64_t rowid,
+                      const struct TALER_Amount *amount_with_fee)
+{
+  struct TALER_Amount tmp;
+
+  if (TALER_ARL_SR_INVALID_NEGATIVE ==
+      TALER_ARL_amount_subtract_neg (&tmp,
+                                     &dso->dcd.denom_balance,
+                                     amount_with_fee))
+  {
+    TALER_ARL_amount_add (&dso->dcd.denom_loss,
+                          &dso->dcd.denom_loss,
+                          amount_with_fee);
+    dso->report_emergency = true;
+  }
+  else
+  {
+    dso->dcd.denom_balance = tmp;
+  }
+  if (-1 == TALER_amount_cmp (&TALER_ARL_USE_AB (total_escrowed),
+                              amount_with_fee))
+  {
+    /* This can theoretically happen if for example the exchange
+       never issued any coins (i.e. escrow balance is zero), but
+       accepted a forged coin (i.e. emergency situation after
+       private key compromise). In that case, we cannot even
+       subtract the profit we make from the fee from the escrow
+       balance. Tested as part of test-auditor.sh, case #18 */
+    report_amount_arithmetic_inconsistency (
+      "subtracting amount from escrow balance",
+      rowid,
+      &TALER_ARL_USE_AB (total_escrowed),
+      amount_with_fee,
+      0);
+  }
+  else
+  {
+    TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (total_escrowed),
+                               &TALER_ARL_USE_AB (total_escrowed),
+                               amount_with_fee);
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "New balance of denomination `%s' is %s\n",
+              GNUNET_h2s (&dso->issue->denom_hash.hash),
+              TALER_amount2s (&dso->dcd.denom_balance));
+}
+
+
+/**
  * Function called with details about coins that were melted, with the
  * goal of auditing the refresh's execution.  Verifies the signature
  * and updates our information about coins outstanding (the old coin's
@@ -1204,6 +1239,7 @@ check_known_coin (const char *operation,
  * @param cls closure
  * @param rowid unique serial ID for the refresh session in our DB
  * @param denom_pub denomination public key of @a coin_pub
+ * @param h_age_commitment hash of the age commitment for the coin
  * @param coin_pub public key of the coin
  * @param coin_sig signature from the coin
  * @param amount_with_fee amount that was deposited including fee
@@ -1211,7 +1247,7 @@ check_known_coin (const char *operation,
  * @param rc what is the refresh commitment
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
-static int
+static enum GNUNET_GenericReturnValue
 refresh_session_cb (void *cls,
                     uint64_t rowid,
                     const struct TALER_DenominationPublicKey *denom_pub,
@@ -1226,12 +1262,12 @@ refresh_session_cb (void *cls,
   const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
   struct DenominationSummary *dso;
   struct TALER_Amount amount_without_fee;
-  struct TALER_Amount tmp;
   enum GNUNET_DB_QueryStatus qs;
 
   (void) noreveal_index;
-  GNUNET_assert (rowid >= ppc.last_melt_serial_id); /* should be monotonically increasing */
-  ppc.last_melt_serial_id = rowid + 1;
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (coins_melt_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_melt_serial_id) = rowid + 1;
 
   qs = TALER_ARL_get_denomination_info (denom_pub,
                                         &issue,
@@ -1279,6 +1315,7 @@ refresh_session_cb (void *cls,
                                   coin_pub,
                                   coin_sig))
     {
+      GNUNET_break_op (0);
       TALER_ARL_report (report_bad_sig_losses,
                         GNUNET_JSON_PACK (
                           GNUNET_JSON_pack_string ("operation",
@@ -1289,8 +1326,8 @@ refresh_session_cb (void *cls,
                                                   amount_with_fee),
                           GNUNET_JSON_pack_data_auto ("coin_pub",
                                                       coin_pub)));
-      TALER_ARL_amount_add (&total_bad_sig_loss,
-                            &total_bad_sig_loss,
+      TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                            &TALER_ARL_USE_AB (coin_irregular_loss),
                             amount_with_fee);
     }
   }
@@ -1323,7 +1360,7 @@ refresh_session_cb (void *cls,
       /* This can legitimately happen if reveal was not yet called or only
          with invalid data, even if the exchange is correctly operating. We
          still report it. */
-      TALER_ARL_report (report_refreshs_hanging,
+      TALER_ARL_report (report_refreshes_hanging,
                         GNUNET_JSON_PACK (
                           GNUNET_JSON_pack_uint64 ("row",
                                                    rowid),
@@ -1390,11 +1427,12 @@ refresh_session_cb (void *cls,
                                             &amount_without_fee));
     }
 
-    /* check old coin covers complete expenses (of withdraw operations) */
+    /* check old coin covers complete expenses (of refresh operation) */
     if (1 == TALER_amount_cmp (&refresh_cost,
                                &amount_without_fee))
     {
       /* refresh_cost > amount_without_fee, which is bad (exchange lost) */
+      GNUNET_break_op (0);
       report_amount_arithmetic_inconsistency ("melt (cost)",
                                               rowid,
                                               &amount_without_fee, /* 'exchange' */
@@ -1424,22 +1462,22 @@ refresh_session_cb (void *cls,
                     "Created fresh coin in denomination `%s' of value %s\n",
                     GNUNET_h2s (&ni->denom_hash.hash),
                     TALER_amount2s (&ni->value));
-        dsi->num_issued++;
-        TALER_ARL_amount_add (&dsi->denom_balance,
-                              &dsi->denom_balance,
+        dsi->dcd.num_issued++;
+        TALER_ARL_amount_add (&dsi->dcd.denom_balance,
+                              &dsi->dcd.denom_balance,
                               &ni->value);
-        TALER_ARL_amount_add (&dsi->denom_risk,
-                              &dsi->denom_risk,
+        TALER_ARL_amount_add (&dsi->dcd.denom_risk,
+                              &dsi->dcd.denom_risk,
                               &ni->value);
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "New balance of denomination `%s' is %s\n",
                     GNUNET_h2s (&ni->denom_hash.hash),
-                    TALER_amount2s (&dsi->denom_balance));
-        TALER_ARL_amount_add (&total_escrow_balance,
-                              &total_escrow_balance,
+                    TALER_amount2s (&dsi->dcd.denom_balance));
+        TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_escrowed),
+                              &TALER_ARL_USE_AB (total_escrowed),
                               &ni->value);
-        TALER_ARL_amount_add (&total_risk,
-                              &total_risk,
+        TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_balance_risk),
+                              &TALER_ARL_USE_AB (coin_balance_risk),
                               &ni->value);
       }
     }
@@ -1458,51 +1496,14 @@ refresh_session_cb (void *cls,
   }
   else
   {
-    if (TALER_ARL_SR_INVALID_NEGATIVE ==
-        TALER_ARL_amount_subtract_neg (&tmp,
-                                       &dso->denom_balance,
-                                       amount_with_fee))
-    {
-      TALER_ARL_amount_add (&dso->denom_loss,
-                            &dso->denom_loss,
-                            amount_with_fee);
-      dso->report_emergency = GNUNET_YES;
-    }
-    else
-    {
-      dso->denom_balance = tmp;
-    }
-    if (-1 == TALER_amount_cmp (&total_escrow_balance,
-                                amount_with_fee))
-    {
-      /* This can theoretically happen if for example the exchange
-         never issued any coins (i.e. escrow balance is zero), but
-         accepted a forged coin (i.e. emergency situation after
-         private key compromise). In that case, we cannot even
-         subtract the profit we make from the fee from the escrow
-         balance. Tested as part of test-auditor.sh, case #18 *///
-      report_amount_arithmetic_inconsistency (
-        "subtracting refresh fee from escrow balance",
-        rowid,
-        &total_escrow_balance,
-        amount_with_fee,
-        0);
-    }
-    else
-    {
-      TALER_ARL_amount_subtract (&total_escrow_balance,
-                                 &total_escrow_balance,
-                                 amount_with_fee);
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "New balance of denomination `%s' after melt is %s\n",
-                GNUNET_h2s (&issue->denom_hash.hash),
-                TALER_amount2s (&dso->denom_balance));
+    reduce_denom_balance (dso,
+                          rowid,
+                          amount_with_fee);
   }
 
   /* update global melt fees */
-  TALER_ARL_amount_add (&total_melt_fee_income,
-                        &total_melt_fee_income,
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_melt_fee_revenue),
+                        &TALER_ARL_USE_AB (coin_melt_fee_revenue),
                         &issue->fees.refresh);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
@@ -1537,8 +1538,9 @@ deposit_cb (void *cls,
 
   (void) done;
   (void) exchange_timestamp;
-  GNUNET_assert (rowid >= ppc.last_deposit_serial_id); /* should be monotonically increasing */
-  ppc.last_deposit_serial_id = rowid + 1;
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (coins_deposit_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_deposit_serial_id) = rowid + 1;
 
   qs = TALER_ARL_get_denomination_info (denom_pub,
                                         &issue,
@@ -1598,8 +1600,11 @@ deposit_cb (void *cls,
                                      &issue->fees.deposit,
                                      &h_wire,
                                      &deposit->h_contract_terms,
+                                     deposit->no_wallet_data_hash
+                                     ? NULL
+                                     : &deposit->wallet_data_hash,
                                      &deposit->coin.h_age_commitment,
-                                     NULL /* FIXME: h_extensions! */,
+                                     &deposit->h_policy,
                                      &h_denom_pub,
                                      deposit->timestamp,
                                      &deposit->merchant_pub,
@@ -1617,8 +1622,8 @@ deposit_cb (void *cls,
                                                   &deposit->amount_with_fee),
                           GNUNET_JSON_pack_data_auto ("coin_pub",
                                                       &deposit->coin.coin_pub)));
-      TALER_ARL_amount_add (&total_bad_sig_loss,
-                            &total_bad_sig_loss,
+      TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                            &TALER_ARL_USE_AB (coin_irregular_loss),
                             &deposit->amount_with_fee);
       if (TALER_ARL_do_abort ())
         return GNUNET_SYSERR;
@@ -1643,55 +1648,14 @@ deposit_cb (void *cls,
   }
   else
   {
-    struct TALER_Amount tmp;
-
-    if (TALER_ARL_SR_INVALID_NEGATIVE ==
-        TALER_ARL_amount_subtract_neg (&tmp,
-                                       &ds->denom_balance,
-                                       &deposit->amount_with_fee))
-    {
-      TALER_ARL_amount_add (&ds->denom_loss,
-                            &ds->denom_loss,
-                            &deposit->amount_with_fee);
-      ds->report_emergency = GNUNET_YES;
-    }
-    else
-    {
-      ds->denom_balance = tmp;
-    }
-
-    if (-1 == TALER_amount_cmp (&total_escrow_balance,
-                                &deposit->amount_with_fee))
-    {
-      /* This can theoretically happen if for example the exchange
-         never issued any coins (i.e. escrow balance is zero), but
-         accepted a forged coin (i.e. emergency situation after
-         private key compromise). In that case, we cannot even
-         subtract the profit we make from the fee from the escrow
-         balance. Tested as part of test-auditor.sh, case #18 *///
-      report_amount_arithmetic_inconsistency (
-        "subtracting deposit fee from escrow balance",
-        rowid,
-        &total_escrow_balance,
-        &deposit->amount_with_fee,
-        0);
-    }
-    else
-    {
-      TALER_ARL_amount_subtract (&total_escrow_balance,
-                                 &total_escrow_balance,
-                                 &deposit->amount_with_fee);
-    }
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "New balance of denomination `%s' after deposit is %s\n",
-                GNUNET_h2s (&issue->denom_hash.hash),
-                TALER_amount2s (&ds->denom_balance));
+    reduce_denom_balance (ds,
+                          rowid,
+                          &deposit->amount_with_fee);
   }
 
   /* update global deposit fees */
-  TALER_ARL_amount_add (&total_deposit_fee_income,
-                        &total_deposit_fee_income,
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                        &TALER_ARL_USE_AB (coin_deposit_fee_revenue),
                         &issue->fees.deposit);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
@@ -1713,6 +1677,7 @@ deposit_cb (void *cls,
  * @param merchant_sig signature of the merchant
  * @param h_contract_terms hash of the proposal data known to merchant and customer
  * @param rtransaction_id refund transaction ID chosen by the merchant
+ * @param full_refund true if the refunds total up to the entire deposited value
  * @param amount_with_fee amount that was deposited including fee
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
@@ -1725,6 +1690,7 @@ refund_cb (void *cls,
            const struct TALER_MerchantSignatureP *merchant_sig,
            const struct TALER_PrivateContractHashP *h_contract_terms,
            uint64_t rtransaction_id,
+           bool full_refund,
            const struct TALER_Amount *amount_with_fee)
 {
   struct CoinContext *cc = cls;
@@ -1733,8 +1699,8 @@ refund_cb (void *cls,
   struct TALER_Amount amount_without_fee;
   enum GNUNET_DB_QueryStatus qs;
 
-  GNUNET_assert (rowid >= ppc.last_refund_serial_id); /* should be monotonically increasing */
-  ppc.last_refund_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (coins_refund_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_refund_serial_id) = rowid + 1;
 
   qs = TALER_ARL_get_denomination_info (denom_pub,
                                         &issue,
@@ -1773,8 +1739,8 @@ refund_cb (void *cls,
                                                 amount_with_fee),
                         GNUNET_JSON_pack_data_auto ("coin_pub",
                                                     coin_pub)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
                           amount_with_fee);
     if (TALER_ARL_do_abort ())
       return GNUNET_SYSERR;
@@ -1814,27 +1780,160 @@ refund_cb (void *cls,
   }
   else
   {
-    TALER_ARL_amount_add (&ds->denom_balance,
-                          &ds->denom_balance,
+    TALER_ARL_amount_add (&ds->dcd.denom_balance,
+                          &ds->dcd.denom_balance,
                           &amount_without_fee);
-    TALER_ARL_amount_add (&ds->denom_risk,
-                          &ds->denom_risk,
+    TALER_ARL_amount_add (&ds->dcd.denom_risk,
+                          &ds->dcd.denom_risk,
                           &amount_without_fee);
-    TALER_ARL_amount_add (&total_escrow_balance,
-                          &total_escrow_balance,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_escrowed),
+                          &TALER_ARL_USE_AB (total_escrowed),
                           &amount_without_fee);
-    TALER_ARL_amount_add (&total_risk,
-                          &total_risk,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_balance_risk),
+                          &TALER_ARL_USE_AB (coin_balance_risk),
                           &amount_without_fee);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "New balance of denomination `%s' after refund is %s\n",
                 GNUNET_h2s (&issue->denom_hash.hash),
-                TALER_amount2s (&ds->denom_balance));
+                TALER_amount2s (&ds->dcd.denom_balance));
   }
   /* update total refund fee balance */
-  TALER_ARL_amount_add (&total_refund_fee_income,
-                        &total_refund_fee_income,
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_refund_fee_revenue),
+                        &TALER_ARL_USE_AB (coin_refund_fee_revenue),
                         &issue->fees.refund);
+  if (full_refund)
+  {
+    TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                               &TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                               &issue->fees.deposit);
+  }
+  if (TALER_ARL_do_abort ())
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about purse refunds that have been made, with
+ * the goal of auditing the purse refund's execution.
+ *
+ * @param cls closure
+ * @param rowid row of the purse-refund
+ * @param amount_with_fee amount of the deposit into the purse
+ * @param coin_pub coin that is to be refunded the @a given amount_with_fee
+ * @param denom_pub denomination of @a coin_pub
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+purse_refund_coin_cb (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_DenominationPublicKey *denom_pub)
+{
+  struct CoinContext *cc = cls;
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
+  struct DenominationSummary *ds;
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = TALER_ARL_get_denomination_info (denom_pub,
+                                        &issue,
+                                        NULL);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    report_row_inconsistency ("purse-refunds",
+                              rowid,
+                              "denomination key not found");
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Aborted purse-deposit of coin %s in denomination `%s' value %s\n",
+              TALER_B2S (coin_pub),
+              GNUNET_h2s (&issue->denom_hash.hash),
+              TALER_amount2s (amount_with_fee));
+
+  /* update coin's denomination balance */
+  ds = get_denomination_summary (cc,
+                                 issue,
+                                 &issue->denom_hash);
+  if (NULL == ds)
+  {
+    report_row_inconsistency ("purse-refund",
+                              rowid,
+                              "denomination key for purse-refunded coin unknown to auditor");
+  }
+  else
+  {
+    TALER_ARL_amount_add (&ds->dcd.denom_balance,
+                          &ds->dcd.denom_balance,
+                          amount_with_fee);
+    TALER_ARL_amount_add (&ds->dcd.denom_risk,
+                          &ds->dcd.denom_risk,
+                          amount_with_fee);
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_escrowed),
+                          &TALER_ARL_USE_AB (total_escrowed),
+                          amount_with_fee);
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_balance_risk),
+                          &TALER_ARL_USE_AB (coin_balance_risk),
+                          amount_with_fee);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "New balance of denomination `%s' after purse-refund is %s\n",
+                GNUNET_h2s (&issue->denom_hash.hash),
+                TALER_amount2s (&ds->dcd.denom_balance));
+  }
+  /* update total deposit fee balance */
+  TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                             &TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                             &issue->fees.deposit);
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about a purse that was refunded.  Adds the
+ * refunded amounts back to the outstanding balance of the respective
+ * denominations.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the refund in our DB
+ * @param purse_pub public key of the purse
+ * @param reserve_pub public key of the targeted reserve (ignored)
+ * @param val targeted amount to be in the reserve (ignored)
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+purse_refund_cb (void *cls,
+                 uint64_t rowid,
+                 const struct TALER_PurseContractPublicKeyP *purse_pub,
+                 const struct TALER_ReservePublicKeyP *reserve_pub,
+                 const struct TALER_Amount *val)
+{
+  struct CoinContext *cc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  (void) val; /* irrelevant on refund */
+  (void) reserve_pub; /* irrelevant, may even be NULL */
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (coins_purse_refunds_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_purse_refunds_serial_id) = rowid + 1;
+  qs = TALER_ARL_edb->select_purse_deposits_by_purse (TALER_ARL_edb->cls,
+                                                      purse_pub,
+                                                      &purse_refund_coin_cb,
+                                                      cc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return GNUNET_SYSERR;
+  }
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
   return GNUNET_OK;
@@ -1863,13 +1962,23 @@ check_recoup (struct CoinContext *cc,
               const struct TALER_CoinPublicInfo *coin,
               const struct TALER_DenominationPublicKey *denom_pub,
               const struct TALER_CoinSpendSignatureP *coin_sig,
-              const union TALER_DenominationBlindingKeyP *coin_blind)
+              const union GNUNET_CRYPTO_BlindingSecretP *coin_blind)
 {
   struct DenominationSummary *ds;
   enum GNUNET_DB_QueryStatus qs;
   const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
 
   if (GNUNET_OK !=
+      TALER_wallet_recoup_verify (&coin->denom_pub_hash,
+                                  coin_blind,
+                                  &coin->coin_pub,
+                                  coin_sig))
+  {
+    report_row_inconsistency (operation,
+                              rowid,
+                              "recoup signature invalid");
+  }
+  if (GNUNET_OK !=
       TALER_test_coin_valid (coin,
                              denom_pub))
   {
@@ -1883,8 +1992,8 @@ check_recoup (struct CoinContext *cc,
                                                 amount),
                         GNUNET_JSON_pack_data_auto ("coin_pub",
                                                     &coin->denom_pub_hash)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
                           amount);
   }
   qs = TALER_ARL_get_denomination_info_by_hash (&coin->denom_pub_hash,
@@ -1929,7 +2038,7 @@ check_recoup (struct CoinContext *cc,
   }
   else
   {
-    if (GNUNET_NO == ds->was_revoked)
+    if (! ds->was_revoked)
     {
       /* Woopsie, we allowed recoup on non-revoked denomination!? */
       TALER_ARL_report (report_bad_sig_losses,
@@ -1944,15 +2053,15 @@ check_recoup (struct CoinContext *cc,
                                                   amount),
                           GNUNET_JSON_pack_data_auto ("coin_pub",
                                                       &coin->coin_pub)));
-      TALER_ARL_amount_add (&total_bad_sig_loss,
-                            &total_bad_sig_loss,
+      TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                            &TALER_ARL_USE_AB (coin_irregular_loss),
                             amount);
     }
-    TALER_ARL_amount_add (&ds->denom_recoup,
-                          &ds->denom_recoup,
+    TALER_ARL_amount_add (&ds->dcd.recoup_loss,
+                          &ds->dcd.recoup_loss,
                           amount);
-    TALER_ARL_amount_add (&total_recoup_loss,
-                          &total_recoup_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_recoup_loss),
+                          &TALER_ARL_USE_AB (total_recoup_loss),
                           amount);
   }
   if (TALER_ARL_do_abort ())
@@ -1984,12 +2093,12 @@ recoup_cb (void *cls,
            const struct TALER_CoinPublicInfo *coin,
            const struct TALER_DenominationPublicKey *denom_pub,
            const struct TALER_CoinSpendSignatureP *coin_sig,
-           const union TALER_DenominationBlindingKeyP *coin_blind)
+           const union GNUNET_CRYPTO_BlindingSecretP *coin_blind)
 {
   struct CoinContext *cc = cls;
 
-  GNUNET_assert (rowid >= ppc.last_recoup_serial_id); /* should be monotonically increasing */
-  ppc.last_recoup_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (coins_recoup_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_recoup_serial_id) = rowid + 1;
   (void) timestamp;
   (void) reserve_pub;
   if (GNUNET_OK !=
@@ -2008,8 +2117,8 @@ recoup_cb (void *cls,
                                                 amount),
                         GNUNET_JSON_pack_data_auto ("coin_pub",
                                                     &coin->coin_pub)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
                           amount);
     if (TALER_ARL_do_abort ())
       return GNUNET_SYSERR;
@@ -2052,7 +2161,7 @@ recoup_refresh_cb (void *cls,
                    const struct TALER_CoinPublicInfo *coin,
                    const struct TALER_DenominationPublicKey *denom_pub,
                    const struct TALER_CoinSpendSignatureP *coin_sig,
-                   const union TALER_DenominationBlindingKeyP *coin_blind)
+                   const union GNUNET_CRYPTO_BlindingSecretP *coin_blind)
 {
   struct CoinContext *cc = cls;
   const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
@@ -2060,8 +2169,8 @@ recoup_refresh_cb (void *cls,
 
   (void) timestamp;
   (void) old_coin_pub;
-  GNUNET_assert (rowid >= ppc.last_recoup_refresh_serial_id); /* should be monotonically increasing */
-  ppc.last_recoup_refresh_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (coins_recoup_refresh_serial_id)); /* should be monotonically increasing */
+  TALER_ARL_USE_PP (coins_recoup_refresh_serial_id) = rowid + 1;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Recoup-refresh amount is %s\n",
               TALER_amount2s (amount));
@@ -2096,13 +2205,13 @@ recoup_refresh_cb (void *cls,
     }
     else
     {
-      TALER_ARL_amount_add (&dso->denom_balance,
-                            &dso->denom_balance,
+      TALER_ARL_amount_add (&dso->dcd.denom_balance,
+                            &dso->dcd.denom_balance,
                             amount);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "New balance of denomination `%s' after refresh-recoup is %s\n",
                   GNUNET_h2s (&issue->denom_hash.hash),
-                  TALER_amount2s (&dso->denom_balance));
+                  TALER_amount2s (&dso->dcd.denom_balance));
     }
   }
 
@@ -2122,8 +2231,8 @@ recoup_refresh_cb (void *cls,
                                                 amount),
                         GNUNET_JSON_pack_data_auto ("coin_pub",
                                                     &coin->coin_pub)));
-    TALER_ARL_amount_add (&total_bad_sig_loss,
-                          &total_bad_sig_loss,
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
                           amount);
     if (TALER_ARL_do_abort ())
       return GNUNET_SYSERR;
@@ -2148,7 +2257,7 @@ recoup_refresh_cb (void *cls,
  *
  * @param cls closure, NULL
  * @param denom_pub public key, sometimes NULL (!)
- * @param validity issuing information with value, fees and other info about the denomination.
+ * @param issue issuing information with value, fees and other info about the denomination.
  */
 static void
 check_denomination (
@@ -2211,6 +2320,127 @@ check_denomination (
 
 
 /**
+ * Function called with details about purse deposits that have been made, with
+ * the goal of auditing the deposit's execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param deposit deposit details
+ * @param reserve_pub which reserve is the purse merged into, NULL if unknown
+ * @param flags purse flags
+ * @param auditor_balance purse balance (according to the
+ *          auditor during auditing)
+ * @param purse_total target amount the purse should reach
+ * @param denom_pub denomination public key of @a coin_pub
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+purse_deposit_cb (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_EXCHANGEDB_PurseDeposit *deposit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *auditor_balance,
+  const struct TALER_Amount *purse_total,
+  const struct TALER_DenominationPublicKey *denom_pub)
+{
+  struct CoinContext *cc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_DenominationHashP dh;
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
+  struct DenominationSummary *ds;
+
+  (void) flags;
+  (void) auditor_balance;
+  (void) purse_total;
+  (void) reserve_pub;
+  GNUNET_assert (rowid >=
+                 TALER_ARL_USE_PP (coins_purse_deposits_serial_id));
+  TALER_ARL_USE_PP (coins_purse_deposits_serial_id) = rowid + 1;
+  qs = TALER_ARL_get_denomination_info (denom_pub,
+                                        &issue,
+                                        &dh);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    report_row_inconsistency ("purse-deposits",
+                              rowid,
+                              "denomination key not found");
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
+  qs = check_known_coin ("purse-deposit",
+                         issue,
+                         rowid,
+                         &deposit->coin_pub,
+                         denom_pub,
+                         &deposit->amount);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    cc->qs = qs;
+    return GNUNET_SYSERR;
+  }
+
+  if (GNUNET_OK !=
+      TALER_wallet_purse_deposit_verify (
+        NULL != deposit->exchange_base_url
+        ? deposit->exchange_base_url
+        : TALER_ARL_exchange_url,
+        &deposit->purse_pub,
+        &deposit->amount,
+        &dh,
+        &deposit->h_age_commitment,
+        &deposit->coin_pub,
+        &deposit->coin_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "purse-deposit"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                &deposit->amount),
+                        GNUNET_JSON_pack_data_auto ("coin_pub",
+                                                    &deposit->coin_pub)));
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_irregular_loss),
+                          &TALER_ARL_USE_AB (coin_irregular_loss),
+                          &deposit->amount);
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
+
+  /* update coin's denomination balance */
+  ds = get_denomination_summary (cc,
+                                 issue,
+                                 &issue->denom_hash);
+  if (NULL == ds)
+  {
+    report_row_inconsistency ("purse-deposit",
+                              rowid,
+                              "denomination key for purse-deposited coin unknown to auditor");
+  }
+  else
+  {
+    reduce_denom_balance (ds,
+                          rowid,
+                          &deposit->amount);
+  }
+
+  /* update global deposit fees */
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                        &TALER_ARL_USE_AB (coin_deposit_fee_revenue),
+                        &issue->fees.deposit);
+  if (TALER_ARL_do_abort ())
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+/**
  * Analyze the exchange's processing of coins.
  *
  * @param cls closure
@@ -2237,9 +2467,17 @@ analyze_coins (void *cls)
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Analyzing coins\n");
-  qsp = TALER_ARL_adb->get_auditor_progress_coin (TALER_ARL_adb->cls,
-                                                  &TALER_ARL_master_pub,
-                                                  &ppc);
+  qsp = TALER_ARL_adb->get_auditor_progress (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_PP (coins_withdraw_serial_id),
+    TALER_ARL_GET_PP (coins_deposit_serial_id),
+    TALER_ARL_GET_PP (coins_melt_serial_id),
+    TALER_ARL_GET_PP (coins_refund_serial_id),
+    TALER_ARL_GET_PP (coins_recoup_serial_id),
+    TALER_ARL_GET_PP (coins_recoup_refresh_serial_id),
+    TALER_ARL_GET_PP (coins_purse_deposits_serial_id),
+    TALER_ARL_GET_PP (coins_purse_refunds_serial_id),
+    NULL);
   if (0 > qsp)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsp);
@@ -2252,29 +2490,39 @@ analyze_coins (void *cls)
   }
   else
   {
-    ppc_start = ppc;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Resuming coin audit at %llu/%llu/%llu/%llu/%llu\n",
-                (unsigned long long) ppc.last_deposit_serial_id,
-                (unsigned long long) ppc.last_melt_serial_id,
-                (unsigned long long) ppc.last_refund_serial_id,
-                (unsigned long long) ppc.last_withdraw_serial_id,
-                (unsigned long long) ppc.last_recoup_refresh_serial_id);
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_INFO,
+      "Resuming coin audit at %llu/%llu/%llu/%llu/%llu/%llu/%llu\n",
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_deposit_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_melt_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_refund_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_withdraw_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_recoup_refresh_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_purse_deposits_serial_id),
+      (unsigned long long) TALER_ARL_USE_PP (
+        coins_purse_refunds_serial_id));
   }
 
   /* setup 'cc' */
   cc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
   cc.denom_summaries = GNUNET_CONTAINER_multihashmap_create (256,
                                                              GNUNET_NO);
-  qsx = TALER_ARL_adb->get_balance_summary (TALER_ARL_adb->cls,
-                                            &TALER_ARL_master_pub,
-                                            &total_escrow_balance,
-                                            &total_deposit_fee_income,
-                                            &total_melt_fee_income,
-                                            &total_refund_fee_income,
-                                            &total_risk,
-                                            &total_recoup_loss,
-                                            &total_irregular_recoups);
+  qsx = TALER_ARL_adb->get_balance (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_AB (coin_balance_risk),
+    TALER_ARL_GET_AB (total_escrowed),
+    TALER_ARL_GET_AB (coin_irregular_loss),
+    TALER_ARL_GET_AB (coin_melt_fee_revenue),
+    TALER_ARL_GET_AB (coin_deposit_fee_revenue),
+    TALER_ARL_GET_AB (coin_refund_fee_revenue),
+    TALER_ARL_GET_AB (total_recoup_loss),
+    NULL);
   if (0 > qsx)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsx);
@@ -2285,7 +2533,7 @@ analyze_coins (void *cls)
   if (0 >
       (qs = TALER_ARL_edb->select_withdrawals_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_withdraw_serial_id,
+         TALER_ARL_USE_PP (coins_withdraw_serial_id),
          &withdraw_cb,
          &cc)) )
   {
@@ -2299,7 +2547,7 @@ analyze_coins (void *cls)
   if (0 >
       (qs = TALER_ARL_edb->select_refunds_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_refund_serial_id,
+         TALER_ARL_USE_PP (coins_refund_serial_id),
          &refund_cb,
          &cc)))
   {
@@ -2309,11 +2557,26 @@ analyze_coins (void *cls)
   if (0 > cc.qs)
     return cc.qs;
 
+  /* process purse_refunds */
+  if (0 >
+      (qs = TALER_ARL_edb->select_purse_decisions_above_serial_id (
+         TALER_ARL_edb->cls,
+         TALER_ARL_USE_PP (coins_purse_refunds_serial_id),
+         true, /* only go for refunds! */
+         &purse_refund_cb,
+         &cc)))
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (0 > cc.qs)
+    return cc.qs;
+
   /* process recoups */
   if (0 >
       (qs = TALER_ARL_edb->select_recoup_refresh_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_recoup_refresh_serial_id,
+         TALER_ARL_USE_PP (coins_recoup_refresh_serial_id),
          &recoup_refresh_cb,
          &cc)))
   {
@@ -2325,7 +2588,7 @@ analyze_coins (void *cls)
   if (0 >
       (qs = TALER_ARL_edb->select_recoup_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_recoup_serial_id,
+         TALER_ARL_USE_PP (coins_recoup_serial_id),
          &recoup_cb,
          &cc)))
   {
@@ -2335,11 +2598,11 @@ analyze_coins (void *cls)
   if (0 > cc.qs)
     return cc.qs;
 
-  /* process refreshs */
+  /* process refreshes */
   if (0 >
       (qs = TALER_ARL_edb->select_refreshes_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_melt_serial_id,
+         TALER_ARL_USE_PP (coins_melt_serial_id),
          &refresh_session_cb,
          &cc)))
   {
@@ -2351,9 +2614,9 @@ analyze_coins (void *cls)
 
   /* process deposits */
   if (0 >
-      (qs = TALER_ARL_edb->select_deposits_above_serial_id (
+      (qs = TALER_ARL_edb->select_coin_deposits_above_serial_id (
          TALER_ARL_edb->cls,
-         ppc.last_deposit_serial_id,
+         TALER_ARL_USE_PP (coins_deposit_serial_id),
          &deposit_cb,
          &cc)))
   {
@@ -2363,6 +2626,20 @@ analyze_coins (void *cls)
   if (0 > cc.qs)
     return cc.qs;
 
+  /* process purse_deposits */
+  if (0 >
+      (qs = TALER_ARL_edb->select_purse_deposits_above_serial_id (
+         TALER_ARL_edb->cls,
+         TALER_ARL_USE_PP (coins_purse_deposits_serial_id),
+         &purse_deposit_cb,
+         &cc)))
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (0 > cc.qs)
+    return cc.qs;
+
   /* sync 'cc' back to disk */
   cc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
   GNUNET_CONTAINER_multihashmap_iterate (cc.denom_summaries,
@@ -2375,25 +2652,27 @@ analyze_coins (void *cls)
     return cc.qs;
   }
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsx)
-    qs = TALER_ARL_adb->update_balance_summary (TALER_ARL_adb->cls,
-                                                &TALER_ARL_master_pub,
-                                                &total_escrow_balance,
-                                                &total_deposit_fee_income,
-                                                &total_melt_fee_income,
-                                                &total_refund_fee_income,
-                                                &total_risk,
-                                                &total_recoup_loss,
-                                                &total_irregular_recoups);
+    qs = TALER_ARL_adb->update_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (coin_balance_risk),
+      TALER_ARL_SET_AB (total_escrowed),
+      TALER_ARL_SET_AB (coin_irregular_loss),
+      TALER_ARL_SET_AB (coin_melt_fee_revenue),
+      TALER_ARL_SET_AB (coin_deposit_fee_revenue),
+      TALER_ARL_SET_AB (coin_refund_fee_revenue),
+      TALER_ARL_SET_AB (total_recoup_loss),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_balance_summary (TALER_ARL_adb->cls,
-                                                &TALER_ARL_master_pub,
-                                                &total_escrow_balance,
-                                                &total_deposit_fee_income,
-                                                &total_melt_fee_income,
-                                                &total_refund_fee_income,
-                                                &total_risk,
-                                                &total_recoup_loss,
-                                                &total_irregular_recoups);
+    qs = TALER_ARL_adb->insert_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (coin_balance_risk),
+      TALER_ARL_SET_AB (total_escrowed),
+      TALER_ARL_SET_AB (coin_irregular_loss),
+      TALER_ARL_SET_AB (coin_melt_fee_revenue),
+      TALER_ARL_SET_AB (coin_deposit_fee_revenue),
+      TALER_ARL_SET_AB (coin_refund_fee_revenue),
+      TALER_ARL_SET_AB (total_recoup_loss),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
@@ -2401,13 +2680,29 @@ analyze_coins (void *cls)
   }
 
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
-    qs = TALER_ARL_adb->update_auditor_progress_coin (TALER_ARL_adb->cls,
-                                                      &TALER_ARL_master_pub,
-                                                      &ppc);
+    qs = TALER_ARL_adb->update_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (coins_withdraw_serial_id),
+      TALER_ARL_SET_PP (coins_deposit_serial_id),
+      TALER_ARL_SET_PP (coins_melt_serial_id),
+      TALER_ARL_SET_PP (coins_refund_serial_id),
+      TALER_ARL_SET_PP (coins_recoup_serial_id),
+      TALER_ARL_SET_PP (coins_recoup_refresh_serial_id),
+      TALER_ARL_SET_PP (coins_purse_deposits_serial_id),
+      TALER_ARL_SET_PP (coins_purse_refunds_serial_id),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_auditor_progress_coin (TALER_ARL_adb->cls,
-                                                      &TALER_ARL_master_pub,
-                                                      &ppc);
+    qs = TALER_ARL_adb->insert_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (coins_withdraw_serial_id),
+      TALER_ARL_SET_PP (coins_deposit_serial_id),
+      TALER_ARL_SET_PP (coins_melt_serial_id),
+      TALER_ARL_SET_PP (coins_refund_serial_id),
+      TALER_ARL_SET_PP (coins_recoup_serial_id),
+      TALER_ARL_SET_PP (coins_recoup_refresh_serial_id),
+      TALER_ARL_SET_PP (coins_purse_deposits_serial_id),
+      TALER_ARL_SET_PP (coins_purse_refunds_serial_id),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -2416,12 +2711,17 @@ analyze_coins (void *cls)
     return qs;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Concluded coin audit step at %llu/%llu/%llu/%llu/%llu\n",
-              (unsigned long long) ppc.last_deposit_serial_id,
-              (unsigned long long) ppc.last_melt_serial_id,
-              (unsigned long long) ppc.last_refund_serial_id,
-              (unsigned long long) ppc.last_withdraw_serial_id,
-              (unsigned long long) ppc.last_recoup_refresh_serial_id);
+              "Concluded coin audit step at %llu/%llu/%llu/%llu/%llu/%llu/%llu\n",
+              (unsigned long long) TALER_ARL_USE_PP (coins_deposit_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (coins_melt_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (coins_refund_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (coins_withdraw_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                coins_recoup_refresh_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                coins_purse_deposits_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                coins_purse_refunds_serial_id));
   return qs;
 }
 
@@ -2467,25 +2767,29 @@ run (void *cls,
                                         &reported_emergency_loss_by_count));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_escrow_balance));
+                                        &TALER_ARL_USE_AB (total_escrowed)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_risk));
+                                        &TALER_ARL_USE_AB (
+                                          coin_deposit_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_recoup_loss));
+                                        &TALER_ARL_USE_AB (
+                                          coin_melt_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_irregular_recoups));
+                                        &TALER_ARL_USE_AB (
+                                          coin_refund_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_deposit_fee_income));
+                                        &TALER_ARL_USE_AB (coin_balance_risk)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_melt_fee_income));
+                                        &TALER_ARL_USE_AB (total_recoup_loss)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_refund_fee_income));
+                                        &TALER_ARL_USE_AB (
+                                          coin_irregular_loss)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_arithmetic_delta_plus));
@@ -2494,9 +2798,6 @@ run (void *cls,
                                         &total_arithmetic_delta_minus));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_bad_sig_loss));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_refresh_hanging));
   GNUNET_assert (NULL !=
                  (report_emergencies = json_array ()));
@@ -2512,7 +2813,7 @@ run (void *cls,
   GNUNET_assert (NULL !=
                  (report_bad_sig_losses = json_array ()));
   GNUNET_assert (NULL !=
-                 (report_refreshs_hanging = json_array ()));
+                 (report_refreshes_hanging = json_array ()));
   if (GNUNET_OK !=
       TALER_ARL_setup_sessions_and_run (&analyze_coins,
                                         NULL))
@@ -2525,27 +2826,26 @@ run (void *cls,
   TALER_ARL_done (
     GNUNET_JSON_PACK (
       TALER_JSON_pack_amount ("total_escrow_balance",
-                              &total_escrow_balance),
-      TALER_JSON_pack_amount ("total_active_risk",
-                              &total_risk),
+                              &TALER_ARL_USE_AB (total_escrowed)),
       TALER_JSON_pack_amount ("total_deposit_fee_income",
-                              &total_deposit_fee_income),
+                              &TALER_ARL_USE_AB (coin_deposit_fee_revenue)),
       TALER_JSON_pack_amount ("total_melt_fee_income",
-                              &total_melt_fee_income),
+                              &TALER_ARL_USE_AB (coin_melt_fee_revenue)),
       TALER_JSON_pack_amount ("total_refund_fee_income",
-                              &total_refund_fee_income),
+                              &TALER_ARL_USE_AB (coin_refund_fee_revenue)),
+      TALER_JSON_pack_amount ("total_active_risk",
+                              &TALER_ARL_USE_AB (coin_balance_risk)),
+      TALER_JSON_pack_amount ("total_recoup_loss",
+                              &TALER_ARL_USE_AB (total_recoup_loss)),
+      /* Tested in test-auditor.sh #4/#5/#6/#13/#26 */
+      TALER_JSON_pack_amount ("irregular_loss",
+                              &TALER_ARL_USE_AB (coin_irregular_loss)),
       /* Tested in test-auditor.sh #18 */
       GNUNET_JSON_pack_array_steal ("emergencies",
                                     report_emergencies),
       /* Tested in test-auditor.sh #18 */
       TALER_JSON_pack_amount ("emergencies_risk_by_amount",
                               &reported_emergency_risk_by_amount),
-      /* Tested in test-auditor.sh #4/#5/#6/#13/#26 */
-      GNUNET_JSON_pack_array_steal ("bad_sig_losses",
-                                    report_bad_sig_losses),
-      /* Tested in test-auditor.sh #4/#5/#6/#13/#26 */
-      TALER_JSON_pack_amount ("total_bad_sig_loss",
-                              &total_bad_sig_loss),
       /* Tested in test-auditor.sh #31 */
       GNUNET_JSON_pack_array_steal ("row_inconsistencies",
                                     report_row_inconsistencies),
@@ -2558,11 +2858,11 @@ run (void *cls,
                               &total_arithmetic_delta_minus),
       TALER_JSON_pack_amount ("total_refresh_hanging",
                               &total_refresh_hanging),
+      GNUNET_JSON_pack_array_steal ("bad_sig_losses",
+                                    report_bad_sig_losses),
       /* Tested in test-auditor.sh #12 */
       GNUNET_JSON_pack_array_steal ("refresh_hanging",
-                                    report_refreshs_hanging),
-      TALER_JSON_pack_amount ("total_recoup_loss",
-                              &total_recoup_loss),
+                                    report_refreshes_hanging),
       /* Tested in test-auditor.sh #18 */
       GNUNET_JSON_pack_array_steal ("emergencies_by_count",
                                     report_emergencies_by_count),
@@ -2576,38 +2876,48 @@ run (void *cls,
       TALER_JSON_pack_amount ("emergencies_loss_by_count",
                               &reported_emergency_loss_by_count),
       GNUNET_JSON_pack_uint64 ("start_ppc_withdraw_serial_id",
-                               ppc_start.last_withdraw_serial_id),
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("start_ppc_deposit_serial_id",
-                               ppc_start.last_deposit_serial_id),
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("start_ppc_melt_serial_id",
-                               ppc_start.last_melt_serial_id),
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("start_ppc_refund_serial_id",
-                               ppc_start.last_refund_serial_id),
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("start_ppc_recoup_serial_id",
-                               ppc_start.last_recoup_serial_id),
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("start_ppc_recoup_refresh_serial_id",
-                               ppc_start.
-                               last_recoup_refresh_serial_id),
+                               0 /* not implemented */),
+      GNUNET_JSON_pack_uint64 ("start_ppc_purse_deposits_serial_id",
+                               0 /* not implemented */),
+      GNUNET_JSON_pack_uint64 ("start_ppc_purse_refunds_serial_id",
+                               0 /* not implemented */),
       GNUNET_JSON_pack_uint64 ("end_ppc_withdraw_serial_id",
-                               ppc.last_withdraw_serial_id),
+                               TALER_ARL_USE_PP (coins_withdraw_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppc_deposit_serial_id",
-                               ppc.last_deposit_serial_id),
+                               TALER_ARL_USE_PP (coins_deposit_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppc_melt_serial_id",
-                               ppc.last_melt_serial_id),
+                               TALER_ARL_USE_PP (coins_melt_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppc_refund_serial_id",
-                               ppc.last_refund_serial_id),
+                               TALER_ARL_USE_PP (coins_refund_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppc_recoup_serial_id",
-                               ppc.last_recoup_serial_id),
+                               TALER_ARL_USE_PP (coins_recoup_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppc_recoup_refresh_serial_id",
-                               ppc.last_recoup_refresh_serial_id),
-      TALER_JSON_pack_time_abs_human ("auditor_start_time",
-                                      start_time),
+                               TALER_ARL_USE_PP (
+                                 coins_recoup_refresh_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppc_purse_deposits_serial_id",
+                               TALER_ARL_USE_PP (
+                                 coins_purse_deposits_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppc_purse_refunds_serial_id",
+                               TALER_ARL_USE_PP (
+                                 coins_purse_refunds_serial_id)),
+      TALER_JSON_pack_time_abs_human (
+        "auditor_start_time",
+        start_time),
       TALER_JSON_pack_time_abs_human ("auditor_end_time",
                                       GNUNET_TIME_absolute_get ()),
-      TALER_JSON_pack_amount ("total_irregular_recoups",
-                              &total_irregular_recoups),
-      GNUNET_JSON_pack_array_steal ("unsigned_denominations",
-                                    report_denominations_without_sigs)));
+      GNUNET_JSON_pack_array_steal (
+        "unsigned_denominations",
+        report_denominations_without_sigs)));
 }
 
 
@@ -2627,11 +2937,10 @@ main (int argc,
                                "internal",
                                "perform checks only applicable for exchange-internal audits",
                                &internal_checks),
-    GNUNET_GETOPT_option_base32_auto ('m',
-                                      "exchange-key",
-                                      "KEY",
-                                      "public key of the exchange (Crockford base32 encoded)",
-                                      &TALER_ARL_master_pub),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
diff --git a/src/auditor/taler-helper-auditor-deposits.c b/src/auditor/taler-helper-auditor-deposits.c
index 2499df2eb..3dbce0183 100644
--- a/src/auditor/taler-helper-auditor-deposits.c
+++ b/src/auditor/taler-helper-auditor-deposits.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero Public License as published by the Free Software
@@ -17,6 +17,7 @@
  * @file auditor/taler-helper-auditor-deposits.c
  * @brief audits an exchange database for deposit confirmation consistency
  * @author Christian Grothoff
+ * @author Nic Eigel
  *
  * We simply check that all of the deposit confirmations reported to us
  * by merchants were also reported to us by the exchange.
@@ -29,7 +30,29 @@
 #include "taler_bank_service.h"
 #include "taler_signatures.h"
 #include "report-lib.h"
+#include "taler_dbevents.h"
+#include <jansson.h>
 
+/*
+--
+-- SELECT serial_id,h_contract_terms,h_wire,merchant_pub ...
+--   FROM auditor.auditor_deposit_confirmations
+--   WHERE NOT ancient
+--    ORDER BY exchange_timestamp ASC;
+--  SELECT 1
+-      FROM exchange.deposits dep
+       WHERE ($RESULT.contract_terms = dep.h_contract_terms) AND ($RESULT.h_wire = dep.h_wire) AND ...);
+-- IF FOUND
+-- DELETE FROM auditor.auditor_deposit_confirmations
+--   WHERE serial_id = $RESULT.serial_id;
+-- SELECT exchange_timestamp AS latest
+--   FROM exchange.deposits ORDER BY exchange_timestamp DESC;
+-- latest -= 1 hour; // time is not exactly monotonic...
+-- UPDATE auditor.deposit_confirmations
+--   SET ancient=TRUE
+--  WHERE exchange_timestamp < latest
+--    AND NOT ancient;
+*/
 
 /**
  * Return value from main().
@@ -37,6 +60,14 @@
 static int global_ret;
 
 /**
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
+ */
+static int test_mode;
+
+/**
  * Array of reports about missing deposit confirmations.
  */
 static json_t *report_deposit_confirmation_inconsistencies;
@@ -56,6 +87,18 @@ static struct TALER_Amount total_missed_deposit_confirmations;
  */
 static int internal_checks;
 
+static struct GNUNET_DB_EventHandler *eh;
+
+/**
+ * Our database plugin.
+ */
+static struct TALER_AUDITORDB_Plugin *db_plugin;
+
+/**
+ * The auditors's configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
 /**
  * Closure for #test_dc.
  */
@@ -92,7 +135,6 @@ struct DepositConfirmationContext
 
 };
 
-
 /**
  * Given a deposit confirmation from #TALER_ARL_adb, check that it is also
  * in #TALER_ARL_edb.  Update the deposit confirmation context accordingly.
@@ -102,14 +144,16 @@ struct DepositConfirmationContext
  * @param dc the deposit confirmation we know
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop iterating
  */
-static int
+static enum GNUNET_GenericReturnValue
 test_dc (void *cls,
          uint64_t serial_id,
          const struct TALER_AUDITORDB_DepositConfirmation *dc)
 {
   struct DepositConfirmationContext *dcc = cls;
+  bool missing = false;
 
   dcc->last_seen_coin_serial = serial_id;
+  for (unsigned int i = 0; i < dc->num_coins; i++)
   {
     enum GNUNET_DB_QueryStatus qs;
     struct GNUNET_TIME_Timestamp exchange_timestamp;
@@ -118,20 +162,12 @@ test_dc (void *cls,
     qs = TALER_ARL_edb->have_deposit2 (TALER_ARL_edb->cls,
                                        &dc->h_contract_terms,
                                        &dc->h_wire,
-                                       &dc->coin_pub,
+                                       &dc->coin_pubs[i],
                                        &dc->merchant,
                                        dc->refund_deadline,
                                        &deposit_fee,
                                        &exchange_timestamp);
-    if (qs > 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Found deposit %s in exchange database\n",
-                  GNUNET_h2s (&dc->h_contract_terms.hash));
-      if (TALER_ARL_do_abort ())
-        return GNUNET_SYSERR;
-      return GNUNET_OK; /* found, all good */
-    }
+    missing |= (0 == qs);
     if (qs < 0)
     {
       GNUNET_break (0); /* DB error, complain */
@@ -139,6 +175,15 @@ test_dc (void *cls,
       return GNUNET_SYSERR;
     }
   }
+  if (! missing)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Found deposit %s in exchange database\n",
+                GNUNET_h2s (&dc->h_contract_terms.hash));
+    if (TALER_ARL_do_abort ())
+      return GNUNET_SYSERR;
+    return GNUNET_OK; /* all coins found, all good */
+  }
   /* deposit confirmation missing! report! */
   TALER_ARL_report (
     report_deposit_confirmation_inconsistencies,
@@ -146,7 +191,7 @@ test_dc (void *cls,
       TALER_JSON_pack_time_abs_human ("timestamp",
                                       dc->exchange_timestamp.abs_time),
       TALER_JSON_pack_amount ("amount",
-                              &dc->amount_without_fee),
+                              &dc->total_without_fee),
       GNUNET_JSON_pack_uint64 ("rowid",
                                serial_id),
       GNUNET_JSON_pack_data_auto ("account",
@@ -156,7 +201,7 @@ test_dc (void *cls,
   dcc->missed_count++;
   TALER_ARL_amount_add (&dcc->missed_amount,
                         &dcc->missed_amount,
-                        &dc->amount_without_fee);
+                        &dc->total_without_fee);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
   return GNUNET_OK;
@@ -173,20 +218,18 @@ test_dc (void *cls,
 static enum GNUNET_DB_QueryStatus
 analyze_deposit_confirmations (void *cls)
 {
-  struct TALER_AUDITORDB_ProgressPointDepositConfirmation ppdc;
+  TALER_ARL_DEF_PP (deposit_confirmation_serial_id);
   struct DepositConfirmationContext dcc;
   enum GNUNET_DB_QueryStatus qs;
   enum GNUNET_DB_QueryStatus qsx;
   enum GNUNET_DB_QueryStatus qsp;
-
   (void) cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Analyzing deposit confirmations\n");
-  ppdc.last_deposit_confirmation_serial_id = 0;
-  qsp = TALER_ARL_adb->get_auditor_progress_deposit_confirmation (
+
+  qsp = TALER_ARL_adb->get_auditor_progress (
     TALER_ARL_adb->cls,
-    &TALER_ARL_master_pub,
-    &ppdc);
+    TALER_ARL_GET_PP (deposit_confirmation_serial_id),
+    NULL);
+
   if (0 > qsp)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsp);
@@ -201,7 +244,8 @@ analyze_deposit_confirmations (void *cls)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Resuming deposit confirmation audit at %llu\n",
-                (unsigned long long) ppdc.last_deposit_confirmation_serial_id);
+                (unsigned long long) TALER_ARL_USE_PP (
+                  deposit_confirmation_serial_id));
   }
 
   /* setup 'cc' */
@@ -211,10 +255,13 @@ analyze_deposit_confirmations (void *cls)
   dcc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
   dcc.missed_count = 0LLU;
   dcc.first_missed_coin_serial = UINT64_MAX;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "lastdepconfserialid %lu\n",
+              TALER_ARL_USE_PP (deposit_confirmation_serial_id));
   qsx = TALER_ARL_adb->get_deposit_confirmations (
     TALER_ARL_adb->cls,
-    &TALER_ARL_master_pub,
-    ppdc.last_deposit_confirmation_serial_id,
+    TALER_ARL_USE_PP (deposit_confirmation_serial_id),
+    true, /* return suppressed */
     &test_dc,
     &dcc);
   if (0 > qsx)
@@ -225,28 +272,30 @@ analyze_deposit_confirmations (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Analyzed %d deposit confirmations (above serial ID %llu)\n",
               (int) qsx,
-              (unsigned long long) ppdc.last_deposit_confirmation_serial_id);
+              (unsigned long long) TALER_ARL_USE_PP (
+                deposit_confirmation_serial_id));
   if (0 > dcc.qs)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == dcc.qs);
     return dcc.qs;
   }
-  if (UINT64_MAX == dcc.first_missed_coin_serial)
-    ppdc.last_deposit_confirmation_serial_id = dcc.last_seen_coin_serial;
-  else
-    ppdc.last_deposit_confirmation_serial_id = dcc.first_missed_coin_serial - 1;
 
+  /* if (UINT64_MAX == dcc.first_missed_coin_serial)
+     ppdc.last_deposit_confirmation_serial_id = dcc.last_seen_coin_serial;
+   else
+     ppdc.last_deposit_confirmation_serial_id = dcc.first_missed_coin_serial - 1;
+ */
   /* sync 'cc' back to disk */
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
-    qs = TALER_ARL_adb->update_auditor_progress_deposit_confirmation (
+    qs = TALER_ARL_adb->update_auditor_progress (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &ppdc);
+      TALER_ARL_SET_PP (deposit_confirmation_serial_id),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_auditor_progress_deposit_confirmation (
+    qs = TALER_ARL_adb->insert_auditor_progress (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      &ppdc);
+      TALER_ARL_SET_PP (deposit_confirmation_serial_id),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -254,17 +303,90 @@ analyze_deposit_confirmations (void *cls)
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
     return qs;
   }
+
   number_missed_deposit_confirmations = (json_int_t) dcc.missed_count;
   total_missed_deposit_confirmations = dcc.missed_amount;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Concluded deposit confirmation audit step at %llu\n",
-              (unsigned long long) ppdc.last_deposit_confirmation_serial_id);
+              (unsigned long long) TALER_ARL_USE_PP (
+                deposit_confirmation_serial_id));
   return qs;
 }
 
 
 /**
+ * Function called on events received from Postgres.
+ *
+ * @param cls closure, NULL
+ * @param extra additional event data provided
+ * @param extra_size number of bytes in @a extra
+ */
+static void
+db_notify (void *cls,
+           const void *extra,
+           size_t extra_size)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Received notification for new deposit_confirmation\n");
+
+  (void) cls;
+  (void) extra;
+  (void) extra_size;
+
+  if (NULL ==
+      (db_plugin = TALER_AUDITORDB_plugin_load (cfg)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to initialize DB subsystem\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_assert (NULL !=
+                 (report_deposit_confirmation_inconsistencies = json_array ()));
+
+  if (GNUNET_OK !=
+      TALER_ARL_setup_sessions_and_run (&analyze_deposit_confirmations,
+                                        NULL))
+  {
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Deposit audit complete\n");
+  TALER_ARL_done (
+    GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_array_steal ("deposit_confirmation_inconsistencies",
+                                    report_deposit_confirmation_inconsistencies),
+      GNUNET_JSON_pack_uint64 ("missing_deposit_confirmation_count",
+                               number_missed_deposit_confirmations),
+      TALER_JSON_pack_amount ("missing_deposit_confirmation_total",
+                              &total_missed_deposit_confirmations),
+      TALER_JSON_pack_time_abs_human ("auditor_start_time",
+                                      start_time),
+      TALER_JSON_pack_time_abs_human ("auditor_end_time",
+                                      GNUNET_TIME_absolute_get ())));
+}
+
+
+/**
+ * Function called on shutdown.
+ */
+static void
+do_shutdown (void *cls)
+{
+  (void) cls;
+
+  db_plugin->event_listen_cancel (eh);
+  eh = NULL;
+  TALER_AUDITORDB_plugin_unload (db_plugin);
+  db_plugin = NULL;
+  TALER_ARL_done (NULL);
+}
+
+
+/**
  * Main function that will be run.
  *
  * @param cls closure
@@ -281,6 +403,10 @@ run (void *cls,
   (void) cls;
   (void) args;
   (void) cfgfile;
+  cfg = c;
+
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Launching deposit auditor\n");
   if (GNUNET_OK !=
@@ -289,6 +415,34 @@ run (void *cls,
     global_ret = EXIT_FAILURE;
     return;
   }
+
+  if (NULL ==
+      (db_plugin = TALER_AUDITORDB_plugin_load (cfg)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to initialize DB subsystem\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_OK !=
+      db_plugin->preflight (db_plugin->cls))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to connect to database\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  struct GNUNET_DB_EventHeaderP es = {
+    .size = htons (sizeof (es)),
+    .type = htons (TALER_DBEVENT_EXCHANGE_AUDITOR_NEW_DEPOSIT_CONFIRMATION)
+  };
+  eh = db_plugin->event_listen (db_plugin->cls,
+                                &es,
+                                GNUNET_TIME_UNIT_FOREVER_REL,
+                                &db_notify,
+                                NULL);
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting deposit audit\n");
   GNUNET_assert (NULL !=
@@ -333,11 +487,10 @@ main (int argc,
                                "internal",
                                "perform checks only applicable for exchange-internal audits",
                                &internal_checks),
-    GNUNET_GETOPT_option_base32_auto ('m',
-                                      "exchange-key",
-                                      "KEY",
-                                      "public key of the exchange (Crockford base32 encoded)",
-                                      &TALER_ARL_master_pub),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
diff --git a/src/auditor/taler-helper-auditor-purses.c b/src/auditor/taler-helper-auditor-purses.c
new file mode 100644
index 000000000..967ac13a7
--- /dev/null
+++ b/src/auditor/taler-helper-auditor-purses.c
@@ -0,0 +1,1451 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2016-2024 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Affero 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 Affero Public License for more details.
+
+  You should have received a copy of the GNU Affero Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file auditor/taler-helper-auditor-purses.c
+ * @brief audits the purses of an exchange database
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_auditordb_plugin.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_bank_service.h"
+#include "taler_signatures.h"
+#include "report-lib.h"
+
+
+/**
+ * Use a 1 day grace period to deal with clocks not being perfectly synchronized.
+ */
+#define EXPIRATION_GRACE_PERIOD GNUNET_TIME_UNIT_DAYS
+
+/**
+ * Return value from main().
+ */
+static int global_ret;
+
+/**
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
+ */
+static int test_mode;
+
+/**
+ * Checkpointing our progress for purses.
+ */
+static TALER_ARL_DEF_PP (purse_account_merge_serial_id);
+static TALER_ARL_DEF_PP (purse_decision_serial_id);
+static TALER_ARL_DEF_PP (purse_deposits_serial_id);
+static TALER_ARL_DEF_PP (purse_merges_serial_id);
+static TALER_ARL_DEF_PP (purse_request_serial_id);
+static TALER_ARL_DEF_PP (purse_open_counter);
+static TALER_ARL_DEF_AB (purse_global_balance);
+
+/**
+ * Array of reports about row inconsistencies.
+ */
+static json_t *report_row_inconsistencies;
+
+/**
+ * Array of reports about purse balance insufficient inconsistencies.
+ */
+static json_t *report_purse_balance_insufficient_inconsistencies;
+
+/**
+ * Total amount purses were merged with insufficient balance.
+ */
+static struct TALER_Amount total_balance_insufficient_loss;
+
+/**
+ * Total amount purse decisions are delayed past deadline.
+ */
+static struct TALER_Amount total_delayed_decisions;
+
+/**
+ * Array of reports about purses's not being closed inconsistencies.
+ */
+static json_t *report_purse_not_closed_inconsistencies;
+
+/**
+ * Total amount affected by purses not having been closed on time.
+ */
+static struct TALER_Amount total_balance_purse_not_closed;
+
+/**
+ * Report about amount calculation differences (causing profit
+ * or loss at the exchange).
+ */
+static json_t *report_amount_arithmetic_inconsistencies;
+
+/**
+ * Profits the exchange made by bad amount calculations.
+ */
+static struct TALER_Amount total_arithmetic_delta_plus;
+
+/**
+ * Losses the exchange made by bad amount calculations.
+ */
+static struct TALER_Amount total_arithmetic_delta_minus;
+
+/**
+ * Array of reports about coin operations with bad signatures.
+ */
+static json_t *report_bad_sig_losses;
+
+/**
+ * Total amount lost by operations for which signatures were invalid.
+ */
+static struct TALER_Amount total_bad_sig_loss;
+
+/**
+ * Should we run checks that only work for exchange-internal audits?
+ */
+static int internal_checks;
+
+/* ***************************** Report logic **************************** */
+
+
+/**
+ * Report a (serious) inconsistency in the exchange's database with
+ * respect to calculations involving amounts.
+ *
+ * @param operation what operation had the inconsistency
+ * @param rowid affected row, 0 if row is missing
+ * @param exchange amount calculated by exchange
+ * @param auditor amount calculated by auditor
+ * @param profitable 1 if @a exchange being larger than @a auditor is
+ *           profitable for the exchange for this operation,
+ *           -1 if @a exchange being smaller than @a auditor is
+ *           profitable for the exchange, and 0 if it is unclear
+ */
+static void
+report_amount_arithmetic_inconsistency (
+  const char *operation,
+  uint64_t rowid,
+  const struct TALER_Amount *exchange,
+  const struct TALER_Amount *auditor,
+  int profitable)
+{
+  struct TALER_Amount delta;
+  struct TALER_Amount *target;
+
+  if (0 < TALER_amount_cmp (exchange,
+                            auditor))
+  {
+    /* exchange > auditor */
+    TALER_ARL_amount_subtract (&delta,
+                               exchange,
+                               auditor);
+  }
+  else
+  {
+    /* auditor < exchange */
+    profitable = -profitable;
+    TALER_ARL_amount_subtract (&delta,
+                               auditor,
+                               exchange);
+  }
+  TALER_ARL_report (report_amount_arithmetic_inconsistencies,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_string ("operation",
+                                               operation),
+                      GNUNET_JSON_pack_uint64 ("rowid",
+                                               rowid),
+                      TALER_JSON_pack_amount ("exchange",
+                                              exchange),
+                      TALER_JSON_pack_amount ("auditor",
+                                              auditor),
+                      GNUNET_JSON_pack_int64 ("profitable",
+                                              profitable)));
+  if (0 != profitable)
+  {
+    target = (1 == profitable)
+        ? &total_arithmetic_delta_plus
+        : &total_arithmetic_delta_minus;
+    TALER_ARL_amount_add (target,
+                          target,
+                          &delta);
+  }
+}
+
+
+/**
+ * Report a (serious) inconsistency in the exchange's database.
+ *
+ * @param table affected table
+ * @param rowid affected row, 0 if row is missing
+ * @param diagnostic message explaining the problem
+ */
+static void
+report_row_inconsistency (const char *table,
+                          uint64_t rowid,
+                          const char *diagnostic)
+{
+  TALER_ARL_report (report_row_inconsistencies,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_string ("table",
+                                               table),
+                      GNUNET_JSON_pack_uint64 ("row",
+                                               rowid),
+                      GNUNET_JSON_pack_string ("diagnostic",
+                                               diagnostic)));
+}
+
+
+/**
+ * Obtain the purse fee for a purse created at @a time.
+ *
+ * @param atime when was the purse created
+ * @param[out] fee set to the purse fee
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+get_purse_fee (struct GNUNET_TIME_Timestamp atime,
+               struct TALER_Amount *fee)
+{
+  struct TALER_MasterSignatureP master_sig;
+  struct GNUNET_TIME_Timestamp start_date;
+  struct GNUNET_TIME_Timestamp end_date;
+  struct TALER_GlobalFeeSet fees;
+  struct GNUNET_TIME_Relative ptimeout;
+  struct GNUNET_TIME_Relative hexp;
+  uint32_t pacl;
+
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      TALER_ARL_edb->get_global_fee (TALER_ARL_edb->cls,
+                                     atime,
+                                     &start_date,
+                                     &end_date,
+                                     &fees,
+                                     &ptimeout,
+                                     &hexp,
+                                     &pacl,
+                                     &master_sig))
+  {
+    char *diag;
+
+    GNUNET_asprintf (&diag,
+                     "purse fee unavailable at %s\n",
+                     GNUNET_TIME_timestamp2s (atime));
+    report_row_inconsistency ("purse-fee",
+                              atime.abs_time.abs_value_us,
+                              diag);
+    GNUNET_free (diag);
+    return GNUNET_SYSERR;
+  }
+  *fee = fees.purse;
+  return GNUNET_OK;
+}
+
+
+/* ***************************** Analyze purses ************************ */
+/* This logic checks the purses_requests, purse_deposits,
+   purse_refunds, purse_merges and account_merges */
+
+/**
+ * Summary data we keep per purse.
+ */
+struct PurseSummary
+{
+  /**
+   * Public key of the purse.
+   * Always set when the struct is first initialized.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Balance of the purse from deposits (includes purse fee, excludes deposit
+   * fees), as calculated by auditor.
+   */
+  struct TALER_Amount balance;
+
+  /**
+   * Expected value of the purse, excludes purse fee.
+   */
+  struct TALER_Amount total_value;
+
+  /**
+   * Purse balance according to exchange DB.
+   */
+  struct TALER_Amount exchange_balance;
+
+  /**
+   * Contract terms of the purse.
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * Merge timestamp (as per exchange DB).
+   */
+  struct GNUNET_TIME_Timestamp merge_timestamp;
+
+  /**
+   * Purse creation date.  This is when the merge
+   * fee is applied.
+   */
+  struct GNUNET_TIME_Timestamp creation_date;
+
+  /**
+   * Purse expiration date.
+   */
+  struct GNUNET_TIME_Timestamp expiration_date;
+
+  /**
+   * Did we have a previous purse info?  Used to decide between UPDATE and
+   * INSERT later.  Initialized in #load_auditor_purse_summary().
+   */
+  bool had_pi;
+
+  /**
+   * Was the purse deleted?  FIXME: Not yet handled (do we need to? purse
+   * might just appear as expired eventually; but in the meantime, exchange
+   * may seem to have refunded the coins for no good reason...), also we do
+   * not yet check the deletion signature.
+   */
+  bool purse_deleted;
+
+  /**
+   * Was the purse refunded? FIXME: Not yet handled (do we need to?)
+   */
+  bool purse_refunded;
+
+};
+
+
+/**
+ * Load the auditor's remembered state about the purse into @a ps.
+ *
+ * @param[in,out] ps purse summary to (fully) initialize
+ * @return transaction status code
+ */
+static enum GNUNET_DB_QueryStatus
+load_auditor_purse_summary (struct PurseSummary *ps)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  uint64_t rowid;
+
+  qs = TALER_ARL_adb->get_purse_info (TALER_ARL_adb->cls,
+                                      &ps->purse_pub,
+                                      &rowid,
+                                      &ps->balance,
+                                      &ps->expiration_date);
+  if (0 > qs)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    ps->had_pi = false;
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TALER_ARL_currency,
+                                          &ps->balance));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Creating fresh purse `%s'\n",
+                TALER_B2S (&ps->purse_pub));
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  ps->had_pi = true;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Auditor remembers purse `%s' has balance %s\n",
+              TALER_B2S (&ps->purse_pub),
+              TALER_amount2s (&ps->balance));
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+/**
+ * Closure to the various callbacks we make while checking a purse.
+ */
+struct PurseContext
+{
+  /**
+   * Map from hash of purse's public key to a `struct PurseSummary`.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *purses;
+
+  /**
+   * Transaction status code, set to error codes if applicable.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+
+};
+
+
+/**
+ * Create a new reserve for @a reserve_pub in @a rc.
+ *
+ * @param[in,out] pc context to update
+ * @param purse_pub key for which to create a purse
+ * @return NULL on error
+ */
+static struct PurseSummary *
+setup_purse (struct PurseContext *pc,
+             const struct TALER_PurseContractPublicKeyP *purse_pub)
+{
+  struct PurseSummary *ps;
+  struct GNUNET_HashCode key;
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_CRYPTO_hash (purse_pub,
+                      sizeof (*purse_pub),
+                      &key);
+  ps = GNUNET_CONTAINER_multihashmap_get (pc->purses,
+                                          &key);
+  if (NULL != ps)
+    return ps;
+  ps = GNUNET_new (struct PurseSummary);
+  ps->purse_pub = *purse_pub;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &ps->balance));
+  /* get purse meta-data from exchange DB */
+  qs = TALER_ARL_edb->select_purse (TALER_ARL_edb->cls,
+                                    purse_pub,
+                                    &ps->creation_date,
+                                    &ps->expiration_date,
+                                    &ps->total_value,
+                                    &ps->exchange_balance,
+                                    &ps->h_contract_terms,
+                                    &ps->merge_timestamp,
+                                    &ps->purse_deleted,
+                                    &ps->purse_refunded);
+  if (0 >= qs)
+  {
+    GNUNET_free (ps);
+    pc->qs = qs;
+    return NULL;
+  }
+  if (0 > (qs = load_auditor_purse_summary (ps)))
+  {
+    GNUNET_free (ps);
+    pc->qs = qs;
+    return NULL;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multihashmap_put (pc->purses,
+                                                    &key,
+                                                    ps,
+                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  return ps;
+}
+
+
+/**
+ * Function called on purse requests.
+ *
+ * @param cls closure
+ * @param rowid which row in the database was the request stored in
+ * @param purse_pub public key of the purse
+ * @param merge_pub public key representing the merge capability
+ * @param purse_creation when was the purse created
+ * @param purse_expiration when would an unmerged purse expire
+ * @param h_contract_terms contract associated with the purse
+ * @param age_limit the age limit for deposits into the purse
+ * @param target_amount amount to be put into the purse
+ * @param purse_sig signature of the purse over the initialization data
+ * @return #GNUNET_OK to continue to iterate
+   */
+static enum GNUNET_GenericReturnValue
+handle_purse_requested (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp purse_creation,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t age_limit,
+  const struct TALER_Amount *target_amount,
+  const struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct PurseContext *pc = cls;
+  struct PurseSummary *ps;
+  struct GNUNET_HashCode key;
+
+  TALER_ARL_USE_PP (purse_request_serial_id) = rowid;
+  if (GNUNET_OK !=
+      TALER_wallet_purse_create_verify (purse_expiration,
+                                        h_contract_terms,
+                                        merge_pub,
+                                        age_limit,
+                                        target_amount,
+                                        purse_pub,
+                                        purse_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "purse-reqeust"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                target_amount),
+                        GNUNET_JSON_pack_data_auto ("key_pub",
+                                                    purse_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          target_amount);
+  }
+  GNUNET_CRYPTO_hash (purse_pub,
+                      sizeof (*purse_pub),
+                      &key);
+  ps = GNUNET_new (struct PurseSummary);
+  ps->purse_pub = *purse_pub;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &ps->balance));
+  ps->creation_date = purse_creation;
+  ps->expiration_date = purse_expiration;
+  ps->total_value = *target_amount;
+  ps->h_contract_terms = *h_contract_terms;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multihashmap_put (pc->purses,
+                                                    &key,
+                                                    ps,
+                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about purse deposits that have been made, with
+ * the goal of auditing the deposit's execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param deposit deposit details
+ * @param reserve_pub which reserve is the purse merged into, NULL if unknown
+ * @param flags purse flags
+ * @param auditor_balance purse balance (according to the
+ *          auditor during auditing)
+ * @param purse_total target amount the purse should reach
+ * @param denom_pub denomination public key of @a coin_pub
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_purse_deposits (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_EXCHANGEDB_PurseDeposit *deposit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *auditor_balance,
+  const struct TALER_Amount *purse_total,
+  const struct TALER_DenominationPublicKey *denom_pub)
+{
+  struct PurseContext *pc = cls;
+  struct TALER_Amount amount_minus_fee;
+  struct PurseSummary *ps;
+  const char *base_url
+    = (NULL == deposit->exchange_base_url)
+    ? TALER_ARL_exchange_url
+    : deposit->exchange_base_url;
+  struct TALER_DenominationHashP h_denom_pub;
+
+  /* should be monotonically increasing */
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (purse_deposits_serial_id));
+  TALER_ARL_USE_PP (purse_deposits_serial_id) = rowid + 1;
+
+  {
+    const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TALER_ARL_get_denomination_info (denom_pub,
+                                          &issue,
+                                          &h_denom_pub);
+    if (0 > qs)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Hard database error trying to get denomination %s from database!\n",
+                    TALER_B2S (denom_pub));
+      pc->qs = qs;
+      return GNUNET_SYSERR;
+    }
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    {
+      report_row_inconsistency ("purse-deposit",
+                                rowid,
+                                "denomination key not found");
+      if (TALER_ARL_do_abort ())
+        return GNUNET_SYSERR;
+      return GNUNET_OK;
+    }
+    TALER_ARL_amount_subtract (&amount_minus_fee,
+                               &deposit->amount,
+                               &issue->fees.deposit);
+  }
+
+  if (GNUNET_OK !=
+      TALER_wallet_purse_deposit_verify (base_url,
+                                         &deposit->purse_pub,
+                                         &deposit->amount,
+                                         &h_denom_pub,
+                                         &deposit->h_age_commitment,
+                                         &deposit->coin_pub,
+                                         &deposit->coin_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "purse-deposit"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                &deposit->amount),
+                        GNUNET_JSON_pack_data_auto ("key_pub",
+                                                    &deposit->coin_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          &deposit->amount);
+    return GNUNET_OK;
+  }
+
+  ps = setup_purse (pc,
+                    &deposit->purse_pub);
+  if (NULL == ps)
+  {
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs)
+    {
+      report_row_inconsistency ("purse-deposit",
+                                rowid,
+                                "purse not found");
+    }
+    else
+    {
+      /* Database trouble!? */
+      GNUNET_break (0);
+    }
+    return GNUNET_SYSERR;
+  }
+  TALER_ARL_amount_add (&ps->balance,
+                        &ps->balance,
+                        &amount_minus_fee);
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (purse_global_balance),
+                        &TALER_ARL_USE_AB (purse_global_balance),
+                        &amount_minus_fee);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about purse merges that have been made, with
+ * the goal of auditing the purse merge execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param partner_base_url where is the reserve, NULL for this exchange
+ * @param amount total amount expected in the purse
+ * @param balance current balance in the purse
+ * @param flags purse flags
+ * @param merge_pub merge capability key
+ * @param reserve_pub reserve the merge affects
+ * @param merge_sig signature affirming the merge
+ * @param purse_pub purse key
+ * @param merge_timestamp when did the merge happen
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_purse_merged (
+  void *cls,
+  uint64_t rowid,
+  const char *partner_base_url,
+  const struct TALER_Amount *amount,
+  const struct TALER_Amount *balance,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp merge_timestamp)
+{
+  struct PurseContext *pc = cls;
+  struct PurseSummary *ps;
+
+  /* should be monotonically increasing */
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (purse_merges_serial_id));
+  TALER_ARL_USE_PP (purse_merges_serial_id) = rowid + 1;
+
+  {
+    char *reserve_url;
+
+    reserve_url
+      = TALER_reserve_make_payto (NULL == partner_base_url
+                                ? TALER_ARL_exchange_url
+                                : partner_base_url,
+                                  reserve_pub);
+    if (GNUNET_OK !=
+        TALER_wallet_purse_merge_verify (reserve_url,
+                                         merge_timestamp,
+                                         purse_pub,
+                                         merge_pub,
+                                         merge_sig))
+    {
+      GNUNET_free (reserve_url);
+      TALER_ARL_report (report_bad_sig_losses,
+                        GNUNET_JSON_PACK (
+                          GNUNET_JSON_pack_string ("operation",
+                                                   "merge-purse"),
+                          GNUNET_JSON_pack_uint64 ("row",
+                                                   rowid),
+                          TALER_JSON_pack_amount ("loss",
+                                                  amount),
+                          GNUNET_JSON_pack_data_auto ("key_pub",
+                                                      merge_pub)));
+      TALER_ARL_amount_add (&total_bad_sig_loss,
+                            &total_bad_sig_loss,
+                            amount);
+      return GNUNET_OK;
+    }
+    GNUNET_free (reserve_url);
+  }
+
+  ps = setup_purse (pc,
+                    purse_pub);
+  if (NULL == ps)
+  {
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs)
+    {
+      report_row_inconsistency ("purse-merge",
+                                rowid,
+                                "purse not found");
+    }
+    else
+    {
+      /* Database trouble!? */
+      GNUNET_break (0);
+    }
+    return GNUNET_SYSERR;
+  }
+  GNUNET_break (0 ==
+                GNUNET_TIME_timestamp_cmp (merge_timestamp,
+                                           ==,
+                                           ps->merge_timestamp));
+  TALER_ARL_amount_add (&ps->balance,
+                        &ps->balance,
+                        amount);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about account merge requests that have been
+ * made, with the goal of auditing the account merge execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param reserve_pub reserve affected by the merge
+ * @param purse_pub purse being merged
+ * @param h_contract_terms hash over contract of the purse
+ * @param purse_expiration when would the purse expire
+ * @param amount total amount in the purse
+ * @param min_age minimum age of all coins deposited into the purse
+ * @param flags how was the purse created
+ * @param purse_fee if a purse fee was paid, how high is it
+ * @param merge_timestamp when was the merge approved
+ * @param reserve_sig signature by reserve approving the merge
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_account_merged (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_Amount *amount,
+  uint32_t min_age,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *purse_fee,
+  struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct PurseContext *pc = cls;
+  struct PurseSummary *ps;
+
+  /* should be monotonically increasing */
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (purse_account_merge_serial_id));
+  TALER_ARL_USE_PP (purse_account_merge_serial_id) = rowid + 1;
+  if (GNUNET_OK !=
+      TALER_wallet_account_merge_verify (merge_timestamp,
+                                         purse_pub,
+                                         purse_expiration,
+                                         h_contract_terms,
+                                         amount,
+                                         purse_fee,
+                                         min_age,
+                                         flags,
+                                         reserve_pub,
+                                         reserve_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "account-merge"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                purse_fee),
+                        GNUNET_JSON_pack_data_auto ("key_pub",
+                                                    reserve_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          purse_fee);
+    return GNUNET_OK;
+  }
+  ps = setup_purse (pc,
+                    purse_pub);
+  if (NULL == ps)
+  {
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs)
+    {
+      report_row_inconsistency ("account-merge",
+                                rowid,
+                                "purse not found");
+    }
+    else
+    {
+      /* Database trouble!? */
+      GNUNET_break (0);
+    }
+    return GNUNET_SYSERR;
+  }
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (purse_global_balance),
+                        &TALER_ARL_USE_AB (purse_global_balance),
+                        purse_fee);
+  TALER_ARL_amount_add (&ps->balance,
+                        &ps->balance,
+                        purse_fee);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about purse decisions that have been made.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param purse_pub which purse was the decision made on
+ * @param refunded true if decision was to refund
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_purse_decision (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  bool refunded)
+{
+  struct PurseContext *pc = cls;
+  struct PurseSummary *ps;
+  struct GNUNET_HashCode key;
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_Amount purse_fee;
+  struct TALER_Amount balance_without_purse_fee;
+
+  TALER_ARL_USE_PP (purse_decision_serial_id) = rowid;
+  ps = setup_purse (pc,
+                    purse_pub);
+  if (NULL == ps)
+  {
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs)
+    {
+      report_row_inconsistency ("purse-decision",
+                                rowid,
+                                "purse not found");
+    }
+    else
+    {
+      /* Database trouble!? */
+      GNUNET_break (0);
+    }
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      get_purse_fee (ps->creation_date,
+                     &purse_fee))
+  {
+    report_row_inconsistency ("purse-request",
+                              rowid,
+                              "purse fee unavailable");
+  }
+  if (0 >
+      TALER_amount_subtract (&balance_without_purse_fee,
+                             &ps->balance,
+                             &purse_fee))
+  {
+    report_row_inconsistency ("purse-request",
+                              rowid,
+                              "purse fee higher than balance");
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TALER_ARL_currency,
+                                          &balance_without_purse_fee));
+  }
+
+  if (refunded)
+  {
+    if (-1 != TALER_amount_cmp (&balance_without_purse_fee,
+                                &ps->total_value))
+    {
+      report_amount_arithmetic_inconsistency ("purse-decision: refund",
+                                              rowid,
+                                              &balance_without_purse_fee,
+                                              &ps->total_value,
+                                              0);
+    }
+  }
+  else
+  {
+    if (-1 == TALER_amount_cmp (&balance_without_purse_fee,
+                                &ps->total_value))
+    {
+      report_amount_arithmetic_inconsistency ("purse-decision: merge",
+                                              rowid,
+                                              &ps->total_value,
+                                              &balance_without_purse_fee,
+                                              0);
+      TALER_ARL_amount_add (&total_balance_insufficient_loss,
+                            &total_balance_insufficient_loss,
+                            &ps->total_value);
+    }
+  }
+
+  qs = TALER_ARL_adb->delete_purse_info (TALER_ARL_adb->cls,
+                                         purse_pub);
+  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
+    pc->qs = qs;
+    return GNUNET_SYSERR;
+  }
+  GNUNET_CRYPTO_hash (purse_pub,
+                      sizeof (*purse_pub),
+                      &key);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap_remove (pc->purses,
+                                                       &key,
+                                                       ps));
+  GNUNET_free (ps);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called on expired purses.
+ *
+ * @param cls closure
+ * @param purse_pub public key of the purse
+ * @param balance amount of money in the purse
+ * @param expiration_date when did the purse expire?
+ * @return #GNUNET_OK to continue to iterate
+ */
+static enum GNUNET_GenericReturnValue
+handle_purse_expired (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp expiration_date)
+{
+  struct PurseContext *pc = cls;
+
+  (void) pc;
+  TALER_ARL_report (report_purse_not_closed_inconsistencies,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_data_auto ("purse_pub",
+                                                  purse_pub),
+                      TALER_JSON_pack_amount ("balance",
+                                              balance),
+                      TALER_JSON_pack_time_abs_human ("expired",
+                                                      expiration_date.abs_time)));
+  TALER_ARL_amount_add (&total_delayed_decisions,
+                        &total_delayed_decisions,
+                        balance);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Check that the purse summary matches what the exchange database
+ * thinks about the purse, and update our own state of the purse.
+ *
+ * Remove all purses that we are happy with from the DB.
+ *
+ * @param cls our `struct PurseContext`
+ * @param key hash of the purse public key
+ * @param value a `struct PurseSummary`
+ * @return #GNUNET_OK to process more entries
+ */
+static enum GNUNET_GenericReturnValue
+verify_purse_balance (void *cls,
+                      const struct GNUNET_HashCode *key,
+                      void *value)
+{
+  struct PurseContext *pc = cls;
+  struct PurseSummary *ps = value;
+  enum GNUNET_GenericReturnValue ret;
+  enum GNUNET_DB_QueryStatus qs;
+
+  ret = GNUNET_OK;
+  if (internal_checks)
+  {
+    struct TALER_Amount pf;
+    struct TALER_Amount balance_without_purse_fee;
+
+    /* subtract purse fee from ps->balance to get actual balance we expect, as
+       we track the balance including purse fee, while the exchange subtracts
+       the purse fee early on. */
+    if (GNUNET_OK !=
+        get_purse_fee (ps->creation_date,
+                       &pf))
+    {
+      GNUNET_break (0);
+      report_row_inconsistency ("purse",
+                                0,
+                                "purse fee unavailable");
+    }
+    if (0 >
+        TALER_amount_subtract (&balance_without_purse_fee,
+                               &ps->balance,
+                               &pf))
+    {
+      report_row_inconsistency ("purse",
+                                0,
+                                "purse fee higher than balance");
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_amount_set_zero (TALER_ARL_currency,
+                                            &balance_without_purse_fee));
+    }
+
+    if (0 != TALER_amount_cmp (&ps->exchange_balance,
+                               &balance_without_purse_fee))
+    {
+      report_amount_arithmetic_inconsistency ("purse-balance",
+                                              0,
+                                              &ps->exchange_balance,
+                                              &balance_without_purse_fee,
+                                              0);
+    }
+  }
+
+  if (ps->had_pi)
+    qs = TALER_ARL_adb->update_purse_info (TALER_ARL_adb->cls,
+                                           &ps->purse_pub,
+                                           &ps->balance);
+  else
+    qs = TALER_ARL_adb->insert_purse_info (TALER_ARL_adb->cls,
+                                           &ps->purse_pub,
+                                           &ps->balance,
+                                           ps->expiration_date);
+  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
+    pc->qs = qs;
+    return GNUNET_SYSERR;
+  }
+
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multihashmap_remove (pc->purses,
+                                                       key,
+                                                       ps));
+  GNUNET_free (ps);
+  return ret;
+}
+
+
+/**
+ * Analyze purses for being well-formed.
+ *
+ * @param cls NULL
+ * @return transaction status code
+ */
+static enum GNUNET_DB_QueryStatus
+analyze_purses (void *cls)
+{
+  struct PurseContext pc;
+  enum GNUNET_DB_QueryStatus qsx;
+  enum GNUNET_DB_QueryStatus qs;
+  enum GNUNET_DB_QueryStatus qsp;
+
+  (void) cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Analyzing purses\n");
+  qsp = TALER_ARL_adb->get_auditor_progress (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_PP (purse_account_merge_serial_id),
+    TALER_ARL_GET_PP (purse_decision_serial_id),
+    TALER_ARL_GET_PP (purse_deposits_serial_id),
+    TALER_ARL_GET_PP (purse_merges_serial_id),
+    TALER_ARL_GET_PP (purse_request_serial_id),
+    TALER_ARL_GET_PP (purse_open_counter),
+    NULL);
+  if (0 > qsp)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsp);
+    return qsp;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsp)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "First analysis using this auditor, starting audit from scratch\n");
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Resuming purse audit at %llu/%llu/%llu/%llu/%llu\n",
+                (unsigned long long) TALER_ARL_USE_PP (
+                  purse_request_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  purse_decision_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  purse_merges_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  purse_deposits_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  purse_account_merge_serial_id));
+  }
+  pc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+  qsx = TALER_ARL_adb->get_balance (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_AB (purse_global_balance),
+    NULL);
+  if (qsx < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsx);
+    return qsx;
+  }
+  pc.purses = GNUNET_CONTAINER_multihashmap_create (512,
+                                                    GNUNET_NO);
+
+  qs = TALER_ARL_edb->select_purse_requests_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (purse_request_serial_id),
+    &handle_purse_requested,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+
+  qs = TALER_ARL_edb->select_purse_merges_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (purse_merges_serial_id),
+    &handle_purse_merged,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  qs = TALER_ARL_edb->select_purse_deposits_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (purse_deposits_serial_id),
+    &handle_purse_deposits,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  /* Charge purse fee! */
+  qs = TALER_ARL_edb->select_account_merges_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (purse_account_merge_serial_id),
+    &handle_account_merged,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+
+  qs = TALER_ARL_edb->select_all_purse_decisions_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (purse_decision_serial_id),
+    &handle_purse_decision,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+
+  qs = TALER_ARL_adb->select_purse_expired (
+    TALER_ARL_adb->cls,
+    &handle_purse_expired,
+    &pc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+
+  GNUNET_CONTAINER_multihashmap_iterate (pc.purses,
+                                         &verify_purse_balance,
+                                         &pc);
+  GNUNET_break (0 ==
+                GNUNET_CONTAINER_multihashmap_size (pc.purses));
+  GNUNET_CONTAINER_multihashmap_destroy (pc.purses);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != pc.qs)
+    return qs;
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsx)
+  {
+    qs = TALER_ARL_adb->insert_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (purse_global_balance),
+      NULL);
+  }
+  else
+  {
+    qs = TALER_ARL_adb->update_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (purse_global_balance),
+      NULL);
+  }
+  if (0 >= qs)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
+    qs = TALER_ARL_adb->update_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (purse_account_merge_serial_id),
+      TALER_ARL_SET_PP (purse_decision_serial_id),
+      TALER_ARL_SET_PP (purse_deposits_serial_id),
+      TALER_ARL_SET_PP (purse_merges_serial_id),
+      TALER_ARL_SET_PP (purse_request_serial_id),
+      TALER_ARL_SET_PP (purse_open_counter),
+      NULL);
+  else
+    qs = TALER_ARL_adb->insert_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (purse_account_merge_serial_id),
+      TALER_ARL_SET_PP (purse_decision_serial_id),
+      TALER_ARL_SET_PP (purse_deposits_serial_id),
+      TALER_ARL_SET_PP (purse_merges_serial_id),
+      TALER_ARL_SET_PP (purse_request_serial_id),
+      TALER_ARL_SET_PP (purse_open_counter),
+      NULL);
+  if (0 >= qs)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Failed to update auditor DB, not recording progress\n");
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Concluded purse audit step at %llu/%llu/%llu/%llu/%llu\n",
+              (unsigned long long) TALER_ARL_USE_PP (
+                purse_request_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                purse_decision_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                purse_merges_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                purse_deposits_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                purse_account_merge_serial_id));
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  (void) cls;
+  (void) args;
+  (void) cfgfile;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Launching auditor\n");
+  if (GNUNET_OK !=
+      TALER_ARL_init (c))
+  {
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &TALER_ARL_USE_AB (
+                                          purse_global_balance)));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_balance_insufficient_loss));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_delayed_decisions));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_arithmetic_delta_plus));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_arithmetic_delta_minus));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_balance_purse_not_closed));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_bad_sig_loss));
+
+  GNUNET_assert (NULL !=
+                 (report_row_inconsistencies = json_array ()));
+  GNUNET_assert (NULL !=
+                 (report_purse_balance_insufficient_inconsistencies
+                    = json_array ()));
+  GNUNET_assert (NULL !=
+                 (report_purse_not_closed_inconsistencies
+                    = json_array ()));
+  GNUNET_assert (NULL !=
+                 (report_amount_arithmetic_inconsistencies
+                    = json_array ()));
+  GNUNET_assert (NULL !=
+                 (report_bad_sig_losses = json_array ()));
+  if (GNUNET_OK !=
+      TALER_ARL_setup_sessions_and_run (&analyze_purses,
+                                        NULL))
+  {
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+  TALER_ARL_done (
+    GNUNET_JSON_PACK (
+      /* Globals (REVIEW!) */
+      TALER_JSON_pack_amount ("total_balance_insufficient",
+                              &total_balance_insufficient_loss),
+      TALER_JSON_pack_amount ("total_delayed_purse_decisions",
+                              &total_delayed_decisions),
+      GNUNET_JSON_pack_array_steal (
+        "purse_balance_insufficient_inconsistencies",
+        report_purse_balance_insufficient_inconsistencies),
+      TALER_JSON_pack_amount ("total_balance_purse_not_closed",
+                              &total_balance_purse_not_closed),
+      TALER_JSON_pack_amount ("total_bad_sig_loss",
+                              &total_bad_sig_loss),
+      TALER_JSON_pack_amount ("total_arithmetic_delta_plus",
+                              &total_arithmetic_delta_plus),
+      TALER_JSON_pack_amount ("total_arithmetic_delta_minus",
+                              &total_arithmetic_delta_minus),
+
+      /* Global 'balances' */
+      TALER_JSON_pack_amount ("total_purse_balance",
+                              &TALER_ARL_USE_AB (purse_global_balance)),
+      GNUNET_JSON_pack_uint64 ("total_purse_count",
+                               TALER_ARL_USE_PP (purse_open_counter)),
+
+      GNUNET_JSON_pack_array_steal ("purse_not_closed_inconsistencies",
+                                    report_purse_not_closed_inconsistencies),
+      GNUNET_JSON_pack_array_steal ("bad_sig_losses",
+                                    report_bad_sig_losses),
+      GNUNET_JSON_pack_array_steal ("row_inconsistencies",
+                                    report_row_inconsistencies),
+      GNUNET_JSON_pack_array_steal ("amount_arithmetic_inconsistencies",
+                                    report_amount_arithmetic_inconsistencies),
+      /* Information about audited range ... */
+      TALER_JSON_pack_time_abs_human ("auditor_start_time",
+                                      start_time),
+      TALER_JSON_pack_time_abs_human ("auditor_end_time",
+                                      GNUNET_TIME_absolute_get ()),
+      GNUNET_JSON_pack_uint64 ("start_ppp_purse_merges_serial_id",
+                               0 /* not supported anymore */),
+      GNUNET_JSON_pack_uint64 ("start_ppp_purse_deposits_serial_id",
+                               0 /* not supported anymore */),
+      GNUNET_JSON_pack_uint64 ("start_ppp_account_merge_serial_id",
+                               0 /* not supported anymore */),
+      GNUNET_JSON_pack_uint64 ("end_ppp_purse_merges_serial_id",
+                               TALER_ARL_USE_PP (
+                                 purse_merges_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppp_purse_deposits_serial_id",
+                               TALER_ARL_USE_PP (
+                                 purse_deposits_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppp_account_merge_serial_id",
+                               TALER_ARL_USE_PP (
+                                 purse_account_merge_serial_id))));
+}
+
+
+/**
+ * The main function to check the database's handling of purses.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc,
+      char *const *argv)
+{
+  const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_flag ('i',
+                               "internal",
+                               "perform checks only applicable for exchange-internal audits",
+                               &internal_checks),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
+    GNUNET_GETOPT_option_timetravel ('T',
+                                     "timetravel"),
+    GNUNET_GETOPT_OPTION_END
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  /* force linker to link against libtalerutil; if we do
+     not do this, the linker may "optimize" libtalerutil
+     away and skip #TALER_OS_init(), which we do need */
+  (void) TALER_project_data_default ();
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
+    return EXIT_INVALIDARGUMENT;
+  ret = GNUNET_PROGRAM_run (
+    argc,
+    argv,
+    "taler-helper-auditor-purses",
+    gettext_noop ("Audit Taler exchange purse handling"),
+    options,
+    &run,
+    NULL);
+  GNUNET_free_nz ((void *) argv);
+  if (GNUNET_SYSERR == ret)
+    return EXIT_INVALIDARGUMENT;
+  if (GNUNET_NO == ret)
+    return EXIT_SUCCESS;
+  return global_ret;
+}
+
+
+/* end of taler-helper-auditor-purses.c */
diff --git a/src/auditor/taler-helper-auditor-render.py b/src/auditor/taler-helper-auditor-render.py
index 4b086cb62..b9c92b29c 100644
--- a/src/auditor/taler-helper-auditor-render.py
+++ b/src/auditor/taler-helper-auditor-render.py
@@ -53,4 +53,14 @@ jinjaEnv = jinja2.Environment(loader=StdinLoader(),
                               autoescape=False)
 tmpl = jinjaEnv.get_template('stdin');
 
-print(tmpl.render(aggregation = jsonData1, coins = jsonData2, deposits = jsonData3, reserves = jsonData4, wire = jsonData5))
+try:
+     print(tmpl.render(aggregation = jsonData1, coins = jsonData2, deposits = jsonData3, reserves = jsonData4, wire = jsonData5))
+except jinja2.TemplateSyntaxError as error:
+     print("Template syntax error: {error.message} on line {error.lineno}.".format(error=error))
+     exit(1)
+except jinja2.UndefinedError as error:
+     print("Template undefined error: {error.message}.".format(error=error))
+     exit(1)
+except TypeError as error:
+     print("Template type error: {0}.".format(error.args[0]))
+     exit(1)
diff --git a/src/auditor/taler-helper-auditor-reserves.c b/src/auditor/taler-helper-auditor-reserves.c
index 17d628399..aa35c6a75 100644
--- a/src/auditor/taler-helper-auditor-reserves.c
+++ b/src/auditor/taler-helper-auditor-reserves.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2022 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero Public License as published by the Free Software
@@ -39,6 +39,14 @@
 static int global_ret;
 
 /**
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
+ */
+static int test_mode;
+
+/**
  * After how long should idle reserves be closed?
  */
 static struct GNUNET_TIME_Relative idle_reserve_expiration_time;
@@ -46,15 +54,29 @@ static struct GNUNET_TIME_Relative idle_reserve_expiration_time;
 /**
  * Checkpointing our progress for reserves.
  */
-static struct TALER_AUDITORDB_ProgressPointReserve ppr;
+static TALER_ARL_DEF_PP (reserves_reserve_in_serial_id);
+static TALER_ARL_DEF_PP (reserves_reserve_out_serial_id);
+static TALER_ARL_DEF_PP (reserves_reserve_recoup_serial_id);
+static TALER_ARL_DEF_PP (reserves_reserve_open_serial_id);
+static TALER_ARL_DEF_PP (reserves_reserve_close_serial_id);
+static TALER_ARL_DEF_PP (reserves_purse_decisions_serial_id);
+static TALER_ARL_DEF_PP (reserves_account_merges_serial_id);
+static TALER_ARL_DEF_PP (reserves_history_requests_serial_id);
 
 /**
- * Checkpointing our progress for reserves.
+ * Tracked global reserve balances.
  */
-static struct TALER_AUDITORDB_ProgressPointReserve ppr_start;
+static TALER_ARL_DEF_AB (reserves_reserve_total_balance);
+static TALER_ARL_DEF_AB (reserves_reserve_loss);
+static TALER_ARL_DEF_AB (reserves_withdraw_fee_revenue);
+static TALER_ARL_DEF_AB (reserves_close_fee_revenue);
+static TALER_ARL_DEF_AB (reserves_purse_fee_revenue);
+static TALER_ARL_DEF_AB (reserves_open_fee_revenue);
+static TALER_ARL_DEF_AB (reserves_history_fee_revenue);
+
 
 /**
- * Array of reports about row inconsitencies.
+ * Array of reports about row inconsistencies.
  */
 static json_t *report_row_inconsistencies;
 
@@ -65,14 +87,14 @@ static json_t *report_row_inconsistencies;
 static json_t *denomination_key_validity_withdraw_inconsistencies;
 
 /**
- * Array of reports about reserve balance insufficient inconsitencies.
+ * Array of reports about reserve balance insufficient inconsistencies.
  */
 static json_t *report_reserve_balance_insufficient_inconsistencies;
 
 /**
- * Total amount reserves were charged beyond their balance.
+ * Array of reports about purse balance insufficient inconsistencies.
  */
-static struct TALER_Amount total_balance_insufficient_loss;
+static json_t *report_purse_balance_insufficient_inconsistencies;
 
 /**
  * Array of reports about reserve balance summary wrong in database.
@@ -81,18 +103,20 @@ static json_t *report_reserve_balance_summary_wrong_inconsistencies;
 
 /**
  * Total delta between expected and stored reserve balance summaries,
- * for positive deltas.
+ * for positive deltas.  Used only when internal checks are
+ * enabled.
  */
 static struct TALER_Amount total_balance_summary_delta_plus;
 
 /**
  * Total delta between expected and stored reserve balance summaries,
- * for negative deltas.
+ * for negative deltas.  Used only when internal checks are
+ * enabled.
  */
 static struct TALER_Amount total_balance_summary_delta_minus;
 
 /**
- * Array of reports about reserve's not being closed inconsitencies.
+ * Array of reports about reserve's not being closed inconsistencies.
  */
 static json_t *report_reserve_not_closed_inconsistencies;
 
@@ -118,21 +142,6 @@ static struct TALER_Amount total_arithmetic_delta_plus;
 static struct TALER_Amount total_arithmetic_delta_minus;
 
 /**
- * Expected balance in the escrow account.
- */
-static struct TALER_Amount total_escrow_balance;
-
-/**
- * Recoups we made on denominations that were not revoked (!?).
- */
-static struct TALER_Amount total_irregular_recoups;
-
-/**
- * Total withdraw fees earned.
- */
-static struct TALER_Amount total_withdraw_fee_income;
-
-/**
  * Array of reports about coin operations with bad signatures.
  */
 static json_t *report_bad_sig_losses;
@@ -205,8 +214,8 @@ report_amount_arithmetic_inconsistency (
   if (0 != profitable)
   {
     target = (1 == profitable)
-             ? &total_arithmetic_delta_plus
-             : &total_arithmetic_delta_minus;
+        ? &total_arithmetic_delta_plus
+        : &total_arithmetic_delta_minus;
     TALER_ARL_amount_add (target,
                           target,
                           &delta);
@@ -264,21 +273,15 @@ struct ReserveSummary
   struct TALER_Amount total_out;
 
   /**
-   * Sum of withdraw fees encountered during this transaction.
+   * Sum of balance and fees encountered during this transaction.
    */
-  struct TALER_Amount total_fee;
+  struct TALER_AUDITORDB_ReserveFeeBalance curr_balance;
 
   /**
-   * Previous balance of the reserve as remembered by the auditor.
+   * Previous balances of the reserve as remembered by the auditor.
    * (updated based on @e total_in and @e total_out at the end).
    */
-  struct TALER_Amount balance_at_previous_audit;
-
-  /**
-   * Previous withdraw fee balance of the reserve, as remembered by the auditor.
-   * (updated based on @e total_fee at the end).
-   */
-  struct TALER_Amount a_withdraw_fee_balance;
+  struct TALER_AUDITORDB_ReserveFeeBalance prev_balance;
 
   /**
    * Previous reserve expiration data, as remembered by the auditor.
@@ -297,7 +300,7 @@ struct ReserveSummary
    * #load_auditor_reserve_summary() together with the a-* values
    * (if available).
    */
-  int had_ri;
+  bool had_ri;
 
 };
 
@@ -318,10 +321,8 @@ load_auditor_reserve_summary (struct ReserveSummary *rs)
 
   qs = TALER_ARL_adb->get_reserve_info (TALER_ARL_adb->cls,
                                         &rs->reserve_pub,
-                                        &TALER_ARL_master_pub,
                                         &rowid,
-                                        &rs->balance_at_previous_audit,
-                                        &rs->a_withdraw_fee_balance,
+                                        &rs->prev_balance,
                                         &rs->a_expiration_date,
                                         &rs->sender_account);
   if (0 > qs)
@@ -331,34 +332,38 @@ load_auditor_reserve_summary (struct ReserveSummary *rs)
   }
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
   {
-    rs->had_ri = GNUNET_NO;
+    rs->had_ri = false;
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (rs->total_in.currency,
+                                          &rs->prev_balance.reserve_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (rs->total_in.currency,
+                                          &rs->prev_balance.reserve_loss));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (rs->total_in.currency,
+                                          &rs->prev_balance.withdraw_fee_balance));
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (rs->total_in.currency,
-                                          &rs->balance_at_previous_audit));
+                                          &rs->prev_balance.close_fee_balance));
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (rs->total_in.currency,
-                                          &rs->a_withdraw_fee_balance));
+                                          &rs->prev_balance.purse_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (rs->total_in.currency,
+                                          &rs->prev_balance.open_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (rs->total_in.currency,
+                                          &rs->prev_balance.history_fee_balance));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Creating fresh reserve `%s' with starting balance %s\n",
-                TALER_B2S (&rs->reserve_pub),
-                TALER_amount2s (&rs->balance_at_previous_audit));
+                "Creating fresh reserve `%s'\n",
+                TALER_B2S (&rs->reserve_pub));
     return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
   }
-  rs->had_ri = GNUNET_YES;
-  if ( (GNUNET_YES !=
-        TALER_amount_cmp_currency (&rs->balance_at_previous_audit,
-                                   &rs->a_withdraw_fee_balance)) ||
-       (GNUNET_YES !=
-        TALER_amount_cmp_currency (&rs->total_in,
-                                   &rs->balance_at_previous_audit)) )
-  {
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
+  rs->had_ri = true;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Auditor remembers reserve `%s' has balance %s\n",
               TALER_B2S (&rs->reserve_pub),
-              TALER_amount2s (&rs->balance_at_previous_audit));
+              TALER_amount2s (&rs->prev_balance.reserve_balance));
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
 
@@ -390,6 +395,72 @@ struct ReserveContext
 
 
 /**
+ * Create a new reserve for @a reserve_pub in @a rc.
+ *
+ * @param[in,out] rc context to update
+ * @param reserve_pub key for which to create a reserve
+ * @return NULL on error
+ */
+static struct ReserveSummary *
+setup_reserve (struct ReserveContext *rc,
+               const struct TALER_ReservePublicKeyP *reserve_pub)
+{
+  struct ReserveSummary *rs;
+  struct GNUNET_HashCode key;
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_CRYPTO_hash (reserve_pub,
+                      sizeof (*reserve_pub),
+                      &key);
+  rs = GNUNET_CONTAINER_multihashmap_get (rc->reserves,
+                                          &key);
+  if (NULL != rs)
+    return rs;
+  rs = GNUNET_new (struct ReserveSummary);
+  rs->reserve_pub = *reserve_pub;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->total_in));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->total_out));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.reserve_balance));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.reserve_loss));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.withdraw_fee_balance));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.close_fee_balance));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.purse_fee_balance));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.open_fee_balance));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &rs->curr_balance.history_fee_balance));
+  if (0 > (qs = load_auditor_reserve_summary (rs)))
+  {
+    GNUNET_free (rs);
+    rc->qs = qs;
+    return NULL;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multihashmap_put (rc->reserves,
+                                                    &key,
+                                                    rs,
+                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  return rs;
+}
+
+
+/**
  * Function called with details about incoming wire transfers.
  *
  * @param cls our `struct ReserveContext`
@@ -401,7 +472,7 @@ struct ReserveContext
  * @param execution_date when did we receive the funds
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
-static int
+static enum GNUNET_GenericReturnValue
 handle_reserve_in (void *cls,
                    uint64_t rowid,
                    const struct TALER_ReservePublicKeyP *reserve_pub,
@@ -411,54 +482,22 @@ handle_reserve_in (void *cls,
                    struct GNUNET_TIME_Timestamp execution_date)
 {
   struct ReserveContext *rc = cls;
-  struct GNUNET_HashCode key;
   struct ReserveSummary *rs;
   struct GNUNET_TIME_Timestamp expiry;
-  enum GNUNET_DB_QueryStatus qs;
 
   (void) wire_reference;
   /* should be monotonically increasing */
-  GNUNET_assert (rowid >= ppr.last_reserve_in_serial_id);
-  ppr.last_reserve_in_serial_id = rowid + 1;
-
-  GNUNET_CRYPTO_hash (reserve_pub,
-                      sizeof (*reserve_pub),
-                      &key);
-  rs = GNUNET_CONTAINER_multihashmap_get (rc->reserves,
-                                          &key);
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_reserve_in_serial_id));
+  TALER_ARL_USE_PP (reserves_reserve_in_serial_id) = rowid + 1;
+  rs = setup_reserve (rc,
+                      reserve_pub);
   if (NULL == rs)
   {
-    rs = GNUNET_new (struct ReserveSummary);
-    rs->sender_account = GNUNET_strdup (sender_account_details);
-    rs->reserve_pub = *reserve_pub;
-    rs->total_in = *credit;
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (credit->currency,
-                                          &rs->total_out));
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (credit->currency,
-                                          &rs->total_fee));
-    if (0 > (qs = load_auditor_reserve_summary (rs)))
-    {
-      GNUNET_break (0);
-      GNUNET_free (rs);
-      rc->qs = qs;
-      return GNUNET_SYSERR;
-    }
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (rc->reserves,
-                                                      &key,
-                                                      rs,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  else
-  {
-    TALER_ARL_amount_add (&rs->total_in,
-                          &rs->total_in,
-                          credit);
-    if (NULL == rs->sender_account)
-      rs->sender_account = GNUNET_strdup (sender_account_details);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
+  if (NULL == rs->sender_account)
+    rs->sender_account = GNUNET_strdup (sender_account_details);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Additional incoming wire transfer for reserve `%s' of %s\n",
               TALER_B2S (reserve_pub),
@@ -468,6 +507,9 @@ handle_reserve_in (void *cls,
                               idle_reserve_expiration_time));
   rs->a_expiration_date = GNUNET_TIME_timestamp_max (rs->a_expiration_date,
                                                      expiry);
+  TALER_ARL_amount_add (&rs->total_in,
+                        &rs->total_in,
+                        credit);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
   return GNUNET_OK;
@@ -499,7 +541,6 @@ handle_reserve_out (void *cls,
                     const struct TALER_Amount *amount_with_fee)
 {
   struct ReserveContext *rc = cls;
-  struct GNUNET_HashCode key;
   struct ReserveSummary *rs;
   const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue;
   struct TALER_Amount auditor_amount_with_fee;
@@ -507,8 +548,8 @@ handle_reserve_out (void *cls,
   struct TALER_DenominationHashP h_denom_pub;
 
   /* should be monotonically increasing */
-  GNUNET_assert (rowid >= ppr.last_reserve_out_serial_id);
-  ppr.last_reserve_out_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_reserve_out_serial_id));
+  TALER_ARL_USE_PP (reserves_reserve_out_serial_id) = rowid + 1;
 
   /* lookup denomination pub data (make sure denom_pub is valid, establish fees);
      initializes wsrd.h_denomination_pub! */
@@ -584,7 +625,7 @@ handle_reserve_out (void *cls,
                           amount_with_fee);
     if (TALER_ARL_do_abort ())
       return GNUNET_SYSERR;
-    return GNUNET_OK;   /* exit function here, we cannot add this to the legitimate withdrawals */
+    return GNUNET_OK;     /* exit function here, we cannot add this to the legitimate withdrawals */
   }
 
   TALER_ARL_amount_add (&auditor_amount_with_fee,
@@ -598,43 +639,12 @@ handle_reserve_out (void *cls,
                               rowid,
                               "amount with fee from exchange does not match denomination value plus fee");
   }
-
-
-  GNUNET_CRYPTO_hash (reserve_pub,
-                      sizeof (*reserve_pub),
-                      &key);
-  rs = GNUNET_CONTAINER_multihashmap_get (rc->reserves,
-                                          &key);
+  rs = setup_reserve (rc,
+                      reserve_pub);
   if (NULL == rs)
   {
-    rs = GNUNET_new (struct ReserveSummary);
-    rs->reserve_pub = *reserve_pub;
-    rs->total_out = auditor_amount_with_fee;
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (amount_with_fee->currency,
-                                          &rs->total_in));
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (amount_with_fee->currency,
-                                          &rs->total_fee));
-    qs = load_auditor_reserve_summary (rs);
-    if (0 > qs)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-      GNUNET_free (rs);
-      rc->qs = qs;
-      return GNUNET_SYSERR;
-    }
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (rc->reserves,
-                                                      &key,
-                                                      rs,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  else
-  {
-    TALER_ARL_amount_add (&rs->total_out,
-                          &rs->total_out,
-                          &auditor_amount_with_fee);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Reserve `%s' reduced by %s from withdraw\n",
@@ -643,9 +653,15 @@ handle_reserve_out (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Increasing withdraw profits by fee %s\n",
               TALER_amount2s (&issue->fees.withdraw));
-  TALER_ARL_amount_add (&rs->total_fee,
-                        &rs->total_fee,
+  TALER_ARL_amount_add (&rs->curr_balance.withdraw_fee_balance,
+                        &rs->curr_balance.withdraw_fee_balance,
                         &issue->fees.withdraw);
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_withdraw_fee_revenue),
+                        &TALER_ARL_USE_AB (reserves_withdraw_fee_revenue),
+                        &issue->fees.withdraw);
+  TALER_ARL_amount_add (&rs->total_out,
+                        &rs->total_out,
+                        &auditor_amount_with_fee);
   if (TALER_ARL_do_abort ())
     return GNUNET_SYSERR;
   return GNUNET_OK;
@@ -678,10 +694,9 @@ handle_recoup_by_reserve (
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_DenominationPublicKey *denom_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig,
-  const union TALER_DenominationBlindingKeyP *coin_blind)
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_blind)
 {
   struct ReserveContext *rc = cls;
-  struct GNUNET_HashCode key;
   struct ReserveSummary *rs;
   struct GNUNET_TIME_Timestamp expiry;
   struct TALER_MasterSignatureP msig;
@@ -691,8 +706,8 @@ handle_recoup_by_reserve (
 
   (void) denom_pub;
   /* should be monotonically increasing */
-  GNUNET_assert (rowid >= ppr.last_reserve_recoup_serial_id);
-  ppr.last_reserve_recoup_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_reserve_recoup_serial_id));
+  TALER_ARL_USE_PP (reserves_reserve_recoup_serial_id) = rowid + 1;
   /* We know that denom_pub matches denom_pub_hash because this
      is how the SQL statement joined the tables. */
   if (GNUNET_OK !=
@@ -736,8 +751,8 @@ handle_recoup_by_reserve (
       report_row_inconsistency ("recoup",
                                 rowid,
                                 "denomination key not in revocation set");
-      TALER_ARL_amount_add (&total_irregular_recoups,
-                            &total_irregular_recoups,
+      TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_reserve_loss),
+                            &TALER_ARL_USE_AB (reserves_reserve_loss),
                             amount);
     }
     else
@@ -754,20 +769,22 @@ handle_recoup_by_reserve (
       {
         rev = "revoked";
       }
-      GNUNET_assert (GNUNET_OK ==
-                     GNUNET_CONTAINER_multihashmap_put (rc->revoked,
-                                                        &coin->denom_pub_hash.
-                                                        hash,
-                                                        (void *) rev,
-                                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+      GNUNET_assert (
+        GNUNET_OK ==
+        GNUNET_CONTAINER_multihashmap_put (
+          rc->revoked,
+          &coin->denom_pub_hash.hash,
+          (void *) rev,
+          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
     }
   }
   else
   {
-    rev_rowid = 0; /* reported elsewhere */
+    rev_rowid = 0;   /* reported elsewhere */
   }
   if ( (NULL != rev) &&
-       (0 == strcmp (rev, "master signature invalid")) )
+       (0 == strcmp (rev,
+                     "master signature invalid")) )
   {
     TALER_ARL_report (report_bad_sig_losses,
                       GNUNET_JSON_PACK (
@@ -784,42 +801,16 @@ handle_recoup_by_reserve (
                           amount);
   }
 
-  GNUNET_CRYPTO_hash (reserve_pub,
-                      sizeof (*reserve_pub),
-                      &key);
-  rs = GNUNET_CONTAINER_multihashmap_get (rc->reserves,
-                                          &key);
+  rs = setup_reserve (rc,
+                      reserve_pub);
   if (NULL == rs)
   {
-    rs = GNUNET_new (struct ReserveSummary);
-    rs->reserve_pub = *reserve_pub;
-    rs->total_in = *amount;
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (amount->currency,
-                                          &rs->total_out));
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (amount->currency,
-                                          &rs->total_fee));
-    qs = load_auditor_reserve_summary (rs);
-    if (0 > qs)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-      GNUNET_free (rs);
-      rc->qs = qs;
-      return GNUNET_SYSERR;
-    }
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (rc->reserves,
-                                                      &key,
-                                                      rs,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  else
-  {
-    TALER_ARL_amount_add (&rs->total_in,
-                          &rs->total_in,
-                          amount);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
+  TALER_ARL_amount_add (&rs->total_in,
+                        &rs->total_in,
+                        amount);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Additional /recoup value to for reserve `%s' of %s\n",
               TALER_B2S (reserve_pub),
@@ -888,6 +879,88 @@ get_closing_fee (const char *receiver_account,
 
 
 /**
+ * Function called about reserve opening operations.
+ *
+ * @param cls closure
+ * @param rowid row identifier used to uniquely identify the reserve closing operation
+ * @param reserve_payment how much to pay from the
+ *        reserve's own balance for opening the reserve
+ * @param request_timestamp when was the request created
+ * @param reserve_expiration desired expiration time for the reserve
+ * @param purse_limit minimum number of purses the client
+ *       wants to have concurrently open for this reserve
+ * @param reserve_pub public key of the reserve
+ * @param reserve_sig signature affirming the operation
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserve_open (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct ReserveContext *rc = cls;
+  struct ReserveSummary *rs;
+
+  /* should be monotonically increasing */
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_reserve_open_serial_id));
+  TALER_ARL_USE_PP (reserves_reserve_open_serial_id) = rowid + 1;
+
+  rs = setup_reserve (rc,
+                      reserve_pub);
+  if (NULL == rs)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_open_verify (reserve_payment,
+                                        request_timestamp,
+                                        reserve_expiration,
+                                        purse_limit,
+                                        reserve_pub,
+                                        reserve_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "reserve-open"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                reserve_payment),
+                        GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                                    reserve_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          reserve_payment);
+    return GNUNET_OK;
+  }
+  TALER_ARL_amount_add (&rs->curr_balance.open_fee_balance,
+                        &rs->curr_balance.open_fee_balance,
+                        reserve_payment);
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_open_fee_revenue),
+                        &TALER_ARL_USE_AB (reserves_open_fee_revenue),
+                        reserve_payment);
+  TALER_ARL_amount_add (&rs->total_out,
+                        &rs->total_out,
+                        reserve_payment);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Additional open operation for reserve `%s' of %s\n",
+              TALER_B2S (reserve_pub),
+              TALER_amount2s (reserve_payment));
+  if (TALER_ARL_do_abort ())
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+/**
  * Function called about reserve closing operations
  * the aggregator triggered.
  *
@@ -899,9 +972,11 @@ get_closing_fee (const char *receiver_account,
  * @param reserve_pub public key of the reserve
  * @param receiver_account where did we send the funds
  * @param transfer_details details about the wire transfer
+ * @param close_request_row which close request triggered the operation?
+ *         0 if it was a timeout
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
-static int
+static enum GNUNET_GenericReturnValue
 handle_reserve_closed (
   void *cls,
   uint64_t rowid,
@@ -910,56 +985,27 @@ handle_reserve_closed (
   const struct TALER_Amount *closing_fee,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const char *receiver_account,
-  const struct TALER_WireTransferIdentifierRawP *transfer_details)
+  const struct TALER_WireTransferIdentifierRawP *transfer_details,
+  uint64_t close_request_row)
 {
   struct ReserveContext *rc = cls;
-  struct GNUNET_HashCode key;
   struct ReserveSummary *rs;
-  enum GNUNET_DB_QueryStatus qs;
 
   (void) transfer_details;
   /* should be monotonically increasing */
-  GNUNET_assert (rowid >= ppr.last_reserve_close_serial_id);
-  ppr.last_reserve_close_serial_id = rowid + 1;
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_reserve_close_serial_id));
+  TALER_ARL_USE_PP (reserves_reserve_close_serial_id) = rowid + 1;
 
-  GNUNET_CRYPTO_hash (reserve_pub,
-                      sizeof (*reserve_pub),
-                      &key);
-  rs = GNUNET_CONTAINER_multihashmap_get (rc->reserves,
-                                          &key);
+  rs = setup_reserve (rc,
+                      reserve_pub);
   if (NULL == rs)
   {
-    rs = GNUNET_new (struct ReserveSummary);
-    rs->reserve_pub = *reserve_pub;
-    rs->total_out = *amount_with_fee;
-    rs->total_fee = *closing_fee;
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (amount_with_fee->currency,
-                                          &rs->total_in));
-    qs = load_auditor_reserve_summary (rs);
-    if (0 > qs)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-      GNUNET_free (rs);
-      rc->qs = qs;
-      return GNUNET_SYSERR;
-    }
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (rc->reserves,
-                                                      &key,
-                                                      rs,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
-  else
   {
     struct TALER_Amount expected_fee;
 
-    TALER_ARL_amount_add (&rs->total_out,
-                          &rs->total_out,
-                          amount_with_fee);
-    TALER_ARL_amount_add (&rs->total_fee,
-                          &rs->total_fee,
-                          closing_fee);
     /* verify closing_fee is correct! */
     if (GNUNET_OK !=
         get_closing_fee (receiver_account,
@@ -979,20 +1025,117 @@ handle_reserve_closed (
         1);
     }
   }
-  if (NULL == rs->sender_account)
+
+  TALER_ARL_amount_add (&rs->curr_balance.close_fee_balance,
+                        &rs->curr_balance.close_fee_balance,
+                        closing_fee);
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_close_fee_revenue),
+                        &TALER_ARL_USE_AB (reserves_close_fee_revenue),
+                        closing_fee);
+  TALER_ARL_amount_add (&rs->total_out,
+                        &rs->total_out,
+                        amount_with_fee);
+  if (0 != close_request_row)
   {
-    GNUNET_break (GNUNET_NO == rs->had_ri);
-    report_row_inconsistency ("reserves_close",
-                              rowid,
-                              "target account not verified, auditor does not know reserve");
+    struct TALER_ReserveSignatureP reserve_sig;
+    struct GNUNET_TIME_Timestamp request_timestamp;
+    struct TALER_Amount close_balance;
+    struct TALER_Amount close_fee;
+    char *payto_uri;
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TALER_ARL_edb->select_reserve_close_request_info (
+      TALER_ARL_edb->cls,
+      reserve_pub,
+      close_request_row,
+      &reserve_sig,
+      &request_timestamp,
+      &close_balance,
+      &close_fee,
+      &payto_uri);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+    {
+      report_row_inconsistency ("reserves_close",
+                                rowid,
+                                "reserve close request unknown");
+    }
+    else
+    {
+      struct TALER_PaytoHashP h_payto;
+
+      TALER_payto_hash (payto_uri,
+                        &h_payto);
+      if (GNUNET_OK !=
+          TALER_wallet_reserve_close_verify (
+            request_timestamp,
+            &h_payto,
+            reserve_pub,
+            &reserve_sig))
+      {
+        TALER_ARL_report (report_bad_sig_losses,
+                          GNUNET_JSON_PACK (
+                            GNUNET_JSON_pack_string ("operation",
+                                                     "close-request"),
+                            GNUNET_JSON_pack_uint64 ("row",
+                                                     close_request_row),
+                            TALER_JSON_pack_amount ("loss",
+                                                    amount_with_fee),
+                            GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                                        reserve_pub)));
+        TALER_ARL_amount_add (&total_bad_sig_loss,
+                              &total_bad_sig_loss,
+                              amount_with_fee);
+      }
+    }
+    if ( (NULL == payto_uri) &&
+         (NULL == rs->sender_account) )
+    {
+      GNUNET_break (! rs->had_ri);
+      report_row_inconsistency ("reserves_close",
+                                rowid,
+                                "target account not verified, auditor does not know reserve");
+    }
+    if (NULL == payto_uri)
+    {
+      if ( (NULL == rs->sender_account) ||
+           (0 != strcmp (rs->sender_account,
+                         receiver_account)) )
+      {
+        report_row_inconsistency ("reserves_close",
+                                  rowid,
+                                  "target account does not match origin account");
+      }
+    }
+    else
+    {
+      if (0 != strcmp (payto_uri,
+                       receiver_account))
+      {
+        report_row_inconsistency ("reserves_close",
+                                  rowid,
+                                  "target account does not match origin account");
+      }
+    }
+    GNUNET_free (payto_uri);
   }
-  else if (0 != strcmp (rs->sender_account,
-                        receiver_account))
+  else
   {
-    report_row_inconsistency ("reserves_close",
-                              rowid,
-                              "target account does not match origin account");
+    if (NULL == rs->sender_account)
+    {
+      GNUNET_break (! rs->had_ri);
+      report_row_inconsistency ("reserves_close",
+                                rowid,
+                                "target account not verified, auditor does not know reserve");
+    }
+    else if (0 != strcmp (rs->sender_account,
+                          receiver_account))
+    {
+      report_row_inconsistency ("reserves_close",
+                                rowid,
+                                "target account does not match origin account");
+    }
   }
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Additional closing operation for reserve `%s' of %s\n",
               TALER_B2S (reserve_pub),
@@ -1004,6 +1147,137 @@ handle_reserve_closed (
 
 
 /**
+ * Function called with details about account merge requests that have been
+ * made, with the goal of accounting for the merge fee paid by the reserve (if
+ * applicable).
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param reserve_pub reserve affected by the merge
+ * @param purse_pub purse being merged
+ * @param h_contract_terms hash over contract of the purse
+ * @param purse_expiration when would the purse expire
+ * @param amount total amount in the purse
+ * @param min_age minimum age of all coins deposited into the purse
+ * @param flags how was the purse created
+ * @param purse_fee if a purse fee was paid, how high is it
+ * @param merge_timestamp when was the merge approved
+ * @param reserve_sig signature by reserve approving the merge
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+handle_account_merged (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_Amount *amount,
+  uint32_t min_age,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *purse_fee,
+  struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct ReserveContext *rc = cls;
+  struct ReserveSummary *rs;
+
+  /* should be monotonically increasing */
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (reserves_account_merges_serial_id));
+  TALER_ARL_USE_PP (reserves_account_merges_serial_id) = rowid + 1;
+  if (GNUNET_OK !=
+      TALER_wallet_account_merge_verify (merge_timestamp,
+                                         purse_pub,
+                                         purse_expiration,
+                                         h_contract_terms,
+                                         amount,
+                                         purse_fee,
+                                         min_age,
+                                         flags,
+                                         reserve_pub,
+                                         reserve_sig))
+  {
+    TALER_ARL_report (report_bad_sig_losses,
+                      GNUNET_JSON_PACK (
+                        GNUNET_JSON_pack_string ("operation",
+                                                 "account-merge"),
+                        GNUNET_JSON_pack_uint64 ("row",
+                                                 rowid),
+                        TALER_JSON_pack_amount ("loss",
+                                                purse_fee),
+                        GNUNET_JSON_pack_data_auto ("key_pub",
+                                                    reserve_pub)));
+    TALER_ARL_amount_add (&total_bad_sig_loss,
+                          &total_bad_sig_loss,
+                          purse_fee);
+    return GNUNET_OK;
+  }
+  if ( (flags & TALER_WAMF_MERGE_MODE_MASK) !=
+       TALER_WAMF_MODE_CREATE_WITH_PURSE_FEE)
+    return GNUNET_OK; /* no impact on reserve balance */
+  rs = setup_reserve (rc,
+                      reserve_pub);
+  if (NULL == rs)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_purse_fee_revenue),
+                        &TALER_ARL_USE_AB (reserves_purse_fee_revenue),
+                        purse_fee);
+  TALER_ARL_amount_add (&rs->curr_balance.purse_fee_balance,
+                        &rs->curr_balance.purse_fee_balance,
+                        purse_fee);
+  TALER_ARL_amount_add (&rs->total_out,
+                        &rs->total_out,
+                        purse_fee);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with details about a purse that was merged into an account.
+ * Only updates the reserve balance, the actual verifications are done in the
+ * purse helper.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the refund in our DB
+ * @param purse_pub public key of the purse
+ * @param reserve_pub which reserve is the purse credited to
+ * @param purse_value what is the target value of the purse
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+purse_decision_cb (void *cls,
+                   uint64_t rowid,
+                   const struct TALER_PurseContractPublicKeyP *purse_pub,
+                   const struct TALER_ReservePublicKeyP *reserve_pub,
+                   const struct TALER_Amount *purse_value)
+{
+  struct ReserveContext *rc = cls;
+  struct ReserveSummary *rs;
+
+  GNUNET_assert (rowid >= TALER_ARL_USE_PP (
+                   reserves_purse_decisions_serial_id));                         /* should be monotonically increasing */
+  TALER_ARL_USE_PP (reserves_purse_decisions_serial_id) = rowid + 1;
+  rs = setup_reserve (rc,
+                      reserve_pub);
+  if (NULL == rs)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  TALER_ARL_amount_add (&rs->total_in,
+                        &rs->total_in,
+                        purse_value);
+  if (TALER_ARL_do_abort ())
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+/**
  * Check that the reserve summary matches what the exchange database
  * thinks about the reserve, and update our own state of the reserve.
  *
@@ -1014,36 +1288,39 @@ handle_reserve_closed (
  * @param value a `struct ReserveSummary`
  * @return #GNUNET_OK to process more entries
  */
-static int
+static enum GNUNET_GenericReturnValue
 verify_reserve_balance (void *cls,
                         const struct GNUNET_HashCode *key,
                         void *value)
 {
   struct ReserveContext *rc = cls;
   struct ReserveSummary *rs = value;
-  struct TALER_Amount balance;
+  struct TALER_Amount mbalance;
   struct TALER_Amount nbalance;
   enum GNUNET_DB_QueryStatus qs;
-  int ret;
+  enum GNUNET_GenericReturnValue ret;
 
   ret = GNUNET_OK;
   /* Check our reserve summary balance calculation shows that
      the reserve balance is acceptable (i.e. non-negative) */
-  TALER_ARL_amount_add (&balance,
+  TALER_ARL_amount_add (&mbalance,
                         &rs->total_in,
-                        &rs->balance_at_previous_audit);
+                        &rs->prev_balance.reserve_balance);
   if (TALER_ARL_SR_INVALID_NEGATIVE ==
       TALER_ARL_amount_subtract_neg (&nbalance,
-                                     &balance,
+                                     &mbalance,
                                      &rs->total_out))
   {
     struct TALER_Amount loss;
 
     TALER_ARL_amount_subtract (&loss,
                                &rs->total_out,
-                               &balance);
-    TALER_ARL_amount_add (&total_balance_insufficient_loss,
-                          &total_balance_insufficient_loss,
+                               &mbalance);
+    TALER_ARL_amount_add (&rs->curr_balance.reserve_loss,
+                          &rs->prev_balance.reserve_loss,
+                          &loss);
+    TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_reserve_loss),
+                          &TALER_ARL_USE_AB (reserves_reserve_loss),
                           &loss);
     TALER_ARL_report (report_reserve_balance_insufficient_inconsistencies,
                       GNUNET_JSON_PACK (
@@ -1053,8 +1330,13 @@ verify_reserve_balance (void *cls,
                                                 &loss)));
     /* Continue with a reserve balance of zero */
     GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (balance.currency,
-                                          &nbalance));
+                   TALER_amount_set_zero (TALER_ARL_currency,
+                                          &rs->curr_balance.reserve_balance));
+  }
+  else
+  {
+    /* Update remaining reserve balance! */
+    rs->curr_balance.reserve_balance = nbalance;
   }
 
   if (internal_checks)
@@ -1064,13 +1346,10 @@ verify_reserve_balance (void *cls,
        internal audit, as otherwise the balance of the 'reserves' table
        is not replicated at the auditor. */
     struct TALER_EXCHANGEDB_Reserve reserve;
-    struct TALER_EXCHANGEDB_KycStatus kyc;
 
     reserve.pub = rs->reserve_pub;
     qs = TALER_ARL_edb->reserves_get (TALER_ARL_edb->cls,
-                                      &reserve,
-                                      &kyc);
-    // FIXME: figure out what to do with KYC status!
+                                      &reserve);
     if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
     {
       /* If the exchange doesn't have this reserve in the summary, it
@@ -1078,7 +1357,7 @@ verify_reserve_balance (void *cls,
          making an illegitimate gain over the amount it dropped.
          We don't add the amount to some total simply because it is
          not an actualized gain and could be trivially corrected by
-         restoring the summary. *///
+         restoring the summary. */
       TALER_ARL_report (report_reserve_balance_insufficient_inconsistencies,
                         GNUNET_JSON_PACK (
                           GNUNET_JSON_pack_data_auto ("reserve_pub",
@@ -1095,17 +1374,17 @@ verify_reserve_balance (void *cls,
     else
     {
       /* Check that exchange's balance matches our expected balance for the reserve */
-      if (0 != TALER_amount_cmp (&nbalance,
+      if (0 != TALER_amount_cmp (&rs->curr_balance.reserve_balance,
                                  &reserve.balance))
       {
         struct TALER_Amount delta;
 
-        if (0 < TALER_amount_cmp (&nbalance,
+        if (0 < TALER_amount_cmp (&rs->curr_balance.reserve_balance,
                                   &reserve.balance))
         {
           /* balance > reserve.balance */
           TALER_ARL_amount_subtract (&delta,
-                                     &nbalance,
+                                     &rs->curr_balance.reserve_balance,
                                      &reserve.balance);
           TALER_ARL_amount_add (&total_balance_summary_delta_plus,
                                 &total_balance_summary_delta_plus,
@@ -1116,7 +1395,7 @@ verify_reserve_balance (void *cls,
           /* balance < reserve.balance */
           TALER_ARL_amount_subtract (&delta,
                                      &reserve.balance,
-                                     &nbalance);
+                                     &rs->curr_balance.reserve_balance);
           TALER_ARL_amount_add (&total_balance_summary_delta_minus,
                                 &total_balance_summary_delta_minus,
                                 &delta);
@@ -1128,10 +1407,11 @@ verify_reserve_balance (void *cls,
                             TALER_JSON_pack_amount ("exchange",
                                                     &reserve.balance),
                             TALER_JSON_pack_amount ("auditor",
-                                                    &nbalance)));
+                                                    &rs->curr_balance.
+                                                    reserve_balance)));
       }
     }
-  } /* end of 'if (internal_checks)' */
+  }   /* end of 'if (internal_checks)' */
 
   /* Check that reserve is being closed if it is past its expiration date
      (and the closing fee would not exceed the remaining balance) */
@@ -1188,26 +1468,43 @@ verify_reserve_balance (void *cls,
     }
   }
 
-  /* Add withdraw fees we encountered to totals */
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Reserve reserve `%s' made %s in withdraw fees\n",
-              TALER_B2S (&rs->reserve_pub),
-              TALER_amount2s (&rs->total_fee));
-  TALER_ARL_amount_add (&rs->a_withdraw_fee_balance,
-                        &rs->a_withdraw_fee_balance,
-                        &rs->total_fee);
-  TALER_ARL_amount_add (&total_escrow_balance,
-                        &total_escrow_balance,
+  /* We already computed the 'new' balance in 'curr_balance'
+     to include the previous balance, so this one is just
+     an assignment, not adding up! */
+  rs->prev_balance.reserve_balance = rs->curr_balance.reserve_balance;
+
+  /* Add up new totals to previous totals  */
+  TALER_ARL_amount_add (&rs->prev_balance.reserve_loss,
+                        &rs->prev_balance.reserve_loss,
+                        &rs->curr_balance.reserve_loss);
+  TALER_ARL_amount_add (&rs->prev_balance.withdraw_fee_balance,
+                        &rs->prev_balance.withdraw_fee_balance,
+                        &rs->curr_balance.withdraw_fee_balance);
+  TALER_ARL_amount_add (&rs->prev_balance.close_fee_balance,
+                        &rs->prev_balance.close_fee_balance,
+                        &rs->curr_balance.close_fee_balance);
+  TALER_ARL_amount_add (&rs->prev_balance.purse_fee_balance,
+                        &rs->prev_balance.purse_fee_balance,
+                        &rs->curr_balance.purse_fee_balance);
+  TALER_ARL_amount_add (&rs->prev_balance.open_fee_balance,
+                        &rs->prev_balance.open_fee_balance,
+                        &rs->curr_balance.open_fee_balance);
+  TALER_ARL_amount_add (&rs->prev_balance.history_fee_balance,
+                        &rs->prev_balance.history_fee_balance,
+                        &rs->curr_balance.history_fee_balance);
+
+  /* Update global balance: add incoming first, then try
+     to subtract outgoing... */
+  TALER_ARL_amount_add (&TALER_ARL_USE_AB (reserves_reserve_total_balance),
+                        &TALER_ARL_USE_AB (reserves_reserve_total_balance),
                         &rs->total_in);
-  TALER_ARL_amount_add (&total_withdraw_fee_income,
-                        &total_withdraw_fee_income,
-                        &rs->total_fee);
   {
     struct TALER_Amount r;
 
     if (TALER_ARL_SR_INVALID_NEGATIVE ==
         TALER_ARL_amount_subtract_neg (&r,
-                                       &total_escrow_balance,
+                                       &TALER_ARL_USE_AB (
+                                         reserves_reserve_total_balance),
                                        &rs->total_out))
     {
       /* We could not reduce our total balance, i.e. exchange allowed IN TOTAL (!)
@@ -1215,34 +1512,33 @@ verify_reserve_balance (void *cls,
          went negative!).  Woopsie. Calculate how badly it went and log. */
       report_amount_arithmetic_inconsistency ("global escrow balance",
                                               0,
-                                              &total_escrow_balance, /* what we had */
-                                              &rs->total_out, /* what we needed */
+                                              &TALER_ARL_USE_AB (
+                                                reserves_reserve_total_balance),                   /* what we had */
+                                              &rs->total_out,   /* what we needed */
                                               0 /* specific profit/loss does not apply to the total summary */);
       /* We unexpectedly went negative, so a sane value to continue from
          would be zero. */
       GNUNET_assert (GNUNET_OK ==
                      TALER_amount_set_zero (TALER_ARL_currency,
-                                            &total_escrow_balance));
+                                            &TALER_ARL_USE_AB (
+                                              reserves_reserve_total_balance)));
     }
     else
     {
-      total_escrow_balance = r;
+      TALER_ARL_USE_AB (reserves_reserve_total_balance) = r;
     }
   }
 
-  if ( (0ULL == balance.value) &&
-       (0U == balance.fraction) )
+  if (TALER_amount_is_zero (&rs->prev_balance.reserve_balance))
   {
     /* balance is zero, drop reserve details (and then do not update/insert) */
     if (rs->had_ri)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Final balance of reserve `%s' is %s, dropping it\n",
-                  TALER_B2S (&rs->reserve_pub),
-                  TALER_amount2s (&nbalance));
+                  "Final balance of reserve `%s' is zero, dropping it\n",
+                  TALER_B2S (&rs->reserve_pub));
       qs = TALER_ARL_adb->del_reserve_info (TALER_ARL_adb->cls,
-                                            &rs->reserve_pub,
-                                            &TALER_ARL_master_pub);
+                                            &rs->reserve_pub);
       if (0 >= qs)
       {
         GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
@@ -1253,9 +1549,8 @@ verify_reserve_balance (void *cls,
     else
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Final balance of reserve `%s' is %s, no need to remember it\n",
-                  TALER_B2S (&rs->reserve_pub),
-                  TALER_amount2s (&nbalance));
+                  "Final balance of reserve `%s' is zero, no need to remember it\n",
+                  TALER_B2S (&rs->reserve_pub));
     }
   }
   else
@@ -1264,20 +1559,16 @@ verify_reserve_balance (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Remembering final balance of reserve `%s' as %s\n",
                 TALER_B2S (&rs->reserve_pub),
-                TALER_amount2s (&nbalance));
+                TALER_amount2s (&rs->prev_balance.reserve_balance));
     if (rs->had_ri)
       qs = TALER_ARL_adb->update_reserve_info (TALER_ARL_adb->cls,
                                                &rs->reserve_pub,
-                                               &TALER_ARL_master_pub,
-                                               &nbalance,
-                                               &rs->a_withdraw_fee_balance,
+                                               &rs->prev_balance,
                                                rs->a_expiration_date);
     else
       qs = TALER_ARL_adb->insert_reserve_info (TALER_ARL_adb->cls,
                                                &rs->reserve_pub,
-                                               &TALER_ARL_master_pub,
-                                               &nbalance,
-                                               &rs->a_withdraw_fee_balance,
+                                               &rs->prev_balance,
                                                rs->a_expiration_date,
                                                rs->sender_account);
     if (0 >= qs)
@@ -1287,7 +1578,7 @@ verify_reserve_balance (void *cls,
       rc->qs = qs;
     }
   }
-
+  /* now we can discard the cached entry */
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap_remove (rc->reserves,
                                                        key,
@@ -1315,9 +1606,17 @@ analyze_reserves (void *cls)
   (void) cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Analyzing reserves\n");
-  qsp = TALER_ARL_adb->get_auditor_progress_reserve (TALER_ARL_adb->cls,
-                                                     &TALER_ARL_master_pub,
-                                                     &ppr);
+  qsp = TALER_ARL_adb->get_auditor_progress (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_PP (reserves_reserve_in_serial_id),
+    TALER_ARL_GET_PP (reserves_reserve_out_serial_id),
+    TALER_ARL_GET_PP (reserves_reserve_recoup_serial_id),
+    TALER_ARL_GET_PP (reserves_reserve_open_serial_id),
+    TALER_ARL_GET_PP (reserves_reserve_close_serial_id),
+    TALER_ARL_GET_PP (reserves_purse_decisions_serial_id),
+    TALER_ARL_GET_PP (reserves_account_merges_serial_id),
+    TALER_ARL_GET_PP (reserves_history_requests_serial_id),
+    NULL);
   if (0 > qsp)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsp);
@@ -1330,19 +1629,36 @@ analyze_reserves (void *cls)
   }
   else
   {
-    ppr_start = ppr;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Resuming reserve audit at %llu/%llu/%llu/%llu\n",
-                (unsigned long long) ppr.last_reserve_in_serial_id,
-                (unsigned long long) ppr.last_reserve_out_serial_id,
-                (unsigned long long) ppr.last_reserve_recoup_serial_id,
-                (unsigned long long) ppr.last_reserve_close_serial_id);
+                "Resuming reserve audit at %llu/%llu/%llu/%llu/%llu/%llu/%llu/%llu\n",
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_reserve_in_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_reserve_out_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_reserve_recoup_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_reserve_open_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_reserve_close_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_purse_decisions_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_account_merges_serial_id),
+                (unsigned long long) TALER_ARL_USE_PP (
+                  reserves_history_requests_serial_id));
   }
   rc.qs = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-  qsx = TALER_ARL_adb->get_reserve_summary (TALER_ARL_adb->cls,
-                                            &TALER_ARL_master_pub,
-                                            &total_escrow_balance,
-                                            &total_withdraw_fee_income);
+  qsx = TALER_ARL_adb->get_balance (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_AB (reserves_reserve_total_balance),
+    TALER_ARL_GET_AB (reserves_reserve_loss),
+    TALER_ARL_GET_AB (reserves_withdraw_fee_revenue),
+    TALER_ARL_GET_AB (reserves_close_fee_revenue),
+    TALER_ARL_GET_AB (reserves_purse_fee_revenue),
+    TALER_ARL_GET_AB (reserves_open_fee_revenue),
+    TALER_ARL_GET_AB (reserves_history_fee_revenue),
+    NULL);
   if (qsx < 0)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsx);
@@ -1352,10 +1668,9 @@ analyze_reserves (void *cls)
                                                       GNUNET_NO);
   rc.revoked = GNUNET_CONTAINER_multihashmap_create (4,
                                                      GNUNET_NO);
-
   qs = TALER_ARL_edb->select_reserves_in_above_serial_id (
     TALER_ARL_edb->cls,
-    ppr.last_reserve_in_serial_id,
+    TALER_ARL_USE_PP (reserves_reserve_in_serial_id),
     &handle_reserve_in,
     &rc);
   if (qs < 0)
@@ -1365,7 +1680,7 @@ analyze_reserves (void *cls)
   }
   qs = TALER_ARL_edb->select_withdrawals_above_serial_id (
     TALER_ARL_edb->cls,
-    ppr.last_reserve_out_serial_id,
+    TALER_ARL_USE_PP (reserves_reserve_out_serial_id),
     &handle_reserve_out,
     &rc);
   if (qs < 0)
@@ -1375,7 +1690,7 @@ analyze_reserves (void *cls)
   }
   qs = TALER_ARL_edb->select_recoup_above_serial_id (
     TALER_ARL_edb->cls,
-    ppr.last_reserve_recoup_serial_id,
+    TALER_ARL_USE_PP (reserves_reserve_recoup_serial_id),
     &handle_recoup_by_reserve,
     &rc);
   if (qs < 0)
@@ -1383,9 +1698,19 @@ analyze_reserves (void *cls)
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
     return qs;
   }
+  qs = TALER_ARL_edb->select_reserve_open_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (reserves_reserve_open_serial_id),
+    &handle_reserve_open,
+    &rc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
   qs = TALER_ARL_edb->select_reserve_closed_above_serial_id (
     TALER_ARL_edb->cls,
-    ppr.last_reserve_close_serial_id,
+    TALER_ARL_USE_PP (reserves_reserve_close_serial_id),
     &handle_reserve_closed,
     &rc);
   if (qs < 0)
@@ -1393,7 +1718,31 @@ analyze_reserves (void *cls)
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
     return qs;
   }
-
+  /* process purse_decisions (to credit reserve) */
+  if (0 >
+      (qs = TALER_ARL_edb->select_purse_decisions_above_serial_id (
+         TALER_ARL_edb->cls,
+         TALER_ARL_USE_PP (reserves_purse_decisions_serial_id),
+         false, /* only go for merged purses! */
+         &purse_decision_cb,
+         &rc)))
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (0 > rc.qs)
+    return rc.qs;
+  /* Charge purse fee! */
+  qs = TALER_ARL_edb->select_account_merges_above_serial_id (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (reserves_account_merges_serial_id),
+    &handle_account_merged,
+    &rc);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
   GNUNET_CONTAINER_multihashmap_iterate (rc.reserves,
                                          &verify_reserve_balance,
                                          &rc);
@@ -1401,23 +1750,33 @@ analyze_reserves (void *cls)
                 GNUNET_CONTAINER_multihashmap_size (rc.reserves));
   GNUNET_CONTAINER_multihashmap_destroy (rc.reserves);
   GNUNET_CONTAINER_multihashmap_destroy (rc.revoked);
-
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != rc.qs)
     return qs;
-
   if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qsx)
   {
-    qs = TALER_ARL_adb->insert_reserve_summary (TALER_ARL_adb->cls,
-                                                &TALER_ARL_master_pub,
-                                                &total_escrow_balance,
-                                                &total_withdraw_fee_income);
+    qs = TALER_ARL_adb->insert_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (reserves_reserve_total_balance),
+      TALER_ARL_SET_AB (reserves_reserve_loss),
+      TALER_ARL_SET_AB (reserves_withdraw_fee_revenue),
+      TALER_ARL_SET_AB (reserves_close_fee_revenue),
+      TALER_ARL_SET_AB (reserves_purse_fee_revenue),
+      TALER_ARL_SET_AB (reserves_open_fee_revenue),
+      TALER_ARL_SET_AB (reserves_history_fee_revenue),
+      NULL);
   }
   else
   {
-    qs = TALER_ARL_adb->update_reserve_summary (TALER_ARL_adb->cls,
-                                                &TALER_ARL_master_pub,
-                                                &total_escrow_balance,
-                                                &total_withdraw_fee_income);
+    qs = TALER_ARL_adb->update_balance (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_AB (reserves_reserve_total_balance),
+      TALER_ARL_SET_AB (reserves_reserve_loss),
+      TALER_ARL_SET_AB (reserves_withdraw_fee_revenue),
+      TALER_ARL_SET_AB (reserves_close_fee_revenue),
+      TALER_ARL_SET_AB (reserves_purse_fee_revenue),
+      TALER_ARL_SET_AB (reserves_open_fee_revenue),
+      TALER_ARL_SET_AB (reserves_history_fee_revenue),
+      NULL);
   }
   if (0 >= qs)
   {
@@ -1425,13 +1784,29 @@ analyze_reserves (void *cls)
     return qs;
   }
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsp)
-    qs = TALER_ARL_adb->update_auditor_progress_reserve (TALER_ARL_adb->cls,
-                                                         &TALER_ARL_master_pub,
-                                                         &ppr);
+    qs = TALER_ARL_adb->update_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (reserves_reserve_in_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_out_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_recoup_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_open_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_close_serial_id),
+      TALER_ARL_SET_PP (reserves_purse_decisions_serial_id),
+      TALER_ARL_SET_PP (reserves_account_merges_serial_id),
+      TALER_ARL_SET_PP (reserves_history_requests_serial_id),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_auditor_progress_reserve (TALER_ARL_adb->cls,
-                                                         &TALER_ARL_master_pub,
-                                                         &ppr);
+    qs = TALER_ARL_adb->insert_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (reserves_reserve_in_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_out_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_recoup_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_open_serial_id),
+      TALER_ARL_SET_PP (reserves_reserve_close_serial_id),
+      TALER_ARL_SET_PP (reserves_purse_decisions_serial_id),
+      TALER_ARL_SET_PP (reserves_account_merges_serial_id),
+      TALER_ARL_SET_PP (reserves_history_requests_serial_id),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1440,11 +1815,23 @@ analyze_reserves (void *cls)
     return qs;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Concluded reserve audit step at %llu/%llu/%llu/%llu\n",
-              (unsigned long long) ppr.last_reserve_in_serial_id,
-              (unsigned long long) ppr.last_reserve_out_serial_id,
-              (unsigned long long) ppr.last_reserve_recoup_serial_id,
-              (unsigned long long) ppr.last_reserve_close_serial_id);
+              "Concluded reserve audit step at %llu/%llu/%llu/%llu/%llu/%llu/%llu/%llu\n",
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_reserve_in_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_reserve_out_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_reserve_recoup_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_reserve_open_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_reserve_close_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_purse_decisions_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_account_merges_serial_id),
+              (unsigned long long) TALER_ARL_USE_PP (
+                reserves_history_requests_serial_id));
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
 
@@ -1490,16 +1877,33 @@ run (void *cls,
               "Starting audit\n");
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_escrow_balance));
+                                        &TALER_ARL_USE_AB (
+                                          reserves_reserve_total_balance)));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &TALER_ARL_USE_AB (
+                                          reserves_reserve_loss)));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &TALER_ARL_USE_AB (
+                                          reserves_withdraw_fee_revenue)));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &TALER_ARL_USE_AB (
+                                          reserves_close_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_irregular_recoups));
+                                        &TALER_ARL_USE_AB (
+                                          reserves_purse_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_withdraw_fee_income));
+                                        &TALER_ARL_USE_AB (
+                                          reserves_open_fee_revenue)));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_balance_insufficient_loss));
+                                        &TALER_ARL_USE_AB (
+                                          reserves_history_fee_revenue)));
+  // REVIEW:
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_balance_summary_delta_plus));
@@ -1518,6 +1922,7 @@ run (void *cls,
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_bad_sig_loss));
+
   GNUNET_assert (NULL !=
                  (report_row_inconsistencies = json_array ()));
   GNUNET_assert (NULL !=
@@ -1530,6 +1935,9 @@ run (void *cls,
                  (report_reserve_balance_insufficient_inconsistencies
                     = json_array ()));
   GNUNET_assert (NULL !=
+                 (report_purse_balance_insufficient_inconsistencies
+                    = json_array ()));
+  GNUNET_assert (NULL !=
                  (report_reserve_not_closed_inconsistencies
                     = json_array ()));
   GNUNET_assert (NULL !=
@@ -1546,12 +1954,6 @@ run (void *cls,
   }
   TALER_ARL_done (
     GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_array_steal (
-        "reserve_balance_insufficient_inconsistencies",
-        report_reserve_balance_insufficient_inconsistencies),
-      /* Tested in test-auditor.sh #3 */
-      TALER_JSON_pack_amount ("total_loss_balance_insufficient",
-                              &total_balance_insufficient_loss),
       /* Tested in test-auditor.sh #3 */
       GNUNET_JSON_pack_array_steal (
         "reserve_balance_summary_wrong_inconsistencies",
@@ -1560,23 +1962,49 @@ run (void *cls,
                               &total_balance_summary_delta_plus),
       TALER_JSON_pack_amount ("total_balance_summary_delta_minus",
                               &total_balance_summary_delta_minus),
-      /* blocks #2 */
+      /* Tested in test-auditor.sh #21 */
+      TALER_JSON_pack_amount ("total_balance_reserve_not_closed",
+                              &total_balance_reserve_not_closed),
+      /* Tested in test-auditor.sh #7 */
+      TALER_JSON_pack_amount ("total_bad_sig_loss",
+                              &total_bad_sig_loss),
+      TALER_JSON_pack_amount ("total_arithmetic_delta_plus",
+                              &total_arithmetic_delta_plus),
+      TALER_JSON_pack_amount ("total_arithmetic_delta_minus",
+                              &total_arithmetic_delta_minus),
+
+      /* Global 'balances' */
       TALER_JSON_pack_amount ("total_escrow_balance",
-                              &total_escrow_balance),
+                              &TALER_ARL_USE_AB (
+                                reserves_reserve_total_balance)),
+      /* Tested in test-auditor.sh #3 */
+      TALER_JSON_pack_amount ("total_irregular_loss",
+                              &TALER_ARL_USE_AB (reserves_reserve_loss)),
       TALER_JSON_pack_amount ("total_withdraw_fee_income",
-                              &total_withdraw_fee_income),
+                              &TALER_ARL_USE_AB (
+                                reserves_withdraw_fee_revenue)),
+      TALER_JSON_pack_amount ("total_close_fee_income",
+                              &TALER_ARL_USE_AB (reserves_close_fee_revenue)),
+      TALER_JSON_pack_amount ("total_purse_fee_income",
+                              &TALER_ARL_USE_AB (reserves_purse_fee_revenue)),
+      TALER_JSON_pack_amount ("total_open_fee_income",
+                              &TALER_ARL_USE_AB (reserves_open_fee_revenue)),
+      TALER_JSON_pack_amount ("total_history_fee_income",
+                              &TALER_ARL_USE_AB (reserves_history_fee_revenue)),
+
+      /* Detailed report tables */
+      GNUNET_JSON_pack_array_steal (
+        "reserve_balance_insufficient_inconsistencies",
+        report_reserve_balance_insufficient_inconsistencies),
+      GNUNET_JSON_pack_array_steal (
+        "purse_balance_insufficient_inconsistencies",
+        report_purse_balance_insufficient_inconsistencies),
       /* Tested in test-auditor.sh #21 */
       GNUNET_JSON_pack_array_steal ("reserve_not_closed_inconsistencies",
                                     report_reserve_not_closed_inconsistencies),
-      /* Tested in test-auditor.sh #21 */
-      TALER_JSON_pack_amount ("total_balance_reserve_not_closed",
-                              &total_balance_reserve_not_closed),
       /* Tested in test-auditor.sh #7 */
       GNUNET_JSON_pack_array_steal ("bad_sig_losses",
                                     report_bad_sig_losses),
-      /* Tested in test-auditor.sh #7 */
-      TALER_JSON_pack_amount ("total_bad_sig_loss",
-                              &total_bad_sig_loss),
       /* Tested in test-revocation.sh #4 */
       GNUNET_JSON_pack_array_steal ("row_inconsistencies",
                                     report_row_inconsistencies),
@@ -1586,32 +2014,52 @@ run (void *cls,
         denomination_key_validity_withdraw_inconsistencies),
       GNUNET_JSON_pack_array_steal ("amount_arithmetic_inconsistencies",
                                     report_amount_arithmetic_inconsistencies),
-      TALER_JSON_pack_amount ("total_arithmetic_delta_plus",
-                              &total_arithmetic_delta_plus),
-      TALER_JSON_pack_amount ("total_arithmetic_delta_minus",
-                              &total_arithmetic_delta_minus),
+
+      /* Information about audited range ... */
       TALER_JSON_pack_time_abs_human ("auditor_start_time",
                                       start_time),
       TALER_JSON_pack_time_abs_human ("auditor_end_time",
                                       GNUNET_TIME_absolute_get ()),
-      TALER_JSON_pack_amount ("total_irregular_recoups",
-                              &total_irregular_recoups),
       GNUNET_JSON_pack_uint64 ("start_ppr_reserve_in_serial_id",
-                               ppr_start.last_reserve_in_serial_id),
+                               0 /* no longer supported */),
       GNUNET_JSON_pack_uint64 ("start_ppr_reserve_out_serial_id",
-                               ppr_start.last_reserve_out_serial_id),
+                               0 /* no longer supported */),
       GNUNET_JSON_pack_uint64 ("start_ppr_reserve_recoup_serial_id",
-                               ppr_start.last_reserve_recoup_serial_id),
+                               0 /* no longer supported */),
+      GNUNET_JSON_pack_uint64 ("start_ppr_reserve_open_serial_id",
+                               0 /* no longer supported */),
       GNUNET_JSON_pack_uint64 ("start_ppr_reserve_close_serial_id",
-                               ppr_start.last_reserve_close_serial_id),
+                               0 /* no longer supported */),
+      GNUNET_JSON_pack_uint64 ("start_ppr_purse_decisions_serial_id",
+                               0 /* no longer supported */),
+      GNUNET_JSON_pack_uint64 ("start_ppr_account_merges_serial_id",
+                               0 /* no longer supported */),
+      GNUNET_JSON_pack_uint64 ("start_ppr_history_requests_serial_id",
+                               0 /* no longer supported */),
       GNUNET_JSON_pack_uint64 ("end_ppr_reserve_in_serial_id",
-                               ppr.last_reserve_in_serial_id),
+                               TALER_ARL_USE_PP (
+                                 reserves_reserve_in_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppr_reserve_out_serial_id",
-                               ppr.last_reserve_out_serial_id),
+                               TALER_ARL_USE_PP (
+                                 reserves_reserve_out_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppr_reserve_recoup_serial_id",
-                               ppr.last_reserve_recoup_serial_id),
+                               TALER_ARL_USE_PP (
+                                 reserves_reserve_recoup_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppr_reserve_open_serial_id",
+                               TALER_ARL_USE_PP (
+                                 reserves_reserve_open_serial_id)),
       GNUNET_JSON_pack_uint64 ("end_ppr_reserve_close_serial_id",
-                               ppr.last_reserve_close_serial_id)));
+                               TALER_ARL_USE_PP (
+                                 reserves_reserve_close_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppr_purse_decisions_serial_id",
+                               TALER_ARL_USE_PP (
+                                 reserves_purse_decisions_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppr_account_merges_serial_id",
+                               TALER_ARL_USE_PP (
+                                 reserves_account_merges_serial_id)),
+      GNUNET_JSON_pack_uint64 ("end_ppr_history_requests_serial_id",
+                               TALER_ARL_USE_PP (
+                                 reserves_history_requests_serial_id))));
 }
 
 
@@ -1631,11 +2079,10 @@ main (int argc,
                                "internal",
                                "perform checks only applicable for exchange-internal audits",
                                &internal_checks),
-    GNUNET_GETOPT_option_base32_auto ('m',
-                                      "exchange-key",
-                                      "KEY",
-                                      "public key of the exchange (Crockford base32 encoded)",
-                                      &TALER_ARL_master_pub),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c
index 274344ff6..d48ac1f18 100644
--- a/src/auditor/taler-helper-auditor-wire.c
+++ b/src/auditor/taler-helper-auditor-wire.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2021 Taler Systems SA
+  Copyright (C) 2017-2023 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
@@ -53,6 +53,20 @@
 
 
 /**
+ * Run in test mode. Exit when idle instead of
+ * going to sleep and waiting for more work.
+ *
+ * FIXME: not yet implemented!
+ */
+static int test_mode;
+
+struct TALER_AUDITORDB_WireAccountProgressPoint
+{
+  uint64_t last_reserve_in_serial_id;
+  uint64_t last_wire_out_serial_id;
+};
+
+/**
  * Information we keep for each supported account.
  */
 struct WireAccount
@@ -93,14 +107,34 @@ struct WireAccount
   struct TALER_AUDITORDB_WireAccountProgressPoint start_pp;
 
   /**
-   * Where we are in the inbound (CREDIT) transaction history.
+   * Where we are in the inbound transaction history.
+   */
+  uint64_t wire_off_in;
+
+  /**
+   * Where we are in the outbound transaction history.
    */
-  uint64_t in_wire_off;
+  uint64_t wire_off_out;
 
   /**
-   * Where we are in the inbound (DEBIT) transaction history.
+   * Label under which we store our pp's reserve_in_serial_id.
    */
-  uint64_t out_wire_off;
+  char *label_reserve_in_serial_id;
+
+  /**
+   * Label under which we store our pp's reserve_in_serial_id.
+   */
+  char *label_wire_out_serial_id;
+
+  /**
+   * Label under which we store our wire_off_in.
+   */
+  char *label_wire_off_in;
+
+  /**
+   * Label under which we store our wire_off_out.
+   */
+  char *label_wire_off_out;
 
   /**
    * Return value when we got this account's progress point.
@@ -183,20 +217,17 @@ static enum GNUNET_DB_QueryStatus qsx_gwap;
 /**
  * Last reserve_in / wire_out serial IDs seen.
  */
-static struct TALER_AUDITORDB_WireProgressPoint pp;
-
-/**
- * Last reserve_in / wire_out serial IDs seen.
- */
-static struct TALER_AUDITORDB_WireProgressPoint start_pp;
+static TALER_ARL_DEF_PP (wire_reserve_close_id);
+static TALER_ARL_DEF_PP (wire_batch_deposit_id);
+static TALER_ARL_DEF_PP (wire_aggregation_id);
 
 /**
- * Array of reports about row inconsitencies in wire_out table.
+ * Array of reports about row inconsistencies in wire_out table.
  */
 static json_t *report_wire_out_inconsistencies;
 
 /**
- * Array of reports about row inconsitencies in reserves_in table.
+ * Array of reports about row inconsistencies in reserves_in table.
  */
 static json_t *report_reserve_in_inconsistencies;
 
@@ -204,7 +235,7 @@ static json_t *report_reserve_in_inconsistencies;
  * Array of reports about wrong bank account being recorded for
  * incoming wire transfers.
  */
-static json_t *report_missattribution_in_inconsistencies;
+static json_t *report_misattribution_in_inconsistencies;
 
 /**
  * Array of reports about row inconsistencies.
@@ -228,6 +259,16 @@ static json_t *report_row_minor_inconsistencies;
 static json_t *report_lags;
 
 /**
+ * Array of reports about lagging transactions from deposits due to missing KYC.
+ */
+static json_t *report_kyc_lags;
+
+/**
+ * Array of reports about lagging transactions from deposits due to pending or frozen AML decisions.
+ */
+static json_t *report_aml_lags;
+
+/**
  * Array of reports about lagging transactions from reserve closures.
  */
 static json_t *report_closure_lags;
@@ -267,7 +308,7 @@ static struct TALER_Amount total_bad_amount_in_minus;
  * for incoming funds and may thus wire funds to the wrong
  * destination when closing the reserve.
  */
-static struct TALER_Amount total_missattribution_in;
+static struct TALER_Amount total_misattribution_in;
 
 /**
  * Total amount which the exchange did not transfer in time.
@@ -285,6 +326,36 @@ static struct TALER_Amount total_closure_amount_lag;
 static struct TALER_Amount total_wire_format_amount;
 
 /**
+ * Total amount credited to exchange accounts.
+ */
+static struct TALER_Amount total_wire_in;
+
+/**
+ * Total amount debited to exchange accounts.
+ */
+static struct TALER_Amount total_wire_out;
+
+/**
+ * Total amount of profits drained.
+ */
+static TALER_ARL_DEF_AB (total_drained);
+
+/**
+ * Final balance at the end of this iteration.
+ */
+static TALER_ARL_DEF_AB (final_balance);
+
+/**
+ * Starting balance at the beginning of this iteration.
+ */
+static struct TALER_Amount start_balance;
+
+/**
+ * True if #start_balance was initialized.
+ */
+static bool had_start_balance;
+
+/**
  * Amount of zero in our currency.
  */
 static struct TALER_Amount zero;
@@ -304,6 +375,12 @@ static struct GNUNET_CURL_RescheduleContext *rc;
  */
 static int internal_checks;
 
+/**
+ * Should we ignore if the bank does not know our bank
+ * account?
+ */
+static int ignore_account_404;
+
 /* *****************************   Shutdown   **************************** */
 
 /**
@@ -361,7 +438,7 @@ struct ReserveOutInfo
  * @param value the `struct ReserveInInfo` to free
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 free_rii (void *cls,
           const struct GNUNET_HashCode *key,
           void *value)
@@ -386,7 +463,7 @@ free_rii (void *cls,
  * @param value the `struct ReserveOutInfo` to free
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 free_roi (void *cls,
           const struct GNUNET_HashCode *key,
           void *value)
@@ -411,7 +488,7 @@ free_roi (void *cls,
  * @param value the `struct ReserveClosure` to free
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 free_rc (void *cls,
          const struct GNUNET_HashCode *key,
          void *value)
@@ -463,11 +540,11 @@ do_shutdown (void *cls)
         TALER_JSON_pack_amount ("total_wire_in_delta_minus",
                                 &total_bad_amount_in_minus),
         /* Tested in test-auditor.sh #9 */
-        GNUNET_JSON_pack_array_steal ("missattribution_in_inconsistencies",
-                                      report_missattribution_in_inconsistencies),
+        GNUNET_JSON_pack_array_steal ("misattribution_in_inconsistencies",
+                                      report_misattribution_in_inconsistencies),
         /* Tested in test-auditor.sh #9 */
-        TALER_JSON_pack_amount ("total_missattribution_in",
-                                &total_missattribution_in),
+        TALER_JSON_pack_amount ("total_misattribution_in",
+                                &total_misattribution_in),
         GNUNET_JSON_pack_array_steal ("row_inconsistencies",
                                       report_row_inconsistencies),
         /* Tested in test-auditor.sh #10/#17 */
@@ -479,12 +556,24 @@ do_shutdown (void *cls)
         /* Tested in test-auditor.sh #19 */
         GNUNET_JSON_pack_array_steal ("wire_format_inconsistencies",
                                       report_wire_format_inconsistencies),
+        TALER_JSON_pack_amount ("total_wire_in",
+                                &total_wire_in),
+        TALER_JSON_pack_amount ("total_wire_out",
+                                &total_wire_out),
+        TALER_JSON_pack_amount ("total_drained",
+                                &TALER_ARL_USE_AB (total_drained)),
+        TALER_JSON_pack_amount ("final_balance",
+                                &TALER_ARL_USE_AB (final_balance)),
         /* Tested in test-auditor.sh #1 */
         TALER_JSON_pack_amount ("total_amount_lag",
                                 &total_amount_lag),
         /* Tested in test-auditor.sh #1 */
         GNUNET_JSON_pack_array_steal ("lag_details",
                                       report_lags),
+        GNUNET_JSON_pack_array_steal ("lag_aml_details",
+                                      report_aml_lags),
+        GNUNET_JSON_pack_array_steal ("lag_kyc_details",
+                                      report_kyc_lags),
         /* Tested in test-auditor.sh #22 */
         TALER_JSON_pack_amount ("total_closure_amount_lag",
                                 &total_closure_amount_lag),
@@ -495,22 +584,28 @@ do_shutdown (void *cls)
                                         start_time),
         TALER_JSON_pack_time_abs_human ("wire_auditor_end_time",
                                         GNUNET_TIME_absolute_get ()),
-        GNUNET_JSON_pack_uint64 ("start_pp_reserve_close_uuid",
-                                 start_pp.last_reserve_close_uuid),
-        GNUNET_JSON_pack_uint64 ("end_pp_reserve_close_uuid",
-                                 pp.last_reserve_close_uuid),
-        TALER_JSON_pack_time_abs_human ("start_pp_last_timestamp",
-                                        start_pp.last_timestamp.abs_time),
-        TALER_JSON_pack_time_abs_human ("end_pp_last_timestamp",
-                                        pp.last_timestamp.abs_time),
+        GNUNET_JSON_pack_uint64 ("start_pp_reserve_close_id",
+                                 0 /* no longer supported */),
+        GNUNET_JSON_pack_uint64 ("end_pp_reserve_close_id",
+                                 TALER_ARL_USE_PP (wire_reserve_close_id)),
+        GNUNET_JSON_pack_uint64 ("start_pp_last_batch_deposit_id",
+                                 0 /* no longer supported */),
+        GNUNET_JSON_pack_uint64 ("end_pp_last_batch_deposit_id",
+                                 TALER_ARL_USE_PP (wire_batch_deposit_id)),
+        GNUNET_JSON_pack_uint64 ("start_pp_last_aggregation_serial_id",
+                                 0 /* no longer supported */),
+        GNUNET_JSON_pack_uint64 ("end_pp_last_aggregation_serial_id",
+                                 TALER_ARL_USE_PP (wire_aggregation_id)),
         GNUNET_JSON_pack_array_steal ("account_progress",
                                       report_account_progress)));
     report_wire_out_inconsistencies = NULL;
     report_reserve_in_inconsistencies = NULL;
     report_row_inconsistencies = NULL;
     report_row_minor_inconsistencies = NULL;
-    report_missattribution_in_inconsistencies = NULL;
+    report_misattribution_in_inconsistencies = NULL;
     report_lags = NULL;
+    report_kyc_lags = NULL;
+    report_aml_lags = NULL;
     report_closure_lags = NULL;
     report_account_progress = NULL;
     report_wire_format_inconsistencies = NULL;
@@ -558,6 +653,10 @@ do_shutdown (void *cls)
     GNUNET_CONTAINER_DLL_remove (wa_head,
                                  wa_tail,
                                  wa);
+    GNUNET_free (wa->label_reserve_in_serial_id);
+    GNUNET_free (wa->label_wire_out_serial_id);
+    GNUNET_free (wa->label_wire_off_in);
+    GNUNET_free (wa->label_wire_off_out);
     GNUNET_free (wa);
   }
   if (NULL != ctx)
@@ -585,7 +684,7 @@ do_shutdown (void *cls)
  * @param value the `struct ReserveClosure` to free
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_pending_rc (void *cls,
                   const struct GNUNET_HashCode *key,
                   void *value)
@@ -612,8 +711,8 @@ check_pending_rc (void *cls,
                                     &rc->wtid),
         GNUNET_JSON_pack_string ("account",
                                  rc->receiver_account)));
-  pp.last_reserve_close_uuid
-    = GNUNET_MIN (pp.last_reserve_close_uuid,
+  TALER_ARL_USE_PP (wire_reserve_close_id)
+    = GNUNET_MIN (TALER_ARL_USE_PP (wire_reserve_close_id),
                   rc->rowid);
   return GNUNET_OK;
 }
@@ -635,12 +734,12 @@ hash_rc (const char *receiver_account,
   size_t slen = strlen (receiver_account);
   char buf[sizeof (struct TALER_WireTransferIdentifierRawP) + slen];
 
-  memcpy (buf,
-          wtid,
-          sizeof (*wtid));
-  memcpy (&buf[sizeof (*wtid)],
-          receiver_account,
-          slen);
+  GNUNET_memcpy (buf,
+                 wtid,
+                 sizeof (*wtid));
+  GNUNET_memcpy (&buf[sizeof (*wtid)],
+                 receiver_account,
+                 slen);
   GNUNET_CRYPTO_hash (buf,
                       sizeof (buf),
                       key);
@@ -656,6 +755,42 @@ hash_rc (const char *receiver_account,
 static enum GNUNET_DB_QueryStatus
 commit (enum GNUNET_DB_QueryStatus qs)
 {
+  if (qs >= 0)
+  {
+    if (had_start_balance)
+    {
+      struct TALER_Amount sum;
+
+      TALER_ARL_amount_add (&sum,
+                            &total_wire_in,
+                            &start_balance);
+      TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (final_balance),
+                                 &sum,
+                                 &total_wire_out);
+      qs = TALER_ARL_adb->update_balance (
+        TALER_ARL_adb->cls,
+        TALER_ARL_SET_AB (total_drained),
+        TALER_ARL_SET_AB (final_balance),
+        NULL);
+    }
+    else
+    {
+      TALER_ARL_amount_subtract (&TALER_ARL_USE_AB (final_balance),
+                                 &total_wire_in,
+                                 &total_wire_out);
+      qs = TALER_ARL_adb->insert_balance (
+        TALER_ARL_adb->cls,
+        TALER_ARL_SET_AB (total_drained),
+        TALER_ARL_SET_AB (final_balance),
+        NULL);
+    }
+  }
+  else
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TALER_ARL_currency,
+                                          &TALER_ARL_USE_AB (final_balance)));
+  }
   if (0 > qs)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -684,26 +819,33 @@ commit (enum GNUNET_DB_QueryStatus qs)
           GNUNET_JSON_pack_uint64 ("end_reserve_in",
                                    wa->pp.last_reserve_in_serial_id),
           GNUNET_JSON_pack_uint64 ("start_wire_out",
-                                   wa->start_pp.
-                                   last_wire_out_serial_id),
+                                   wa->start_pp.last_wire_out_serial_id),
           GNUNET_JSON_pack_uint64 ("end_wire_out",
                                    wa->pp.last_wire_out_serial_id))));
     if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == wa->qsx)
-      qs = TALER_ARL_adb->update_wire_auditor_account_progress (
+      qs = TALER_ARL_adb->update_auditor_progress (
         TALER_ARL_adb->cls,
-        &TALER_ARL_master_pub,
-        wa->ai->section_name,
-        &wa->pp,
-        wa->in_wire_off,
-        wa->out_wire_off);
+        wa->label_reserve_in_serial_id,
+        wa->pp.last_reserve_in_serial_id,
+        wa->label_wire_out_serial_id,
+        wa->pp.last_wire_out_serial_id,
+        wa->label_wire_off_in,
+        wa->wire_off_in,
+        wa->label_wire_off_out,
+        wa->wire_off_out,
+        NULL);
     else
-      qs = TALER_ARL_adb->insert_wire_auditor_account_progress (
+      qs = TALER_ARL_adb->insert_auditor_progress (
         TALER_ARL_adb->cls,
-        &TALER_ARL_master_pub,
-        wa->ai->section_name,
-        &wa->pp,
-        wa->in_wire_off,
-        wa->out_wire_off);
+        wa->label_reserve_in_serial_id,
+        wa->pp.last_reserve_in_serial_id,
+        wa->label_wire_out_serial_id,
+        wa->pp.last_wire_out_serial_id,
+        wa->label_wire_off_in,
+        wa->wire_off_in,
+        wa->label_wire_off_out,
+        wa->wire_off_out,
+        NULL);
     if (0 >= qs)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -716,13 +858,19 @@ commit (enum GNUNET_DB_QueryStatus qs)
                                          &check_pending_rc,
                                          NULL);
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qsx_gwap)
-    qs = TALER_ARL_adb->update_wire_auditor_progress (TALER_ARL_adb->cls,
-                                                      &TALER_ARL_master_pub,
-                                                      &pp);
+    qs = TALER_ARL_adb->update_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (wire_reserve_close_id),
+      TALER_ARL_SET_PP (wire_batch_deposit_id),
+      TALER_ARL_SET_PP (wire_aggregation_id),
+      NULL);
   else
-    qs = TALER_ARL_adb->insert_wire_auditor_progress (TALER_ARL_adb->cls,
-                                                      &TALER_ARL_master_pub,
-                                                      &pp);
+    qs = TALER_ARL_adb->insert_auditor_progress (
+      TALER_ARL_adb->cls,
+      TALER_ARL_SET_PP (wire_reserve_close_id),
+      TALER_ARL_SET_PP (wire_batch_deposit_id),
+      TALER_ARL_SET_PP (wire_aggregation_id),
+      NULL);
   if (0 >= qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -731,8 +879,9 @@ commit (enum GNUNET_DB_QueryStatus qs)
     return qs;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Concluded audit step at %s\n",
-              GNUNET_TIME_timestamp2s (pp.last_timestamp));
+              "Concluded audit step at %llu/%llu\n",
+              (unsigned long long) TALER_ARL_USE_PP (wire_aggregation_id),
+              (unsigned long long) TALER_ARL_USE_PP (wire_batch_deposit_id));
 
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
   {
@@ -769,59 +918,341 @@ commit (enum GNUNET_DB_QueryStatus qs)
 /* ***************************** Analyze required transfers ************************ */
 
 /**
- * Function called on deposits that are past their due date
- * and have not yet seen a wire transfer.
+ * Closure for import_wire_missing_cb().
+ */
+struct ImportMissingWireContext
+{
+  /**
+   * Set to maximum row ID encountered.
+   */
+  uint64_t max_batch_deposit_uuid;
+
+  /**
+   * Set to database errors in callback.
+   */
+  enum GNUNET_DB_QueryStatus err;
+};
+
+
+/**
+ * Function called on deposits that need to be checked for their
+ * wire transfer.
  *
- * @param cls closure
- * @param rowid deposit table row of the coin's deposit
- * @param coin_pub public key of the coin
- * @param amount value of the deposit, including fee
- * @param payto_uri where should the funds be wired
- * @param deadline what was the requested wire transfer deadline
- * @param done did the exchange claim that it made a transfer?
- *             NOTE: only valid in internal audit mode!
+ * @param cls closure, points to a `struct ImportMissingWireContext`
+ * @param batch_deposit_serial_id serial of the entry in the batch deposits table
+ * @param total_amount value of the missing deposits, including fee
+ * @param wire_target_h_payto where should the funds be wired
+ * @param deadline what was the earliest requested wire transfer deadline
  */
 static void
-wire_missing_cb (void *cls,
-                 uint64_t rowid,
-                 const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                 const struct TALER_Amount *amount,
-                 const char *payto_uri,
-                 struct GNUNET_TIME_Timestamp deadline,
-                 bool done)
+import_wire_missing_cb (void *cls,
+                        uint64_t batch_deposit_serial_id,
+                        const struct TALER_Amount *total_amount,
+                        const struct TALER_PaytoHashP *wire_target_h_payto,
+                        struct GNUNET_TIME_Timestamp deadline)
 {
-  json_t *rep;
+  struct ImportMissingWireContext *wc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  if (wc->err < 0)
+    return; /* already failed */
+  GNUNET_assert (batch_deposit_serial_id > wc->max_batch_deposit_uuid);
+  wc->max_batch_deposit_uuid = batch_deposit_serial_id;
+  qs = TALER_ARL_adb->insert_pending_deposit (
+    TALER_ARL_adb->cls,
+    batch_deposit_serial_id,
+    wire_target_h_payto,
+    total_amount,
+    deadline);
+  if (qs < 0)
+    wc->err = qs;
+}
+
+
+/**
+ * Information about a delayed wire transfer and the possible
+ * reasons for the delay.
+ */
+struct ReasonDetail
+{
+  /**
+   * Total amount that should have been transferred.
+   */
+  struct TALER_Amount total_amount;
+
+  /**
+   * Earliest deadline for an expected transfer to the account.
+   */
+  struct GNUNET_TIME_Timestamp deadline;
+
+  /**
+   * Target account, NULL if even that is not known (due to
+   * exchange lacking required entry in wire_targets table).
+   */
+  char *payto_uri;
+
+  /**
+   * Reasons due to pending KYC requests.
+   */
+  char *kyc_pending;
+
+  /**
+   * AML decision state for the target account.
+   */
+  enum TALER_AmlDecisionState status;
+
+  /**
+   * Current AML threshold for the account, may be an invalid account if the
+   * default threshold applies.
+   */
+  struct TALER_Amount aml_limit;
+};
+
+/**
+ * Closure for report_wire_missing_cb().
+ */
+struct ReportMissingWireContext
+{
+  /**
+   * Map from wire_target_h_payto to `struct ReasonDetail`.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *map;
+
+  /**
+   * Set to database errors in callback.
+   */
+  enum GNUNET_DB_QueryStatus err;
+};
+
+
+/**
+ * Closure for #clear_finished_transfer_cb().
+ */
+struct AggregationContext
+{
+  /**
+   * Set to maximum row ID encountered.
+   */
+  uint64_t max_aggregation_serial;
+
+  /**
+   * Set to database errors in callback.
+   */
+  enum GNUNET_DB_QueryStatus err;
+};
+
+
+/**
+ * Free memory allocated in @a value.
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value must be a `struct ReasonDetail`
+ * @return #GNUNET_YES if we should continue to
+ *         iterate,
+ *         #GNUNET_NO if not.
+ */
+static enum GNUNET_GenericReturnValue
+free_report_entry (void *cls,
+                   const struct GNUNET_ShortHashCode *key,
+                   void *value)
+{
+  struct ReasonDetail *rd = value;
+
+  GNUNET_free (rd->kyc_pending);
+  GNUNET_free (rd->payto_uri);
+  GNUNET_free (rd);
+  return GNUNET_YES;
+}
+
+
+/**
+ * We had an entry in our map of wire transfers that
+ * should have been performed. Generate report.
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value must be a `struct ReasonDetail`
+ * @return #GNUNET_YES if we should continue to
+ *         iterate,
+ *         #GNUNET_NO if not.
+ */
+static enum GNUNET_GenericReturnValue
+generate_report (void *cls,
+                 const struct GNUNET_ShortHashCode *key,
+                 void *value)
+{
+  struct ReasonDetail *rd = value;
 
-  (void) cls;
-  TALER_ARL_amount_add (&total_amount_lag,
-                        &total_amount_lag,
-                        amount);
   /* For now, we simplify and only check that the
      amount was tiny */
-  if (0 > TALER_amount_cmp (amount,
+  if (0 > TALER_amount_cmp (&rd->total_amount,
                             &tiny_amount))
-    return; /* acceptable, amount was tiny */
-  rep = GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_uint64 ("row",
-                             rowid),
-    TALER_JSON_pack_amount ("amount",
-                            amount),
-    TALER_JSON_pack_time_abs_human ("deadline",
-                                    deadline.abs_time),
-    GNUNET_JSON_pack_data_auto ("coin_pub",
-                                coin_pub),
-    GNUNET_JSON_pack_string ("account",
-                             payto_uri));
-  if (internal_checks)
+    return free_report_entry (cls,
+                              key,
+                              value); /* acceptable, amount was tiny */
+  // TODO: maybe split total_amount_lag up by category below?
+  TALER_ARL_amount_add (&total_amount_lag,
+                        &total_amount_lag,
+                        &rd->total_amount);
+  if (NULL != rd->kyc_pending)
+  {
+    json_t *rep;
+
+    rep = GNUNET_JSON_PACK (
+      TALER_JSON_pack_amount ("total_amount",
+                              &rd->total_amount),
+      TALER_JSON_pack_time_abs_human ("deadline",
+                                      rd->deadline.abs_time),
+      GNUNET_JSON_pack_string ("kyc_pending",
+                               rd->kyc_pending),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("account",
+                                 rd->payto_uri)));
+    TALER_ARL_report (report_kyc_lags,
+                      rep);
+  }
+  else if (TALER_AML_NORMAL != rd->status)
+  {
+    const char *sstatus = "<undefined>";
+    json_t *rep;
+
+    switch (rd->status)
+    {
+    case TALER_AML_NORMAL:
+      GNUNET_assert (0);
+      break;
+    case TALER_AML_PENDING:
+      sstatus = "pending";
+      break;
+    case TALER_AML_FROZEN:
+      sstatus = "frozen";
+      break;
+    }
+    rep = GNUNET_JSON_PACK (
+      TALER_JSON_pack_amount ("total_amount",
+                              &rd->total_amount),
+      GNUNET_JSON_pack_allow_null (
+        TALER_JSON_pack_amount ("aml_limit",
+                                TALER_amount_is_valid (&rd->aml_limit)
+                              ? &rd->aml_limit
+                              : NULL)),
+      TALER_JSON_pack_time_abs_human ("deadline",
+                                      rd->deadline.abs_time),
+      GNUNET_JSON_pack_string ("aml_status",
+                               sstatus),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("account",
+                                 rd->payto_uri)));
+    TALER_ARL_report (report_aml_lags,
+                      rep);
+  }
+  else
   {
-    /* the 'done' bit is only useful in 'internal' mode */
-    GNUNET_assert (0 ==
-                   json_object_set (rep,
-                                    "claimed_done",
-                                    json_string ((done) ? "yes" : "no")));
+    json_t *rep;
+
+    rep = GNUNET_JSON_PACK (
+      TALER_JSON_pack_amount ("total_amount",
+                              &rd->total_amount),
+      TALER_JSON_pack_time_abs_human ("deadline",
+                                      rd->deadline.abs_time),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("account",
+                                 rd->payto_uri)));
+    TALER_ARL_report (report_lags,
+                      rep);
   }
-  TALER_ARL_report (report_lags,
-                    rep);
+
+  return free_report_entry (cls,
+                            key,
+                            value);
+}
+
+
+/**
+ * Function called on deposits that are past their due date
+ * and have not yet seen a wire transfer.
+ *
+ * @param cls closure, points to a `struct ReportMissingWireContext`
+ * @param batch_deposit_serial_id row in the database for which the wire transfer is missing
+ * @param total_amount value of the missing deposits, including fee
+ * @param wire_target_h_payto hash of payto-URI where the funds should have been wired
+ * @param deadline what was the earliest requested wire transfer deadline
+ */
+static void
+report_wire_missing_cb (void *cls,
+                        uint64_t batch_deposit_serial_id,
+                        const struct TALER_Amount *total_amount,
+                        const struct TALER_PaytoHashP *wire_target_h_payto,
+                        struct GNUNET_TIME_Timestamp deadline)
+{
+  struct ReportMissingWireContext *rc = cls;
+  struct ReasonDetail *rd;
+
+  rd = GNUNET_CONTAINER_multishortmap_get (rc->map,
+                                           &wire_target_h_payto->hash);
+  if (NULL == rd)
+  {
+    rd = GNUNET_new (struct ReasonDetail);
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONTAINER_multishortmap_put (
+                     rc->map,
+                     &wire_target_h_payto->hash,
+                     rd,
+                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+    rc->err = TALER_ARL_edb->select_justification_for_missing_wire (
+      TALER_ARL_edb->cls,
+      wire_target_h_payto,
+      &rd->payto_uri,
+      &rd->kyc_pending,
+      &rd->status,
+      &rd->aml_limit);
+    rd->total_amount = *total_amount;
+    rd->deadline = deadline;
+  }
+  else
+  {
+    TALER_ARL_amount_add (&rd->total_amount,
+                          &rd->total_amount,
+                          total_amount);
+    rd->deadline = GNUNET_TIME_timestamp_min (rd->deadline,
+                                              deadline);
+  }
+}
+
+
+/**
+ * Function called on aggregations that were done for
+ * a (batch) deposit.
+ *
+ * @param cls closure
+ * @param tracking_serial_id where in the table are we
+ * @param batch_deposit_serial_id which batch deposit was aggregated
+ */
+static void
+clear_finished_transfer_cb (
+  void *cls,
+  uint64_t tracking_serial_id,
+  uint64_t batch_deposit_serial_id)
+{
+  struct AggregationContext *ac = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  if (0 > ac->err)
+    return; /* already failed */
+  GNUNET_assert (ac->max_aggregation_serial < tracking_serial_id);
+  ac->max_aggregation_serial = tracking_serial_id;
+  qs = TALER_ARL_adb->delete_pending_deposit (
+    TALER_ARL_adb->cls,
+    batch_deposit_serial_id);
+  if (0 == qs)
+  {
+    /* Aggregated something twice or other error, report! */
+    GNUNET_break (0);
+    // FIXME: report more nicely!
+  }
+  if (0 > qs)
+    ac->err = qs;
 }
 
 
@@ -832,30 +1263,78 @@ wire_missing_cb (void *cls,
 static void
 check_for_required_transfers (void)
 {
-  struct GNUNET_TIME_Timestamp next_timestamp;
+  struct ImportMissingWireContext wc = {
+    .max_batch_deposit_uuid = TALER_ARL_USE_PP (wire_batch_deposit_id),
+    .err = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
+  };
+  struct GNUNET_TIME_Absolute deadline;
   enum GNUNET_DB_QueryStatus qs;
+  struct ReportMissingWireContext rc = {
+    .err = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
+  };
+  struct AggregationContext ac = {
+    .max_aggregation_serial = TALER_ARL_USE_PP (wire_aggregation_id),
+    .err = GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
+  };
 
+  qs = TALER_ARL_edb->select_batch_deposits_missing_wire (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (wire_batch_deposit_id),
+    &import_wire_missing_cb,
+    &wc);
+  if ( (0 > qs) || (0 > wc.err) )
+  {
+    GNUNET_break (0);
+    GNUNET_break ( (GNUNET_DB_STATUS_SOFT_ERROR == qs) ||
+                   (GNUNET_DB_STATUS_SOFT_ERROR == wc.err) );
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  TALER_ARL_USE_PP (wire_batch_deposit_id) = wc.max_batch_deposit_uuid;
+  qs = TALER_ARL_edb->select_aggregations_above_serial (
+    TALER_ARL_edb->cls,
+    TALER_ARL_USE_PP (wire_aggregation_id),
+    &clear_finished_transfer_cb,
+    &ac);
+  if ( (0 > qs) || (0 > ac.err) )
+  {
+    GNUNET_break (0);
+    GNUNET_break ( (GNUNET_DB_STATUS_SOFT_ERROR == qs) ||
+                   (GNUNET_DB_STATUS_SOFT_ERROR == ac.err) );
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  TALER_ARL_USE_PP (wire_aggregation_id) = ac.max_aggregation_serial;
   /* Subtract #GRACE_PERIOD, so we can be a bit behind in processing
      without immediately raising undue concern */
-  next_timestamp = GNUNET_TIME_absolute_to_timestamp (
-    GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (),
-                                   GRACE_PERIOD));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Analyzing exchange's unfinished deposits (deadline: %s)\n",
-              GNUNET_TIME_timestamp2s (next_timestamp));
-  qs = TALER_ARL_edb->select_deposits_missing_wire (TALER_ARL_edb->cls,
-                                                    pp.last_timestamp,
-                                                    next_timestamp,
-                                                    &wire_missing_cb,
-                                                    &next_timestamp);
-  if (0 > qs)
+  deadline = GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (),
+                                            GRACE_PERIOD);
+  rc.map = GNUNET_CONTAINER_multishortmap_create (1024,
+                                                  GNUNET_NO);
+  qs = TALER_ARL_adb->select_pending_deposits (
+    TALER_ARL_adb->cls,
+    deadline,
+    &report_wire_missing_cb,
+    &rc);
+  if ( (0 > qs) || (0 > rc.err) )
   {
-    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    GNUNET_break (0);
+    GNUNET_break ( (GNUNET_DB_STATUS_SOFT_ERROR == qs) ||
+                   (GNUNET_DB_STATUS_SOFT_ERROR == rc.err) );
+    GNUNET_CONTAINER_multishortmap_iterate (rc.map,
+                                            &free_report_entry,
+                                            NULL);
+    GNUNET_CONTAINER_multishortmap_destroy (rc.map);
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  pp.last_timestamp = next_timestamp;
+  GNUNET_CONTAINER_multishortmap_iterate (rc.map,
+                                          &generate_report,
+                                          NULL);
+  GNUNET_CONTAINER_multishortmap_destroy (rc.map);
   /* conclude with success */
   commit (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT);
   GNUNET_SCHEDULER_shutdown ();
@@ -950,6 +1429,9 @@ wire_out_cb (void *cls,
               GNUNET_TIME_timestamp2s (date),
               TALER_amount2s (amount),
               TALER_B2S (wtid));
+  TALER_ARL_amount_add (&total_wire_out,
+                        &total_wire_out,
+                        amount);
   GNUNET_CRYPTO_hash (wtid,
                       sizeof (struct TALER_WireTransferIdentifierRawP),
                       &key);
@@ -959,7 +1441,7 @@ wire_out_cb (void *cls,
   {
     /* Wire transfer was not made (yet) at all (but would have been
        justified), so the entire amount is missing / still to be done.
-       This is moderately harmless, it might just be that the aggreator
+       This is moderately harmless, it might just be that the aggregator
        has not yet fully caught up with the transfers it should do. */
     TALER_ARL_report (
       report_wire_out_inconsistencies,
@@ -1127,7 +1609,7 @@ struct CheckMatchContext
  * @param key key of @a value in #reserve_closures
  * @param value a `struct ReserveClosure`
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_rc_matches (void *cls,
                   const struct GNUNET_HashCode *key,
                   void *value)
@@ -1157,16 +1639,17 @@ check_rc_matches (void *cls,
 
 
 /**
- * Check whether the given transfer was justified by a reserve closure. If
- * not, complain that we failed to match an entry from #out_map.  This means a
- * wire transfer was made without proper justification.
+ * Check whether the given transfer was justified by a reserve closure or
+ * profit drain. If not, complain that we failed to match an entry from
+ * #out_map.  This means a wire transfer was made without proper
+ * justification.
  *
  * @param cls a `struct WireAccount`
  * @param key unused key
  * @param value the `struct ReserveOutInfo` to report
- * @return #GNUNET_OK
+ * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 complain_out_not_found (void *cls,
                         const struct GNUNET_HashCode *key,
                         void *value)
@@ -1189,6 +1672,131 @@ complain_out_not_found (void *cls,
                                               &ctx);
   if (ctx.found)
     return GNUNET_OK;
+  /* check for profit drain */
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    uint64_t serial;
+    char *account_section;
+    char *payto_uri;
+    struct GNUNET_TIME_Timestamp request_timestamp;
+    struct TALER_Amount amount;
+    struct TALER_MasterSignatureP master_sig;
+
+    qs = TALER_ARL_edb->get_drain_profit (TALER_ARL_edb->cls,
+                                          &roi->details.wtid,
+                                          &serial,
+                                          &account_section,
+                                          &payto_uri,
+                                          &request_timestamp,
+                                          &amount,
+                                          &master_sig);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      global_ret = EXIT_FAILURE;
+      GNUNET_SCHEDULER_shutdown ();
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      /* should fail on commit later ... */
+      GNUNET_break (0);
+      return GNUNET_NO;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      /* not a profit drain */
+      break;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Profit drain of %s to %s found!\n",
+                  TALER_amount2s (&amount),
+                  payto_uri);
+      if (GNUNET_OK !=
+          TALER_exchange_offline_profit_drain_verify (
+            &roi->details.wtid,
+            request_timestamp,
+            &amount,
+            account_section,
+            payto_uri,
+            &TALER_ARL_master_pub,
+            &master_sig))
+      {
+        GNUNET_break (0);
+        TALER_ARL_report (report_row_inconsistencies,
+                          GNUNET_JSON_PACK (
+                            GNUNET_JSON_pack_string ("table",
+                                                     "profit_drains"),
+                            GNUNET_JSON_pack_uint64 ("row",
+                                                     serial),
+                            GNUNET_JSON_pack_data_auto ("id",
+                                                        &roi->details.wtid),
+                            GNUNET_JSON_pack_string ("diagnostic",
+                                                     "invalid signature")));
+        TALER_ARL_amount_add (&total_bad_amount_out_plus,
+                              &total_bad_amount_out_plus,
+                              &amount);
+      }
+      else if (0 !=
+               strcasecmp (payto_uri,
+                           roi->details.credit_account_uri))
+      {
+        TALER_ARL_report (
+          report_wire_out_inconsistencies,
+          GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_uint64 ("row",
+                                     serial),
+            TALER_JSON_pack_amount ("amount_wired",
+                                    &roi->details.amount),
+            TALER_JSON_pack_amount ("amount_wired",
+                                    &amount),
+            GNUNET_JSON_pack_data_auto ("wtid",
+                                        &roi->details.wtid),
+            TALER_JSON_pack_time_abs_human ("timestamp",
+                                            roi->details.execution_date.abs_time),
+            GNUNET_JSON_pack_string ("account",
+                                     wa->ai->section_name),
+            GNUNET_JSON_pack_string ("diagnostic",
+                                     "wrong target account")));
+        TALER_ARL_amount_add (&total_bad_amount_out_plus,
+                              &total_bad_amount_out_plus,
+                              &amount);
+      }
+      else if (0 !=
+               TALER_amount_cmp (&amount,
+                                 &roi->details.amount))
+      {
+        TALER_ARL_report (
+          report_wire_out_inconsistencies,
+          GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_uint64 ("row",
+                                     serial),
+            TALER_JSON_pack_amount ("amount_justified",
+                                    &roi->details.amount),
+            TALER_JSON_pack_amount ("amount_wired",
+                                    &amount),
+            GNUNET_JSON_pack_data_auto ("wtid",
+                                        &roi->details.wtid),
+            TALER_JSON_pack_time_abs_human ("timestamp",
+                                            roi->details.execution_date.abs_time),
+            GNUNET_JSON_pack_string ("account",
+                                     wa->ai->section_name),
+            GNUNET_JSON_pack_string ("diagnostic",
+                                     "profit drain amount incorrect")));
+        TALER_ARL_amount_add (&total_bad_amount_out_minus,
+                              &total_bad_amount_out_minus,
+                              &roi->details.amount);
+        TALER_ARL_amount_add (&total_bad_amount_out_plus,
+                              &total_bad_amount_out_plus,
+                              &amount);
+      }
+      GNUNET_free (account_section);
+      GNUNET_free (payto_uri);
+      /* profit drain was correct */
+      TALER_ARL_amount_add (&TALER_ARL_USE_AB (total_drained),
+                            &TALER_ARL_USE_AB (total_drained),
+                            &amount);
+      return GNUNET_OK;
+    }
+  }
+
   TALER_ARL_report (
     report_wire_out_inconsistencies,
     GNUNET_JSON_PACK (
@@ -1235,6 +1843,7 @@ check_exchange_wire_out (struct WireAccount *wa)
 {
   enum GNUNET_DB_QueryStatus qs;
 
+  GNUNET_assert (NULL == wa->dhh);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Analyzing exchange's wire OUT table for account `%s'\n",
               wa->ai->section_name);
@@ -1268,90 +1877,92 @@ check_exchange_wire_out (struct WireAccount *wa)
  * transactions).
  *
  * @param cls `struct WireAccount` with current wire account to process
- * @param http_status_code http status of the request
- * @param ec error code in case something went wrong
- * @param row_off identification of the position at which we are querying
- * @param details details about the wire transfer
- * @param json original response in JSON format
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
- */
-static int
+ * @param dhr HTTP response details
+ */
+static void
 history_debit_cb (void *cls,
-                  unsigned int http_status_code,
-                  enum TALER_ErrorCode ec,
-                  uint64_t row_off,
-                  const struct TALER_BANK_DebitDetails *details,
-                  const json_t *json)
+                  const struct TALER_BANK_DebitHistoryResponse *dhr)
 {
   struct WireAccount *wa = cls;
   struct ReserveOutInfo *roi;
   size_t slen;
 
-  (void) json;
-  if (NULL == details)
+  wa->dhh = NULL;
+  switch (dhr->http_status)
   {
-    wa->dhh = NULL;
-    if (TALER_EC_NONE != ec)
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<dhr->details.ok.details_length; i++)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error fetching debit history of account %s: %u/%u!\n",
-                  wa->ai->section_name,
-                  http_status_code,
-                  (unsigned int) ec);
-      commit (GNUNET_DB_STATUS_HARD_ERROR);
-      global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      return GNUNET_SYSERR;
+      const struct TALER_BANK_DebitDetails *dd
+        = &dhr->details.ok.details[i];
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Analyzing bank DEBIT at %s of %s with WTID %s\n",
+                  GNUNET_TIME_timestamp2s (dd->execution_date),
+                  TALER_amount2s (&dd->amount),
+                  TALER_B2S (&dd->wtid));
+      /* Update offset */
+      wa->wire_off_out = dd->serial_id;
+      slen = strlen (dd->credit_account_uri) + 1;
+      roi = GNUNET_malloc (sizeof (struct ReserveOutInfo)
+                           + slen);
+      GNUNET_CRYPTO_hash (&dd->wtid,
+                          sizeof (dd->wtid),
+                          &roi->subject_hash);
+      roi->details.amount = dd->amount;
+      roi->details.execution_date = dd->execution_date;
+      roi->details.wtid = dd->wtid;
+      roi->details.credit_account_uri = (const char *) &roi[1];
+      GNUNET_memcpy (&roi[1],
+                     dd->credit_account_uri,
+                     slen);
+      if (GNUNET_OK !=
+          GNUNET_CONTAINER_multihashmap_put (out_map,
+                                             &roi->subject_hash,
+                                             roi,
+                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+      {
+        char *diagnostic;
+
+        GNUNET_asprintf (&diagnostic,
+                         "duplicate subject hash `%s'",
+                         TALER_B2S (&roi->subject_hash));
+        TALER_ARL_amount_add (&total_wire_format_amount,
+                              &total_wire_format_amount,
+                              &dd->amount);
+        TALER_ARL_report (report_wire_format_inconsistencies,
+                          GNUNET_JSON_PACK (
+                            TALER_JSON_pack_amount ("amount",
+                                                    &dd->amount),
+                            GNUNET_JSON_pack_uint64 ("wire_offset",
+                                                     dd->serial_id),
+                            GNUNET_JSON_pack_string ("diagnostic",
+                                                     diagnostic)));
+        GNUNET_free (diagnostic);
+      }
     }
     check_exchange_wire_out (wa);
-    return GNUNET_OK;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Analyzing bank DEBIT at %s of %s with WTID %s\n",
-              GNUNET_TIME_timestamp2s (details->execution_date),
-              TALER_amount2s (&details->amount),
-              TALER_B2S (&details->wtid));
-  /* Update offset */
-  wa->out_wire_off = row_off;
-  slen = strlen (details->credit_account_uri) + 1;
-  roi = GNUNET_malloc (sizeof (struct ReserveOutInfo)
-                       + slen);
-  GNUNET_CRYPTO_hash (&details->wtid,
-                      sizeof (details->wtid),
-                      &roi->subject_hash);
-  roi->details.amount = details->amount;
-  roi->details.execution_date = details->execution_date;
-  roi->details.wtid = details->wtid;
-  roi->details.credit_account_uri = (const char *) &roi[1];
-  memcpy (&roi[1],
-          details->credit_account_uri,
-          slen);
-  if (GNUNET_OK !=
-      GNUNET_CONTAINER_multihashmap_put (out_map,
-                                         &roi->subject_hash,
-                                         roi,
-                                         GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
-  {
-    char *diagnostic;
-
-    GNUNET_asprintf (&diagnostic,
-                     "duplicate subject hash `%s'",
-                     TALER_B2S (&roi->subject_hash));
-    TALER_ARL_amount_add (&total_wire_format_amount,
-                          &total_wire_format_amount,
-                          &details->amount);
-    TALER_ARL_report (report_wire_format_inconsistencies,
-                      GNUNET_JSON_PACK (
-                        TALER_JSON_pack_amount ("amount",
-                                                &details->amount),
-                        GNUNET_JSON_pack_uint64 ("wire_offset",
-                                                 row_off),
-                        GNUNET_JSON_pack_string ("diagnostic",
-                                                 diagnostic)));
-    GNUNET_free (diagnostic);
-    return GNUNET_OK;
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    check_exchange_wire_out (wa);
+    return;
+  case MHD_HTTP_NOT_FOUND:
+    if (ignore_account_404)
+    {
+      check_exchange_wire_out (wa);
+      return;
+    }
+    break;
+  default:
+    break;
   }
-  return GNUNET_OK;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Error fetching debit history of account %s: %u/%u!\n",
+              wa->ai->section_name,
+              dhr->http_status,
+              (unsigned int) dhr->ec);
+  commit (GNUNET_DB_STATUS_HARD_ERROR);
+  global_ret = EXIT_FAILURE;
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -1382,10 +1993,12 @@ process_debits (void *cls)
               "Checking bank DEBIT records of account `%s'\n",
               wa->ai->section_name);
   GNUNET_assert (NULL == wa->dhh);
+  // FIXME: handle the case where more than INT32_MAX transactions exist.
+  // (CG: used to be INT64_MAX, changed by MS to INT32_MAX, why? To be discussed with him!)
   wa->dhh = TALER_BANK_debit_history (ctx,
                                       wa->ai->auth,
-                                      wa->out_wire_off,
-                                      INT64_MAX,
+                                      wa->wire_off_out,
+                                      INT32_MAX,
                                       GNUNET_TIME_UNIT_ZERO,
                                       &history_debit_cb,
                                       wa);
@@ -1408,8 +2021,9 @@ process_debits (void *cls)
 static void
 begin_debit_audit (void)
 {
+  GNUNET_assert (NULL == out_map);
   out_map = GNUNET_CONTAINER_multihashmap_create (1024,
-                                                  GNUNET_YES);
+                                                  true);
   process_debits (wa_head);
 }
 
@@ -1424,8 +2038,11 @@ begin_debit_audit (void)
 static void
 conclude_credit_history (void)
 {
-  GNUNET_CONTAINER_multihashmap_destroy (in_map);
-  in_map = NULL;
+  if (NULL != in_map)
+  {
+    GNUNET_CONTAINER_multihashmap_destroy (in_map);
+    in_map = NULL;
+  }
   /* credit done, now check debits */
   begin_debit_audit ();
 }
@@ -1444,7 +2061,7 @@ conclude_credit_history (void)
  * @param execution_date when did we receive the funds
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
-static int
+static enum GNUNET_GenericReturnValue
 reserve_in_cb (void *cls,
                uint64_t rowid,
                const struct TALER_ReservePublicKeyP *reserve_pub,
@@ -1463,6 +2080,9 @@ reserve_in_cb (void *cls,
               GNUNET_TIME_timestamp2s (execution_date),
               TALER_amount2s (credit),
               TALER_B2S (reserve_pub));
+  TALER_ARL_amount_add (&total_wire_in,
+                        &total_wire_in,
+                        credit);
   slen = strlen (sender_account_details) + 1;
   rii = GNUNET_malloc (sizeof (struct ReserveInInfo) + slen);
   rii->rowid = rowid;
@@ -1470,9 +2090,9 @@ reserve_in_cb (void *cls,
   rii->details.execution_date = execution_date;
   rii->details.reserve_pub = *reserve_pub;
   rii->details.debit_account_uri = (const char *) &rii[1];
-  memcpy (&rii[1],
-          sender_account_details,
-          slen);
+  GNUNET_memcpy (&rii[1],
+                 sender_account_details,
+                 slen);
   GNUNET_CRYPTO_hash (&wire_reference,
                       sizeof (uint64_t),
                       &rii->row_off_hash);
@@ -1488,7 +2108,7 @@ reserve_in_cb (void *cls,
                                                  "reserves_in"),
                         GNUNET_JSON_pack_uint64 ("row",
                                                  rowid),
-                        GNUNET_JSON_pack_data_auto ("wire_offset_hash",
+                        GNUNET_JSON_pack_data_auto ("id",
                                                     &rii->row_off_hash),
                         GNUNET_JSON_pack_string ("diagnostic",
                                                  "duplicate wire offset")));
@@ -1512,7 +2132,7 @@ reserve_in_cb (void *cls,
  * @param value the `struct ReserveInInfo` to free
  * @return #GNUNET_OK
  */
-static int
+static enum GNUNET_GenericReturnValue
 complain_in_not_found (void *cls,
                        const struct GNUNET_HashCode *key,
                        void *value)
@@ -1556,50 +2176,19 @@ process_credits (void *cls);
 
 
 /**
- * This function is called for all transactions that
- * are credited to the exchange's account (incoming
- * transactions).
+ * We got all of the incoming transactions for @a wa,
+ * finish processing the account.
  *
- * @param cls `struct WireAccount` we are processing
- * @param http_status HTTP status returned by the bank
- * @param ec error code in case something went wrong
- * @param row_off identification of the position at which we are querying
- * @param details details about the wire transfer
- * @param json raw response
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
- */
-static int
-history_credit_cb (void *cls,
-                   unsigned int http_status,
-                   enum TALER_ErrorCode ec,
-                   uint64_t row_off,
-                   const struct TALER_BANK_CreditDetails *details,
-                   const json_t *json)
+ * @param[in,out] wa wire account to process
+ */
+static void
+conclude_account (struct WireAccount *wa)
 {
-  struct WireAccount *wa = cls;
-  struct ReserveInInfo *rii;
-  struct GNUNET_HashCode key;
-
-  (void) json;
-  if (NULL == details)
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Reconciling CREDIT processing of account `%s'\n",
+              wa->ai->section_name);
+  if (NULL != in_map)
   {
-    wa->chh = NULL;
-    if (TALER_EC_NONE != ec)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error fetching credit history of account %s: %u/%s!\n",
-                  wa->ai->section_name,
-                  http_status,
-                  TALER_ErrorCode_get_hint (ec));
-      commit (GNUNET_DB_STATUS_HARD_ERROR);
-      global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      return GNUNET_SYSERR;
-    }
-    /* end of operation */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Reconciling CREDIT processing of account `%s'\n",
-                wa->ai->section_name);
     GNUNET_CONTAINER_multihashmap_iterate (in_map,
                                            &complain_in_not_found,
                                            wa);
@@ -1607,16 +2196,32 @@ history_credit_cb (void *cls,
     GNUNET_CONTAINER_multihashmap_iterate (in_map,
                                            &free_rii,
                                            NULL);
-    process_credits (wa->next);
-    return GNUNET_OK;
   }
+  process_credits (wa->next);
+}
+
+
+/**
+ * Analyze credit transaction @a details into @a wa.
+ *
+ * @param[in,out] wa account that received the transfer
+ * @param details transfer details
+ * @return true on success, false to stop loop at this point
+ */
+static bool
+analyze_credit (struct WireAccount *wa,
+                const struct TALER_BANK_CreditDetails *details)
+{
+  struct ReserveInInfo *rii;
+  struct GNUNET_HashCode key;
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Analyzing bank CREDIT at %s of %s with Reserve-pub %s\n",
               GNUNET_TIME_timestamp2s (details->execution_date),
               TALER_amount2s (&details->amount),
               TALER_B2S (&details->reserve_pub));
-  GNUNET_CRYPTO_hash (&row_off,
-                      sizeof (row_off),
+  GNUNET_CRYPTO_hash (&details->serial_id,
+                      sizeof (details->serial_id),
                       &key);
   rii = GNUNET_CONTAINER_multihashmap_get (in_map,
                                            &key);
@@ -1625,13 +2230,12 @@ history_credit_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Failed to find wire transfer at `%s' in exchange database. Audit ends at this point in time.\n",
                 GNUNET_TIME_timestamp2s (details->execution_date));
-    wa->chh = NULL;
     process_credits (wa->next);
-    return GNUNET_SYSERR; /* not an error, just end of processing */
+    return false; /* not an error, just end of processing */
   }
 
   /* Update offset */
-  wa->in_wire_off = row_off;
+  wa->wire_off_in = details->serial_id;
   /* compare records with expected data */
   if (0 != GNUNET_memcmp (&details->reserve_pub,
                           &rii->details.reserve_pub))
@@ -1642,7 +2246,7 @@ history_credit_cb (void *cls,
         GNUNET_JSON_pack_uint64 ("row",
                                  rii->rowid),
         GNUNET_JSON_pack_uint64 ("bank_row",
-                                 row_off),
+                                 details->serial_id),
         TALER_JSON_pack_amount ("amount_exchange_expected",
                                 &rii->details.amount),
         TALER_JSON_pack_amount ("amount_wired",
@@ -1662,7 +2266,7 @@ history_credit_cb (void *cls,
         GNUNET_JSON_pack_uint64 ("row",
                                  rii->rowid),
         GNUNET_JSON_pack_uint64 ("bank_row",
-                                 row_off),
+                                 details->serial_id),
         TALER_JSON_pack_amount ("amount_exchange_expected",
                                 &zero),
         TALER_JSON_pack_amount ("amount_wired",
@@ -1688,7 +2292,7 @@ history_credit_cb (void *cls,
         GNUNET_JSON_pack_uint64 ("row",
                                  rii->rowid),
         GNUNET_JSON_pack_uint64 ("bank_row",
-                                 row_off),
+                                 details->serial_id),
         TALER_JSON_pack_amount ("amount_exchange_expected",
                                 &rii->details.amount),
         TALER_JSON_pack_amount ("amount_wired",
@@ -1729,19 +2333,19 @@ history_credit_cb (void *cls,
   if (0 != strcasecmp (details->debit_account_uri,
                        rii->details.debit_account_uri))
   {
-    TALER_ARL_report (report_missattribution_in_inconsistencies,
+    TALER_ARL_report (report_misattribution_in_inconsistencies,
                       GNUNET_JSON_PACK (
                         TALER_JSON_pack_amount ("amount",
                                                 &rii->details.amount),
                         GNUNET_JSON_pack_uint64 ("row",
                                                  rii->rowid),
                         GNUNET_JSON_pack_uint64 ("bank_row",
-                                                 row_off),
+                                                 details->serial_id),
                         GNUNET_JSON_pack_data_auto (
                           "reserve_pub",
                           &rii->details.reserve_pub)));
-    TALER_ARL_amount_add (&total_missattribution_in,
-                          &total_missattribution_in,
+    TALER_ARL_amount_add (&total_misattribution_in,
+                          &total_misattribution_in,
                           &rii->details.amount);
   }
   if (GNUNET_TIME_timestamp_cmp (details->execution_date,
@@ -1755,7 +2359,7 @@ history_credit_cb (void *cls,
                         GNUNET_JSON_pack_uint64 ("row",
                                                  rii->rowid),
                         GNUNET_JSON_pack_uint64 ("bank_row",
-                                                 row_off),
+                                                 details->serial_id),
                         GNUNET_JSON_pack_string ("diagnostic",
                                                  "execution date mismatch")));
   }
@@ -1764,7 +2368,60 @@ cleanup:
                  free_rii (NULL,
                            &key,
                            rii));
-  return GNUNET_OK;
+  return true;
+}
+
+
+/**
+ * This function is called for all transactions that
+ * are credited to the exchange's account (incoming
+ * transactions).
+ *
+ * @param cls `struct WireAccount` we are processing
+ * @param chr HTTP response returned by the bank
+ */
+static void
+history_credit_cb (void *cls,
+                   const struct TALER_BANK_CreditHistoryResponse *chr)
+{
+  struct WireAccount *wa = cls;
+
+  wa->chh = NULL;
+  switch (chr->http_status)
+  {
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<chr->details.ok.details_length; i++)
+    {
+      const struct TALER_BANK_CreditDetails *cd
+        = &chr->details.ok.details[i];
+
+      if (! analyze_credit (wa,
+                            cd))
+        return;
+    }
+    conclude_account (wa);
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    conclude_account (wa);
+    return;
+  case MHD_HTTP_NOT_FOUND:
+    if (ignore_account_404)
+    {
+      conclude_account (wa);
+      return;
+    }
+    break;
+  default:
+    break;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Error fetching credit history of account %s: %u/%s!\n",
+              wa->ai->section_name,
+              chr->http_status,
+              TALER_ErrorCode_get_hint (chr->ec));
+  commit (GNUNET_DB_STATUS_HARD_ERROR);
+  global_ret = EXIT_FAILURE;
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -1813,10 +2470,12 @@ process_credits (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting bank CREDIT history of account `%s'\n",
               wa->ai->section_name);
+  // NOTE: handle the case where more than INT32_MAX transactions exist.
+  // (CG: used to be INT64_MAX, changed by MS to INT32_MAX, why? To be discussed with him!)
   wa->chh = TALER_BANK_credit_history (ctx,
                                        wa->ai->auth,
-                                       wa->in_wire_off,
-                                       INT64_MAX,
+                                       wa->wire_off_in,
+                                       INT32_MAX,
                                        GNUNET_TIME_UNIT_ZERO,
                                        &history_credit_cb,
                                        wa);
@@ -1838,6 +2497,7 @@ process_credits (void *cls)
 static void
 begin_credit_audit (void)
 {
+  GNUNET_assert (NULL == in_map);
   in_map = GNUNET_CONTAINER_multihashmap_create (1024,
                                                  GNUNET_YES);
   /* now go over all bank accounts and check delta with in_map */
@@ -1846,8 +2506,7 @@ begin_credit_audit (void)
 
 
 /**
- * Function called about reserve closing operations
- * the aggregator triggered.
+ * Function called about reserve closing operations the aggregator triggered.
  *
  * @param cls closure
  * @param rowid row identifier used to uniquely identify the reserve closing operation
@@ -1857,9 +2516,11 @@ begin_credit_audit (void)
  * @param reserve_pub public key of the reserve
  * @param receiver_account where did we send the funds, in payto://-format
  * @param wtid identifier used for the wire transfer
+ * @param close_request_row which close request triggered the operation?
+ *         0 if it was a timeout (not used)
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
-static int
+static enum GNUNET_GenericReturnValue
 reserve_closed_cb (void *cls,
                    uint64_t rowid,
                    struct GNUNET_TIME_Timestamp execution_date,
@@ -1867,12 +2528,14 @@ reserve_closed_cb (void *cls,
                    const struct TALER_Amount *closing_fee,
                    const struct TALER_ReservePublicKeyP *reserve_pub,
                    const char *receiver_account,
-                   const struct TALER_WireTransferIdentifierRawP *wtid)
+                   const struct TALER_WireTransferIdentifierRawP *wtid,
+                   uint64_t close_request_row)
 {
   struct ReserveClosure *rc;
   struct GNUNET_HashCode key;
 
   (void) cls;
+  (void) close_request_row;
   rc = GNUNET_new (struct ReserveClosure);
   if (TALER_ARL_SR_INVALID_NEGATIVE ==
       TALER_ARL_amount_subtract_neg (&rc->amount,
@@ -1885,7 +2548,7 @@ reserve_closed_cb (void *cls,
                                                  "reserves_closures"),
                         GNUNET_JSON_pack_uint64 ("row",
                                                  rowid),
-                        GNUNET_JSON_pack_data_auto ("reserve_pub",
+                        GNUNET_JSON_pack_data_auto ("id",
                                                     reserve_pub),
                         TALER_JSON_pack_amount ("amount_with_fee",
                                                 amount_with_fee),
@@ -1898,8 +2561,8 @@ reserve_closed_cb (void *cls,
       return GNUNET_SYSERR;
     return GNUNET_OK;
   }
-  pp.last_reserve_close_uuid
-    = GNUNET_MAX (pp.last_reserve_close_uuid,
+  TALER_ARL_USE_PP (wire_reserve_close_id)
+    = GNUNET_MAX (TALER_ARL_USE_PP (wire_reserve_close_id),
                   rowid + 1);
   rc->receiver_account = GNUNET_strdup (receiver_account);
   rc->wtid = *wtid;
@@ -1926,6 +2589,8 @@ reserve_closed_cb (void *cls,
 static enum GNUNET_DB_QueryStatus
 begin_transaction (void)
 {
+  enum GNUNET_DB_QueryStatus qs;
+
   if (GNUNET_SYSERR ==
       TALER_ARL_edb->preflight (TALER_ARL_edb->cls))
   {
@@ -1954,17 +2619,66 @@ begin_transaction (void)
     GNUNET_break (0);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &TALER_ARL_USE_AB (total_drained)));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_wire_in));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TALER_ARL_currency,
+                                        &total_wire_out));
+  qs = TALER_ARL_adb->get_balance (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_AB (total_drained),
+    TALER_ARL_GET_AB (final_balance),
+    NULL);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    had_start_balance = false;
+    break;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    had_start_balance = true;
+    break;
+  }
   for (struct WireAccount *wa = wa_head;
        NULL != wa;
        wa = wa->next)
   {
-    wa->qsx = TALER_ARL_adb->get_wire_auditor_account_progress (
+    GNUNET_asprintf (&wa->label_reserve_in_serial_id,
+                     "wire-%s-%s",
+                     wa->ai->section_name,
+                     "reserve_in_serial_id");
+    GNUNET_asprintf (&wa->label_wire_out_serial_id,
+                     "wire-%s-%s",
+                     wa->ai->section_name,
+                     "wire_out_serial_id");
+    GNUNET_asprintf (&wa->label_wire_off_in,
+                     "wire-%s-%s",
+                     wa->ai->section_name,
+                     "wire_off_in");
+    GNUNET_asprintf (&wa->label_wire_off_out,
+                     "wire-%s-%s",
+                     wa->ai->section_name,
+                     "wire_off_out");
+    wa->qsx = TALER_ARL_adb->get_auditor_progress (
       TALER_ARL_adb->cls,
-      &TALER_ARL_master_pub,
-      wa->ai->section_name,
-      &wa->pp,
-      &wa->in_wire_off,
-      &wa->out_wire_off);
+      wa->label_reserve_in_serial_id,
+      &wa->pp.last_reserve_in_serial_id,
+      wa->label_wire_out_serial_id,
+      &wa->pp.last_wire_out_serial_id,
+      wa->label_wire_off_in,
+      &wa->wire_off_in,
+      wa->label_wire_off_out,
+      &wa->wire_off_out,
+      NULL);
     if (0 > wa->qsx)
     {
       GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == wa->qsx);
@@ -1972,9 +2686,12 @@ begin_transaction (void)
     }
     wa->start_pp = wa->pp;
   }
-  qsx_gwap = TALER_ARL_adb->get_wire_auditor_progress (TALER_ARL_adb->cls,
-                                                       &TALER_ARL_master_pub,
-                                                       &pp);
+  qsx_gwap = TALER_ARL_adb->get_auditor_progress (
+    TALER_ARL_adb->cls,
+    TALER_ARL_GET_PP (wire_reserve_close_id),
+    TALER_ARL_GET_PP (wire_batch_deposit_id),
+    TALER_ARL_GET_PP (wire_aggregation_id),
+    NULL);
   if (0 > qsx_gwap)
   {
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qsx_gwap);
@@ -1987,11 +2704,11 @@ begin_transaction (void)
   }
   else
   {
-    start_pp = pp;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Resuming wire audit at %s / %llu\n",
-                GNUNET_TIME_timestamp2s (pp.last_timestamp),
-                (unsigned long long) pp.last_reserve_close_uuid);
+                "Resuming wire audit at %llu / %llu / %llu\n",
+                (unsigned long long) TALER_ARL_USE_PP (wire_reserve_close_id),
+                (unsigned long long) TALER_ARL_USE_PP (wire_batch_deposit_id),
+                (unsigned long long) TALER_ARL_USE_PP (wire_aggregation_id));
   }
 
   {
@@ -1999,7 +2716,7 @@ begin_transaction (void)
 
     qs = TALER_ARL_edb->select_reserve_closed_above_serial_id (
       TALER_ARL_edb->cls,
-      pp.last_reserve_close_uuid,
+      TALER_ARL_USE_PP (wire_reserve_close_id),
       &reserve_closed_cb,
       NULL);
     if (0 > qs)
@@ -2101,11 +2818,15 @@ run (void *cls,
   GNUNET_assert (NULL !=
                  (report_row_inconsistencies = json_array ()));
   GNUNET_assert (NULL !=
-                 (report_missattribution_in_inconsistencies
+                 (report_misattribution_in_inconsistencies
                     = json_array ()));
   GNUNET_assert (NULL !=
                  (report_lags = json_array ()));
   GNUNET_assert (NULL !=
+                 (report_aml_lags = json_array ()));
+  GNUNET_assert (NULL !=
+                 (report_kyc_lags = json_array ()));
+  GNUNET_assert (NULL !=
                  (report_closure_lags = json_array ()));
   GNUNET_assert (NULL !=
                  (report_account_progress = json_array ()));
@@ -2123,7 +2844,7 @@ run (void *cls,
                                         &total_bad_amount_in_minus));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
-                                        &total_missattribution_in));
+                                        &total_misattribution_in));
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TALER_ARL_currency,
                                         &total_amount_lag));
@@ -2177,11 +2898,14 @@ main (int argc,
                                "internal",
                                "perform checks only applicable for exchange-internal audits",
                                &internal_checks),
-    GNUNET_GETOPT_option_base32_auto ('m',
-                                      "exchange-key",
-                                      "KEY",
-                                      "public key of the exchange (Crockford base32 encoded)",
-                                      &TALER_ARL_master_pub),
+    GNUNET_GETOPT_option_flag ('I',
+                               "ignore-not-found",
+                               "continue, even if the bank account of the exchange was not found",
+                               &ignore_account_404),
+    GNUNET_GETOPT_option_flag ('t',
+                               "test",
+                               "run in test mode and exit when idle",
+                               &test_mode),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_OPTION_END
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 0d5dbc884..2cfea0532 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -1,4 +1,24 @@
 #!/bin/bash
+#
+#  This file is part of TALER
+#  Copyright (C) 2014-2023 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, If not, see <http://www.gnu.org/license>
+#
+#
+# shellcheck disable=SC2317
+# shellcheck disable=SC1091
+#
+#
 # Setup database which was generated from a perfectly normal
 # exchange-wallet interaction and run the auditor against it.
 #
@@ -10,7 +30,7 @@ set -eu
 
 # Set of numbers for all the testcases.
 # When adding new tests, increase the last number:
-ALL_TESTS=`seq 0 32`
+ALL_TESTS=$(seq 0 33)
 
 # $TESTS determines which tests we should run.
 # This construction is used to make it easy to
@@ -28,60 +48,105 @@ TESTS=${1:-$ALL_TESTS}
 # VALGRIND=valgrind
 VALGRIND=""
 
-# Exit, with status code "skip" (no 'real' failure)
-function exit_skip() {
-    echo $1
-    exit 77
-}
+# Number of seconds to let libeuifn background
+# tasks apply a cycle of payment submission and
+# history request.
+LIBEUFIN_SETTLE_TIME=1
+
+. setup.sh
+
 
-# Exit, with error message (hard failure)
-function exit_fail() {
-    echo $1
-    exit 1
+# Cleanup exchange and libeufin between runs.
+function cleanup()
+{
+    if [ ! -z "${EPID:-}" ]
+    then
+        echo -n "Stopping exchange $EPID..."
+        kill -TERM "$EPID"
+        wait "$EPID" || true
+        echo "DONE"
+        unset EPID
+    fi
+    stop_libeufin
 }
 
 # Cleanup to run whenever we exit
-function cleanup()
+function exit_cleanup()
 {
-    for n in `jobs -p`
+    echo "Running exit-cleanup"
+    if [ ! -z "${POSTGRES_PATH:-}" ]
+    then
+        echo "Stopping Postgres at ${POSTGRES_PATH}"
+        "${POSTGRES_PATH}/pg_ctl" \
+                        -D "$TMPDIR" \
+                        -l /dev/null \
+                        stop \
+            &> /dev/null \
+            || true
+    fi
+    cleanup
+    for n in $(jobs -p)
     do
-        kill $n 2> /dev/null || true
+        kill "$n" 2> /dev/null || true
     done
-    wait
+    wait || true
+    echo "DONE"
 }
 
 # Install cleanup handler (except for kill -9)
-trap cleanup EXIT
+trap exit_cleanup EXIT
 
 
 # Operations to run before the actual audit
 function pre_audit () {
     # Launch bank
-    echo -n "Launching bank "
-    taler-bank-manage-testing $CONF postgres:///$DB serve 2>bank.err >bank.log &
-    for n in `seq 1 80`
+    echo -n "Launching libeufin-bank"
+    export CONF
+    export MY_TMP_DIR
+    launch_libeufin
+    for n in $(seq 1 80)
     do
         echo -n "."
         sleep 0.1
         OK=1
-        wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null && break
+        wget http://localhost:8082/ \
+             -o /dev/null \
+             -O /dev/null \
+             >/dev/null \
+            && break
         OK=0
     done
-    if [ 1 != $OK ]
+    if [ 1 != "$OK" ]
     then
-        exit_skip "Failed to launch bank"
+        exit_skip "Failed to launch libeufin-bank"
     fi
     echo " DONE"
-    if test ${1:-no} = "aggregator"
+    if [ "${1:-no}" = "aggregator" ]
     then
         echo -n "Running exchange aggregator ..."
-        taler-exchange-aggregator -y -L INFO -t -c $CONF 2> aggregator.log || exit_fail "FAIL"
+        taler-exchange-aggregator \
+            -y \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/aggregator.log" \
+            || exit_fail "FAIL"
         echo " DONE"
         echo -n "Running exchange closer ..."
-        taler-exchange-closer -L INFO -t -c $CONF 2> closer.log || exit_fail "FAIL"
+        taler-exchange-closer \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/closer.log" \
+            || exit_fail "FAIL"
         echo " DONE"
         echo -n "Running exchange transfer ..."
-        taler-exchange-transfer -L INFO -t -c $CONF 2> transfer.log || exit_fail "FAIL"
+        taler-exchange-transfer \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/transfer.log" \
+            || exit_fail "FAIL"
         echo " DONE"
     fi
 }
@@ -92,26 +157,92 @@ function audit_only () {
     echo -n "Running audit(s) ..."
 
     # Restart so that first run is always fresh, and second one is incremental
-    taler-auditor-dbinit -r -c $CONF
-    $VALGRIND taler-helper-auditor-aggregation -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-aggregation.json 2> test-audit-aggregation.log || exit_fail "aggregation audit failed"
+    taler-auditor-dbinit \
+        -r \
+        -c "$CONF"
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-aggregation.out" \
+              2> "${MY_TMP_DIR}/test-audit-aggregation.err" \
+        || exit_fail "aggregation audit failed (see ${MY_TMP_DIR}/test-audit-aggregation.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-aggregation -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-aggregation-inc.json 2> test-audit-aggregation-inc.log || exit_fail "incremental aggregation audit failed"
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-aggregation-inc.out" \
+              2> "${MY_TMP_DIR}/test-audit-aggregation-inc.err" \
+        || exit_fail "incremental aggregation audit failed (see ${MY_TMP_DIR}/test-audit-aggregation-inc.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-coins -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-coins.json 2> test-audit-coins.log || exit_fail "coin audit failed"
+    $VALGRIND taler-helper-auditor-coins \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-coins.out" \
+              2> "${MY_TMP_DIR}/test-audit-coins.err" \
+        || exit_fail "coin audit failed (see ${MY_TMP_DIR}/test-audit-coins.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-coins -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-coins-inc.json 2> test-audit-coins-inc.log || exit_fail "incremental coin audit failed"
+    $VALGRIND taler-helper-auditor-coins \
+              -L DEBUG  \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-coins-inc.out" \
+              2> "${MY_TMP_DIR}/test-audit-coins-inc.err" \
+        || exit_fail "incremental coin audit failed (see ${MY_TMP_DIR}/test-audit-coins-inc.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-deposits -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-deposits.json 2> test-audit-deposits.log || exit_fail "deposits audit failed"
+    $VALGRIND taler-helper-auditor-deposits \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-deposits.out" \
+              2> "${MY_TMP_DIR}/test-audit-deposits.err" \
+        || exit_fail "deposits audit failed (see ${MY_TMP_DIR}/test-audit-deposits.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-deposits -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-deposits-inc.json 2> test-audit-deposits-inc.log || exit_fail "incremental deposits audit failed"
+    $VALGRIND taler-helper-auditor-deposits \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-deposits-inc.out" \
+              2> "${MY_TMP_DIR}/test-audit-deposits-inc.err" \
+        || exit_fail "incremental deposits audit failed (see ${MY_TMP_DIR}/test-audit-deposits-inc.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-reserves -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-reserves.json 2> test-audit-reserves.log || exit_fail "reserves audit failed"
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-reserves.out" \
+              2> "${MY_TMP_DIR}/test-audit-reserves.err" \
+        || exit_fail "reserves audit failed (see ${MY_TMP_DIR}/test-audit-reserves.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-reserves -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-reserves-inc.json 2> test-audit-reserves-inc.log || exit_fail "incremental reserves audit failed"
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-reserves-inc.out" \
+              2> "${MY_TMP_DIR}/test-audit-reserves-inc.err" \
+        || exit_fail "incremental reserves audit failed (see ${MY_TMP_DIR}/test-audit-reserves-inc.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire.json 2> test-wire-audit.log || exit_fail "wire audit failed"
+    $VALGRIND taler-helper-auditor-wire \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-wire.out" \
+              2> "${MY_TMP_DIR}/test-audit-wire.err" \
+        || exit_fail "wire audit failed (see ${MY_TMP_DIR}/test-audit-wire.*)"
     echo -n "."
-    $VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire-inc.json 2> test-wire-audit-inc.log || exit_fail "wire audit failed"
+    $VALGRIND taler-helper-auditor-wire \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -t \
+              > "${MY_TMP_DIR}/test-audit-wire-inc.out" \
+              2> "${MY_TMP_DIR}/test-audit-wire-inc.err" \
+        || exit_fail "wire audit inc failed (see ${MY_TMP_DIR}/test-audit-wire-inc.*)"
     echo -n "."
 
     echo " DONE"
@@ -120,16 +251,11 @@ function audit_only () {
 
 # Cleanup to run after the auditor
 function post_audit () {
-    taler-exchange-dbinit -c $CONF -g || exit_fail "exchange DB GC failed"
-
+    taler-exchange-dbinit \
+        -c "$CONF" \
+        -g \
+        || exit_fail "exchange DB GC failed"
     cleanup
-    echo -n "TeXing ."
-    taler-helper-auditor-render.py test-audit-aggregation.json test-audit-coins.json test-audit-deposits.json test-audit-reserves.json test-audit-wire.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"
-
-    echo -n "."
-    timeout 10 pdflatex test-report.tex >/dev/null || exit_fail "pdflatex failed"
-    echo -n "."
-    timeout 10 pdflatex test-report.tex >/dev/null
     echo " DONE"
 }
 
@@ -138,143 +264,207 @@ function post_audit () {
 # generation.  Pass "aggregator" as $1 to run
 # $ taler-exchange-aggregator
 # before auditor (to trigger pending wire transfers).
+# Pass "drain" as $2 to run a drain operation as well.
 function run_audit () {
-    pre_audit ${1:-no}
+    pre_audit "${1:-no}"
+    if [ "${2:-no}" = "drain" ]
+    then
+        echo -n "Starting exchange..."
+        taler-exchange-httpd \
+            -c "${CONF}" \
+            -L INFO \
+            2> "${MY_TMP_DIR}/exchange-httpd-drain.err" &
+        EPID=$!
+
+        # Wait for all services to be available
+        for n in $(seq 1 50)
+        do
+            echo -n "."
+            sleep 0.1
+            OK=0
+            # exchange
+            wget "http://localhost:8081/seed" \
+                 -o /dev/null \
+                 -O /dev/null \
+                 >/dev/null \
+                || continue
+            OK=1
+            break
+        done
+        echo "... DONE."
+        export CONF
+
+        echo -n "Running taler-exchange-offline drain "
+
+        taler-exchange-offline \
+            -L DEBUG \
+            -c "${CONF}" \
+            drain TESTKUDOS:0.1 \
+            exchange-account-1 payto://iban/SANDBOXX/DE360679?receiver-name=Exchange+Drain \
+            upload \
+            2> "${MY_TMP_DIR}/taler-exchange-offline-drain.log" \
+            || exit_fail "offline draining failed"
+        kill -TERM "$EPID"
+        wait "$EPID" || true
+        unset EPID
+        echo -n "Running taler-exchange-drain ..."
+        printf "\n" | taler-exchange-drain \
+                        -L DEBUG \
+                        -c "$CONF" \
+                        2> "${MY_TMP_DIR}/taler-exchange-drain.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+
+        echo -n "Running taler-exchange-transfer ..."
+        taler-exchange-transfer \
+            -L INFO \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/drain-transfer.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+    fi
     audit_only
     post_audit
-
 }
 
 
 # Do a full reload of the (original) database
-full_reload()
+function full_reload()
 {
-    echo -n "Doing full reload of the database... "
-    dropdb $DB 2> /dev/null || true
-    createdb -T template0 $DB || exit_skip "could not create database"
+    echo -n "Doing full reload of the database (loading ${BASEDB}.sql into $DB at $PGHOST)... "
+    dropdb "$DB" 2> /dev/null || true
+    createdb -T template0 "$DB" \
+        || exit_skip "could not create database $DB (at $PGHOST)"
     # Import pre-generated database, -q(ietly) using single (-1) transaction
-    psql -Aqt $DB -q -1 -f ${BASEDB}.sql > /dev/null || exit_skip "Failed to load database"
+    psql -Aqt "$DB" \
+         -q \
+         -1 \
+         -f "${BASEDB}.sql" \
+         > /dev/null \
+        || exit_skip "Failed to load database $DB from ${BASEDB}.sql"
     echo "DONE"
+    # Technically, this call shouldn't be needed as libeufin should already be stopped here...
+    stop_libeufin
 }
 
 
 function test_0() {
 
-echo "===========0: normal run with aggregator==========="
-run_audit aggregator
-
-echo "Checking output"
-# if an emergency was detected, that is a bug and we should fail
-echo -n "Test for emergencies... "
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
-echo -n "Test for deposit confirmation emergencies... "
-jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
-echo -n "Test for emergencies by count... "
-jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
-
-echo -n "Test for wire inconsistencies... "
-jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
-jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
-jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run"
-jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
-jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
-jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
-jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
-jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
-
-
-# TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
-# TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+    echo "===========0: normal run with aggregator==========="
+    run_audit aggregator
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
+    echo -n "Test for deposit confirmation emergencies... "
+    jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
+
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
 
-echo PASS
+    echo PASS
 
-LOSS=`jq -r .total_bad_sig_loss < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
-fi
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
-fi
-LOSS=`jq -r .total_bad_sig_loss < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
-fi
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
+    fi
 
-echo -n "Test for wire amounts... "
-WIRED=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_missattribution_in < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total missattribution in wrong, got $WIRED"
-fi
-echo PASS
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
+    echo "PASS"
 
-echo -n "Checking for unexpected arithmetic differences "
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
-fi
+    echo -n "Checking for unexpected arithmetic differences "
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
+    fi
 
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
-echo PASS
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
+    echo "PASS"
 
-echo -n "Checking for unexpected wire out differences "
-jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
-echo PASS
+    echo -n "Checking for unexpected wire out differences "
+    jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
+    echo "PASS"
 
-# cannot easily undo aggregator, hence full reload
-full_reload
+    # cannot easily undo aggregator, hence full reload
+    full_reload
 
 }
 
@@ -283,121 +473,147 @@ full_reload
 # transfer lag!
 function test_1() {
 
-echo "===========1: normal run==========="
-run_audit
-
-echo "Checking output"
-# if an emergency was detected, that is a bug and we should fail
-echo -n "Test for emergencies... "
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
-echo -n "Test for emergencies by count... "
-jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
-
-echo -n "Test for wire inconsistencies... "
-jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
-jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
-jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run"
-jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
-jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
-jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
-
-# TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
-# TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
-
-echo PASS
-
-echo -n "Check for lag detection... "
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
-    jq -e .lag_details[0] < test-audit-wire.json > /dev/null || exit_fail "Lag not detected in run without aggregator at age $DELTA"
+    echo "===========1: normal run==========="
+    run_audit
+
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency detected in ordinary run";
+    echo "PASS"
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency by count detected in ordinary run"
+    echo "PASS"
 
-    LAG=`jq -r .total_amount_lag < test-audit-wire.json`
-    if test $LAG = "TESTKUDOS:0"
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo "PASS"
+
+    echo -n "Check for lag detection... "
+
+    # Check wire transfer lag reported (no aggregator!)
+    # NOTE: This test is EXPECTED to fail for ~1h after
+    # re-generating the test database as we do not
+    # report lag of less than 1h (see GRACE_PERIOD in
+    # taler-helper-auditor-wire.c)
+    jq -e .lag_details[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        || exit_fail "Lag not detected in run without aggregator"
+
+    LAG=$(jq -r .total_amount_lag < test-audit-wire.json)
+    if [ "$LAG" = "TESTKUDOS:0" ]
     then
         exit_fail "Expected total lag to be non-zero"
     fi
     echo "PASS"
-else
-    echo "SKIP (database too new)"
-fi
 
 
-echo -n "Test for wire amounts... "
-WIRED=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_missattribution_in < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total missattribution in wrong, got $WIRED"
-fi
-# Database was unmodified, no need to undo
-echo "OK"
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
+    # Database was unmodified, no need to undo
+    echo "OK"
 }
 
 
 # Change amount of wire transfer reported by exchange
 function test_2() {
 
-echo "===========2: reserves_in inconsistency==========="
-echo "UPDATE reserves_in SET credit_val=5 WHERE reserve_in_serial_id=1" | psql -At $DB
+    echo "===========2: reserves_in inconsistency ==========="
+    echo "UPDATE exchange.reserves_in SET credit_val=5 WHERE reserve_in_serial_id=1" \
+        | psql -At "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-ROW=`jq .reserve_in_amount_inconsistencies[0].row < test-audit-wire.json`
-if test $ROW != 1
-then
-    exit_fail "Row $ROW is wrong"
-fi
-WIRED=`jq -r .reserve_in_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:10"
-then
-    exit_fail "Amount wrong"
-fi
-EXPECTED=`jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json`
-if test $EXPECTED != "TESTKUDOS:5"
-then
-    exit_fail "Expected amount wrong"
-fi
+    echo -n "Testing inconsistency detection... "
+    ROW=$(jq .reserve_in_amount_inconsistencies[0].row < test-audit-wire.json)
+    if [ "$ROW" != 1 ]
+    then
+        exit_fail "Row $ROW is wrong"
+    fi
+    WIRED=$(jq -r .reserve_in_amount_inconsistencies[0].amount_wired < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Amount wrong"
+    fi
+    EXPECTED=$(jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json)
+    if [ "$EXPECTED" != "TESTKUDOS:5" ]
+    then
+        exit_fail "Expected amount wrong"
+    fi
 
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
-fi
-DELTA=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $DELTA != "TESTKUDOS:5"
-then
-    exit_fail "Expected total wire delta plus wrong, got $DELTA"
-fi
-echo PASS
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
+    fi
+    DELTA=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$DELTA" != "TESTKUDOS:5" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $DELTA"
+    fi
+    echo "PASS"
 
-# Undo database modification
-echo "UPDATE reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE exchange.reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" \
+        | psql -Aqt "$DB"
 
 }
 
@@ -406,61 +622,62 @@ echo "UPDATE reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" | psql
 # lower than what exchange claims to have received.
 function test_3() {
 
-echo "===========3: reserves_in inconsistency==========="
-echo "UPDATE reserves_in SET credit_val=15 WHERE reserve_in_serial_id=1" | psql -Aqt $DB
+    echo "===========3: reserves_in inconsistency==========="
+    echo "UPDATE exchange.reserves_in SET credit_val=15 WHERE reserve_in_serial_id=1" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-EXPECTED=`jq -r .reserve_balance_summary_wrong_inconsistencies[0].auditor < test-audit-reserves.json`
-if test $EXPECTED != "TESTKUDOS:5.01"
-then
-    exit_fail "Expected reserve balance summary amount wrong, got $EXPECTED (auditor)"
-fi
+    EXPECTED=$(jq -r .reserve_balance_summary_wrong_inconsistencies[0].auditor < test-audit-reserves.json)
+    if [ "$EXPECTED" != "TESTKUDOS:5.01" ]
+    then
+        exit_fail "Expected reserve balance summary amount wrong, got $EXPECTED (auditor)"
+    fi
 
-EXPECTED=`jq -r .reserve_balance_summary_wrong_inconsistencies[0].exchange < test-audit-reserves.json`
-if test $EXPECTED != "TESTKUDOS:0.01"
-then
-    exit_fail "Expected reserve balance summary amount wrong, got $EXPECTED (exchange)"
-fi
+    EXPECTED=$(jq -r .reserve_balance_summary_wrong_inconsistencies[0].exchange < test-audit-reserves.json)
+    if [ "$EXPECTED" != "TESTKUDOS:0.01" ]
+    then
+        exit_fail "Expected reserve balance summary amount wrong, got $EXPECTED (exchange)"
+    fi
 
-WIRED=`jq -r .total_loss_balance_insufficient < test-audit-reserves.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total loss from insufficient balance, got $WIRED"
-fi
+    WIRED=$(jq -r .total_irregular_loss < test-audit-reserves.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total loss from insufficient balance, got $WIRED"
+    fi
 
-ROW=`jq -e .reserve_in_amount_inconsistencies[0].row < test-audit-wire.json`
-if test $ROW != 1
-then
-    exit_fail "Row wrong, got $ROW"
-fi
+    ROW=$(jq -e .reserve_in_amount_inconsistencies[0].row < test-audit-wire.json)
+    if [ "$ROW" != 1 ]
+    then
+        exit_fail "Row wrong, got $ROW"
+    fi
 
-WIRED=`jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:15"
-then
-    exit_fail "Wrong amount_exchange_expected, got $WIRED"
-fi
+    WIRED=$(jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:15" ]
+    then
+        exit_fail "Wrong amount_exchange_expected, got $WIRED"
+    fi
 
-WIRED=`jq -r .reserve_in_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:10"
-then
-    exit_fail "Wrong amount_wired, got $WIRED"
-fi
+    WIRED=$(jq -r .reserve_in_amount_inconsistencies[0].amount_wired < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Wrong amount_wired, got $WIRED"
+    fi
 
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:5"
-then
-    exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
-fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:5" ]
+    then
+        exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
+    fi
 
-WIRED=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total wire_in_delta_plus, got $WIRED"
-fi
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total wire_in_delta_plus, got $WIRED"
+    fi
 
-# Undo database modification
-echo "UPDATE reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE exchange.reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" | psql -Aqt "$DB"
 
 }
 
@@ -469,46 +686,52 @@ echo "UPDATE reserves_in SET credit_val=10 WHERE reserve_in_serial_id=1" | psql
 # lower than what exchange claims to have received.
 function test_4() {
 
-echo "===========4: deposit wire target wrong================="
-# Original target bank account was 43, changing to 44
-SERIAL=`echo "SELECT deposit_serial_id FROM deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql $DB -Aqt`
-OLD_WIRE_ID=`echo "SELECT wire_target_h_payto FROM deposits WHERE deposit_serial_id=${SERIAL};"  | psql $DB -Aqt`
-NEW_WIRE_ID=`echo "INSERT INTO wire_targets (payto_uri, wire_target_h_payto, kyc_ok) VALUES ('payto://x-taler-bank/localhost/testuser-xxlargtp', '\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b', false);"  | psql $DB -Aqt`
-echo "UPDATE deposits SET wire_target_h_payto='\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b' WHERE deposit_serial_id=${SERIAL}" | psql -Aqt $DB
+    echo "===========4: deposit wire target wrong================="
+    # Original target bank account was 43, changing to 44
+    SERIAL=$(echo "SELECT deposit_serial_id FROM exchange.deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql "$DB" -Aqt)
+    OLD_WIRE_ID=$(echo "SELECT wire_target_h_payto FROM exchange.deposits WHERE deposit_serial_id=${SERIAL};"  | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "INSERT INTO exchange.wire_targets (payto_uri, wire_target_h_payto) VALUES ('payto://x-taler-bank/localhost/testuser-xxlargtp', '\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b');" \
+        | psql "$DB" \
+               -Aqt \
+               > /dev/null
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.deposits SET wire_target_h_payto='\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b' WHERE deposit_serial_id=${SERIAL}" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
+    echo -n "Testing inconsistency detection... "
 
-jq -e .bad_sig_losses[0] < test-audit-coins.json > /dev/null || exit_fail "Bad signature not detected"
+    jq -e .bad_sig_losses[0] < test-audit-coins.json > /dev/null || exit_fail "Bad signature not detected"
 
-ROW=`jq -e .bad_sig_losses[0].row < test-audit-coins.json`
-if test $ROW != ${SERIAL}
-then
-    exit_fail "Row wrong, got $ROW"
-fi
+    ROW=$(jq -e .bad_sig_losses[0].row < test-audit-coins.json)
+    if [ "$ROW" != "${SERIAL}" ]
+    then
+        exit_fail "Row wrong, got $ROW"
+    fi
 
-LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong deposit bad signature loss, got $LOSS"
-fi
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong deposit bad signature loss, got $LOSS"
+    fi
 
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
-if test $OP != "deposit"
-then
-    exit_fail "Wrong operation, got $OP"
-fi
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "deposit" ]
+    then
+        exit_fail "Wrong operation, got $OP"
+    fi
 
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong total bad sig loss, got $LOSS"
-fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong total bad sig loss, got $LOSS"
+    fi
 
-echo PASS
-# Undo:
-echo "UPDATE deposits SET wire_target_h_payto='$OLD_WIRE_ID' WHERE deposit_serial_id=${SERIAL}" | psql -Aqt $DB
+    echo PASS
+    # Undo:
+    echo "UPDATE exchange.deposits SET wire_target_h_payto='$OLD_WIRE_ID' WHERE deposit_serial_id=${SERIAL}" | psql -Aqt "$DB"
 
 }
 
@@ -517,42 +740,44 @@ echo "UPDATE deposits SET wire_target_h_payto='$OLD_WIRE_ID' WHERE deposit_seria
 # Test where h_contract_terms in the deposit table is wrong
 # (=> bad signature)
 function test_5() {
-echo "===========5: deposit contract hash wrong================="
-# Modify h_wire hash, so it is inconsistent with 'wire'
-SERIAL=`echo "SELECT deposit_serial_id FROM deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql $DB -Aqt`
-OLD_H=`echo "SELECT h_contract_terms FROM deposits WHERE deposit_serial_id=$SERIAL;" | psql $DB -Aqt`
-echo "UPDATE deposits SET h_contract_terms='\x12bb676444955c98789f219148aa31899d8c354a63330624d3d143222cf3bb8b8e16f69accd5a8773127059b804c1955696bf551dd7be62719870613332aa8d5' WHERE deposit_serial_id=$SERIAL" | psql -Aqt $DB
+    echo "===========5: deposit contract hash wrong================="
+    # Modify h_wire hash, so it is inconsistent with 'wire'
+    SERIAL=$(echo "SELECT deposit_serial_id FROM exchange.deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql "$DB" -Aqt)
+    OLD_H=$(echo "SELECT h_contract_terms FROM exchange.deposits WHERE deposit_serial_id=$SERIAL;" | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.deposits SET h_contract_terms='\x12bb676444955c98789f219148aa31899d8c354a63330624d3d143222cf3bb8b8e16f69accd5a8773127059b804c1955696bf551dd7be62719870613332aa8d5' WHERE deposit_serial_id=$SERIAL" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Checking bad signature detection... "
-ROW=`jq -e .bad_sig_losses[0].row < test-audit-coins.json`
-if test $ROW != $SERIAL
-then
-    exit_fail "Row wrong, got $ROW"
-fi
+    echo -n "Checking bad signature detection... "
+    ROW=$(jq -e .bad_sig_losses[0].row < test-audit-coins.json)
+    if [ "$ROW" != "$SERIAL" ]
+    then
+        exit_fail "Row wrong, got $ROW"
+    fi
 
-LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong deposit bad signature loss, got $LOSS"
-fi
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong deposit bad signature loss, got $LOSS"
+    fi
 
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
-if test $OP != "deposit"
-then
-    exit_fail "Wrong operation, got $OP"
-fi
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "deposit" ]
+    then
+        exit_fail "Wrong operation, got $OP"
+    fi
 
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong total bad sig loss, got $LOSS"
-fi
-echo PASS
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong total bad sig loss, got $LOSS"
+    fi
+    echo PASS
 
-# Undo:
-echo "UPDATE deposits SET h_contract_terms='${OLD_H}' WHERE deposit_serial_id=$SERIAL" | psql -Aqt $DB
+    # Undo:
+    echo "UPDATE exchange.deposits SET h_contract_terms='${OLD_H}' WHERE deposit_serial_id=$SERIAL" | psql -Aqt "$DB"
 
 }
 
@@ -560,40 +785,42 @@ echo "UPDATE deposits SET h_contract_terms='${OLD_H}' WHERE deposit_serial_id=$S
 # Test where denom_sig in known_coins table is wrong
 # (=> bad signature)
 function test_6() {
-echo "===========6: known_coins signature wrong================="
-# Modify denom_sig, so it is wrong
-OLD_SIG=`echo 'SELECT denom_sig FROM known_coins LIMIT 1;' | psql $DB -Aqt`
-COIN_PUB=`echo "SELECT coin_pub FROM known_coins WHERE denom_sig='$OLD_SIG';"  | psql $DB -Aqt`
-echo "UPDATE known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" | psql -Aqt $DB
+    echo "===========6: known_coins signature wrong================="
+    # Modify denom_sig, so it is wrong
+    OLD_SIG=$(echo 'SELECT denom_sig FROM exchange.known_coins LIMIT 1;' | psql "$DB" -Aqt)
+    COIN_PUB=$(echo "SELECT coin_pub FROM exchange.known_coins WHERE denom_sig='$OLD_SIG';"  | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-ROW=`jq -e .bad_sig_losses[0].row < test-audit-coins.json`
-if test $ROW != "1"
-then
-    exit_fail "Row wrong, got $ROW"
-fi
+    ROW=$(jq -e .bad_sig_losses[0].row < test-audit-coins.json)
+    if [ "$ROW" != "1" ]
+    then
+        exit_fail "Row wrong, got $ROW"
+    fi
 
-LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
-if test $LOSS == "TESTKUDOS:0"
-then
-    exit_fail "Wrong deposit bad signature loss, got $LOSS"
-fi
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-coins.json)
+    if [ "$LOSS" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong deposit bad signature loss, got $LOSS"
+    fi
 
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
-if test $OP != "melt"
-then
-    exit_fail "Wrong operation, got $OP"
-fi
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "melt" ]
+    then
+        exit_fail "Wrong operation, got $OP"
+    fi
 
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS == "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss, got $LOSS"
-fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss, got $LOSS"
+    fi
 
-# Undo
-echo "UPDATE known_coins SET denom_sig='$OLD_SIG' WHERE coin_pub='$COIN_PUB'" | psql -Aqt $DB
+    # Undo
+    echo "UPDATE exchange.known_coins SET denom_sig='$OLD_SIG' WHERE coin_pub='$COIN_PUB'" | psql -Aqt "$DB"
 
 }
 
@@ -601,51 +828,53 @@ echo "UPDATE known_coins SET denom_sig='$OLD_SIG' WHERE coin_pub='$COIN_PUB'" |
 
 # Test where h_wire in the deposit table is wrong
 function test_7() {
-echo "===========7: reserves_out signature wrong================="
-# Modify reserve_sig, so it is bogus
-HBE=`echo 'SELECT h_blind_ev FROM reserves_out LIMIT 1;' | psql $DB -Aqt`
-OLD_SIG=`echo "SELECT reserve_sig FROM reserves_out WHERE h_blind_ev='$HBE';" | psql $DB -Aqt`
-A_VAL=`echo "SELECT amount_with_fee_val FROM reserves_out WHERE h_blind_ev='$HBE';" | psql $DB -Aqt`
-A_FRAC=`echo "SELECT amount_with_fee_frac FROM reserves_out WHERE h_blind_ev='$HBE';" | psql $DB -Aqt`
-# Normalize, we only deal with cents in this test-case
-A_FRAC=`expr $A_FRAC / 1000000 || true`
-echo "UPDATE reserves_out SET reserve_sig='\x9ef381a84aff252646a157d88eded50f708b2c52b7120d5a232a5b628f9ced6d497e6652d986b581188fb014ca857fd5e765a8ccc4eb7e2ce9edcde39accaa4b' WHERE h_blind_ev='$HBE'" | psql -Aqt $DB
-
-run_audit
-
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-reserves.json`
-if test $OP != "withdraw"
-then
-    exit_fail "Wrong operation, got $OP"
-fi
+    echo "===========7: reserves_out signature wrong================="
+    # Modify reserve_sig, so it is bogus
+    HBE=$(echo 'SELECT h_blind_ev FROM exchange.reserves_out LIMIT 1;' | psql "$DB" -Aqt)
+    OLD_SIG=$(echo "SELECT reserve_sig FROM exchange.reserves_out WHERE h_blind_ev='$HBE';" | psql "$DB" -Aqt)
+    A_VAL=$(echo "SELECT amount_with_fee_val FROM exchange.reserves_out WHERE h_blind_ev='$HBE';" | psql "$DB" -Aqt)
+    A_FRAC=$(echo "SELECT amount_with_fee_frac FROM exchange.reserves_out WHERE h_blind_ev='$HBE';" | psql "$DB" -Aqt)
+    # Normalize, we only deal with cents in this test-case
+    A_FRAC=$(( A_FRAC / 1000000))
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.reserves_out SET reserve_sig='\x9ef381a84aff252646a157d88eded50f708b2c52b7120d5a232a5b628f9ced6d497e6652d986b581188fb014ca857fd5e765a8ccc4eb7e2ce9edcde39accaa4b' WHERE h_blind_ev='$HBE'" \
+        | psql -Aqt "$DB"
 
-LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-reserves.json`
-LOSS_TOTAL=`jq -r .total_bad_sig_loss < test-audit-reserves.json`
-if test $LOSS != $LOSS_TOTAL
-then
-    exit_fail "Expected loss $LOSS and total loss $LOSS_TOTAL do not match"
-fi
-if test $A_FRAC != 0
-then
-    if [ $A_FRAC -lt 10 ]
+    run_audit
+
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-reserves.json)
+    if [ "$OP" != "withdraw" ]
     then
-        A_PREV="0"
-    else
-        A_PREV=""
+        exit_fail "Wrong operation, got $OP"
     fi
-    if test $LOSS != "TESTKUDOS:$A_VAL.$A_PREV$A_FRAC"
+
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-reserves.json)
+    LOSS_TOTAL=$(jq -r .total_bad_sig_loss < test-audit-reserves.json)
+    if [ "$LOSS" != "$LOSS_TOTAL" ]
     then
-        exit_fail "Expected loss TESTKUDOS:$A_VAL.$A_PREV$A_FRAC but got $LOSS"
+        exit_fail "Expected loss $LOSS and total loss $LOSS_TOTAL do not match"
     fi
-else
-    if test $LOSS != "TESTKUDOS:$A_VAL"
+    if [ "$A_FRAC" != 0 ]
     then
-        exit_fail "Expected loss TESTKUDOS:$A_VAL but got $LOSS"
+        if [ "$A_FRAC" -lt 10 ]
+        then
+            A_PREV="0"
+        else
+            A_PREV=""
+        fi
+        if [ "$LOSS" != "TESTKUDOS:$A_VAL.$A_PREV$A_FRAC" ]
+        then
+            exit_fail "Expected loss TESTKUDOS:$A_VAL.$A_PREV$A_FRAC but got $LOSS"
+        fi
+    else
+        if [ "$LOSS" != "TESTKUDOS:$A_VAL" ]
+        then
+            exit_fail "Expected loss TESTKUDOS:$A_VAL but got $LOSS"
+        fi
     fi
-fi
 
-# Undo:
-echo "UPDATE reserves_out SET reserve_sig='$OLD_SIG' WHERE h_blind_ev='$HBE'" | psql -Aqt $DB
+    # Undo:
+    echo "UPDATE exchange.reserves_out SET reserve_sig='$OLD_SIG' WHERE h_blind_ev='$HBE'" | psql -Aqt "$DB"
 
 }
 
@@ -653,460 +882,459 @@ echo "UPDATE reserves_out SET reserve_sig='$OLD_SIG' WHERE h_blind_ev='$HBE'" |
 # Test wire transfer subject disagreement!
 function test_8() {
 
-echo "===========8: wire-transfer-subject disagreement==========="
-OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-OLD_WTID=`echo "SELECT subject FROM app_banktransaction WHERE id='$OLD_ID';" | psql $DB -Aqt`
-NEW_WTID="CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG"
-echo "UPDATE app_banktransaction SET subject='$NEW_WTID' WHERE id='$OLD_ID';" | psql -Aqt $DB
+    echo "===========8: wire-transfer-subject disagreement==========="
+    # Technically, this call shouldn't be needed, as libeufin should already be stopped here.
+    stop_libeufin
+    echo "FIXME: test needs update to new libeufin-bank schema"
+    exit 0
+    OLD_ID=$(echo "SELECT id FROM NexusBankTransactions WHERE amount='10' AND currency='TESTKUDOS' ORDER BY id LIMIT 1;" | psql "${DB}" -Aqt) \
+        || exit_fail "Failed to SELECT FROM NexusBankTransactions nexus DB!"
+    OLD_WTID=$(echo "SELECT \"reservePublicKey\" FROM TalerIncomingPayments WHERE payment='$OLD_ID';" \
+                   | psql "${DB}" -Aqt)
+    NEW_WTID="CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG"
+    echo "UPDATE TalerIncomingPayments SET \"reservePublicKey\"='$NEW_WTID' WHERE payment='$OLD_ID';" \
+        | psql "${DB}" -q \
+        || exit_fail "Failed to update TalerIncomingPayments"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-DIAG=`jq -r .reserve_in_amount_inconsistencies[0].diagnostic < test-audit-wire.json`
-if test "x$DIAG" != "xwire subject does not match"
-then
-    exit_fail "Diagnostic wrong: $DIAG (0)"
-fi
-WTID=`jq -r .reserve_in_amount_inconsistencies[0].reserve_pub < test-audit-wire.json`
-if test x$WTID != x"$OLD_WTID" -a x$WTID != x"$NEW_WTID"
-then
-    exit_fail "WTID reported wrong: $WTID"
-fi
-EX_A=`jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json`
-if test x$WTID = x$OLD_WTID -a x$EX_A != x"TESTKUDOS:10"
-then
-    exit_fail "Amount reported wrong: $EX_A"
-fi
-if test x$WTID = x$NEW_WTID -a x$EX_A != x"TESTKUDOS:0"
-then
-    exit_fail "Amount reported wrong: $EX_A"
-fi
-DIAG=`jq -r .reserve_in_amount_inconsistencies[1].diagnostic < test-audit-wire.json`
-if test "x$DIAG" != "xwire subject does not match"
-then
-    exit_fail "Diagnostic wrong: $DIAG (1)"
-fi
-WTID=`jq -r .reserve_in_amount_inconsistencies[1].reserve_pub < test-audit-wire.json`
-if test $WTID != "$OLD_WTID" -a $WTID != "$NEW_WTID"
-then
-    exit_fail "WTID reported wrong: $WTID (wanted: $NEW_WTID or $OLD_WTID)"
-fi
-EX_A=`jq -r .reserve_in_amount_inconsistencies[1].amount_exchange_expected < test-audit-wire.json`
-if test $WTID = "$OLD_WTID" -a $EX_A != "TESTKUDOS:10"
-then
-    exit_fail "Amount reported wrong: $EX_A"
-fi
-if test $WTID = "$NEW_WTID" -a $EX_A != "TESTKUDOS:0"
-then
-    exit_fail "Amount reported wrong: $EX_A"
-fi
+    echo -n "Testing inconsistency detection... "
+    DIAG=$(jq -r .reserve_in_amount_inconsistencies[0].diagnostic < test-audit-wire.json)
+    if [ "x$DIAG" != "xwire subject does not match" ]
+    then
+        exit_fail "Diagnostic wrong: $DIAG (0)"
+    fi
+    WTID=$(jq -r .reserve_in_amount_inconsistencies[0].reserve_pub < test-audit-wire.json)
+    if [ "$WTID" != "$OLD_WTID" ] && [ "$WTID" != "$NEW_WTID" ]
+    then
+        exit_fail "WTID reported wrong: $WTID (wanted $OLD_WTID or $NEW_WTID)"
+    fi
+    EX_A=$(jq -r .reserve_in_amount_inconsistencies[0].amount_exchange_expected < test-audit-wire.json)
+    if [ "$WTID" = "$OLD_WTID" ] && [ "$EX_A" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Amount reported wrong: $EX_A"
+    fi
+    if [ "$WTID" = "$NEW_WTID" ] && [ "$EX_A" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Amount reported wrong: $EX_A"
+    fi
+    DIAG=$(jq -r .reserve_in_amount_inconsistencies[1].diagnostic < test-audit-wire.json)
+    if [ "$DIAG" != "wire subject does not match" ]
+    then
+        exit_fail "Diagnostic wrong: $DIAG (1)"
+    fi
+    WTID=$(jq -r .reserve_in_amount_inconsistencies[1].reserve_pub < test-audit-wire.json)
+    if [ "$WTID" != "$OLD_WTID" ] && [ "$WTID" != "$NEW_WTID" ]
+    then
+        exit_fail "WTID reported wrong: $WTID (wanted: $NEW_WTID or $OLD_WTID)"
+    fi
+    EX_A=$(jq -r .reserve_in_amount_inconsistencies[1].amount_exchange_expected < test-audit-wire.json)
+    if [ "$WTID" = "$OLD_WTID" ] && [ "$EX_A" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Amount reported wrong: $EX_A"
+    fi
+    if [ "$WTID" = "$NEW_WTID" ] && [ "$EX_A" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Amount reported wrong: $EX_A"
+    fi
 
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:10"
-then
-    exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
-fi
-DELTA=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $DELTA != "TESTKUDOS:10"
-then
-    exit_fail "Expected total wire delta plus wrong, got $DELTA"
-fi
-echo PASS
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Wrong total wire_in_delta_minus, got $WIRED"
+    fi
+    DELTA=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$DELTA" != "TESTKUDOS:10" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $DELTA"
+    fi
+    echo "PASS"
 
-# Undo database modification
-echo "UPDATE app_banktransaction SET subject='$OLD_WTID' WHERE id='$OLD_ID';" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE TalerIncomingPayments SET \"reservePublicKey\"='$OLD_WTID' WHERE payment='$OLD_ID';" \
+        | psql "${DB}" -q
 
 }
 
 
-
 # Test wire origin disagreement!
 function test_9() {
 
-echo "===========9: wire-origin disagreement==========="
-OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-OLD_ACC=`echo "SELECT debit_account_id FROM app_banktransaction WHERE id='$OLD_ID';" | psql $DB -Aqt`
-echo "UPDATE app_banktransaction SET debit_account_id=1 WHERE id='$OLD_ID';" | psql -Aqt $DB
+    echo "===========9: wire-origin disagreement==========="
+    # Technically, this call shouldn't be needed, as libeufin should already be stopped here.
+    stop_libeufin
+    echo "FIXME: test needs update to new libeufin-bank schema"
+    exit 0
+    OLD_ID=$(echo "SELECT id FROM NexusBankTransactions WHERE amount='10' AND currency='TESTKUDOS' ORDER BY id LIMIT 1;" | psql "${DB}" -Aqt)
+    OLD_ACC=$(echo 'SELECT "incomingPaytoUri" FROM TalerIncomingPayments WHERE payment='"'$OLD_ID';" | psql "${DB}" -Aqt)
+    echo "UPDATE TalerIncomingPayments SET \"incomingPaytoUri\"='payto://iban/SANDBOXX/DE144373?receiver-name=New+Exchange+Company' WHERE payment='$OLD_ID';" \
+        | psql "${DB}" -q
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-AMOUNT=`jq -r .missattribution_in_inconsistencies[0].amount < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:10"
-then
-    exit_fail "Reported amount wrong: $AMOUNT"
-fi
-AMOUNT=`jq -r .total_missattribution_in < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:10"
-then
-    exit_fail "Reported total amount wrong: $AMOUNT"
-fi
-echo PASS
+    echo -n "Testing inconsistency detection... "
+    AMOUNT=$(jq -r .misattribution_in_inconsistencies[0].amount < test-audit-wire.json)
+    if test "x$AMOUNT" != "xTESTKUDOS:10"
+    then
+        exit_fail "Reported amount wrong: $AMOUNT"
+    fi
+    AMOUNT=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if test "x$AMOUNT" != "xTESTKUDOS:10"
+    then
+        exit_fail "Reported total amount wrong: $AMOUNT"
+    fi
+    echo PASS
 
-# Undo database modification
-echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC WHERE id='$OLD_ID';" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE TalerIncomingPayments SET \"incomingPaytoUri\"='$OLD_ACC' WHERE payment='$OLD_ID';" \
+        | psql "${DB}" -q
 
 }
 
 
 # Test wire_in timestamp disagreement!
 function test_10() {
+    NOW_MS=$(date +%s)000
+    echo "===========10: wire-timestamp disagreement==========="
+    # Technically, this call shouldn't be needed, as libeufin should already be stopped here.
+    stop_libeufin
+    echo "FIXME: test needs update to new libeufin-bank schema"
+    exit 0
+    OLD_ID=$(echo "SELECT id FROM NexusBankTransactions WHERE amount='10' AND currency='TESTKUDOS' ORDER BY id LIMIT 1;" | psql "${DB}" -Aqt)
+    OLD_DATE=$(echo "SELECT \"timestampMs\" FROM TalerIncomingPayments WHERE payment='$OLD_ID';" | psql "${DB}" -Aqt)
+    echo "UPDATE TalerIncomingPayments SET \"timestampMs\"=$NOW_MS WHERE payment=$OLD_ID;" | psql "${DB}" -q
 
-echo "===========10: wire-timestamp disagreement==========="
-OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-OLD_DATE=`echo "SELECT date FROM app_banktransaction WHERE id='$OLD_ID';" | psql $DB -Aqt`
-echo "UPDATE app_banktransaction SET date=NOW() WHERE id=$OLD_ID;" | psql -Aqt $DB
-
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-audit-wire.json`
-if test "x$DIAG" != "xexecution date mismatch"
-then
-    exit_fail "Reported diagnostic wrong: $DIAG"
-fi
-TABLE=`jq -r .row_minor_inconsistencies[0].table < test-audit-wire.json`
-if test "x$TABLE" != "xreserves_in"
-then
-    exit_fail "Reported table wrong: $TABLE"
-fi
-echo PASS
+    echo -n "Testing inconsistency detection... "
+    DIAG=$(jq -r .row_minor_inconsistencies[0].diagnostic < test-audit-wire.json)
+    if test "x$DIAG" != "xexecution date mismatch"
+    then
+        exit_fail "Reported diagnostic wrong: $DIAG"
+    fi
+    TABLE=$(jq -r .row_minor_inconsistencies[0].table < test-audit-wire.json)
+    if test "x$TABLE" != "xreserves_in"
+    then
+        exit_fail "Reported table wrong: $TABLE"
+    fi
+    echo "PASS"
 
-# Undo database modification
-echo "UPDATE app_banktransaction SET date='$OLD_DATE' WHERE id=$OLD_ID;" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE TalerIncomingPayments SET \"timestampMs\"='$OLD_DATE' WHERE payment=$OLD_ID;" | psql "${DB}" -q
 
 }
 
 
 # Test for extra outgoing wire transfer.
+# In case of changing the subject in the Nexus
+# ingested table: '.batches[0].batchTransactions[0].details.unstructuredRemittanceInformation'
 function test_11() {
+    echo "===========11: spurious outgoing transfer ==========="
+    # Technically, this call shouldn't be needed, as libeufin should already be stopped here.
+    stop_libeufin
+    echo "FIXME: test needs update to new libeufin-bank schema"
+    exit 0
+    OLD_ID=$(echo "SELECT id FROM NexusBankTransactions WHERE amount='10' AND currency='TESTKUDOS' ORDER BY id LIMIT 1;" | psql "${DB}" -Aqt)
+    OLD_TX=$(echo "SELECT \"transactionJson\" FROM NexusBankTransactions WHERE id='$OLD_ID';" | psql "${DB}" -Aqt)
+    # Change wire transfer to be FROM the exchange (#2) to elsewhere!
+    # (Note: this change also causes a missing incoming wire transfer, but
+    #  this test is only concerned about the outgoing wire transfer
+    #  being detected as such, and we simply ignore the other
+    #  errors being reported.)
+    OTHER_IBAN=$(echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | psql "${DB}" -Aqt)
+    NEW_TX=$(echo "$OLD_TX" | jq .batches[0].batchTransactions[0].details.creditDebitIndicator='"DBIT"' | jq 'del(.batches[0].batchTransactions[0].details.debtor)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAccount)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAgent)' | jq '.batches[0].batchTransactions[0].details.creditor'='{"name": "Forty Two"}' | jq .batches[0].batchTransactions[0].details.creditorAccount='{"iban": "'"$OTHER_IBAN"'"}' | jq .batches[0].batchTransactions[0].details.creditorAgent='{"bic": "SANDBOXX"}' | jq .batches[0].batchTransactions[0].details.unstructuredRemittanceInformation='"CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/"')
+    echo -e "UPDATE NexusBankTransactions SET \"transactionJson\"='""$NEW_TX""' WHERE id=$OLD_ID" \
+        | psql "${DB}" -q
+    # Now fake that the exchange prepared this payment (= it POSTed to /transfer)
+    # This step is necessary, because the TWG table that accounts for outgoing
+    # payments needs it.  Worth noting here is the column 'rawConfirmation' that
+    # points to the transaction from the main Nexus ledger; without that column set,
+    # a prepared payment won't appear as actually outgoing.
+    echo -e "INSERT INTO PaymentInitiations (\"bankAccount\",\"preparationDate\",\"submissionDate\",sum,currency,\"endToEndId\",\"paymentInformationId\",\"instructionId\",subject,\"creditorIban\",\"creditorBic\",\"creditorName\",submitted,\"messageId\",\"rawConfirmation\") VALUES (1,1,1,10,'TESTKUDOS','NOTGIVEN','unused','unused','CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/','""$OTHER_IBAN""','SANDBOXX','Forty Two',false,1,$OLD_ID)" \
+        | psql "${DB}" -q
+    # Now populate the TWG table that accounts for outgoing payments, in
+    # order to let /history/outgoing return one result.
+    echo -e "INSERT INTO TalerRequestedPayments (facade,payment,\"requestUid\",amount,\"exchangeBaseUrl\",wtid,\"creditAccount\") VALUES (1,1,'unused','TESTKUDOS:10','http://exchange.example.com/','CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG','payto://iban/SANDBOXX/""$OTHER_IBAN""?receiver-name=Forty+Two')" \
+        | psql "${DB}" -q
 
-echo "===========11: spurious outgoing transfer ==========="
-OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-OLD_ACC=`echo "SELECT debit_account_id FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
-OLD_SUBJECT=`echo "SELECT subject FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
-# Change wire transfer to be FROM the exchange (#2) to elsewhere!
-# (Note: this change also causes a missing incoming wire transfer, but
-#  this test is only concerned about the outgoing wire transfer
-#  being detected as such, and we simply ignore the other
-#  errors being reported.)
-echo -e "UPDATE app_banktransaction SET debit_account_id=2,credit_account_id=1,subject='CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/' WHERE id=$OLD_ID;" | psql -Aqt $DB
-
-run_audit
-
-echo -n "Testing inconsistency detection... "
-AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:10"
-then
-    exit_fail "Reported wired amount wrong: $AMOUNT"
-fi
-AMOUNT=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:10"
-then
-    exit_fail "Reported total plus amount wrong: $AMOUNT"
-fi
-AMOUNT=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:0"
-then
-    exit_fail "Reported total minus amount wrong: $AMOUNT"
-fi
-AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json`
-if test "x$AMOUNT" != "xTESTKUDOS:0"
-then
-    exit_fail "Reported justified amount wrong: $AMOUNT"
-fi
-DIAG=`jq -r .wire_out_amount_inconsistencies[0].diagnostic < test-audit-wire.json`
-if test "x$DIAG" != "xjustification for wire transfer not found"
-then
-    exit_fail "Reported diagnostic wrong: $DIAG"
-fi
-echo PASS
+    run_audit
 
-# Undo database modification (exchange always has account #2)
-echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC,credit_account_id=2,subject='$OLD_SUBJECT' WHERE id=$OLD_ID;" | psql -Aqt $DB
+    echo -n "Testing inconsistency detection... "
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json)
+    if [ "x$AMOUNT" != "xTESTKUDOS:10" ]
+    then
+        exit_fail "Reported wired amount wrong: $AMOUNT"
+    fi
+    AMOUNT=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "x$AMOUNT" != "xTESTKUDOS:10" ]
+    then
+        exit_fail "Reported total plus amount wrong: $AMOUNT"
+    fi
+    AMOUNT=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "x$AMOUNT" != "xTESTKUDOS:0" ]
+    then
+        exit_fail "Reported total minus amount wrong: $AMOUNT"
+    fi
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json)
+    if [ "x$AMOUNT" != "xTESTKUDOS:0" ]
+    then
+        exit_fail "Reported justified amount wrong: $AMOUNT"
+    fi
+    DIAG=$(jq -r .wire_out_amount_inconsistencies[0].diagnostic < test-audit-wire.json)
+    if [ "x$DIAG" != "xjustification for wire transfer not found" ]
+    then
+        exit_fail "Reported diagnostic wrong: $DIAG"
+    fi
+    echo "PASS"
 
+    full_reload
 }
 
 
-
 # Test for hanging/pending refresh.
 function test_12() {
 
-echo "===========12: incomplete refresh ==========="
-OLD_ACC=`echo "DELETE FROM refresh_revealed_coins;" | psql $DB -Aqt`
-
-run_audit
-
-echo -n "Testing hung refresh detection... "
-
-HANG=`jq -er .refresh_hanging[0].amount < test-audit-coins.json`
-TOTAL_HANG=`jq -er .total_refresh_hanging < test-audit-coins.json`
-if test x$HANG = TESTKUDOS:0
-then
-    exit_fail "Hanging amount zero"
-fi
-if test x$TOTAL_HANG = TESTKUDOS:0
-then
-    exit_fail "Total hanging amount zero"
-fi
+    echo "===========12: incomplete refresh ==========="
+    OLD_ACC=$(echo "DELETE FROM exchange.refresh_revealed_coins;" | psql "$DB" -Aqt)
 
-echo PASS
+    run_audit
 
+    echo -n "Testing hung refresh detection... "
 
-# cannot easily undo DELETE, hence full reload
-full_reload
+    HANG=$(jq -er .refresh_hanging[0].amount < test-audit-coins.json)
+    TOTAL_HANG=$(jq -er .total_refresh_hanging < test-audit-coins.json)
+    if [ "$HANG" = "TESTKUDOS:0" ]
+    then
+        exit_fail "Hanging amount zero"
+    fi
+    if [ "$TOTAL_HANG" = "TESTKUDOS:0" ]
+    then
+        exit_fail "Total hanging amount zero"
+    fi
+    echo "PASS"
 
+    # cannot easily undo DELETE, hence full reload
+    full_reload
 }
 
 
 # Test for wrong signature on refresh.
 function test_13() {
 
-echo "===========13: wrong melt signature ==========="
-# Modify denom_sig, so it is wrong
-COIN_PUB=`echo "SELECT old_coin_pub FROM refresh_commitments LIMIT 1;"  | psql $DB -Aqt`
-OLD_SIG=`echo "SELECT old_coin_sig FROM refresh_commitments WHERE old_coin_pub='$COIN_PUB';" | psql $DB -Aqt`
-NEW_SIG="\xba588af7c13c477dca1ac458f65cc484db8fba53b969b873f4353ecbd815e6b4c03f42c0cb63a2b609c2d726e612fd8e0c084906a41f409b6a23a08a83c89a02"
-echo "UPDATE refresh_commitments SET old_coin_sig='$NEW_SIG' WHERE old_coin_pub='$COIN_PUB'" | psql -Aqt $DB
+    echo "===========13: wrong melt signature ==========="
+    # Modify denom_sig, so it is wrong
+    COIN_PUB=$(echo "SELECT old_coin_pub FROM exchange.refresh_commitments LIMIT 1;"  | psql "$DB" -Aqt)
+    OLD_SIG=$(echo "SELECT old_coin_sig FROM exchange.refresh_commitments WHERE old_coin_pub='$COIN_PUB';" | psql "$DB" -Aqt)
+    NEW_SIG="\xba588af7c13c477dca1ac458f65cc484db8fba53b969b873f4353ecbd815e6b4c03f42c0cb63a2b609c2d726e612fd8e0c084906a41f409b6a23a08a83c89a02"
+    echo "UPDATE exchange.refresh_commitments SET old_coin_sig='$NEW_SIG' WHERE old_coin_pub='$COIN_PUB'" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
+    echo -n "Testing inconsistency detection... "
 
-OP=`jq -er .bad_sig_losses[0].operation < test-audit-coins.json`
-if test x$OP != xmelt
-then
-    exit_fail "Operation wrong, got $OP"
-fi
+    OP=$(jq -er .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "melt" ]
+    then
+        exit_fail "Operation wrong, got $OP"
+    fi
 
-LOSS=`jq -er .bad_sig_losses[0].loss < test-audit-coins.json`
-TOTAL_LOSS=`jq -er .total_bad_sig_loss < test-audit-coins.json`
-if test x$LOSS != x$TOTAL_LOSS
-then
-    exit_fail "Loss inconsistent, got $LOSS and $TOTAL_LOSS"
-fi
-if test x$TOTAL_LOSS = TESTKUDOS:0
-then
-    exit_fail "Loss zero"
-fi
+    LOSS=$(jq -er .bad_sig_losses[0].loss < test-audit-coins.json)
+    TOTAL_LOSS=$(jq -er .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "$TOTAL_LOSS" ]
+    then
+        exit_fail "Loss inconsistent, got $LOSS and $TOTAL_LOSS"
+    fi
+    if [ "$TOTAL_LOSS" = "TESTKUDOS:0" ]
+    then
+        exit_fail "Loss zero"
+    fi
 
-echo PASS
+    echo "PASS"
 
-# cannot easily undo DELETE, hence full reload
-full_reload
+    # cannot easily undo DELETE, hence full reload
+    full_reload
 }
 
 
 # Test for wire fee disagreement
 function test_14() {
 
-echo "===========14: wire-fee disagreement==========="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-wire-auditor.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========14: wire-fee disagreement==========="
 
     # Wire fees are only checked/generated once there are
     # actual outgoing wire transfers, so we need to run the
     # aggregator here.
     pre_audit aggregator
-    echo "UPDATE wire_fee SET wire_fee_frac=100;" | psql -Aqt $DB
+    echo "UPDATE exchange.wire_fee SET wire_fee_frac=100;" \
+        | psql -Aqt "$DB"
     audit_only
     post_audit
 
     echo -n "Testing inconsistency detection... "
-    TABLE=`jq -r .row_inconsistencies[0].table < test-audit-aggregation.json`
-    if test "x$TABLE" != "xwire-fee"
+    TABLE=$(jq -r .row_inconsistencies[0].table < test-audit-aggregation.json)
+    if [ "$TABLE" != "wire-fee" ]
     then
         exit_fail "Reported table wrong: $TABLE"
     fi
-    DIAG=`jq -r .row_inconsistencies[0].diagnostic < test-audit-aggregation.json`
-    if test "x$DIAG" != "xwire fee signature invalid at given time"
+    DIAG=$(jq -r .row_inconsistencies[0].diagnostic < test-audit-aggregation.json)
+    if [ "$DIAG" != "wire fee signature invalid at given time" ]
     then
         exit_fail "Reported diagnostic wrong: $DIAG"
     fi
-    echo PASS
+    echo "PASS"
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-
-else
-    echo "Test skipped (database too new)"
-fi
-
 }
 
 
 # Test where salt in the deposit table is wrong
 function test_15() {
-echo "===========15: deposit wire salt wrong================="
+    echo "===========15: deposit wire salt wrong================="
 
-# Modify wire_salt hash, so it is inconsistent
-SALT=`echo "SELECT wire_salt FROM deposits WHERE deposit_serial_id=1;" | psql -Aqt $DB`
-echo "UPDATE deposits SET wire_salt='\x1197cd7f7b0e13ab1905fedb36c536a2' WHERE deposit_serial_id=1;" | psql -Aqt $DB
+    # Modify wire_salt hash, so it is inconsistent
+    SALT=$(echo "SELECT wire_salt FROM exchange.deposits WHERE deposit_serial_id=1;" | psql -Aqt "$DB")
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.deposits SET wire_salt='\x1197cd7f7b0e13ab1905fedb36c536a2' WHERE deposit_serial_id=1;" \
+        | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
-if test "x$OP" != "xdeposit"
-then
-    exit_fail "Reported operation wrong: $OP"
-fi
-echo PASS
+    echo -n "Testing inconsistency detection... "
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "deposit" ]
+    then
+        exit_fail "Reported operation wrong: $OP"
+    fi
+    echo "PASS"
 
-# Restore DB
-echo "UPDATE deposits SET wire_salt='$SALT' WHERE deposit_serial_id=1;" | psql -Aqt $DB
+    # Restore DB
+    echo "UPDATE exchange.deposits SET wire_salt='$SALT' WHERE deposit_serial_id=1;" \
+        | psql -Aqt "$DB"
 
 }
 
 
 # Test where wired amount (wire out) is wrong
 function test_16() {
-echo "===========16: incorrect wire_out amount================="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========16: incorrect wire_out amount================="
+
+    # Check wire transfer lag reported (no aggregator!)
 
     # First, we need to run the aggregator so we even
     # have a wire_out to modify.
     pre_audit aggregator
 
-    # Modify wire amount, such that it is inconsistent with 'aggregation'
-    # (exchange account is #2, so the logic below should select the outgoing
-    # wire transfer):
-    OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE debit_account_id=2 ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-    OLD_AMOUNT=`echo "SELECT amount FROM app_banktransaction WHERE id='${OLD_ID}';" | psql $DB -Aqt`
+    stop_libeufin
+    OLD_AMOUNT=$(echo "SELECT amount FROM TalerRequestedPayments WHERE id='1';" | psql "${DB}" -Aqt)
     NEW_AMOUNT="TESTKUDOS:50"
-    echo "UPDATE app_banktransaction SET amount='${NEW_AMOUNT}' WHERE id='${OLD_ID}';" | psql -Aqt $DB
-
+    echo "UPDATE TalerRequestedPayments SET amount='${NEW_AMOUNT}' WHERE id='1';" \
+        | psql "${DB}" -q
+    launch_libeufin
     audit_only
 
     echo -n "Testing inconsistency detection... "
 
-    AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json`
-    if test "x$AMOUNT" != "x$OLD_AMOUNT"
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json)
+    if [ "$AMOUNT" != "$OLD_AMOUNT" ]
     then
         exit_fail "Reported justified amount wrong: $AMOUNT"
     fi
-    AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
-    if test "x$AMOUNT" != "x$NEW_AMOUNT"
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json)
+    if [ "$AMOUNT" != "$NEW_AMOUNT" ]
     then
         exit_fail "Reported wired amount wrong: $AMOUNT"
     fi
-    TOTAL_AMOUNT=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-    if test "x$TOTAL_AMOUNT" != "xTESTKUDOS:0"
+    TOTAL_AMOUNT=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$TOTAL_AMOUNT" != "TESTKUDOS:0" ]
     then
         exit_fail "Reported total wired amount minus wrong: $TOTAL_AMOUNT"
     fi
-    TOTAL_AMOUNT=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-    if test "x$TOTAL_AMOUNT" = "xTESTKUDOS:0"
+    TOTAL_AMOUNT=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$TOTAL_AMOUNT" = "TESTKUDOS:0" ]
     then
         exit_fail "Reported total wired amount plus wrong: $TOTAL_AMOUNT"
     fi
-    echo PASS
+    echo "PASS"
 
+    stop_libeufin
     echo "Second modification: wire nothing"
     NEW_AMOUNT="TESTKUDOS:0"
-    echo "UPDATE app_banktransaction SET amount='${NEW_AMOUNT}' WHERE id='${OLD_ID}';" | psql -Aqt $DB
-
+    echo "UPDATE TalerRequestedPayments SET amount='${NEW_AMOUNT}' WHERE id='1';" \
+        | psql "${DB}" -q
+    launch_libeufin
     audit_only
-
+    stop_libeufin
     echo -n "Testing inconsistency detection... "
 
-    AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json`
-    if test "x$AMOUNT" != "x$OLD_AMOUNT"
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_justified < test-audit-wire.json)
+    if [ "$AMOUNT" != "$OLD_AMOUNT" ]
     then
         exit_fail "Reported justified amount wrong: $AMOUNT"
     fi
-    AMOUNT=`jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json`
-    if test "x$AMOUNT" != "x$NEW_AMOUNT"
+    AMOUNT=$(jq -r .wire_out_amount_inconsistencies[0].amount_wired < test-audit-wire.json)
+    if [ "$AMOUNT" != "$NEW_AMOUNT" ]
     then
         exit_fail "Reported wired amount wrong: $AMOUNT"
     fi
-    TOTAL_AMOUNT=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-    if test "x$TOTAL_AMOUNT" != "x$OLD_AMOUNT"
+    TOTAL_AMOUNT=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$TOTAL_AMOUNT" != "$OLD_AMOUNT" ]
     then
         exit_fail "Reported total wired amount minus wrong: $TOTAL_AMOUNT (wanted $OLD_AMOUNT)"
     fi
-    TOTAL_AMOUNT=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-    if test "x$TOTAL_AMOUNT" != "xTESTKUDOS:0"
+    TOTAL_AMOUNT=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$TOTAL_AMOUNT" != "TESTKUDOS:0" ]
     then
         exit_fail "Reported total wired amount plus wrong: $TOTAL_AMOUNT"
     fi
-    echo PASS
+    echo "PASS"
 
     post_audit
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-else
-    echo "Test skipped (database too new)"
-fi
-
 }
 
 
 
-
 # Test where wire-out timestamp is wrong
 function test_17() {
-echo "===========17: incorrect wire_out timestamp================="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========17: incorrect wire_out timestamp================="
 
     # First, we need to run the aggregator so we even
     # have a wire_out to modify.
     pre_audit aggregator
-
-    # Modify wire amount, such that it is inconsistent with 'aggregation'
-    # (exchange account is #2, so the logic below should select the outgoing
-    # wire transfer):
-    OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE debit_account_id=2 ORDER BY id LIMIT 1;" | psql $DB -Aqt`
-    OLD_DATE=`echo "SELECT date FROM app_banktransaction WHERE id='${OLD_ID}';" | psql $DB -Aqt`
+    stop_libeufin
+    OLD_ID=1
+    OLD_PREP=$(echo "SELECT payment FROM TalerRequestedPayments WHERE id='${OLD_ID}';" | psql "${DB}" -Aqt)
+    OLD_DATE=$(echo "SELECT \"preparationDate\" FROM PaymentInitiations WHERE id='${OLD_ID}';" | psql "${DB}" -Aqt)
     # Note: need - interval '1h' as "NOW()" may otherwise be exactly what is already in the DB
     # (due to rounding, if this machine is fast...)
-    echo "UPDATE app_banktransaction SET date=NOW()- interval '1 hour' WHERE id='${OLD_ID}';" | psql -Aqt $DB
-
+    NOW_1HR=$(( $(date +%s) - 3600))
+    echo "UPDATE PaymentInitiations SET \"preparationDate\"='$NOW_1HR' WHERE id='${OLD_PREP}';" \
+        | psql "${DB}" -q
+    launch_libeufin
+    echo "DONE"
     audit_only
     post_audit
 
     echo -n "Testing inconsistency detection... "
-    TABLE=`jq -r .row_minor_inconsistencies[0].table < test-audit-wire.json`
-    if test "x$TABLE" != "xwire_out"
+    TABLE=$(jq -r .row_minor_inconsistencies[0].table < test-audit-wire.json)
+    if [ "$TABLE" != "wire_out" ]
     then
         exit_fail "Reported table wrong: $TABLE"
     fi
-    DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-audit-wire.json`
-    DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'`
-    if test "x$DIAG" != "xexecution date mismatch"
+    DIAG=$(jq -r .row_minor_inconsistencies[0].diagnostic < test-audit-wire.json)
+    DIAG=$(echo "$DIAG" | awk '{print $1 " " $2 " " $3}')
+    if [ "$DIAG" != "execution date mismatch" ]
     then
         exit_fail "Reported diagnostic wrong: $DIAG"
     fi
-    echo PASS
+    echo "PASS"
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-
-else
-    echo "Test skipped (database too new)"
-fi
-
 }
 
 
@@ -1114,64 +1342,67 @@ fi
 
 # Test where we trigger an emergency.
 function test_18() {
-echo "===========18: emergency================="
-
-echo "DELETE FROM reserves_out;" | psql -Aqt $DB
+    echo "===========18: emergency================="
 
-run_audit
+    echo "DELETE FROM exchange.reserves_out;" \
+        | psql -Aqt "$DB" -q
 
-echo -n "Testing emergency detection... "
-
-jq -e .reserve_balance_summary_wrong_inconsistencies[0] < test-audit-reserves.json > /dev/null || exit_fail "Reserve balance inconsistency not detected"
-
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null || exit_fail "Emergency not detected"
-jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null || exit_fail "Emergency by count not detected"
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-coins.json > /dev/null || exit_fail "Escrow balance calculation impossibility not detected"
-
-echo PASS
-
-echo -n "Testing loss calculation... "
+    run_audit
 
-AMOUNT=`jq -r .emergencies_loss < test-audit-coins.json`
-if test "x$AMOUNT" == "xTESTKUDOS:0"
-then
-    exit_fail "Reported amount wrong: $AMOUNT"
-fi
-AMOUNT=`jq -r .emergencies_loss_by_count < test-audit-coins.json`
-if test "x$AMOUNT" == "xTESTKUDOS:0"
-then
-    exit_fail "Reported amount wrong: $AMOUNT"
-fi
+    echo -n "Testing emergency detection... "
+    jq -e .reserve_balance_summary_wrong_inconsistencies[0] \
+       < test-audit-reserves.json \
+       > /dev/null \
+        || exit_fail "Reserve balance inconsistency not detected"
+    jq -e .emergencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        || exit_fail "Emergency not detected"
+    jq -e .emergencies_by_count[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        || exit_fail "Emergency by count not detected"
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        || exit_fail "Escrow balance calculation impossibility not detected"
+    echo "PASS"
 
-echo  PASS
+    echo -n "Testing loss calculation... "
+    AMOUNT=$(jq -r .emergencies_loss < test-audit-coins.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Reported amount wrong: $AMOUNT"
+    fi
+    AMOUNT=$(jq -r .emergencies_loss_by_count < test-audit-coins.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Reported amount wrong: $AMOUNT"
+    fi
+    echo "PASS"
 
-# cannot easily undo broad DELETE operation, hence full reload
-full_reload
+    # cannot easily undo broad DELETE operation, hence full reload
+    full_reload
 }
 
 
 
 # Test where reserve closure was done properly
 function test_19() {
-echo "===========19: reserve closure done properly ================="
-
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========19: reserve closure done properly ================="
 
-    OLD_TIME=`echo "SELECT execution_date FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    OLD_VAL=`echo "SELECT credit_val FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    RES_PUB=`echo "SELECT reserve_pub FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    OLD_EXP=`echo "SELECT expiration_date FROM reserves WHERE reserve_pub='${RES_PUB}';" | psql $DB -Aqt`
+    OLD_TIME=$(echo "SELECT execution_date FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    OLD_VAL=$(echo "SELECT credit_val FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    RES_PUB=$(echo "SELECT reserve_pub FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    OLD_EXP=$(echo "SELECT expiration_date FROM exchange.reserves WHERE reserve_pub='${RES_PUB}';" | psql "$DB" -Aqt)
     VAL_DELTA=1
-    NEW_TIME=`expr $OLD_TIME - 3024000000000 || true`  # 5 weeks
-    NEW_EXP=`expr $OLD_EXP - 3024000000000 || true`  # 5 weeks
-    NEW_CREDIT=`expr $OLD_VAL + $VAL_DELTA || true`
-    echo "UPDATE reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" | psql -Aqt $DB
-    echo "UPDATE reserves SET current_balance_val=${VAL_DELTA}+current_balance_val,expiration_date='${NEW_EXP}' WHERE reserve_pub='${RES_PUB}';" | psql -Aqt $DB
+    NEW_TIME=$(( OLD_TIME - 3024000000000))  # 5 weeks
+    NEW_EXP=$(( OLD_EXP - 3024000000000))  # 5 weeks
+    NEW_CREDIT=$(( OLD_VAL + VAL_DELTA))
+    echo "UPDATE exchange.reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" \
+        | psql -Aqt "$DB"
+    echo "UPDATE exchange.reserves SET current_balance_val=${VAL_DELTA}+current_balance_val,expiration_date='${NEW_EXP}' WHERE reserve_pub='${RES_PUB}';" \
+        | psql -Aqt "$DB"
 
     # Need to run with the aggregator so the reserve closure happens
     run_audit aggregator
@@ -1189,88 +1420,90 @@ then
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-
-else
-    echo "Test skipped (database too new)"
-fi
 }
 
 
 # Test where reserve closure was not done properly
 function test_20() {
-echo "===========20: reserve closure missing ================="
-
-OLD_TIME=`echo "SELECT execution_date FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-OLD_VAL=`echo "SELECT credit_val FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-RES_PUB=`echo "SELECT reserve_pub FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-NEW_TIME=`expr $OLD_TIME - 3024000000000 || true`  # 5 weeks
-NEW_CREDIT=`expr $OLD_VAL + 100 || true`
-echo "UPDATE reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" | psql -Aqt $DB
-echo "UPDATE reserves SET current_balance_val=100+current_balance_val WHERE reserve_pub='${RES_PUB}';" | psql -Aqt $DB
-
-# This time, run without the aggregator so the reserve closure is skipped!
-run_audit
+    echo "===========20: reserve closure missing ================="
+
+    OLD_TIME=$(echo "SELECT execution_date FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    OLD_VAL=$(echo "SELECT credit_val FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    RES_PUB=$(echo "SELECT reserve_pub FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    NEW_TIME=$(( OLD_TIME - 3024000000000 ))  # 5 weeks
+    NEW_CREDIT=$(( OLD_VAL + 100 ))
+    echo "UPDATE exchange.reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" \
+        | psql -Aqt "$DB"
+    echo "UPDATE exchange.reserves SET current_balance_val=100+current_balance_val WHERE reserve_pub='${RES_PUB}';" \
+        | psql -Aqt "$DB"
+
+    # This time, run without the aggregator so the reserve closure is skipped!
+    run_audit
 
-echo -n "Testing reserve closure missing detected... "
-jq -e .reserve_not_closed_inconsistencies[0] < test-audit-reserves.json > /dev/null || exit_fail "Reserve not closed inconsistency not detected"
-echo "PASS"
+    echo -n "Testing reserve closure missing detected... "
+    jq -e .reserve_not_closed_inconsistencies[0] \
+       < test-audit-reserves.json \
+       > /dev/null  \
+        || exit_fail "Reserve not closed inconsistency not detected"
+    echo "PASS"
 
-AMOUNT=`jq -r .total_balance_reserve_not_closed < test-audit-reserves.json`
-if test "x$AMOUNT" == "xTESTKUDOS:0"
-then
-    exit_fail "Reported total amount wrong: $AMOUNT"
-fi
+    AMOUNT=$(jq -r .total_balance_reserve_not_closed < test-audit-reserves.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Reported total amount wrong: $AMOUNT"
+    fi
 
-# Undo
-echo "UPDATE reserves_in SET execution_date='${OLD_TIME}',credit_val=${OLD_VAL} WHERE reserve_in_serial_id=1;" | psql -Aqt $DB
-echo "UPDATE reserves SET current_balance_val=current_balance_val-100 WHERE reserve_pub='${RES_PUB}';" | psql -Aqt $DB
+    # Undo
+    echo "UPDATE exchange.reserves_in SET execution_date='${OLD_TIME}',credit_val=${OLD_VAL} WHERE reserve_in_serial_id=1;" \
+        | psql -Aqt "$DB"
+    echo "UPDATE exchange.reserves SET current_balance_val=current_balance_val-100 WHERE reserve_pub='${RES_PUB}';" \
+        | psql -Aqt "$DB"
 
 }
 
 
 # Test reserve closure reported but wire transfer missing detection
 function test_21() {
-echo "===========21: reserve closure missreported ================="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========21: reserve closure missreported ================="
 
-    OLD_TIME=`echo "SELECT execution_date FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    OLD_VAL=`echo "SELECT credit_val FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    RES_PUB=`echo "SELECT reserve_pub FROM reserves_in WHERE reserve_in_serial_id=1;" | psql $DB -Aqt`
-    OLD_EXP=`echo "SELECT expiration_date FROM reserves WHERE reserve_pub='${RES_PUB}';" | psql $DB -Aqt`
+    OLD_TIME=$(echo "SELECT execution_date FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    OLD_VAL=$(echo "SELECT credit_val FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    RES_PUB=$(echo "SELECT reserve_pub FROM exchange.reserves_in WHERE reserve_in_serial_id=1;" | psql "$DB" -Aqt)
+    OLD_EXP=$(echo "SELECT expiration_date FROM exchange.reserves WHERE reserve_pub='${RES_PUB}';" | psql "$DB" -Aqt)
     VAL_DELTA=1
-    NEW_TIME=`expr $OLD_TIME - 3024000000000 || true`  # 5 weeks
-    NEW_EXP=`expr $OLD_EXP - 3024000000000 || true`  # 5 weeks
-    NEW_CREDIT=`expr $OLD_VAL + $VAL_DELTA || true`
-    echo "UPDATE reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" | psql -Aqt $DB
-    echo "UPDATE reserves SET current_balance_val=${VAL_DELTA}+current_balance_val,expiration_date='${NEW_EXP}' WHERE reserve_pub='${RES_PUB}';" | psql -Aqt $DB
+    NEW_TIME=$(( OLD_TIME - 3024000000000 ))  # 5 weeks
+    NEW_EXP=$(( OLD_EXP - 3024000000000 ))  # 5 weeks
+    NEW_CREDIT=$(( OLD_VAL + VAL_DELTA ))
+    echo "UPDATE exchange.reserves_in SET execution_date='${NEW_TIME}',credit_val=${NEW_CREDIT} WHERE reserve_in_serial_id=1;" \
+        | psql -Aqt "$DB"
+    echo "UPDATE exchange.reserves SET current_balance_val=${VAL_DELTA}+current_balance_val,expiration_date='${NEW_EXP}' WHERE reserve_pub='${RES_PUB}';" \
+        | psql -Aqt "$DB"
 
     # Need to first run the aggregator so the transfer is marked as done exists
     pre_audit aggregator
-
+    stop_libeufin
     # remove transaction from bank DB
-    echo "DELETE FROM app_banktransaction WHERE debit_account_id=2 AND amount='TESTKUDOS:${VAL_DELTA}';" | psql -Aqt $DB
-
+    # Currently emulating this (to be deleted):
+    echo "DELETE FROM TalerRequestedPayments WHERE amount='TESTKUDOS:${VAL_DELTA}'" \
+        | psql "${DB}" -q
+    launch_libeufin
     audit_only
     post_audit
 
     echo -n "Testing lack of reserve closure transaction detected... "
 
-    jq -e .reserve_lag_details[0] < test-audit-wire.json > /dev/null || exit_fail "Reserve closure lag not detected"
+    jq -e .reserve_lag_details[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        || exit_fail "Reserve closure lag not detected"
 
-    AMOUNT=`jq -r .reserve_lag_details[0].amount < test-audit-wire.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:${VAL_DELTA}"
+    AMOUNT=$(jq -r .reserve_lag_details[0].amount < test-audit-wire.json)
+    if [ "$AMOUNT" != "TESTKUDOS:${VAL_DELTA}" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
-    AMOUNT=`jq -r .total_closure_amount_lag < test-audit-wire.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:${VAL_DELTA}"
+    AMOUNT=$(jq -r .total_closure_amount_lag < test-audit-wire.json)
+    if [ "$AMOUNT" != "TESTKUDOS:${VAL_DELTA}" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
@@ -1279,35 +1512,32 @@ then
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-else
-    echo "Test skipped (database too new)"
-fi
 }
 
 
 # Test use of withdraw-expired denomination key
 function test_22() {
-echo "===========22: denomination key expired ================="
+    echo "===========22: denomination key expired ================="
 
-S_DENOM=`echo 'SELECT denominations_serial FROM reserves_out LIMIT 1;' | psql $DB -Aqt`
+    S_DENOM=$(echo 'SELECT denominations_serial FROM exchange.reserves_out LIMIT 1;' | 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 denominations_serial='${S_DENOM}';" | psql $DB -Aqt`
-# Basically expires 'immediately', so that the withdraw must have been 'invalid'
-NEW_WEXP=$OLD_START
+    OLD_START=$(echo "SELECT valid_from FROM exchange.denominations WHERE denominations_serial='${S_DENOM}';" | psql "$DB" -Aqt)
+    OLD_WEXP=$(echo "SELECT expire_withdraw FROM exchange.denominations WHERE denominations_serial='${S_DENOM}';" | psql "$DB" -Aqt)
+    # Basically expires 'immediately', so that the withdraw must have been 'invalid'
+    NEW_WEXP=$OLD_START
 
-echo "UPDATE denominations SET expire_withdraw=${NEW_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt $DB
+    echo "UPDATE exchange.denominations SET expire_withdraw=${NEW_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt "$DB"
 
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null || exit_fail "Denomination key withdraw inconsistency for $S_DENOM not detected"
+    echo -n "Testing inconsistency detection... "
+    jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null || exit_fail "Denomination key withdraw inconsistency for $S_DENOM not detected"
 
-echo PASS
+    echo "PASS"
 
-# Undo modification
-echo "UPDATE denominations SET expire_withdraw=${OLD_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt $DB
+    # Undo modification
+    echo "UPDATE exchange.denominations SET expire_withdraw=${OLD_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt "$DB"
 
 }
 
@@ -1315,50 +1545,46 @@ echo "UPDATE denominations SET expire_withdraw=${OLD_WEXP} WHERE denominations_s
 
 # Test calculation of wire-out amounts
 function test_23() {
-echo "===========23: wire out calculations ================="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========23: wire out calculations ================="
 
     # Need to first run the aggregator so the transfer is marked as done exists
     pre_audit aggregator
 
-    OLD_AMOUNT=`echo "SELECT amount_frac FROM wire_out WHERE wireout_uuid=1;" | psql $DB -Aqt`
-    NEW_AMOUNT=`expr $OLD_AMOUNT - 1000000 || true`
-    echo "UPDATE wire_out SET amount_frac=${NEW_AMOUNT} WHERE wireout_uuid=1;" | psql -Aqt $DB
+    OLD_AMOUNT=$(echo "SELECT amount_frac FROM exchange.wire_out WHERE wireout_uuid=1;" | psql "$DB" -Aqt)
+    NEW_AMOUNT=$(( OLD_AMOUNT - 1000000 ))
+    echo "UPDATE exchange.wire_out SET amount_frac=${NEW_AMOUNT} WHERE wireout_uuid=1;" \
+        | psql -Aqt "$DB"
 
     audit_only
     post_audit
 
     echo -n "Testing inconsistency detection... "
 
-    jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null || exit_fail "Wire out inconsistency not detected"
+    jq -e .wire_out_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        || exit_fail "Wire out inconsistency not detected"
 
-    ROW=`jq .wire_out_inconsistencies[0].rowid < test-audit-aggregation.json`
-    if test $ROW != 1
+    ROW=$(jq .wire_out_inconsistencies[0].rowid < test-audit-aggregation.json)
+    if [ "$ROW" != 1 ]
     then
         exit_fail "Row wrong"
     fi
-    AMOUNT=`jq -r .total_wire_out_delta_plus < test-audit-aggregation.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:0"
+    AMOUNT=$(jq -r .total_wire_out_delta_plus < test-audit-aggregation.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0" ]
     then
         exit_fail "Reported amount wrong: $AMOUNT"
     fi
-    AMOUNT=`jq -r .total_wire_out_delta_minus < test-audit-aggregation.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:0.01"
+    AMOUNT=$(jq -r .total_wire_out_delta_minus < test-audit-aggregation.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0.01" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
-    echo PASS
+    echo "PASS"
 
     echo "Second pass: changing how amount is wrong to other direction"
-    NEW_AMOUNT=`expr $OLD_AMOUNT + 1000000 || true`
-    echo "UPDATE wire_out SET amount_frac=${NEW_AMOUNT} WHERE wireout_uuid=1;" | psql -Aqt $DB
+    NEW_AMOUNT=$(( OLD_AMOUNT + 1000000 ))
+    echo "UPDATE exchange.wire_out SET amount_frac=${NEW_AMOUNT} WHERE wireout_uuid=1;" | psql -Aqt "$DB"
 
     pre_audit
     audit_only
@@ -1368,29 +1594,25 @@ then
 
     jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null || exit_fail "Wire out inconsistency not detected"
 
-    ROW=`jq .wire_out_inconsistencies[0].rowid < test-audit-aggregation.json`
-    if test $ROW != 1
+    ROW=$(jq .wire_out_inconsistencies[0].rowid < test-audit-aggregation.json)
+    if [ "$ROW" != 1 ]
     then
         exit_fail "Row wrong"
     fi
-    AMOUNT=`jq -r .total_wire_out_delta_minus < test-audit-aggregation.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:0"
+    AMOUNT=$(jq -r .total_wire_out_delta_minus < test-audit-aggregation.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0" ]
     then
         exit_fail "Reported amount wrong: $AMOUNT"
     fi
-    AMOUNT=`jq -r .total_wire_out_delta_plus < test-audit-aggregation.json`
-    if test "x$AMOUNT" != "xTESTKUDOS:0.01"
+    AMOUNT=$(jq -r .total_wire_out_delta_plus < test-audit-aggregation.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0.01" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
-    echo PASS
-
+    echo "PASS"
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-else
-    echo "Test skipped (database too new)"
-fi
 }
 
 
@@ -1398,179 +1620,173 @@ fi
 # Test for missing deposits in exchange database.
 function test_24() {
 
-echo "===========24: deposits missing ==========="
-# Modify denom_sig, so it is wrong
-CNT=`echo "SELECT COUNT(*) FROM deposit_confirmations;" | psql -Aqt $DB`
-if test x$CNT = x0
-then
-    echo "Skipping deposits missing test: no deposit confirmations in database!"
-else
-    echo "DELETE FROM deposits;" | psql -Aqt $DB
-    echo "DELETE FROM deposits WHERE deposit_serial_id=1;" | psql -Aqt $DB
+    echo "===========24: deposits missing ==========="
+    # Modify denom_sig, so it is wrong
+    CNT=$(echo "SELECT COUNT(*) FROM auditor.deposit_confirmations;" | psql -Aqt "$DB")
+    if [ "$CNT" = "0" ]
+    then
+        echo "Skipping deposits missing test: no deposit confirmations in database!"
+    else
+        echo "DELETE FROM exchange.deposits;" | psql -Aqt "$DB"
+        echo "DELETE FROM exchange.deposits WHERE deposit_serial_id=1;" \
+            | psql -Aqt "$DB"
 
-    run_audit
+        run_audit
 
-    echo -n "Testing inconsistency detection... "
+        echo -n "Testing inconsistency detection... "
 
-    jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null || exit_fail "Deposit confirmation inconsistency NOT detected"
+        jq -e .deposit_confirmation_inconsistencies[0] \
+           < test-audit-deposits.json \
+           > /dev/null \
+            || exit_fail "Deposit confirmation inconsistency NOT detected"
 
-    AMOUNT=`jq -er .missing_deposit_confirmation_total < test-audit-deposits.json`
-    if test x$AMOUNT = xTESTKUDOS:0
-    then
-        exit_fail "Expected non-zero total missing deposit confirmation amount"
-    fi
-    COUNT=`jq -er .missing_deposit_confirmation_count < test-audit-deposits.json`
-    if test x$AMOUNT = x0
-    then
-        exit_fail "Expected non-zero total missing deposit confirmation count"
-    fi
+        AMOUNT=$(jq -er .missing_deposit_confirmation_total < test-audit-deposits.json)
+        if [ "$AMOUNT" = "TESTKUDOS:0" ]
+        then
+            exit_fail "Expected non-zero total missing deposit confirmation amount"
+        fi
+        COUNT=$(jq -er .missing_deposit_confirmation_count < test-audit-deposits.json)
+        if [ "$AMOUNT" = "0" ]
+        then
+            exit_fail "Expected non-zero total missing deposit confirmation count"
+        fi
 
-    echo PASS
+        echo "PASS"
 
-    # cannot easily undo DELETE, hence full reload
-    full_reload
-fi
+        # cannot easily undo DELETE, hence full reload
+        full_reload
+    fi
 }
 
 
 # Test for inconsistent coin history.
 function test_25() {
 
-echo "=========25: inconsistent coin history========="
-
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "=========25: inconsistent coin history========="
 
     # Drop refund, so coin history is bogus.
-    echo "DELETE FROM refunds WHERE refund_serial_id=1;" | psql -Aqt $DB
+    echo "DELETE FROM exchange.refunds WHERE refund_serial_id=1;" \
+        | psql -At "$DB"
 
     run_audit aggregator
 
     echo -n "Testing inconsistency detection... "
 
-    jq -e .coin_inconsistencies[0] < test-audit-aggregation.json > /dev/null || exit_fail "Coin inconsistency NOT detected"
+    jq -e .coin_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        || exit_fail "Coin inconsistency NOT detected"
 
     # Note: if the wallet withdrew much more than it spent, this might indeed
     # go legitimately unnoticed.
-    jq -e .emergencies[0] < test-audit-coins.json > /dev/null || exit_fail "Denomination value emergency NOT reported"
+    jq -e .emergencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        || exit_fail "Denomination value emergency NOT reported"
 
-    AMOUNT=`jq -er .total_coin_delta_minus < test-audit-aggregation.json`
-    if test x$AMOUNT = xTESTKUDOS:0
+    AMOUNT=$(jq -er .total_coin_delta_minus < test-audit-aggregation.json)
+    if [ "$AMOUNT" = "TESTKUDOS:0" ]
     then
         exit_fail "Expected non-zero total inconsistency amount from coins"
     fi
     # Note: if the wallet withdrew much more than it spent, this might indeed
     # go legitimately unnoticed.
-    COUNT=`jq -er .emergencies_risk_by_amount < test-audit-coins.json`
-    if test x$AMOUNT = xTESTKUDOS:0
+    COUNT=$(jq -er .emergencies_risk_by_amount < test-audit-coins.json)
+    if [ "$COUNT" = "TESTKUDOS:0" ]
     then
         exit_fail "Expected non-zero emergency-by-amount"
     fi
-    echo PASS
+    echo "PASS"
 
     # cannot easily undo DELETE, hence full reload
     full_reload
-else
-    echo "Test skipped (database too new)"
-fi
 }
 
 
 # Test for deposit wire target malformed
 function test_26() {
-echo "===========26: deposit wire target malformed ================="
-# Expects 'payto_uri', not 'url' (also breaks signature, but we cannot even check that).
-SERIAL=`echo "SELECT deposit_serial_id FROM deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql $DB -Aqt`
-OLD_WIRE_ID=`echo "SELECT wire_target_h_payto FROM deposits WHERE deposit_serial_id=${SERIAL};"  | psql $DB -Aqt`
-NEW_WIRE_ID=`echo "INSERT INTO wire_targets (payto_uri, wire_target_h_payto, kyc_ok) VALUES ('payto://x-taler-bank/localhost/testuser-xxlargtp', '\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b', false);"  | psql $DB -Aqt`
-echo OLD_WIRE_ID=$OLD_WIRE_ID
-echo NEW_WIRE_ID=$NEW_WIRE_ID
-echo "UPDATE deposits SET wire_target_h_payto='\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b' WHERE deposit_serial_id=${SERIAL}" | psql -Aqt $DB
+    echo "===========26: deposit wire target malformed ================="
+    # Expects 'payto_uri', not 'url' (also breaks signature, but we cannot even check that).
+    SERIAL=$(echo "SELECT deposit_serial_id FROM exchange.deposits WHERE amount_with_fee_val=3 AND amount_with_fee_frac=0 ORDER BY deposit_serial_id LIMIT 1" | psql "$DB" -Aqt)
+    OLD_WIRE_ID=$(echo "SELECT wire_target_h_payto FROM exchange.deposits WHERE deposit_serial_id=${SERIAL};"  | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "INSERT INTO exchange.wire_targets (payto_uri, wire_target_h_payto) VALUES ('payto://x-taler-bank/localhost/testuser-xxlargtp', '\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b');" \
+        | psql "$DB" -Aqt
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.deposits SET wire_target_h_payto='\x1e8f31936b3cee8f8afd3aac9e38b5db42d45b721ffc4eb1e5b9ddaf1565660b' WHERE deposit_serial_id=${SERIAL}" \
+        | psql -Aqt "$DB"
 
-run_audit
-
-echo -n "Testing inconsistency detection... "
+    run_audit
 
-jq -e .bad_sig_losses[0] < test-audit-coins.json > /dev/null || exit_fail "Bad signature not detected"
+    echo -n "Testing inconsistency detection... "
 
-ROW=`jq -e .bad_sig_losses[0].row < test-audit-coins.json`
-if test $ROW != ${SERIAL}
-then
-    exit_fail "Row wrong, got $ROW"
-fi
+    jq -e .bad_sig_losses[0] < test-audit-coins.json > /dev/null || exit_fail "Bad signature not detected"
 
-LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong deposit bad signature loss, got $LOSS"
-fi
+    ROW=$(jq -e .bad_sig_losses[0].row < test-audit-coins.json)
+    if [ "$ROW" != "${SERIAL}" ]
+    then
+        exit_fail "Row wrong, got $ROW"
+    fi
 
-OP=`jq -r .bad_sig_losses[0].operation < test-audit-coins.json`
-if test $OP != "deposit"
-then
-    exit_fail "Wrong operation, got $OP"
-fi
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong deposit bad signature loss, got $LOSS"
+    fi
 
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:3"
-then
-    exit_fail "Wrong total bad sig loss, got $LOSS"
-fi
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-coins.json)
+    if [ "$OP" != "deposit" ]
+    then
+        exit_fail "Wrong operation, got $OP"
+    fi
 
-echo PASS
-# Undo:
-echo "UPDATE deposits SET wire_target_h_payto='$OLD_WIRE_ID' WHERE deposit_serial_id=${SERIAL}" | psql -Aqt $DB
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Wrong total bad sig loss, got $LOSS"
+    fi
 
+    echo "PASS"
+    # Undo:
+    echo "UPDATE exchange.deposits SET wire_target_h_payto='$OLD_WIRE_ID' WHERE deposit_serial_id=${SERIAL}" \
+        | psql -Aqt "$DB"
 }
 
 # Test for duplicate wire transfer subject
 function test_27() {
-echo "===========27: duplicate WTID detection ================="
-
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "===========27: duplicate WTID detection ================="
 
     pre_audit aggregator
-
+    stop_libeufin
     # Obtain data to duplicate.
-    ID=`echo "SELECT id FROM app_banktransaction WHERE debit_account_id=2 LIMIT 1" | psql $DB -Aqt`
-    WTID=`echo "SELECT subject FROM app_banktransaction WHERE debit_account_id=2 LIMIT 1" | psql $DB -Aqt`
-    echo WTID=$WTID
-    UUID="992e8936-a64d-4845-87d7-021440330f8a"
-    echo "INSERT INTO app_banktransaction (amount,subject,date,credit_account_id,debit_account_id,cancelled,request_uid) VALUES ('TESTKUDOS:1','$WTID',NOW(),12,2,'f','$UUID')" | psql -Aqt $DB
-
+    WTID=$(echo SELECT wtid FROM TalerRequestedPayments WHERE id=1 | psql "${DB}" -Aqt)
+    OTHER_IBAN=$(echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | psql "${DB}" -Aqt)
+    # 'rawConfirmation' is set to 2 here, that doesn't
+    # point to any record.  That's only needed to set a non null value.
+    echo -e "INSERT INTO PaymentInitiations (\"bankAccount\",\"preparationDate\",\"submissionDate\",sum,currency,\"endToEndId\",\"paymentInformationId\",\"instructionId\",subject,\"creditorIban\",\"creditorBic\",\"creditorName\",submitted,\"messageId\",\"rawConfirmation\") VALUES (1,$(date +%s),$(( $(date +%s) + 2)),10,'TESTKUDOS','NOTGIVEN','unused','unused','$WTID http://exchange.example.com/','$OTHER_IBAN','SANDBOXX','Forty Two',false,1,2)" \
+        | psql "${DB}" -q
+    echo -e "INSERT INTO TalerRequestedPayments (facade,payment,\"requestUid\",amount,\"exchangeBaseUrl\",wtid,\"creditAccount\") VALUES (1,2,'unused','TESTKUDOS:1','http://exchange.example.com/','$WTID','payto://iban/SANDBOXX/$OTHER_IBAN?receiver-name=Forty+Two')" \
+        | psql "${DB}" -q
+    launch_libeufin
     audit_only
     post_audit
 
     echo -n "Testing inconsistency detection... "
 
-    AMOUNT=`jq -r .wire_format_inconsistencies[0].amount < test-audit-wire.json`
-    if test "${AMOUNT}" != "TESTKUDOS:1"
+    AMOUNT=$(jq -r .wire_format_inconsistencies[0].amount < test-audit-wire.json)
+    if [ "${AMOUNT}" != "TESTKUDOS:1" ]
     then
         exit_fail "Amount wrong, got ${AMOUNT}"
     fi
 
-    AMOUNT=`jq -r .total_wire_format_amount < test-audit-wire.json`
-    if test "${AMOUNT}" != "TESTKUDOS:1"
+    AMOUNT=$(jq -r .total_wire_format_amount < test-audit-wire.json)
+    if [ "${AMOUNT}" != "TESTKUDOS:1" ]
     then
         exit_fail "Wrong total wire format amount, got $AMOUNT"
     fi
 
     # cannot easily undo aggregator, hence full reload
     full_reload
-else
-    echo "Test skipped (database too new)"
-fi
-
 }
 
 
@@ -1579,41 +1795,37 @@ fi
 # Test where denom_sig in known_coins table is wrong
 # (=> bad signature) AND the coin is used in aggregation
 function test_28() {
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
 
     echo "===========28: known_coins signature wrong================="
     # Modify denom_sig, so it is wrong
-    OLD_SIG=`echo 'SELECT denom_sig FROM known_coins LIMIT 1;' | psql $DB -Aqt`
-    COIN_PUB=`echo "SELECT coin_pub FROM known_coins WHERE denom_sig='$OLD_SIG';"  | psql $DB -Aqt`
-    echo "UPDATE known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" | psql -Aqt $DB
+    OLD_SIG=$(echo 'SELECT denom_sig FROM exchange.known_coins LIMIT 1;' | psql "$DB" -Aqt)
+    COIN_PUB=$(echo "SELECT coin_pub FROM exchange.known_coins WHERE denom_sig='$OLD_SIG';"  | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" \
+        | psql -Aqt "$DB"
 
     run_audit aggregator
 
     echo -n "Testing inconsistency detection... "
-    LOSS=`jq -r .bad_sig_losses[0].loss < test-audit-aggregation.json`
-    if test $LOSS == "TESTKUDOS:0"
+    LOSS=$(jq -r .bad_sig_losses[0].loss < test-audit-aggregation.json)
+    if [ "$LOSS" == "TESTKUDOS:0" ]
     then
         exit_fail "Wrong deposit bad signature loss, got $LOSS"
     fi
 
-    OP=`jq -r .bad_sig_losses[0].operation < test-audit-aggregation.json`
-    if test $OP != "wire"
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-aggregation.json)
+    if [ "$OP" != "wire" ]
     then
         exit_fail "Wrong operation, got $OP"
     fi
-    TAB=`jq -r .row_inconsistencies[0].table < test-audit-aggregation.json`
-    if test $TAB != "deposit"
+    TAB=$(jq -r .row_inconsistencies[0].table < test-audit-aggregation.json)
+    if [ "$TAB" != "deposit" ]
     then
         exit_fail "Wrong table for row inconsistency, got $TAB"
     fi
 
-    LOSS=`jq -r .total_bad_sig_loss < test-audit-aggregation.json`
-    if test $LOSS == "TESTKUDOS:0"
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$LOSS" == "TESTKUDOS:0" ]
     then
         exit_fail "Wrong total bad sig loss, got $LOSS"
     fi
@@ -1621,10 +1833,6 @@ then
     echo "OK"
     # cannot easily undo aggregator, hence full reload
     full_reload
-
-else
-    echo "Test skipped (database too new)"
-fi
 }
 
 
@@ -1632,27 +1840,27 @@ fi
 # Test where fees known to the auditor differ from those
 # accounted for by the exchange
 function test_29() {
-echo "===========29: withdraw fee inconsistency ================="
+    echo "===========29: withdraw fee inconsistency ================="
 
-echo "UPDATE denominations SET fee_withdraw_frac=5000000 WHERE coin_val=1;" | psql -Aqt $DB
+    echo "UPDATE exchange.denominations SET fee_withdraw_frac=5000000 WHERE coin_val=1;" | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-AMOUNT=`jq -r .total_balance_summary_delta_minus < test-audit-reserves.json`
-if test "x$AMOUNT" == "xTESTKUDOS:0"
-then
-    exit_fail "Reported total amount wrong: $AMOUNT"
-fi
+    echo -n "Testing inconsistency detection... "
+    AMOUNT=$(jq -r .total_balance_summary_delta_minus < test-audit-reserves.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Reported total amount wrong: $AMOUNT"
+    fi
 
-PROFIT=`jq -r .amount_arithmetic_inconsistencies[0].profitable < test-audit-coins.json`
-if test "x$PROFIT" != "x-1"
-then
-    exit_fail "Reported wrong profitability: $PROFIT"
-fi
-echo "OK"
-# Undo
-echo "UPDATE denominations SET fee_withdraw_frac=2000000 WHERE coin_val=1;" | psql -Aqt $DB
+    PROFIT=$(jq -r .amount_arithmetic_inconsistencies[0].profitable < test-audit-coins.json)
+    if [ "$PROFIT" != "-1" ]
+    then
+        exit_fail "Reported wrong profitability: $PROFIT"
+    fi
+    echo "OK"
+    # Undo
+    echo "UPDATE exchange.denominations SET fee_withdraw_frac=2000000 WHERE coin_val=1;" | psql -Aqt "$DB"
 
 }
 
@@ -1660,28 +1868,28 @@ echo "UPDATE denominations SET fee_withdraw_frac=2000000 WHERE coin_val=1;" | ps
 # Test where fees known to the auditor differ from those
 # accounted for by the exchange
 function test_30() {
-echo "===========30: melt fee inconsistency ================="
+    echo "===========30: melt fee inconsistency ================="
 
-echo "UPDATE denominations SET fee_refresh_frac=5000000 WHERE coin_val=10;" | psql -Aqt $DB
+    echo "UPDATE exchange.denominations SET fee_refresh_frac=5000000 WHERE coin_val=10;" | psql -Aqt "$DB"
 
-run_audit
-echo -n "Testing inconsistency detection... "
-AMOUNT=`jq -r .bad_sig_losses[0].loss < test-audit-coins.json`
-if test "x$AMOUNT" == "xTESTKUDOS:0"
-then
-    exit_fail "Reported total amount wrong: $AMOUNT"
-fi
+    run_audit
+    echo -n "Testing inconsistency detection... "
+    AMOUNT=$(jq -r .bad_sig_losses[0].loss < test-audit-coins.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Reported total amount wrong: $AMOUNT"
+    fi
 
-PROFIT=`jq -r .amount_arithmetic_inconsistencies[0].profitable < test-audit-coins.json`
-if test "x$PROFIT" != "x-1"
-then
-    exit_fail "Reported profitability wrong: $PROFIT"
-fi
+    PROFIT=$(jq -r .amount_arithmetic_inconsistencies[0].profitable < test-audit-coins.json)
+    if [ "$PROFIT" != "-1" ]
+    then
+        exit_fail "Reported profitability wrong: $PROFIT"
+    fi
 
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run"
-echo "OK"
-# Undo
-echo "UPDATE denominations SET fee_refresh_frac=3000000 WHERE coin_val=1;" | psql -Aqt $DB
+    jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run"
+    echo "OK"
+    # Undo
+    echo "UPDATE exchange.denominations SET fee_refresh_frac=3000000 WHERE coin_val=10;" | psql -Aqt "$DB"
 
 }
 
@@ -1690,39 +1898,27 @@ echo "UPDATE denominations SET fee_refresh_frac=3000000 WHERE coin_val=1;" | psq
 # accounted for by the exchange
 function test_31() {
 
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
-
     echo "===========31: deposit fee inconsistency ================="
 
-    echo "UPDATE denominations SET fee_deposit_frac=5000000 WHERE coin_val=8;" | psql -Aqt $DB
+    echo "UPDATE exchange.denominations SET fee_deposit_frac=5000000 WHERE coin_val=8;" | psql -Aqt "$DB"
 
     run_audit aggregator
     echo -n "Testing inconsistency detection... "
-    AMOUNT=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-    if test "x$AMOUNT" == "xTESTKUDOS:0"
+    AMOUNT=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
 
-    OP=`jq -r --arg dep "deposit" '.bad_sig_losses[] | select(.operation == $dep) | .operation'< test-audit-coins.json | head -n1`
-    if test "x$OP" != "xdeposit"
+    OP=$(jq -r --arg dep "deposit" '.bad_sig_losses[] | select(.operation == $dep) | .operation'< test-audit-coins.json | head -n1)
+    if [ "$OP" != "deposit" ]
     then
         exit_fail "Reported wrong operation: $OP"
     fi
 
     echo "OK"
     # Undo
-    echo "UPDATE denominations SET fee_deposit_frac=2000000 WHERE coin_val=8;" | psql -Aqt $DB
-
-else
-    echo "Test skipped (database too new)"
-fi
-
+    echo "UPDATE exchange.denominations SET fee_deposit_frac=2000000 WHERE coin_val=8;" | psql -Aqt "$DB"
 }
 
 
@@ -1732,30 +1928,25 @@ fi
 # (=> bad signature)
 function test_32() {
 
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
-
     echo "===========32: known_coins signature wrong w. aggregation================="
     # Modify denom_sig, so it is wrong
-    OLD_SIG=`echo 'SELECT denom_sig FROM known_coins LIMIT 1;' | psql $DB -At`
-    COIN_PUB=`echo "SELECT coin_pub FROM known_coins WHERE denom_sig='$OLD_SIG';"  | psql $DB -At`
-    echo "UPDATE known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" | psql -Aqt $DB
+    OLD_SIG=$(echo 'SELECT denom_sig FROM exchange.known_coins LIMIT 1;' | psql "$DB" -Aqt)
+    COIN_PUB=$(echo "SELECT coin_pub FROM exchange.known_coins WHERE denom_sig='$OLD_SIG';"  | psql "$DB" -Aqt)
+# shellcheck disable=SC2028
+    echo "UPDATE exchange.known_coins SET denom_sig='\x0000000100000000287369672d76616c200a2028727361200a2020287320233542383731423743393036444643303442424430453039353246413642464132463537303139374131313437353746324632323332394644443146324643333445393939413336363430334233413133324444464239413833353833464536354442374335434445304441453035374438363336434541423834463843323843344446304144363030343430413038353435363039373833434431333239393736423642433437313041324632414132414435413833303432434346314139464635394244434346374436323238344143354544364131373739463430353032323241373838423837363535453434423145443831364244353638303232413123290a2020290a20290b' WHERE coin_pub='$COIN_PUB'" \
+        | psql -Aqt "$DB"
 
     run_audit aggregator
     echo -n "Testing inconsistency detection... "
 
-    AMOUNT=`jq -r .total_bad_sig_loss < test-audit-aggregation.json`
-    if test "x$AMOUNT" == "xTESTKUDOS:0"
+    AMOUNT=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
     then
         exit_fail "Reported total amount wrong: $AMOUNT"
     fi
 
-    OP=`jq -r .bad_sig_losses[0].operation < test-audit-aggregation.json`
-    if test "x$OP" != "xwire"
+    OP=$(jq -r .bad_sig_losses[0].operation < test-audit-aggregation.json)
+    if [ "$OP" != "wire" ]
     then
         exit_fail "Reported wrong operation: $OP"
     fi
@@ -1763,54 +1954,147 @@ then
     echo "OK"
     # Cannot undo aggregation, do full reload
     full_reload
-
-fi
 }
 
 
 
-# Test where h_payto in the wire_targets table is wrong
 function test_33() {
-echo "===========33: h_payto wrong================="
 
-# Check wire transfer lag reported (no aggregator!)
-# NOTE: this test is BRAND NEW and expected
-# to fail until we implement the check in the auditor!
+    echo "===========33: normal run with aggregator and profit drain==========="
+    run_audit aggregator drain
 
-# NOTE: This test is EXPECTED to fail for ~1h after
-# re-generating the test database as we do not
-# report lag of less than 1h (see GRACE_PERIOD in
-# taler-helper-auditor-wire.c)
-if [ $DATABASE_AGE -gt 3600 ]
-then
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
+    echo -n "Test for deposit confirmation emergencies... "
+    jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
 
-    # Modify h_payto hash, so it is inconsistent with 'wire'
-    WTSID=`echo "SELECT wire_target_serial_id FROM deposits WHERE deposit_serial_id=1;" | psql -Aqt $DB`
-    echo "UPDATE wire_targets SET h_payto='\x973e52d193a357940be9ef2939c19b0575ee1101f52188c3c01d9005b7d755c397e92624f09cfa709104b3b65605fe5130c90d7e1b7ee30f8fc570f39c16b853' WHERE wire_target_serial_id=$WTSID" | psql -Aqt $DB
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
 
-    # The auditor checks h_wire consistency only for
-    # coins where the wire transfer has happened, hence
-    # run aggregator first to get this test to work.
-    run_audit aggregator
 
-    echo -n "Testing inconsistency detection... "
-    TABLE=`jq -r .row_inconsistencies[0].table < test-audit-aggregation.json`
-    if test "x$TABLE" != "xwire_targets"
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo PASS
+
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
     then
-        exit_fail "Reported table wrong: $TABLE"
+        exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
+    fi
+
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
     fi
     echo PASS
 
-    # cannot easily undo aggregator, hence full reload
-    full_reload
+    echo -n "Checking for unexpected arithmetic differences "
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
+    fi
 
-else
-    echo "Test skipped (database too new)"
-fi
-}
+    DRAINED=$(jq -r .total_drained < test-audit-wire.json)
+    if [ "$DRAINED" != "TESTKUDOS:0.1" ]
+    then
+        exit_fail "Wrong amount drained, got unexpected drain of $DRAINED"
+    fi
+
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-reserves.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
+    echo "PASS"
 
+    echo -n "Checking for unexpected wire out differences "
+    jq -e .wire_out_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
+    echo "PASS"
 
+    # cannot easily undo aggregator, hence full reload
+    full_reload
 
+}
 
 
 # *************** Main test loop starts here **************
@@ -1818,21 +2102,18 @@ fi
 
 # Run all the tests against the database given in $1.
 # Sets $fail to 0 on success, non-zero on failure.
-check_with_database()
+function check_with_database()
 {
-    BASEDB=$1
+    BASEDB="$1"
+    CONF="$1.conf"
     echo "Running test suite with database $BASEDB using configuration $CONF"
-
-    # Setup database-specific globals
-    MASTER_PUB=`cat ${BASEDB}.mpub`
-
-    # Determine database age
-    echo "Calculating database age based on ${BASEDB}.age"
-    AGE=`cat ${BASEDB}.age`
-    NOW=`date +%s`
-    # NOTE: expr "fails" if the result is zero.
-    DATABASE_AGE=`expr ${NOW} - ${AGE} || true`
-    echo "Database age is ${DATABASE_AGE} seconds"
+    MASTER_PRIV_FILE="${BASEDB}.mpriv"
+    taler-config \
+        -f \
+        -c "${CONF}" \
+        -s exchange-offline \
+        -o MASTER_PRIV_FILE \
+        -V "${MASTER_PRIV_FILE}"
 
     # Load database
     full_reload
@@ -1841,7 +2122,7 @@ check_with_database()
     fail=0
     for i in $TESTS
     do
-        test_$i
+        "test_$i"
         if test 0 != $fail
         then
             break
@@ -1854,61 +2135,121 @@ check_with_database()
 
 
 
-
-
 # *************** Main logic starts here **************
 
 # ####### Setup globals ######
-# Postgres database to use
-DB=auditor-basedb
-
-# Configuration file to use
-CONF=${DB}.conf
+# Postgres database to use (must match configuration file)
+export DB="auditor-basedb"
 
 # test required commands exist
 echo "Testing for jq"
 jq -h > /dev/null || exit_skip "jq required"
-echo "Testing for taler-bank-manage"
-taler-bank-manage --help >/dev/null </dev/null || exit_skip "taler-bank-manage required"
+echo "Testing for faketime"
+faketime -h > /dev/null || exit_skip "faketime required"
+# NOTE: really check for all three libeufin commands?
+echo "Testing for libeufin"
+libeufin-bank --help >/dev/null 2> /dev/null </dev/null || exit_skip "libeufin required"
 echo "Testing for pdflatex"
 which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
+echo "Testing for taler-wallet-cli"
+taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null || exit_skip "taler-wallet-cli required"
 
-# check if we should regenerate the database
-if test -n "${1:-}"
-then
-    echo "Custom run, will only run on existing DB."
+
+echo -n "Testing for Postgres"
+# Available directly in path?
+INITDB_BIN=$(command -v initdb) || true
+if [[ -n "$INITDB_BIN" ]]; then
+  echo " FOUND (in path) at $INITDB_BIN"
 else
-    echo -n "Testing for taler-wallet-cli"
-    if taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null
+    HAVE_INITDB=$(find /usr -name "initdb" 2> /dev/null \
+                      | head -1 2> /dev/null \
+                      | grep postgres) \
+        || exit_skip " MISSING"
+  echo " FOUND at $(dirname "$HAVE_INITDB")"
+  INITDB_BIN=$(echo "$HAVE_INITDB" | grep bin/initdb | grep postgres | sort -n | tail -n1)
+fi
+POSTGRES_PATH=$(dirname "$INITDB_BIN")
+
+MY_TMP_DIR=$(mktemp -d /tmp/taler-auditor-basedbXXXXXX)
+echo "Using $MY_TMP_DIR for logging and temporary data"
+TMPDIR="$MY_TMP_DIR/postgres"
+mkdir -p "$TMPDIR"
+echo -n "Setting up Postgres DB at $TMPDIR ..."
+$INITDB_BIN \
+    --no-sync \
+    --auth=trust \
+    -D "${TMPDIR}" \
+    > "${MY_TMP_DIR}/postgres-dbinit.log" \
+    2> "${MY_TMP_DIR}/postgres-dbinit.err"
+echo "DONE"
+
+# Once we move to PG16, we can use:
+#    --set listen_addresses='' \
+#    --set fsync=off \
+#    --set max_wal_senders=0 \
+#    --set synchronous_commit=off \
+#    --set wal_level=minimal \
+#    --set unix_socket_directories="${TMPDIR}/sockets" \
+
+
+SOCKETDIR="${TMPDIR}/sockets"
+mkdir "${SOCKETDIR}"
+
+echo -n "Launching Postgres service"
+
+cat - >> "$TMPDIR/postgresql.conf" <<EOF
+unix_socket_directories='${TMPDIR}/sockets'
+fsync=off
+max_wal_senders=0
+synchronous_commit=off
+wal_level=minimal
+listen_addresses=''
+EOF
+
+grep -v host \
+     < "$TMPDIR/pg_hba.conf" \
+     > "$TMPDIR/pg_hba.conf.new"
+mv "$TMPDIR/pg_hba.conf.new" "$TMPDIR/pg_hba.conf"
+"${POSTGRES_PATH}/pg_ctl" \
+    -D "$TMPDIR" \
+    -l "${MY_TMP_DIR}/postgres.log" \
+    start \
+    > "${MY_TMP_DIR}/postgres-start.log" \
+    2> "${MY_TMP_DIR}/postgres-start.err"
+echo " DONE"
+PGHOST="$TMPDIR/sockets"
+export PGHOST
+MYDIR="${MY_TMP_DIR}/basedb"
+mkdir -p "${MYDIR}"
+
+if [ -z $REUSE_BASEDB_DIR ]
+then
+    echo "Generating fresh database at $MYDIR"
+
+    if faketime -f '-1 d' ./generate-auditor-basedb.sh -d "$MYDIR/$DB"
     then
-        MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX`
-        echo " FOUND. Generating fresh database at $MYDIR"
-        pwd
-        if ./generate-auditor-basedb.sh $MYDIR/basedb
-        then
-            check_with_database $MYDIR/basedb
-            if test x$fail != x0
-            then
-                exit $fail
-            else
-                echo "Cleaning up $MYDIR..."
-                rm -rf $MYDIR || echo "Removing $MYDIR failed"
-            fi
-        else
-            echo "Generation failed, running only on existing DB"
-        fi
+        echo -n "Reset 'auditor-basedb' database at $PGHOST ..."
+        dropdb "auditor-basedb" >/dev/null 2>/dev/null || true
+        createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB' at $PGHOST"
+        echo " DONE"
     else
-        echo " NOT FOUND, running only on existing DB"
+        echo "Generation failed"
+        exit 1
     fi
+else
+    echo "Reusing existing database from ${REUSE_BASEDB_DIR}"
+    cp -r "${REUSE_BASEDB_DIR}/basedb"/* "${MYDIR}/"
 fi
 
-# run tests with pre-build database, if one is available
-if test -r auditor-basedb.mpub
+check_with_database "$MYDIR/$DB"
+if [ "$fail" != "0" ]
 then
-  check_with_database "auditor-basedb"
-else
-  echo "Lacking auditor-basedb.mpub, skipping test"
-  fail=77
+    exit "$fail"
+fi
+
+if [ -z $REUSE_BASEDB_DIR ]
+then
+    echo "Run 'export REUSE_BASEDB_DIR=${MY_TMP_DIR}' to re-run tests against the same database"
 fi
 
-exit $fail
+exit 0
diff --git a/src/auditor/test-kyc.sh b/src/auditor/test-kyc.sh
new file mode 100755
index 000000000..2c4fa6594
--- /dev/null
+++ b/src/auditor/test-kyc.sh
@@ -0,0 +1,751 @@
+#!/bin/bash
+#
+#  This file is part of TALER
+#  Copyright (C) 2014-2023 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, If not, see <http://www.gnu.org/license>
+#
+#
+# shellcheck disable=SC2317
+# shellcheck disable=SC1091
+#
+#
+# Setup database which was generated from a perfectly normal
+# exchange-wallet interaction with KYC enabled and transactions
+# blocked due to KYC and run the auditor against it.
+#
+# Check that the auditor report is as expected.
+#
+# Requires 'jq' tool and Postgres superuser rights!
+#
+set -eu
+#set -x
+
+# Set of numbers for all the testcases.
+# When adding new tests, increase the last number:
+ALL_TESTS=$(seq 0 1)
+
+# $TESTS determines which tests we should run.
+# This construction is used to make it easy to
+# only run a subset of the tests. To only run a subset,
+# pass the numbers of the tests to run as the FIRST
+# argument to test-kyc.sh, i.e.:
+#
+# $ test-kyc.sh "1 3"
+#
+# to run tests 1 and 3 only.  By default, all tests are run.
+#
+TESTS=${1:-$ALL_TESTS}
+
+# Global variable to run the auditor processes under valgrind
+# VALGRIND=valgrind
+VALGRIND=""
+
+# Number of seconds to let libeuifn background
+# tasks apply a cycle of payment submission and
+# history request.
+LIBEUFIN_SETTLE_TIME=1
+
+. setup.sh
+
+
+# Cleanup exchange and libeufin between runs.
+function cleanup()
+{
+    if test ! -z "${EPID:-}"
+    then
+        echo -n "Stopping exchange $EPID..."
+        kill -TERM "$EPID"
+        wait "$EPID" || true
+        echo "DONE"
+        unset EPID
+    fi
+    stop_libeufin
+}
+
+# Cleanup to run whenever we exit
+function exit_cleanup()
+{
+    echo "Running exit-cleanup"
+    if test ! -z "${POSTGRES_PATH:-}"
+    then
+        echo "Stopping Postgres at ${POSTGRES_PATH}"
+        "${POSTGRES_PATH}/pg_ctl" \
+                        -D "$TMPDIR" \
+                        -l /dev/null \
+                        stop \
+            &> /dev/null \
+            || true
+    fi
+    cleanup
+    for n in $(jobs -p)
+    do
+        kill "$n" 2> /dev/null || true
+    done
+    wait || true
+    echo "DONE"
+}
+
+# Install cleanup handler (except for kill -9)
+trap exit_cleanup EXIT
+
+
+
+# Operations to run before the actual audit
+function pre_audit () {
+    # Launch bank
+    echo -n "Launching bank"
+    launch_libeufin
+    for n in $(seq 1 80)
+    do
+        echo -n "."
+        sleep 0.1
+        OK=1
+        wget http://localhost:18082/ \
+             -o /dev/null \
+             -O /dev/null \
+             >/dev/null \
+            && break
+        OK=0
+    done
+    if [ 1 != "$OK" ]
+    then
+        exit_skip "Failed to launch Sandbox"
+    fi
+    sleep "$LIBEUFIN_SETTLE_TIME"
+    for n in $(seq 1 80)
+    do
+        echo -n "."
+        sleep 0.1
+        OK=1
+        wget http://localhost:8082/ \
+             -o /dev/null \
+             -O /dev/null \
+             >/dev/null \
+            && break
+        OK=0
+    done
+    if [ 1 != "$OK" ]
+    then
+        exit_skip "Failed to launch Nexus"
+    fi
+    echo " DONE"
+    if test "${1:-no}" = "aggregator"
+    then
+        echo -n "Running exchange aggregator ..."
+        taler-exchange-aggregator \
+            -y \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/aggregator.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+        echo -n "Running exchange closer ..."
+        taler-exchange-closer \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/closer.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+        echo -n "Running exchange transfer ..."
+        taler-exchange-transfer \
+            -L "INFO" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/transfer.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+    fi
+}
+
+# actual audit run
+function audit_only () {
+    # Run the auditor!
+    echo -n "Running audit(s) ..."
+
+    # Restart so that first run is always fresh, and second one is incremental
+    taler-auditor-dbinit \
+        -r \
+        -c "$CONF"
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-aggregation.json \
+              2> "${MY_TMP_DIR}/test-audit-aggregation.log" \
+        || exit_fail "aggregation audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-aggregation-inc.json \
+              2> "${MY_TMP_DIR}/test-audit-aggregation-inc.log" \
+        || exit_fail "incremental aggregation audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-coins \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-coins.json \
+              2> "${MY_TMP_DIR}/test-audit-coins.log" \
+        || exit_fail "coin audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-coins \
+              -L DEBUG  \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-coins-inc.json \
+              2> "${MY_TMP_DIR}/test-audit-coins-inc.log" \
+        || exit_fail "incremental coin audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-deposits \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-deposits.json \
+              2> "${MY_TMP_DIR}/test-audit-deposits.log" \
+        || exit_fail "deposits audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-deposits \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-deposits-inc.json \
+              2> "${MY_TMP_DIR}/test-audit-deposits-inc.log" \
+        || exit_fail "incremental deposits audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-reserves.json \
+              2> "${MY_TMP_DIR}/test-audit-reserves.log" \
+        || exit_fail "reserves audit failed"
+    echo -n "."
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-reserves-inc.json \
+              2> "${MY_TMP_DIR}/test-audit-reserves-inc.log" \
+        || exit_fail "incremental reserves audit failed"
+    echo -n "."
+    rm -f "${MY_TMP_DIR}/test-wire-audit.log"
+    thaw() {
+        $VALGRIND taler-helper-auditor-wire \
+                  -i \
+                  -L DEBUG \
+                  -c "$CONF" \
+                  -m "$MASTER_PUB" \
+                  > test-audit-wire.json \
+                  2>> "${MY_TMP_DIR}/test-wire-audit.log"
+    }
+    thaw || ( echo -e " FIRST CALL TO taler-helper-auditor-wire FAILED,\nRETRY AFTER TWO SECONDS..." | tee -a "${MY_TMP_DIR}/test-wire-audit.log"
+	      sleep 2
+	      thaw || exit_fail "wire audit failed" )
+    echo -n "."
+    $VALGRIND taler-helper-auditor-wire \
+              -i \
+              -L DEBUG \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-wire-inc.json \
+              2> "${MY_TMP_DIR}/test-wire-audit-inc.log" \
+        || exit_fail "wire audit inc failed"
+    echo -n "."
+
+    echo " DONE"
+}
+
+
+# Cleanup to run after the auditor
+function post_audit () {
+    taler-exchange-dbinit \
+        -c "$CONF" \
+        -g \
+        || exit_fail "exchange DB GC failed"
+
+    cleanup
+    echo -n "TeXing ."
+    taler-helper-auditor-render.py \
+        test-audit-aggregation.json \
+        test-audit-coins.json \
+        test-audit-deposits.json \
+        test-audit-reserves.json \
+        test-audit-wire.json \
+        < ../../contrib/auditor-report.tex.j2 \
+        > test-report.tex \
+        || exit_fail "Renderer failed"
+
+    echo -n "."
+    timeout 10 pdflatex test-report.tex \
+            >/dev/null \
+        || exit_fail "pdflatex failed"
+    echo -n "."
+    timeout 10 pdflatex test-report.tex \
+            >/dev/null
+    echo " DONE"
+}
+
+
+# Run audit process on current database, including report
+# generation.  Pass "aggregator" as $1 to run
+# $ taler-exchange-aggregator
+# before auditor (to trigger pending wire transfers).
+# Pass "drain" as $2 to run a drain operation as well.
+function run_audit () {
+    pre_audit "${1:-no}"
+    if test "${2:-no}" = "drain"
+    then
+        echo -n "Starting exchange..."
+        taler-exchange-httpd \
+            -c "${CONF}" \
+            -L INFO \
+            2> "${MY_TMP_DIR}/exchange-httpd-drain.err" &
+        EPID=$!
+
+        # Wait for all services to be available
+        for n in $(seq 1 50)
+        do
+            echo -n "."
+            sleep 0.1
+            OK=0
+            # exchange
+            wget "http://localhost:8081/seed" \
+                 -o /dev/null \
+                 -O /dev/null \
+                 >/dev/null \
+                || continue
+            OK=1
+            break
+        done
+        echo "... DONE."
+        export CONF
+
+        echo -n "Running taler-exchange-offline drain "
+
+        taler-exchange-offline \
+            -L DEBUG \
+            -c "${CONF}" \
+            drain TESTKUDOS:0.1 \
+            exchange-account-1 payto://iban/SANDBOXX/DE360679?receiver-name=Exchange+Drain \
+            upload \
+            2> "${MY_TMP_DIR}/taler-exchange-offline-drain.log" \
+            || exit_fail "offline draining failed"
+        kill -TERM "$EPID"
+        wait "$EPID" || true
+        unset EPID
+        echo -n "Running taler-exchange-drain ..."
+        printf "\n" | taler-exchange-drain \
+                        -L DEBUG \
+                        -c "$CONF" \
+                        2> "${MY_TMP_DIR}/taler-exchange-drain.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+
+        echo -n "Running taler-exchange-transfer ..."
+        taler-exchange-transfer \
+            -L INFO \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/drain-transfer.log" \
+            || exit_fail "FAIL"
+        echo " DONE"
+
+        audit_only
+        post_audit
+}
+
+
+# Do a full reload of the (original) database
+function full_reload()
+{
+    echo -n "Doing full reload of the database (loading ${BASEDB}.sql into $DB at $PGHOST)... "
+    dropdb "$DB" 2> /dev/null || true
+    createdb -T template0 "$DB" \
+        || exit_skip "could not create database $DB (at $PGHOST)"
+    # Import pre-generated database, -q(ietly) using single (-1) transaction
+    psql -Aqt "$DB" \
+         -q \
+         -1 \
+         -f "${BASEDB}.sql" \
+         > /dev/null \
+        || exit_skip "Failed to load database $DB from ${BASEDB}.sql"
+    echo "DONE"
+    # Technically, this call shouldn't be needed as libeufin should already be stopped here...
+    stop_libeufin
+}
+
+
+function test_0() {
+
+    echo "===========0: normal run with aggregator==========="
+    run_audit aggregator
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
+    echo -n "Test for deposit confirmation emergencies... "
+    jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
+
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo PASS
+
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
+    fi
+
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
+    echo "PASS"
+
+    echo -n "Checking for unexpected arithmetic differences "
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
+    fi
+
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
+    echo "PASS"
+
+    echo -n "Checking for unexpected wire out differences "
+    jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
+    echo "PASS"
+
+    # cannot easily undo aggregator, hence full reload
+    full_reload
+
+}
+
+
+# Run without aggregator, hence auditor should detect wire
+# transfer lag!
+function test_1() {
+
+    echo "===========1: normal run==========="
+    run_audit
+
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency detected in ordinary run";
+    echo "PASS"
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency by count detected in ordinary run"
+    echo "PASS"
+
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo "PASS"
+
+    echo -n "Check for lag detection... "
+
+    # Check wire transfer lag reported (no aggregator!)
+    # NOTE: This test is EXPECTED to fail for ~1h after
+    # re-generating the test database as we do not
+    # report lag of less than 1h (see GRACE_PERIOD in
+    # taler-helper-auditor-wire.c)
+    jq -e .lag_details[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        || exit_fail "Lag not detected in run without aggregator"
+
+    LAG=$(jq -r .total_amount_lag < test-audit-wire.json)
+    if [ "$LAG" = "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total lag to be non-zero"
+    fi
+    echo "PASS"
+
+
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
+    # Database was unmodified, no need to undo
+    echo "OK"
+}
+
+
+
+# *************** Main test loop starts here **************
+
+
+# Run all the tests against the database given in $1.
+# Sets $fail to 0 on success, non-zero on failure.
+function check_with_database()
+{
+    BASEDB="$1"
+    CONF="$1.conf"
+    echo "Running test suite with database $BASEDB using configuration $CONF"
+    MASTER_PRIV_FILE="${BASEDB}.mpriv"
+    taler-config \
+        -f \
+        -c "${CONF}" \
+        -s exchange-offline \
+        -o MASTER_PRIV_FILE \
+        -V "${MASTER_PRIV_FILE}"
+    MASTER_PUB=$(gnunet-ecc -p "$MASTER_PRIV_FILE")
+
+    echo "MASTER PUB is ${MASTER_PUB} using file ${MASTER_PRIV_FILE}"
+
+    # Load database
+    full_reload
+
+    # Run test suite
+    fail=0
+    for i in $TESTS
+    do
+        "test_$i"
+        if test 0 != $fail
+        then
+            break
+        fi
+    done
+    echo "Cleanup (disabled, leaving database $DB behind)"
+    # dropdb $DB
+}
+
+
+
+
+# *************** Main logic starts here **************
+
+# ####### Setup globals ######
+# Postgres database to use (must match configuration file)
+export DB="auditor-basedb"
+
+# test required commands exist
+echo "Testing for jq"
+jq -h > /dev/null || exit_skip "jq required"
+echo "Testing for faketime"
+faketime -h > /dev/null || exit_skip "faketime required"
+# NOTE: really check for all three libeufin commands?
+echo "Testing for libeufin-bank"
+libeufin-bank --help >/dev/null 2> /dev/null </dev/null || exit_skip "libeufin-bank required"
+echo "Testing for pdflatex"
+which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
+echo "Testing for taler-wallet-cli"
+taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null || exit_skip "taler-wallet-cli required"
+
+
+echo -n "Testing for Postgres"
+# Available directly in path?
+INITDB_BIN=$(command -v initdb) || true
+if [[ -n "$INITDB_BIN" ]]; then
+  echo " FOUND (in path) at $INITDB_BIN"
+else
+    HAVE_INITDB=$(find /usr -name "initdb" | head -1 2> /dev/null | grep postgres) \
+        || exit_skip " MISSING"
+  echo " FOUND at $(dirname "$HAVE_INITDB")"
+  INITDB_BIN=$(echo "$HAVE_INITDB" | grep bin/initdb | grep postgres | sort -n | tail -n1)
+fi
+POSTGRES_PATH=$(dirname "$INITDB_BIN")
+
+MY_TMP_DIR=$(mktemp -d /tmp/taler-auditor-basedbXXXXXX)
+echo "Using $MY_TMP_DIR for logging and temporary data"
+TMPDIR="$MY_TMP_DIR/postgres"
+mkdir -p "$TMPDIR"
+echo -n "Setting up Postgres DB at $TMPDIR ..."
+$INITDB_BIN \
+    --no-sync \
+    --auth=trust \
+    -D "${TMPDIR}" \
+    > "${MY_TMP_DIR}/postgres-dbinit.log" \
+    2> "${MY_TMP_DIR}/postgres-dbinit.err"
+echo "DONE"
+SOCKETDIR="${TMPDIR}/sockets"
+mkdir "${SOCKETDIR}"
+echo -n "Launching Postgres service"
+cat - >> "$TMPDIR/postgresql.conf" <<EOF
+unix_socket_directories='${TMPDIR}/sockets'
+fsync=off
+max_wal_senders=0
+synchronous_commit=off
+wal_level=minimal
+listen_addresses=''
+EOF
+grep -v host \
+     < "$TMPDIR/pg_hba.conf" \
+     > "$TMPDIR/pg_hba.conf.new"
+mv "$TMPDIR/pg_hba.conf.new" "$TMPDIR/pg_hba.conf"
+"${POSTGRES_PATH}/pg_ctl" \
+                -D "$TMPDIR" \
+                -l /dev/null \
+                start \
+                > "${MY_TMP_DIR}/postgres-start.log" \
+                2> "${MY_TMP_DIR}/postgres-start.err"
+echo " DONE"
+PGHOST="$TMPDIR/sockets"
+export PGHOST
+
+MYDIR="${MY_TMP_DIR}/basedb"
+mkdir -p "${MYDIR}"
+echo "Generating fresh database at $MYDIR"
+if faketime -f '-1 d' ./generate-auditor-basedb.sh \
+            -c generate-kyc-basedb.conf \
+            -d "$MYDIR/$DB"
+then
+    echo -n "Reset 'auditor-basedb' database at $PGHOST ..."
+    dropdb "auditor-basedb" >/dev/null 2>/dev/null || true
+    createdb "auditor-basedb" || exit_skip "Could not create database '$BASEDB' at $PGHOST"
+    echo " DONE"
+    check_with_database "$MYDIR/$DB"
+    if [ "$fail" != "0" ]
+    then
+        exit "$fail"
+    fi
+else
+    echo "Generation failed"
+    exit 1
+fi
+
+exit 0
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index 9453c4458..277b102fb 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -1,15 +1,33 @@
 #!/bin/bash
+#
+#  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, If not, see <http://www.gnu.org/license>
+#
 # Setup database which was generated from a exchange-wallet interaction
 # with revocations and run the auditor against it.
 #
 # Check that the auditor report is as expected.
 #
+# shellcheck disable=SC2317
+#
 # Requires 'jq' tool and Postgres superuser rights!
 set -eu
+# set -x
 
 # Set of numbers for all the testcases.
 # When adding new tests, increase the last number:
-ALL_TESTS=`seq 0 4`
+ALL_TESTS=$(seq 0 4)
 
 # $TESTS determines which tests we should run.
 # This construction is used to make it easy to
@@ -26,63 +44,114 @@ TESTS=${1:-$ALL_TESTS}
 # Global variable to run the auditor processes under valgrind
 # VALGRIND=valgrind
 VALGRIND=""
+LOGLEVEL="INFO"
 
-# Exit, with status code "skip" (no 'real' failure)
-function exit_skip() {
-    echo $1
-    exit 77
-}
+. setup.sh
 
-# Exit, with error message (hard failure)
-function exit_fail() {
-    echo $1
-    exit 1
+# Cleanup to run whenever we exit
+function cleanup()
+{
+    if [ ! -z "${EPID:-}" ]
+    then
+        echo -n "Stopping exchange $EPID..."
+        kill -TERM "$EPID"
+        wait "$EPID"
+        echo " DONE"
+        unset EPID
+    fi
+    stop_libeufin
 }
 
 # Cleanup to run whenever we exit
-function cleanup()
+function exit_cleanup()
 {
-    for n in `jobs -p`
+    echo "Running exit-cleanup"
+    if [ ! -z "${POSTGRES_PATH:-}" ]
+    then
+        echo "Stopping Postgres at ${POSTGRES_PATH}"
+        "${POSTGRES_PATH}/pg_ctl" \
+            -D "$TMPDIR" \
+            -l /dev/null \
+            stop \
+            &> /dev/null \
+            || true
+    fi
+    cleanup
+    for n in $(jobs -p)
     do
-        kill $n 2> /dev/null || true
+        kill "$n" 2> /dev/null || true
     done
     wait
+    echo "DONE"
 }
 
 # Install cleanup handler (except for kill -9)
-trap cleanup EXIT
+trap exit_cleanup EXIT
 
 
 # Operations to run before the actual audit
 function pre_audit () {
     # Launch bank
     echo -n "Launching bank "
-    taler-bank-manage-testing $CONF postgres:///$DB serve 2>bank.err >bank.log &
-    for n in `seq 1 80`
+    launch_libeufin
+    for n in $(seq 1 80)
+    do
+        echo -n "."
+        sleep 0.1
+        OK=1
+        wget http://localhost:18082/ \
+             -o /dev/null \
+             -O /dev/null \
+             >/dev/null && break
+        OK=0
+    done
+    if [ 1 != "$OK" ]
+    then
+        exit_skip "Failed to launch Sandbox"
+    fi
+    for n in $(seq 1 80)
     do
         echo -n "."
         sleep 0.1
         OK=1
-        wget http://localhost:8082/ -o /dev/null -O /dev/null >/dev/null && break
+        wget http://localhost:8082/ \
+             -o /dev/null \
+             -O /dev/null \
+             >/dev/null && break
         OK=0
     done
-    if [ 1 != $OK ]
+    if [ 1 != "$OK" ]
     then
-        exit_skip "Failed to launch bank"
+        exit_skip "Failed to launch Nexus"
     fi
     echo " DONE"
-
-    if test ${1:-no} = "aggregator"
+    if [ "${1:-no}" = "aggregator" ]
     then
         export CONF
-        echo -n "Running exchange aggregator ..."
-        taler-exchange-aggregator -L INFO -t -c $CONF -y 2> aggregator.log || exit_fail "FAIL"
+	    echo -n "Running exchange aggregator ... (config: $CONF)"
+        taler-exchange-aggregator \
+            -L "$LOGLEVEL" \
+            -t \
+            -c "$CONF" \
+            -y \
+            2> "${MY_TMP_DIR}/aggregator.log" \
+            || exit_fail "FAIL"
         echo " DONE"
         echo -n "Running exchange closer ..."
-        taler-exchange-closer -L INFO -t -c $CONF 2> closer.log || exit_fail "FAIL"
+        taler-exchange-closer \
+            -L "$LOGLEVEL" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/closer.log" \
+            || exit_fail "FAIL"
         echo " DONE"
         echo -n "Running exchange transfer ..."
-        taler-exchange-transfer -L INFO -t -c $CONF 2> transfer.log || exit_fail "FAIL"
+        taler-exchange-transfer \
+            -L "$LOGLEVEL" \
+            -t \
+            -c "$CONF" \
+            2> "${MY_TMP_DIR}/transfer.log" \
+            || exit_fail "FAIL"
         echo " DONE"
     fi
 }
@@ -90,47 +159,120 @@ function pre_audit () {
 # actual audit run
 function audit_only () {
     # Run the auditor!
-    echo -n "Running audit(s) ..."
+    echo -n "Running audit(s) ... (conf is $CONF)"
 
     # Restart so that first run is always fresh, and second one is incremental
-    taler-auditor-dbinit -r -c $CONF
-    $VALGRIND taler-helper-auditor-aggregation -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-aggregation.json 2> test-audit-aggregation.log || exit_fail "aggregation audit failed"
+    taler-auditor-dbinit \
+        -r \
+        -c "$CONF"
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-aggregation.json \
+              2> test-audit-aggregation.log \
+        || exit_fail "aggregation audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-aggregation -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-aggregation-inc.json 2> test-audit-aggregation-inc.log || exit_fail "incremental aggregation audit failed"
+    $VALGRIND taler-helper-auditor-aggregation \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-aggregation-inc.json \
+              2> test-audit-aggregation-inc.log \
+        || exit_fail "incremental aggregation audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-coins -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-coins.json 2> test-audit-coins.log || exit_fail "coin audit failed"
+    $VALGRIND taler-helper-auditor-coins \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-coins.json \
+              2> test-audit-coins.log \
+        || exit_fail "coin audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-coins -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-coins-inc.json 2> test-audit-coins-inc.log || exit_fail "incremental coin audit failed"
+    $VALGRIND taler-helper-auditor-coins \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-coins-inc.json \
+              2> test-audit-coins-inc.log \
+        || exit_fail "incremental coin audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-deposits -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-deposits.json 2> test-audit-deposits.log || exit_fail "deposits audit failed"
+    $VALGRIND taler-helper-auditor-deposits \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-deposits.json \
+              2> test-audit-deposits.log \
+        || exit_fail "deposits audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-deposits -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-deposits-inc.json 2> test-audit-deposits-inc.log || exit_fail "incremental deposits audit failed"
+    $VALGRIND taler-helper-auditor-deposits \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-deposits-inc.json \
+              2> test-audit-deposits-inc.log \
+        || exit_fail "incremental deposits audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-reserves -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-reserves.json 2> test-audit-reserves.log || exit_fail "reserves audit failed"
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-reserves.json \
+              2> test-audit-reserves.log \
+        || exit_fail "reserves audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-reserves -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-reserves-inc.json 2> test-audit-reserves-inc.log || exit_fail "incremental reserves audit failed"
+    $VALGRIND taler-helper-auditor-reserves \
+              -i \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-reserves-inc.json \
+              2> test-audit-reserves-inc.log \
+        || exit_fail "incremental reserves audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire.json 2> test-wire-audit.log || exit_fail "wire audit failed"
+    $VALGRIND taler-helper-auditor-wire \
+              -i \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-wire.json \
+              2> test-wire-audit.log \
+        || exit_fail "wire audit failed"
     echo -n "."
-    $VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire-inc.json 2> test-wire-audit-inc.log || exit_fail "wire audit failed"
+    $VALGRIND taler-helper-auditor-wire \
+              -i \
+              -L "$LOGLEVEL" \
+              -c "$CONF" \
+              -m "$MASTER_PUB" \
+              > test-audit-wire-inc.json \
+              2> test-wire-audit-inc.log \
+        || exit_fail "wire audit failed"
     echo -n "."
-
     echo " DONE"
 }
 
 
 # Cleanup to run after the auditor
 function post_audit () {
-    echo -n "Cleanup ..."
     cleanup
-    echo " DONE"
     echo -n "TeXing ."
-    taler-helper-auditor-render.py test-audit-aggregation.json test-audit-coins.json test-audit-deposits.json test-audit-reserves.json test-audit-wire.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"
-
+    taler-helper-auditor-render.py \
+        test-audit-aggregation.json \
+        test-audit-coins.json \
+        test-audit-deposits.json \
+        test-audit-reserves.json \
+        test-audit-wire.json \
+        < ../../contrib/auditor-report.tex.j2 \
+        > test-report.tex \
+        || exit_fail "Renderer failed"
     echo -n "."
-    timeout 10 pdflatex test-report.tex >/dev/null || exit_fail "pdflatex failed"
+    timeout 10 pdflatex test-report.tex \
+            >/dev/null \
+        || exit_fail "pdflatex failed"
     echo -n "."
-    timeout 10 pdflatex test-report.tex >/dev/null
+    timeout 10 pdflatex test-report.tex \
+            >/dev/null
     echo " DONE"
 }
 
@@ -140,143 +282,158 @@ function post_audit () {
 # $ taler-exchange-aggregator
 # before auditor (to trigger pending wire transfers).
 function run_audit () {
-    pre_audit ${1:-no}
+    pre_audit "${1:-no}"
     audit_only
     post_audit
-
 }
 
 
 # Do a full reload of the (original) database
-full_reload()
+function full_reload()
 {
     echo -n "Doing full reload of the database... "
-    dropdb $DB 2> /dev/null || true
-    createdb -T template0 $DB || exit_skip "could not create database"
+    dropdb "$DB" 2> /dev/null || true
+    createdb -T template0 "$DB" \
+        || exit_skip "could not create database $DB (at $PGHOST)"
     # Import pre-generated database, -q(ietly) using single (-1) transaction
-    psql -Aqt $DB -q -1 -f ${BASEDB}.sql > /dev/null || exit_skip "Failed to load database"
+    psql -Aqt "$DB" \
+         -q \
+         -1 \
+         -f "${BASEDB}.sql" \
+         > /dev/null \
+        || exit_skip "Failed to load database $DB from ${BASEDB}.sql"
     echo "DONE"
 }
 
 
 function test_0() {
+    echo "===========0: normal run with aggregator==========="
+    run_audit aggregator
+
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
+    echo -n "Test for deposit confirmation emergencies... "
+    jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
+
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo PASS
+
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
+    fi
+    LOSS=$(jq -r .total_bad_sig_loss < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
+    fi
 
-echo "===========0: normal run with aggregator==========="
-run_audit aggregator
-
-echo "Checking output"
-# if an emergency was detected, that is a bug and we should fail
-echo -n "Test for emergencies... "
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
-echo -n "Test for deposit confirmation emergencies... "
-jq -e .deposit_confirmation_inconsistencies[0] < test-audit-deposits.json > /dev/null && exit_fail "Unexpected deposit confirmation inconsistency detected" || echo PASS
-echo -n "Test for emergencies by count... "
-jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
-
-echo -n "Test for wire inconsistencies... "
-jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
-jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
-jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run"
-jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
-jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected denomination key withdraw inconsistency detected in ordinary run"
-jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
-jq -e .lag_details[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected lag detected in ordinary run"
-jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
-
-
-# TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
-# TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
-
-echo PASS
-
-LOSS=`jq -r .total_bad_sig_loss < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from aggregation, got unexpected loss of $LOSS"
-fi
-LOSS=`jq -r .total_bad_sig_loss < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from coins, got unexpected loss of $LOSS"
-fi
-LOSS=`jq -r .total_bad_sig_loss < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong total bad sig loss from reserves, got unexpected loss of $LOSS"
-fi
-
-echo -n "Test for wire amounts... "
-WIRED=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_missattribution_in < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total missattribution in wrong, got $WIRED"
-fi
-echo PASS
-
-echo -n "Checking for unexpected arithmetic differences "
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-coins.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_plus < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
-fi
-LOSS=`jq -r .total_arithmetic_delta_minus < test-audit-reserves.json`
-if test $LOSS != "TESTKUDOS:0"
-then
-    exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
-fi
-
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
-jq -e .amount_arithmetic_inconsistencies[0] < test-audit-reserves.json > /dev/null && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
-echo PASS
-
-echo -n "Checking for unexpected wire out differences "
-jq -e .wire_out_inconsistencies[0] < test-audit-aggregation.json > /dev/null && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
-echo PASS
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
+    echo "PASS"
 
-# cannot easily undo aggregator, hence full reload
-full_reload
+    echo -n "Checking for unexpected arithmetic differences "
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregations, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-aggregation.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from aggregation, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-coins.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from coins, got unexpected minus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_plus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected plus of $LOSS"
+    fi
+    LOSS=$(jq -r .total_arithmetic_delta_minus < test-audit-reserves.json)
+    if [ "$LOSS" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Wrong arithmetic delta from reserves, got unexpected minus of $LOSS"
+    fi
 
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from aggregations detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from coins detected in ordinary run"
+    jq -e .amount_arithmetic_inconsistencies[0] \
+       < test-audit-reserves.json \
+       > /dev/null \
+        && exit_fail "Unexpected arithmetic inconsistencies from reserves detected in ordinary run"
+    echo "PASS"
+
+    echo -n "Checking for unexpected wire out differences "
+    jq -e .wire_out_inconsistencies[0] \
+       < test-audit-aggregation.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire out inconsistencies detected in ordinary run"
+    echo "PASS"
+
+    # cannot easily undo aggregator, hence full reload
+    full_reload
 }
 
 
@@ -284,58 +441,84 @@ full_reload
 # transfer lag!
 function test_1() {
 
-echo "===========1: normal run==========="
-run_audit
-
-echo "Checking output"
-# if an emergency was detected, that is a bug and we should fail
-echo -n "Test for emergencies... "
-jq -e .emergencies[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency detected in ordinary run" || echo PASS
-echo -n "Test for emergencies by count... "
-jq -e .emergencies_by_count[0] < test-audit-coins.json > /dev/null && exit_fail "Unexpected emergency by count detected in ordinary run" || echo PASS
-
-echo -n "Test for wire inconsistencies... "
-jq -e .wire_out_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
-jq -e .reserve_in_amount_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
-jq -e .missattribution_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected missattribution inconsistency detected in ordinary run"
-jq -e .row_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected row inconsistency detected in ordinary run"
-jq -e .row_minor_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
-jq -e .wire_format_inconsistencies[0] < test-audit-wire.json > /dev/null && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
-
-# TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
-# TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
-
-echo PASS
-
-echo -n "Test for wire amounts... "
-WIRED=`jq -r .total_wire_in_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_in_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_plus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta plus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_wire_out_delta_minus < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total wire delta minus wrong, got $WIRED"
-fi
-WIRED=`jq -r .total_missattribution_in < test-audit-wire.json`
-if test $WIRED != "TESTKUDOS:0"
-then
-    exit_fail "Expected total missattribution in wrong, got $WIRED"
-fi
+    echo "===========1: normal run==========="
+    run_audit
+
+    echo "Checking output"
+    # if an emergency was detected, that is a bug and we should fail
+    echo -n "Test for emergencies... "
+    jq -e .emergencies[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency detected in ordinary run" \
+        || echo "PASS"
+    echo -n "Test for emergencies by count... "
+    jq -e .emergencies_by_count[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        && exit_fail "Unexpected emergency by count detected in ordinary run" \
+        || echo "PASS"
+
+    echo -n "Test for wire inconsistencies... "
+    jq -e .wire_out_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire out inconsistency detected in ordinary run"
+    jq -e .reserve_in_amount_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected reserve in inconsistency detected in ordinary run"
+    jq -e .misattribution_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected misattribution inconsistency detected in ordinary run"
+    jq -e .row_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected row inconsistency detected in ordinary run"
+    jq -e .row_minor_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected minor row inconsistency detected in ordinary run"
+    jq -e .wire_format_inconsistencies[0] \
+       < test-audit-wire.json \
+       > /dev/null \
+        && exit_fail "Unexpected wire format inconsistencies detected in ordinary run"
+
+    # TODO: check operation balances are correct (once we have all transaction types and wallet is deterministic)
+    # TODO: check revenue summaries are correct (once we have all transaction types and wallet is deterministic)
+
+    echo "PASS"
+
+    echo -n "Test for wire amounts... "
+    WIRED=$(jq -r .total_wire_in_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_in_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_plus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta plus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_wire_out_delta_minus < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total wire delta minus wrong, got $WIRED"
+    fi
+    WIRED=$(jq -r .total_misattribution_in < test-audit-wire.json)
+    if [ "$WIRED" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Expected total misattribution in wrong, got $WIRED"
+    fi
 
-# Database was unmodified, no need to undo
-echo "OK"
+    # Database was unmodified, no need to undo
+    echo "OK"
 }
 
 
@@ -343,38 +526,38 @@ echo "OK"
 # Change recoup amount
 function test_2() {
 
-echo "===========2: recoup amount inconsistency==========="
-echo "UPDATE recoup SET amount_val=5 WHERE recoup_uuid=1" | psql -Aqt $DB
+    echo "===========2: recoup amount inconsistency==========="
+    echo "UPDATE exchange.recoup SET amount_val=5 WHERE recoup_uuid=1" | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-# Reserve balance is now wrong
-echo -n "Testing inconsistency detection... "
-AMOUNT=`jq -r .reserve_balance_summary_wrong_inconsistencies[0].auditor < test-audit-reserves.json`
-if test $AMOUNT != "TESTKUDOS:3"
-then
-    exit_fail "Reserve auditor amount $AMOUNT is wrong"
-fi
-AMOUNT=`jq -r .reserve_balance_summary_wrong_inconsistencies[0].exchange < test-audit-reserves.json`
-if test $AMOUNT != "TESTKUDOS:0"
-then
-    exit_fail "Reserve exchange amount $AMOUNT is wrong"
-fi
-# Coin spent exceeded coin's value
-AMOUNT=`jq -r .amount_arithmetic_inconsistencies[0].auditor < test-audit-coins.json`
-if test $AMOUNT != "TESTKUDOS:2"
-then
-    exit_fail "Coin auditor amount $AMOUNT is wrong"
-fi
-AMOUNT=`jq -r .amount_arithmetic_inconsistencies[0].exchange < test-audit-coins.json`
-if test $AMOUNT != "TESTKUDOS:5"
-then
-    exit_fail "Coin exchange amount $AMOUNT is wrong"
-fi
-echo OK
+    # Reserve balance is now wrong
+    echo -n "Testing inconsistency detection... "
+    AMOUNT=$(jq -r .reserve_balance_summary_wrong_inconsistencies[0].auditor < test-audit-reserves.json)
+    if [ "$AMOUNT" != "TESTKUDOS:3" ]
+    then
+        exit_fail "Reserve auditor amount $AMOUNT is wrong"
+    fi
+    AMOUNT=$(jq -r .reserve_balance_summary_wrong_inconsistencies[0].exchange < test-audit-reserves.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Reserve exchange amount $AMOUNT is wrong"
+    fi
+    # Coin spent exceeded coin's value
+    AMOUNT=$(jq -r .amount_arithmetic_inconsistencies[0].auditor < test-audit-coins.json)
+    if [ "$AMOUNT" != "TESTKUDOS:2" ]
+    then
+        exit_fail "Coin auditor amount $AMOUNT is wrong"
+    fi
+    AMOUNT=$(jq -r .amount_arithmetic_inconsistencies[0].exchange < test-audit-coins.json)
+    if [ "$AMOUNT" != "TESTKUDOS:5" ]
+    then
+        exit_fail "Coin exchange amount $AMOUNT is wrong"
+    fi
+    echo "OK"
 
-# Undo database modification
-echo "UPDATE recoup SET amount_val=2 WHERE recoup_uuid=1" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE exchange.recoup SET amount_val=2 WHERE recoup_uuid=1" | psql -Aqt "$DB"
 
 }
 
@@ -382,27 +565,27 @@ echo "UPDATE recoup SET amount_val=2 WHERE recoup_uuid=1" | psql -Aqt $DB
 # Change recoup-refresh amount
 function test_3() {
 
-echo "===========3: recoup-refresh amount inconsistency==========="
-echo "UPDATE recoup_refresh SET amount_val=5 WHERE recoup_refresh_uuid=1" | psql -Aqt $DB
+    echo "===========3: recoup-refresh amount inconsistency==========="
+    echo "UPDATE exchange.recoup_refresh SET amount_val=5 WHERE recoup_refresh_uuid=1" | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-# Coin spent exceeded coin's value
-AMOUNT=`jq -r .total_arithmetic_delta_minus < test-audit-coins.json`
-if test $AMOUNT != "TESTKUDOS:5"
-then
-    exit_fail "Arithmetic delta minus amount $AMOUNT is wrong"
-fi
-AMOUNT=`jq -r .total_arithmetic_delta_plus < test-audit-coins.json`
-if test $AMOUNT != "TESTKUDOS:0"
-then
-    exit_fail "Arithmetic delta plus amount $AMOUNT is wrong"
-fi
-echo OK
+    echo -n "Testing inconsistency detection... "
+    # Coin spent exceeded coin's value
+    AMOUNT=$(jq -r .total_arithmetic_delta_minus < test-audit-coins.json)
+    if [ "$AMOUNT" != "TESTKUDOS:5" ]
+    then
+        exit_fail "Arithmetic delta minus amount $AMOUNT is wrong"
+    fi
+    AMOUNT=$(jq -r .total_arithmetic_delta_plus < test-audit-coins.json)
+    if [ "$AMOUNT" != "TESTKUDOS:0" ]
+    then
+        exit_fail "Arithmetic delta plus amount $AMOUNT is wrong"
+    fi
+    echo "OK"
 
-# Undo database modification
-echo "UPDATE recoup_refresh SET amount_val=0 WHERE recoup_refresh_uuid=1" | psql -Aqt $DB
+    # Undo database modification
+    echo "UPDATE exchange.recoup_refresh SET amount_val=0 WHERE recoup_refresh_uuid=1" | psql -Aqt "$DB"
 
 }
 
@@ -410,72 +593,68 @@ echo "UPDATE recoup_refresh SET amount_val=0 WHERE recoup_refresh_uuid=1" | psql
 # Void recoup-refresh entry by 'unrevoking' denomination
 function test_4() {
 
-echo "===========4: invalid recoup==========="
-echo "DELETE FROM denomination_revocations;" | psql -Aqt $DB
+    echo "===========4: invalid recoup==========="
+    echo "DELETE FROM exchange.denomination_revocations;" | psql -Aqt "$DB"
 
-run_audit
+    run_audit
 
-echo -n "Testing inconsistency detection... "
-# Coin spent exceeded coin's value
-jq -e .bad_sig_losses[0] < test-audit-coins.json > /dev/null || exit_fail "Bad recoup not detected"
-AMOUNT=`jq -r .total_bad_sig_losses < test-audit-coins.json`
-if test $AMOUNT == "TESTKUDOS:0"
-then
-    exit_fail "Total bad sig losses are wrong"
-fi
-TAB=`jq -r .row_inconsistencies[0].table < test-audit-reserves.json`
-if test $TAB != "recoup"
-then
-    exit_fail "Wrong table for row inconsistency, got $TAB"
-fi
-echo OK
-
-# Undo database modification (can't easily undo DELETE, so full reload)
-full_reload
+    echo -n "Testing inconsistency detection... "
+    # Coin spent exceeded coin's value
+    jq -e .bad_sig_losses[0] \
+       < test-audit-coins.json \
+       > /dev/null \
+        || exit_fail "Bad recoup not detected"
+    AMOUNT=$(jq -r .irregular_loss < test-audit-coins.json)
+    if [ "$AMOUNT" == "TESTKUDOS:0" ]
+    then
+        exit_fail "Total bad sig losses are wrong"
+    fi
+    TAB=$(jq -r .row_inconsistencies[0].table < test-audit-reserves.json)
+    if [ "$TAB" != "recoup" ]
+    then
+        exit_fail "Wrong table for row inconsistency, got $TAB"
+    fi
+    echo "OK"
 
+    # Undo database modification (can't easily undo DELETE, so full reload)
+    full_reload
 }
 
 
 
 
-
 # *************** Main test loop starts here **************
 
 
 # Run all the tests against the database given in $1.
 # Sets $fail to 0 on success, non-zero on failure.
-check_with_database()
+function check_with_database()
 {
-    BASEDB=$1
+    BASEDB="$1"
+    # Configuration file to use
+    CONF="$1.conf"
     echo "Running test suite with database $BASEDB using configuration $CONF"
 
-    # Setup database-specific globals
-    MASTER_PUB=`cat ${BASEDB}.mpub`
+    MASTER_PRIV_FILE="${BASEDB}.mpriv"
+    taler-config -f -c "${CONF}" -s exchange-offline -o MASTER_PRIV_FILE -V "${MASTER_PRIV_FILE}"
+    MASTER_PUB=$(gnunet-ecc -p "$MASTER_PRIV_FILE")
 
-    # Determine database age
-    echo "Calculating database age based on ${BASEDB}.age"
-    AGE=`cat ${BASEDB}.age`
-    NOW=`date +%s`
-    # NOTE: expr "fails" if the result is zero.
-    DATABASE_AGE=`expr ${NOW} - ${AGE} || true`
-    echo "Database age is ${DATABASE_AGE} seconds"
+    echo "MASTER PUB is ${MASTER_PUB} using file ${MASTER_PRIV_FILE}"
 
     # Load database
     full_reload
-
     # Run test suite
     fail=0
     for i in $TESTS
     do
-        test_$i
-        if test 0 != $fail
+        "test_$i"
+        if [ 0 != "$fail" ]
         then
             break
         fi
     done
     # echo "Cleanup (disabled, leaving database $DB behind)"
-    dropdb $DB
-    rm -f test-audit.log test-wire-audit.log
+    dropdb "$DB"
 }
 
 
@@ -483,54 +662,91 @@ check_with_database()
 # *************** Main logic starts here **************
 
 # ####### Setup globals ######
-# Postgres database to use (must match revoke-basedb.conf)
-DB=taler-auditor-test
+# Postgres database to use
+DB=revoke-basedb
 
-# Configuration file to use
-CONF=revoke-basedb.conf
 
 # test required commands exist
 echo "Testing for jq"
 jq -h > /dev/null || exit_skip "jq required"
-echo "Testing for taler-bank-manage"
-taler-bank-manage --help >/dev/null </dev/null || exit_skip "taler-bank-manage required"
+echo "Testing for faketime"
+faketime -h > /dev/null \
+    || exit_skip "faketime required"
+echo "Testing for libeufin-bank"
+libeufin-bank --help \
+             >/dev/null \
+             2> /dev/null \
+             </dev/null \
+    || exit_skip "libeufin-bank required"
 echo "Testing for pdflatex"
 which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
-
-# check if we should regenerate the database
-if test -n "${1:-}"
-then
-    echo "Custom run, will only run on existing DB."
+echo "Testing for taler-wallet-cli"
+taler-wallet-cli -h \
+                 >/dev/null \
+                 </dev/null \
+                 2>/dev/null \
+    || exit_skip "taler-wallet-cli required"
+
+echo -n "Testing for Postgres "
+# Available directly in path?
+INITDB_BIN=$(command -v initdb) || true
+if [[ -n "$INITDB_BIN" ]]; then
+  echo "FOUND (in path) at $INITDB_BIN"
 else
-    echo -n "Testing for taler-wallet-cli"
-    if taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null
+  HAVE_INITDB=$(find /usr -name "initdb" | head -1 2> /dev/null | grep postgres) || exit_skip " MISSING"
+  echo "FOUND at " "$(dirname "$HAVE_INITDB")"
+  INITDB_BIN=$(echo "$HAVE_INITDB" | grep bin/initdb | grep postgres | sort -n | tail -n1)
+fi
+echo -n "Setting up Postgres DB"
+POSTGRES_PATH=$(dirname "$INITDB_BIN")
+MY_TMP_DIR=$(mktemp -d /tmp/taler-auditor-basedbXXXXXX)
+TMPDIR="${MY_TMP_DIR}/postgres/"
+mkdir -p "$TMPDIR"
+echo -n "Setting up Postgres DB at $TMPDIR ..."
+"$INITDB_BIN" \
+    --no-sync \
+    --auth=trust \
+    -D "${TMPDIR}" \
+    > "${MY_TMP_DIR}/postgres-dbinit.log" \
+    2> "${MY_TMP_DIR}/postgres-dbinit.err"
+echo " DONE"
+mkdir "${TMPDIR}/sockets"
+echo -n "Launching Postgres service at $POSTGRES_PATH"
+cat - >> "$TMPDIR/postgresql.conf" <<EOF
+unix_socket_directories='${TMPDIR}/sockets'
+fsync=off
+max_wal_senders=0
+synchronous_commit=off
+wal_level=minimal
+listen_addresses=''
+EOF
+grep -v host \
+     < "$TMPDIR/pg_hba.conf" \
+     > "$TMPDIR/pg_hba.conf.new"
+mv "$TMPDIR/pg_hba.conf.new" "$TMPDIR/pg_hba.conf"
+"${POSTGRES_PATH}/pg_ctl" \
+    -D "$TMPDIR" \
+    -l /dev/null \
+    start \
+    > "${MY_TMP_DIR}/postgres-start.log" \
+    2> "${MY_TMP_DIR}/postgres-start.err"
+echo " DONE"
+PGHOST="$TMPDIR/sockets"
+export PGHOST
+
+echo "Generating fresh database at $MY_TMP_DIR"
+if faketime -f '-1 d' ./generate-revoke-basedb.sh "$MY_TMP_DIR/$DB"
+then
+    check_with_database "$MY_TMP_DIR/$DB"
+    if [ "x$fail" != "x0" ]
     then
-        MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX`
-        echo " FOUND. Generating fresh database at $MYDIR"
-        if ./generate-revoke-basedb.sh $MYDIR/basedb
-        then
-            check_with_database $MYDIR/basedb
-            if test x$fail != x0
-            then
-                exit $fail
-            else
-                echo "Cleaning up $MYDIR..."
-                rm -rf $MYDIR || echo "Removing $MYDIR failed"
-            fi
-        else
-            echo "Generation failed, running only on existing DB"
-        fi
+        exit "$fail"
     else
-        echo " NOT FOUND, running only on existing DB"
+        echo "Cleaning up $MY_TMP_DIR..."
+        rm -rf "$MY_TMP_DIR" || echo "Removing $MY_TMP_DIR failed"
     fi
-fi
-
-# run tests with pre-build database, if one is available
-if test -r revoke-basedb.mpub
-then
-  check_with_database "revoke-basedb"
 else
-  fail=77
+    echo "Generation failed"
 fi
 
-exit $fail
+exit 0
diff --git a/src/auditor/test-sync.sh b/src/auditor/test-sync.sh
index a69201a8a..bcef908aa 100755
--- a/src/auditor/test-sync.sh
+++ b/src/auditor/test-sync.sh
@@ -1,43 +1,167 @@
-#!/bin/sh
+#!/bin/bash
+#
+#  This file is part of TALER
+#  Copyright (C) 2014-2023 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, If not, see <http://www.gnu.org/license>
+#
+# shellcheck disable=SC2317
 
 set -eu
 
-echo -n "Testing synchronization logic ..."
+# Exit, with status code "skip" (no 'real' failure)
+function exit_skip() {
+    echo "SKIPPING test: $1"
+    exit 77
+}
 
-dropdb talercheck-in 2> /dev/null || true
-dropdb talercheck-out 2> /dev/null || true
+# Exit, with error message (hard failure)
+function exit_fail() {
+    echo "FAILING test: $1"
+    exit 1
+}
 
-createdb talercheck-in || exit 77
-createdb talercheck-out || exit 77
-echo -n "."
+# Cleanup to run whenever we exit
+function cleanup() {
+    if [ -n "${POSTGRES_PATH:-}" ]
+    then
+        "${POSTGRES_PATH}/pg_ctl" -D "$TMPDIR" stop &> /dev/null || true
+    fi
+    for n in $(jobs -p)
+    do
+        kill "$n" 2> /dev/null || true
+    done
+    wait
+}
 
-taler-exchange-dbinit -c test-sync-out.conf
-echo -n "."
-psql talercheck-in < auditor-basedb.sql >/dev/null 2> /dev/null
+# Install cleanup handler (except for kill -9)
+trap cleanup EXIT
 
-echo -n "."
-taler-auditor-sync -s test-sync-in.conf -d test-sync-out.conf -t
+function check_with_database()
+{
+    echo -n "Testing synchronization logic ..."
 
-# cs_nonce_locks excluded: no point
-for table in denominations denomination_revocations wire_targets reserves reserves_in reserves_close reserves_out auditors auditor_denom_sigs exchange_sign_keys signkey_revocations extensions extension_details known_coins refresh_commitments refresh_revealed_coins refresh_transfer_keys deposits refunds wire_out aggregation_tracking wire_fee recoup recoup_refresh
-do
+    dropdb talercheck-in 2> /dev/null || true
+    dropdb talercheck-out 2> /dev/null || true
+
+    createdb talercheck-in || exit 77
+    createdb talercheck-out || exit 77
     echo -n "."
-    CIN=`echo "SELECT COUNT(*) FROM $table" | psql talercheck-in -Aqt`
-    COUT=`echo "SELECT COUNT(*) FROM $table" | psql talercheck-out -Aqt`
 
-    if test ${CIN} != ${COUT}
-    then
-        dropdb talercheck-in
-        dropdb talercheck-out
-        echo "FAIL"
-        echo "Record count mismatch: $CIN / $COUT in table $table"
-        exit 1
-    fi
-done
+    taler-exchange-dbinit -c test-sync-out.conf
+    echo -n "."
+    psql -Aqt talercheck-in \
+         -q -1 \
+         -f "$1.sql" \
+         >/dev/null \
+        || exit_skip "Failed to load database"
+
+    echo -n "."
+    taler-auditor-sync \
+        -s test-sync-in.conf \
+        -d test-sync-out.conf -t
 
-echo -n ". "
-dropdb talercheck-in
-dropdb talercheck-out
+    # cs_nonce_locks excluded: no point
+    for table in denominations denomination_revocations wire_targets reserves reserves_in reserves_close reserves_out auditors auditor_denom_sigs exchange_sign_keys signkey_revocations extensions policy_details policy_fulfillments known_coins refresh_commitments refresh_revealed_coins refresh_transfer_keys deposits refunds wire_out aggregation_tracking wire_fee recoup recoup_refresh
+    do
+        echo -n "."
+        CIN=$(echo "SELECT COUNT(*) FROM exchange.$table" | psql talercheck-in -Aqt)
+        COUT=$(echo "SELECT COUNT(*) FROM exchange.$table" | psql talercheck-out -Aqt)
 
-echo "PASS"
+        if [ "${CIN}" != "${COUT}" ]
+        then
+            dropdb talercheck-in
+            dropdb talercheck-out
+            echo "FAIL"
+            exit_fail "Record count mismatch: $CIN / $COUT in table $table"
+        fi
+    done
+
+    echo -n ". "
+    dropdb talercheck-in
+    dropdb talercheck-out
+
+    echo "PASS"
+    fail=0
+}
+
+# test required commands exist
+echo "Testing for jq"
+jq -h > /dev/null || exit_skip "jq required"
+echo "Testing for faketime"
+faketime -h > /dev/null || exit_skip "faketime required"
+echo "Testing for libeufin-bank"
+libeufin-bank --help >/dev/null </dev/null 2> /dev/null || exit_skip "libeufin-bank required"
+echo "Testing for pdflatex"
+which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
+echo "Testing for taler-wallet-cli"
+taler-wallet-cli -h >/dev/null </dev/null 2>/dev/null || exit_skip "taler-wallet-cli required"
+
+echo -n "Testing for Postgres"
+# Available directly in path?
+INITDB_BIN=$(command -v initdb) || true
+if [[ -n "$INITDB_BIN" ]]; then
+  echo " FOUND (in path) at $INITDB_BIN"
+else
+  HAVE_INITDB=$(find /usr -name "initdb" | head -1 2> /dev/null | grep postgres) || exit_skip " MISSING"
+  echo " FOUND at " "$(dirname "$HAVE_INITDB")"
+  INITDB_BIN=$(echo "$HAVE_INITDB" | grep bin/initdb | grep postgres | sort -n | tail -n1)
+fi
+echo -n "Setting up Postgres DB"
+POSTGRES_PATH=$(dirname "$INITDB_BIN")
+MYDIR=$(mktemp -d /tmp/taler-auditor-basedbXXXXXX)
+TMPDIR="$MYDIR/postgres/"
+mkdir -p "$TMPDIR"
+"$INITDB_BIN" --no-sync --auth=trust -D "${TMPDIR}" \
+            > "${MYDIR}/postgres-dbinit.log" \
+            2> "${MYDIR}/postgres-dbinit.err"
+echo " DONE"
+mkdir "${TMPDIR}/sockets"
+echo -n "Launching Postgres service"
+cat - >> "$TMPDIR/postgresql.conf" <<EOF
+unix_socket_directories='${TMPDIR}/sockets'
+fsync=off
+max_wal_senders=0
+synchronous_commit=off
+wal_level=minimal
+listen_addresses=''
+EOF
+grep -v host \
+     < "$TMPDIR/pg_hba.conf" \
+     > "$TMPDIR/pg_hba.conf.new"
+mv "$TMPDIR/pg_hba.conf.new" "$TMPDIR/pg_hba.conf"
+"${POSTGRES_PATH}/pg_ctl" \
+    -D "$TMPDIR" \
+    -l /dev/null \
+    start \
+    > "${MYDIR}/postgres-start.log" \
+    2> "${MYDIR}/postgres-start.err"
+echo " DONE"
+PGHOST="$TMPDIR/sockets"
+export PGHOST
+
+echo "Generating fresh database at $MYDIR"
+if faketime -f '-1 d' ./generate-auditor-basedb.sh -d "$MYDIR/auditor-basedb"
+then
+    check_with_database "$MYDIR/auditor-basedb"
+    if [ x$fail != x0 ]
+    then
+        exit "$fail"
+    else
+        echo "Cleaning up $MYDIR..."
+        rm -rf "$MYDIR" || echo "Removing $MYDIR failed"
+    fi
+else
+    echo "Generation failed"
+    exit 77
+fi
 exit 0
diff --git a/src/auditordb/.gitignore b/src/auditordb/.gitignore
index 56c08312b..e1c7a648b 100644
--- a/src/auditordb/.gitignore
+++ b/src/auditordb/.gitignore
@@ -1 +1,5 @@
 test-auditordb-postgres
+auditor-0002.sql
+procedures.sql
+test_auditordb_checkpoints_postgres
+test_auditordb-postgres
diff --git a/src/auditordb/0002-auditor_amount_arithmetic_inconsistency.sql b/src/auditordb/0002-auditor_amount_arithmetic_inconsistency.sql
new file mode 100644
index 000000000..19dfa682c
--- /dev/null
+++ b/src/auditordb/0002-auditor_amount_arithmetic_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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 auditor_amount_arithmetic_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    operation BYTEA,

+    exchange_amount taler_amount,

+    auditor_amount taler_amount,

+    profitable BOOLEAN

+);

+COMMENT ON TABLE auditor_amount_arithmetic_inconsistency

+    IS 'Report a (serious) inconsistency in the exchange''s database with respect to calculations involving amounts';

diff --git a/src/auditordb/0002-auditor_bad_sig_losses.sql b/src/auditordb/0002-auditor_bad_sig_losses.sql
new file mode 100644
index 000000000..ac17a5120
--- /dev/null
+++ b/src/auditordb/0002-auditor_bad_sig_losses.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_bad_sig_losses

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    operation BYTEA,

+    loss taler_amount,

+    operation_specific_pub BYTEA

+);

+COMMENT ON TABLE auditor_bad_sig_losses

+    IS 'Report a (serious) inconsistency with losses due to bad signatures';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_balances.sql b/src/auditordb/0002-auditor_balances.sql
new file mode 100644
index 000000000..8014b9c41
--- /dev/null
+++ b/src/auditordb/0002-auditor_balances.sql
@@ -0,0 +1,30 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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_balances
+(
+   balance_key TEXT PRIMARY KEY NOT NULL
+  ,balance_value taler_amount
+);
+COMMENT
+ON TABLE auditor_balances
+  IS 'table storing various global balances of the auditor';
+COMMENT
+ON COLUMN auditor_balances.balance_key
+ IS 'unique name for the balance value';
+COMMENT
+ON COLUMN auditor_balances.balance_value
+ IS 'balance amount';
diff --git a/src/auditordb/0002-auditor_closure_lags.sql b/src/auditordb/0002-auditor_closure_lags.sql
new file mode 100644
index 000000000..8473b25f9
--- /dev/null
+++ b/src/auditordb/0002-auditor_closure_lags.sql
@@ -0,0 +1,27 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+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,

+    account BYTEA

+);

+COMMENT ON TABLE auditor_closure_lags

+    IS 'Report closure lags.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_coin_inconsistency.sql b/src/auditordb/0002-auditor_coin_inconsistency.sql
new file mode 100644
index 000000000..91f954a68
--- /dev/null
+++ b/src/auditordb/0002-auditor_coin_inconsistency.sql
@@ -0,0 +1,28 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_coin_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    operation BYTEA,

+    exchange_amount taler_amount,

+    auditor_amount taler_amount,

+    coin_pub BYTEA,

+    profitable BOOLEAN

+);

+COMMENT ON TABLE auditor_coin_inconsistency

+    IS 'Report a (serious) inconsistency in the exchange''s database with respect to calculations involving amounts';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_denomination_key_validity_withdraw_inconsistency.sql b/src/auditordb/0002-auditor_denomination_key_validity_withdraw_inconsistency.sql
new file mode 100644
index 000000000..fd18f35fb
--- /dev/null
+++ b/src/auditordb/0002-auditor_denomination_key_validity_withdraw_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_denomination_key_validity_withdraw_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    execution_date BIGINT,

+    reserve_pub BYTEA,

+    denompub_h BYTEA

+);

+COMMENT ON TABLE auditor_denomination_key_validity_withdraw_inconsistency

+    IS 'Report a (serious) denomination key validity withdraw inconsistency in the exchange''s database';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_denomination_pending.sql b/src/auditordb/0002-auditor_denomination_pending.sql
new file mode 100644
index 000000000..f9ba535b4
--- /dev/null
+++ b/src/auditordb/0002-auditor_denomination_pending.sql
@@ -0,0 +1,34 @@
+--
+-- 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 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
+  ,denom_risk taler_amount NOT NULL
+  ,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).';
+COMMENT ON COLUMN auditor_denomination_pending.num_issued
+  IS 'counts the number of coins issued (withdraw, refresh) of this denomination';
+COMMENT ON COLUMN auditor_denomination_pending.denom_risk
+  IS 'amount that could theoretically be lost in the future due to recoup operations';
+COMMENT ON COLUMN auditor_denomination_pending.denom_loss
+  IS 'amount that was lost due to failures by the exchange';
+COMMENT ON COLUMN auditor_denomination_pending.recoup_loss
+  IS 'amount actually lost due to recoup operations after a revocation';
diff --git a/src/auditordb/0002-auditor_denominations_without_sigs.sql b/src/auditordb/0002-auditor_denominations_without_sigs.sql
new file mode 100644
index 000000000..86c83e94f
--- /dev/null
+++ b/src/auditordb/0002-auditor_denominations_without_sigs.sql
@@ -0,0 +1,27 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_denominations_without_sigs

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    denompub_h BYTEA,

+    value taler_amount,

+    start_time BIGINT,

+    end_time BIGINT

+);

+COMMENT ON TABLE auditor_denominations_without_sigs

+    IS 'Report encountered denomination that auditor is not auditing.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_deposit_confirmations.sql b/src/auditordb/0002-auditor_deposit_confirmations.sql
new file mode 100644
index 000000000..1b7fec185
--- /dev/null
+++ b/src/auditordb/0002-auditor_deposit_confirmations.sql
@@ -0,0 +1,58 @@
+--
+-- 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 auditor_deposit_confirmations
+(deposit_confirmation_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+    ,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
+    ,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))
+    ,merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)
+    ,exchange_sig BYTEA NOT NULL CHECK (LENGTH(exchange_sig)=64)
+    ,exchange_pub BYTEA NOT NULL CHECK (LENGTH(exchange_pub)=32)
+    ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+    ,suppressed BOOLEAN NOT NULL DEFAULT FALSE
+    ,ancient BOOLEAN NOT NULL DEFAULT FALSE
+    ,PRIMARY KEY (h_contract_terms,h_wire,merchant_pub,exchange_sig,exchange_pub,master_sig)
+    );
+COMMENT ON TABLE auditor_deposit_confirmations
+  IS 'deposit confirmation sent to us by merchants; we must check that the exchange reported these properly.';
+
+CREATE INDEX IF NOT EXISTS auditor_deposit_confirmations_not_ancient
+    ON auditor_deposit_confirmations
+    (exchange_timestamp ASC)
+    WHERE NOT ancient;
+
+CREATE OR REPLACE FUNCTION auditor_new_transactions_trigger()
+    RETURNS trigger
+    LANGUAGE plpgsql
+AS $$
+BEGIN
+    NOTIFY XX81AFHF88YGN6ESNH39KR5VQE9MHD7GSSNMTCXB82SZ6T99ARHE0;
+    RETURN NEW;
+END $$;
+COMMENT ON FUNCTION auditor_new_transactions_trigger()
+    IS 'Call auditor_call_db_notify on new entry';
+
+CREATE TRIGGER auditor_notify_helper_deposits
+    AFTER INSERT
+    ON auditor.auditor_deposit_confirmations
+EXECUTE PROCEDURE auditor_new_transactions_trigger();
diff --git a/src/auditordb/0002-auditor_emergency.sql b/src/auditordb/0002-auditor_emergency.sql
new file mode 100644
index 000000000..2bb13d7e5
--- /dev/null
+++ b/src/auditordb/0002-auditor_emergency.sql
@@ -0,0 +1,29 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+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,

+    denom_risk taler_amount,

+    denom_loss taler_amount,

+    deposit_start BIGINT,

+    deposit_end BIGINT,

+    value taler_amount

+);

+COMMENT ON TABLE auditor_emergency

+    IS 'Report an emergency denomination.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_emergency_by_count.sql b/src/auditordb/0002-auditor_emergency_by_count.sql
new file mode 100644
index 000000000..4daa994a7
--- /dev/null
+++ b/src/auditordb/0002-auditor_emergency_by_count.sql
@@ -0,0 +1,30 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_emergency_by_count

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    denompub_h BYTEA,

+    num_issued integer,

+    num_known integer,

+    risk taler_amount,

+    start BIGINT,

+    deposit_end BIGINT,

+    value taler_amount

+);

+COMMENT ON TABLE auditor_emergency_by_count

+    IS 'Report an emergency denomination.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_exchange_signkeys.sql b/src/auditordb/0002-auditor_exchange_signkeys.sql
new file mode 100644
index 000000000..64349a2ff
--- /dev/null
+++ b/src/auditordb/0002-auditor_exchange_signkeys.sql
@@ -0,0 +1,35 @@
+    --
+-- 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 auditor_exchange_signkeys
+  (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
+  );
+COMMENT ON TABLE auditor_exchange_signkeys
+  IS 'list of the online signing keys of exchanges we are auditing';
+COMMENT ON COLUMN auditor_exchange_signkeys.exchange_pub
+  IS 'Public online signing key of the exchange.';
+COMMENT ON COLUMN auditor_exchange_signkeys.master_sig
+  IS 'Signature affirming the validity of the signing key of purpose TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.';
+COMMENT ON COLUMN auditor_exchange_signkeys.ep_valid_from
+  IS 'Time when this online signing key will first be used to sign messages.';
+COMMENT ON COLUMN auditor_exchange_signkeys.ep_expire_sign
+  IS 'Time when this online signing key will no longer be used to sign.';
+COMMENT ON COLUMN auditor_exchange_signkeys.ep_expire_legal
+  IS 'Time when this online signing key legally expires.';
diff --git a/src/auditordb/0002-auditor_fee_time_inconsistency.sql b/src/auditordb/0002-auditor_fee_time_inconsistency.sql
new file mode 100644
index 000000000..b89cc59c7
--- /dev/null
+++ b/src/auditordb/0002-auditor_fee_time_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_fee_time_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    type BYTEA,

+    time BIGINT,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_fee_time_inconsistency

+    IS 'Report a (serious) fee time inconsistency in the exchange''s database';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_historic_denomination_revenue.sql b/src/auditordb/0002-auditor_historic_denomination_revenue.sql
new file mode 100644
index 000000000..bf7e4c07e
--- /dev/null
+++ b/src/auditordb/0002-auditor_historic_denomination_revenue.sql
@@ -0,0 +1,32 @@
+--
+-- 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 auditor_historic_denomination_revenue
+  (denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)
+  ,revenue_timestamp INT8 NOT NULL
+  ,revenue_balance taler_amount NOT NULL
+  ,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.';
+COMMENT ON COLUMN auditor_historic_denomination_revenue.denom_pub_hash
+  IS 'hash of the denomination public key that created this revenue';
+COMMENT ON COLUMN auditor_historic_denomination_revenue.revenue_timestamp
+  IS 'when was this revenue realized (by the denomination public key expiring)';
+COMMENT ON COLUMN auditor_historic_denomination_revenue.revenue_balance
+  IS 'the sum of all of the profits we made on the denomination except for withdraw fees (which are in historic_reserve_revenue); so this includes the deposit, melt and refund fees';
+COMMENT ON COLUMN auditor_historic_denomination_revenue.loss_balance
+  IS 'the sum of all of the losses we made on the denomination (for example, because the signing key was compromised and thus we redeemed coins we never issued); of course should be zero in practice in most cases';
diff --git a/src/auditordb/0002-auditor_historic_reserve_summary.sql b/src/auditordb/0002-auditor_historic_reserve_summary.sql
new file mode 100644
index 000000000..819c4e160
--- /dev/null
+++ b/src/auditordb/0002-auditor_historic_reserve_summary.sql
@@ -0,0 +1,30 @@
+--
+-- 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/>
+--
+
+SET search_path TO auditor;
+CREATE TABLE IF NOT EXISTS auditor_historic_reserve_summary
+  (start_date INT8 PRIMARY KEY
+  ,end_date INT8 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).';
+COMMENT ON COLUMN auditor_historic_reserve_summary.start_date
+  IS 'start date of the time interval over which we made these profits from reserves';
+COMMENT ON COLUMN auditor_historic_reserve_summary.end_date
+  IS 'end date (exclusive) of the time interval over which we made these profits from reserves';
+COMMENT ON COLUMN auditor_historic_reserve_summary.reserve_profits
+  IS 'total amount in profits made';
diff --git a/src/auditordb/0002-auditor_misattribution_in_inconsistency.sql b/src/auditordb/0002-auditor_misattribution_in_inconsistency.sql
new file mode 100644
index 000000000..f786d0fdf
--- /dev/null
+++ b/src/auditordb/0002-auditor_misattribution_in_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_misattribution_in_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    amount taler_amount,

+    bank_row BIGINT,

+    reserve_pub BYTEA

+);

+COMMENT ON TABLE auditor_misattribution_in_inconsistency

+    IS 'Report wire transfer that was smaller than it should have been.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_progress.sql b/src/auditordb/0002-auditor_progress.sql
new file mode 100644
index 000000000..288a08ae9
--- /dev/null
+++ b/src/auditordb/0002-auditor_progress.sql
@@ -0,0 +1,26 @@
+--
+-- 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_progress
+  (progress_key TEXT PRIMARY KEY NOT NULL
+  ,progress_offset INT8 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.';
+COMMENT ON COLUMN auditor_progress.progress_key
+  IS 'Name of the progress indicator';
+COMMENT ON COLUMN auditor_progress.progress_offset
+  IS 'Table offset or timestamp or counter until which the audit has progressed';
diff --git a/src/auditordb/0002-auditor_purse_not_closed_inconsistencies.sql b/src/auditordb/0002-auditor_purse_not_closed_inconsistencies.sql
new file mode 100644
index 000000000..5ffb6e85a
--- /dev/null
+++ b/src/auditordb/0002-auditor_purse_not_closed_inconsistencies.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_purse_not_closed_inconsistencies

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    purse_pub BYTEA,

+    amount taler_amount,

+    expiration_date BIGINT

+);

+COMMENT ON TABLE auditor_purse_not_closed_inconsistencies

+    IS 'Report expired purses';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_purses.sql b/src/auditordb/0002-auditor_purses.sql
new file mode 100644
index 000000000..86b6494d1
--- /dev/null
+++ b/src/auditordb/0002-auditor_purses.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 auditor_purses
+  (auditor_purses_rowid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,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
+  );
+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_refreshes_hanging.sql b/src/auditordb/0002-auditor_refreshes_hanging.sql
new file mode 100644
index 000000000..5544bc0d8
--- /dev/null
+++ b/src/auditordb/0002-auditor_refreshes_hanging.sql
@@ -0,0 +1,25 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_refreshes_hanging

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    amount taler_amount,

+    coin_pub BYTEA

+);

+COMMENT ON TABLE auditor_refreshes_hanging

+    IS 'Report a hanging refresh.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_reserve_balance_insufficient_inconsistency.sql b/src/auditordb/0002-auditor_reserve_balance_insufficient_inconsistency.sql
new file mode 100644
index 000000000..bbc0c8118
--- /dev/null
+++ b/src/auditordb/0002-auditor_reserve_balance_insufficient_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_reserve_balance_insufficient_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    reserve_pub BYTEA,

+    inconsistency_gain BOOLEAN,

+    inconsistency_amount taler_amount

+);

+COMMENT ON TABLE auditor_reserve_balance_insufficient_inconsistency

+    IS 'Report a (serious) balance insufficiency in the exchange''s database';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_reserve_balance_summary_wrong_inconsistency.sql b/src/auditordb/0002-auditor_reserve_balance_summary_wrong_inconsistency.sql
new file mode 100644
index 000000000..26d872132
--- /dev/null
+++ b/src/auditordb/0002-auditor_reserve_balance_summary_wrong_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_reserve_balance_summary_wrong_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    reserve_pub BYTEA,

+    exchange_amount taler_amount,

+    auditor_amount taler_amount

+);

+COMMENT ON TABLE auditor_reserve_balance_summary_wrong_inconsistency

+    IS 'Report a (serious) reserve balance insufficiency.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_reserve_in_inconsistency.sql b/src/auditordb/0002-auditor_reserve_in_inconsistency.sql
new file mode 100644
index 000000000..bb90c4018
--- /dev/null
+++ b/src/auditordb/0002-auditor_reserve_in_inconsistency.sql
@@ -0,0 +1,29 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_reserve_in_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    amount_exchange_expected taler_amount,

+    amount_wired taler_amount,

+    reserve_pub BYTEA,

+    timestamp BIGINT,

+    account BYTEA,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_reserve_in_inconsistency

+    IS 'Report an incoming wire transfer claimed by exchange not found.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_reserve_not_closed_inconsistency.sql b/src/auditordb/0002-auditor_reserve_not_closed_inconsistency.sql
new file mode 100644
index 000000000..1147b4ae8
--- /dev/null
+++ b/src/auditordb/0002-auditor_reserve_not_closed_inconsistency.sql
@@ -0,0 +1,27 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_reserve_not_closed_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    reserve_pub BYTEA,

+    balance taler_amount,

+    expiration_time BIGINT,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_reserve_not_closed_inconsistency

+    IS 'Report a (serious) reserve balance insufficiency.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_reserves.sql b/src/auditordb/0002-auditor_reserves.sql
new file mode 100644
index 000000000..808524b28
--- /dev/null
+++ b/src/auditordb/0002-auditor_reserves.sql
@@ -0,0 +1,31 @@
+--
+-- 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 auditor_reserves
+  (auditor_reserves_rowid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)
+  ,reserve_balance taler_amount NOT NULL
+  ,reserve_loss taler_amount NOT NULL
+  ,withdraw_fee_balance taler_amount NOT NULL
+  ,close_fee_balance taler_amount NOT NULL
+  ,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
+  );
+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/0002-auditor_row_inconsistency.sql b/src/auditordb/0002-auditor_row_inconsistency.sql
new file mode 100644
index 000000000..ece2e5661
--- /dev/null
+++ b/src/auditordb/0002-auditor_row_inconsistency.sql
@@ -0,0 +1,25 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_row_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    table BYTEA,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_row_inconsistency

+    IS 'Report a (serious) row inconsistency in the exchange''s database';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_row_minor_inconsistencies.sql b/src/auditordb/0002-auditor_row_minor_inconsistencies.sql
new file mode 100644
index 000000000..7836037c7
--- /dev/null
+++ b/src/auditordb/0002-auditor_row_minor_inconsistencies.sql
@@ -0,0 +1,25 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_row_minor_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    table BYTEA,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_row_minor_inconsistency

+    IS 'Report a (serious) row inconsistency in the exchange''s database.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_wire_format_inconsistency.sql b/src/auditordb/0002-auditor_wire_format_inconsistency.sql
new file mode 100644
index 000000000..1bc9af89d
--- /dev/null
+++ b/src/auditordb/0002-auditor_wire_format_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_wire_format_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    amount taler_amount,

+    wire_offset BIGINT,

+    diagnostic BYTEA

+);

+COMMENT ON TABLE auditor_wire_format_inconsistency

+    IS 'Report a (serious) format inconsistency.';
\ No newline at end of file
diff --git a/src/auditordb/0002-auditor_wire_out_inconsistency.sql b/src/auditordb/0002-auditor_wire_out_inconsistency.sql
new file mode 100644
index 000000000..6a49c24a0
--- /dev/null
+++ b/src/auditordb/0002-auditor_wire_out_inconsistency.sql
@@ -0,0 +1,26 @@
+--

+-- This file is part of TALER

+-- Copyright (C) 2014--2024 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/>

+--

+

+SET search_path TO auditor;

+CREATE TABLE IF NOT EXISTS auditor_wire_out_inconsistency

+(

+    row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,

+    destination_account BYTEA,

+    expected taler_amount,

+    claimed taler_amount

+);

+COMMENT ON TABLE auditor_wire_out_inconsistency

+    IS 'Report a (serious) wire inconsistency in the exchange''s database';
\ No newline at end of file
diff --git a/src/auditordb/9999.sql b/src/auditordb/9999.sql
deleted file mode 100644
index d6add4b20..000000000
--- a/src/auditordb/9999.sql
+++ /dev/null
@@ -1,53 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2020 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
-NOTE: This code is not yet ready / in use. It was archived here
-as we might want this kind of table in the future. It is NOT
-to be installed in a production system (hence in EXTRA_DIST and
-not in the SQL target!)
-
--- Check patch versioning is in place.
-SELECT _v.register_patch('auditor-9999', NULL, NULL);
-
-
--- Table with historic business ledger; basically, when the exchange
--- operator decides to use operating costs for anything but wire
--- transfers to merchants, it goes in here.  This happens when the
--- operator users transaction fees for business expenses. purpose
--- is free-form but should be a human-readable wire transfer
--- identifier.   This is NOT yet used and outside of the scope of
--- the core auditing logic. However, once we do take fees to use
--- operating costs, and if we still want auditor_predicted_result to match
--- the tables overall, we'll need a command-line tool to insert rows
--- into this table and update auditor_predicted_result accordingly.
--- (So this table for now just exists as a reminder of what we'll
--- need in the long term.)
-CREATE TABLE IF NOT EXISTS auditor_historic_ledger
-  (master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,purpose VARCHAR NOT NULL
-  ,timestamp INT8 NOT NULL
-  ,balance_val INT8 NOT NULL
-  ,balance_frac INT4 NOT NULL
-  );
-CREATE INDEX history_ledger_by_master_pub_and_time
-  ON auditor_historic_ledger
-  (master_pub
-  ,timestamp);
-
-COMMIT;
diff --git a/src/auditordb/Makefile.am b/src/auditordb/Makefile.am
index 92aabcd31..c0282e9c9 100644
--- a/src/auditordb/Makefile.am
+++ b/src/auditordb/Makefile.am
@@ -13,17 +13,41 @@ pkgcfg_DATA = \
 
 sqldir = $(prefix)/share/taler/sql/auditor/
 
+sqlinputs = \
+  0002-*.sql \
+  auditor-0002.sql.in \
+  auditor_do_*.sql \
+  procedures.sql.in
+
 sql_DATA = \
-  auditor-0000.sql \
+  versioning.sql \
   auditor-0001.sql \
-  drop0001.sql \
-  restart0001.sql
+  auditor-0002.sql \
+  drop.sql \
+  restart.sql \
+  procedures.sql
+
+CLEANFILES = \
+  auditor-0002.sql
+
+procedures.sql: procedures.sql.in auditor_do_*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < procedures.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
+
+auditor-0002.sql: auditor-0002.sql.in 0002-*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < auditor-0002.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
+
 
 EXTRA_DIST = \
   auditordb-postgres.conf \
   test-auditor-db-postgres.conf \
+  $(sqlinputs) \
   $(sql_DATA) \
-  9999.sql
+  pg_template.h pg_template.c \
+  pg_template.sh
 
 plugindir = $(libdir)/taler
 
@@ -33,17 +57,48 @@ plugin_LTLIBRARIES = \
 endif
 
 libtaler_plugin_auditordb_postgres_la_SOURCES = \
-  plugin_auditordb_postgres.c
-libtaler_plugin_auditordb_postgres_la_LIBADD = \
-  $(LTLIBINTL)
+  plugin_auditordb_postgres.c pg_helper.h \
+  pg_delete_deposit_confirmations.c pg_delete_deposit_confirmations.h \
+  pg_delete_pending_deposit.c pg_delete_pending_deposit.h \
+  pg_delete_purse_info.c pg_delete_purse_info.h \
+  pg_del_denomination_balance.h pg_del_denomination_balance.c \
+  pg_del_reserve_info.c pg_del_reserve_info.h \
+  pg_get_auditor_progress.c pg_get_auditor_progress.h \
+  pg_get_balance.c pg_get_balance.h \
+  pg_get_denomination_balance.c pg_get_denomination_balance.h \
+  pg_get_deposit_confirmations.c pg_get_deposit_confirmations.h \
+  pg_get_purse_info.c pg_get_purse_info.h \
+  pg_get_reserve_info.c pg_get_reserve_info.h \
+  pg_get_wire_fee_summary.c pg_get_wire_fee_summary.h \
+  pg_insert_auditor_progress.c pg_insert_auditor_progress.h \
+  pg_insert_balance.c pg_insert_balance.h \
+  pg_insert_denomination_balance.c pg_insert_denomination_balance.h \
+  pg_insert_deposit_confirmation.c pg_insert_deposit_confirmation.h \
+  pg_insert_exchange_signkey.c pg_insert_exchange_signkey.h \
+  pg_insert_historic_denom_revenue.c pg_insert_historic_denom_revenue.h \
+  pg_insert_historic_reserve_revenue.c pg_insert_historic_reserve_revenue.h \
+  pg_insert_pending_deposit.c pg_insert_pending_deposit.h \
+  pg_insert_purse_info.c pg_insert_purse_info.h \
+  pg_insert_reserve_info.c pg_insert_reserve_info.h \
+  pg_select_historic_denom_revenue.c pg_select_historic_denom_revenue.h \
+  pg_select_historic_reserve_revenue.c pg_select_historic_reserve_revenue.h \
+  pg_select_pending_deposits.c pg_select_pending_deposits.h \
+  pg_select_purse_expired.c pg_select_purse_expired.h \
+  pg_update_auditor_progress.c pg_update_auditor_progress.h \
+  pg_update_balance.c pg_update_balance.h \
+  pg_update_denomination_balance.c pg_update_denomination_balance.h \
+  pg_update_purse_info.c pg_update_purse_info.h \
+  pg_update_reserve_info.c pg_update_reserve_info.h \
+  pg_update_wire_fee_summary.c pg_update_wire_fee_summary.h
 libtaler_plugin_auditordb_postgres_la_LDFLAGS = \
-  $(TALER_PLUGIN_LDFLAGS) \
+  $(TALER_PLUGIN_LDFLAGS)
+libtaler_plugin_auditordb_postgres_la_LIBADD = \
+  $(LTLIBINTL) \
   $(top_builddir)/src/pq/libtalerpq.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lpq \
   -lgnunetpq \
   -lgnunetutil \
-  -lpthread \
+  -lpq \
   $(XLIB)
 
 lib_LTLIBRARIES = \
@@ -65,11 +120,22 @@ libtalerauditordb_la_LDFLAGS = \
 
 
 check_PROGRAMS = \
-  test-auditordb-postgres
+  test_auditordb_checkpoints-postgres \
+  test_auditordb-postgres
 
 AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
-  test-auditordb-postgres
+  test_auditordb_checkpoints-postgres \
+  test_auditordb-postgres
+
+test_auditordb_checkpoints_postgres_SOURCES = \
+  test_auditordb_checkpoints.c
+test_auditordb_checkpoints_postgres_LDADD = \
+  libtalerauditordb.la \
+  $(top_srcdir)/src/pq/libtalerpq.la \
+  $(top_srcdir)/src/util/libtalerutil.la \
+  -lgnunetutil  \
+  $(XLIB)
 
 test_auditordb_postgres_SOURCES = \
   test_auditordb.c
diff --git a/src/auditordb/auditor-0001.sql b/src/auditordb/auditor-0001.sql
index 0faa890d7..0b7823cec 100644
--- a/src/auditordb/auditor-0001.sql
+++ b/src/auditordb/auditor-0001.sql
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2014--2020 Taler Systems SA
+-- Copyright (C) 2014--2024 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
@@ -14,246 +14,283 @@
 -- TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 --
 
--- Everything in one big transaction
 BEGIN;
 
--- Check patch versioning is in place.
 SELECT _v.register_patch('auditor-0001', NULL, NULL);
 
-
-CREATE TABLE IF NOT EXISTS auditor_exchanges
-  (master_pub BYTEA PRIMARY KEY CHECK (LENGTH(master_pub)=32)
-  ,exchange_url VARCHAR NOT NULL
+CREATE SCHEMA auditor;
+COMMENT ON SCHEMA auditor IS 'taler-auditor data';
+
+SET search_path TO auditor;
+
+---------------------------------------------------------------------------
+--                   General procedures for DB setup
+---------------------------------------------------------------------------
+
+CREATE TABLE auditor_tables
+  (table_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY
+  ,name TEXT NOT NULL
+  ,version TEXT NOT NULL
+  ,action TEXT NOT NULL
+  ,partitioned BOOL NOT NULL
+  ,by_range BOOL NOT NULL
+  ,finished BOOL NOT NULL DEFAULT(FALSE));
+COMMENT ON TABLE auditor_tables
+  IS 'Tables of the auditor and their status';
+COMMENT ON COLUMN auditor_tables.name
+  IS 'Base name of the table (without partition/shard)';
+COMMENT ON COLUMN auditor_tables.version
+  IS 'Version of the DB in which the given action happened';
+COMMENT ON COLUMN auditor_tables.action
+  IS 'Action to take on the table (e.g. create, constrain, or foreign). Create is done for the master table and each partition; constrain is only for partitions or for master if there are no partitions; master only on master (takes no argument); foreign only on master if there are no partitions.';
+COMMENT ON COLUMN auditor_tables.partitioned
+  IS 'TRUE if the table is partitioned';
+COMMENT ON COLUMN auditor_tables.by_range
+  IS 'TRUE if the table is partitioned by range';
+COMMENT ON COLUMN auditor_tables.finished
+  IS 'TRUE if the respective migration has been run';
+
+
+CREATE FUNCTION create_partitioned_table(
+   IN table_definition TEXT -- SQL template for table creation
+  ,IN table_name TEXT -- base name of the table
+  ,IN main_table_partition_str TEXT -- declaration for how to partition the table
+  ,IN partition_suffix TEXT DEFAULT NULL -- NULL: no partitioning, 0: yes partitioning, no sharding, >0: sharding
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF (partition_suffix IS NULL)
+  THEN
+    -- no partitioning, disable option
+    main_table_partition_str = '';
+  ELSE
+    IF (partition_suffix::int > 0)
+    THEN
+      -- sharding, add shard name
+      table_name=table_name || '_' || partition_suffix;
+    END IF;
+  END IF;
+  EXECUTE FORMAT(
+    table_definition,
+    table_name,
+    main_table_partition_str
   );
-COMMENT ON TABLE auditor_exchanges
-  IS 'list of the exchanges we are auditing';
-
-
-CREATE TABLE IF NOT EXISTS auditor_exchange_signkeys
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,ep_start INT8 NOT NULL
-  ,ep_expire INT8 NOT NULL
-  ,ep_end INT8 NOT NULL
-  ,exchange_pub BYTEA NOT NULL CHECK (LENGTH(exchange_pub)=32)
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+END $$;
+
+COMMENT ON FUNCTION create_partitioned_table
+  IS 'Generic function to create a table that is partitioned or sharded.';
+
+
+CREATE FUNCTION comment_partitioned_table(
+   IN table_comment TEXT
+  ,IN table_name TEXT
+  ,IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF ( (partition_suffix IS NOT NULL) AND
+       (partition_suffix::int > 0) )
+  THEN
+    -- sharding, add shard name
+    table_name=table_name || '_' || partition_suffix;
+  END IF;
+  EXECUTE FORMAT(
+     'COMMENT ON TABLE %s IS %s'
+    ,table_name
+    ,quote_literal(table_comment)
   );
-COMMENT ON TABLE auditor_exchange_signkeys
-  IS 'list of the online signing keys of exchanges we are auditing';
-
-
-CREATE TABLE IF NOT EXISTS auditor_progress_reserve
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,last_reserve_in_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_reserve_out_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_reserve_recoup_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_reserve_close_serial_id INT8 NOT NULL DEFAULT 0
-  ,PRIMARY KEY (master_pub)
-  );
-COMMENT ON TABLE auditor_progress_reserve
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
-CREATE TABLE IF NOT EXISTS auditor_progress_aggregation
-  (master_pub BYTEA CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,last_wire_out_serial_id INT8 NOT NULL DEFAULT 0
-  ,PRIMARY KEY (master_pub)
-  );
-COMMENT ON TABLE auditor_progress_aggregation
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
-CREATE TABLE IF NOT EXISTS auditor_progress_deposit_confirmation
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,last_deposit_confirmation_serial_id INT8 NOT NULL DEFAULT 0
-  ,PRIMARY KEY (master_pub)
-  );
-COMMENT ON TABLE auditor_progress_deposit_confirmation
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
-CREATE TABLE IF NOT EXISTS auditor_progress_coin
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,last_withdraw_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_deposit_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_melt_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_refund_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_recoup_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_recoup_refresh_serial_id INT8 NOT NULL DEFAULT 0
-  ,PRIMARY KEY (master_pub)
-  );
-COMMENT ON TABLE auditor_progress_coin
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
-CREATE TABLE IF NOT EXISTS wire_auditor_account_progress
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,account_name TEXT NOT NULL
-  ,last_wire_reserve_in_serial_id INT8 NOT NULL DEFAULT 0
-  ,last_wire_wire_out_serial_id INT8 NOT NULL DEFAULT 0
-  ,wire_in_off INT8 NOT NULL
-  ,wire_out_off INT8 NOT NULL
-  ,PRIMARY KEY (master_pub,account_name)
-  );
-COMMENT ON TABLE wire_auditor_account_progress
-  IS 'information as to which transactions the auditor has processed in the exchange database.  Used for SELECTing the
- statements to process.  The indices include the last serial ID from the respective tables that we have processed. Thus, we need to select those table entries that are strictly larger (and process in monotonically increasing order).';
-
-
-CREATE TABLE IF NOT EXISTS wire_auditor_progress
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,last_timestamp INT8 NOT NULL
-  ,last_reserve_close_uuid INT8 NOT NULL
-  ,PRIMARY KEY (master_pub)
-  );
-
-
-CREATE TABLE IF NOT EXISTS auditor_reserves
-  (reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)
-  ,master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,reserve_balance_val INT8 NOT NULL
-  ,reserve_balance_frac INT4 NOT NULL
-  ,withdraw_fee_balance_val INT8 NOT NULL
-  ,withdraw_fee_balance_frac INT4 NOT NULL
-  ,expiration_date INT8 NOT NULL
-  ,auditor_reserves_rowid BIGSERIAL UNIQUE
-  ,origin_account TEXT
-  );
-COMMENT ON TABLE auditor_reserves
-  IS 'all of the customer reserves and their respective balances that the auditor is aware of';
-
-CREATE INDEX IF NOT EXISTS auditor_reserves_by_reserve_pub
-  ON auditor_reserves
-  (reserve_pub);
-
-
-CREATE TABLE IF NOT EXISTS auditor_reserve_balance
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,reserve_balance_val INT8 NOT NULL
-  ,reserve_balance_frac INT4 NOT NULL
-  ,withdraw_fee_balance_val INT8 NOT NULL
-  ,withdraw_fee_balance_frac INT4 NOT NULL
-  );
-COMMENT ON TABLE auditor_reserve_balance
-  IS 'sum of the balances of all customer reserves (by exchange master public key)';
-
-
-CREATE TABLE IF NOT EXISTS auditor_wire_fee_balance
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,wire_fee_balance_val INT8 NOT NULL
-  ,wire_fee_balance_frac INT4 NOT NULL
-  );
-COMMENT ON TABLE auditor_wire_fee_balance
-  IS 'sum of the balances of all wire fees (by exchange master public key)';
-
-
-CREATE TABLE IF NOT EXISTS auditor_denomination_pending
-  (denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)
-  ,denom_balance_val INT8 NOT NULL
-  ,denom_balance_frac INT4 NOT NULL
-  ,denom_loss_val INT8 NOT NULL
-  ,denom_loss_frac INT4 NOT NULL
-  ,num_issued INT8 NOT NULL
-  ,denom_risk_val INT8 NOT NULL
-  ,denom_risk_frac INT4 NOT NULL
-  ,recoup_loss_val INT8 NOT NULL
-  ,recoup_loss_frac INT4 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).';
-COMMENT ON COLUMN auditor_denomination_pending.num_issued
-  IS 'counts the number of coins issued (withdraw, refresh) of this denomination';
-COMMENT ON COLUMN auditor_denomination_pending.denom_risk_val
-  IS 'amount that could theoretically be lost in the future due to recoup operations';
-COMMENT ON COLUMN auditor_denomination_pending.recoup_loss_val
-  IS 'amount actually lost due to recoup operations past revocation';
-
-
-CREATE TABLE IF NOT EXISTS auditor_balance_summary
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,denom_balance_val INT8 NOT NULL
-  ,denom_balance_frac INT4 NOT NULL
-  ,deposit_fee_balance_val INT8 NOT NULL
-  ,deposit_fee_balance_frac INT4 NOT NULL
-  ,melt_fee_balance_val INT8 NOT NULL
-  ,melt_fee_balance_frac INT4 NOT NULL
-  ,refund_fee_balance_val INT8 NOT NULL
-  ,refund_fee_balance_frac INT4 NOT NULL
-  ,risk_val INT8 NOT NULL
-  ,risk_frac INT4 NOT NULL
-  ,loss_val INT8 NOT NULL
-  ,loss_frac INT4 NOT NULL
-  ,irregular_recoup_val INT8 NOT NULL
-  ,irregular_recoup_frac INT4 NOT NULL
-  );
-COMMENT ON TABLE auditor_balance_summary
-  IS 'the sum of the outstanding coins from auditor_denomination_pending (denom_pubs must belong to the respectives exchange master public key); it represents the auditor_balance_summary of the exchange at this point (modulo unexpected historic_loss-style events where denomination keys are compromised)';
-
-
-CREATE TABLE IF NOT EXISTS auditor_historic_denomination_revenue
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)
-  ,revenue_timestamp INT8 NOT NULL
-  ,revenue_balance_val INT8 NOT NULL
-  ,revenue_balance_frac INT4 NOT NULL
-  ,loss_balance_val INT8 NOT NULL
-  ,loss_balance_frac INT4 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.';
-COMMENT ON COLUMN auditor_historic_denomination_revenue.revenue_balance_val
-  IS 'the sum of all of the profits we made on the coin except for withdraw fees (which are in historic_reserve_revenue); so this includes the deposit, melt and refund fees';
-
-
-CREATE TABLE IF NOT EXISTS auditor_historic_reserve_summary
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,start_date INT8 NOT NULL
-  ,end_date INT8 NOT NULL
-  ,reserve_profits_val INT8 NOT NULL
-  ,reserve_profits_frac INT4 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).';
-
-CREATE INDEX IF NOT EXISTS auditor_historic_reserve_summary_by_master_pub_start_date
-  ON auditor_historic_reserve_summary
-  (master_pub
-  ,start_date);
-
-
-CREATE TABLE IF NOT EXISTS deposit_confirmations
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,serial_id BIGSERIAL NOT NULL UNIQUE
-  ,h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)
-  ,h_extensions BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=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
-  ,amount_without_fee_val INT8 NOT NULL
-  ,amount_without_fee_frac INT4 NOT NULL
-  ,coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)
-  ,merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)
-  ,exchange_sig BYTEA NOT NULL CHECK (LENGTH(exchange_sig)=64)
-  ,exchange_pub BYTEA NOT NULL CHECK (LENGTH(exchange_pub)=32)
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  ,PRIMARY KEY (h_contract_terms,h_wire,coin_pub,merchant_pub,exchange_sig,exchange_pub,master_sig)
-  );
-COMMENT ON TABLE deposit_confirmations
-  IS 'deposit confirmation sent to us by merchants; we must check that the exchange reported these properly.';
-
-
-CREATE TABLE IF NOT EXISTS auditor_predicted_result
-  (master_pub BYTEA NOT NULL CONSTRAINT master_pub_ref REFERENCES auditor_exchanges(master_pub) ON DELETE CASCADE
-  ,balance_val INT8 NOT NULL
-  ,balance_frac INT4 NOT NULL
+END $$;
+
+COMMENT ON FUNCTION comment_partitioned_table
+  IS 'Generic function to create a comment on table that is partitioned.';
+
+
+CREATE FUNCTION comment_partitioned_column(
+   IN table_comment TEXT
+  ,IN column_name TEXT
+  ,IN table_name TEXT
+  ,IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF ( (partition_suffix IS NOT NULL) AND
+       (partition_suffix::int > 0) )
+  THEN
+    -- sharding, add shard name
+    table_name=table_name || '_' || partition_suffix;
+  END IF;
+  EXECUTE FORMAT(
+     'COMMENT ON COLUMN %s.%s IS %s'
+    ,table_name
+    ,column_name
+    ,quote_literal(table_comment)
   );
-COMMENT ON TABLE auditor_predicted_result
-  IS 'Table with the sum of the ledger, auditor_historic_revenue and the auditor_reserve_balance.  This is the final amount that the exchange should have in its bank account right now.';
+END $$;
+
+COMMENT ON FUNCTION comment_partitioned_column
+  IS 'Generic function to create a comment on column of a table that is partitioned.';
+
+
+---------------------------------------------------------------------------
+--                   Main DB setup loop
+---------------------------------------------------------------------------
+
+CREATE FUNCTION do_create_tables(
+  num_partitions INTEGER
+-- NULL: no partitions, add foreign constraints
+-- 0: no partitions, no foreign constraints
+-- 1: only 1 default partition
+-- > 1: normal partitions
+)
+  RETURNS VOID
+  LANGUAGE plpgsql
+AS $$
+DECLARE
+  tc CURSOR FOR
+    SELECT table_serial_id
+          ,name
+          ,action
+          ,partitioned
+          ,by_range
+      FROM auditor.auditor_tables
+     WHERE NOT finished
+     ORDER BY table_serial_id ASC;
+BEGIN
+  FOR rec IN tc
+  LOOP
+    CASE rec.action
+    -- "create" actions apply to master and partitions
+    WHEN 'create'
+    THEN
+      IF (rec.partitioned AND
+          (num_partitions IS NOT NULL))
+      THEN
+        -- Create master table with partitioning.
+        EXECUTE FORMAT(
+          'SELECT auditor.%s_table_%s (%s)'::text
+          ,rec.action
+          ,rec.name
+          ,quote_literal('0')
+        );
+        IF (rec.by_range OR
+            (num_partitions = 0))
+        THEN
+          -- Create default partition.
+          IF (rec.by_range)
+          THEN
+            -- Range partition
+            EXECUTE FORMAT(
+              'CREATE TABLE auditor.%s_default'
+              ' PARTITION OF %s'
+              ' DEFAULT'
+             ,rec.name
+             ,rec.name
+            );
+          ELSE
+            -- Hash partition
+            EXECUTE FORMAT(
+              'CREATE TABLE auditor.%s_default'
+              ' PARTITION OF %s'
+              ' FOR VALUES WITH (MODULUS 1, REMAINDER 0)'
+             ,rec.name
+             ,rec.name
+            );
+          END IF;
+        ELSE
+          FOR i IN 1..num_partitions LOOP
+            -- Create num_partitions
+            EXECUTE FORMAT(
+               'CREATE TABLE auditor.%I'
+               ' PARTITION OF %I'
+               ' FOR VALUES WITH (MODULUS %s, REMAINDER %s)'
+              ,rec.name || '_' || i
+              ,rec.name
+              ,num_partitions
+              ,i-1
+            );
+          END LOOP;
+        END IF;
+      ELSE
+        -- Only create master table. No partitions.
+        EXECUTE FORMAT(
+          'SELECT auditor.%s_table_%s ()'::text
+          ,rec.action
+          ,rec.name
+        );
+      END IF;
+    -- Constrain action apply to master OR each partition
+    WHEN 'constrain'
+    THEN
+      ASSERT rec.partitioned, 'constrain action only applies to partitioned tables';
+      IF (num_partitions IS NULL)
+      THEN
+        -- Constrain master table
+        EXECUTE FORMAT(
+           'SELECT auditor.%s_table_%s (NULL)'::text
+          ,rec.action
+          ,rec.name
+        );
+      ELSE
+        IF ( (num_partitions = 0) OR
+             (rec.by_range) )
+        THEN
+          -- Constrain default table
+          EXECUTE FORMAT(
+             'SELECT auditor.%s_table_%s (%s)'::text
+            ,rec.action
+            ,rec.name
+            ,quote_literal('default')
+          );
+        ELSE
+          -- Constrain each partition
+          FOR i IN 1..num_partitions LOOP
+            EXECUTE FORMAT(
+              'SELECT auditor.%s_table_%s (%s)'::text
+              ,rec.action
+              ,rec.name
+              ,quote_literal(i)
+            );
+          END LOOP;
+        END IF;
+      END IF;
+    -- Foreign actions only apply if partitioning is off
+    WHEN 'foreign'
+    THEN
+      IF (num_partitions IS NULL)
+      THEN
+        -- Add foreign constraints
+        EXECUTE FORMAT(
+          'SELECT auditor.%s_table_%s (%s)'::text
+          ,rec.action
+          ,rec.name
+          ,NULL
+        );
+      END IF;
+    WHEN 'master'
+    THEN
+      EXECUTE FORMAT(
+        'SELECT auditor.%s_table_%s ()'::text
+        ,rec.action
+        ,rec.name
+      );
+    ELSE
+      ASSERT FALSE, 'unsupported action type: ' || rec.action;
+    END CASE;  -- END CASE (rec.action)
+    -- Mark as finished
+    UPDATE auditor.auditor_tables
+       SET finished=TRUE
+     WHERE table_serial_id=rec.table_serial_id;
+  END LOOP; -- create/alter/drop actions
+END $$;
+
+COMMENT ON FUNCTION do_create_tables
+  IS 'Creates all tables for the given number of partitions that need creating. Does NOT support sharding.';
 
 
--- Finally, commit everything
 COMMIT;
diff --git a/src/auditordb/auditor-0002.sql.in b/src/auditordb/auditor-0002.sql.in
new file mode 100644
index 000000000..ad459b472
--- /dev/null
+++ b/src/auditordb/auditor-0002.sql.in
@@ -0,0 +1,46 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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/>
+--
+
+BEGIN;
+
+SELECT _v.register_patch('auditor-0002', NULL, NULL);
+
+SET search_path TO auditor;
+
+DO $$ BEGIN
+    CREATE TYPE taler_amount
+      AS
+      (val INT8
+      ,frac INT4
+      );
+    COMMENT ON TYPE taler_amount
+      IS 'Stores an amount, fraction is in units of 1/100000000 of the base value';
+EXCEPTION
+    WHEN duplicate_object THEN null;
+END $$;
+
+#include "0002-auditor_amount_arithmetic_inconsistency.sql"
+#include "0002-auditor_balances.sql"
+#include "0002-auditor_denomination_pending.sql"
+#include "0002-auditor_exchange_signkeys.sql"
+#include "0002-auditor_historic_denomination_revenue.sql"
+#include "0002-auditor_historic_reserve_summary.sql"
+#include "0002-auditor_progress.sql"
+#include "0002-auditor_purses.sql"
+#include "0002-auditor_reserves.sql"
+#include "0002-auditor_deposit_confirmations.sql"
+
+COMMIT;
diff --git a/src/auditordb/auditor_do_get_auditor_progress.sql b/src/auditordb/auditor_do_get_auditor_progress.sql
new file mode 100644
index 000000000..9371cf67b
--- /dev/null
+++ b/src/auditordb/auditor_do_get_auditor_progress.sql
@@ -0,0 +1,38 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+-- @author Christian Grothoff
+
+CREATE OR REPLACE FUNCTION auditor_do_get_auditor_progress(
+  IN in_keys TEXT[])
+RETURNS INT8
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_key TEXT;
+  my_off INT8;
+BEGIN
+  FOREACH my_key IN ARRAY in_keys
+  LOOP
+    SELECT progress_offset
+      INTO my_off
+      FROM auditor_progress
+      WHERE progress_key=my_key;
+    RETURN my_off;
+  END LOOP;
+END $$;
+
+COMMENT ON FUNCTION auditor_do_get_auditor_progress(TEXT[])
+  IS 'Finds all progress offsets associated with the array of keys given as the argument and returns them in order';
diff --git a/src/auditordb/auditor_do_get_balance.sql b/src/auditordb/auditor_do_get_balance.sql
new file mode 100644
index 000000000..782a31f89
--- /dev/null
+++ b/src/auditordb/auditor_do_get_balance.sql
@@ -0,0 +1,47 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+-- @author Christian Grothoff
+
+CREATE OR REPLACE FUNCTION auditor_do_get_balance(
+  IN in_keys TEXT[])
+RETURNS taler_amount
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_key TEXT;
+  my_rec RECORD;
+  my_val taler_amount;
+BEGIN
+  FOREACH my_key IN ARRAY in_keys
+  LOOP
+    SELECT (ab.balance_value).val
+          ,(ab.balance_value).frac
+      INTO my_rec
+      FROM auditor_balances ab
+      WHERE balance_key=my_key;
+    IF FOUND
+    THEN
+        my_val.val = my_rec.val;
+        my_val.frac = my_rec.frac;
+        RETURN my_val;
+    ELSE
+        RETURN NULL;
+    END IF;
+  END LOOP;
+END $$;
+
+COMMENT ON FUNCTION auditor_do_get_balance(TEXT[])
+  IS 'Finds all balances associated with the array of keys given as the argument and returns them in order';
diff --git a/src/auditordb/drop.sql b/src/auditordb/drop.sql
new file mode 100644
index 000000000..4bae66103
--- /dev/null
+++ b/src/auditordb/drop.sql
@@ -0,0 +1,31 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2020 Taler Systems SA
+--
+-- TALER is free software; you can redistribute it and/or modify it under the
+-- terms of the GNU General Public License as published by the Free Software
+-- 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/>
+--
+
+-- Everything in one big transaction
+BEGIN;
+
+WITH xpatches AS (
+  SELECT patch_name
+  FROM _v.patches
+  WHERE starts_with(patch_name,'auditor-')
+)
+  SELECT _v.unregister_patch(xpatches.patch_name)
+  FROM xpatches;
+
+DROP SCHEMA auditor CASCADE;
+
+-- And we're out of here...
+COMMIT;
diff --git a/src/auditordb/drop0001.sql b/src/auditordb/drop0001.sql
deleted file mode 100644
index 8e42c8094..000000000
--- a/src/auditordb/drop0001.sql
+++ /dev/null
@@ -1,50 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2020 Taler Systems SA
---
--- TALER is free software; you can redistribute it and/or modify it under the
--- terms of the GNU General Public License as published by the Free Software
--- 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
--- This script DROPs all of the tables we create, including the
--- versioning schema!
---
--- Unlike the other SQL files, it SHOULD be updated to reflect the
--- latest requirements for dropping tables.
-
--- Drops for 0001.sql
-DROP TABLE IF EXISTS auditor_predicted_result;
-DROP TABLE IF EXISTS auditor_historic_denomination_revenue;
-DROP TABLE IF EXISTS auditor_balance_summary;
-DROP TABLE IF EXISTS auditor_denomination_pending;
-DROP TABLE IF EXISTS auditor_reserve_balance;
-DROP TABLE IF EXISTS auditor_wire_fee_balance;
-DROP TABLE IF EXISTS auditor_reserves;
-DROP TABLE IF EXISTS auditor_progress_reserve;
-DROP TABLE IF EXISTS auditor_progress_aggregation;
-DROP TABLE IF EXISTS auditor_progress_deposit_confirmation;
-DROP TABLE IF EXISTS auditor_progress_coin;
-DROP TABLE IF EXISTS auditor_exchange_signkeys;
-DROP TABLE IF EXISTS wire_auditor_progress;
-DROP TABLE IF EXISTS wire_auditor_account_progress;
-DROP TABLE IF EXISTS auditor_historic_reserve_summary CASCADE;
-DROP TABLE IF EXISTS auditor_denominations CASCADE;
-DROP TABLE IF EXISTS deposit_confirmations CASCADE;
-DROP TABLE IF EXISTS auditor_exchanges CASCADE;
-
--- Drop versioning (auditor-0001.sql)
-SELECT _v.unregister_patch('auditor-0001');
-
--- And we're out of here...
-COMMIT;
diff --git a/src/auditordb/hdr.h b/src/auditordb/hdr.h
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/auditordb/hdr.h
diff --git a/src/auditordb/pg_del_denomination_balance.c b/src/auditordb/pg_del_denomination_balance.c
new file mode 100644
index 000000000..154dc50bb
--- /dev/null
+++ b/src/auditordb/pg_del_denomination_balance.c
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_del_denomination_balance.c
+ * @brief Implementation of the del_denomination_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_del_denomination_balance.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_del_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_del_denomination_balance",
+           "DELETE"
+           " FROM auditor_denomination_pending"
+           " WHERE denom_pub_hash=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_del_denomination_balance",
+                                             params);
+}
diff --git a/src/auditordb/pg_del_denomination_balance.h b/src/auditordb/pg_del_denomination_balance.h
new file mode 100644
index 000000000..56e9232b0
--- /dev/null
+++ b/src/auditordb/pg_del_denomination_balance.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_del_denomination_balance.h
+ * @brief implementation of the del_denomination_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DEL_DENOMINATION_BALANCE_H
+#define PG_DEL_DENOMINATION_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Delete information about a denomination key's balances.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the denomination public key
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_del_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash);
+
+#endif
diff --git a/src/auditordb/pg_del_reserve_info.c b/src/auditordb/pg_del_reserve_info.c
new file mode 100644
index 000000000..619bd0afa
--- /dev/null
+++ b/src/auditordb/pg_del_reserve_info.c
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_del_reserve_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_del_reserve_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_del_reserve_info (void *cls,
+                         const struct TALER_ReservePublicKeyP *reserve_pub)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_del_reserve_info",
+           "DELETE"
+           " FROM auditor_reserves"
+           " WHERE reserve_pub=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_del_reserve_info",
+                                             params);
+}
diff --git a/src/auditordb/pg_del_reserve_info.h b/src/auditordb/pg_del_reserve_info.h
new file mode 100644
index 000000000..88a10bcfd
--- /dev/null
+++ b/src/auditordb/pg_del_reserve_info.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_del_reserve_info.h
+ * @brief implementation of the del_reserve_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_DEL_RESERVE_INFO_H
+#define PG_DEL_RESERVE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Delete information about a reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_del_reserve_info (void *cls,
+                         const struct TALER_ReservePublicKeyP *reserve_pub);
+
+
+#endif
diff --git a/src/auditordb/pg_delete_deposit_confirmations.c b/src/auditordb/pg_delete_deposit_confirmations.c
new file mode 100644
index 000000000..6cb76d4e9
--- /dev/null
+++ b/src/auditordb/pg_delete_deposit_confirmations.c
@@ -0,0 +1,47 @@
+/*

+   This file is part of TALER

+   Copyright (C) 2024 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/>

+ */

+/**

+ * @file auditordb/pg_delete_deposit_confirmations.c

+ * @brief Implementation of the delete_deposit_confirmations function for Postgres

+ * @author Nicola Eigel

+ */

+#include "platform.h"

+#include "taler_error_codes.h"

+#include "taler_dbevents.h"

+#include "taler_pq_lib.h"

+#include "pg_delete_deposit_confirmations.h"

+#include "pg_helper.h"

+

+enum GNUNET_DB_QueryStatus

+TAH_PG_delete_deposit_confirmation (

+  void *cls,

+  uint64_t row_id)

+{

+  struct PostgresClosure *pg = cls;

+  struct GNUNET_PQ_QueryParam params[] = {

+    GNUNET_PQ_query_param_uint64 (&row_id),

+    GNUNET_PQ_query_param_end

+  };

+

+  PREPARE (pg,

+           "auditor_delete_deposit_confirmation",

+           "DELETE"

+           " FROM deposit_confirmations"

+           " WHERE deposit_confirmation_serial_id=$1;");

+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,

+                                             "auditor_delete_deposit_confirmation",

+                                             params);

+}

diff --git a/src/auditordb/pg_delete_deposit_confirmations.h b/src/auditordb/pg_delete_deposit_confirmations.h
new file mode 100644
index 000000000..5f7700ba1
--- /dev/null
+++ b/src/auditordb/pg_delete_deposit_confirmations.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_delete_deposit_confirmations.h
+ * @brief implementation of the delete_deposit_confirmation function for Postgres
+ * @author Nicola Eigel
+ */
+#ifndef PG_DELETE_DEPOSIT_CONFIRMATIONS_H
+#define PG_DELETE_DEPOSIT_CONFIRMATIONS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Delete a row from the deposit confirmations table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param row_id row to delete
+ * @return query transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_delete_deposit_confirmation (
+  void *cls,
+  uint64_t row_id);
+
+
+#endif
diff --git a/src/auditordb/pg_delete_pending_deposit.c b/src/auditordb/pg_delete_pending_deposit.c
new file mode 100644
index 000000000..29814e84b
--- /dev/null
+++ b/src/auditordb/pg_delete_pending_deposit.c
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_delete_pending_deposit.c
+ * @brief Implementation of the delete_pending_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_delete_pending_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_delete_pending_deposit (
+  void *cls,
+  uint64_t batch_deposit_serial_id)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&batch_deposit_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_delete_pending_deposit",
+           "DELETE"
+           " FROM auditor_pending_deposits"
+           " WHERE batch_deposit_serial_id=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_delete_pending_deposit",
+                                             params);
+}
diff --git a/src/auditordb/pg_delete_pending_deposit.h b/src/auditordb/pg_delete_pending_deposit.h
new file mode 100644
index 000000000..8e7159eac
--- /dev/null
+++ b/src/auditordb/pg_delete_pending_deposit.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_delete_pending_deposit.h
+ * @brief implementation of the delete_pending_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DELETE_PENDING_DEPOSIT_H
+#define PG_DELETE_PENDING_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Delete a row from the pending deposit table.
+ * Usually done when the respective wire transfer
+ * was finally detected.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param batch_deposit_serial_id which entry to delete
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_delete_pending_deposit (
+  void *cls,
+  uint64_t batch_deposit_serial_id);
+
+
+#endif
diff --git a/src/auditordb/pg_delete_purse_info.c b/src/auditordb/pg_delete_purse_info.c
new file mode 100644
index 000000000..8fa77ba46
--- /dev/null
+++ b/src/auditordb/pg_delete_purse_info.c
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_delete_purse_info.c
+ * @brief Implementation of the delete_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_delete_purse_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_delete_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_purses_delete",
+           "DELETE FROM auditor_purses "
+           " WHERE purse_pub=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_purses_delete",
+                                             params);
+}
diff --git a/src/auditordb/pg_delete_purse_info.h b/src/auditordb/pg_delete_purse_info.h
new file mode 100644
index 000000000..88393f9b8
--- /dev/null
+++ b/src/auditordb/pg_delete_purse_info.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_delete_purse_info.h
+ * @brief implementation of the delete_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DELETE_PURSE_INFO_H
+#define PG_DELETE_PURSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Delete information about a purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the reserve
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_delete_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub);
+
+
+#endif
diff --git a/src/auditordb/pg_get_auditor_progress.c b/src/auditordb/pg_get_auditor_progress.c
new file mode 100644
index 000000000..3742d2eb6
--- /dev/null
+++ b/src/auditordb/pg_get_auditor_progress.c
@@ -0,0 +1,178 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_get_auditor_progress.c
+ * @brief Implementation of get_auditor_progress function
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_auditor_progress.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #auditor_progress_cb().
+ */
+struct AuditorProgressContext
+{
+
+  /**
+   * Where to store results.
+   */
+  uint64_t **dst;
+
+  /**
+   * Offset in @e dst.
+   */
+  unsigned int off;
+
+  /**
+   * Length of array at @e dst.
+   */
+  unsigned int len;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to true on failure.
+   */
+  bool failure;
+};
+
+
+/**
+ * Helper function for #TAH_PG_get_auditor_progress().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct AuditorProgressContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+auditor_progress_cb (void *cls,
+                     PGresult *result,
+                     unsigned int num_results)
+{
+  struct AuditorProgressContext *ctx = cls;
+
+  GNUNET_assert (num_results <= ctx->len);
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    bool is_missing = false;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 ("progress_offset",
+                                      ctx->dst[i]),
+        &is_missing),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->failure = true;
+      return;
+    }
+    if (is_missing)
+      *ctx->dst[i] = 0;
+    ctx->off++;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_auditor_progress (void *cls,
+                             const char *progress_key,
+                             uint64_t *progress_offset,
+                             ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            progress_offset);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   uint64_t *);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    uint64_t *dsts[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    struct AuditorProgressContext ctx = {
+      .dst = dsts,
+      .len = cnt,
+      .pg = pg
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = progress_key;
+    dsts[0] = progress_offset;
+
+    va_start (ap,
+              progress_offset);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      dsts[off] = va_arg (ap,
+                          uint64_t *);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "get_auditor_progress",
+             "SELECT"
+             " auditor_do_get_auditor_progress AS progress_offset"
+             " FROM auditor_do_get_auditor_progress "
+             "($1);");
+    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "get_auditor_progress",
+                                               params,
+                                               &auditor_progress_cb,
+                                               &ctx);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    if (ctx.failure)
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    if (qs < 0)
+      return qs;
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_get_auditor_progress.h b/src/auditordb/pg_get_auditor_progress.h
new file mode 100644
index 000000000..fee7a4424
--- /dev/null
+++ b/src/auditordb/pg_get_auditor_progress.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_get_auditor_progress.h
+ * @brief implementation of the get_auditor_progress function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_AUDITOR_PROGRESS_H
+#define PG_GET_AUDITOR_PROGRESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about the progress of the auditor.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param progress_key name of the progress indicator
+ * @param[out] progress_offset set to offset until which we have made progress
+ * @param ... NULL terminated list of additional key-value pairs to fetch
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_auditor_progress (void *cls,
+                             const char *progress_key,
+                             uint64_t *progress_offset,
+                             ...);
+
+#endif
diff --git a/src/auditordb/pg_get_balance.c b/src/auditordb/pg_get_balance.c
new file mode 100644
index 000000000..4edc1c89f
--- /dev/null
+++ b/src/auditordb/pg_get_balance.c
@@ -0,0 +1,183 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_get_balance.c
+ * @brief Implementation of the get_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_balance.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #balance_cb().
+ */
+struct BalanceContext
+{
+
+  /**
+   * Where to store results.
+   */
+  struct TALER_Amount **dst;
+
+  /**
+   * Offset in @e dst.
+   */
+  unsigned int off;
+
+  /**
+   * Length of array at @e dst.
+   */
+  unsigned int len;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to true on failure.
+   */
+  bool failure;
+};
+
+
+/**
+ * Helper function for #TAH_PG_get_balance().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct BalanceContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+balance_cb (void *cls,
+            PGresult *result,
+            unsigned int num_results)
+{
+  struct BalanceContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  GNUNET_assert (num_results <= ctx->len);
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    bool is_missing = false;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_allow_null (
+        TALER_PQ_result_spec_amount ("balance",
+                                     pg->currency,
+                                     ctx->dst[i]),
+        &is_missing),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->failure = true;
+      return;
+    }
+    if (is_missing)
+      memset (ctx->dst[i],
+              0,
+              sizeof (struct TALER_Amount));
+    ctx->off++;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_balance (void *cls,
+                    const char *balance_key,
+                    struct TALER_Amount *balance_value,
+                    ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            balance_value);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   struct TALER_Amount *);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    struct TALER_Amount *dsts[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    struct BalanceContext ctx = {
+      .dst = dsts,
+      .len = cnt,
+      .pg = pg
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = balance_key;
+    dsts[0] = balance_value;
+
+    va_start (ap,
+              balance_value);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      dsts[off] = va_arg (ap,
+                          struct TALER_Amount *);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "get_balance",
+             "SELECT "
+             " auditor_do_get_balance AS balance"
+             " FROM auditor_do_get_balance "
+             "($1);");
+    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "get_balance",
+                                               params,
+                                               &balance_cb,
+                                               &ctx);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    if (ctx.failure)
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    if (qs < 0)
+      return qs;
+    GNUNET_assert (qs == ctx.off);
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_get_balance.h b/src/auditordb/pg_get_balance.h
new file mode 100644
index 000000000..59d2af0ae
--- /dev/null
+++ b/src/auditordb/pg_get_balance.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_get_balance.h
+ * @brief implementation of the get_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_BALANCE_H
+#define PG_GET_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get summary information about balance tracked by the auditor.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param balance_key key of the balance to store
+ * @param[out] balance_value set to amount stored under @a balance_key
+ * @param ... NULL terminated list of additional key-value pairs to fetch
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_balance (void *cls,
+                    const char *balance_key,
+                    struct TALER_Amount *balance_value,
+                    ...);
+
+#endif
diff --git a/src/auditordb/pg_get_denomination_balance.c b/src/auditordb/pg_get_denomination_balance.c
new file mode 100644
index 000000000..40af766cd
--- /dev/null
+++ b/src/auditordb/pg_get_denomination_balance.c
@@ -0,0 +1,68 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_denomination_balance.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_denomination_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_AUDITORDB_DenominationCirculationData *dcd)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_balance",
+                                 &dcd->denom_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_loss",
+                                 &dcd->denom_loss),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_risk",
+                                 &dcd->denom_risk),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("recoup_loss",
+                                 &dcd->recoup_loss),
+    GNUNET_PQ_result_spec_uint64 ("num_issued",
+                                  &dcd->num_issued),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "auditor_denomination_pending_select",
+           "SELECT"
+           " denom_balance"
+           ",denom_loss"
+           ",num_issued"
+           ",denom_risk"
+           ",recoup_loss"
+           " FROM auditor_denomination_pending"
+           " WHERE denom_pub_hash=$1");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "auditor_denomination_pending_select",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/auditordb/pg_get_denomination_balance.h b/src/auditordb/pg_get_denomination_balance.h
new file mode 100644
index 000000000..31f377066
--- /dev/null
+++ b/src/auditordb/pg_get_denomination_balance.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_denomination_balance.h
+ * @brief implementation of the get_denomination_balance function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_DENOMINATION_BALANCE_H
+#define PG_GET_DENOMINATION_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about a denomination key's balances.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the denomination public key
+ * @param[out] dcd circulation data to initialize
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_AUDITORDB_DenominationCirculationData *dcd);
+
+#endif
diff --git a/src/auditordb/pg_get_deposit_confirmations.c b/src/auditordb/pg_get_deposit_confirmations.c
new file mode 100644
index 000000000..b8055a296
--- /dev/null
+++ b/src/auditordb/pg_get_deposit_confirmations.c
@@ -0,0 +1,199 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file pg_get_deposit_confirmations.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_deposit_confirmations.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #deposit_confirmation_cb().
+ */
+struct DepositConfirmationContext
+{
+
+  /**
+   * Function to call for each deposit confirmation.
+   */
+  TALER_AUDITORDB_DepositConfirmationCallback cb;
+
+  /**
+   * Closure for @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Query status to return.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Helper function for #TAH_PG_get_deposit_confirmations().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct DepositConfirmationContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+deposit_confirmation_cb (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct DepositConfirmationContext *dcc = cls;
+  struct PostgresClosure *pg = dcc->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    uint64_t serial_id;
+    struct TALER_AUDITORDB_DepositConfirmation dc = { 0};
+    struct TALER_CoinSpendPublicKeyP *coin_pubs = NULL;
+    struct TALER_CoinSpendSignatureP *coin_sigs = NULL;
+    size_t num_pubs = 0;
+    size_t num_sigs = 0;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial_id",
+                                    &serial_id),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &dc.h_contract_terms),
+      GNUNET_PQ_result_spec_auto_from_type ("h_policy",
+                                            &dc.h_policy),
+      GNUNET_PQ_result_spec_auto_from_type ("h_wire",
+                                            &dc.h_wire),
+      GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
+                                       &dc.exchange_timestamp),
+      GNUNET_PQ_result_spec_timestamp ("refund_deadline",
+                                       &dc.refund_deadline),
+      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
+                                       &dc.wire_deadline),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("total_without_fee",
+                                   &dc.total_without_fee),
+      GNUNET_PQ_result_spec_auto_array_from_type (pg->conn,
+                                                  "coin_pubs",
+                                                  &num_pubs,
+                                                  coin_pubs),
+      GNUNET_PQ_result_spec_auto_array_from_type (pg->conn,
+                                                  "coin_sigs",
+                                                  &num_sigs,
+                                                  coin_sigs),
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                            &dc.merchant),
+      GNUNET_PQ_result_spec_auto_from_type ("exchange_sig",
+                                            &dc.exchange_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
+                                            &dc.exchange_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &dc.master_sig),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue rval;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    if (num_sigs != num_pubs)
+    {
+      GNUNET_break (0);
+      dcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      GNUNET_PQ_cleanup_result (rs);
+      return;
+    }
+    dcc->qs = i + 1;
+    dc.coin_pubs = coin_pubs;
+    dc.coin_sigs = coin_sigs;
+    dc.num_coins = num_sigs;
+    rval = dcc->cb (dcc->cb_cls,
+                    serial_id,
+                    &dc);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != rval)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_deposit_confirmations (
+  void *cls,
+  uint64_t start_id,
+  bool return_suppressed,
+  TALER_AUDITORDB_DepositConfirmationCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&start_id),
+    GNUNET_PQ_query_param_bool (return_suppressed),
+    GNUNET_PQ_query_param_end
+  };
+  struct DepositConfirmationContext dcc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "auditor_deposit_confirmation_select",
+           "SELECT"
+           " deposit_confirmation_serial_id"
+           ",h_contract_terms"
+           ",h_policy"
+           ",h_wire"
+           ",exchange_timestamp"
+           ",wire_deadline"
+           ",refund_deadline"
+           ",total_without_fee"
+           ",coin_pubs"
+           ",coin_sigs"
+           ",merchant_pub"
+           ",exchange_sig"
+           ",exchange_pub"
+           ",master_sig"
+           " FROM auditor_deposit_confirmations"
+           " WHERE deposit_confirmation_serial_id>$1"
+           " AND ($2 OR NOT suppressed);");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "auditor_deposit_confirmation_select",
+                                             params,
+                                             &deposit_confirmation_cb,
+                                             &dcc);
+  if (qs > 0)
+    return dcc.qs;
+  GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
+  return qs;
+}
diff --git a/src/auditordb/pg_get_deposit_confirmations.h b/src/auditordb/pg_get_deposit_confirmations.h
new file mode 100644
index 000000000..6b33e9e6f
--- /dev/null
+++ b/src/auditordb/pg_get_deposit_confirmations.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_deposit_confirmations.h
+ * @brief implementation of the get_deposit_confirmations function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_DEPOSIT_CONFIRMATIONS_H
+#define PG_GET_DEPOSIT_CONFIRMATIONS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about deposit confirmations from the database.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param start_id row/serial ID where to start the iteration (0 from
+ *                  the start, exclusive, i.e. serial_ids must start from 1)
+ * @param return_suppressed should suppressed rows be returned anyway?
+ * @param cb function to call with results
+ * @param cb_cls closure for @a cb
+ * @return query result status
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_deposit_confirmations (
+  void *cls,
+  uint64_t start_id,
+  bool return_suppressed,
+  TALER_AUDITORDB_DepositConfirmationCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/auditordb/pg_get_purse_info.c b/src/auditordb/pg_get_purse_info.c
new file mode 100644
index 000000000..6a0faf616
--- /dev/null
+++ b/src/auditordb/pg_get_purse_info.c
@@ -0,0 +1,62 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_get_purse_info.c
+ * @brief Implementation of the get_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_purse_info.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  uint64_t *rowid,
+  struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp *expiration_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                 balance),
+    GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                     expiration_date),
+    GNUNET_PQ_result_spec_uint64 ("auditor_purses_rowid",
+                                  rowid),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "auditor_get_purse_info",
+           "SELECT"
+           " expiration_date"
+           ",balance"
+           " FROM auditor_purses"
+           " WHERE purse_pub=$1");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "auditor_get_purse_info",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/auditordb/pg_get_purse_info.h b/src/auditordb/pg_get_purse_info.h
new file mode 100644
index 000000000..e8268282e
--- /dev/null
+++ b/src/auditordb/pg_get_purse_info.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_get_purse_info.h
+ * @brief implementation of the get_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_PURSE_INFO_H
+#define PG_GET_PURSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about a purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the purse
+ * @param[out] rowid which row did we get the information from
+ * @param[out] balance set to balance of the purse
+ * @param[out] expiration_date expiration date of the purse
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  uint64_t *rowid,
+  struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp *expiration_date);
+
+#endif
diff --git a/src/auditordb/pg_get_reserve_info.c b/src/auditordb/pg_get_reserve_info.c
new file mode 100644
index 000000000..f16c6d995
--- /dev/null
+++ b/src/auditordb/pg_get_reserve_info.c
@@ -0,0 +1,88 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_reserve_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_reserve_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_reserve_info (void *cls,
+                         const struct TALER_ReservePublicKeyP *reserve_pub,
+                         uint64_t *rowid,
+                         struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+                         struct GNUNET_TIME_Timestamp *expiration_date,
+                         char **sender_account)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_balance",
+                                 &rfb->reserve_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_loss",
+                                 &rfb->reserve_loss),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("withdraw_fee_balance",
+                                 &rfb->withdraw_fee_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("close_fee_balance",
+                                 &rfb->close_fee_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee_balance",
+                                 &rfb->purse_fee_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("open_fee_balance",
+                                 &rfb->open_fee_balance),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee_balance",
+                                 &rfb->history_fee_balance),
+    GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                     expiration_date),
+    GNUNET_PQ_result_spec_uint64 ("auditor_reserves_rowid",
+                                  rowid),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("origin_account",
+                                    sender_account),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *sender_account = NULL;
+  PREPARE (pg,
+           "auditor_get_reserve_info",
+           "SELECT"
+           " reserve_balance"
+           ",reserve_loss"
+           ",withdraw_fee_balance"
+           ",close_fee_balance"
+           ",purse_fee_balance"
+           ",open_fee_balance"
+           ",history_fee_balance"
+           ",expiration_date"
+           ",auditor_reserves_rowid"
+           ",origin_account"
+           " FROM auditor_reserves"
+           " WHERE reserve_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "auditor_get_reserve_info",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/auditordb/pg_get_reserve_info.h b/src/auditordb/pg_get_reserve_info.h
new file mode 100644
index 000000000..3eba035fc
--- /dev/null
+++ b/src/auditordb/pg_get_reserve_info.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_reserve_info.h
+ * @brief implementation of the get_reserve_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_RESERVE_INFO_H
+#define PG_GET_RESERVE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about a reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param[out] rowid which row did we get the information from
+ * @param[out] rfb where to store the reserve balance summary
+ * @param[out] expiration_date expiration date of the reserve
+ * @param[out] sender_account from where did the money in the reserve originally come from
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_reserve_info (void *cls,
+                         const struct TALER_ReservePublicKeyP *reserve_pub,
+                         uint64_t *rowid,
+                         struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+                         struct GNUNET_TIME_Timestamp *expiration_date,
+                         char **sender_account);
+
+
+#endif
diff --git a/src/auditordb/pg_get_wire_fee_summary.c b/src/auditordb/pg_get_wire_fee_summary.c
new file mode 100644
index 000000000..b0eb9ba50
--- /dev/null
+++ b/src/auditordb/pg_get_wire_fee_summary.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_wire_fee_summary.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_wire_fee_summary.h"
+#include "pg_helper.h"
+
+
+/**
+ * Get summary information about an exchanges wire fee balance.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param[out] wire_fee_balance set amount the exchange gained in wire fees
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_wire_fee_summary (void *cls,
+                             struct TALER_Amount *wire_fee_balance)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee_balance",
+                                 wire_fee_balance),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "auditor_wire_fee_balance_select",
+           "SELECT"
+           " wire_fee_balance"
+           " FROM auditor_wire_fee_balance");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "auditor_wire_fee_balance_select",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/auditordb/pg_get_wire_fee_summary.h b/src/auditordb/pg_get_wire_fee_summary.h
new file mode 100644
index 000000000..4c7f1aebd
--- /dev/null
+++ b/src/auditordb/pg_get_wire_fee_summary.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_wire_fee_summary.h
+ * @brief implementation of the get_wire_fee_summary function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_WIRE_FEE_SUMMARY_H
+#define PG_GET_WIRE_FEE_SUMMARY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get summary information about an exchanges wire fee balance.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param[out] wire_fee_balance set amount the exchange gained in wire fees
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_get_wire_fee_summary (void *cls,
+                             struct TALER_Amount *wire_fee_balance);
+
+
+#endif
diff --git a/src/auditordb/pg_helper.h b/src/auditordb/pg_helper.h
new file mode 100644
index 000000000..54ccd5978
--- /dev/null
+++ b/src/auditordb/pg_helper.h
@@ -0,0 +1,119 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_helper.h
+ * @brief shared internal definitions for postgres DB plugin
+ * @author Christian Grothoff
+ */
+#ifndef PG_HELPER_H
+#define PG_HELPER_H
+
+
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Type of the "cls" argument given to each of the functions in
+ * our API.
+ */
+struct PostgresClosure
+{
+
+  /**
+   * Postgres connection handle.
+   */
+  struct GNUNET_PQ_Context *conn;
+
+  /**
+   * Name of the ongoing transaction, used to debug cases where
+   * a transaction is not properly terminated via COMMIT or
+   * ROLLBACK.
+   */
+  const char *transaction_name;
+
+  /**
+   * Our configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * How often have we connected to the DB so far?
+   */
+  unsigned long long prep_gen;
+
+  /**
+   * Which currency should we assume all amounts to be in?
+   */
+  char *currency;
+};
+
+
+/**
+ * Prepares SQL statement @a sql under @a name for
+ * connection @a pg once.
+ * Returns with #GNUNET_DB_STATUS_HARD_ERROR on failure.
+ *
+ * @param pg a `struct PostgresClosure`
+ * @param name name to prepare the statement under
+ * @param sql actual SQL text
+ */
+#define PREPARE(pg,name,sql)                      \
+  do {                                            \
+    static struct {                               \
+      unsigned long long cnt;                     \
+      struct PostgresClosure *pg;                 \
+    } preps[2]; /* 2 ctrs for taler-auditor-sync*/ \
+    unsigned int off = 0;                         \
+                                                  \
+    while ( (NULL != preps[off].pg) &&            \
+            (pg != preps[off].pg) &&              \
+            (off < sizeof(preps) / sizeof(*preps)) ) \
+    off++;                                      \
+    GNUNET_assert (off <                          \
+                   sizeof(preps) / sizeof(*preps)); \
+    if (preps[off].cnt < pg->prep_gen)            \
+    {                                             \
+      struct GNUNET_PQ_PreparedStatement ps[] = { \
+        GNUNET_PQ_make_prepare (name, sql),       \
+        GNUNET_PQ_PREPARED_STATEMENT_END          \
+      };                                          \
+                                                  \
+      if (GNUNET_OK !=                            \
+          GNUNET_PQ_prepare_statements (pg->conn, \
+                                        ps))      \
+      {                                           \
+        GNUNET_break (0);                         \
+        return GNUNET_DB_STATUS_HARD_ERROR;       \
+      }                                           \
+      preps[off].pg = pg;                         \
+      preps[off].cnt = pg->prep_gen;              \
+    }                                             \
+  } while (0)
+
+
+/**
+ * Wrapper macro to add the currency from the plugin's state
+ * when fetching amounts from the database.
+ *
+ * @param field name of the database field to fetch amount from
+ * @param[out] amountp pointer to amount to set
+ */
+#define TALER_PQ_RESULT_SPEC_AMOUNT(field, \
+                                    amountp) TALER_PQ_result_spec_amount ( \
+    field,pg->currency,amountp)
+
+
+#endif
diff --git a/src/auditordb/pg_insert_auditor_progress.c b/src/auditordb/pg_insert_auditor_progress.c
new file mode 100644
index 000000000..3c5d25eef
--- /dev/null
+++ b/src/auditordb/pg_insert_auditor_progress.c
@@ -0,0 +1,97 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_insert_auditor_progress.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_auditor_progress.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_auditor_progress (
+  void *cls,
+  const char *progress_key,
+  uint64_t progress_offset,
+  ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            progress_offset);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   uint64_t);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    uint64_t offsets[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      GNUNET_PQ_query_param_array_uint64 (cnt,
+                                          offsets,
+                                          pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = progress_key;
+    offsets[0] = progress_offset;
+
+    va_start (ap,
+              progress_offset);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      offsets[off] = va_arg (ap,
+                             uint64_t);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "auditor_progress_insert",
+             "INSERT INTO auditor_progress "
+             "(progress_key"
+             ",progress_offset"
+             ") SELECT *"
+             " FROM UNNEST (CAST($1 AS TEXT[]),"
+             "              CAST($2 AS INT8[]))"
+             " ON CONFLICT DO NOTHING;");
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_progress_insert",
+                                             params);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_insert_auditor_progress.h b/src/auditordb/pg_insert_auditor_progress.h
new file mode 100644
index 000000000..a20e376c8
--- /dev/null
+++ b/src/auditordb/pg_insert_auditor_progress.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_auditor_progress.h
+ * @brief implementation of the insert_auditor_progress function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_AUDITOR_PROGRESS_H
+#define PG_INSERT_AUDITOR_PROGRESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about the auditor's progress with an exchange's
+ * data.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param progress_key name of the progress indicator
+ * @param progress_offset offset until which we have made progress
+ * @param ... NULL terminated list of additional key-value pairs to insert
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_auditor_progress (
+  void *cls,
+  const char *progress_key,
+  uint64_t progress_offset,
+  ...);
+
+#endif
diff --git a/src/auditordb/pg_insert_balance.c b/src/auditordb/pg_insert_balance.c
new file mode 100644
index 000000000..0d1762acc
--- /dev/null
+++ b/src/auditordb/pg_insert_balance.c
@@ -0,0 +1,97 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_insert_balance.c
+ * @brief Implementation of the insert_balance function
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_balance (void *cls,
+                       const char *balance_key,
+                       const struct TALER_Amount *balance_value,
+                       ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            balance_value);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   const struct TALER_Amount *);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    struct TALER_Amount amounts[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      TALER_PQ_query_param_array_amount (cnt,
+                                         amounts,
+                                         pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = balance_key;
+    amounts[0] = *balance_value;
+
+    va_start (ap,
+              balance_value);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      amounts[off] = *va_arg (ap,
+                              const struct TALER_Amount *);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "auditor_balance_insert",
+             "INSERT INTO auditor_balances "
+             "(balance_key"
+             ",balance_value.val"
+             ",balance_value.frac"
+             ") SELECT *"
+             " FROM UNNEST (CAST($1 AS TEXT[]),"
+             "              CAST($2 AS taler_amount[]))"
+             " ON CONFLICT DO NOTHING;");
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_balance_insert",
+                                             params);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_insert_balance.h b/src/auditordb/pg_insert_balance.h
new file mode 100644
index 000000000..dff69eec9
--- /dev/null
+++ b/src/auditordb/pg_insert_balance.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_insert_balance.h
+ * @brief implementation of the insert_balance function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_BALANCE_H
+#define PG_INSERT_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Insert information about a balance tracked by the auditor. There must not be an
+ * existing record.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param balance_key key of the balance to store
+ * @param balance_value value to store
+ * @param ... NULL terminated list of additional key-value pairs to insert
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_balance (void *cls,
+                       const char *balance_key,
+                       const struct TALER_Amount *balance_value,
+                       ...);
+
+
+#endif
diff --git a/src/auditordb/pg_insert_denomination_balance.c b/src/auditordb/pg_insert_denomination_balance.c
new file mode 100644
index 000000000..bbf4127f4
--- /dev/null
+++ b/src/auditordb/pg_insert_denomination_balance.c
@@ -0,0 +1,65 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_denomination_balance.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_denomination_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_AUDITORDB_DenominationCirculationData *dcd)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_loss),
+    GNUNET_PQ_query_param_uint64 (&dcd->num_issued),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_risk),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->recoup_loss),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_denomination_pending_insert",
+           "INSERT INTO auditor_denomination_pending "
+           "(denom_pub_hash"
+           ",denom_balance"
+           ",denom_loss"
+           ",num_issued"
+           ",denom_risk"
+           ",recoup_loss"
+           ") VALUES ("
+           "$1,$2,$3,$4,$5,$6"
+           ");");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_denomination_pending_insert",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_denomination_balance.h b/src/auditordb/pg_insert_denomination_balance.h
new file mode 100644
index 000000000..90776367c
--- /dev/null
+++ b/src/auditordb/pg_insert_denomination_balance.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_denomination_balance.h
+ * @brief implementation of the insert_denomination_balance function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_DENOMINATION_BALANCE_H
+#define PG_INSERT_DENOMINATION_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about a denomination key's balances.  There
+ * must not be an existing record for the denomination key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the denomination public key
+ * @param dcd circulation data to store
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_AUDITORDB_DenominationCirculationData *dcd);
+
+
+#endif
diff --git a/src/auditordb/pg_insert_deposit_confirmation.c b/src/auditordb/pg_insert_deposit_confirmation.c
new file mode 100644
index 000000000..1b5205782
--- /dev/null
+++ b/src/auditordb/pg_insert_deposit_confirmation.c
@@ -0,0 +1,77 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file pg_insert_deposit_confirmation.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_deposit_confirmation.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_deposit_confirmation (
+  void *cls,
+  const struct TALER_AUDITORDB_DepositConfirmation *dc)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&dc->h_contract_terms),
+    GNUNET_PQ_query_param_auto_from_type (&dc->h_policy),
+    GNUNET_PQ_query_param_auto_from_type (&dc->h_wire),
+    GNUNET_PQ_query_param_timestamp (&dc->exchange_timestamp),
+    GNUNET_PQ_query_param_timestamp (&dc->wire_deadline),
+    GNUNET_PQ_query_param_timestamp (&dc->refund_deadline),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dc->total_without_fee),
+    GNUNET_PQ_query_param_array_auto_from_type (dc->num_coins,
+                                                dc->coin_pubs,
+                                                pg->conn),
+    GNUNET_PQ_query_param_array_auto_from_type (dc->num_coins,
+                                                dc->coin_sigs,
+                                                pg->conn),
+    GNUNET_PQ_query_param_auto_from_type (&dc->merchant),
+    GNUNET_PQ_query_param_auto_from_type (&dc->exchange_sig),
+    GNUNET_PQ_query_param_auto_from_type (&dc->exchange_pub),
+    GNUNET_PQ_query_param_auto_from_type (&dc->master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_deposit_confirmation_insert",
+           "INSERT INTO deposit_confirmations "
+           "(h_contract_terms"
+           ",h_policy"
+           ",h_wire"
+           ",exchange_timestamp"
+           ",wire_deadline"
+           ",refund_deadline"
+           ",total_without_fee"
+           ",coin_pubs"
+           ",coin_sigs"
+           ",merchant_pub"
+           ",exchange_sig"
+           ",exchange_pub"
+           ",master_sig"                  /* master_sig could be normalized... */
+           ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_deposit_confirmation_insert",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_deposit_confirmation.h b/src/auditordb/pg_insert_deposit_confirmation.h
new file mode 100644
index 000000000..f3d11e3cb
--- /dev/null
+++ b/src/auditordb/pg_insert_deposit_confirmation.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_deposit_confirmation.h
+ * @brief implementation of the insert_deposit_confirmation function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_DEPOSIT_CONFIRMATION_H
+#define PG_INSERT_DEPOSIT_CONFIRMATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about a deposit confirmation into the database.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param dc deposit confirmation information to store
+ * @return query result status
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_deposit_confirmation (
+  void *cls,
+  const struct TALER_AUDITORDB_DepositConfirmation *dc);
+
+
+#endif
diff --git a/src/auditordb/pg_insert_exchange_signkey.c b/src/auditordb/pg_insert_exchange_signkey.c
new file mode 100644
index 000000000..8bf439da0
--- /dev/null
+++ b/src/auditordb/pg_insert_exchange_signkey.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_exchange_signkey.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_exchange_signkey.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_exchange_signkey (
+  void *cls,
+  const struct TALER_AUDITORDB_ExchangeSigningKey *sk)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&sk->ep_start),
+    GNUNET_PQ_query_param_timestamp (&sk->ep_expire),
+    GNUNET_PQ_query_param_timestamp (&sk->ep_end),
+    GNUNET_PQ_query_param_auto_from_type (&sk->exchange_pub),
+    GNUNET_PQ_query_param_auto_from_type (&sk->master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_insert_exchange_signkey",
+           "INSERT INTO auditor_exchange_signkeys "
+           "(ep_start"
+           ",ep_expire"
+           ",ep_end"
+           ",exchange_pub"
+           ",master_sig"
+           ") VALUES ($1,$2,$3,$4,$5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_insert_exchange_signkey",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_exchange_signkey.h b/src/auditordb/pg_insert_exchange_signkey.h
new file mode 100644
index 000000000..1c1eefe35
--- /dev/null
+++ b/src/auditordb/pg_insert_exchange_signkey.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_exchange_signkey.h
+ * @brief implementation of the insert_exchange_signkey function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_EXCHANGE_SIGNKEY_H
+#define PG_INSERT_EXCHANGE_SIGNKEY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Insert information about a signing key of the exchange.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param sk signing key information to store
+ * @return query result status
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_exchange_signkey (
+  void *cls,
+  const struct TALER_AUDITORDB_ExchangeSigningKey *sk);
+
+
+#endif
diff --git a/src/auditordb/pg_insert_historic_denom_revenue.c b/src/auditordb/pg_insert_historic_denom_revenue.c
new file mode 100644
index 000000000..2c3dd44cc
--- /dev/null
+++ b/src/auditordb/pg_insert_historic_denom_revenue.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_historic_denom_revenue.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_historic_denom_revenue.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_historic_denom_revenue (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct GNUNET_TIME_Timestamp revenue_timestamp,
+  const struct TALER_Amount *revenue_balance,
+  const struct TALER_Amount *loss_balance)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_timestamp (&revenue_timestamp),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 revenue_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 loss_balance),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_historic_denomination_revenue_insert",
+           "INSERT INTO auditor_historic_denomination_revenue"
+           "(denom_pub_hash"
+           ",revenue_timestamp"
+           ",revenue_balance"
+           ",loss_balance"
+           ") VALUES ($1,$2,$3,$4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_historic_denomination_revenue_insert",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_historic_denom_revenue.h b/src/auditordb/pg_insert_historic_denom_revenue.h
new file mode 100644
index 000000000..02567119b
--- /dev/null
+++ b/src/auditordb/pg_insert_historic_denom_revenue.h
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_historic_denom_revenue.h
+ * @brief implementation of the insert_historic_denom_revenue function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_HISTORIC_DENOM_REVENUE_H
+#define PG_INSERT_HISTORIC_DENOM_REVENUE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about an exchange's historic
+ * revenue about a denomination key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the denomination key
+ * @param revenue_timestamp when did this profit get realized
+ * @param revenue_balance what was the total profit made from
+ *                        deposit fees, melting fees, refresh fees
+ *                        and coins that were never returned?
+ * @param loss_balance total losses suffered by the exchange at the time
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_historic_denom_revenue (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct GNUNET_TIME_Timestamp revenue_timestamp,
+  const struct TALER_Amount *revenue_balance,
+  const struct TALER_Amount *loss_balance);
+
+#endif
diff --git a/src/auditordb/pg_insert_historic_reserve_revenue.c b/src/auditordb/pg_insert_historic_reserve_revenue.c
new file mode 100644
index 000000000..953fba34a
--- /dev/null
+++ b/src/auditordb/pg_insert_historic_reserve_revenue.c
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_historic_reserve_revenue.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_historic_reserve_revenue.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_historic_reserve_revenue (
+  void *cls,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  const struct TALER_Amount *reserve_profits)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&start_time),
+    GNUNET_PQ_query_param_timestamp (&end_time),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 reserve_profits),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_historic_reserve_summary_insert",
+           "INSERT INTO auditor_historic_reserve_summary"
+           "(start_date"
+           ",end_date"
+           ",reserve_profits"
+           ") VALUES ($1,$2,$3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_historic_reserve_summary_insert",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_historic_reserve_revenue.h b/src/auditordb/pg_insert_historic_reserve_revenue.h
new file mode 100644
index 000000000..a76a50b39
--- /dev/null
+++ b/src/auditordb/pg_insert_historic_reserve_revenue.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_historic_reserve_revenue.h
+ * @brief implementation of the insert_historic_reserve_revenue function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_HISTORIC_RESERVE_REVENUE_H
+#define PG_INSERT_HISTORIC_RESERVE_REVENUE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about an exchange's historic revenue from reserves.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param start_time beginning of aggregated time interval
+ * @param end_time end of aggregated time interval
+ * @param reserve_profits total profits made
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_historic_reserve_revenue (
+  void *cls,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  const struct TALER_Amount *reserve_profits);
+
+#endif
diff --git a/src/auditordb/pg_insert_pending_deposit.c b/src/auditordb/pg_insert_pending_deposit.c
new file mode 100644
index 000000000..50b655ee7
--- /dev/null
+++ b/src/auditordb/pg_insert_pending_deposit.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_insert_pending_deposit.c
+ * @brief Implementation of the insert_pending_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_pending_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_pending_deposit (
+  void *cls,
+  uint64_t batch_deposit_serial_id,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  const struct TALER_Amount *total_amount,
+  struct GNUNET_TIME_Timestamp deadline)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 total_amount),
+    GNUNET_PQ_query_param_auto_from_type (wire_target_h_payto),
+    GNUNET_PQ_query_param_uint64 (&batch_deposit_serial_id),
+    GNUNET_PQ_query_param_timestamp (&deadline),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_insert_pending_deposit",
+           "INSERT INTO auditor_pending_deposits "
+           "(total_amount"
+           ",wire_target_h_payto"
+           ",batch_deposit_serial_id"
+           ",deadline"
+           ") VALUES ($1,$2,$3,$4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_insert_pending_deposit",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_pending_deposit.h b/src/auditordb/pg_insert_pending_deposit.h
new file mode 100644
index 000000000..7c2b59809
--- /dev/null
+++ b/src/auditordb/pg_insert_pending_deposit.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_insert_pending_deposit.h
+ * @brief implementation of the insert_pending_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_PENDING_DEPOSIT_H
+#define PG_INSERT_PENDING_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert new row into the pending deposits table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param batch_deposit_serial_id where in the table are we
+ * @param total_amount value of all missing deposits, including fees
+ * @param wire_target_h_payto hash of the recipient account's payto URI
+ * @param deadline what was the requested wire transfer deadline
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_pending_deposit (
+  void *cls,
+  uint64_t batch_deposit_serial_id,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  const struct TALER_Amount *total_amount,
+  struct GNUNET_TIME_Timestamp deadline);
+
+
+#endif
diff --git a/src/auditordb/pg_insert_purse_info.c b/src/auditordb/pg_insert_purse_info.c
new file mode 100644
index 000000000..7eaad8d3c
--- /dev/null
+++ b/src/auditordb/pg_insert_purse_info.c
@@ -0,0 +1,55 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_insert_purse_info.c
+ * @brief Implementation of the insert_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_purse_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp expiration_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 balance),
+    GNUNET_PQ_query_param_timestamp (&expiration_date),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_purses_insert",
+           "INSERT INTO auditor_purses "
+           "(purse_pub"
+           ",target"
+           ",expiration_date"
+           ") VALUES ($1,$2,$3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_purses_insert",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_purse_info.h b/src/auditordb/pg_insert_purse_info.h
new file mode 100644
index 000000000..ee1b3eebd
--- /dev/null
+++ b/src/auditordb/pg_insert_purse_info.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_insert_purse_info.h
+ * @brief implementation of the insert_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_PURSE_INFO_H
+#define PG_INSERT_PURSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Insert information about a purse.  There must not be an
+ * existing record for the purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the purse
+ * @param balance balance of the purse
+ * @param expiration_date expiration date of the purse
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp expiration_date);
+
+#endif
diff --git a/src/auditordb/pg_insert_reserve_info.c b/src/auditordb/pg_insert_reserve_info.c
new file mode 100644
index 000000000..4c99394fe
--- /dev/null
+++ b/src/auditordb/pg_insert_reserve_info.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_reserve_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_reserve_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_reserve_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+  struct GNUNET_TIME_Timestamp expiration_date,
+  const char *origin_account)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->reserve_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->reserve_loss),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->withdraw_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->close_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->purse_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->open_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->history_fee_balance),
+    GNUNET_PQ_query_param_timestamp (&expiration_date),
+    NULL == origin_account
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (origin_account),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_insert_reserve_info",
+           "INSERT INTO auditor_reserves "
+           "(reserve_pub"
+           ",reserve_balance"
+           ",reserve_loss"
+           ",withdraw_fee_balance"
+           ",close_fee_balance"
+           ",purse_fee_balance"
+           ",open_fee_balance"
+           ",history_fee_balance"
+           ",expiration_date"
+           ",origin_account"
+           ") VALUES "
+           "($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_insert_reserve_info",
+                                             params);
+}
diff --git a/src/auditordb/pg_insert_reserve_info.h b/src/auditordb/pg_insert_reserve_info.h
new file mode 100644
index 000000000..b416aa556
--- /dev/null
+++ b/src/auditordb/pg_insert_reserve_info.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_reserve_info.h
+ * @brief implementation of the insert_reserve_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_RESERVE_INFO_H
+#define PG_INSERT_RESERVE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about a reserve.  There must not be an
+ * existing record for the reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param rfb balance amounts for the reserve
+ * @param expiration_date when will the reserve expire
+ * @param origin_account where did the money in the reserve originally come from
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_insert_reserve_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+  struct GNUNET_TIME_Timestamp expiration_date,
+  const char *origin_account);
+
+#endif
diff --git a/src/auditordb/pg_select_historic_denom_revenue.c b/src/auditordb/pg_select_historic_denom_revenue.c
new file mode 100644
index 000000000..aa44625e7
--- /dev/null
+++ b/src/auditordb/pg_select_historic_denom_revenue.c
@@ -0,0 +1,146 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_historic_denom_revenue.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_historic_denom_revenue.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #historic_denom_revenue_cb().
+ */
+struct HistoricDenomRevenueContext
+{
+  /**
+   * Function to call for each result.
+   */
+  TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Number of results processed.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Helper function for #TAH_PG_select_historic_denom_revenue().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct HistoricRevenueContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+historic_denom_revenue_cb (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct HistoricDenomRevenueContext *hrc = cls;
+  struct PostgresClosure *pg = hrc->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_DenominationHashP denom_pub_hash;
+    struct GNUNET_TIME_Timestamp revenue_timestamp;
+    struct TALER_Amount revenue_balance;
+    struct TALER_Amount loss;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &denom_pub_hash),
+      GNUNET_PQ_result_spec_timestamp ("revenue_timestamp",
+                                       &revenue_timestamp),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("revenue_balance",
+                                   &revenue_balance),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("loss_balance",
+                                   &loss),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      hrc->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+
+    hrc->qs = i + 1;
+    if (GNUNET_OK !=
+        hrc->cb (hrc->cb_cls,
+                 &denom_pub_hash,
+                 revenue_timestamp,
+                 &revenue_balance,
+                 &loss))
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_historic_denom_revenue (
+  void *cls,
+  TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct HistoricDenomRevenueContext hrc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "auditor_historic_denomination_revenue_select",
+           "SELECT"
+           " denom_pub_hash"
+           ",revenue_timestamp"
+           ",revenue_balance"
+           ",loss_balance"
+           " FROM auditor_historic_denomination_revenue;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "auditor_historic_denomination_revenue_select",
+                                             params,
+                                             &historic_denom_revenue_cb,
+                                             &hrc);
+  if (qs <= 0)
+    return qs;
+  return hrc.qs;
+}
diff --git a/src/auditordb/pg_select_historic_denom_revenue.h b/src/auditordb/pg_select_historic_denom_revenue.h
new file mode 100644
index 000000000..25a68dacb
--- /dev/null
+++ b/src/auditordb/pg_select_historic_denom_revenue.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_historic_denom_revenue.h
+ * @brief implementation of the select_historic_denom_revenue function
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_HISTORIC_DENOM_REVENUE_H
+#define PG_SELECT_HISTORIC_DENOM_REVENUE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Obtain all of the historic denomination key revenue
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call with the results
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_historic_denom_revenue (
+  void *cls,
+  TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/auditordb/pg_select_historic_reserve_revenue.c b/src/auditordb/pg_select_historic_reserve_revenue.c
new file mode 100644
index 000000000..877c3e2d7
--- /dev/null
+++ b/src/auditordb/pg_select_historic_reserve_revenue.c
@@ -0,0 +1,140 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_historic_reserve_revenue.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_historic_reserve_revenue.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #historic_reserve_revenue_cb().
+ */
+struct HistoricReserveRevenueContext
+{
+  /**
+   * Function to call for each result.
+   */
+  TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Number of results processed.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Helper function for #TAH_PG_select_historic_reserve_revenue().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct HistoricRevenueContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+historic_reserve_revenue_cb (void *cls,
+                             PGresult *result,
+                             unsigned int num_results)
+{
+  struct HistoricReserveRevenueContext *hrc = cls;
+  struct PostgresClosure *pg = hrc->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct GNUNET_TIME_Timestamp start_date;
+    struct GNUNET_TIME_Timestamp end_date;
+    struct TALER_Amount reserve_profits;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_timestamp ("start_date",
+                                       &start_date),
+      GNUNET_PQ_result_spec_timestamp ("end_date",
+                                       &end_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_profits",
+                                   &reserve_profits),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      hrc->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    hrc->qs = i + 1;
+    if (GNUNET_OK !=
+        hrc->cb (hrc->cb_cls,
+                 start_date,
+                 end_date,
+                 &reserve_profits))
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_historic_reserve_revenue (
+  void *cls,
+  TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+  struct HistoricReserveRevenueContext hrc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "auditor_historic_reserve_summary_select",
+           "SELECT"
+           " start_date"
+           ",end_date"
+           ",reserve_profits"
+           " FROM auditor_historic_reserve_summary");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "auditor_historic_reserve_summary_select",
+                                             params,
+                                             &historic_reserve_revenue_cb,
+                                             &hrc);
+  if (0 >= qs)
+    return qs;
+  return hrc.qs;
+}
diff --git a/src/auditordb/pg_select_historic_reserve_revenue.h b/src/auditordb/pg_select_historic_reserve_revenue.h
new file mode 100644
index 000000000..b067c8917
--- /dev/null
+++ b/src/auditordb/pg_select_historic_reserve_revenue.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_historic_reserve_revenue.h
+ * @brief implementation of the select_historic_reserve_revenue function
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_HISTORIC_RESERVE_REVENUE_H
+#define PG_SELECT_HISTORIC_RESERVE_REVENUE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Return information about an exchange's historic revenue from reserves.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call with results
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_historic_reserve_revenue (
+  void *cls,
+  TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/auditordb/pg_select_pending_deposits.c b/src/auditordb/pg_select_pending_deposits.c
new file mode 100644
index 000000000..1190fb132
--- /dev/null
+++ b/src/auditordb/pg_select_pending_deposits.c
@@ -0,0 +1,149 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_select_pending_deposits.c
+ * @brief Implementation of the select_pending_deposits function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_pending_deposits.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #wire_missing_cb().
+ */
+struct WireMissingContext
+{
+
+  /**
+   * Function to call for each pending deposit.
+   */
+  TALER_AUDITORDB_WireMissingCallback cb;
+
+  /**
+   * Closure for @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Query status to return.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Helper function for #TAH_PG_select_purse_expired().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct WireMissingContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+wire_missing_cb (void *cls,
+                 PGresult *result,
+                 unsigned int num_results)
+{
+  struct WireMissingContext *eic = cls;
+  struct PostgresClosure *pg = eic->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    uint64_t batch_deposit_serial_id;
+    struct TALER_Amount total_amount;
+    struct TALER_PaytoHashP wire_target_h_payto;
+    struct GNUNET_TIME_Timestamp deadline;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("batch_deposit_serial_id",
+                                    &batch_deposit_serial_id),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("total_amount",
+                                   &total_amount),
+      GNUNET_PQ_result_spec_auto_from_type ("wire_target_h_payto",
+                                            &wire_target_h_payto),
+      GNUNET_PQ_result_spec_timestamp ("deadline",
+                                       &deadline),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      eic->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    eic->cb (eic->cb_cls,
+             batch_deposit_serial_id,
+             &total_amount,
+             &wire_target_h_payto,
+             deadline);
+  }
+  eic->qs = num_results;
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_pending_deposits (
+  void *cls,
+  struct GNUNET_TIME_Absolute deadline,
+  TALER_AUDITORDB_WireMissingCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_absolute_time (&deadline),
+    GNUNET_PQ_query_param_end
+  };
+  struct WireMissingContext eic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "auditor_select_pending_deposits",
+           "SELECT"
+           " batch_deposit_serial_id"
+           ",total_amount"
+           ",wire_target_h_payto"
+           ",deadline"
+           " FROM auditor_pending_deposits"
+           " WHERE deadline<$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "auditor_select_pending_deposits",
+    params,
+    &wire_missing_cb,
+    &eic);
+  if (0 > qs)
+    return qs;
+  GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != eic.qs);
+  return eic.qs;
+}
diff --git a/src/auditordb/pg_select_pending_deposits.h b/src/auditordb/pg_select_pending_deposits.h
new file mode 100644
index 000000000..e165098c5
--- /dev/null
+++ b/src/auditordb/pg_select_pending_deposits.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_select_pending_deposits.h
+ * @brief implementation of the select_pending_deposits function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PENDING_DEPOSITS_H
+#define PG_SELECT_PENDING_DEPOSITS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Return (batch) deposits for which we have not yet
+ * seen the required wire transfer.
+ *
+ * @param cls closure
+ * @param deadline only return up to this deadline
+ * @param cb function to call on each entry
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_pending_deposits (
+  void *cls,
+  struct GNUNET_TIME_Absolute deadline,
+  TALER_AUDITORDB_WireMissingCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/auditordb/pg_select_purse_expired.c b/src/auditordb/pg_select_purse_expired.c
new file mode 100644
index 000000000..77c6d3b26
--- /dev/null
+++ b/src/auditordb/pg_select_purse_expired.c
@@ -0,0 +1,146 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_select_purse_expired.c
+ * @brief Implementation of the select_purse_expired function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_expired.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #purse_expired_cb().
+ */
+struct PurseExpiredContext
+{
+
+  /**
+   * Function to call for each expired purse.
+   */
+  TALER_AUDITORDB_ExpiredPurseCallback cb;
+
+  /**
+   * Closure for @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Query status to return.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Helper function for #TAH_PG_select_purse_expired().
+ * To be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseExpiredContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_expired_cb (void *cls,
+                  PGresult *result,
+                  unsigned int num_results)
+{
+  struct PurseExpiredContext *eic = cls;
+  struct PostgresClosure *pg = eic->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    struct GNUNET_TIME_Timestamp expiration_date;
+    struct TALER_Amount balance;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                   &balance),
+      GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                       &expiration_date),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      eic->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    eic->qs = i + 1;
+    if (GNUNET_OK !=
+        eic->cb (eic->cb_cls,
+                 &purse_pub,
+                 &balance,
+                 expiration_date))
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_purse_expired (
+  void *cls,
+  TALER_AUDITORDB_ExpiredPurseCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp now
+    = GNUNET_TIME_timestamp_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseExpiredContext eic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "auditor_select_expired_purses",
+           "SELECT"
+           " purse_pub"
+           ",expiration_date"
+           ",balance"
+           " FROM auditor_purses"
+           " AND expiration_date<$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "auditor_select_expired_purses",
+                                             params,
+                                             &purse_expired_cb,
+                                             &eic);
+  if (qs > 0)
+    return eic.qs;
+  GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
+  return qs;
+}
diff --git a/src/auditordb/pg_select_purse_expired.h b/src/auditordb/pg_select_purse_expired.h
new file mode 100644
index 000000000..36d81285c
--- /dev/null
+++ b/src/auditordb/pg_select_purse_expired.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_select_purse_expired.h
+ * @brief implementation of the select_purse_expired function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_EXPIRED_H
+#define PG_SELECT_PURSE_EXPIRED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Get information about expired purses.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on expired purses
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_select_purse_expired (
+  void *cls,
+  TALER_AUDITORDB_ExpiredPurseCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/auditordb/pg_template.c b/src/auditordb/pg_template.c
new file mode 100644
index 000000000..e44fdab60
--- /dev/null
+++ b/src/auditordb/pg_template.c
@@ -0,0 +1,26 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_template.c
+ * @brief Implementation of the template function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_template.h"
+#include "pg_helper.h"
diff --git a/src/auditordb/pg_template.h b/src/auditordb/pg_template.h
new file mode 100644
index 000000000..911faf107
--- /dev/null
+++ b/src/auditordb/pg_template.h
@@ -0,0 +1,29 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_template.h
+ * @brief implementation of the template function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_TEMPLATE_H
+#define PG_TEMPLATE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+#endif
diff --git a/src/auditordb/pg_template.sh b/src/auditordb/pg_template.sh
new file mode 100755
index 000000000..c0937dcd3
--- /dev/null
+++ b/src/auditordb/pg_template.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# This file is in the public domain.
+#
+# Instantiates pg_template for a particular function.
+
+for n in $*
+do
+    NCAPS=`echo $n | tr a-z A-Z`
+    if test ! -e pg_$n.c
+    then
+        cat pg_template.c | sed -e s/template/$n/g -e s/TEMPLATE/$NCAPS/g > pg_$n.c
+        cat pg_template.h | sed -e s/template/$n/g -e s/TEMPLATE/$NCAPS/g > pg_$n.h
+        echo "  plugin->$n\n    = &TAH_PG_$n;" >> tmpl.c
+        echo "#include \"pg_$n.h\"" >> tmpl.inc
+        echo "  pg_$n.h pg_$n.c \\" >> tmpl.am
+    fi
+done
+
+echo "Add lines from tmpl.am to Makefile.am"
+echo "Add lines from tmpl.inc to plugin_auditordb_postgres.c at the beginning"
+echo "Add lines from tmpl.c to plugin_auditordb_postgres.c at the end"
diff --git a/src/auditordb/pg_update_auditor_progress.c b/src/auditordb/pg_update_auditor_progress.c
new file mode 100644
index 000000000..b30be18bd
--- /dev/null
+++ b/src/auditordb/pg_update_auditor_progress.c
@@ -0,0 +1,99 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file pg_update_auditor_progress.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_auditor_progress.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_auditor_progress (
+  void *cls,
+  const char *progress_key,
+  uint64_t progress_offset,
+  ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            progress_offset);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   uint64_t);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    uint64_t offsets[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      GNUNET_PQ_query_param_array_uint64 (cnt,
+                                          offsets,
+                                          pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = progress_key;
+    offsets[0] = progress_offset;
+
+    va_start (ap,
+              progress_offset);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      offsets[off] = va_arg (ap,
+                             uint64_t);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "auditor_progress_update",
+             "UPDATE auditor_progress"
+             "  SET progress_offset=data.off"
+             "  FROM ("
+             "    SELECT *"
+             "      FROM UNNEST (CAST($1 AS TEXT[]),"
+             "                   CAST($2 AS INT8[]))"
+             "      AS t(key,off)"
+             "  ) AS data"
+             " WHERE auditor_progress.progress_key=data.key;");
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_progress_update",
+                                             params);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_update_auditor_progress.h b/src/auditordb/pg_update_auditor_progress.h
new file mode 100644
index 000000000..e8de58161
--- /dev/null
+++ b/src/auditordb/pg_update_auditor_progress.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_auditor_progress.h
+ * @brief implementation of the update_auditor_progress function
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_AUDITOR_PROGRESS_H
+#define PG_UPDATE_AUDITOR_PROGRESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Update information about the progress of the auditor.  There
+ * must be an existing record for the exchange.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param progress_key name of the progress indicator
+ * @param progress_offset offset until which we have made progress
+ * @param ... NULL terminated list of additional key-value pairs to update
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_auditor_progress (
+  void *cls,
+  const char *progress_key,
+  uint64_t progress_offset,
+  ...);
+
+#endif
diff --git a/src/auditordb/pg_update_balance.c b/src/auditordb/pg_update_balance.c
new file mode 100644
index 000000000..eff03056b
--- /dev/null
+++ b/src/auditordb/pg_update_balance.c
@@ -0,0 +1,100 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file auditordb/pg_update_balance.c
+ * @brief Implementation of the update_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_balance (
+  void *cls,
+  const char *balance_key,
+  const struct TALER_Amount *balance_amount,
+  ...)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int cnt = 1;
+  va_list ap;
+
+  va_start (ap,
+            balance_amount);
+  while (NULL != va_arg (ap,
+                         const char *))
+  {
+    cnt++;
+    (void) va_arg (ap,
+                   const struct TALER_Amount *);
+  }
+  va_end (ap);
+  {
+    const char *keys[cnt];
+    struct TALER_Amount amounts[cnt];
+    unsigned int off = 1;
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_array_ptrs_string (cnt,
+                                               keys,
+                                               pg->conn),
+      TALER_PQ_query_param_array_amount (cnt,
+                                         amounts,
+                                         pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    keys[0] = balance_key;
+    amounts[0] = *balance_amount;
+
+    va_start (ap,
+              balance_amount);
+    while (off < cnt)
+    {
+      keys[off] = va_arg (ap,
+                          const char *);
+      amounts[off] = *va_arg (ap,
+                              const struct TALER_Amount *);
+      off++;
+    }
+    GNUNET_assert (NULL == va_arg (ap,
+                                   const char *));
+    va_end (ap);
+
+    PREPARE (pg,
+             "auditor_balance_update",
+             "UPDATE auditor_balances"
+             "  SET balance_value.val=data.val"
+             "     ,balance_value.frac=data.frac"
+             "  FROM ("
+             "    SELECT *"
+             "      FROM UNNEST (CAST($1 AS TEXT[]),"
+             "                   CAST($2 AS taler_amount[]))"
+             "      AS t(key,val,frac)"
+             "  ) AS data"
+             " WHERE auditor_balances.balance_key=data.key;");
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_balance_update",
+                                             params);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    return qs;
+  }
+}
diff --git a/src/auditordb/pg_update_balance.h b/src/auditordb/pg_update_balance.h
new file mode 100644
index 000000000..8f83726f5
--- /dev/null
+++ b/src/auditordb/pg_update_balance.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file auditordb/pg_update_balance.h
+ * @brief implementation of the update_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_BALANCE_H
+#define PG_UPDATE_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about a balance tracked by the auditor.  Destructively updates an
+ * existing record, which must already exist.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param balance_key key of the balance to store
+ * @param balance_amount value to store
+ * @param ... NULL terminated list of additional key-value pairs to update
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_balance (
+  void *cls,
+  const char *balance_key,
+  const struct TALER_Amount *balance_amount,
+  ...);
+
+
+#endif
diff --git a/src/auditordb/pg_update_denomination_balance.c b/src/auditordb/pg_update_denomination_balance.c
new file mode 100644
index 000000000..0c738779e
--- /dev/null
+++ b/src/auditordb/pg_update_denomination_balance.c
@@ -0,0 +1,62 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_denomination_balance.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_denomination_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_AUDITORDB_DenominationCirculationData *dcd)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_loss),
+    GNUNET_PQ_query_param_uint64 (&dcd->num_issued),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->denom_risk),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &dcd->recoup_loss),
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_denomination_pending_update",
+           "UPDATE auditor_denomination_pending SET"
+           " denom_balance=$1"
+           ",denom_loss=$2"
+           ",num_issued=$3"
+           ",denom_risk=$4"
+           ",recoup_loss=$5"
+           " WHERE denom_pub_hash=$6");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_denomination_pending_update",
+                                             params);
+}
diff --git a/src/auditordb/pg_update_denomination_balance.h b/src/auditordb/pg_update_denomination_balance.h
new file mode 100644
index 000000000..474fcaafd
--- /dev/null
+++ b/src/auditordb/pg_update_denomination_balance.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_denomination_balance.h
+ * @brief implementation of the update_denomination_balance function
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_DENOMINATION_BALANCE_H
+#define PG_UPDATE_DENOMINATION_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Update information about a denomination key's balances.  There
+ * must be an existing record for the denomination key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the denomination public key
+ * @param dcd circulation data to store
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_denomination_balance (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_AUDITORDB_DenominationCirculationData *dcd);
+
+
+#endif
diff --git a/src/auditordb/pg_update_purse_info.c b/src/auditordb/pg_update_purse_info.c
new file mode 100644
index 000000000..66dfd490e
--- /dev/null
+++ b/src/auditordb/pg_update_purse_info.c
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_update_purse_info.c
+ * @brief Implementation of the update_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_purse_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance)
+{
+
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 balance),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_purses_update",
+           "UPDATE auditor_purses"
+           "   SET balance=$2"
+           " WHERE purse_pub=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_purses_update",
+                                             params);
+}
diff --git a/src/auditordb/pg_update_purse_info.h b/src/auditordb/pg_update_purse_info.h
new file mode 100644
index 000000000..ac37be7b4
--- /dev/null
+++ b/src/auditordb/pg_update_purse_info.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file auditordb/pg_update_purse_info.h
+ * @brief implementation of the update_purse_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_PURSE_INFO_H
+#define PG_UPDATE_PURSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Update information about a purse.  Destructively updates an
+ * existing record, which must already exist.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the purse
+ * @param balance new balance for the purse
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_purse_info (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance);
+
+
+#endif
diff --git a/src/auditordb/pg_update_reserve_info.c b/src/auditordb/pg_update_reserve_info.c
new file mode 100644
index 000000000..2d38a2b0e
--- /dev/null
+++ b/src/auditordb/pg_update_reserve_info.c
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_reserve_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_reserve_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_reserve_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+  struct GNUNET_TIME_Timestamp expiration_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->reserve_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->reserve_loss),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->withdraw_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->purse_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->open_fee_balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &rfb->history_fee_balance),
+    GNUNET_PQ_query_param_timestamp (&expiration_date),
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_update_reserve_info",
+           "UPDATE auditor_reserves SET"
+           " reserve_balance=$1"
+           ",reserve_loss=$2"
+           ",withdraw_fee_balance=$3"
+           ",purse_fee_balance=$4"
+           ",open_fee_balance=$5"
+           ",history_fee_balance=$6"
+           ",expiration_date=$7"
+           " WHERE reserve_pub=$8");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_update_reserve_info",
+                                             params);
+}
diff --git a/src/auditordb/pg_update_reserve_info.h b/src/auditordb/pg_update_reserve_info.h
new file mode 100644
index 000000000..25f43476a
--- /dev/null
+++ b/src/auditordb/pg_update_reserve_info.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_reserve_info.h
+ * @brief implementation of the update_reserve_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_RESERVE_INFO_H
+#define PG_UPDATE_RESERVE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Update information about a reserve.  Destructively updates an
+ * existing record, which must already exist.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param rfb amounts for the reserve
+ * @param expiration_date expiration date of the reserve
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_reserve_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+  struct GNUNET_TIME_Timestamp expiration_date);
+
+#endif
diff --git a/src/auditordb/pg_update_wire_fee_summary.c b/src/auditordb/pg_update_wire_fee_summary.c
new file mode 100644
index 000000000..192612f17
--- /dev/null
+++ b/src/auditordb/pg_update_wire_fee_summary.c
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_wire_fee_summary.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_wire_fee_summary.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_wire_fee_summary (
+  void *cls,
+  const struct TALER_Amount *wire_fee_balance)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 wire_fee_balance),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "auditor_wire_fee_balance_update",
+           "UPDATE auditor_wire_fee_balance SET"
+           " wire_fee_balance=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "auditor_wire_fee_balance_update",
+                                             params);
+}
diff --git a/src/auditordb/pg_update_wire_fee_summary.h b/src/auditordb/pg_update_wire_fee_summary.h
new file mode 100644
index 000000000..a004a2db4
--- /dev/null
+++ b/src/auditordb/pg_update_wire_fee_summary.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_update_wire_fee_summary.h
+ * @brief implementation of the update_wire_fee_summary function
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_WIRE_FEE_SUMMARY_H
+#define PG_UPDATE_WIRE_FEE_SUMMARY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_auditordb_plugin.h"
+
+
+/**
+ * Insert information about exchange's wire fee balance.  Destructively updates an
+ * existing record, which must already exist.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param wire_fee_balance amount the exchange gained in wire fees
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TAH_PG_update_wire_fee_summary (
+  void *cls,
+  const struct TALER_Amount *wire_fee_balance);
+
+#endif
diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c
index 6cee2b23a..f5c405d8d 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -21,9 +21,41 @@
  */
 #include "platform.h"
 #include "taler_pq_lib.h"
-#include "taler_auditordb_plugin.h"
 #include <pthread.h>
 #include <libpq-fe.h>
+#include "pg_delete_deposit_confirmations.h"
+#include "pg_delete_pending_deposit.h"
+#include "pg_delete_purse_info.h"
+#include "pg_del_denomination_balance.h"
+#include "pg_del_reserve_info.h"
+#include "pg_get_auditor_progress.h"
+#include "pg_get_balance.h"
+#include "pg_get_denomination_balance.h"
+#include "pg_get_deposit_confirmations.h"
+#include "pg_get_purse_info.h"
+#include "pg_get_reserve_info.h"
+#include "pg_get_wire_fee_summary.h"
+#include "pg_helper.h"
+#include "pg_insert_auditor_progress.h"
+#include "pg_insert_balance.h"
+#include "pg_insert_denomination_balance.h"
+#include "pg_insert_deposit_confirmation.h"
+#include "pg_insert_exchange_signkey.h"
+#include "pg_insert_historic_denom_revenue.h"
+#include "pg_insert_historic_reserve_revenue.h"
+#include "pg_insert_pending_deposit.h"
+#include "pg_insert_purse_info.h"
+#include "pg_insert_reserve_info.h"
+#include "pg_select_historic_denom_revenue.h"
+#include "pg_select_historic_reserve_revenue.h"
+#include "pg_select_pending_deposits.h"
+#include "pg_select_purse_expired.h"
+#include "pg_update_auditor_progress.h"
+#include "pg_update_balance.h"
+#include "pg_update_denomination_balance.h"
+#include "pg_update_purse_info.h"
+#include "pg_update_reserve_info.h"
+#include "pg_update_wire_fee_summary.h"
 
 
 #define LOG(kind,...) GNUNET_log_from (kind, "taler-auditordb-postgres", \
@@ -31,60 +63,6 @@
 
 
 /**
- * Wrapper macro to add the currency from the plugin's state
- * when fetching amounts from the database.
- *
- * @param field name of the database field to fetch amount from
- * @param[out] amountp pointer to amount to set
- */
-#define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) \
-  TALER_PQ_result_spec_amount (                    \
-    field,pg->currency,amountp)
-
-/**
- * Wrapper macro to add the currency from the plugin's state
- * when fetching amounts from the database.  NBO variant.
- *
- * @param field name of the database field to fetch amount from
- * @param[out] amountp pointer to amount to set
- */
-#define TALER_PQ_RESULT_SPEC_AMOUNT_NBO(field, \
-                                        amountp) TALER_PQ_result_spec_amount_nbo ( \
-    field,pg->currency,amountp)
-
-
-/**
- * Type of the "cls" argument given to each of the functions in
- * our API.
- */
-struct PostgresClosure
-{
-
-  /**
-   * Postgres connection handle.
-   */
-  struct GNUNET_PQ_Context *conn;
-
-  /**
-   * Name of the ongoing transaction, used to debug cases where
-   * a transaction is not properly terminated via COMMIT or
-   * ROLLBACK.
-   */
-  const char *transaction_name;
-
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Which currency should we assume all amounts to be in?
-   */
-  char *currency;
-};
-
-
-/**
  * Drop all auditor tables OR deletes recoverable auditor state.
  * This should only be used by testcases or when restarting the
  * auditor from scratch.
@@ -97,20 +75,23 @@ struct PostgresClosure
  */
 static enum GNUNET_GenericReturnValue
 postgres_drop_tables (void *cls,
-                      int drop_exchangelist)
+                      bool drop_exchangelist)
 {
   struct PostgresClosure *pc = cls;
   struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
 
   conn = GNUNET_PQ_connect_with_cfg (pc->cfg,
                                      "auditordb-postgres",
-                                     (drop_exchangelist) ? "drop" : "restart",
+                                     NULL,
                                      NULL,
                                      NULL);
   if (NULL == conn)
     return GNUNET_SYSERR;
+  ret = GNUNET_PQ_exec_sql (conn,
+                            (drop_exchangelist) ? "drop" : "restart");
   GNUNET_PQ_disconnect (conn);
-  return GNUNET_OK;
+  return ret;
 }
 
 
@@ -118,23 +99,129 @@ postgres_drop_tables (void *cls,
  * Create the necessary tables if they are not present
  *
  * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param support_partitions true to support partitioning
+ * @param num_partitions number of partitions to use
  * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
  */
 static enum GNUNET_GenericReturnValue
-postgres_create_tables (void *cls)
+postgres_create_tables (void *cls,
+                        bool support_partitions,
+                        uint32_t num_partitions)
 {
   struct PostgresClosure *pc = cls;
+  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
   struct GNUNET_PQ_Context *conn;
+  struct GNUNET_PQ_QueryParam params[] = {
+    support_partitions
+    ? GNUNET_PQ_query_param_uint32 (&num_partitions)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_PreparedStatement ps[] = {
+    GNUNET_PQ_make_prepare ("create_tables",
+                            "SELECT"
+                            " auditor.do_create_tables"
+                            " ($1);"),
+    GNUNET_PQ_PREPARED_STATEMENT_END
+  };
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_try_execute ("SET search_path TO auditor;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
 
   conn = GNUNET_PQ_connect_with_cfg (pc->cfg,
                                      "auditordb-postgres",
                                      "auditor-",
-                                     NULL,
-                                     NULL);
+                                     es,
+                                     ps);
   if (NULL == conn)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to database\n");
     return GNUNET_SYSERR;
+  }
+  if (0 >
+      GNUNET_PQ_eval_prepared_non_select (conn,
+                                          "create_tables",
+                                          params))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to run 'create_tables' prepared statement\n");
+    ret = GNUNET_SYSERR;
+  }
+  if (GNUNET_OK == ret)
+  {
+    ret = GNUNET_PQ_exec_sql (conn,
+                              "procedures");
+    if (GNUNET_OK != ret)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to load stored procedures\n");
+  }
   GNUNET_PQ_disconnect (conn);
-  return GNUNET_OK;
+  return ret;
+}
+
+
+/**
+ * Register callback to be invoked on events of type @a es.
+ *
+ * @param cls database context to use
+ * @param es specification of the event to listen for
+ * @param timeout how long to wait for the event
+ * @param cb function to call when the event happens, possibly
+ *         mulrewardle times (until cancel is invoked)
+ * @param cb_cls closure for @a cb
+ * @return handle useful to cancel the listener
+ */
+static struct GNUNET_DB_EventHandler *
+postgres_event_listen (void *cls,
+                       const struct GNUNET_DB_EventHeaderP *es,
+                       struct GNUNET_TIME_Relative timeout,
+                       GNUNET_DB_EventCallback cb,
+                       void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+
+  return GNUNET_PQ_event_listen (pg->conn,
+                                 es,
+                                 timeout,
+                                 cb,
+                                 cb_cls);
+}
+
+
+/**
+ * Stop notifications.
+ *
+ * @param eh handle to unregister.
+ */
+static void
+postgres_event_listen_cancel (struct GNUNET_DB_EventHandler *eh)
+{
+  GNUNET_PQ_event_listen_cancel (eh);
+}
+
+
+/**
+ * Notify all that listen on @a es of an event.
+ *
+ * @param cls database context to use
+ * @param es specification of the event to generate
+ * @param extra additional event data provided
+ * @param extra_size number of bytes in @a extra
+ */
+static void
+postgres_event_notify (void *cls,
+                       const struct GNUNET_DB_EventHeaderP *es,
+                       const void *extra,
+                       size_t extra_size)
+{
+  struct PostgresClosure *pg = cls;
+
+  return GNUNET_PQ_event_notify (pg->conn,
+                                 es,
+                                 extra,
+                                 extra_size);
 }
 
 
@@ -147,507 +234,9 @@ postgres_create_tables (void *cls)
 static enum GNUNET_GenericReturnValue
 setup_connection (struct PostgresClosure *pg)
 {
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    /* used in #postgres_commit */
-    GNUNET_PQ_make_prepare ("do_commit",
-                            "COMMIT",
-                            0),
-    /* used in #postgres_insert_exchange */
-    GNUNET_PQ_make_prepare ("auditor_insert_exchange",
-                            "INSERT INTO auditor_exchanges "
-                            "(master_pub"
-                            ",exchange_url"
-                            ") VALUES ($1,$2);",
-                            2),
-    /* used in #postgres_delete_exchange */
-    GNUNET_PQ_make_prepare ("auditor_delete_exchange",
-                            "DELETE"
-                            " FROM auditor_exchanges"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* used in #postgres_list_exchanges */
-    GNUNET_PQ_make_prepare ("auditor_list_exchanges",
-                            "SELECT"
-                            " master_pub"
-                            ",exchange_url"
-                            " FROM auditor_exchanges",
-                            0),
-    /* used in #postgres_insert_exchange_signkey */
-    GNUNET_PQ_make_prepare ("auditor_insert_exchange_signkey",
-                            "INSERT INTO auditor_exchange_signkeys "
-                            "(master_pub"
-                            ",ep_start"
-                            ",ep_expire"
-                            ",ep_end"
-                            ",exchange_pub"
-                            ",master_sig"
-                            ") VALUES ($1,$2,$3,$4,$5,$6);",
-                            6),
-    /* Used in #postgres_insert_deposit_confirmation() */
-    GNUNET_PQ_make_prepare ("auditor_deposit_confirmation_insert",
-                            "INSERT INTO deposit_confirmations "
-                            "(master_pub"
-                            ",h_contract_terms"
-                            ",h_extensions"
-                            ",h_wire"
-                            ",exchange_timestamp"
-                            ",wire_deadline"
-                            ",refund_deadline"
-                            ",amount_without_fee_val"
-                            ",amount_without_fee_frac"
-                            ",coin_pub"
-                            ",merchant_pub"
-                            ",exchange_sig"
-                            ",exchange_pub"
-                            ",master_sig" /* master_sig could be normalized... */
-                            ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14);",
-                            14),
-    /* Used in #postgres_get_deposit_confirmations() */
-    GNUNET_PQ_make_prepare ("auditor_deposit_confirmation_select",
-                            "SELECT"
-                            " serial_id"
-                            ",h_contract_terms"
-                            ",h_extensions"
-                            ",h_wire"
-                            ",exchange_timestamp"
-                            ",wire_deadline"
-                            ",refund_deadline"
-                            ",amount_without_fee_val"
-                            ",amount_without_fee_frac"
-                            ",coin_pub"
-                            ",merchant_pub"
-                            ",exchange_sig"
-                            ",exchange_pub"
-                            ",master_sig" /* master_sig could be normalized... */
-                            " FROM deposit_confirmations"
-                            " WHERE master_pub=$1"
-                            " AND serial_id>$2",
-                            2),
-    /* Used in #postgres_update_auditor_progress_reserve() */
-    GNUNET_PQ_make_prepare ("auditor_progress_update_reserve",
-                            "UPDATE auditor_progress_reserve SET "
-                            " last_reserve_in_serial_id=$1"
-                            ",last_reserve_out_serial_id=$2"
-                            ",last_reserve_recoup_serial_id=$3"
-                            ",last_reserve_close_serial_id=$4"
-                            " WHERE master_pub=$5",
-                            5),
-    /* Used in #postgres_get_auditor_progress_reserve() */
-    GNUNET_PQ_make_prepare ("auditor_progress_select_reserve",
-                            "SELECT"
-                            " last_reserve_in_serial_id"
-                            ",last_reserve_out_serial_id"
-                            ",last_reserve_recoup_serial_id"
-                            ",last_reserve_close_serial_id"
-                            " FROM auditor_progress_reserve"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_auditor_progress_reserve() */
-    GNUNET_PQ_make_prepare ("auditor_progress_insert_reserve",
-                            "INSERT INTO auditor_progress_reserve "
-                            "(master_pub"
-                            ",last_reserve_in_serial_id"
-                            ",last_reserve_out_serial_id"
-                            ",last_reserve_recoup_serial_id"
-                            ",last_reserve_close_serial_id"
-                            ") VALUES ($1,$2,$3,$4,$5);",
-                            5),
-    /* Used in #postgres_update_auditor_progress_aggregation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_update_aggregation",
-                            "UPDATE auditor_progress_aggregation SET "
-                            " last_wire_out_serial_id=$1"
-                            " WHERE master_pub=$2",
-                            2),
-    /* Used in #postgres_get_auditor_progress_aggregation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_select_aggregation",
-                            "SELECT"
-                            " last_wire_out_serial_id"
-                            " FROM auditor_progress_aggregation"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_auditor_progress_aggregation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_insert_aggregation",
-                            "INSERT INTO auditor_progress_aggregation "
-                            "(master_pub"
-                            ",last_wire_out_serial_id"
-                            ") VALUES ($1,$2);",
-                            2),
-    /* Used in #postgres_update_auditor_progress_deposit_confirmation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_update_deposit_confirmation",
-                            "UPDATE auditor_progress_deposit_confirmation SET "
-                            " last_deposit_confirmation_serial_id=$1"
-                            " WHERE master_pub=$2",
-                            2),
-    /* Used in #postgres_get_auditor_progress_deposit_confirmation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_select_deposit_confirmation",
-                            "SELECT"
-                            " last_deposit_confirmation_serial_id"
-                            " FROM auditor_progress_deposit_confirmation"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_auditor_progress_deposit_confirmation() */
-    GNUNET_PQ_make_prepare ("auditor_progress_insert_deposit_confirmation",
-                            "INSERT INTO auditor_progress_deposit_confirmation "
-                            "(master_pub"
-                            ",last_deposit_confirmation_serial_id"
-                            ") VALUES ($1,$2);",
-                            2),
-    /* Used in #postgres_update_auditor_progress_coin() */
-    GNUNET_PQ_make_prepare ("auditor_progress_update_coin",
-                            "UPDATE auditor_progress_coin SET "
-                            " last_withdraw_serial_id=$1"
-                            ",last_deposit_serial_id=$2"
-                            ",last_melt_serial_id=$3"
-                            ",last_refund_serial_id=$4"
-                            ",last_recoup_serial_id=$5"
-                            ",last_recoup_refresh_serial_id=$6"
-                            " WHERE master_pub=$7",
-                            7),
-    /* Used in #postgres_get_auditor_progress_coin() */
-    GNUNET_PQ_make_prepare ("auditor_progress_select_coin",
-                            "SELECT"
-                            " last_withdraw_serial_id"
-                            ",last_deposit_serial_id"
-                            ",last_melt_serial_id"
-                            ",last_refund_serial_id"
-                            ",last_recoup_serial_id"
-                            ",last_recoup_refresh_serial_id"
-                            " FROM auditor_progress_coin"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_auditor_progress() */
-    GNUNET_PQ_make_prepare ("auditor_progress_insert_coin",
-                            "INSERT INTO auditor_progress_coin "
-                            "(master_pub"
-                            ",last_withdraw_serial_id"
-                            ",last_deposit_serial_id"
-                            ",last_melt_serial_id"
-                            ",last_refund_serial_id"
-                            ",last_recoup_serial_id"
-                            ",last_recoup_refresh_serial_id"
-                            ") VALUES ($1,$2,$3,$4,$5,$6,$7);",
-                            7),
-    /* Used in #postgres_insert_wire_auditor_account_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_account_progress_insert",
-                            "INSERT INTO wire_auditor_account_progress "
-                            "(master_pub"
-                            ",account_name"
-                            ",last_wire_reserve_in_serial_id"
-                            ",last_wire_wire_out_serial_id"
-                            ",wire_in_off"
-                            ",wire_out_off"
-                            ") VALUES ($1,$2,$3,$4,$5,$6);",
-                            6),
-    /* Used in #postgres_update_wire_auditor_account_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_account_progress_update",
-                            "UPDATE wire_auditor_account_progress SET "
-                            " last_wire_reserve_in_serial_id=$1"
-                            ",last_wire_wire_out_serial_id=$2"
-                            ",wire_in_off=$3"
-                            ",wire_out_off=$4"
-                            " WHERE master_pub=$5 AND account_name=$6",
-                            6),
-    /* Used in #postgres_get_wire_auditor_account_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_account_progress_select",
-                            "SELECT"
-                            " last_wire_reserve_in_serial_id"
-                            ",last_wire_wire_out_serial_id"
-                            ",wire_in_off"
-                            ",wire_out_off"
-                            " FROM wire_auditor_account_progress"
-                            " WHERE master_pub=$1 AND account_name=$2;",
-                            2),
-    /* Used in #postgres_insert_wire_auditor_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_progress_insert",
-                            "INSERT INTO wire_auditor_progress "
-                            "(master_pub"
-                            ",last_timestamp"
-                            ",last_reserve_close_uuid"
-                            ") VALUES ($1,$2,$3);",
-                            3),
-    /* Used in #postgres_update_wire_auditor_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_progress_update",
-                            "UPDATE wire_auditor_progress SET "
-                            " last_timestamp=$1"
-                            ",last_reserve_close_uuid=$2"
-                            " WHERE master_pub=$3",
-                            3),
-    /* Used in #postgres_get_wire_auditor_progress() */
-    GNUNET_PQ_make_prepare ("wire_auditor_progress_select",
-                            "SELECT"
-                            " last_timestamp"
-                            ",last_reserve_close_uuid"
-                            " FROM wire_auditor_progress"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_reserve_info() */
-    GNUNET_PQ_make_prepare ("auditor_reserves_insert",
-                            "INSERT INTO auditor_reserves "
-                            "(reserve_pub"
-                            ",master_pub"
-                            ",reserve_balance_val"
-                            ",reserve_balance_frac"
-                            ",withdraw_fee_balance_val"
-                            ",withdraw_fee_balance_frac"
-                            ",expiration_date"
-                            ",origin_account"
-                            ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8);",
-                            8),
-    /* Used in #postgres_update_reserve_info() */
-    GNUNET_PQ_make_prepare ("auditor_reserves_update",
-                            "UPDATE auditor_reserves SET"
-                            " reserve_balance_val=$1"
-                            ",reserve_balance_frac=$2"
-                            ",withdraw_fee_balance_val=$3"
-                            ",withdraw_fee_balance_frac=$4"
-                            ",expiration_date=$5"
-                            " WHERE reserve_pub=$6 AND master_pub=$7;",
-                            7),
-    /* Used in #postgres_get_reserve_info() */
-    GNUNET_PQ_make_prepare ("auditor_reserves_select",
-                            "SELECT"
-                            " reserve_balance_val"
-                            ",reserve_balance_frac"
-                            ",withdraw_fee_balance_val"
-                            ",withdraw_fee_balance_frac"
-                            ",expiration_date"
-                            ",auditor_reserves_rowid"
-                            ",origin_account"
-                            " FROM auditor_reserves"
-                            " WHERE reserve_pub=$1 AND master_pub=$2;",
-                            2),
-    /* Used in #postgres_del_reserve_info() */
-    GNUNET_PQ_make_prepare ("auditor_reserves_delete",
-                            "DELETE"
-                            " FROM auditor_reserves"
-                            " WHERE reserve_pub=$1 AND master_pub=$2;",
-                            2),
-    /* Used in #postgres_insert_reserve_summary() */
-    GNUNET_PQ_make_prepare ("auditor_reserve_balance_insert",
-                            "INSERT INTO auditor_reserve_balance"
-                            "(master_pub"
-                            ",reserve_balance_val"
-                            ",reserve_balance_frac"
-                            ",withdraw_fee_balance_val"
-                            ",withdraw_fee_balance_frac"
-                            ") VALUES ($1,$2,$3,$4,$5)",
-                            5),
-    /* Used in #postgres_update_reserve_summary() */
-    GNUNET_PQ_make_prepare ("auditor_reserve_balance_update",
-                            "UPDATE auditor_reserve_balance SET"
-                            " reserve_balance_val=$1"
-                            ",reserve_balance_frac=$2"
-                            ",withdraw_fee_balance_val=$3"
-                            ",withdraw_fee_balance_frac=$4"
-                            " WHERE master_pub=$5;",
-                            5),
-    /* Used in #postgres_get_reserve_summary() */
-    GNUNET_PQ_make_prepare ("auditor_reserve_balance_select",
-                            "SELECT"
-                            " reserve_balance_val"
-                            ",reserve_balance_frac"
-                            ",withdraw_fee_balance_val"
-                            ",withdraw_fee_balance_frac"
-                            " FROM auditor_reserve_balance"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_wire_fee_summary() */
-    GNUNET_PQ_make_prepare ("auditor_wire_fee_balance_insert",
-                            "INSERT INTO auditor_wire_fee_balance"
-                            "(master_pub"
-                            ",wire_fee_balance_val"
-                            ",wire_fee_balance_frac"
-                            ") VALUES ($1,$2,$3)",
-                            3),
-    /* Used in #postgres_update_wire_fee_summary() */
-    GNUNET_PQ_make_prepare ("auditor_wire_fee_balance_update",
-                            "UPDATE auditor_wire_fee_balance SET"
-                            " wire_fee_balance_val=$1"
-                            ",wire_fee_balance_frac=$2"
-                            " WHERE master_pub=$3;",
-                            3),
-    /* Used in #postgres_get_wire_fee_summary() */
-    GNUNET_PQ_make_prepare ("auditor_wire_fee_balance_select",
-                            "SELECT"
-                            " wire_fee_balance_val"
-                            ",wire_fee_balance_frac"
-                            " FROM auditor_wire_fee_balance"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_denomination_balance() */
-    GNUNET_PQ_make_prepare ("auditor_denomination_pending_insert",
-                            "INSERT INTO auditor_denomination_pending "
-                            "(denom_pub_hash"
-                            ",denom_balance_val"
-                            ",denom_balance_frac"
-                            ",denom_loss_val"
-                            ",denom_loss_frac"
-                            ",num_issued"
-                            ",denom_risk_val"
-                            ",denom_risk_frac"
-                            ",recoup_loss_val"
-                            ",recoup_loss_frac"
-                            ") VALUES ("
-                            "$1,$2,$3,$4,$5,$6,$7,$8,$9,$10"
-                            ");",
-                            10),
-    /* Used in #postgres_update_denomination_balance() */
-    GNUNET_PQ_make_prepare ("auditor_denomination_pending_update",
-                            "UPDATE auditor_denomination_pending SET"
-                            " denom_balance_val=$1"
-                            ",denom_balance_frac=$2"
-                            ",denom_loss_val=$3"
-                            ",denom_loss_frac=$4"
-                            ",num_issued=$5"
-                            ",denom_risk_val=$6"
-                            ",denom_risk_frac=$7"
-                            ",recoup_loss_val=$8"
-                            ",recoup_loss_frac=$9"
-                            " WHERE denom_pub_hash=$10",
-                            10),
-    /* Used in #postgres_get_denomination_balance() */
-    GNUNET_PQ_make_prepare ("auditor_denomination_pending_select",
-                            "SELECT"
-                            " denom_balance_val"
-                            ",denom_balance_frac"
-                            ",denom_loss_val"
-                            ",denom_loss_frac"
-                            ",num_issued"
-                            ",denom_risk_val"
-                            ",denom_risk_frac"
-                            ",recoup_loss_val"
-                            ",recoup_loss_frac"
-                            " FROM auditor_denomination_pending"
-                            " WHERE denom_pub_hash=$1",
-                            1),
-    /* Used in #postgres_insert_balance_summary() */
-    GNUNET_PQ_make_prepare ("auditor_balance_summary_insert",
-                            "INSERT INTO auditor_balance_summary "
-                            "(master_pub"
-                            ",denom_balance_val"
-                            ",denom_balance_frac"
-                            ",deposit_fee_balance_val"
-                            ",deposit_fee_balance_frac"
-                            ",melt_fee_balance_val"
-                            ",melt_fee_balance_frac"
-                            ",refund_fee_balance_val"
-                            ",refund_fee_balance_frac"
-                            ",risk_val"
-                            ",risk_frac"
-                            ",loss_val"
-                            ",loss_frac"
-                            ",irregular_recoup_val"
-                            ",irregular_recoup_frac"
-                            ") VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,"
-                            "          $11,$12,$13,$14,$15);",
-                            15),
-    /* Used in #postgres_update_balance_summary() */
-    GNUNET_PQ_make_prepare ("auditor_balance_summary_update",
-                            "UPDATE auditor_balance_summary SET"
-                            " denom_balance_val=$1"
-                            ",denom_balance_frac=$2"
-                            ",deposit_fee_balance_val=$3"
-                            ",deposit_fee_balance_frac=$4"
-                            ",melt_fee_balance_val=$5"
-                            ",melt_fee_balance_frac=$6"
-                            ",refund_fee_balance_val=$7"
-                            ",refund_fee_balance_frac=$8"
-                            ",risk_val=$9"
-                            ",risk_frac=$10"
-                            ",loss_val=$11"
-                            ",loss_frac=$12"
-                            ",irregular_recoup_val=$13"
-                            ",irregular_recoup_frac=$14"
-                            " WHERE master_pub=$15;",
-                            15),
-    /* Used in #postgres_get_balance_summary() */
-    GNUNET_PQ_make_prepare ("auditor_balance_summary_select",
-                            "SELECT"
-                            " denom_balance_val"
-                            ",denom_balance_frac"
-                            ",deposit_fee_balance_val"
-                            ",deposit_fee_balance_frac"
-                            ",melt_fee_balance_val"
-                            ",melt_fee_balance_frac"
-                            ",refund_fee_balance_val"
-                            ",refund_fee_balance_frac"
-                            ",risk_val"
-                            ",risk_frac"
-                            ",loss_val"
-                            ",loss_frac"
-                            ",irregular_recoup_val"
-                            ",irregular_recoup_frac"
-                            " FROM auditor_balance_summary"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_historic_denom_revenue() */
-    GNUNET_PQ_make_prepare ("auditor_historic_denomination_revenue_insert",
-                            "INSERT INTO auditor_historic_denomination_revenue"
-                            "(master_pub"
-                            ",denom_pub_hash"
-                            ",revenue_timestamp"
-                            ",revenue_balance_val"
-                            ",revenue_balance_frac"
-                            ",loss_balance_val"
-                            ",loss_balance_frac"
-                            ") VALUES ($1,$2,$3,$4,$5,$6,$7);",
-                            7),
-    /* Used in #postgres_select_historic_denom_revenue() */
-    GNUNET_PQ_make_prepare ("auditor_historic_denomination_revenue_select",
-                            "SELECT"
-                            " denom_pub_hash"
-                            ",revenue_timestamp"
-                            ",revenue_balance_val"
-                            ",revenue_balance_frac"
-                            ",loss_balance_val"
-                            ",loss_balance_frac"
-                            " FROM auditor_historic_denomination_revenue"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_historic_reserve_revenue() */
-    GNUNET_PQ_make_prepare ("auditor_historic_reserve_summary_insert",
-                            "INSERT INTO auditor_historic_reserve_summary"
-                            "(master_pub"
-                            ",start_date"
-                            ",end_date"
-                            ",reserve_profits_val"
-                            ",reserve_profits_frac"
-                            ") VALUES ($1,$2,$3,$4,$5);",
-                            5),
-    /* Used in #postgres_select_historic_reserve_revenue() */
-    GNUNET_PQ_make_prepare ("auditor_historic_reserve_summary_select",
-                            "SELECT"
-                            " start_date"
-                            ",end_date"
-                            ",reserve_profits_val"
-                            ",reserve_profits_frac"
-                            " FROM auditor_historic_reserve_summary"
-                            " WHERE master_pub=$1;",
-                            1),
-    /* Used in #postgres_insert_predicted_result() */
-    GNUNET_PQ_make_prepare ("auditor_predicted_result_insert",
-                            "INSERT INTO auditor_predicted_result"
-                            "(master_pub"
-                            ",balance_val"
-                            ",balance_frac"
-                            ") VALUES ($1,$2,$3);",
-                            3),
-    /* Used in #postgres_update_predicted_result() */
-    GNUNET_PQ_make_prepare ("auditor_predicted_result_update",
-                            "UPDATE auditor_predicted_result SET"
-                            " balance_val=$1"
-                            ",balance_frac=$2"
-                            " WHERE master_pub=$3;",
-                            3),
-    /* Used in #postgres_get_predicted_balance() */
-    GNUNET_PQ_make_prepare ("auditor_predicted_result_select",
-                            "SELECT"
-                            " balance_val"
-                            ",balance_frac"
-                            " FROM auditor_predicted_result"
-                            " WHERE master_pub=$1;",
-                            1),
-    GNUNET_PQ_PREPARED_STATEMENT_END
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_try_execute ("SET search_path TO auditor;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
   };
   struct GNUNET_PQ_Context *db_conn;
 
@@ -659,11 +248,12 @@ setup_connection (struct PostgresClosure *pg)
   db_conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
                                         "auditordb-postgres",
                                         NULL,
-                                        NULL,
-                                        ps);
+                                        es,
+                                        NULL);
   if (NULL == db_conn)
     return GNUNET_SYSERR;
   pg->conn = db_conn;
+  pg->prep_gen++;
   return GNUNET_OK;
 }
 
@@ -778,6 +368,9 @@ postgres_commit (void *cls)
     GNUNET_PQ_query_param_end
   };
 
+  PREPARE (pg,
+           "do_commit",
+           "COMMIT");
   return GNUNET_PQ_eval_prepared_non_select (pg->conn,
                                              "do_commit",
                                              params);
@@ -804,19 +397,18 @@ postgres_gc (void *cls)
   struct GNUNET_PQ_Context *conn;
   enum GNUNET_DB_QueryStatus qs;
   struct GNUNET_PQ_PreparedStatement ps[] = {
-#if 0
-    GNUNET_PQ_make_prepare ("gc_auditor",
-                            "TODO: #4960",
-                            0),
-#endif
     GNUNET_PQ_PREPARED_STATEMENT_END
   };
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_try_execute ("SET search_path TO auditor;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
 
   now = GNUNET_TIME_absolute_get ();
   conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
                                      "auditordb-postgres",
                                      NULL,
-                                     NULL,
+                                     es,
                                      ps);
   if (NULL == conn)
     return GNUNET_SYSERR;
@@ -836,1993 +428,6 @@ postgres_gc (void *cls)
 
 
 /**
- * Insert information about an exchange this auditor will be auditing.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param exchange_url public (base) URL of the API of the exchange
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_exchange (void *cls,
-                          const struct TALER_MasterPublicKeyP *master_pub,
-                          const char *exchange_url)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_string (exchange_url),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_insert_exchange",
-                                             params);
-}
-
-
-/**
- * Delete an exchange from the list of exchanges this auditor is auditing.
- * Warning: this will cascade and delete all knowledge of this auditor related
- * to this exchange!
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_delete_exchange (void *cls,
-                          const struct TALER_MasterPublicKeyP *master_pub)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_delete_exchange",
-                                             params);
-}
-
-
-/**
- * Closure for #exchange_info_cb().
- */
-struct ExchangeInfoContext
-{
-
-  /**
-   * Function to call for each exchange.
-   */
-  TALER_AUDITORDB_ExchangeCallback cb;
-
-  /**
-   * Closure for @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Query status to return.
-   */
-  enum GNUNET_DB_QueryStatus qs;
-};
-
-
-/**
- * Helper function for #postgres_list_exchanges().
- * To be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct ExchangeInfoContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-exchange_info_cb (void *cls,
-                  PGresult *result,
-                  unsigned int num_results)
-{
-  struct ExchangeInfoContext *eic = cls;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct TALER_MasterPublicKeyP master_pub;
-    char *exchange_url;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("master_pub", &master_pub),
-      GNUNET_PQ_result_spec_string ("exchange_url", &exchange_url),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      eic->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-    eic->qs = i + 1;
-    eic->cb (eic->cb_cls,
-             &master_pub,
-             exchange_url);
-    GNUNET_free (exchange_url);
-  }
-}
-
-
-/**
- * Obtain information about exchanges this auditor is auditing.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call with the results
- * @param cb_cls closure for @a cb
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_list_exchanges (void *cls,
-                         TALER_AUDITORDB_ExchangeCallback cb,
-                         void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  struct ExchangeInfoContext eic = {
-    .cb = cb,
-    .cb_cls = cb_cls
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "auditor_list_exchanges",
-                                             params,
-                                             &exchange_info_cb,
-                                             &eic);
-  if (qs > 0)
-    return eic.qs;
-  GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
-  return qs;
-}
-
-
-/**
- * Insert information about a signing key of the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param sk signing key information to store
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_exchange_signkey (
-  void *cls,
-  const struct TALER_AUDITORDB_ExchangeSigningKey *sk)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&sk->master_public_key),
-    GNUNET_PQ_query_param_timestamp (&sk->ep_start),
-    GNUNET_PQ_query_param_timestamp (&sk->ep_expire),
-    GNUNET_PQ_query_param_timestamp (&sk->ep_end),
-    GNUNET_PQ_query_param_auto_from_type (&sk->exchange_pub),
-    GNUNET_PQ_query_param_auto_from_type (&sk->master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_insert_exchange_signkey",
-                                             params);
-}
-
-
-/**
- * Insert information about a deposit confirmation into the database.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param dc deposit confirmation information to store
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_deposit_confirmation (
-  void *cls,
-  const struct TALER_AUDITORDB_DepositConfirmation *dc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&dc->master_public_key),
-    GNUNET_PQ_query_param_auto_from_type (&dc->h_contract_terms),
-    GNUNET_PQ_query_param_auto_from_type (&dc->h_extensions),
-    GNUNET_PQ_query_param_auto_from_type (&dc->h_wire),
-    GNUNET_PQ_query_param_timestamp (&dc->exchange_timestamp),
-    GNUNET_PQ_query_param_timestamp (&dc->wire_deadline),
-    GNUNET_PQ_query_param_timestamp (&dc->refund_deadline),
-    TALER_PQ_query_param_amount (&dc->amount_without_fee),
-    GNUNET_PQ_query_param_auto_from_type (&dc->coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&dc->merchant),
-    GNUNET_PQ_query_param_auto_from_type (&dc->exchange_sig),
-    GNUNET_PQ_query_param_auto_from_type (&dc->exchange_pub),
-    GNUNET_PQ_query_param_auto_from_type (&dc->master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_deposit_confirmation_insert",
-                                             params);
-}
-
-
-/**
- * Closure for #deposit_confirmation_cb().
- */
-struct DepositConfirmationContext
-{
-
-  /**
-   * Master public key that is being used.
-   */
-  const struct TALER_MasterPublicKeyP *master_pub;
-
-  /**
-   * Function to call for each deposit confirmation.
-   */
-  TALER_AUDITORDB_DepositConfirmationCallback cb;
-
-  /**
-   * Closure for @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Query status to return.
-   */
-  enum GNUNET_DB_QueryStatus qs;
-};
-
-
-/**
- * Helper function for #postgres_get_deposit_confirmations().
- * To be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct DepositConfirmationContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-deposit_confirmation_cb (void *cls,
-                         PGresult *result,
-                         unsigned int num_results)
-{
-  struct DepositConfirmationContext *dcc = cls;
-  struct PostgresClosure *pg = dcc->pg;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    uint64_t serial_id;
-    struct TALER_AUDITORDB_DepositConfirmation dc = {
-      .master_public_key = *dcc->master_pub
-    };
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("serial_id",
-                                    &serial_id),
-      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                            &dc.h_contract_terms),
-      GNUNET_PQ_result_spec_auto_from_type ("h_extensions",
-                                            &dc.h_extensions),
-      GNUNET_PQ_result_spec_auto_from_type ("h_wire",
-                                            &dc.h_wire),
-      GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
-                                       &dc.exchange_timestamp),
-      GNUNET_PQ_result_spec_timestamp ("refund_deadline",
-                                       &dc.refund_deadline),
-      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                       &dc.wire_deadline),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_without_fee",
-                                   &dc.amount_without_fee),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &dc.coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                            &dc.merchant),
-      GNUNET_PQ_result_spec_auto_from_type ("exchange_sig",
-                                            &dc.exchange_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
-                                            &dc.exchange_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &dc.master_sig),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      dcc->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-    dcc->qs = i + 1;
-    if (GNUNET_OK !=
-        dcc->cb (dcc->cb_cls,
-                 serial_id,
-                 &dc))
-      break;
-  }
-}
-
-
-/**
- * Get information about deposit confirmations from the database.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_public_key for which exchange do we want to get deposit confirmations
- * @param start_id row/serial ID where to start the iteration (0 from
- *                  the start, exclusive, i.e. serial_ids must start from 1)
- * @param cb function to call with results
- * @param cb_cls closure for @a cb
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_deposit_confirmations (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_public_key,
-  uint64_t start_id,
-  TALER_AUDITORDB_DepositConfirmationCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_public_key),
-    GNUNET_PQ_query_param_uint64 (&start_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct DepositConfirmationContext dcc = {
-    .master_pub = master_public_key,
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "auditor_deposit_confirmation_select",
-                                             params,
-                                             &deposit_confirmation_cb,
-                                             &dcc);
-  if (qs > 0)
-    return dcc.qs;
-  GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
-  return qs;
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppr where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor_progress_reserve (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointReserve *ppr)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_in_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_out_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_recoup_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_close_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_insert_reserve",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppr where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_auditor_progress_reserve (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointReserve *ppr)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_in_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_out_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_recoup_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppr->last_reserve_close_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_update_reserve",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] ppr set to where the auditor is in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_auditor_progress_reserve (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct TALER_AUDITORDB_ProgressPointReserve *ppr)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("last_reserve_in_serial_id",
-                                  &ppr->last_reserve_in_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_reserve_out_serial_id",
-                                  &ppr->last_reserve_out_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_reserve_recoup_serial_id",
-                                  &ppr->last_reserve_recoup_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_reserve_close_serial_id",
-                                  &ppr->last_reserve_close_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_progress_select_reserve",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppa where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor_progress_aggregation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointAggregation *ppa)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_uint64 (&ppa->last_wire_out_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_insert_aggregation",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppa where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_auditor_progress_aggregation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointAggregation *ppa)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&ppa->last_wire_out_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_update_aggregation",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] ppa set to where the auditor is in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_auditor_progress_aggregation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct TALER_AUDITORDB_ProgressPointAggregation *ppa)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("last_wire_out_serial_id",
-                                  &ppa->last_wire_out_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_progress_select_aggregation",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppdc where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor_progress_deposit_confirmation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_uint64 (&ppdc->last_deposit_confirmation_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_insert_deposit_confirmation",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppdc where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_auditor_progress_deposit_confirmation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&ppdc->last_deposit_confirmation_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_update_deposit_confirmation",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] ppdc set to where the auditor is in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_auditor_progress_deposit_confirmation (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("last_deposit_confirmation_serial_id",
-                                  &ppdc->last_deposit_confirmation_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_progress_select_deposit_confirmation",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppc where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor_progress_coin (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointCoin *ppc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_withdraw_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_deposit_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_melt_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_refund_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_recoup_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_recoup_refresh_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_insert_coin",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppc where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_auditor_progress_coin (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_ProgressPointCoin *ppc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&ppc->last_withdraw_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_deposit_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_melt_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_refund_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_recoup_serial_id),
-    GNUNET_PQ_query_param_uint64 (&ppc->last_recoup_refresh_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_progress_update_coin",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] ppc set to where the auditor is in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_auditor_progress_coin (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct TALER_AUDITORDB_ProgressPointCoin *ppc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("last_withdraw_serial_id",
-                                  &ppc->last_withdraw_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_deposit_serial_id",
-                                  &ppc->last_deposit_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_melt_serial_id",
-                                  &ppc->last_melt_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_refund_serial_id",
-                                  &ppc->last_refund_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_recoup_serial_id",
-                                  &ppc->last_recoup_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_recoup_refresh_serial_id",
-                                  &ppc->last_recoup_refresh_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_progress_select_coin",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param account_name name of the wire account we are auditing
- * @param pp how far are we in the auditor's tables
- * @param in_wire_off how far are we in the incoming wire transfers
- * @param out_wire_off how far are we in the outgoing wire transfers
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_wire_auditor_account_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const char *account_name,
-  const struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-  uint64_t in_wire_off,
-  uint64_t out_wire_off)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_string (account_name),
-    GNUNET_PQ_query_param_uint64 (&pp->last_reserve_in_serial_id),
-    GNUNET_PQ_query_param_uint64 (&pp->last_wire_out_serial_id),
-    GNUNET_PQ_query_param_uint64 (&in_wire_off),
-    GNUNET_PQ_query_param_uint64 (&out_wire_off),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_auditor_account_progress_insert",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param account_name name of the wire account we are auditing
- * @param pp where is the auditor in processing
- * @param in_wire_off how far are we in the incoming wire transaction history
- * @param out_wire_off how far are we in the outgoing wire transaction history
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_wire_auditor_account_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const char *account_name,
-  const struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-  uint64_t in_wire_off,
-  uint64_t out_wire_off)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&pp->last_reserve_in_serial_id),
-    GNUNET_PQ_query_param_uint64 (&pp->last_wire_out_serial_id),
-    GNUNET_PQ_query_param_uint64 (&in_wire_off),
-    GNUNET_PQ_query_param_uint64 (&out_wire_off),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_string (account_name),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_auditor_account_progress_update",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param account_name name of the wire account we are auditing
- * @param[out] pp where is the auditor in processing
- * @param[out] in_wire_off how far are we in the incoming wire transaction history
- * @param[out] out_wire_off how far are we in the outgoing wire transaction history
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_auditor_account_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const char *account_name,
-  struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-  uint64_t *in_wire_off,
-  uint64_t *out_wire_off)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_string (account_name),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("last_wire_reserve_in_serial_id",
-                                  &pp->last_reserve_in_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("last_wire_wire_out_serial_id",
-                                  &pp->last_wire_out_serial_id),
-    GNUNET_PQ_result_spec_uint64 ("wire_in_off",
-                                  in_wire_off),
-    GNUNET_PQ_result_spec_uint64 ("wire_out_off",
-                                  out_wire_off),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "wire_auditor_account_progress_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param pp where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_wire_auditor_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_WireProgressPoint *pp)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_timestamp (&pp->last_timestamp),
-    GNUNET_PQ_query_param_uint64 (&pp->last_reserve_close_uuid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_auditor_progress_insert",
-                                             params);
-}
-
-
-/**
- * Update information about the progress of the auditor.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param pp where is the auditor in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_wire_auditor_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_AUDITORDB_WireProgressPoint *pp)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&pp->last_timestamp),
-    GNUNET_PQ_query_param_uint64 (&pp->last_reserve_close_uuid),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_auditor_progress_update",
-                                             params);
-}
-
-
-/**
- * Get information about the progress of the auditor.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] pp set to where the auditor is in processing
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_auditor_progress (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct TALER_AUDITORDB_WireProgressPoint *pp)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("last_timestamp",
-                                     &pp->last_timestamp),
-    GNUNET_PQ_result_spec_uint64 ("last_reserve_close_uuid",
-                                  &pp->last_reserve_close_uuid),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "wire_auditor_progress_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about a reserve.  There must not be an
- * existing record for the reserve.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param master_pub master public key of the exchange
- * @param reserve_balance amount stored in the reserve
- * @param withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @param expiration_date expiration date of the reserve
- * @param origin_account where did the money in the reserve originally come from
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_reserve_info (void *cls,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              const struct TALER_MasterPublicKeyP *master_pub,
-                              const struct TALER_Amount *reserve_balance,
-                              const struct TALER_Amount *withdraw_fee_balance,
-                              struct GNUNET_TIME_Timestamp expiration_date,
-                              const char *origin_account)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    TALER_PQ_query_param_amount (reserve_balance),
-    TALER_PQ_query_param_amount (withdraw_fee_balance),
-    GNUNET_PQ_query_param_timestamp (&expiration_date),
-    GNUNET_PQ_query_param_string (origin_account),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (reserve_balance,
-                                            withdraw_fee_balance));
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_reserves_insert",
-                                             params);
-}
-
-
-/**
- * Update information about a reserve.  Destructively updates an
- * existing record, which must already exist.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param master_pub master public key of the exchange
- * @param reserve_balance amount stored in the reserve
- * @param withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @param expiration_date expiration date of the reserve
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_reserve_info (void *cls,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              const struct TALER_MasterPublicKeyP *master_pub,
-                              const struct TALER_Amount *reserve_balance,
-                              const struct TALER_Amount *withdraw_fee_balance,
-                              struct GNUNET_TIME_Timestamp expiration_date)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (reserve_balance),
-    TALER_PQ_query_param_amount (withdraw_fee_balance),
-    GNUNET_PQ_query_param_timestamp (&expiration_date),
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (reserve_balance,
-                                            withdraw_fee_balance));
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_reserves_update",
-                                             params);
-}
-
-
-/**
- * Delete information about a reserve.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param master_pub master public key of the exchange
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_del_reserve_info (void *cls,
-                           const struct TALER_ReservePublicKeyP *reserve_pub,
-                           const struct TALER_MasterPublicKeyP *master_pub)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_reserves_delete",
-                                             params);
-}
-
-
-/**
- * Get information about a reserve.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param master_pub master public key of the exchange
- * @param[out] rowid which row did we get the information from
- * @param[out] reserve_balance amount stored in the reserve
- * @param[out] withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @param[out] expiration_date expiration date of the reserve
- * @param[out] sender_account from where did the money in the reserve originally come from
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_info (void *cls,
-                           const struct TALER_ReservePublicKeyP *reserve_pub,
-                           const struct TALER_MasterPublicKeyP *master_pub,
-                           uint64_t *rowid,
-                           struct TALER_Amount *reserve_balance,
-                           struct TALER_Amount *withdraw_fee_balance,
-                           struct GNUNET_TIME_Timestamp *expiration_date,
-                           char **sender_account)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_balance", reserve_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("withdraw_fee_balance", withdraw_fee_balance),
-    GNUNET_PQ_result_spec_timestamp ("expiration_date", expiration_date),
-    GNUNET_PQ_result_spec_uint64 ("auditor_reserves_rowid", rowid),
-    GNUNET_PQ_result_spec_string ("origin_account", sender_account),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_reserves_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about all reserves.  There must not be an
- * existing record for the @a master_pub.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param reserve_balance amount stored in the reserve
- * @param withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_reserve_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *reserve_balance,
-  const struct TALER_Amount *withdraw_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    TALER_PQ_query_param_amount (reserve_balance),
-    TALER_PQ_query_param_amount (withdraw_fee_balance),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (reserve_balance,
-                                            withdraw_fee_balance));
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_reserve_balance_insert",
-                                             params);
-}
-
-
-/**
- * Update information about all reserves.  Destructively updates an
- * existing record, which must already exist.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param reserve_balance amount stored in the reserve
- * @param withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_reserve_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *reserve_balance,
-  const struct TALER_Amount *withdraw_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (reserve_balance),
-    TALER_PQ_query_param_amount (withdraw_fee_balance),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_reserve_balance_update",
-                                             params);
-}
-
-
-/**
- * Get summary information about all reserves.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param[out] reserve_balance amount stored in the reserve
- * @param[out] withdraw_fee_balance amount the exchange gained in withdraw fees
- *                             due to withdrawals from this reserve
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_summary (void *cls,
-                              const struct TALER_MasterPublicKeyP *master_pub,
-                              struct TALER_Amount *reserve_balance,
-                              struct TALER_Amount *withdraw_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_balance", reserve_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("withdraw_fee_balance", withdraw_fee_balance),
-
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_reserve_balance_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about exchange's wire fee balance. There must not be an
- * existing record for the same @a master_pub.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param wire_fee_balance amount the exchange gained in wire fees
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_wire_fee_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *wire_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    TALER_PQ_query_param_amount (wire_fee_balance),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_wire_fee_balance_insert",
-                                             params);
-}
-
-
-/**
- * Insert information about exchange's wire fee balance.  Destructively updates an
- * existing record, which must already exist.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param wire_fee_balance amount the exchange gained in wire fees
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_wire_fee_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *wire_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (wire_fee_balance),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_wire_fee_balance_update",
-                                             params);
-}
-
-
-/**
- * Get summary information about an exchanges wire fee balance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master public key of the exchange
- * @param[out] wire_fee_balance set amount the exchange gained in wire fees
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_fee_summary (void *cls,
-                               const struct TALER_MasterPublicKeyP *master_pub,
-                               struct TALER_Amount *wire_fee_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee_balance",
-                                 wire_fee_balance),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_wire_fee_balance_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about a denomination key's balances.  There
- * must not be an existing record for the denomination key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param denom_pub_hash hash of the denomination public key
- * @param denom_balance value of coins outstanding with this denomination key
- * @param denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
- * @param denom_risk value of coins issued with this denomination key
- * @param recoup_loss losses from recoup (if this denomination was revoked)
- * @param num_issued how many coins of this denomination did the exchange blind-sign
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_denomination_balance (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  const struct TALER_Amount *denom_balance,
-  const struct TALER_Amount *denom_loss,
-  const struct TALER_Amount *denom_risk,
-  const struct TALER_Amount *recoup_loss,
-  uint64_t num_issued)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    TALER_PQ_query_param_amount (denom_balance),
-    TALER_PQ_query_param_amount (denom_loss),
-    GNUNET_PQ_query_param_uint64 (&num_issued),
-    TALER_PQ_query_param_amount (denom_risk),
-    TALER_PQ_query_param_amount (recoup_loss),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_denomination_pending_insert",
-                                             params);
-}
-
-
-/**
- * Update information about a denomination key's balances.  There
- * must be an existing record for the denomination key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param denom_pub_hash hash of the denomination public key
- * @param denom_balance value of coins outstanding with this denomination key
- * @param denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
-* @param denom_risk value of coins issued with this denomination key
- * @param recoup_loss losses from recoup (if this denomination was revoked)
- * @param num_issued how many coins of this denomination did the exchange blind-sign
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_denomination_balance (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  const struct TALER_Amount *denom_balance,
-  const struct TALER_Amount *denom_loss,
-  const struct TALER_Amount *denom_risk,
-  const struct TALER_Amount *recoup_loss,
-  uint64_t num_issued)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (denom_balance),
-    TALER_PQ_query_param_amount (denom_loss),
-    GNUNET_PQ_query_param_uint64 (&num_issued),
-    TALER_PQ_query_param_amount (denom_risk),
-    TALER_PQ_query_param_amount (recoup_loss),
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_denomination_pending_update",
-                                             params);
-}
-
-
-/**
- * Get information about a denomination key's balances.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param denom_pub_hash hash of the denomination public key
- * @param[out] denom_balance value of coins outstanding with this denomination key
- * @param[out] denom_risk value of coins issued with this denomination key
- * @param[out] denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
- * @param[out] recoup_loss losses from recoup (if this denomination was revoked)
- * @param[out] num_issued how many coins of this denomination did the exchange blind-sign
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_denomination_balance (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  struct TALER_Amount *denom_balance,
-  struct TALER_Amount *denom_loss,
-  struct TALER_Amount *denom_risk,
-  struct TALER_Amount *recoup_loss,
-  uint64_t *num_issued)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_balance", denom_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_loss", denom_loss),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_risk", denom_risk),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("recoup_loss", recoup_loss),
-    GNUNET_PQ_result_spec_uint64 ("num_issued", num_issued),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_denomination_pending_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about an exchange's denomination balances.  There
- * must not be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param denom_balance value of coins outstanding with this denomination key
- * @param deposit_fee_balance total deposit fees collected for this DK
- * @param melt_fee_balance total melt fees collected for this DK
- * @param refund_fee_balance total refund fees collected for this DK
- * @param risk maximum risk exposure of the exchange
- * @param loss materialized @a risk from recoup
- * @param irregular_recoup recoups on non-revoked coins
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_balance_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *denom_balance,
-  const struct TALER_Amount *deposit_fee_balance,
-  const struct TALER_Amount *melt_fee_balance,
-  const struct TALER_Amount *refund_fee_balance,
-  const struct TALER_Amount *risk,
-  const struct TALER_Amount *loss,
-  const struct TALER_Amount *irregular_recoup)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    TALER_PQ_query_param_amount (denom_balance),
-    TALER_PQ_query_param_amount (deposit_fee_balance),
-    TALER_PQ_query_param_amount (melt_fee_balance),
-    TALER_PQ_query_param_amount (refund_fee_balance),
-    TALER_PQ_query_param_amount (risk),
-    TALER_PQ_query_param_amount (loss),
-    TALER_PQ_query_param_amount (irregular_recoup),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (denom_balance,
-                                            deposit_fee_balance));
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (denom_balance,
-                                            melt_fee_balance));
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (denom_balance,
-                                            refund_fee_balance));
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_balance_summary_insert",
-                                             params);
-}
-
-
-/**
- * Update information about an exchange's denomination balances.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param denom_balance value of coins outstanding with this denomination key
- * @param deposit_fee_balance total deposit fees collected for this DK
- * @param melt_fee_balance total melt fees collected for this DK
- * @param refund_fee_balance total refund fees collected for this DK
- * @param risk maximum risk exposure of the exchange
- * @param loss materialized @a risk from recoup
- * @param irregular_recoup recoups made on non-revoked coins
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_balance_summary (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *denom_balance,
-  const struct TALER_Amount *deposit_fee_balance,
-  const struct TALER_Amount *melt_fee_balance,
-  const struct TALER_Amount *refund_fee_balance,
-  const struct TALER_Amount *risk,
-  const struct TALER_Amount *loss,
-  const struct TALER_Amount *irregular_recoup)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (denom_balance),
-    TALER_PQ_query_param_amount (deposit_fee_balance),
-    TALER_PQ_query_param_amount (melt_fee_balance),
-    TALER_PQ_query_param_amount (refund_fee_balance),
-    TALER_PQ_query_param_amount (risk),
-    TALER_PQ_query_param_amount (loss),
-    TALER_PQ_query_param_amount (irregular_recoup),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_balance_summary_update",
-                                             params);
-}
-
-
-/**
- * Get information about an exchange's denomination balances.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] denom_balance value of coins outstanding with this denomination key
- * @param[out] deposit_fee_balance total deposit fees collected for this DK
- * @param[out] melt_fee_balance total melt fees collected for this DK
- * @param[out] refund_fee_balance total refund fees collected for this DK
- * @param[out] risk maximum risk exposure of the exchange
- * @param[out] loss losses from recoup (on revoked denominations)
- * @param[out] irregular_recoup recoups on NOT revoked denominations
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_balance_summary (void *cls,
-                              const struct TALER_MasterPublicKeyP *master_pub,
-                              struct TALER_Amount *denom_balance,
-                              struct TALER_Amount *deposit_fee_balance,
-                              struct TALER_Amount *melt_fee_balance,
-                              struct TALER_Amount *refund_fee_balance,
-                              struct TALER_Amount *risk,
-                              struct TALER_Amount *loss,
-                              struct TALER_Amount *irregular_recoup)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("denom_balance", denom_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("deposit_fee_balance", deposit_fee_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("melt_fee_balance", melt_fee_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("refund_fee_balance", refund_fee_balance),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("risk", risk),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("loss", loss),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("irregular_recoup", irregular_recoup),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_balance_summary_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about an exchange's historic
- * revenue about a denomination key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param denom_pub_hash hash of the denomination key
- * @param revenue_timestamp when did this profit get realized
- * @param revenue_balance what was the total profit made from
- *                        deposit fees, melting fees, refresh fees
- *                        and coins that were never returned?
- * @param loss_balance total losses suffered by the exchange at the time
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_historic_denom_revenue (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  struct GNUNET_TIME_Timestamp revenue_timestamp,
-  const struct TALER_Amount *revenue_balance,
-  const struct TALER_Amount *loss_balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_timestamp (&revenue_timestamp),
-    TALER_PQ_query_param_amount (revenue_balance),
-    TALER_PQ_query_param_amount (loss_balance),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_historic_denomination_revenue_insert",
-                                             params);
-}
-
-
-/**
- * Closure for #historic_denom_revenue_cb().
- */
-struct HistoricDenomRevenueContext
-{
-  /**
-   * Function to call for each result.
-   */
-  TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Number of results processed.
-   */
-  enum GNUNET_DB_QueryStatus qs;
-};
-
-
-/**
- * Helper function for #postgres_select_historic_denom_revenue().
- * To be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct HistoricRevenueContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-historic_denom_revenue_cb (void *cls,
-                           PGresult *result,
-                           unsigned int num_results)
-{
-  struct HistoricDenomRevenueContext *hrc = cls;
-  struct PostgresClosure *pg = hrc->pg;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct TALER_DenominationHashP denom_pub_hash;
-    struct GNUNET_TIME_Timestamp revenue_timestamp;
-    struct TALER_Amount revenue_balance;
-    struct TALER_Amount loss;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            &denom_pub_hash),
-      GNUNET_PQ_result_spec_timestamp ("revenue_timestamp",
-                                       &revenue_timestamp),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("revenue_balance",
-                                   &revenue_balance),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("loss_balance",
-                                   &loss),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      hrc->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-
-    hrc->qs = i + 1;
-    if (GNUNET_OK !=
-        hrc->cb (hrc->cb_cls,
-                 &denom_pub_hash,
-                 revenue_timestamp,
-                 &revenue_balance,
-                 &loss))
-      break;
-  }
-}
-
-
-/**
- * Obtain all of the historic denomination key revenue
- * of the given @a master_pub.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param cb function to call with the results
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_historic_denom_revenue (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct HistoricDenomRevenueContext hrc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "auditor_historic_denomination_revenue_select",
-                                             params,
-                                             &historic_denom_revenue_cb,
-                                             &hrc);
-  if (qs <= 0)
-    return qs;
-  return hrc.qs;
-}
-
-
-/**
- * Insert information about an exchange's historic revenue from reserves.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param start_time beginning of aggregated time interval
- * @param end_time end of aggregated time interval
- * @param reserve_profits total profits made
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_historic_reserve_revenue (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  struct GNUNET_TIME_Timestamp start_time,
-  struct GNUNET_TIME_Timestamp end_time,
-  const struct TALER_Amount *reserve_profits)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_timestamp (&start_time),
-    GNUNET_PQ_query_param_timestamp (&end_time),
-    TALER_PQ_query_param_amount (reserve_profits),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_historic_reserve_summary_insert",
-                                             params);
-}
-
-
-/**
- * Closure for #historic_reserve_revenue_cb().
- */
-struct HistoricReserveRevenueContext
-{
-  /**
-   * Function to call for each result.
-   */
-  TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Number of results processed.
-   */
-  enum GNUNET_DB_QueryStatus qs;
-};
-
-
-/**
- * Helper function for #postgres_select_historic_reserve_revenue().
- * To be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct HistoricRevenueContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-historic_reserve_revenue_cb (void *cls,
-                             PGresult *result,
-                             unsigned int num_results)
-{
-  struct HistoricReserveRevenueContext *hrc = cls;
-  struct PostgresClosure *pg = hrc->pg;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct GNUNET_TIME_Timestamp start_date;
-    struct GNUNET_TIME_Timestamp end_date;
-    struct TALER_Amount reserve_profits;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_timestamp ("start_date",
-                                       &start_date),
-      GNUNET_PQ_result_spec_timestamp ("end_date",
-                                       &end_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_profits",
-                                   &reserve_profits),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      hrc->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-    hrc->qs = i + 1;
-    if (GNUNET_OK !=
-        hrc->cb (hrc->cb_cls,
-                 start_date,
-                 end_date,
-                 &reserve_profits))
-      break;
-  }
-}
-
-
-/**
- * Return information about an exchange's historic revenue from reserves.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param cb function to call with results
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_historic_reserve_revenue (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct HistoricReserveRevenueContext hrc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg
-  };
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "auditor_historic_reserve_summary_select",
-                                             params,
-                                             &historic_reserve_revenue_cb,
-                                             &hrc);
-  if (0 >= qs)
-    return qs;
-  return hrc.qs;
-}
-
-
-/**
- * Insert information about the predicted exchange's bank
- * account balance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param balance what the bank account balance of the exchange should show
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_predicted_result (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    TALER_PQ_query_param_amount (balance),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_predicted_result_insert",
-                                             params);
-}
-
-
-/**
- * Update information about an exchange's predicted balance.  There
- * must be an existing record for the exchange.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param balance what the bank account balance of the exchange should show
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_predicted_result (
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const struct TALER_Amount *balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (balance),
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "auditor_predicted_result_update",
-                                             params);
-}
-
-
-/**
- * Get an exchange's predicted balance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param[out] balance expected bank account balance of the exchange
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_predicted_balance (void *cls,
-                                const struct TALER_MasterPublicKeyP *master_pub,
-                                struct TALER_Amount *balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
-                                 balance),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "auditor_predicted_result_select",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
  * Initialize Postgres database subsystem.
  *
  * @param cls a configuration instance
@@ -2849,83 +454,81 @@ libtaler_plugin_auditordb_postgres_init (void *cls)
   plugin->preflight = &postgres_preflight;
   plugin->drop_tables = &postgres_drop_tables;
   plugin->create_tables = &postgres_create_tables;
+  plugin->event_listen = &postgres_event_listen;
+  plugin->event_listen_cancel = &postgres_event_listen_cancel;
+  plugin->event_notify = &postgres_event_notify;
   plugin->start = &postgres_start;
   plugin->commit = &postgres_commit;
   plugin->rollback = &postgres_rollback;
   plugin->gc = &postgres_gc;
 
-  plugin->insert_exchange = &postgres_insert_exchange;
-  plugin->delete_exchange = &postgres_delete_exchange;
-  plugin->list_exchanges = &postgres_list_exchanges;
-  plugin->insert_exchange_signkey = &postgres_insert_exchange_signkey;
-  plugin->insert_deposit_confirmation = &postgres_insert_deposit_confirmation;
-  plugin->get_deposit_confirmations = &postgres_get_deposit_confirmations;
-
-  plugin->get_auditor_progress_reserve = &postgres_get_auditor_progress_reserve;
-  plugin->update_auditor_progress_reserve =
-    &postgres_update_auditor_progress_reserve;
-  plugin->insert_auditor_progress_reserve =
-    &postgres_insert_auditor_progress_reserve;
-  plugin->get_auditor_progress_aggregation =
-    &postgres_get_auditor_progress_aggregation;
-  plugin->update_auditor_progress_aggregation =
-    &postgres_update_auditor_progress_aggregation;
-  plugin->insert_auditor_progress_aggregation =
-    &postgres_insert_auditor_progress_aggregation;
-  plugin->get_auditor_progress_deposit_confirmation =
-    &postgres_get_auditor_progress_deposit_confirmation;
-  plugin->update_auditor_progress_deposit_confirmation =
-    &postgres_update_auditor_progress_deposit_confirmation;
-  plugin->insert_auditor_progress_deposit_confirmation =
-    &postgres_insert_auditor_progress_deposit_confirmation;
-  plugin->get_auditor_progress_coin = &postgres_get_auditor_progress_coin;
-  plugin->update_auditor_progress_coin = &postgres_update_auditor_progress_coin;
-  plugin->insert_auditor_progress_coin = &postgres_insert_auditor_progress_coin;
-
-  plugin->get_wire_auditor_account_progress =
-    &postgres_get_wire_auditor_account_progress;
-  plugin->update_wire_auditor_account_progress =
-    &postgres_update_wire_auditor_account_progress;
-  plugin->insert_wire_auditor_account_progress =
-    &postgres_insert_wire_auditor_account_progress;
-  plugin->get_wire_auditor_progress = &postgres_get_wire_auditor_progress;
-  plugin->update_wire_auditor_progress = &postgres_update_wire_auditor_progress;
-  plugin->insert_wire_auditor_progress = &postgres_insert_wire_auditor_progress;
-
-  plugin->del_reserve_info = &postgres_del_reserve_info;
-  plugin->get_reserve_info = &postgres_get_reserve_info;
-  plugin->update_reserve_info = &postgres_update_reserve_info;
-  plugin->insert_reserve_info = &postgres_insert_reserve_info;
-
-  plugin->get_reserve_summary = &postgres_get_reserve_summary;
-  plugin->update_reserve_summary = &postgres_update_reserve_summary;
-  plugin->insert_reserve_summary = &postgres_insert_reserve_summary;
-
-  plugin->get_wire_fee_summary = &postgres_get_wire_fee_summary;
-  plugin->update_wire_fee_summary = &postgres_update_wire_fee_summary;
-  plugin->insert_wire_fee_summary = &postgres_insert_wire_fee_summary;
-
-  plugin->get_denomination_balance = &postgres_get_denomination_balance;
-  plugin->update_denomination_balance = &postgres_update_denomination_balance;
-  plugin->insert_denomination_balance = &postgres_insert_denomination_balance;
-
-  plugin->get_balance_summary = &postgres_get_balance_summary;
-  plugin->update_balance_summary = &postgres_update_balance_summary;
-  plugin->insert_balance_summary = &postgres_insert_balance_summary;
-
-  plugin->select_historic_denom_revenue =
-    &postgres_select_historic_denom_revenue;
-  plugin->insert_historic_denom_revenue =
-    &postgres_insert_historic_denom_revenue;
-
-  plugin->select_historic_reserve_revenue =
-    &postgres_select_historic_reserve_revenue;
-  plugin->insert_historic_reserve_revenue =
-    &postgres_insert_historic_reserve_revenue;
-
-  plugin->get_predicted_balance = &postgres_get_predicted_balance;
-  plugin->update_predicted_result = &postgres_update_predicted_result;
-  plugin->insert_predicted_result = &postgres_insert_predicted_result;
+  plugin->get_auditor_progress
+    = &TAH_PG_get_auditor_progress;
+  plugin->get_balance
+    = &TAH_PG_get_balance;
+  plugin->insert_auditor_progress
+    = &TAH_PG_insert_auditor_progress;
+  plugin->insert_balance
+    = &TAH_PG_insert_balance;
+  plugin->update_auditor_progress
+    = &TAH_PG_update_auditor_progress;
+  plugin->update_balance
+    = &TAH_PG_update_balance;
+
+  plugin->insert_exchange_signkey
+    = &TAH_PG_insert_exchange_signkey;
+  plugin->insert_deposit_confirmation
+    = &TAH_PG_insert_deposit_confirmation;
+  plugin->get_deposit_confirmations
+    = &TAH_PG_get_deposit_confirmations;
+  plugin->delete_deposit_confirmation
+    = &TAH_PG_delete_deposit_confirmation;
+
+  plugin->insert_reserve_info
+    = &TAH_PG_insert_reserve_info;
+  plugin->update_reserve_info
+    = &TAH_PG_update_reserve_info;
+  plugin->get_reserve_info
+    = &TAH_PG_get_reserve_info;
+  plugin->del_reserve_info
+    = &TAH_PG_del_reserve_info;
+
+  plugin->insert_pending_deposit
+    = &TAH_PG_insert_pending_deposit;
+  plugin->select_pending_deposits
+    = &TAH_PG_select_pending_deposits;
+  plugin->delete_pending_deposit
+    = &TAH_PG_delete_pending_deposit;
+
+  plugin->insert_purse_info
+    = &TAH_PG_insert_purse_info;
+  plugin->update_purse_info
+    = &TAH_PG_update_purse_info;
+  plugin->get_purse_info
+    = &TAH_PG_get_purse_info;
+  plugin->delete_purse_info
+    = &TAH_PG_delete_purse_info;
+  plugin->select_purse_expired
+    = &TAH_PG_select_purse_expired;
+
+  plugin->insert_denomination_balance
+    = &TAH_PG_insert_denomination_balance;
+  plugin->update_denomination_balance
+    = &TAH_PG_update_denomination_balance;
+  plugin->del_denomination_balance
+    = &TAH_PG_del_denomination_balance;
+  plugin->get_denomination_balance
+    = &TAH_PG_get_denomination_balance;
+
+  plugin->insert_historic_denom_revenue
+    = &TAH_PG_insert_historic_denom_revenue;
+  plugin->select_historic_denom_revenue
+    = &TAH_PG_select_historic_denom_revenue;
+
+  plugin->insert_historic_reserve_revenue
+    = &TAH_PG_insert_historic_reserve_revenue;
+  plugin->select_historic_reserve_revenue
+    = &TAH_PG_select_historic_reserve_revenue;
 
   return plugin;
 }
diff --git a/src/exchangedb/drop0001-shard-part.sql b/src/auditordb/procedures.sql.in
index 9cf3eeb3a..0c83bdb5e 100644
--- a/src/exchangedb/drop0001-shard-part.sql
+++ b/src/auditordb/procedures.sql.in
@@ -1,6 +1,6 @@
 --
 -- This file is part of TALER
--- Copyright (C) 2014--2021 Taler Systems SA
+-- Copyright (C) 2024 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
@@ -16,12 +16,9 @@
 
 BEGIN;
 
--- Unregister patch (shard-0001.sql)
-SELECT _v.unregister_patch('shard-0001');
+SET search_path TO auditor;
 
--- Drops for shard-0001-part.sql
-
-DROP FUNCTION IF EXISTS drop_shard;
-DROP FUNCTION IF EXISTS setup_shard;
+#include "auditor_do_get_auditor_progress.sql"
+#include "auditor_do_get_balance.sql"
 
 COMMIT;
diff --git a/src/auditordb/restart0001.sql b/src/auditordb/restart.sql
index 90bb59551..2dc6864ff 100644
--- a/src/auditordb/restart0001.sql
+++ b/src/auditordb/restart.sql
@@ -17,6 +17,8 @@
 -- Everything in one big transaction
 BEGIN;
 
+SET search_path TO auditor;
+
 -- This script restart the auditor state as done to RESTART
 -- an audit from scratch. It does NOT drop tables and also
 -- PRESERVES data that running the auditor would not recover,
@@ -29,20 +31,14 @@ BEGIN;
 -- Unlike the other SQL files, it SHOULD be updated to reflect the
 -- latest requirements for dropping tables.
 
-DELETE FROM auditor_predicted_result;
-DELETE FROM auditor_historic_denomination_revenue;
-DELETE FROM auditor_balance_summary;
+DELETE FROM auditor_amount_arithmetic_inconsistency;
+DELETE FROM auditor_balances;
 DELETE FROM auditor_denomination_pending;
-DELETE FROM auditor_reserve_balance;
-DELETE FROM auditor_wire_fee_balance;
-DELETE FROM auditor_reserves;
-DELETE FROM auditor_progress_reserve;
-DELETE FROM auditor_progress_aggregation;
-DELETE FROM auditor_progress_deposit_confirmation;
-DELETE FROM auditor_progress_coin;
-DELETE FROM wire_auditor_progress;
-DELETE FROM wire_auditor_account_progress;
+DELETE FROM auditor_historic_denomination_revenue;
 DELETE FROM auditor_historic_reserve_summary;
+DELETE FROM auditor_progress;
+DELETE FROM auditor_purses;
+DELETE FROM auditor_reserves;
 
 -- And we're out of here...
 COMMIT;
diff --git a/src/auditordb/test_auditordb.c b/src/auditordb/test_auditordb.c
index 80eeeca94..5184722f0 100644
--- a/src/auditordb/test_auditordb.c
+++ b/src/auditordb/test_auditordb.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016 Taler Systems SA
+  Copyright (C) 2016--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
@@ -17,17 +17,17 @@
  * @file auditordb/test_auditordb.c
  * @brief test cases for DB interaction functions
  * @author Gabor X Toth
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include <gnunet/gnunet_db_lib.h>
 #include "taler_auditordb_lib.h"
 #include "taler_auditordb_plugin.h"
 
-
 /**
- * Global result from the testcase.
+ * Currency we use, must match CURRENCY in "test-auditor-db-postgres.conf".
  */
-static int result = -1;
+#define CURRENCY "EUR"
 
 /**
  * Report line of error if @a cond is true, and jump to label "drop".
@@ -39,7 +39,6 @@ static int result = -1;
     goto drop;                                \
   } while (0)
 
-
 /**
  * Initializes @a ptr with random data.
  */
@@ -54,15 +53,124 @@ static int result = -1;
 
 
 /**
- * Currency we use, must match CURRENCY in "test-auditor-db-postgres.conf".
+ * Global result from the testcase.
  */
-#define CURRENCY "EUR"
+static int result = -1;
+
+/**
+ * Hash of denomination public key.
+ */
+static struct TALER_DenominationHashP denom_pub_hash;
+
+/**
+ * Another hash of a denomination public key.
+ */
+static struct TALER_DenominationHashP rnd_hash;
+
+/**
+ * Current time.
+ */
+static struct GNUNET_TIME_Timestamp now;
+
+/**
+ * Timestamp in the past.
+ */
+static struct GNUNET_TIME_Timestamp past;
+
+/**
+ * Timestamp in the future.
+ */
+static struct GNUNET_TIME_Timestamp future;
 
 /**
  * Database plugin under test.
  */
 static struct TALER_AUDITORDB_Plugin *plugin;
 
+/**
+ * Historic denomination revenue value.
+ */
+static struct TALER_Amount rbalance;
+
+/**
+ * Historic denomination loss value.
+ */
+static struct TALER_Amount rloss;
+
+/**
+ * Reserve profit value we are using.
+ */
+static struct TALER_Amount reserve_profits;
+
+
+static enum GNUNET_GenericReturnValue
+select_historic_denom_revenue_result (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash2,
+  struct GNUNET_TIME_Timestamp revenue_timestamp2,
+  const struct TALER_Amount *revenue_balance2,
+  const struct TALER_Amount *loss2)
+{
+  static int n = 0;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "select_historic_denom_revenue_result: row %u\n", n);
+
+  if ( (2 <= n++)
+       || (cls != NULL)
+       || ((0 != GNUNET_memcmp (&revenue_timestamp2,
+                                &past))
+           && (0 != GNUNET_memcmp (&revenue_timestamp2,
+                                   &now)))
+       || ((0 != GNUNET_memcmp (denom_pub_hash2,
+                                &denom_pub_hash))
+           && (0 != GNUNET_memcmp (denom_pub_hash2,
+                                   &rnd_hash)))
+       || (0 != TALER_amount_cmp (revenue_balance2,
+                                  &rbalance))
+       || (0 != TALER_amount_cmp (loss2,
+                                  &rloss)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "select_historic_denom_revenue_result: result does not match\n");
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+static enum GNUNET_GenericReturnValue
+select_historic_reserve_revenue_result (
+  void *cls,
+  struct GNUNET_TIME_Timestamp start_time2,
+  struct GNUNET_TIME_Timestamp end_time2,
+  const struct TALER_Amount *reserve_profits2)
+{
+  static int n = 0;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "select_historic_reserve_revenue_result: row %u\n", n);
+
+  if ((2 <= n++)
+      || (cls != NULL)
+      || ((0 != GNUNET_memcmp (&start_time2,
+                               &past))
+          && (0 != GNUNET_memcmp (&start_time2,
+                                  &now)))
+      || (0 != GNUNET_memcmp (&end_time2,
+                              &future))
+      || (0 != TALER_amount_cmp (reserve_profits2,
+                                 &reserve_profits)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "select_historic_reserve_revenue_result: result does not match\n");
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
 
 /**
  * Main function that will be run by the scheduler.
@@ -88,7 +196,9 @@ run (void *cls)
   (void) plugin->drop_tables (plugin->cls,
                               GNUNET_YES);
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls))
+      plugin->create_tables (plugin->cls,
+                             false,
+                             0))
   {
     result = 77;
     goto unload;
@@ -128,24 +238,17 @@ run (void *cls)
                  TALER_string_to_amount (CURRENCY ":0.000014",
                                          &fee_refund));
 
-  struct TALER_MasterPublicKeyP master_pub;
   struct TALER_ReservePublicKeyP reserve_pub;
-  struct TALER_DenominationHashP rnd_hash;
   struct TALER_DenominationPrivateKey denom_priv;
   struct TALER_DenominationPublicKey denom_pub;
-  struct TALER_DenominationHashP denom_pub_hash;
-  struct GNUNET_TIME_Timestamp now;
-  struct GNUNET_TIME_Timestamp past;
-  struct GNUNET_TIME_Timestamp future;
   struct GNUNET_TIME_Timestamp date;
 
-  RND_BLK (&master_pub);
   RND_BLK (&reserve_pub);
   RND_BLK (&rnd_hash);
   GNUNET_assert (GNUNET_OK ==
                  TALER_denom_priv_create (&denom_priv,
                                           &denom_pub,
-                                          TALER_DENOMINATION_RSA,
+                                          GNUNET_CRYPTO_BSA_RSA,
                                           1024));
   TALER_denom_pub_hash (&denom_pub,
                         &denom_pub_hash);
@@ -164,487 +267,182 @@ run (void *cls)
                                 GNUNET_TIME_UNIT_HOURS,
                                 4)));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: auditor_insert_exchange\n");
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_exchange (plugin->cls,
-                                   &master_pub,
-                                   "https://exchange/"));
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_auditor_progress\n");
-
-  struct TALER_AUDITORDB_ProgressPointCoin ppc = {
-    .last_deposit_serial_id = 123,
-    .last_melt_serial_id = 456,
-    .last_refund_serial_id = 789,
-    .last_withdraw_serial_id = 555
-  };
-  struct TALER_AUDITORDB_ProgressPointCoin ppc2 = {
-    .last_deposit_serial_id = 0,
-    .last_melt_serial_id = 0,
-    .last_refund_serial_id = 0,
-    .last_withdraw_serial_id = 0
-  };
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_auditor_progress_coin (plugin->cls,
-                                                &master_pub,
-                                                &ppc));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_auditor_progress\n");
-
-  ppc.last_deposit_serial_id++;
-  ppc.last_melt_serial_id++;
-  ppc.last_refund_serial_id++;
-  ppc.last_withdraw_serial_id++;
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_auditor_progress_coin (plugin->cls,
-                                                &master_pub,
-                                                &ppc));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_auditor_progress\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_auditor_progress_coin (plugin->cls,
-                                             &master_pub,
-                                             &ppc2));
-  FAILIF ( (ppc.last_deposit_serial_id != ppc2.last_deposit_serial_id) ||
-           (ppc.last_melt_serial_id != ppc2.last_melt_serial_id) ||
-           (ppc.last_refund_serial_id != ppc2.last_refund_serial_id) ||
-           (ppc.last_withdraw_serial_id != ppc2.last_withdraw_serial_id) );
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_reserve_info\n");
-
-  struct TALER_Amount reserve_balance, withdraw_fee_balance;
-  struct TALER_Amount reserve_balance2 = {}, withdraw_fee_balance2 = {};
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":12.345678",
-                                         &reserve_balance));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":23.456789",
-                                         &withdraw_fee_balance));
-
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_reserve_info (plugin->cls,
-                                       &reserve_pub,
-                                       &master_pub,
-                                       &reserve_balance,
-                                       &withdraw_fee_balance,
-                                       past,
-                                       "payto://bla/blub"));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_reserve_info\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_reserve_info (plugin->cls,
-                                       &reserve_pub,
-                                       &master_pub,
-                                       &reserve_balance,
-                                       &withdraw_fee_balance,
-                                       future));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_reserve_info\n");
-
-  char *payto;
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_reserve_info (plugin->cls,
-                                    &reserve_pub,
-                                    &master_pub,
-                                    &rowid,
-                                    &reserve_balance2,
-                                    &withdraw_fee_balance2,
-                                    &date,
-                                    &payto));
-  FAILIF (0 != strcmp (payto,
-                       "payto://bla/blub"));
-  GNUNET_free (payto);
-  FAILIF (0 != GNUNET_memcmp (&date, &future)
-          || 0 != GNUNET_memcmp (&reserve_balance2, &reserve_balance)
-          || 0 != GNUNET_memcmp (&withdraw_fee_balance2,
-                                 &withdraw_fee_balance));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_reserve_summary\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_reserve_summary (plugin->cls,
-                                          &master_pub,
-                                          &withdraw_fee_balance,
-                                          &reserve_balance));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_reserve_summary\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_reserve_summary (plugin->cls,
-                                          &master_pub,
-                                          &reserve_balance,
-                                          &withdraw_fee_balance));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_reserve_summary\n");
+  {
+    struct TALER_AUDITORDB_ReserveFeeBalance rfb;
+    struct TALER_AUDITORDB_ReserveFeeBalance rfb2;
 
-  ZR_BLK (&reserve_balance2);
-  ZR_BLK (&withdraw_fee_balance2);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: insert_reserve_info\n");
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":12.345678",
+                                           &rfb.reserve_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":11.245678",
+                                           &rfb.reserve_loss));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":23.456789",
+                                           &rfb.withdraw_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":23.456719",
+                                           &rfb.close_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":33.456789",
+                                           &rfb.purse_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":43.456789",
+                                           &rfb.open_fee_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":53.456789",
+                                           &rfb.history_fee_balance));
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->insert_reserve_info (plugin->cls,
+                                         &reserve_pub,
+                                         &rfb,
+                                         past,
+                                         "payto://bla/blub"));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: update_reserve_info\n");
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->update_reserve_info (plugin->cls,
+                                         &reserve_pub,
+                                         &rfb,
+                                         future));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: get_reserve_info\n");
+    {
+      char *payto;
+
+      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+              plugin->get_reserve_info (plugin->cls,
+                                        &reserve_pub,
+                                        &rowid,
+                                        &rfb2,
+                                        &date,
+                                        &payto));
+      FAILIF (0 != strcmp (payto,
+                           "payto://bla/blub"));
+      GNUNET_free (payto);
+    }
+    FAILIF ( (0 != GNUNET_memcmp (&date,
+                                  &future))
+             || (0 != TALER_amount_cmp (&rfb2.reserve_balance,
+                                        &rfb.reserve_balance))
+             || (0 != TALER_amount_cmp (&rfb2.withdraw_fee_balance,
+                                        &rfb.withdraw_fee_balance))
+             || (0 != TALER_amount_cmp (&rfb2.close_fee_balance,
+                                        &rfb.close_fee_balance))
+             || (0 != TALER_amount_cmp (&rfb2.purse_fee_balance,
+                                        &rfb.purse_fee_balance))
+             || (0 != TALER_amount_cmp (&rfb2.open_fee_balance,
+                                        &rfb.open_fee_balance))
+             || (0 != TALER_amount_cmp (&rfb2.history_fee_balance,
+                                        &rfb.history_fee_balance))
+             );
+  }
 
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_reserve_summary (plugin->cls,
-                                       &master_pub,
-                                       &reserve_balance2,
-                                       &withdraw_fee_balance2));
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: insert_denomination_balance\n");
+
+    struct TALER_AUDITORDB_DenominationCirculationData dcd;
+    struct TALER_AUDITORDB_DenominationCirculationData dcd2;
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":12.345678",
+                                           &dcd.denom_balance));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":0.1",
+                                           &dcd.denom_loss));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":13.57986",
+                                           &dcd.denom_risk));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (CURRENCY ":12.57986",
+                                           &dcd.recoup_loss));
+    dcd.num_issued = 62;
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->insert_denomination_balance (plugin->cls,
+                                                 &denom_pub_hash,
+                                                 &dcd));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: update_denomination_balance\n");
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->update_denomination_balance (plugin->cls,
+                                                 &denom_pub_hash,
+                                                 &dcd));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Test: get_denomination_balance\n");
 
-  FAILIF ( (0 != GNUNET_memcmp (&reserve_balance2,
-                                &reserve_balance) ||
-            (0 != GNUNET_memcmp (&withdraw_fee_balance2,
-                                 &withdraw_fee_balance)) ) );
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->get_denomination_balance (plugin->cls,
+                                              &denom_pub_hash,
+                                              &dcd2));
+    FAILIF (0 != TALER_amount_cmp (&dcd2.denom_balance,
+                                   &dcd.denom_balance));
+    FAILIF (0 != TALER_amount_cmp (&dcd2.denom_loss,
+                                   &dcd.denom_loss));
+    FAILIF (0 != TALER_amount_cmp (&dcd2.denom_risk,
+                                   &dcd.denom_risk));
+    FAILIF (0 != TALER_amount_cmp (&dcd2.recoup_loss,
+                                   &dcd.recoup_loss));
+    FAILIF (dcd2.num_issued != dcd.num_issued);
+  }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_denomination_balance\n");
-
-  struct TALER_Amount denom_balance;
-  struct TALER_Amount denom_loss;
-  struct TALER_Amount denom_loss2;
-  struct TALER_Amount deposit_fee_balance;
-  struct TALER_Amount melt_fee_balance;
-  struct TALER_Amount refund_fee_balance;
-  struct TALER_Amount denom_balance2;
-  struct TALER_Amount deposit_fee_balance2;
-  struct TALER_Amount melt_fee_balance2;
-  struct TALER_Amount refund_fee_balance2;
-  struct TALER_Amount rbalance;
-  struct TALER_Amount rbalance2;
-  struct TALER_Amount loss;
-  struct TALER_Amount loss2;
-  struct TALER_Amount iirp;
-  struct TALER_Amount iirp2;
-  uint64_t nissued;
-
+              "Test: insert_historic_denom_revenue\n");
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (CURRENCY ":12.345678",
-                                         &denom_balance));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":0.1",
-                                         &denom_loss));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":23.456789",
-                                         &deposit_fee_balance));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":34.567890",
-                                         &melt_fee_balance));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":45.678901",
-                                         &refund_fee_balance));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":13.57986",
                                          &rbalance));
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":1.6",
-                                         &loss));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":1.1",
-                                         &iirp));
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_denomination_balance (plugin->cls,
-                                               &denom_pub_hash,
-                                               &denom_balance,
-                                               &denom_loss,
-                                               &rbalance,
-                                               &loss,
-                                               42));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_denomination_balance\n");
-
-  ppc.last_withdraw_serial_id++;
-  ppc.last_deposit_serial_id++;
-  ppc.last_melt_serial_id++;
-  ppc.last_refund_serial_id++;
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_denomination_balance (plugin->cls,
-                                               &denom_pub_hash,
-                                               &denom_balance,
-                                               &denom_loss,
-                                               &rbalance,
-                                               &loss,
-                                               62));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_denomination_balance\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_denomination_balance (plugin->cls,
-                                            &denom_pub_hash,
-                                            &denom_balance2,
-                                            &denom_loss2,
-                                            &rbalance2,
-                                            &loss2,
-                                            &nissued));
-
-  FAILIF (0 != GNUNET_memcmp (&denom_balance2, &denom_balance));
-  FAILIF (0 != GNUNET_memcmp (&denom_loss2, &denom_loss));
-  FAILIF (0 != GNUNET_memcmp (&rbalance2, &rbalance));
-  FAILIF (62 != nissued);
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_balance_summary\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_balance_summary (plugin->cls,
-                                          &master_pub,
-                                          &refund_fee_balance,
-                                          &melt_fee_balance,
-                                          &deposit_fee_balance,
-                                          &denom_balance,
-                                          &rbalance,
-                                          &loss,
-                                          &iirp));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_balance_summary\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_balance_summary (plugin->cls,
-                                          &master_pub,
-                                          &denom_balance,
-                                          &deposit_fee_balance,
-                                          &melt_fee_balance,
-                                          &refund_fee_balance,
-                                          &rbalance,
-                                          &loss,
-                                          &iirp));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_balance_summary\n");
-
-  ZR_BLK (&denom_balance2);
-  ZR_BLK (&deposit_fee_balance2);
-  ZR_BLK (&melt_fee_balance2);
-  ZR_BLK (&refund_fee_balance2);
-  ZR_BLK (&rbalance2);
-  ZR_BLK (&loss2);
-  ZR_BLK (&iirp2);
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_balance_summary (plugin->cls,
-                                       &master_pub,
-                                       &denom_balance2,
-                                       &deposit_fee_balance2,
-                                       &melt_fee_balance2,
-                                       &refund_fee_balance2,
-                                       &rbalance2,
-                                       &loss2,
-                                       &iirp2));
-
-  FAILIF ( (0 != GNUNET_memcmp (&denom_balance2,
-                                &denom_balance) ) ||
-           (0 != GNUNET_memcmp (&deposit_fee_balance2,
-                                &deposit_fee_balance) ) ||
-           (0 != GNUNET_memcmp (&melt_fee_balance2,
-                                &melt_fee_balance) ) ||
-           (0 != GNUNET_memcmp (&refund_fee_balance2,
-                                &refund_fee_balance)) );
-  FAILIF (0 != GNUNET_memcmp (&rbalance2,
-                              &rbalance));
-  FAILIF (0 != GNUNET_memcmp (&loss2,
-                              &loss));
-  FAILIF (0 != GNUNET_memcmp (&iirp2,
-                              &iirp));
-
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_historic_denom_revenue\n");
-
+                 TALER_string_to_amount (CURRENCY ":23.456789",
+                                         &rloss));
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->insert_historic_denom_revenue (plugin->cls,
-                                                 &master_pub,
                                                  &denom_pub_hash,
                                                  past,
                                                  &rbalance,
-                                                 &loss));
-
+                                                 &rloss));
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->insert_historic_denom_revenue (plugin->cls,
-                                                 &master_pub,
                                                  &rnd_hash,
                                                  now,
                                                  &rbalance,
-                                                 &loss));
-
+                                                 &rloss));
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: select_historic_denom_revenue\n");
-
-  int
-  select_historic_denom_revenue_result (
-    void *cls,
-    const struct TALER_DenominationHashP *denom_pub_hash2,
-    struct GNUNET_TIME_Timestamp revenue_timestamp2,
-    const struct TALER_Amount *revenue_balance2,
-    const struct TALER_Amount *loss2)
-  {
-    static int n = 0;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "select_historic_denom_revenue_result: row %u\n", n);
-
-    if ((2 <= n++)
-        || (cls != NULL)
-        || ((0 != GNUNET_memcmp (&revenue_timestamp2, &past))
-            && (0 != GNUNET_memcmp (&revenue_timestamp2, &now)))
-        || ((0 != GNUNET_memcmp (denom_pub_hash2, &denom_pub_hash))
-            && (0 != GNUNET_memcmp (denom_pub_hash2, &rnd_hash)))
-        || (0 != GNUNET_memcmp (revenue_balance2, &rbalance))
-        || (0 != GNUNET_memcmp (loss2, &loss)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "select_historic_denom_revenue_result: result does not match\n");
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    return GNUNET_OK;
-  }
-
-
   FAILIF (0 >=
-          plugin->select_historic_denom_revenue (plugin->cls,
-                                                 &master_pub,
-                                                 &
-                                                 select_historic_denom_revenue_result,
-                                                 NULL));
-
+          plugin->select_historic_denom_revenue (
+            plugin->cls,
+            &select_historic_denom_revenue_result,
+            NULL));
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: insert_historic_reserve_revenue\n");
-
-  struct TALER_Amount reserve_profits;
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (CURRENCY ":56.789012",
                                          &reserve_profits));
-
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->insert_historic_reserve_revenue (plugin->cls,
-                                                   &master_pub,
                                                    past,
                                                    future,
                                                    &reserve_profits));
-
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->insert_historic_reserve_revenue (plugin->cls,
-                                                   &master_pub,
                                                    now,
                                                    future,
                                                    &reserve_profits));
-
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test: select_historic_reserve_revenue\n");
-
-  int
-  select_historic_reserve_revenue_result (
-    void *cls,
-    struct GNUNET_TIME_Timestamp start_time2,
-    struct GNUNET_TIME_Timestamp end_time2,
-    const struct TALER_Amount *reserve_profits2)
-  {
-    static int n = 0;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "select_historic_reserve_revenue_result: row %u\n", n);
-
-    if ((2 <= n++)
-        || (cls != NULL)
-        || ((0 != GNUNET_memcmp (&start_time2, &past))
-            && (0 != GNUNET_memcmp (&start_time2, &now)))
-        || (0 != GNUNET_memcmp (&end_time2, &future))
-        || (0 != GNUNET_memcmp (reserve_profits2, &reserve_profits)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "select_historic_reserve_revenue_result: result does not match\n");
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    return GNUNET_OK;
-  }
-
-
   FAILIF (0 >=
           plugin->select_historic_reserve_revenue (plugin->cls,
-                                                   &master_pub,
                                                    select_historic_reserve_revenue_result,
                                                    NULL));
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: insert_predicted_result\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_predicted_result (plugin->cls,
-                                           &master_pub,
-                                           &rbalance));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: update_predicted_result\n");
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":78.901234",
-                                         &rbalance));
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_predicted_result (plugin->cls,
-                                           &master_pub,
-                                           &rbalance));
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->insert_wire_fee_summary (plugin->cls,
-                                           &master_pub,
-                                           &rbalance));
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->update_wire_fee_summary (plugin->cls,
-                                           &master_pub,
-                                           &reserve_profits));
-  {
-    struct TALER_Amount rprof;
-
-    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-            plugin->get_wire_fee_summary (plugin->cls,
-                                          &master_pub,
-                                          &rprof));
-    FAILIF (0 !=
-            TALER_amount_cmp (&rprof,
-                              &reserve_profits));
-  }
   FAILIF (0 >
           plugin->commit (plugin->cls));
 
-
-  FAILIF (GNUNET_OK !=
-          plugin->start (plugin->cls));
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test: get_predicted_balance\n");
-
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_predicted_balance (plugin->cls,
-                                         &master_pub,
-                                         &rbalance2));
-
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->del_reserve_info (plugin->cls,
-                                    &reserve_pub,
-                                    &master_pub));
-
-  FAILIF (0 != TALER_amount_cmp (&rbalance2,
-                                 &rbalance));
-
-  plugin->rollback (plugin->cls);
+                                    &reserve_pub));
 
 #if GC_IMPLEMENTED
   FAILIF (GNUNET_OK !=
@@ -654,18 +452,7 @@ run (void *cls)
   result = 0;
 
 drop:
-  {
-    plugin->rollback (plugin->cls);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Test: auditor_delete_exchange\n");
-    GNUNET_break (GNUNET_OK ==
-                  plugin->start (plugin->cls));
-    GNUNET_break (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
-                  plugin->delete_exchange (plugin->cls,
-                                           &master_pub));
-    GNUNET_break (0 <=
-                  plugin->commit (plugin->cls));
-  }
+  plugin->rollback (plugin->cls);
   GNUNET_break (GNUNET_OK ==
                 plugin->drop_tables (plugin->cls,
                                      GNUNET_YES));
@@ -686,17 +473,20 @@ main (int argc,
 
   (void) argc;
   result = -1;
-  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  TALER_OS_init ();
+  if (NULL == (plugin_name = strrchr (argv[0],
+                                      (int) '-')))
   {
     GNUNET_break (0);
     return -1;
   }
-  GNUNET_log_setup (argv[0],
-                    "WARNING",
-                    NULL);
   plugin_name++;
   (void) GNUNET_asprintf (&testname,
-                          "test-auditor-db-%s", plugin_name);
+                          "test-auditor-db-%s",
+                          plugin_name);
   (void) GNUNET_asprintf (&config_filename,
                           "%s.conf", testname);
   cfg = GNUNET_CONFIGURATION_create ();
@@ -709,7 +499,8 @@ main (int argc,
     GNUNET_free (testname);
     return 2;
   }
-  GNUNET_SCHEDULER_run (&run, cfg);
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
   GNUNET_CONFIGURATION_destroy (cfg);
   GNUNET_free (config_filename);
   GNUNET_free (testname);
diff --git a/src/auditordb/test_auditordb_checkpoints.c b/src/auditordb/test_auditordb_checkpoints.c
new file mode 100644
index 000000000..f9bb83142
--- /dev/null
+++ b/src/auditordb/test_auditordb_checkpoints.c
@@ -0,0 +1,386 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2016--2024 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/>
+*/
+/**
+ * @file auditordb/test_auditordb_checkpoints.c
+ * @brief test cases for DB interaction functions
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_db_lib.h>
+#include "taler_auditordb_lib.h"
+#include "taler_auditordb_plugin.h"
+
+/**
+ * Currency we use, must match CURRENCY in "test-auditor-db-postgres.conf".
+ */
+#define CURRENCY "EUR"
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                              \
+  do {                                          \
+    if (! (cond)) { break;}                     \
+    GNUNET_break (0);                         \
+    goto drop;                                \
+  } while (0)
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
+                              sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+  memset (ptr, 0, sizeof (*ptr))
+
+
+/**
+ * Global result from the testcase.
+ */
+static int result = -1;
+
+/**
+ * Database plugin under test.
+ */
+static struct TALER_AUDITORDB_Plugin *plugin;
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+static void
+run (void *cls)
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct TALER_Amount a1;
+  struct TALER_Amount a2;
+  struct TALER_Amount a3;
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":11.245678",
+                                         &a1));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":2",
+                                         &a2));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":3",
+                                         &a3));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "loading database plugin\n");
+  if (NULL ==
+      (plugin = TALER_AUDITORDB_plugin_load (cfg)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to database\n");
+    result = 77;
+    return;
+  }
+
+  (void) plugin->drop_tables (plugin->cls,
+                              GNUNET_YES);
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             false,
+                             0))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to 'create_tables'\n");
+    result = 77;
+    goto unload;
+  }
+  if (GNUNET_SYSERR ==
+      plugin->preflight (plugin->cls))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed preflight check\n");
+    result = 77;
+    goto drop;
+  }
+
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls));
+
+  /* Test inserting a blank value, should tell us one result */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->insert_auditor_progress (plugin->cls,
+                                     "Test",
+                                     69,
+                                     NULL)
+    );
+  /* Test re-inserting the same value; should yield no results */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->insert_auditor_progress (plugin->cls,
+                                     "Test",
+                                     69,
+                                     NULL)
+    );
+  /* Test inserting multiple values, with one already existing */
+  GNUNET_assert (
+    2 == plugin->insert_auditor_progress (plugin->cls,
+                                          "Test",
+                                          69,
+                                          "Test2",
+                                          123,
+                                          "Test3",
+                                          245,
+                                          NULL)
+    );
+  /* Test re-re-inserting the same key with a different value; should also yield no results */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->insert_auditor_progress (plugin->cls,
+                                     "Test",
+                                     42,
+                                     NULL)
+    );
+  /* Test updating the same key (again) with a different value; should yield a result */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->update_auditor_progress (plugin->cls,
+                                     "Test",
+                                     42,
+                                     NULL)
+    );
+  /* Test updating a key that doesn't exist; should yield 0 */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->update_auditor_progress (plugin->cls,
+                                     "NonexistentTest",
+                                     1,
+                                     NULL)
+    );
+
+  /* Right now, the state should look like this:
+   * Test  = 42
+   * Test2 = 123
+   * Test3 = 245
+   * Let's make sure that's the case! */
+  uint64_t value;
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_auditor_progress (
+      plugin->cls,
+      "Test",
+      &value,
+      NULL)
+    );
+  GNUNET_assert (value == 42);
+
+  /* Ensure the rest are also at their expected values */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_auditor_progress (
+      plugin->cls,
+      "Test2",
+      &value,
+      NULL)
+    );
+  GNUNET_assert (value == 123);
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_auditor_progress (
+      plugin->cls,
+      "Test3",
+      &value,
+      NULL)
+    );
+  GNUNET_assert (value == 245);
+
+  /* Try fetching value that does not exist */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_auditor_progress (
+      plugin->cls,
+      "TestNX",
+      &value,
+      NULL)
+    );
+  GNUNET_assert (0 == value);
+
+
+  /* Test inserting a blank value, should tell us one result */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->insert_balance (plugin->cls,
+                            "Test",
+                            &a1,
+                            NULL)
+    );
+  /* Test re-inserting the same value; should yield no results */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->insert_balance (plugin->cls,
+                            "Test",
+                            &a1,
+                            NULL)
+    );
+  /* Test inserting multiple values, with one already existing */
+  GNUNET_assert (
+    2 == plugin->insert_balance (plugin->cls,
+                                 "Test",
+                                 &a1,
+                                 "Test2",
+                                 &a2,
+                                 "Test3",
+                                 &a3,
+                                 NULL)
+    );
+  /* Test re-re-inserting the same key with a different value; should also yield no results */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->insert_balance (plugin->cls,
+                            "Test",
+                            &a2,
+                            NULL)
+    );
+  /* Test updating the same key (again) with a different value; should yield a result */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->update_balance (plugin->cls,
+                            "Test",
+                            &a2,
+                            NULL)
+    );
+  /* Test updating a key that doesn't exist; should yield 0 */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_NO_RESULTS ==
+    plugin->update_balance (plugin->cls,
+                            "NonexistentTest",
+                            &a2,
+                            NULL)
+    );
+
+  /* Right now, the state should look like this:
+   * Test  = a2
+   * Test2 = a2
+   * Test3 = a3
+   * Let's make sure that's the case! */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_balance (
+      plugin->cls,
+      "Test",
+      &a1,
+      NULL)
+    );
+  GNUNET_assert (0 ==
+                 TALER_amount_cmp (&a1,
+                                   &a2));
+
+  /* Ensure the rest are also at their expected values */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_balance (
+      plugin->cls,
+      "Test2",
+      &a1,
+      NULL)
+    );
+  GNUNET_assert (0 ==
+                 TALER_amount_cmp (&a1,
+                                   &a2));
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_balance (
+      plugin->cls,
+      "Test3",
+      &a1,
+      NULL)
+    );
+  GNUNET_assert (0 ==
+                 TALER_amount_cmp (&a1,
+                                   &a3));
+
+  /* Try fetching value that does not exist */
+  GNUNET_assert (
+    GNUNET_DB_STATUS_SUCCESS_ONE_RESULT ==
+    plugin->get_balance (
+      plugin->cls,
+      "TestNX",
+      &a1,
+      NULL)
+    );
+  GNUNET_assert (GNUNET_OK !=
+                 TALER_amount_is_valid (&a1));
+
+  result = 0;
+  GNUNET_break (0 <=
+                plugin->commit (plugin->cls));
+drop:
+  GNUNET_break (GNUNET_OK ==
+                plugin->drop_tables (plugin->cls,
+                                     GNUNET_YES));
+unload:
+  TALER_AUDITORDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  char *testname;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  (void) argc;
+  result = -1;
+  TALER_OS_init ();
+  GNUNET_log_setup (argv[0],
+                    "INFO",
+                    NULL);
+  if (NULL == (plugin_name = strrchr (argv[0],
+                                      (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  plugin_name++;
+  (void) GNUNET_asprintf (&testname,
+                          "test-auditor-db-%s",
+                          plugin_name);
+  (void) GNUNET_asprintf (&config_filename,
+                          "%s.conf",
+                          testname);
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    GNUNET_free (testname);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run, cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  GNUNET_free (testname);
+  return result;
+}
diff --git a/src/auditordb/auditor-0000.sql b/src/auditordb/versioning.sql
index 116f409b7..444cf95ed 100644
--- a/src/auditordb/auditor-0000.sql
+++ b/src/auditordb/versioning.sql
@@ -146,12 +146,13 @@
 
 BEGIN;
 
+
 -- This file adds versioning support to database it will be loaded to.
 -- It requires that PL/pgSQL is already loaded - will raise exception otherwise.
 -- All versioning "stuff" (tables, functions) is in "_v" schema.
 
 -- All functions are defined as 'RETURNS SETOF INT4' to be able to make them to RETURN literally nothing (0 rows).
--- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling.
+-- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling
 CREATE SCHEMA IF NOT EXISTS _v;
 COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
 
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index ffd428a6f..a292dcece 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -51,14 +51,42 @@ libtalerbank_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   $(XLIB)
 
 libtalerfakebank_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
 libtalerfakebank_la_SOURCES = \
-  fakebank.c
+  fakebank.c fakebank.h \
+  fakebank_api_check.c \
+  fakebank_common_lookup.c fakebank_common_lookup.h \
+  fakebank_common_lp.c fakebank_common_lp.h \
+  fakebank_common_make_admin_transfer.c fakebank_common_make_admin_transfer.h \
+  fakebank_common_parser.c fakebank_common_parser.h \
+  fakebank_common_transact.c fakebank_common_transact.h \
+  fakebank_stop.c \
+  fakebank_bank.c fakebank_bank.h \
+  fakebank_bank_accounts_withdrawals.c fakebank_bank_accounts_withdrawals.h \
+  fakebank_bank_get_accounts.c fakebank_bank_get_accounts.h \
+  fakebank_bank_get_withdrawals.c fakebank_bank_get_withdrawals.h \
+  fakebank_bank_get_root.c fakebank_bank_get_root.h \
+  fakebank_bank_post_accounts_withdrawals.c fakebank_bank_post_accounts_withdrawals.h \
+  fakebank_bank_post_withdrawals_abort.c fakebank_bank_post_withdrawals_abort.h \
+  fakebank_bank_post_withdrawals_confirm.c fakebank_bank_post_withdrawals_confirm.h \
+  fakebank_bank_post_withdrawals_id_op.c fakebank_bank_post_withdrawals_id_op.h \
+  fakebank_bank_testing_register.c fakebank_bank_testing_register.h \
+  fakebank_tbr.c fakebank_tbr.h \
+  fakebank_tbr_get_history.c fakebank_tbr_get_history.h \
+  fakebank_tbr_get_root.c fakebank_tbr_get_root.h \
+  fakebank_tbi.c fakebank_tbi.h \
+  fakebank_tbi_get_withdrawal_operation.c fakebank_tbi_get_withdrawal_operation.h \
+  fakebank_tbi_post_withdrawal_operation.c fakebank_tbi_post_withdrawal_operation.h \
+  fakebank_twg.c fakebank_twg.h \
+  fakebank_twg_admin_add_incoming.c fakebank_twg_admin_add_incoming.h \
+  fakebank_twg_get_root.c fakebank_twg_get_root.h \
+  fakebank_twg_history.c fakebank_twg_history.h \
+  fakebank_twg_transfer.c fakebank_twg_transfer.h
 libtalerfakebank_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/mhd/libtalermhd.la \
@@ -66,7 +94,7 @@ libtalerfakebank_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   -lmicrohttpd \
   -lpthread \
   $(XLIB)
diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c
index 77b1a38e4..f12ab6ee2 100644
--- a/src/bank-lib/bank_api_admin.c
+++ b/src/bank-lib/bank_api_admin.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015--2020 Taler Systems SA
+  Copyright (C) 2015--2023 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
@@ -16,7 +16,7 @@
 */
 /**
  * @file bank-lib/bank_api_admin.c
- * @brief Implementation of the /admin/ requests of the bank's HTTP API
+ * @brief Implementation of the /admin/add-incoming requests of the bank's HTTP API
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -27,7 +27,7 @@
 
 
 /**
- * @brief An admin/add-incoming Handle
+ * @brief An /admin/add-incoming Handle
  */
 struct TALER_BANK_AdminAddIncomingHandle
 {
@@ -74,25 +74,25 @@ handle_admin_add_incoming_finished (void *cls,
                                     const void *response)
 {
   struct TALER_BANK_AdminAddIncomingHandle *aai = cls;
-  uint64_t row_id = UINT64_MAX;
-  struct GNUNET_TIME_Timestamp timestamp;
-  enum TALER_ErrorCode ec;
   const json_t *j = response;
+  struct TALER_BANK_AdminAddIncomingResponse ir = {
+    .http_status = response_code,
+    .response = response
+  };
 
   aai->job = NULL;
-  timestamp = GNUNET_TIME_UNIT_FOREVER_TS;
   switch (response_code)
   {
   case 0:
-    ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    ir.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     {
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_uint64 ("row_id",
-                                 &row_id),
+                                 &ir.details.ok.serial_id),
         GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
+                                    &ir.details.ok.timestamp),
         GNUNET_JSON_spec_end ()
       };
 
@@ -102,42 +102,41 @@ handle_admin_add_incoming_finished (void *cls,
                              NULL, NULL))
       {
         GNUNET_break_op (0);
-        response_code = 0;
-        ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+        ir.http_status = 0;
+        ir.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
         break;
       }
-      ec = TALER_EC_NONE;
     }
     break;
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
     GNUNET_break_op (0);
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Access denied */
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_UNAUTHORIZED:
     /* Nothing really to verify, bank says the password is invalid; we should
        pass the JSON reply to the application */
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, maybe account really does not exist.
        We should pass the JSON reply to the application */
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_CONFLICT:
     /* Nothing to verify, we used the same wire subject
        twice? */
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   default:
     /* unexpected response code */
@@ -145,15 +144,11 @@ handle_admin_add_incoming_finished (void *cls,
                 "Unexpected response code %u\n",
                 (unsigned int) response_code);
     GNUNET_break (0);
-    ec = TALER_JSON_get_error_code (j);
+    ir.ec = TALER_JSON_get_error_code (j);
     break;
   }
   aai->cb (aai->cb_cls,
-           response_code,
-           ec,
-           row_id,
-           timestamp,
-           j);
+           &ir);
   TALER_BANK_admin_add_incoming_cancel (aai);
 }
 
@@ -215,9 +210,10 @@ TALER_BANK_admin_add_incoming (
               "Requesting administrative transaction at `%s' for reserve %s\n",
               aai->request_url,
               TALER_B2S (reserve_pub));
-  aai->post_ctx.headers = curl_slist_append
-                            (aai->post_ctx.headers,
-                            "Content-Type: application/json");
+  aai->post_ctx.headers
+    = curl_slist_append (
+        aai->post_ctx.headers,
+        "Content-Type: application/json");
 
   eh = curl_easy_init ();
   if ( (NULL == eh) ||
diff --git a/src/bank-lib/bank_api_common.h b/src/bank-lib/bank_api_common.h
index ac059e9ed..e288a7e6f 100644
--- a/src/bank-lib/bank_api_common.h
+++ b/src/bank-lib/bank_api_common.h
@@ -36,7 +36,7 @@
  * @param auth authentication data to use
  * @return #GNUNET_OK in success
  */
-int
+enum GNUNET_GenericReturnValue
 TALER_BANK_setup_auth_ (CURL *easy,
                         const struct TALER_BANK_AuthenticationData *auth);
 
diff --git a/src/bank-lib/bank_api_credit.c b/src/bank-lib/bank_api_credit.c
index 1ea2e269e..124415b80 100644
--- a/src/bank-lib/bank_api_credit.c
+++ b/src/bank-lib/bank_api_credit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017--2021 Taler Systems SA
+  Copyright (C) 2017--2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
@@ -77,62 +77,67 @@ static enum GNUNET_GenericReturnValue
 parse_account_history (struct TALER_BANK_CreditHistoryHandle *hh,
                        const json_t *history)
 {
-  json_t *history_array;
+  struct TALER_BANK_CreditHistoryResponse chr = {
+    .http_status = MHD_HTTP_OK,
+    .ec = TALER_EC_NONE,
+    .response = history
+  };
+  const json_t *history_array;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("incoming_transactions",
+                                  &history_array),
+    GNUNET_JSON_spec_string ("credit_account",
+                             &chr.details.ok.credit_account_uri),
+    GNUNET_JSON_spec_end ()
+  };
 
-  if (NULL == (history_array = json_object_get (history,
-                                                "incoming_transactions")))
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (history,
+                         spec,
+                         NULL,
+                         NULL))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if (! json_is_array (history_array))
   {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  for (unsigned int i = 0; i<json_array_size (history_array); i++)
-  {
-    struct TALER_BANK_CreditDetails td;
-    uint64_t row_id;
-    struct GNUNET_JSON_Specification hist_spec[] = {
-      TALER_JSON_spec_amount_any ("amount",
-                                  &td.amount),
-      GNUNET_JSON_spec_timestamp ("date",
-                                  &td.execution_date),
-      GNUNET_JSON_spec_uint64 ("row_id",
-                               &row_id),
-      GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                   &td.reserve_pub),
-      GNUNET_JSON_spec_string ("debit_account",
-                               &td.debit_account_uri),
-      GNUNET_JSON_spec_string ("credit_account",
-                               &td.credit_account_uri),
-      GNUNET_JSON_spec_end ()
-    };
-    json_t *transaction = json_array_get (history_array,
-                                          i);
+    size_t len = json_array_size (history_array);
+    struct TALER_BANK_CreditDetails cd[GNUNET_NZL (len)];
 
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (transaction,
-                           hist_spec,
-                           NULL, NULL))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if (GNUNET_OK !=
-        hh->hcb (hh->hcb_cls,
-                 MHD_HTTP_OK,
-                 TALER_EC_NONE,
-                 row_id,
-                 &td,
-                 transaction))
+    GNUNET_break_op (0 != len);
+    for (size_t i = 0; i<len; i++)
     {
-      hh->hcb = NULL;
-      GNUNET_JSON_parse_free (hist_spec);
-      return GNUNET_OK;
+      struct TALER_BANK_CreditDetails *td = &cd[i];
+      struct GNUNET_JSON_Specification hist_spec[] = {
+        TALER_JSON_spec_amount_any ("amount",
+                                    &td->amount),
+        GNUNET_JSON_spec_timestamp ("date",
+                                    &td->execution_date),
+        GNUNET_JSON_spec_uint64 ("row_id",
+                                 &td->serial_id),
+        GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                     &td->reserve_pub),
+        GNUNET_JSON_spec_string ("debit_account",
+                                 &td->debit_account_uri),
+        GNUNET_JSON_spec_end ()
+      };
+      json_t *transaction = json_array_get (history_array,
+                                            i);
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (transaction,
+                             hist_spec,
+                             NULL,
+                             NULL))
+      {
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
     }
-    GNUNET_JSON_parse_free (hist_spec);
+    chr.details.ok.details_length = len;
+    chr.details.ok.details = cd;
+    hh->hcb (hh->hcb_cls,
+             &chr);
   }
   return GNUNET_OK;
 }
@@ -152,69 +157,67 @@ handle_credit_history_finished (void *cls,
                                 const void *response)
 {
   struct TALER_BANK_CreditHistoryHandle *hh = cls;
-  const json_t *j = response;
-  enum TALER_ErrorCode ec;
+  struct TALER_BANK_CreditHistoryResponse chr = {
+    .http_status = response_code,
+    .response = response
+  };
 
   hh->job = NULL;
   switch (response_code)
   {
   case 0:
-    ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    chr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
         parse_account_history (hh,
-                               j))
+                               chr.response))
     {
       GNUNET_break_op (0);
-      response_code = 0;
-      ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      json_dumpf (chr.response,
+                  stderr,
+                  JSON_INDENT (2));
+      chr.http_status = 0;
+      chr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
       break;
     }
-    response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */
-    ec = TALER_EC_NONE;
-    break;
+    TALER_BANK_credit_history_cancel (hh);
+    return;
   case MHD_HTTP_NO_CONTENT:
-    ec = TALER_EC_NONE;
     break;
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
     GNUNET_break_op (0);
-    ec = TALER_JSON_get_error_code (j);
+    chr.ec = TALER_JSON_get_error_code (chr.response);
     break;
   case MHD_HTTP_UNAUTHORIZED:
     /* Nothing really to verify, bank says the HTTP Authentication
        failed. May happen if HTTP authentication is used and the
        user supplied a wrong username/password combination. */
-    ec = TALER_JSON_get_error_code (j);
+    chr.ec = TALER_JSON_get_error_code (chr.response);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify: the bank is either unaware
        of the endpoint (not a bank), or of the account.
        We should pass the JSON (?) reply to the application */
-    ec = TALER_JSON_get_error_code (j);
+    chr.ec = TALER_JSON_get_error_code (chr.response);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    ec = TALER_JSON_get_error_code (j);
+    chr.ec = TALER_JSON_get_error_code (chr.response);
     break;
   default:
     /* unexpected response code */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u\n",
                 (unsigned int) response_code);
-    ec = TALER_JSON_get_error_code (j);
+    chr.ec = TALER_JSON_get_error_code (chr.response);
     break;
   }
-  if (NULL != hh->hcb)
-    hh->hcb (hh->hcb_cls,
-             response_code,
-             ec,
-             0LLU,
-             NULL,
-             j);
+  hh->hcb (hh->hcb_cls,
+           &chr);
   TALER_BANK_credit_history_cancel (hh);
 }
 
@@ -248,12 +251,15 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
   {
     if ( (0 < num_results) &&
          (! GNUNET_TIME_relative_is_zero (timeout)) )
+      /* 0 == start_row is implied, go with timeout into future */
       GNUNET_snprintf (url,
                        sizeof (url),
                        "history/incoming?delta=%lld&long_poll_ms=%llu",
                        (long long) num_results,
                        tms);
     else
+      /* Going back from current transaction or have no timeout;
+         hence timeout makes no sense */
       GNUNET_snprintf (url,
                        sizeof (url),
                        "history/incoming?delta=%lld",
@@ -263,6 +269,7 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
   {
     if ( (0 < num_results) &&
          (! GNUNET_TIME_relative_is_zero (timeout)) )
+      /* going forward from num_result */
       GNUNET_snprintf (url,
                        sizeof (url),
                        "history/incoming?delta=%lld&start=%llu&long_poll_ms=%llu",
@@ -270,6 +277,8 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
                        (unsigned long long) start_row,
                        tms);
     else
+      /* going backwards or have no timeout;
+         hence timeout makes no sense */
       GNUNET_snprintf (url,
                        sizeof (url),
                        "history/incoming?delta=%lld&start=%llu",
diff --git a/src/bank-lib/bank_api_debit.c b/src/bank-lib/bank_api_debit.c
index 2a76495bd..58dc0a736 100644
--- a/src/bank-lib/bank_api_debit.c
+++ b/src/bank-lib/bank_api_debit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017--2021 Taler Systems SA
+  Copyright (C) 2017--2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
@@ -77,64 +77,69 @@ static enum GNUNET_GenericReturnValue
 parse_account_history (struct TALER_BANK_DebitHistoryHandle *hh,
                        const json_t *history)
 {
-  json_t *history_array;
+  struct TALER_BANK_DebitHistoryResponse dhr = {
+    .http_status = MHD_HTTP_OK,
+    .ec = TALER_EC_NONE,
+    .response = history
+  };
+  const json_t *history_array;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("outgoing_transactions",
+                                  &history_array),
+    GNUNET_JSON_spec_string ("debit_account",
+                             &dhr.details.ok.debit_account_uri),
+    GNUNET_JSON_spec_end ()
+  };
 
-  if (NULL == (history_array = json_object_get (history,
-                                                "outgoing_transactions")))
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (history,
+                         spec,
+                         NULL,
+                         NULL))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if (! json_is_array (history_array))
   {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  for (unsigned int i = 0; i<json_array_size (history_array); i++)
-  {
-    struct TALER_BANK_DebitDetails td;
-    uint64_t row_id;
-    struct GNUNET_JSON_Specification hist_spec[] = {
-      TALER_JSON_spec_amount_any ("amount",
-                                  &td.amount),
-      GNUNET_JSON_spec_timestamp ("date",
-                                  &td.execution_date),
-      GNUNET_JSON_spec_uint64 ("row_id",
-                               &row_id),
-      GNUNET_JSON_spec_fixed_auto ("wtid",
-                                   &td.wtid),
-      GNUNET_JSON_spec_string ("credit_account",
-                               &td.credit_account_uri),
-      GNUNET_JSON_spec_string ("debit_account",
-                               &td.debit_account_uri),
-      GNUNET_JSON_spec_string ("exchange_base_url",
-                               &td.exchange_base_url),
-      GNUNET_JSON_spec_end ()
-    };
-    json_t *transaction = json_array_get (history_array,
-                                          i);
+    size_t len = json_array_size (history_array);
+    struct TALER_BANK_DebitDetails dd[GNUNET_NZL (len)];
 
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (transaction,
-                           hist_spec,
-                           NULL, NULL))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if (GNUNET_OK !=
-        hh->hcb (hh->hcb_cls,
-                 MHD_HTTP_OK,
-                 TALER_EC_NONE,
-                 row_id,
-                 &td,
-                 transaction))
+    GNUNET_break_op (0 != len);
+    for (unsigned int i = 0; i<len; i++)
     {
-      hh->hcb = NULL;
-      GNUNET_JSON_parse_free (hist_spec);
-      return GNUNET_OK;
+      struct TALER_BANK_DebitDetails *td = &dd[i];
+      struct GNUNET_JSON_Specification hist_spec[] = {
+        TALER_JSON_spec_amount_any ("amount",
+                                    &td->amount),
+        GNUNET_JSON_spec_timestamp ("date",
+                                    &td->execution_date),
+        GNUNET_JSON_spec_uint64 ("row_id",
+                                 &td->serial_id),
+        GNUNET_JSON_spec_fixed_auto ("wtid",
+                                     &td->wtid),
+        GNUNET_JSON_spec_string ("credit_account",
+                                 &td->credit_account_uri),
+        GNUNET_JSON_spec_string ("exchange_base_url",
+                                 &td->exchange_base_url),
+        GNUNET_JSON_spec_end ()
+      };
+      json_t *transaction = json_array_get (history_array,
+                                            i);
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (transaction,
+                             hist_spec,
+                             NULL,
+                             NULL))
+      {
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
     }
-    GNUNET_JSON_parse_free (hist_spec);
+    dhr.details.ok.details_length = len;
+    dhr.details.ok.details = dd;
+    hh->hcb (hh->hcb_cls,
+             &dhr);
   }
   return GNUNET_OK;
 }
@@ -154,69 +159,64 @@ handle_debit_history_finished (void *cls,
                                const void *response)
 {
   struct TALER_BANK_DebitHistoryHandle *hh = cls;
-  const json_t *j = response;
-  enum TALER_ErrorCode ec;
+  struct TALER_BANK_DebitHistoryResponse dhr = {
+    .http_status = response_code,
+    .response = response
+  };
 
   hh->job = NULL;
   switch (response_code)
   {
   case 0:
-    ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    dhr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
         parse_account_history (hh,
-                               j))
+                               dhr.response))
     {
       GNUNET_break_op (0);
-      response_code = 0;
-      ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      dhr.http_status = 0;
+      dhr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
       break;
     }
-    response_code = MHD_HTTP_NO_CONTENT; /* signal end of list */
-    ec = TALER_EC_NONE;
-    break;
+    TALER_BANK_debit_history_cancel (hh);
+    return;
   case MHD_HTTP_NO_CONTENT:
-    ec = TALER_EC_NONE;
     break;
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
     GNUNET_break_op (0);
-    ec = TALER_JSON_get_error_code (j);
+    dhr.ec = TALER_JSON_get_error_code (dhr.response);
     break;
   case MHD_HTTP_UNAUTHORIZED:
     /* Nothing really to verify, bank says the HTTP Authentication
        failed. May happen if HTTP authentication is used and the
        user supplied a wrong username/password combination. */
-    ec = TALER_JSON_get_error_code (j);
+    dhr.ec = TALER_JSON_get_error_code (dhr.response);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify: the bank is either unaware
        of the endpoint (not a bank), or of the account.
        We should pass the JSON (?) reply to the application */
-    ec = TALER_JSON_get_error_code (j);
+    dhr.ec = TALER_JSON_get_error_code (dhr.response);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    ec = TALER_JSON_get_error_code (j);
+    dhr.ec = TALER_JSON_get_error_code (dhr.response);
     break;
   default:
     /* unexpected response code */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u\n",
                 (unsigned int) response_code);
-    ec = TALER_JSON_get_error_code (j);
+    dhr.ec = TALER_JSON_get_error_code (dhr.response);
     break;
   }
-  if (NULL != hh->hcb)
-    hh->hcb (hh->hcb_cls,
-             response_code,
-             ec,
-             0LLU,
-             NULL,
-             j);
+  hh->hcb (hh->hcb_cls,
+           &dhr);
   TALER_BANK_debit_history_cancel (hh);
 }
 
diff --git a/src/bank-lib/bank_api_transfer.c b/src/bank-lib/bank_api_transfer.c
index 3b50018d3..0748a0d7e 100644
--- a/src/bank-lib/bank_api_transfer.c
+++ b/src/bank-lib/bank_api_transfer.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015--2020 Taler Systems SA
+  Copyright (C) 2015--2023 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
@@ -99,12 +99,12 @@ TALER_BANK_prepare_transfer (
   wp->account_len = htonl ((uint32_t) d_len);
   wp->exchange_url_len = htonl ((uint32_t) u_len);
   end = (char *) &wp[1];
-  memcpy (end,
-          destination_account_payto_uri,
-          d_len);
-  memcpy (end + d_len,
-          exchange_base_url,
-          u_len);
+  GNUNET_memcpy (end,
+                 destination_account_payto_uri,
+                 d_len);
+  GNUNET_memcpy (end + d_len,
+                 exchange_base_url,
+                 u_len);
   *buf = (char *) wp;
 }
 
@@ -158,23 +158,24 @@ handle_transfer_finished (void *cls,
 {
   struct TALER_BANK_TransferHandle *th = cls;
   const json_t *j = response;
-  uint64_t row_id = UINT64_MAX;
-  struct GNUNET_TIME_Timestamp timestamp = GNUNET_TIME_UNIT_FOREVER_TS;
-  enum TALER_ErrorCode ec;
+  struct TALER_BANK_TransferResponse tr = {
+    .http_status = response_code,
+    .response = j
+  };
 
   th->job = NULL;
   switch (response_code)
   {
   case 0:
-    ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    tr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     {
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_uint64 ("row_id",
-                                 &row_id),
+                                 &tr.details.ok.row_id),
         GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
+                                    &tr.details.ok.timestamp),
         GNUNET_JSON_spec_end ()
       };
 
@@ -184,39 +185,38 @@ handle_transfer_finished (void *cls,
                              NULL, NULL))
       {
         GNUNET_break_op (0);
-        response_code = 0;
-        ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+        tr.http_status = 0;
+        tr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
         break;
       }
-      ec = TALER_EC_NONE;
     }
     break;
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
     GNUNET_break_op (0);
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_UNAUTHORIZED:
     /* Nothing really to verify, bank says our credentials are
        invalid. We should pass the JSON reply to the application. */
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, endpoint wrong -- could be user unknown */
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_CONFLICT:
     /* Nothing really to verify. Server says we used the same transfer request
        UID before, but with different details.  Should not happen if the user
        properly used #TALER_BANK_prepare_transfer() and our PRNG is not
        broken... */
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   default:
     /* unexpected response code */
@@ -224,14 +224,11 @@ handle_transfer_finished (void *cls,
                 "Unexpected response code %u\n",
                 (unsigned int) response_code);
     GNUNET_break (0);
-    ec = TALER_JSON_get_error_code (j);
+    tr.ec = TALER_JSON_get_error_code (j);
     break;
   }
   th->cb (th->cb_cls,
-          response_code,
-          ec,
-          row_id,
-          timestamp);
+          &tr);
   TALER_BANK_transfer_cancel (th);
 }
 
diff --git a/src/bank-lib/fakebank.c b/src/bank-lib/fakebank.c
index db30851d8..3a004dc80 100644
--- a/src/bank-lib/fakebank.c
+++ b/src/bank-lib/fakebank.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2016-2021 Taler Systems SA
+  (C) 2016-2024 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
@@ -21,8 +21,6 @@
  * @brief library that fakes being a Taler bank for testcases
  * @author Christian Grothoff <christian@grothoff.org>
  */
-// TODO: support adding WAD transfers
-
 #include "platform.h"
 #include <pthread.h>
 #include <poll.h>
@@ -33,1292 +31,10 @@
 #include "taler_bank_service.h"
 #include "taler_mhd_lib.h"
 #include <gnunet/gnunet_mhd_compat.h>
-
-/**
- * Maximum POST request size (for /admin/add-incoming)
- */
-#define REQUEST_BUFFER_MAX (4 * 1024)
-
-/**
- * How long are exchange base URLs allowed to be at most?
- * Set to a relatively low number as this does contribute
- * significantly to our RAM consumption.
- */
-#define MAX_URL_LEN 64
-
-/**
- * Per account information.
- */
-struct Account;
-
-
-/**
- * Types of long polling activities.
- */
-enum LongPollType
-{
-  /**
-   * Transfer TO the exchange.
-   */
-  LP_CREDIT,
-
-  /**
-   * Transfer FROM the exchange.
-   */
-  LP_DEBIT
-
-};
-
-/**
- * Client waiting for activity on this account.
- */
-struct LongPoller
-{
-
-  /**
-   * Kept in a DLL.
-   */
-  struct LongPoller *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct LongPoller *prev;
-
-  /**
-   * Account this long poller is waiting on.
-   */
-  struct Account *account;
-
-  /**
-   * Entry in the heap for this long poller.
-   */
-  struct GNUNET_CONTAINER_HeapNode *hn;
-
-  /**
-   * Client that is waiting for transactions.
-   */
-  struct MHD_Connection *conn;
-
-  /**
-   * When will this long poller time out?
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * What does the @e connection wait for?
-   */
-  enum LongPollType type;
-
-};
-
-
-/**
- * Details about a transcation we (as the simulated bank) received.
- */
-struct Transaction;
-
-/**
- * Per account information.
- */
-struct Account
-{
-
-  /**
-   * Inbound transactions for this account in a MDLL.
-   */
-  struct Transaction *in_head;
-
-  /**
-   * Inbound transactions for this account in a MDLL.
-   */
-  struct Transaction *in_tail;
-
-  /**
-   * Outbound transactions for this account in a MDLL.
-   */
-  struct Transaction *out_head;
-
-  /**
-   * Outbound transactions for this account in a MDLL.
-   */
-  struct Transaction *out_tail;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct LongPoller *lp_head;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct LongPoller *lp_tail;
-
-  /**
-   * Account name (string, not payto!)
-   */
-  char *account_name;
-
-  /**
-   * Current account balance.
-   */
-  struct TALER_Amount balance;
-
-  /**
-   * true if the balance is negative.
-   */
-  bool is_negative;
-
-};
-
-
-/**
- * Details about a transcation we (as the simulated bank) received.
- */
-struct Transaction
-{
-  /**
-   * We store inbound transactions in a MDLL.
-   */
-  struct Transaction *next_in;
-
-  /**
-   * We store inbound transactions in a MDLL.
-   */
-  struct Transaction *prev_in;
-
-  /**
-   * We store outbound transactions in a MDLL.
-   */
-  struct Transaction *next_out;
-
-  /**
-   * We store outbound transactions in a MDLL.
-   */
-  struct Transaction *prev_out;
-
-  /**
-   * Amount to be transferred.
-   */
-  struct TALER_Amount amount;
-
-  /**
-   * Account to debit.
-   */
-  struct Account *debit_account;
-
-  /**
-   * Account to credit.
-   */
-  struct Account *credit_account;
-
-  /**
-   * Random unique identifier for the request.
-   * Used to detect idempotent requests.
-   */
-  struct GNUNET_HashCode request_uid;
-
-  /**
-   * When did the transaction happen?
-   */
-  struct GNUNET_TIME_Timestamp date;
-
-  /**
-   * Number of this transaction.
-   */
-  uint64_t row_id;
-
-  /**
-   * What does the @e subject contain?
-   */
-  enum
-  {
-    /**
-     * Transfer TO the exchange.
-     */
-    T_CREDIT,
-
-    /**
-     * Transfer FROM the exchange.
-     */
-    T_DEBIT,
-
-    /**
-     * Exchange-to-exchange WAD transfer.
-     */
-    T_WAD,
-  } type;
-
-  /**
-   * Wire transfer subject.
-   */
-  union
-  {
-
-    /**
-     * Used if @e type is T_DEBIT.
-     */
-    struct
-    {
-
-      /**
-       * Subject of the transfer.
-       */
-      struct TALER_WireTransferIdentifierRawP wtid;
-
-      /**
-       * Base URL of the exchange.
-       */
-      char exchange_base_url[MAX_URL_LEN];
-
-    } debit;
-
-    /**
-     * Used if @e type is T_CREDIT.
-     */
-    struct
-    {
-
-      /**
-       * Reserve public key of the credit operation.
-       */
-      struct TALER_ReservePublicKeyP reserve_pub;
-
-    } credit;
-
-    /**
-     * Used if @e type is T_WAD.
-     */
-    struct
-    {
-
-      /**
-       * Subject of the transfer.
-       */
-      struct TALER_WadIdentifierP wad;
-
-      /**
-       * Base URL of the originating exchange.
-       */
-      char origin_base_url[MAX_URL_LEN];
-
-    } wad;
-
-  } subject;
-
-  /**
-   * Has this transaction not yet been subjected to
-   * #TALER_FAKEBANK_check_credit() or #TALER_FAKEBANK_check_debit() and
-   * should thus be counted in #TALER_FAKEBANK_check_empty()?
-   */
-  bool unchecked;
-};
-
-
-/**
- * Handle for the fake bank.
- */
-struct TALER_FAKEBANK_Handle
-{
-  /**
-   * We store transactions in a revolving array.
-   */
-  struct Transaction **transactions;
-
-  /**
-   * HTTP server we run to pretend to be the "test" bank.
-   */
-  struct MHD_Daemon *mhd_bank;
-
-  /**
-   * Task running HTTP server for the "test" bank,
-   * unless we are using a thread pool (then NULL).
-   */
-  struct GNUNET_SCHEDULER_Task *mhd_task;
-
-  /**
-   * Task for expiring long-polling connections,
-   * unless we are using a thread pool (then NULL).
-   */
-  struct GNUNET_SCHEDULER_Task *lp_task;
-
-  /**
-   * Task for expiring long-polling connections, unless we are using the
-   * GNUnet scheduler (then NULL).
-   */
-  pthread_t lp_thread;
-
-  /**
-   * MIN-heap of long pollers, sorted by timeout.
-   */
-  struct GNUNET_CONTAINER_Heap *lp_heap;
-
-  /**
-   * Hashmap of reserve public keys to
-   * `struct Transaction` with that reserve public
-   * key. Used to prevent public-key re-use.
-   */
-  struct GNUNET_CONTAINER_MultiPeerMap *rpubs;
-
-  /**
-   * Lock for accessing @a rpubs map.
-   */
-  pthread_mutex_t rpubs_lock;
-
-  /**
-   * Hashmap of hashes of account names to `struct Account`.
-   */
-  struct GNUNET_CONTAINER_MultiHashMap *accounts;
-
-  /**
-   * Lock for accessing @a accounts hash map.
-   */
-  pthread_mutex_t accounts_lock;
-
-  /**
-   * Hashmap of hashes of transaction request_uids to `struct Transaction`.
-   */
-  struct GNUNET_CONTAINER_MultiHashMap *uuid_map;
-
-  /**
-   * Lock for accessing @a uuid_map.
-   */
-  pthread_mutex_t uuid_map_lock;
-
-  /**
-   * Lock for accessing the internals of
-   * accounts and transaction array entries.
-   */
-  pthread_mutex_t big_lock;
-
-  /**
-   * Current transaction counter.
-   */
-  uint64_t serial_counter;
-
-  /**
-   * Number of transactions we keep in memory (at most).
-   */
-  uint64_t ram_limit;
-
-  /**
-   * Currency used by the fakebank.
-   */
-  char *currency;
-
-  /**
-   * BaseURL of the fakebank.
-   */
-  char *my_baseurl;
-
-  /**
-   * Our port number.
-   */
-  uint16_t port;
-
-#ifdef __linux__
-  /**
-   * Event FD to signal @a lp_thread a change in
-   * @a lp_heap.
-   */
-  int lp_event;
-#else
-  /**
-   * Pipe input to signal @a lp_thread a change in
-   * @a lp_heap.
-   */
-  int lp_event_in;
-
-  /**
-   * Pipe output to signal @a lp_thread a change in
-   * @a lp_heap.
-   */
-  int lp_event_out;
-#endif
-
-  /**
-   * Set to true once we are shutting down.
-   */
-  bool in_shutdown;
-
-  /**
-   * Should we run MHD immediately again?
-   */
-  bool mhd_again;
-
-#if EPOLL_SUPPORT
-  /**
-   * Boxed @e mhd_fd.
-   */
-  struct GNUNET_NETWORK_Handle *mhd_rfd;
-
-  /**
-   * File descriptor to use to wait for MHD.
-   */
-  int mhd_fd;
-#endif
-};
-
-
-/**
- * Special address "con_cls" can point to to indicate that the handler has
- * been called more than once already (was previously suspended).
- */
-static int special_ptr;
-
-
-/**
- * Task run whenever HTTP server operations are pending.
- *
- * @param cls the `struct TALER_FAKEBANK_Handle`
- */
-static void
-run_mhd (void *cls);
-
-
-/**
- * Trigger the @a lp. Frees associated resources,
- * except the entry of @a lp in the timeout heap.
- * Must be called while the ``big lock`` is held.
- *
- * @param[in] lp long poller to trigger
- * @param[in,out] h fakebank handle
- */
-static void
-lp_trigger (struct LongPoller *lp,
-            struct TALER_FAKEBANK_Handle *h)
-{
-  struct Account *acc = lp->account;
-
-  GNUNET_CONTAINER_DLL_remove (acc->lp_head,
-                               acc->lp_tail,
-                               lp);
-  MHD_resume_connection (lp->conn);
-  GNUNET_free (lp);
-  h->mhd_again = true;
-#ifdef __linux__
-  if (-1 != h->lp_event)
-#else
-  if (-1 != h->lp_event_in && -1 != h->lp_event_out)
-#endif
-  {
-    if (NULL != h->mhd_task)
-      GNUNET_SCHEDULER_cancel (h->mhd_task);
-    h->mhd_task =
-      GNUNET_SCHEDULER_add_now (&run_mhd,
-                                h);
-  }
-}
-
-
-/**
- * Thread that is run to wake up connections that have hit their timeout. Runs
- * until in_shutdown is set to true. Must be send signals via lp_event on
- * shutdown and/or whenever the heap changes to an earlier timeout.
- *
- * @param cls a `struct TALER_FAKEBANK_Handle *`
- * @return NULL
- */
-static void *
-lp_expiration_thread (void *cls)
-{
-  struct TALER_FAKEBANK_Handle *h = cls;
-
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->big_lock));
-  while (! h->in_shutdown)
-  {
-    struct LongPoller *lp;
-    int timeout_ms;
-
-    lp = GNUNET_CONTAINER_heap_peek (h->lp_heap);
-    while ( (NULL != lp) &&
-            GNUNET_TIME_absolute_is_past (lp->timeout))
-    {
-      GNUNET_assert (lp ==
-                     GNUNET_CONTAINER_heap_remove_root (h->lp_heap));
-      lp_trigger (lp,
-                  h);
-      lp = GNUNET_CONTAINER_heap_peek (h->lp_heap);
-    }
-    if (NULL != lp)
-    {
-      struct GNUNET_TIME_Relative rem;
-      unsigned long long left_ms;
-
-      rem = GNUNET_TIME_absolute_get_remaining (lp->timeout);
-      left_ms = rem.rel_value_us / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
-      if (left_ms > INT_MAX)
-        timeout_ms = INT_MAX;
-      else
-        timeout_ms = (int) left_ms;
-    }
-    else
-    {
-      timeout_ms = -1; /* infinity */
-    }
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->big_lock));
-    {
-      struct pollfd p = {
-#ifdef __linux__
-        .fd = h->lp_event,
-#else
-        .fd = h->lp_event_out,
-#endif
-        .events = POLLIN
-      };
-      int ret;
-
-      ret = poll (&p,
-                  1,
-                  timeout_ms);
-      if (-1 == ret)
-      {
-        if (EINTR != errno)
-          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
-                               "poll");
-      }
-      else if (1 == ret)
-      {
-        /* clear event */
-        uint64_t ev;
-        ssize_t iret;
-
-#ifdef __linux__
-        iret = read (h->lp_event,
-#else
-        iret = read (h->lp_event_out,
-#endif
-                     &ev,
-                     sizeof (ev));
-        if (-1 == iret)
-        {
-          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
-                               "read");
-        }
-        else
-        {
-          GNUNET_break (sizeof (uint64_t) == iret);
-        }
-      }
-    }
-    GNUNET_assert (0 ==
-                   pthread_mutex_lock (&h->big_lock));
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->big_lock));
-  return NULL;
-}
-
-
-/**
- * Lookup account with @a name, and if it does not exist, create it.
- *
- * @param[in,out] h bank to lookup account at
- * @param name account name to resolve
- * @return account handle (never NULL)
- */
-static struct Account *
-lookup_account (struct TALER_FAKEBANK_Handle *h,
-                const char *name)
-{
-  struct GNUNET_HashCode hc;
-  size_t slen;
-  struct Account *account;
-
-  memset (&hc,
-          0,
-          sizeof (hc));
-  slen = strlen (name);
-  GNUNET_CRYPTO_hash (name,
-                      slen,
-                      &hc);
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->accounts_lock));
-  account = GNUNET_CONTAINER_multihashmap_get (h->accounts,
-                                               &hc);
-  if (NULL == account)
-  {
-    account = GNUNET_new (struct Account);
-    account->account_name = GNUNET_strdup (name);
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (h->currency,
-                                          &account->balance));
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_put (h->accounts,
-                                                      &hc,
-                                                      account,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->accounts_lock));
-  return account;
-}
-
-
-/**
- * Generate log messages for failed check operation.
- *
- * @param h handle to output transaction log for
- */
-static void
-check_log (struct TALER_FAKEBANK_Handle *h)
-{
-  for (uint64_t i = 0; i<h->ram_limit; i++)
-  {
-    struct Transaction *t = h->transactions[i];
-
-    if (NULL == t)
-      continue;
-    if (! t->unchecked)
-      continue;
-    switch (t->type)
-    {
-    case T_DEBIT:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "%s -> %s (%s) %s (%s)\n",
-                  t->debit_account->account_name,
-                  t->credit_account->account_name,
-                  TALER_amount2s (&t->amount),
-                  t->subject.debit.exchange_base_url,
-                  "DEBIT");
-      break;
-    case T_CREDIT:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "%s -> %s (%s) %s (%s)\n",
-                  t->debit_account->account_name,
-                  t->credit_account->account_name,
-                  TALER_amount2s (&t->amount),
-                  TALER_B2S (&t->subject.credit.reserve_pub),
-                  "CREDIT");
-      break;
-    case T_WAD:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "%s -> %s (%s) %s[%s] (%s)\n",
-                  t->debit_account->account_name,
-                  t->credit_account->account_name,
-                  TALER_amount2s (&t->amount),
-                  t->subject.wad.origin_base_url,
-                  TALER_B2S (&t->subject.wad),
-                  "WAD");
-      break;
-    }
-  }
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_FAKEBANK_check_debit (struct TALER_FAKEBANK_Handle *h,
-                            const struct TALER_Amount *want_amount,
-                            const char *want_debit,
-                            const char *want_credit,
-                            const char *exchange_base_url,
-                            struct TALER_WireTransferIdentifierRawP *wtid)
-{
-  struct Account *debit_account;
-  struct Account *credit_account;
-
-  GNUNET_assert (0 ==
-                 strcasecmp (want_amount->currency,
-                             h->currency));
-  debit_account = lookup_account (h,
-                                  want_debit);
-  credit_account = lookup_account (h,
-                                   want_credit);
-  for (struct Transaction *t = debit_account->out_tail;
-       NULL != t;
-       t = t->prev_out)
-  {
-    if ( (t->unchecked) &&
-         (credit_account == t->credit_account) &&
-         (T_DEBIT == t->type) &&
-         (0 == TALER_amount_cmp (want_amount,
-                                 &t->amount)) &&
-         (0 == strcasecmp (exchange_base_url,
-                           t->subject.debit.exchange_base_url)) )
-    {
-      *wtid = t->subject.debit.wtid;
-      t->unchecked = false;
-      return GNUNET_OK;
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Did not find matching transaction! I have:\n");
-  check_log (h);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "I wanted: %s->%s (%s) from exchange %s (DEBIT)\n",
-              want_debit,
-              want_credit,
-              TALER_amount2s (want_amount),
-              exchange_base_url);
-  return GNUNET_SYSERR;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_FAKEBANK_check_credit (struct TALER_FAKEBANK_Handle *h,
-                             const struct TALER_Amount *want_amount,
-                             const char *want_debit,
-                             const char *want_credit,
-                             const struct TALER_ReservePublicKeyP *reserve_pub)
-{
-  struct Account *debit_account;
-  struct Account *credit_account;
-
-  GNUNET_assert (0 == strcasecmp (want_amount->currency,
-                                  h->currency));
-  debit_account = lookup_account (h,
-                                  want_debit);
-  credit_account = lookup_account (h,
-                                   want_credit);
-  for (struct Transaction *t = credit_account->in_tail;
-       NULL != t;
-       t = t->prev_in)
-  {
-    if ( (t->unchecked) &&
-         (debit_account == t->debit_account) &&
-         (T_CREDIT == t->type) &&
-         (0 == TALER_amount_cmp (want_amount,
-                                 &t->amount)) &&
-         (0 == GNUNET_memcmp (reserve_pub,
-                              &t->subject.credit.reserve_pub)) )
-    {
-      t->unchecked = false;
-      return GNUNET_OK;
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Did not find matching transaction!\nI have:\n");
-  check_log (h);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "I wanted:\n%s -> %s (%s) with subject %s (CREDIT)\n",
-              want_debit,
-              want_credit,
-              TALER_amount2s (want_amount),
-              TALER_B2S (reserve_pub));
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Update @a account balance by @a amount.
- *
- * The @a big_lock must already be locked when calling
- * this function.
- *
- * @param[in,out] account account to update
- * @param amount balance change
- * @param debit true to subtract, false to add @a amount
- */
-static void
-update_balance (struct Account *account,
-                const struct TALER_Amount *amount,
-                bool debit)
-{
-  if (debit == account->is_negative)
-  {
-    GNUNET_assert (0 <=
-                   TALER_amount_add (&account->balance,
-                                     &account->balance,
-                                     amount));
-    return;
-  }
-  if (0 <= TALER_amount_cmp (&account->balance,
-                             amount))
-  {
-    GNUNET_assert (0 <=
-                   TALER_amount_subtract (&account->balance,
-                                          &account->balance,
-                                          amount));
-  }
-  else
-  {
-    GNUNET_assert (0 <=
-                   TALER_amount_subtract (&account->balance,
-                                          amount,
-                                          &account->balance));
-    account->is_negative = ! account->is_negative;
-  }
-}
-
-
-/**
- * Add transaction to the debit and credit accounts,
- * updating the balances as needed.
- *
- * The transaction @a t must already be locked
- * when calling this function!
- *
- * @param[in,out] h bank handle
- * @param[in,out] t transaction to add to account lists
- */
-static void
-post_transaction (struct TALER_FAKEBANK_Handle *h,
-                  struct Transaction *t)
-{
-  struct Account *debit_acc = t->debit_account;
-  struct Account *credit_acc = t->credit_account;
-  uint64_t row_id;
-  struct Transaction *old;
-
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->big_lock));
-  row_id = ++h->serial_counter;
-  old = h->transactions[row_id % h->ram_limit];
-  h->transactions[row_id % h->ram_limit] = t;
-  t->row_id = row_id;
-  GNUNET_CONTAINER_MDLL_insert_tail (out,
-                                     debit_acc->out_head,
-                                     debit_acc->out_tail,
-                                     t);
-  update_balance (debit_acc,
-                  &t->amount,
-                  true);
-  GNUNET_CONTAINER_MDLL_insert_tail (in,
-                                     credit_acc->in_head,
-                                     credit_acc->in_tail,
-                                     t);
-  update_balance (credit_acc,
-                  &t->amount,
-                  false);
-  if (NULL != old)
-  {
-    struct Account *da;
-    struct Account *ca;
-
-    da = old->debit_account;
-    ca = old->credit_account;
-    /* slot was already in use, must clean out old
-       entry first! */
-    GNUNET_CONTAINER_MDLL_remove (out,
-                                  da->out_head,
-                                  da->out_tail,
-                                  old);
-    GNUNET_CONTAINER_MDLL_remove (in,
-                                  ca->in_head,
-                                  ca->in_tail,
-                                  old);
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->big_lock));
-  if ( (NULL != old) &&
-       (T_DEBIT == old->type) )
-  {
-    GNUNET_assert (0 ==
-                   pthread_mutex_lock (&h->uuid_map_lock));
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONTAINER_multihashmap_remove (h->uuid_map,
-                                                         &old->request_uid,
-                                                         old));
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->uuid_map_lock));
-  }
-  GNUNET_free (old);
-}
-
-
-/**
- * Trigger long pollers that might have been waiting
- * for @a t.
- *
- * @param h fakebank handle
- * @param t transaction to notify on
- */
-static void
-notify_transaction (struct TALER_FAKEBANK_Handle *h,
-                    struct Transaction *t)
-{
-  struct Account *debit_acc = t->debit_account;
-  struct Account *credit_acc = t->credit_account;
-  struct LongPoller *nxt;
-
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->big_lock));
-  for (struct LongPoller *lp = debit_acc->lp_head;
-       NULL != lp;
-       lp = nxt)
-  {
-    nxt = lp->next;
-    if (LP_DEBIT == lp->type)
-    {
-      GNUNET_assert (lp ==
-                     GNUNET_CONTAINER_heap_remove_node (lp->hn));
-      lp_trigger (lp,
-                  h);
-    }
-  }
-  for (struct LongPoller *lp = credit_acc->lp_head;
-       NULL != lp;
-       lp = nxt)
-  {
-    nxt = lp->next;
-    if (LP_CREDIT == lp->type)
-    {
-      GNUNET_assert (lp ==
-                     GNUNET_CONTAINER_heap_remove_node (lp->hn));
-      lp_trigger (lp,
-                  h);
-    }
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->big_lock));
-}
-
-
-/**
- * Tell the fakebank to create another wire transfer *from* an exchange.
- *
- * @param h fake bank handle
- * @param debit_account account to debit
- * @param credit_account account to credit
- * @param amount amount to transfer
- * @param subject wire transfer subject to use
- * @param exchange_base_url exchange URL
- * @param request_uid unique number to make the request unique, or NULL to create one
- * @param[out] ret_row_id pointer to store the row ID of this transaction
- * @param[out] timestamp set to the time of the transfer
- * @return #GNUNET_YES if the transfer was successful,
- *         #GNUNET_SYSERR if the request_uid was reused for a different transfer
- */
-static enum GNUNET_GenericReturnValue
-make_transfer (
-  struct TALER_FAKEBANK_Handle *h,
-  const char *debit_account,
-  const char *credit_account,
-  const struct TALER_Amount *amount,
-  const struct TALER_WireTransferIdentifierRawP *subject,
-  const char *exchange_base_url,
-  const struct GNUNET_HashCode *request_uid,
-  uint64_t *ret_row_id,
-  struct GNUNET_TIME_Timestamp *timestamp)
-{
-  struct Transaction *t;
-  struct Account *debit_acc;
-  struct Account *credit_acc;
-  size_t url_len;
-
-  GNUNET_assert (0 == strcasecmp (amount->currency,
-                                  h->currency));
-  GNUNET_assert (NULL != debit_account);
-  GNUNET_assert (NULL != credit_account);
-  GNUNET_break (0 != strncasecmp ("payto://",
-                                  debit_account,
-                                  strlen ("payto://")));
-  GNUNET_break (0 != strncasecmp ("payto://",
-                                  credit_account,
-                                  strlen ("payto://")));
-  url_len = strlen (exchange_base_url);
-  GNUNET_assert (url_len < MAX_URL_LEN);
-  debit_acc = lookup_account (h,
-                              debit_account);
-  credit_acc = lookup_account (h,
-                               credit_account);
-  if (NULL != request_uid)
-  {
-    GNUNET_assert (0 ==
-                   pthread_mutex_lock (&h->uuid_map_lock));
-    t = GNUNET_CONTAINER_multihashmap_get (h->uuid_map,
-                                           request_uid);
-    if (NULL != t)
-    {
-      if ( (debit_acc != t->debit_account) ||
-            (credit_acc != t->credit_account) ||
-           (0 != TALER_amount_cmp (amount,
-                                   &t->amount)) ||
-           (T_DEBIT != t->type) ||
-           (0 != GNUNET_memcmp (subject,
-                                &t->subject.debit.wtid)) )
-      {
-        /* Transaction exists, but with different details. */
-        GNUNET_break (0);
-        GNUNET_assert (0 ==
-                       pthread_mutex_unlock (&h->uuid_map_lock));
-        return GNUNET_SYSERR;
-      }
-      *ret_row_id = t->row_id;
-      *timestamp = t->date;
-      GNUNET_assert (0 ==
-                     pthread_mutex_unlock (&h->uuid_map_lock));
-      return GNUNET_OK;
-    }
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->uuid_map_lock));
-  }
-  t = GNUNET_new (struct Transaction);
-  t->unchecked = true;
-  t->debit_account = debit_acc;
-  t->credit_account = credit_acc;
-  t->amount = *amount;
-  t->date = GNUNET_TIME_timestamp_get ();
-  if (NULL != timestamp)
-    *timestamp = t->date;
-  t->type = T_DEBIT;
-  memcpy (t->subject.debit.exchange_base_url,
-          exchange_base_url,
-          url_len);
-  t->subject.debit.wtid = *subject;
-  if (NULL == request_uid)
-    GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_NONCE,
-                                      &t->request_uid);
-  else
-    t->request_uid = *request_uid;
-  post_transaction (h,
-                    t);
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->uuid_map_lock));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multihashmap_put (
-                   h->uuid_map,
-                   &t->request_uid,
-                   t,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->uuid_map_lock));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Making transfer %llu from %s to %s over %s and subject %s; for exchange: %s\n",
-              (unsigned long long) t->row_id,
-              debit_account,
-              credit_account,
-              TALER_amount2s (amount),
-              TALER_B2S (subject),
-              exchange_base_url);
-  *ret_row_id = t->row_id;
-  notify_transaction (h,
-                      t);
-  return GNUNET_OK;
-}
-
-
-/**
- * Tell the fakebank to create another wire transfer *to* an exchange.
- *
- * @param h fake bank handle
- * @param debit_account account to debit
- * @param credit_account account to credit
- * @param amount amount to transfer
- * @param reserve_pub reserve public key to use in subject
- * @param[out] row_id serial_id of the transfer
- * @param[out] timestamp when was the transfer made
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-make_admin_transfer (
-  struct TALER_FAKEBANK_Handle *h,
-  const char *debit_account,
-  const char *credit_account,
-  const struct TALER_Amount *amount,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  uint64_t *row_id,
-  struct GNUNET_TIME_Timestamp *timestamp)
-{
-  struct Transaction *t;
-  const struct GNUNET_PeerIdentity *pid;
-  struct Account *debit_acc;
-  struct Account *credit_acc;
-
-  GNUNET_static_assert (sizeof (*pid) ==
-                        sizeof (*reserve_pub));
-  pid = (const struct GNUNET_PeerIdentity *) reserve_pub;
-  GNUNET_assert (NULL != debit_account);
-  GNUNET_assert (NULL != credit_account);
-  GNUNET_assert (0 == strcasecmp (amount->currency,
-                                  h->currency));
-  GNUNET_break (0 != strncasecmp ("payto://",
-                                  debit_account,
-                                  strlen ("payto://")));
-  GNUNET_break (0 != strncasecmp ("payto://",
-                                  credit_account,
-                                  strlen ("payto://")));
-  debit_acc = lookup_account (h,
-                              debit_account);
-  credit_acc = lookup_account (h,
-                               credit_account);
-
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->rpubs_lock));
-  t = GNUNET_CONTAINER_multipeermap_get (h->rpubs,
-                                         pid);
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->rpubs_lock));
-  if (NULL != t)
-  {
-    /* duplicate reserve public key not allowed */
-    GNUNET_break_op (0);
-    return GNUNET_NO;
-  }
-
-  t = GNUNET_new (struct Transaction);
-  t->unchecked = true;
-  t->debit_account = debit_acc;
-  t->credit_account = credit_acc;
-  t->amount = *amount;
-  t->date = GNUNET_TIME_timestamp_get ();
-  if (NULL != timestamp)
-    *timestamp = t->date;
-  t->type = T_CREDIT;
-  t->subject.credit.reserve_pub = *reserve_pub;
-  post_transaction (h,
-                    t);
-  if (NULL != row_id)
-    *row_id = t->row_id;
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->rpubs_lock));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_put (
-                   h->rpubs,
-                   pid,
-                   t,
-                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->rpubs_lock));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Making transfer from %s to %s over %s and subject %s at row %llu\n",
-              debit_account,
-              credit_account,
-              TALER_amount2s (amount),
-              TALER_B2S (reserve_pub),
-              (unsigned long long) t->row_id);
-  notify_transaction (h,
-                      t);
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_FAKEBANK_check_empty (struct TALER_FAKEBANK_Handle *h)
-{
-  for (uint64_t i = 0; i<h->ram_limit; i++)
-  {
-    struct Transaction *t = h->transactions[i];
-
-    if ( (NULL != t) &&
-         (t->unchecked) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Expected empty transaction set, but I have:\n");
-      check_log (h);
-      return GNUNET_SYSERR;
-    }
-  }
-  return GNUNET_OK;
-}
-
-
-static int
-free_account (void *cls,
-              const struct GNUNET_HashCode *key,
-              void *val)
-{
-  struct Account *account = val;
-
-  (void) cls;
-  (void) key;
-  GNUNET_assert (NULL == account->lp_head);
-  GNUNET_free (account->account_name);
-  GNUNET_free (account);
-  return GNUNET_OK;
-}
-
-
-void
-TALER_FAKEBANK_stop (struct TALER_FAKEBANK_Handle *h)
-{
-  if (NULL != h->lp_task)
-  {
-    GNUNET_SCHEDULER_cancel (h->lp_task);
-    h->lp_task = NULL;
-  }
-#if EPOLL_SUPPORT
-  if (NULL != h->mhd_rfd)
-  {
-    GNUNET_NETWORK_socket_free_memory_only_ (h->mhd_rfd);
-    h->mhd_rfd = NULL;
-  }
-#endif
-#ifdef __linux__
-  if (-1 != h->lp_event)
-#else
-  if (-1 != h->lp_event_in && -1 != h->lp_event_out)
-#endif
-  {
-    uint64_t val = 1;
-    void *ret;
-    struct LongPoller *lp;
-
-    GNUNET_assert (0 ==
-                   pthread_mutex_lock (&h->big_lock));
-    h->in_shutdown = true;
-    while (NULL != (lp = GNUNET_CONTAINER_heap_remove_root (h->lp_heap)))
-      lp_trigger (lp,
-                  h);
-    GNUNET_break (sizeof (val) ==
-#ifdef __linux__
-                  write (h->lp_event,
-#else
-                  write (h->lp_event_in,
-#endif
-                         &val,
-                         sizeof (val)));
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->big_lock));
-    GNUNET_break (0 ==
-                  pthread_join (h->lp_thread,
-                                &ret));
-    GNUNET_break (NULL == ret);
-#ifdef __linux__
-    GNUNET_break (0 == close (h->lp_event));
-    h->lp_event = -1;
-#else
-    GNUNET_break (0 == close (h->lp_event_in));
-    GNUNET_break (0 == close (h->lp_event_out));
-    h->lp_event_in = -1;
-    h->lp_event_out = -1;
-#endif
-  }
-  else
-  {
-    struct LongPoller *lp;
-
-    while (NULL != (lp = GNUNET_CONTAINER_heap_remove_root (h->lp_heap)))
-      lp_trigger (lp,
-                  h);
-  }
-  if (NULL != h->mhd_bank)
-  {
-    MHD_stop_daemon (h->mhd_bank);
-    h->mhd_bank = NULL;
-  }
-  if (NULL != h->mhd_task)
-  {
-    GNUNET_SCHEDULER_cancel (h->mhd_task);
-    h->mhd_task = NULL;
-  }
-  if (NULL != h->accounts)
-  {
-    GNUNET_CONTAINER_multihashmap_iterate (h->accounts,
-                                           &free_account,
-                                           NULL);
-    GNUNET_CONTAINER_multihashmap_destroy (h->accounts);
-  }
-  GNUNET_CONTAINER_multihashmap_destroy (h->uuid_map);
-  GNUNET_CONTAINER_multipeermap_destroy (h->rpubs);
-  GNUNET_CONTAINER_heap_destroy (h->lp_heap);
-  GNUNET_assert (0 ==
-                 pthread_mutex_destroy (&h->big_lock));
-  GNUNET_assert (0 ==
-                 pthread_mutex_destroy (&h->uuid_map_lock));
-  GNUNET_assert (0 ==
-                 pthread_mutex_destroy (&h->accounts_lock));
-  GNUNET_assert (0 ==
-                 pthread_mutex_destroy (&h->rpubs_lock));
-  for (uint64_t i = 0; i<h->ram_limit; i++)
-    GNUNET_free (h->transactions[i]);
-  GNUNET_free (h->transactions);
-  GNUNET_free (h->my_baseurl);
-  GNUNET_free (h->currency);
-  GNUNET_free (h);
-}
+#include "fakebank.h"
+#include "fakebank_bank.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_tbi.h"
 
 
 /**
@@ -1327,9 +43,9 @@ TALER_FAKEBANK_stop (struct TALER_FAKEBANK_Handle *h)
  * @a con_cls that might still need to be cleaned up.  Call the
  * respective function to free the memory.
  *
- * @param cls client-defined closure
+ * @param cls a `struct TALER_FAKEBANK_Handle *`
  * @param connection connection handle
- * @param con_cls value as set by the last call to
+ * @param con_cls a `struct ConnectionContext *`
  *        the #MHD_AccessHandlerCallback
  * @param toe reason for request termination
  * @see #MHD_OPTION_NOTIFY_COMPLETED
@@ -1341,1079 +57,16 @@ handle_mhd_completion_callback (void *cls,
                                 void **con_cls,
                                 enum MHD_RequestTerminationCode toe)
 {
-  /*  struct TALER_FAKEBANK_Handle *h = cls; */
-  (void) cls;
-  (void) connection;
-  (void) toe;
-  if (NULL == *con_cls)
-    return;
-  if (&special_ptr == *con_cls)
-    return;
-  GNUNET_JSON_post_parser_cleanup (*con_cls);
-  *con_cls = NULL;
-}
-
-
-/**
- * Handle incoming HTTP request for /admin/add/incoming.
- *
- * @param h the fakebank handle
- * @param connection the connection
- * @param account account into which to deposit the funds (credit)
- * @param upload_data request data
- * @param upload_data_size size of @a upload_data in bytes
- * @param con_cls closure for request (a `struct Buffer *`)
- * @return MHD result code
- */
-static MHD_RESULT
-handle_admin_add_incoming (struct TALER_FAKEBANK_Handle *h,
-                           struct MHD_Connection *connection,
-                           const char *account,
-                           const char *upload_data,
-                           size_t *upload_data_size,
-                           void **con_cls)
-{
-  enum GNUNET_JSON_PostResult pr;
-  json_t *json;
-  uint64_t row_id;
-  struct GNUNET_TIME_Timestamp timestamp;
-
-  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
-                                connection,
-                                con_cls,
-                                upload_data,
-                                upload_data_size,
-                                &json);
-  switch (pr)
-  {
-  case GNUNET_JSON_PR_OUT_OF_MEMORY:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_CONTINUE:
-    return MHD_YES;
-  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_JSON_INVALID:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_SUCCESS:
-    break;
-  }
-  {
-    const char *debit_account;
-    struct TALER_Amount amount;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    char *debit;
-    enum GNUNET_GenericReturnValue ret;
-    struct GNUNET_JSON_Specification spec[] = {
-      GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                   &reserve_pub),
-      GNUNET_JSON_spec_string ("debit_account",
-                               &debit_account),
-      TALER_JSON_spec_amount ("amount",
-                              h->currency,
-                              &amount),
-      GNUNET_JSON_spec_end ()
-    };
-
-    if (GNUNET_OK !=
-        (ret = TALER_MHD_parse_json_data (connection,
-                                          json,
-                                          spec)))
-    {
-      GNUNET_break_op (0);
-      json_decref (json);
-      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
-    }
-    if (0 != strcasecmp (amount.currency,
-                         h->currency))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Currency `%s' does not match our configuration\n",
-                  amount.currency);
-      json_decref (json);
-      return TALER_MHD_reply_with_error (
-        connection,
-        MHD_HTTP_CONFLICT,
-        TALER_EC_GENERIC_CURRENCY_MISMATCH,
-        NULL);
-    }
-    debit = TALER_xtalerbank_account_from_payto (debit_account);
-    if (NULL == debit)
-    {
-      GNUNET_break_op (0);
-      return TALER_MHD_reply_with_error (
-        connection,
-        MHD_HTTP_BAD_REQUEST,
-        TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
-        debit_account);
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Receiving incoming wire transfer: %s->%s, subject: %s, amount: %s\n",
-                debit,
-                account,
-                TALER_B2S (&reserve_pub),
-                TALER_amount2s (&amount));
-    ret = make_admin_transfer (h,
-                               debit,
-                               account,
-                               &amount,
-                               &reserve_pub,
-                               &row_id,
-                               &timestamp);
-    GNUNET_free (debit);
-    if (GNUNET_OK != ret)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Reserve public key not unique\n");
-      json_decref (json);
-      return TALER_MHD_reply_with_error (
-        connection,
-        MHD_HTTP_CONFLICT,
-        TALER_EC_BANK_DUPLICATE_RESERVE_PUB_SUBJECT,
-        NULL);
-    }
-  }
-  json_decref (json);
-
-  /* Finally build response object */
-  return TALER_MHD_REPLY_JSON_PACK (connection,
-                                    MHD_HTTP_OK,
-                                    GNUNET_JSON_pack_uint64 ("row_id",
-                                                             row_id),
-                                    GNUNET_JSON_pack_timestamp ("timestamp",
-                                                                timestamp));
-}
-
-
-/**
- * Handle incoming HTTP request for /transfer.
- *
- * @param h the fakebank handle
- * @param connection the connection
- * @param account account making the transfer
- * @param upload_data request data
- * @param upload_data_size size of @a upload_data in bytes
- * @param con_cls closure for request (a `struct Buffer *`)
- * @return MHD result code
- */
-static MHD_RESULT
-handle_transfer (struct TALER_FAKEBANK_Handle *h,
-                 struct MHD_Connection *connection,
-                 const char *account,
-                 const char *upload_data,
-                 size_t *upload_data_size,
-                 void **con_cls)
-{
-  enum GNUNET_JSON_PostResult pr;
-  json_t *json;
-  uint64_t row_id;
-  struct GNUNET_TIME_Timestamp ts;
-
-  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
-                                connection,
-                                con_cls,
-                                upload_data,
-                                upload_data_size,
-                                &json);
-  switch (pr)
-  {
-  case GNUNET_JSON_PR_OUT_OF_MEMORY:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_CONTINUE:
-    return MHD_YES;
-  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_JSON_INVALID:
-    GNUNET_break (0);
-    return MHD_NO;
-  case GNUNET_JSON_PR_SUCCESS:
-    break;
-  }
-  {
-    struct GNUNET_HashCode uuid;
-    struct TALER_WireTransferIdentifierRawP wtid;
-    const char *credit_account;
-    char *credit;
-    const char *base_url;
-    struct TALER_Amount amount;
-    enum GNUNET_GenericReturnValue ret;
-    struct GNUNET_JSON_Specification spec[] = {
-      GNUNET_JSON_spec_fixed_auto ("request_uid",
-                                   &uuid),
-      TALER_JSON_spec_amount ("amount",
-                              h->currency,
-                              &amount),
-      GNUNET_JSON_spec_string ("exchange_base_url",
-                               &base_url),
-      GNUNET_JSON_spec_fixed_auto ("wtid",
-                                   &wtid),
-      GNUNET_JSON_spec_string ("credit_account",
-                               &credit_account),
-      GNUNET_JSON_spec_end ()
-    };
-
-    if (GNUNET_OK !=
-        (ret = TALER_MHD_parse_json_data (connection,
-                                          json,
-                                          spec)))
-    {
-      GNUNET_break_op (0);
-      json_decref (json);
-      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
-    }
-    {
-      int ret;
-
-      credit = TALER_xtalerbank_account_from_payto (credit_account);
-      if (NULL == credit)
-      {
-        GNUNET_break_op (0);
-        return TALER_MHD_reply_with_error (
-          connection,
-          MHD_HTTP_BAD_REQUEST,
-          TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
-          credit_account);
-      }
-      ret = make_transfer (h,
-                           account,
-                           credit,
-                           &amount,
-                           &wtid,
-                           base_url,
-                           &uuid,
-                           &row_id,
-                           &ts);
-      if (GNUNET_OK != ret)
-      {
-        MHD_RESULT res;
-        char *uids;
-
-        GNUNET_break (0);
-        uids = GNUNET_STRINGS_data_to_string_alloc (&uuid,
-                                                    sizeof (uuid));
-        json_decref (json);
-        res = TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_CONFLICT,
-                                          TALER_EC_BANK_TRANSFER_REQUEST_UID_REUSED,
-                                          uids);
-        GNUNET_free (uids);
-        return res;
-      }
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Receiving incoming wire transfer: %s->%s, subject: %s, amount: %s, from %s\n",
-                  account,
-                  credit,
-                  TALER_B2S (&wtid),
-                  TALER_amount2s (&amount),
-                  base_url);
-      GNUNET_free (credit);
-    }
-  }
-  json_decref (json);
-
-  /* Finally build response object */
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    GNUNET_JSON_pack_uint64 ("row_id",
-                             row_id),
-    GNUNET_JSON_pack_timestamp ("timestamp",
-                                ts));
-}
-
-
-/**
- * Handle incoming HTTP request for / (home page).
- *
- * @param h the fakebank handle
- * @param connection the connection
- * @return MHD result code
- */
-static MHD_RESULT
-handle_home_page (struct TALER_FAKEBANK_Handle *h,
-                  struct MHD_Connection *connection)
-{
-  MHD_RESULT ret;
-  struct MHD_Response *resp;
-#define HELLOMSG "Hello, Fakebank!"
-
-  (void) h;
-  resp = MHD_create_response_from_buffer (
-    strlen (HELLOMSG),
-    HELLOMSG,
-    MHD_RESPMEM_MUST_COPY);
-  ret = MHD_queue_response (connection,
-                            MHD_HTTP_OK,
-                            resp);
-  MHD_destroy_response (resp);
-  return ret;
-}
-
-
-/**
- * This is the "base" structure for both the /history and the
- * /history-range API calls.
- */
-struct HistoryArgs
-{
-
-  /**
-   * Bank account number of the requesting client.
-   */
-  uint64_t account_number;
-
-  /**
-   * Index of the starting transaction, exclusive (!).
-   */
-  uint64_t start_idx;
-
-  /**
-   * Requested number of results and order
-   * (positive: ascending, negative: descending)
-   */
-  int64_t delta;
-
-  /**
-   * Timeout for long polling.
-   */
-  struct GNUNET_TIME_Relative lp_timeout;
-
-  /**
-   * true if starting point was given.
-   */
-  bool have_start;
-
-};
-
-
-/**
- * Parse URL history arguments, of _both_ APIs:
- * /history/incoming and /history/outgoing.
- *
- * @param h bank handle to work on
- * @param connection MHD connection.
- * @param[out] ha will contain the parsed values.
- * @return #GNUNET_OK only if the parsing succeeds,
- *         #GNUNET_SYSERR if it failed,
- *         #GNUNET_NO if it failed and an error was returned
- */
-static enum GNUNET_GenericReturnValue
-parse_history_common_args (const struct TALER_FAKEBANK_Handle *h,
-                           struct MHD_Connection *connection,
-                           struct HistoryArgs *ha)
-{
-  const char *start;
-  const char *delta;
-  const char *long_poll_ms;
-  unsigned long long lp_timeout;
-  unsigned long long sval;
-  long long d;
-  char dummy;
-
-  start = MHD_lookup_connection_value (connection,
-                                       MHD_GET_ARGUMENT_KIND,
-                                       "start");
-  ha->have_start = (NULL != start);
-  delta = MHD_lookup_connection_value (connection,
-                                       MHD_GET_ARGUMENT_KIND,
-                                       "delta");
-  long_poll_ms = MHD_lookup_connection_value (connection,
-                                              MHD_GET_ARGUMENT_KIND,
-                                              "long_poll_ms");
-  lp_timeout = 0;
-  if ( (NULL == delta) ||
-       (1 != sscanf (delta,
-                     "%lld%c",
-                     &d,
-                     &dummy)) )
-  {
-    /* Fail if one of the above failed.  */
-    /* Invalid request, given that this is fakebank we impolitely
-     * just kill the connection instead of returning a nice error.
-     */
-    GNUNET_break_op (0);
-    return (MHD_YES ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                        "delta"))
-           ? GNUNET_NO
-           : GNUNET_SYSERR;
-  }
-  if ( (NULL != long_poll_ms) &&
-       (1 != sscanf (long_poll_ms,
-                     "%llu%c",
-                     &lp_timeout,
-                     &dummy)) )
-  {
-    /* Fail if one of the above failed.  */
-    /* Invalid request, given that this is fakebank we impolitely
-     * just kill the connection instead of returning a nice error.
-     */
-    GNUNET_break_op (0);
-    return (MHD_YES ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                        "long_poll_ms"))
-           ? GNUNET_NO
-           : GNUNET_SYSERR;
-  }
-  if ( (NULL != start) &&
-       (1 != sscanf (start,
-                     "%llu%c",
-                     &sval,
-                     &dummy)) )
-  {
-    /* Fail if one of the above failed.  */
-    /* Invalid request, given that this is fakebank we impolitely
-     * just kill the connection instead of returning a nice error.
-     */
-    GNUNET_break_op (0);
-    return (MHD_YES ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                        "start"))
-           ? GNUNET_NO
-           : GNUNET_SYSERR;
-  }
-  if (NULL == start)
-    ha->start_idx = (d > 0) ? 0 : h->serial_counter;
-  else
-    ha->start_idx = (uint64_t) sval;
-  ha->delta = (int64_t) d;
-  if (0 == ha->delta)
-  {
-    GNUNET_break_op (0);
-    return (MHD_YES ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                        "delta"))
-           ? GNUNET_NO
-           : GNUNET_SYSERR;
-  }
-  ha->lp_timeout
-    = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                     lp_timeout);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Request for %lld records from %llu\n",
-              (long long) ha->delta,
-              (unsigned long long) ha->start_idx);
-  return GNUNET_OK;
-}
-
-
-/**
- * Task run when a long poller is about to time out.
- * Only used in single-threaded mode.
- *
- * @param cls a `struct TALER_FAKEBANK_Handle *`
- */
-static void
-lp_timeout (void *cls)
-{
   struct TALER_FAKEBANK_Handle *h = cls;
-  struct LongPoller *lp;
+  struct ConnectionContext *cc = *con_cls;
 
-  h->lp_task = NULL;
-  while (NULL != (lp = GNUNET_CONTAINER_heap_peek (h->lp_heap)))
-  {
-    if (GNUNET_TIME_absolute_is_future (lp->timeout))
-      break;
-    GNUNET_assert (lp ==
-                   GNUNET_CONTAINER_heap_remove_root (h->lp_heap));
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Timeout reached for long poller %p\n",
-                lp->conn);
-    lp_trigger (lp,
-                h);
-  }
-  if (NULL == lp)
+  (void) h;
+  (void) connection;
+  (void) toe;
+  if (NULL == cc)
     return;
-  h->lp_task = GNUNET_SCHEDULER_add_at (lp->timeout,
-                                        &lp_timeout,
-                                        h);
-}
-
-
-/**
- * Reschedule the timeout task of @a h for time @a t.
- *
- * @param h fakebank handle
- * @param t when will the next connection timeout expire
- */
-static void
-reschedule_lp_timeout (struct TALER_FAKEBANK_Handle *h,
-                       struct GNUNET_TIME_Absolute t)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Scheduling timeout task for %s\n",
-              GNUNET_STRINGS_absolute_time_to_string (t));
-#ifdef __linux__
-  if (-1 != h->lp_event)
-#else
-  if (-1 != h->lp_event_in && -1 != h->lp_event_out)
-#endif
-  {
-    uint64_t num = 1;
-
-    GNUNET_break (sizeof (num) ==
-#ifdef __linux__
-                  write (h->lp_event,
-#else
-                  write (h->lp_event_in,
-#endif
-                         &num,
-                         sizeof (num)));
-  }
-  else
-  {
-    if (NULL != h->lp_task)
-      GNUNET_SCHEDULER_cancel (h->lp_task);
-    h->lp_task = GNUNET_SCHEDULER_add_at (t,
-                                          &lp_timeout,
-                                          h);
-  }
-}
-
-
-/**
- * Start long-polling for @a connection and @a acc
- * for transfers in @a dir. Must be called with the
- * "big lock" held.
- *
- * @param[in,out] h fakebank handle
- * @param[in,out] connection to suspend
- * @param[in,out] acc account affected
- * @param lp_timeout how long to suspend
- * @param dir direction of transfers to watch for
- */
-static void
-start_lp (struct TALER_FAKEBANK_Handle *h,
-          struct MHD_Connection *connection,
-          struct Account *acc,
-          struct GNUNET_TIME_Relative lp_timeout,
-          enum LongPollType dir)
-{
-  struct LongPoller *lp;
-  bool toc;
-
-  lp = GNUNET_new (struct LongPoller);
-  lp->account = acc;
-  lp->conn = connection;
-  lp->timeout = GNUNET_TIME_relative_to_absolute (lp_timeout);
-  lp->type = dir;
-  lp->hn = GNUNET_CONTAINER_heap_insert (h->lp_heap,
-                                         lp,
-                                         lp->timeout.abs_value_us);
-  toc = (lp ==
-         GNUNET_CONTAINER_heap_peek (h->lp_heap));
-  GNUNET_CONTAINER_DLL_insert (acc->lp_head,
-                               acc->lp_tail,
-                               lp);
-  MHD_suspend_connection (connection);
-  if (toc)
-    reschedule_lp_timeout (h,
-                           lp->timeout);
-
-}
-
-
-/**
- * Handle incoming HTTP request for /history/outgoing
- *
- * @param h the fakebank handle
- * @param connection the connection
- * @param account which account the request is about
- * @param con_cls closure for request (NULL or &special_ptr)
- */
-static MHD_RESULT
-handle_debit_history (struct TALER_FAKEBANK_Handle *h,
-                      struct MHD_Connection *connection,
-                      const char *account,
-                      void **con_cls)
-{
-  struct HistoryArgs ha;
-  struct Account *acc;
-  struct Transaction *pos;
-  json_t *history;
-  char *debit_payto;
-  enum GNUNET_GenericReturnValue ret;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Handling /history/outgoing connection %p\n",
-              connection);
-  if (GNUNET_OK !=
-      (ret = parse_history_common_args (h,
-                                        connection,
-                                        &ha)))
-  {
-    GNUNET_break_op (0);
-    return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
-  }
-  if (&special_ptr == *con_cls)
-    ha.lp_timeout = GNUNET_TIME_UNIT_ZERO;
-  acc = lookup_account (h,
-                        account);
-  GNUNET_asprintf (&debit_payto,
-                   "payto://x-taler-bank/localhost/%s",
-                   account);
-  history = json_array ();
-  if (NULL == history)
-  {
-    GNUNET_break (0);
-    GNUNET_free (debit_payto);
-    return MHD_NO;
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->big_lock));
-  if (! ha.have_start)
-  {
-    pos = (0 > ha.delta)
-          ? acc->out_tail
-          : acc->out_head;
-  }
-  else
-  {
-    struct Transaction *t = h->transactions[ha.start_idx % h->ram_limit];
-    bool overflow;
-    uint64_t dir;
-    bool skip = true;
-
-    dir = (0 > ha.delta) ? (h->ram_limit - 1) : 1;
-    overflow = (t->row_id != ha.start_idx);
-    /* If account does not match, linear scan for
-       first matching account. */
-    while ( (! overflow) &&
-             (NULL != t) &&
-            (t->debit_account != acc) )
-    {
-      skip = false;
-      t = h->transactions[(t->row_id + dir) % h->ram_limit];
-      if ( (NULL != t) &&
-           (t->row_id == ha.start_idx) )
-        overflow = true; /* full circle, give up! */
-    }
-    if ( (NULL == t) ||
-         overflow)
-    {
-      GNUNET_free (debit_payto);
-      if (GNUNET_TIME_relative_is_zero (ha.lp_timeout) &&
-          (0 < ha.delta))
-      {
-        GNUNET_assert (0 ==
-                       pthread_mutex_unlock (&h->big_lock));
-        return TALER_MHD_REPLY_JSON_PACK (
-          connection,
-          MHD_HTTP_OK,
-          GNUNET_JSON_pack_array_steal (
-            "outgoing_transactions",
-            history));
-      }
-      *con_cls = &special_ptr;
-      start_lp (h,
-                connection,
-                acc,
-                ha.lp_timeout,
-                LP_DEBIT);
-      GNUNET_assert (0 ==
-                     pthread_mutex_unlock (&h->big_lock));
-      json_decref (history);
-      return MHD_YES;
-    }
-    if (t->debit_account != acc)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Invalid start specified, transaction %llu not with account %s!\n",
-                  (unsigned long long) ha.start_idx,
-                  account);
-      GNUNET_assert (0 ==
-                     pthread_mutex_unlock (&h->big_lock));
-      GNUNET_free (debit_payto);
-      json_decref (history);
-      return MHD_NO;
-    }
-    if (skip)
-    {
-      /* range is exclusive, skip the matching entry */
-      if (0 > ha.delta)
-        pos = t->prev_out;
-      else
-        pos = t->next_out;
-    }
-    else
-    {
-      pos = t;
-    }
-  }
-  if (NULL != pos)
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Returning %lld debit transactions starting (inclusive) from %llu\n",
-                (long long) ha.delta,
-                (unsigned long long) pos->row_id);
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No debit transactions exist after given starting point\n");
-  while ( (0 != ha.delta) &&
-          (NULL != pos) )
-  {
-    json_t *trans;
-    char *credit_payto;
-
-    if (T_DEBIT != pos->type)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Unexpected CREDIT transaction #%llu for account `%s'\n",
-                  (unsigned long long) pos->row_id,
-                  account);
-      if (0 > ha.delta)
-        pos = pos->prev_in;
-      if (0 < ha.delta)
-        pos = pos->next_in;
-      continue;
-    }
-    GNUNET_asprintf (&credit_payto,
-                     "payto://x-taler-bank/localhost/%s",
-                     pos->credit_account->account_name);
-    trans = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_uint64 ("row_id",
-                               pos->row_id),
-      GNUNET_JSON_pack_timestamp ("date",
-                                  pos->date),
-      TALER_JSON_pack_amount ("amount",
-                              &pos->amount),
-      GNUNET_JSON_pack_string ("credit_account",
-                               credit_payto),
-      GNUNET_JSON_pack_string ("debit_account",
-                               debit_payto),          // FIXME: inefficient to return this here always!
-      GNUNET_JSON_pack_string ("exchange_base_url",
-                               pos->subject.debit.exchange_base_url),
-      GNUNET_JSON_pack_data_auto ("wtid",
-                                  &pos->subject.debit.wtid));
-    GNUNET_assert (NULL != trans);
-    GNUNET_free (credit_payto);
-    GNUNET_assert (0 ==
-                   json_array_append_new (history,
-                                          trans));
-    if (ha.delta > 0)
-      ha.delta--;
-    else
-      ha.delta++;
-    if (0 > ha.delta)
-      pos = pos->prev_out;
-    if (0 < ha.delta)
-      pos = pos->next_out;
-  }
-  if ( (0 == json_array_size (history)) &&
-       (! GNUNET_TIME_relative_is_zero (ha.lp_timeout)) &&
-       (0 < ha.delta))
-  {
-    *con_cls = &special_ptr;
-    start_lp (h,
-              connection,
-              acc,
-              ha.lp_timeout,
-              LP_DEBIT);
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->big_lock));
-    json_decref (history);
-    return MHD_YES;
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->big_lock));
-  GNUNET_free (debit_payto);
-  return TALER_MHD_REPLY_JSON_PACK (connection,
-                                    MHD_HTTP_OK,
-                                    GNUNET_JSON_pack_array_steal (
-                                      "outgoing_transactions",
-                                      history));
-}
-
-
-/**
- * Handle incoming HTTP request for /history/incoming
- *
- * @param h the fakebank handle
- * @param connection the connection
- * @param account which account the request is about
- * @param con_cls closure for request (NULL or &special_ptr)
- * @return MHD result code
- */
-static MHD_RESULT
-handle_credit_history (struct TALER_FAKEBANK_Handle *h,
-                       struct MHD_Connection *connection,
-                       const char *account,
-                       void **con_cls)
-{
-  struct HistoryArgs ha;
-  struct Account *acc;
-  const struct Transaction *pos;
-  json_t *history;
-  char *credit_payto;
-  enum GNUNET_GenericReturnValue ret;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Handling /history/incoming connection %p (%d)\n",
-              connection,
-              (*con_cls == &special_ptr));
-  if (GNUNET_OK !=
-      (ret = parse_history_common_args (h,
-                                        connection,
-                                        &ha)))
-  {
-    GNUNET_break_op (0);
-    return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
-  }
-  if (&special_ptr == *con_cls)
-    ha.lp_timeout = GNUNET_TIME_UNIT_ZERO;
-  *con_cls = &special_ptr;
-  acc = lookup_account (h,
-                        account);
-  history = json_array ();
-  GNUNET_assert (NULL != history);
-  GNUNET_asprintf (&credit_payto,
-                   "payto://x-taler-bank/localhost/%s",
-                   account);
-  GNUNET_assert (0 ==
-                 pthread_mutex_lock (&h->big_lock));
-  if (! ha.have_start)
-  {
-    pos = (0 > ha.delta)
-          ? acc->in_tail
-          : acc->in_head;
-  }
-  else
-  {
-    struct Transaction *t = h->transactions[ha.start_idx % h->ram_limit];
-    bool overflow;
-    uint64_t dir;
-    bool skip = true;
-
-    overflow = ( (NULL != t) && (t->row_id != ha.start_idx) );
-    dir = (0 > ha.delta) ? (h->ram_limit - 1) : 1;
-    /* If account does not match, linear scan for
-       first matching account. */
-    while ( (! overflow) &&
-            (NULL != t) &&
-            (t->credit_account != acc) )
-    {
-      skip = false;
-      t = h->transactions[(t->row_id + dir) % h->ram_limit];
-      if ( (NULL != t) &&
-           (t->row_id == ha.start_idx) )
-        overflow = true; /* full circle, give up! */
-    }
-    if ( (NULL == t) ||
-         overflow)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "No transactions available, suspending request\n");
-      GNUNET_free (credit_payto);
-      if (GNUNET_TIME_relative_is_zero (ha.lp_timeout) &&
-          (0 < ha.delta))
-      {
-        GNUNET_assert (0 ==
-                       pthread_mutex_unlock (&h->big_lock));
-        return TALER_MHD_REPLY_JSON_PACK (connection,
-                                          MHD_HTTP_OK,
-                                          GNUNET_JSON_pack_array_steal (
-                                            "incoming_transactions",
-                                            history));
-      }
-      *con_cls = &special_ptr;
-      start_lp (h,
-                connection,
-                acc,
-                ha.lp_timeout,
-                LP_CREDIT);
-      GNUNET_assert (0 ==
-                     pthread_mutex_unlock (&h->big_lock));
-      json_decref (history);
-      return MHD_YES;
-    }
-    if (skip)
-    {
-      /* range from application is exclusive, skip the
-  matching entry */
-      if (0 > ha.delta)
-        pos = t->prev_in;
-      else
-        pos = t->next_in;
-    }
-    else
-    {
-      pos = t;
-    }
-  }
-  if (NULL != pos)
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Returning %lld credit transactions starting (inclusive) from %llu\n",
-                (long long) ha.delta,
-                (unsigned long long) pos->row_id);
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No credit transactions exist after given starting point\n");
-  while ( (0 != ha.delta) &&
-          (NULL != pos) )
-  {
-    json_t *trans;
-    char *debit_payto;
-
-    if (T_CREDIT != pos->type)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Unexpected DEBIT transaction #%llu for account `%s'\n",
-                  (unsigned long long) pos->row_id,
-                  account);
-      if (0 > ha.delta)
-        pos = pos->prev_in;
-      if (0 < ha.delta)
-        pos = pos->next_in;
-      continue;
-    }
-    GNUNET_asprintf (&debit_payto,
-                     "payto://x-taler-bank/localhost/%s",
-                     pos->debit_account->account_name);
-    trans = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_uint64 ("row_id",
-                               pos->row_id),
-      GNUNET_JSON_pack_timestamp ("date",
-                                  pos->date),
-      TALER_JSON_pack_amount ("amount",
-                              &pos->amount),
-      GNUNET_JSON_pack_string ("credit_account",
-                               credit_payto),   // FIXME: inefficient to repeat this always here!
-      GNUNET_JSON_pack_string ("debit_account",
-                               debit_payto),
-      GNUNET_JSON_pack_data_auto ("reserve_pub",
-                                  &pos->subject.credit.reserve_pub));
-    GNUNET_assert (NULL != trans);
-    GNUNET_free (debit_payto);
-    GNUNET_assert (0 ==
-                   json_array_append_new (history,
-                                          trans));
-    if (ha.delta > 0)
-      ha.delta--;
-    else
-      ha.delta++;
-    if (0 > ha.delta)
-      pos = pos->prev_in;
-    if (0 < ha.delta)
-      pos = pos->next_in;
-  }
-  if ( (0 == json_array_size (history)) &&
-       (! GNUNET_TIME_relative_is_zero (ha.lp_timeout)) &&
-       (0 < ha.delta))
-  {
-    *con_cls = &special_ptr;
-    start_lp (h,
-              connection,
-              acc,
-              ha.lp_timeout,
-              LP_CREDIT);
-    GNUNET_assert (0 ==
-                   pthread_mutex_unlock (&h->big_lock));
-    json_decref (history);
-    return MHD_YES;
-  }
-  GNUNET_assert (0 ==
-                 pthread_mutex_unlock (&h->big_lock));
-  GNUNET_free (credit_payto);
-  return TALER_MHD_REPLY_JSON_PACK (connection,
-                                    MHD_HTTP_OK,
-                                    GNUNET_JSON_pack_array_steal (
-                                      "incoming_transactions",
-                                      history));
-}
-
-
-/**
- * Handle incoming HTTP request.
- *
- * @param h our handle
- * @param connection the connection
- * @param url the requested url
- * @param method the method (POST, GET, ...)
- * @param account which account should process the request
- * @param upload_data request data
- * @param upload_data_size size of @a upload_data in bytes
- * @param con_cls closure
- * @return MHD result code
- */
-static MHD_RESULT
-serve (struct TALER_FAKEBANK_Handle *h,
-       struct MHD_Connection *connection,
-       const char *account,
-       const char *url,
-       const char *method,
-       const char *upload_data,
-       size_t *upload_data_size,
-       void **con_cls)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Fakebank, serving URL `%s' for account `%s'\n",
-              url,
-              account);
-  if (0 == strcasecmp (method,
-                       MHD_HTTP_METHOD_GET))
-  {
-    if ( (0 == strcmp (url,
-                       "/history/incoming")) &&
-         (NULL != account) )
-      return handle_credit_history (h,
-                                    connection,
-                                    account,
-                                    con_cls);
-    if ( (0 == strcmp (url,
-                       "/history/outgoing")) &&
-         (NULL != account) )
-      return handle_debit_history (h,
-                                   connection,
-                                   account,
-                                   con_cls);
-    if (0 == strcmp (url,
-                     "/"))
-      return handle_home_page (h,
-                               connection);
-  }
-  else if (0 == strcasecmp (method,
-                            MHD_HTTP_METHOD_POST))
-  {
-    if ( (0 == strcmp (url,
-                       "/admin/add-incoming")) &&
-         (NULL != account) )
-      return handle_admin_add_incoming (h,
-                                        connection,
-                                        account,
-                                        upload_data,
-                                        upload_data_size,
-                                        con_cls);
-    if ( (0 == strcmp (url,
-                       "/transfer")) &&
-         (NULL != account) )
-      return handle_transfer (h,
-                              connection,
-                              account,
-                              upload_data,
-                              upload_data_size,
-                              con_cls);
-  }
-  /* Unexpected URL path, just close the connection. */
-  TALER_LOG_ERROR ("Breaking URL: %s %s\n",
-                   method,
-                   url);
-  GNUNET_break_op (0);
-  return TALER_MHD_reply_with_error (
-    connection,
-    MHD_HTTP_NOT_FOUND,
-    TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
-    url);
+  cc->ctx_cleaner (cc->ctx);
+  GNUNET_free (cc);
 }
 
 
@@ -2441,35 +94,28 @@ handle_mhd_request (void *cls,
                     void **con_cls)
 {
   struct TALER_FAKEBANK_Handle *h = cls;
-  char *account = NULL;
-  char *end;
-  MHD_RESULT ret;
 
   (void) version;
   if (0 == strncmp (url,
-                    "/taler-wire-gateway/",
-                    strlen ("/taler-wire-gateway/")))
-    url += strlen ("/taler-wire-gateway");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Handling request for `%s'\n",
-              url);
-  if ( (strlen (url) > 1) &&
-       (NULL != (end = strchr (url + 1, '/'))) )
-  {
-    account = GNUNET_strndup (url + 1,
-                              end - url - 1);
-    url = end;
-  }
-  ret = serve (h,
-               connection,
-               account,
-               url,
-               method,
-               upload_data,
-               upload_data_size,
-               con_cls);
-  GNUNET_free (account);
-  return ret;
+                    "/taler-integration/",
+                    strlen ("/taler-integration/")))
+  {
+    url += strlen ("/taler-integration");
+    return TALER_FAKEBANK_tbi_main_ (h,
+                                     connection,
+                                     url,
+                                     method,
+                                     upload_data,
+                                     upload_data_size,
+                                     con_cls);
+  }
+  return TALER_FAKEBANK_bank_main_ (h,
+                                    connection,
+                                    url,
+                                    method,
+                                    upload_data,
+                                    upload_data_size,
+                                    con_cls);
 }
 
 
@@ -2500,7 +146,7 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h)
   h->mhd_task =
     GNUNET_SCHEDULER_add_read_net (tv,
                                    h->mhd_rfd,
-                                   &run_mhd,
+                                   &TALER_FAKEBANK_run_mhd_,
                                    h);
 }
 
@@ -2574,7 +220,7 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h)
                                  tv,
                                  wrs,
                                  wws,
-                                 &run_mhd,
+                                 &TALER_FAKEBANK_run_mhd_,
                                  h);
   if (NULL != wrs)
     GNUNET_NETWORK_fdset_destroy (wrs);
@@ -2591,8 +237,8 @@ schedule_httpd (struct TALER_FAKEBANK_Handle *h)
  *
  * @param cls the `struct TALER_FAKEBANK_Handle`
  */
-static void
-run_mhd (void *cls)
+void
+TALER_FAKEBANK_run_mhd_ (void *cls)
 {
   struct TALER_FAKEBANK_Handle *h = cls;
 
@@ -2630,6 +276,34 @@ TALER_FAKEBANK_start2 (uint16_t port,
                        uint64_t ram_limit,
                        unsigned int num_threads)
 {
+  struct TALER_Amount zero;
+
+  if (GNUNET_OK !=
+      TALER_amount_set_zero (currency,
+                             &zero))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  return TALER_FAKEBANK_start3 ("localhost",
+                                port,
+                                NULL,
+                                currency,
+                                ram_limit,
+                                num_threads,
+                                &zero);
+}
+
+
+struct TALER_FAKEBANK_Handle *
+TALER_FAKEBANK_start3 (const char *hostname,
+                       uint16_t port,
+                       const char *exchange_url,
+                       const char *currency,
+                       uint64_t ram_limit,
+                       unsigned int num_threads,
+                       const struct TALER_Amount *signup_bonus)
+{
   struct TALER_FAKEBANK_Handle *h;
 
   if (SIZE_MAX / sizeof (struct Transaction *) < ram_limit)
@@ -2640,7 +314,16 @@ TALER_FAKEBANK_start2 (uint16_t port,
     return NULL;
   }
   GNUNET_assert (strlen (currency) < TALER_CURRENCY_LEN);
+  if (0 != strcmp (signup_bonus->currency,
+                   currency))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
   h = GNUNET_new (struct TALER_FAKEBANK_Handle);
+  h->signup_bonus = *signup_bonus;
+  if (NULL != exchange_url)
+    h->exchange_url = GNUNET_strdup (exchange_url);
 #ifdef __linux__
   h->lp_event = -1;
 #else
@@ -2697,27 +380,30 @@ TALER_FAKEBANK_start2 (uint16_t port,
   }
   h->lp_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
   h->currency = GNUNET_strdup (currency);
+  h->hostname = GNUNET_strdup (hostname);
   GNUNET_asprintf (&h->my_baseurl,
-                   "http://localhost:%u/",
+                   "http://%s:%u/",
+                   h->hostname,
                    (unsigned int) port);
   if (0 == num_threads)
   {
-    h->mhd_bank = MHD_start_daemon (MHD_USE_DEBUG
+    h->mhd_bank = MHD_start_daemon (
+      MHD_USE_DEBUG
 #if EPOLL_SUPPORT
-                                    | MHD_USE_EPOLL
+      | MHD_USE_EPOLL
 #endif
-                                    | MHD_USE_DUAL_STACK
-                                    | MHD_ALLOW_SUSPEND_RESUME,
-                                    port,
-                                    NULL, NULL,
-                                    &handle_mhd_request, h,
-                                    MHD_OPTION_NOTIFY_COMPLETED,
-                                    &handle_mhd_completion_callback, h,
-                                    MHD_OPTION_LISTEN_BACKLOG_SIZE,
-                                    (unsigned int) 1024,
-                                    MHD_OPTION_CONNECTION_LIMIT,
-                                    (unsigned int) 65536,
-                                    MHD_OPTION_END);
+      | MHD_USE_DUAL_STACK
+      | MHD_ALLOW_SUSPEND_RESUME,
+      port,
+      NULL, NULL,
+      &handle_mhd_request, h,
+      MHD_OPTION_NOTIFY_COMPLETED,
+      &handle_mhd_completion_callback, h,
+      MHD_OPTION_LISTEN_BACKLOG_SIZE,
+      (unsigned int) 1024,
+      MHD_OPTION_CONNECTION_LIMIT,
+      (unsigned int) 65536,
+      MHD_OPTION_END);
     if (NULL == h->mhd_bank)
     {
       TALER_FAKEBANK_stop (h);
@@ -2745,6 +431,7 @@ TALER_FAKEBANK_start2 (uint16_t port,
 #else
     {
       int pipefd[2];
+
       if (0 != pipe (pipefd))
       {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
@@ -2759,7 +446,7 @@ TALER_FAKEBANK_start2 (uint16_t port,
     if (0 !=
         pthread_create (&h->lp_thread,
                         NULL,
-                        &lp_expiration_thread,
+                        &TALER_FAKEBANK_lp_expiration_thread_,
                         h))
     {
       GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
@@ -2776,24 +463,25 @@ TALER_FAKEBANK_start2 (uint16_t port,
       TALER_FAKEBANK_stop (h);
       return NULL;
     }
-    h->mhd_bank = MHD_start_daemon (MHD_USE_DEBUG
-                                    | MHD_USE_AUTO_INTERNAL_THREAD
-                                    | MHD_ALLOW_SUSPEND_RESUME
-                                    | MHD_USE_TURBO
-                                    | MHD_USE_TCP_FASTOPEN
-                                    | MHD_USE_DUAL_STACK,
-                                    port,
-                                    NULL, NULL,
-                                    &handle_mhd_request, h,
-                                    MHD_OPTION_NOTIFY_COMPLETED,
-                                    &handle_mhd_completion_callback, h,
-                                    MHD_OPTION_LISTEN_BACKLOG_SIZE,
-                                    (unsigned int) 1024,
-                                    MHD_OPTION_CONNECTION_LIMIT,
-                                    (unsigned int) 65536,
-                                    MHD_OPTION_THREAD_POOL_SIZE,
-                                    num_threads,
-                                    MHD_OPTION_END);
+    h->mhd_bank = MHD_start_daemon (
+      MHD_USE_DEBUG
+      | MHD_USE_AUTO_INTERNAL_THREAD
+      | MHD_ALLOW_SUSPEND_RESUME
+      | MHD_USE_TURBO
+      | MHD_USE_TCP_FASTOPEN
+      | MHD_USE_DUAL_STACK,
+      port,
+      NULL, NULL,
+      &handle_mhd_request, h,
+      MHD_OPTION_NOTIFY_COMPLETED,
+      &handle_mhd_completion_callback, h,
+      MHD_OPTION_LISTEN_BACKLOG_SIZE,
+      (unsigned int) 1024,
+      MHD_OPTION_CONNECTION_LIMIT,
+      (unsigned int) 65536,
+      MHD_OPTION_THREAD_POOL_SIZE,
+      num_threads,
+      MHD_OPTION_END);
     if (NULL == h->mhd_bank)
     {
       GNUNET_break (0);
diff --git a/src/bank-lib/fakebank.h b/src/bank-lib/fakebank.h
new file mode 100644
index 000000000..a9d61d8b1
--- /dev/null
+++ b/src/bank-lib/fakebank.h
@@ -0,0 +1,691 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank.h
+ * @brief general state of the fakebank
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_H
+#define FAKEBANK_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+
+
+/**
+ * How long are exchange base URLs allowed to be at most?
+ * Set to a relatively low number as this does contribute
+ * significantly to our RAM consumption.
+ */
+#define MAX_URL_LEN 64
+
+
+/**
+ * Maximum POST request size.
+ */
+#define REQUEST_BUFFER_MAX (4 * 1024)
+
+
+/**
+ * Per account information.
+ */
+struct Account;
+
+
+/**
+ * Types of long polling activities.
+ */
+enum LongPollType
+{
+  /**
+   * Transfer TO the exchange.
+   */
+  LP_CREDIT,
+
+  /**
+   * Transfer FROM the exchange.
+   */
+  LP_DEBIT,
+
+  /**
+   * Withdraw operation completion/abort.
+   */
+  LP_WITHDRAW
+
+};
+
+/**
+ * Client waiting for activity on this account.
+ */
+struct LongPoller
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct LongPoller *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct LongPoller *prev;
+
+  /**
+   * Fakebank this long poller belongs with.
+   */
+  struct TALER_FAKEBANK_Handle *h;
+
+  /**
+   * Account this long poller is waiting on.
+   */
+  struct Account *account;
+
+  /**
+   * Withdraw operation we are waiting on,
+   * only if @e type is #LP_WITHDRAW, otherwise NULL.
+   */
+  const struct WithdrawalOperation *wo;
+
+  /**
+   * Entry in the heap for this long poller.
+   */
+  struct GNUNET_CONTAINER_HeapNode *hn;
+
+  /**
+   * Client that is waiting for transactions.
+   */
+  struct MHD_Connection *conn;
+
+  /**
+   * When will this long poller time out?
+   */
+  struct GNUNET_TIME_Absolute timeout;
+
+  /**
+   * What does the @e connection wait for?
+   */
+  enum LongPollType type;
+
+};
+
+
+/**
+ * Details about a transcation we (as the simulated bank) received.
+ */
+struct Transaction;
+
+
+/**
+ * Information we keep per withdraw operation.
+ */
+struct WithdrawalOperation
+{
+  /**
+   * Unique (random) operation ID.
+   */
+  struct GNUNET_ShortHashCode wopid;
+
+  /**
+   * Debited account.
+   */
+  struct Account *debit_account;
+
+  /**
+   * Target exchange account, or NULL if unknown.
+   */
+  const struct Account *exchange_account;
+
+  /**
+   * RowID of the resulting transaction, if any. Otherwise 0.
+   */
+  uint64_t row_id;
+
+  /**
+   * Amount transferred.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Public key of the reserve, wire transfer subject.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * When was the transaction made? 0 if not yet.
+   */
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  /**
+   * Was the withdrawal aborted?
+   */
+  bool aborted;
+
+  /**
+   * Did the bank confirm the withdrawal?
+   */
+  bool confirmation_done;
+
+  /**
+   * Is @e reserve_pub initialized?
+   */
+  bool selection_done;
+
+};
+
+
+/**
+ * Per account information.
+ */
+struct Account
+{
+
+  /**
+   * Inbound transactions for this account in a MDLL.
+   */
+  struct Transaction *in_head;
+
+  /**
+   * Inbound transactions for this account in a MDLL.
+   */
+  struct Transaction *in_tail;
+
+  /**
+   * Outbound transactions for this account in a MDLL.
+   */
+  struct Transaction *out_head;
+
+  /**
+   * Outbound transactions for this account in a MDLL.
+   */
+  struct Transaction *out_tail;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct LongPoller *lp_head;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct LongPoller *lp_tail;
+
+  /**
+   * Account name (string, not payto!)
+   */
+  char *account_name;
+
+  /**
+   * Receiver name for payto:// URIs.
+   */
+  char *receiver_name;
+
+  /**
+   * Payto URI for this account.
+   */
+  char *payto_uri;
+
+  /**
+   * Password set for the account (if any).
+   */
+  char *password;
+
+  /**
+   * Current account balance.
+   */
+  struct TALER_Amount balance;
+
+  /**
+   * true if the balance is negative.
+   */
+  bool is_negative;
+
+};
+
+
+/**
+ * Details about a transcation we (as the simulated bank) received.
+ */
+struct Transaction
+{
+  /**
+   * We store inbound transactions in a MDLL.
+   */
+  struct Transaction *next_in;
+
+  /**
+   * We store inbound transactions in a MDLL.
+   */
+  struct Transaction *prev_in;
+
+  /**
+   * We store outbound transactions in a MDLL.
+   */
+  struct Transaction *next_out;
+
+  /**
+   * We store outbound transactions in a MDLL.
+   */
+  struct Transaction *prev_out;
+
+  /**
+   * Amount to be transferred.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Account to debit.
+   */
+  struct Account *debit_account;
+
+  /**
+   * Account to credit.
+   */
+  struct Account *credit_account;
+
+  /**
+   * Random unique identifier for the request.
+   * Used to detect idempotent requests.
+   */
+  struct GNUNET_HashCode request_uid;
+
+  /**
+   * When did the transaction happen?
+   */
+  struct GNUNET_TIME_Timestamp date;
+
+  /**
+   * Number of this transaction.
+   */
+  uint64_t row_id;
+
+  /**
+   * What does the @e subject contain?
+   */
+  enum
+  {
+    /**
+     * Transfer TO the exchange.
+     */
+    T_CREDIT,
+
+    /**
+     * Transfer FROM the exchange.
+     */
+    T_DEBIT,
+
+    /**
+     * Exchange-to-exchange WAD transfer.
+     */
+    T_WAD,
+  } type;
+
+  /**
+   * Wire transfer subject.
+   */
+  union
+  {
+
+    /**
+     * Used if @e type is T_DEBIT.
+     */
+    struct
+    {
+
+      /**
+       * Subject of the transfer.
+       */
+      struct TALER_WireTransferIdentifierRawP wtid;
+
+      /**
+       * Base URL of the exchange.
+       */
+      char exchange_base_url[MAX_URL_LEN];
+
+    } debit;
+
+    /**
+     * Used if @e type is T_CREDIT.
+     */
+    struct
+    {
+
+      /**
+       * Reserve public key of the credit operation.
+       */
+      struct TALER_ReservePublicKeyP reserve_pub;
+
+    } credit;
+
+    /**
+     * Used if @e type is T_WAD.
+     */
+    struct
+    {
+
+      /**
+       * Subject of the transfer.
+       */
+      struct TALER_WadIdentifierP wad;
+
+      /**
+       * Base URL of the originating exchange.
+       */
+      char origin_base_url[MAX_URL_LEN];
+
+    } wad;
+
+  } subject;
+
+  /**
+   * Has this transaction not yet been subjected to
+   * #TALER_FAKEBANK_check_credit() or #TALER_FAKEBANK_check_debit() and
+   * should thus be counted in #TALER_FAKEBANK_check_empty()?
+   */
+  bool unchecked;
+};
+
+
+/**
+ * Function called to clean up context of a connection.
+ *
+ * @param ctx context to clean up
+ */
+typedef void
+(*ConnectionCleaner)(void *ctx);
+
+/**
+ * Universal context we keep per connection.
+ */
+struct ConnectionContext
+{
+  /**
+   * Function we call upon completion to clean up.
+   */
+  ConnectionCleaner ctx_cleaner;
+
+  /**
+   * Request-handler specific context.
+   */
+  void *ctx;
+};
+
+
+/**
+ * This is the "base" structure for both the /history and the
+ * /history-range API calls.
+ */
+struct HistoryArgs
+{
+
+  /**
+   * Bank account number of the requesting client.
+   */
+  uint64_t account_number;
+
+  /**
+   * Index of the starting transaction, exclusive (!).
+   */
+  uint64_t start_idx;
+
+  /**
+   * Requested number of results and order
+   * (positive: ascending, negative: descending)
+   */
+  int64_t delta;
+
+  /**
+   * Timeout for long polling.
+   */
+  struct GNUNET_TIME_Relative lp_timeout;
+
+  /**
+   * true if starting point was given.
+   */
+  bool have_start;
+
+};
+
+
+/**
+ * Context we keep per history request.
+ */
+struct HistoryContext
+{
+  /**
+   * When does this request time out.
+   */
+  struct GNUNET_TIME_Absolute timeout;
+
+  /**
+   * Client arguments for this request.
+   */
+  struct HistoryArgs ha;
+
+  /**
+   * Account the request is about.
+   */
+  struct Account *acc;
+
+  /**
+   * JSON object we are building to return.
+   */
+  json_t *history;
+
+};
+
+
+/**
+ * Context we keep per get withdrawal operation request.
+ */
+struct WithdrawContext
+{
+  /**
+   * When does this request time out.
+   */
+  struct GNUNET_TIME_Absolute timeout;
+
+  /**
+   * The withdrawal operation this is about.
+   */
+  struct WithdrawalOperation *wo;
+
+};
+
+
+/**
+ * Handle for the fake bank.
+ */
+struct TALER_FAKEBANK_Handle
+{
+  /**
+   * We store transactions in a revolving array.
+   */
+  struct Transaction **transactions;
+
+  /**
+   * HTTP server we run to pretend to be the "test" bank.
+   */
+  struct MHD_Daemon *mhd_bank;
+
+  /**
+   * Task running HTTP server for the "test" bank,
+   * unless we are using a thread pool (then NULL).
+   */
+  struct GNUNET_SCHEDULER_Task *mhd_task;
+
+  /**
+   * Task for expiring long-polling connections,
+   * unless we are using a thread pool (then NULL).
+   */
+  struct GNUNET_SCHEDULER_Task *lp_task;
+
+  /**
+   * Task for expiring long-polling connections, unless we are using the
+   * GNUnet scheduler (then NULL).
+   */
+  pthread_t lp_thread;
+
+  /**
+   * MIN-heap of long pollers, sorted by timeout.
+   */
+  struct GNUNET_CONTAINER_Heap *lp_heap;
+
+  /**
+   * Hashmap of reserve public keys to
+   * `struct Transaction` with that reserve public
+   * key. Used to prevent public-key reuse.
+   */
+  struct GNUNET_CONTAINER_MultiPeerMap *rpubs;
+
+  /**
+   * Hashmap of short hashes (wopids) to
+   * `struct WithdrawalOperation`.
+   * Used to lookup withdrawal operations.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *wops;
+
+  /**
+   * (Base) URL to suggest for the exchange.  Can
+   * be NULL if there is no suggestion to be made.
+   */
+  char *exchange_url;
+
+  /**
+   * Lock for accessing @a rpubs map.
+   */
+  pthread_mutex_t rpubs_lock;
+
+  /**
+   * Hashmap of hashes of account names to `struct Account`.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *accounts;
+
+  /**
+   * Lock for accessing @a accounts hash map.
+   */
+  pthread_mutex_t accounts_lock;
+
+  /**
+   * Hashmap of hashes of transaction request_uids to `struct Transaction`.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *uuid_map;
+
+  /**
+   * Lock for accessing @a uuid_map.
+   */
+  pthread_mutex_t uuid_map_lock;
+
+  /**
+   * Lock for accessing the internals of
+   * accounts and transaction array entries.
+   */
+  pthread_mutex_t big_lock;
+
+  /**
+   * How much money should be put into new accounts
+   * on /register.
+   */
+  struct TALER_Amount signup_bonus;
+
+  /**
+   * Current transaction counter.
+   */
+  uint64_t serial_counter;
+
+  /**
+   * Number of transactions we keep in memory (at most).
+   */
+  uint64_t ram_limit;
+
+  /**
+   * Currency used by the fakebank.
+   */
+  char *currency;
+
+  /**
+   * Hostname of the fakebank.
+   */
+  char *hostname;
+
+  /**
+   * BaseURL of the fakebank.
+   */
+  char *my_baseurl;
+
+  /**
+   * Our port number.
+   */
+  uint16_t port;
+
+#ifdef __linux__
+  /**
+   * Event FD to signal @a lp_thread a change in
+   * @a lp_heap.
+   */
+  int lp_event;
+#else
+  /**
+   * Pipe input to signal @a lp_thread a change in
+   * @a lp_heap.
+   */
+  int lp_event_in;
+
+  /**
+   * Pipe output to signal @a lp_thread a change in
+   * @a lp_heap.
+   */
+  int lp_event_out;
+#endif
+
+  /**
+   * Set to true once we are shutting down.
+   */
+  bool in_shutdown;
+
+  /**
+   * Should we run MHD immediately again?
+   */
+  bool mhd_again;
+
+#if EPOLL_SUPPORT
+  /**
+   * Boxed @e mhd_fd.
+   */
+  struct GNUNET_NETWORK_Handle *mhd_rfd;
+
+  /**
+   * File descriptor to use to wait for MHD.
+   */
+  int mhd_fd;
+#endif
+};
+
+
+/**
+ * Task run whenever HTTP server operations are pending.
+ *
+ * @param cls the `struct TALER_FAKEBANK_Handle`
+ */
+void
+TALER_FAKEBANK_run_mhd_ (void *cls);
+
+
+#endif
diff --git a/src/bank-lib/fakebank_api_check.c b/src/bank-lib/fakebank_api_check.c
new file mode 100644
index 000000000..04656ebab
--- /dev/null
+++ b/src/bank-lib/fakebank_api_check.c
@@ -0,0 +1,238 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_api_check.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+
+
+/**
+ * Generate log messages for failed check operation.
+ *
+ * @param h handle to output transaction log for
+ */
+static void
+check_log (struct TALER_FAKEBANK_Handle *h)
+{
+  for (uint64_t i = 0; i<h->ram_limit; i++)
+  {
+    struct Transaction *t = h->transactions[i];
+
+    if (NULL == t)
+      continue;
+    if (! t->unchecked)
+      continue;
+    switch (t->type)
+    {
+    case T_DEBIT:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "%s -> %s (%s) %s (%s)\n",
+                  t->debit_account->account_name,
+                  t->credit_account->account_name,
+                  TALER_amount2s (&t->amount),
+                  t->subject.debit.exchange_base_url,
+                  "DEBIT");
+      break;
+    case T_CREDIT:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "%s -> %s (%s) %s (%s)\n",
+                  t->debit_account->account_name,
+                  t->credit_account->account_name,
+                  TALER_amount2s (&t->amount),
+                  TALER_B2S (&t->subject.credit.reserve_pub),
+                  "CREDIT");
+      break;
+    case T_WAD:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "%s -> %s (%s) %s[%s] (%s)\n",
+                  t->debit_account->account_name,
+                  t->credit_account->account_name,
+                  TALER_amount2s (&t->amount),
+                  t->subject.wad.origin_base_url,
+                  TALER_B2S (&t->subject.wad),
+                  "WAD");
+      break;
+    }
+  }
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_check_debit (struct TALER_FAKEBANK_Handle *h,
+                            const struct TALER_Amount *want_amount,
+                            const char *want_debit,
+                            const char *want_credit,
+                            const char *exchange_base_url,
+                            struct TALER_WireTransferIdentifierRawP *wtid)
+{
+  struct Account *debit_account;
+  struct Account *credit_account;
+
+  GNUNET_assert (0 ==
+                 strcasecmp (want_amount->currency,
+                             h->currency));
+  debit_account = TALER_FAKEBANK_lookup_account_ (h,
+                                                  want_debit,
+                                                  NULL);
+  credit_account = TALER_FAKEBANK_lookup_account_ (h,
+                                                   want_credit,
+                                                   NULL);
+  if (NULL == debit_account)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "I wanted: %s->%s (%s) from exchange %s (DEBIT), but debit account does not even exist!\n",
+                want_debit,
+                want_credit,
+                TALER_amount2s (want_amount),
+                exchange_base_url);
+    return GNUNET_SYSERR;
+  }
+  if (NULL == credit_account)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "I wanted: %s->%s (%s) from exchange %s (DEBIT), but credit account does not even exist!\n",
+                want_debit,
+                want_credit,
+                TALER_amount2s (want_amount),
+                exchange_base_url);
+    return GNUNET_SYSERR;
+  }
+  for (struct Transaction *t = debit_account->out_tail;
+       NULL != t;
+       t = t->prev_out)
+  {
+    if ( (t->unchecked) &&
+         (credit_account == t->credit_account) &&
+         (T_DEBIT == t->type) &&
+         (0 == TALER_amount_cmp (want_amount,
+                                 &t->amount)) &&
+         (0 == strcasecmp (exchange_base_url,
+                           t->subject.debit.exchange_base_url)) )
+    {
+      *wtid = t->subject.debit.wtid;
+      t->unchecked = false;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Did not find matching transaction! I have:\n");
+  check_log (h);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "I wanted: %s->%s (%s) from exchange %s (DEBIT)\n",
+              want_debit,
+              want_credit,
+              TALER_amount2s (want_amount),
+              exchange_base_url);
+  return GNUNET_SYSERR;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_check_credit (struct TALER_FAKEBANK_Handle *h,
+                             const struct TALER_Amount *want_amount,
+                             const char *want_debit,
+                             const char *want_credit,
+                             const struct TALER_ReservePublicKeyP *reserve_pub)
+{
+  struct Account *debit_account;
+  struct Account *credit_account;
+
+  GNUNET_assert (0 == strcasecmp (want_amount->currency,
+                                  h->currency));
+  debit_account = TALER_FAKEBANK_lookup_account_ (h,
+                                                  want_debit,
+                                                  NULL);
+  credit_account = TALER_FAKEBANK_lookup_account_ (h,
+                                                   want_credit,
+                                                   NULL);
+  if (NULL == debit_account)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "I wanted:\n%s -> %s (%s) with subject %s (CREDIT) but debit account is unknown.\n",
+                want_debit,
+                want_credit,
+                TALER_amount2s (want_amount),
+                TALER_B2S (reserve_pub));
+    return GNUNET_SYSERR;
+  }
+  if (NULL == credit_account)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "I wanted:\n%s -> %s (%s) with subject %s (CREDIT) but credit account is unknown.\n",
+                want_debit,
+                want_credit,
+                TALER_amount2s (want_amount),
+                TALER_B2S (reserve_pub));
+    return GNUNET_SYSERR;
+  }
+  for (struct Transaction *t = credit_account->in_tail;
+       NULL != t;
+       t = t->prev_in)
+  {
+    if ( (t->unchecked) &&
+         (debit_account == t->debit_account) &&
+         (T_CREDIT == t->type) &&
+         (0 == TALER_amount_cmp (want_amount,
+                                 &t->amount)) &&
+         (0 == GNUNET_memcmp (reserve_pub,
+                              &t->subject.credit.reserve_pub)) )
+    {
+      t->unchecked = false;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Did not find matching transaction!\nI have:\n");
+  check_log (h);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "I wanted:\n%s -> %s (%s) with subject %s (CREDIT)\n",
+              want_debit,
+              want_credit,
+              TALER_amount2s (want_amount),
+              TALER_B2S (reserve_pub));
+  return GNUNET_SYSERR;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_check_empty (struct TALER_FAKEBANK_Handle *h)
+{
+  for (uint64_t i = 0; i<h->ram_limit; i++)
+  {
+    struct Transaction *t = h->transactions[i];
+
+    if ( (NULL != t) &&
+         (t->unchecked) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Expected empty transaction set, but I have:\n");
+      check_log (h);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
diff --git a/src/bank-lib/fakebank_bank.c b/src/bank-lib/fakebank_bank.c
new file mode 100644
index 000000000..7c2d39ab4
--- /dev/null
+++ b/src/bank-lib/fakebank_bank.c
@@ -0,0 +1,524 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank.c
+ * @brief Main dispatcher for the Taler Bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank.h"
+#include "fakebank_tbr.h"
+#include "fakebank_twg.h"
+#include "fakebank_bank_get_accounts.h"
+#include "fakebank_bank_get_withdrawals.h"
+#include "fakebank_bank_get_root.h"
+#include "fakebank_bank_post_accounts_withdrawals.h"
+#include "fakebank_bank_post_withdrawals_abort.h"
+#include "fakebank_bank_post_withdrawals_confirm.h"
+#include "fakebank_bank_post_withdrawals_id_op.h"
+#include "fakebank_bank_testing_register.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_main_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *url,
+  const char *method,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  if (0 == strcasecmp (method,
+                       MHD_HTTP_METHOD_HEAD))
+    method = MHD_HTTP_METHOD_GET;
+
+  if ( (0 == strcmp (url,
+                     "/")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET / */
+    return TALER_FAKEBANK_bank_get_root_ (h,
+                                          connection);
+  }
+
+  if ( (0 == strcmp (url,
+                     "/config")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /config */
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string ("version",
+                               "4:0:4"), /* not sure, API versions are not properly marked up! */
+      GNUNET_JSON_pack_string ("currency",
+                               h->currency),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:bank:fakebank"),
+      GNUNET_JSON_pack_string ("name",
+                               "taler-corebank"));
+  }
+
+  if ( (0 == strcmp (url,
+                     "/public-accounts")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /public-accounts */
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_array_steal ("public_accounts",
+                                    json_array ()));
+  }
+
+  /* account registration API */
+  if ( (0 == strcmp (url,
+                     "/accounts")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_POST)) )
+  {
+    /* POST /accounts */
+    return TALER_FAKEBANK_bank_testing_register_ (h,
+                                                  connection,
+                                                  upload_data,
+                                                  upload_data_size,
+                                                  con_cls);
+  }
+
+  if ( (0 == strcmp (url,
+                     "/accounts")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /accounts */
+    GNUNET_break (0); /* not implemented */
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_NOT_IMPLEMENTED,
+      TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+      url);
+  }
+
+  if ( (0 == strcmp (url,
+                     "/cashout-rate")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /cashout-rate */
+    GNUNET_break (0); /* not implemented */
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_NOT_IMPLEMENTED,
+      TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+      url);
+  }
+
+  if ( (0 == strcmp (url,
+                     "/cashouts")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /cashouts */
+    GNUNET_break (0); /* not implemented */
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_NOT_IMPLEMENTED,
+      TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+      url);
+  }
+
+  if ( (0 == strncmp (url,
+                      "/withdrawals/",
+                      strlen ("/withdrawals/"))) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /withdrawals/$WID */
+    const char *wid;
+
+    wid = &url[strlen ("/withdrawals/")];
+    return TALER_FAKEBANK_bank_get_withdrawals_ (h,
+                                                 connection,
+                                                 wid);
+  }
+
+  if ( (0 == strncmp (url,
+                      "/withdrawals/",
+                      strlen ("/withdrawals/"))) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_POST)) )
+  {
+    /* POST /withdrawals/$WID* */
+    const char *wid = url + strlen ("/withdrawals/");
+    const char *opid = strchr (wid,
+                               '/');
+    char *wi;
+
+    if (NULL == opid)
+    {
+      /* POST /withdrawals/$WID (not defined) */
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                         url);
+    }
+    wi = GNUNET_strndup (wid,
+                         opid - wid);
+    if (0 == strcmp (opid,
+                     "/abort"))
+    {
+      /* POST /withdrawals/$WID/abort */
+      MHD_RESULT ret;
+
+      ret = TALER_FAKEBANK_bank_withdrawals_abort_ (h,
+                                                    connection,
+                                                    wi);
+      GNUNET_free (wi);
+      return ret;
+    }
+    if (0 == strcmp (opid,
+                     "/confirm"))
+    {
+      /* POST /withdrawals/$WID/confirm */
+      MHD_RESULT ret;
+
+      ret = TALER_FAKEBANK_bank_withdrawals_confirm_ (h,
+                                                      connection,
+                                                      wi);
+      GNUNET_free (wi);
+      return ret;
+    }
+  }
+
+  if (0 == strncmp (url,
+                    "/accounts/",
+                    strlen ("/accounts/")))
+  {
+    const char *acc_name = &url[strlen ("/accounts/")];
+    const char *end_acc = strchr (acc_name,
+                                  '/');
+
+    if ( (NULL != end_acc) &&
+         (0 == strncmp (end_acc,
+                        "/taler-wire-gateway/",
+                        strlen ("/taler-wire-gateway/"))) )
+    {
+      /* $METHOD /accounts/$ACCOUNT/taler-wire-gateway/ */
+      char *acc;
+      MHD_RESULT ret;
+
+      acc = GNUNET_strndup (acc_name,
+                            end_acc - acc_name);
+      end_acc += strlen ("/taler-wire-gateway");
+      ret = TALER_FAKEBANK_twg_main_ (h,
+                                      connection,
+                                      acc,
+                                      end_acc,
+                                      method,
+                                      upload_data,
+                                      upload_data_size,
+                                      con_cls);
+      GNUNET_free (acc);
+      return ret;
+    }
+
+    if ( (NULL != end_acc) &&
+         (0 == strncmp (end_acc,
+                        "/taler-revenue/",
+                        strlen ("/taler-revenue/"))) )
+    {
+      /* $METHOD /accounts/$ACCOUNT/taler-revenue/ */
+      char *acc;
+      MHD_RESULT ret;
+
+      acc = GNUNET_strndup (acc_name,
+                            end_acc - acc_name);
+      end_acc += strlen ("/taler-revenue");
+      ret = TALER_FAKEBANK_tbr_main_ (h,
+                                      connection,
+                                      acc,
+                                      end_acc,
+                                      method,
+                                      upload_data,
+                                      upload_data_size,
+                                      con_cls);
+      GNUNET_free (acc);
+      return ret;
+    }
+
+    if ( (NULL == end_acc) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_GET)) )
+    {
+      /* GET /accounts/$ACCOUNT */
+      return TALER_FAKEBANK_bank_get_accounts_ (h,
+                                                connection,
+                                                acc_name);
+    }
+
+    if ( (NULL == end_acc) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_PATCH)) )
+    {
+      /* PATCH /accounts/$USERNAME */
+      GNUNET_break (0); /* not implemented */
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_NOT_IMPLEMENTED,
+        TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+        url);
+    }
+
+    if ( (NULL == end_acc) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_DELETE)) )
+    {
+      /* DELETE /accounts/$USERNAME */
+      GNUNET_break (0); /* not implemented */
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_NOT_IMPLEMENTED,
+        TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+        url);
+    }
+
+    if ( (NULL != end_acc) &&
+         (0 == strcmp ("/auth",
+                       end_acc)) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_PATCH)) )
+    {
+      /* PATCH /accounts/$USERNAME/auth */
+      GNUNET_break (0); /* not implemented */
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_NOT_IMPLEMENTED,
+        TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+        url);
+    }
+
+    if ( (NULL != end_acc) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_GET)) )
+    {
+      /* GET /accounts/$ACCOUNT/+ */
+
+      if (0 == strcmp (end_acc,
+                       "/transactions"))
+      {
+        /* GET /accounts/$USERNAME/transactions */
+        GNUNET_break (0); /* not implemented */
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+      if (0 == strncmp (end_acc,
+                        "/transactions/",
+                        strlen ("/transactions/")))
+      {
+        /* GET /accounts/$USERNAME/transactions/$TID */
+        GNUNET_break (0); /* not implemented */
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+      if (0 == strcmp (end_acc,
+                       "/withdrawals"))
+      {
+        /* GET /accounts/$USERNAME/withdrawals */
+        GNUNET_break (0); /* not implemented */
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+      if (0 == strcmp (end_acc,
+                       "/cashouts"))
+      {
+        /* GET /accounts/$USERNAME/cashouts */
+        GNUNET_break (0); /* not implemented */
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+      if (0 == strncmp (end_acc,
+                        "/cashouts/",
+                        strlen ("/cashouts/")))
+      {
+        /* GET /accounts/$USERNAME/cashouts/$CID */
+        GNUNET_break (0); /* not implemented */
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+
+
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                         acc_name);
+    }
+
+    if ( (NULL != end_acc) &&
+         (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_POST)) )
+    {
+      /* POST /accounts/$ACCOUNT/+ */
+      char *acc;
+
+      acc = GNUNET_strndup (acc_name,
+                            end_acc - acc_name);
+      if (0 == strcmp (end_acc,
+                       "/cashouts"))
+      {
+        /* POST /accounts/$USERNAME/cashouts */
+        GNUNET_break (0); /* not implemented */
+        GNUNET_free (acc);
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_NOT_IMPLEMENTED,
+          TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+          url);
+      }
+      if (0 == strncmp (end_acc,
+                        "/cashouts/",
+                        strlen ("/cashouts/")))
+      {
+        /* POST /accounts/$USERNAME/cashouts/+ */
+        const char *cid = end_acc + strlen ("/cashouts/");
+        const char *opid = strchr (cid,
+                                   '/');
+        char *ci;
+
+        if (NULL == opid)
+        {
+          /* POST /accounts/$ACCOUNT/cashouts/$CID (not defined) */
+          GNUNET_break_op (0);
+          GNUNET_free (acc);
+          return TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_NOT_FOUND,
+                                             TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                             acc_name);
+        }
+        ci = GNUNET_strndup (cid,
+                             opid - cid);
+        if (0 == strcmp (opid,
+                         "/abort"))
+        {
+          GNUNET_break (0); /* not implemented */
+          GNUNET_free (ci);
+          GNUNET_free (acc);
+          return TALER_MHD_reply_with_error (
+            connection,
+            MHD_HTTP_NOT_IMPLEMENTED,
+            TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+            url);
+        }
+        if (0 == strcmp (opid,
+                         "/confirm"))
+        {
+          GNUNET_break (0); /* not implemented */
+          GNUNET_free (ci);
+          GNUNET_free (acc);
+          return TALER_MHD_reply_with_error (
+            connection,
+            MHD_HTTP_NOT_IMPLEMENTED,
+            TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR,
+            url);
+        }
+      }
+
+      if (0 == strcmp (end_acc,
+                       "/withdrawals"))
+      {
+        /* POST /accounts/$ACCOUNT/withdrawals */
+        MHD_RESULT ret;
+
+        ret = TALER_FAKEBANK_bank_post_account_withdrawals_ (
+          h,
+          connection,
+          acc,
+          upload_data,
+          upload_data_size,
+          con_cls);
+        GNUNET_free (acc);
+        return ret;
+      }
+
+      if (0 == strncmp (end_acc,
+                        "/withdrawals/",
+                        strlen ("/withdrawals/")))
+      {
+        /* POST /accounts/$ACCOUNT/withdrawals/$WID/$OP */
+        MHD_RESULT ret;
+        const char *pos = &end_acc[strlen ("/withdrawals/")];
+        const char *op = strchr (pos, '/');
+
+        if (NULL != op)
+        {
+          char *wid = GNUNET_strndup (pos,
+                                      op - pos);
+
+          ret = TALER_FAKEBANK_bank_withdrawals_id_op_ (
+            h,
+            connection,
+            acc,
+            wid,
+            op,
+            upload_data,
+            upload_data_size,
+            con_cls);
+          GNUNET_free (wid);
+          GNUNET_free (acc);
+          return ret;
+        }
+        GNUNET_free (acc);
+      }
+    }
+  }
+
+  GNUNET_break_op (0);
+  TALER_LOG_ERROR ("Breaking URL: %s %s\n",
+                   method,
+                   url);
+  return TALER_MHD_reply_with_error (connection,
+                                     MHD_HTTP_NOT_FOUND,
+                                     TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                     url);
+}
diff --git a/src/bank-lib/fakebank_bank.h b/src/bank-lib/fakebank_bank.h
new file mode 100644
index 000000000..1c51f88f8
--- /dev/null
+++ b/src/bank-lib/fakebank_bank.h
@@ -0,0 +1,54 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank.h
+ * @brief Main dispatcher for the Taler Bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_H
+#define FAKEBANK_BANK_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle incoming HTTP request to the Taler bank API.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param url the requested url
+ * @param method the method (POST, GET, ...)
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_main_ (struct TALER_FAKEBANK_Handle *h,
+                           struct MHD_Connection *connection,
+                           const char *url,
+                           const char *method,
+                           const char *upload_data,
+                           size_t *upload_data_size,
+                           void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_accounts_withdrawals.c b/src/bank-lib/fakebank_bank_accounts_withdrawals.c
new file mode 100644
index 000000000..bb435d975
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_accounts_withdrawals.c
@@ -0,0 +1,101 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_accounts_withdrawals.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_accounts_withdrawals.h"
+#include "fakebank_common_lookup.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_account_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account_name,
+  const char *withdrawal_id)
+{
+  struct WithdrawalOperation *wo;
+  struct Account *acc;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if (NULL == wo)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  acc = TALER_FAKEBANK_lookup_account_ (h,
+                                        account_name,
+                                        NULL);
+  if (NULL == acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                       account_name);
+  }
+  if (wo->debit_account != acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       account_name);
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_bool ("aborted",
+                           wo->aborted),
+    GNUNET_JSON_pack_bool ("selection_done",
+                           wo->selection_done),
+    GNUNET_JSON_pack_bool ("transfer_done",
+                           wo->confirmation_done),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("selected_exchange_account",
+                               wo->exchange_account->payto_uri)),
+    GNUNET_JSON_pack_allow_null (
+      wo->selection_done
+      ? GNUNET_JSON_pack_data_auto ("selected_reserve_pub",
+                                    &wo->reserve_pub)
+      : GNUNET_JSON_pack_string ("selected_reserve_pub",
+                                 NULL)),
+    TALER_JSON_pack_amount ("amount",
+                            &wo->amount));
+}
diff --git a/src/bank-lib/fakebank_bank_accounts_withdrawals.h b/src/bank-lib/fakebank_bank_accounts_withdrawals.h
new file mode 100644
index 000000000..2a598dee9
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_accounts_withdrawals.h
@@ -0,0 +1,50 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_accounts_withdrawals.h
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_ACCOUNTS_WITHDRAWALS_H
+#define FAKEBANK_BANK_ACCOUNTS_WITHDRAWALS_H
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle GET /accounts/${account_name}/withdrawals/{withdrawal_id} request
+ * to the Taler bank access API.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @param withdrawal_id withdrawal ID to return status of
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_account_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account_name,
+  const char *withdrawal_id);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_get_accounts.c b/src/bank-lib/fakebank_bank_get_accounts.c
new file mode 100644
index 000000000..e85387d2a
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_accounts.c
@@ -0,0 +1,80 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_accounts.c
+ * @brief implements the Taler Bank API "GET /accounts/" handler
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_get_accounts.h"
+#include "fakebank_common_lookup.h"
+
+/**
+ * Handle GET /accounts/${account_name} request of the Taler bank API.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_accounts_ (struct TALER_FAKEBANK_Handle *h,
+                                   struct MHD_Connection *connection,
+                                   const char *account_name)
+{
+  struct Account *acc;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  acc = TALER_FAKEBANK_lookup_account_ (h,
+                                        account_name,
+                                        NULL);
+  if (NULL == acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                       account_name);
+  }
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_string ("payto_uri",
+                             acc->payto_uri),
+    GNUNET_JSON_pack_object_steal (
+      "balance",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("credit_debit_indicator",
+                                 acc->is_negative
+                                 ? "debit"
+                                 : "credit"),
+        TALER_JSON_pack_amount ("amount",
+                                &acc->balance))));
+}
diff --git a/src/bank-lib/fakebank_bank_get_accounts.h b/src/bank-lib/fakebank_bank_get_accounts.h
new file mode 100644
index 000000000..7d3872133
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_accounts.h
@@ -0,0 +1,48 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_accounts.h
+ * @brief implements the Taler Bank API "GET /accounts/" handler
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_GET_ACCOUNTS_H
+#define FAKEBANK_BANK_GET_ACCOUNTS_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle GET /accounts/${account_name} request of the Taler bank API.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_accounts_ (struct TALER_FAKEBANK_Handle *h,
+                                   struct MHD_Connection *connection,
+                                   const char *account_name);
+
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_get_root.c b/src/bank-lib/fakebank_bank_get_root.c
new file mode 100644
index 000000000..8c34697b4
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_root.c
@@ -0,0 +1,58 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_root.c
+ * @brief handle a GET "/" request for the bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_get_root.h"
+
+
+/**
+ * Handle incoming HTTP request for "/" (home page).
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_root_ (struct TALER_FAKEBANK_Handle *h,
+                               struct MHD_Connection *connection)
+{
+  MHD_RESULT ret;
+  struct MHD_Response *resp;
+#define HELLOMSG "Hello, Fakebank!"
+
+  (void) h;
+  resp = MHD_create_response_from_buffer (
+    strlen (HELLOMSG),
+    HELLOMSG,
+    MHD_RESPMEM_MUST_COPY);
+  ret = MHD_queue_response (connection,
+                            MHD_HTTP_OK,
+                            resp);
+  MHD_destroy_response (resp);
+  return ret;
+}
diff --git a/src/bank-lib/fakebank_bank_get_root.h b/src/bank-lib/fakebank_bank_get_root.h
new file mode 100644
index 000000000..2eedb94a1
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_root.h
@@ -0,0 +1,44 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_root.c
+ * @brief handle a GET "/" request for the bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_GET_ROOT_H
+#define FAKEBANK_BANK_GET_ROOT_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle incoming HTTP request for "/" (home page).
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_root_ (struct TALER_FAKEBANK_Handle *h,
+                               struct MHD_Connection *connection);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_get_withdrawals.c b/src/bank-lib/fakebank_bank_get_withdrawals.c
new file mode 100644
index 000000000..7f65e8660
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_withdrawals.c
@@ -0,0 +1,87 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_withdrawals.c
+ * @brief implements the Taler Bank API "GET /withdrawals/$WID" handler
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_get_withdrawals.h"
+#include "fakebank_common_lookup.h"
+
+
+/**
+ * Handle GET /withdrawals/{withdrawal_id} request
+ * to the Taler bank access API.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param withdrawal_id withdrawal ID to return status of
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id)
+{
+  struct WithdrawalOperation *wo;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if (NULL == wo)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_bool ("aborted",
+                           wo->aborted),
+    GNUNET_JSON_pack_bool ("selection_done",
+                           wo->selection_done),
+    GNUNET_JSON_pack_bool ("transfer_done",
+                           wo->confirmation_done),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("selected_exchange_account",
+                               wo->exchange_account->payto_uri)),
+    GNUNET_JSON_pack_allow_null (
+      wo->selection_done
+      ? GNUNET_JSON_pack_data_auto ("selected_reserve_pub",
+                                    &wo->reserve_pub)
+      : GNUNET_JSON_pack_string ("selected_reserve_pub",
+                                 NULL)),
+    TALER_JSON_pack_amount ("amount",
+                            &wo->amount));
+}
diff --git a/src/bank-lib/fakebank_bank_get_withdrawals.h b/src/bank-lib/fakebank_bank_get_withdrawals.h
new file mode 100644
index 000000000..62a96866c
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_get_withdrawals.h
@@ -0,0 +1,51 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_get_withdrawals.h
+ * @brief implements the Taler Bank API "GET /accounts/ACC/withdrawals/WID" handler
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_GET_WITHDRAWALS_H
+#define FAKEBANK_BANK_GET_WITHDRAWALS_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_get_withdrawals.h"
+
+
+/**
+ * Handle GET /withdrawals/{withdrawal_id} request
+ * to the Taler bank access API.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param withdrawal_id withdrawal ID to return status of
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_get_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id);
+
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c
new file mode 100644
index 000000000..7fbb93352
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.c
@@ -0,0 +1,196 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_accounts_withdrawals.c
+ * @brief implementation of the bank API's POST /accounts/AID/withdrawals endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_post_accounts_withdrawals.h"
+#include "fakebank_common_lookup.h"
+
+
+/**
+ * Execute POST /accounts/$account_name/withdrawals request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @param amount amount to withdraw
+ * @return MHD result code
+ */
+static MHD_RESULT
+do_post_account_withdrawals (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account_name,
+  const struct TALER_Amount *amount)
+{
+  struct Account *acc;
+  struct WithdrawalOperation *wo;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  acc = TALER_FAKEBANK_lookup_account_ (h,
+                                        account_name,
+                                        NULL);
+  if (NULL == acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                       account_name);
+  }
+  wo = GNUNET_new (struct WithdrawalOperation);
+  wo->debit_account = acc;
+  wo->amount = *amount;
+  if (NULL == h->wops)
+  {
+    h->wops = GNUNET_CONTAINER_multishortmap_create (32,
+                                                     GNUNET_YES);
+  }
+  while (1)
+  {
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                                &wo->wopid,
+                                sizeof (wo->wopid));
+    if (GNUNET_OK ==
+        GNUNET_CONTAINER_multishortmap_put (h->wops,
+                                            &wo->wopid,
+                                            wo,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
+      break;
+  }
+  {
+    char *wopids;
+    char *uri;
+    MHD_RESULT res;
+
+    wopids = GNUNET_STRINGS_data_to_string_alloc (&wo->wopid,
+                                                  sizeof (wo->wopid));
+    GNUNET_asprintf (&uri,
+                     "taler+http://withdraw/%s:%u/taler-integration/%s",
+                     h->hostname,
+                     (unsigned int) h->port,
+                     wopids);
+    GNUNET_free (wopids);
+    res = TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string ("taler_withdraw_uri",
+                               uri),
+      GNUNET_JSON_pack_data_auto ("withdrawal_id",
+                                  &wo->wopid));
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    GNUNET_free (uri);
+    return res;
+  }
+}
+
+
+/**
+ * Handle POST /accounts/$account_name/withdrawals request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_post_account_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account_name,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  enum GNUNET_JSON_PostResult pr;
+  json_t *json;
+  MHD_RESULT res;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &GNUNET_JSON_post_parser_cleanup;
+    *con_cls = cc;
+  }
+  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
+                                connection,
+                                &cc->ctx,
+                                upload_data,
+                                upload_data_size,
+                                &json);
+  switch (pr)
+  {
+  case GNUNET_JSON_PR_OUT_OF_MEMORY:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_CONTINUE:
+    return MHD_YES;
+  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_JSON_INVALID:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_SUCCESS:
+    break;
+  }
+
+  {
+    struct TALER_Amount amount;
+    enum GNUNET_GenericReturnValue ret;
+    struct GNUNET_JSON_Specification spec[] = {
+      TALER_JSON_spec_amount ("amount",
+                              h->currency,
+                              &amount),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        (ret = TALER_MHD_parse_json_data (connection,
+                                          json,
+                                          spec)))
+    {
+      GNUNET_break_op (0);
+      json_decref (json);
+      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
+    }
+    res = do_post_account_withdrawals (h,
+                                       connection,
+                                       account_name,
+                                       &amount);
+  }
+  json_decref (json);
+  return res;
+}
diff --git a/src/bank-lib/fakebank_bank_post_accounts_withdrawals.h b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.h
new file mode 100644
index 000000000..1becf1efc
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_accounts_withdrawals.h
@@ -0,0 +1,54 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_accounts_withdrawals.c
+ * @brief implementation of the bank API's POST /accounts/AID/withdrawals endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_POST_ACCOUNTS_WITHDRAWALS_H
+#define FAKEBANK_BANK_POST_ACCOUNTS_WITHDRAWALS_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle POST /accounts/$account_name/withdrawals request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account_name name of the account
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_post_account_withdrawals_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account_name,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_abort.c b/src/bank-lib/fakebank_bank_post_withdrawals_abort.c
new file mode 100644
index 000000000..f8ebf1b93
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_abort.c
@@ -0,0 +1,74 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_abort.c
+ * @brief implement bank API withdrawals /abort endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_post_withdrawals_abort.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_abort_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id)
+{
+  struct WithdrawalOperation *wo;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if (NULL == wo)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  if (wo->confirmation_done)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_ABORT_CONFIRM_CONFLICT,
+                                       withdrawal_id);
+  }
+  wo->aborted = true;
+  TALER_FAKEBANK_notify_withdrawal_ (h,
+                                     wo);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_reply_json (connection,
+                               json_object (), /* FIXME: #7301 */
+                               MHD_HTTP_OK);
+}
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_abort.h b/src/bank-lib/fakebank_bank_post_withdrawals_abort.h
new file mode 100644
index 000000000..920b0b802
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_abort.h
@@ -0,0 +1,48 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_abort.h
+ * @brief implement bank API withdrawals /abort endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_POST_WITHDRAWALS_ABORT_H
+#define FAKEBANK_BANK_POST_WITHDRAWALS_ABORT_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle POST /withdrawals/{withdrawal_id}/abort request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param withdrawal_id the withdrawal operation identifier
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_abort_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_confirm.c b/src/bank-lib/fakebank_bank_post_withdrawals_confirm.c
new file mode 100644
index 000000000..2fa67c970
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_confirm.c
@@ -0,0 +1,107 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_confirm.c
+ * @brief implement bank API withdrawals /confirm endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_post_withdrawals_confirm.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_make_admin_transfer.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_confirm_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id)
+{
+  struct WithdrawalOperation *wo;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if (NULL == wo)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  if (NULL == wo->exchange_account)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_BANK_POST_WITHDRAWAL_OPERATION_REQUIRED,
+                                       NULL);
+  }
+  if (wo->aborted)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_CONFIRM_ABORT_CONFLICT,
+                                       withdrawal_id);
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  if (GNUNET_OK !=
+      TALER_FAKEBANK_make_admin_transfer_ (
+        h,
+        wo->debit_account->account_name,
+        wo->exchange_account->account_name,
+        &wo->amount,
+        &wo->reserve_pub,
+        &wo->row_id,
+        &wo->timestamp))
+  {
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_DUPLICATE_RESERVE_PUB_SUBJECT,
+                                       NULL);
+  }
+  /* Re-acquiring the lock and continuing to operate on 'wo'
+     is currently (!) acceptable because we NEVER free 'wo'
+     until shutdown. We may want to revise this if keeping
+     all withdraw operations in RAM becomes an issue... */
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo->confirmation_done = true;
+  TALER_FAKEBANK_notify_withdrawal_ (h,
+                                     wo);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_reply_json (connection,
+                               json_object (),
+                               MHD_HTTP_OK);
+}
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_confirm.h b/src/bank-lib/fakebank_bank_post_withdrawals_confirm.h
new file mode 100644
index 000000000..56cd2deda
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_confirm.h
@@ -0,0 +1,48 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_confirm.h
+ * @brief implement bank API withdrawals /confirm endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_POST_WITHDRAWALS_CONFIRM_H
+#define FAKEBANK_BANK_POST_WITHDRAWALS_CONFIRM_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle POST /accounts/{account_name}/withdrawals/{withdrawal_id}/confirm request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param withdrawal_id the withdrawal operation identifier
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_confirm_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *withdrawal_id);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_id_op.c b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.c
new file mode 100644
index 000000000..fe5cc982d
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.c
@@ -0,0 +1,241 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_id_op.c
+ * @brief implement bank API POST /accounts/$ACCOUNT/withdrawals/$WID/$OP endpoint(s)
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_post_withdrawals_id_op.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_make_admin_transfer.h"
+
+
+/**
+ * Handle POST /accounts/$ACC/withdrawals/{withdrawal_id}/confirm request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account name of the account
+ * @param withdrawal_id the withdrawal operation identifier
+ * @return MHD result code
+ */
+static MHD_RESULT
+bank_withdrawals_confirm (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *withdrawal_id)
+{
+  const struct Account *acc;
+  struct WithdrawalOperation *wo;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  acc = TALER_FAKEBANK_lookup_account_ (h,
+                                        account,
+                                        NULL);
+  if (NULL == acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Account %s is unknown\n",
+                account);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                       account);
+  }
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if ( (NULL == wo) ||
+       (acc != wo->debit_account) )
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  if (NULL == wo->exchange_account)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_BANK_POST_WITHDRAWAL_OPERATION_REQUIRED,
+                                       NULL);
+  }
+  if (wo->aborted)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_CONFIRM_ABORT_CONFLICT,
+                                       withdrawal_id);
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  if (GNUNET_OK !=
+      TALER_FAKEBANK_make_admin_transfer_ (
+        h,
+        wo->debit_account->account_name,
+        wo->exchange_account->account_name,
+        &wo->amount,
+        &wo->reserve_pub,
+        &wo->row_id,
+        &wo->timestamp))
+  {
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_DUPLICATE_RESERVE_PUB_SUBJECT,
+                                       NULL);
+  }
+  /* Re-acquiring the lock and continuing to operate on 'wo'
+     is currently (!) acceptable because we NEVER free 'wo'
+     until shutdown. We may want to revise this if keeping
+     all withdraw operations in RAM becomes an issue... */
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo->confirmation_done = true;
+  TALER_FAKEBANK_notify_withdrawal_ (h,
+                                     wo);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_reply_static (connection,
+                                 MHD_HTTP_NO_CONTENT,
+                                 NULL,
+                                 NULL,
+                                 0);
+}
+
+
+/**
+ * Handle POST /accounts/$ACC/withdrawals/{withdrawal_id}/abort request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account name of the account
+ * @param withdrawal_id the withdrawal operation identifier
+ * @return MHD result code
+ */
+static MHD_RESULT
+bank_withdrawals_abort (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *withdrawal_id)
+{
+  struct WithdrawalOperation *wo;
+  const struct Account *acc;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  acc = TALER_FAKEBANK_lookup_account_ (h,
+                                        account,
+                                        NULL);
+  if (NULL == acc)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Account %s is unknown\n",
+                account);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                       account);
+  }
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    withdrawal_id);
+  if ( (NULL == wo) ||
+       (acc != wo->debit_account) )
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       withdrawal_id);
+  }
+  if (wo->confirmation_done)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_ABORT_CONFIRM_CONFLICT,
+                                       withdrawal_id);
+  }
+  wo->aborted = true;
+  TALER_FAKEBANK_notify_withdrawal_ (h,
+                                     wo);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return TALER_MHD_reply_static (connection,
+                                 MHD_HTTP_NO_CONTENT,
+                                 NULL,
+                                 NULL,
+                                 0);
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_id_op_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *withdrawal_id,
+  const char *op,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  if (0 == strcmp (op,
+                   "/confirm"))
+  {
+    return bank_withdrawals_confirm (h,
+                                     connection,
+                                     account,
+                                     withdrawal_id);
+  }
+  if (0 == strcmp (op,
+                   "/abort"))
+  {
+    return bank_withdrawals_abort (h,
+                                   connection,
+                                   account,
+                                   withdrawal_id);
+  }
+  GNUNET_break_op (0);
+  return TALER_MHD_reply_with_error (connection,
+                                     MHD_HTTP_NOT_FOUND,
+                                     TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                     op);
+}
diff --git a/src/bank-lib/fakebank_bank_post_withdrawals_id_op.h b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.h
new file mode 100644
index 000000000..a2d40e66f
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_post_withdrawals_id_op.h
@@ -0,0 +1,58 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_post_withdrawals_id_op.h
+ * @brief implement bank API POST /accounts/$ACCOUNT/withdrawals/$WID/$OP endpoint(s)
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_POST_WITHDRAWALS_ID_OP_H
+#define FAKEBANK_BANK_POST_WITHDRAWALS_ID_OP_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle POST /accounts/{account_name}/withdrawals/{withdrawal_id}/${OP} request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param account name of the account
+ * @param withdrawal_id the withdrawal operation identifier
+ * @param op operation to be performed, includes leading "/"
+ * @param upload_data data uploaded
+ * @param[in,out] upload_data_size number of bytes in @a upload_data
+ * @param[in,out] con_cls application context that can be used
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_withdrawals_id_op_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *withdrawal_id,
+  const char *op,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_bank_testing_register.c b/src/bank-lib/fakebank_bank_testing_register.c
new file mode 100644
index 000000000..e5720f1a6
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_testing_register.c
@@ -0,0 +1,128 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_testing_register.c
+ * @brief implementation of /testing/register endpoint for the bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_bank_testing_register.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_bank_testing_register_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  enum GNUNET_JSON_PostResult pr;
+  json_t *json;
+  MHD_RESULT res;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &GNUNET_JSON_post_parser_cleanup;
+    *con_cls = cc;
+  }
+  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
+                                connection,
+                                &cc->ctx,
+                                upload_data,
+                                upload_data_size,
+                                &json);
+  switch (pr)
+  {
+  case GNUNET_JSON_PR_OUT_OF_MEMORY:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_CONTINUE:
+    return MHD_YES;
+  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_JSON_INVALID:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_SUCCESS:
+    break;
+  }
+
+  {
+    const char *username;
+    const char *password;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_string ("username",
+                               &username),
+      GNUNET_JSON_spec_string ("password",
+                               &password),
+      GNUNET_JSON_spec_end ()
+    };
+    enum GNUNET_GenericReturnValue ret;
+    struct Account *acc;
+
+    if (GNUNET_OK !=
+        (ret = TALER_MHD_parse_json_data (connection,
+                                          json,
+                                          spec)))
+    {
+      GNUNET_break_op (0);
+      json_decref (json);
+      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
+    }
+    acc = TALER_FAKEBANK_lookup_account_ (h,
+                                          username,
+                                          NULL);
+    if (NULL != acc)
+    {
+      if (0 != strcmp (password,
+                       acc->password))
+      {
+        return TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_CONFLICT,
+                                           TALER_EC_BANK_REGISTER_CONFLICT,
+                                           "password");
+      }
+    }
+    else
+    {
+      acc = TALER_FAKEBANK_lookup_account_ (h,
+                                            username,
+                                            username);
+      GNUNET_assert (NULL != acc);
+      acc->password = GNUNET_strdup (password);
+      acc->balance = h->signup_bonus; /* magic money creation! */
+    }
+    res = TALER_MHD_reply_static (connection,
+                                  MHD_HTTP_NO_CONTENT,
+                                  NULL,
+                                  NULL,
+                                  0);
+  }
+  json_decref (json);
+  return res;
+}
diff --git a/src/bank-lib/fakebank_bank_testing_register.h b/src/bank-lib/fakebank_bank_testing_register.h
new file mode 100644
index 000000000..d8744ecc2
--- /dev/null
+++ b/src/bank-lib/fakebank_bank_testing_register.h
@@ -0,0 +1,53 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_bank_testing_register.h
+ * @brief implementation of /testing/register endpoint for the bank API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_BANK_TESTING_REGISTER_H
+#define FAKEBANK_BANK_TESTING_REGISTER_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+
+
+/**
+ * Handle POST /testing/register request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_bank_testing_register_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_common_lookup.c b/src/bank-lib/fakebank_common_lookup.c
new file mode 100644
index 000000000..b4f853871
--- /dev/null
+++ b/src/bank-lib/fakebank_common_lookup.c
@@ -0,0 +1,103 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_lookup.c
+ * @brief common helper functions related to lookups
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+
+struct WithdrawalOperation *
+TALER_FAKEBANK_lookup_withdrawal_operation_ (struct TALER_FAKEBANK_Handle *h,
+                                             const char *wopid)
+{
+  struct GNUNET_ShortHashCode sh;
+
+  if (NULL == h->wops)
+    return NULL;
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (wopid,
+                                     strlen (wopid),
+                                     &sh,
+                                     sizeof (sh)))
+  {
+    GNUNET_break_op (0);
+    return NULL;
+  }
+  return GNUNET_CONTAINER_multishortmap_get (h->wops,
+                                             &sh);
+}
+
+
+struct Account *
+TALER_FAKEBANK_lookup_account_ (struct TALER_FAKEBANK_Handle *h,
+                                const char *name,
+                                const char *receiver_name)
+{
+  struct GNUNET_HashCode hc;
+  size_t slen;
+  struct Account *account;
+
+  memset (&hc,
+          0,
+          sizeof (hc));
+  slen = strlen (name);
+  GNUNET_CRYPTO_hash (name,
+                      slen,
+                      &hc);
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->accounts_lock));
+  account = GNUNET_CONTAINER_multihashmap_get (h->accounts,
+                                               &hc);
+  if (NULL == account)
+  {
+    if (NULL == receiver_name)
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->accounts_lock));
+      return NULL;
+    }
+    account = GNUNET_new (struct Account);
+    account->account_name = GNUNET_strdup (name);
+    account->receiver_name = GNUNET_strdup (receiver_name);
+    GNUNET_asprintf (&account->payto_uri,
+                     "payto://x-taler-bank/%s/%s?receiver-name=%s",
+                     h->hostname,
+                     account->account_name,
+                     account->receiver_name);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (h->currency,
+                                          &account->balance));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multihashmap_put (h->accounts,
+                                                      &hc,
+                                                      account,
+                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->accounts_lock));
+  return account;
+}
diff --git a/src/bank-lib/fakebank_common_lookup.h b/src/bank-lib/fakebank_common_lookup.h
new file mode 100644
index 000000000..b93447743
--- /dev/null
+++ b/src/bank-lib/fakebank_common_lookup.h
@@ -0,0 +1,62 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_lookup.h
+ * @brief common helper functions related to lookups
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+
+#ifndef FAKEBANK_COMMON_LOOKUP_H
+#define FAKEBANK_COMMON_LOOKUP_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Lookup account with @a name, and if it does not exist, create it.
+ *
+ * @param[in,out] h bank to lookup account at
+ * @param name account name to resolve
+ * @param receiver_name receiver name in payto:// URI,
+ *         NULL if the account must already exist
+ * @return account handle, NULL if account does not yet exist
+ */
+struct Account *
+TALER_FAKEBANK_lookup_account_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const char *name,
+  const char *receiver_name);
+
+
+/**
+ * Find withdrawal operation @a wopid in @a h.
+ *
+ * @param h fakebank handle
+ * @param wopid withdrawal operation ID as a string
+ * @return NULL if operation was not found
+ */
+struct WithdrawalOperation *
+TALER_FAKEBANK_lookup_withdrawal_operation_ (struct TALER_FAKEBANK_Handle *h,
+                                             const char *wopid);
+
+#endif
diff --git a/src/bank-lib/fakebank_common_lp.c b/src/bank-lib/fakebank_common_lp.c
new file mode 100644
index 000000000..22a9e3ab4
--- /dev/null
+++ b/src/bank-lib/fakebank_common_lp.c
@@ -0,0 +1,344 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_lp.c
+ * @brief long-polling support for fakebank
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include <poll.h>
+#ifdef __linux__
+#include <sys/eventfd.h>
+#endif
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+void
+TALER_FAKEBANK_lp_trigger_ (struct LongPoller *lp)
+{
+  struct TALER_FAKEBANK_Handle *h = lp->h;
+  struct Account *acc = lp->account;
+
+  GNUNET_CONTAINER_DLL_remove (acc->lp_head,
+                               acc->lp_tail,
+                               lp);
+  MHD_resume_connection (lp->conn);
+  GNUNET_free (lp);
+  h->mhd_again = true;
+#ifdef __linux__
+  if (-1 == h->lp_event)
+#else
+  if ( (-1 == h->lp_event_in) &&
+       (-1 == h->lp_event_out) )
+#endif
+  {
+    if (NULL != h->mhd_task)
+      GNUNET_SCHEDULER_cancel (h->mhd_task);
+    h->mhd_task =
+      GNUNET_SCHEDULER_add_now (&TALER_FAKEBANK_run_mhd_,
+                                h);
+  }
+}
+
+
+void *
+TALER_FAKEBANK_lp_expiration_thread_ (void *cls)
+{
+  struct TALER_FAKEBANK_Handle *h = cls;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  while (! h->in_shutdown)
+  {
+    struct LongPoller *lp;
+    int timeout_ms;
+
+    lp = GNUNET_CONTAINER_heap_peek (h->lp_heap);
+    while ( (NULL != lp) &&
+            GNUNET_TIME_absolute_is_past (lp->timeout))
+    {
+      GNUNET_assert (lp ==
+                     GNUNET_CONTAINER_heap_remove_root (h->lp_heap));
+      TALER_FAKEBANK_lp_trigger_ (lp);
+      lp = GNUNET_CONTAINER_heap_peek (h->lp_heap);
+    }
+    if (NULL != lp)
+    {
+      struct GNUNET_TIME_Relative rem;
+      unsigned long long left_ms;
+
+      rem = GNUNET_TIME_absolute_get_remaining (lp->timeout);
+      left_ms = rem.rel_value_us / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
+      if (left_ms > INT_MAX)
+        timeout_ms = INT_MAX;
+      else
+        timeout_ms = (int) left_ms;
+    }
+    else
+    {
+      timeout_ms = -1; /* infinity */
+    }
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    {
+      struct pollfd p = {
+#ifdef __linux__
+        .fd = h->lp_event,
+#else
+        .fd = h->lp_event_out,
+#endif
+        .events = POLLIN
+      };
+      int ret;
+
+      ret = poll (&p,
+                  1,
+                  timeout_ms);
+      if (-1 == ret)
+      {
+        if (EINTR != errno)
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                               "poll");
+      }
+      else if (1 == ret)
+      {
+        /* clear event */
+        uint64_t ev;
+        ssize_t iret;
+
+#ifdef __linux__
+        iret = read (h->lp_event,
+                     &ev,
+                     sizeof (ev));
+#else
+        iret = read (h->lp_event_out,
+                     &ev,
+                     sizeof (ev));
+#endif
+        if (-1 == iret)
+        {
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                               "read");
+        }
+        else
+        {
+          GNUNET_break (sizeof (uint64_t) == iret);
+        }
+      }
+    }
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return NULL;
+}
+
+
+/**
+ * Trigger long pollers that might have been waiting
+ * for @a t.
+ *
+ * @param h fakebank handle
+ * @param t transaction to notify on
+ */
+void
+TALER_FAKEBANK_notify_transaction_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct Transaction *t)
+{
+  struct Account *debit_acc = t->debit_account;
+  struct Account *credit_acc = t->credit_account;
+  struct LongPoller *nxt;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  for (struct LongPoller *lp = debit_acc->lp_head;
+       NULL != lp;
+       lp = nxt)
+  {
+    nxt = lp->next;
+    if (LP_DEBIT == lp->type)
+    {
+      GNUNET_assert (lp ==
+                     GNUNET_CONTAINER_heap_remove_node (lp->hn));
+      TALER_FAKEBANK_lp_trigger_ (lp);
+    }
+  }
+  for (struct LongPoller *lp = credit_acc->lp_head;
+       NULL != lp;
+       lp = nxt)
+  {
+    nxt = lp->next;
+    if (LP_CREDIT == lp->type)
+    {
+      GNUNET_assert (lp ==
+                     GNUNET_CONTAINER_heap_remove_node (lp->hn));
+      TALER_FAKEBANK_lp_trigger_ (lp);
+    }
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+}
+
+
+/**
+ * Notify long pollers that a @a wo was updated.
+ * Must be called with the "big_lock" still held.
+ *
+ * @param h fakebank handle
+ * @param wo withdraw operation that finished
+ */
+void
+TALER_FAKEBANK_notify_withdrawal_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const struct WithdrawalOperation *wo)
+{
+  struct Account *debit_acc = wo->debit_account;
+  struct LongPoller *nxt;
+
+  for (struct LongPoller *lp = debit_acc->lp_head;
+       NULL != lp;
+       lp = nxt)
+  {
+    nxt = lp->next;
+    if ( (LP_WITHDRAW == lp->type) &&
+         (wo == lp->wo) )
+    {
+      GNUNET_assert (lp ==
+                     GNUNET_CONTAINER_heap_remove_node (lp->hn));
+      TALER_FAKEBANK_lp_trigger_ (lp);
+    }
+  }
+}
+
+
+/**
+ * Task run when a long poller is about to time out.
+ * Only used in single-threaded mode.
+ *
+ * @param cls a `struct TALER_FAKEBANK_Handle *`
+ */
+static void
+lp_timeout (void *cls)
+{
+  struct TALER_FAKEBANK_Handle *h = cls;
+  struct LongPoller *lp;
+
+  h->lp_task = NULL;
+  while (NULL != (lp = GNUNET_CONTAINER_heap_peek (h->lp_heap)))
+  {
+    if (GNUNET_TIME_absolute_is_future (lp->timeout))
+      break;
+    GNUNET_assert (lp ==
+                   GNUNET_CONTAINER_heap_remove_root (h->lp_heap));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Timeout reached for long poller %p\n",
+                lp->conn);
+    TALER_FAKEBANK_lp_trigger_ (lp);
+  }
+  if (NULL == lp)
+    return;
+  h->lp_task = GNUNET_SCHEDULER_add_at (lp->timeout,
+                                        &lp_timeout,
+                                        h);
+}
+
+
+/**
+ * Reschedule the timeout task of @a h for time @a t.
+ *
+ * @param h fakebank handle
+ * @param t when will the next connection timeout expire
+ */
+static void
+reschedule_lp_timeout (struct TALER_FAKEBANK_Handle *h,
+                       struct GNUNET_TIME_Absolute t)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Scheduling timeout task for %s\n",
+              GNUNET_STRINGS_absolute_time_to_string (t));
+#ifdef __linux__
+  if (-1 != h->lp_event)
+#else
+  if (-1 != h->lp_event_in && -1 != h->lp_event_out)
+#endif
+  {
+    uint64_t num = 1;
+
+    GNUNET_break (sizeof (num) ==
+#ifdef __linux__
+                  write (h->lp_event,
+                         &num,
+                         sizeof (num)));
+#else
+                  write (h->lp_event_in,
+                         &num,
+                         sizeof (num)));
+#endif
+  }
+  else
+  {
+    if (NULL != h->lp_task)
+      GNUNET_SCHEDULER_cancel (h->lp_task);
+    h->lp_task = GNUNET_SCHEDULER_add_at (t,
+                                          &lp_timeout,
+                                          h);
+  }
+}
+
+
+void
+TALER_FAKEBANK_start_lp_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  struct Account *acc,
+  struct GNUNET_TIME_Relative lp_timeout,
+  enum LongPollType dir,
+  const struct WithdrawalOperation *wo)
+{
+  struct LongPoller *lp;
+  bool toc;
+
+  lp = GNUNET_new (struct LongPoller);
+  lp->account = acc;
+  lp->h = h;
+  lp->wo = wo;
+  lp->conn = connection;
+  lp->timeout = GNUNET_TIME_relative_to_absolute (lp_timeout);
+  lp->type = dir;
+  lp->hn = GNUNET_CONTAINER_heap_insert (h->lp_heap,
+                                         lp,
+                                         lp->timeout.abs_value_us);
+  toc = (lp ==
+         GNUNET_CONTAINER_heap_peek (h->lp_heap));
+  GNUNET_CONTAINER_DLL_insert (acc->lp_head,
+                               acc->lp_tail,
+                               lp);
+  MHD_suspend_connection (connection);
+  if (toc)
+    reschedule_lp_timeout (h,
+                           lp->timeout);
+
+}
diff --git a/src/bank-lib/fakebank_common_lp.h b/src/bank-lib/fakebank_common_lp.h
new file mode 100644
index 000000000..37094e12b
--- /dev/null
+++ b/src/bank-lib/fakebank_common_lp.h
@@ -0,0 +1,100 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_lp.h
+ * @brief long-polling support for fakebank
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_COMMON_LP_H
+#define FAKEBANK_COMMON_LP_H
+#include "taler_fakebank_lib.h"
+
+
+/**
+ * Trigger the @a lp. Frees associated resources, except the entry of @a lp in
+ * the timeout heap.  Must be called while the ``big lock`` is held.
+ *
+ * @param[in] lp long poller to trigger
+ */
+void
+TALER_FAKEBANK_lp_trigger_ (struct LongPoller *lp);
+
+
+/**
+ * Trigger long pollers that might have been waiting
+ * for @a t.
+ *
+ * @param h fakebank handle
+ * @param t transaction to notify on
+ */
+void
+TALER_FAKEBANK_notify_transaction_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct Transaction *t);
+
+
+/**
+ * Notify long pollers that a @a wo was updated.
+ * Must be called with the "big_lock" still held.
+ *
+ * @param h fakebank handle
+ * @param wo withdraw operation that finished
+ */
+void
+TALER_FAKEBANK_notify_withdrawal_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const struct WithdrawalOperation *wo);
+
+
+/**
+ * Start long-polling for @a connection and @a acc
+ * for transfers in @a dir. Must be called with the
+ * "big lock" held.
+ *
+ * @param[in,out] h fakebank handle
+ * @param[in,out] connection to suspend
+ * @param[in,out] acc account affected
+ * @param lp_timeout how long to suspend
+ * @param dir direction of transfers to watch for
+ * @param wo withdraw operation to watch, only
+ *        if @a dir is #LP_WITHDRAW
+ */
+void
+TALER_FAKEBANK_start_lp_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  struct Account *acc,
+  struct GNUNET_TIME_Relative lp_timeout,
+  enum LongPollType dir,
+  const struct WithdrawalOperation *wo);
+
+
+/**
+ * Main routine of a thread that is run to wake up connections that have hit
+ * their timeout. Runs until in_shutdown is set to true. Must be send signals
+ * via lp_event on shutdown and/or whenever the heap changes to an earlier
+ * timeout.
+ *
+ * @param cls a `struct TALER_FAKEBANK_Handle *`
+ * @return NULL
+ */
+void *
+TALER_FAKEBANK_lp_expiration_thread_ (void *cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_common_make_admin_transfer.c b/src/bank-lib/fakebank_common_make_admin_transfer.c
new file mode 100644
index 000000000..4a11d412c
--- /dev/null
+++ b/src/bank-lib/fakebank_common_make_admin_transfer.c
@@ -0,0 +1,117 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_make_admin_transfer.c
+ * @brief routine to create transfers to the exchange
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_transact.h"
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_make_admin_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const char *debit_account,
+  const char *credit_account,
+  const struct TALER_Amount *amount,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *row_id,
+  struct GNUNET_TIME_Timestamp *timestamp)
+{
+  struct Transaction *t;
+  const struct GNUNET_PeerIdentity *pid;
+  struct Account *debit_acc;
+  struct Account *credit_acc;
+
+  GNUNET_static_assert (sizeof (*pid) ==
+                        sizeof (*reserve_pub));
+  pid = (const struct GNUNET_PeerIdentity *) reserve_pub;
+  GNUNET_assert (NULL != debit_account);
+  GNUNET_assert (NULL != credit_account);
+  GNUNET_assert (0 == strcasecmp (amount->currency,
+                                  h->currency));
+  GNUNET_break (0 != strncasecmp ("payto://",
+                                  debit_account,
+                                  strlen ("payto://")));
+  GNUNET_break (0 != strncasecmp ("payto://",
+                                  credit_account,
+                                  strlen ("payto://")));
+  debit_acc = TALER_FAKEBANK_lookup_account_ (h,
+                                              debit_account,
+                                              debit_account);
+  credit_acc = TALER_FAKEBANK_lookup_account_ (h,
+                                               credit_account,
+                                               credit_account);
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->rpubs_lock));
+  t = GNUNET_CONTAINER_multipeermap_get (h->rpubs,
+                                         pid);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->rpubs_lock));
+  if (NULL != t)
+  {
+    /* duplicate reserve public key not allowed */
+    GNUNET_break_op (0);
+    return GNUNET_NO;
+  }
+
+  t = GNUNET_new (struct Transaction);
+  t->unchecked = true;
+  t->debit_account = debit_acc;
+  t->credit_account = credit_acc;
+  t->amount = *amount;
+  t->date = GNUNET_TIME_timestamp_get ();
+  if (NULL != timestamp)
+    *timestamp = t->date;
+  t->type = T_CREDIT;
+  t->subject.credit.reserve_pub = *reserve_pub;
+  TALER_FAKEBANK_transact_ (h,
+                            t);
+  if (NULL != row_id)
+    *row_id = t->row_id;
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->rpubs_lock));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multipeermap_put (
+                   h->rpubs,
+                   pid,
+                   t,
+                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->rpubs_lock));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Making transfer from %s to %s over %s and subject %s at row %llu\n",
+              debit_account,
+              credit_account,
+              TALER_amount2s (amount),
+              TALER_B2S (reserve_pub),
+              (unsigned long long) t->row_id);
+  TALER_FAKEBANK_notify_transaction_ (h,
+                                      t);
+  return GNUNET_OK;
+}
diff --git a/src/bank-lib/fakebank_common_make_admin_transfer.h b/src/bank-lib/fakebank_common_make_admin_transfer.h
new file mode 100644
index 000000000..841cfb481
--- /dev/null
+++ b/src/bank-lib/fakebank_common_make_admin_transfer.h
@@ -0,0 +1,56 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_make_admin_transfer.h
+ * @brief routine to create transfers to the exchange
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_COMMON_MAKE_ADMIN_TRANSFER_H
+#define FAKEBANK_COMMON_MAKE_ADMIN_TRANSFER_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Tell the fakebank to create another wire transfer *to* an exchange.
+ *
+ * @param h fake bank handle
+ * @param debit_account account to debit
+ * @param credit_account account to credit
+ * @param amount amount to transfer
+ * @param reserve_pub reserve public key to use in subject
+ * @param[out] row_id serial_id of the transfer
+ * @param[out] timestamp when was the transfer made
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_make_admin_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const char *debit_account,
+  const char *credit_account,
+  const struct TALER_Amount *amount,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *row_id,
+  struct GNUNET_TIME_Timestamp *timestamp);
+
+#endif
diff --git a/src/bank-lib/fakebank_common_parser.c b/src/bank-lib/fakebank_common_parser.c
new file mode 100644
index 000000000..cf2dc5a74
--- /dev/null
+++ b/src/bank-lib/fakebank_common_parser.c
@@ -0,0 +1,138 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_parser.c
+ * @brief functions to help parse REST requests
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_common_parse_history_args (
+  const struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  struct HistoryArgs *ha)
+{
+  const char *start;
+  const char *delta;
+  const char *long_poll_ms;
+  unsigned long long lp_timeout;
+  unsigned long long sval;
+  long long d;
+  char dummy;
+
+  start = MHD_lookup_connection_value (connection,
+                                       MHD_GET_ARGUMENT_KIND,
+                                       "start");
+  ha->have_start = (NULL != start);
+  delta = MHD_lookup_connection_value (connection,
+                                       MHD_GET_ARGUMENT_KIND,
+                                       "delta");
+  long_poll_ms = MHD_lookup_connection_value (connection,
+                                              MHD_GET_ARGUMENT_KIND,
+                                              "long_poll_ms");
+  lp_timeout = 0;
+  if ( (NULL == delta) ||
+       (1 != sscanf (delta,
+                     "%lld%c",
+                     &d,
+                     &dummy)) )
+  {
+    /* Fail if one of the above failed.  */
+    /* Invalid request, given that this is fakebank we impolitely
+     * just kill the connection instead of returning a nice error.
+     */
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        "delta"))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
+  }
+  if ( (NULL != long_poll_ms) &&
+       (1 != sscanf (long_poll_ms,
+                     "%llu%c",
+                     &lp_timeout,
+                     &dummy)) )
+  {
+    /* Fail if one of the above failed.  */
+    /* Invalid request, given that this is fakebank we impolitely
+     * just kill the connection instead of returning a nice error.
+     */
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        "long_poll_ms"))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
+  }
+  if ( (NULL != start) &&
+       (1 != sscanf (start,
+                     "%llu%c",
+                     &sval,
+                     &dummy)) )
+  {
+    /* Fail if one of the above failed.  */
+    /* Invalid request, given that this is fakebank we impolitely
+     * just kill the connection instead of returning a nice error.
+     */
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        "start"))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
+  }
+  if (NULL == start)
+    ha->start_idx = (d > 0) ? 0 : UINT64_MAX;
+  else
+    ha->start_idx = (uint64_t) sval;
+  ha->delta = (int64_t) d;
+  if (0 == ha->delta)
+  {
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        "delta"))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
+  }
+  ha->lp_timeout
+    = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+                                     lp_timeout);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Request for %lld records from %llu\n",
+              (long long) ha->delta,
+              (unsigned long long) ha->start_idx);
+  return GNUNET_OK;
+}
diff --git a/src/bank-lib/fakebank_common_parser.h b/src/bank-lib/fakebank_common_parser.h
new file mode 100644
index 000000000..8e0d14649
--- /dev/null
+++ b/src/bank-lib/fakebank_common_parser.h
@@ -0,0 +1,50 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_parser.h
+ * @brief functions to help parse REST requests
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_COMMON_PARSER_H
+#define FAKEBANK_COMMON_PARSER_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Parse URL history arguments, of _both_ APIs:
+ * /history/incoming and /history/outgoing.
+ *
+ * @param h bank handle to work on
+ * @param connection MHD connection.
+ * @param[out] ha will contain the parsed values.
+ * @return #GNUNET_OK only if the parsing succeeds,
+ *         #GNUNET_SYSERR if it failed,
+ *         #GNUNET_NO if it failed and an error was returned
+ */
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_common_parse_history_args (
+  const struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  struct HistoryArgs *ha);
+
+#endif
diff --git a/src/bank-lib/fakebank_common_transact.c b/src/bank-lib/fakebank_common_transact.c
new file mode 100644
index 000000000..a099ef966
--- /dev/null
+++ b/src/bank-lib/fakebank_common_transact.c
@@ -0,0 +1,261 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_transact.c
+ * @brief actual transaction logic for FAKEBANK
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_transact.h"
+
+
+/**
+ * Update @a account balance by @a amount.
+ *
+ * The @a big_lock must already be locked when calling
+ * this function.
+ *
+ * @param[in,out] account account to update
+ * @param amount balance change
+ * @param debit true to subtract, false to add @a amount
+ */
+static void
+update_balance (struct Account *account,
+                const struct TALER_Amount *amount,
+                bool debit)
+{
+  if (debit == account->is_negative)
+  {
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&account->balance,
+                                     &account->balance,
+                                     amount));
+    return;
+  }
+  if (0 <= TALER_amount_cmp (&account->balance,
+                             amount))
+  {
+    GNUNET_assert (0 <=
+                   TALER_amount_subtract (&account->balance,
+                                          &account->balance,
+                                          amount));
+  }
+  else
+  {
+    GNUNET_assert (0 <=
+                   TALER_amount_subtract (&account->balance,
+                                          amount,
+                                          &account->balance));
+    account->is_negative = ! account->is_negative;
+  }
+}
+
+
+/**
+ * Add transaction to the debit and credit accounts,
+ * updating the balances as needed.
+ *
+ * The transaction @a t must already be locked
+ * when calling this function!
+ *
+ * @param[in,out] h bank handle
+ * @param[in,out] t transaction to add to account lists
+ */
+void
+TALER_FAKEBANK_transact_ (struct TALER_FAKEBANK_Handle *h,
+                          struct Transaction *t)
+{
+  struct Account *debit_acc = t->debit_account;
+  struct Account *credit_acc = t->credit_account;
+  uint64_t row_id;
+  struct Transaction *old;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  row_id = ++h->serial_counter;
+  old = h->transactions[row_id % h->ram_limit];
+  h->transactions[row_id % h->ram_limit] = t;
+  t->row_id = row_id;
+  GNUNET_CONTAINER_MDLL_insert_tail (out,
+                                     debit_acc->out_head,
+                                     debit_acc->out_tail,
+                                     t);
+  update_balance (debit_acc,
+                  &t->amount,
+                  true);
+  GNUNET_CONTAINER_MDLL_insert_tail (in,
+                                     credit_acc->in_head,
+                                     credit_acc->in_tail,
+                                     t);
+  update_balance (credit_acc,
+                  &t->amount,
+                  false);
+  if (NULL != old)
+  {
+    struct Account *da;
+    struct Account *ca;
+
+    da = old->debit_account;
+    ca = old->credit_account;
+    /* slot was already in use, must clean out old
+       entry first! */
+    GNUNET_CONTAINER_MDLL_remove (out,
+                                  da->out_head,
+                                  da->out_tail,
+                                  old);
+    GNUNET_CONTAINER_MDLL_remove (in,
+                                  ca->in_head,
+                                  ca->in_tail,
+                                  old);
+  }
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  if ( (NULL != old) &&
+       (T_DEBIT == old->type) )
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->uuid_map_lock));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multihashmap_remove (h->uuid_map,
+                                                         &old->request_uid,
+                                                         old));
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->uuid_map_lock));
+  }
+  GNUNET_free (old);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_make_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const char *debit_account,
+  const char *credit_account,
+  const struct TALER_Amount *amount,
+  const struct TALER_WireTransferIdentifierRawP *subject,
+  const char *exchange_base_url,
+  const struct GNUNET_HashCode *request_uid,
+  uint64_t *ret_row_id,
+  struct GNUNET_TIME_Timestamp *timestamp)
+{
+  struct Transaction *t;
+  struct Account *debit_acc;
+  struct Account *credit_acc;
+  size_t url_len;
+
+  GNUNET_assert (0 == strcasecmp (amount->currency,
+                                  h->currency));
+  GNUNET_assert (NULL != debit_account);
+  GNUNET_assert (NULL != credit_account);
+  GNUNET_break (0 != strncasecmp ("payto://",
+                                  debit_account,
+                                  strlen ("payto://")));
+  GNUNET_break (0 != strncasecmp ("payto://",
+                                  credit_account,
+                                  strlen ("payto://")));
+  url_len = strlen (exchange_base_url);
+  GNUNET_assert (url_len < MAX_URL_LEN);
+  debit_acc = TALER_FAKEBANK_lookup_account_ (h,
+                                              debit_account,
+                                              debit_account);
+  credit_acc = TALER_FAKEBANK_lookup_account_ (h,
+                                               credit_account,
+                                               credit_account);
+  if (NULL != request_uid)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->uuid_map_lock));
+    t = GNUNET_CONTAINER_multihashmap_get (h->uuid_map,
+                                           request_uid);
+    if (NULL != t)
+    {
+      if ( (debit_acc != t->debit_account) ||
+           (credit_acc != t->credit_account) ||
+           (0 != TALER_amount_cmp (amount,
+                                   &t->amount)) ||
+           (T_DEBIT != t->type) ||
+           (0 != GNUNET_memcmp (subject,
+                                &t->subject.debit.wtid)) )
+      {
+        /* Transaction exists, but with different details. */
+        GNUNET_break (0);
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->uuid_map_lock));
+        return GNUNET_SYSERR;
+      }
+      *ret_row_id = t->row_id;
+      *timestamp = t->date;
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->uuid_map_lock));
+      return GNUNET_OK;
+    }
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->uuid_map_lock));
+  }
+  t = GNUNET_new (struct Transaction);
+  t->unchecked = true;
+  t->debit_account = debit_acc;
+  t->credit_account = credit_acc;
+  t->amount = *amount;
+  t->date = GNUNET_TIME_timestamp_get ();
+  if (NULL != timestamp)
+    *timestamp = t->date;
+  t->type = T_DEBIT;
+  GNUNET_memcpy (t->subject.debit.exchange_base_url,
+                 exchange_base_url,
+                 url_len);
+  t->subject.debit.wtid = *subject;
+  if (NULL == request_uid)
+    GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_NONCE,
+                                      &t->request_uid);
+  else
+    t->request_uid = *request_uid;
+  TALER_FAKEBANK_transact_ (h,
+                            t);
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->uuid_map_lock));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multihashmap_put (
+                   h->uuid_map,
+                   &t->request_uid,
+                   t,
+                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->uuid_map_lock));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Making transfer %llu from %s to %s over %s and subject %s; for exchange: %s\n",
+              (unsigned long long) t->row_id,
+              debit_account,
+              credit_account,
+              TALER_amount2s (amount),
+              TALER_B2S (subject),
+              exchange_base_url);
+  *ret_row_id = t->row_id;
+  TALER_FAKEBANK_notify_transaction_ (h,
+                                      t);
+  return GNUNET_OK;
+}
diff --git a/src/bank-lib/fakebank_common_transact.h b/src/bank-lib/fakebank_common_transact.h
new file mode 100644
index 000000000..0914785e9
--- /dev/null
+++ b/src/bank-lib/fakebank_common_transact.h
@@ -0,0 +1,76 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_common_transact.h
+ * @brief actual transaction logic for FAKEBANK
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_COMMON_TRANSACT_H
+#define FAKEBANK_COMMON_TRANSACT_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Add transaction to the debit and credit accounts,
+ * updating the balances as needed.
+ *
+ * The transaction @a t must already be locked
+ * when calling this function!
+ *
+ * @param[in,out] h bank handle
+ * @param[in,out] t transaction to add to account lists
+ */
+void
+TALER_FAKEBANK_transact_ (struct TALER_FAKEBANK_Handle *h,
+                          struct Transaction *t);
+
+
+/**
+ * Tell the fakebank to create another wire transfer *from* an exchange.
+ *
+ * @param h fake bank handle
+ * @param debit_account account to debit
+ * @param credit_account account to credit
+ * @param amount amount to transfer
+ * @param subject wire transfer subject to use
+ * @param exchange_base_url exchange URL
+ * @param request_uid unique number to make the request unique, or NULL to create one
+ * @param[out] ret_row_id pointer to store the row ID of this transaction
+ * @param[out] timestamp set to the time of the transfer
+ * @return #GNUNET_YES if the transfer was successful,
+ *         #GNUNET_SYSERR if the request_uid was reused for a different transfer
+ */
+enum GNUNET_GenericReturnValue
+TALER_FAKEBANK_make_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  const char *debit_account,
+  const char *credit_account,
+  const struct TALER_Amount *amount,
+  const struct TALER_WireTransferIdentifierRawP *subject,
+  const char *exchange_base_url,
+  const struct GNUNET_HashCode *request_uid,
+  uint64_t *ret_row_id,
+  struct GNUNET_TIME_Timestamp *timestamp);
+
+#endif
diff --git a/src/bank-lib/fakebank_stop.c b/src/bank-lib/fakebank_stop.c
new file mode 100644
index 000000000..e31d47523
--- /dev/null
+++ b/src/bank-lib/fakebank_stop.c
@@ -0,0 +1,192 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_stop.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include <poll.h>
+#ifdef __linux__
+#include <sys/eventfd.h>
+#endif
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lp.h"
+
+
+/**
+ * Helper function to free memory when finished.
+ *
+ * @param cls NULL
+ * @param key key of the account to free (ignored)
+ * @param val a `struct Account` to free.
+ */
+static enum GNUNET_GenericReturnValue
+free_account (void *cls,
+              const struct GNUNET_HashCode *key,
+              void *val)
+{
+  struct Account *account = val;
+
+  (void) cls;
+  (void) key;
+  GNUNET_assert (NULL == account->lp_head);
+  GNUNET_free (account->account_name);
+  GNUNET_free (account->receiver_name);
+  GNUNET_free (account->payto_uri);
+  GNUNET_free (account->password);
+  GNUNET_free (account);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Helper function to free memory when finished.
+ *
+ * @param cls NULL
+ * @param key key of the operation to free (ignored)
+ * @param val a `struct WithdrawalOperation *` to free.
+ */
+static enum GNUNET_GenericReturnValue
+free_withdraw_op (void *cls,
+                  const struct GNUNET_ShortHashCode *key,
+                  void *val)
+{
+  struct WithdrawalOperation *wo = val;
+
+  (void) cls;
+  (void) key;
+  GNUNET_free (wo);
+  return GNUNET_OK;
+}
+
+
+void
+TALER_FAKEBANK_stop (struct TALER_FAKEBANK_Handle *h)
+{
+  if (NULL != h->lp_task)
+  {
+    GNUNET_SCHEDULER_cancel (h->lp_task);
+    h->lp_task = NULL;
+  }
+#if EPOLL_SUPPORT
+  if (NULL != h->mhd_rfd)
+  {
+    GNUNET_NETWORK_socket_free_memory_only_ (h->mhd_rfd);
+    h->mhd_rfd = NULL;
+  }
+#endif
+#ifdef __linux__
+  if (-1 != h->lp_event)
+#else
+  if (-1 != h->lp_event_in && -1 != h->lp_event_out)
+#endif
+  {
+    uint64_t val = 1;
+    void *ret;
+    struct LongPoller *lp;
+
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+    h->in_shutdown = true;
+    while (NULL != (lp = GNUNET_CONTAINER_heap_remove_root (h->lp_heap)))
+      TALER_FAKEBANK_lp_trigger_ (lp);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+#ifdef __linux__
+    GNUNET_break (sizeof (val) ==
+                  write (h->lp_event,
+                         &val,
+                         sizeof (val)));
+#else
+    GNUNET_break (sizeof (val) ==
+                  write (h->lp_event_in,
+                         &val,
+                         sizeof (val)));
+#endif
+    GNUNET_break (0 ==
+                  pthread_join (h->lp_thread,
+                                &ret));
+    GNUNET_break (NULL == ret);
+#ifdef __linux__
+    GNUNET_break (0 == close (h->lp_event));
+    h->lp_event = -1;
+#else
+    GNUNET_break (0 == close (h->lp_event_in));
+    GNUNET_break (0 == close (h->lp_event_out));
+    h->lp_event_in = -1;
+    h->lp_event_out = -1;
+#endif
+  }
+  else
+  {
+    struct LongPoller *lp;
+
+    while (NULL != (lp = GNUNET_CONTAINER_heap_remove_root (h->lp_heap)))
+      TALER_FAKEBANK_lp_trigger_ (lp);
+  }
+  if (NULL != h->mhd_bank)
+  {
+    MHD_stop_daemon (h->mhd_bank);
+    h->mhd_bank = NULL;
+  }
+  if (NULL != h->mhd_task)
+  {
+    GNUNET_SCHEDULER_cancel (h->mhd_task);
+    h->mhd_task = NULL;
+  }
+  if (NULL != h->accounts)
+  {
+    GNUNET_CONTAINER_multihashmap_iterate (h->accounts,
+                                           &free_account,
+                                           NULL);
+    GNUNET_CONTAINER_multihashmap_destroy (h->accounts);
+  }
+  if (NULL != h->wops)
+  {
+    GNUNET_CONTAINER_multishortmap_iterate (h->wops,
+                                            &free_withdraw_op,
+                                            NULL);
+    GNUNET_CONTAINER_multishortmap_destroy (h->wops);
+  }
+  GNUNET_CONTAINER_multihashmap_destroy (h->uuid_map);
+  GNUNET_CONTAINER_multipeermap_destroy (h->rpubs);
+  GNUNET_CONTAINER_heap_destroy (h->lp_heap);
+  GNUNET_assert (0 ==
+                 pthread_mutex_destroy (&h->big_lock));
+  GNUNET_assert (0 ==
+                 pthread_mutex_destroy (&h->uuid_map_lock));
+  GNUNET_assert (0 ==
+                 pthread_mutex_destroy (&h->accounts_lock));
+  GNUNET_assert (0 ==
+                 pthread_mutex_destroy (&h->rpubs_lock));
+  for (uint64_t i = 0; i<h->ram_limit; i++)
+    GNUNET_free (h->transactions[i]);
+  GNUNET_free (h->transactions);
+  GNUNET_free (h->my_baseurl);
+  GNUNET_free (h->currency);
+  GNUNET_free (h->exchange_url);
+  GNUNET_free (h->hostname);
+  GNUNET_free (h);
+}
diff --git a/src/bank-lib/fakebank_tbi.c b/src/bank-lib/fakebank_tbi.c
new file mode 100644
index 000000000..463ec7d31
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi.c
@@ -0,0 +1,167 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi.c
+ * @brief main entry point to the Taler Bank Integration (TBI) API implementation
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_tbi.h"
+#include "fakebank_tbi_get_withdrawal_operation.h"
+#include "fakebank_tbi_post_withdrawal_operation.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h,
+                          struct MHD_Connection *connection,
+                          const char *url,
+                          const char *method,
+                          const char *upload_data,
+                          size_t *upload_data_size,
+                          void **con_cls)
+{
+  if (0 == strcasecmp (method,
+                       MHD_HTTP_METHOD_HEAD))
+    method = MHD_HTTP_METHOD_GET;
+  if ( (0 == strcmp (url,
+                     "/config")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    struct TALER_Amount zero;
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (h->currency,
+                                          &zero));
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string ("version",
+                               "1:0:1"),
+      GNUNET_JSON_pack_string ("currency",
+                               h->currency),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:bank:fakebank"),
+      GNUNET_JSON_pack_bool ("allow_conversion",
+                             false),
+      GNUNET_JSON_pack_bool ("allow_registrations",
+                             true),
+      GNUNET_JSON_pack_bool ("allow_deletions",
+                             false),
+      GNUNET_JSON_pack_bool ("allow_edit_name",
+                             false),
+      GNUNET_JSON_pack_bool ("allow_edit_cashout_payto_uri",
+                             false),
+      TALER_JSON_pack_amount ("default_debit_threshold",
+                              &zero),
+      GNUNET_JSON_pack_array_steal ("supported_tan_channels",
+                                    json_array ()),
+      GNUNET_JSON_pack_object_steal (
+        "currency_specification",
+        GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_string ("name",
+                                   h->currency),
+          GNUNET_JSON_pack_string ("currency",
+                                   h->currency),
+          GNUNET_JSON_pack_uint64 ("num_fractional_input_digits",
+                                   2),
+          GNUNET_JSON_pack_uint64 ("num_fractional_normal_digits",
+                                   2),
+          GNUNET_JSON_pack_uint64 ("num_fractional_trailing_zero_digits",
+                                   2),
+          GNUNET_JSON_pack_object_steal (
+            "alt_unit_names",
+            GNUNET_JSON_PACK (
+              GNUNET_JSON_pack_string ("0",
+                                       h->currency))),
+          GNUNET_JSON_pack_string ("name",
+                                   h->currency))),
+      GNUNET_JSON_pack_string ("name",
+                               "taler-bank-integration"));
+  }
+  if ( (0 == strncmp (url,
+                      "/withdrawal-operation/",
+                      strlen ("/withdrawal-operation/"))) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    const char *wopid = &url[strlen ("/withdrawal-operation/")];
+    const char *lp_s
+      = MHD_lookup_connection_value (connection,
+                                     MHD_GET_ARGUMENT_KIND,
+                                     "long_poll_ms");
+    struct GNUNET_TIME_Relative lp = GNUNET_TIME_UNIT_ZERO;
+
+    if (NULL != lp_s)
+    {
+      unsigned long long d;
+      char dummy;
+
+      if (1 != sscanf (lp_s,
+                       "%llu%c",
+                       &d,
+                       &dummy))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "long_poll_ms");
+      }
+      lp = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+                                          d);
+    }
+    return TALER_FAKEBANK_tbi_get_withdrawal_operation_ (h,
+                                                         connection,
+                                                         wopid,
+                                                         lp,
+                                                         con_cls);
+
+  }
+  if ( (0 == strncmp (url,
+                      "/withdrawal-operation/",
+                      strlen ("/withdrawal-operation/"))) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_POST)) )
+  {
+    const char *wopid = &url[strlen ("/withdrawal-operation/")];
+
+    return TALER_FAKEBANK_tbi_post_withdrawal (h,
+                                               connection,
+                                               wopid,
+                                               upload_data,
+                                               upload_data_size,
+                                               con_cls);
+  }
+
+  TALER_LOG_ERROR ("Breaking URL: %s %s\n",
+                   method,
+                   url);
+  GNUNET_break_op (0);
+  return TALER_MHD_reply_with_error (
+    connection,
+    MHD_HTTP_NOT_FOUND,
+    TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+    url);
+}
diff --git a/src/bank-lib/fakebank_tbi.h b/src/bank-lib/fakebank_tbi.h
new file mode 100644
index 000000000..ef9f35fa2
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi.h
@@ -0,0 +1,54 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi.c
+ * @brief main entry point to the Taler Bank Integration (TBI) API implementation
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+
+
+#ifndef FAKEBANK_TBI_H
+#define FAKEBANK_TBI_H
+
+/**
+ * Handle incoming HTTP request to the bank integration API.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param url the requested url
+ * @param method the method (POST, GET, ...)
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbi_main_ (struct TALER_FAKEBANK_Handle *h,
+                          struct MHD_Connection *connection,
+                          const char *url,
+                          const char *method,
+                          const char *upload_data,
+                          size_t *upload_data_size,
+                          void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_tbi_get_withdrawal_operation.c b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.c
new file mode 100644
index 000000000..4749bda77
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.c
@@ -0,0 +1,141 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi_get_withdrawal_operation.c
+ * @brief Implementation of the GET /withdrawal-operation/ request of the Taler Bank Integration API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_tbi_get_withdrawal_operation.h"
+
+/**
+ * Function called to clean up a withdraw context.
+ *
+ * @param cls a `struct WithdrawContext *`
+ */
+static void
+withdraw_cleanup (void *cls)
+{
+  struct WithdrawContext *wc = cls;
+
+  GNUNET_free (wc);
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbi_get_withdrawal_operation_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *wopid,
+  struct GNUNET_TIME_Relative lp,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  struct WithdrawContext *wc;
+  const char *status_string;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &withdraw_cleanup;
+    *con_cls = cc;
+    wc = GNUNET_new (struct WithdrawContext);
+    cc->ctx = wc;
+    wc->wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                          wopid);
+    if (NULL == wc->wo)
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                         wopid);
+    }
+    wc->timeout = GNUNET_TIME_relative_to_absolute (lp);
+  }
+  else
+  {
+    wc = cc->ctx;
+  }
+  if (GNUNET_TIME_absolute_is_past (wc->timeout) ||
+      h->in_shutdown ||
+      wc->wo->confirmation_done ||
+      wc->wo->aborted)
+  {
+    json_t *wt;
+
+    wt = json_array ();
+    GNUNET_assert (NULL != wt);
+    GNUNET_assert (0 ==
+                   json_array_append_new (wt,
+                                          json_string ("x-taler-bank")));
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    if (wc->wo->aborted)
+      status_string = "aborted";
+    else if (wc->wo->confirmation_done)
+      status_string = "confirmed";
+    else if (wc->wo->selection_done)
+      status_string = "selected";
+    else
+      status_string = "pending";
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      // FIXME: deprecated field, should be removed in the future.
+      GNUNET_JSON_pack_bool ("aborted",
+                             wc->wo->aborted),
+      // FIXME: deprecated field, should be removed in the future.
+      GNUNET_JSON_pack_bool ("selection_done",
+                             wc->wo->selection_done),
+      // FIXME: deprecated field, should be removed in the future.
+      GNUNET_JSON_pack_bool ("transfer_done",
+                             wc->wo->confirmation_done),
+      GNUNET_JSON_pack_string ("status",
+                               status_string),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("suggested_exchange",
+                                 h->exchange_url)),
+      TALER_JSON_pack_amount ("amount",
+                              &wc->wo->amount),
+      GNUNET_JSON_pack_array_steal ("wire_types",
+                                    wt));
+  }
+
+  TALER_FAKEBANK_start_lp_ (h,
+                            connection,
+                            wc->wo->debit_account,
+                            GNUNET_TIME_absolute_get_remaining (wc->timeout),
+                            LP_WITHDRAW,
+                            wc->wo);
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  return MHD_YES;
+}
diff --git a/src/bank-lib/fakebank_tbi_get_withdrawal_operation.h b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.h
new file mode 100644
index 000000000..b42e5a768
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi_get_withdrawal_operation.h
@@ -0,0 +1,51 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi_get_withdrawal_operation.h
+ * @brief Implementation of the GET /withdrawal-operation/ request of the Taler Bank Integration API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TBI_GET_WITHDRAWAL_OPERATION_H
+#define FAKEBANK_TBI_GET_WITHDRAWAL_OPERATION_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle GET /withdrawal-operation/{wopid} request.
+ *
+ * @param h the handle
+ * @param connection the connection
+ * @param wopid the withdrawal operation identifier
+ * @param lp how long is the long-polling timeout
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbi_get_withdrawal_operation_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *wopid,
+  struct GNUNET_TIME_Relative lp,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_tbi_post_withdrawal_operation.c b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.c
new file mode 100644
index 000000000..38b92e494
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.c
@@ -0,0 +1,231 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi_post_withdrawal_operation.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_tbi_post_withdrawal_operation.h"
+
+
+/**
+ * Execute POST /withdrawal-operation/ request.
+ *
+ * @param h our handle
+ * @param connection the connection
+ * @param wopid the withdrawal operation identifier
+ * @param reserve_pub public key of the reserve
+ * @param exchange_payto_uri payto://-URI of the exchange
+ * @return MHD result code
+ */
+static MHD_RESULT
+do_post_withdrawal (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *wopid,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const char *exchange_payto_uri)
+{
+  struct WithdrawalOperation *wo;
+  char *credit_name;
+  struct Account *credit_account;
+  const char *status_string;
+
+  GNUNET_assert (0 ==
+                 pthread_mutex_lock (&h->big_lock));
+  wo = TALER_FAKEBANK_lookup_withdrawal_operation_ (h,
+                                                    wopid);
+  if (NULL == wo)
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_BANK_TRANSACTION_NOT_FOUND,
+                                       wopid);
+  }
+  if ( (wo->selection_done) &&
+       (0 != GNUNET_memcmp (&wo->reserve_pub,
+                            reserve_pub)) )
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_WITHDRAWAL_OPERATION_RESERVE_SELECTION_CONFLICT,
+                                       "reserve public key changed");
+  }
+  {
+    /* check if reserve_pub is already in use */
+    const struct GNUNET_PeerIdentity *pid;
+
+    pid = (const struct GNUNET_PeerIdentity *) &wo->reserve_pub;
+    if (GNUNET_CONTAINER_multipeermap_contains (h->rpubs,
+                                                pid))
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_CONFLICT,
+                                         TALER_EC_BANK_DUPLICATE_RESERVE_PUB_SUBJECT,
+                                         NULL);
+    }
+  }
+  credit_name = TALER_xtalerbank_account_from_payto (exchange_payto_uri);
+  if (NULL == credit_name)
+  {
+    GNUNET_break_op (0);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
+                                       NULL);
+  }
+  credit_account = TALER_FAKEBANK_lookup_account_ (h,
+                                                   credit_name,
+                                                   NULL);
+  if (NULL == credit_account)
+  {
+    MHD_RESULT res;
+
+    GNUNET_break_op (0);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    res = TALER_MHD_reply_with_error (connection,
+                                      MHD_HTTP_NOT_FOUND,
+                                      TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                      credit_name);
+    GNUNET_free (credit_name);
+    return res;
+  }
+  GNUNET_free (credit_name);
+  if ( (NULL != wo->exchange_account) &&
+       (credit_account != wo->exchange_account) )
+  {
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_CONFLICT,
+                                       TALER_EC_BANK_WITHDRAWAL_OPERATION_RESERVE_SELECTION_CONFLICT,
+                                       "exchange account changed");
+  }
+  wo->exchange_account = credit_account;
+  wo->reserve_pub = *reserve_pub;
+  wo->selection_done = true;
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+  if (wo->aborted)
+    status_string = "aborted";
+  else if (wo->confirmation_done)
+    status_string = "confirmed";
+  else
+    status_string = "selected";
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    // FIXME: Deprecated field, should be deleted in the future.
+    GNUNET_JSON_pack_bool ("transfer_done",
+                           wo->confirmation_done),
+    GNUNET_JSON_pack_string ("status",
+                             status_string));
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbi_post_withdrawal (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *wopid,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  enum GNUNET_JSON_PostResult pr;
+  json_t *json;
+  MHD_RESULT res;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &GNUNET_JSON_post_parser_cleanup;
+    *con_cls = cc;
+  }
+  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
+                                connection,
+                                &cc->ctx,
+                                upload_data,
+                                upload_data_size,
+                                &json);
+  switch (pr)
+  {
+  case GNUNET_JSON_PR_OUT_OF_MEMORY:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_CONTINUE:
+    return MHD_YES;
+  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_JSON_INVALID:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_SUCCESS:
+    break;
+  }
+
+  {
+    struct TALER_ReservePublicKeyP reserve_pub;
+    const char *exchange_payto_url;
+    enum GNUNET_GenericReturnValue ret;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                   &reserve_pub),
+      GNUNET_JSON_spec_string ("selected_exchange",
+                               &exchange_payto_url),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        (ret = TALER_MHD_parse_json_data (connection,
+                                          json,
+                                          spec)))
+    {
+      GNUNET_break_op (0);
+      json_decref (json);
+      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
+    }
+    res = do_post_withdrawal (h,
+                              connection,
+                              wopid,
+                              &reserve_pub,
+                              exchange_payto_url);
+  }
+  json_decref (json);
+  return res;
+}
diff --git a/src/bank-lib/fakebank_tbi_post_withdrawal_operation.h b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.h
new file mode 100644
index 000000000..8873bb5f6
--- /dev/null
+++ b/src/bank-lib/fakebank_tbi_post_withdrawal_operation.h
@@ -0,0 +1,53 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbi_post_withdrawal_operation.c
+ * @brief Implementation of the Taler Bank Integration API for POAT /withdrawal-operation/ requests
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TBI_POST_WITHDRAWAL_OPERATION_H
+#define FAKEBANK_TBI_POST_WITHDRAWAL_OPERATION_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle POST /withdrawal-operation/ request.
+ *
+ * @param h our fakebank handle
+ * @param connection the connection
+ * @param wopid the withdrawal operation identifier
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbi_post_withdrawal (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *wopid,
+  const void *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_tbr.c b/src/bank-lib/fakebank_tbr.c
new file mode 100644
index 000000000..0f0e5bdc1
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr.c
@@ -0,0 +1,94 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr.c
+ * @brief main entry point for the Taler Bank Revenue API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_tbr_get_history.h"
+#include "fakebank_tbr_get_root.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbr_main_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *url,
+  const char *method,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Fakebank - Anastasis API: serving URL `%s' for account `%s'\n",
+              url,
+              account);
+
+  if ( (0 == strcmp (url,
+                     "/config")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /config */
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string ("version",
+                               "0:0:0"),
+      GNUNET_JSON_pack_string ("currency",
+                               h->currency),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:bank:fakebank"),
+      GNUNET_JSON_pack_string ("name",
+                               "taler-revenue"));
+  }
+
+  if (0 == strcasecmp (method,
+                       MHD_HTTP_METHOD_GET))
+  {
+    if ( (0 == strcmp (url,
+                       "/history")) &&
+         (NULL != account) )
+      return TALER_FAKEBANK_tbr_get_history (h,
+                                             connection,
+                                             account,
+                                             con_cls);
+    if (0 == strcmp (url,
+                     "/"))
+      return TALER_FAKEBANK_tbr_get_root (h,
+                                          connection);
+  }
+  /* Unexpected URL path, just close the connection. */
+  TALER_LOG_ERROR ("Breaking URL: %s %s\n",
+                   method,
+                   url);
+  GNUNET_break_op (0);
+  return TALER_MHD_reply_with_error (
+    connection,
+    MHD_HTTP_NOT_FOUND,
+    TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+    url);
+}
diff --git a/src/bank-lib/fakebank_tbr.h b/src/bank-lib/fakebank_tbr.h
new file mode 100644
index 000000000..fb9bdfefc
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr.h
@@ -0,0 +1,58 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr.h
+ * @brief main entry point for the Taler Bank Revenue API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+#ifndef FAKEBANK_TBR_H
+#define FAKEBANK_TBR_H
+
+/**
+ * Handle incoming HTTP request to the Taler Bank Revenue API.
+ *
+ * @param h our handle
+ * @param connection the connection
+ * @param url the requested url
+ * @param method the method (POST, GET, ...)
+ * @param account which account should process the request
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbr_main_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *url,
+  const char *method,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_tbr_get_history.c b/src/bank-lib/fakebank_tbr_get_history.c
new file mode 100644
index 000000000..a6cfaad8d
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr_get_history.c
@@ -0,0 +1,312 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr_get_history.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_parser.h"
+#include "fakebank_tbr_get_history.h"
+
+
+/**
+ * Function called to clean up a history context.
+ *
+ * @param cls a `struct HistoryContext *`
+ */
+static void
+history_cleanup (void *cls)
+{
+  struct HistoryContext *hc = cls;
+
+  json_decref (hc->history);
+  GNUNET_free (hc);
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbr_get_history (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  struct HistoryContext *hc;
+  const struct Transaction *pos;
+  enum GNUNET_GenericReturnValue ret;
+  bool in_shutdown;
+  const char *acc_payto_uri;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &history_cleanup;
+    *con_cls = cc;
+    hc = GNUNET_new (struct HistoryContext);
+    cc->ctx = hc;
+    hc->history = json_array ();
+    if (NULL == hc->history)
+    {
+      GNUNET_break (0);
+      return MHD_NO;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Handling /accounts/%s/taler-revenue/history request\n",
+                account);
+    if (GNUNET_OK !=
+        (ret = TALER_FAKEBANK_common_parse_history_args (h,
+                                                         connection,
+                                                         &hc->ha)))
+    {
+      GNUNET_break_op (0);
+      return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
+    }
+    hc->timeout = GNUNET_TIME_relative_to_absolute (hc->ha.lp_timeout);
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+    if (UINT64_MAX == hc->ha.start_idx)
+      hc->ha.start_idx = h->serial_counter;
+    hc->acc = TALER_FAKEBANK_lookup_account_ (h,
+                                              account,
+                                              NULL);
+    if (NULL == hc->acc)
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Account %s is unknown\n",
+                  account);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                         account);
+    }
+  }
+  else
+  {
+    hc = cc->ctx;
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+  }
+
+  if (! hc->ha.have_start)
+  {
+    pos = (0 > hc->ha.delta)
+          ? hc->acc->in_tail
+          : hc->acc->in_head;
+  }
+  else
+  {
+    struct Transaction *t = h->transactions[hc->ha.start_idx % h->ram_limit];
+    bool overflow;
+    uint64_t dir;
+    bool skip = true;
+
+    overflow = ( (NULL != t) && (t->row_id != hc->ha.start_idx) );
+    dir = (0 > hc->ha.delta) ? (h->ram_limit - 1) : 1;
+    /* If account does not match, linear scan for
+       first matching account. */
+    while ( (! overflow) &&
+            (NULL != t) &&
+            (t->credit_account != hc->acc) )
+    {
+      skip = false;
+      t = h->transactions[(t->row_id + dir) % h->ram_limit];
+      if ( (NULL != t) &&
+           (t->row_id == hc->ha.start_idx) )
+        overflow = true; /* full circle, give up! */
+    }
+    if ( (NULL == t) ||
+         overflow)
+    {
+      in_shutdown = h->in_shutdown;
+      /* FIXME: these conditions are unclear to me. */
+      if (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout) &&
+          (0 < hc->ha.delta))
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        if (overflow)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "Transactions lost due to RAM limits\n");
+          return TALER_MHD_reply_with_ec (
+            connection,
+            TALER_EC_BANK_ANCIENT_TRANSACTION_GONE,
+            NULL);
+        }
+        goto finish;
+      }
+      if (in_shutdown)
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        goto finish;
+      }
+      TALER_FAKEBANK_start_lp_ (h,
+                                connection,
+                                hc->acc,
+                                GNUNET_TIME_absolute_get_remaining (
+                                  hc->timeout),
+                                LP_CREDIT,
+                                NULL);
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return MHD_YES;
+    }
+    if (skip)
+    {
+      /* range from application is exclusive, skip the
+  matching entry */
+      if (0 > hc->ha.delta)
+        pos = t->prev_in;
+      else
+        pos = t->next_in;
+    }
+    else
+    {
+      pos = t;
+    }
+  }
+  if (NULL != pos)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Returning %lld credit transactions starting (inclusive) from %llu\n",
+                (long long) hc->ha.delta,
+                (unsigned long long) pos->row_id);
+  while ( (0 != hc->ha.delta) &&
+          (NULL != pos) )
+  {
+    json_t *trans;
+    char *subject;
+
+    if (T_DEBIT != pos->type)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Unexpected CREDIT transaction #%llu for account `%s'\n",
+                  (unsigned long long) pos->row_id,
+                  account);
+      if (0 > hc->ha.delta)
+        pos = pos->prev_in;
+      if (0 < hc->ha.delta)
+        pos = pos->next_in;
+      continue;
+    }
+
+    {
+      char *wtids;
+
+      wtids = GNUNET_STRINGS_data_to_string_alloc (
+        &pos->subject.debit.wtid,
+        sizeof (pos->subject.debit.wtid));
+      GNUNET_asprintf (&subject,
+                       "%s %s",
+                       wtids,
+                       pos->subject.debit.exchange_base_url);
+      GNUNET_free (wtids);
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Found transaction over %s with subject %s\n",
+                TALER_amount2s (&pos->amount),
+                subject);
+    trans = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("type",
+                               "RESERVE"),
+      GNUNET_JSON_pack_uint64 ("row_id",
+                               pos->row_id),
+      GNUNET_JSON_pack_timestamp ("date",
+                                  pos->date),
+      TALER_JSON_pack_amount ("amount",
+                              &pos->amount),
+      GNUNET_JSON_pack_string ("debit_account",
+                               pos->debit_account->payto_uri),
+      GNUNET_JSON_pack_string ("subject",
+                               subject));
+    GNUNET_free (subject);
+    GNUNET_assert (NULL != trans);
+    GNUNET_assert (0 ==
+                   json_array_append_new (hc->history,
+                                          trans));
+    if (hc->ha.delta > 0)
+      hc->ha.delta--;
+    else
+      hc->ha.delta++;
+    if (0 > hc->ha.delta)
+      pos = pos->prev_in;
+    if (0 < hc->ha.delta)
+      pos = pos->next_in;
+  }
+  if ( (0 == json_array_size (hc->history)) &&
+       (! h->in_shutdown) &&
+       (GNUNET_TIME_absolute_is_future (hc->timeout)) &&
+       (0 < hc->ha.delta))
+  {
+    TALER_FAKEBANK_start_lp_ (h,
+                              connection,
+                              hc->acc,
+                              GNUNET_TIME_absolute_get_remaining (hc->timeout),
+                              LP_CREDIT,
+                              NULL);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return MHD_YES;
+  }
+  in_shutdown = h->in_shutdown;
+  acc_payto_uri = hc->acc->payto_uri;
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+finish:
+  if (0 == json_array_size (hc->history))
+  {
+    GNUNET_break (in_shutdown ||
+                  (! GNUNET_TIME_absolute_is_future (hc->timeout)));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Zero transactions found\n");
+    return TALER_MHD_reply_static (connection,
+                                   MHD_HTTP_NO_CONTENT,
+                                   NULL,
+                                   NULL,
+                                   0);
+  }
+  {
+    json_t *h = hc->history;
+
+    hc->history = NULL;
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string (
+        "credit_account",
+        acc_payto_uri),
+      GNUNET_JSON_pack_array_steal (
+        "incoming_transactions",
+        h));
+  }
+}
diff --git a/src/bank-lib/fakebank_tbr_get_history.h b/src/bank-lib/fakebank_tbr_get_history.h
new file mode 100644
index 000000000..997c9a86b
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr_get_history.h
@@ -0,0 +1,52 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr_get_history.h
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TBR_GET_HISTORY_H
+#define FAKEBANK_TBR_GET_HISTORY_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for /history
+ * of the taler-revenue API.  This one can return transactions
+ * created by debits from the exchange!
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account which account the request is about
+ * @param con_cls closure for request (NULL or &special_ptr)
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbr_get_history (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_tbr_get_root.c b/src/bank-lib/fakebank_tbr_get_root.c
new file mode 100644
index 000000000..6e518d661
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr_get_root.c
@@ -0,0 +1,50 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr_get_root.c
+ * @brief return the main "/" page for the Taler Bank Revenue API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_tbr_get_root (struct TALER_FAKEBANK_Handle *h,
+                             struct MHD_Connection *connection)
+{
+  MHD_RESULT ret;
+  struct MHD_Response *resp;
+#define HELLOMSG "Hello, Fakebank (Bank Revenue API here)!"
+
+  (void) h;
+  resp = MHD_create_response_from_buffer (
+    strlen (HELLOMSG),
+    HELLOMSG,
+    MHD_RESPMEM_MUST_COPY);
+  ret = MHD_queue_response (connection,
+                            MHD_HTTP_OK,
+                            resp);
+  MHD_destroy_response (resp);
+  return ret;
+}
diff --git a/src/bank-lib/fakebank_tbr_get_root.h b/src/bank-lib/fakebank_tbr_get_root.h
new file mode 100644
index 000000000..eda8060bf
--- /dev/null
+++ b/src/bank-lib/fakebank_tbr_get_root.h
@@ -0,0 +1,45 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_tbr_get_root.h
+ * @brief return the main "/" page for the Taler Bank Revenue API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TBR_GET_ROOT_H
+#define FAKEBANK_TBR_GET_ROOT_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for "/" (home page).
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_tbr_get_root (struct TALER_FAKEBANK_Handle *h,
+                             struct MHD_Connection *connection);
+
+#endif
diff --git a/src/bank-lib/fakebank_twg.c b/src/bank-lib/fakebank_twg.c
new file mode 100644
index 000000000..9356e69ba
--- /dev/null
+++ b/src/bank-lib/fakebank_twg.c
@@ -0,0 +1,124 @@
+/*
+  This file is part of TALER
+  (C) 2016-2024 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg.c
+ * @brief main entry point for the Taler Wire Gateway API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_twg.h"
+#include "fakebank_twg_admin_add_incoming.h"
+#include "fakebank_twg_get_root.h"
+#include "fakebank_twg_history.h"
+#include "fakebank_twg_transfer.h"
+
+
+MHD_RESULT
+TALER_FAKEBANK_twg_main_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *url,
+  const char *method,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Fakebank TWG, serving URL `%s' for account `%s'\n",
+              url,
+              account);
+  if ( (0 == strcmp (url,
+                     "/config")) &&
+       (0 == strcasecmp (method,
+                         MHD_HTTP_METHOD_GET)) )
+  {
+    /* GET /config */
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string ("version",
+                               "0:0:0"),
+      GNUNET_JSON_pack_string ("currency",
+                               h->currency),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:bank:fakebank"),
+      GNUNET_JSON_pack_string ("name",
+                               "taler-wire-gateway"));
+  }
+  if (0 == strcasecmp (method,
+                       MHD_HTTP_METHOD_GET))
+  {
+    if ( (0 == strcmp (url,
+                       "/history/incoming")) &&
+         (NULL != account) )
+      return TALER_FAKEBANK_twg_get_credit_history_ (h,
+                                                     connection,
+                                                     account,
+                                                     con_cls);
+    if ( (0 == strcmp (url,
+                       "/history/outgoing")) &&
+         (NULL != account) )
+      return TALER_FAKEBANK_twg_get_debit_history_ (h,
+                                                    connection,
+                                                    account,
+                                                    con_cls);
+    if (0 == strcmp (url,
+                     "/"))
+      return TALER_FAKEBANK_twg_get_root_ (h,
+                                           connection);
+  }
+  else if (0 == strcasecmp (method,
+                            MHD_HTTP_METHOD_POST))
+  {
+    if ( (0 == strcmp (url,
+                       "/admin/add-incoming")) &&
+         (NULL != account) )
+      return TALER_FAKEBANK_twg_admin_add_incoming_ (h,
+                                                     connection,
+                                                     account,
+                                                     upload_data,
+                                                     upload_data_size,
+                                                     con_cls);
+    if ( (0 == strcmp (url,
+                       "/transfer")) &&
+         (NULL != account) )
+      return TALER_FAKEBANK_handle_transfer_ (h,
+                                              connection,
+                                              account,
+                                              upload_data,
+                                              upload_data_size,
+                                              con_cls);
+  }
+  /* Unexpected URL path, just close the connection. */
+  TALER_LOG_ERROR ("Breaking URL: %s %s\n",
+                   method,
+                   url);
+  GNUNET_break_op (0);
+  return TALER_MHD_reply_with_error (
+    connection,
+    MHD_HTTP_NOT_FOUND,
+    TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+    url);
+}
diff --git a/src/bank-lib/fakebank_twg.h b/src/bank-lib/fakebank_twg.h
new file mode 100644
index 000000000..de808a21f
--- /dev/null
+++ b/src/bank-lib/fakebank_twg.h
@@ -0,0 +1,56 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg.h
+ * @brief main entry point for the Taler Wire Gateway API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TWG_H
+#define FAKEBANK_TWG_H
+
+#include "taler_fakebank_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+
+
+/**
+ * Handle incoming HTTP request to the Taler Wire Gateway
+ * API.
+ *
+ * @param h our handle
+ * @param connection the connection
+ * @param url the requested url
+ * @param method the method (POST, GET, ...)
+ * @param account which account should process the request
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_main_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *url,
+  const char *method,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_twg_admin_add_incoming.c b/src/bank-lib/fakebank_twg_admin_add_incoming.c
new file mode 100644
index 000000000..2db4f1fe5
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_admin_add_incoming.c
@@ -0,0 +1,160 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_admin_add_incoming.c
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_make_admin_transfer.h"
+#include "fakebank_twg_admin_add_incoming.h"
+
+MHD_RESULT
+TALER_FAKEBANK_twg_admin_add_incoming_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  enum GNUNET_JSON_PostResult pr;
+  json_t *json;
+  uint64_t row_id;
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &GNUNET_JSON_post_parser_cleanup;
+    *con_cls = cc;
+  }
+  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
+                                connection,
+                                &cc->ctx,
+                                upload_data,
+                                upload_data_size,
+                                &json);
+  switch (pr)
+  {
+  case GNUNET_JSON_PR_OUT_OF_MEMORY:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_CONTINUE:
+    return MHD_YES;
+  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_JSON_INVALID:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_SUCCESS:
+    break;
+  }
+  {
+    const char *debit_account;
+    struct TALER_Amount amount;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    char *debit;
+    enum GNUNET_GenericReturnValue ret;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                   &reserve_pub),
+      GNUNET_JSON_spec_string ("debit_account",
+                               &debit_account),
+      TALER_JSON_spec_amount ("amount",
+                              h->currency,
+                              &amount),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        (ret = TALER_MHD_parse_json_data (connection,
+                                          json,
+                                          spec)))
+    {
+      GNUNET_break_op (0);
+      json_decref (json);
+      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
+    }
+    if (0 != strcasecmp (amount.currency,
+                         h->currency))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Currency `%s' does not match our configuration\n",
+                  amount.currency);
+      json_decref (json);
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_CONFLICT,
+        TALER_EC_GENERIC_CURRENCY_MISMATCH,
+        NULL);
+    }
+    debit = TALER_xtalerbank_account_from_payto (debit_account);
+    if (NULL == debit)
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_BAD_REQUEST,
+        TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
+        debit_account);
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Receiving incoming wire transfer: %s->%s, subject: %s, amount: %s\n",
+                debit,
+                account,
+                TALER_B2S (&reserve_pub),
+                TALER_amount2s (&amount));
+    ret = TALER_FAKEBANK_make_admin_transfer_ (h,
+                                               debit,
+                                               account,
+                                               &amount,
+                                               &reserve_pub,
+                                               &row_id,
+                                               &timestamp);
+    GNUNET_free (debit);
+    if (GNUNET_OK != ret)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Reserve public key not unique\n");
+      json_decref (json);
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_CONFLICT,
+        TALER_EC_BANK_DUPLICATE_RESERVE_PUB_SUBJECT,
+        NULL);
+    }
+  }
+  json_decref (json);
+
+  /* Finally build response object */
+  return TALER_MHD_REPLY_JSON_PACK (connection,
+                                    MHD_HTTP_OK,
+                                    GNUNET_JSON_pack_uint64 ("row_id",
+                                                             row_id),
+                                    GNUNET_JSON_pack_timestamp ("timestamp",
+                                                                timestamp));
+}
diff --git a/src/bank-lib/fakebank_twg_admin_add_incoming.h b/src/bank-lib/fakebank_twg_admin_add_incoming.h
new file mode 100644
index 000000000..220a10fc8
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_admin_add_incoming.h
@@ -0,0 +1,52 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_admin_add_incoming.h
+ * @brief library that fakes being a Taler bank for testcases
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TWG_ADMIN_ADD_INCOMING_H
+#define FAKEBANK_TWG_ADMIN_ADD_INCOMING_H
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+/**
+ * Handle incoming HTTP request for /admin/add/incoming.
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account account into which to deposit the funds (credit)
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request (a `struct ConnectionContext *`)
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_admin_add_incoming_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/fakebank_twg_get_root.c b/src/bank-lib/fakebank_twg_get_root.c
new file mode 100644
index 000000000..09589890e
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_get_root.c
@@ -0,0 +1,58 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_get_root.c
+ * @brief return the "/" page for the taler wire gateway
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for "/" (home page).
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_get_root_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection)
+{
+  MHD_RESULT ret;
+  struct MHD_Response *resp;
+#define HELLOMSG "Hello, Fakebank (Taler Wire Gateway)!"
+
+  (void) h;
+  resp = MHD_create_response_from_buffer (
+    strlen (HELLOMSG),
+    HELLOMSG,
+    MHD_RESPMEM_MUST_COPY);
+  ret = MHD_queue_response (connection,
+                            MHD_HTTP_OK,
+                            resp);
+  MHD_destroy_response (resp);
+  return ret;
+}
diff --git a/src/bank-lib/fakebank_twg_get_root.h b/src/bank-lib/fakebank_twg_get_root.h
new file mode 100644
index 000000000..8bbcf4192
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_get_root.h
@@ -0,0 +1,46 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_get_root.h
+ * @brief return the "/" page for the taler wire gateway
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TWG_GET_ROOT_H
+#define FAKEBANK_TWG_GET_ROOT_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for "/" (home page).
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_get_root_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection);
+
+#endif
diff --git a/src/bank-lib/fakebank_twg_history.c b/src/bank-lib/fakebank_twg_history.c
new file mode 100644
index 000000000..5dfc160b0
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_history.c
@@ -0,0 +1,537 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_history.c
+ * @brief routines to return account histories for the Taler Wire Gateway API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include <pthread.h>
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_lookup.h"
+#include "fakebank_common_lp.h"
+#include "fakebank_common_parser.h"
+
+/**
+ * Function called to clean up a history context.
+ *
+ * @param cls a `struct HistoryContext *`
+ */
+static void
+history_cleanup (void *cls)
+{
+  struct HistoryContext *hc = cls;
+
+  json_decref (hc->history);
+  GNUNET_free (hc);
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_twg_get_debit_history_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  struct HistoryContext *hc;
+  struct Transaction *pos;
+  enum GNUNET_GenericReturnValue ret;
+  bool in_shutdown;
+  const char *acc_payto_uri;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &history_cleanup;
+    *con_cls = cc;
+    hc = GNUNET_new (struct HistoryContext);
+    cc->ctx = hc;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Handling /history/outgoing connection %p\n",
+                connection);
+    if (GNUNET_OK !=
+        (ret = TALER_FAKEBANK_common_parse_history_args (h,
+                                                         connection,
+                                                         &hc->ha)))
+    {
+      GNUNET_break_op (0);
+      return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
+    }
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+    if (UINT64_MAX == hc->ha.start_idx)
+      hc->ha.start_idx = h->serial_counter;
+    hc->acc = TALER_FAKEBANK_lookup_account_ (h,
+                                              account,
+                                              NULL);
+    if (NULL == hc->acc)
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                         account);
+    }
+    hc->history = json_array ();
+    if (NULL == hc->history)
+    {
+      GNUNET_break (0);
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return MHD_NO;
+    }
+    hc->timeout = GNUNET_TIME_relative_to_absolute (hc->ha.lp_timeout);
+  }
+  else
+  {
+    hc = cc->ctx;
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+  }
+
+  if (! hc->ha.have_start)
+  {
+    pos = (0 > hc->ha.delta)
+      ? hc->acc->out_tail
+      : hc->acc->out_head;
+  }
+  else
+  {
+    struct Transaction *t = h->transactions[hc->ha.start_idx % h->ram_limit];
+    bool overflow;
+    uint64_t dir;
+    bool skip = true;
+
+    dir = (0 > hc->ha.delta) ? (h->ram_limit - 1) : 1;
+    overflow = (t->row_id != hc->ha.start_idx);
+    /* If account does not match, linear scan for
+       first matching account. */
+    while ( (! overflow) &&
+            (NULL != t) &&
+            (t->debit_account != hc->acc) )
+    {
+      skip = false;
+      t = h->transactions[(t->row_id + dir) % h->ram_limit];
+      if ( (NULL != t) &&
+           (t->row_id == hc->ha.start_idx) )
+        overflow = true; /* full circle, give up! */
+    }
+    if ( (NULL == t) ||
+         overflow)
+    {
+      /* FIXME: these conditions are unclear to me. */
+      if ( (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout)) &&
+           (0 < hc->ha.delta))
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        in_shutdown = h->in_shutdown;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        if (overflow)
+        {
+          return TALER_MHD_reply_with_ec (
+            connection,
+            TALER_EC_BANK_ANCIENT_TRANSACTION_GONE,
+            NULL);
+        }
+        goto finish;
+      }
+      if (h->in_shutdown)
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        in_shutdown = h->in_shutdown;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        goto finish;
+      }
+      TALER_FAKEBANK_start_lp_ (h,
+                                connection,
+                                hc->acc,
+                                GNUNET_TIME_absolute_get_remaining (
+                                  hc->timeout),
+                                LP_DEBIT,
+                                NULL);
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return MHD_YES;
+    }
+    if (t->debit_account != hc->acc)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Invalid start specified, transaction %llu not with account %s!\n",
+                  (unsigned long long) hc->ha.start_idx,
+                  account);
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return MHD_NO;
+    }
+    if (skip)
+    {
+      /* range is exclusive, skip the matching entry */
+      if (0 > hc->ha.delta)
+        pos = t->prev_out;
+      else
+        pos = t->next_out;
+    }
+    else
+    {
+      pos = t;
+    }
+  }
+  if (NULL != pos)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Returning %lld debit transactions starting (inclusive) from %llu\n",
+                (long long) hc->ha.delta,
+                (unsigned long long) pos->row_id);
+  while ( (0 != hc->ha.delta) &&
+          (NULL != pos) )
+  {
+    json_t *trans;
+    char *credit_payto;
+
+    if (T_DEBIT != pos->type)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Unexpected CREDIT transaction #%llu for account `%s'\n",
+                  (unsigned long long) pos->row_id,
+                  account);
+      if (0 > hc->ha.delta)
+        pos = pos->prev_in;
+      if (0 < hc->ha.delta)
+        pos = pos->next_in;
+      continue;
+    }
+    GNUNET_asprintf (&credit_payto,
+                     "payto://x-taler-bank/localhost/%s?receiver-name=%s",
+                     pos->credit_account->account_name,
+                     pos->credit_account->receiver_name);
+
+    trans = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("row_id",
+                               pos->row_id),
+      GNUNET_JSON_pack_timestamp ("date",
+                                  pos->date),
+      TALER_JSON_pack_amount ("amount",
+                              &pos->amount),
+      GNUNET_JSON_pack_string ("credit_account",
+                               credit_payto),
+      GNUNET_JSON_pack_string ("exchange_base_url",
+                               pos->subject.debit.exchange_base_url),
+      GNUNET_JSON_pack_data_auto ("wtid",
+                                  &pos->subject.debit.wtid));
+    GNUNET_assert (NULL != trans);
+    GNUNET_free (credit_payto);
+    GNUNET_assert (0 ==
+                   json_array_append_new (hc->history,
+                                          trans));
+    if (hc->ha.delta > 0)
+      hc->ha.delta--;
+    else
+      hc->ha.delta++;
+    if (0 > hc->ha.delta)
+      pos = pos->prev_out;
+    if (0 < hc->ha.delta)
+      pos = pos->next_out;
+  }
+  if ( (0 == json_array_size (hc->history)) &&
+       (! h->in_shutdown) &&
+       (GNUNET_TIME_absolute_is_future (hc->timeout)) &&
+       (0 < hc->ha.delta))
+  {
+    TALER_FAKEBANK_start_lp_ (h,
+                              connection,
+                              hc->acc,
+                              GNUNET_TIME_absolute_get_remaining (hc->timeout),
+                              LP_DEBIT,
+                              NULL);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return MHD_YES;
+  }
+  in_shutdown = h->in_shutdown;
+  acc_payto_uri = hc->acc->payto_uri;
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+finish:
+  if (0 == json_array_size (hc->history))
+  {
+    GNUNET_break (in_shutdown ||
+                  (! GNUNET_TIME_absolute_is_future (hc->timeout)));
+    return TALER_MHD_reply_static (connection,
+                                   MHD_HTTP_NO_CONTENT,
+                                   NULL,
+                                   NULL,
+                                   0);
+  }
+  {
+    json_t *h = hc->history;
+
+    hc->history = NULL;
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string (
+        "debit_account",
+        acc_payto_uri),
+      GNUNET_JSON_pack_array_steal (
+        "outgoing_transactions",
+        h));
+  }
+}
+
+
+MHD_RESULT
+TALER_FAKEBANK_twg_get_credit_history_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  struct HistoryContext *hc;
+  const struct Transaction *pos;
+  enum GNUNET_GenericReturnValue ret;
+  bool in_shutdown;
+  const char *acc_payto_uri;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &history_cleanup;
+    *con_cls = cc;
+    hc = GNUNET_new (struct HistoryContext);
+    cc->ctx = hc;
+    hc->history = json_array ();
+    if (NULL == hc->history)
+    {
+      GNUNET_break (0);
+      return MHD_NO;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Handling /history/incoming connection %p\n",
+                connection);
+    if (GNUNET_OK !=
+        (ret = TALER_FAKEBANK_common_parse_history_args (h,
+                                                         connection,
+                                                         &hc->ha)))
+    {
+      GNUNET_break_op (0);
+      return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
+    }
+    hc->timeout = GNUNET_TIME_relative_to_absolute (hc->ha.lp_timeout);
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+    if (UINT64_MAX == hc->ha.start_idx)
+      hc->ha.start_idx = h->serial_counter;
+    hc->acc = TALER_FAKEBANK_lookup_account_ (h,
+                                              account,
+                                              NULL);
+    if (NULL == hc->acc)
+    {
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_BANK_UNKNOWN_ACCOUNT,
+                                         account);
+    }
+  }
+  else
+  {
+    hc = cc->ctx;
+    GNUNET_assert (0 ==
+                   pthread_mutex_lock (&h->big_lock));
+  }
+
+  if (! hc->ha.have_start)
+  {
+    pos = (0 > hc->ha.delta)
+          ? hc->acc->in_tail
+          : hc->acc->in_head;
+  }
+  else
+  {
+    struct Transaction *t = h->transactions[hc->ha.start_idx % h->ram_limit];
+    bool overflow;
+    uint64_t dir;
+    bool skip = true;
+
+    overflow = ( (NULL != t) && (t->row_id != hc->ha.start_idx) );
+    dir = (0 > hc->ha.delta) ? (h->ram_limit - 1) : 1;
+    /* If account does not match, linear scan for
+       first matching account. */
+    while ( (! overflow) &&
+            (NULL != t) &&
+            (t->credit_account != hc->acc) )
+    {
+      skip = false;
+      t = h->transactions[(t->row_id + dir) % h->ram_limit];
+      if ( (NULL != t) &&
+           (t->row_id == hc->ha.start_idx) )
+        overflow = true; /* full circle, give up! */
+    }
+    if ( (NULL == t) ||
+         overflow)
+    {
+      in_shutdown = h->in_shutdown;
+      /* FIXME: these conditions are unclear to me. */
+      if (GNUNET_TIME_relative_is_zero (hc->ha.lp_timeout) &&
+          (0 < hc->ha.delta))
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        if (overflow)
+          return TALER_MHD_reply_with_ec (
+            connection,
+            TALER_EC_BANK_ANCIENT_TRANSACTION_GONE,
+            NULL);
+        goto finish;
+      }
+      if (in_shutdown)
+      {
+        acc_payto_uri = hc->acc->payto_uri;
+        GNUNET_assert (0 ==
+                       pthread_mutex_unlock (&h->big_lock));
+        goto finish;
+      }
+      TALER_FAKEBANK_start_lp_ (h,
+                                connection,
+                                hc->acc,
+                                GNUNET_TIME_absolute_get_remaining (
+                                  hc->timeout),
+                                LP_CREDIT,
+                                NULL);
+      GNUNET_assert (0 ==
+                     pthread_mutex_unlock (&h->big_lock));
+      return MHD_YES;
+    }
+    if (skip)
+    {
+      /* range from application is exclusive, skip the
+  matching entry */
+      if (0 > hc->ha.delta)
+        pos = t->prev_in;
+      else
+        pos = t->next_in;
+    }
+    else
+    {
+      pos = t;
+    }
+  }
+  if (NULL != pos)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Returning %lld credit transactions starting (inclusive) from %llu\n",
+                (long long) hc->ha.delta,
+                (unsigned long long) pos->row_id);
+  while ( (0 != hc->ha.delta) &&
+          (NULL != pos) )
+  {
+    json_t *trans;
+
+    if (T_CREDIT != pos->type)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Unexpected DEBIT transaction #%llu for account `%s'\n",
+                  (unsigned long long) pos->row_id,
+                  account);
+      if (0 > hc->ha.delta)
+        pos = pos->prev_in;
+      if (0 < hc->ha.delta)
+        pos = pos->next_in;
+      continue;
+    }
+    trans = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("row_id",
+                               pos->row_id),
+      GNUNET_JSON_pack_timestamp ("date",
+                                  pos->date),
+      TALER_JSON_pack_amount ("amount",
+                              &pos->amount),
+      GNUNET_JSON_pack_string ("debit_account",
+                               pos->debit_account->payto_uri),
+      GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                  &pos->subject.credit.reserve_pub));
+    GNUNET_assert (NULL != trans);
+    GNUNET_assert (0 ==
+                   json_array_append_new (hc->history,
+                                          trans));
+    if (hc->ha.delta > 0)
+      hc->ha.delta--;
+    else
+      hc->ha.delta++;
+    if (0 > hc->ha.delta)
+      pos = pos->prev_in;
+    if (0 < hc->ha.delta)
+      pos = pos->next_in;
+  }
+  if ( (0 == json_array_size (hc->history)) &&
+       (! h->in_shutdown) &&
+       (GNUNET_TIME_absolute_is_future (hc->timeout)) &&
+       (0 < hc->ha.delta))
+  {
+    TALER_FAKEBANK_start_lp_ (h,
+                              connection,
+                              hc->acc,
+                              GNUNET_TIME_absolute_get_remaining (hc->timeout),
+                              LP_CREDIT,
+                              NULL);
+    GNUNET_assert (0 ==
+                   pthread_mutex_unlock (&h->big_lock));
+    return MHD_YES;
+  }
+  in_shutdown = h->in_shutdown;
+  acc_payto_uri = hc->acc->payto_uri;
+  GNUNET_assert (0 ==
+                 pthread_mutex_unlock (&h->big_lock));
+finish:
+  if (0 == json_array_size (hc->history))
+  {
+    GNUNET_break (in_shutdown ||
+                  (! GNUNET_TIME_absolute_is_future (hc->timeout)));
+    return TALER_MHD_reply_static (connection,
+                                   MHD_HTTP_NO_CONTENT,
+                                   NULL,
+                                   NULL,
+                                   0);
+  }
+  {
+    json_t *h = hc->history;
+
+    hc->history = NULL;
+    return TALER_MHD_REPLY_JSON_PACK (
+      connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_string (
+        "credit_account",
+        acc_payto_uri),
+      GNUNET_JSON_pack_array_steal (
+        "incoming_transactions",
+        h));
+  }
+}
diff --git a/src/bank-lib/fakebank_twg_history.h b/src/bank-lib/fakebank_twg_history.h
new file mode 100644
index 000000000..c49678aef
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_history.h
@@ -0,0 +1,67 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_history.c
+ * @brief routines to return account histories for the Taler Wire Gateway API
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TWG_HISTORY_H
+#define FAKEBANK_TWG_HISTORY_H
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for /history/outgoing
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account which account the request is about
+ * @param con_cls closure for request
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_get_debit_history_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls);
+
+
+/**
+ * Handle incoming HTTP request for /history/incoming
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account which account the request is about
+ * @param con_cls closure for request (NULL or &special_ptr)
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_twg_get_credit_history_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  void **con_cls);
+
+
+#endif
diff --git a/src/bank-lib/fakebank_twg_transfer.c b/src/bank-lib/fakebank_twg_transfer.c
new file mode 100644
index 000000000..fef314a52
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_transfer.c
@@ -0,0 +1,178 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_transfer.c
+ * @brief implementation of the Taler Wire Gateway "/transfer" endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#include "platform.h"
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+#include "fakebank_common_transact.h"
+#include "fakebank_twg_transfer.h"
+
+
+/**
+ * Handle incoming HTTP request for /transfer.
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account account making the transfer
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request (a `struct ConnectionContext *`)
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_handle_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls)
+{
+  struct ConnectionContext *cc = *con_cls;
+  enum GNUNET_JSON_PostResult pr;
+  json_t *json;
+  uint64_t row_id;
+  struct GNUNET_TIME_Timestamp ts;
+
+  if (NULL == cc)
+  {
+    cc = GNUNET_new (struct ConnectionContext);
+    cc->ctx_cleaner = &GNUNET_JSON_post_parser_cleanup;
+    *con_cls = cc;
+  }
+  pr = GNUNET_JSON_post_parser (REQUEST_BUFFER_MAX,
+                                connection,
+                                &cc->ctx,
+                                upload_data,
+                                upload_data_size,
+                                &json);
+  switch (pr)
+  {
+  case GNUNET_JSON_PR_OUT_OF_MEMORY:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_CONTINUE:
+    return MHD_YES;
+  case GNUNET_JSON_PR_REQUEST_TOO_LARGE:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_JSON_INVALID:
+    GNUNET_break (0);
+    return MHD_NO;
+  case GNUNET_JSON_PR_SUCCESS:
+    break;
+  }
+  {
+    struct GNUNET_HashCode uuid;
+    struct TALER_WireTransferIdentifierRawP wtid;
+    const char *credit_account;
+    char *credit;
+    const char *base_url;
+    struct TALER_Amount amount;
+    enum GNUNET_GenericReturnValue ret;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto ("request_uid",
+                                   &uuid),
+      TALER_JSON_spec_amount ("amount",
+                              h->currency,
+                              &amount),
+      GNUNET_JSON_spec_string ("exchange_base_url",
+                               &base_url),
+      GNUNET_JSON_spec_fixed_auto ("wtid",
+                                   &wtid),
+      GNUNET_JSON_spec_string ("credit_account",
+                               &credit_account),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        (ret = TALER_MHD_parse_json_data (connection,
+                                          json,
+                                          spec)))
+    {
+      GNUNET_break_op (0);
+      json_decref (json);
+      return (GNUNET_NO == ret) ? MHD_YES : MHD_NO;
+    }
+    {
+      enum GNUNET_GenericReturnValue ret;
+
+      credit = TALER_xtalerbank_account_from_payto (credit_account);
+      if (NULL == credit)
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_BAD_REQUEST,
+          TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
+          credit_account);
+      }
+      ret = TALER_FAKEBANK_make_transfer_ (h,
+                                           account,
+                                           credit,
+                                           &amount,
+                                           &wtid,
+                                           base_url,
+                                           &uuid,
+                                           &row_id,
+                                           &ts);
+      if (GNUNET_OK != ret)
+      {
+        MHD_RESULT res;
+        char *uids;
+
+        GNUNET_break (0);
+        uids = GNUNET_STRINGS_data_to_string_alloc (&uuid,
+                                                    sizeof (uuid));
+        json_decref (json);
+        res = TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_CONFLICT,
+                                          TALER_EC_BANK_TRANSFER_REQUEST_UID_REUSED,
+                                          uids);
+        GNUNET_free (uids);
+        return res;
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Receiving incoming wire transfer: %s->%s, subject: %s, amount: %s, from %s\n",
+                  account,
+                  credit,
+                  TALER_B2S (&wtid),
+                  TALER_amount2s (&amount),
+                  base_url);
+      GNUNET_free (credit);
+    }
+  }
+  json_decref (json);
+
+  /* Finally build response object */
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_uint64 ("row_id",
+                             row_id),
+    GNUNET_JSON_pack_timestamp ("timestamp",
+                                ts));
+}
diff --git a/src/bank-lib/fakebank_twg_transfer.h b/src/bank-lib/fakebank_twg_transfer.h
new file mode 100644
index 000000000..2019565bf
--- /dev/null
+++ b/src/bank-lib/fakebank_twg_transfer.h
@@ -0,0 +1,55 @@
+/*
+  This file is part of TALER
+  (C) 2016-2023 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/>
+*/
+/**
+ * @file bank-lib/fakebank_twg_transfer.h
+ * @brief implementation of the Taler Wire Gateway "/transfer" endpoint
+ * @author Christian Grothoff <christian@grothoff.org>
+ */
+#ifndef FAKEBANK_TWG_TRANSFER_H
+#define FAKEBANK_TWG_TRANSFER_H
+
+
+#include "taler_fakebank_lib.h"
+#include "taler_bank_service.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "fakebank.h"
+
+
+/**
+ * Handle incoming HTTP request for /transfer.
+ *
+ * @param h the fakebank handle
+ * @param connection the connection
+ * @param account account making the transfer
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request (a `struct ConnectionContext *`)
+ * @return MHD result code
+ */
+MHD_RESULT
+TALER_FAKEBANK_handle_transfer_ (
+  struct TALER_FAKEBANK_Handle *h,
+  struct MHD_Connection *connection,
+  const char *account,
+  const char *upload_data,
+  size_t *upload_data_size,
+  void **con_cls);
+
+#endif
diff --git a/src/bank-lib/taler-exchange-wire-gateway-client.c b/src/bank-lib/taler-exchange-wire-gateway-client.c
index ab16573a7..b0d387b71 100644
--- a/src/bank-lib/taler-exchange-wire-gateway-client.c
+++ b/src/bank-lib/taler-exchange-wire-gateway-client.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2021 Taler Systems SA
+  Copyright (C) 2017-2023 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
@@ -152,83 +152,72 @@ do_shutdown (void *cls)
 
 
 /**
- * Callback used to process ONE entry in the transaction
+ * Callback used to process the transaction
  * history returned by the bank.
  *
  * @param cls closure
- * @param http_status HTTP status code from server
- * @param ec taler error code
- * @param serial_id identification of the position at
- *        which we are returning data
- * @param details details about the wire transfer
- * @param json original full response from server
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to
- *         abort iteration
+ * @param reply response we got from the bank
  */
-static enum GNUNET_GenericReturnValue
+static void
 credit_history_cb (void *cls,
-                   unsigned int http_status,
-                   enum TALER_ErrorCode ec,
-                   uint64_t serial_id,
-                   const struct TALER_BANK_CreditDetails *details,
-                   const json_t *json)
+                   const struct TALER_BANK_CreditHistoryResponse *reply)
 {
   (void) cls;
 
   chh = NULL;
-  if (MHD_HTTP_OK != http_status)
+  switch (reply->http_status)
   {
-    if ( (MHD_HTTP_NO_CONTENT != http_status) ||
-         (TALER_EC_NONE != ec) )
+  case 0:
+    fprintf (stderr,
+             "Failed to obtain HTTP reply from `%s'\n",
+             auth.wire_gateway_url);
+    global_ret = 2;
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    fprintf (stdout,
+             "No transactions.\n");
+    global_ret = 0;
+    break;
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<reply->details.ok.details_length; i++)
     {
-      if (0 == http_status)
-      {
-        fprintf (stderr,
-                 "Failed to obtain HTTP reply from `%s'\n",
-                 auth.wire_gateway_url);
-      }
-      else
-      {
-        fprintf (stderr,
-                 "Failed to obtain credit history from `%s': HTTP status %u (%s)\n",
-                 auth.wire_gateway_url,
-                 http_status,
-                 TALER_ErrorCode_get_hint (ec));
-      }
-      if (NULL != json)
-        json_dumpf (json,
-                    stderr,
-                    JSON_INDENT (2));
-      global_ret = 2;
-      GNUNET_SCHEDULER_shutdown ();
-      return GNUNET_NO;
+      const struct TALER_BANK_CreditDetails *cd =
+        &reply->details.ok.details[i];
+
+      /* If credit/debit accounts were specified, use as a filter */
+      if ( (NULL != credit_account) &&
+           (0 != strcasecmp (credit_account,
+                             reply->details.ok.credit_account_uri) ) )
+        continue;
+      if ( (NULL != debit_account) &&
+           (0 != strcasecmp (debit_account,
+                             cd->debit_account_uri) ) )
+        continue;
+      fprintf (stdout,
+               "%llu: %s->%s (%s) over %s at %s\n",
+               (unsigned long long) cd->serial_id,
+               cd->debit_account_uri,
+               reply->details.ok.credit_account_uri,
+               TALER_B2S (&cd->reserve_pub),
+               TALER_amount2s (&cd->amount),
+               GNUNET_TIME_timestamp2s (cd->execution_date));
     }
-    fprintf (stdout,
-             "End of transactions list.\n");
     global_ret = 0;
-    GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_NO;
+    break;
+  default:
+    fprintf (stderr,
+             "Failed to obtain credit history from `%s': HTTP status %u (%s)\n",
+             auth.wire_gateway_url,
+             reply->http_status,
+             TALER_ErrorCode_get_hint (reply->ec));
+    if (NULL != reply->response)
+      json_dumpf (reply->response,
+                  stderr,
+                  JSON_INDENT (2));
+    global_ret = 2;
+    break;
   }
-
-  /* If credit/debit accounts were specified, use as a filter */
-  if ( (NULL != credit_account) &&
-       (0 != strcasecmp (credit_account,
-                         details->credit_account_uri) ) )
-    return GNUNET_OK;
-  if ( (NULL != debit_account) &&
-       (0 != strcasecmp (debit_account,
-                         details->debit_account_uri) ) )
-    return GNUNET_OK;
-
-  fprintf (stdout,
-           "%llu: %s->%s (%s) over %s at %s\n",
-           (unsigned long long) serial_id,
-           details->debit_account_uri,
-           details->credit_account_uri,
-           TALER_B2S (&details->reserve_pub),
-           TALER_amount2s (&details->amount),
-           GNUNET_TIME_timestamp2s (details->execution_date));
-  return GNUNET_OK;
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -264,84 +253,71 @@ execute_credit_history (void)
 
 
 /**
- * Function with the debit debit transaction history.
+ * Function with the debit transaction history.
  *
  * @param cls closure
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
- *                    0 if the bank's reply is bogus (fails to follow the protocol),
- *                    #MHD_HTTP_NO_CONTENT if there are no more results; on success the
- *                    last callback is always of this status (even if `abs(num_results)` were
- *                    already returned).
- * @param ec detailed error code
- * @param serial_id monotonically increasing counter corresponding to the transaction
- * @param details details about the wire transfer
- * @param json detailed response from the HTTPD, or NULL if reply was not in JSON
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
+ * @param reply response details
  */
-static enum GNUNET_GenericReturnValue
+static void
 debit_history_cb (void *cls,
-                  unsigned int http_status,
-                  enum TALER_ErrorCode ec,
-                  uint64_t serial_id,
-                  const struct TALER_BANK_DebitDetails *details,
-                  const json_t *json)
+                  const struct TALER_BANK_DebitHistoryResponse *reply)
 {
   (void) cls;
 
   dhh = NULL;
-  if (MHD_HTTP_OK != http_status)
+  switch (reply->http_status)
   {
-    if ( (MHD_HTTP_NO_CONTENT != http_status) ||
-         (TALER_EC_NONE != ec) )
+  case 0:
+    fprintf (stderr,
+             "Failed to obtain HTTP reply from `%s'\n",
+             auth.wire_gateway_url);
+    global_ret = 2;
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    fprintf (stdout,
+             "No transactions.\n");
+    global_ret = 0;
+    break;
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<reply->details.ok.details_length; i++)
     {
-      if (0 == http_status)
-      {
-        fprintf (stderr,
-                 "Failed to obtain HTTP reply from `%s'\n",
-                 auth.wire_gateway_url);
-      }
-      else
-      {
-        fprintf (stderr,
-                 "Failed to obtain debit history from `%s': HTTP status %u (%s)\n",
-                 auth.wire_gateway_url,
-                 http_status,
-                 TALER_ErrorCode_get_hint (ec));
-      }
-      if (NULL != json)
-        json_dumpf (json,
-                    stderr,
-                    JSON_INDENT (2));
-      global_ret = 2;
-      GNUNET_SCHEDULER_shutdown ();
-      return GNUNET_NO;
+      const struct TALER_BANK_DebitDetails *dd =
+        &reply->details.ok.details[i];
+
+      /* If credit/debit accounts were specified, use as a filter */
+      if ( (NULL != credit_account) &&
+           (0 != strcasecmp (credit_account,
+                             dd->credit_account_uri) ) )
+        continue;
+      if ( (NULL != debit_account) &&
+           (0 != strcasecmp (debit_account,
+                             reply->details.ok.debit_account_uri) ) )
+        continue;
+      fprintf (stdout,
+               "%llu: %s->%s (%s) over %s at %s\n",
+               (unsigned long long) dd->serial_id,
+               reply->details.ok.debit_account_uri,
+               dd->credit_account_uri,
+               TALER_B2S (&dd->wtid),
+               TALER_amount2s (&dd->amount),
+               GNUNET_TIME_timestamp2s (dd->execution_date));
     }
-    fprintf (stdout,
-             "End of transactions list.\n");
     global_ret = 0;
-    GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_NO;
+    break;
+  default:
+    fprintf (stderr,
+             "Failed to obtain debit history from `%s': HTTP status %u (%s)\n",
+             auth.wire_gateway_url,
+             reply->http_status,
+             TALER_ErrorCode_get_hint (reply->ec));
+    if (NULL != reply->response)
+      json_dumpf (reply->response,
+                  stderr,
+                  JSON_INDENT (2));
+    global_ret = 2;
+    break;
   }
-
-  /* If credit/debit accounts were specified, use as a filter */
-  if ( (NULL != credit_account) &&
-       (0 != strcasecmp (credit_account,
-                         details->credit_account_uri) ) )
-    return GNUNET_OK;
-  if ( (NULL != debit_account) &&
-       (0 != strcasecmp (debit_account,
-                         details->debit_account_uri) ) )
-    return GNUNET_OK;
-
-  fprintf (stdout,
-           "%llu: %s->%s (%s) over %s at %s\n",
-           (unsigned long long) serial_id,
-           details->debit_account_uri,
-           details->credit_account_uri,
-           TALER_B2S (&details->wtid),
-           TALER_amount2s (&details->amount),
-           GNUNET_TIME_timestamp2s (details->execution_date));
-  return GNUNET_OK;
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -381,34 +357,28 @@ execute_debit_history (void)
  * execution.
  *
  * @param cls closure
- * @param response_code HTTP status code
- * @param ec taler error code
- * @param row_id unique ID of the wire transfer in the bank's records
- * @param timestamp when did the transaction go into effect
+ * @param tr response details
  */
 static void
 confirmation_cb (void *cls,
-                 unsigned int response_code,
-                 enum TALER_ErrorCode ec,
-                 uint64_t row_id,
-                 struct GNUNET_TIME_Timestamp timestamp)
+                 const struct TALER_BANK_TransferResponse *tr)
 {
   (void) cls;
   eh = NULL;
-  if (MHD_HTTP_OK != response_code)
+  if (MHD_HTTP_OK != tr->http_status)
   {
     fprintf (stderr,
              "The wire transfer didn't execute correctly (%u/%d).\n",
-             response_code,
-             ec);
+             tr->http_status,
+             tr->ec);
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
   fprintf (stdout,
            "Wire transfer #%llu executed successfully at %s.\n",
-           (unsigned long long) row_id,
-           GNUNET_TIME_timestamp2s (timestamp));
+           (unsigned long long) tr->details.ok.row_id,
+           GNUNET_TIME_timestamp2s (tr->details.ok.timestamp));
   global_ret = 0;
   GNUNET_SCHEDULER_shutdown ();
 }
@@ -488,39 +458,29 @@ execute_wire_transfer (void)
  * Function called with the result of the operation.
  *
  * @param cls closure
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
- *                    0 if the bank's reply is bogus (fails to follow the protocol)
- * @param ec detailed error code
- * @param serial_id unique ID of the wire transfer in the bank's records; UINT64_MAX on error
- * @param timestamp timestamp when the transaction got settled at the bank.
- * @param json detailed response from the HTTPD, or NULL if reply was not in JSON
+ * @param air response details
  */
 static void
 res_cb (void *cls,
-        unsigned int http_status,
-        enum TALER_ErrorCode ec,
-        uint64_t serial_id,
-        struct GNUNET_TIME_Timestamp timestamp,
-        const json_t *json)
+        const struct TALER_BANK_AdminAddIncomingResponse *air)
 {
   (void) cls;
-  (void) timestamp;
   op = NULL;
-  switch (ec)
+  switch (air->http_status)
   {
-  case TALER_EC_NONE:
+  case MHD_HTTP_OK:
     global_ret = 0;
     fprintf (stdout,
              "%llu\n",
-             (unsigned long long) serial_id);
+             (unsigned long long) air->details.ok.serial_id);
     break;
   default:
     fprintf (stderr,
              "Operation failed with status code %u/%u\n",
-             (unsigned int) ec,
-             http_status);
-    if (NULL != json)
-      json_dumpf (json,
+             (unsigned int) air->ec,
+             air->http_status);
+    if (NULL != air->response)
+      json_dumpf (air->response,
                   stderr,
                   JSON_INDENT (2));
     break;
diff --git a/src/bank-lib/taler-fakebank-run.c b/src/bank-lib/taler-fakebank-run.c
index 4e3706071..c15145ecb 100644
--- a/src/bank-lib/taler-fakebank-run.c
+++ b/src/bank-lib/taler-fakebank-run.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016, 2017 Taler Systems SA
+  Copyright (C) 2016-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
@@ -52,6 +52,10 @@ static struct TALER_FAKEBANK_Handle *fb;
  */
 static struct GNUNET_SCHEDULER_Task *keepalive;
 
+/**
+ * Amount to credit an account with on /register.
+ */
+static struct TALER_Amount signup_bonus;
 
 /**
  * Stop the process.
@@ -103,6 +107,8 @@ run (void *cls,
   unsigned long long port = 8082;
   unsigned long long ram = 1024 * 128; /* 128 k entries */
   char *currency_string;
+  char *hostname;
+  char *exchange_url;
 
   (void) cls;
   (void) args;
@@ -125,6 +131,23 @@ run (void *cls,
                 port);
   }
   if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "bank",
+                                             "SUGGESTED_EXCHANGE",
+                                             &exchange_url))
+  {
+    /* no suggested exchange */
+    exchange_url = NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "bank",
+                                             "HOSTNAME",
+                                             &hostname))
+  {
+    hostname = GNUNET_strdup ("localhost");
+  }
+  if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg,
                                              "bank",
                                              "RAM_LIMIT",
@@ -142,17 +165,37 @@ run (void *cls,
       go |= TALER_MHD_GO_FORCE_CONNECTION_CLOSE;
     TALER_MHD_setup (go);
   }
-  fb = TALER_FAKEBANK_start2 ((uint16_t) port,
+  if (GNUNET_OK !=
+      TALER_amount_is_valid (&signup_bonus))
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (currency_string,
+                                          &signup_bonus));
+  }
+  if (0 != strcmp (currency_string,
+                   signup_bonus.currency))
+  {
+    fprintf (stderr,
+             "Signup bonus and main currency do not match\n");
+    ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  fb = TALER_FAKEBANK_start3 (hostname,
+                              (uint16_t) port,
+                              exchange_url,
                               currency_string,
                               ram,
-                              num_threads);
+                              num_threads,
+                              &signup_bonus);
+  GNUNET_free (hostname);
+  GNUNET_free (exchange_url);
+  GNUNET_free (currency_string);
   if (NULL == fb)
   {
     GNUNET_break (0);
     ret = EXIT_FAILURE;
     return;
   }
-  GNUNET_free (currency_string);
   keepalive = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                             &keepalive_task,
                                             NULL);
@@ -183,6 +226,11 @@ main (int argc,
                                "NUM_THREADS",
                                "size of the thread pool",
                                &num_threads),
+    TALER_getopt_get_amount ('s',
+                             "signup-bonus",
+                             "AMOUNT",
+                             "amount to credit newly registered account (created out of thin air)",
+                             &signup_bonus),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue iret;
diff --git a/src/bank-lib/test_bank.sh b/src/bank-lib/test_bank.sh
index 46be326b4..5ee2bd836 100755
--- a/src/bank-lib/test_bank.sh
+++ b/src/bank-lib/test_bank.sh
@@ -1,19 +1,20 @@
 #!/bin/bash
-
+# This file is in the public domain.
+# shellcheck disable=SC2317
 set -eu
 
 # Exit, with status code "skip" (no 'real' failure)
 function exit_skip() {
-    echo $1
+    echo "$1"
     exit 77
 }
 
 # Cleanup to run whenever we exit
 function cleanup()
 {
-    for n in `jobs -p`
+    for n in $(jobs -p)
     do
-        kill $n 2> /dev/null || true
+        kill "$n" 2> /dev/null || true
     done
     wait
 }
@@ -23,21 +24,30 @@ trap cleanup EXIT
 
 echo -n "Launching bank..."
 
-taler-fakebank-run -c test_bank.conf -L DEBUG &> bank.log &
+taler-fakebank-run \
+    -c test_bank.conf \
+    -L DEBUG &> bank.log &
 
 # Wait for bank to be available (usually the slowest)
-for n in `seq 1 50`
+for n in $(seq 1 50)
 do
     echo -n "."
     sleep 0.2
     OK=0
     # bank
-    wget --tries=1 --timeout=1 http://localhost:8899/ -o /dev/null -O /dev/null >/dev/null || continue
+    wget \
+        --tries=1 \
+        --timeout=1 \
+        http://localhost:8899/ \
+        -o /dev/null \
+        -O /dev/null \
+        >/dev/null \
+        || continue
     OK=1
     break
 done
 
-if [ 1 != $OK ]
+if [ 1 != "$OK" ]
 then
     exit_skip "Failed to launch services (bank)"
 fi
@@ -47,31 +57,40 @@ echo "OK"
 echo -n "Making wire transfer to exchange ..."
 
 taler-exchange-wire-gateway-client \
-    -b http://localhost:8899/exchange/ \
+    -b http://localhost:8899/accounts/exchange/taler-wire-gateway/ \
     -S 0ZSX8SH0M30KHX8K3Y1DAMVGDQV82XEF9DG1HC4QMQ3QWYT4AF00 \
-    -D payto://x-taler-bank/localhost:8899/user \
+    -D payto://x-taler-bank/localhost:8899/user?receiver-name=user \
     -a TESTKUDOS:4 > /dev/null
 echo " OK"
 
 echo -n "Requesting exchange incoming transaction list ..."
 
-./taler-exchange-wire-gateway-client -b http://localhost:8899/exchange/ -i | grep TESTKUDOS:4 > /dev/null
+./taler-exchange-wire-gateway-client \
+    -b http://localhost:8899/accounts/exchange/taler-wire-gateway/ \
+    -i \
+    | grep TESTKUDOS:4 \
+    > /dev/null
 
 echo " OK"
 
 echo -n "Making wire transfer from exchange..."
 
 ./taler-exchange-wire-gateway-client \
-    -b http://localhost:8899/exchange/ \
+    -b http://localhost:8899/accounts/exchange/taler-wire-gateway/ \
     -S 0ZSX8SH0M30KHX8K3Y1DAMVGDQV82XEF9DG1HC4QMQ3QWYT4AF00 \
-    -C payto://x-taler-bank/localhost:8899/merchant \
-    -a TESTKUDOS:2 > /dev/null
+    -C payto://x-taler-bank/localhost:8899/merchant?receiver-name=merchant \
+    -a TESTKUDOS:2 \
+    -L DEBUG > /dev/null
 echo " OK"
 
 
 echo -n "Requesting exchange's outgoing transaction list..."
 
-./taler-exchange-wire-gateway-client -b http://localhost:8899/exchange/ -o | grep TESTKUDOS:2 > /dev/null
+./taler-exchange-wire-gateway-client \
+    -b http://localhost:8899/accounts/exchange/taler-wire-gateway/ \
+    -o \
+    | grep TESTKUDOS:2 \
+    > /dev/null
 
 echo " OK"
 
diff --git a/src/benchmark/.gitignore b/src/benchmark/.gitignore
index 45e150087..a1b4711e7 100644
--- a/src/benchmark/.gitignore
+++ b/src/benchmark/.gitignore
@@ -1,2 +1,3 @@
 taler-bank-benchmark
 taler-aggregator-benchmark
+*.edited
diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am
index 2b569c27a..c82584626 100644
--- a/src/benchmark/Makefile.am
+++ b/src/benchmark/Makefile.am
@@ -15,6 +15,7 @@ bin_PROGRAMS = \
   taler-bank-benchmark \
   taler-exchange-benchmark
 
+
 taler_aggregator_benchmark_SOURCES = \
   taler-aggregator-benchmark.c
 taler_aggregator_benchmark_LDADD = \
@@ -32,6 +33,7 @@ taler_bank_benchmark_SOURCES = \
 taler_bank_benchmark_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/testing/libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/bank-lib/libtalerfakebank.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
@@ -63,5 +65,10 @@ taler_exchange_benchmark_LDADD = \
   $(XLIB)
 
 EXTRA_DIST = \
-  benchmark.conf \
-  exchange_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv
+  benchmark-common.conf \
+  benchmark-cs.conf \
+  benchmark-rsa.conf \
+  bank-benchmark-cs.conf \
+  bank-benchmark-rsa.conf \
+  coins-cs.conf \
+  coins-rsa.conf
diff --git a/src/benchmark/bank-benchmark-cs.conf b/src/benchmark/bank-benchmark-cs.conf
index d012f0faa..39c82a3fe 100644
--- a/src/benchmark/bank-benchmark-cs.conf
+++ b/src/benchmark/bank-benchmark-cs.conf
@@ -1,128 +1,5 @@
 # This file is in the public domain.
-#
-[paths]
-# Persistent data storage for the testcase
-# This value is a default for `taler_config_home'
-taler_test_home = exchange_benchmark_home/
+@INLINE@ benchmark-common.conf
+@INLINE@ coins-cs.conf
 
-[taler]
-# Currency supported by the exchange (can only be one)
-currency = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
 
-[exchange]
-# how long is one signkey valid?
-signkey_duration = 4 weeks
-signkey_legal_duration = 2 years
-# how long do we provide to clients denomination and signing keys
-# ahead of time?
-# Keep it short so the test runs fast.
-lookahead_sign = 12h
-# HTTP port the exchange listens to
-port = 8081
-# Master public key used to sign the exchange's various keys
-master_public_key = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# How to access our database
-DB = postgres
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-base_url = "http://localhost:8081/"
-
-WIREWATCH_IDLE_SLEEP_INTERVAL = 1500 ms
-
-[exchange-offline]
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[exchangedb-postgres]
-config = "postgres:///talercheck"
-
-[benchmark-remote-exchange]
-host = localhost
-# Adjust $HOME to match remote target!
-dir = $HOME/repos/taler/exchange/src/benchmark
-
-[bank]
-HTTP_PORT = 8082
-SERVE = http
-MAX_DEBT = EUR:100000000000.0
-MAX_DEBT_BANK = EUR:1000000000000000.0
-
-[benchmark]
-USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
-
-[exchange-account-2]
-# What is the payto://-URL of the exchange (to generate wire response)
-PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange"
-enable_debit = YES
-enable_credit = YES
-
-[exchange-accountcredentials-2]
-# What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
-# Authentication information for basic authentication
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-username = Exchange
-password = x
-
-
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
diff --git a/src/benchmark/bank-benchmark-rsa.conf b/src/benchmark/bank-benchmark-rsa.conf
index f2f4dee50..ca5d6b0da 100644
--- a/src/benchmark/bank-benchmark-rsa.conf
+++ b/src/benchmark/bank-benchmark-rsa.conf
@@ -1,133 +1,5 @@
 # This file is in the public domain.
-#
-[paths]
-# Persistent data storage for the testcase
-# This value is a default for `taler_config_home'
-taler_test_home = exchange_benchmark_home/
+@INLINE@ benchmark-common.conf
+@INLINE@ coins-rsa.conf
 
-[taler]
-# Currency supported by the exchange (can only be one)
-currency = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
 
-[exchange]
-# how long is one signkey valid?
-signkey_duration = 4 weeks
-signkey_legal_duration = 2 years
-# how long do we provide to clients denomination and signing keys
-# ahead of time?
-# Keep it short so the test runs fast.
-lookahead_sign = 12h
-# HTTP port the exchange listens to
-port = 8081
-# Master public key used to sign the exchange's various keys
-master_public_key = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# How to access our database
-DB = postgres
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-base_url = "http://localhost:8081/"
-
-WIREWATCH_IDLE_SLEEP_INTERVAL = 1500 ms
-
-[exchange-offline]
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[exchangedb-postgres]
-config = "postgres:///talercheck"
-
-[benchmark-remote-exchange]
-host = localhost
-# Adjust $HOME to match remote target!
-dir = $HOME/repos/taler/exchange/src/benchmark
-
-[bank]
-HTTP_PORT = 8082
-SERVE = http
-MAX_DEBT = EUR:100000000000.0
-MAX_DEBT_BANK = EUR:1000000000000000.0
-
-[benchmark]
-USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
-
-[exchange-account-2]
-# What is the payto://-URL of the exchange (to generate wire response)
-PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange"
-enable_debit = YES
-enable_credit = YES
-
-[exchange-accountcredentials-2]
-# What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
-# Authentication information for basic authentication
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-username = Exchange
-password = x
-
-
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
diff --git a/src/benchmark/benchmark-common.conf b/src/benchmark/benchmark-common.conf
new file mode 100644
index 000000000..e47115a2b
--- /dev/null
+++ b/src/benchmark/benchmark-common.conf
@@ -0,0 +1,106 @@
+# This file is in the public domain.
+[paths]
+TALER_TEST_HOME=exchange_benchmark_home/
+
+[taler]
+CURRENCY=EUR
+CURRENCY_ROUND_UNIT=EUR:0.01
+
+[exchange]
+AML_THRESHOLD=EUR:99999999
+SIGNKEY_LEGAL_DURATION=2 years
+PORT=8081
+MASTER_PUBLIC_KEY=98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+DB=postgres
+BASE_URL="http://localhost:8081/"
+# Only set this option if you are actually running
+# multiple aggregators!
+# AGGREGATOR_SHARD_SIZE=67108864
+WIREWATCH_IDLE_SLEEP_INTERVAL=5 ms
+
+[exchangedb-postgres]
+CONFIG="postgres:///talercheck"
+
+[exchange-offline]
+MASTER_PRIV_FILE=${TALER_TEST_HOME}/.local/share/taler/exchange/offline-keys/master.priv
+
+[taler-exchange-secmod-rsa]
+LOOKAHEAD_SIGN="1 d"
+
+[taler-exchange-secmod-cs]
+LOOKAHEAD_SIGN="1 d"
+
+[taler-exchange-secmod-eddsa]
+DURATION="2 d"
+LOOKAHEAD_SIGN="1 d"
+
+# account-2 is suitable for fakebank
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost/exchange?receiver-name=exchange"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8080/accounts/exchange/taler-wire-gateway/"
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8080/accounts/exchange/taler-wire-gateway/"
+
+# account-2 is suitable for libeufin
+[exchange-account-2]
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+PAYTO_URI = payto://iban/SANDBOXX/DE033310?receiver-name=Exchange+Company
+
+[exchange-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8080/accounts/exchange/taler-wire-gateway/"
+
+[admin-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = admin
+PASSWORD = secret
+WIRE_GATEWAY_URL = "http://localhost:8080/accounts/exchange/taler-wire-gateway/"
+
+
+# Trust local exchange for "EUR" currency
+[merchant-exchange-benchmark]
+EXCHANGE_BASE_URL = http://localhost:8081/
+MASTER_KEY=98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+# If currency does not match [TALER] section, the exchange
+# will be ignored!
+CURRENCY = EUR
+
+
+[merchantdb-postgres]
+CONFIG="postgres:///talercheck"
+
+[auditordb-postgres]
+CONFIG="postgres:///talercheck"
+
+[syncdb-postgres]
+CONFIG="postgres:///talercheck"
+
+[exchange]
+WIREWATCH_IDLE_SLEEP_INTERVAL = 5000 ms
+
+[bank]
+HTTP_PORT=8080
+SERVE=http
+RAM_LIMIT=10000000
+
+[libeufin-bank]
+CURRENCY = EUR
+
+[libeufin-nexus]
+DB_CONNECTION="postgresql:///talercheck"
+
+[libeufin-sandbox]
+DB_CONNECTION="postgresql:///talercheck"
+
+[auditor]
+BASE_URL="http://localhost:8083/"
diff --git a/src/benchmark/benchmark-cs.conf b/src/benchmark/benchmark-cs.conf
index d0d14b8d9..7f660ad31 100644
--- a/src/benchmark/benchmark-cs.conf
+++ b/src/benchmark/benchmark-cs.conf
@@ -1,58 +1,6 @@
 # This file is in the public domain.
-#
-[paths]
-# Persistent data storage for the testcase
-# This value is a default for `taler_config_home'
-TALER_TEST_HOME = exchange_benchmark_home/
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[exchange]
-
-SIGNKEY_LEGAL_DURATION = 2 years
-
-# HTTP port the exchange listens to
-PORT = 8081
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# How to access our database
-DB = postgres
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-AGGREGATOR_SHARD_SIZE = 67108864
-#AGGREGATOR_SHARD_SIZE = 2147483648
-
-
-
-WIREWATCH_IDLE_SLEEP_INTERVAL = 5 ms
-
-[exchange-offline]
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[benchmark-remote-exchange]
-HOST = localhost
-# Adjust $HOME to match remote target!
-DIR = $HOME/repos/taler/exchange/src/benchmark
-
-[bank]
-HTTP_PORT = 8082
-SERVE = http
-MAX_DEBT = EUR:100000000000.0
-MAX_DEBT_BANK = EUR:1000000000000000.0
-
-[benchmark]
-USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
+@INLINE@ benchmark-common.conf
+@INLINE@ coins-cs.conf
 
 [exchange-account-test]
 # What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
@@ -62,65 +10,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/Exchange/taler-wire-gateway/
 WIRE_GATEWAY_AUTH_METHOD = "basic"
 USERNAME = Exchange
 PASSWORD = x
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
diff --git a/src/benchmark/benchmark-rsa.conf b/src/benchmark/benchmark-rsa.conf
index 7b5b0d1f1..a6c1512ee 100644
--- a/src/benchmark/benchmark-rsa.conf
+++ b/src/benchmark/benchmark-rsa.conf
@@ -1,58 +1,6 @@
 # This file is in the public domain.
-#
-[paths]
-# Persistent data storage for the testcase
-# This value is a default for `taler_config_home'
-TALER_TEST_HOME = exchange_benchmark_home/
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[exchange]
-
-SIGNKEY_LEGAL_DURATION = 2 years
-
-# HTTP port the exchange listens to
-PORT = 8081
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-# How to access our database
-DB = postgres
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-AGGREGATOR_SHARD_SIZE = 67108864
-#AGGREGATOR_SHARD_SIZE = 2147483648
-
-
-
-WIREWATCH_IDLE_SLEEP_INTERVAL = 5 ms
-
-[exchange-offline]
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange/offline-keys/master.priv
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[benchmark-remote-exchange]
-HOST = localhost
-# Adjust $HOME to match remote target!
-DIR = $HOME/repos/taler/exchange/src/benchmark
-
-[bank]
-HTTP_PORT = 8082
-SERVE = http
-MAX_DEBT = EUR:100000000000.0
-MAX_DEBT_BANK = EUR:1000000000000000.0
-
-[benchmark]
-USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
+@INLINE@ benchmark-common.conf
+@INLINE@ coins-rsa.conf
 
 [exchange-account-test]
 # What is the bank account (with the "Taler Bank" demo system)? Must end with "/".
@@ -62,70 +10,7 @@ ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-test]
-WIRE_GATEWAY_URL = http://localhost:8082/Exchange/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/Exchange/taler-wire-gateway/
 WIRE_GATEWAY_AUTH_METHOD = "basic"
 USERNAME = Exchange
 PASSWORD = x
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 2048
diff --git a/src/benchmark/coins-cs.conf b/src/benchmark/coins-cs.conf
new file mode 100644
index 000000000..c4b5a45c1
--- /dev/null
+++ b/src/benchmark/coins-cs.conf
@@ -0,0 +1,58 @@
+# This file is in the public domain.
+#
+# Sections starting with "coin_" specify which denominations
+# the exchange should support (and their respective fee structure)
+[coin_eur_ct_1]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_ct_10]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_1]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_5]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_10]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
diff --git a/src/benchmark/coins-rsa.conf b/src/benchmark/coins-rsa.conf
new file mode 100644
index 000000000..42eb8acfc
--- /dev/null
+++ b/src/benchmark/coins-rsa.conf
@@ -0,0 +1,63 @@
+# This file is in the public domain.
+#
+# Sections starting with "coin_" specify which denominations
+# the exchange should support (and their respective fee structure)
+[coin_eur_ct_1]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 2048
+
+[coin_eur_ct_10]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 2048
+
+[coin_eur_1]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 2048
+
+[coin_eur_5]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 2048
+
+[coin_eur_10]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 2048
diff --git a/src/benchmark/exchange_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv b/src/benchmark/exchange_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/benchmark/exchange_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c
index 7748f583d..228d050e4 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -251,7 +251,7 @@ add_refund (const struct Merchant *m,
   r.details.rtransaction_id = 42;
   make_amount (0, 5000000, &r.details.refund_amount);
   make_amount (0, 5, &r.details.refund_fee);
-  if (0 <=
+  if (0 >=
       plugin->insert_refund (plugin->cls,
                              &r))
   {
@@ -274,7 +274,11 @@ static bool
 add_deposit (const struct Merchant *m)
 {
   struct Deposit d;
-  struct TALER_EXCHANGEDB_Deposit deposit;
+  struct TALER_EXCHANGEDB_CoinDepositInformation deposit;
+  struct TALER_EXCHANGEDB_BatchDeposit bd = {
+    .cdis = &deposit,
+    .num_cdis = 1
+  };
   uint64_t known_coin_id;
   struct TALER_DenominationHashP dph;
   struct TALER_AgeCommitmentHash agh;
@@ -283,6 +287,10 @@ add_deposit (const struct Merchant *m)
   d.coin.denom_pub_hash = h_denom_pub;
   d.coin.denom_sig = denom_sig;
   RANDOMIZE (&d.h_contract_terms);
+  d.coin.no_age_commitment = true;
+  memset (&d.coin.h_age_commitment,
+          0,
+          sizeof (d.coin.h_age_commitment));
 
   if (0 >=
       plugin->ensure_coin_known (plugin->cls,
@@ -298,24 +306,40 @@ add_deposit (const struct Merchant *m)
   }
   deposit.coin = d.coin;
   RANDOMIZE (&deposit.csig);
-  deposit.merchant_pub = m->merchant_pub;
-  deposit.h_contract_terms = d.h_contract_terms;
-  deposit.wire_salt = m->wire_salt;
-  deposit.receiver_wire_account = m->payto_uri;
-  deposit.timestamp = random_time ();
-  deposit.refund_deadline = random_time ();
-  deposit.wire_deadline = random_time ();
+  bd.merchant_pub = m->merchant_pub;
+  bd.h_contract_terms = d.h_contract_terms;
+  bd.wire_salt = m->wire_salt;
+  bd.receiver_wire_account = m->payto_uri;
+  bd.wallet_timestamp = random_time ();
+  do {
+    bd.refund_deadline = random_time ();
+    bd.wire_deadline = random_time ();
+  } while (GNUNET_TIME_timestamp_cmp (bd.wire_deadline,
+                                      <,
+                                      bd.refund_deadline));
+
   make_amount (1, 0, &deposit.amount_with_fee);
-  make_amount (0, 5, &deposit.deposit_fee);
-  if (0 >=
-      plugin->insert_deposit (plugin->cls,
-                              random_time (),
-                              &deposit))
+
   {
-    GNUNET_break (0);
-    global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    return false;
+    struct GNUNET_TIME_Timestamp now;
+    bool balance_ok;
+    uint32_t bad_idx;
+    bool conflict;
+
+    now = random_time ();
+    if (0 >=
+        plugin->do_deposit (plugin->cls,
+                            &bd,
+                            &now,
+                            &balance_ok,
+                            &bad_idx,
+                            &conflict))
+    {
+      GNUNET_break (0);
+      global_ret = EXIT_FAILURE;
+      GNUNET_SCHEDULER_shutdown ();
+      return false;
+    }
   }
   if (GNUNET_YES ==
       eval_probability (((float) refund_rate) / 100.0))
@@ -442,6 +466,9 @@ run (void *cls,
   }
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
+  memset (&issue,
+          0,
+          sizeof (issue));
   RANDOMIZE (&issue.signature);
   issue.start
     = start;
@@ -462,18 +489,19 @@ run (void *cls,
     struct TALER_PlanchetDetail pd;
     struct TALER_BlindedDenominationSignature bds;
     struct TALER_PlanchetMasterSecretP ps;
-    struct TALER_ExchangeWithdrawValues alg_values;
     struct TALER_CoinSpendPublicKeyP coin_pub;
     struct TALER_AgeCommitmentHash hac;
-    union TALER_DenominationBlindingKeyP bks;
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    const struct TALER_ExchangeWithdrawValues *alg_values;
 
     RANDOMIZE (&coin_pub);
     GNUNET_assert (GNUNET_OK ==
                    TALER_denom_priv_create (&pk,
                                             &denom_pub,
-                                            TALER_DENOMINATION_RSA,
+                                            GNUNET_CRYPTO_BSA_RSA,
                                             1024));
-    alg_values.cipher = TALER_DENOMINATION_RSA;
+    alg_values = TALER_denom_ewv_rsa_singleton ();
+    denom_pub.age_mask = issue.age_mask;
     TALER_denom_pub_hash (&denom_pub,
                           &h_denom_pub);
     make_amount (2, 0, &issue.value);
@@ -493,38 +521,35 @@ run (void *cls,
       return;
     }
 
-
     TALER_planchet_blinding_secret_create (&ps,
-                                           &alg_values,
+                                           TALER_denom_ewv_rsa_singleton (),
                                            &bks);
 
     {
       struct GNUNET_HashCode seed;
       struct TALER_AgeMask mask = {
-        .bits = 1 || 1 << 8 || 1 << 12 || 1 << 16 || 1 << 18
+        .bits = 1 | (1 << 8) | (1 << 12) | (1 << 16) | (1 << 18)
       };
       struct TALER_AgeCommitmentProof acp = {0};
 
       GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                   &seed,
                                   sizeof(seed));
-
-      GNUNET_assert (GNUNET_OK ==
-                     TALER_age_restriction_commit (
-                       &mask,
-                       13,
-                       &seed,
-                       &acp));
-
-      TALER_age_commitment_hash (&acp.commitment, &hac);
+      TALER_age_restriction_commit (&mask,
+                                    13,
+                                    &seed,
+                                    &acp);
+      TALER_age_commitment_hash (&acp.commitment,
+                                 &hac);
     }
 
     GNUNET_assert (GNUNET_OK ==
                    TALER_denom_blind (&denom_pub,
                                       &bks,
+                                      NULL,
                                       &hac,
                                       &coin_pub,
-                                      &alg_values,
+                                      alg_values,
                                       &c_hash,
                                       &pd.blinded_planchet));
     GNUNET_assert (GNUNET_OK ==
@@ -538,7 +563,7 @@ run (void *cls,
                                             &bds,
                                             &bks,
                                             &c_hash,
-                                            &alg_values,
+                                            alg_values,
                                             &denom_pub));
     TALER_blinded_denom_sig_free (&bds);
     TALER_denom_pub_free (&denom_pub);
@@ -558,7 +583,6 @@ run (void *cls,
       ws = GNUNET_TIME_absolute_to_timestamp (GNUNET_TIME_year_to_time (y - 1));
       we = GNUNET_TIME_absolute_to_timestamp (GNUNET_TIME_year_to_time (y));
       make_amount (0, 5, &fees.wire);
-      make_amount (0, 5, &fees.wad);
       make_amount (0, 5, &fees.closing);
       memset (&master_sig,
               0,
diff --git a/src/benchmark/taler-bank-benchmark.c b/src/benchmark/taler-bank-benchmark.c
index 4d7dbe35e..528798424 100644
--- a/src/benchmark/taler-bank-benchmark.c
+++ b/src/benchmark/taler-bank-benchmark.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014-2021 Taler Systems SA
+  (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it
   under the terms of the GNU Affero General Public License as
@@ -38,55 +38,12 @@
 #include "taler_testing_lib.h"
 #include "taler_error_codes.h"
 
-
-/* Error codes.  */
-enum BenchmarkError
-{
-  MISSING_BANK_URL,
-  FAILED_TO_LAUNCH_BANK,
-  BAD_CLI_ARG,
-  BAD_CONFIG_FILE,
-  NO_CONFIG_FILE_GIVEN
-};
-
-
-/**
- * What mode should the benchmark run in?
- */
-enum BenchmarkMode
-{
-  /**
-   * Run as client against the bank.
-   */
-  MODE_CLIENT = 1,
-
-  /**
-   * Run the bank.
-   */
-  MODE_BANK = 2,
-
-  /**
-   * Run both, for a local benchmark.
-   */
-  MODE_BOTH = 3,
-};
-
+#define SHARD_SIZE "1024"
 
 /**
- * Hold information regarding which bank has the exchange account.
+ * Credentials to use for the benchmark.
  */
-static const struct TALER_EXCHANGEDB_AccountInfo *exchange_bank_account;
-
-/**
- * Time snapshot taken right before executing the CMDs.
- */
-static struct GNUNET_TIME_Absolute start_time;
-
-/**
- * Benchmark duration time taken right after the CMD interpreter
- * returns.
- */
-static struct GNUNET_TIME_Relative duration;
+static struct TALER_TESTING_Credentials cred;
 
 /**
  * Array of all the commands the benchmark is running.
@@ -94,26 +51,14 @@ static struct GNUNET_TIME_Relative duration;
 static struct TALER_TESTING_Command *all_commands;
 
 /**
- * Dummy keepalive task.
- */
-static struct GNUNET_SCHEDULER_Task *keepalive;
-
-/**
  * Name of our configuration file.
  */
 static char *cfg_filename;
 
 /**
  * Use the fakebank instead of LibEuFin.
- * NOTE: LibEuFin not yet supported! Set
- * to 0 once we do support it!
  */
-static int use_fakebank = 1;
-
-/**
- * Launch taler-exchange-wirewatch.
- */
-static int start_wirewatch;
+static int use_fakebank;
 
 /**
  * Verbosity level.
@@ -121,12 +66,6 @@ static int start_wirewatch;
 static unsigned int verbose;
 
 /**
- * Size of the transaction history the fakebank
- * should keep in RAM.
- */
-static unsigned long long history_size = 65536;
-
-/**
  * How many reserves we want to create per client.
  */
 static unsigned int howmany_reserves = 1;
@@ -137,9 +76,9 @@ static unsigned int howmany_reserves = 1;
 static unsigned int howmany_clients = 1;
 
 /**
- * How many bank worker threads do we want to create.
+ * How many wirewatch processes do we want to create.
  */
-static unsigned int howmany_threads;
+static unsigned int start_wirewatch;
 
 /**
  * Log level used during the run.
@@ -152,25 +91,15 @@ static char *loglev;
 static char *logfile;
 
 /**
- * Benchmarking mode (run as client, exchange, both) as string.
- */
-static char *mode_str;
-
-/**
- * Benchmarking mode (run as client, bank, both).
- */
-static enum BenchmarkMode mode;
-
-/**
- * Don't kill exchange/fakebank/wirewatch until
- * requested by the user explicitly.
+ * Configuration.
  */
-static int linger;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
- * Configuration.
+ * Section with the configuration data for the exchange
+ * bank account.
  */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static char *exchange_bank_section;
 
 /**
  * Currency used.
@@ -232,10 +161,10 @@ print_stats (void)
 
     total = GNUNET_strdup (
       GNUNET_STRINGS_relative_time_to_string (timings[i].total_duration,
-                                              GNUNET_YES));
+                                              true));
     latency = GNUNET_strdup (
       GNUNET_STRINGS_relative_time_to_string (timings[i].success_latency,
-                                              GNUNET_YES));
+                                              true));
     fprintf (stderr,
              "%s-%d took %s in total with %s for latency for %u executions (%u repeats)\n",
              timings[i].prefix,
@@ -265,37 +194,39 @@ run (void *cls,
 
   (void) cls;
   len = howmany_reserves + 2;
-  all_commands = GNUNET_new_array (len,
-                                   struct TALER_TESTING_Command);
+  all_commands = GNUNET_malloc_large ((1 + len)
+                                      * sizeof (struct TALER_TESTING_Command));
+  GNUNET_assert (NULL != all_commands);
+  all_commands[0]
+    = TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                      cred.cfg,
+                                      NULL,
+                                      true,
+                                      true);
+
   GNUNET_asprintf (&total_reserve_amount,
                    "%s:5",
                    currency);
   for (unsigned int j = 0; j < howmany_reserves; j++)
   {
     char *create_reserve_label;
-    char *user_payto_uri;
-
-    // FIXME: vary user accounts more...
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                          "benchmark",
-                                                          "USER_PAYTO_URI",
-                                                          &user_payto_uri));
+
     GNUNET_asprintf (&create_reserve_label,
                      "createreserve-%u",
                      j);
-    all_commands[j]
+    // TODO: vary user accounts more...
+    all_commands[1 + j]
       = TALER_TESTING_cmd_admin_add_incoming_retry (
           TALER_TESTING_cmd_admin_add_incoming (add_label (
                                                   create_reserve_label),
                                                 total_reserve_amount,
-                                                exchange_bank_account->auth,
-                                                add_label (user_payto_uri)));
+                                                &cred.ba_admin,
+                                                cred.user42_payto));
   }
   GNUNET_free (total_reserve_amount);
-  all_commands[howmany_reserves]
+  all_commands[1 + howmany_reserves]
     = TALER_TESTING_cmd_stat (timings);
-  all_commands[howmany_reserves + 1]
+  all_commands[1 + howmany_reserves + 1]
     = TALER_TESTING_cmd_end ();
   TALER_TESTING_run2 (is,
                       all_commands,
@@ -312,15 +243,11 @@ launch_clients (void)
   enum GNUNET_GenericReturnValue result = GNUNET_OK;
   pid_t cpids[howmany_clients];
 
-  start_time = GNUNET_TIME_absolute_get ();
   if (1 == howmany_clients)
   {
     /* do everything in this process */
-    result = TALER_TESTING_setup (&run,
-                                  NULL,
-                                  cfg,
-                                  NULL,
-                                  GNUNET_NO);
+    result = TALER_TESTING_loop (&run,
+                                 NULL);
     if (verbose)
       print_stats ();
     return result;
@@ -334,11 +261,8 @@ launch_clients (void)
       GNUNET_log_setup ("benchmark-worker",
                         NULL == loglev ? "INFO" : loglev,
                         logfile);
-      result = TALER_TESTING_setup (&run,
-                                    NULL,
-                                    cfg,
-                                    NULL,
-                                    GNUNET_NO);
+      result = TALER_TESTING_loop (&run,
+                                   NULL);
       if (verbose)
         print_stats ();
       if (GNUNET_OK != result)
@@ -388,282 +312,109 @@ again:
 
 
 /**
- * Stop the fakebank.
- *
- * @param cls fakebank handle
- */
-static void
-stop_fakebank (void *cls)
-{
-  struct TALER_FAKEBANK_Handle *fakebank = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Stopping fakebank\n");
-  TALER_FAKEBANK_stop (fakebank);
-  GNUNET_SCHEDULER_cancel (keepalive);
-  keepalive = NULL;
-}
-
-
-/**
- * Dummy task that is never run.
- */
-static void
-never_task (void *cls)
-{
-  (void) cls;
-  GNUNET_assert (0);
-}
-
-
-/**
- * Start the fakebank.
- *
- * @param cls NULL
- */
-static void
-launch_fakebank (void *cls)
-{
-  struct TALER_FAKEBANK_Handle *fakebank;
-  unsigned long long pnum;
-
-  (void) cls;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "bank",
-                                             "HTTP_PORT",
-                                             &pnum))
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "bank",
-                               "HTTP_PORT",
-                               "must be valid port number");
-    return;
-  }
-  fakebank
-    = TALER_FAKEBANK_start2 ((uint16_t) pnum,
-                             currency,
-                             history_size,
-                             howmany_threads);
-  if (NULL == fakebank)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  keepalive
-    = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                    &never_task,
-                                    NULL);
-  GNUNET_SCHEDULER_add_shutdown (&stop_fakebank,
-                                 fakebank);
-}
-
-
-/**
  * Run the benchmark in parallel in many (client) processes
  * and summarize result.
  *
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 parallel_benchmark (void)
 {
   enum GNUNET_GenericReturnValue result = GNUNET_OK;
-  pid_t fakebank = -1;
-  struct GNUNET_OS_Process *bankd = NULL;
-  struct GNUNET_OS_Process *wirewatch = NULL;
+  struct GNUNET_OS_Process *wirewatch[GNUNET_NZL (start_wirewatch)];
 
-  if ( (MODE_BANK == mode) ||
-       (MODE_BOTH == mode) )
+  memset (wirewatch,
+          0,
+          sizeof (wirewatch));
+  /* start exchange wirewatch */
+  for (unsigned int w = 0; w<start_wirewatch; w++)
   {
-    if (use_fakebank)
-    {
-      unsigned long long pnum;
-
-      if (GNUNET_OK !=
-          GNUNET_CONFIGURATION_get_value_number (cfg,
-                                                 "bank",
-                                                 "HTTP_PORT",
-                                                 &pnum))
-      {
-        GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                   "bank",
-                                   "HTTP_PORT",
-                                   "must be valid port number");
-        return GNUNET_SYSERR;
-      }
-      /* start fakebank */
-      fakebank = fork ();
-      if (0 == fakebank)
-      {
-        GNUNET_log_setup ("benchmark-fakebank",
-                          NULL == loglev ? "INFO" : loglev,
-                          logfile);
-        GNUNET_SCHEDULER_run (&launch_fakebank,
-                              NULL);
-        exit (0);
-      }
-      if (-1 == fakebank)
-      {
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                             "fork");
-        return GNUNET_SYSERR;
-      }
-      /* wait for fakebank to be ready */
-      {
-        char *bank_url;
-        int ret;
-
-        GNUNET_asprintf (&bank_url,
-                         "http://localhost:%u/",
-                         (unsigned int) (uint16_t) pnum);
-        ret = TALER_TESTING_wait_httpd_ready (bank_url);
-        GNUNET_free (bank_url);
-        if (0 != ret)
-        {
-          int wstatus;
-
-          kill (fakebank,
-                SIGTERM);
-          if (fakebank !=
-              waitpid (fakebank,
-                       &wstatus,
-                       0))
-          {
-            GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                                 "waitpid");
-          }
-          fakebank = -1;
-          exit (ret);
-        }
-      }
-    }
-    else
+    wirewatch[w] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
+                                            NULL, NULL, NULL,
+                                            "taler-exchange-wirewatch",
+                                            "taler-exchange-wirewatch",
+                                            "-c", cfg_filename,
+                                            "-a", exchange_bank_section,
+                                            "-S", SHARD_SIZE,
+                                            (NULL != loglev) ? "-L" : NULL,
+                                            loglev,
+                                            NULL);
+    if (NULL == wirewatch[w])
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "FIXME: launching LibEuFin not yet supported\n");
-      bankd = NULL; // FIXME
-      return GNUNET_SYSERR;
-    }
-
-    {
-      struct GNUNET_OS_Process *dbinit;
-
-      dbinit = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                        NULL, NULL, NULL,
-                                        "taler-exchange-dbinit",
-                                        "taler-exchange-dbinit",
-                                        "-c", cfg_filename,
-                                        "-r",
-                                        NULL);
-      GNUNET_break (GNUNET_OK ==
-                    GNUNET_OS_process_wait (dbinit));
-      GNUNET_OS_process_destroy (dbinit);
-    }
-    if (start_wirewatch)
-    {
-      /* start exchange wirewatch */
-      wirewatch = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                           NULL, NULL, NULL,
-                                           "taler-exchange-wirewatch",
-                                           "taler-exchange-wirewatch",
-                                           "-c", cfg_filename,
-                                           NULL);
-      if (NULL == wirewatch)
+                  "Failed to launch wirewatch, aborting benchmark\n");
+      for (unsigned int x = 0; x<w; x++)
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Failed to launch wirewatch, aborting benchmark\n");
-        if (-1 != fakebank)
-        {
-          int wstatus;
-
-          kill (fakebank,
-                SIGTERM);
-          if (fakebank !=
-              waitpid (fakebank,
-                       &wstatus,
-                       0))
-          {
-            GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                                 "waitpid");
-          }
-          fakebank = -1;
-        }
-        if (NULL != bankd)
-        {
-          GNUNET_OS_process_kill (bankd,
-                                  SIGTERM);
-          GNUNET_OS_process_destroy (bankd);
-          bankd = NULL;
-        }
-        return GNUNET_SYSERR;
+        GNUNET_break (0 ==
+                      GNUNET_OS_process_kill (wirewatch[x],
+                                              SIGTERM));
+        GNUNET_break (GNUNET_OK ==
+                      GNUNET_OS_process_wait (wirewatch[x]));
+        GNUNET_OS_process_destroy (wirewatch[x]);
+        wirewatch[x] = NULL;
       }
+      return GNUNET_SYSERR;
     }
   }
-
-  if ( (MODE_CLIENT == mode) ||
-       (MODE_BOTH == mode) )
-    result = launch_clients ();
-  if ( (GNUNET_YES == linger) ||
-       (MODE_BANK == mode) )
+  result = launch_clients ();
+  /* Ensure wirewatch runs to completion! */
+  if (0 != start_wirewatch)
   {
-    printf ("Press ENTER to stop!\n");
-    if (MODE_BANK != mode)
-      duration = GNUNET_TIME_absolute_get_duration (start_time);
-    (void) getchar ();
-    if (MODE_BANK == mode)
-      duration = GNUNET_TIME_absolute_get_duration (start_time);
-  }
-
-  if ( (MODE_BANK == mode) ||
-       (MODE_BOTH == mode) )
-  {
-    if (NULL != wirewatch)
+    /* replace ONE of the wirewatchers with one that is in test-mode */
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (wirewatch[0],
+                                          SIGTERM));
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_OS_process_wait (wirewatch[0]));
+    GNUNET_OS_process_destroy (wirewatch[0]);
+    wirewatch[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
+                                            NULL, NULL, NULL,
+                                            "taler-exchange-wirewatch",
+                                            "taler-exchange-wirewatch",
+                                            "-c", cfg_filename,
+                                            "-a", exchange_bank_section,
+                                            "-S", SHARD_SIZE,
+                                            "-t",
+                                            (NULL != loglev) ? "-L" : NULL,
+                                            loglev,
+                                            NULL);
+    /* wait for it to finish! */
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_OS_process_wait (wirewatch[0]));
+    GNUNET_OS_process_destroy (wirewatch[0]);
+    wirewatch[0] = NULL;
+    /* Then stop the rest, which should basically also be finished */
+    for (unsigned int w = 1; w<start_wirewatch; w++)
     {
-      /* stop wirewatch */
       GNUNET_break (0 ==
-                    GNUNET_OS_process_kill (wirewatch,
+                    GNUNET_OS_process_kill (wirewatch[w],
                                             SIGTERM));
       GNUNET_break (GNUNET_OK ==
-                    GNUNET_OS_process_wait (wirewatch));
-      GNUNET_OS_process_destroy (wirewatch);
-      wirewatch = NULL;
-    }
-    /* stop fakebank */
-    if (-1 != fakebank)
-    {
-      int wstatus;
-
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Telling fakebank to shut down\n");
-      kill (fakebank,
-            SIGTERM);
-      if (fakebank !=
-          waitpid (fakebank,
-                   &wstatus,
-                   0))
-      {
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                             "waitpid");
-      }
-      else
-      {
-        if ( (! WIFEXITED (wstatus)) ||
-             (0 != WEXITSTATUS (wstatus)) )
-        {
-          GNUNET_break (0);
-          result = GNUNET_SYSERR;
-        }
-      }
-      fakebank = -1;
-    }
-    if (NULL != bankd)
-    {
-      GNUNET_OS_process_kill (bankd,
-                              SIGTERM);
-      GNUNET_OS_process_destroy (bankd);
+                    GNUNET_OS_process_wait (wirewatch[w]));
+      GNUNET_OS_process_destroy (wirewatch[w]);
     }
+
+    /* But be extra sure we did finish all shards by doing one more */
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "Shard check phase\n");
+    wirewatch[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
+                                            NULL, NULL, NULL,
+                                            "taler-exchange-wirewatch",
+                                            "taler-exchange-wirewatch",
+                                            "-c", cfg_filename,
+                                            "-a", exchange_bank_section,
+                                            "-S", SHARD_SIZE,
+                                            "-t",
+                                            (NULL != loglev) ? "-L" : NULL,
+                                            loglev,
+                                            NULL);
+    /* wait for it to finish! */
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_OS_process_wait (wirewatch[0]));
+    GNUNET_OS_process_destroy (wirewatch[0]);
+    wirewatch[0] = NULL;
   }
+
   return result;
 }
 
@@ -683,56 +434,44 @@ main (int argc,
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_mandatory (
       GNUNET_GETOPT_option_cfgfile (&cfg_filename)),
-#if FIXME_SUPPORT_LIBEUFIN
     GNUNET_GETOPT_option_flag ('f',
                                "fakebank",
-                               "start a fakebank instead of the Python bank",
+                               "we are using fakebank",
                                &use_fakebank),
-#endif
     GNUNET_GETOPT_option_help ("taler-bank benchmark"),
-    GNUNET_GETOPT_option_flag ('K',
-                               "linger",
-                               "linger around until key press",
-                               &linger),
     GNUNET_GETOPT_option_string ('l',
                                  "logfile",
                                  "LF",
                                  "will log to file LF",
                                  &logfile),
     GNUNET_GETOPT_option_loglevel (&loglev),
-    GNUNET_GETOPT_option_string ('m',
-                                 "mode",
-                                 "MODE",
-                                 "run as bank, client or both",
-                                 &mode_str),
     GNUNET_GETOPT_option_uint ('p',
                                "worker-parallelism",
                                "NPROCS",
                                "How many client processes we should run",
                                &howmany_clients),
-    GNUNET_GETOPT_option_uint ('P',
-                               "service-parallelism",
-                               "NTHREADS",
-                               "How many service threads we should create",
-                               &howmany_threads),
     GNUNET_GETOPT_option_uint ('r',
                                "reserves",
                                "NRESERVES",
                                "How many reserves per client we should create",
                                &howmany_reserves),
-    GNUNET_GETOPT_option_ulong ('s',
-                                "size",
-                                "HISTORY_SIZE",
-                                "Maximum history size kept in memory by the fakebank",
-                                &history_size),
+    GNUNET_GETOPT_option_mandatory (
+      GNUNET_GETOPT_option_string (
+        'u',
+        "exchange-account-section",
+        "SECTION",
+        "use exchange bank account configuration from the given SECTION",
+        &exchange_bank_section)),
     GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
     GNUNET_GETOPT_option_verbose (&verbose),
-    GNUNET_GETOPT_option_flag ('w',
+    GNUNET_GETOPT_option_uint ('w',
                                "wirewatch",
-                               "run taler-exchange-wirewatch",
+                               "NPROC",
+                               "run NPROC taler-exchange-wirewatch processes",
                                &start_wirewatch),
     GNUNET_GETOPT_OPTION_END
   };
+  struct GNUNET_TIME_Relative duration;
 
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
@@ -745,43 +484,15 @@ main (int argc,
     GNUNET_free (cfg_filename);
     if (GNUNET_NO == result)
       return 0;
-    return BAD_CLI_ARG;
+    return EXIT_INVALIDARGUMENT;
   }
+  if (NULL == exchange_bank_section)
+    exchange_bank_section = "exchange-account-1";
+  if (NULL == loglev)
+    loglev = "INFO";
   GNUNET_log_setup ("taler-bank-benchmark",
-                    NULL == loglev ? "INFO" : loglev,
+                    loglev,
                     logfile);
-  if (history_size < 10)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "History size too small, this can hardly work\n");
-    return BAD_CLI_ARG;
-  }
-  if (NULL == mode_str)
-    mode = MODE_BOTH;
-  else if (0 == strcasecmp (mode_str,
-                            "bank"))
-    mode = MODE_BANK;
-  else if (0 == strcasecmp (mode_str,
-                            "client"))
-    mode = MODE_CLIENT;
-  else if (0 == strcasecmp (mode_str,
-                            "both"))
-    mode = MODE_BOTH;
-  else
-  {
-    TALER_LOG_ERROR ("Unknown mode given: '%s'\n",
-                     mode_str);
-    GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
-  }
-  if (NULL == cfg_filename)
-    cfg_filename = GNUNET_CONFIGURATION_default_filename ();
-  if (NULL == cfg_filename)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Can't find default configuration file.\n");
-    return EXIT_NOTCONFIGURED;
-  }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_load (cfg,
@@ -789,7 +500,7 @@ main (int argc,
   {
     TALER_LOG_ERROR ("Could not parse configuration\n");
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_NOTCONFIGURED;
   }
   if (GNUNET_OK !=
       TALER_config_get_currency (cfg,
@@ -797,52 +508,30 @@ main (int argc,
   {
     GNUNET_CONFIGURATION_destroy (cfg);
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
-  }
-  if (MODE_BANK != mode)
-  {
-    if (howmany_clients > 10240)
-    {
-      TALER_LOG_ERROR ("-p option value given is too large\n");
-      return BAD_CLI_ARG;
-    }
-    if (0 == howmany_clients)
-    {
-      TALER_LOG_ERROR ("-p option value must not be zero\n");
-      GNUNET_free (cfg_filename);
-      return BAD_CLI_ARG;
-    }
+    return EXIT_NOTCONFIGURED;
   }
 
   if (GNUNET_OK !=
-      TALER_EXCHANGEDB_load_accounts (cfg,
-                                      TALER_EXCHANGEDB_ALO_AUTHDATA
-                                      | TALER_EXCHANGEDB_ALO_CREDIT))
+      TALER_TESTING_get_credentials (
+        cfg_filename,
+        exchange_bank_section,
+        use_fakebank
+        ? TALER_TESTING_BS_FAKEBANK
+        : TALER_TESTING_BS_IBAN,
+        &cred))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Configuration fails to provide exchange bank details\n");
+                "Required bank credentials not given in configuration\n");
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_NOTCONFIGURED;
   }
 
-  exchange_bank_account
-    = TALER_EXCHANGEDB_find_account_by_method ("x-taler-bank");
-  if (NULL == exchange_bank_account)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No bank account for `x-taler-bank` given in configuration\n");
-    GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
-  }
-  result = parallel_benchmark ();
-  TALER_EXCHANGEDB_unload_accounts ();
-  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free (cfg_filename);
+    struct GNUNET_TIME_Absolute start_time;
 
-  if (MODE_BANK == mode)
-  {
-    /* If we're the bank, we're done now.  No need to print results. */
-    return (GNUNET_OK == result) ? 0 : result;
+    start_time = GNUNET_TIME_absolute_get ();
+    result = parallel_benchmark ();
+    duration = GNUNET_TIME_absolute_get_duration (start_time);
   }
 
   if (GNUNET_OK == result)
@@ -858,16 +547,19 @@ main (int argc,
              howmany_clients,
              GNUNET_STRINGS_relative_time_to_string (duration,
                                                      GNUNET_YES));
-    tps = ((unsigned long long) howmany_reserves) * howmany_clients * 1000LLU
-          / (duration.rel_value_us / 1000LL);
-    fprintf (stdout,
-             "RAW: %04u %04u %16llu (%llu TPS)\n",
-             howmany_reserves,
-             howmany_clients,
-             (unsigned long long) duration.rel_value_us,
-             tps);
+    if (! GNUNET_TIME_relative_is_zero (duration))
+    {
+      tps = ((unsigned long long) howmany_reserves) * howmany_clients * 1000LLU
+            / (duration.rel_value_us / 1000LL);
+      fprintf (stdout,
+               "RAW: %04u %04u %16llu (%llu TPS)\n",
+               howmany_reserves,
+               howmany_clients,
+               (unsigned long long) duration.rel_value_us,
+               tps);
+    }
     fprintf (stdout,
-             "CPU time: sys %llu user %llu\n",                          \
+             "CPU time: sys %llu user %llu\n",
              (unsigned long long) (usage.ru_stime.tv_sec * 1000 * 1000
                                    + usage.ru_stime.tv_usec),
              (unsigned long long) (usage.ru_utime.tv_sec * 1000 * 1000
@@ -878,5 +570,7 @@ main (int argc,
   GNUNET_array_grow (labels,
                      label_len,
                      0);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (cfg_filename);
   return (GNUNET_OK == result) ? 0 : result;
 }
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index 77ef94ebc..75424a358 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2014-2020 Taler Systems SA
+  (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it
   under the terms of the GNU Affero General Public License as
@@ -28,25 +28,7 @@
 #include <microhttpd.h>
 #include <sys/resource.h>
 #include "taler_util.h"
-#include "taler_signatures.h"
-#include "taler_exchangedb_lib.h"
-#include "taler_exchange_service.h"
-#include "taler_json_lib.h"
-#include "taler_bank_service.h"
-#include "taler_fakebank_lib.h"
 #include "taler_testing_lib.h"
-#include "taler_error_codes.h"
-
-/* Error codes.  */
-enum BenchmarkError
-{
-  MISSING_BANK_URL,
-  FAILED_TO_LAUNCH_BANK,
-  BAD_CLI_ARG,
-  BAD_CONFIG_FILE,
-  NO_CONFIG_FILE_GIVEN
-};
-
 
 /**
  * The whole benchmark is a repetition of a "unit".  Each
@@ -55,56 +37,11 @@ enum BenchmarkError
  */
 #define UNITY_SIZE 6
 
-#define FIRST_INSTRUCTION -1
-
-
-/**
- * What mode should the benchmark run in?
- */
-enum BenchmarkMode
-{
-  /**
-   * Run as client (with fakebank), also starts a remote exchange.
-   */
-  MODE_CLIENT = 1,
-
-  /**
-   * Run the the exchange.
-   */
-  MODE_EXCHANGE = 2,
-
-  /**
-   * Run both, for a local benchmark.
-   */
-  MODE_BOTH = 3,
-};
-
-
-/**
- * Hold information regarding which bank has the exchange account.
- */
-static const struct TALER_EXCHANGEDB_AccountInfo *exchange_bank_account;
-
-/**
- * Configuration of our exchange.
- */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Hold information about a user at the bank.
- */
-static char *user_payto_uri;
-
-/**
- * Time snapshot taken right before executing the CMDs.
- */
-static struct GNUNET_TIME_Absolute start_time;
 
 /**
- * Benchmark duration time taken right after the CMD interpreter
- * returns.
+ * Credentials to use for the benchmark.
  */
-static struct GNUNET_TIME_Relative duration;
+static struct TALER_TESTING_Credentials cred;
 
 /**
  * Array of all the commands the benchmark is running.
@@ -117,16 +54,6 @@ static struct TALER_TESTING_Command *all_commands;
 static char *cfg_filename;
 
 /**
- * Exit code.
- */
-static enum GNUNET_GenericReturnValue result;
-
-/**
- * Use the fakebank instead of the Python bank.
- */
-static int use_fakebank;
-
-/**
  * How many coins we want to create per client and reserve.
  */
 static unsigned int howmany_coins = 1;
@@ -147,11 +74,6 @@ static unsigned int refresh_rate = 10;
 static unsigned int howmany_clients = 1;
 
 /**
- * Bank configuration to use.
- */
-static struct TALER_TESTING_BankConfiguration bc;
-
-/**
  * Log level used during the run.
  */
 static char *loglev;
@@ -162,16 +84,6 @@ static char *loglev;
 static char *logfile;
 
 /**
- * Benchmarking mode (run as client, exchange, both) as string.
- */
-static char *mode_str;
-
-/**
- * Benchmarking mode (run as client, exchange, both).
- */
-static enum BenchmarkMode mode;
-
-/**
  * Configuration.
  */
 static struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -182,19 +94,20 @@ static struct GNUNET_CONFIGURATION_Handle *cfg;
 static int reserves_first;
 
 /**
- * Currency used.
+ * Are we running against 'fakebank'?
  */
-static char *currency;
+static int use_fakebank;
 
 /**
- * Remote host that runs the exchange.
+ * Section with the configuration data for the exchange
+ * bank account.
  */
-static char *remote_host;
+static char *exchange_bank_section;
 
 /**
- * Remote benchmarking directory.
+ * Currency used.
  */
-static char *remote_dir;
+static char *currency;
 
 /**
  * Array of command labels.
@@ -212,12 +125,6 @@ static unsigned int label_len;
 static unsigned int label_off;
 
 /**
- * Don't kill exchange/fakebank/wirewatch until
- * requested by the user explicitly.
- */
-static int linger;
-
-/**
  * Performance counters.
  */
 static struct TALER_TESTING_Timer timings[] = {
@@ -256,14 +163,15 @@ cmd_transfer_to_exchange (const char *label,
   return TALER_TESTING_cmd_admin_add_incoming_retry (
     TALER_TESTING_cmd_admin_add_incoming (label,
                                           amount,
-                                          exchange_bank_account->auth,
-                                          user_payto_uri));
+                                          &cred.ba_admin,
+                                          cred.user42_payto));
 }
 
 
 /**
  * Throw a weighted coin with @a probability.
  *
+ * @param probability weight of the coin flip
  * @return #GNUNET_OK with @a probability,
  *         #GNUNET_NO with 1 - @a probability
  */
@@ -298,16 +206,26 @@ run (void *cls,
   char *amount_1;
 
   (void) cls;
-  all_commands = GNUNET_new_array (howmany_reserves * (1     /* Withdraw block */
-                                                       + howmany_coins)   /* All units */
-                                   + 1 /* stat CMD */
-                                   + 1 /* End CMD */,
-                                   struct TALER_TESTING_Command);
+  all_commands = GNUNET_malloc_large (
+    (1 /* exchange CMD */
+     + howmany_reserves
+     * (1 /* Withdraw block */
+        + howmany_coins) /* All units */
+     + 1 /* stat CMD */
+     + 1 /* End CMD */) * sizeof (struct TALER_TESTING_Command));
+  GNUNET_assert (NULL != all_commands);
+  all_commands[0]
+    = TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                      cred.cfg,
+                                      NULL,
+                                      true,
+                                      true);
   GNUNET_asprintf (&amount_5, "%s:5", currency);
   GNUNET_asprintf (&amount_4, "%s:4", currency);
   GNUNET_asprintf (&amount_1, "%s:1", currency);
-  GNUNET_assert (GNUNET_OK == TALER_amount_set_zero (currency,
-                                                     &total_reserve_amount));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        &total_reserve_amount));
   total_reserve_amount.value = 5 * howmany_coins;
   GNUNET_asprintf (&withdraw_fee_str,
                    "%s:0.1",
@@ -338,9 +256,9 @@ run (void *cls,
       GNUNET_asprintf (&batch_label,
                        "batch-start-%u",
                        j);
-      all_commands[reserves_first
-                   ? j
-                   : j * (howmany_coins + 1)]
+      all_commands[1 + (reserves_first
+                        ? j
+                        : j * (howmany_coins + 1))]
         = TALER_TESTING_cmd_batch (add_label (batch_label),
                                    make_reserve);
     }
@@ -359,25 +277,25 @@ run (void *cls,
       wl = add_label (withdraw_label);
       GNUNET_asprintf (&order_enc,
                        "{\"nonce\": %llu}",
-                       ((unsigned long long) i) + (howmany_coins
-                                                   * (unsigned long long) j));
+                       ((unsigned long long) i)
+                       + (howmany_coins * (unsigned long long) j));
       unit[0] =
-        TALER_TESTING_cmd_withdraw_with_retry
-          (TALER_TESTING_cmd_withdraw_amount (wl,
-                                              create_reserve_label,
-                                              amount_5,
-                                              0, /* age restriction off */
-                                              MHD_HTTP_OK));
+        TALER_TESTING_cmd_withdraw_with_retry (
+          TALER_TESTING_cmd_withdraw_amount (wl,
+                                             create_reserve_label,
+                                             amount_5,
+                                             0,  /* age restriction off */
+                                             MHD_HTTP_OK));
       unit[1] =
-        TALER_TESTING_cmd_deposit_with_retry
-          (TALER_TESTING_cmd_deposit ("deposit",
-                                      wl,
-                                      0, /* Index of the one withdrawn coin in the traits.  */
-                                      user_payto_uri,
-                                      add_label (order_enc),
-                                      GNUNET_TIME_UNIT_ZERO,
-                                      amount_1,
-                                      MHD_HTTP_OK));
+        TALER_TESTING_cmd_deposit_with_retry (
+          TALER_TESTING_cmd_deposit ("deposit",
+                                     wl,
+                                     0,  /* Index of the one withdrawn coin in the traits.  */
+                                     cred.user43_payto,
+                                     add_label (order_enc),
+                                     GNUNET_TIME_UNIT_ZERO,
+                                     amount_1,
+                                     MHD_HTTP_OK));
       if (eval_probability (refresh_rate / 100.0))
       {
         char *melt_label;
@@ -396,21 +314,21 @@ run (void *cls,
                          j);
         rl = add_label (reveal_label);
         unit[2] =
-          TALER_TESTING_cmd_melt_with_retry
-            (TALER_TESTING_cmd_melt (ml,
-                                     wl,
-                                     MHD_HTTP_OK,
-                                     NULL));
+          TALER_TESTING_cmd_melt_with_retry (
+            TALER_TESTING_cmd_melt (ml,
+                                    wl,
+                                    MHD_HTTP_OK,
+                                    NULL));
         unit[3] =
-          TALER_TESTING_cmd_refresh_reveal_with_retry
-            (TALER_TESTING_cmd_refresh_reveal (rl,
-                                               ml,
-                                               MHD_HTTP_OK));
+          TALER_TESTING_cmd_refresh_reveal_with_retry (
+            TALER_TESTING_cmd_refresh_reveal (rl,
+                                              ml,
+                                              MHD_HTTP_OK));
         unit[4] =
-          TALER_TESTING_cmd_refresh_link_with_retry
-            (TALER_TESTING_cmd_refresh_link ("link",
-                                             rl,
-                                             MHD_HTTP_OK));
+          TALER_TESTING_cmd_refresh_link_with_retry (
+            TALER_TESTING_cmd_refresh_link ("link",
+                                            rl,
+                                            MHD_HTTP_OK));
         unit[5] = TALER_TESTING_cmd_end ();
       }
       else
@@ -420,16 +338,16 @@ run (void *cls,
                        "unit-%u-%u",
                        i,
                        j);
-      all_commands[reserves_first
-                   ? howmany_reserves + j * howmany_coins + i
-                   : j * (howmany_coins + 1) + (1 + i)]
+      all_commands[1 + (reserves_first
+                        ? howmany_reserves + j * howmany_coins + i
+                        : j * (howmany_coins + 1) + (1 + i))]
         = TALER_TESTING_cmd_batch (add_label (unit_label),
                                    unit);
     }
   }
-  all_commands[howmany_reserves * (1 + howmany_coins)]
+  all_commands[1 + howmany_reserves * (1 + howmany_coins)]
     = TALER_TESTING_cmd_stat (timings);
-  all_commands[howmany_reserves * (1 + howmany_coins) + 1]
+  all_commands[1 + howmany_reserves * (1 + howmany_coins) + 1]
     = TALER_TESTING_cmd_end ();
   TALER_TESTING_run2 (is,
                       all_commands,
@@ -438,7 +356,6 @@ run (void *cls,
   GNUNET_free (amount_4);
   GNUNET_free (amount_5);
   GNUNET_free (withdraw_fee_str);
-  result = GNUNET_OK;
 }
 
 
@@ -455,10 +372,10 @@ print_stats (void)
 
     total = GNUNET_strdup (
       GNUNET_STRINGS_relative_time_to_string (timings[i].total_duration,
-                                              GNUNET_YES));
+                                              true));
     latency = GNUNET_strdup (
       GNUNET_STRINGS_relative_time_to_string (timings[i].success_latency,
-                                              GNUNET_YES));
+                                              true));
     fprintf (stderr,
              "%s-%d took %s in total with %s for latency for %u executions (%u repeats)\n",
              timings[i].prefix,
@@ -474,45 +391,6 @@ print_stats (void)
 
 
 /**
- * Stop the fakebank.
- *
- * @param cls fakebank handle
- */
-static void
-stop_fakebank (void *cls)
-{
-  struct TALER_FAKEBANK_Handle *fakebank = cls;
-
-  TALER_FAKEBANK_stop (fakebank);
-}
-
-
-/**
- * Start the fakebank.
- *
- * @param cls NULL
- */
-static void
-launch_fakebank (void *cls)
-{
-  struct TALER_FAKEBANK_Handle *fakebank;
-
-  (void) cls;
-  fakebank
-    = TALER_TESTING_run_fakebank (
-        exchange_bank_account->auth->wire_gateway_url,
-        currency);
-  if (NULL == fakebank)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  GNUNET_SCHEDULER_add_shutdown (&stop_fakebank,
-                                 fakebank);
-}
-
-
-/**
  * Run the benchmark in parallel in many (client) processes
  * and summarize result.
  *
@@ -521,363 +399,58 @@ launch_fakebank (void *cls)
  * @param config_file configuration file to use
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 parallel_benchmark (TALER_TESTING_Main main_cb,
                     void *main_cb_cls,
                     const char *config_file)
 {
   enum GNUNET_GenericReturnValue result = GNUNET_OK;
   pid_t cpids[howmany_clients];
-  pid_t fakebank = -1;
-  int wstatus;
-  struct GNUNET_OS_Process *bankd = NULL;
-  struct GNUNET_OS_Process *auditord = NULL;
-  struct GNUNET_OS_Process *exchanged = NULL;
-  struct GNUNET_OS_Process *wirewatch = NULL;
-  struct GNUNET_OS_Process *exchange_slave = NULL;
-  struct GNUNET_DISK_PipeHandle *exchange_slave_pipe;
 
-  if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) )
+  if (1 == howmany_clients)
+  {
+    result = TALER_TESTING_loop (main_cb,
+                                 main_cb_cls);
+    print_stats ();
+  }
+  else
   {
-    if (use_fakebank)
+    for (unsigned int i = 0; i<howmany_clients; i++)
     {
-      /* start fakebank */
-      fakebank = fork ();
-      if (0 == fakebank)
+      if (0 == (cpids[i] = fork ()))
       {
-        GNUNET_log_setup ("benchmark-fakebank",
-                          NULL == loglev ? "INFO" : loglev,
+        /* I am the child, do the work! */
+        GNUNET_log_setup ("benchmark-worker",
+                          loglev,
                           logfile);
-        GNUNET_SCHEDULER_run (&launch_fakebank,
-                              NULL);
-        exit (0);
+        result = TALER_TESTING_loop (main_cb,
+                                     main_cb_cls);
+        print_stats ();
+        if (GNUNET_OK != result)
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Failure in child process %u test suite!\n",
+                      i);
+        if (GNUNET_OK == result)
+          exit (0);
+        else
+          exit (1);
       }
-      if (-1 == fakebank)
+      if (-1 == cpids[i])
       {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
                              "fork");
-        return GNUNET_SYSERR;
-      }
-    }
-    else
-    {
-      /* start bank */
-      if (GNUNET_OK !=
-          TALER_TESTING_prepare_bank (cfg_filename,
-                                      GNUNET_NO,
-                                      "exchange-account-2",
-                                      &bc))
-      {
-        return 1;
-      }
-      bankd = TALER_TESTING_run_bank (cfg_filename,
-                                      "http://localhost:8082/");
-      if (NULL == bankd)
-        return 77;
-    }
-  }
-
-  if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) )
-  {
-    /* start exchange */
-    exchanged = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                         NULL, NULL, NULL,
-                                         "taler-exchange-httpd",
-                                         "taler-exchange-httpd",
-                                         "-c", config_file,
-                                         "-C",
-                                         NULL);
-    if ( (NULL == exchanged) && (MODE_BOTH == mode) )
-    {
-      if (-1 != fakebank)
-      {
-        kill (fakebank,
-              SIGTERM);
-        waitpid (fakebank,
-                 &wstatus,
-                 0);
-      }
-      if (NULL != bankd)
-      {
-        GNUNET_OS_process_kill (bankd,
-                                SIGTERM);
-        GNUNET_OS_process_destroy (bankd);
-      }
-      return 77;
-    }
-    /* start auditor */
-    auditord = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                        NULL, NULL, NULL,
-                                        "taler-auditor-httpd",
-                                        "taler-auditor-httpd",
-                                        "-c", config_file,
-                                        NULL);
-    if (NULL == auditord)
-    {
-      GNUNET_OS_process_kill (exchanged,
-                              SIGTERM);
-      if (MODE_BOTH == mode)
-      {
-        if (-1 != fakebank)
-        {
-          kill (fakebank,
-                SIGTERM);
-          waitpid (fakebank,
-                   &wstatus,
-                   0);
-        }
-        if (NULL != bankd)
-        {
-          GNUNET_OS_process_kill (bankd,
-                                  SIGTERM);
-          GNUNET_OS_process_destroy (bankd);
-        }
-      }
-      GNUNET_OS_process_destroy (exchanged);
-      return 77;
-    }
-    /* start exchange wirewatch */
-    wirewatch = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                         NULL, NULL, NULL,
-                                         "taler-exchange-wirewatch",
-                                         "taler-exchange-wirewatch",
-                                         "-c", config_file,
-                                         NULL);
-    if (NULL == wirewatch)
-    {
-      GNUNET_OS_process_kill (auditord,
-                              SIGTERM);
-      GNUNET_OS_process_kill (exchanged,
-                              SIGTERM);
-      if (MODE_BOTH == mode)
-      {
-        if (-1 != fakebank)
-        {
-          kill (fakebank,
-                SIGTERM);
-          waitpid (fakebank,
-                   &wstatus,
-                   0);
-        }
-        if (NULL != bankd)
-        {
-          GNUNET_OS_process_kill (bankd,
-                                  SIGTERM);
-          GNUNET_OS_process_destroy (bankd);
-        }
-      }
-      GNUNET_OS_process_destroy (exchanged);
-      return 77;
-    }
-  }
-
-  if (MODE_CLIENT == mode)
-  {
-    char *remote_cmd;
-
-    GNUNET_asprintf (&remote_cmd,
-                     ("cd '%s'; "
-                      "taler-exchange-benchmark --mode=exchange -c '%s'"),
-                     remote_dir,
-                     config_file);
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "remote command: %s\n",
-                remote_cmd);
-
-    GNUNET_assert (NULL != (exchange_slave_pipe =
-                              GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW)));
-
-    exchange_slave = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                              exchange_slave_pipe, NULL, NULL,
-                                              "ssh",
-                                              "ssh",
-                                              /* Don't ask for pw/passphrase, rather fail */
-                                              "-oBatchMode=yes",
-                                              remote_host,
-                                              remote_cmd,
-                                              NULL);
-    GNUNET_free (remote_cmd);
-  }
-
-  /* We always wait for the exchange, no matter if it's running locally or
-     remotely */
-  if (0 != TALER_TESTING_wait_exchange_ready (ec.exchange_url))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to detect running exchange at `%s'\n",
-                ec.exchange_url);
-    GNUNET_OS_process_kill (exchanged,
-                            SIGTERM);
-    if ( (MODE_BOTH == mode) || (MODE_CLIENT == mode))
-    {
-      if (-1 != fakebank)
-      {
-        kill (fakebank,
-              SIGTERM);
-        waitpid (fakebank,
-                 &wstatus,
-                 0);
-      }
-      if (NULL != bankd)
-      {
-        GNUNET_OS_process_kill (bankd,
-                                SIGTERM);
-        GNUNET_OS_process_destroy (bankd);
+        howmany_clients = i;
+        result = GNUNET_SYSERR;
+        break;
       }
+      /* fork() success, continue starting more processes! */
     }
-    GNUNET_OS_process_wait (exchanged);
-    GNUNET_OS_process_destroy (exchanged);
-    if (NULL != wirewatch)
-    {
-      GNUNET_OS_process_kill (wirewatch,
-                              SIGTERM);
-      GNUNET_OS_process_wait (wirewatch);
-      GNUNET_OS_process_destroy (wirewatch);
-    }
-    if (NULL != auditord)
+    /* collect all children */
+    for (unsigned int i = 0; i<howmany_clients; i++)
     {
-      GNUNET_OS_process_kill (auditord,
-                              SIGTERM);
-      GNUNET_OS_process_wait (auditord);
-      GNUNET_OS_process_destroy (auditord);
-    }
-    return 77;
-  }
-  if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) )
-  {
-    if (-1 != fakebank)
-      sleep (1); /* make sure fakebank process is ready before continuing */
-
-    start_time = GNUNET_TIME_absolute_get ();
-    result = GNUNET_OK;
-
-    if (1 == howmany_clients)
-    {
-      result = TALER_TESTING_setup (main_cb,
-                                    main_cb_cls,
-                                    cfg,
-                                    exchanged,
-                                    GNUNET_YES);
-      print_stats ();
-    }
-    else
-    {
-      for (unsigned int i = 0; i<howmany_clients; i++)
-      {
-        if (0 == (cpids[i] = fork ()))
-        {
-          /* I am the child, do the work! */
-          GNUNET_log_setup ("benchmark-worker",
-                            NULL == loglev ? "INFO" : loglev,
-                            logfile);
-
-          result = TALER_TESTING_setup (main_cb,
-                                        main_cb_cls,
-                                        cfg,
-                                        exchanged,
-                                        GNUNET_YES);
-          print_stats ();
-          if (GNUNET_OK != result)
-            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                        "Failure in child process test suite!\n");
-          if (GNUNET_OK == result)
-            exit (0);
-          else
-            exit (1);
-        }
-        if (-1 == cpids[i])
-        {
-          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                               "fork");
-          howmany_clients = i;
-          result = GNUNET_SYSERR;
-          break;
-        }
-        /* fork() success, continue starting more processes! */
-      }
-      /* collect all children */
-      for (unsigned int i = 0; i<howmany_clients; i++)
-      {
-        waitpid (cpids[i],
-                 &wstatus,
-                 0);
-        if ( (! WIFEXITED (wstatus)) ||
-             (0 != WEXITSTATUS (wstatus)) )
-        {
-          GNUNET_break (0);
-          result = GNUNET_SYSERR;
-        }
-      }
-    }
-  }
-
-  /* Wait for our master to die or to tell us to die */
-  if (MODE_EXCHANGE == mode)
-    (void) getchar ();
-
-  if ( (GNUNET_YES == linger) &&
-       ( ((mode == MODE_BOTH) ||
-          (mode == MODE_CLIENT) ) ) )
-  {
-    printf ("press ENTER to stop\n");
-    (void) getchar ();
-  }
-
-  if (MODE_CLIENT == mode)
-  {
-    char c = 'q';
-
-    GNUNET_assert (NULL != exchange_slave);
-
-    /* Write a character to the pipe to end the exchange slave.
-     * We can't send a signal here, as it would just kill SSH and
-     * not necessarily the process on the other machine. */
-    GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
-                              (exchange_slave_pipe, GNUNET_DISK_PIPE_END_WRITE),
-                            &c, sizeof (c));
+      int wstatus;
 
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (exchange_slave));
-    GNUNET_OS_process_destroy (exchange_slave);
-  }
-
-  if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) )
-  {
-    GNUNET_assert (NULL != wirewatch);
-    GNUNET_assert (NULL != exchanged);
-    GNUNET_assert (NULL != auditord);
-    /* stop wirewatch */
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (wirewatch,
-                                          SIGTERM));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (wirewatch));
-    GNUNET_OS_process_destroy (wirewatch);
-    /* stop auditor */
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (auditord,
-                                          SIGTERM));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (auditord));
-    GNUNET_OS_process_destroy (auditord);
-    /* stop exchange */
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (exchanged,
-                                          SIGTERM));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (exchanged));
-    GNUNET_OS_process_destroy (exchanged);
-  }
-
-  if ( (MODE_CLIENT == mode) || (MODE_BOTH == mode) )
-  {
-    /* stop fakebank */
-    if (-1 != fakebank)
-    {
-      kill (fakebank,
-            SIGTERM);
-      waitpid (fakebank,
+      waitpid (cpids[i],
                &wstatus,
                0);
       if ( (! WIFEXITED (wstatus)) ||
@@ -887,12 +460,6 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
         result = GNUNET_SYSERR;
       }
     }
-    if (NULL != bankd)
-    {
-      GNUNET_OS_process_kill (bankd,
-                              SIGTERM);
-      GNUNET_OS_process_destroy (bankd);
-    }
   }
   return result;
 }
@@ -910,55 +477,65 @@ main (int argc,
       char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_mandatory
-      (GNUNET_GETOPT_option_cfgfile (&cfg_filename)),
-    GNUNET_GETOPT_option_version (PACKAGE_VERSION " " VCS_VERSION),
-    GNUNET_GETOPT_option_help ("Exchange benchmark"),
-    GNUNET_GETOPT_option_loglevel (&loglev),
-    GNUNET_GETOPT_option_uint ('n',
-                               "coins-number",
-                               "CN",
-                               "How many coins we should instantiate per reserve",
-                               &howmany_coins),
-    GNUNET_GETOPT_option_uint ('p',
-                               "parallelism",
-                               "NPROCS",
-                               "How many client processes we should run",
-                               &howmany_clients),
-    GNUNET_GETOPT_option_uint ('r',
-                               "reserves",
-                               "NRESERVES",
-                               "How many reserves per client we should create",
-                               &howmany_reserves),
-    GNUNET_GETOPT_option_uint ('R',
-                               "refresh-rate",
-                               "RATE",
-                               "Probability of refresh per coin (0-100)",
-                               &refresh_rate),
-    GNUNET_GETOPT_option_string ('m',
-                                 "mode",
-                                 "MODE",
-                                 "run as exchange, clients or both",
-                                 &mode_str),
-    GNUNET_GETOPT_option_string ('l',
-                                 "logfile",
-                                 "LF",
-                                 "will log to file LF",
-                                 &logfile),
-    GNUNET_GETOPT_option_flag ('f',
-                               "fakebank",
-                               "start a fakebank instead of the Python bank",
-                               &use_fakebank),
-    GNUNET_GETOPT_option_flag ('F',
-                               "reserves-first",
-                               "should all reserves be created first, before starting normal operations",
-                               &reserves_first),
-    GNUNET_GETOPT_option_flag ('K',
-                               "linger",
-                               "linger around until key press",
-                               &linger),
+    GNUNET_GETOPT_option_mandatory (
+      GNUNET_GETOPT_option_cfgfile (
+        &cfg_filename)),
+    GNUNET_GETOPT_option_version (
+      PACKAGE_VERSION " " VCS_VERSION),
+    GNUNET_GETOPT_option_flag (
+      'f',
+      "fakebank",
+      "use fakebank for the banking system",
+      &use_fakebank),
+    GNUNET_GETOPT_option_flag (
+      'F',
+      "reserves-first",
+      "should all reserves be created first, before starting normal operations",
+      &reserves_first),
+    GNUNET_GETOPT_option_help (
+      "Exchange benchmark"),
+    GNUNET_GETOPT_option_string (
+      'l',
+      "logfile",
+      "LF",
+      "will log to file LF",
+      &logfile),
+    GNUNET_GETOPT_option_loglevel (
+      &loglev),
+    GNUNET_GETOPT_option_uint (
+      'n',
+      "coins-number",
+      "CN",
+      "How many coins we should instantiate per reserve",
+      &howmany_coins),
+    GNUNET_GETOPT_option_uint (
+      'p',
+      "parallelism",
+      "NPROCS",
+      "How many client processes we should run",
+      &howmany_clients),
+    GNUNET_GETOPT_option_uint (
+      'r',
+      "reserves",
+      "NRESERVES",
+      "How many reserves per client we should create",
+      &howmany_reserves),
+    GNUNET_GETOPT_option_uint (
+      'R',
+      "refresh-rate",
+      "RATE",
+      "Probability of refresh per coin (0-100)",
+      &refresh_rate),
+    GNUNET_GETOPT_option_string (
+      'u',
+      "exchange-account-section",
+      "SECTION",
+      "use exchange bank account configuration from the given SECTION",
+      &exchange_bank_section),
     GNUNET_GETOPT_OPTION_END
   };
+  enum GNUNET_GenericReturnValue result;
+  struct GNUNET_TIME_Relative duration;
 
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
@@ -971,25 +548,15 @@ main (int argc,
     GNUNET_free (cfg_filename);
     if (GNUNET_NO == result)
       return 0;
-    return BAD_CLI_ARG;
+    return EXIT_INVALIDARGUMENT;
   }
+  if (NULL == exchange_bank_section)
+    exchange_bank_section = "exchange-account-1";
+  if (NULL == loglev)
+    loglev = "INFO";
   GNUNET_log_setup ("taler-exchange-benchmark",
-                    NULL == loglev ? "INFO" : loglev,
+                    loglev,
                     logfile);
-  if (NULL == mode_str)
-    mode = MODE_BOTH;
-  else if (0 == strcmp (mode_str, "exchange"))
-    mode = MODE_EXCHANGE;
-  else if (0 == strcmp (mode_str, "client"))
-    mode = MODE_CLIENT;
-  else if (0 == strcmp (mode_str, "both"))
-    mode = MODE_BOTH;
-  else
-  {
-    TALER_LOG_ERROR ("Unknown mode given: '%s'\n", mode_str);
-    GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
-  }
   if (NULL == cfg_filename)
     cfg_filename = GNUNET_CONFIGURATION_default_filename ();
   if (NULL == cfg_filename)
@@ -1005,7 +572,7 @@ main (int argc,
   {
     TALER_LOG_ERROR ("Could not parse configuration\n");
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_NOTCONFIGURED;
   }
   if (GNUNET_OK !=
       TALER_config_get_currency (cfg,
@@ -1013,177 +580,91 @@ main (int argc,
   {
     GNUNET_CONFIGURATION_destroy (cfg);
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_NOTCONFIGURED;
   }
   if (howmany_clients > 10240)
   {
     TALER_LOG_ERROR ("-p option value given is too large\n");
-    return BAD_CLI_ARG;
+    return EXIT_INVALIDARGUMENT;
   }
   if (0 == howmany_clients)
   {
     TALER_LOG_ERROR ("-p option value must not be zero\n");
     GNUNET_free (cfg_filename);
-    return BAD_CLI_ARG;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "benchmark",
-                                             "USER_PAYTO_URI",
-                                             &user_payto_uri))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "benchmark",
-                               "USER_PAYTO_URI");
-    GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_INVALIDARGUMENT;
   }
 
   if (GNUNET_OK !=
-      TALER_EXCHANGEDB_load_accounts (cfg,
-                                      TALER_EXCHANGEDB_ALO_AUTHDATA
-                                      | TALER_EXCHANGEDB_ALO_CREDIT))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Configuration fails to provide exchange bank details\n");
-    GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
-  }
-
-  exchange_bank_account
-    = TALER_EXCHANGEDB_find_account_by_method ("x-taler-bank");
-  if (NULL == exchange_bank_account)
+      TALER_TESTING_get_credentials (
+        cfg_filename,
+        exchange_bank_section,
+        use_fakebank
+        ? TALER_TESTING_BS_FAKEBANK
+        : TALER_TESTING_BS_IBAN,
+        &cred))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No bank account for `x-taler-bank` given in configuration\n");
+                "Required bank credentials not given in configuration\n");
     GNUNET_free (cfg_filename);
-    return BAD_CONFIG_FILE;
+    return EXIT_NOTCONFIGURED;
   }
-  if ( (MODE_EXCHANGE == mode) || (MODE_BOTH == mode) )
-  {
-    struct GNUNET_OS_Process *compute_wire_response;
 
-    compute_wire_response
-      = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                 NULL, NULL, NULL,
-                                 "taler-exchange-wire",
-                                 "taler-exchange-wire",
-                                 "-c", cfg_filename,
-                                 NULL);
-    if (NULL == compute_wire_response)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to run `taler-exchange-wire`, is your PATH correct?\n");
-      GNUNET_free (cfg_filename);
-      return BAD_CONFIG_FILE;
-    }
-    GNUNET_OS_process_wait (compute_wire_response);
-    GNUNET_OS_process_destroy (compute_wire_response);
-    /* If we use the fakebank, we MUST reset the database as the fakebank
-       will have forgotten everything... */
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_TESTING_prepare_exchange (cfg_filename,
-                                                   (GNUNET_YES == use_fakebank)
-                                                   ? GNUNET_YES
-                                                   : GNUNET_NO,
-                                                   &ec));
-  }
-  else
   {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (cfg,
-                                               "exchange",
-                                               "BASE_URL",
-                                               &ec.exchange_url))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "exchange",
-                                 "base_url");
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (cfg_filename);
-      return BAD_CONFIG_FILE;
-    }
-
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (cfg,
-                                               "benchmark-remote-exchange",
-                                               "host",
-                                               &remote_host))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "benchmark-remote-exchange",
-                                 "host");
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (cfg_filename);
-      return BAD_CONFIG_FILE;
-    }
+    struct GNUNET_TIME_Absolute start_time;
 
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (cfg,
-                                               "benchmark-remote-exchange",
-                                               "dir",
-                                               &remote_dir))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "benchmark-remote-exchange",
-                                 "dir");
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (cfg_filename);
-      return BAD_CONFIG_FILE;
-    }
+    start_time = GNUNET_TIME_absolute_get ();
+    result = parallel_benchmark (&run,
+                                 NULL,
+                                 cfg_filename);
+    duration = GNUNET_TIME_absolute_get_duration (start_time);
   }
 
-  result = parallel_benchmark (&run,
-                               NULL,
-                               cfg_filename);
-  TALER_EXCHANGEDB_unload_accounts ();
-  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free (cfg_filename);
-
-  /* If we're the exchange worker, we're done now.  No need to print results */
-  if (MODE_EXCHANGE == mode)
-  {
-    return (GNUNET_OK == result) ? 0 : result;
-  }
-  duration = GNUNET_TIME_absolute_get_duration (start_time);
   if (GNUNET_OK == result)
   {
     struct rusage usage;
-    GNUNET_assert (0 == getrusage (RUSAGE_CHILDREN, &usage));
+
+    GNUNET_assert (0 == getrusage (RUSAGE_CHILDREN,
+                                   &usage));
     fprintf (stdout,
-             "Executed (Withdraw=%u, Deposit=%u, Refresh~=%5.2f) * Reserve=%u * Parallel=%u, operations in %s\n",
+             "Executed (Withdraw=%u, Deposit=%u, Refresh~=%5.2f)"
+             " * Reserve=%u * Parallel=%u, operations in %s\n",
              howmany_coins,
              howmany_coins,
              (float) howmany_coins * (refresh_rate / 100.0),
              howmany_reserves,
              howmany_clients,
-             GNUNET_STRINGS_relative_time_to_string
-               (duration,
-               GNUNET_NO));
+             GNUNET_STRINGS_relative_time_to_string (
+               duration,
+               false));
     fprintf (stdout,
              "(approximately %s/coin)\n",
-             GNUNET_STRINGS_relative_time_to_string
-               (GNUNET_TIME_relative_divide (duration,
-                                             (unsigned long long) howmany_coins
-                                             * howmany_reserves
-                                             * howmany_clients),
-               GNUNET_YES));
+             GNUNET_STRINGS_relative_time_to_string (
+               GNUNET_TIME_relative_divide (
+                 duration,
+                 (unsigned long long) howmany_coins
+                 * howmany_reserves
+                 * howmany_clients),
+               true));
     fprintf (stdout,
              "RAW: %04u %04u %04u %16llu\n",
              howmany_coins,
              howmany_reserves,
              howmany_clients,
              (unsigned long long) duration.rel_value_us);
-    fprintf (stdout, "cpu time: sys %llu user %llu\n", \
+    fprintf (stdout,
+             "cpu time: sys %llu user %llu\n",
              (unsigned long long) (usage.ru_stime.tv_sec * 1000 * 1000
                                    + usage.ru_stime.tv_usec),
              (unsigned long long) (usage.ru_utime.tv_sec * 1000 * 1000
                                    + usage.ru_utime.tv_usec));
   }
+
   for (unsigned int i = 0; i<label_off; i++)
     GNUNET_free (labels[i]);
   GNUNET_array_grow (labels,
                      label_len,
                      0);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (cfg_filename);
   return (GNUNET_OK == result) ? 0 : result;
 }
diff --git a/src/curl/Makefile.am b/src/curl/Makefile.am
index f60a3806d..c8f8761aa 100644
--- a/src/curl/Makefile.am
+++ b/src/curl/Makefile.am
@@ -17,7 +17,7 @@ libtalercurl_la_SOURCES = \
 libtalercurl_la_LIBADD = \
   -lgnunetcurl \
   -lgnunetutil \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   -ljansson \
   -lz \
   -lm \
diff --git a/src/curl/curl.c b/src/curl/curl.c
index 5009fa3cf..483c9b671 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2019-2021 Taler Systems SA
+  Copyright (C) 2019-2024 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
@@ -30,6 +30,58 @@
 #endif
 
 
+void
+TALER_curl_set_secure_redirect_policy (CURL *eh,
+                                       const char *url)
+{
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_FOLLOWLOCATION,
+                                   1L));
+  GNUNET_assert ( (0 == strncasecmp (url,
+                                     "https://",
+                                     strlen ("https://"))) ||
+                  (0 == strncasecmp (url,
+                                     "http://",
+                                     strlen ("http://"))) );
+#ifdef CURLOPT_REDIR_PROTOCOLS_STR
+  if (0 == strncasecmp (url,
+                        "https://",
+                        strlen ("https://")))
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS_STR,
+                                     "https"));
+  else
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS_STR,
+                                     "http,https"));
+#else
+#ifdef CURLOPT_REDIR_PROTOCOLS
+  if (0 == strncasecmp (url,
+                        "https://",
+                        strlen ("https://")))
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS,
+                                     CURLPROTO_HTTPS));
+  else
+    GNUNET_assert (CURLE_OK ==
+                   curl_easy_setopt (eh,
+                                     CURLOPT_REDIR_PROTOCOLS,
+                                     CURLPROTO_HTTP | CURLPROTO_HTTPS));
+#endif
+#endif
+  /* limit MAXREDIRS to 5 as a simple security measure against
+     a potential infinite loop caused by a malicious target */
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   5L));
+}
+
+
 enum GNUNET_GenericReturnValue
 TALER_curl_easy_post (struct TALER_CURL_PostContext *ctx,
                       CURL *eh,
@@ -46,7 +98,8 @@ TALER_curl_easy_post (struct TALER_CURL_PostContext *ctx,
     return GNUNET_SYSERR;
   }
   slen = strlen (str);
-#if TALER_CURL_COMPRESS_BODIES
+  if (TALER_CURL_COMPRESS_BODIES &&
+      (! ctx->disable_compression) )
   {
     Bytef *cbuf;
     uLongf cbuf_size;
@@ -68,18 +121,21 @@ TALER_curl_easy_post (struct TALER_CURL_PostContext *ctx,
     free (str);
     slen = (size_t) cbuf_size;
     ctx->json_enc = (char *) cbuf;
+    GNUNET_assert (
+      NULL !=
+      (ctx->headers = curl_slist_append (
+         ctx->headers,
+         "Content-Encoding: deflate")));
   }
-  GNUNET_assert (NULL != (ctx->headers = curl_slist_append (
-                            ctx->headers,
-                            "Content-Encoding: deflate")));
-#else
-  ctx->json_enc = str;
-#endif
-
-  GNUNET_assert
-    (NULL != (ctx->headers = curl_slist_append (
-                ctx->headers,
-                "Content-Type: application/json")));
+  else
+  {
+    ctx->json_enc = str;
+  }
+  GNUNET_assert (
+    NULL !=
+    (ctx->headers = curl_slist_append (
+       ctx->headers,
+       "Content-Type: application/json")));
 
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
diff --git a/src/exchange-tools/Makefile.am b/src/exchange-tools/Makefile.am
index 15e34cb35..955544564 100644
--- a/src/exchange-tools/Makefile.am
+++ b/src/exchange-tools/Makefile.am
@@ -15,8 +15,7 @@ endif
 bin_PROGRAMS = \
   taler-auditor-offline \
   taler-exchange-offline \
-  taler-exchange-dbinit \
-  taler-crypto-worker
+  taler-exchange-dbinit
 
 taler_exchange_offline_SOURCES = \
   taler-exchange-offline.c
@@ -60,20 +59,6 @@ taler_exchange_dbinit_CPPFLAGS = \
   -I$(top_srcdir)/src/pq/ \
   $(POSTGRESQL_CPPFLAGS)
 
-taler_crypto_worker_SOURCES = \
-  taler-crypto-worker.c
-taler_crypto_worker_LDADD = \
-  $(top_builddir)/src/util/libtalerutil.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  -lgnunetutil \
-  -lgnunetjson \
-  -ljansson \
-  -lpthread \
-  $(LIBGCRYPT_LIBS) \
-  $(XLIB)
-
-
-
 
 # Testcases
 
diff --git a/src/exchange-tools/exchange-offline.conf b/src/exchange-tools/exchange-offline.conf
index cfd5c98ef..020eb34ba 100644
--- a/src/exchange-tools/exchange-offline.conf
+++ b/src/exchange-tools/exchange-offline.conf
@@ -3,10 +3,10 @@
 [exchange-offline]
 
 # Where do we store the offline master private key of the exchange?
-MASTER_PRIV_FILE = ${TALER_DATA_HOME}/exchange-offline/master.priv
+MASTER_PRIV_FILE = ${TALER_DATA_HOME}exchange-offline/master.priv
 
 # Where do we store the TOFU key material?
-SECM_TOFU_FILE = ${TALER_DATA_HOME}/exchange-offline/secm_tofus.pub
+SECM_TOFU_FILE = ${TALER_DATA_HOME}exchange-offline/secm_tofus.pub
 
 # Base32-encoded public key of the RSA helper.
 # SECM_DENOM_PUBKEY =
diff --git a/src/exchange-tools/taler-auditor-offline.c b/src/exchange-tools/taler-auditor-offline.c
index 53135d9fa..8c280d46b 100644
--- a/src/exchange-tools/taler-auditor-offline.c
+++ b/src/exchange-tools/taler-auditor-offline.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020-2021 Taler Systems SA
+  Copyright (C) 2020-2023 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
@@ -174,7 +174,7 @@ static struct DenominationAddRequest *dar_tail;
 /**
  * Handle to the exchange, used to request /keys.
  */
-static struct TALER_EXCHANGE_Handle *exchange;
+static struct TALER_EXCHANGE_GetKeysHandle *exchange;
 
 
 /**
@@ -219,7 +219,7 @@ do_shutdown (void *cls)
   }
   if (NULL != exchange)
   {
-    TALER_EXCHANGE_disconnect (exchange);
+    TALER_EXCHANGE_get_keys_cancel (exchange);
     exchange = NULL;
   }
   if (NULL != nxt)
@@ -388,14 +388,15 @@ load_offline_key (int do_create)
  * add operation result.
  *
  * @param cls closure with a `struct DenominationAddRequest`
- * @param hr HTTP response data
+ * @param adr response data
  */
 static void
 denomination_add_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_AuditorAddDenominationResponse *adr)
 {
   struct DenominationAddRequest *dar = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &adr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -644,30 +645,24 @@ do_upload (char *const *args)
  * a particular exchange and what keys the exchange is using.
  *
  * @param cls closure with the `char **` remaining args
- * @param hr HTTP response data
- * @param keys information about the various keys used
- *        by the exchange, NULL if /keys failed
- * @param compat protocol compatibility information
+ * @param kr response data
+ * @param keys key data from the exchange
  */
 static void
 keys_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_EXCHANGE_Keys *keys,
-  enum TALER_EXCHANGE_VersionCompatibility compat)
+  const struct TALER_EXCHANGE_KeysResponse *kr,
+  struct TALER_EXCHANGE_Keys *keys)
 {
   char *const *args = cls;
 
-  (void) keys;
-  (void) compat;
-  switch (hr->http_status)
+  exchange = NULL;
+  switch (kr->hr.http_status)
   {
   case MHD_HTTP_OK:
-    if (! json_is_object (hr->reply))
+    if (NULL == kr->hr.reply)
     {
       GNUNET_break (0);
-      TALER_EXCHANGE_disconnect (exchange);
-      exchange = NULL;
       test_shutdown ();
       global_ret = EXIT_FAILURE;
       return;
@@ -676,11 +671,9 @@ keys_cb (
   default:
     fprintf (stderr,
              "Failed to download keys: %s (HTTP status: %u/%u)\n",
-             hr->hint,
-             hr->http_status,
-             (unsigned int) hr->ec);
-    TALER_EXCHANGE_disconnect (exchange);
-    exchange = NULL;
+             kr->hr.hint,
+             kr->hr.http_status,
+             (unsigned int) kr->hr.ec);
     test_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
@@ -689,7 +682,7 @@ keys_cb (
     GNUNET_JSON_pack_string ("operation",
                              OP_INPUT_KEYS),
     GNUNET_JSON_pack_object_incref ("arguments",
-                                    (json_t *) hr->reply));
+                                    (json_t *) kr->hr.reply));
   if (NULL == args[0])
   {
     json_dumpf (in,
@@ -698,9 +691,8 @@ keys_cb (
     json_decref (in);
     in = NULL;
   }
-  TALER_EXCHANGE_disconnect (exchange);
-  exchange = NULL;
   next (args);
+  TALER_EXCHANGE_keys_decref (keys);
 }
 
 
@@ -727,11 +719,11 @@ do_download (char *const *args)
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
-  exchange = TALER_EXCHANGE_connect (ctx,
-                                     exchange_url,
-                                     &keys_cb,
-                                     (void *) args,
-                                     TALER_EXCHANGE_OPTION_END);
+  exchange = TALER_EXCHANGE_get_keys (ctx,
+                                      exchange_url,
+                                      NULL,
+                                      &keys_cb,
+                                      (void *) args);
   GNUNET_free (exchange_url);
 }
 
@@ -742,46 +734,27 @@ do_download (char *const *args)
  * @param denomkeys keys to output
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 show_denomkeys (const json_t *denomkeys)
 {
   size_t index;
   json_t *value;
 
   json_array_foreach (denomkeys, index, value) {
+    struct TALER_DenominationGroup group;
+    const json_t *denoms;
     const char *err_name;
     unsigned int err_line;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct GNUNET_TIME_Timestamp stamp_start;
-    struct GNUNET_TIME_Timestamp stamp_expire_withdraw;
-    struct GNUNET_TIME_Timestamp stamp_expire_deposit;
-    struct GNUNET_TIME_Timestamp stamp_expire_legal;
-    struct TALER_Amount coin_value;
-    struct TALER_DenomFeeSet fees;
-    struct TALER_MasterSignatureP master_sig;
     struct GNUNET_JSON_Specification spec[] = {
-      TALER_JSON_spec_denom_pub ("denom_pub",
-                                 &denom_pub),
-      TALER_JSON_spec_amount ("value",
-                              currency,
-                              &coin_value),
-      TALER_JSON_SPEC_DENOM_FEES ("fee",
-                                  currency,
-                                  &fees),
-      GNUNET_JSON_spec_timestamp ("stamp_start",
-                                  &stamp_start),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_withdraw",
-                                  &stamp_expire_withdraw),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_deposit",
-                                  &stamp_expire_deposit),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_legal",
-                                  &stamp_expire_legal),
-      GNUNET_JSON_spec_fixed_auto ("master_sig",
-                                   &master_sig),
+      TALER_JSON_spec_denomination_group (NULL,
+                                          currency,
+                                          &group),
+      GNUNET_JSON_spec_array_const ("denoms",
+                                    &denoms),
       GNUNET_JSON_spec_end ()
     };
-    struct GNUNET_TIME_Relative duration;
-    struct TALER_DenominationHashP h_denom_pub;
+    size_t index2;
+    json_t *value2;
 
     if (GNUNET_OK !=
         GNUNET_JSON_parse (value,
@@ -799,70 +772,116 @@ show_denomkeys (const json_t *denomkeys)
       test_shutdown ();
       return GNUNET_SYSERR;
     }
-    duration = GNUNET_TIME_absolute_get_difference (
-      stamp_start.abs_time,
-      stamp_expire_withdraw.abs_time);
-    TALER_denom_pub_hash (&denom_pub,
-                          &h_denom_pub);
-    if (GNUNET_OK !=
-        TALER_exchange_offline_denom_validity_verify (
-          &h_denom_pub,
-          stamp_start,
-          stamp_expire_withdraw,
-          stamp_expire_deposit,
-          stamp_expire_legal,
-          &coin_value,
-          &fees,
-          &master_pub,
-          &master_sig))
-    {
-      fprintf (stderr,
-               "Invalid master signature for key %s (aborting)\n",
-               TALER_B2S (&h_denom_pub));
-      global_ret = EXIT_FAILURE;
-      test_shutdown ();
-      return GNUNET_SYSERR;
-    }
+    json_array_foreach (denoms, index2, value2) {
+      struct GNUNET_TIME_Timestamp stamp_start;
+      struct GNUNET_TIME_Timestamp stamp_expire_withdraw;
+      struct GNUNET_TIME_Timestamp stamp_expire_deposit;
+      struct GNUNET_TIME_Timestamp stamp_expire_legal;
+      struct TALER_DenominationPublicKey denom_pub;
+      struct TALER_MasterSignatureP master_sig;
+      struct GNUNET_JSON_Specification ispec[] = {
+        TALER_JSON_spec_denom_pub_cipher (NULL,
+                                          group.cipher,
+                                          &denom_pub),
+        GNUNET_JSON_spec_timestamp ("stamp_start",
+                                    &stamp_start),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_withdraw",
+                                    &stamp_expire_withdraw),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_deposit",
+                                    &stamp_expire_deposit),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_legal",
+                                    &stamp_expire_legal),
+        GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                     &master_sig),
+        GNUNET_JSON_spec_end ()
+      };
+      struct GNUNET_TIME_Relative duration;
+      struct TALER_DenominationHashP h_denom_pub;
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (value2,
+                             ispec,
+                             &err_name,
+                             &err_line))
+      {
+        fprintf (stderr,
+                 "Invalid input for denomination key to 'show': %s#%u at %u/%u (skipping)\n",
+                 err_name,
+                 err_line,
+                 (unsigned int) index,
+                 (unsigned int) index2);
+        GNUNET_JSON_parse_free (spec);
+        global_ret = EXIT_FAILURE;
+        test_shutdown ();
+        return GNUNET_SYSERR;
+      }
+      duration = GNUNET_TIME_absolute_get_difference (
+        stamp_start.abs_time,
+        stamp_expire_withdraw.abs_time);
+      TALER_denom_pub_hash (&denom_pub,
+                            &h_denom_pub);
+      if (GNUNET_OK !=
+          TALER_exchange_offline_denom_validity_verify (
+            &h_denom_pub,
+            stamp_start,
+            stamp_expire_withdraw,
+            stamp_expire_deposit,
+            stamp_expire_legal,
+            &group.value,
+            &group.fees,
+            &master_pub,
+            &master_sig))
+      {
+        fprintf (stderr,
+                 "Invalid master signature for key %s (aborting)\n",
+                 TALER_B2S (&h_denom_pub));
+        global_ret = EXIT_FAILURE;
+        GNUNET_JSON_parse_free (ispec);
+        GNUNET_JSON_parse_free (spec);
+        test_shutdown ();
+        return GNUNET_SYSERR;
+      }
 
-    {
-      char *withdraw_fee_s;
-      char *deposit_fee_s;
-      char *refresh_fee_s;
-      char *refund_fee_s;
-      char *deposit_s;
-      char *legal_s;
-
-      withdraw_fee_s = TALER_amount_to_string (&fees.withdraw);
-      deposit_fee_s = TALER_amount_to_string (&fees.deposit);
-      refresh_fee_s = TALER_amount_to_string (&fees.refresh);
-      refund_fee_s = TALER_amount_to_string (&fees.refund);
-      deposit_s = GNUNET_strdup (
-        GNUNET_TIME_timestamp2s (stamp_expire_deposit));
-      legal_s = GNUNET_strdup (
-        GNUNET_TIME_timestamp2s (stamp_expire_legal));
-
-      printf (
-        "DENOMINATION-KEY %s of value %s starting at %s "
-        "(used for: %s, deposit until: %s legal end: %s) with fees %s/%s/%s/%s\n",
-        TALER_B2S (&h_denom_pub),
-        TALER_amount2s (&coin_value),
-        GNUNET_TIME_timestamp2s (stamp_start),
-        GNUNET_TIME_relative2s (duration,
-                                false),
-        deposit_s,
-        legal_s,
-        withdraw_fee_s,
-        deposit_fee_s,
-        refresh_fee_s,
-        refund_fee_s);
-      GNUNET_free (withdraw_fee_s);
-      GNUNET_free (deposit_fee_s);
-      GNUNET_free (refresh_fee_s);
-      GNUNET_free (refund_fee_s);
-      GNUNET_free (deposit_s);
-      GNUNET_free (legal_s);
+      {
+        char *withdraw_fee_s;
+        char *deposit_fee_s;
+        char *refresh_fee_s;
+        char *refund_fee_s;
+        char *deposit_s;
+        char *legal_s;
+
+        withdraw_fee_s = TALER_amount_to_string (&group.fees.withdraw);
+        deposit_fee_s = TALER_amount_to_string (&group.fees.deposit);
+        refresh_fee_s = TALER_amount_to_string (&group.fees.refresh);
+        refund_fee_s = TALER_amount_to_string (&group.fees.refund);
+        deposit_s = GNUNET_strdup (
+          GNUNET_TIME_timestamp2s (stamp_expire_deposit));
+        legal_s = GNUNET_strdup (
+          GNUNET_TIME_timestamp2s (stamp_expire_legal));
+
+        printf (
+          "DENOMINATION-KEY %s of value %s starting at %s "
+          "(used for: %s, deposit until: %s legal end: %s) with fees %s/%s/%s/%s\n",
+          TALER_B2S (&h_denom_pub),
+          TALER_amount2s (&group.value),
+          GNUNET_TIME_timestamp2s (stamp_start),
+          GNUNET_TIME_relative2s (duration,
+                                  false),
+          deposit_s,
+          legal_s,
+          withdraw_fee_s,
+          deposit_fee_s,
+          refresh_fee_s,
+          refund_fee_s);
+        GNUNET_free (withdraw_fee_s);
+        GNUNET_free (deposit_fee_s);
+        GNUNET_free (refresh_fee_s);
+        GNUNET_free (refund_fee_s);
+        GNUNET_free (deposit_s);
+        GNUNET_free (legal_s);
+      }
+      GNUNET_JSON_parse_free (ispec);
     }
-
     GNUNET_JSON_parse_free (spec);
   }
   return GNUNET_OK;
@@ -956,11 +975,11 @@ do_show (char *const *args)
   json_t *keys;
   const char *err_name;
   unsigned int err_line;
-  json_t *denomkeys;
+  const json_t *denomkeys;
   struct TALER_MasterPublicKeyP mpub;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("denoms",
-                           &denomkeys),
+    GNUNET_JSON_spec_array_const ("denominations",
+                                  &denomkeys),
     GNUNET_JSON_spec_fixed_auto ("master_public_key",
                                  &mpub),
     GNUNET_JSON_spec_end ()
@@ -1004,11 +1023,9 @@ do_show (char *const *args)
   {
     global_ret = EXIT_FAILURE;
     test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
     json_decref (keys);
     return;
   }
-  GNUNET_JSON_parse_free (spec);
   json_decref (keys);
   /* do NOT consume input if next argument is '-' */
   if ( (NULL != args[0]) &&
@@ -1028,45 +1045,27 @@ do_show (char *const *args)
  * @param denomkeys keys to output
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 sign_denomkeys (const json_t *denomkeys)
 {
-  size_t index;
+  size_t group_idx;
   json_t *value;
 
-  json_array_foreach (denomkeys, index, value) {
+  json_array_foreach (denomkeys, group_idx, value) {
+    struct TALER_DenominationGroup group = { 0 };
+    const json_t *denom_keys_array;
     const char *err_name;
     unsigned int err_line;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct GNUNET_TIME_Timestamp stamp_start;
-    struct GNUNET_TIME_Timestamp stamp_expire_withdraw;
-    struct GNUNET_TIME_Timestamp stamp_expire_deposit;
-    struct GNUNET_TIME_Timestamp stamp_expire_legal;
-    struct TALER_Amount coin_value;
-    struct TALER_DenomFeeSet fees;
-    struct TALER_MasterSignatureP master_sig;
     struct GNUNET_JSON_Specification spec[] = {
-      TALER_JSON_spec_denom_pub ("denom_pub",
-                                 &denom_pub),
-      TALER_JSON_spec_amount ("value",
-                              currency,
-                              &coin_value),
-      TALER_JSON_SPEC_DENOM_FEES ("fee",
-                                  currency,
-                                  &fees),
-      GNUNET_JSON_spec_timestamp ("stamp_start",
-                                  &stamp_start),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_withdraw",
-                                  &stamp_expire_withdraw),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_deposit",
-                                  &stamp_expire_deposit),
-      GNUNET_JSON_spec_timestamp ("stamp_expire_legal",
-                                  &stamp_expire_legal),
-      GNUNET_JSON_spec_fixed_auto ("master_sig",
-                                   &master_sig),
+      TALER_JSON_spec_denomination_group (NULL,
+                                          currency,
+                                          &group),
+      GNUNET_JSON_spec_array_const ("denoms",
+                                    &denom_keys_array),
       GNUNET_JSON_spec_end ()
     };
-    struct TALER_DenominationHashP h_denom_pub;
+    size_t index;
+    json_t *denom_key_obj;
 
     if (GNUNET_OK !=
         GNUNET_JSON_parse (value,
@@ -1078,54 +1077,100 @@ sign_denomkeys (const json_t *denomkeys)
                "Invalid input for denomination key to 'sign': %s#%u at %u (skipping)\n",
                err_name,
                err_line,
-               (unsigned int) index);
+               (unsigned int) group_idx);
       GNUNET_JSON_parse_free (spec);
       global_ret = EXIT_FAILURE;
       test_shutdown ();
       return GNUNET_SYSERR;
     }
-    TALER_denom_pub_hash (&denom_pub,
-                          &h_denom_pub);
-    if (GNUNET_OK !=
-        TALER_exchange_offline_denom_validity_verify (
-          &h_denom_pub,
-          stamp_start,
-          stamp_expire_withdraw,
-          stamp_expire_deposit,
-          stamp_expire_legal,
-          &coin_value,
-          &fees,
-          &master_pub,
-          &master_sig))
-    {
-      fprintf (stderr,
-               "Invalid master signature for key %s (aborting)\n",
-               TALER_B2S (&h_denom_pub));
-      global_ret = EXIT_FAILURE;
-      test_shutdown ();
-      return GNUNET_SYSERR;
-    }
+    json_array_foreach (denom_keys_array, index, denom_key_obj) {
+      struct GNUNET_TIME_Timestamp stamp_start;
+      struct GNUNET_TIME_Timestamp stamp_expire_withdraw;
+      struct GNUNET_TIME_Timestamp stamp_expire_deposit;
+      struct GNUNET_TIME_Timestamp stamp_expire_legal;
+      struct TALER_DenominationPublicKey denom_pub = {
+        .age_mask = group.age_mask
+      };
+      struct TALER_MasterSignatureP master_sig;
+      struct GNUNET_JSON_Specification ispec[] = {
+        TALER_JSON_spec_denom_pub_cipher (NULL,
+                                          group.cipher,
+                                          &denom_pub),
+        GNUNET_JSON_spec_timestamp ("stamp_start",
+                                    &stamp_start),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_withdraw",
+                                    &stamp_expire_withdraw),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_deposit",
+                                    &stamp_expire_deposit),
+        GNUNET_JSON_spec_timestamp ("stamp_expire_legal",
+                                    &stamp_expire_legal),
+        GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                     &master_sig),
+        GNUNET_JSON_spec_end ()
+      };
+      struct TALER_DenominationHashP h_denom_pub;
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (denom_key_obj,
+                             ispec,
+                             &err_name,
+                             &err_line))
+      {
+        fprintf (stderr,
+                 "Invalid input for denomination key to 'show': %s#%u at %u/%u (skipping)\n",
+                 err_name,
+                 err_line,
+                 (unsigned int) group_idx,
+                 (unsigned int) index);
+        GNUNET_JSON_parse_free (spec);
+        global_ret = EXIT_FAILURE;
+        test_shutdown ();
+        return GNUNET_SYSERR;
+      }
+      TALER_denom_pub_hash (&denom_pub,
+                            &h_denom_pub);
+      if (GNUNET_OK !=
+          TALER_exchange_offline_denom_validity_verify (
+            &h_denom_pub,
+            stamp_start,
+            stamp_expire_withdraw,
+            stamp_expire_deposit,
+            stamp_expire_legal,
+            &group.value,
+            &group.fees,
+            &master_pub,
+            &master_sig))
+      {
+        fprintf (stderr,
+                 "Invalid master signature for key %s (aborting)\n",
+                 TALER_B2S (&h_denom_pub));
+        global_ret = EXIT_FAILURE;
+        test_shutdown ();
+        return GNUNET_SYSERR;
+      }
 
-    {
-      struct TALER_AuditorSignatureP auditor_sig;
-
-      TALER_auditor_denom_validity_sign (auditor_url,
-                                         &h_denom_pub,
-                                         &master_pub,
-                                         stamp_start,
-                                         stamp_expire_withdraw,
-                                         stamp_expire_deposit,
-                                         stamp_expire_legal,
-                                         &coin_value,
-                                         &fees,
-                                         &auditor_priv,
-                                         &auditor_sig);
-      output_operation (OP_SIGN_DENOMINATION,
-                        GNUNET_JSON_PACK (
-                          GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                                      &h_denom_pub),
-                          GNUNET_JSON_pack_data_auto ("auditor_sig",
-                                                      &auditor_sig)));
+      {
+        struct TALER_AuditorSignatureP auditor_sig;
+
+        TALER_auditor_denom_validity_sign (auditor_url,
+                                           &h_denom_pub,
+                                           &master_pub,
+                                           stamp_start,
+                                           stamp_expire_withdraw,
+                                           stamp_expire_deposit,
+                                           stamp_expire_legal,
+                                           &group.value,
+                                           &group.fees,
+                                           &auditor_priv,
+                                           &auditor_sig);
+        output_operation (OP_SIGN_DENOMINATION,
+                          GNUNET_JSON_PACK (
+                            GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                                        &h_denom_pub),
+                            GNUNET_JSON_pack_data_auto ("auditor_sig",
+                                                        &auditor_sig)));
+      }
+      GNUNET_JSON_parse_free (ispec);
     }
     GNUNET_JSON_parse_free (spec);
   }
@@ -1145,10 +1190,10 @@ do_sign (char *const *args)
   const char *err_name;
   unsigned int err_line;
   struct TALER_MasterPublicKeyP mpub;
-  json_t *denomkeys;
+  const json_t *denomkeys;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("denoms",
-                           &denomkeys),
+    GNUNET_JSON_spec_array_const ("denominations",
+                                  &denomkeys),
     GNUNET_JSON_spec_fixed_auto ("master_public_key",
                                  &mpub),
     GNUNET_JSON_spec_end ()
@@ -1203,11 +1248,9 @@ do_sign (char *const *args)
   {
     global_ret = EXIT_FAILURE;
     test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
     json_decref (keys);
     return;
   }
-  GNUNET_JSON_parse_free (spec);
   json_decref (keys);
   next (args);
 }
diff --git a/src/exchange-tools/taler-crypto-worker.c b/src/exchange-tools/taler-crypto-worker.c
deleted file mode 100644
index d5ba4feec..000000000
--- a/src/exchange-tools/taler-crypto-worker.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2021 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/>
-*/
-/**
- * @file exchange-tools/taler-crypto-worker.c
- * @brief Standalone process to perform various cryptographic operations.
- * @author Florian Dold
- */
-#include "platform.h"
-#include "taler_util.h"
-#include <gnunet/gnunet_json_lib.h>
-#include <gnunet/gnunet_crypto_lib.h>
-#include "taler_error_codes.h"
-#include "taler_json_lib.h"
-#include "taler_signatures.h"
-
-
-/**
- * Return value from main().
- */
-static int global_ret;
-
-
-/**
- * Main function that will be run under the GNUnet scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  (void) cls;
-  (void) args;
-  (void) cfgfile;
-
-  json_t *req;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "started crypto worker\n");
-
-  for (;;)
-  {
-    const char *op;
-    const json_t *args;
-    req = json_loadf (stdin, JSON_DISABLE_EOF_CHECK, NULL);
-    if (NULL == req)
-    {
-      if (feof (stdin))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "end of input\n");
-        global_ret = 0;
-        return;
-      }
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "invalid JSON\n");
-      global_ret = 1;
-      return;
-    }
-    op = json_string_value (json_object_get (req,
-                                             "op"));
-    if (! op)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "no op specified\n");
-      global_ret = 1;
-      return;
-    }
-    args = json_object_get (req, "args");
-    if (! args)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "no args specified\n");
-      global_ret = 1;
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "got request\n");
-    if (0 == strcmp ("eddsa_get_public",
-                     op))
-    {
-      struct GNUNET_CRYPTO_EddsaPublicKey eddsa_pub;
-      struct GNUNET_CRYPTO_EddsaPrivateKey eddsa_priv;
-      json_t *resp;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("eddsa_priv",
-                                     &eddsa_priv),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK != GNUNET_JSON_parse (args,
-                                          spec,
-                                          NULL,
-                                          NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      GNUNET_CRYPTO_eddsa_key_get_public (&eddsa_priv,
-                                          &eddsa_pub);
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("eddsa_pub",
-                                    &eddsa_pub)
-        );
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (spec);
-      continue;
-    }
-    if (0 == strcmp ("ecdhe_get_public",
-                     op))
-    {
-      struct GNUNET_CRYPTO_EcdhePublicKey ecdhe_pub;
-      struct GNUNET_CRYPTO_EcdhePrivateKey ecdhe_priv;
-      json_t *resp;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("ecdhe_priv",
-                                     &ecdhe_priv),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK != GNUNET_JSON_parse (args,
-                                          spec,
-                                          NULL,
-                                          NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      GNUNET_CRYPTO_ecdhe_key_get_public (&ecdhe_priv,
-                                          &ecdhe_pub);
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("ecdhe_pub",
-                                    &ecdhe_pub)
-        );
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (spec);
-      continue;
-    }
-    if (0 == strcmp ("eddsa_verify",
-                     op))
-    {
-      struct GNUNET_CRYPTO_EddsaPublicKey pub;
-      struct GNUNET_CRYPTO_EddsaSignature sig;
-      struct GNUNET_CRYPTO_EccSignaturePurpose *msg;
-      size_t msg_size;
-      enum GNUNET_GenericReturnValue verify_ret;
-      json_t *resp;
-      struct GNUNET_JSON_Specification eddsa_verify_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("pub",
-                                     &pub),
-        GNUNET_JSON_spec_fixed_auto ("sig",
-                                     &sig),
-        GNUNET_JSON_spec_varsize ("msg",
-                                  (void **) &msg,
-                                  &msg_size),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK != GNUNET_JSON_parse (args,
-                                          eddsa_verify_spec,
-                                          NULL,
-                                          NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      verify_ret = GNUNET_CRYPTO_eddsa_verify_ (
-        ntohl (msg->purpose),
-        msg,
-        &sig,
-        &pub);
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_bool ("valid",
-                               GNUNET_OK == verify_ret));
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (eddsa_verify_spec);
-      continue;
-    }
-    if (0 == strcmp ("kx_ecdhe_eddsa",
-                     op))
-    {
-      struct GNUNET_CRYPTO_EcdhePrivateKey priv;
-      struct GNUNET_CRYPTO_EddsaPublicKey pub;
-      struct GNUNET_HashCode key_material;
-      json_t *resp;
-      struct GNUNET_JSON_Specification kx_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("eddsa_pub",
-                                     &pub),
-        GNUNET_JSON_spec_fixed_auto ("ecdhe_priv",
-                                     &priv),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK != GNUNET_JSON_parse (args,
-                                          kx_spec,
-                                          NULL,
-                                          NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      if (GNUNET_OK != GNUNET_CRYPTO_ecdh_eddsa (&priv,
-                                                 &pub,
-                                                 &key_material))
-      {
-        // FIXME: Return as result?
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "kx failed\n");
-        global_ret = 1;
-        return;
-      }
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("h",
-                                    &key_material)
-        );
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (kx_spec);
-      continue;
-    }
-    if (0 == strcmp ("eddsa_sign",
-                     op))
-    {
-      struct GNUNET_CRYPTO_EddsaSignature sig;
-      struct GNUNET_CRYPTO_EccSignaturePurpose *msg;
-      struct GNUNET_CRYPTO_EddsaPrivateKey priv;
-      size_t msg_size;
-      json_t *resp;
-      struct GNUNET_JSON_Specification eddsa_sign_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("priv",
-                                     &priv),
-        GNUNET_JSON_spec_varsize ("msg",
-                                  (void **) &msg,
-                                  &msg_size),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK != GNUNET_JSON_parse (args,
-                                          eddsa_sign_spec,
-                                          NULL,
-                                          NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      GNUNET_CRYPTO_eddsa_sign_ (
-        &priv,
-        msg,
-        &sig
-        );
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("sig", &sig)
-        );
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (eddsa_sign_spec);
-      continue;
-    }
-    if (0 == strcmp ("setup_refresh_planchet", op))
-    {
-      struct TALER_TransferSecretP transfer_secret;
-      uint32_t coin_index;
-      json_t *resp;
-      struct GNUNET_JSON_Specification setup_refresh_planchet_spec[] = {
-        GNUNET_JSON_spec_uint32 ("coin_index",
-                                 &coin_index),
-        GNUNET_JSON_spec_fixed_auto ("transfer_secret",
-                                     &transfer_secret),
-        GNUNET_JSON_spec_end ()
-      };
-      struct TALER_CoinSpendPublicKeyP coin_pub;
-      struct TALER_CoinSpendPrivateKeyP coin_priv;
-      struct TALER_PlanchetMasterSecretP ps;
-      struct TALER_ExchangeWithdrawValues alg_values = {
-        // FIXME: also allow CS
-        .cipher = TALER_DENOMINATION_RSA,
-      };
-      union TALER_DenominationBlindingKeyP dbk;
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (args,
-                             setup_refresh_planchet_spec,
-                             NULL,
-                             NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      TALER_transfer_secret_to_planchet_secret (&transfer_secret,
-                                                coin_index,
-                                                &ps);
-      TALER_planchet_setup_coin_priv (&ps,
-                                      &alg_values,
-                                      &coin_priv);
-      GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
-                                          &coin_pub.eddsa_pub);
-      TALER_planchet_blinding_secret_create (&ps,
-                                             &alg_values,
-                                             &dbk);
-
-      resp = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("coin_priv", &coin_priv),
-        GNUNET_JSON_pack_data_auto ("coin_pub", &coin_pub),
-        GNUNET_JSON_pack_data_auto ("blinding_key", &dbk.rsa_bks)
-        );
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (setup_refresh_planchet_spec);
-      continue;
-    }
-    if (0 == strcmp ("rsa_blind", op))
-    {
-      struct GNUNET_HashCode hm;
-      struct GNUNET_CRYPTO_RsaBlindingKeySecret bks;
-      void *pub_enc;
-      size_t pub_enc_size;
-      int success;
-      struct GNUNET_CRYPTO_RsaPublicKey *pub;
-      void *blinded_buf;
-      size_t blinded_size;
-      json_t *resp;
-      struct GNUNET_JSON_Specification rsa_blind_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("hm",
-                                     &hm),
-        GNUNET_JSON_spec_fixed_auto ("bks",
-                                     &bks),
-        GNUNET_JSON_spec_varsize ("pub",
-                                  &pub_enc,
-                                  &pub_enc_size),
-        GNUNET_JSON_spec_end ()
-      };
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (args,
-                             rsa_blind_spec,
-                             NULL,
-                             NULL))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "malformed op args\n");
-        global_ret = 1;
-        return;
-      }
-      pub = GNUNET_CRYPTO_rsa_public_key_decode (pub_enc,
-                                                 pub_enc_size);
-      success = GNUNET_CRYPTO_rsa_blind (&hm,
-                                         &bks,
-                                         pub,
-                                         &blinded_buf,
-                                         &blinded_size);
-
-      if (GNUNET_YES == success)
-      {
-        resp = GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_data_varsize ("blinded", blinded_buf, blinded_size),
-          GNUNET_JSON_pack_bool ("success", true)
-          );
-      }
-      else
-      {
-        resp = GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_bool ("success", false)
-          );
-      }
-      json_dumpf (resp, stdout, JSON_COMPACT);
-      printf ("\n");
-      fflush (stdout);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "sent response\n");
-      GNUNET_JSON_parse_free (rsa_blind_spec);
-      GNUNET_free (blinded_buf);
-      continue;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "unsupported operation '%s'\n",
-                op);
-    global_ret = 1;
-    return;
-  }
-
-}
-
-
-/**
- * The entry point.
- *
- * @param argc number of arguments in @a argv
- * @param argv command-line arguments
- * @return 0 on normal termination
- */
-int
-main (int argc,
-      char **argv)
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-
-  /* force linker to link against libtalerutil; if we do
-   not do this, the linker may "optimize" libtalerutil
-   away and skip #TALER_OS_init(), which we do need */
-  TALER_OS_init ();
-  ret = GNUNET_PROGRAM_run (argc, argv,
-                            "taler-crypto-worker",
-                            "Execute cryptographic operations read from stdin",
-                            options,
-                            &run,
-                            NULL);
-  if (GNUNET_NO == ret)
-    return 0;
-  if (GNUNET_SYSERR == ret)
-    return 1;
-  return global_ret;
-}
diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index c2d8964d6..41ff2ab24 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -30,6 +30,11 @@
 static int global_ret;
 
 /**
+ * -a option: inject auditor triggers
+ */
+static int inject_auditor;
+
+/**
  * -r option: do full DB reset
  */
 static int reset_db;
@@ -50,19 +55,9 @@ static int gc_db;
 static uint32_t num_partitions;
 
 /**
- * -F option: setup a sharded database, i.e. create foreign tables/server
- */
-static uint32_t num_foreign_servers;
-
-/**
- * -S option: setup a database on a shard server, creates tables with suffix shard_idx
- */
-static uint32_t shard_idx;
-
-/**
- * -R option: do full shard DB reset
+ * -f option: force partitions to be created when there is only one
  */
-static uint32_t reset_shard_db;
+static int force_create_partitions;
 
 /**
  * Main function that will be run.
@@ -83,6 +78,7 @@ run (void *cls,
   (void) cls;
   (void) args;
   (void) cfgfile;
+
   if (NULL ==
       (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
   {
@@ -93,43 +89,17 @@ run (void *cls,
   }
   if (reset_db)
   {
-    if (GNUNET_OK != plugin->drop_tables (plugin->cls))
+    if (GNUNET_OK !=
+        plugin->drop_tables (plugin->cls))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not drop tables as requested. Either database was not yet initialized, or permission denied. Consult the logs. Will still try to create new tables.\n");
     }
   }
-  if (0 <
-      reset_shard_db)
-  {
-    if (GNUNET_OK != plugin->drop_shard_tables (plugin->cls, reset_shard_db))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not drop shard tables as requested. Either database was not yet initialized or permission denied. Consult the logs.\n");
-      global_ret = EXIT_FAILURE;
-      return;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
-                "Dropped shard database, please call taler-exchange-dbinit -S <N> to initialize a new shard database\n");
-    return;
-  }
-  if (0 <
-      shard_idx)
-  {
-    if (GNUNET_OK != plugin->create_shard_tables (plugin->cls,
-                                                  shard_idx))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not create shard database\n");
-      global_ret = EXIT_NOTINSTALLED;
-    }
-    /* We do not want to continue if we are on a shard */
-    TALER_EXCHANGEDB_plugin_unload (plugin);
-    plugin = NULL;
-    return;
-  }
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls))
+      plugin->create_tables (plugin->cls,
+                             force_create_partitions || num_partitions > 0,
+                             num_partitions))
   {
     fprintf (stderr,
              "Failed to initialize database.\n");
@@ -138,46 +108,6 @@ run (void *cls,
     global_ret = EXIT_NOPERMISSION;
     return;
   }
-  if (1 <
-      num_partitions)
-  {
-    if (GNUNET_OK !=
-        plugin->setup_partitions (plugin->cls,
-                                  num_partitions))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not setup partitions. Dropping default ones again\n");
-      if (GNUNET_OK != plugin->drop_tables (plugin->cls))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Could not drop tables after failed partitioning, please delete the DB manually\n");
-      }
-      TALER_EXCHANGEDB_plugin_unload (plugin);
-      plugin = NULL;
-      global_ret = EXIT_NOTINSTALLED;
-      return;
-    }
-  }
-  else if (1 <
-           num_foreign_servers)
-  {
-    if (GNUNET_OK !=
-        plugin->setup_foreign_servers (plugin->cls,
-                                       num_foreign_servers))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not setup shards. Aborting\n");
-      if (GNUNET_OK != plugin->drop_tables (plugin->cls))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Could not drop tables after failed shard setup, please delete the DB manually\n");
-      }
-      TALER_EXCHANGEDB_plugin_unload (plugin);
-      plugin = NULL;
-      global_ret = EXIT_NOTINSTALLED;
-      return;
-    }
-  }
   if (gc_db || clear_shards)
   {
     if (GNUNET_OK !=
@@ -192,7 +122,7 @@ run (void *cls,
     }
     if (clear_shards)
     {
-      if (0 >
+      if (GNUNET_OK !=
           plugin->delete_shard_locks (plugin->cls))
       {
         fprintf (stderr,
@@ -208,6 +138,15 @@ run (void *cls,
       }
     }
   }
+  if (inject_auditor)
+  {
+    if (GNUNET_SYSERR == plugin->inject_auditor_triggers (plugin->cls))
+    {
+      fprintf (stderr,
+               "Injecting auditor triggers failed!\n");
+      global_ret = EXIT_FAILURE;
+    }
+  }
   TALER_EXCHANGEDB_plugin_unload (plugin);
   plugin = NULL;
 }
@@ -226,6 +165,10 @@ main (int argc,
       char *const *argv)
 {
   const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_flag ('a',
+                               "inject-auditor",
+                               "inject auditor triggers",
+                               &inject_auditor),
     GNUNET_GETOPT_option_flag ('g',
                                "gc",
                                "garbage collect database",
@@ -241,23 +184,12 @@ main (int argc,
     GNUNET_GETOPT_option_uint ('P',
                                "partition",
                                "NUMBER",
-                               "Setup a partitioned database where each table which can be partitioned holds NUMBER partitions on a single DB node (NOTE: this is different from sharding)",
+                               "Setup a partitioned database where each table which can be partitioned holds NUMBER partitions on a single DB node",
                                &num_partitions),
-    GNUNET_GETOPT_option_uint ('F',
-                               "foreign",
-                               "NUMBER",
-                               "Setup a sharded database whit N foreign servers (shards) / tables, must be called as DB superuser",
-                               &num_foreign_servers),
-    GNUNET_GETOPT_option_uint ('S',
-                               "shard",
-                               "INDEX",
-                               "Setup a shard server, creates tables with INDEX as suffix",
-                               &shard_idx),
-    GNUNET_GETOPT_option_uint ('R',
-                               "reset-shard",
-                               "OLD_SHARD_IDX",
-                               "reset a shard database, does not reinitialize i.e. call taler-exchange-dbinit -S afterwards (DANGEROUS: all existsing data is lost!)",
-                               &reset_shard_db),
+    GNUNET_GETOPT_option_flag ('f',
+                               "force",
+                               "Force partitions to be created if there is only one partition",
+                               &force_create_partitions),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
diff --git a/src/exchange-tools/taler-exchange-offline.c b/src/exchange-tools/taler-exchange-offline.c
index 8d8c4c62b..1f10c55e3 100644
--- a/src/exchange-tools/taler-exchange-offline.c
+++ b/src/exchange-tools/taler-exchange-offline.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2020, 2021, 2022 Taler Systems SA
+   Copyright (C) 2020-2024 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
@@ -24,6 +24,8 @@
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
 #include "taler_extensions.h"
+#include <regex.h>
+
 
 /**
  * Name of the input for the 'sign' and 'show' operation.
@@ -107,6 +109,20 @@
  */
 #define OP_EXTENSIONS "exchange-extensions-0"
 
+/**
+ * Generate message to drain profits.
+ */
+#define OP_DRAIN_PROFITS "exchange-drain-profits-0"
+
+/**
+ * Setup AML staff.
+ */
+#define OP_UPDATE_AML_STAFF "exchange-add-aml-staff-0"
+
+/**
+ * Setup partner exchange for wad transfers.
+ */
+#define OP_ADD_PARTNER "exchange-add-partner-0"
 
 /**
  * Our private key, initialized in #load_offline_key().
@@ -134,6 +150,12 @@ static struct GNUNET_CURL_RescheduleContext *rc;
 static const struct GNUNET_CONFIGURATION_Handle *kcfg;
 
 /**
+ * Age restriction configuration
+ */
+static bool ar_enabled = false;
+static struct TALER_AgeRestrictionConfig ar_config = {0};
+
+/**
  * Return value from main().
  */
 static int global_ret;
@@ -160,11 +182,6 @@ static char *currency;
 static char *CFG_exchange_url;
 
 /**
- * If age restriction is enabled, the age mask to be used
- */
-static struct TALER_AgeMask age_mask = {0};
-
-/**
  * A subcommand supported by this program.
  */
 struct SubCommand
@@ -385,6 +402,34 @@ struct WireFeeRequest
 
 
 /**
+ * Data structure for draining profits.
+ */
+struct DrainProfitsRequest
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct DrainProfitsRequest *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct DrainProfitsRequest *prev;
+
+  /**
+   * Operation handle.
+   */
+  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *h;
+
+  /**
+   * Array index of the associated command.
+   */
+  size_t idx;
+};
+
+
+/**
  * Data structure for announcing global fees.
  */
 struct GlobalFeeRequest
@@ -466,6 +511,62 @@ struct UploadExtensionsRequest
 
 
 /**
+ * Data structure for AML staff requests.
+ */
+struct AmlStaffRequest
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct AmlStaffRequest *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct AmlStaffRequest *prev;
+
+  /**
+   * Operation handle.
+   */
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *h;
+
+  /**
+   * Array index of the associated command.
+   */
+  size_t idx;
+};
+
+
+/**
+ * Data structure for partner add requests.
+ */
+struct PartnerAddRequest
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct PartnerAddRequest *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct PartnerAddRequest *prev;
+
+  /**
+   * Operation handle.
+   */
+  struct TALER_EXCHANGE_ManagementAddPartner *h;
+
+  /**
+   * Array index of the associated command.
+   */
+  size_t idx;
+};
+
+
+/**
  * Next work item to perform.
  */
 static struct GNUNET_SCHEDULER_Task *nxt;
@@ -475,6 +576,27 @@ static struct GNUNET_SCHEDULER_Task *nxt;
  */
 static struct TALER_EXCHANGE_ManagementGetKeysHandle *mgkh;
 
+
+/**
+ * Active AML staff change requests.
+ */
+static struct AmlStaffRequest *asr_head;
+
+/**
+ * Active AML staff change requests.
+ */
+static struct AmlStaffRequest *asr_tail;
+
+/**
+ * Active partner add requests.
+ */
+static struct PartnerAddRequest *par_head;
+
+/**
+ * Active partner add requests.
+ */
+static struct PartnerAddRequest *par_tail;
+
 /**
  * Active denomiantion revocation requests.
  */
@@ -576,6 +698,17 @@ static struct UploadExtensionsRequest *uer_head;
 static struct UploadExtensionsRequest *uer_tail;
 
 /**
+ * Active drain profits requests.
+ */
+struct DrainProfitsRequest *dpr_head;
+
+/**
+ * Active drain profits requests.
+ */
+static struct DrainProfitsRequest *dpr_tail;
+
+
+/**
  * Shutdown task. Invoked when the application is being terminated.
  *
  * @param cls NULL
@@ -586,6 +719,36 @@ do_shutdown (void *cls)
   (void) cls;
 
   {
+    struct AmlStaffRequest *asr;
+
+    while (NULL != (asr = asr_head))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Aborting incomplete AML staff update #%u\n",
+                  (unsigned int) asr->idx);
+      TALER_EXCHANGE_management_update_aml_officer_cancel (asr->h);
+      GNUNET_CONTAINER_DLL_remove (asr_head,
+                                   asr_tail,
+                                   asr);
+      GNUNET_free (asr);
+    }
+  }
+  {
+    struct PartnerAddRequest *par;
+
+    while (NULL != (par = par_head))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Aborting incomplete partner add request #%u\n",
+                  (unsigned int) par->idx);
+      TALER_EXCHANGE_management_add_partner_cancel (par->h);
+      GNUNET_CONTAINER_DLL_remove (par_head,
+                                   par_tail,
+                                   par);
+      GNUNET_free (par);
+    }
+  }
+  {
     struct DenomRevocationRequest *drr;
 
     while (NULL != (drr = drr_head))
@@ -729,18 +892,36 @@ do_shutdown (void *cls)
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Aborting incomplete extensions signature upload #%u\n",
                   (unsigned int) uer->idx);
-      TALER_EXCHANGE_post_management_extensions_cancel (uer->h);
+      TALER_EXCHANGE_management_post_extensions_cancel (uer->h);
       GNUNET_CONTAINER_DLL_remove (uer_head,
                                    uer_tail,
                                    uer);
       GNUNET_free (uer);
     }
   }
+
+  {
+    struct DrainProfitsRequest *dpr;
+
+    while (NULL != (dpr = dpr_head))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Aborting incomplete drain profits request #%u\n",
+                  (unsigned int) dpr->idx);
+      TALER_EXCHANGE_management_drain_profits_cancel (dpr->h);
+      GNUNET_CONTAINER_DLL_remove (dpr_head,
+                                   dpr_tail,
+                                   dpr);
+      GNUNET_free (dpr);
+    }
+  }
+
   if (NULL != out)
   {
-    json_dumpf (out,
-                stdout,
-                JSON_INDENT (2));
+    if (EXIT_SUCCESS == global_ret)
+      json_dumpf (out,
+                  stdout,
+                  JSON_INDENT (2));
     json_decref (out);
     out = NULL;
   }
@@ -781,6 +962,8 @@ static void
 test_shutdown (void)
 {
   if ( (NULL == drr_head) &&
+       (NULL == par_head) &&
+       (NULL == asr_head) &&
        (NULL == srr_head) &&
        (NULL == aar_head) &&
        (NULL == adr_head) &&
@@ -790,6 +973,7 @@ test_shutdown (void)
        (NULL == gfr_head) &&
        (NULL == ukr_head) &&
        (NULL == uer_head) &&
+       (NULL == dpr_head) &&
        (NULL == mgkh) &&
        (NULL == nxt) )
     GNUNET_SCHEDULER_shutdown ();
@@ -926,6 +1110,9 @@ load_offline_key (int do_create)
   GNUNET_free (fn);
   GNUNET_CRYPTO_eddsa_key_get_public (&master_priv.eddsa_priv,
                                       &master_pub.eddsa_pub);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Using master public key %s\n",
+              TALER_B2S (&master_pub));
   done = true;
   return GNUNET_OK;
 }
@@ -935,14 +1122,15 @@ load_offline_key (int do_create)
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct DenomRevocationRequest`
- * @param hr HTTP response data
+ * @param dr response data
  */
 static void
 denom_revocation_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeDenominationResponse *dr)
 {
   struct DenomRevocationRequest *drr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &dr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1002,7 +1190,7 @@ upload_denom_revocation (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   drr = GNUNET_new (struct DenomRevocationRequest);
@@ -1024,14 +1212,15 @@ upload_denom_revocation (const char *exchange_url,
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct SignkeyRevocationRequest`
- * @param hr HTTP response data
+ * @param sr response data
  */
 static void
 signkey_revocation_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse *sr)
 {
   struct SignkeyRevocationRequest *srr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &sr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1091,7 +1280,7 @@ upload_signkey_revocation (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   srr = GNUNET_new (struct SignkeyRevocationRequest);
@@ -1113,13 +1302,15 @@ upload_signkey_revocation (const char *exchange_url,
  * Function called with information about the post auditor add operation result.
  *
  * @param cls closure with a `struct AuditorAddRequest`
- * @param hr HTTP response data
+ * @param mer response data
  */
 static void
-auditor_add_cb (void *cls,
-                const struct TALER_EXCHANGE_HttpResponse *hr)
+auditor_add_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementAuditorEnableResponse *mer)
 {
   struct AuditorAddRequest *aar = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &mer->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1160,7 +1351,7 @@ upload_auditor_add (const char *exchange_url,
   const char *err_name;
   unsigned int err_line;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("auditor_url",
+    TALER_JSON_spec_web_url ("auditor_url",
                              &auditor_url),
     GNUNET_JSON_spec_string ("auditor_name",
                              &auditor_name),
@@ -1188,7 +1379,7 @@ upload_auditor_add (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   aar = GNUNET_new (struct AuditorAddRequest);
@@ -1213,13 +1404,15 @@ upload_auditor_add (const char *exchange_url,
  * Function called with information about the post auditor del operation result.
  *
  * @param cls closure with a `struct AuditorDelRequest`
- * @param hr HTTP response data
+ * @param mdr response data
  */
 static void
 auditor_del_cb (void *cls,
-                const struct TALER_EXCHANGE_HttpResponse *hr)
+                const struct
+                TALER_EXCHANGE_ManagementAuditorDisableResponse *mdr)
 {
   struct AuditorDelRequest *adr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &mdr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1282,7 +1475,7 @@ upload_auditor_del (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   adr = GNUNET_new (struct AuditorDelRequest);
@@ -1305,13 +1498,14 @@ upload_auditor_del (const char *exchange_url,
  * Function called with information about the post wire add operation result.
  *
  * @param cls closure with a `struct WireAddRequest`
- * @param hr HTTP response data
+ * @param wer response data
  */
 static void
 wire_add_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireEnableResponse *wer)
 {
   struct WireAddRequest *war = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wer->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1349,10 +1543,29 @@ upload_wire_add (const char *exchange_url,
   struct GNUNET_TIME_Timestamp start_time;
   struct WireAddRequest *war;
   const char *err_name;
+  const char *conversion_url = NULL;
+  const char *bank_label = NULL;
+  int64_t priority = 0;
+  const json_t *debit_restrictions;
+  const json_t *credit_restrictions;
   unsigned int err_line;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &payto_uri),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &payto_uri),
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_web_url ("conversion_url",
+                               &conversion_url),
+      NULL),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string ("bank_label",
+                               &bank_label),
+      NULL),
+    GNUNET_JSON_spec_int64 ("priority",
+                            &priority),
+    GNUNET_JSON_spec_array_const ("debit_restrictions",
+                                  &debit_restrictions),
+    GNUNET_JSON_spec_array_const ("credit_restrictions",
+                                  &credit_restrictions),
     GNUNET_JSON_spec_timestamp ("validity_start",
                                 &start_time),
     GNUNET_JSON_spec_fixed_auto ("master_sig_add",
@@ -1377,7 +1590,7 @@ upload_wire_add (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   {
@@ -1390,7 +1603,7 @@ upload_wire_add (const char *exchange_url,
                   "payto:// URI `%s' is malformed\n",
                   payto_uri);
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
     GNUNET_free (wire_method);
@@ -1404,7 +1617,7 @@ upload_wire_add (const char *exchange_url,
                   "payto URI is malformed: %s\n",
                   msg);
       GNUNET_free (msg);
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       global_ret = EXIT_INVALIDARGUMENT;
       return;
     }
@@ -1415,9 +1628,14 @@ upload_wire_add (const char *exchange_url,
     TALER_EXCHANGE_management_enable_wire (ctx,
                                            exchange_url,
                                            payto_uri,
+                                           conversion_url,
+                                           debit_restrictions,
+                                           credit_restrictions,
                                            start_time,
                                            &master_sig_add,
                                            &master_sig_wire,
+                                           bank_label,
+                                           priority,
                                            &wire_add_cb,
                                            war);
   GNUNET_CONTAINER_DLL_insert (war_head,
@@ -1430,13 +1648,14 @@ upload_wire_add (const char *exchange_url,
  * Function called with information about the post wire del operation result.
  *
  * @param cls closure with a `struct WireDelRequest`
- * @param hr HTTP response data
+ * @param wdres response data
  */
 static void
 wire_del_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireDisableResponse *wdres)
 {
   struct WireDelRequest *wdr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wdres->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1475,8 +1694,8 @@ upload_wire_del (const char *exchange_url,
   const char *err_name;
   unsigned int err_line;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &payto_uri),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &payto_uri),
     GNUNET_JSON_spec_timestamp ("validity_end",
                                 &end_time),
     GNUNET_JSON_spec_fixed_auto ("master_sig",
@@ -1499,7 +1718,7 @@ upload_wire_del (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   wdr = GNUNET_new (struct WireDelRequest);
@@ -1522,14 +1741,15 @@ upload_wire_del (const char *exchange_url,
  * Function called with information about the post wire fee operation result.
  *
  * @param cls closure with a `struct WireFeeRequest`
- * @param hr HTTP response data
+ * @param swr response data
  */
 static void
 wire_fee_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementSetWireFeeResponse *swr)
 {
   struct WireFeeRequest *wfr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &swr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1575,9 +1795,6 @@ upload_wire_fee (const char *exchange_url,
     TALER_JSON_spec_amount ("wire_fee",
                             currency,
                             &fees.wire),
-    TALER_JSON_spec_amount ("wad_fee",
-                            currency,
-                            &fees.wad),
     TALER_JSON_spec_amount ("closing_fee",
                             currency,
                             &fees.closing),
@@ -1605,7 +1822,7 @@ upload_wire_fee (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   wfr = GNUNET_new (struct WireFeeRequest);
@@ -1630,14 +1847,15 @@ upload_wire_fee (const char *exchange_url,
  * Function called with information about the post global fee operation result.
  *
  * @param cls closure with a `struct WireFeeRequest`
- * @param hr HTTP response data
+ * @param gr response data
  */
 static void
 global_fee_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse *gr)
 {
   struct GlobalFeeRequest *gfr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &gr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1677,16 +1895,12 @@ upload_global_fee (const char *exchange_url,
   struct GNUNET_TIME_Timestamp start_time;
   struct GNUNET_TIME_Timestamp end_time;
   struct GNUNET_TIME_Relative purse_timeout;
-  struct GNUNET_TIME_Relative kyc_timeout;
   struct GNUNET_TIME_Relative history_expiration;
   uint32_t purse_account_limit;
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount ("history_fee",
                             currency,
                             &fees.history),
-    TALER_JSON_spec_amount ("kyc_fee",
-                            currency,
-                            &fees.kyc),
     TALER_JSON_spec_amount ("account_fee",
                             currency,
                             &fees.account),
@@ -1695,8 +1909,6 @@ upload_global_fee (const char *exchange_url,
                             &fees.purse),
     GNUNET_JSON_spec_relative_time ("purse_timeout",
                                     &purse_timeout),
-    GNUNET_JSON_spec_relative_time ("kyc_timeout",
-                                    &kyc_timeout),
     GNUNET_JSON_spec_relative_time ("history_expiration",
                                     &history_expiration),
     GNUNET_JSON_spec_uint32 ("purse_account_limit",
@@ -1725,7 +1937,7 @@ upload_global_fee (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   gfr = GNUNET_new (struct GlobalFeeRequest);
@@ -1737,7 +1949,6 @@ upload_global_fee (const char *exchange_url,
                                                end_time,
                                                &fees,
                                                purse_timeout,
-                                               kyc_timeout,
                                                history_expiration,
                                                purse_account_limit,
                                                &master_sig,
@@ -1750,17 +1961,125 @@ upload_global_fee (const char *exchange_url,
 
 
 /**
+ * Function called with information about the drain profits operation.
+ *
+ * @param cls closure with a `struct DrainProfitsRequest`
+ * @param mdr response data
+ */
+static void
+drain_profits_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementDrainResponse *mdr)
+{
+  struct DrainProfitsRequest *dpr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &mdr->hr;
+
+  if (MHD_HTTP_NO_CONTENT != hr->http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Upload failed for command %u with status %u: %s (%s)\n",
+                (unsigned int) dpr->idx,
+                hr->http_status,
+                TALER_ErrorCode_get_hint (hr->ec),
+                hr->hint);
+    global_ret = EXIT_FAILURE;
+  }
+  GNUNET_CONTAINER_DLL_remove (dpr_head,
+                               dpr_tail,
+                               dpr);
+  GNUNET_free (dpr);
+  test_shutdown ();
+}
+
+
+/**
+ * Upload drain profit action.
+ *
+ * @param exchange_url base URL of the exchange
+ * @param idx index of the operation we are performing (for logging)
+ * @param value arguments for drain profits
+ */
+static void
+upload_drain (const char *exchange_url,
+              size_t idx,
+              const json_t *value)
+{
+  struct TALER_WireTransferIdentifierRawP wtid;
+  struct TALER_MasterSignatureP master_sig;
+  const char *err_name;
+  unsigned int err_line;
+  struct TALER_Amount amount;
+  struct GNUNET_TIME_Timestamp date;
+  const char *payto_uri;
+  const char *account_section;
+  struct DrainProfitsRequest *dpr;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("wtid",
+                                 &wtid),
+    TALER_JSON_spec_amount ("amount",
+                            currency,
+                            &amount),
+    GNUNET_JSON_spec_timestamp ("date",
+                                &date),
+    GNUNET_JSON_spec_string ("account_section",
+                             &account_section),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &payto_uri),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &master_sig),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (value,
+                         spec,
+                         &err_name,
+                         &err_line))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid input to drain profits: %s#%u at %u (skipping)\n",
+                err_name,
+                err_line,
+                (unsigned int) idx);
+    json_dumpf (value,
+                stderr,
+                JSON_INDENT (2));
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  dpr = GNUNET_new (struct DrainProfitsRequest);
+  dpr->idx = idx;
+  dpr->h =
+    TALER_EXCHANGE_management_drain_profits (ctx,
+                                             exchange_url,
+                                             &wtid,
+                                             &amount,
+                                             date,
+                                             account_section,
+                                             payto_uri,
+                                             &master_sig,
+                                             &drain_profits_cb,
+                                             dpr);
+  GNUNET_CONTAINER_DLL_insert (dpr_head,
+                               dpr_tail,
+                               dpr);
+}
+
+
+/**
  * Function called with information about the post upload keys operation result.
  *
  * @param cls closure with a `struct UploadKeysRequest`
- * @param hr HTTP response data
+ * @param mr response data
  */
 static void
 keys_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementPostKeysResponse *mr)
 {
   struct UploadKeysRequest *ukr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &mr->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1796,13 +2115,13 @@ upload_keys (const char *exchange_url,
   struct UploadKeysRequest *ukr;
   const char *err_name;
   unsigned int err_line;
-  json_t *denom_sigs;
-  json_t *signkey_sigs;
+  const json_t *denom_sigs;
+  const json_t *signkey_sigs;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("denom_sigs",
-                           &denom_sigs),
-    GNUNET_JSON_spec_json ("signkey_sigs",
-                           &signkey_sigs),
+    GNUNET_JSON_spec_array_const ("denom_sigs",
+                                  &denom_sigs),
+    GNUNET_JSON_spec_array_const ("signkey_sigs",
+                                  &signkey_sigs),
     GNUNET_JSON_spec_end ()
   };
   bool ok = true;
@@ -1821,7 +2140,7 @@ upload_keys (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   pkd.num_sign_sigs = json_array_size (signkey_sigs);
@@ -1914,11 +2233,10 @@ upload_keys (const char *exchange_url,
   else
   {
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
   }
   GNUNET_free (pkd.sign_sigs);
   GNUNET_free (pkd.denom_sigs);
-  GNUNET_JSON_parse_free (spec);
 }
 
 
@@ -1926,14 +2244,15 @@ upload_keys (const char *exchange_url,
  * Function called with information about the post upload extensions operation result.
  *
  * @param cls closure with a `struct UploadExtensionsRequest`
- * @param hr HTTP response data
+ * @param er response data
  */
 static void
 extensions_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementPostExtensionsResponse *er)
 {
   struct UploadExtensionsRequest *uer = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &er->hr;
 
   if (MHD_HTTP_NO_CONTENT != hr->http_status)
   {
@@ -1965,13 +2284,13 @@ upload_extensions (const char *exchange_url,
                    size_t idx,
                    const json_t *value)
 {
-  json_t *extensions;
+  const json_t *extensions;
   struct TALER_MasterSignatureP sig;
   const char *err_name;
   unsigned int err_line;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("extensions",
-                           &extensions),
+    GNUNET_JSON_spec_object_const ("extensions",
+                                   &extensions),
     GNUNET_JSON_spec_fixed_auto ("extensions_sig",
                                  &sig),
     GNUNET_JSON_spec_end ()
@@ -1993,22 +2312,22 @@ upload_extensions (const char *exchange_url,
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
 
   /* 2. Verify the signature */
   {
-    struct TALER_ExtensionConfigHashP h_config;
+    struct TALER_ExtensionManifestsHashP h_manifests;
 
     if (GNUNET_OK !=
-        TALER_JSON_extensions_config_hash (extensions, &h_config))
+        TALER_JSON_extensions_manifests_hash (extensions,
+                                              &h_manifests))
     {
-      GNUNET_JSON_parse_free (spec);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "couldn't hash extensions\n");
+                  "couldn't hash extensions' manifests\n");
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
 
@@ -2016,16 +2335,15 @@ upload_extensions (const char *exchange_url,
         load_offline_key (GNUNET_NO))
       return;
 
-    if (GNUNET_OK != TALER_exchange_offline_extension_config_hash_verify (
-          &h_config,
+    if (GNUNET_OK != TALER_exchange_offline_extension_manifests_hash_verify (
+          &h_manifests,
           &master_pub,
           &sig))
     {
-      GNUNET_JSON_parse_free (spec);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "invalid signature for extensions\n");
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   }
@@ -2036,8 +2354,9 @@ upload_extensions (const char *exchange_url,
       .extensions = extensions,
       .extensions_sig = sig,
     };
-    struct UploadExtensionsRequest *uer = GNUNET_new (struct
-                                                      UploadExtensionsRequest);
+    struct UploadExtensionsRequest *uer
+      = GNUNET_new (struct UploadExtensionsRequest);
+
     uer->idx = idx;
     uer->h = TALER_EXCHANGE_management_post_extensions (
       ctx,
@@ -2049,7 +2368,223 @@ upload_extensions (const char *exchange_url,
                                  uer_tail,
                                  uer);
   }
-  GNUNET_JSON_parse_free (spec);
+}
+
+
+/**
+ * Function called with information about the add partner operation.
+ *
+ * @param cls closure with a `struct PartnerAddRequest`
+ * @param apr response data
+ */
+static void
+add_partner_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementAddPartnerResponse *apr)
+{
+  struct PartnerAddRequest *par = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &apr->hr;
+
+  if (MHD_HTTP_NO_CONTENT != hr->http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Upload failed for command %u with status %u: %s (%s)\n",
+                (unsigned int) par->idx,
+                hr->http_status,
+                TALER_ErrorCode_get_hint (hr->ec),
+                hr->hint);
+    global_ret = EXIT_FAILURE;
+  }
+  GNUNET_CONTAINER_DLL_remove (par_head,
+                               par_tail,
+                               par);
+  GNUNET_free (par);
+  test_shutdown ();
+}
+
+
+/**
+ * Add partner action.
+ *
+ * @param exchange_url base URL of the exchange
+ * @param idx index of the operation we are performing (for logging)
+ * @param value arguments for add partner
+ */
+static void
+add_partner (const char *exchange_url,
+             size_t idx,
+             const json_t *value)
+{
+  struct TALER_MasterPublicKeyP partner_pub;
+  struct GNUNET_TIME_Timestamp start_date;
+  struct GNUNET_TIME_Timestamp end_date;
+  struct GNUNET_TIME_Relative wad_frequency;
+  struct TALER_Amount wad_fee;
+  const char *partner_base_url;
+  struct TALER_MasterSignatureP master_sig;
+  struct PartnerAddRequest *par;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("partner_pub",
+                                 &partner_pub),
+    TALER_JSON_spec_amount ("wad_fee",
+                            currency,
+                            &wad_fee),
+    GNUNET_JSON_spec_relative_time ("wad_frequency",
+                                    &wad_frequency),
+    GNUNET_JSON_spec_timestamp ("start_date",
+                                &start_date),
+    GNUNET_JSON_spec_timestamp ("end_date",
+                                &end_date),
+    TALER_JSON_spec_web_url ("partner_base_url",
+                             &partner_base_url),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &master_sig),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *err_name;
+  unsigned int err_line;
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (value,
+                         spec,
+                         &err_name,
+                         &err_line))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid input to add partner: %s#%u at %u (skipping)\n",
+                err_name,
+                err_line,
+                (unsigned int) idx);
+    json_dumpf (value,
+                stderr,
+                JSON_INDENT (2));
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  par = GNUNET_new (struct PartnerAddRequest);
+  par->idx = idx;
+  par->h =
+    TALER_EXCHANGE_management_add_partner (ctx,
+                                           exchange_url,
+                                           &partner_pub,
+                                           start_date,
+                                           end_date,
+                                           wad_frequency,
+                                           &wad_fee,
+                                           partner_base_url,
+                                           &master_sig,
+                                           &add_partner_cb,
+                                           par);
+  GNUNET_CONTAINER_DLL_insert (par_head,
+                               par_tail,
+                               par);
+}
+
+
+/**
+ * Function called with information about the AML officer update operation.
+ *
+ * @param cls closure with a `struct AmlStaffRequest`
+ * @param ar response data
+ */
+static void
+update_aml_officer_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse *ar)
+{
+  struct AmlStaffRequest *asr = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &ar->hr;
+
+  if (MHD_HTTP_NO_CONTENT != hr->http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Upload failed for command %u with status %u: %s (%s)\n",
+                (unsigned int) asr->idx,
+                hr->http_status,
+                TALER_ErrorCode_get_hint (hr->ec),
+                hr->hint);
+    global_ret = EXIT_FAILURE;
+  }
+  GNUNET_CONTAINER_DLL_remove (asr_head,
+                               asr_tail,
+                               asr);
+  GNUNET_free (asr);
+  test_shutdown ();
+}
+
+
+/**
+ * Upload AML staff action.
+ *
+ * @param exchange_url base URL of the exchange
+ * @param idx index of the operation we are performing (for logging)
+ * @param value arguments for AML staff change
+ */
+static void
+update_aml_staff (const char *exchange_url,
+                  size_t idx,
+                  const json_t *value)
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  const char *officer_name;
+  struct GNUNET_TIME_Timestamp change_date;
+  bool is_active;
+  bool read_only;
+  struct TALER_MasterSignatureP master_sig;
+  struct AmlStaffRequest *asr;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("officer_pub",
+                                 &officer_pub),
+    GNUNET_JSON_spec_timestamp ("change_date",
+                                &change_date),
+    GNUNET_JSON_spec_bool ("is_active",
+                           &is_active),
+    GNUNET_JSON_spec_bool ("read_only",
+                           &read_only),
+    GNUNET_JSON_spec_string ("officer_name",
+                             &officer_name),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &master_sig),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *err_name;
+  unsigned int err_line;
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (value,
+                         spec,
+                         &err_name,
+                         &err_line))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid input to AML staff update: %s#%u at %u (skipping)\n",
+                err_name,
+                err_line,
+                (unsigned int) idx);
+    json_dumpf (value,
+                stderr,
+                JSON_INDENT (2));
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  asr = GNUNET_new (struct AmlStaffRequest);
+  asr->idx = idx;
+  asr->h =
+    TALER_EXCHANGE_management_update_aml_officer (ctx,
+                                                  exchange_url,
+                                                  &officer_pub,
+                                                  officer_name,
+                                                  change_date,
+                                                  is_active,
+                                                  read_only,
+                                                  &master_sig,
+                                                  &update_aml_officer_cb,
+                                                  asr);
+  GNUNET_CONTAINER_DLL_insert (asr_head,
+                               asr_tail,
+                               asr);
 }
 
 
@@ -2099,9 +2634,21 @@ trigger_upload (const char *exchange_url)
       .cb = &upload_keys
     },
     {
+      .key = OP_DRAIN_PROFITS,
+      .cb = &upload_drain
+    },
+    {
       .key = OP_EXTENSIONS,
       .cb = &upload_extensions
     },
+    {
+      .key = OP_UPDATE_AML_STAFF,
+      .cb = &update_aml_staff
+    },
+    {
+      .key = OP_ADD_PARTNER,
+      .cb = &add_partner
+    },
     /* array termination */
     {
       .key = NULL
@@ -2122,7 +2669,7 @@ trigger_upload (const char *exchange_url)
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Malformed JSON input\n");
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
     /* block of code that uses key and value */
@@ -2145,7 +2692,7 @@ trigger_upload (const char *exchange_url)
                   "Upload does not know how to handle `%s'\n",
                   key);
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   }
@@ -2165,7 +2712,7 @@ do_upload (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, refusing upload\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2184,7 +2731,7 @@ do_upload (char *const *args)
                   err.line,
                   err.source,
                   err.position);
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       global_ret = EXIT_FAILURE;
       return;
     }
@@ -2193,7 +2740,7 @@ do_upload (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Error: expected JSON array for `upload` command\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2208,7 +2755,7 @@ do_upload (char *const *args)
                                "exchange",
                                "BASE_URL");
     global_ret = EXIT_NOTCONFIGURED;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
   trigger_upload (CFG_exchange_url);
@@ -2233,7 +2780,7 @@ do_revoke_denomination_key (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, refusing revocation\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2246,7 +2793,7 @@ do_revoke_denomination_key (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify a denomination key with this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2282,7 +2829,7 @@ do_revoke_signkey (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, refusing revocation\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2295,7 +2842,7 @@ do_revoke_signkey (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify an exchange signing key with this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2333,7 +2880,7 @@ do_add_auditor (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not adding auditor\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2346,7 +2893,7 @@ do_add_auditor (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify an auditor public key as first argument for this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2359,7 +2906,7 @@ do_add_auditor (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify an auditor URI and auditor name as 2nd and 3rd arguments to this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2405,7 +2952,7 @@ do_del_auditor (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not deleting auditor account\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2418,7 +2965,7 @@ do_del_auditor (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify an auditor public key as first argument for this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2443,6 +2990,96 @@ do_del_auditor (char *const *args)
 
 
 /**
+ * Parse account restriction.
+ *
+ * @param args the array of command-line arguments to process next
+ * @param[in,out] restrictions JSON array to update
+ * @return -1 on error, otherwise number of arguments from @a args that were used
+ */
+static int
+parse_restriction (char *const *args,
+                   json_t *restrictions)
+{
+  if (NULL == args[0])
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Restriction TYPE argument missing\n");
+    return -1;
+  }
+  if (0 == strcmp (args[0],
+                   "deny"))
+  {
+    GNUNET_assert (0 ==
+                   json_array_append_new (
+                     restrictions,
+                     GNUNET_JSON_PACK (
+                       GNUNET_JSON_pack_string ("type",
+                                                "deny"))));
+    return 1;
+  }
+  if (0 == strcmp (args[0],
+                   "regex"))
+  {
+    json_t *i18n;
+    json_error_t err;
+
+    if ( (NULL == args[1]) ||
+         (NULL == args[2]) ||
+         (NULL == args[3]) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Mandatory arguments for restriction of type `regex' missing (REGEX, HINT, HINT-I18 required)\n");
+      return -1;
+    }
+    {
+      regex_t ex;
+
+      if (0 != regcomp (&ex,
+                        args[1],
+                        REG_NOSUB | REG_EXTENDED))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Invalid regular expression `%s'\n",
+                    args[1]);
+        return -1;
+      }
+      regfree (&ex);
+    }
+
+    i18n = json_loads (args[3],
+                       JSON_REJECT_DUPLICATES,
+                       &err);
+    if (NULL == i18n)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Invalid JSON for restriction of type `regex': `%s` at %d\n",
+                  args[3],
+                  err.position);
+      return -1;
+    }
+    GNUNET_assert (0 ==
+                   json_array_append_new (
+                     restrictions,
+                     GNUNET_JSON_PACK (
+                       GNUNET_JSON_pack_string ("type",
+                                                "regex"),
+                       GNUNET_JSON_pack_string ("payto_regex",
+                                                args[1]),
+                       GNUNET_JSON_pack_string ("human_hint",
+                                                args[2]),
+                       GNUNET_JSON_pack_object_steal ("human_hint_i18n",
+                                                      i18n)
+                       )));
+    return 4;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Restriction TYPE `%s' unsupported\n",
+              args[0]);
+  return -1;
+}
+
+
+/**
  * Add wire account.
  *
  * @param args the array of command-line arguments to process next;
@@ -2454,12 +3091,18 @@ do_add_wire (char *const *args)
   struct TALER_MasterSignatureP master_sig_add;
   struct TALER_MasterSignatureP master_sig_wire;
   struct GNUNET_TIME_Timestamp now;
+  const char *conversion_url = NULL;
+  const char *bank_label = NULL;
+  int64_t priority = 0;
+  json_t *debit_restrictions;
+  json_t *credit_restrictions;
+  unsigned int num_args = 1;
 
   if (NULL != in)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not adding wire account\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2467,7 +3110,7 @@ do_add_wire (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify a payto://-URI with this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2483,7 +3126,7 @@ do_add_wire (char *const *args)
                   "payto URI is malformed: %s\n",
                   msg);
       GNUNET_free (msg);
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       global_ret = EXIT_INVALIDARGUMENT;
       return;
     }
@@ -2499,29 +3142,160 @@ do_add_wire (char *const *args)
                   "payto:// URI `%s' is malformed\n",
                   args[0]);
       global_ret = EXIT_INVALIDARGUMENT;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
     GNUNET_free (wire_method);
   }
+  debit_restrictions = json_array ();
+  GNUNET_assert (NULL != debit_restrictions);
+  credit_restrictions = json_array ();
+  GNUNET_assert (NULL != credit_restrictions);
+  while (NULL != args[num_args])
+  {
+    if (0 == strcmp (args[num_args],
+                     "conversion-url"))
+    {
+      num_args++;
+      conversion_url = args[num_args];
+      if (NULL == conversion_url)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "'conversion-url' requires an argument\n");
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      if (! TALER_is_web_url (conversion_url))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "'conversion-url' must refer to HTTP(S) endpoint, `%s' is invalid\n",
+                    conversion_url);
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      num_args++;
+      continue;
+    }
+    if (0 == strcmp (args[num_args],
+                     "credit-restriction"))
+    {
+      int iret;
+
+      num_args++;
+      iret = parse_restriction (&args[num_args],
+                                credit_restrictions);
+      if (iret <= 0)
+      {
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      num_args += iret;
+      continue;
+    }
+    if (0 == strcmp (args[num_args],
+                     "debit-restriction"))
+    {
+      int iret;
+
+      num_args++;
+      iret = parse_restriction (&args[num_args],
+                                debit_restrictions);
+      if (iret <= 0)
+      {
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      num_args += iret;
+      continue;
+    }
+    if (0 == strcmp (args[num_args],
+                     "display-hint"))
+    {
+      long long p;
+      char dummy;
+
+      num_args++;
+      if ( (NULL == args[num_args]) ||
+           (NULL == args[num_args + 1]) )
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "'display-hint' requires at least two arguments (priority and label)\n");
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      if (1 != sscanf (args[num_args],
+                       "%lld%c",
+                       &p,
+                       &dummy))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Priority argument `%s' is not a number\n",
+                    args[num_args]);
+        global_ret = EXIT_INVALIDARGUMENT;
+        GNUNET_SCHEDULER_shutdown ();
+        json_decref (debit_restrictions);
+        json_decref (credit_restrictions);
+        return;
+      }
+      priority = (int64_t) p;
+      num_args++;
+      bank_label = args[num_args];
+      num_args++;
+      continue;
+    }
+    break;
+  }
   TALER_exchange_offline_wire_add_sign (args[0],
+                                        conversion_url,
+                                        debit_restrictions,
+                                        credit_restrictions,
                                         now,
                                         &master_priv,
                                         &master_sig_add);
   TALER_exchange_wire_signature_make (args[0],
+                                      conversion_url,
+                                      debit_restrictions,
+                                      credit_restrictions,
                                       &master_priv,
                                       &master_sig_wire);
   output_operation (OP_ENABLE_WIRE,
                     GNUNET_JSON_PACK (
                       GNUNET_JSON_pack_string ("payto_uri",
                                                args[0]),
+                      GNUNET_JSON_pack_array_steal ("debit_restrictions",
+                                                    debit_restrictions),
+                      GNUNET_JSON_pack_array_steal ("credit_restrictions",
+                                                    credit_restrictions),
+                      GNUNET_JSON_pack_allow_null (
+                        GNUNET_JSON_pack_string ("conversion_url",
+                                                 conversion_url)),
+                      GNUNET_JSON_pack_allow_null (
+                        GNUNET_JSON_pack_string ("bank_label",
+                                                 bank_label)),
+                      GNUNET_JSON_pack_int64 ("priority",
+                                              priority),
                       GNUNET_JSON_pack_timestamp ("validity_start",
                                                   now),
                       GNUNET_JSON_pack_data_auto ("master_sig_add",
                                                   &master_sig_add),
                       GNUNET_JSON_pack_data_auto ("master_sig_wire",
                                                   &master_sig_wire)));
-  next (args + 1);
+  next (args + num_args);
 }
 
 
@@ -2541,7 +3315,7 @@ do_del_wire (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not deleting wire account\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2549,7 +3323,7 @@ do_del_wire (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must specify a payto://-URI with this subcommand\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2578,7 +3352,7 @@ do_del_wire (char *const *args)
  *
  * @param args the array of command-line arguments to process next;
  *        args[0] must be the year, args[1] the wire method, args[2] the wire fee and args[3]
- *        the closing fee and args[4] the wad fee.
+ *        the closing fee.
  */
 static void
 do_set_wire_fee (char *const *args)
@@ -2594,7 +3368,7 @@ do_set_wire_fee (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not setting wire fee\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2602,7 +3376,6 @@ do_set_wire_fee (char *const *args)
        (NULL == args[1]) ||
        (NULL == args[2]) ||
        (NULL == args[3]) ||
-       (NULL == args[4]) ||
        ( (1 != sscanf (args[0],
                        "%u%c",
                        &year,
@@ -2614,14 +3387,11 @@ do_set_wire_fee (char *const *args)
                                 &fees.wire)) ||
        (GNUNET_OK !=
         TALER_string_to_amount (args[3],
-                                &fees.closing)) ||
-       (GNUNET_OK !=
-        TALER_string_to_amount (args[4],
-                                &fees.wad)) )
+                                &fees.closing)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "You must use YEAR, METHOD, WIRE-FEE, CLOSING-FEE and WAD-FEE as arguments for this subcommand\n");
-    test_shutdown ();
+                "You must use YEAR, METHOD, WIRE-FEE, and CLOSING-FEE as arguments for this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2652,13 +3422,11 @@ do_set_wire_fee (char *const *args)
                                                   end_time),
                       TALER_JSON_pack_amount ("wire_fee",
                                               &fees.wire),
-                      TALER_JSON_pack_amount ("wad_fee",
-                                              &fees.wad),
                       TALER_JSON_pack_amount ("closing_fee",
                                               &fees.closing),
                       GNUNET_JSON_pack_data_auto ("master_sig",
                                                   &master_sig)));
-  next (args + 5);
+  next (args + 4);
 }
 
 
@@ -2666,9 +3434,9 @@ do_set_wire_fee (char *const *args)
  * Set global fees for the given year.
  *
  * @param args the array of command-line arguments to process next;
- *        args[0] must be the year, args[1] the history fee, args[2] the kyc fee, args[3]
- *        the account fee and args[4] the purse fee. These are followed by args[5] purse timeout,
- *        args[6] kyc timeout and args[7] history expiration. Last is args[8] the (free) purse account limit.
+ *        args[0] must be the year, args[1] the history fee, args[2]
+ *        the account fee and args[3] the purse fee. These are followed by args[4] purse timeout,
+ *        args[5] history expiration. Last is args[6] the (free) purse account limit.
  */
 static void
 do_set_global_fee (char *const *args)
@@ -2678,7 +3446,6 @@ do_set_global_fee (char *const *args)
   unsigned int year;
   struct TALER_GlobalFeeSet fees;
   struct GNUNET_TIME_Relative purse_timeout;
-  struct GNUNET_TIME_Relative kyc_timeout;
   struct GNUNET_TIME_Relative history_expiration;
   unsigned int purse_account_limit;
   struct GNUNET_TIME_Timestamp start_time;
@@ -2688,7 +3455,7 @@ do_set_global_fee (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Downloaded data was not consumed, not setting global fee\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2698,44 +3465,64 @@ do_set_global_fee (char *const *args)
        (NULL == args[3]) ||
        (NULL == args[4]) ||
        (NULL == args[5]) ||
-       (NULL == args[6]) ||
-       (NULL == args[7]) ||
-       (NULL == args[8]) ||
-       ( (1 != sscanf (args[0],
-                       "%u%c",
-                       &year,
-                       &dummy)) &&
-         (0 != strcasecmp ("now",
-                           args[0])) ) ||
-       (GNUNET_OK !=
+       (NULL == args[6]) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "You must use YEAR, HISTORY-FEE, ACCOUNT-FEE, PURSE-FEE, PURSE-TIMEOUT, HISTORY-EXPIRATION and PURSE-ACCOUNT-LIMIT as arguments for this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (1 != sscanf (args[0],
+                     "%u%c",
+                     &year,
+                     &dummy)) &&
+       (0 != strcasecmp ("now",
+                         args[0])) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid YEAR given for 'global-fee' subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (GNUNET_OK !=
         TALER_string_to_amount (args[1],
                                 &fees.history)) ||
        (GNUNET_OK !=
         TALER_string_to_amount (args[2],
-                                &fees.kyc)) ||
-       (GNUNET_OK !=
-        TALER_string_to_amount (args[3],
                                 &fees.account)) ||
        (GNUNET_OK !=
-        TALER_string_to_amount (args[4],
-                                &fees.purse)) ||
-       (GNUNET_OK !=
-        GNUNET_STRINGS_fancy_time_to_relative (args[5],
+        TALER_string_to_amount (args[3],
+                                &fees.purse)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid amount given for 'global-fee' subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (GNUNET_OK !=
+        GNUNET_STRINGS_fancy_time_to_relative (args[4],
                                                &purse_timeout)) ||
        (GNUNET_OK !=
-        GNUNET_STRINGS_fancy_time_to_relative (args[6],
-                                               &kyc_timeout)) ||
-       (GNUNET_OK !=
-        GNUNET_STRINGS_fancy_time_to_relative (args[7],
-                                               &history_expiration)) ||
-       (1 != sscanf (args[8],
-                     "%u%c",
-                     &purse_account_limit,
-                     &dummy)) )
+        GNUNET_STRINGS_fancy_time_to_relative (args[5],
+                                               &history_expiration)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "You must use YEAR, HISTORY-FEE, KYC-FEE, ACCOUNT-FEE, PURSE-FEE, PURSE-TIMEOUT, KYC-TIMEOUT, HISTORY-EXPIRATION and PURSE-ACCOUNT-LIMIT as arguments for this subcommand\n");
-    test_shutdown ();
+                "Invalid delay given for 'global-fee' subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if (1 != sscanf (args[6],
+                   "%u%c",
+                   &purse_account_limit,
+                   &dummy))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid purse account limit given for 'global-fee' subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
@@ -2754,7 +3541,6 @@ do_set_global_fee (char *const *args)
                                           end_time,
                                           &fees,
                                           purse_timeout,
-                                          kyc_timeout,
                                           history_expiration,
                                           (uint32_t) purse_account_limit,
                                           &master_priv,
@@ -2767,23 +3553,382 @@ do_set_global_fee (char *const *args)
                                                   end_time),
                       TALER_JSON_pack_amount ("history_fee",
                                               &fees.history),
-                      TALER_JSON_pack_amount ("kyc_fee",
-                                              &fees.kyc),
                       TALER_JSON_pack_amount ("account_fee",
                                               &fees.account),
                       TALER_JSON_pack_amount ("purse_fee",
                                               &fees.purse),
                       GNUNET_JSON_pack_time_rel ("purse_timeout",
                                                  purse_timeout),
-                      GNUNET_JSON_pack_time_rel ("kyc_timeout",
-                                                 kyc_timeout),
                       GNUNET_JSON_pack_time_rel ("history_expiration",
                                                  history_expiration),
                       GNUNET_JSON_pack_uint64 ("purse_account_limit",
                                                (uint32_t) purse_account_limit),
                       GNUNET_JSON_pack_data_auto ("master_sig",
                                                   &master_sig)));
-  next (args + 9);
+  next (args + 7);
+}
+
+
+/**
+ * Drain profits from exchange's escrow account to
+ * regular exchange account.
+ *
+ * @param args the array of command-line arguments to process next;
+ *        args[0] must be the amount,
+ *        args[1] must be the section of the escrow account to drain
+ *        args[2] must be the payto://-URI of the target account
+ */
+static void
+do_drain (char *const *args)
+{
+  struct TALER_WireTransferIdentifierRawP wtid;
+  struct GNUNET_TIME_Timestamp date;
+  struct TALER_Amount amount;
+  const char *account_section;
+  const char *payto_uri;
+  struct TALER_MasterSignatureP master_sig;
+  char *err;
+
+  if (NULL != in)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Downloaded data was not consumed, refusing drain\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+  if ( (NULL == args[0]) ||
+       (NULL == args[1]) ||
+       (NULL == args[2]) ||
+       (GNUNET_OK !=
+        TALER_string_to_amount (args[0],
+                                &amount)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Drain requires an amount, section name and target payto://-URI as arguments\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (NULL == args[0]) ||
+       (NULL == args[1]) ||
+       (NULL == args[2]) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Drain requires an amount, section name and target payto://-URI as arguments\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_string_to_amount (args[0],
+                              &amount))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid amount `%s' specified for drain\n",
+                args[0]);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  account_section = args[1];
+  payto_uri = args[2];
+  err = TALER_payto_validate (payto_uri);
+  if (NULL != err)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid payto://-URI `%s' specified for drain: %s\n",
+                payto_uri,
+                err);
+    GNUNET_free (err);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if (GNUNET_OK !=
+      load_offline_key (GNUNET_NO))
+    return;
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                              &wtid,
+                              sizeof (wtid));
+  date = GNUNET_TIME_timestamp_get ();
+  TALER_exchange_offline_profit_drain_sign (&wtid,
+                                            date,
+                                            &amount,
+                                            account_section,
+                                            payto_uri,
+                                            &master_priv,
+                                            &master_sig);
+  output_operation (OP_DRAIN_PROFITS,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_data_auto ("wtid",
+                                                  &wtid),
+                      GNUNET_JSON_pack_string ("account_section",
+                                               account_section),
+                      GNUNET_JSON_pack_string ("payto_uri",
+                                               payto_uri),
+                      TALER_JSON_pack_amount ("amount",
+                                              &amount),
+                      GNUNET_JSON_pack_timestamp ("date",
+                                                  date),
+                      GNUNET_JSON_pack_data_auto ("master_sig",
+                                                  &master_sig)));
+  next (args + 3);
+}
+
+
+/**
+ * Add partner.
+ *
+ * @param args the array of command-line arguments to process next;
+ *        args[0] must be the partner's master public key, args[1] the partner's
+ *        API base URL, args[2] the wad fee, args[3] the wad frequency, and
+ *        args[4] the year (including possibly 'now')
+ */
+static void
+do_add_partner (char *const *args)
+{
+  struct TALER_MasterPublicKeyP partner_pub;
+  struct GNUNET_TIME_Timestamp start_date;
+  struct GNUNET_TIME_Timestamp end_date;
+  struct GNUNET_TIME_Relative wad_frequency;
+  struct TALER_Amount wad_fee;
+  const char *partner_base_url;
+  struct TALER_MasterSignatureP master_sig;
+  char dummy;
+  unsigned int year;
+
+  if (NULL != in)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Downloaded data was not consumed, not adding partner\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+  if ( (NULL == args[0]) ||
+       (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[0],
+                                       strlen (args[0]),
+                                       &partner_pub,
+                                       sizeof (partner_pub))) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "You must specify the partner master public key as first argument for this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (NULL == args[1]) ||
+       (0 != strncmp ("http",
+                      args[1],
+                      strlen ("http"))) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "You must specify the partner's base URL as the 2nd argument to this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  partner_base_url = args[1];
+  if ( (NULL == args[2]) ||
+       (GNUNET_OK !=
+        TALER_string_to_amount (args[2],
+                                &wad_fee)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid amount `%s' specified for wad fee of partner\n",
+                args[2]);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (NULL == args[3]) ||
+       (GNUNET_OK !=
+        GNUNET_STRINGS_fancy_time_to_relative (args[3],
+                                               &wad_frequency)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid wad frequency `%s' specified for add partner\n",
+                args[3]);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if ( (NULL == args[4]) ||
+       ( (1 != sscanf (args[4],
+                       "%u%c",
+                       &year,
+                       &dummy)) &&
+         (0 != strcasecmp ("now",
+                           args[4])) ) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid year `%s' specified for add partner\n",
+                args[4]);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if (0 == strcasecmp ("now",
+                       args[4]))
+    year = GNUNET_TIME_get_current_year ();
+  start_date = GNUNET_TIME_absolute_to_timestamp (
+    GNUNET_TIME_year_to_time (year));
+  end_date = GNUNET_TIME_absolute_to_timestamp (
+    GNUNET_TIME_year_to_time (year + 1));
+
+  if (GNUNET_OK !=
+      load_offline_key (GNUNET_NO))
+    return;
+  TALER_exchange_offline_partner_details_sign (&partner_pub,
+                                               start_date,
+                                               end_date,
+                                               wad_frequency,
+                                               &wad_fee,
+                                               partner_base_url,
+                                               &master_priv,
+                                               &master_sig);
+  output_operation (OP_ADD_PARTNER,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_string ("partner_base_url",
+                                               partner_base_url),
+                      GNUNET_JSON_pack_time_rel ("wad_frequency",
+                                                 wad_frequency),
+                      GNUNET_JSON_pack_timestamp ("start_date",
+                                                  start_date),
+                      GNUNET_JSON_pack_timestamp ("end_date",
+                                                  end_date),
+                      GNUNET_JSON_pack_data_auto ("partner_pub",
+                                                  &partner_pub),
+                      GNUNET_JSON_pack_data_auto ("master_sig",
+                                                  &master_sig)));
+  next (args + 5);
+}
+
+
+/**
+ * Enable or disable AML staff.
+ *
+ * @param is_active true to enable, false to disable
+ * @param args the array of command-line arguments to process next; args[0] must be the AML staff's public key, args[1] the AML staff's legal name, and if @a is_active then args[2] rw (read write) or ro (read only)
+ */
+static void
+do_set_aml_staff (bool is_active,
+                  char *const *args)
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  const char *officer_name;
+  bool read_only;
+  struct TALER_MasterSignatureP master_sig;
+  struct GNUNET_TIME_Timestamp now
+    = GNUNET_TIME_timestamp_get ();
+
+  if (NULL != in)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Downloaded data was not consumed, not updating AML staff status\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_FAILURE;
+    return;
+  }
+  if ( (NULL == args[0]) ||
+       (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[0],
+                                       strlen (args[0]),
+                                       &officer_pub,
+                                       sizeof (officer_pub))) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "You must specify the AML officer's public key as first argument for this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  if (NULL == args[1])
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "You must specify the officer's legal name as the 2nd argument to this subcommand\n");
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  officer_name = args[1];
+  if (is_active)
+  {
+    if ( (NULL == args[2]) ||
+         ( (0 != strcmp (args[2],
+                         "ro")) &&
+           (0 != strcmp (args[2],
+                         "rw")) ) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "You must specify 'ro' or 'rw' (and not `%s') for the access level\n",
+                  args[2]);
+      GNUNET_SCHEDULER_shutdown ();
+      global_ret = EXIT_INVALIDARGUMENT;
+      return;
+    }
+    read_only = (0 == strcmp (args[2],
+                              "ro"));
+  }
+  else
+  {
+    read_only = true;
+  }
+  if (GNUNET_OK !=
+      load_offline_key (GNUNET_NO))
+    return;
+  TALER_exchange_offline_aml_officer_status_sign (&officer_pub,
+                                                  officer_name,
+                                                  now,
+                                                  is_active,
+                                                  read_only,
+                                                  &master_priv,
+                                                  &master_sig);
+  output_operation (OP_UPDATE_AML_STAFF,
+                    GNUNET_JSON_PACK (
+                      GNUNET_JSON_pack_string ("officer_name",
+                                               officer_name),
+                      GNUNET_JSON_pack_timestamp ("change_date",
+                                                  now),
+                      GNUNET_JSON_pack_bool ("is_active",
+                                             is_active),
+                      GNUNET_JSON_pack_bool ("read_only",
+                                             read_only),
+                      GNUNET_JSON_pack_data_auto ("officer_pub",
+                                                  &officer_pub),
+                      GNUNET_JSON_pack_data_auto ("master_sig",
+                                                  &master_sig)));
+  next (args + (is_active ? 3 : 2));
+}
+
+
+/**
+ * Disable AML staff.
+ *
+ * @param args the array of command-line arguments to process next;
+ *        args[0] must be the AML staff's public key, args[1] the AML staff's legal name, args[2] rw (read write) or ro (read only)
+ */
+static void
+disable_aml_staff (char *const *args)
+{
+  do_set_aml_staff (false,
+                    args);
+}
+
+
+/**
+ * Enable AML staff.
+ *
+ * @param args the array of command-line arguments to process next;
+ *        args[0] must be the AML staff's public key, args[1] the AML staff's legal name, args[2] rw (read write) or ro (read only)
+ */
+static void
+enable_aml_staff (char *const *args)
+{
+  do_set_aml_staff (true,
+                    args);
 }
 
 
@@ -2793,18 +3938,15 @@ do_set_global_fee (char *const *args)
  * whether there are subsequent commands).
  *
  * @param cls closure with the `char **` remaining args
- * @param hr HTTP response data
- * @param keys information about the various keys used
- *        by the exchange, NULL if /management/keys failed
+ * @param mgr response data
  */
 static void
 download_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr,
-             const struct TALER_EXCHANGE_FutureKeys *keys)
+             const struct TALER_EXCHANGE_ManagementGetKeysResponse *mgr)
 {
   char *const *args = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &mgr->hr;
 
-  (void) keys;
   mgkh = NULL;
   switch (hr->http_status)
   {
@@ -2822,7 +3964,7 @@ download_cb (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Failed to download keys from `%s' (no HTTP response)\n",
                   CFG_exchange_url);
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_FAILURE;
     return;
   }
@@ -2861,7 +4003,7 @@ do_download (char *const *args)
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "exchange",
                                "BASE_URL");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
@@ -3069,7 +4211,7 @@ tofu_check (const struct TALER_SecurityModulePublicKeySetP *secmset)
  * @param signkeys keys to output
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 show_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
                const json_t *signkeys)
 {
@@ -3114,7 +4256,7 @@ show_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
                   stderr,
                   JSON_INDENT (2));
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
     duration = GNUNET_TIME_absolute_get_difference (start_time.abs_time,
@@ -3130,7 +4272,7 @@ show_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
                   "Invalid security module signature for signing key %s (aborting)\n",
                   TALER_B2S (&exchange_pub));
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
     {
@@ -3222,7 +4364,7 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                   JSON_INDENT (2));
       GNUNET_JSON_parse_free (spec);
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
     duration = GNUNET_TIME_absolute_get_difference (
@@ -3230,13 +4372,13 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
       stamp_expire_withdraw.abs_time);
     TALER_denom_pub_hash (&denom_pub,
                           &h_denom_pub);
-    switch (denom_pub.cipher)
+    switch (denom_pub.bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_RSA:
+    case GNUNET_CRYPTO_BSA_RSA:
       {
         struct TALER_RsaPubHashP h_rsa;
 
-        TALER_rsa_pub_hash (denom_pub.details.rsa_public_key,
+        TALER_rsa_pub_hash (denom_pub.bsign_pub_key->details.rsa_public_key,
                             &h_rsa);
         ok = TALER_exchange_secmod_rsa_verify (&h_rsa,
                                                section_name,
@@ -3246,11 +4388,11 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                                                &secm_sig);
       }
       break;
-    case TALER_DENOMINATION_CS:
+    case GNUNET_CRYPTO_BSA_CS:
       {
         struct TALER_CsPubHashP h_cs;
 
-        TALER_cs_pub_hash (&denom_pub.details.cs_public_key,
+        TALER_cs_pub_hash (&denom_pub.bsign_pub_key->details.cs_public_key,
                            &h_cs);
         ok = TALER_exchange_secmod_cs_verify (&h_cs,
                                               section_name,
@@ -3271,7 +4413,7 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                   "Invalid security module signature for denomination key %s (aborting)\n",
                   GNUNET_h2s (&h_denom_pub.hash));
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
 
@@ -3358,7 +4500,7 @@ parse_keys_input (const char *command_name)
                   err.source,
                   err.position);
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return NULL;
     }
   }
@@ -3377,7 +4519,7 @@ parse_keys_input (const char *command_name)
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     return NULL;
   }
   if (0 != strcmp (op_str,
@@ -3408,15 +4550,15 @@ do_show (char *const *args)
   json_t *keys;
   const char *err_name;
   unsigned int err_line;
-  json_t *denomkeys;
-  json_t *signkeys;
+  const json_t *denomkeys;
+  const json_t *signkeys;
   struct TALER_MasterPublicKeyP mpub;
   struct TALER_SecurityModulePublicKeySetP secmset;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("future_denoms",
-                           &denomkeys),
-    GNUNET_JSON_spec_json ("future_signkeys",
-                           &signkeys),
+    GNUNET_JSON_spec_array_const ("future_denoms",
+                                  &denomkeys),
+    GNUNET_JSON_spec_array_const ("future_signkeys",
+                                  &signkeys),
     GNUNET_JSON_spec_fixed_auto ("master_pub",
                                  &mpub),
     GNUNET_JSON_spec_fixed_auto ("denom_secmod_public_key",
@@ -3449,7 +4591,7 @@ do_show (char *const *args)
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3460,8 +4602,7 @@ do_show (char *const *args)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Fatal: exchange uses different master key!\n");
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3469,8 +4610,7 @@ do_show (char *const *args)
       tofu_check (&secmset))
   {
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3483,13 +4623,11 @@ do_show (char *const *args)
                         denomkeys)) )
   {
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
   json_decref (keys);
-  GNUNET_JSON_parse_free (spec);
   next (args);
 }
 
@@ -3548,7 +4686,7 @@ sign_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
                   stderr,
                   JSON_INDENT (2));
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
 
@@ -3565,7 +4703,7 @@ sign_signkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
                   "Invalid security module signature for signing key %s (aborting)\n",
                   TALER_B2S (&exchange_pub));
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
@@ -3606,7 +4744,7 @@ load_age_mask (const char*section_name)
   static const struct TALER_AgeMask null_mask = {0};
   enum GNUNET_GenericReturnValue ret;
 
-  if (age_mask.bits == 0)
+  if (! ar_enabled)
     return null_mask;
 
   if (GNUNET_OK != (GNUNET_CONFIGURATION_have_value (
@@ -3618,14 +4756,14 @@ load_age_mask (const char*section_name)
   ret = GNUNET_CONFIGURATION_get_value_yesno (kcfg,
                                               section_name,
                                               "AGE_RESTRICTED");
-  if (GNUNET_YES == ret)
-    return age_mask;
-
   if (GNUNET_SYSERR == ret)
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
                                section_name,
                                "AGE_RESTRICTED",
                                "Value must be YES or NO\n");
+  if (GNUNET_YES == ret)
+    return ar_config.mask;
+
   return null_mask;
 }
 
@@ -3702,7 +4840,7 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                   JSON_INDENT (2));
       GNUNET_JSON_parse_free (spec);
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       return GNUNET_SYSERR;
     }
     duration = GNUNET_TIME_absolute_get_difference (
@@ -3714,13 +4852,14 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
 
     TALER_denom_pub_hash (&denom_pub,
                           &h_denom_pub);
-    switch (denom_pub.cipher)
+
+    switch (denom_pub.bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_RSA:
+    case GNUNET_CRYPTO_BSA_RSA:
       {
         struct TALER_RsaPubHashP h_rsa;
 
-        TALER_rsa_pub_hash (denom_pub.details.rsa_public_key,
+        TALER_rsa_pub_hash (denom_pub.bsign_pub_key->details.rsa_public_key,
                             &h_rsa);
         if (GNUNET_OK !=
             TALER_exchange_secmod_rsa_verify (&h_rsa,
@@ -3734,17 +4873,17 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                       "Invalid security module signature for denomination key %s (aborting)\n",
                       GNUNET_h2s (&h_denom_pub.hash));
           global_ret = EXIT_FAILURE;
-          test_shutdown ();
+          GNUNET_SCHEDULER_shutdown ();
           GNUNET_JSON_parse_free (spec);
           return GNUNET_SYSERR;
         }
       }
       break;
-    case TALER_DENOMINATION_CS:
+    case GNUNET_CRYPTO_BSA_CS:
       {
         struct TALER_CsPubHashP h_cs;
 
-        TALER_cs_pub_hash (&denom_pub.details.cs_public_key,
+        TALER_cs_pub_hash (&denom_pub.bsign_pub_key->details.cs_public_key,
                            &h_cs);
         if (GNUNET_OK !=
             TALER_exchange_secmod_cs_verify (&h_cs,
@@ -3758,7 +4897,7 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
                       "Invalid security module signature for denomination key %s (aborting)\n",
                       GNUNET_h2s (&h_denom_pub.hash));
           global_ret = EXIT_FAILURE;
-          test_shutdown ();
+          GNUNET_SCHEDULER_shutdown ();
           GNUNET_JSON_parse_free (spec);
           return GNUNET_SYSERR;
         }
@@ -3766,7 +4905,7 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub_rsa,
       break;
     default:
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
@@ -3809,15 +4948,15 @@ do_sign (char *const *args)
   json_t *keys;
   const char *err_name;
   unsigned int err_line;
-  json_t *denomkeys;
-  json_t *signkeys;
+  const json_t *denomkeys;
+  const json_t *signkeys;
   struct TALER_MasterPublicKeyP mpub;
   struct TALER_SecurityModulePublicKeySetP secmset;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("future_denoms",
-                           &denomkeys),
-    GNUNET_JSON_spec_json ("future_signkeys",
-                           &signkeys),
+    GNUNET_JSON_spec_array_const ("future_denoms",
+                                  &denomkeys),
+    GNUNET_JSON_spec_array_const ("future_signkeys",
+                                  &signkeys),
     GNUNET_JSON_spec_fixed_auto ("master_pub",
                                  &mpub),
     GNUNET_JSON_spec_fixed_auto ("denom_secmod_public_key",
@@ -3852,7 +4991,7 @@ do_sign (char *const *args)
                 stderr,
                 JSON_INDENT (2));
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3863,8 +5002,7 @@ do_sign (char *const *args)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Fatal: exchange uses different master key!\n");
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3874,8 +5012,7 @@ do_sign (char *const *args)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Fatal: security module keys changed!\n");
     global_ret = EXIT_FAILURE;
-    test_shutdown ();
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_SCHEDULER_shutdown ();
     json_decref (keys);
     return;
   }
@@ -3896,10 +5033,9 @@ do_sign (char *const *args)
                           denomkey_sig_array)) )
     {
       global_ret = EXIT_FAILURE;
-      test_shutdown ();
+      GNUNET_SCHEDULER_shutdown ();
       json_decref (signkey_sig_array);
       json_decref (denomkey_sig_array);
-      GNUNET_JSON_parse_free (spec);
       json_decref (keys);
       return;
     }
@@ -3911,7 +5047,6 @@ do_sign (char *const *args)
                         GNUNET_JSON_pack_array_steal ("signkey_sigs",
                                                       signkey_sig_array)));
   }
-  GNUNET_JSON_parse_free (spec);
   json_decref (keys);
   next (args);
 }
@@ -3958,84 +5093,118 @@ do_setup (char *const *args)
 }
 
 
-/*
+/**
  * Print the current extensions as configured
+ *
+ * @param args the array of command-line arguments to process next
  */
 static void
 do_extensions_show (char *const *args)
 {
-
-  json_t *obj = json_object ();
+  const struct TALER_Extensions *it;
   json_t *exts = json_object ();
-  const struct TALER_Extension *it;
+  json_t *obj;
 
+  GNUNET_assert (NULL != exts);
   for (it = TALER_extensions_get_head ();
-       NULL != it;
+       NULL != it && NULL != it->extension;
        it = it->next)
-    json_object_set (exts, it->name, it->config_to_json (it));
-
-  json_object_set (obj, "extensions", exts);
+  {
+    const struct TALER_Extension *extension = it->extension;
+    int ret;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "%s\n",
-              json_dumps (obj, JSON_INDENT (2)));
+    ret = json_object_set_new (exts,
+                               extension->name,
+                               extension->manifest (extension));
+    GNUNET_assert (-1 != ret);
+  }
 
+  obj = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_object_steal ("extensions",
+                                   exts));
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "%s\n",
+              json_dumps (obj,
+                          JSON_INDENT (2)));
   json_decref (obj);
+  next (args);
 }
 
 
-/*
+/**
  * Sign the configurations of the enabled extensions
  */
 static void
 do_extensions_sign (char *const *args)
 {
-  json_t *obj = json_object ();
   json_t *extensions = json_object ();
-  struct TALER_ExtensionConfigHashP h_config;
+  struct TALER_ExtensionManifestsHashP h_manifests;
   struct TALER_MasterSignatureP sig;
-  const struct TALER_Extension *it;
+  const struct TALER_Extensions *it;
+  bool found = false;
+  json_t *obj;
 
-  if (GNUNET_OK != TALER_extensions_load_taler_config (kcfg))
+  GNUNET_assert (NULL != extensions);
+  for (it = TALER_extensions_get_head ();
+       NULL != it && NULL != it->extension;
+       it = it->next)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "error while loading taler config for extensions\n");
-    return;
+    const struct TALER_Extension *ext = it->extension;
+    GNUNET_assert (ext);
+
+    found = true;
+
+    GNUNET_assert (0 ==
+                   json_object_set_new (extensions,
+                                        ext->name,
+                                        ext->manifest (ext)));
   }
 
-  for (it = TALER_extensions_get_head ();
-       NULL != it;
-       it = it->next)
-    json_object_set (extensions, it->name, it->config_to_json (it));
+  if (! found)
+    return;
 
   if (GNUNET_OK !=
-      TALER_JSON_extensions_config_hash (extensions, &h_config))
+      TALER_JSON_extensions_manifests_hash (extensions,
+                                            &h_manifests))
   {
+    json_decref (extensions);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "error while hashing config for extensions\n");
+                "error while hashing manifest for extensions\n");
     return;
   }
 
   if (GNUNET_OK !=
       load_offline_key (GNUNET_NO))
+  {
+    json_decref (extensions);
     return;
+  }
 
-
-  TALER_exchange_offline_extension_config_hash_sign (&h_config,
-                                                     &master_priv,
-                                                     &sig);
-  json_object_set (obj, "extensions", extensions);
-  json_object_update (obj,
-                      GNUNET_JSON_PACK (
-                        GNUNET_JSON_pack_data_auto (
-                          "extensions_sig",
-                          &sig)));
-
-  output_operation (OP_EXTENSIONS, obj);
+  TALER_exchange_offline_extension_manifests_hash_sign (&h_manifests,
+                                                        &master_priv,
+                                                        &sig);
+  obj = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_object_steal ("extensions",
+                                   extensions),
+    GNUNET_JSON_pack_data_auto (
+      "extensions_sig",
+      &sig));
+
+  output_operation (OP_EXTENSIONS,
+                    obj);
+  next (args);
 }
 
 
+/**
+ * Dispatch @a args in the @a cmds array.
+ *
+ * @param args arguments with subcommand to dispatch
+ * @param cmds array of possible subcommands to call
+ */
 static void
-cmd_handler (char *const *args, const struct SubCommand *cmds)
+cmd_handler (char *const *args,
+             const struct SubCommand *cmds)
 {
   nxt = NULL;
   for (unsigned int i = 0; NULL != cmds[i].name; i++)
@@ -4066,6 +5235,9 @@ cmd_handler (char *const *args, const struct SubCommand *cmds)
                 cmds[i].name,
                 cmds[i].help);
   }
+  json_decref (out);
+  out = NULL;
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -4094,13 +5266,12 @@ do_work_extensions (char *const *args)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "You must provide a subcommand: `show` or `sign`.\n");
-    test_shutdown ();
+    GNUNET_SCHEDULER_shutdown ();
     global_ret = EXIT_INVALIDARGUMENT;
     return;
   }
 
   cmd_handler (args, cmds);
-  next (args + 1);
 }
 
 
@@ -4159,7 +5330,7 @@ work (void *cls)
     {
       .name = "enable-account",
       .help =
-        "enable wire account of the exchange (payto-URI must be given as argument)",
+        "enable wire account of the exchange (payto-URI must be given as argument; for optional arguments see man page)",
       .cb = &do_add_wire
     },
     {
@@ -4171,16 +5342,40 @@ work (void *cls)
     {
       .name = "wire-fee",
       .help =
-        "sign wire fees for the given year (year, wire method, wire fee, closing fee and wad fee must be given as arguments)",
+        "sign wire fees for the given year (year, wire method, wire fee, and closing fee must be given as arguments)",
       .cb = &do_set_wire_fee
     },
     {
       .name = "global-fee",
       .help =
-        "sign global fees for the given year (year, history fee, kyc fee, account fee, purse fee, purse timeout, kyc timeout, history expiration and the maximum number of free purses per account must be given as arguments)",
+        "sign global fees for the given year (year, history fee, account fee, purse fee, purse timeout, history expiration and the maximum number of free purses per account must be given as arguments)",
       .cb = &do_set_global_fee
     },
     {
+      .name = "drain",
+      .help =
+        "drain profits from exchange escrow account to regular exchange operator account (amount, debit account configuration section and credit account payto://-URI must be given as arguments)",
+      .cb = &do_drain
+    },
+    {
+      .name = "add-partner",
+      .help =
+        "add partner exchange for P2P wad transfers (partner master public key, partner base URL, wad fee, wad frequency and validity year must be given as arguments)",
+      .cb = &do_add_partner
+    },
+    {
+      .name = "aml-enable",
+      .help =
+        "enable AML staff member (staff member public key, legal name and rw (read write) or ro (read only) must be given as arguments)",
+      .cb = &enable_aml_staff
+    },
+    {
+      .name = "aml-disable",
+      .help =
+        "disable AML staff member (staff member public key and legal name must be given as arguments)",
+      .cb = &disable_aml_staff
+    },
+    {
       .name = "upload",
       .help =
         "upload operation result to exchange (to be performed online!)",
@@ -4219,25 +5414,31 @@ run (void *cls,
   (void) cls;
   (void) cfgfile;
   kcfg = cfg;
-  if (GNUNET_OK !=
-      TALER_config_get_currency (kcfg,
-                                 &currency))
+
+  /* load extensions */
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_extensions_init (kcfg));
+
+  /* setup age restriction, if applicable */
   {
-    global_ret = EXIT_NOTCONFIGURED;
-    return;
+    const struct TALER_AgeRestrictionConfig *arc;
+
+    if (NULL !=
+        (arc = TALER_extensions_get_age_restriction_config ()))
+    {
+      ar_config  = *arc;
+      ar_enabled = true;
+    }
   }
 
-  /* load age mask, if age restriction is enabled */
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_extension_age_restriction_register ());
 
-  if (GNUNET_OK != TALER_extensions_load_taler_config (kcfg))
+  if (GNUNET_OK !=
+      TALER_config_get_currency (kcfg,
+                                 &currency))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "error while loading taler config for extensions\n");
+    global_ret = EXIT_NOTCONFIGURED;
     return;
   }
-  age_mask = TALER_extensions_age_restriction_ageMask ();
 
   ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
                           &rc);
diff --git a/src/exchange/Makefile.am b/src/exchange/Makefile.am
index ba22281fd..1c0c2c684 100644
--- a/src/exchange/Makefile.am
+++ b/src/exchange/Makefile.am
@@ -15,10 +15,13 @@ pkgcfg_DATA = \
   exchange.conf
 
 # Programs
+bin_SCRIPTS = \
+  taler-exchange-kyc-aml-pep-trigger.sh
 
 bin_PROGRAMS = \
   taler-exchange-aggregator \
   taler-exchange-closer \
+  taler-exchange-drain \
   taler-exchange-expire \
   taler-exchange-httpd \
   taler-exchange-router \
@@ -29,6 +32,7 @@ taler_exchange_aggregator_SOURCES = \
   taler-exchange-aggregator.c
 taler_exchange_aggregator_LDADD = \
   $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
@@ -52,6 +56,19 @@ taler_exchange_closer_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
+taler_exchange_drain_SOURCES = \
+  taler-exchange-drain.c
+taler_exchange_drain_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  -ljansson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  $(XLIB)
+
 taler_exchange_expire_SOURCES = \
   taler-exchange-expire.c
 taler_exchange_expire_LDADD = \
@@ -107,25 +124,38 @@ taler_exchange_wirewatch_LDADD = \
 
 taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd.c taler-exchange-httpd.h \
+  taler-exchange-httpd_age-withdraw.c taler-exchange-httpd_age-withdraw.h \
+  taler-exchange-httpd_age-withdraw_reveal.c taler-exchange-httpd_age-withdraw_reveal.h \
   taler-exchange-httpd_auditors.c taler-exchange-httpd_auditors.h \
+  taler-exchange-httpd_aml-decision.c taler-exchange-httpd_aml-decision.h \
+  taler-exchange-httpd_aml-decision-get.c \
+  taler-exchange-httpd_aml-decisions-get.c \
+  taler-exchange-httpd_batch-deposit.c taler-exchange-httpd_batch-deposit.h \
   taler-exchange-httpd_batch-withdraw.c taler-exchange-httpd_batch-withdraw.h \
+  taler-exchange-httpd_coins_get.c taler-exchange-httpd_coins_get.h \
+  taler-exchange-httpd_common_deposit.c taler-exchange-httpd_common_deposit.h \
+  taler-exchange-httpd_common_kyc.c taler-exchange-httpd_common_kyc.h \
+  taler-exchange-httpd_config.c taler-exchange-httpd_config.h \
   taler-exchange-httpd_contract.c taler-exchange-httpd_contract.h \
   taler-exchange-httpd_csr.c taler-exchange-httpd_csr.h \
   taler-exchange-httpd_db.c taler-exchange-httpd_db.h \
-  taler-exchange-httpd_deposit.c taler-exchange-httpd_deposit.h \
   taler-exchange-httpd_deposits_get.c taler-exchange-httpd_deposits_get.h \
   taler-exchange-httpd_extensions.c taler-exchange-httpd_extensions.h \
   taler-exchange-httpd_keys.c taler-exchange-httpd_keys.h \
   taler-exchange-httpd_kyc-check.c taler-exchange-httpd_kyc-check.h \
   taler-exchange-httpd_kyc-proof.c taler-exchange-httpd_kyc-proof.h \
   taler-exchange-httpd_kyc-wallet.c taler-exchange-httpd_kyc-wallet.h \
+  taler-exchange-httpd_kyc-webhook.c taler-exchange-httpd_kyc-webhook.h \
   taler-exchange-httpd_link.c taler-exchange-httpd_link.h \
   taler-exchange-httpd_management.h \
+  taler-exchange-httpd_management_aml-officers.c \
   taler-exchange-httpd_management_auditors.c \
   taler-exchange-httpd_management_auditors_AP_disable.c \
   taler-exchange-httpd_management_denominations_HDP_revoke.c \
+  taler-exchange-httpd_management_drain.c \
   taler-exchange-httpd_management_extensions.c \
   taler-exchange-httpd_management_global_fees.c \
+  taler-exchange-httpd_management_partners.c \
   taler-exchange-httpd_management_post_keys.c \
   taler-exchange-httpd_management_signkey_EP_revoke.c \
   taler-exchange-httpd_management_wire_enable.c \
@@ -136,21 +166,24 @@ taler_exchange_httpd_SOURCES = \
   taler-exchange-httpd_mhd.c taler-exchange-httpd_mhd.h \
   taler-exchange-httpd_purses_create.c taler-exchange-httpd_purses_create.h \
   taler-exchange-httpd_purses_deposit.c taler-exchange-httpd_purses_deposit.h \
+  taler-exchange-httpd_purses_delete.c taler-exchange-httpd_purses_delete.h \
   taler-exchange-httpd_purses_get.c taler-exchange-httpd_purses_get.h \
   taler-exchange-httpd_purses_merge.c taler-exchange-httpd_purses_merge.h \
   taler-exchange-httpd_recoup.c taler-exchange-httpd_recoup.h \
   taler-exchange-httpd_recoup-refresh.c taler-exchange-httpd_recoup-refresh.h \
   taler-exchange-httpd_refreshes_reveal.c taler-exchange-httpd_refreshes_reveal.h \
   taler-exchange-httpd_refund.c taler-exchange-httpd_refund.h \
+  taler-exchange-httpd_reserves_attest.c taler-exchange-httpd_reserves_attest.h \
+  taler-exchange-httpd_reserves_close.c taler-exchange-httpd_reserves_close.h \
   taler-exchange-httpd_reserves_get.c taler-exchange-httpd_reserves_get.h \
+  taler-exchange-httpd_reserves_get_attest.c taler-exchange-httpd_reserves_get_attest.h \
   taler-exchange-httpd_reserves_history.c taler-exchange-httpd_reserves_history.h \
+  taler-exchange-httpd_reserves_open.c taler-exchange-httpd_reserves_open.h \
   taler-exchange-httpd_reserves_purse.c taler-exchange-httpd_reserves_purse.h \
-  taler-exchange-httpd_reserves_status.c taler-exchange-httpd_reserves_status.h \
   taler-exchange-httpd_responses.c taler-exchange-httpd_responses.h \
+  taler-exchange-httpd_spa.c taler-exchange-httpd_spa.h \
   taler-exchange-httpd_terms.c taler-exchange-httpd_terms.h \
-  taler-exchange-httpd_transfers_get.c taler-exchange-httpd_transfers_get.h \
-  taler-exchange-httpd_wire.c taler-exchange-httpd_wire.h \
-  taler-exchange-httpd_withdraw.c taler-exchange-httpd_withdraw.h
+  taler-exchange-httpd_transfers_get.c taler-exchange-httpd_transfers_get.h
 
 taler_exchange_httpd_LDADD = \
   $(LIBGCRYPT_LIBS) \
@@ -158,6 +191,8 @@ taler_exchange_httpd_LDADD = \
   $(top_builddir)/src/mhd/libtalermhd.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
+  $(top_builddir)/src/templating/libtalertemplating.la \
+  $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
   -lmicrohttpd \
@@ -180,7 +215,6 @@ check_SCRIPTS += \
   test_taler_exchange_httpd_afl.sh
 endif
 
-.NOTPARALLEL:
 TESTS = \
   $(check_SCRIPTS)
 
@@ -193,4 +227,5 @@ EXTRA_DIST = \
   test_taler_exchange_httpd.get \
   test_taler_exchange_httpd.post \
   exchange.conf \
+  $(bin_SCRIPTS) \
   $(check_SCRIPTS)
diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf
index 58e57c82e..ce471a292 100644
--- a/src/exchange/exchange.conf
+++ b/src/exchange/exchange.conf
@@ -6,6 +6,33 @@
 # This must be adjusted to your actual installation.
 # MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
 
+# Must be set to the threshold above which transactions
+# are flagged for AML review.
+# AML_THRESHOLD =
+
+# How many digits does the currency use by default on displays.
+# Hint provided to wallets. Should be 2 for EUR/USD/CHF,
+# and 0 for JPY. Default is 2 as that is most common.
+# Maximum value is 8. Note that this is the number of
+# fractions shown in the wallet by default, it is still
+# possible to configure denominations with more digits
+# and those will then be rendered using 'tiny' fraction
+# capitals (like at gas stations) when present.
+CURRENCY_FRACTION_DIGITS = 2
+
+# Specifies a program (binary) to run on KYC attribute data to decide
+# whether we should immediately flag an account for AML review.
+# The KYC attribute data will be passed on standard-input.
+# Return non-zero to trigger AML review of the new user.
+KYC_AML_TRIGGER = true
+
+# Attribute encryption key for storing attributes encrypted
+# in the database. Should be a high-entropy nonce.
+ATTRIBUTE_ENCRYPTION_KEY = SET_ME_PLEASE
+
+# Set to NO to disable rewards.
+ENABLE_REWARDS = YES
+
 # How long do we allow /keys to be cached at most? The actual
 # limit is the minimum of this value and the first expected
 # significant change in /keys based on the expiration times.
@@ -15,7 +42,7 @@ MAX_KEYS_CACHING = forever
 # After how many requests should the exchange auto-restart
 # (to address potential issues with memory fragmentation)?
 # If this option is not specified, auto-restarting is disabled.
-# MAX_REQUESTS = 10000000
+# MAX_REQUESTS = 100000
 
 # How to access our database
 DB = postgres
@@ -40,13 +67,17 @@ PORT = 8081
 # transfers to enable tracking.
 BASE_URL = http://localhost:8081/
 
-# Maximum number of requests this process should handle before
-# committing suicide.
-# MAX_REQUESTS =
-
 # How long should the aggregator sleep if it has nothing to do?
 AGGREGATOR_IDLE_SLEEP_INTERVAL = 60 s
 
+# What type of asset is the exchange managing? Used to adjust
+# the user-interface of the wallet.
+# Possibilities include: "fiat", "regional" and "crypto".
+# In the future (and already permitted but not yet supported by wallets)
+# we also expect to have "stock" and "future" (and more).
+# Default is "fiat".
+ASSET_TYPE = "fiat"
+
 # FIXME: document!
 ROUTER_IDLE_SLEEP_INTERVAL = 60 s
 
@@ -54,7 +85,7 @@ ROUTER_IDLE_SLEEP_INTERVAL = 60 s
 # by taler-exchange-expire (in time).  It may take
 # this much time for an expired purse to be really
 # cleaned up and the coins refunded.
-EXPIRE_SHARD_SIZE = 1 h
+EXPIRE_SHARD_SIZE = 60 s
 
 # How long should the transfer tool
 # sleep if it has nothing to do?
@@ -95,42 +126,13 @@ WIREWATCH_IDLE_SLEEP_INTERVAL = 1 s
 SIGNKEY_LEGAL_DURATION = 2 years
 
 # Directory with our terms of service.
-TERMS_DIR = $DATADIR/exchange/tos/
+TERMS_DIR = $TALER_DATA_HOME/terms/
 
 # Etag / filename for the terms of service.
-TERMS_ETAG = 0
+TERMS_ETAG = exchange-tos-v0
 
 # Directory with our privacy policy.
-PRIVACY_DIR = $DATADIR/exchange/pp/
+PRIVACY_DIR = $TALER_DATA_HOME/terms/
 
 # Etag / filename for the privacy policy.
-PRIVACY_ETAG = 0
-
-# Set to NONE to disable KYC checks.
-# Set to "OAUTH2" to use OAuth 2.0 for KYC authorization.
-KYC_MODE = NONE
-
-# Balance threshold above which wallets are told
-# to undergo a KYC check at the exchange. Optional,
-# if not given there is no limit.
-# KYC_WALLET_BALANCE_LIMIT = CURRENCY:150
-#
-# KYC_WITHDRAW_PERIOD = 1 month
-
-[exchange-kyc-oauth2]
-
-# URL of the OAuth endpoint for KYC checks
-# KYC_OAUTH2_URL =
-
-# URL of the "information" endpoint for KYC checks
-# KYC_INFO_URL =
-
-# KYC Oauth client ID.
-# KYC_OAUTH2_CLIENT_ID =
-
-# KYC Client secret used to obtain access tokens.
-# KYC_OAUTH2_CLIENT_SECRET =
-
-# Where to redirect clients after successful
-# authorization?
-# KYC_OAUTH2_POST_URL = https://bank.com/
+PRIVACY_ETAG = exchange-pp-v0
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index 9568f011e..691d65ae3 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2022 Taler Systems SA
 
   TALER 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
@@ -26,7 +26,9 @@
 #include "taler_exchangedb_lib.h"
 #include "taler_exchangedb_plugin.h"
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_bank_service.h"
+#include "taler_dbevents.h"
 
 
 /**
@@ -43,6 +45,12 @@ struct AggregationUnit
   struct TALER_MerchantPublicKeyP merchant_pub;
 
   /**
+   * Transient amount already found aggregated,
+   * set only if @e have_transient is true.
+   */
+  struct TALER_Amount trans;
+
+  /**
    * Total amount to be transferred, before subtraction of @e fees.wire and rounding down.
    */
   struct TALER_Amount total_amount;
@@ -84,6 +92,25 @@ struct AggregationUnit
    */
   const struct TALER_EXCHANGEDB_AccountInfo *wa;
 
+  /**
+   * Row in KYC table for legitimization requirements
+   * that are pending for this aggregation, or 0 if none.
+   */
+  uint64_t requirement_row;
+
+  /**
+   * Set to #GNUNET_OK during transient checking
+   * while everything is OK. Otherwise see return
+   * value of #do_aggregate().
+   */
+  enum GNUNET_GenericReturnValue ret;
+
+  /**
+   * Do we have an entry in the transient table for
+   * this aggregation?
+   */
+  bool have_transient;
+
 };
 
 
@@ -123,6 +150,12 @@ struct Shard
 static struct TALER_Amount currency_round_unit;
 
 /**
+ * What is the largest amount we transfer before triggering
+ * an AML check?
+ */
+static struct TALER_Amount aml_threshold;
+
+/**
  * What is the base URL of this exchange?  Used in the
  * wire transfer subjects so that merchants and governments
  * can ask for the list of aggregated deposits.
@@ -151,7 +184,6 @@ static struct TALER_EXCHANGEDB_Plugin *db_plugin;
  */
 static struct GNUNET_SCHEDULER_Task *task;
 
-
 /**
  * How long should we sleep when idle before trying to find more work?
  */
@@ -186,12 +218,12 @@ run_aggregation (void *cls);
 
 
 /**
- * Select a shard to work on.
+ * Work on transactions unlocked by KYC.
  *
  * @param cls NULL
  */
 static void
-run_shard (void *cls);
+drain_kyc_alerts (void *cls);
 
 
 /**
@@ -226,6 +258,7 @@ shutdown_task (void *cls)
     GNUNET_SCHEDULER_cancel (task);
     task = NULL;
   }
+  TALER_KYCLOGIC_kyc_done ();
   TALER_EXCHANGEDB_plugin_unload (db_plugin);
   db_plugin = NULL;
   TALER_EXCHANGEDB_unload_accounts ();
@@ -234,12 +267,12 @@ shutdown_task (void *cls)
 
 
 /**
- * Parse the configuration for wirewatch.
+ * Parse the configuration for aggregator.
  *
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
-parse_wirewatch_config (void)
+parse_aggregator_config (void)
 {
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -268,11 +301,20 @@ parse_wirewatch_config (void)
                                  "taler",
                                  "CURRENCY_ROUND_UNIT",
                                  &currency_round_unit)) ||
-       ( (0 != currency_round_unit.fraction) &&
-         (0 != currency_round_unit.value) ) )
+       (TALER_amount_is_zero (&currency_round_unit)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Need non-zero amount in section `taler' under `CURRENCY_ROUND_UNIT'\n");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_config_get_amount (cfg,
+                               "exchange",
+                               "AML_THRESHOLD",
+                               &aml_threshold))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Need non-zero value in section `TALER' under `CURRENCY_ROUND_UNIT'\n");
+                "Need amount in section `exchange' under `AML_THRESHOLD'\n");
     return GNUNET_SYSERR;
   }
 
@@ -341,6 +383,7 @@ release_shard (struct Shard *s)
   case GNUNET_DB_STATUS_SOFT_ERROR:
     GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
     GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
     return;
   case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
@@ -353,109 +396,286 @@ release_shard (struct Shard *s)
 }
 
 
+/**
+ * Trigger the wire transfer for the @a au_active
+ * and delete the record of the aggregation.
+ *
+ * @param au_active information about the aggregation
+ */
+static enum GNUNET_DB_QueryStatus
+trigger_wire_transfer (const struct AggregationUnit *au_active)
+{
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Preparing wire transfer of %s to %s\n",
+              TALER_amount2s (&au_active->final_amount),
+              TALER_B2S (&au_active->merchant_pub));
+  {
+    void *buf;
+    size_t buf_size;
+
+    TALER_BANK_prepare_transfer (au_active->payto_uri,
+                                 &au_active->final_amount,
+                                 exchange_base_url,
+                                 &au_active->wtid,
+                                 &buf,
+                                 &buf_size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Storing %u bytes of wire prepare data\n",
+                (unsigned int) buf_size);
+    /* Commit our intention to execute the wire transfer! */
+    qs = db_plugin->wire_prepare_data_insert (db_plugin->cls,
+                                              au_active->wa->method,
+                                              buf,
+                                              buf_size);
+    GNUNET_free (buf);
+  }
+  /* Commit the WTID data to 'wire_out'  */
+  if (qs >= 0)
+    qs = db_plugin->store_wire_transfer_out (db_plugin->cls,
+                                             au_active->execution_time,
+                                             &au_active->wtid,
+                                             &au_active->h_payto,
+                                             au_active->wa->section_name,
+                                             &au_active->final_amount);
+
+  if ( (qs >= 0) &&
+       au_active->have_transient)
+    qs = db_plugin->delete_aggregation_transient (db_plugin->cls,
+                                                  &au_active->h_payto,
+                                                  &au_active->wtid);
+  return qs;
+}
+
+
+/**
+ * Callback to return all applicable amounts for the KYC
+ * decision to @ a cb.
+ *
+ * @param cls a `struct AggregationUnit *`
+ * @param limit time limit for the iteration
+ * @param cb function to call with the amounts
+ * @param cb_cls closure for @a cb
+ */
 static void
-run_aggregation (void *cls)
+return_relevant_amounts (void *cls,
+                         struct GNUNET_TIME_Absolute limit,
+                         TALER_EXCHANGEDB_KycAmountCallback cb,
+                         void *cb_cls)
 {
-  struct Shard *s = cls;
-  struct AggregationUnit au_active;
+  const struct AggregationUnit *au_active = cls;
   enum GNUNET_DB_QueryStatus qs;
-  struct TALER_Amount trans;
-  bool have_transient = true; /* squash compiler warning */
 
-  task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Checking for ready deposits to aggregate\n");
-  /* make sure we have current fees */
-  memset (&au_active,
-          0,
-          sizeof (au_active));
-  au_active.execution_time = GNUNET_TIME_timestamp_get ();
+              "Returning amount %s in KYC check\n",
+              TALER_amount2s (&au_active->total_amount));
   if (GNUNET_OK !=
-      db_plugin->start_deferred_wire_out (db_plugin->cls))
+      cb (cb_cls,
+          &au_active->total_amount,
+          GNUNET_TIME_absolute_get ()))
+    return;
+  qs = db_plugin->select_aggregation_amounts_for_kyc_check (
+    db_plugin->cls,
+    &au_active->h_payto,
+    limit,
+    cb,
+    cb_cls);
+  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to start database transaction!\n");
-    global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    release_shard (s);
-    return;
+                "Failed to select aggregation amounts for KYC limit check!\n");
   }
-  qs = db_plugin->get_ready_deposit (
+}
+
+
+/**
+ * Test if KYC is required for a transfer to @a h_payto.
+ *
+ * @param[in,out] au_active aggregation unit to check for
+ * @return true if KYC checks are satisfied
+ */
+static bool
+kyc_satisfied (struct AggregationUnit *au_active)
+{
+  char *requirement;
+  enum GNUNET_DB_QueryStatus qs;
+
+  if (kyc_off)
+    return true;
+  qs = TALER_KYCLOGIC_kyc_test_required (
+    TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT,
+    &au_active->h_payto,
+    db_plugin->select_satisfied_kyc_processes,
     db_plugin->cls,
-    s->shard_start,
-    s->shard_end,
-    kyc_off ? true : false,
-    &au_active.merchant_pub,
-    &au_active.payto_uri);
-  switch (qs)
+    &return_relevant_amounts,
+    (void *) au_active,
+    &requirement);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return false;
+  }
+  if (NULL == requirement)
+    return true;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC requirement for %s is %s\n",
+              TALER_amount2s (&au_active->total_amount),
+              requirement);
+  qs = db_plugin->insert_kyc_requirement_for_account (
+    db_plugin->cls,
+    requirement,
+    &au_active->h_payto,
+    NULL, /* not a reserve */
+    &au_active->requirement_row);
+  if (qs < 0)
   {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-    cleanup_au (&au_active);
-    db_plugin->rollback (db_plugin->cls);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to begin deposit iteration!\n");
-    global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    release_shard (s);
-    return;
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-    cleanup_au (&au_active);
-    db_plugin->rollback (db_plugin->cls);
-    GNUNET_assert (NULL == task);
-    task = GNUNET_SCHEDULER_add_now (&run_aggregation,
-                                     s);
-    return;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-    {
-      uint64_t counter = s->work_counter;
-      struct GNUNET_TIME_Relative duration
-        = GNUNET_TIME_absolute_get_duration (s->start_time.abs_time);
+                "Failed to persist KYC requirement `%s' in DB!\n",
+                requirement);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Legitimization process %llu started\n",
+                (unsigned long long) au_active->requirement_row);
+  }
+  GNUNET_free (requirement);
+  return false;
+}
 
-      cleanup_au (&au_active);
-      db_plugin->rollback (db_plugin->cls);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Completed shard [%u,%u] after %s with %llu deposits\n",
-                  (unsigned int) s->shard_start,
-                  (unsigned int) s->shard_end,
-                  GNUNET_TIME_relative2s (duration,
-                                          true),
-                  (unsigned long long) counter);
-      release_shard (s);
-      if ( (GNUNET_YES == test_mode) &&
-           (0 == counter) )
-      {
-        /* in test mode, shutdown after a shard is done with 0 work */
-        GNUNET_SCHEDULER_shutdown ();
-        return;
-      }
-      GNUNET_assert (NULL == task);
-      /* If we ended up doing zero work, sleep a bit */
-      if (0 == counter)
-        task = GNUNET_SCHEDULER_add_delayed (aggregator_idle_sleep_interval,
-                                             &run_shard,
-                                             NULL);
-      else
-        task = GNUNET_SCHEDULER_add_now (&run_shard,
-                                         NULL);
-      return;
+
+/**
+ * Function called on each @a amount that was found to
+ * be relevant for an AML check.
+ *
+ * @param cls closure with the `struct TALER_Amount *` where we store the sum
+ * @param amount encountered transaction amount
+ * @param date when was the amount encountered
+ * @return #GNUNET_OK to continue to iterate,
+ *         #GNUNET_NO to abort iteration
+ *         #GNUNET_SYSERR on internal error (also abort itaration)
+ */
+static enum GNUNET_GenericReturnValue
+sum_for_aml (
+  void *cls,
+  const struct TALER_Amount *amount,
+  struct GNUNET_TIME_Absolute date)
+{
+  struct TALER_Amount *sum = cls;
+
+  (void) date;
+  if (0 >
+      TALER_amount_add (sum,
+                        sum,
+                        amount))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Test if AML is required for a transfer to @a h_payto.
+ *
+ * @param[in,out] au_active aggregation unit to check for
+ * @return true if AML checks are satisfied
+ */
+static bool
+aml_satisfied (struct AggregationUnit *au_active)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_Amount total;
+  struct TALER_Amount threshold;
+  enum TALER_AmlDecisionState decision;
+  struct TALER_EXCHANGEDB_KycStatus kyc;
+
+  total = au_active->final_amount;
+  qs = db_plugin->select_aggregation_amounts_for_kyc_check (
+    db_plugin->cls,
+    &au_active->h_payto,
+    GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (),
+                                   GNUNET_TIME_UNIT_MONTHS),
+    &sum_for_aml,
+    &total);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return false;
+  }
+  qs = db_plugin->select_aml_threshold (db_plugin->cls,
+                                        &au_active->h_payto,
+                                        &decision,
+                                        &kyc,
+                                        &threshold);
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return false;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    threshold = aml_threshold; /* use default */
+    decision = TALER_AML_NORMAL;
+  }
+  switch (decision)
+  {
+  case TALER_AML_NORMAL:
+    if (0 >= TALER_amount_cmp (&total,
+                               &threshold))
+    {
+      /* total <= threshold, do nothing */
+      return true;
     }
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    s->work_counter++;
-    /* continued below */
-    break;
+    qs = db_plugin->trigger_aml_process (db_plugin->cls,
+                                         &au_active->h_payto,
+                                         &total);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      return false;
+    }
+    return false;
+  case TALER_AML_PENDING:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "AML already pending, doing nothing\n");
+    return false;
+  case TALER_AML_FROZEN:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Account frozen, doing nothing\n");
+    return false;
   }
-  au_active.wa = TALER_EXCHANGEDB_find_account_by_payto_uri (
-    au_active.payto_uri);
-  if (NULL == au_active.wa)
+  GNUNET_assert (0);
+  return false;
+}
+
+
+/**
+ * Perform the main aggregation work for @a au.  Expects to be in
+ * a working transaction, which the caller must also ultimately commit
+ * (or rollback) depending on our return value.
+ *
+ * @param[in,out] au aggregation unit to work on
+ * @return #GNUNET_OK if aggregation succeeded,
+ *         #GNUNET_NO to rollback and try again (serialization issue)
+ *         #GNUNET_SYSERR hard error, terminate aggregator process
+ */
+static enum GNUNET_GenericReturnValue
+do_aggregate (struct AggregationUnit *au)
+{
+  enum GNUNET_DB_QueryStatus qs;
+
+  au->wa = TALER_EXCHANGEDB_find_account_by_payto_uri (
+    au->payto_uri);
+  if (NULL == au->wa)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No exchange account configured for `%s', please fix your setup to continue!\n",
-                au_active.payto_uri);
+                au->payto_uri);
     global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    db_plugin->rollback (db_plugin->cls);
-    release_shard (s);
-    return;
+    return GNUNET_SYSERR;
   }
 
   {
@@ -464,234 +684,301 @@ run_aggregation (void *cls)
     struct TALER_MasterSignatureP master_sig;
 
     qs = db_plugin->get_wire_fee (db_plugin->cls,
-                                  au_active.wa->method,
-                                  au_active.execution_time,
+                                  au->wa->method,
+                                  au->execution_time,
                                   &start_date,
                                   &end_date,
-                                  &au_active.fees,
+                                  &au->fees,
                                   &master_sig);
     if (0 >= qs)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not get wire fees for %s at %s. Aborting run.\n",
-                  au_active.wa->method,
-                  GNUNET_TIME_timestamp2s (au_active.execution_time));
+                  au->wa->method,
+                  GNUNET_TIME_timestamp2s (au->execution_time));
       global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      db_plugin->rollback (db_plugin->cls);
-      release_shard (s);
-      return;
+      return GNUNET_SYSERR;
     }
   }
 
-
   /* Now try to find other deposits to aggregate */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found ready deposit for %s, aggregating by target %s\n",
-              TALER_B2S (&au_active.merchant_pub),
-              au_active.payto_uri);
-  TALER_payto_hash (au_active.payto_uri,
-                    &au_active.h_payto);
-
+              TALER_B2S (&au->merchant_pub),
+              au->payto_uri);
   qs = db_plugin->select_aggregation_transient (db_plugin->cls,
-                                                &au_active.h_payto,
-                                                au_active.wa->section_name,
-                                                &au_active.wtid,
-                                                &trans);
+                                                &au->h_payto,
+                                                &au->merchant_pub,
+                                                au->wa->section_name,
+                                                &au->wtid,
+                                                &au->trans);
   switch (qs)
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to lookup transient aggregates!\n");
-    cleanup_au (&au_active);
-    db_plugin->rollback (db_plugin->cls);
     global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    release_shard (s);
-    return;
+    return GNUNET_SYSERR;
   case GNUNET_DB_STATUS_SOFT_ERROR:
     /* serializiability issue, try again */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Serialization issue, trying again later!\n");
-    db_plugin->rollback (db_plugin->cls);
-    cleanup_au (&au_active);
-    GNUNET_assert (NULL == task);
-    task = GNUNET_SCHEDULER_add_now (&run_aggregation,
-                                     s);
-    return;
+    return GNUNET_NO;
   case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
-                                &au_active.wtid,
-                                sizeof (au_active.wtid));
-    have_transient = false;
+                                &au->wtid,
+                                sizeof (au->wtid));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "No transient aggregation found, starting %s\n",
+                TALER_B2S (&au->wtid));
+    au->have_transient = false;
     break;
   case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    have_transient = true;
+    au->have_transient = true;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Transient aggregation found, resuming %s\n",
+                TALER_B2S (&au->wtid));
     break;
   }
   qs = db_plugin->aggregate (db_plugin->cls,
-                             &au_active.h_payto,
-                             &au_active.merchant_pub,
-                             &au_active.wtid,
-                             &au_active.total_amount);
+                             &au->h_payto,
+                             &au->merchant_pub,
+                             &au->wtid,
+                             &au->total_amount);
   if (GNUNET_DB_STATUS_HARD_ERROR == qs)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to execute aggregation!\n");
-    cleanup_au (&au_active);
-    db_plugin->rollback (db_plugin->cls);
     global_ret = EXIT_FAILURE;
-    GNUNET_SCHEDULER_shutdown ();
-    release_shard (s);
-    return;
+    return GNUNET_SYSERR;
   }
   if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
   {
     /* serializiability issue, try again */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Serialization issue, trying again later!\n");
-    db_plugin->rollback (db_plugin->cls);
-    cleanup_au (&au_active);
-    GNUNET_assert (NULL == task);
-    task = GNUNET_SCHEDULER_add_now (&run_aggregation,
-                                     s);
-    return;
+    return GNUNET_NO;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Aggregation total is %s.\n",
-              TALER_amount2s (&au_active.total_amount));
-
+              TALER_amount2s (&au->total_amount));
   /* Subtract wire transfer fee and round to the unit supported by the
      wire transfer method; Check if after rounding down, we still have
      an amount to transfer, and if not mark as 'tiny'. */
-  if (have_transient)
+  if (au->have_transient)
     GNUNET_assert (0 <=
-                   TALER_amount_add (&au_active.total_amount,
-                                     &au_active.total_amount,
-                                     &trans));
+                   TALER_amount_add (&au->total_amount,
+                                     &au->total_amount,
+                                     &au->trans));
+
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Rounding aggregate of %s\n",
-              TALER_amount2s (&au_active.total_amount));
+              TALER_amount2s (&au->total_amount));
   if ( (0 >=
-        TALER_amount_subtract (&au_active.final_amount,
-                               &au_active.total_amount,
-                               &au_active.fees.wire)) ||
+        TALER_amount_subtract (&au->final_amount,
+                               &au->total_amount,
+                               &au->fees.wire)) ||
        (GNUNET_SYSERR ==
-        TALER_amount_round_down (&au_active.final_amount,
+        TALER_amount_round_down (&au->final_amount,
                                  &currency_round_unit)) ||
-       (TALER_amount_is_zero (&au_active.final_amount)) )
+       (TALER_amount_is_zero (&au->final_amount)) ||
+       (! kyc_satisfied (au)) ||
+       (! aml_satisfied (au)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Aggregate value too low for transfer (%d/%s)\n",
+                "Not ready for wire transfer (%d/%s)\n",
                 qs,
-                TALER_amount2s (&au_active.final_amount));
-    if (have_transient)
+                TALER_amount2s (&au->final_amount));
+    if (au->have_transient)
       qs = db_plugin->update_aggregation_transient (db_plugin->cls,
-                                                    &au_active.h_payto,
-                                                    &au_active.wtid,
-                                                    &au_active.total_amount);
+                                                    &au->h_payto,
+                                                    &au->wtid,
+                                                    au->requirement_row,
+                                                    &au->total_amount);
     else
       qs = db_plugin->create_aggregation_transient (db_plugin->cls,
-                                                    &au_active.h_payto,
-                                                    au_active.wa->section_name,
-                                                    &au_active.wtid,
-                                                    &au_active.total_amount);
+                                                    &au->h_payto,
+                                                    au->wa->section_name,
+                                                    &au->merchant_pub,
+                                                    &au->wtid,
+                                                    au->requirement_row,
+                                                    &au->total_amount);
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Serialization issue, trying again later!\n");
-      db_plugin->rollback (db_plugin->cls);
-      cleanup_au (&au_active);
-      /* start again */
-      GNUNET_assert (NULL == task);
-      task = GNUNET_SCHEDULER_add_now (&run_aggregation,
-                                       s);
-      return;
+      return GNUNET_NO;
     }
     if (GNUNET_DB_STATUS_HARD_ERROR == qs)
     {
       GNUNET_break (0);
-      db_plugin->rollback (db_plugin->cls);
-      cleanup_au (&au_active);
       global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      release_shard (s);
-      return;
+      return GNUNET_SYSERR;
     }
     /* commit */
-    (void) commit_or_warn ();
-    cleanup_au (&au_active);
+    return GNUNET_OK;
+  }
 
-    /* start again */
-    GNUNET_assert (NULL == task);
-    task = GNUNET_SCHEDULER_add_now (&run_aggregation,
-                                     s);
-    return;
+  qs = trigger_wire_transfer (au);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Serialization issue during aggregation; trying again later!\n")
+    ;
+    return GNUNET_NO;
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    return GNUNET_SYSERR;
+  default:
+    break;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Preparing wire transfer of %s to %s\n",
-              TALER_amount2s (&au_active.final_amount),
-              TALER_B2S (&au_active.merchant_pub));
   {
-    void *buf;
-    size_t buf_size;
-
-    TALER_BANK_prepare_transfer (au_active.payto_uri,
-                                 &au_active.final_amount,
-                                 exchange_base_url,
-                                 &au_active.wtid,
-                                 &buf,
-                                 &buf_size);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Storing %u bytes of wire prepare data\n",
-                (unsigned int) buf_size);
-    /* Commit our intention to execute the wire transfer! */
-    qs = db_plugin->wire_prepare_data_insert (db_plugin->cls,
-                                              au_active.wa->method,
-                                              buf,
-                                              buf_size);
-    GNUNET_free (buf);
+    struct TALER_CoinDepositEventP rep = {
+      .header.size = htons (sizeof (rep)),
+      .header.type = htons (TALER_DBEVENT_EXCHANGE_DEPOSIT_STATUS_CHANGED),
+      .merchant_pub = au->merchant_pub
+    };
+
+    db_plugin->event_notify (db_plugin->cls,
+                             &rep.header,
+                             NULL,
+                             0);
   }
-  /* Commit the WTID data to 'wire_out'  */
-  if (qs >= 0)
-    qs = db_plugin->store_wire_transfer_out (db_plugin->cls,
-                                             au_active.execution_time,
-                                             &au_active.wtid,
-                                             &au_active.h_payto,
-                                             au_active.wa->section_name,
-                                             &au_active.final_amount);
+  return GNUNET_OK;
 
-  if ( (qs >= 0) &&
-       have_transient)
-    qs = db_plugin->delete_aggregation_transient (db_plugin->cls,
-                                                  &au_active.h_payto,
-                                                  &au_active.wtid);
-  cleanup_au (&au_active);
+}
 
-  if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+
+static void
+run_aggregation (void *cls)
+{
+  struct Shard *s = cls;
+  struct AggregationUnit au_active;
+  enum GNUNET_DB_QueryStatus qs;
+  enum GNUNET_GenericReturnValue ret;
+
+  task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Checking for ready deposits to aggregate\n");
+  /* make sure we have current fees */
+  memset (&au_active,
+          0,
+          sizeof (au_active));
+  au_active.execution_time = GNUNET_TIME_timestamp_get ();
+  if (GNUNET_OK !=
+      db_plugin->start_deferred_wire_out (db_plugin->cls))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Serialization issue for prepared wire data; trying again later!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start database transaction!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    release_shard (s);
+    return;
+  }
+  qs = db_plugin->get_ready_deposit (
+    db_plugin->cls,
+    s->shard_start,
+    s->shard_end,
+    &au_active.merchant_pub,
+    &au_active.payto_uri);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    cleanup_au (&au_active);
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to begin deposit iteration!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    release_shard (s);
+    return;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    cleanup_au (&au_active);
     db_plugin->rollback (db_plugin->cls);
-    /* start again */
     GNUNET_assert (NULL == task);
     task = GNUNET_SCHEDULER_add_now (&run_aggregation,
                                      s);
     return;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    {
+      uint64_t counter = s->work_counter;
+      struct GNUNET_TIME_Relative duration
+        = GNUNET_TIME_absolute_get_duration (s->start_time.abs_time);
+
+      cleanup_au (&au_active);
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Completed shard [%u,%u] after %s with %llu deposits\n",
+                  (unsigned int) s->shard_start,
+                  (unsigned int) s->shard_end,
+                  GNUNET_TIME_relative2s (duration,
+                                          true),
+                  (unsigned long long) counter);
+      release_shard (s);
+      if ( (GNUNET_YES == test_mode) &&
+           (0 == counter) )
+      {
+        /* in test mode, shutdown after a shard is done with 0 work */
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "No work done and in test mode, shutting down\n");
+        GNUNET_SCHEDULER_shutdown ();
+        return;
+      }
+      GNUNET_assert (NULL == task);
+      /* If we ended up doing zero work, sleep a bit */
+      if (0 == counter)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Going to sleep for %s before trying again\n",
+                    GNUNET_TIME_relative2s (aggregator_idle_sleep_interval,
+                                            true));
+        task = GNUNET_SCHEDULER_add_delayed (aggregator_idle_sleep_interval,
+                                             &drain_kyc_alerts,
+                                             NULL);
+      }
+      else
+      {
+        task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                         NULL);
+      }
+      return;
+    }
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    s->work_counter++;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Found ready deposit!\n");
+    /* continued below */
+    break;
   }
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+
+  TALER_payto_hash (au_active.payto_uri,
+                    &au_active.h_payto);
+  ret = do_aggregate (&au_active);
+  cleanup_au (&au_active);
+  switch (ret)
   {
-    GNUNET_break (0);
-    db_plugin->rollback (db_plugin->cls);
-    /* die hard */
+  case GNUNET_SYSERR:
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
+    db_plugin->rollback (db_plugin->cls);
     release_shard (s);
     return;
+  case GNUNET_NO:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_assert (NULL == task);
+    task = GNUNET_SCHEDULER_add_now (&run_aggregation,
+                                     s);
+    return;
+  case GNUNET_OK:
+    /* continued below */
+    break;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Stored wire transfer out instructions\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Committing aggregation result\n");
 
   /* Now we can finally commit the overall transaction, as we are
      again consistent if all of this passes. */
@@ -699,8 +986,8 @@ run_aggregation (void *cls)
   {
   case GNUNET_DB_STATUS_SOFT_ERROR:
     /* try again */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Commit issue for prepared wire data; trying again later!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Serialization issue on commit; trying again later!\n");
     GNUNET_assert (NULL == task);
     task = GNUNET_SCHEDULER_add_now (&run_aggregation,
                                      s);
@@ -714,7 +1001,7 @@ run_aggregation (void *cls)
     return;
   case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Preparation complete, going again\n");
+                "Commit complete, going again\n");
     GNUNET_assert (NULL == task);
     task = GNUNET_SCHEDULER_add_now (&run_aggregation,
                                      s);
@@ -743,6 +1030,8 @@ run_shard (void *cls)
 
   (void) cls;
   task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Running aggregation shard\n");
   if (GNUNET_SYSERR ==
       db_plugin->preflight (db_plugin->cls))
   {
@@ -769,6 +1058,7 @@ run_shard (void *cls)
       GNUNET_free (s);
       delay = GNUNET_TIME_randomized_backoff (delay,
                                               GNUNET_TIME_UNIT_SECONDS);
+      GNUNET_assert (NULL == task);
       task = GNUNET_SCHEDULER_add_delayed (delay,
                                            &run_shard,
                                            NULL);
@@ -786,12 +1076,207 @@ run_shard (void *cls)
               "Starting shard [%u:%u]!\n",
               (unsigned int) s->shard_start,
               (unsigned int) s->shard_end);
+  GNUNET_assert (NULL == task);
   task = GNUNET_SCHEDULER_add_now (&run_aggregation,
                                    s);
 }
 
 
 /**
+ * Function called on transient aggregations matching
+ * a particular hash of a payto URI.
+ *
+ * @param cls
+ * @param payto_uri corresponding payto URI
+ * @param wtid wire transfer identifier of transient aggregation
+ * @param merchant_pub public key of the merchant
+ * @param total amount aggregated so far
+ * @return true to continue to iterate
+ */
+static bool
+handle_transient_cb (
+  void *cls,
+  const char *payto_uri,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_Amount *total)
+{
+  struct AggregationUnit *au = cls;
+
+  if (GNUNET_OK != au->ret)
+  {
+    GNUNET_break (0);
+    return false;
+  }
+  au->payto_uri = GNUNET_strdup (payto_uri);
+  au->wtid = *wtid;
+  au->merchant_pub = *merchant_pub;
+  au->trans = *total;
+  au->have_transient = true;
+  au->ret = do_aggregate (au);
+  GNUNET_free (au->payto_uri);
+  return (GNUNET_OK == au->ret);
+}
+
+
+static void
+drain_kyc_alerts (void *cls)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  struct AggregationUnit au;
+
+  (void) cls;
+  task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Draining KYC alerts\n");
+  memset (&au,
+          0,
+          sizeof (au));
+  au.execution_time = GNUNET_TIME_timestamp_get ();
+  if (GNUNET_SYSERR ==
+      db_plugin->preflight (db_plugin->cls))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to obtain database connection!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_OK !=
+      db_plugin->start (db_plugin->cls,
+                        "handle kyc alerts"))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start database transaction!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  while (1)
+  {
+    qs = db_plugin->drain_kyc_alert (db_plugin->cls,
+                                     1,
+                                     &au.h_payto);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                       NULL);
+      return;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                       NULL);
+      return;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      qs = db_plugin->commit (db_plugin->cls);
+      if (qs < 0)
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Failed to commit KYC drain\n");
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&run_shard,
+                                       NULL);
+      return;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      /* handled below */
+      break;
+    }
+
+    au.ret = GNUNET_OK;
+    qs = db_plugin->find_aggregation_transient (db_plugin->cls,
+                                                &au.h_payto,
+                                                &handle_transient_cb,
+                                                &au);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to lookup transient aggregates!\n");
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                       NULL);
+      return;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      /* serializiability issue, try again */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Serialization issue, trying again later!\n");
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                       NULL);
+      return;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      continue; /* while (1) */
+    default:
+      break;
+    }
+    break;
+  } /* while(1) */
+
+  {
+    enum GNUNET_GenericReturnValue ret;
+
+    ret = au.ret;
+    cleanup_au (&au);
+    switch (ret)
+    {
+    case GNUNET_SYSERR:
+      GNUNET_break (0);
+      global_ret = EXIT_FAILURE;
+      GNUNET_SCHEDULER_shutdown ();
+      db_plugin->rollback (db_plugin->cls); /* just in case */
+      return;
+    case GNUNET_NO:
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                       NULL);
+      return;
+    case GNUNET_OK:
+      /* continued below */
+      break;
+    }
+  }
+
+  switch (commit_or_warn ())
+  {
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    /* try again */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Serialization issue on commit; trying again later!\n");
+    GNUNET_assert (NULL == task);
+    task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                     NULL);
+    return;
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    db_plugin->rollback (db_plugin->cls); /* just in case */
+    return;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Commit complete, going again\n");
+    GNUNET_assert (NULL == task);
+    task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
+                                     NULL);
+    return;
+  default:
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    db_plugin->rollback (db_plugin->cls); /* just in case */
+    return;
+  }
+}
+
+
+/**
  * First task.
  *
  * @param cls closure, NULL
@@ -811,7 +1296,8 @@ run (void *cls,
   (void) cfgfile;
 
   cfg = c;
-  if (GNUNET_OK != parse_wirewatch_config ())
+  if (GNUNET_OK !=
+      parse_aggregator_config ())
   {
     cfg = NULL;
     global_ret = EXIT_NOTCONFIGURED;
@@ -832,11 +1318,18 @@ run (void *cls,
     shard_size = 1U + INT32_MAX;
   else
     shard_size = (uint32_t) ass;
+  if (GNUNET_OK !=
+      TALER_KYCLOGIC_kyc_init (cfg))
+  {
+    cfg = NULL;
+    global_ret = EXIT_NOTCONFIGURED;
+    return;
+  }
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
   GNUNET_assert (NULL == task);
-  task = GNUNET_SCHEDULER_add_now (&run_shard,
+  task = GNUNET_SCHEDULER_add_now (&drain_kyc_alerts,
                                    NULL);
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
-                                 cls);
 }
 
 
diff --git a/src/exchange/taler-exchange-closer.c b/src/exchange/taler-exchange-closer.c
index 92ba7babb..779525c4e 100644
--- a/src/exchange/taler-exchange-closer.c
+++ b/src/exchange/taler-exchange-closer.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2021 Taler Systems SA
+  Copyright (C) 2016-2022 Taler Systems SA
 
   TALER 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
@@ -204,14 +204,19 @@ commit_or_warn (void)
  * @param account_payto_uri information about the bank account that initially
  *        caused the reserve to be created
  * @param expiration_date when did the reserve expire
- * @return transaction status code
+ * @param close_request_row row of request asking for
+ *         closure, 0 for expired reserves
+ * @return #GNUNET_OK on success (continue)
+ *         #GNUNET_NO on non-fatal errors (try again)
+ *         #GNUNET_SYSERR on fatal errors (abort)
  */
-static enum GNUNET_DB_QueryStatus
+static enum GNUNET_GenericReturnValue
 expired_reserve_cb (void *cls,
                     const struct TALER_ReservePublicKeyP *reserve_pub,
                     const struct TALER_Amount *left,
                     const char *account_payto_uri,
-                    struct GNUNET_TIME_Timestamp expiration_date)
+                    struct GNUNET_TIME_Timestamp expiration_date,
+                    uint64_t close_request_row)
 {
   struct GNUNET_TIME_Timestamp now;
   struct TALER_WireTransferIdentifierRawP wtid;
@@ -239,7 +244,7 @@ expired_reserve_cb (void *cls,
                 account_payto_uri);
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_DB_STATUS_HARD_ERROR;
+    return GNUNET_SYSERR;
   }
 
   /* lookup `fees` from time of actual reserve expiration
@@ -257,13 +262,22 @@ expired_reserve_cb (void *cls,
                                   &end_date,
                                   &fees,
                                   &master_sig);
-    if (0 >= qs)
+    switch (qs)
     {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not get wire fees for %s at %s. Aborting run.\n",
                   wa->method,
                   GNUNET_TIME_timestamp2s (expiration_date));
-      return GNUNET_DB_STATUS_HARD_ERROR;
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      return GNUNET_NO;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      /* continued below */
+      break;
     }
   }
 
@@ -281,8 +295,8 @@ expired_reserve_cb (void *cls,
     GNUNET_assert (GNUNET_OK ==
                    TALER_amount_set_zero (left->currency,
                                           &amount_without_fee));
+    ret = TALER_AAR_RESULT_ZERO;
   }
-  GNUNET_assert (TALER_AAR_RESULT_POSITIVE == ret);
   /* round down to enable transfer */
   if (GNUNET_SYSERR ==
       TALER_amount_round_down (&amount_without_fee,
@@ -291,27 +305,25 @@ expired_reserve_cb (void *cls,
     GNUNET_break (0);
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_DB_STATUS_HARD_ERROR;
+    return GNUNET_SYSERR;
   }
   /* NOTE: sizeof (*reserve_pub) == sizeof (wtid) right now, but to
      be future-compatible, we use the memset + min construction */
   memset (&wtid,
           0,
           sizeof (wtid));
-  memcpy (&wtid,
-          reserve_pub,
-          GNUNET_MIN (sizeof (wtid),
-                      sizeof (*reserve_pub)));
-  if (TALER_AAR_INVALID_NEGATIVE_RESULT != ret)
-    qs = db_plugin->insert_reserve_closed (db_plugin->cls,
-                                           reserve_pub,
-                                           now,
-                                           account_payto_uri,
-                                           &wtid,
-                                           left,
-                                           &closing_fee);
-  else
-    qs = GNUNET_DB_STATUS_HARD_ERROR;
+  GNUNET_memcpy (&wtid,
+                 reserve_pub,
+                 GNUNET_MIN (sizeof (wtid),
+                             sizeof (*reserve_pub)));
+  qs = db_plugin->insert_reserve_closed (db_plugin->cls,
+                                         reserve_pub,
+                                         now,
+                                         account_payto_uri,
+                                         &wtid,
+                                         left,
+                                         &closing_fee,
+                                         close_request_row);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Closing reserve %s over %s (%d, %d)\n",
               TALER_B2S (reserve_pub),
@@ -319,22 +331,30 @@ expired_reserve_cb (void *cls,
               (int) ret,
               qs);
   /* Check for hard failure */
-  if ( (TALER_AAR_INVALID_NEGATIVE_RESULT == ret) ||
-       (GNUNET_DB_STATUS_HARD_ERROR == qs) )
+  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
   {
     GNUNET_break (0);
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_DB_STATUS_HARD_ERROR;
+    return GNUNET_SYSERR;
   }
-  if ( (TALER_AAR_RESULT_ZERO == ret) ||
-       (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs) )
+  if (TALER_amount_is_zero (&amount_without_fee))
   {
     /* Reserve balance was zero OR soft error */
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Reserve was virtually empty, moving on\n");
-    (void) commit_or_warn ();
-    return qs;
+    qs = commit_or_warn ();
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      return GNUNET_NO;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      return GNUNET_OK;
+    }
   }
 
   /* success, perform wire transfer */
@@ -355,19 +375,25 @@ expired_reserve_cb (void *cls,
                                               buf_size);
     GNUNET_free (buf);
   }
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+  switch (qs)
   {
+  case GNUNET_DB_STATUS_HARD_ERROR:
     GNUNET_break (0);
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-  {
+    return GNUNET_SYSERR;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
     /* start again */
-    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+    return GNUNET_NO;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return GNUNET_SYSERR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break;
   }
-  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+  return GNUNET_OK;
 }
 
 
@@ -409,11 +435,18 @@ run_reserve_closures (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Checking for reserves to close by date %s\n",
               GNUNET_TIME_timestamp2s (now));
-  qs = db_plugin->get_expired_reserves (db_plugin->cls,
-                                        now,
-                                        &expired_reserve_cb,
-                                        NULL);
-  GNUNET_assert (1 >= qs);
+  qs = db_plugin->get_unfinished_close_requests (db_plugin->cls,
+                                                 &expired_reserve_cb,
+                                                 NULL);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    /* Try expired reserves as well */
+    qs = db_plugin->get_expired_reserves (
+      db_plugin->cls,
+      now,
+      &expired_reserve_cb,
+      NULL);
+  }
   switch (qs)
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
@@ -436,13 +469,11 @@ run_reserve_closures (void *cls)
     if (GNUNET_YES == test_mode)
     {
       GNUNET_SCHEDULER_shutdown ();
+      return;
     }
-    else
-    {
-      task = GNUNET_SCHEDULER_add_delayed (closer_idle_sleep_interval,
-                                           &run_reserve_closures,
-                                           NULL);
-    }
+    task = GNUNET_SCHEDULER_add_delayed (closer_idle_sleep_interval,
+                                         &run_reserve_closures,
+                                         NULL);
     return;
   case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
     (void) commit_or_warn ();
diff --git a/src/exchange/taler-exchange-drain.c b/src/exchange/taler-exchange-drain.c
new file mode 100644
index 000000000..d409487c1
--- /dev/null
+++ b/src/exchange/taler-exchange-drain.c
@@ -0,0 +1,431 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-drain.c
+ * @brief Process that drains exchange profits from the escrow account
+ *        and puts them into some regular account of the exchange.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <pthread.h>
+#include "taler_exchangedb_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_json_lib.h"
+#include "taler_bank_service.h"
+
+
+/**
+ * The exchange's configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Our database plugin.
+ */
+static struct TALER_EXCHANGEDB_Plugin *db_plugin;
+
+/**
+ * Our master public key.
+ */
+static struct TALER_MasterPublicKeyP master_pub;
+
+/**
+ * Next task to run, if any.
+ */
+static struct GNUNET_SCHEDULER_Task *task;
+
+/**
+ * Base URL of this exchange.
+ */
+static char *exchange_base_url;
+
+/**
+ * Value to return from main(). 0 on success, non-zero on errors.
+ */
+static int global_ret;
+
+
+/**
+ * We're being aborted with CTRL-C (or SIGTERM). Shut down.
+ *
+ * @param cls closure
+ */
+static void
+shutdown_task (void *cls)
+{
+  (void) cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Running shutdown\n");
+  if (NULL != task)
+  {
+    GNUNET_SCHEDULER_cancel (task);
+    task = NULL;
+  }
+  db_plugin->rollback (db_plugin->cls); /* just in case */
+  TALER_EXCHANGEDB_plugin_unload (db_plugin);
+  db_plugin = NULL;
+  TALER_EXCHANGEDB_unload_accounts ();
+  cfg = NULL;
+}
+
+
+/**
+ * Parse the configuration for drain.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_drain_config (void)
+{
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &exchange_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    return GNUNET_SYSERR;
+  }
+
+  {
+    char *master_public_key_str;
+
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_get_value_string (cfg,
+                                               "exchange",
+                                               "MASTER_PUBLIC_KEY",
+                                               &master_public_key_str))
+    {
+      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "MASTER_PUBLIC_KEY");
+      return GNUNET_SYSERR;
+    }
+    if (GNUNET_OK !=
+        GNUNET_CRYPTO_eddsa_public_key_from_string (master_public_key_str,
+                                                    strlen (
+                                                      master_public_key_str),
+                                                    &master_pub.eddsa_pub))
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "MASTER_PUBLIC_KEY",
+                                 "invalid base32 encoding for a master public key");
+      GNUNET_free (master_public_key_str);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (master_public_key_str);
+  }
+  if (NULL ==
+      (db_plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to initialize DB subsystem\n");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_EXCHANGEDB_load_accounts (cfg,
+                                      TALER_EXCHANGEDB_ALO_DEBIT
+                                      | TALER_EXCHANGEDB_ALO_AUTHDATA))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No wire accounts configured for debit!\n");
+    TALER_EXCHANGEDB_plugin_unload (db_plugin);
+    db_plugin = NULL;
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Perform a database commit. If it fails, print a warning.
+ *
+ * @return status of commit
+ */
+static enum GNUNET_DB_QueryStatus
+commit_or_warn (void)
+{
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = db_plugin->commit (db_plugin->cls);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    return qs;
+  GNUNET_log ((GNUNET_DB_STATUS_SOFT_ERROR == qs)
+              ? GNUNET_ERROR_TYPE_INFO
+              : GNUNET_ERROR_TYPE_ERROR,
+              "Failed to commit database transaction!\n");
+  return qs;
+}
+
+
+/**
+ * Execute a wire drain.
+ *
+ * @param cls NULL
+ */
+static void
+run_drain (void *cls)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  uint64_t serial;
+  struct TALER_WireTransferIdentifierRawP wtid;
+  char *account_section;
+  char *payto_uri;
+  struct GNUNET_TIME_Timestamp request_timestamp;
+  struct TALER_Amount amount;
+  struct TALER_MasterSignatureP master_sig;
+
+  (void) cls;
+  task = NULL;
+  if (GNUNET_OK !=
+      db_plugin->start (db_plugin->cls,
+                        "run drain"))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start database transaction!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  qs = db_plugin->profit_drains_get_pending (db_plugin->cls,
+                                             &serial,
+                                             &wtid,
+                                             &account_section,
+                                             &payto_uri,
+                                             &request_timestamp,
+                                             &amount,
+                                             &master_sig);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Serialization failure on simple SELECT!?\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    /* no profit drains, finished */
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_assert (NULL == task);
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "No profit drains pending. Exiting.\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  default:
+    /* continued below */
+    break;
+  }
+  /* Check signature (again, this is a critical operation!) */
+  if (GNUNET_OK !=
+      TALER_exchange_offline_profit_drain_verify (
+        &wtid,
+        request_timestamp,
+        &amount,
+        account_section,
+        payto_uri,
+        &master_pub,
+        &master_sig))
+  {
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_assert (NULL == task);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  /* Display data for manual human check */
+  fprintf (stdout,
+           "Critical operation. MANUAL CHECK REQUIRED.\n");
+  fprintf (stdout,
+           "We will wire %s to `%s'\n based on instructions from %s.\n",
+           TALER_amount2s (&amount),
+           payto_uri,
+           GNUNET_TIME_timestamp2s (request_timestamp));
+  fprintf (stdout,
+           "Press ENTER to confirm, CTRL-D to abort.\n");
+  while (1)
+  {
+    int key;
+
+    key = getchar ();
+    if (EOF == key)
+    {
+      fprintf (stdout,
+               "Transfer aborted.\n"
+               "Re-run 'taler-exchange-drain' to try it again.\n"
+               "Contact Taler Systems SA to cancel it for good.\n"
+               "Exiting.\n");
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_assert (NULL == task);
+      GNUNET_SCHEDULER_shutdown ();
+      global_ret = EXIT_FAILURE;
+      return;
+    }
+    if ('\n' == key)
+      break;
+  }
+
+  /* Note: account_section ignored for now, we
+     might want to use it here in the future... */
+  (void) account_section;
+  {
+    char *method;
+    void *buf;
+    size_t buf_size;
+
+    TALER_BANK_prepare_transfer (payto_uri,
+                                 &amount,
+                                 exchange_base_url,
+                                 &wtid,
+                                 &buf,
+                                 &buf_size);
+    method = TALER_payto_get_method (payto_uri);
+    qs = db_plugin->wire_prepare_data_insert (db_plugin->cls,
+                                              method,
+                                              buf,
+                                              buf_size);
+    GNUNET_free (method);
+    GNUNET_free (buf);
+  }
+  qs = db_plugin->profit_drains_set_finished (db_plugin->cls,
+                                              serial);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed: database serialization issue\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    db_plugin->rollback (db_plugin->cls);
+    GNUNET_assert (NULL == task);
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  default:
+    /* continued below */
+    break;
+  }
+  /* commit transaction + report success + exit */
+  if (0 >= commit_or_warn ())
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "Profit drain triggered. Exiting.\n");
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * First task.
+ *
+ * @param cls closure, NULL
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param c configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  (void) cls;
+  (void) args;
+  (void) cfgfile;
+
+  cfg = c;
+  if (GNUNET_OK != parse_drain_config ())
+  {
+    cfg = NULL;
+    global_ret = EXIT_NOTCONFIGURED;
+    return;
+  }
+  if (GNUNET_SYSERR ==
+      db_plugin->preflight (db_plugin->cls))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to obtain database connection!\n");
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  GNUNET_assert (NULL == task);
+  task = GNUNET_SCHEDULER_add_now (&run_drain,
+                                   NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 cls);
+}
+
+
+/**
+ * The main function of the taler-exchange-drain.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc,
+      char *const *argv)
+{
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_version (VERSION "-" VCS_VERSION),
+    GNUNET_GETOPT_OPTION_END
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
+    return EXIT_INVALIDARGUMENT;
+  TALER_OS_init ();
+  ret = GNUNET_PROGRAM_run (
+    argc, argv,
+    "taler-exchange-drain",
+    gettext_noop (
+      "process that executes a single profit drain"),
+    options,
+    &run, NULL);
+  GNUNET_free_nz ((void *) argv);
+  if (GNUNET_SYSERR == ret)
+    return EXIT_INVALIDARGUMENT;
+  if (GNUNET_NO == ret)
+    return EXIT_SUCCESS;
+  return global_ret;
+}
+
+
+/* end of taler-exchange-drain.c */
diff --git a/src/exchange/taler-exchange-expire.c b/src/exchange/taler-exchange-expire.c
index d99c430e0..b2d34ee1c 100644
--- a/src/exchange/taler-exchange-expire.c
+++ b/src/exchange/taler-exchange-expire.c
@@ -74,11 +74,6 @@ static struct TALER_EXCHANGEDB_Plugin *db_plugin;
 static struct GNUNET_SCHEDULER_Task *task;
 
 /**
- * How long should we sleep when idle before trying to find more work?
- */
-static struct GNUNET_TIME_Relative expire_idle_sleep_interval;
-
-/**
  * How big are the shards we are processing? Is an inclusive offset, so every
  * shard ranges from [X,X+shard_size) exclusive.  So a shard covers
  * shard_size slots.
@@ -141,17 +136,6 @@ shutdown_task (void *cls)
 static enum GNUNET_GenericReturnValue
 parse_expire_config (void)
 {
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "exchange",
-                                           "EXPIRE_IDLE_SLEEP_INTERVAL",
-                                           &expire_idle_sleep_interval))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "EXPIRE_IDLE_SLEEP_INTERVAL");
-    return GNUNET_SYSERR;
-  }
   if (NULL ==
       (db_plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
   {
@@ -223,7 +207,12 @@ release_shard (struct Shard *s)
   if ( (0 == wc) &&
        (test_mode) &&
        (! jump_mode) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "In test-mode without work. Terminating.\n");
     GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 }
 
 
@@ -283,9 +272,9 @@ run_expire (void *cls)
                         "expire-purse"))
   {
     GNUNET_break (0);
-    global_ret = EXIT_FAILURE;
     db_plugin->rollback (db_plugin->cls);
     abort_shard (s);
+    global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -296,9 +285,9 @@ run_expire (void *cls)
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
     GNUNET_break (0);
-    global_ret = EXIT_FAILURE;
     db_plugin->rollback (db_plugin->cls);
     abort_shard (s);
+    global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
     return;
   case GNUNET_DB_STATUS_SOFT_ERROR:
@@ -395,6 +384,13 @@ run_shard (void *cls)
   if (GNUNET_TIME_absolute_is_future (s->shard_end))
   {
     abort_shard (s);
+    if (test_mode)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "In test-mode without work. Terminating.\n");
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
     GNUNET_assert (NULL == task);
     task = GNUNET_SCHEDULER_add_at (s->shard_end,
                                     &run_shard,
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index 71edae65d..36459fbd7 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2014-2022 Taler Systems SA
+   Copyright (C) 2014-2023 Taler Systems SA
 
    TALER 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
@@ -25,21 +25,28 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include <sched.h>
-#include <pthread.h>
 #include <sys/resource.h>
 #include <limits.h>
+#include "taler_kyclogic_lib.h"
+#include "taler_templating_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_age-withdraw.h"
+#include "taler-exchange-httpd_age-withdraw_reveal.h"
+#include "taler-exchange-httpd_aml-decision.h"
 #include "taler-exchange-httpd_auditors.h"
+#include "taler-exchange-httpd_batch-deposit.h"
 #include "taler-exchange-httpd_batch-withdraw.h"
+#include "taler-exchange-httpd_coins_get.h"
+#include "taler-exchange-httpd_config.h"
 #include "taler-exchange-httpd_contract.h"
 #include "taler-exchange-httpd_csr.h"
-#include "taler-exchange-httpd_deposit.h"
 #include "taler-exchange-httpd_deposits_get.h"
 #include "taler-exchange-httpd_extensions.h"
 #include "taler-exchange-httpd_keys.h"
 #include "taler-exchange-httpd_kyc-check.h"
 #include "taler-exchange-httpd_kyc-proof.h"
 #include "taler-exchange-httpd_kyc-wallet.h"
+#include "taler-exchange-httpd_kyc-webhook.h"
 #include "taler-exchange-httpd_link.h"
 #include "taler-exchange-httpd_management.h"
 #include "taler-exchange-httpd_melt.h"
@@ -48,40 +55,36 @@
 #include "taler-exchange-httpd_purses_create.h"
 #include "taler-exchange-httpd_purses_deposit.h"
 #include "taler-exchange-httpd_purses_get.h"
+#include "taler-exchange-httpd_purses_delete.h"
 #include "taler-exchange-httpd_purses_merge.h"
 #include "taler-exchange-httpd_recoup.h"
 #include "taler-exchange-httpd_recoup-refresh.h"
 #include "taler-exchange-httpd_refreshes_reveal.h"
 #include "taler-exchange-httpd_refund.h"
+#include "taler-exchange-httpd_reserves_attest.h"
+#include "taler-exchange-httpd_reserves_close.h"
 #include "taler-exchange-httpd_reserves_get.h"
+#include "taler-exchange-httpd_reserves_get_attest.h"
 #include "taler-exchange-httpd_reserves_history.h"
+#include "taler-exchange-httpd_reserves_open.h"
 #include "taler-exchange-httpd_reserves_purse.h"
-#include "taler-exchange-httpd_reserves_status.h"
+#include "taler-exchange-httpd_spa.h"
 #include "taler-exchange-httpd_terms.h"
 #include "taler-exchange-httpd_transfers_get.h"
-#include "taler-exchange-httpd_wire.h"
-#include "taler-exchange-httpd_withdraw.h"
 #include "taler_exchangedb_lib.h"
 #include "taler_exchangedb_plugin.h"
 #include "taler_extensions.h"
 #include <gnunet/gnunet_mhd_compat.h>
 
 /**
- * Macro to enable P2P handlers. ON for debugging,
- * FIXME: set to OFF for 0.9.0 release as the feature is not stable!
+ * Backlog for listen operation on unix domain sockets.
  */
-#define WITH_P2P 1
+#define UNIX_BACKLOG 50
 
 /**
- * Should the experimental batch withdraw be supported?
- * ON for testing disable for 0.9.0 release!
+ * How often will we try to connect to the database before giving up?
  */
-#define WITH_EXPERIMENTAL 1
-
-/**
- * Backlog for listen operation on unix domain sockets.
- */
-#define UNIX_BACKLOG 50
+#define MAX_DB_RETRIES 5
 
 /**
  * Above what request latency do we start to log?
@@ -108,14 +111,17 @@ static int allow_address_reuse;
 const struct GNUNET_CONFIGURATION_Handle *TEH_cfg;
 
 /**
- * Handle to the HTTP server.
+ * Configuration of age restriction
+ *
+ * Set after loading the library, enabled in database event handler.
  */
-static struct MHD_Daemon *mhd;
+bool TEH_age_restriction_enabled = false;
+struct TALER_AgeRestrictionConfig TEH_age_restriction_config = {0};
 
 /**
- * Our KYC configuration.
+ * Handle to the HTTP server.
  */
-struct TEH_KycOptions TEH_kyc_config;
+static struct MHD_Daemon *mhd;
 
 /**
  * How long is caching /keys allowed at most? (global)
@@ -134,24 +140,61 @@ struct GNUNET_TIME_Relative TEH_reserve_closing_delay;
 struct TALER_MasterPublicKeyP TEH_master_public_key;
 
 /**
+ * Key used to encrypt KYC attribute data in our database.
+ */
+struct TALER_AttributeEncryptionKeyP TEH_attribute_key;
+
+/**
  * Our DB plugin.  (global)
  */
 struct TALER_EXCHANGEDB_Plugin *TEH_plugin;
 
 /**
+ * Absolute STEFAN parameter.
+ */
+struct TALER_Amount TEH_stefan_abs;
+
+/**
+ * Logarithmic STEFAN parameter.
+ */
+struct TALER_Amount TEH_stefan_log;
+
+/**
+ * Linear STEFAN parameter.
+ */
+float TEH_stefan_lin;
+
+/**
+ * Where to redirect users from "/"?
+ */
+static char *toplevel_redirect_url;
+
+/**
  * Our currency.
  */
 char *TEH_currency;
 
 /**
- * Our base URL.
+ * Name of the KYC-AML-trigger evaluation binary.
  */
-char *TEH_base_url;
+char *TEH_kyc_aml_trigger;
+
+/**
+ * Option set to #GNUNET_YES if rewards are enabled.
+ */
+int TEH_enable_rewards;
 
 /**
- * Age restriction flags and mask
+ * What is the largest amount we allow a peer to
+ * merge into a reserve before always triggering
+ * an AML check?
  */
-bool TEH_age_restriction_enabled = true;
+struct TALER_Amount TEH_aml_threshold;
+
+/**
+ * Our base URL.
+ */
+char *TEH_base_url;
 
 /**
  * Default timeout in seconds for HTTP requests.
@@ -180,6 +223,7 @@ bool TEH_suicide;
  * TALER_SIGNATURE_MASTER_EXTENSION.
  */
 struct TALER_MasterSignatureP TEH_extensions_sig;
+bool TEH_extensions_signed = false;
 
 /**
  * Value to return from main()
@@ -209,6 +253,22 @@ static unsigned long long active_connections;
 static unsigned long long req_max;
 
 /**
+ * Length of the cspecs array.
+ */
+static unsigned int num_cspecs;
+
+/**
+ * Rendering specs for currencies.
+ */
+static struct TALER_CurrencySpecification *cspecs;
+
+/**
+ * Rendering spec for our currency.
+ */
+const struct TALER_CurrencySpecification *TEH_cspec;
+
+
+/**
  * Context for all CURL operations (useful to the event loop)
  */
 struct GNUNET_CURL_Context *TEH_curl_ctx;
@@ -280,10 +340,6 @@ handle_post_coins (struct TEH_RequestContext *rc,
 
   } h[] = {
     {
-      .op = "deposit",
-      .handler = &TEH_handler_deposit
-    },
-    {
       .op = "melt",
       .handler = &TEH_handler_melt
     },
@@ -329,6 +385,317 @@ handle_post_coins (struct TEH_RequestContext *rc,
 
 
 /**
+ * Handle a GET "/coins/$COIN_PUB[/$OP]" request.  Parses the "coin_pub"
+ * EdDSA key of the coin and demultiplexes based on $OP.
+ *
+ * @param rc request context
+ * @param args array of additional options
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_get_coins (struct TEH_RequestContext *rc,
+                  const char *const args[2])
+{
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  if (NULL == args[0])
+  {
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       rc->url);
+  }
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &coin_pub,
+                                     sizeof (coin_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_COINS_INVALID_COIN_PUB,
+                                       args[0]);
+  }
+  if (NULL != args[1])
+  {
+    if (0 == strcmp (args[1],
+                     "history"))
+      return TEH_handler_coins_get (rc,
+                                    &coin_pub);
+    if (0 == strcmp (args[1],
+                     "link"))
+      return TEH_handler_link (rc,
+                               &coin_pub);
+  }
+  return TALER_MHD_reply_with_error (rc->connection,
+                                     MHD_HTTP_NOT_FOUND,
+                                     TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                     rc->url);
+}
+
+
+/**
+ * Signature of functions that handle operations
+ * authorized by AML officers.
+ *
+ * @param rc request context
+ * @param officer_pub the public key of the AML officer
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+typedef MHD_RESULT
+(*AmlOpPostHandler)(struct TEH_RequestContext *rc,
+                    const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+                    const json_t *root);
+
+
+/**
+ * Handle a "/aml/$OFFICER_PUB/$OP" POST request.  Parses the "officer_pub"
+ * EdDSA key of the officer and demultiplexes based on $OP.
+ *
+ * @param rc request context
+ * @param root uploaded JSON data
+ * @param args array of additional options
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_post_aml (struct TEH_RequestContext *rc,
+                 const json_t *root,
+                 const char *const args[2])
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  static const struct
+  {
+    /**
+     * Name of the operation (args[1])
+     */
+    const char *op;
+
+    /**
+     * Function to call to perform the operation.
+     */
+    AmlOpPostHandler handler;
+
+  } h[] = {
+    {
+      .op = "decision",
+      .handler = &TEH_handler_post_aml_decision
+    },
+    {
+      .op = NULL,
+      .handler = NULL
+    },
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &officer_pub,
+                                     sizeof (officer_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_AML_OFFICER_PUB_MALFORMED,
+                                       args[0]);
+  }
+  for (unsigned int i = 0; NULL != h[i].op; i++)
+    if (0 == strcmp (h[i].op,
+                     args[1]))
+      return h[i].handler (rc,
+                           &officer_pub,
+                           root);
+  return r404 (rc->connection,
+               args[1]);
+}
+
+
+/**
+ * Signature of functions that handle operations
+ * authorized by AML officers.
+ *
+ * @param rc request context
+ * @param officer_pub the public key of the AML officer
+ * @param args remaining arguments
+ * @return MHD result code
+ */
+typedef MHD_RESULT
+(*AmlOpGetHandler)(struct TEH_RequestContext *rc,
+                   const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+                   const char *const args[]);
+
+
+/**
+ * Handle a "/aml/$OFFICER_PUB/$OP" GET request.  Parses the "officer_pub"
+ * EdDSA key of the officer, checks the authentication signature, and
+ * demultiplexes based on $OP.
+ *
+ * @param rc request context
+ * @param args array of additional options
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_get_aml (struct TEH_RequestContext *rc,
+                const char *const args[])
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  static const struct
+  {
+    /**
+     * Name of the operation (args[1])
+     */
+    const char *op;
+
+    /**
+     * Function to call to perform the operation.
+     */
+    AmlOpGetHandler handler;
+
+  } h[] = {
+    {
+      .op = "decisions",
+      .handler = &TEH_handler_aml_decisions_get
+    },
+    {
+      .op = "decision",
+      .handler = &TEH_handler_aml_decision_get
+    },
+    {
+      .op = NULL,
+      .handler = NULL
+    },
+  };
+
+  if (NULL == args[0])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_AML_OFFICER_PUB_MALFORMED,
+                                       "argument missing");
+  }
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &officer_pub,
+                                     sizeof (officer_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_AML_OFFICER_PUB_MALFORMED,
+                                       args[0]);
+  }
+  if (NULL == args[1])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_GENERIC_WRONG_NUMBER_OF_SEGMENTS,
+                                       "AML GET operations must specify an operation identifier");
+  }
+  {
+    const char *sig_hdr;
+    struct TALER_AmlOfficerSignatureP officer_sig;
+
+    sig_hdr = MHD_lookup_connection_value (rc->connection,
+                                           MHD_HEADER_KIND,
+                                           TALER_AML_OFFICER_SIGNATURE_HEADER);
+    if ( (NULL == sig_hdr) ||
+         (GNUNET_OK !=
+          GNUNET_STRINGS_string_to_data (sig_hdr,
+                                         strlen (sig_hdr),
+                                         &officer_sig,
+                                         sizeof (officer_sig))) ||
+         (GNUNET_OK !=
+          TALER_officer_aml_query_verify (&officer_pub,
+                                          &officer_sig)) )
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_GENERIC_AML_OFFICER_GET_SIGNATURE_INVALID,
+                                         sig_hdr);
+    }
+    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  }
+
+  {
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->test_aml_officer (TEH_plugin->cls,
+                                       &officer_pub);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_FORBIDDEN,
+                                         TALER_EC_EXCHANGE_GENERIC_AML_OFFICER_ACCESS_DENIED,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      break;
+    }
+  }
+  for (unsigned int i = 0; NULL != h[i].op; i++)
+    if (0 == strcmp (h[i].op,
+                     args[1]))
+      return h[i].handler (rc,
+                           &officer_pub,
+                           &args[2]);
+  return r404 (rc->connection,
+               args[1]);
+}
+
+
+/**
+ * Handle a "/age-withdraw/$ACH/reveal" POST request.  Parses the "ACH"
+ * hash of the commitment from a previous call to
+ * /reserves/$reserve_pub/age-withdraw
+ *
+ * @param rc request context
+ * @param root uploaded JSON data
+ * @param args array of additional options
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_post_age_withdraw (struct TEH_RequestContext *rc,
+                          const json_t *root,
+                          const char *const args[2])
+{
+  struct TALER_AgeWithdrawCommitmentHashP ach;
+
+  if (0 != strcmp ("reveal", args[1]))
+    return r404 (rc->connection,
+                 args[1]);
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &ach,
+                                     sizeof (ach)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_RESERVE_PUB_MALFORMED,
+                                       args[0]);
+  }
+
+  return TEH_handler_age_withdraw_reveal (rc,
+                                          &ach,
+                                          root);
+}
+
+
+/**
  * Signature of functions that handle operations on reserves.
  *
  * @param rc request context
@@ -371,29 +738,25 @@ handle_post_reserves (struct TEH_RequestContext *rc,
 
   } h[] = {
     {
-      .op = "withdraw",
-      .handler = &TEH_handler_withdraw
-    },
-#if WITH_EXPERIMENTAL
-    {
       .op = "batch-withdraw",
       .handler = &TEH_handler_batch_withdraw
     },
-#endif
-    {
-      .op = "status",
-      .handler = &TEH_handler_reserves_status
-    },
     {
-      .op = "history",
-      .handler = &TEH_handler_reserves_history
+      .op = "age-withdraw",
+      .handler = &TEH_handler_age_withdraw
     },
-#if WITH_P2P
     {
       .op = "purse",
       .handler = &TEH_handler_reserves_purse
     },
-#endif
+    {
+      .op = "open",
+      .handler = &TEH_handler_reserves_open
+    },
+    {
+      .op = "close",
+      .handler = &TEH_handler_reserves_close
+    },
     {
       .op = NULL,
       .handler = NULL
@@ -409,7 +772,7 @@ handle_post_reserves (struct TEH_RequestContext *rc,
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (rc->connection,
                                        MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_GENERIC_RESERVE_PUB_MALFORMED,
+                                       TALER_EC_GENERIC_RESERVE_PUB_MALFORMED,
                                        args[0]);
   }
   for (unsigned int i = 0; NULL != h[i].op; i++)
@@ -424,9 +787,90 @@ handle_post_reserves (struct TEH_RequestContext *rc,
 
 
 /**
- * Signature of functions that handle operations on purses.
+ * Signature of functions that handle GET operations on reserves.
  *
  * @param rc request context
+ * @param reserve_pub the public key of the reserve
+ * @return MHD result code
+ */
+typedef MHD_RESULT
+(*ReserveGetOpHandler)(struct TEH_RequestContext *rc,
+                       const struct TALER_ReservePublicKeyP *reserve_pub);
+
+
+/**
+ * Handle a "GET /reserves/$RESERVE_PUB[/$OP]" request.  Parses the "reserve_pub"
+ * EdDSA key of the reserve and demultiplexes based on $OP.
+ *
+ * @param rc request context
+ * @param args NULL-terminated array of additional options, zero, one or two
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_get_reserves (struct TEH_RequestContext *rc,
+                     const char *const args[])
+{
+  struct TALER_ReservePublicKeyP reserve_pub;
+  static const struct
+  {
+    /**
+     * Name of the operation (args[1]), optional
+     */
+    const char *op;
+
+    /**
+     * Function to call to perform the operation.
+     */
+    ReserveGetOpHandler handler;
+
+  } h[] = {
+    {
+      .op = NULL,
+      .handler = &TEH_handler_reserves_get
+    },
+    {
+      .op = "history",
+      .handler = &TEH_handler_reserves_history
+    },
+    {
+      .op = NULL,
+      .handler = NULL
+    },
+  };
+
+  if ( (NULL == args[0]) ||
+       (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[0],
+                                       strlen (args[0]),
+                                       &reserve_pub,
+                                       sizeof (reserve_pub))) )
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_RESERVE_PUB_MALFORMED,
+                                       args[0]);
+  }
+  for (unsigned int i = 0; NULL != h[i].handler; i++)
+  {
+    if ( ( (NULL == args[1]) &&
+           (NULL == h[i].op) ) ||
+         ( (NULL != args[1]) &&
+           (NULL != h[i].op) &&
+           (0 == strcmp (h[i].op,
+                         args[1])) ) )
+      return h[i].handler (rc,
+                           &reserve_pub);
+  }
+  return r404 (rc->connection,
+               args[1]);
+}
+
+
+/**
+ * Signature of functions that handle operations on purses.
+ *
+ * @param connection HTTP request handle
  * @param purse_pub the public key of the purse
  * @param root uploaded JSON data
  * @return MHD result code
@@ -465,7 +909,6 @@ handle_post_purses (struct TEH_RequestContext *rc,
     PurseOpHandler handler;
 
   } h[] = {
-#if WITH_P2P
     {
       .op = "create",
       .handler = &TEH_handler_purses_create
@@ -478,7 +921,6 @@ handle_post_purses (struct TEH_RequestContext *rc,
       .op = "merge",
       .handler = &TEH_handler_purses_merge
     },
-#endif
     {
       .op = NULL,
       .handler = NULL
@@ -579,6 +1021,11 @@ handle_mhd_completion_callback (void *cls,
   TEH_check_invariants ();
   if (NULL != rc->rh_cleaner)
     rc->rh_cleaner (rc);
+  if (NULL != rc->root)
+  {
+    json_decref (rc->root);
+    rc->root = NULL;
+  }
   TEH_check_invariants ();
   {
 #if MHD_VERSION >= 0x00097304
@@ -645,7 +1092,6 @@ proceed_with_handler (struct TEH_RequestContext *rc,
   const struct TEH_RequestHandler *rh = rc->rh;
   const char *args[rh->nargs + 2];
   size_t ulen = strlen (url) + 1;
-  json_t *root = NULL;
   MHD_RESULT ret;
 
   /* We do check for "ulen" here, because we'll later stack-allocate a buffer
@@ -666,8 +1112,9 @@ proceed_with_handler (struct TEH_RequestContext *rc,
 
   /* All POST endpoints come with a body in JSON format. So we parse
      the JSON here. */
-  if (0 == strcasecmp (rh->method,
-                       MHD_HTTP_METHOD_POST))
+  if ( (0 == strcasecmp (rh->method,
+                         MHD_HTTP_METHOD_POST)) &&
+       (NULL == rc->root) )
   {
     enum GNUNET_GenericReturnValue res;
 
@@ -675,16 +1122,16 @@ proceed_with_handler (struct TEH_RequestContext *rc,
                                      &rc->opaque_post_parsing_context,
                                      upload_data,
                                      upload_data_size,
-                                     &root);
+                                     &rc->root);
     if (GNUNET_SYSERR == res)
     {
-      GNUNET_assert (NULL == root);
+      GNUNET_assert (NULL == rc->root);
       return MHD_NO; /* bad upload, could not even generate error */
     }
     if ( (GNUNET_NO == res) ||
-         (NULL == root) )
+         (NULL == rc->root) )
     {
-      GNUNET_assert (NULL == root);
+      GNUNET_assert (NULL == rc->root);
       return MHD_YES; /* so far incomplete upload or parser error */
     }
   }
@@ -696,9 +1143,9 @@ proceed_with_handler (struct TEH_RequestContext *rc,
 
     /* Parse command-line arguments */
     /* make a copy of 'url' because 'strtok_r()' will modify */
-    memcpy (d,
-            url,
-            ulen);
+    GNUNET_memcpy (d,
+                   url,
+                   ulen);
     i = 0;
     args[i++] = strtok_r (d, "/", &sp);
     while ( (NULL != args[i - 1]) &&
@@ -721,7 +1168,6 @@ proceed_with_handler (struct TEH_RequestContext *rc,
                        rh->url,
                        url);
       GNUNET_break_op (0);
-      json_decref (root);
       return TALER_MHD_reply_with_error (rc->connection,
                                          MHD_HTTP_NOT_FOUND,
                                          TALER_EC_EXCHANGE_GENERIC_WRONG_NUMBER_OF_SEGMENTS,
@@ -731,16 +1177,19 @@ proceed_with_handler (struct TEH_RequestContext *rc,
 
     /* Above logic ensures that 'root' is exactly non-NULL for POST operations,
        so we test for 'root' to decide which handler to invoke. */
-    if (NULL != root)
+    if (0 == strcasecmp (rh->method,
+                         MHD_HTTP_METHOD_POST))
       ret = rh->handler.post (rc,
-                              root,
+                              rc->root,
                               args);
-    else /* We also only have "POST" or "GET" in the API for at this point
-      (OPTIONS/HEAD are taken care of earlier) */
+    else if (0 == strcasecmp (rh->method,
+                              MHD_HTTP_METHOD_DELETE))
+      ret = rh->handler.delete (rc,
+                                args);
+    else /* Only GET left */
       ret = rh->handler.get (rc,
                              args);
   }
-  json_decref (root);
   return ret;
 }
 
@@ -783,6 +1232,20 @@ handler_seed (struct TEH_RequestContext *rc,
 
 
 /**
+ * Signature of functions that handle simple
+ * POST operations for the management API.
+ *
+ * @param connection the MHD connection to handle
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+typedef MHD_RESULT
+(*ManagementPostHandler)(
+  struct MHD_Connection *connection,
+  const json_t *root);
+
+
+/**
  * Handle POST "/management/..." requests.
  *
  * @param rc request context
@@ -795,6 +1258,55 @@ handle_post_management (struct TEH_RequestContext *rc,
                         const json_t *root,
                         const char *const args[])
 {
+  static const struct
+  {
+    const char *arg0;
+    const char *arg1;
+    ManagementPostHandler handler;
+  } plain_posts[] = {
+    {
+      .arg0 = "keys",
+      .handler = &TEH_handler_management_post_keys
+    },
+    {
+      .arg0 = "wire",
+      .handler = &TEH_handler_management_post_wire
+    },
+    {
+      .arg0 = "wire",
+      .arg1 = "disable",
+      .handler = &TEH_handler_management_post_wire_disable
+    },
+    {
+      .arg0 = "wire-fee",
+      .handler = &TEH_handler_management_post_wire_fees
+    },
+    {
+      .arg0 = "global-fee",
+      .handler = &TEH_handler_management_post_global_fees
+    },
+    {
+      .arg0 = "extensions",
+      .handler = &TEH_handler_management_post_extensions
+    },
+    {
+      .arg0 = "drain",
+      .handler = &TEH_handler_management_post_drain
+    },
+    {
+      .arg0 = "aml-officers",
+      .handler = &TEH_handler_management_aml_officers
+    },
+    {
+      .arg0 = "partners",
+      .handler = &TEH_handler_management_partners
+    },
+    {
+      NULL,
+      NULL,
+      NULL
+    }
+  };
   if (NULL == args[0])
   {
     GNUNET_break_op (0);
@@ -890,64 +1402,22 @@ handle_post_management (struct TEH_RequestContext *rc,
                                                       &exchange_pub,
                                                       root);
   }
-  if (0 == strcmp (args[0],
-                   "keys"))
-  {
-    if (NULL != args[1])
-    {
-      GNUNET_break_op (0);
-      return r404 (rc->connection,
-                   "/management/keys/*");
-    }
-    return TEH_handler_management_post_keys (rc->connection,
-                                             root);
-  }
-  if (0 == strcmp (args[0],
-                   "wire"))
-  {
-    if (NULL == args[1])
-      return TEH_handler_management_post_wire (rc->connection,
-                                               root);
-    if ( (0 != strcmp (args[1],
-                       "disable")) ||
-         (NULL != args[2]) )
-    {
-      GNUNET_break_op (0);
-      return r404 (rc->connection,
-                   "/management/wire/disable");
-    }
-    return TEH_handler_management_post_wire_disable (rc->connection,
-                                                     root);
-  }
-  if (0 == strcmp (args[0],
-                   "wire-fee"))
-  {
-    if (NULL != args[1])
-    {
-      GNUNET_break_op (0);
-      return r404 (rc->connection,
-                   "/management/wire-fee/*");
-    }
-    return TEH_handler_management_post_wire_fees (rc->connection,
-                                                  root);
-  }
-  if (0 == strcmp (args[0],
-                   "global-fee"))
-  {
-    if (NULL != args[1])
-    {
-      GNUNET_break_op (0);
-      return r404 (rc->connection,
-                   "/management/global-fee/*");
+  for (unsigned int i = 0;
+       NULL != plain_posts[i].handler;
+       i++)
+  {
+    if (0 == strcmp (args[0],
+                     plain_posts[i].arg0))
+    {
+      if ( ( (NULL == args[1]) &&
+             (NULL == plain_posts[i].arg1) ) ||
+           ( (NULL != args[1]) &&
+             (NULL != plain_posts[i].arg1) &&
+             (0 == strcmp (args[1],
+                           plain_posts[i].arg1)) ) )
+        return plain_posts[i].handler (rc->connection,
+                                       root);
     }
-    return TEH_handler_management_post_global_fees (rc->connection,
-                                                    root);
-  }
-  if (0 == strcmp (args[0],
-                   "extensions"))
-  {
-    return TEH_handler_management_post_extensions (rc->connection,
-                                                   root);
   }
   GNUNET_break_op (0);
   return r404 (rc->connection,
@@ -956,7 +1426,7 @@ handle_post_management (struct TEH_RequestContext *rc,
 
 
 /**
- * Handle a get "/management" request.
+ * Handle a GET "/management" request.
  *
  * @param rc request context
  * @param args array of additional options (must be [0] == "keys")
@@ -1037,6 +1507,56 @@ handle_post_auditors (struct TEH_RequestContext *rc,
 
 
 /**
+ * Generates the response for "/", redirecting the
+ * client to the ``toplevel_redirect_url``.
+ *
+ * @param rc request context
+ * @param args remaining arguments (should be empty)
+ * @return MHD result code
+ */
+static MHD_RESULT
+toplevel_redirect (struct TEH_RequestContext *rc,
+                   const char *const args[])
+{
+  const char *text = "Redirecting to /webui/";
+  struct MHD_Response *response;
+
+  response = MHD_create_response_from_buffer (strlen (text),
+                                              (void *) text,
+                                              MHD_RESPMEM_PERSISTENT);
+  if (NULL == response)
+  {
+    GNUNET_break (0);
+    return MHD_NO;
+  }
+  TALER_MHD_add_global_headers (response);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (response,
+                                         MHD_HTTP_HEADER_CONTENT_TYPE,
+                                         "text/plain"));
+  if (MHD_NO ==
+      MHD_add_response_header (response,
+                               MHD_HTTP_HEADER_LOCATION,
+                               toplevel_redirect_url))
+  {
+    GNUNET_break (0);
+    MHD_destroy_response (response);
+    return MHD_NO;
+  }
+
+  {
+    MHD_RESULT ret;
+
+    ret = MHD_queue_response (rc->connection,
+                              MHD_HTTP_FOUND,
+                              response);
+    MHD_destroy_response (response);
+    return ret;
+  }
+}
+
+
+/**
  * Handle incoming HTTP request.
  *
  * @param cls closure for MHD daemon (unused)
@@ -1069,15 +1589,11 @@ handle_mhd_request (void *cls,
       .data = "User-agent: *\nDisallow: /\n",
       .response_code = MHD_HTTP_OK
     },
-    /* Landing page, tell humans to go away. */
+    /* Landing page, redirect to toplevel_redirect_url */
     {
       .url = "",
       .method = MHD_HTTP_METHOD_GET,
-      .handler.get = TEH_handler_static_response,
-      .mime_type = "text/plain",
-      .data =
-        "Hello, I'm the Taler exchange. This HTTP server is not for humans.\n",
-      .response_code = MHD_HTTP_OK
+      .handler.get = &toplevel_redirect
     },
     /* AGPL licensing page, redirect to source. As per the AGPL-license, every
        deployment is required to offer the user a download of the source of
@@ -1093,6 +1609,12 @@ handle_mhd_request (void *cls,
       .method = MHD_HTTP_METHOD_GET,
       .handler.get = &handler_seed
     },
+    /* Configuration */
+    {
+      .url = "config",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &TEH_handler_config
+    },
     /* Performance metrics */
     {
       .url = "metrics",
@@ -1117,11 +1639,11 @@ handle_mhd_request (void *cls,
       .method = MHD_HTTP_METHOD_GET,
       .handler.get = &TEH_keys_get_handler,
     },
-    /* Requests for wiring information */
     {
-      .url = "wire",
-      .method = MHD_HTTP_METHOD_GET,
-      .handler.get = &TEH_handler_wire
+      .url = "batch-deposit",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &TEH_handler_batch_deposit,
+      .nargs = 0
     },
     /* request R, used in clause schnorr withdraw and refresh */
     {
@@ -1140,8 +1662,9 @@ handle_mhd_request (void *cls,
     {
       .url = "reserves",
       .method = MHD_HTTP_METHOD_GET,
-      .handler.get = &TEH_handler_reserves_get,
-      .nargs = 1
+      .handler.get = &handle_get_reserves,
+      .nargs = 2,
+      .nargs_is_upper_bound = true
     },
     {
       .url = "reserves",
@@ -1149,6 +1672,24 @@ handle_mhd_request (void *cls,
       .handler.post = &handle_post_reserves,
       .nargs = 2
     },
+    {
+      .url = "age-withdraw",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &handle_post_age_withdraw,
+      .nargs = 2
+    },
+    {
+      .url = "reserves-attest",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &TEH_handler_reserves_get_attest,
+      .nargs = 1
+    },
+    {
+      .url = "reserves-attest",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &TEH_handler_reserves_attest,
+      .nargs = 1
+    },
     /* coins */
     {
       .url = "coins",
@@ -1159,8 +1700,9 @@ handle_mhd_request (void *cls,
     {
       .url = "coins",
       .method = MHD_HTTP_METHOD_GET,
-      .handler.get = TEH_handler_link,
+      .handler.get = &handle_get_coins,
       .nargs = 2,
+      .nargs_is_upper_bound = true
     },
     /* refreshes/$RCH/reveal */
     {
@@ -1188,9 +1730,8 @@ handle_mhd_request (void *cls,
       .url = "purses",
       .method = MHD_HTTP_METHOD_POST,
       .handler.post = &handle_post_purses,
-      .nargs = 2 // ??
+      .nargs = 2
     },
-#if WITH_P2P
     /* Getting purse status */
     {
       .url = "purses",
@@ -1198,6 +1739,13 @@ handle_mhd_request (void *cls,
       .handler.get = &TEH_handler_purses_get,
       .nargs = 2
     },
+    /* Deleting purse */
+    {
+      .url = "purses",
+      .method = MHD_HTTP_METHOD_DELETE,
+      .handler.delete = &TEH_handler_purses_delete,
+      .nargs = 1
+    },
     /* Getting contracts */
     {
       .url = "contracts",
@@ -1205,13 +1753,12 @@ handle_mhd_request (void *cls,
       .handler.get = &TEH_handler_contracts_get,
       .nargs = 1
     },
-#endif
     /* KYC endpoints */
     {
       .url = "kyc-check",
       .method = MHD_HTTP_METHOD_GET,
       .handler.get = &TEH_handler_kyc_check,
-      .nargs = 1
+      .nargs = 3
     },
     {
       .url = "kyc-proof",
@@ -1225,6 +1772,20 @@ handle_mhd_request (void *cls,
       .handler.post = &TEH_handler_kyc_wallet,
       .nargs = 0
     },
+    {
+      .url = "kyc-webhook",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &TEH_handler_kyc_webhook_get,
+      .nargs = 16, /* more is not plausible */
+      .nargs_is_upper_bound = true
+    },
+    {
+      .url = "kyc-webhook",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &TEH_handler_kyc_webhook_post,
+      .nargs = 16, /* more is not plausible */
+      .nargs_is_upper_bound = true
+    },
     /* POST management endpoints */
     {
       .url = "management",
@@ -1248,6 +1809,28 @@ handle_mhd_request (void *cls,
       .nargs = 4,
       .nargs_is_upper_bound = true
     },
+    /* AML endpoints */
+    {
+      .url = "aml",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &handle_get_aml,
+      .nargs = 4,
+      .nargs_is_upper_bound = true
+    },
+    {
+      .url = "aml",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &handle_post_aml,
+      .nargs = 2
+    },
+    {
+      .url = "webui",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &TEH_handler_spa,
+      .nargs = 1,
+      .nargs_is_upper_bound = true
+    },
+
     /* mark end of list */
     {
       .url = NULL
@@ -1288,30 +1871,8 @@ handle_mhd_request (void *cls,
     if (0 == strcasecmp (method,
                          MHD_HTTP_METHOD_POST))
     {
-      const char *cl;
-
-      /* Maybe check for maximum upload size
-         and refuse requests if they are just too big. */
-      cl = MHD_lookup_connection_value (connection,
-                                        MHD_HEADER_KIND,
-                                        MHD_HTTP_HEADER_CONTENT_LENGTH);
-      if (NULL != cl)
-      {
-        unsigned long long cv;
-        char dummy;
-
-        if (1 != sscanf (cl,
-                         "%llu%c",
-                         &cv,
-                         &dummy))
-        {
-          /* Not valid HTTP request, just close connection. */
-          GNUNET_break_op (0);
-          return MHD_NO;
-        }
-        if (cv > TALER_MHD_REQUEST_BUFFER_MAX)
-          return TALER_MHD_reply_request_too_large (connection);
-      }
+      TALER_MHD_check_content_length (connection,
+                                      TALER_MHD_REQUEST_BUFFER_MAX);
     }
   }
 
@@ -1391,7 +1952,8 @@ handle_mhd_request (void *cls,
         continue;
       found = true;
       /* The URL is a match!  What we now do depends on the method. */
-      if (0 == strcasecmp (method, MHD_HTTP_METHOD_OPTIONS))
+      if (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_OPTIONS))
       {
         GNUNET_async_scope_restore (&old_scope);
         return TALER_MHD_reply_cors_preflight (connection);
@@ -1489,276 +2051,178 @@ handle_mhd_request (void *cls,
 
 
 /**
- * Load general KYC configuration parameters for the exchange server into the
- * #TEH_kyc_config variable.
+ * Load configuration parameters for the exchange
+ * server into the corresponding global variables.
  *
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
-parse_kyc_settings (void)
+exchange_serve_process_config (void)
 {
+  static struct TALER_CurrencySpecification defspec = {
+    .num_fractional_input_digits = 2,
+    .num_fractional_normal_digits = 2,
+    .num_fractional_trailing_zero_digits = 2
+  };
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
-                                           "exchange",
-                                           "KYC_WITHDRAW_PERIOD",
-                                           &TEH_kyc_config.withdraw_period))
+      TALER_KYCLOGIC_kyc_init (TEH_cfg))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "KYC_WITHDRAW_PERIOD",
-                               "valid relative time expected");
     return GNUNET_SYSERR;
   }
-  if (GNUNET_TIME_relative_is_zero (TEH_kyc_config.withdraw_period))
-    return GNUNET_OK;
   if (GNUNET_OK !=
-      TALER_config_get_amount (TEH_cfg,
-                               "exchange",
-                               "KYC_WITHDRAW_LIMIT",
-                               &TEH_kyc_config.withdraw_limit))
-    return GNUNET_SYSERR;
-  if (0 != strcasecmp (TEH_kyc_config.withdraw_limit.currency,
-                       TEH_currency))
+      GNUNET_CONFIGURATION_get_value_number (TEH_cfg,
+                                             "exchange",
+                                             "MAX_REQUESTS",
+                                             &req_max))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "KYC_WITHDRAW_LIMIT",
-                               "currency mismatch");
-    return GNUNET_SYSERR;
+    req_max = ULLONG_MAX;
   }
-  return GNUNET_OK;
-}
-
-
-/**
- * Load OAuth2.0 configuration parameters for the exchange server into the
- * #TEH_kyc_config variable.
- *
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-parse_kyc_oauth_cfg (void)
-{
-  char *s;
-
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_OAUTH2_AUTH_URL",
-                                             &s))
+      GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
+                                           "exchangedb",
+                                           "IDLE_RESERVE_EXPIRATION_TIME",
+                                           &TEH_reserve_closing_delay))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_AUTH_URL");
-    return GNUNET_SYSERR;
-  }
-  if ( (! TALER_url_valid_charset (s)) ||
-       ( (0 != strncasecmp (s,
-                            "http://",
-                            strlen ("http://"))) &&
-         (0 != strncasecmp (s,
-                            "https://",
-                            strlen ("https://"))) ) )
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_AUTH_URL",
-                               "not a valid URL");
-    GNUNET_free (s);
-    return GNUNET_SYSERR;
+                               "exchangedb",
+                               "IDLE_RESERVE_EXPIRATION_TIME");
+    /* use default */
+    TEH_reserve_closing_delay
+      = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_WEEKS,
+                                       4);
   }
-  TEH_kyc_config.details.oauth2.auth_url = s;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_OAUTH2_LOGIN_URL",
-                                             &s))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_LOGIN_URL");
-    return GNUNET_SYSERR;
-  }
-  if ( (! TALER_url_valid_charset (s)) ||
-       ( (0 != strncasecmp (s,
-                            "http://",
-                            strlen ("http://"))) &&
-         (0 != strncasecmp (s,
-                            "https://",
-                            strlen ("https://"))) ) )
+      GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
+                                           "exchange",
+                                           "MAX_KEYS_CACHING",
+                                           &TEH_max_keys_caching))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_LOGIN_URL",
-                               "not a valid URL");
-    GNUNET_free (s);
+                               "exchange",
+                               "MAX_KEYS_CACHING",
+                               "valid relative time expected");
     return GNUNET_SYSERR;
   }
-  TEH_kyc_config.details.oauth2.login_url = s;
-
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_INFO_URL",
-                                             &s))
+                                             "exchange",
+                                             "KYC_AML_TRIGGER",
+                                             &TEH_kyc_aml_trigger))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_INFO_URL");
-    return GNUNET_SYSERR;
-  }
-  if ( (! TALER_url_valid_charset (s)) ||
-       ( (0 != strncasecmp (s,
-                            "http://",
-                            strlen ("http://"))) &&
-         (0 != strncasecmp (s,
-                            "https://",
-                            strlen ("https://"))) ) )
-  {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_INFO_URL",
-                               "not a valid URL");
-    GNUNET_free (s);
+                               "exchange",
+                               "KYC_AML_TRIGGER");
     return GNUNET_SYSERR;
   }
-  TEH_kyc_config.details.oauth2.info_url = s;
-
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_OAUTH2_CLIENT_ID",
-                                             &s))
+                                             "exchange",
+                                             "TOPLEVEL_REDIRECT_URL",
+                                             &toplevel_redirect_url))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_CLIENT_ID");
-    return GNUNET_SYSERR;
+    toplevel_redirect_url = GNUNET_strdup ("/terms");
   }
-  TEH_kyc_config.details.oauth2.client_id = s;
-
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_OAUTH2_CLIENT_SECRET",
-                                             &s))
+      TALER_config_get_currency (TEH_cfg,
+                                 &TEH_currency))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_CLIENT_SECRET");
+                               "taler",
+                               "CURRENCY");
     return GNUNET_SYSERR;
   }
-  TEH_kyc_config.details.oauth2.client_secret = s;
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                             "exchange-kyc-oauth2",
-                                             "KYC_OAUTH2_POST_URL",
-                                             &s))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-kyc-oauth2",
-                               "KYC_OAUTH2_POST_URL");
+      TALER_CONFIG_parse_currencies (TEH_cfg,
+                                     &num_cspecs,
+                                     &cspecs))
     return GNUNET_SYSERR;
-  }
-  TEH_kyc_config.details.oauth2.post_kyc_redirect_url = s;
-  return GNUNET_OK;
-}
-
-
-/**
- * Load configuration parameters for the exchange
- * server into the corresponding global variables.
- *
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-exchange_serve_process_config (void)
-{
+  for (unsigned int i = 0; i<num_cspecs; i++)
   {
-    char *kyc_mode;
+    struct TALER_CurrencySpecification *cspec;
 
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
-                                               "exchange",
-                                               "KYC_MODE",
-                                               &kyc_mode))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "exchange",
-                                 "KYC_MODE");
-      return GNUNET_SYSERR;
-    }
-    if (0 == strcasecmp (kyc_mode,
-                         "NONE"))
-    {
-      TEH_kyc_config.mode = TEH_KYC_NONE;
-    }
-    else if (0 == strcasecmp (kyc_mode,
-                              "OAUTH2"))
+    cspec = &cspecs[i];
+    if (0 == strcmp (TEH_currency,
+                     cspec->currency))
     {
-      TEH_kyc_config.mode = TEH_KYC_OAUTH2;
-      if (GNUNET_OK !=
-          parse_kyc_oauth_cfg ())
-      {
-        GNUNET_free (kyc_mode);
-        return GNUNET_SYSERR;
-      }
+      TEH_cspec = cspec;
+      break;
     }
-    else
-    {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                 "exchange",
-                                 "KYC_MODE",
-                                 "Must be 'NONE' or 'OAUTH2'");
-      GNUNET_free (kyc_mode);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (kyc_mode);
   }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (TEH_cfg,
-                                             "exchange",
-                                             "MAX_REQUESTS",
-                                             &req_max))
+  if (NULL == TEH_cspec)
   {
-    req_max = ULLONG_MAX;
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+                               "taler",
+                               "CURRENCY",
+                               "Lacking enabled currency specification for the given currency, using default");
+    defspec.map_alt_unit_names
+      = GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_string ("0",
+                                   TEH_currency)
+          );
+    defspec.name = TEH_currency;
+    GNUNET_assert (strlen (TEH_currency) <
+                   sizeof (defspec.currency));
+    strcpy (defspec.currency,
+            TEH_currency);
+    TEH_cspec = &defspec;
   }
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
-                                           "exchangedb",
-                                           "IDLE_RESERVE_EXPIRATION_TIME",
-                                           &TEH_reserve_closing_delay))
+      TALER_config_get_amount (TEH_cfg,
+                               "exchange",
+                               "AML_THRESHOLD",
+                               &TEH_aml_threshold))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchangedb",
-                               "IDLE_RESERVE_EXPIRATION_TIME");
-    /* use default */
-    TEH_reserve_closing_delay
-      = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_WEEKS,
-                                       4);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Need amount in section `exchange' under `AML_THRESHOLD'\n");
+    return GNUNET_SYSERR;
   }
-
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (TEH_cfg,
-                                           "exchange",
-                                           "MAX_KEYS_CACHING",
-                                           &TEH_max_keys_caching))
+      TALER_config_get_amount (TEH_cfg,
+                               "exchange",
+                               "STEFAN_ABS",
+                               &TEH_stefan_abs))
   {
-    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &TEH_stefan_abs));
+  }
+  if (GNUNET_OK !=
+      TALER_config_get_amount (TEH_cfg,
                                "exchange",
-                               "MAX_KEYS_CACHING",
-                               "valid relative time expected");
-    return GNUNET_SYSERR;
+                               "STEFAN_LOG",
+                               &TEH_stefan_log))
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &TEH_stefan_log));
   }
   if (GNUNET_OK !=
-      TALER_config_get_currency (TEH_cfg,
-                                 &TEH_currency))
+      GNUNET_CONFIGURATION_get_value_float (TEH_cfg,
+                                            "exchange",
+                                            "STEFAN_LIN",
+                                            &TEH_stefan_lin))
   {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler",
-                               "CURRENCY");
+    TEH_stefan_lin = 0.0f;
+  }
+
+  if (0 != strcmp (TEH_currency,
+                   TEH_aml_threshold.currency))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Amount in section `exchange' under `AML_THRESHOLD' uses the wrong currency!\n");
+    return GNUNET_SYSERR;
+  }
+  TEH_enable_rewards
+    = GNUNET_CONFIGURATION_get_value_yesno (
+        TEH_cfg,
+        "exchange",
+        "ENABLE_REWARDS");
+  if (GNUNET_SYSERR == TEH_enable_rewards)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Need YES or NO in section `exchange' under `ENABLE_REWARDS'\n");
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
@@ -1781,35 +2245,6 @@ exchange_serve_process_config (void)
     return GNUNET_SYSERR;
   }
 
-  if (TEH_KYC_NONE != TEH_kyc_config.mode)
-  {
-    if (GNUNET_YES ==
-        GNUNET_CONFIGURATION_have_value (TEH_cfg,
-                                         "exchange",
-                                         "KYC_WALLET_BALANCE_LIMIT"))
-    {
-      if ( (GNUNET_OK !=
-            TALER_config_get_amount (TEH_cfg,
-                                     "exchange",
-                                     "KYC_WALLET_BALANCE_LIMIT",
-                                     &TEH_kyc_config.wallet_balance_limit)) ||
-           (0 != strcasecmp (TEH_currency,
-                             TEH_kyc_config.wallet_balance_limit.currency)) )
-      {
-        GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                   "exchange",
-                                   "KYC_WALLET_BALANCE_LIMIT",
-                                   "valid amount expected");
-        return GNUNET_SYSERR;
-      }
-    }
-    else
-    {
-      memset (&TEH_kyc_config.wallet_balance_limit,
-              0,
-              sizeof (TEH_kyc_config.wallet_balance_limit));
-    }
-  }
   {
     char *master_public_key_str;
 
@@ -1825,34 +2260,58 @@ exchange_serve_process_config (void)
       return GNUNET_SYSERR;
     }
     if (GNUNET_OK !=
-        GNUNET_CRYPTO_eddsa_public_key_from_string (master_public_key_str,
-                                                    strlen (
-                                                      master_public_key_str),
-                                                    &TEH_master_public_key.
-                                                    eddsa_pub))
+        GNUNET_CRYPTO_eddsa_public_key_from_string (
+          master_public_key_str,
+          strlen (master_public_key_str),
+          &TEH_master_public_key.eddsa_pub))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Invalid master public key given in exchange configuration.");
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "MASTER_PUBLIC_KEY",
+                                 "invalid base32 encoding for a master public key");
       GNUNET_free (master_public_key_str);
       return GNUNET_SYSERR;
     }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Launching exchange with public key `%s'...\n",
+                master_public_key_str);
     GNUNET_free (master_public_key_str);
   }
-  if (TEH_KYC_NONE != TEH_kyc_config.mode)
+
   {
+    char *attr_enc_key_str;
+
     if (GNUNET_OK !=
-        parse_kyc_settings ())
+        GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
+                                               "exchange",
+                                               "ATTRIBUTE_ENCRYPTION_KEY",
+                                               &attr_enc_key_str))
+    {
+      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                                 "exchange",
+                                 "ATTRIBUTE_ENCRYPTION_KEY");
       return GNUNET_SYSERR;
+    }
+    GNUNET_CRYPTO_hash (attr_enc_key_str,
+                        strlen (attr_enc_key_str),
+                        &TEH_attribute_key.hash);
+    GNUNET_free (attr_enc_key_str);
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Launching exchange with public key `%s'...\n",
-              GNUNET_p2s (&TEH_master_public_key.eddsa_pub));
 
-  if (NULL ==
-      (TEH_plugin = TALER_EXCHANGEDB_plugin_load (TEH_cfg)))
+  for (unsigned int i = 0; i<MAX_DB_RETRIES; i++)
+  {
+    TEH_plugin = TALER_EXCHANGEDB_plugin_load (TEH_cfg);
+    if (NULL != TEH_plugin)
+      break;
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to DB, will try again %u times\n",
+                MAX_DB_RETRIES - i);
+    sleep (1);
+  }
+  if (NULL == TEH_plugin)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to initialize DB subsystem\n");
+                "Failed to initialize DB subsystem. Giving up.\n");
     return GNUNET_SYSERR;
   }
   return GNUNET_OK;
@@ -1997,7 +2456,9 @@ run_single_request (void)
   xfork = fork ();
   if (-1 == xfork)
   {
-    global_ret = EXIT_FAILURE;
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                         "fork");
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -2084,12 +2545,17 @@ do_shutdown (void *cls)
 
   mhd = TALER_MHD_daemon_stop ();
   TEH_resume_keys_requests (true);
+  TEH_deposits_get_cleanup ();
   TEH_reserves_get_cleanup ();
   TEH_purses_get_cleanup ();
   TEH_kyc_check_cleanup ();
   TEH_kyc_proof_cleanup ();
+  TALER_KYCLOGIC_kyc_done ();
   if (NULL != mhd)
+  {
     MHD_stop_daemon (mhd);
+    mhd = NULL;
+  }
   TEH_wire_done ();
   TEH_extensions_done ();
   TEH_keys_finished ();
@@ -2108,6 +2574,12 @@ do_shutdown (void *cls)
     GNUNET_CURL_gnunet_rc_destroy (exchange_curl_rc);
     exchange_curl_rc = NULL;
   }
+  TALER_TEMPLATING_done ();
+  TEH_cspec = NULL;
+  TALER_CONFIG_free_currencies (num_cspecs,
+                                cspecs);
+  num_cspecs = 0;
+  cspecs = NULL;
 }
 
 
@@ -2145,31 +2617,48 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
+  if (GNUNET_OK !=
+      TEH_spa_init ())
+  {
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TEMPLATING_init ("exchange"))
+  {
+    global_ret = EXIT_NOTINSTALLED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   if (GNUNET_SYSERR ==
       TEH_plugin->preflight (TEH_plugin->cls))
   {
-    global_ret = EXIT_FAILURE;
+    GNUNET_break (0);
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if (GNUNET_OK !=
       TEH_extensions_init ())
   {
-    global_ret = EXIT_FAILURE;
+    global_ret = EXIT_NOTINSTALLED;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if (GNUNET_OK !=
       TEH_keys_init ())
   {
-    global_ret = EXIT_FAILURE;
+    GNUNET_break (0);
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
   if (GNUNET_OK !=
       TEH_wire_init ())
   {
-    global_ret = EXIT_FAILURE;
+    GNUNET_break (0);
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -2181,7 +2670,7 @@ run (void *cls,
   if (NULL == TEH_curl_ctx)
   {
     GNUNET_break (0);
-    global_ret = EXIT_FAILURE;
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -2234,7 +2723,6 @@ run (void *cls,
   global_ret = EXIT_SUCCESS;
   TALER_MHD_daemon_start (mhd);
   atexit (&write_stats);
-
 #if HAVE_DEVELOPER
   if (NULL != input_filename)
     run_single_request ();
diff --git a/src/exchange/taler-exchange-httpd.h b/src/exchange/taler-exchange-httpd.h
index 278a05be9..25e9e1105 100644
--- a/src/exchange/taler-exchange-httpd.h
+++ b/src/exchange/taler-exchange-httpd.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015, 2020 Taler Systems SA
+  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 Affero General Public License as published by the Free Software
@@ -25,113 +25,13 @@
 
 #include <microhttpd.h>
 #include "taler_json_lib.h"
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
+#include "taler_kyclogic_plugin.h"
 #include "taler_extensions.h"
 #include <gnunet/gnunet_mhd_compat.h>
 
 
 /**
- * Enumeration for our KYC modes.
- */
-enum TEH_KycMode
-{
-  /**
-   * KYC is disabled.
-   */
-  TEH_KYC_NONE = 0,
-
-  /**
-   * We use Oauth2.0.
-   */
-  TEH_KYC_OAUTH2 = 1
-};
-
-
-/**
- * Structure describing our KYC configuration.
- */
-struct TEH_KycOptions
-{
-  /**
-   * What KYC mode are we in?
-   */
-  enum TEH_KycMode mode;
-
-  /**
-   * Maximum amount that can be withdrawn in @e withdraw_period without
-   * needing KYC.
-   * Only valid if @e mode is not #TEH_KYC_NONE and
-   * if @e withdraw_period is non-zero.
-   */
-  struct TALER_Amount withdraw_limit;
-
-  /**
-   * Maximum balance a wallet can hold without
-   * needing KYC.
-   * Only valid if @e mode is not #TEH_KYC_NONE and
-   * if the amount specified is valid.
-   */
-  struct TALER_Amount wallet_balance_limit;
-
-  /**
-   * Time period over which @e withdraw_limit applies.
-   * Only valid if @e mode is not #TEH_KYC_NONE.
-   */
-  struct GNUNET_TIME_Relative withdraw_period;
-
-  /**
-   * Details depending on @e mode.
-   */
-  union
-  {
-
-    /**
-     * Configuration details if @e mode is #TEH_KYC_OAUTH2.
-     */
-    struct
-    {
-
-      /**
-       * URL of the OAuth2.0 endpoint for KYC checks.
-       * (token/auth)
-       */
-      char *auth_url;
-
-      /**
-       * URL of the OAuth2.0 endpoint for KYC checks.
-       */
-      char *login_url;
-
-      /**
-       * URL of the user info access endpoint.
-       */
-      char *info_url;
-
-      /**
-       * Our client ID for OAuth2.0.
-       */
-      char *client_id;
-
-      /**
-       * Our client secret for OAuth2.0.
-       */
-      char *client_secret;
-
-      /**
-       * Where to redirect clients after the
-       * Web-based KYC process is done?
-       */
-      char *post_kyc_redirect_url;
-
-    } oauth2;
-
-  } details;
-};
-
-
-extern struct TEH_KycOptions TEH_kyc_config;
-
-/**
  * How long is caching /keys allowed at most?
  */
 extern struct GNUNET_TIME_Relative TEH_max_keys_caching;
@@ -165,6 +65,11 @@ extern int TEH_check_invariants_flag;
 extern int TEH_allow_keys_timetravel;
 
 /**
+ * Option set to #GNUNET_YES if rewards are allowed.
+ */
+extern int TEH_enable_rewards;
+
+/**
  * Main directory with revocation data.
  */
 extern char *TEH_revocation_directory;
@@ -183,19 +88,51 @@ extern bool TEH_suicide;
 extern struct TALER_MasterPublicKeyP TEH_master_public_key;
 
 /**
+ * Key used to encrypt KYC attribute data in our database.
+ */
+extern struct TALER_AttributeEncryptionKeyP TEH_attribute_key;
+
+/**
  * Our DB plugin.
  */
 extern struct TALER_EXCHANGEDB_Plugin *TEH_plugin;
 
 /**
+ * Absolute STEFAN parameter.
+ */
+extern struct TALER_Amount TEH_stefan_abs;
+
+/**
+ * Logarithmic STEFAN parameter.
+ */
+extern struct TALER_Amount TEH_stefan_log;
+
+/**
+ * Linear STEFAN parameter.
+ */
+extern float TEH_stefan_lin;
+
+/**
+ * Default ways how to render #TEH_currency amounts.
+ */
+extern const struct TALER_CurrencySpecification *TEH_cspec;
+
+/**
  * Our currency.
  */
 extern char *TEH_currency;
 
-/*
- * Age restriction extension state
+/**
+ * Name of the KYC-AML-trigger evaluation binary.
  */
-extern bool TEH_age_restriction_enabled;
+extern char *TEH_kyc_aml_trigger;
+
+/**
+ * What is the largest amount we allow a peer to
+ * merge into a reserve before always triggering
+ * an AML check?
+ */
+extern struct TALER_Amount TEH_aml_threshold;
 
 /**
  * Our (externally visible) base URL.
@@ -216,6 +153,7 @@ extern struct GNUNET_CURL_Context *TEH_curl_ctx;
  * Signature of the offline master key of all enabled extensions' configuration
  */
 extern struct TALER_MasterSignatureP TEH_extensions_sig;
+extern bool TEH_extensions_signed;
 
 /**
  * @brief Struct describing an URL and the handler for it.
@@ -261,6 +199,11 @@ struct TEH_RequestContext
   struct MHD_Connection *connection;
 
   /**
+   * JSON root of uploaded data (or NULL, if none).
+   */
+  json_t *root;
+
+  /**
    * @e rh-specific cleanup routine. Function called
    * upon completion of the request that should
    * clean up @a rh_ctx. Can be NULL.
@@ -300,11 +243,10 @@ struct TEH_RequestHandler
   union
   {
     /**
-     * Function to call to handle a GET requests (and those
+     * Function to call to handle GET requests (and those
      * with @e method NULL).
      *
      * @param rc context for the request
-     * @param mime_type the @e mime_type for the reply (hint, can be NULL)
      * @param args array of arguments, needs to be of length @e args_expected
      * @return MHD result code
      */
@@ -314,11 +256,11 @@ struct TEH_RequestHandler
 
 
     /**
-     * Function to call to handle a POST request.
+     * Function to call to handle POST requests.
      *
      * @param rc context for the request
      * @param json uploaded JSON data
-     * @param args array of arguments, needs to be of length @e args_expected
+     * @param args array of arguments, needs to be of length @e nargs
      * @return MHD result code
      */
     MHD_RESULT
@@ -326,18 +268,18 @@ struct TEH_RequestHandler
             const json_t *root,
             const char *const args[]);
 
-  } handler;
-
-  /**
-   * Number of arguments this handler expects in the @a args array.
-   */
-  unsigned int nargs;
+    /**
+     * Function to call to handle DELETE requests.
+     *
+     * @param rc context for the request
+     * @param args array of arguments, needs to be of length @e nargs
+     * @return MHD result code
+     */
+    MHD_RESULT
+      (*delete)(struct TEH_RequestContext *rc,
+                const char *const args[]);
 
-  /**
-   * Is the number of arguments given in @e nargs only an upper bound,
-   * and calling with fewer arguments could be OK?
-   */
-  bool nargs_is_upper_bound;
+  } handler;
 
   /**
    * Mime type to use in reply (hint, can be NULL).
@@ -358,7 +300,22 @@ struct TEH_RequestHandler
    * Default response code. 0 for none provided.
    */
   unsigned int response_code;
+
+  /**
+   * Number of arguments this handler expects in the @a args array.
+   */
+  unsigned int nargs;
+
+  /**
+   * Is the number of arguments given in @e nargs only an upper bound,
+   * and calling with fewer arguments could be OK?
+   */
+  bool nargs_is_upper_bound;
 };
 
 
+/* Age restriction configuration */
+extern bool TEH_age_restriction_enabled;
+extern struct TALER_AgeRestrictionConfig TEH_age_restriction_config;
+
 #endif
diff --git a/src/exchange/taler-exchange-httpd_age-withdraw.c b/src/exchange/taler-exchange-httpd_age-withdraw.c
new file mode 100644
index 000000000..9276fb191
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_age-withdraw.c
@@ -0,0 +1,1019 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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,
+  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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General
+  Public License along with TALER; see the file COPYING.  If not,
+  see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_age-withdraw.c
+ * @brief Handle /reserves/$RESERVE_PUB/age-withdraw requests
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+#include "taler_error_codes.h"
+#include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_age-withdraw.h"
+#include "taler-exchange-httpd_responses.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler_util.h"
+
+
+/**
+ * Context for #age_withdraw_transaction.
+ */
+struct AgeWithdrawContext
+{
+  /**
+   * KYC status for the operation.
+   */
+  struct TALER_EXCHANGEDB_KycStatus kyc;
+
+  /**
+   * Timestamp
+   */
+  struct GNUNET_TIME_Timestamp now;
+
+  /**
+   * Hash of the wire source URL, needed when kyc is needed.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * The data from the age-withdraw request, as we persist it
+   */
+  struct TALER_EXCHANGEDB_AgeWithdraw commitment;
+
+  /**
+   * Number of coins/denonations in the reveal
+   */
+  uint32_t num_coins;
+
+  /**
+   * #num_coins * #kappa hashes of blinded coin planchets.
+   */
+  struct TALER_BlindedPlanchet (*coin_evs) [ TALER_CNC_KAPPA];
+
+  /**
+   * #num_coins hashes of the denominations from which the coins are withdrawn.
+   * Those must support age restriction.
+   */
+  struct TALER_DenominationHashP *denom_hs;
+
+};
+
+/*
+ * @brief Free the resources within a AgeWithdrawContext
+ *
+ * @param awc the context to free
+ */
+static void
+free_age_withdraw_context_resources (struct AgeWithdrawContext *awc)
+{
+  GNUNET_free (awc->denom_hs);
+  GNUNET_free (awc->coin_evs);
+  GNUNET_free (awc->commitment.denom_serials);
+  /*
+   * Note:
+   * awc->commitment.denom_sigs and .h_coin_evs were stack allocated and
+   * .denom_pub_hashes is NULL for this context.
+   */
+}
+
+
+/**
+ * Parse the denominations and blinded coin data of an '/age-withdraw' request.
+ *
+ * @param connection The MHD connection to handle
+ * @param j_denom_hs Array of n hashes of the denominations for the withdrawal, in JSON format
+ * @param j_blinded_coin_evs Array of n arrays of kappa blinded envelopes of in JSON format for the coins.
+ * @param[out] awc The context of the operation, only partially built at call time
+ * @param[out] mhd_ret The result if a reply is queued for MHD
+ * @return true on success, false on failure, with a reply already queued for MHD
+ */
+static enum GNUNET_GenericReturnValue
+parse_age_withdraw_json (
+  struct MHD_Connection *connection,
+  const json_t *j_denom_hs,
+  const json_t *j_blinded_coin_evs,
+  struct AgeWithdrawContext *awc,
+  MHD_RESULT *mhd_ret)
+{
+  char buf[256] = {0};
+  const char *error = NULL;
+  unsigned int idx = 0;
+  json_t *value = NULL;
+  struct GNUNET_HashContext *hash_context;
+
+
+  /* The age value MUST be on the beginning of an age group */
+  if (awc->commitment.max_age !=
+      TALER_get_lowest_age (&TEH_age_restriction_config.mask,
+                            awc->commitment.max_age))
+  {
+    error = "max_age must be the lower edge of an age group";
+    goto EXIT;
+  }
+
+  /* Verify JSON-structure consistency */
+  {
+    uint32_t num_coins = json_array_size (j_denom_hs);
+
+    if (! json_is_array (j_denom_hs))
+      error = "denoms_h must be an array";
+    else if (! json_is_array (j_blinded_coin_evs))
+      error = "coin_evs must be an array";
+    else if (num_coins == 0)
+      error = "denoms_h must not be empty";
+    else if (num_coins != json_array_size (j_blinded_coin_evs))
+      error = "denoms_h and coins_evs must be arrays of the same size";
+    else if (num_coins > TALER_MAX_FRESH_COINS)
+      /**
+       * The wallet had committed to more than the maximum coins allowed, the
+       * reserve has been charged, but now the user can not withdraw any money
+       * from it.  Note that the user can't get their money back in this case!
+       **/
+      error = "maximum number of coins that can be withdrawn has been exceeded";
+
+    _Static_assert ((TALER_MAX_FRESH_COINS < INT_MAX / TALER_CNC_KAPPA),
+                    "TALER_MAX_FRESH_COINS too large");
+
+    if (NULL != error)
+      goto EXIT;
+
+    awc->num_coins =  num_coins;
+    awc->commitment.num_coins = num_coins;
+  }
+
+  /* Continue parsing the parts */
+
+  /* Parse denomination keys */
+  awc->denom_hs = GNUNET_new_array (awc->num_coins,
+                                    struct TALER_DenominationHashP);
+
+  json_array_foreach (j_denom_hs, idx, value) {
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto (NULL, &awc->denom_hs[idx]),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (value, spec, NULL, NULL))
+    {
+      GNUNET_snprintf (buf,
+                       sizeof(buf),
+                       "couldn't parse entry no. %d in array denoms_h",
+                       idx + 1);
+      error = buf;
+      goto EXIT;
+    }
+  };
+
+  {
+    typedef struct TALER_BlindedPlanchet
+      _array_of_kappa_planchets[TALER_CNC_KAPPA];
+
+    awc->coin_evs = GNUNET_new_array (awc->num_coins,
+                                      _array_of_kappa_planchets);
+  }
+
+  hash_context = GNUNET_CRYPTO_hash_context_start ();
+  GNUNET_assert (NULL != hash_context);
+
+  /* Parse blinded envelopes. */
+  json_array_foreach (j_blinded_coin_evs, idx, value) {
+    const json_t *j_kappa_coin_evs = value;
+    if (! json_is_array (j_kappa_coin_evs))
+    {
+      GNUNET_snprintf (buf,
+                       sizeof(buf),
+                       "enxtry %d in array blinded_coin_evs is not an array",
+                       idx + 1);
+      error = buf;
+      goto EXIT;
+    }
+    else if (TALER_CNC_KAPPA != json_array_size (j_kappa_coin_evs))
+    {
+      GNUNET_snprintf (buf,
+                       sizeof(buf),
+                       "array no. %d in coin_evs not of correct size",
+                       idx + 1);
+      error = buf;
+      goto EXIT;
+    }
+
+    /* Now parse the individual kappa envelopes and calculate the hash of
+     * the commitment along the way. */
+    {
+      unsigned int kappa = 0;
+
+      json_array_foreach (j_kappa_coin_evs, kappa, value) {
+        struct GNUNET_JSON_Specification spec[] = {
+          TALER_JSON_spec_blinded_planchet (NULL,
+                                            &awc->coin_evs[idx][kappa]),
+          GNUNET_JSON_spec_end ()
+        };
+
+        if (GNUNET_OK !=
+            GNUNET_JSON_parse (value,
+                               spec,
+                               NULL,
+                               NULL))
+        {
+          GNUNET_snprintf (buf,
+                           sizeof(buf),
+                           "couldn't parse array no. %d in blinded_coin_evs[%d]",
+                           kappa + 1,
+                           idx + 1);
+          error = buf;
+          goto EXIT;
+        }
+
+        /* Continue to hash of the coin candidates */
+        {
+          struct TALER_BlindedCoinHashP bch;
+
+          TALER_coin_ev_hash (&awc->coin_evs[idx][kappa],
+                              &awc->denom_hs[idx],
+                              &bch);
+          GNUNET_CRYPTO_hash_context_read (hash_context,
+                                           &bch,
+                                           sizeof(bch));
+        }
+
+        /* Check for duplicate planchets. Technically a bug on
+         * the client side that is harmless for us, but still
+         * not allowed per protocol */
+        for (unsigned int i = 0; i < idx; i++)
+        {
+          if (0 == TALER_blinded_planchet_cmp (&awc->coin_evs[idx][kappa],
+                                               &awc->coin_evs[i][kappa]))
+          {
+            GNUNET_JSON_parse_free (spec);
+            error = "duplicate planchet";
+            goto EXIT;
+          }
+        }
+      }
+    }
+  }; /* json_array_foreach over j_blinded_coin_evs */
+
+  /* Finally, calculate the h_commitment from all blinded envelopes */
+  GNUNET_CRYPTO_hash_context_finish (hash_context,
+                                     &awc->commitment.h_commitment.hash);
+
+  GNUNET_assert (NULL == error);
+
+
+EXIT:
+  if (NULL != error)
+  {
+    /* Note: resources are freed in caller */
+
+    *mhd_ret = TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_GENERIC_PARAMETER_MALFORMED,
+      error);
+    return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Check if the given denomination is still or already valid, has not been
+ * revoked and supports age restriction.
+ *
+ * @param connection HTTP-connection to the client
+ * @param ksh The handle to the current state of (denomination) keys in the exchange
+ * @param denom_h Hash of the denomination key to check
+ * @param[out] pdk On success, will contain the denomination key details
+ * @param[out] result On failure, an MHD-response will be queued and result will be set to accordingly
+ * @return true on success (denomination valid), false otherwise
+ */
+static bool
+denomination_is_valid (
+  struct MHD_Connection *connection,
+  struct TEH_KeyStateHandle *ksh,
+  const struct TALER_DenominationHashP *denom_h,
+  struct TEH_DenominationKey **pdk,
+  MHD_RESULT *result)
+{
+  struct TEH_DenominationKey *dk;
+  dk = TEH_keys_denomination_by_hash_from_state (ksh,
+                                                 denom_h,
+                                                 connection,
+                                                 result);
+  if (NULL == dk)
+  {
+    /* The denomination doesn't exist */
+    /* Note: a HTTP-response has been queued and result has been set by
+     * TEH_keys_denominations_by_hash_from_state */
+    return false;
+  }
+
+  if (GNUNET_TIME_absolute_is_past (dk->meta.expire_withdraw.abs_time))
+  {
+    /* This denomination is past the expiration time for withdraws */
+    /* FIXME[oec]: add idempotency check */
+    *result = TEH_RESPONSE_reply_expired_denom_pub_hash (
+      connection,
+      denom_h,
+      TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
+      "age-withdraw_reveal");
+    return false;
+  }
+
+  if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
+  {
+    /* This denomination is not yet valid */
+    *result = TEH_RESPONSE_reply_expired_denom_pub_hash (
+      connection,
+      denom_h,
+      TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
+      "age-withdraw_reveal");
+    return false;
+  }
+
+  if (dk->recoup_possible)
+  {
+    /* This denomination has been revoked */
+    *result = TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
+      NULL);
+    return false;
+  }
+
+  if (0 == dk->denom_pub.age_mask.bits)
+  {
+    /* This denomation does not support age restriction */
+    char msg[256] = {0};
+    GNUNET_snprintf (msg,
+                     sizeof(msg),
+                     "denomination %s does not support age restriction",
+                     GNUNET_h2s (&denom_h->hash));
+
+    *result = TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN,
+      msg);
+    return false;
+  }
+
+  *pdk = dk;
+  return true;
+}
+
+
+/**
+ * Check if the given array of hashes of denomination_keys a) belong
+ * to valid denominations and b) those are marked as age restricted.
+ * Also, calculate the total amount of the denominations including fees
+ * for withdraw.
+ *
+ * @param connection The HTTP connection to the client
+ * @param len The lengths of the array @a denoms_h
+ * @param denom_hs array of hashes of denomination public keys
+ * @param coin_evs array of blinded coin planchet candidates
+ * @param[out] denom_serials On success, will be filled with the serial-id's of the denomination keys.  Caller must deallocate.
+ * @param[out] amount_with_fee On success, will contain the committed amount including fees
+ * @param[out] result In the error cases, a response will be queued with MHD and this will be the result.
+ * @return #GNUNET_OK if the denominations are valid and support age-restriction
+ *   #GNUNET_SYSERR otherwise
+ */
+static enum GNUNET_GenericReturnValue
+are_denominations_valid (
+  struct MHD_Connection *connection,
+  uint32_t len,
+  const struct TALER_DenominationHashP *denom_hs,
+  const struct TALER_BlindedPlanchet (*coin_evs) [ TALER_CNC_KAPPA],
+  uint64_t **denom_serials,
+  struct TALER_Amount *amount_with_fee,
+  MHD_RESULT *result)
+{
+  struct TALER_Amount total_amount;
+  struct TALER_Amount total_fee;
+  struct TEH_KeyStateHandle *ksh;
+  uint64_t *serials;
+
+  ksh = TEH_keys_get_state ();
+  if (NULL == ksh)
+  {
+    *result = TALER_MHD_reply_with_ec (connection,
+                                       TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                       NULL);
+    return GNUNET_SYSERR;
+  }
+
+  *denom_serials =
+    serials = GNUNET_new_array (len, uint64_t);
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &total_amount));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &total_fee));
+
+  for (uint32_t i = 0; i < len; i++)
+  {
+    struct TEH_DenominationKey *dk;
+    if (! denomination_is_valid (connection,
+                                 ksh,
+                                 &denom_hs[i],
+                                 &dk,
+                                 result))
+      /* FIXME[oec]: add idempotency check */
+      return GNUNET_SYSERR;
+
+    /* Ensure the ciphers from the planchets match the denominations' */
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+    {
+      if (dk->denom_pub.bsign_pub_key->cipher !=
+          coin_evs[i][k].blinded_message->cipher)
+      {
+        GNUNET_break_op (0);
+        *result = TALER_MHD_reply_with_ec (connection,
+                                           TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
+                                           NULL);
+        return GNUNET_SYSERR;
+      }
+    }
+
+    /* Accumulate the values */
+    if (0 > TALER_amount_add (&total_amount,
+                              &total_amount,
+                              &dk->meta.value))
+    {
+      GNUNET_break_op (0);
+      *result = TALER_MHD_reply_with_error (connection,
+                                            MHD_HTTP_BAD_REQUEST,
+                                            TALER_EC_EXCHANGE_AGE_WITHDRAW_AMOUNT_OVERFLOW,
+                                            "amount");
+      return GNUNET_SYSERR;
+    }
+
+    /* Accumulate the withdraw fees */
+    if (0 > TALER_amount_add (&total_fee,
+                              &total_fee,
+                              &dk->meta.fees.withdraw))
+    {
+      GNUNET_break_op (0);
+      *result = TALER_MHD_reply_with_error (connection,
+                                            MHD_HTTP_BAD_REQUEST,
+                                            TALER_EC_EXCHANGE_AGE_WITHDRAW_AMOUNT_OVERFLOW,
+                                            "fee");
+      return GNUNET_SYSERR;
+    }
+
+    serials[i] = dk->meta.serial;
+  }
+
+  /* Save the total amount including fees */
+  GNUNET_assert (0 < TALER_amount_add (amount_with_fee,
+                                       &total_amount,
+                                       &total_fee));
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * @brief Verify the signature of the request body with the reserve key
+ *
+ * @param connection the connection to the client
+ * @param commitment the age withdraw commitment
+ * @param mhd_ret the response to fill in the error case
+ * @return GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+verify_reserve_signature (
+  struct MHD_Connection *connection,
+  const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+  enum MHD_Result *mhd_ret)
+{
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_wallet_age_withdraw_verify (&commitment->h_commitment,
+                                        &commitment->amount_with_fee,
+                                        &TEH_age_restriction_config.mask,
+                                        commitment->max_age,
+                                        &commitment->reserve_pub,
+                                        &commitment->reserve_sig))
+  {
+    GNUNET_break_op (0);
+    *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                        TALER_EC_EXCHANGE_WITHDRAW_RESERVE_SIGNATURE_INVALID,
+                                        NULL);
+    return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Send a response to a "age-withdraw" request.
+ *
+ * @param connection the connection to send the response to
+ * @param ach value the client committed to
+ * @param noreveal_index which index will the client not have to reveal
+ * @return a MHD status code
+ */
+static MHD_RESULT
+reply_age_withdraw_success (
+  struct MHD_Connection *connection,
+  const struct TALER_AgeWithdrawCommitmentHashP *ach,
+  uint32_t noreveal_index)
+{
+  struct TALER_ExchangePublicKeyP pub;
+  struct TALER_ExchangeSignatureP sig;
+  enum TALER_ErrorCode ec =
+    TALER_exchange_online_age_withdraw_confirmation_sign (
+      &TEH_keys_exchange_sign_,
+      ach,
+      noreveal_index,
+      &pub,
+      &sig);
+
+  if (TALER_EC_NONE != ec)
+    return TALER_MHD_reply_with_ec (connection,
+                                    ec,
+                                    NULL);
+
+  return TALER_MHD_REPLY_JSON_PACK (connection,
+                                    MHD_HTTP_OK,
+                                    GNUNET_JSON_pack_uint64 ("noreveal_index",
+                                                             noreveal_index),
+                                    GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                                                &sig),
+                                    GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                                                &pub));
+}
+
+
+/**
+ * Check if the request is replayed and we already have an
+ * answer. If so, replay the existing answer and return the
+ * HTTP response.
+ *
+ * @param con connection to the client
+ * @param[in,out] awc parsed request data
+ * @param[out] mret HTTP status, set if we return true
+ * @return true if the request is idempotent with an existing request
+ *    false if we did not find the request in the DB and did not set @a mret
+ */
+static bool
+request_is_idempotent (struct MHD_Connection *con,
+                       struct AgeWithdrawContext *awc,
+                       MHD_RESULT *mret)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_EXCHANGEDB_AgeWithdraw commitment;
+
+  qs = TEH_plugin->get_age_withdraw (TEH_plugin->cls,
+                                     &awc->commitment.reserve_pub,
+                                     &awc->commitment.h_commitment,
+                                     &commitment);
+  if (0 > qs)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+      *mret = TALER_MHD_reply_with_ec (con,
+                                       TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                       "get_age_withdraw");
+    return true; /* Well, kind-of.  At least we have set mret. */
+  }
+
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    return false;
+
+  /* Generate idempotent reply */
+  TEH_METRICS_num_requests[TEH_MT_REQUEST_IDEMPOTENT_AGE_WITHDRAW]++;
+  *mret = reply_age_withdraw_success (con,
+                                      &commitment.h_commitment,
+                                      commitment.noreveal_index);
+  return true;
+}
+
+
+/**
+ * Function called to iterate over KYC-relevant transaction amounts for a
+ * particular time range. Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param cls closure, identifies the event type and account to iterate
+ *        over events for
+ * @param limit maximum time-range for which events should be fetched
+ *        (timestamp in the past)
+ * @param cb function to call on each event found, events must be returned
+ *        in reverse chronological order
+ * @param cb_cls closure for @a cb, of type struct AgeWithdrawContext
+ */
+static void
+age_withdraw_amount_cb (void *cls,
+                        struct GNUNET_TIME_Absolute limit,
+                        TALER_EXCHANGEDB_KycAmountCallback cb,
+                        void *cb_cls)
+{
+  struct AgeWithdrawContext *awc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Signaling amount %s for KYC check during age-withdrawal\n",
+              TALER_amount2s (&awc->commitment.amount_with_fee));
+  if (GNUNET_OK !=
+      cb (cb_cls,
+          &awc->commitment.amount_with_fee,
+          awc->now.abs_time))
+    return;
+  qs = TEH_plugin->select_withdraw_amounts_for_kyc_check (TEH_plugin->cls,
+                                                          &awc->h_payto,
+                                                          limit,
+                                                          cb,
+                                                          cb_cls);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Got %d additional transactions for this age-withdrawal and limit %llu\n",
+              qs,
+              (unsigned long long) limit.abs_value_us);
+  GNUNET_break (qs >= 0);
+}
+
+
+/**
+ * Function implementing age withdraw transaction.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction
+ * logic MUST NOT queue a MHD response.  IF it returns an hard error,
+ * the transaction logic MUST queue a MHD response and set @a mhd_ret.
+ * IF it returns the soft error code, the function MAY be called again
+ * to retry and MUST not queue a MHD response.
+ *
+ * @param cls a `struct AgeWithdrawContext *`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+age_withdraw_transaction (void *cls,
+                          struct MHD_Connection *connection,
+                          MHD_RESULT *mhd_ret)
+{
+  struct AgeWithdrawContext *awc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = TEH_plugin->reserves_get_origin (TEH_plugin->cls,
+                                        &awc->commitment.reserve_pub,
+                                        &awc->h_payto);
+  if (qs < 0)
+    return qs;
+
+  /* If _no_ results, reserve was created by merge,
+     in which case no KYC check is required as the
+     merge already did that. */
+
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    char *kyc_required;
+
+    qs = TALER_KYCLOGIC_kyc_test_required (
+      TALER_KYCLOGIC_KYC_TRIGGER_AGE_WITHDRAW,
+      &awc->h_payto,
+      TEH_plugin->select_satisfied_kyc_processes,
+      TEH_plugin->cls,
+      &age_withdraw_amount_cb,
+      awc,
+      &kyc_required);
+
+    if (qs < 0)
+    {
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+      {
+        GNUNET_break (0);
+        *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                            "kyc_test_required");
+      }
+      return qs;
+    }
+
+    if (NULL != kyc_required)
+    {
+      /* Mark result and return by inserting KYC requirement into DB! */
+      awc->kyc.ok = false;
+      return TEH_plugin->insert_kyc_requirement_for_account (
+        TEH_plugin->cls,
+        kyc_required,
+        &awc->h_payto,
+        &awc->commitment.reserve_pub,
+        &awc->kyc.requirement_row);
+    }
+  }
+
+  awc->kyc.ok = true;
+
+  /* KYC requirement fulfilled, do the age-withdraw transaction */
+  {
+    bool found = false;
+    bool balance_ok = false;
+    bool age_ok = false;
+    bool conflict = false;
+    uint16_t allowed_maximum_age = 0;
+    uint32_t reserve_birthday = 0;
+    struct TALER_Amount reserve_balance;
+
+    qs = TEH_plugin->do_age_withdraw (TEH_plugin->cls,
+                                      &awc->commitment,
+                                      awc->now,
+                                      &found,
+                                      &balance_ok,
+                                      &reserve_balance,
+                                      &age_ok,
+                                      &allowed_maximum_age,
+                                      &reserve_birthday,
+                                      &conflict);
+    if (0 > qs)
+    {
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                            "do_age_withdraw");
+      return qs;
+    }
+    if (! found)
+    {
+      *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                          TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                          NULL);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (! age_ok)
+    {
+      enum TALER_ErrorCode ec =
+        TALER_EC_EXCHANGE_AGE_WITHDRAW_MAXIMUM_AGE_TOO_LARGE;
+
+      *mhd_ret =
+        TALER_MHD_REPLY_JSON_PACK (
+          connection,
+          MHD_HTTP_CONFLICT,
+          TALER_MHD_PACK_EC (ec),
+          GNUNET_JSON_pack_uint64 ("allowed_maximum_age",
+                                   allowed_maximum_age),
+          GNUNET_JSON_pack_uint64 ("reserve_birthday",
+                                   reserve_birthday));
+
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (! balance_ok)
+    {
+      TEH_plugin->rollback (TEH_plugin->cls);
+
+      *mhd_ret = TEH_RESPONSE_reply_reserve_insufficient_balance (
+        connection,
+        TALER_EC_EXCHANGE_AGE_WITHDRAW_INSUFFICIENT_FUNDS,
+        &reserve_balance,
+        &awc->commitment.amount_with_fee,
+        &awc->commitment.reserve_pub);
+
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (conflict)
+    {
+      /* do_age_withdraw signaled a conflict, so there MUST be an entry
+       * in the DB.  Put that into the response */
+      bool ok = request_is_idempotent (connection,
+                                       awc,
+                                       mhd_ret);
+      GNUNET_assert (ok);
+      return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+    }
+    *mhd_ret = -1;
+  }
+
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+    TEH_METRICS_num_success[TEH_MT_SUCCESS_AGE_WITHDRAW]++;
+  return qs;
+}
+
+
+/**
+ * @brief Sign the chosen blinded coins, debit the reserve and persist
+ * the commitment.
+ *
+ * On conflict, the noreveal_index from the previous, existing
+ * commitment is returned to the client, returning success.
+ *
+ * On error (like, insufficient funds), the client is notified.
+ *
+ * Note that on success, there are two possible states:
+ *  1.) KYC is required (awc.kyc.ok == false) or
+ *  2.) age withdraw was successful.
+ *
+ * @param connection HTTP-connection to the client
+ * @param awc The context for the current age withdraw request
+ * @param[out] result On error, a HTTP-response will be queued and result set accordingly
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
+ */
+static enum GNUNET_GenericReturnValue
+sign_and_do_age_withdraw (
+  struct MHD_Connection *connection,
+  struct AgeWithdrawContext *awc,
+  MHD_RESULT *result)
+{
+  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+  struct TALER_BlindedCoinHashP h_coin_evs[awc->num_coins];
+  struct TALER_BlindedDenominationSignature denom_sigs[awc->num_coins];
+  uint8_t noreveal_index;
+
+  awc->now = GNUNET_TIME_timestamp_get ();
+
+  /* Pick the challenge */
+  noreveal_index =
+    GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG,
+                              TALER_CNC_KAPPA);
+
+  awc->commitment.noreveal_index = noreveal_index;
+
+  /* Choose and sign the coins */
+  {
+    struct TEH_CoinSignData csds[awc->num_coins];
+    enum TALER_ErrorCode ec;
+
+    /* Pick the chosen blinded coins */
+    for (uint32_t i = 0; i<awc->num_coins; i++)
+    {
+      csds[i].bp = &awc->coin_evs[i][noreveal_index];
+      csds[i].h_denom_pub = &awc->denom_hs[i];
+    }
+
+    ec = TEH_keys_denomination_batch_sign (awc->num_coins,
+                                           csds,
+                                           false,
+                                           denom_sigs);
+    if (TALER_EC_NONE != ec)
+    {
+      GNUNET_break (0);
+      *result = TALER_MHD_reply_with_ec (connection,
+                                         ec,
+                                         NULL);
+      return GNUNET_SYSERR;
+    }
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Signatures ready, starting DB interaction\n");
+
+  /* Prepare the hashes of the coins for insertion */
+  for (uint32_t i = 0; i<awc->num_coins; i++)
+  {
+    TALER_coin_ev_hash (&awc->coin_evs[i][noreveal_index],
+                        &awc->denom_hs[i],
+                        &h_coin_evs[i]);
+  }
+
+  /* Run the transaction */
+  awc->commitment.h_coin_evs = h_coin_evs;
+  awc->commitment.denom_sigs = denom_sigs;
+  ret = TEH_DB_run_transaction (connection,
+                                "run age withdraw",
+                                TEH_MT_REQUEST_AGE_WITHDRAW,
+                                result,
+                                &age_withdraw_transaction,
+                                awc);
+  /* Free resources */
+  for (unsigned int i = 0; i<awc->num_coins; i++)
+    TALER_blinded_denom_sig_free (&denom_sigs[i]);
+  awc->commitment.h_coin_evs = NULL;
+  awc->commitment.denom_sigs = NULL;
+  return ret;
+}
+
+
+MHD_RESULT
+TEH_handler_age_withdraw (struct TEH_RequestContext *rc,
+                          const struct TALER_ReservePublicKeyP *reserve_pub,
+                          const json_t *root)
+{
+  MHD_RESULT mhd_ret;
+  const json_t *j_denom_hs;
+  const json_t *j_blinded_coin_evs;
+  struct AgeWithdrawContext awc = {0};
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("denom_hs",
+                                  &j_denom_hs),
+    GNUNET_JSON_spec_array_const ("blinded_coin_evs",
+                                  &j_blinded_coin_evs),
+    GNUNET_JSON_spec_uint16 ("max_age",
+                             &awc.commitment.max_age),
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &awc.commitment.reserve_sig),
+    GNUNET_JSON_spec_end ()
+  };
+
+  awc.commitment.reserve_pub = *reserve_pub;
+
+
+  /* Parse the JSON body */
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (rc->connection,
+                                     root,
+                                     spec);
+    if (GNUNET_OK != res)
+      return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
+  }
+
+  do {
+    /* Note: If we break the statement here at any point,
+     * a response to the client MUST have been populated
+     * with an appropriate answer and mhd_ret MUST have
+     * been set accordingly.
+     */
+
+    /* Parse denoms_h and blinded_coins_evs, partially fill awc */
+    if (GNUNET_OK !=
+        parse_age_withdraw_json (rc->connection,
+                                 j_denom_hs,
+                                 j_blinded_coin_evs,
+                                 &awc,
+                                 &mhd_ret))
+      break;
+
+    /* Ensure validity of denoms and calculate amounts and fees */
+    if (GNUNET_OK !=
+        are_denominations_valid (rc->connection,
+                                 awc.num_coins,
+                                 awc.denom_hs,
+                                 awc.coin_evs,
+                                 &awc.commitment.denom_serials,
+                                 &awc.commitment.amount_with_fee,
+                                 &mhd_ret))
+      break;
+
+    /* Now that amount_with_fee is calculated, verify the signature of
+     * the request body with the reserve key.
+     */
+    if (GNUNET_OK !=
+        verify_reserve_signature (rc->connection,
+                                  &awc.commitment,
+                                  &mhd_ret))
+      break;
+
+    /* Sign the chosen blinded coins, persist the commitment and
+     * charge the reserve.
+     * On error (like, insufficient funds), the client is notified.
+     * On conflict, the noreveal_index from the previous, existing
+     * commitment is returned to the client, returning success.
+     * Note that on success, there are two possible states:
+     *    KYC is required (awc.kyc.ok == false) or
+     *    age withdraw was successful.
+     */
+    if (GNUNET_OK !=
+        sign_and_do_age_withdraw (rc->connection,
+                                  &awc,
+                                  &mhd_ret))
+      break;
+
+    /* Send back final response, depending on the outcome of
+     * the DB-transaction */
+    if (! awc.kyc.ok)
+      mhd_ret = TEH_RESPONSE_reply_kyc_required (rc->connection,
+                                                 &awc.h_payto,
+                                                 &awc.kyc);
+    else
+      mhd_ret = reply_age_withdraw_success (rc->connection,
+                                            &awc.commitment.h_commitment,
+                                            awc.commitment.noreveal_index);
+
+  } while (0);
+
+  GNUNET_JSON_parse_free (spec);
+  free_age_withdraw_context_resources (&awc);
+  return mhd_ret;
+
+}
+
+
+/* end of taler-exchange-httpd_age-withdraw.c */
diff --git a/src/exchange/taler-exchange-httpd_withdraw.h b/src/exchange/taler-exchange-httpd_age-withdraw.h
index 2ec76bb92..a76779190 100644
--- a/src/exchange/taler-exchange-httpd_withdraw.h
+++ b/src/exchange/taler-exchange-httpd_age-withdraw.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2023 Taler Systems SA
 
   TALER 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
@@ -14,25 +14,25 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-exchange-httpd_withdraw.h
- * @brief Handle /reserve/withdraw requests
- * @author Florian Dold
- * @author Benedikt Mueller
- * @author Christian Grothoff
+ * @file taler-exchange-httpd_age-withdraw.h
+ * @brief Handle /reserve/$RESERVE_PUB/age-withdraw requests
+ * @author Özgür Kesim
  */
-#ifndef TALER_EXCHANGE_HTTPD_WITHDRAW_H
-#define TALER_EXCHANGE_HTTPD_WITHDRAW_H
+#ifndef TALER_EXCHANGE_HTTPD_AGE_WITHDRAW_H
+#define TALER_EXCHANGE_HTTPD_AGE_WITHDRAW_H
 
 #include <microhttpd.h>
 #include "taler-exchange-httpd.h"
 
 
 /**
- * Handle a "/reserves/$RESERVE_PUB/withdraw" request.  Parses the requested "denom_pub" which
- * specifies the key/value of the coin to be withdrawn, and checks that the
- * signature "reserve_sig" makes this a valid withdrawal request from the
- * specified reserve.  If so, the envelope with the blinded coin "coin_ev" is
- * passed down to execute the withdrawal operation.
+ * Handle a "/reserves/$RESERVE_PUB/age-withdraw" request.
+ *
+ * Parses the batch of commitments to withdraw age restricted coins, and checks
+ * that the signature "reserve_sig" makes this a valid withdrawal request from
+ * the specified reserve.  If the request is valid, the response contains a
+ * noreveal_index which the client has to use for the subsequent call to
+ * /age-withdraw/$ACH/reveal.
  *
  * @param rc request context
  * @param root uploaded JSON data
@@ -40,8 +40,8 @@
  * @return MHD result code
   */
 MHD_RESULT
-TEH_handler_withdraw (struct TEH_RequestContext *rc,
-                      const struct TALER_ReservePublicKeyP *reserve_pub,
-                      const json_t *root);
+TEH_handler_age_withdraw (struct TEH_RequestContext *rc,
+                          const struct TALER_ReservePublicKeyP *reserve_pub,
+                          const json_t *root);
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_age-withdraw_reveal.c b/src/exchange/taler-exchange-httpd_age-withdraw_reveal.c
new file mode 100644
index 000000000..c9aca8e99
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_age-withdraw_reveal.c
@@ -0,0 +1,610 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_age-withdraw_reveal.c
+ * @brief Handle /age-withdraw/$ACH/reveal requests
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include "taler-exchange-httpd_metrics.h"
+#include "taler_error_codes.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_mhd.h"
+#include "taler-exchange-httpd_age-withdraw_reveal.h"
+#include "taler-exchange-httpd_responses.h"
+#include "taler-exchange-httpd_keys.h"
+
+/**
+ * State for an /age-withdraw/$ACH/reveal operation.
+ */
+struct AgeRevealContext
+{
+
+  /**
+   * Commitment for the age-withdraw operation, previously called by the
+   * client.
+   */
+  struct TALER_AgeWithdrawCommitmentHashP ach;
+
+  /**
+   * Public key of the reserve for with the age-withdraw commitment was
+   * originally made.  This parameter is provided by the client again
+   * during the call to reveal in order to save a database-lookup.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Number of coins to reveal.  MUST be equal to
+   * @e num_secrets/(kappa -1).
+   */
+  uint32_t num_coins;
+
+  /**
+   * Number of secrets in the reveal.  MUST be a multiple of (kappa-1).
+   */
+  uint32_t num_secrets;
+
+  /**
+   * @e num_secrets secrets for  disclosed coins.
+   */
+  struct TALER_PlanchetMasterSecretP *disclosed_coin_secrets;
+
+  /**
+   * The data from the original age-withdraw.  Will be retrieved from
+   * the DB via @a ach and @a reserve_pub.
+   */
+  struct TALER_EXCHANGEDB_AgeWithdraw commitment;
+};
+
+
+/**
+ * Parse the json body of an '/age-withdraw/$ACH/reveal' request.  It extracts
+ * the denomination hashes, blinded coins and disclosed coins and allocates
+ * memory for those.
+ *
+ * @param connection The MHD connection to handle
+ * @param j_disclosed_coin_secrets The n*(kappa-1) disclosed coins' private keys in JSON format, from which all other attributes (age restriction, blinding, nonce) will be derived from
+ * @param[out] actx The context of the operation, only partially built at call time
+ * @param[out] mhd_ret The result if a reply is queued for MHD
+ * @return true on success, false on failure, with a reply already queued for MHD.
+ */
+static enum GNUNET_GenericReturnValue
+parse_age_withdraw_reveal_json (
+  struct MHD_Connection *connection,
+  const json_t *j_disclosed_coin_secrets,
+  struct AgeRevealContext *actx,
+  MHD_RESULT *mhd_ret)
+{
+  enum GNUNET_GenericReturnValue result = GNUNET_SYSERR;
+  size_t num_entries;
+
+  /* Verify JSON-structure consistency */
+  {
+    const char *error = NULL;
+
+    num_entries = json_array_size (j_disclosed_coin_secrets); /* 0, if not an array */
+
+    if (! json_is_array (j_disclosed_coin_secrets))
+      error = "disclosed_coin_secrets must be an array";
+    else if (num_entries == 0)
+      error = "disclosed_coin_secrets must not be empty";
+    else if (num_entries > TALER_MAX_FRESH_COINS)
+      error = "maximum number of coins that can be withdrawn has been exceeded";
+
+    if (NULL != error)
+    {
+      *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                          TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                          error);
+      return GNUNET_SYSERR;
+    }
+
+    actx->num_secrets = num_entries * (TALER_CNC_KAPPA - 1);
+    actx->num_coins = num_entries;
+
+  }
+
+  /* Continue parsing the parts */
+  {
+    unsigned int idx = 0;
+    unsigned int k = 0;
+    json_t *array = NULL;
+    json_t *value = NULL;
+
+    /* Parse diclosed keys */
+    actx->disclosed_coin_secrets =
+      GNUNET_new_array (actx->num_secrets,
+                        struct TALER_PlanchetMasterSecretP);
+
+    json_array_foreach (j_disclosed_coin_secrets, idx, array) {
+      if (! json_is_array (array) ||
+          (TALER_CNC_KAPPA - 1 != json_array_size (array)))
+      {
+        char msg[256] = {0};
+        GNUNET_snprintf (msg,
+                         sizeof(msg),
+                         "couldn't parse entry no. %d in array disclosed_coin_secrets",
+                         idx + 1);
+        *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                            TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                            msg);
+        goto EXIT;
+
+      }
+
+      json_array_foreach (array, k, value)
+      {
+        struct TALER_PlanchetMasterSecretP *secret =
+          &actx->disclosed_coin_secrets[2 * idx + k];
+        struct GNUNET_JSON_Specification spec[] = {
+          GNUNET_JSON_spec_fixed_auto (NULL, secret),
+          GNUNET_JSON_spec_end ()
+        };
+
+        if (GNUNET_OK !=
+            GNUNET_JSON_parse (value, spec, NULL, NULL))
+        {
+          char msg[256] = {0};
+          GNUNET_snprintf (msg,
+                           sizeof(msg),
+                           "couldn't parse entry no. %d in array disclosed_coin_secrets[%d]",
+                           k + 1,
+                           idx + 1);
+          *mhd_ret = TALER_MHD_reply_with_ec (connection,
+                                              TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                              msg);
+          goto EXIT;
+        }
+      }
+    };
+  }
+
+  result = GNUNET_OK;
+
+EXIT:
+  return result;
+}
+
+
+/**
+ * Check if the request belongs to an existing age-withdraw request.
+ * If so, sets the commitment object with the request data.
+ * Otherwise, it queues an appropriate MHD response.
+ *
+ * @param connection The HTTP connection to the client
+ * @param h_commitment Original commitment value sent with the age-withdraw request
+ * @param reserve_pub Reserve public key used in the original age-withdraw request
+ * @param[out] commitment Data from the original age-withdraw request
+ * @param[out] result In the error cases, a response will be queued with MHD and this will be the result.
+ * @return #GNUNET_OK if the withdraw request has been found,
+ *   #GNUNET_SYSERR if we did not find the request in the DB
+ */
+static enum GNUNET_GenericReturnValue
+find_original_commitment (
+  struct MHD_Connection *connection,
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+  MHD_RESULT *result)
+{
+  enum GNUNET_DB_QueryStatus qs;
+
+  for (unsigned int try = 0; try < 3; try++)
+  {
+    qs = TEH_plugin->get_age_withdraw (TEH_plugin->cls,
+                                       reserve_pub,
+                                       h_commitment,
+                                       commitment);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      return GNUNET_OK; /* Only happy case */
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      *result = TALER_MHD_reply_with_error (connection,
+                                            MHD_HTTP_NOT_FOUND,
+                                            TALER_EC_EXCHANGE_AGE_WITHDRAW_COMMITMENT_UNKNOWN,
+                                            NULL);
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      *result = TALER_MHD_reply_with_ec (connection,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         "get_age_withdraw_info");
+      return GNUNET_SYSERR;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      break; /* try again */
+    default:
+      GNUNET_break (0);
+      *result = TALER_MHD_reply_with_ec (connection,
+                                         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                                         NULL);
+      return GNUNET_SYSERR;
+    }
+  }
+  /* after unsuccessful retries*/
+  *result = TALER_MHD_reply_with_ec (connection,
+                                     TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                     "get_age_withdraw_info");
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * @brief Derives a age-restricted planchet from a given secret and calculates the hash
+ *
+ * @param connection Connection to the client
+ * @param keys The denomination keys in memory
+ * @param secret The secret to a planchet
+ * @param denom_pub_h The hash of the denomination for the planchet
+ * @param max_age The maximum age allowed
+ * @param[out] bch Hashcode to write
+ * @param[out] result On error, a HTTP-response will be queued and result set accordingly
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise, with an error message
+ * written to the client and @e result set.
+ */
+static enum GNUNET_GenericReturnValue
+calculate_blinded_hash (
+  struct MHD_Connection *connection,
+  const struct TEH_KeyStateHandle *keys,
+  const struct TALER_PlanchetMasterSecretP *secret,
+  const struct TALER_DenominationHashP *denom_pub_h,
+  uint8_t max_age,
+  struct TALER_BlindedCoinHashP *bch,
+  MHD_RESULT *result)
+{
+  enum GNUNET_GenericReturnValue ret;
+  struct TEH_DenominationKey *denom_key;
+  struct TALER_AgeCommitmentHash ach;
+
+  /* First, retrieve denomination details */
+  denom_key = TEH_keys_denomination_by_hash_from_state (keys,
+                                                        denom_pub_h,
+                                                        connection,
+                                                        result);
+  if (NULL == denom_key)
+  {
+    GNUNET_break_op (0);
+    *result = TALER_MHD_reply_with_ec (connection,
+                                       TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                       NULL);
+    return GNUNET_SYSERR;
+  }
+
+  /* calculate age commitment hash */
+  {
+    struct TALER_AgeCommitmentProof acp;
+
+    TALER_age_restriction_from_secret (secret,
+                                       &denom_key->denom_pub.age_mask,
+                                       max_age,
+                                       &acp);
+    TALER_age_commitment_hash (&acp.commitment,
+                               &ach);
+    TALER_age_commitment_proof_free (&acp);
+  }
+
+  /* Next: calculate planchet */
+  {
+    struct TALER_CoinPubHashP c_hash;
+    struct TALER_PlanchetDetail detail = {0};
+    struct TALER_CoinSpendPrivateKeyP coin_priv;
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    struct GNUNET_CRYPTO_BlindingInputValues bi = {
+      .cipher = denom_key->denom_pub.bsign_pub_key->cipher
+    };
+    struct TALER_ExchangeWithdrawValues alg_values = {
+      .blinding_inputs = &bi
+    };
+    union GNUNET_CRYPTO_BlindSessionNonce nonce;
+    union GNUNET_CRYPTO_BlindSessionNonce *noncep = NULL;
+
+    // FIXME: add logic to denom.c to do this!
+    if (GNUNET_CRYPTO_BSA_CS == bi.cipher)
+    {
+      struct TEH_CsDeriveData cdd = {
+        .h_denom_pub = &denom_key->h_denom_pub,
+        .nonce = &nonce.cs_nonce,
+      };
+
+      TALER_cs_withdraw_nonce_derive (secret,
+                                      &nonce.cs_nonce);
+      noncep = &nonce;
+      GNUNET_assert (TALER_EC_NONE ==
+                     TEH_keys_denomination_cs_r_pub (
+                       &cdd,
+                       false,
+                       &bi.details.cs_values));
+    }
+    TALER_planchet_blinding_secret_create (secret,
+                                           &alg_values,
+                                           &bks);
+    TALER_planchet_setup_coin_priv (secret,
+                                    &alg_values,
+                                    &coin_priv);
+    ret = TALER_planchet_prepare (&denom_key->denom_pub,
+                                  &alg_values,
+                                  &bks,
+                                  noncep,
+                                  &coin_priv,
+                                  &ach,
+                                  &c_hash,
+                                  &detail);
+    if (GNUNET_OK != ret)
+    {
+      GNUNET_break (0);
+      *result = TALER_MHD_reply_json_pack (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           "{ss}",
+                                           "details",
+                                           "failed to prepare planchet from base key");
+      return ret;
+    }
+
+    TALER_coin_ev_hash (&detail.blinded_planchet,
+                        &denom_key->h_denom_pub,
+                        bch);
+    TALER_blinded_planchet_free (&detail.blinded_planchet);
+  }
+
+  return ret;
+}
+
+
+/**
+ * @brief Checks the validity of the disclosed coins as follows:
+ * - Derives and calculates the disclosed coins'
+ *    - public keys,
+ *    - nonces (if applicable),
+ *    - age commitments,
+ *    - blindings
+ *    - blinded hashes
+ * - Computes h_commitment with those calculated and the undisclosed hashes
+ * - Compares h_commitment with the value from the original commitment
+ * - Verifies that all public keys in indices larger than the age group
+ *   corresponding to max_age are derived from the constant public key.
+ *
+ * The derivation of the blindings, (potential) nonces and age-commitment from
+ * a coin's private keys is defined in
+ * https://docs.taler.net/design-documents/024-age-restriction.html#withdraw
+ *
+ * @param connection HTTP-connection to the client
+ * @param commitment Original commitment
+ * @param disclosed_coin_secrets The secrets of the disclosed coins, (TALER_CNC_KAPPA - 1)*num_coins many
+ * @param num_coins number of coins to reveal via @a disclosed_coin_secrets
+ * @param[out] result On error, a HTTP-response will be queued and result set accordingly
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+static enum GNUNET_GenericReturnValue
+verify_commitment_and_max_age (
+  struct MHD_Connection *connection,
+  const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+  const struct TALER_PlanchetMasterSecretP *disclosed_coin_secrets,
+  uint32_t num_coins,
+  MHD_RESULT *result)
+{
+  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+  struct GNUNET_HashContext *hash_context;
+  struct TEH_KeyStateHandle *keys;
+
+  if (num_coins != commitment->num_coins)
+  {
+    GNUNET_break_op (0);
+    *result = TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_BAD_REQUEST,
+                                          TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                          "#coins");
+    return GNUNET_SYSERR;
+  }
+
+  /* We need the current keys in memory for the meta-data of the denominations */
+  keys = TEH_keys_get_state ();
+  if (NULL == keys)
+  {
+    *result = TALER_MHD_reply_with_ec (connection,
+                                       TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                       NULL);
+    return GNUNET_SYSERR;
+  }
+
+  hash_context = GNUNET_CRYPTO_hash_context_start ();
+
+  for (size_t coin_idx = 0; coin_idx < num_coins; coin_idx++)
+  {
+    size_t i = 0; /* either 0 or 1, to index into coin_evs */
+
+    for (size_t k = 0; k<TALER_CNC_KAPPA; k++)
+    {
+      if (k == (size_t) commitment->noreveal_index)
+      {
+        GNUNET_CRYPTO_hash_context_read (hash_context,
+                                         &commitment->h_coin_evs[coin_idx],
+                                         sizeof(commitment->h_coin_evs[coin_idx]));
+      }
+      else
+      {
+        /* j is the index into disclosed_coin_secrets[] */
+        size_t j = (TALER_CNC_KAPPA - 1) * coin_idx + i;
+        const struct TALER_PlanchetMasterSecretP *secret;
+        struct TALER_BlindedCoinHashP bch;
+
+        GNUNET_assert (2>i);
+        GNUNET_assert ((TALER_CNC_KAPPA - 1) * num_coins  > j);
+
+        secret = &disclosed_coin_secrets[j];
+        i++;
+
+        ret = calculate_blinded_hash (connection,
+                                      keys,
+                                      secret,
+                                      &commitment->denom_pub_hashes[coin_idx],
+                                      commitment->max_age,
+                                      &bch,
+                                      result);
+
+        if (GNUNET_OK != ret)
+        {
+          GNUNET_CRYPTO_hash_context_abort (hash_context);
+          return GNUNET_SYSERR;
+        }
+
+        /* Continue the running hash of all coin hashes with the calculated
+         * hash-value of the current, disclosed coin */
+        GNUNET_CRYPTO_hash_context_read (hash_context,
+                                         &bch,
+                                         sizeof(bch));
+      }
+    }
+  }
+
+  /* Finally, compare the calculated hash with the original commitment */
+  {
+    struct GNUNET_HashCode calc_hash;
+    GNUNET_CRYPTO_hash_context_finish (hash_context,
+                                       &calc_hash);
+
+    if (0 != GNUNET_CRYPTO_hash_cmp (&commitment->h_commitment.hash,
+                                     &calc_hash))
+    {
+      GNUNET_break_op (0);
+      *result = TALER_MHD_reply_with_ec (connection,
+                                         TALER_EC_EXCHANGE_AGE_WITHDRAW_REVEAL_INVALID_HASH,
+                                         NULL);
+      return GNUNET_SYSERR;
+    }
+
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * @brief Send a response for "/age-withdraw/$RCH/reveal"
+ *
+ * @param connection The http connection to the client to send the response to
+ * @param commitment The data from the commitment with signatures
+ * @return a MHD result code
+ */
+static MHD_RESULT
+reply_age_withdraw_reveal_success (
+  struct MHD_Connection *connection,
+  const struct TALER_EXCHANGEDB_AgeWithdraw *commitment)
+{
+  json_t *list = json_array ();
+  GNUNET_assert (NULL != list);
+
+  for (unsigned int i = 0; i < commitment->num_coins; i++)
+  {
+    json_t *obj = GNUNET_JSON_PACK (
+      TALER_JSON_pack_blinded_denom_sig (NULL,
+                                         &commitment->denom_sigs[i]));
+    GNUNET_assert (0 ==
+                   json_array_append_new (list,
+                                          obj));
+  }
+
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_array_steal ("ev_sigs",
+                                  list));
+}
+
+
+MHD_RESULT
+TEH_handler_age_withdraw_reveal (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AgeWithdrawCommitmentHashP *ach,
+  const json_t *root)
+{
+  MHD_RESULT result = MHD_NO;
+  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+  struct AgeRevealContext actx = {0};
+  const json_t *j_disclosed_coin_secrets;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                 &actx.reserve_pub),
+    GNUNET_JSON_spec_array_const ("disclosed_coin_secrets",
+                                  &j_disclosed_coin_secrets),
+    GNUNET_JSON_spec_end ()
+  };
+
+  actx.ach = *ach;
+
+  /* Parse JSON body*/
+  ret = TALER_MHD_parse_json_data (rc->connection,
+                                   root,
+                                   spec);
+  if (GNUNET_OK != ret)
+  {
+    GNUNET_break_op (0);
+    return (GNUNET_SYSERR == ret) ? MHD_NO : MHD_YES;
+  }
+
+
+  do {
+    /* Extract denominations, blinded and disclosed coins */
+    if (GNUNET_OK !=
+        parse_age_withdraw_reveal_json (
+          rc->connection,
+          j_disclosed_coin_secrets,
+          &actx,
+          &result))
+      break;
+
+    /* Find original commitment */
+    if (GNUNET_OK !=
+        find_original_commitment (
+          rc->connection,
+          &actx.ach,
+          &actx.reserve_pub,
+          &actx.commitment,
+          &result))
+      break;
+
+    /* Verify the computed h_commitment equals the committed one and that coins
+     * have a maximum age group corresponding max_age (age-mask dependent) */
+    if (GNUNET_OK !=
+        verify_commitment_and_max_age (
+          rc->connection,
+          &actx.commitment,
+          actx.disclosed_coin_secrets,
+          actx.num_coins,
+          &result))
+      break;
+
+    /* Finally, return the signatures */
+    result = reply_age_withdraw_reveal_success (rc->connection,
+                                                &actx.commitment);
+
+  } while (0);
+
+  GNUNET_JSON_parse_free (spec);
+  if (NULL != actx.commitment.denom_sigs)
+    for (unsigned int i = 0; i<actx.num_coins; i++)
+      TALER_blinded_denom_sig_free (&actx.commitment.denom_sigs[i]);
+  GNUNET_free (actx.commitment.denom_sigs);
+  GNUNET_free (actx.commitment.denom_pub_hashes);
+  GNUNET_free (actx.commitment.denom_serials);
+  GNUNET_free (actx.disclosed_coin_secrets);
+  return result;
+}
+
+
+/* end of taler-exchange-httpd_age-withdraw_reveal.c */
diff --git a/src/exchange/taler-exchange-httpd_age-withdraw_reveal.h b/src/exchange/taler-exchange-httpd_age-withdraw_reveal.h
new file mode 100644
index 000000000..f7b813fe7
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_age-withdraw_reveal.h
@@ -0,0 +1,56 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_age-withdraw_reveal.h
+ * @brief Handle /age-withdraw/$ACH/reveal requests
+ * @author Özgür Kesim
+ */
+#ifndef TALER_EXCHANGE_HTTPD_AGE_WITHDRAW_REVEAL_H
+#define TALER_EXCHANGE_HTTPD_AGE_WITHDRAW_REVEAL_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Handle a "/age-withdraw/$ACH/reveal" request.
+ *
+ * The client got a noreveal_index in response to a previous request
+ * /reserve/$RESERVE_PUB/age-withdraw.  It now has to reveal all n*(kappa-1)
+ * coin's private keys (except for the noreveal_index), from which all other
+ * coin-relevant data (blinding, age restriction, nonce) is derived from.
+ *
+ * The exchange computes those values, ensures that the maximum age is
+ * correctly applied, calculates the hash of the blinded envelopes, and -
+ * together with the non-disclosed blinded envelopes - compares the hash of
+ * those against the original commitment $ACH.
+ *
+ * If all those checks and the used denominations turn out to be correct, the
+ * exchange signs all blinded envelopes with their appropriate denomination
+ * keys.
+ *
+ * @param rc request context
+ * @param root uploaded JSON data
+ * @param ach commitment to the age restricted coints from the age-withdraw request
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_age_withdraw_reveal (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AgeWithdrawCommitmentHashP *ach,
+  const json_t *root);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_aml-decision-get.c b/src/exchange/taler-exchange-httpd_aml-decision-get.c
new file mode 100644
index 000000000..b4f337db1
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_aml-decision-get.c
@@ -0,0 +1,233 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_aml-decision-get.c
+ * @brief Return summary information about AML decision
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler-exchange-httpd_aml-decision.h"
+#include "taler-exchange-httpd_metrics.h"
+
+
+/**
+ * Maximum number of records we return per request.
+ */
+#define MAX_RECORDS 1024
+
+/**
+ * Callback with KYC attributes about a particular user.
+ *
+ * @param[in,out] cls closure with a `json_t *` array to update
+ * @param h_payto account for which the attribute data is stored
+ * @param provider_section provider that must be checked
+ * @param collection_time when was the data collected
+ * @param expiration_time when does the data expire
+ * @param enc_attributes_size number of bytes in @a enc_attributes
+ * @param enc_attributes encrypted attribute data
+ */
+static void
+kyc_attribute_cb (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  struct GNUNET_TIME_Timestamp collection_time,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  size_t enc_attributes_size,
+  const void *enc_attributes)
+{
+  json_t *kyc_attributes = cls;
+  json_t *attributes;
+
+  attributes = TALER_CRYPTO_kyc_attributes_decrypt (&TEH_attribute_key,
+                                                    enc_attributes,
+                                                    enc_attributes_size);
+  GNUNET_break (NULL != attributes);
+  GNUNET_assert (
+    0 ==
+    json_array_append (
+      kyc_attributes,
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("provider_section",
+                                 provider_section),
+        GNUNET_JSON_pack_timestamp ("collection_time",
+                                    collection_time),
+        GNUNET_JSON_pack_timestamp ("expiration_time",
+                                    expiration_time),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_steal ("attributes",
+                                         attributes))
+        )));
+}
+
+
+/**
+ * Return historic AML decision(s).
+ *
+ * @param[in,out] cls closure with a `json_t *` array to update
+ * @param new_threshold new monthly threshold that would trigger an AML check
+ * @param new_state AML decision status
+ * @param decision_time when was the decision made
+ * @param justification human-readable text justifying the decision
+ * @param decider_pub public key of the staff member
+ * @param decider_sig signature of the staff member
+ */
+static void
+aml_history_cb (
+  void *cls,
+  const struct TALER_Amount *new_threshold,
+  enum TALER_AmlDecisionState new_state,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const char *justification,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_AmlOfficerSignatureP *decider_sig)
+{
+  json_t *aml_history = cls;
+
+  GNUNET_assert (
+    0 ==
+    json_array_append (
+      aml_history,
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_auto ("decider_pub",
+                                    decider_pub),
+        GNUNET_JSON_pack_string ("justification",
+                                 justification),
+        TALER_JSON_pack_amount ("new_threshold",
+                                new_threshold),
+        GNUNET_JSON_pack_int64 ("new_state",
+                                new_state),
+        GNUNET_JSON_pack_timestamp ("decision_time",
+                                    decision_time)
+        )));
+}
+
+
+MHD_RESULT
+TEH_handler_aml_decision_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *const args[])
+{
+  struct TALER_PaytoHashP h_payto;
+
+  if ( (NULL == args[0]) ||
+       (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[0],
+                                       strlen (args[0]),
+                                       &h_payto,
+                                       sizeof (h_payto))) )
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       "h_payto");
+  }
+
+  if (NULL != args[1])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       args[1]);
+  }
+
+  {
+    json_t *aml_history;
+    json_t *kyc_attributes;
+    enum GNUNET_DB_QueryStatus qs;
+    bool none = false;
+
+    aml_history = json_array ();
+    GNUNET_assert (NULL != aml_history);
+    qs = TEH_plugin->select_aml_history (TEH_plugin->cls,
+                                         &h_payto,
+                                         &aml_history_cb,
+                                         aml_history);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      json_decref (aml_history);
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      none = true;
+      break;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      none = false;
+      break;
+    }
+
+    kyc_attributes = json_array ();
+    GNUNET_assert (NULL != kyc_attributes);
+    qs = TEH_plugin->select_kyc_attributes (TEH_plugin->cls,
+                                            &h_payto,
+                                            &kyc_attribute_cb,
+                                            kyc_attributes);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      json_decref (aml_history);
+      json_decref (kyc_attributes);
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      if (none)
+      {
+        json_decref (aml_history);
+        json_decref (kyc_attributes);
+        return TALER_MHD_reply_static (
+          rc->connection,
+          MHD_HTTP_NO_CONTENT,
+          NULL,
+          NULL,
+          0);
+      }
+      break;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      break;
+    }
+    return TALER_MHD_REPLY_JSON_PACK (
+      rc->connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_array_steal ("aml_history",
+                                    aml_history),
+      GNUNET_JSON_pack_array_steal ("kyc_attributes",
+                                    kyc_attributes));
+  }
+}
+
+
+/* end of taler-exchange-httpd_aml-decision_get.c */
diff --git a/src/exchange/taler-exchange-httpd_aml-decision.c b/src/exchange/taler-exchange-httpd_aml-decision.c
new file mode 100644
index 000000000..bf43fdbf2
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_aml-decision.c
@@ -0,0 +1,358 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_aml-decision.c
+ * @brief Handle request about an AML decision.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Closure for #make_aml_decision()
+ */
+struct DecisionContext
+{
+  /**
+   * Justification given for the decision.
+   */
+  const char *justification;
+
+  /**
+   * When was the decision taken.
+   */
+  struct GNUNET_TIME_Timestamp decision_time;
+
+  /**
+   * New threshold for revising the decision.
+   */
+  struct TALER_Amount new_threshold;
+
+  /**
+   * Hash of payto://-URI of affected account.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * New AML state.
+   */
+  enum TALER_AmlDecisionState new_state;
+
+  /**
+   * Signature affirming the decision.
+   */
+  struct TALER_AmlOfficerSignatureP officer_sig;
+
+  /**
+   * Public key of the AML officer.
+   */
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub;
+
+  /**
+   * KYC requirements imposed, NULL for none.
+   */
+  const json_t *kyc_requirements;
+
+};
+
+
+/**
+ * Function implementing AML decision database transaction.
+ *
+ * Runs the transaction logic; IF it returns a non-error code, the
+ * transaction logic MUST NOT queue a MHD response.  IF it returns an hard
+ * error, the transaction logic MUST queue a MHD response and set @a mhd_ret.
+ * IF it returns the soft error code, the function MAY be called again to
+ * retry and MUST not queue a MHD response.
+ *
+ * @param cls closure with a `struct DecisionContext`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+make_aml_decision (void *cls,
+                   struct MHD_Connection *connection,
+                   MHD_RESULT *mhd_ret)
+{
+  struct DecisionContext *dc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_TIME_Timestamp last_date;
+  bool invalid_officer;
+  uint64_t requirement_row = 0;
+
+  if ( (NULL != dc->kyc_requirements) &&
+       (0 != json_array_size (dc->kyc_requirements)) )
+  {
+    char *res = NULL;
+    size_t idx;
+    json_t *req;
+    bool satisfied;
+
+    json_array_foreach (dc->kyc_requirements, idx, req)
+    {
+      const char *r = json_string_value (req);
+
+      if (NULL == res)
+      {
+        res = GNUNET_strdup (r);
+      }
+      else
+      {
+        char *tmp;
+
+        GNUNET_asprintf (&tmp,
+                         "%s %s",
+                         res,
+                         r);
+        GNUNET_free (res);
+        res = tmp;
+      }
+    }
+
+    {
+      json_t *kyc_details = NULL;
+
+      qs = TALER_KYCLOGIC_check_satisfied (
+        &res,
+        &dc->h_payto,
+        &kyc_details,
+        TEH_plugin->select_satisfied_kyc_processes,
+        TEH_plugin->cls,
+        &satisfied);
+      json_decref (kyc_details);
+    }
+    if (qs < 0)
+    {
+      if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
+      {
+        GNUNET_break (0);
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "select_satisfied_kyc_processes");
+        return GNUNET_DB_STATUS_HARD_ERROR;
+      }
+      return qs;
+    }
+    if (! satisfied)
+    {
+      qs = TEH_plugin->insert_kyc_requirement_for_account (
+        TEH_plugin->cls,
+        res,
+        &dc->h_payto,
+        NULL, /* not a reserve */
+        &requirement_row);
+      if (qs < 0)
+      {
+        if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
+        {
+          GNUNET_break (0);
+          *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                                 MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                                 TALER_EC_GENERIC_DB_STORE_FAILED,
+                                                 "insert_kyc_requirement_for_account");
+          return GNUNET_DB_STATUS_HARD_ERROR;
+        }
+        return qs;
+      }
+    }
+    GNUNET_free (res);
+  }
+
+  qs = TEH_plugin->insert_aml_decision (TEH_plugin->cls,
+                                        &dc->h_payto,
+                                        &dc->new_threshold,
+                                        dc->new_state,
+                                        dc->decision_time,
+                                        dc->justification,
+                                        dc->kyc_requirements,
+                                        requirement_row,
+                                        dc->officer_pub,
+                                        &dc->officer_sig,
+                                        &invalid_officer,
+                                        &last_date);
+  if (qs <= 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
+    {
+      GNUNET_break (0);
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_GENERIC_DB_STORE_FAILED,
+                                             "insert_aml_decision");
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    return qs;
+  }
+  if (invalid_officer)
+  {
+    GNUNET_break_op (0);
+    *mhd_ret = TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_AML_DECISION_INVALID_OFFICER,
+      NULL);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  if (GNUNET_TIME_timestamp_cmp (last_date,
+                                 >=,
+                                 dc->decision_time))
+  {
+    GNUNET_break_op (0);
+    *mhd_ret = TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_CONFLICT,
+      TALER_EC_EXCHANGE_AML_DECISION_MORE_RECENT_PRESENT,
+      NULL);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+MHD_RESULT
+TEH_handler_post_aml_decision (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const json_t *root)
+{
+  struct MHD_Connection *connection = rc->connection;
+  struct DecisionContext dc = {
+    .officer_pub = officer_pub
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("officer_sig",
+                                 &dc.officer_sig),
+    GNUNET_JSON_spec_fixed_auto ("h_payto",
+                                 &dc.h_payto),
+    TALER_JSON_spec_amount ("new_threshold",
+                            TEH_currency,
+                            &dc.new_threshold),
+    GNUNET_JSON_spec_string ("justification",
+                             &dc.justification),
+    GNUNET_JSON_spec_timestamp ("decision_time",
+                                &dc.decision_time),
+    TALER_JSON_spec_aml_decision ("new_state",
+                                  &dc.new_state),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_array_const ("kyc_requirements",
+                                    &dc.kyc_requirements),
+      NULL),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+      return MHD_NO; /* hard failure */
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      return MHD_YES; /* failure */
+    }
+  }
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_officer_aml_decision_verify (dc.justification,
+                                         dc.decision_time,
+                                         &dc.new_threshold,
+                                         &dc.h_payto,
+                                         dc.new_state,
+                                         dc.kyc_requirements,
+                                         dc.officer_pub,
+                                         &dc.officer_sig))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_AML_DECISION_ADD_SIGNATURE_INVALID,
+      NULL);
+  }
+
+  if (NULL != dc.kyc_requirements)
+  {
+    size_t index;
+    json_t *elem;
+
+    json_array_foreach (dc.kyc_requirements, index, elem)
+    {
+      const char *val;
+
+      if (! json_is_string (elem))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_BAD_REQUEST,
+          TALER_EC_GENERIC_PARAMETER_MALFORMED,
+          "kyc_requirements array members must be strings");
+      }
+      val = json_string_value (elem);
+      if (GNUNET_SYSERR ==
+          TALER_KYCLOGIC_check_satisfiable (val))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (
+          connection,
+          MHD_HTTP_BAD_REQUEST,
+          TALER_EC_EXCHANGE_AML_DECISION_UNKNOWN_CHECK,
+          val);
+      }
+    }
+  }
+
+  {
+    MHD_RESULT mhd_ret;
+
+    if (GNUNET_OK !=
+        TEH_DB_run_transaction (connection,
+                                "make-aml-decision",
+                                TEH_MT_REQUEST_OTHER,
+                                &mhd_ret,
+                                &make_aml_decision,
+                                &dc))
+    {
+      return mhd_ret;
+    }
+  }
+  return TALER_MHD_reply_static (
+    connection,
+    MHD_HTTP_NO_CONTENT,
+    NULL,
+    NULL,
+    0);
+}
+
+
+/* end of taler-exchange-httpd_aml-decision.c */
diff --git a/src/exchange/taler-exchange-httpd_aml-decision.h b/src/exchange/taler-exchange-httpd_aml-decision.h
new file mode 100644
index 000000000..8af742c0a
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_aml-decision.h
@@ -0,0 +1,79 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_aml-decision.h
+ * @brief Handle /aml/$OFFICER_PUB/decision requests
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_AML_DECISION_H
+#define TALER_EXCHANGE_HTTPD_AML_DECISION_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Handle a POST "/aml/$OFFICER_PUB/decision" request.  Parses the decision
+ * details, checks the signatures and if appropriately authorized executes
+ * the decision.
+ *
+ * @param rc request context
+ * @param officer_pub public key of the AML officer who made the request
+ * @param root uploaded JSON data
+ * @return MHD result code
+  */
+MHD_RESULT
+TEH_handler_post_aml_decision (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const json_t *root);
+
+
+/**
+ * Handle a GET "/aml/$OFFICER_PUB/decisions/$STATE" request.  Parses the request
+ * details, checks the signatures and if appropriately authorized returns
+ * the matching decisions.
+ *
+ * @param rc request context
+ * @param officer_pub public key of the AML officer who made the request
+ * @param args GET arguments (should be the state)
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_aml_decisions_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *const args[]);
+
+
+/**
+ * Handle a GET "/aml/$OFFICER_PUB/decision/$H_PAYTO" request.  Parses the request
+ * details, checks the signatures and if appropriately authorized returns
+ * the AML history and KYC attributes for the account.
+ *
+ * @param rc request context
+ * @param officer_pub public key of the AML officer who made the request
+ * @param args GET arguments (should be one)
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_aml_decision_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *const args[]);
+
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_aml-decisions-get.c b/src/exchange/taler-exchange-httpd_aml-decisions-get.c
new file mode 100644
index 000000000..763817cf6
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_aml-decisions-get.c
@@ -0,0 +1,215 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_aml-decisions-get.c
+ * @brief Return summary information about AML decisions
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler-exchange-httpd_aml-decision.h"
+#include "taler-exchange-httpd_metrics.h"
+
+
+/**
+ * Maximum number of records we return per request.
+ */
+#define MAX_RECORDS 1024
+
+/**
+ * Return AML status.
+ *
+ * @param cls closure
+ * @param row_id current row in AML status table
+ * @param h_payto account for which the attribute data is stored
+ * @param threshold currently monthly threshold that would trigger an AML check
+ * @param status what is the current AML decision
+ */
+static void
+record_cb (
+  void *cls,
+  uint64_t row_id,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *threshold,
+  enum TALER_AmlDecisionState status)
+{
+  json_t *records = cls;
+
+  GNUNET_assert (
+    0 ==
+    json_array_append (
+      records,
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_auto ("h_payto",
+                                    h_payto),
+        GNUNET_JSON_pack_int64 ("current_state",
+                                status),
+        TALER_JSON_pack_amount ("threshold",
+                                threshold),
+        GNUNET_JSON_pack_int64 ("rowid",
+                                row_id)
+        )));
+}
+
+
+MHD_RESULT
+TEH_handler_aml_decisions_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *const args[])
+{
+  enum TALER_AmlDecisionState decision;
+  int delta = -20;
+  unsigned long long start;
+  const char *state_str = args[0];
+
+  if (NULL == state_str)
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       args[0]);
+  }
+  if (0 == strcmp (state_str,
+                   "pending"))
+    decision = TALER_AML_PENDING;
+  else if (0 == strcmp (state_str,
+                        "frozen"))
+    decision = TALER_AML_FROZEN;
+  else if (0 == strcmp (state_str,
+                        "normal"))
+    decision = TALER_AML_NORMAL;
+  else
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       state_str);
+  }
+  if (NULL != args[1])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       args[1]);
+  }
+
+  {
+    const char *p;
+
+    p = MHD_lookup_connection_value (rc->connection,
+                                     MHD_GET_ARGUMENT_KIND,
+                                     "delta");
+    if (NULL != p)
+    {
+      char dummy;
+
+      if (1 != sscanf (p,
+                       "%d%c",
+                       &delta,
+                       &dummy))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "delta");
+      }
+    }
+    if (delta > 0)
+      start = 0;
+    else
+      start = INT64_MAX;
+    p = MHD_lookup_connection_value (rc->connection,
+                                     MHD_GET_ARGUMENT_KIND,
+                                     "start");
+    if (NULL != p)
+    {
+      char dummy;
+
+      if (1 != sscanf (p,
+                       "%llu%c",
+                       &start,
+                       &dummy))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "start");
+      }
+    }
+  }
+
+  {
+    json_t *records;
+    enum GNUNET_DB_QueryStatus qs;
+
+    records = json_array ();
+    GNUNET_assert (NULL != records);
+    if (INT_MIN == delta)
+      delta = INT_MIN + 1;
+    qs = TEH_plugin->select_aml_process (TEH_plugin->cls,
+                                         decision,
+                                         start,
+                                         GNUNET_MIN (MAX_RECORDS,
+                                                     delta > 0
+                                                     ? delta
+                                                     : -delta),
+                                         delta > 0,
+                                         &record_cb,
+                                         records);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      json_decref (records);
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      return TALER_MHD_reply_static (
+        rc->connection,
+        MHD_HTTP_NO_CONTENT,
+        NULL,
+        NULL,
+        0);
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      break;
+    }
+    return TALER_MHD_REPLY_JSON_PACK (
+      rc->connection,
+      MHD_HTTP_OK,
+      GNUNET_JSON_pack_array_steal ("records",
+                                    records));
+  }
+}
+
+
+/* end of taler-exchange-httpd_aml-decisions_get.c */
diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c
new file mode 100644
index 000000000..84f27dd94
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_batch-deposit.c
@@ -0,0 +1,738 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_batch-deposit.c
+ * @brief Handle /batch-deposit requests; parses the POST and JSON and
+ *        verifies the coin signatures before handing things off
+ *        to the database.
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_extensions_policy.h"
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_batch-deposit.h"
+#include "taler-exchange-httpd_responses.h"
+#include "taler_exchangedb_lib.h"
+#include "taler-exchange-httpd_keys.h"
+
+
+/**
+ * Closure for #batch_deposit_transaction.
+ */
+struct BatchDepositContext
+{
+
+  /**
+   * Array with the individual coin deposit fees.
+   */
+  struct TALER_Amount *deposit_fees;
+
+  /**
+   * Our timestamp (when we received the request).
+   * Possibly updated by the transaction if the
+   * request is idempotent (was repeated).
+   */
+  struct GNUNET_TIME_Timestamp exchange_timestamp;
+
+  /**
+   * Details about the batch deposit operation.
+   */
+  struct TALER_EXCHANGEDB_BatchDeposit bd;
+
+
+  /**
+   * Total amount that is accumulated with this deposit,
+   * without fee.
+   */
+  struct TALER_Amount accumulated_total_without_fee;
+
+  /**
+   * True, if no policy was present in the request. Then
+   * @e policy_json is NULL and @e h_policy will be all zero.
+   */
+  bool has_no_policy;
+
+  /**
+   * Additional details for policy extension relevant for this
+   * deposit operation, possibly NULL!
+   */
+  json_t *policy_json;
+
+  /**
+   * If @e policy_json was present, the corresponding policy extension
+   * calculates these details.  These will be persisted in the policy_details
+   * table.
+   */
+  struct TALER_PolicyDetails policy_details;
+
+  /**
+   * Hash over @e policy_details, might be all zero
+   */
+  struct TALER_ExtensionPolicyHashP h_policy;
+
+  /**
+   * Hash over the merchant's payto://-URI with the wire salt.
+   */
+  struct TALER_MerchantWireHashP h_wire;
+
+  /**
+   * When @e policy_details are persisted, this contains the id of the record
+   * in the policy_details table.
+   */
+  uint64_t policy_details_serial_id;
+
+};
+
+
+/**
+ * Send confirmation of batch deposit success to client.  This function will
+ * create a signed message affirming the given information and return it to
+ * the client.  By this, the exchange affirms that the coins had sufficient
+ * (residual) value for the specified transaction and that it will execute the
+ * requested batch deposit operation with the given wiring details.
+ *
+ * @param connection connection to the client
+ * @param dc information about the batch deposit
+ * @return MHD result code
+ */
+static MHD_RESULT
+reply_batch_deposit_success (
+  struct MHD_Connection *connection,
+  const struct BatchDepositContext *dc)
+{
+  const struct TALER_EXCHANGEDB_BatchDeposit *bd = &dc->bd;
+  const struct TALER_CoinSpendSignatureP *csigs[GNUNET_NZL (bd->num_cdis)];
+  enum TALER_ErrorCode ec;
+  struct TALER_ExchangePublicKeyP pub;
+  struct TALER_ExchangeSignatureP sig;
+
+  for (unsigned int i = 0; i<bd->num_cdis; i++)
+    csigs[i] = &bd->cdis[i].csig;
+  if (TALER_EC_NONE !=
+      (ec = TALER_exchange_online_deposit_confirmation_sign (
+         &TEH_keys_exchange_sign_,
+         &bd->h_contract_terms,
+         &dc->h_wire,
+         dc->has_no_policy ? NULL : &dc->h_policy,
+         dc->exchange_timestamp,
+         bd->wire_deadline,
+         bd->refund_deadline,
+         &dc->accumulated_total_without_fee,
+         bd->num_cdis,
+         csigs,
+         &dc->bd.merchant_pub,
+         &pub,
+         &sig)))
+  {
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_ec (connection,
+                                    ec,
+                                    NULL);
+  }
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
+                                dc->exchange_timestamp),
+    GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                &pub),
+    GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                &sig));
+}
+
+
+/**
+ * Execute database transaction for /batch-deposit.  Runs the transaction
+ * logic; IF it returns a non-error code, the transaction logic MUST
+ * NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF
+ * it returns the soft error code, the function MAY be called again to
+ * retry and MUST not queue a MHD response.
+ *
+ * @param cls a `struct BatchDepositContext`
+ * @param connection MHD request context
+ * @param[out] mhd_ret set to MHD status on error
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+batch_deposit_transaction (void *cls,
+                           struct MHD_Connection *connection,
+                           MHD_RESULT *mhd_ret)
+{
+  struct BatchDepositContext *dc = cls;
+  const struct TALER_EXCHANGEDB_BatchDeposit *bd = &dc->bd;
+  enum GNUNET_DB_QueryStatus qs = GNUNET_DB_STATUS_HARD_ERROR;
+  uint32_t bad_balance_coin_index = UINT32_MAX;
+  bool balance_ok;
+  bool in_conflict;
+
+  /* If the deposit has a policy associated to it, persist it.  This will
+   * insert or update the record. */
+  if (! dc->has_no_policy)
+  {
+    qs = TEH_plugin->persist_policy_details (
+      TEH_plugin->cls,
+      &dc->policy_details,
+      &dc->bd.policy_details_serial_id,
+      &dc->accumulated_total_without_fee,
+      &dc->policy_details.fulfillment_state);
+    if (qs < 0)
+      return qs;
+
+    dc->bd.policy_blocked =
+      dc->policy_details.fulfillment_state != TALER_PolicyFulfillmentSuccess;
+  }
+
+  /* FIXME: replace by batch insert! */
+  for (unsigned int i = 0; i<bd->num_cdis; i++)
+  {
+    const struct TALER_EXCHANGEDB_CoinDepositInformation *cdi
+      = &bd->cdis[i];
+    uint64_t known_coin_id;
+
+    qs = TEH_make_coin_known (&cdi->coin,
+                              connection,
+                              &known_coin_id,
+                              mhd_ret);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "make coin known (%s) returned %d\n",
+                TALER_B2S (&cdi->coin.coin_pub),
+                qs);
+    if (qs < 0)
+      return qs;
+  }
+
+  qs = TEH_plugin->do_deposit (
+    TEH_plugin->cls,
+    bd,
+    &dc->exchange_timestamp,
+    &balance_ok,
+    &bad_balance_coin_index,
+    &in_conflict);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    TALER_LOG_WARNING (
+      "Failed to store /batch-deposit information in database\n");
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_GENERIC_DB_STORE_FAILED,
+                                           "batch-deposit");
+    return qs;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "do_deposit returned: %d / %s[%u] / %s\n",
+              qs,
+              balance_ok ? "balance ok" : "balance insufficient",
+              (unsigned int) bad_balance_coin_index,
+              in_conflict ? "in conflict" : "no conflict");
+  if (in_conflict)
+  {
+    struct TALER_MerchantWireHashP h_wire;
+
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+        TEH_plugin->get_wire_hash_for_contract (
+          TEH_plugin->cls,
+          &bd->merchant_pub,
+          &bd->h_contract_terms,
+          &h_wire))
+    {
+      TALER_LOG_WARNING (
+        "Failed to retrieve conflicting contract details from database\n");
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_GENERIC_DB_STORE_FAILED,
+                                             "batch-deposit");
+      return qs;
+    }
+
+    *mhd_ret
+      = TEH_RESPONSE_reply_coin_conflicting_contract (
+          connection,
+          TALER_EC_EXCHANGE_DEPOSIT_CONFLICTING_CONTRACT,
+          &h_wire);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  if (! balance_ok)
+  {
+    GNUNET_assert (bad_balance_coin_index < bd->num_cdis);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "returning history of conflicting coin (%s)\n",
+                TALER_B2S (&bd->cdis[bad_balance_coin_index].coin.coin_pub));
+    *mhd_ret
+      = TEH_RESPONSE_reply_coin_insufficient_funds (
+          connection,
+          TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+          &bd->cdis[bad_balance_coin_index].coin.denom_pub_hash,
+          &bd->cdis[bad_balance_coin_index].coin.coin_pub);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  TEH_METRICS_num_success[TEH_MT_SUCCESS_DEPOSIT]++;
+  return qs;
+}
+
+
+/**
+ * Parse per-coin deposit information from @a jcoin
+ * into @a deposit. Fill in generic information from
+ * @a ctx.
+ *
+ * @param connection connection we are handling
+ * @param dc information about the overall batch
+ * @param jcoin coin data to parse
+ * @param[out] cdi where to store the result
+ * @param[out] deposit_fee where to write the deposit fee
+ * @return #GNUNET_OK on success, #GNUNET_NO if an error was returned,
+ *         #GNUNET_SYSERR on failure and no error could be returned
+ */
+static enum GNUNET_GenericReturnValue
+parse_coin (struct MHD_Connection *connection,
+            const struct BatchDepositContext *dc,
+            json_t *jcoin,
+            struct TALER_EXCHANGEDB_CoinDepositInformation *cdi,
+            struct TALER_Amount *deposit_fee)
+{
+  const struct TALER_EXCHANGEDB_BatchDeposit *bd = &dc->bd;
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount ("contribution",
+                            TEH_currency,
+                            &cdi->amount_with_fee),
+    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
+                                 &cdi->coin.denom_pub_hash),
+    TALER_JSON_spec_denom_sig ("ub_sig",
+                               &cdi->coin.denom_sig),
+    GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                 &cdi->coin.coin_pub),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
+                                   &cdi->coin.h_age_commitment),
+      &cdi->coin.no_age_commitment),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &cdi->csig),
+    GNUNET_JSON_spec_end ()
+  };
+  enum GNUNET_GenericReturnValue res;
+
+  if (GNUNET_OK !=
+      (res = TALER_MHD_parse_json_data (connection,
+                                        jcoin,
+                                        spec)))
+    return res;
+  /* check denomination exists and is valid */
+  {
+    struct TEH_DenominationKey *dk;
+    MHD_RESULT mret;
+
+    dk = TEH_keys_denomination_by_hash (&cdi->coin.denom_pub_hash,
+                                        connection,
+                                        &mret);
+    if (NULL == dk)
+    {
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES == mret)
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+    if (0 > TALER_amount_cmp (&dk->meta.value,
+                              &cdi->amount_with_fee))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_BAD_REQUEST,
+                                          TALER_EC_EXCHANGE_GENERIC_AMOUNT_EXCEEDS_DENOMINATION_VALUE,
+                                          NULL))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
+    {
+      /* This denomination is past the expiration time for deposits */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &cdi->coin.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
+                "DEPOSIT"))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
+    {
+      /* This denomination is not yet valid */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &cdi->coin.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
+                "DEPOSIT"))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+    if (dk->recoup_possible)
+    {
+      /* This denomination has been revoked */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &cdi->coin.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
+                "DEPOSIT"))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+    if (dk->denom_pub.bsign_pub_key->cipher !=
+        cdi->coin.denom_sig.unblinded_sig->cipher)
+    {
+      /* denomination cipher and denomination signature cipher not the same */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_BAD_REQUEST,
+                                          TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
+                                          NULL))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+
+    *deposit_fee = dk->meta.fees.deposit;
+    /* check coin signature */
+    switch (dk->denom_pub.bsign_pub_key->cipher)
+    {
+    case GNUNET_CRYPTO_BSA_RSA:
+      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
+      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
+      break;
+    default:
+      break;
+    }
+    if (GNUNET_YES !=
+        TALER_test_coin_valid (&cdi->coin,
+                               &dk->denom_pub))
+    {
+      TALER_LOG_WARNING ("Invalid coin passed for /batch-deposit\n");
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_FORBIDDEN,
+                                          TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
+                                          NULL))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+    }
+  }
+  if (0 < TALER_amount_cmp (deposit_fee,
+                            &cdi->amount_with_fee))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
+                                        NULL))
+        ? GNUNET_NO
+        : GNUNET_SYSERR;
+  }
+
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_wallet_deposit_verify (
+        &cdi->amount_with_fee,
+        deposit_fee,
+        &dc->h_wire,
+        &bd->h_contract_terms,
+        &bd->wallet_data_hash,
+        cdi->coin.no_age_commitment
+        ? NULL
+        : &cdi->coin.h_age_commitment,
+        NULL != dc->policy_json ? &dc->h_policy : NULL,
+        &cdi->coin.denom_pub_hash,
+        bd->wallet_timestamp,
+        &bd->merchant_pub,
+        bd->refund_deadline,
+        &cdi->coin.coin_pub,
+        &cdi->csig))
+  {
+    TALER_LOG_WARNING ("Invalid signature on /batch-deposit request\n");
+    GNUNET_JSON_parse_free (spec);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_FORBIDDEN,
+                                        TALER_EC_EXCHANGE_DEPOSIT_COIN_SIGNATURE_INVALID,
+                                        TALER_B2S (&cdi->coin.coin_pub)))
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+MHD_RESULT
+TEH_handler_batch_deposit (struct TEH_RequestContext *rc,
+                           const json_t *root,
+                           const char *const args[])
+{
+  struct MHD_Connection *connection = rc->connection;
+  struct BatchDepositContext dc = { 0 };
+  struct TALER_EXCHANGEDB_BatchDeposit *bd = &dc.bd;
+  const json_t *coins;
+  bool no_refund_deadline = true;
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_payto_uri ("merchant_payto_uri",
+                               &bd->receiver_wire_account),
+    GNUNET_JSON_spec_fixed_auto ("wire_salt",
+                                 &bd->wire_salt),
+    GNUNET_JSON_spec_fixed_auto ("merchant_pub",
+                                 &bd->merchant_pub),
+    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
+                                 &bd->h_contract_terms),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("wallet_data_hash",
+                                   &bd->wallet_data_hash),
+      &bd->no_wallet_data_hash),
+    GNUNET_JSON_spec_array_const ("coins",
+                                  &coins),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_json ("policy",
+                             &dc.policy_json),
+      &dc.has_no_policy),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &bd->wallet_timestamp),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_timestamp ("refund_deadline",
+                                  &bd->refund_deadline),
+      &no_refund_deadline),
+    GNUNET_JSON_spec_timestamp ("wire_transfer_deadline",
+                                &bd->wire_deadline),
+    GNUNET_JSON_spec_end ()
+  };
+
+  (void) args;
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_break (0);
+      return MHD_NO; /* hard failure */
+    }
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      return MHD_YES; /* failure */
+    }
+  }
+
+  /* validate merchant's wire details (as far as we can) */
+  {
+    char *emsg;
+
+    emsg = TALER_payto_validate (bd->receiver_wire_account);
+    if (NULL != emsg)
+    {
+      MHD_RESULT ret;
+
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      ret = TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        emsg);
+      GNUNET_free (emsg);
+      return ret;
+    }
+  }
+  if (GNUNET_TIME_timestamp_cmp (bd->refund_deadline,
+                                 >,
+                                 bd->wire_deadline))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE,
+                                       NULL);
+  }
+  if (GNUNET_TIME_absolute_is_never (bd->wire_deadline.abs_time))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_DEPOSIT_WIRE_DEADLINE_IS_NEVER,
+                                       NULL);
+  }
+  TALER_payto_hash (bd->receiver_wire_account,
+                    &bd->wire_target_h_payto);
+  TALER_merchant_wire_signature_hash (bd->receiver_wire_account,
+                                      &bd->wire_salt,
+                                      &dc.h_wire);
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &dc.accumulated_total_without_fee));
+
+  /* handle policy, if present */
+  if (! dc.has_no_policy)
+  {
+    const char *error_hint = NULL;
+
+    if (GNUNET_OK !=
+        TALER_extensions_create_policy_details (
+          TEH_currency,
+          dc.policy_json,
+          &dc.policy_details,
+          &error_hint))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSITS_POLICY_NOT_ACCEPTED,
+                                         error_hint);
+    }
+
+    TALER_deposit_policy_hash (dc.policy_json,
+                               &dc.h_policy);
+  }
+
+  bd->num_cdis = json_array_size (coins);
+  if (0 == bd->num_cdis)
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       "coins");
+  }
+  if (TALER_MAX_FRESH_COINS < bd->num_cdis)
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       "coins");
+  }
+
+  {
+    struct TALER_EXCHANGEDB_CoinDepositInformation cdis[
+      GNUNET_NZL (bd->num_cdis)];
+    struct TALER_Amount deposit_fees[GNUNET_NZL (bd->num_cdis)];
+    enum GNUNET_GenericReturnValue res;
+    unsigned int i;
+
+    bd->cdis = cdis;
+    dc.deposit_fees = deposit_fees;
+    for (i = 0; i<bd->num_cdis; i++)
+    {
+      struct TALER_Amount amount_without_fee;
+
+      res = parse_coin (connection,
+                        &dc,
+                        json_array_get (coins,
+                                        i),
+                        &cdis[i],
+                        &deposit_fees[i]);
+      if (GNUNET_OK != res)
+        break;
+      GNUNET_assert (0 <=
+                     TALER_amount_subtract (
+                       &amount_without_fee,
+                       &cdis[i].amount_with_fee,
+                       &deposit_fees[i]));
+
+      GNUNET_assert (0 <=
+                     TALER_amount_add (
+                       &dc.accumulated_total_without_fee,
+                       &dc.accumulated_total_without_fee,
+                       &amount_without_fee));
+    }
+    if (GNUNET_OK != res)
+    {
+      for (unsigned int j = 0; j<i; j++)
+        TALER_denom_sig_free (&cdis[j].coin.denom_sig);
+      GNUNET_JSON_parse_free (spec);
+      return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
+    }
+
+    dc.exchange_timestamp = GNUNET_TIME_timestamp_get ();
+    if (GNUNET_SYSERR ==
+        TEH_plugin->preflight (TEH_plugin->cls))
+    {
+      GNUNET_break (0);
+      GNUNET_JSON_parse_free (spec);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_START_FAILED,
+                                         "preflight failure");
+    }
+
+    /* execute transaction */
+    {
+      MHD_RESULT mhd_ret;
+
+      if (GNUNET_OK !=
+          TEH_DB_run_transaction (connection,
+                                  "execute batch deposit",
+                                  TEH_MT_REQUEST_BATCH_DEPOSIT,
+                                  &mhd_ret,
+                                  &batch_deposit_transaction,
+                                  &dc))
+      {
+        for (unsigned int j = 0; j<bd->num_cdis; j++)
+          TALER_denom_sig_free (&cdis[j].coin.denom_sig);
+        GNUNET_JSON_parse_free (spec);
+        return mhd_ret;
+      }
+    }
+
+    /* generate regular response */
+    {
+      MHD_RESULT mhd_ret;
+
+      mhd_ret = reply_batch_deposit_success (connection,
+                                             &dc);
+      for (unsigned int j = 0; j<bd->num_cdis; j++)
+        TALER_denom_sig_free (&cdis[j].coin.denom_sig);
+      GNUNET_JSON_parse_free (spec);
+      return mhd_ret;
+    }
+  }
+}
+
+
+/* end of taler-exchange-httpd_batch-deposit.c */
diff --git a/src/exchange/taler-exchange-httpd_deposit.h b/src/exchange/taler-exchange-httpd_batch-deposit.h
index a4d598a69..187fb9f20 100644
--- a/src/exchange/taler-exchange-httpd_deposit.h
+++ b/src/exchange/taler-exchange-httpd_batch-deposit.h
@@ -14,14 +14,14 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-exchange-httpd_deposit.h
- * @brief Handle /deposit requests
+ * @file taler-exchange-httpd_batch-deposit.h
+ * @brief Handle /batch-deposit requests
  * @author Florian Dold
  * @author Benedikt Mueller
  * @author Christian Grothoff
  */
-#ifndef TALER_EXCHANGE_HTTPD_DEPOSIT_H
-#define TALER_EXCHANGE_HTTPD_DEPOSIT_H
+#ifndef TALER_EXCHANGE_HTTPD_BATCH_DEPOSIT_H
+#define TALER_EXCHANGE_HTTPD_BATCH_DEPOSIT_H
 
 #include <gnunet/gnunet_util_lib.h>
 #include <microhttpd.h>
@@ -29,21 +29,21 @@
 
 
 /**
- * Handle a "/coins/$COIN_PUB/deposit" request.  Parses the JSON, and, if
+ * Handle a "/batch-deposit" request.  Parses the JSON, and, if
  * successful, passes the JSON data to #deposit_transaction() to
  * further check the details of the operation specified.  If everything checks
- * out, this will ultimately lead to the "/deposit" being executed, or
+ * out, this will ultimately lead to the "/batch-deposit" being executed, or
  * rejected.
  *
- * @param connection the MHD connection to handle
- * @param coin_pub public key of the coin
+ * @param rc request context
  * @param root uploaded JSON data
+ * @param args arguments, empty in this case
  * @return MHD result code
   */
 MHD_RESULT
-TEH_handler_deposit (struct MHD_Connection *connection,
-                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                     const json_t *root);
+TEH_handler_batch_deposit (struct TEH_RequestContext *rc,
+                           const json_t *root,
+                           const char *const args[]);
 
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_batch-withdraw.c b/src/exchange/taler-exchange-httpd_batch-withdraw.c
index e58548af7..2b80c2fc4 100644
--- a/src/exchange/taler-exchange-httpd_batch-withdraw.c
+++ b/src/exchange/taler-exchange-httpd_batch-withdraw.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as
@@ -26,11 +26,14 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
+#include "taler-exchange-httpd.h"
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_batch-withdraw.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler-exchange-httpd_keys.h"
+#include "taler_util.h"
 
 
 /**
@@ -72,11 +75,16 @@ struct BatchWithdrawContext
 {
 
   /**
-   * Public key of the reserv.
+   * Public key of the reserve.
    */
   const struct TALER_ReservePublicKeyP *reserve_pub;
 
   /**
+   * request context
+   */
+  const struct TEH_RequestContext *rc;
+
+  /**
    * KYC status of the reserve used for the operation.
    */
   struct TALER_EXCHANGEDB_KycStatus kyc;
@@ -87,6 +95,17 @@ struct BatchWithdrawContext
   struct PlanchetContext *planchets;
 
   /**
+   * Hash of the payto-URI representing the reserve
+   * from which we are withdrawing.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Current time for the DB transaction.
+   */
+  struct GNUNET_TIME_Timestamp now;
+
+  /**
    * Total amount from all coins with fees.
    */
   struct TALER_Amount batch_total;
@@ -96,10 +115,175 @@ struct BatchWithdrawContext
    */
   unsigned int planchets_length;
 
+  /**
+   * AML decision, #TALER_AML_NORMAL if we may proceed.
+   */
+  enum TALER_AmlDecisionState aml_decision;
+
 };
 
 
 /**
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param cls closure, identifies the event type and
+ *        account to iterate over events for
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
+ */
+static void
+batch_withdraw_amount_cb (void *cls,
+                          struct GNUNET_TIME_Absolute limit,
+                          TALER_EXCHANGEDB_KycAmountCallback cb,
+                          void *cb_cls)
+{
+  struct BatchWithdrawContext *wc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  if (GNUNET_OK !=
+      cb (cb_cls,
+          &wc->batch_total,
+          wc->now.abs_time))
+    return;
+  qs = TEH_plugin->select_withdraw_amounts_for_kyc_check (
+    TEH_plugin->cls,
+    &wc->h_payto,
+    limit,
+    cb,
+    cb_cls);
+  GNUNET_break (qs >= 0);
+}
+
+
+/**
+ * Function called on each @a amount that was found to
+ * be relevant for the AML check as it was merged into
+ * the reserve.
+ *
+ * @param cls `struct TALER_Amount *` to total up the amounts
+ * @param amount encountered transaction amount
+ * @param date when was the amount encountered
+ * @return #GNUNET_OK to continue to iterate,
+ *         #GNUNET_NO to abort iteration
+ *         #GNUNET_SYSERR on internal error (also abort itaration)
+ */
+static enum GNUNET_GenericReturnValue
+aml_amount_cb (
+  void *cls,
+  const struct TALER_Amount *amount,
+  struct GNUNET_TIME_Absolute date)
+{
+  struct TALER_Amount *total = cls;
+
+  GNUNET_assert (0 <=
+                 TALER_amount_add (total,
+                                   total,
+                                   amount));
+  return GNUNET_OK;
+}
+
+
+/**
+ * Generates our final (successful) response.
+ *
+ * @param rc request context
+ * @param wc operation context
+ * @return MHD queue status
+ */
+static MHD_RESULT
+generate_reply_success (const struct TEH_RequestContext *rc,
+                        const struct BatchWithdrawContext *wc)
+{
+  json_t *sigs;
+
+  if (! wc->kyc.ok)
+  {
+    /* KYC required */
+    return TEH_RESPONSE_reply_kyc_required (rc->connection,
+                                            &wc->h_payto,
+                                            &wc->kyc);
+  }
+  if (TALER_AML_NORMAL != wc->aml_decision)
+    return TEH_RESPONSE_reply_aml_blocked (rc->connection,
+                                           wc->aml_decision);
+
+  sigs = json_array ();
+  GNUNET_assert (NULL != sigs);
+  for (unsigned int i = 0; i<wc->planchets_length; i++)
+  {
+    struct PlanchetContext *pc = &wc->planchets[i];
+
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        sigs,
+        GNUNET_JSON_PACK (
+          TALER_JSON_pack_blinded_denom_sig (
+            "ev_sig",
+            &pc->collectable.sig))));
+  }
+  TEH_METRICS_batch_withdraw_num_coins += wc->planchets_length;
+  return TALER_MHD_REPLY_JSON_PACK (
+    rc->connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_array_steal ("ev_sigs",
+                                  sigs));
+}
+
+
+/**
+ * Check if the @a wc is replayed and we already have an
+ * answer. If so, replay the existing answer and return the
+ * HTTP response.
+ *
+ * @param wc parsed request data
+ * @param[out] mret HTTP status, set if we return true
+ * @return true if the request is idempotent with an existing request
+ *    false if we did not find the request in the DB and did not set @a mret
+ */
+static bool
+check_request_idempotent (const struct BatchWithdrawContext *wc,
+                          MHD_RESULT *mret)
+{
+  const struct TEH_RequestContext *rc = wc->rc;
+
+  for (unsigned int i = 0; i<wc->planchets_length; i++)
+  {
+    struct PlanchetContext *pc = &wc->planchets[i];
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->get_withdraw_info (TEH_plugin->cls,
+                                        &pc->h_coin_envelope,
+                                        &pc->collectable);
+    if (0 > qs)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mret = TALER_MHD_reply_with_error (rc->connection,
+                                            MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                            "get_withdraw_info");
+      return true; /* well, kind-of */
+    }
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+      return false;
+  }
+  /* generate idempotent reply */
+  TEH_METRICS_num_requests[TEH_MT_REQUEST_IDEMPOTENT_BATCH_WITHDRAW]++;
+  *mret = generate_reply_success (rc,
+                                  wc);
+  return true;
+}
+
+
+/**
  * Function implementing withdraw transaction.  Runs the
  * transaction logic; IF it returns a non-error code, the transaction
  * logic MUST NOT queue a MHD response.  IF it returns an hard error,
@@ -122,114 +306,254 @@ batch_withdraw_transaction (void *cls,
                             MHD_RESULT *mhd_ret)
 {
   struct BatchWithdrawContext *wc = cls;
-  struct GNUNET_TIME_Timestamp now;
   uint64_t ruuid;
   enum GNUNET_DB_QueryStatus qs;
-  bool balance_ok = false;
   bool found = false;
+  bool balance_ok = false;
+  bool age_ok = false;
+  uint16_t allowed_maximum_age = 0;
+  struct TALER_Amount reserve_balance;
+  char *kyc_required;
+  struct TALER_PaytoHashP reserve_h_payto;
+
+  wc->now = GNUNET_TIME_timestamp_get ();
+  /* Do AML check: compute total merged amount and check
+     against applicable AML threshold */
+  {
+    char *reserve_payto;
+
+    reserve_payto = TALER_reserve_make_payto (TEH_base_url,
+                                              wc->reserve_pub);
+    TALER_payto_hash (reserve_payto,
+                      &reserve_h_payto);
+    GNUNET_free (reserve_payto);
+  }
+  {
+    struct TALER_Amount merge_amount;
+    struct TALER_Amount threshold;
+    struct GNUNET_TIME_Absolute now_minus_one_month;
+
+    now_minus_one_month
+      = GNUNET_TIME_absolute_subtract (wc->now.abs_time,
+                                       GNUNET_TIME_UNIT_MONTHS);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &merge_amount));
+    qs = TEH_plugin->select_merge_amounts_for_kyc_check (TEH_plugin->cls,
+                                                         &reserve_h_payto,
+                                                         now_minus_one_month,
+                                                         &aml_amount_cb,
+                                                         &merge_amount);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "select_merge_amounts_for_kyc_check");
+      return qs;
+    }
+    qs = TEH_plugin->select_aml_threshold (TEH_plugin->cls,
+                                           &reserve_h_payto,
+                                           &wc->aml_decision,
+                                           &wc->kyc,
+                                           &threshold);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "select_aml_threshold");
+      return qs;
+    }
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    {
+      threshold = TEH_aml_threshold; /* use default */
+      wc->aml_decision = TALER_AML_NORMAL;
+    }
+
+    switch (wc->aml_decision)
+    {
+    case TALER_AML_NORMAL:
+      if (0 >= TALER_amount_cmp (&merge_amount,
+                                 &threshold))
+      {
+        /* merge_amount <= threshold, continue withdraw below */
+        break;
+      }
+      wc->aml_decision = TALER_AML_PENDING;
+      qs = TEH_plugin->trigger_aml_process (TEH_plugin->cls,
+                                            &reserve_h_payto,
+                                            &merge_amount);
+      if (qs <= 0)
+      {
+        GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+        if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+          *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                                 MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                                 TALER_EC_GENERIC_DB_STORE_FAILED,
+                                                 "trigger_aml_process");
+        return qs;
+      }
+      return qs;
+    case TALER_AML_PENDING:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "AML already pending, doing nothing\n");
+      return qs;
+    case TALER_AML_FROZEN:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Account frozen, doing nothing\n");
+      return qs;
+    }
+  }
+
+  /* Check if the money came from a wire transfer */
+  qs = TEH_plugin->reserves_get_origin (TEH_plugin->cls,
+                                        wc->reserve_pub,
+                                        &wc->h_payto);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                             "reserves_get_origin");
+    return qs;
+  }
+  /* If no results, reserve was created by merge, in which case no KYC check
+     is required as the merge already did that. */
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    qs = TALER_KYCLOGIC_kyc_test_required (
+      TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW,
+      &wc->h_payto,
+      TEH_plugin->select_satisfied_kyc_processes,
+      TEH_plugin->cls,
+      &batch_withdraw_amount_cb,
+      wc,
+      &kyc_required);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "kyc_test_required");
+      return qs;
+    }
+    if (NULL != kyc_required)
+    {
+      /* insert KYC requirement into DB! */
+      wc->kyc.ok = false;
+      qs = TEH_plugin->insert_kyc_requirement_for_account (
+        TEH_plugin->cls,
+        kyc_required,
+        &wc->h_payto,
+        wc->reserve_pub,
+        &wc->kyc.requirement_row);
+      GNUNET_free (kyc_required);
+      if (qs < 0)
+      {
+        GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+        if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+          *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                                 MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                                 TALER_EC_GENERIC_DB_STORE_FAILED,
+                                                 "insert_kyc_requirement_for_account");
+      }
+      return qs;
+    }
+  }
+  wc->kyc.ok = true;
 
-  now = GNUNET_TIME_timestamp_get ();
   qs = TEH_plugin->do_batch_withdraw (TEH_plugin->cls,
-                                      now,
+                                      wc->now,
                                       wc->reserve_pub,
                                       &wc->batch_total,
+                                      TEH_age_restriction_enabled,
                                       &found,
                                       &balance_ok,
-                                      &wc->kyc,
+                                      &reserve_balance,
+                                      &age_ok,
+                                      &allowed_maximum_age,
                                       &ruuid);
   if (0 > qs)
   {
     if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+    {
+      GNUNET_break (0);
       *mhd_ret = TALER_MHD_reply_with_error (connection,
                                              MHD_HTTP_INTERNAL_SERVER_ERROR,
                                              TALER_EC_GENERIC_DB_FETCH_FAILED,
                                              "update_reserve_batch_withdraw");
+    }
     return qs;
   }
   if (! found)
   {
     *mhd_ret = TALER_MHD_reply_with_error (connection,
                                            MHD_HTTP_NOT_FOUND,
-                                           TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN,
+                                           TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
                                            NULL);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
-  if (! balance_ok)
+
+  if (! age_ok)
   {
+    /* We respond with the lowest age in the corresponding age group
+     * of the required age */
+    uint16_t lowest_age = TALER_get_lowest_age (
+      &TEH_age_restriction_config.mask,
+      allowed_maximum_age);
+
     TEH_plugin->rollback (TEH_plugin->cls);
-    *mhd_ret = TEH_RESPONSE_reply_reserve_insufficient_balance (
+    *mhd_ret = TEH_RESPONSE_reply_reserve_age_restriction_required (
       connection,
-      &wc->batch_total,
-      wc->reserve_pub);
+      lowest_age);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
 
-  if ( (TEH_KYC_NONE != TEH_kyc_config.mode) &&
-       (! wc->kyc.ok) &&
-       (TALER_EXCHANGEDB_KYC_W2W == wc->kyc.type) )
+  if (! balance_ok)
   {
-    /* Wallet-to-wallet payments _always_ require KYC */
-    *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
+    TEH_plugin->rollback (TEH_plugin->cls);
+    *mhd_ret = TEH_RESPONSE_reply_reserve_insufficient_balance (
       connection,
-      MHD_HTTP_ACCEPTED,
-      GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                               wc->kyc.payment_target_uuid));
+      TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS,
+      &reserve_balance,
+      &wc->batch_total,
+      wc->reserve_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
-  if ( (TEH_KYC_NONE != TEH_kyc_config.mode) &&
-       (! wc->kyc.ok) &&
-       (TALER_EXCHANGEDB_KYC_WITHDRAW == wc->kyc.type) &&
-       (! GNUNET_TIME_relative_is_zero (TEH_kyc_config.withdraw_period)) )
-  {
-    /* Withdraws require KYC if above threshold */
-    enum GNUNET_DB_QueryStatus qs2;
-    bool below_limit;
-
-    qs2 = TEH_plugin->do_withdraw_limit_check (
-      TEH_plugin->cls,
-      ruuid,
-      GNUNET_TIME_absolute_subtract (now.abs_time,
-                                     TEH_kyc_config.withdraw_period),
-      &TEH_kyc_config.withdraw_limit,
-      &below_limit);
-    if (0 > qs2)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs2);
-      if (GNUNET_DB_STATUS_HARD_ERROR == qs2)
-        *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                               "do_withdraw_limit_check");
-      return qs2;
-    }
-    if (! below_limit)
-    {
-      *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
-        connection,
-        MHD_HTTP_ACCEPTED,
-        GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                                 wc->kyc.payment_target_uuid));
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
 
   /* Add information about each planchet in the batch */
   for (unsigned int i = 0; i<wc->planchets_length; i++)
   {
     struct PlanchetContext *pc = &wc->planchets[i];
     const struct TALER_BlindedPlanchet *bp = &pc->blinded_planchet;
-    const struct TALER_CsNonce *nonce;
+    const union GNUNET_CRYPTO_BlindSessionNonce *nonce = NULL;
     bool denom_unknown = true;
     bool conflict = true;
     bool nonce_reuse = true;
 
-    nonce = (TALER_DENOMINATION_CS == bp->cipher)
-            ? &bp->details.cs_blinded_planchet.nonce
-            : NULL;
+    switch (bp->blinded_message->cipher)
+    {
+    case GNUNET_CRYPTO_BSA_INVALID:
+      break;
+    case GNUNET_CRYPTO_BSA_RSA:
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
+      nonce = (const union GNUNET_CRYPTO_BlindSessionNonce *)
+              &bp->blinded_message->details.cs_blinded_message.nonce;
+      break;
+    }
     qs = TEH_plugin->do_batch_withdraw_insert (TEH_plugin->cls,
                                                nonce,
                                                &pc->collectable,
-                                               now,
+                                               wc->now,
                                                ruuid,
                                                &denom_unknown,
                                                &conflict,
@@ -240,7 +564,7 @@ batch_withdraw_transaction (void *cls,
         *mhd_ret = TALER_MHD_reply_with_error (connection,
                                                MHD_HTTP_INTERNAL_SERVER_ERROR,
                                                TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                               "do_withdraw");
+                                               "do_batch_withdraw_insert");
       return qs;
     }
     if (denom_unknown)
@@ -255,12 +579,18 @@ batch_withdraw_transaction (void *cls,
     if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs) ||
          (conflict) )
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Idempotent coin in batch, not allowed. Aborting.\n");
-      *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_CONFLICT,
-                                             TALER_EC_EXCHANGE_WITHDRAW_BATCH_IDEMPOTENT_PLANCHET,
-                                             NULL);
+      if (! check_request_idempotent (wc,
+                                      mhd_ret))
+      {
+        /* We do not support *some* of the coins of the request being
+           idempotent while others being fresh. */
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Idempotent coin in batch, not allowed. Aborting.\n");
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_CONFLICT,
+                                               TALER_EC_EXCHANGE_WITHDRAW_BATCH_IDEMPOTENT_PLANCHET,
+                                               NULL);
+      }
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
     if (nonce_reuse)
@@ -273,92 +603,12 @@ batch_withdraw_transaction (void *cls,
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
   }
+  TEH_METRICS_num_success[TEH_MT_SUCCESS_BATCH_WITHDRAW]++;
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
 
 
 /**
- * Generates our final (successful) response.
- *
- * @param rc request context
- * @param wc operation context
- * @return MHD queue status
- */
-static MHD_RESULT
-generate_reply_success (const struct TEH_RequestContext *rc,
-                        const struct BatchWithdrawContext *wc)
-{
-  json_t *sigs;
-
-  sigs = json_array ();
-  GNUNET_assert (NULL != sigs);
-  for (unsigned int i = 0; i<wc->planchets_length; i++)
-  {
-    struct PlanchetContext *pc = &wc->planchets[i];
-
-    GNUNET_assert (
-      0 ==
-      json_array_append_new (
-        sigs,
-        GNUNET_JSON_PACK (
-          TALER_JSON_pack_blinded_denom_sig (
-            "ev_sig",
-            &pc->collectable.sig))));
-  }
-  TEH_METRICS_batch_withdraw_num_coins += wc->planchets_length;
-  return TALER_MHD_REPLY_JSON_PACK (
-    rc->connection,
-    MHD_HTTP_OK,
-    GNUNET_JSON_pack_array_steal ("ev_sigs",
-                                  sigs));
-}
-
-
-/**
- * Check if the @a rc is replayed and we already have an
- * answer. If so, replay the existing answer and return the
- * HTTP response.
- *
- * @param rc request context
- * @param wc parsed request data
- * @param[out] mret HTTP status, set if we return true
- * @return true if the request is idempotent with an existing request
- *    false if we did not find the request in the DB and did not set @a mret
- */
-static bool
-check_request_idempotent (const struct TEH_RequestContext *rc,
-                          const struct BatchWithdrawContext *wc,
-                          MHD_RESULT *mret)
-{
-  for (unsigned int i = 0; i<wc->planchets_length; i++)
-  {
-    struct PlanchetContext *pc = &wc->planchets[i];
-    enum GNUNET_DB_QueryStatus qs;
-
-    qs = TEH_plugin->get_withdraw_info (TEH_plugin->cls,
-                                        &pc->h_coin_envelope,
-                                        &pc->collectable);
-    if (0 > qs)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-        *mret = TALER_MHD_reply_with_error (rc->connection,
-                                            MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                            "get_withdraw_info");
-      return true; /* well, kind-of */
-    }
-    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-      return false;
-  }
-  /* generate idempotent reply */
-  *mret = generate_reply_success (rc,
-                                  wc);
-  return true;
-}
-
-
-/**
  * The request was parsed successfully. Prepare
  * our side for the main DB transaction.
  *
@@ -370,20 +620,24 @@ static MHD_RESULT
 prepare_transaction (const struct TEH_RequestContext *rc,
                      struct BatchWithdrawContext *wc)
 {
-  /* Note: We could check the reserve balance here,
-     just to be reasonably sure that the reserve has
-     a sufficient balance before doing the "expensive"
-     signatures... */
-  /* Sign before transaction! */
+  struct TEH_CoinSignData csds[wc->planchets_length];
+  struct TALER_BlindedDenominationSignature bss[wc->planchets_length];
+
   for (unsigned int i = 0; i<wc->planchets_length; i++)
   {
     struct PlanchetContext *pc = &wc->planchets[i];
+
+    csds[i].h_denom_pub = &pc->collectable.denom_pub_hash;
+    csds[i].bp = &pc->blinded_planchet;
+  }
+  {
     enum TALER_ErrorCode ec;
 
-    ec = TEH_keys_denomination_sign_withdraw (
-      &pc->collectable.denom_pub_hash,
-      &pc->blinded_planchet,
-      &pc->collectable.sig);
+    ec = TEH_keys_denomination_batch_sign (
+      wc->planchets_length,
+      csds,
+      false,
+      bss);
     if (TALER_EC_NONE != ec)
     {
       GNUNET_break (0);
@@ -392,6 +646,12 @@ prepare_transaction (const struct TEH_RequestContext *rc,
                                       NULL);
     }
   }
+  for (unsigned int i = 0; i<wc->planchets_length; i++)
+  {
+    struct PlanchetContext *pc = &wc->planchets[i];
+
+    pc->collectable.sig = bss[i];
+  }
 
   /* run transaction */
   {
@@ -455,13 +715,27 @@ parse_planchets (const struct TEH_RequestContext *rc,
         return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
     }
     pc->collectable.reserve_pub = *wc->reserve_pub;
+    for (unsigned int k = 0; k<i; k++)
+    {
+      const struct PlanchetContext *kpc = &wc->planchets[k];
+
+      if (0 ==
+          TALER_blinded_planchet_cmp (&kpc->blinded_planchet,
+                                      &pc->blinded_planchet))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                           "duplicate planchet");
+      }
+    }
   }
 
   ksh = TEH_keys_get_state ();
   if (NULL == ksh)
   {
-    if (! check_request_idempotent (rc,
-                                    wc,
+    if (! check_request_idempotent (wc,
                                     &mret))
     {
       return TALER_MHD_reply_with_error (rc->connection,
@@ -476,14 +750,15 @@ parse_planchets (const struct TEH_RequestContext *rc,
     struct PlanchetContext *pc = &wc->planchets[i];
     struct TEH_DenominationKey *dk;
 
-    dk = TEH_keys_denomination_by_hash2 (ksh,
-                                         &pc->collectable.denom_pub_hash,
-                                         NULL,
-                                         NULL);
+    dk = TEH_keys_denomination_by_hash_from_state (
+      ksh,
+      &pc->collectable.denom_pub_hash,
+      NULL,
+      NULL);
+
     if (NULL == dk)
     {
-      if (! check_request_idempotent (rc,
-                                      wc,
+      if (! check_request_idempotent (wc,
                                       &mret))
       {
         return TEH_RESPONSE_reply_unknown_denom_pub_hash (
@@ -495,8 +770,7 @@ parse_planchets (const struct TEH_RequestContext *rc,
     if (GNUNET_TIME_absolute_is_past (dk->meta.expire_withdraw.abs_time))
     {
       /* This denomination is past the expiration time for withdraws */
-      if (! check_request_idempotent (rc,
-                                      wc,
+      if (! check_request_idempotent (wc,
                                       &mret))
       {
         return TEH_RESPONSE_reply_expired_denom_pub_hash (
@@ -520,8 +794,7 @@ parse_planchets (const struct TEH_RequestContext *rc,
     if (dk->recoup_possible)
     {
       /* This denomination has been revoked */
-      if (! check_request_idempotent (rc,
-                                      wc,
+      if (! check_request_idempotent (wc,
                                       &mret))
       {
         return TEH_RESPONSE_reply_expired_denom_pub_hash (
@@ -532,7 +805,8 @@ parse_planchets (const struct TEH_RequestContext *rc,
       }
       return mret;
     }
-    if (dk->denom_pub.cipher != pc->blinded_planchet.cipher)
+    if (dk->denom_pub.bsign_pub_key->cipher !=
+        pc->blinded_planchet.blinded_message->cipher)
     {
       /* denomination cipher and blinded planchet cipher not the same */
       GNUNET_break_op (0);
@@ -564,17 +838,10 @@ parse_planchets (const struct TEH_RequestContext *rc,
                                          NULL);
     }
 
-    if (GNUNET_OK !=
-        TALER_coin_ev_hash (&pc->blinded_planchet,
-                            &pc->collectable.denom_pub_hash,
-                            &pc->collectable.h_coin_envelope))
-    {
-      GNUNET_break (0);
-      return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
-                                         NULL);
-    }
+    TALER_coin_ev_hash (&pc->blinded_planchet,
+                        &pc->collectable.denom_pub_hash,
+                        &pc->collectable.h_coin_envelope);
+
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
     if (GNUNET_OK !=
         TALER_wallet_withdraw_verify (&pc->collectable.denom_pub_hash,
@@ -601,21 +868,20 @@ TEH_handler_batch_withdraw (struct TEH_RequestContext *rc,
                             const struct TALER_ReservePublicKeyP *reserve_pub,
                             const json_t *root)
 {
-  struct BatchWithdrawContext wc;
-  json_t *planchets;
+  struct BatchWithdrawContext wc = {
+    .reserve_pub = reserve_pub,
+    .rc = rc
+  };
+  const json_t *planchets;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("planchets",
-                           &planchets),
+    GNUNET_JSON_spec_array_const ("planchets",
+                                  &planchets),
     GNUNET_JSON_spec_end ()
   };
 
-  memset (&wc,
-          0,
-          sizeof (wc));
-  TALER_amount_set_zero (TEH_currency,
-                         &wc.batch_total);
-  wc.reserve_pub = reserve_pub;
-
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &wc.batch_total));
   {
     enum GNUNET_GenericReturnValue res;
 
@@ -625,20 +891,17 @@ TEH_handler_batch_withdraw (struct TEH_RequestContext *rc,
     if (GNUNET_OK != res)
       return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
   }
-  if ( (! json_is_array (planchets)) ||
-       (0 == json_array_size (planchets)) )
+  wc.planchets_length = json_array_size (planchets);
+  if (0 == wc.planchets_length)
   {
-    GNUNET_JSON_parse_free (spec);
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (rc->connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
                                        "planchets");
   }
-  wc.planchets_length = json_array_size (planchets);
   if (wc.planchets_length > TALER_MAX_FRESH_COINS)
   {
-    GNUNET_JSON_parse_free (spec);
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (rc->connection,
                                        MHD_HTTP_BAD_REQUEST,
@@ -664,7 +927,6 @@ TEH_handler_batch_withdraw (struct TEH_RequestContext *rc,
       TALER_blinded_planchet_free (&pc->blinded_planchet);
       TALER_blinded_denom_sig_free (&pc->collectable.sig);
     }
-    GNUNET_JSON_parse_free (spec);
     return ret;
   }
 }
diff --git a/src/exchange/taler-exchange-httpd_coins_get.c b/src/exchange/taler-exchange-httpd_coins_get.c
new file mode 100644
index 000000000..cd453275e
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_coins_get.c
@@ -0,0 +1,709 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_coins_get.c
+ * @brief Handle GET /coins/$COIN_PUB/history requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include "taler_dbevents.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_coins_get.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Add the headers we want to set for every response.
+ *
+ * @param cls the key state to use
+ * @param[in,out] response the response to modify
+ */
+static void
+add_response_headers (void *cls,
+                      struct MHD_Response *response)
+{
+  (void) cls;
+  TALER_MHD_add_global_headers (response);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (response,
+                                         MHD_HTTP_HEADER_CACHE_CONTROL,
+                                         "no-cache"));
+}
+
+
+/**
+ * Compile the transaction history of a coin into a JSON object.
+ *
+ * @param coin_pub public key of the coin
+ * @param tl transaction history to JSON-ify
+ * @return json representation of the @a rh, NULL on error
+ */
+static json_t *
+compile_transaction_history (
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_EXCHANGEDB_TransactionList *tl)
+{
+  json_t *history;
+
+  history = json_array ();
+  if (NULL == history)
+  {
+    GNUNET_break (0); /* out of memory!? */
+    return NULL;
+  }
+  for (const struct TALER_EXCHANGEDB_TransactionList *pos = tl;
+       NULL != pos;
+       pos = pos->next)
+  {
+    switch (pos->type)
+    {
+    case TALER_EXCHANGEDB_TT_DEPOSIT:
+      {
+        const struct TALER_EXCHANGEDB_DepositListEntry *deposit =
+          pos->details.deposit;
+        struct TALER_MerchantWireHashP h_wire;
+
+        TALER_merchant_wire_signature_hash (deposit->receiver_wire_account,
+                                            &deposit->wire_salt,
+                                            &h_wire);
+#if ENABLE_SANITY_CHECKS
+        /* internal sanity check before we hand out a bogus sig... */
+        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+        if (GNUNET_OK !=
+            TALER_wallet_deposit_verify (
+              &deposit->amount_with_fee,
+              &deposit->deposit_fee,
+              &h_wire,
+              &deposit->h_contract_terms,
+              deposit->no_wallet_data_hash
+              ? NULL
+              : &deposit->wallet_data_hash,
+              deposit->no_age_commitment
+              ? NULL
+              : &deposit->h_age_commitment,
+              &deposit->h_policy,
+              &deposit->h_denom_pub,
+              deposit->timestamp,
+              &deposit->merchant_pub,
+              deposit->refund_deadline,
+              coin_pub,
+              &deposit->csig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+#endif
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "DEPOSIT"),
+                TALER_JSON_pack_amount ("amount",
+                                        &deposit->amount_with_fee),
+                TALER_JSON_pack_amount ("deposit_fee",
+                                        &deposit->deposit_fee),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            deposit->timestamp),
+                GNUNET_JSON_pack_allow_null (
+                  GNUNET_JSON_pack_timestamp ("refund_deadline",
+                                              deposit->refund_deadline)),
+                GNUNET_JSON_pack_data_auto ("merchant_pub",
+                                            &deposit->merchant_pub),
+                GNUNET_JSON_pack_data_auto ("h_contract_terms",
+                                            &deposit->h_contract_terms),
+                GNUNET_JSON_pack_data_auto ("h_wire",
+                                            &h_wire),
+                GNUNET_JSON_pack_allow_null (
+                  deposit->no_age_commitment ?
+                  GNUNET_JSON_pack_string (
+                    "h_age_commitment", NULL) :
+                  GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                              &deposit->h_age_commitment)),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &deposit->csig))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        break;
+      }
+    case TALER_EXCHANGEDB_TT_MELT:
+      {
+        const struct TALER_EXCHANGEDB_MeltListEntry *melt =
+          pos->details.melt;
+        const struct TALER_AgeCommitmentHash *phac = NULL;
+
+#if ENABLE_SANITY_CHECKS
+        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+        if (GNUNET_OK !=
+            TALER_wallet_melt_verify (
+              &melt->amount_with_fee,
+              &melt->melt_fee,
+              &melt->rc,
+              &melt->h_denom_pub,
+              &melt->h_age_commitment,
+              coin_pub,
+              &melt->coin_sig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+#endif
+
+        /* Age restriction is optional.  We communicate a NULL value to
+         * JSON_PACK below */
+        if (! melt->no_age_commitment)
+          phac = &melt->h_age_commitment;
+
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "MELT"),
+                TALER_JSON_pack_amount ("amount",
+                                        &melt->amount_with_fee),
+                TALER_JSON_pack_amount ("melt_fee",
+                                        &melt->melt_fee),
+                GNUNET_JSON_pack_data_auto ("rc",
+                                            &melt->rc),
+                GNUNET_JSON_pack_allow_null (
+                  GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                              phac)),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &melt->coin_sig))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_TT_REFUND:
+      {
+        const struct TALER_EXCHANGEDB_RefundListEntry *refund =
+          pos->details.refund;
+        struct TALER_Amount value;
+
+#if ENABLE_SANITY_CHECKS
+        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+        if (GNUNET_OK !=
+            TALER_merchant_refund_verify (
+              coin_pub,
+              &refund->h_contract_terms,
+              refund->rtransaction_id,
+              &refund->refund_amount,
+              &refund->merchant_pub,
+              &refund->merchant_sig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+#endif
+        if (0 >
+            TALER_amount_subtract (&value,
+                                   &refund->refund_amount,
+                                   &refund->refund_fee))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "REFUND"),
+                TALER_JSON_pack_amount ("amount",
+                                        &value),
+                TALER_JSON_pack_amount ("refund_fee",
+                                        &refund->refund_fee),
+                GNUNET_JSON_pack_data_auto ("h_contract_terms",
+                                            &refund->h_contract_terms),
+                GNUNET_JSON_pack_data_auto ("merchant_pub",
+                                            &refund->merchant_pub),
+                GNUNET_JSON_pack_uint64 ("rtransaction_id",
+                                         refund->rtransaction_id),
+                GNUNET_JSON_pack_data_auto ("merchant_sig",
+                                            &refund->merchant_sig))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP:
+      {
+        struct TALER_EXCHANGEDB_RecoupRefreshListEntry *pr =
+          pos->details.old_coin_recoup;
+        struct TALER_ExchangePublicKeyP epub;
+        struct TALER_ExchangeSignatureP esig;
+
+        if (TALER_EC_NONE !=
+            TALER_exchange_online_confirm_recoup_refresh_sign (
+              &TEH_keys_exchange_sign_,
+              pr->timestamp,
+              &pr->value,
+              &pr->coin.coin_pub,
+              &pr->old_coin_pub,
+              &epub,
+              &esig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        /* NOTE: we could also provide coin_pub's coin_sig, denomination key hash and
+           the denomination key's RSA signature over coin_pub, but as the
+           wallet should really already have this information (and cannot
+           check or do anything with it anyway if it doesn't), it seems
+           strictly unnecessary. */
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "OLD-COIN-RECOUP"),
+                TALER_JSON_pack_amount ("amount",
+                                        &pr->value),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &esig),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &epub),
+                GNUNET_JSON_pack_data_auto ("coin_pub",
+                                            &pr->coin.coin_pub),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            pr->timestamp))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        break;
+      }
+    case TALER_EXCHANGEDB_TT_RECOUP:
+      {
+        const struct TALER_EXCHANGEDB_RecoupListEntry *recoup =
+          pos->details.recoup;
+        struct TALER_ExchangePublicKeyP epub;
+        struct TALER_ExchangeSignatureP esig;
+
+        if (TALER_EC_NONE !=
+            TALER_exchange_online_confirm_recoup_sign (
+              &TEH_keys_exchange_sign_,
+              recoup->timestamp,
+              &recoup->value,
+              coin_pub,
+              &recoup->reserve_pub,
+              &epub,
+              &esig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "RECOUP"),
+                TALER_JSON_pack_amount ("amount",
+                                        &recoup->value),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &esig),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &epub),
+                GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                            &recoup->reserve_pub),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &recoup->coin_sig),
+                GNUNET_JSON_pack_data_auto ("coin_blind",
+                                            &recoup->coin_blind),
+                GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                            &recoup->reserve_pub),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            recoup->timestamp))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_TT_RECOUP_REFRESH:
+      {
+        struct TALER_EXCHANGEDB_RecoupRefreshListEntry *pr =
+          pos->details.recoup_refresh;
+        struct TALER_ExchangePublicKeyP epub;
+        struct TALER_ExchangeSignatureP esig;
+
+        if (TALER_EC_NONE !=
+            TALER_exchange_online_confirm_recoup_refresh_sign (
+              &TEH_keys_exchange_sign_,
+              pr->timestamp,
+              &pr->value,
+              coin_pub,
+              &pr->old_coin_pub,
+              &epub,
+              &esig))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        /* NOTE: we could also provide coin_pub's coin_sig, denomination key
+           hash and the denomination key's RSA signature over coin_pub, but as
+           the wallet should really already have this information (and cannot
+           check or do anything with it anyway if it doesn't), it seems
+           strictly unnecessary. */
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "RECOUP-REFRESH"),
+                TALER_JSON_pack_amount ("amount",
+                                        &pr->value),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &esig),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &epub),
+                GNUNET_JSON_pack_data_auto ("old_coin_pub",
+                                            &pr->old_coin_pub),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &pr->coin_sig),
+                GNUNET_JSON_pack_data_auto ("coin_blind",
+                                            &pr->coin_blind),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            pr->timestamp))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        break;
+      }
+
+    case TALER_EXCHANGEDB_TT_PURSE_DEPOSIT:
+      {
+        struct TALER_EXCHANGEDB_PurseDepositListEntry *pd
+          = pos->details.purse_deposit;
+        const struct TALER_AgeCommitmentHash *phac = NULL;
+
+        if (! pd->no_age_commitment)
+          phac = &pd->h_age_commitment;
+
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "PURSE-DEPOSIT"),
+                TALER_JSON_pack_amount ("amount",
+                                        &pd->amount),
+                GNUNET_JSON_pack_string ("exchange_base_url",
+                                         NULL == pd->exchange_base_url
+                                         ? TEH_base_url
+                                         : pd->exchange_base_url),
+                GNUNET_JSON_pack_allow_null (
+                  GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                              phac)),
+                GNUNET_JSON_pack_data_auto ("purse_pub",
+                                            &pd->purse_pub),
+                GNUNET_JSON_pack_bool ("refunded",
+                                       pd->refunded),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &pd->coin_sig))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        break;
+      }
+
+    case TALER_EXCHANGEDB_TT_PURSE_REFUND:
+      {
+        const struct TALER_EXCHANGEDB_PurseRefundListEntry *prefund =
+          pos->details.purse_refund;
+        struct TALER_Amount value;
+        enum TALER_ErrorCode ec;
+        struct TALER_ExchangePublicKeyP epub;
+        struct TALER_ExchangeSignatureP esig;
+
+        if (0 >
+            TALER_amount_subtract (&value,
+                                   &prefund->refund_amount,
+                                   &prefund->refund_fee))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        ec = TALER_exchange_online_purse_refund_sign (
+          &TEH_keys_exchange_sign_,
+          &value,
+          &prefund->refund_fee,
+          coin_pub,
+          &prefund->purse_pub,
+          &epub,
+          &esig);
+        if (TALER_EC_NONE != ec)
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "PURSE-REFUND"),
+                TALER_JSON_pack_amount ("amount",
+                                        &value),
+                TALER_JSON_pack_amount ("refund_fee",
+                                        &prefund->refund_fee),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &esig),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &epub),
+                GNUNET_JSON_pack_data_auto ("purse_pub",
+                                            &prefund->purse_pub))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+      }
+      break;
+
+    case TALER_EXCHANGEDB_TT_RESERVE_OPEN:
+      {
+        struct TALER_EXCHANGEDB_ReserveOpenListEntry *role
+          = pos->details.reserve_open;
+
+        if (0 !=
+            json_array_append_new (
+              history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "RESERVE-OPEN-DEPOSIT"),
+                TALER_JSON_pack_amount ("coin_contribution",
+                                        &role->coin_contribution),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &role->reserve_sig),
+                GNUNET_JSON_pack_data_auto ("coin_sig",
+                                            &role->coin_sig))))
+        {
+          GNUNET_break (0);
+          json_decref (history);
+          return NULL;
+        }
+        break;
+      }
+    }
+  }
+  return history;
+}
+
+
+MHD_RESULT
+TEH_handler_coins_get (struct TEH_RequestContext *rc,
+                       const struct TALER_CoinSpendPublicKeyP *coin_pub)
+{
+  struct TALER_EXCHANGEDB_TransactionList *tl = NULL;
+  uint64_t start_off = 0;
+  uint64_t etag_in;
+  uint64_t etag_out;
+  char etagp[24];
+  struct MHD_Response *resp;
+  unsigned int http_status;
+  struct TALER_DenominationHashP h_denom_pub;
+  struct TALER_Amount balance;
+
+  TALER_MHD_parse_request_number (rc->connection,
+                                  "start",
+                                  &start_off);
+  /* Check signature */
+  {
+    struct TALER_CoinSpendSignatureP coin_sig;
+    bool required = true;
+
+    TALER_MHD_parse_request_header_auto (rc->connection,
+                                         TALER_COIN_HISTORY_SIGNATURE_HEADER,
+                                         &coin_sig,
+                                         required);
+    if (GNUNET_OK !=
+        TALER_wallet_coin_history_verify (start_off,
+                                          coin_pub,
+                                          &coin_sig))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_FORBIDDEN,
+                                         TALER_EC_EXCHANGE_COIN_HISTORY_BAD_SIGNATURE,
+                                         NULL);
+    }
+  }
+
+  /* Get etag */
+  {
+    const char *etags;
+
+    etags = MHD_lookup_connection_value (rc->connection,
+                                         MHD_HEADER_KIND,
+                                         MHD_HTTP_HEADER_IF_NONE_MATCH);
+    if (NULL != etags)
+    {
+      char dummy;
+      unsigned long long ev;
+
+      if (1 != sscanf (etags,
+                       "\"%llu\"%c",
+                       &ev,
+                       &dummy))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Client send malformed `If-None-Match' header `%s'\n",
+                    etags);
+        etag_in = start_off;
+      }
+      else
+      {
+        etag_in = (uint64_t) ev;
+      }
+    }
+    else
+    {
+      etag_in = start_off;
+    }
+  }
+
+  /* Get history from DB between etag and now */
+  {
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->get_coin_transactions (TEH_plugin->cls,
+                                            coin_pub,
+                                            start_off,
+                                            etag_in,
+                                            &etag_out,
+                                            &balance,
+                                            &h_denom_pub,
+                                            &tl);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         "get_coin_history");
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_SOFT_FAILURE,
+                                         "get_coin_history");
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_EXCHANGE_GENERIC_COIN_UNKNOWN,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      /* Handled below */
+      break;
+    }
+  }
+
+  GNUNET_snprintf (etagp,
+                   sizeof (etagp),
+                   "\"%llu\"",
+                   (unsigned long long) etag_out);
+  if (etag_in == etag_out)
+  {
+    return TEH_RESPONSE_reply_not_modified (rc->connection,
+                                            etagp,
+                                            &add_response_headers,
+                                            NULL);
+  }
+  if (NULL == tl)
+  {
+    /* 204: empty history */
+    resp = MHD_create_response_from_buffer (0,
+                                            "",
+                                            MHD_RESPMEM_PERSISTENT);
+    http_status = MHD_HTTP_NO_CONTENT;
+  }
+  else
+  {
+    /* 200: regular history */
+    json_t *history;
+
+    history = compile_transaction_history (coin_pub,
+                                           tl);
+    TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
+                                            tl);
+    tl = NULL;
+    if (NULL == history)
+    {
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
+                                         "Failed to compile coin history");
+    }
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                  &h_denom_pub),
+      TALER_JSON_pack_amount ("balance",
+                              &balance),
+      GNUNET_JSON_pack_array_steal ("history",
+                                    history));
+    http_status = MHD_HTTP_OK;
+  }
+  add_response_headers (NULL,
+                        resp);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (resp,
+                                         MHD_HTTP_HEADER_ETAG,
+                                         etagp));
+  {
+    MHD_RESULT ret;
+
+    ret = MHD_queue_response (rc->connection,
+                              http_status,
+                              resp);
+    GNUNET_break (MHD_YES == ret);
+    MHD_destroy_response (resp);
+    return ret;
+  }
+}
+
+
+/* end of taler-exchange-httpd_coins_get.c */
diff --git a/src/exchange/taler-exchange-httpd_coins_get.h b/src/exchange/taler-exchange-httpd_coins_get.h
new file mode 100644
index 000000000..90405b55d
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_coins_get.h
@@ -0,0 +1,53 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_coins_get.h
+ * @brief Handle GET /coins/$COIN_PUB requests
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_COINS_GET_H
+#define TALER_EXCHANGE_HTTPD_COINS_GET_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Shutdown reserves-get subsystem.  Resumes all
+ * suspended long-polling clients and cleans up
+ * data structures.
+ */
+void
+TEH_reserves_get_cleanup (void);
+
+
+/**
+ * Handle a GET "/coins/$COIN_PUB/history" request.  Parses the
+ * given "coins_pub" in @a args (which should contain the
+ * EdDSA public key of a reserve) and then respond with the
+ * transaction history of the coin.
+ *
+ * @param rc request context
+ * @param coin_pub public key of the coin
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_coins_get (struct TEH_RequestContext *rc,
+                       const struct TALER_CoinSpendPublicKeyP *coin_pub);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_common_deposit.c b/src/exchange/taler-exchange-httpd_common_deposit.c
new file mode 100644
index 000000000..898e23dd9
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_common_deposit.c
@@ -0,0 +1,268 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_common_deposit.c
+ * @brief shared logic for handling deposited coins
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler-exchange-httpd_common_deposit.h"
+#include "taler-exchange-httpd.h"
+#include "taler-exchange-httpd_keys.h"
+
+
+enum GNUNET_GenericReturnValue
+TEH_common_purse_deposit_parse_coin (
+  struct MHD_Connection *connection,
+  struct TEH_PurseDepositedCoin *coin,
+  const json_t *jcoin)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount ("amount",
+                            TEH_currency,
+                            &coin->amount),
+    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
+                                 &coin->cpi.denom_pub_hash),
+    TALER_JSON_spec_denom_sig ("ub_sig",
+                               &coin->cpi.denom_sig),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("attest",
+                                   &coin->attest),
+      &coin->no_attest),
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_age_commitment ("age_commitment",
+                                      &coin->age_commitment),
+      &coin->cpi.no_age_commitment),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &coin->coin_sig),
+    GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                 &coin->cpi.coin_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  memset (coin,
+          0,
+          sizeof (*coin));
+  coin->cpi.no_age_commitment = true;
+  coin->no_attest = true;
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     jcoin,
+                                     spec);
+    if (GNUNET_OK != res)
+      return res;
+  }
+
+  /* check denomination exists and is valid */
+  {
+    struct TEH_DenominationKey *dk;
+    MHD_RESULT mret;
+
+    dk = TEH_keys_denomination_by_hash (&coin->cpi.denom_pub_hash,
+                                        connection,
+                                        &mret);
+    if (NULL == dk)
+    {
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES == mret) ? GNUNET_NO : GNUNET_SYSERR;
+    }
+    if (! coin->cpi.no_age_commitment)
+    {
+      coin->age_commitment.mask = dk->meta.age_mask;
+      TALER_age_commitment_hash (&coin->age_commitment,
+                                 &coin->cpi.h_age_commitment);
+    }
+    if (0 > TALER_amount_cmp (&dk->meta.value,
+                              &coin->amount))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_BAD_REQUEST,
+                                          TALER_EC_EXCHANGE_GENERIC_AMOUNT_EXCEEDS_DENOMINATION_VALUE,
+                                          NULL))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
+    {
+      /* This denomination is past the expiration time for deposits */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &coin->cpi.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
+                "PURSE CREATE"))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
+    {
+      /* This denomination is not yet valid */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &coin->cpi.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
+                "PURSE CREATE"))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+    if (dk->recoup_possible)
+    {
+      /* This denomination has been revoked */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TEH_RESPONSE_reply_expired_denom_pub_hash (
+                connection,
+                &coin->cpi.denom_pub_hash,
+                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
+                "PURSE CREATE"))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+    if (dk->denom_pub.bsign_pub_key->cipher !=
+        coin->cpi.denom_sig.unblinded_sig->cipher)
+    {
+      /* denomination cipher and denomination signature cipher not the same */
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_BAD_REQUEST,
+                                          TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
+                                          NULL))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+
+    coin->deposit_fee = dk->meta.fees.deposit;
+    if (0 < TALER_amount_cmp (&coin->deposit_fee,
+                              &coin->amount))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
+                                         NULL);
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_subtract (&coin->amount_minus_fee,
+                                          &coin->amount,
+                                          &coin->deposit_fee));
+
+    /* check coin signature */
+    switch (dk->denom_pub.bsign_pub_key->cipher)
+    {
+    case GNUNET_CRYPTO_BSA_RSA:
+      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
+      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
+      break;
+    default:
+      break;
+    }
+    if (GNUNET_YES !=
+        TALER_test_coin_valid (&coin->cpi,
+                               &dk->denom_pub))
+    {
+      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
+      GNUNET_JSON_parse_free (spec);
+      return (MHD_YES ==
+              TALER_MHD_reply_with_error (connection,
+                                          MHD_HTTP_FORBIDDEN,
+                                          TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
+                                          NULL))
+             ? GNUNET_NO : GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TEH_common_deposit_check_purse_deposit (
+  struct MHD_Connection *connection,
+  const struct TEH_PurseDepositedCoin *coin,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  uint32_t min_age)
+{
+  if (GNUNET_OK !=
+      TALER_wallet_purse_deposit_verify (TEH_base_url,
+                                         purse_pub,
+                                         &coin->amount,
+                                         &coin->cpi.denom_pub_hash,
+                                         &coin->cpi.h_age_commitment,
+                                         &coin->cpi.coin_pub,
+                                         &coin->coin_sig))
+  {
+    TALER_LOG_WARNING (
+      "Invalid coin signature to deposit into purse\n");
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_FORBIDDEN,
+                                        TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_SIGNATURE_INVALID,
+                                        TEH_base_url))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
+  }
+
+  if (0 == min_age)
+    return GNUNET_OK; /* no need to apply age checks */
+
+  /* Check and verify the age restriction. */
+  if (coin->no_attest != coin->cpi.no_age_commitment)
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_CONFLICTING_ATTEST_VS_AGE_COMMITMENT,
+                                       "mismatch of attest and age_commitment");
+  }
+
+  if (coin->cpi.no_age_commitment)
+    return GNUNET_OK; /* unrestricted coin */
+
+  /* age attestation must be valid */
+  if (GNUNET_OK !=
+      TALER_age_commitment_verify (&coin->age_commitment,
+                                   min_age,
+                                   &coin->attest))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_AGE_ATTESTATION_FAILURE,
+                                       "invalid attest for minimum age");
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Release data structures of @a coin. Note that
+ * @a coin itself is NOT freed.
+ *
+ * @param[in] coin information to release
+ */
+void
+TEH_common_purse_deposit_free_coin (struct TEH_PurseDepositedCoin *coin)
+{
+  TALER_denom_sig_free (&coin->cpi.denom_sig);
+  if (! coin->cpi.no_age_commitment)
+    GNUNET_free (coin->age_commitment.keys); /* Only the keys have been allocated */
+}
diff --git a/src/exchange/taler-exchange-httpd_common_deposit.h b/src/exchange/taler-exchange-httpd_common_deposit.h
new file mode 100644
index 000000000..10fd7e8bf
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_common_deposit.h
@@ -0,0 +1,130 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_common_deposit.h
+ * @brief shared logic for handling deposited coins
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_COMMON_DEPOSIT_H
+#define TALER_EXCHANGE_HTTPD_COMMON_DEPOSIT_H
+
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+
+
+/**
+ * Information about an individual coin being deposited.
+ */
+struct TEH_PurseDepositedCoin
+{
+  /**
+   * Public information about the coin.
+   */
+  struct TALER_CoinPublicInfo cpi;
+
+  /**
+   * Signature affirming spending the coin.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * Amount to be put into the purse from this coin.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Deposit fee applicable for this coin.
+   */
+  struct TALER_Amount deposit_fee;
+
+  /**
+   * Amount to be put into the purse from this coin.
+   */
+  struct TALER_Amount amount_minus_fee;
+
+  /**
+   * Age attestation provided, set if @e no_attest is false.
+   */
+  struct TALER_AgeAttestation attest;
+
+  /**
+   * Age commitment provided, set if @e cpi.no_age_commitment is false.
+   */
+  struct TALER_AgeCommitment age_commitment;
+
+  /**
+   * ID of the coin in known_coins.
+   */
+  uint64_t known_coin_id;
+
+  /**
+   * True if @e attest was not provided.
+   */
+  bool no_attest;
+
+};
+
+
+/**
+ * Parse a coin and check signature of the coin and the denomination
+ * signature over the coin.
+ *
+ * @param[in,out] connection our HTTP connection
+ * @param[out] coin coin to initialize
+ * @param jcoin coin to parse
+ * @return #GNUNET_OK on success, #GNUNET_NO if an error was returned,
+ *         #GNUNET_SYSERR on failure and no error could be returned
+ */
+enum GNUNET_GenericReturnValue
+TEH_common_purse_deposit_parse_coin (
+  struct MHD_Connection *connection,
+  struct TEH_PurseDepositedCoin *coin,
+  const json_t *jcoin);
+
+
+/**
+ * Check that the deposited @a coin is valid for @a purse_pub
+ * and has a valid age commitment for @a min_age.
+ *
+ * @param[in,out] connection our HTTP connection
+ * @param coin the coin to evaluate
+ * @param purse_pub public key of the purse the coin was deposited into
+ * @param min_age minimum age restriction expected for this purse
+ * @return #GNUNET_OK on success, #GNUNET_NO if an error was returned,
+ *         #GNUNET_SYSERR on failure and no error could be returned
+ */
+enum GNUNET_GenericReturnValue
+TEH_common_deposit_check_purse_deposit (
+  struct MHD_Connection *connection,
+  const struct TEH_PurseDepositedCoin *coin,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  uint32_t min_age);
+
+
+/**
+ * Release data structures of @a coin. Note that
+ * @a coin itself is NOT freed.
+ *
+ * @param[in] coin information to release
+ */
+void
+TEH_common_purse_deposit_free_coin (struct TEH_PurseDepositedCoin *coin);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_common_kyc.c b/src/exchange/taler-exchange-httpd_common_kyc.c
new file mode 100644
index 000000000..bcee5a0d2
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_common_kyc.c
@@ -0,0 +1,302 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_common_kyc.c
+ * @brief shared logic for finishing a KYC process
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler-exchange-httpd.h"
+#include "taler-exchange-httpd_common_kyc.h"
+#include "taler_attributes.h"
+#include "taler_error_codes.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include <gnunet/gnunet_common.h>
+
+struct TEH_KycAmlTrigger
+{
+
+  /**
+   * Our logging scope.
+   */
+  struct GNUNET_AsyncScopeId scope;
+
+  /**
+   * account the operation is about
+   */
+  struct TALER_PaytoHashP account_id;
+
+  /**
+   * until when is the KYC data valid
+   */
+  struct GNUNET_TIME_Absolute expiration;
+
+  /**
+   * legitimization process the KYC data is about
+   */
+  uint64_t process_row;
+
+  /**
+   * name of the configuration section of the logic that was run
+   */
+  char *provider_section;
+
+  /**
+   * set to user ID at the provider, or NULL if not supported or unknown
+   */
+  char *provider_user_id;
+
+  /**
+   * provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+   */
+  char *provider_legitimization_id;
+
+  /**
+   * function to call with the result
+   */
+  TEH_KycAmlTriggerCallback cb;
+
+  /**
+   * closure for @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * user attributes returned by the provider
+   */
+  json_t *attributes;
+
+  /**
+   * response to return to the HTTP client
+   */
+  struct MHD_Response *response;
+
+  /**
+   * Handle to an external process that evaluates the
+   * need to run AML on the account.
+   */
+  struct TALER_JSON_ExternalConversion *kyc_aml;
+
+  /**
+   * HTTP status code of @e response
+   */
+  unsigned int http_status;
+
+};
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure of type `struct TEH_KycAmlTrigger *`
+ * @param status_type how did the process die
+ * @param code termination status code from the process,
+ *        non-zero if AML checks are required next
+ * @param result some JSON result, NULL if we failed to get an JSON output
+ */
+static void
+kyc_aml_finished (void *cls,
+                  enum GNUNET_OS_ProcessStatusType status_type,
+                  unsigned long code,
+                  const json_t *result)
+{
+  struct TEH_KycAmlTrigger *kat = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  size_t eas;
+  void *ea;
+  const char *birthdate;
+  unsigned int birthday = 0;
+  struct GNUNET_ShortHashCode kyc_prox;
+  struct GNUNET_AsyncScopeSave old_scope;
+  unsigned int num_checks;
+  char **provided_checks;
+
+  kat->kyc_aml = NULL;
+  GNUNET_async_scope_enter (&kat->scope,
+                            &old_scope);
+  TALER_CRYPTO_attributes_to_kyc_prox (kat->attributes,
+                                       &kyc_prox);
+  birthdate = json_string_value (json_object_get (kat->attributes,
+                                                  TALER_ATTRIBUTE_BIRTHDATE));
+  if ( (TEH_age_restriction_enabled) &&
+       (NULL != birthdate) )
+  {
+    enum GNUNET_GenericReturnValue ret;
+
+    ret = TALER_parse_coarse_date (birthdate,
+                                   &TEH_age_restriction_config.mask,
+                                   &birthday);
+
+    if (GNUNET_OK != ret)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to parse birthdate `%s' from KYC attributes\n",
+                  birthdate);
+      if (NULL != kat->response)
+        MHD_destroy_response (kat->response);
+      kat->http_status = MHD_HTTP_BAD_REQUEST;
+      kat->response = TALER_MHD_make_error (
+        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+        TALER_ATTRIBUTE_BIRTHDATE);
+      goto RETURN_RESULT;
+    }
+  }
+
+  TALER_CRYPTO_kyc_attributes_encrypt (&TEH_attribute_key,
+                                       kat->attributes,
+                                       &ea,
+                                       &eas);
+  TALER_KYCLOGIC_lookup_checks (kat->provider_section,
+                                &num_checks,
+                                &provided_checks);
+  qs = TEH_plugin->insert_kyc_attributes (
+    TEH_plugin->cls,
+    kat->process_row,
+    &kat->account_id,
+    &kyc_prox,
+    kat->provider_section,
+    num_checks,
+    (const char **) provided_checks,
+    birthday,
+    GNUNET_TIME_timestamp_get (),
+    kat->provider_user_id,
+    kat->provider_legitimization_id,
+    kat->expiration,
+    eas,
+    ea,
+    0 != code);
+  for (unsigned int i = 0; i<num_checks; i++)
+    GNUNET_free (provided_checks[i]);
+  GNUNET_free (provided_checks);
+  GNUNET_free (ea);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Stored encrypted KYC process #%llu attributes: %d\n",
+              (unsigned long long) kat->process_row,
+              qs);
+  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+  {
+    GNUNET_break (0);
+    if (NULL != kat->response)
+      MHD_destroy_response (kat->response);
+    kat->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    kat->response = TALER_MHD_make_error (TALER_EC_GENERIC_DB_STORE_FAILED,
+                                          "do_insert_kyc_attributes");
+    /* Continued below to return the response */
+  }
+RETURN_RESULT:
+  /* Finally, return result to main handler */
+  kat->cb (kat->cb_cls,
+           kat->http_status,
+           kat->response);
+  kat->response = NULL;
+  TEH_kyc_finished_cancel (kat);
+  GNUNET_async_scope_restore (&old_scope);
+}
+
+
+struct TEH_KycAmlTrigger *
+TEH_kyc_finished (const struct GNUNET_AsyncScopeId *scope,
+                  uint64_t process_row,
+                  const struct TALER_PaytoHashP *account_id,
+                  const char *provider_section,
+                  const char *provider_user_id,
+                  const char *provider_legitimization_id,
+                  struct GNUNET_TIME_Absolute expiration,
+                  const json_t *attributes,
+                  unsigned int http_status,
+                  struct MHD_Response *response,
+                  TEH_KycAmlTriggerCallback cb,
+                  void *cb_cls)
+{
+  struct TEH_KycAmlTrigger *kat;
+
+  kat = GNUNET_new (struct TEH_KycAmlTrigger);
+  kat->scope = *scope;
+  kat->process_row = process_row;
+  kat->account_id = *account_id;
+  kat->provider_section
+    = GNUNET_strdup (provider_section);
+  if (NULL != provider_user_id)
+    kat->provider_user_id
+      = GNUNET_strdup (provider_user_id);
+  if (NULL != provider_legitimization_id)
+    kat->provider_legitimization_id
+      = GNUNET_strdup (provider_legitimization_id);
+  kat->expiration = expiration;
+  kat->attributes = json_incref ((json_t*) attributes);
+  kat->http_status = http_status;
+  kat->response = response;
+  kat->cb = cb;
+  kat->cb_cls = cb_cls;
+  kat->kyc_aml
+    = TALER_JSON_external_conversion_start (
+        attributes,
+        &kyc_aml_finished,
+        kat,
+        TEH_kyc_aml_trigger,
+        TEH_kyc_aml_trigger,
+        NULL);
+  if (NULL == kat->kyc_aml)
+  {
+    GNUNET_break (0);
+    TEH_kyc_finished_cancel (kat);
+    return NULL;
+  }
+  return kat;
+}
+
+
+void
+TEH_kyc_finished_cancel (struct TEH_KycAmlTrigger *kat)
+{
+  if (NULL != kat->kyc_aml)
+  {
+    TALER_JSON_external_conversion_stop (kat->kyc_aml);
+    kat->kyc_aml = NULL;
+  }
+  GNUNET_free (kat->provider_section);
+  GNUNET_free (kat->provider_user_id);
+  GNUNET_free (kat->provider_legitimization_id);
+  json_decref (kat->attributes);
+  if (NULL != kat->response)
+  {
+    MHD_destroy_response (kat->response);
+    kat->response = NULL;
+  }
+  GNUNET_free (kat);
+}
+
+
+bool
+TEH_kyc_failed (uint64_t process_row,
+                const struct TALER_PaytoHashP *account_id,
+                const char *provider_section,
+                const char *provider_user_id,
+                const char *provider_legitimization_id)
+{
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = TEH_plugin->insert_kyc_failure (
+    TEH_plugin->cls,
+    process_row,
+    account_id,
+    provider_section,
+    provider_user_id,
+    provider_legitimization_id);
+  GNUNET_break (qs >= 0);
+  return qs >= 0;
+}
diff --git a/src/exchange/taler-exchange-httpd_common_kyc.h b/src/exchange/taler-exchange-httpd_common_kyc.h
new file mode 100644
index 000000000..8198679c9
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_common_kyc.h
@@ -0,0 +1,117 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_common_kyc.h
+ * @brief shared logic for finishing a KYC process
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_COMMON_KYC_H
+#define TALER_EXCHANGE_HTTPD_COMMON_KYC_H
+
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Function called after the KYC-AML trigger is done.
+ *
+ * @param cls closure
+ * @param http_status final HTTP status to return
+ * @param[in] response final HTTP ro return
+ */
+typedef void
+(*TEH_KycAmlTriggerCallback) (
+  void *cls,
+  unsigned int http_status,
+  struct MHD_Response *response);
+
+
+/**
+ * Handle for an asynchronous operation to finish
+ * a KYC process after running the AML trigger.
+ */
+struct TEH_KycAmlTrigger;
+
+// FIXME: also pass async log context and set it!
+/**
+ * We have finished a KYC process and obtained new
+ * @a attributes for a given @a account_id.
+ * Check with the KYC-AML trigger to see if we need
+ * to initiate an AML process, and store the attributes
+ * in the database. Then call @a cb.
+ *
+ * @param scope the HTTP request logging scope
+ * @param process_row legitimization process the webhook was about
+ * @param account_id account the webhook was about
+ * @param provider_section name of the configuration section of the logic that was run
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param expiration until when is the KYC check valid
+ * @param attributes user attributes returned by the provider
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel the operation
+ */
+struct TEH_KycAmlTrigger *
+TEH_kyc_finished (const struct GNUNET_AsyncScopeId *scope,
+                  uint64_t process_row,
+                  const struct TALER_PaytoHashP *account_id,
+                  const char *provider_section,
+                  const char *provider_user_id,
+                  const char *provider_legitimization_id,
+                  struct GNUNET_TIME_Absolute expiration,
+                  const json_t *attributes,
+                  unsigned int http_status,
+                  struct MHD_Response *response,
+                  TEH_KycAmlTriggerCallback cb,
+                  void *cb_cls);
+
+
+/**
+ * Cancel KYC finish operation.
+ *
+ * @param[in] kat operation to abort
+ */
+void
+TEH_kyc_finished_cancel (struct TEH_KycAmlTrigger *kat);
+
+
+/**
+ * Update state of a legitmization process to 'finished'
+ * (and failed, no attributes were obtained).
+ *
+ * @param process_row legitimization process the webhook was about
+ * @param account_id account the webhook was about
+ * @param provider_section name of the configuration section of the logic that was run
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @return true on success, false if updating the database failed
+ */
+bool
+TEH_kyc_failed (uint64_t process_row,
+                const struct TALER_PaytoHashP *account_id,
+                const char *provider_section,
+                const char *provider_user_id,
+                const char *provider_legitimization_id);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_config.c b/src/exchange/taler-exchange-httpd_config.c
new file mode 100644
index 000000000..e17a9a050
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_config.c
@@ -0,0 +1,84 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2015-2024 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_config.c
+ * @brief Handle /config requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_json_lib.h>
+#include "taler_dbevents.h"
+#include "taler-exchange-httpd_config.h"
+#include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_mhd_lib.h"
+#include <jansson.h>
+
+
+MHD_RESULT
+TEH_handler_config (struct TEH_RequestContext *rc,
+                    const char *const args[])
+{
+  static struct MHD_Response *resp;
+
+  if (NULL == resp)
+  {
+    struct GNUNET_TIME_Absolute a;
+    struct GNUNET_TIME_Timestamp km;
+    char dat[128];
+
+    a = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_DAYS);
+    /* Round up to next full day to ensure the expiration
+       time does not become a fingerprint! */
+    a = GNUNET_TIME_absolute_round_down (a,
+                                         GNUNET_TIME_UNIT_DAYS);
+    a = GNUNET_TIME_absolute_add (a,
+                                  GNUNET_TIME_UNIT_DAYS);
+    /* => /config response stays at most 48h in caches! */
+    km = GNUNET_TIME_absolute_to_timestamp (a);
+    TALER_MHD_get_date_string (km.abs_time,
+                               dat);
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_array_steal ("supported_kyc_requirements",
+                                    TALER_KYCLOGIC_get_satisfiable ()),
+      GNUNET_JSON_pack_object_steal (
+        "currency_specification",
+        TALER_CONFIG_currency_specs_to_json (TEH_cspec)),
+      GNUNET_JSON_pack_string ("currency",
+                               TEH_currency),
+      GNUNET_JSON_pack_string ("name",
+                               "taler-exchange"),
+      GNUNET_JSON_pack_string ("implementation",
+                               "urn:net:taler:specs:taler-exchange:c-reference"),
+      GNUNET_JSON_pack_string ("version",
+                               EXCHANGE_PROTOCOL_VERSION));
+
+    GNUNET_break (MHD_YES ==
+                  MHD_add_response_header (resp,
+                                           MHD_HTTP_HEADER_EXPIRES,
+                                           dat));
+    GNUNET_break (MHD_YES ==
+                  MHD_add_response_header (resp,
+                                           MHD_HTTP_HEADER_CACHE_CONTROL,
+                                           "public,max-age=21600")); /* 6h */
+  }
+  return MHD_queue_response (rc->connection,
+                             MHD_HTTP_OK,
+                             resp);
+}
+
+
+/* end of taler-exchange-httpd_config.c */
diff --git a/src/exchange/taler-exchange-httpd_config.h b/src/exchange/taler-exchange-httpd_config.h
new file mode 100644
index 000000000..c0a14104a
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_config.h
@@ -0,0 +1,58 @@
+/*
+  This file is part of TALER
+  (C) 2023 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 EXCHANGEABILITY 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/>
+*/
+/**
+ * @file taler-exchange-httpd_config.h
+ * @brief headers for /config handler
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_CONFIG_H
+#define TALER_EXCHANGE_HTTPD_CONFIG_H
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Taler protocol version in the format CURRENT:REVISION:AGE
+ * as used by GNU libtool.  See
+ * https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
+ *
+ * Please be very careful when updating and follow
+ * https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+ * precisely.  Note that this version has NOTHING to do with the
+ * release version, and the format is NOT the same that semantic
+ * versioning uses either.
+ *
+ * When changing this version, you likely want to also update
+ * #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in
+ * exchange_api_handle.c!
+ *
+ * Returned via both /config and /keys endpoints.
+ */
+#define EXCHANGE_PROTOCOL_VERSION "19:1:2"
+
+
+/**
+ * Manages a /config call.
+ *
+ * @param rc context of the handler
+ * @param[in,out] args remaining arguments (ignored)
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_config (struct TEH_RequestContext *rc,
+                    const char *const args[]);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_csr.c b/src/exchange/taler-exchange-httpd_csr.c
index 1abe55639..e4fa4f5e4 100644
--- a/src/exchange/taler-exchange-httpd_csr.c
+++ b/src/exchange/taler-exchange-httpd_csr.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as
@@ -21,6 +21,7 @@
  * @brief Handle /csr requests
  * @author Lucien Heuzeveldt
  * @author Gian Demarmles
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
@@ -39,12 +40,12 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
 {
   struct TALER_RefreshMasterSecretP rms;
   unsigned int csr_requests_num;
-  json_t *csr_requests;
+  const json_t *csr_requests;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("rms",
                                  &rms),
-    GNUNET_JSON_spec_json ("nks",
-                           &csr_requests),
+    GNUNET_JSON_spec_array_const ("nks",
+                                  &csr_requests),
     GNUNET_JSON_spec_end ()
   };
   enum TALER_ErrorCode ec;
@@ -65,7 +66,7 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
   if ( (TALER_MAX_FRESH_COINS <= csr_requests_num) ||
        (0 == csr_requests_num) )
   {
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (
       rc->connection,
       MHD_HTTP_BAD_REQUEST,
@@ -74,11 +75,12 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
   }
 
   {
-    struct TALER_ExchangeWithdrawValues ewvs[csr_requests_num];
-
+    struct GNUNET_CRYPTO_BlindingInputValues ewvs[csr_requests_num];
     {
-      struct TALER_CsNonce nonces[csr_requests_num];
+      struct GNUNET_CRYPTO_CsSessionNonce nonces[csr_requests_num];
       struct TALER_DenominationHashP denom_pub_hashes[csr_requests_num];
+      struct TEH_CsDeriveData cdds[csr_requests_num];
+      struct GNUNET_CRYPTO_CSPublicRPairP r_pubs[csr_requests_num];
 
       for (unsigned int i = 0; i < csr_requests_num; i++)
       {
@@ -100,24 +102,20 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
                                           -1);
         if (GNUNET_OK != res)
         {
-          GNUNET_JSON_parse_free (spec);
           return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
         }
         TALER_cs_refresh_nonce_derive (&rms,
                                        coin_off,
                                        &nonces[i]);
       }
-      GNUNET_JSON_parse_free (spec);
 
       for (unsigned int i = 0; i < csr_requests_num; i++)
       {
-        const struct TALER_CsNonce *nonce = &nonces[i];
+        const struct GNUNET_CRYPTO_CsSessionNonce *nonce = &nonces[i];
         const struct TALER_DenominationHashP *denom_pub_hash =
           &denom_pub_hashes[i];
-        struct TALER_DenominationCSPublicRPairP *r_pub
-          = &ewvs[i].details.cs_values;
 
-        ewvs[i].cipher = TALER_DENOMINATION_CS;
+        ewvs[i].cipher = GNUNET_CRYPTO_BSA_CS;
         /* check denomination referenced by denom_pub_hash */
         {
           struct TEH_KeyStateHandle *ksh;
@@ -130,10 +128,10 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
                                                TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
                                                NULL);
           }
-          dk = TEH_keys_denomination_by_hash2 (ksh,
-                                               denom_pub_hash,
-                                               NULL,
-                                               NULL);
+          dk = TEH_keys_denomination_by_hash_from_state (ksh,
+                                                         denom_pub_hash,
+                                                         NULL,
+                                                         NULL);
           if (NULL == dk)
           {
             return TEH_RESPONSE_reply_unknown_denom_pub_hash (
@@ -168,7 +166,8 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
               TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
               "csr-melt");
           }
-          if (TALER_DENOMINATION_CS != dk->denom_pub.cipher)
+          if (GNUNET_CRYPTO_BSA_CS !=
+              dk->denom_pub.bsign_pub_key->cipher)
           {
             /* denomination is valid but not for CS */
             return TEH_RESPONSE_reply_invalid_denom_cipher_for_operation (
@@ -176,21 +175,23 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
               denom_pub_hash);
           }
         }
-
-        /* derive r_pub */
-        // FIXME: bundle all requests into one derivation request (TEH_keys_..., crypto helper, security module)
-        ec = TEH_keys_denomination_cs_r_pub_melt (denom_pub_hash,
-                                                  nonce,
-                                                  r_pub);
-        if (TALER_EC_NONE != ec)
-        {
-          GNUNET_break (0);
-          return TALER_MHD_reply_with_ec (rc->connection,
-                                          ec,
-                                          NULL);
-        }
+        cdds[i].h_denom_pub = denom_pub_hash;
+        cdds[i].nonce = nonce;
+      } /* for (i) */
+      ec = TEH_keys_denomination_cs_batch_r_pub (csr_requests_num,
+                                                 cdds,
+                                                 true,
+                                                 r_pubs);
+      if (TALER_EC_NONE != ec)
+      {
+        GNUNET_break (0);
+        return TALER_MHD_reply_with_ec (rc->connection,
+                                        ec,
+                                        NULL);
       }
-    }
+      for (unsigned int i = 0; i < csr_requests_num; i++)
+        ewvs[i].details.cs_values = r_pubs[i];
+    } /* end scope */
 
     /* send response */
     {
@@ -201,10 +202,13 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
       for (unsigned int i = 0; i < csr_requests_num; i++)
       {
         json_t *csr_obj;
+        struct TALER_ExchangeWithdrawValues exw = {
+          .blinding_inputs = &ewvs[i]
+        };
 
         csr_obj = GNUNET_JSON_PACK (
           TALER_JSON_pack_exchange_withdraw_values ("ewv",
-                                                    &ewvs[i]));
+                                                    &exw));
         GNUNET_assert (NULL != csr_obj);
         GNUNET_assert (0 ==
                        json_array_append_new (csr_response_ewvs,
@@ -227,18 +231,16 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
                           const json_t *root,
                           const char *const args[])
 {
-  struct TALER_CsNonce nonce;
+  struct GNUNET_CRYPTO_CsSessionNonce nonce;
   struct TALER_DenominationHashP denom_pub_hash;
-  struct TALER_ExchangeWithdrawValues ewv = {
-    .cipher = TALER_DENOMINATION_CS
+  struct GNUNET_CRYPTO_BlindingInputValues ewv = {
+    .cipher = GNUNET_CRYPTO_BSA_CS
   };
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_fixed ("nonce",
-                            &nonce,
-                            sizeof (struct TALER_CsNonce)),
-    GNUNET_JSON_spec_fixed ("denom_pub_hash",
-                            &denom_pub_hash,
-                            sizeof (struct TALER_DenominationHashP)),
+    GNUNET_JSON_spec_fixed_auto ("nonce",
+                                 &nonce),
+    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
+                                 &denom_pub_hash),
     GNUNET_JSON_spec_end ()
   };
   struct TEH_DenominationKey *dk;
@@ -265,10 +267,10 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
                                          TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
                                          NULL);
     }
-    dk = TEH_keys_denomination_by_hash2 (ksh,
-                                         &denom_pub_hash,
-                                         NULL,
-                                         NULL);
+    dk = TEH_keys_denomination_by_hash_from_state (ksh,
+                                                   &denom_pub_hash,
+                                                   NULL,
+                                                   NULL);
     if (NULL == dk)
     {
       return TEH_RESPONSE_reply_unknown_denom_pub_hash (
@@ -303,7 +305,8 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
         TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
         "csr-withdraw");
     }
-    if (TALER_DENOMINATION_CS != dk->denom_pub.cipher)
+    if (GNUNET_CRYPTO_BSA_CS !=
+        dk->denom_pub.bsign_pub_key->cipher)
     {
       /* denomination is valid but not for CS */
       return TEH_RESPONSE_reply_invalid_denom_cipher_for_operation (
@@ -315,10 +318,14 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
   /* derive r_pub */
   {
     enum TALER_ErrorCode ec;
+    const struct TEH_CsDeriveData cdd = {
+      .h_denom_pub = &denom_pub_hash,
+      .nonce = &nonce
+    };
 
-    ec = TEH_keys_denomination_cs_r_pub_withdraw (&denom_pub_hash,
-                                                  &nonce,
-                                                  &ewv.details.cs_values);
+    ec = TEH_keys_denomination_cs_r_pub (&cdd,
+                                         false,
+                                         &ewv.details.cs_values);
     if (TALER_EC_NONE != ec)
     {
       GNUNET_break (0);
@@ -327,17 +334,16 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
                                       NULL);
     }
   }
-
   {
-    json_t *csr_obj;
+    struct TALER_ExchangeWithdrawValues exw = {
+      .blinding_inputs = &ewv
+    };
 
-    csr_obj = GNUNET_JSON_PACK (
+    return TALER_MHD_REPLY_JSON_PACK (
+      rc->connection,
+      MHD_HTTP_OK,
       TALER_JSON_pack_exchange_withdraw_values ("ewv",
-                                                &ewv));
-    GNUNET_assert (NULL != csr_obj);
-    return TALER_MHD_reply_json_steal (rc->connection,
-                                       csr_obj,
-                                       MHD_HTTP_OK);
+                                                &exw));
   }
 }
 
diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c
index 53b935ba4..6fec3fee4 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -19,9 +19,12 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include <gnunet/gnunet_db_lib.h>
 #include <pthread.h>
 #include <jansson.h>
 #include <gnunet/gnunet_json_lib.h>
+#include "taler_error_codes.h"
+#include "taler_exchangedb_plugin.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler_exchangedb_lib.h"
@@ -37,14 +40,14 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
 {
   enum TALER_EXCHANGEDB_CoinKnownStatus cks;
   struct TALER_DenominationHashP h_denom_pub;
-  struct TALER_AgeCommitmentHash age_hash;
+  struct TALER_AgeCommitmentHash h_age_commitment = {{{0}}};
 
   /* make sure coin is 'known' in database */
   cks = TEH_plugin->ensure_coin_known (TEH_plugin->cls,
                                        coin,
                                        known_coin_id,
                                        &h_denom_pub,
-                                       &age_hash);
+                                       &h_age_commitment);
   switch (cks)
   {
   case TALER_EXCHANGEDB_CKS_ADDED:
@@ -61,16 +64,50 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
                                     NULL);
     return GNUNET_DB_STATUS_HARD_ERROR;
   case TALER_EXCHANGEDB_CKS_DENOM_CONFLICT:
-    *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
-      connection,
-      TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY,
-      &coin->coin_pub);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT:
-    *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
+    /* The exchange has a seen this coin before, but with a different denomination.
+     * Get the corresponding signature and sent it to the client as proof */
+    {
+      struct
+      {
+        struct TALER_DenominationPublicKey pub;
+        struct TALER_DenominationSignature sig;
+      } prev_denom = {0};
+
+      if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+          TEH_plugin->get_signature_for_known_coin (TEH_plugin->cls,
+                                                    &coin->coin_pub,
+                                                    &prev_denom.pub,
+                                                    &prev_denom.sig))
+      {
+        /* There _should_ have been a result, because
+         * we ended here due to a conflict! */
+        GNUNET_break (0);
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               NULL);
+        return GNUNET_DB_STATUS_HARD_ERROR;
+      }
+
+      *mhd_ret = TEH_RESPONSE_reply_coin_denomination_conflict (
+        connection,
+        TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY,
+        &coin->coin_pub,
+        &prev_denom.pub,
+        &prev_denom.sig);
+
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NULL:
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NON_NULL:
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_VALUE_DIFFERS:
+    *mhd_ret = TEH_RESPONSE_reply_coin_age_commitment_conflict (
       connection,
       TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_AGE_HASH,
-      &coin->coin_pub);
+      cks,
+      &h_denom_pub,
+      &coin->coin_pub,
+      &h_age_commitment);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
   GNUNET_assert (0);
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
deleted file mode 100644
index 7ca56e104..000000000
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
-
-  TALER 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, 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_deposit.c
- * @brief Handle /deposit requests; parses the POST and JSON and
- *        verifies the coin signature before handing things off
- *        to the database.
- * @author Florian Dold
- * @author Benedikt Mueller
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <jansson.h>
-#include <microhttpd.h>
-#include <pthread.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
-#include "taler-exchange-httpd_deposit.h"
-#include "taler-exchange-httpd_responses.h"
-#include "taler_exchangedb_lib.h"
-#include "taler-exchange-httpd_keys.h"
-
-
-/**
- * Send confirmation of deposit success to client.  This function
- * will create a signed message affirming the given information
- * and return it to the client.  By this, the exchange affirms that
- * the coin had sufficient (residual) value for the specified
- * transaction and that it will execute the requested deposit
- * operation with the given wiring details.
- *
- * @param connection connection to the client
- * @param coin_pub public key of the coin
- * @param h_wire hash of wire details
- * @param h_extensions hash of applicable extensions
- * @param h_contract_terms hash of contract details
- * @param exchange_timestamp exchange's timestamp
- * @param refund_deadline until when this deposit be refunded
- * @param wire_deadline until when will the exchange wire the funds
- * @param merchant merchant public key
- * @param amount_without_fee fraction of coin value to deposit, without the fee
- * @return MHD result code
- */
-static MHD_RESULT
-reply_deposit_success (
-  struct MHD_Connection *connection,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  struct GNUNET_TIME_Timestamp exchange_timestamp,
-  struct GNUNET_TIME_Timestamp refund_deadline,
-  struct GNUNET_TIME_Timestamp wire_deadline,
-  const struct TALER_MerchantPublicKeyP *merchant,
-  const struct TALER_Amount *amount_without_fee)
-{
-  struct TALER_ExchangePublicKeyP pub;
-  struct TALER_ExchangeSignatureP sig;
-  enum TALER_ErrorCode ec;
-
-  if (TALER_EC_NONE !=
-      (ec = TALER_exchange_online_deposit_confirmation_sign (
-         &TEH_keys_exchange_sign_,
-         h_contract_terms,
-         h_wire,
-         h_extensions,
-         exchange_timestamp,
-         wire_deadline,
-         refund_deadline,
-         amount_without_fee,
-         coin_pub,
-         merchant,
-         &pub,
-         &sig)))
-  {
-    return TALER_MHD_reply_with_ec (connection,
-                                    ec,
-                                    NULL);
-  }
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
-                                exchange_timestamp),
-    GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                &sig),
-    GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                &pub));
-}
-
-
-/**
- * Closure for #deposit_transaction.
- */
-struct DepositContext
-{
-  /**
-   * Information about the deposit request.
-   */
-  const struct TALER_EXCHANGEDB_Deposit *deposit;
-
-  /**
-   * Our timestamp (when we received the request).
-   * Possibly updated by the transaction if the
-   * request is idempotent (was repeated).
-   */
-  struct GNUNET_TIME_Timestamp exchange_timestamp;
-
-  /**
-   * Hash of the payto URI.
-   */
-  struct TALER_PaytoHashP h_payto;
-
-  /**
-   * Row of of the coin in the known_coins table.
-   */
-  uint64_t known_coin_id;
-
-};
-
-
-/**
- * Execute database transaction for /deposit.  Runs the transaction
- * logic; IF it returns a non-error code, the transaction logic MUST
- * NOT queue a MHD response.  IF it returns an hard error, the
- * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF
- * it returns the soft error code, the function MAY be called again to
- * retry and MUST not queue a MHD response.
- *
- * @param cls a `struct DepositContext`
- * @param connection MHD request context
- * @param[out] mhd_ret set to MHD status on error
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-deposit_transaction (void *cls,
-                     struct MHD_Connection *connection,
-                     MHD_RESULT *mhd_ret)
-{
-  struct DepositContext *dc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  bool balance_ok;
-  bool in_conflict;
-
-  qs = TEH_plugin->do_deposit (TEH_plugin->cls,
-                               dc->deposit,
-                               dc->known_coin_id,
-                               &dc->h_payto,
-                               false, /* FIXME-OEC: extension blocked */
-                               &dc->exchange_timestamp,
-                               &balance_ok,
-                               &in_conflict);
-  if (qs < 0)
-  {
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-      return qs;
-    TALER_LOG_WARNING ("Failed to store /deposit information in database\n");
-    *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                           TALER_EC_GENERIC_DB_STORE_FAILED,
-                                           "deposit");
-    return qs;
-  }
-  if (in_conflict)
-  {
-    *mhd_ret
-      = TEH_RESPONSE_reply_coin_insufficient_funds (
-          connection,
-          TALER_EC_EXCHANGE_DEPOSIT_CONFLICTING_CONTRACT,
-          &dc->deposit->coin.coin_pub);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (! balance_ok)
-  {
-    *mhd_ret
-      = TEH_RESPONSE_reply_coin_insufficient_funds (
-          connection,
-          TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
-          &dc->deposit->coin.coin_pub);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  return qs;
-}
-
-
-MHD_RESULT
-TEH_handler_deposit (struct MHD_Connection *connection,
-                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                     const json_t *root)
-{
-  struct DepositContext dc;
-  struct TALER_EXCHANGEDB_Deposit deposit;
-  const char *payto_uri;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("merchant_payto_uri",
-                             &payto_uri),
-    GNUNET_JSON_spec_fixed_auto ("wire_salt",
-                                 &deposit.wire_salt),
-    TALER_JSON_spec_amount ("contribution",
-                            TEH_currency,
-                            &deposit.amount_with_fee),
-    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
-                                 &deposit.coin.denom_pub_hash),
-    TALER_JSON_spec_denom_sig ("ub_sig",
-                               &deposit.coin.denom_sig),
-    GNUNET_JSON_spec_fixed_auto ("merchant_pub",
-                                 &deposit.merchant_pub),
-    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                 &deposit.h_contract_terms),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                   &deposit.coin.h_age_commitment),
-      &deposit.coin.no_age_commitment),
-    GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                 &deposit.csig),
-    GNUNET_JSON_spec_timestamp ("timestamp",
-                                &deposit.timestamp),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_timestamp ("refund_deadline",
-                                  &deposit.refund_deadline),
-      NULL),
-    GNUNET_JSON_spec_timestamp ("wire_transfer_deadline",
-                                &deposit.wire_deadline),
-    GNUNET_JSON_spec_end ()
-  };
-  struct TALER_MerchantWireHashP h_wire;
-
-  memset (&deposit,
-          0,
-          sizeof (deposit));
-  deposit.coin.coin_pub = *coin_pub;
-  {
-    enum GNUNET_GenericReturnValue res;
-
-    res = TALER_MHD_parse_json_data (connection,
-                                     root,
-                                     spec);
-    if (GNUNET_SYSERR == res)
-    {
-      GNUNET_break (0);
-      return MHD_NO; /* hard failure */
-    }
-    if (GNUNET_NO == res)
-    {
-      GNUNET_break_op (0);
-      return MHD_YES; /* failure */
-    }
-  }
-  /* validate merchant's wire details (as far as we can) */
-  {
-    char *emsg;
-
-    emsg = TALER_payto_validate (payto_uri);
-    if (NULL != emsg)
-    {
-      MHD_RESULT ret;
-
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      ret = TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                        emsg);
-      GNUNET_free (emsg);
-      return ret;
-    }
-  }
-  if (GNUNET_TIME_timestamp_cmp (deposit.refund_deadline,
-                                 >,
-                                 deposit.wire_deadline))
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE,
-                                       NULL);
-  }
-  if (GNUNET_TIME_absolute_is_never (deposit.wire_deadline.abs_time))
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSIT_WIRE_DEADLINE_IS_NEVER,
-                                       NULL);
-  }
-  deposit.receiver_wire_account = (char *) payto_uri;
-  TALER_payto_hash (payto_uri,
-                    &dc.h_payto);
-  TALER_merchant_wire_signature_hash (payto_uri,
-                                      &deposit.wire_salt,
-                                      &h_wire);
-  dc.deposit = &deposit;
-
-  /* new deposit */
-  dc.exchange_timestamp = GNUNET_TIME_timestamp_get ();
-  /* check denomination exists and is valid */
-  {
-    struct TEH_DenominationKey *dk;
-    MHD_RESULT mret;
-
-    dk = TEH_keys_denomination_by_hash (&deposit.coin.denom_pub_hash,
-                                        connection,
-                                        &mret);
-    if (NULL == dk)
-    {
-      GNUNET_JSON_parse_free (spec);
-      return mret;
-    }
-    if (0 > TALER_amount_cmp (&dk->meta.value,
-                              &deposit.amount_with_fee))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_EXCHANGE_GENERIC_AMOUNT_EXCEEDS_DENOMINATION_VALUE,
-                                         NULL);
-    }
-    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
-    {
-      /* This denomination is past the expiration time for deposits */
-      GNUNET_JSON_parse_free (spec);
-      return TEH_RESPONSE_reply_expired_denom_pub_hash (
-        connection,
-        &deposit.coin.denom_pub_hash,
-        TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
-        "DEPOSIT");
-    }
-    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
-    {
-      /* This denomination is not yet valid */
-      GNUNET_JSON_parse_free (spec);
-      return TEH_RESPONSE_reply_expired_denom_pub_hash (
-        connection,
-        &deposit.coin.denom_pub_hash,
-        TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
-        "DEPOSIT");
-    }
-    if (dk->recoup_possible)
-    {
-      /* This denomination has been revoked */
-      GNUNET_JSON_parse_free (spec);
-      return TEH_RESPONSE_reply_expired_denom_pub_hash (
-        connection,
-        &deposit.coin.denom_pub_hash,
-        TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
-        "DEPOSIT");
-    }
-    if (dk->denom_pub.cipher != deposit.coin.denom_sig.cipher)
-    {
-      /* denomination cipher and denomination signature cipher not the same */
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
-                                         NULL);
-    }
-
-    deposit.deposit_fee = dk->meta.fees.deposit;
-    /* check coin signature */
-    switch (dk->denom_pub.cipher)
-    {
-    case TALER_DENOMINATION_RSA:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
-      break;
-    case TALER_DENOMINATION_CS:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
-      break;
-    default:
-      break;
-    }
-    if (GNUNET_YES !=
-        TALER_test_coin_valid (&deposit.coin,
-                               &dk->denom_pub))
-    {
-      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_FORBIDDEN,
-                                         TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
-                                         NULL);
-    }
-  }
-  if (0 < TALER_amount_cmp (&deposit.deposit_fee,
-                            &deposit.amount_with_fee))
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
-                                       NULL);
-  }
-
-  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-  if (GNUNET_OK !=
-      TALER_wallet_deposit_verify (&deposit.amount_with_fee,
-                                   &deposit.deposit_fee,
-                                   &h_wire,
-                                   &deposit.h_contract_terms,
-                                   &deposit.coin.h_age_commitment,
-                                   NULL /* h_extensions! */,
-                                   &deposit.coin.denom_pub_hash,
-                                   deposit.timestamp,
-                                   &deposit.merchant_pub,
-                                   deposit.refund_deadline,
-                                   &deposit.coin.coin_pub,
-                                   &deposit.csig))
-  {
-    TALER_LOG_WARNING ("Invalid signature on /deposit request\n");
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_FORBIDDEN,
-                                       TALER_EC_EXCHANGE_DEPOSIT_COIN_SIGNATURE_INVALID,
-                                       NULL);
-  }
-
-  if (GNUNET_SYSERR ==
-      TEH_plugin->preflight (TEH_plugin->cls))
-  {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_DB_START_FAILED,
-                                       "preflight failure");
-  }
-
-  {
-    MHD_RESULT mhd_ret = MHD_NO;
-    enum GNUNET_DB_QueryStatus qs;
-
-    /* make sure coin is 'known' in database */
-    for (unsigned int tries = 0; tries<MAX_TRANSACTION_COMMIT_RETRIES; tries++)
-    {
-      qs = TEH_make_coin_known (&deposit.coin,
-                                connection,
-                                &dc.known_coin_id,
-                                &mhd_ret);
-      /* no transaction => no serialization failures should be possible */
-      if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
-        break;
-    }
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-    {
-      GNUNET_break (0);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                         TALER_EC_GENERIC_DB_COMMIT_FAILED,
-                                         "make_coin_known");
-    }
-    if (qs < 0)
-      return mhd_ret;
-  }
-
-
-  /* execute transaction */
-  {
-    MHD_RESULT mhd_ret;
-
-    if (GNUNET_OK !=
-        TEH_DB_run_transaction (connection,
-                                "execute deposit",
-                                TEH_MT_REQUEST_DEPOSIT,
-                                &mhd_ret,
-                                &deposit_transaction,
-                                &dc))
-    {
-      GNUNET_JSON_parse_free (spec);
-      return mhd_ret;
-    }
-  }
-
-  /* generate regular response */
-  {
-    struct TALER_Amount amount_without_fee;
-    MHD_RESULT res;
-
-    GNUNET_assert (0 <=
-                   TALER_amount_subtract (&amount_without_fee,
-                                          &deposit.amount_with_fee,
-                                          &deposit.deposit_fee));
-    res = reply_deposit_success (connection,
-                                 &deposit.coin.coin_pub,
-                                 &h_wire,
-                                 NULL /* h_extensions! */,
-                                 &deposit.h_contract_terms,
-                                 dc.exchange_timestamp,
-                                 deposit.refund_deadline,
-                                 deposit.wire_deadline,
-                                 &deposit.merchant_pub,
-                                 &amount_without_fee);
-    GNUNET_JSON_parse_free (spec);
-    return res;
-  }
-}
-
-
-/* end of taler-exchange-httpd_deposit.c */
diff --git a/src/exchange/taler-exchange-httpd_deposits_get.c b/src/exchange/taler-exchange-httpd_deposits_get.c
index 97618a944..0850d19eb 100644
--- a/src/exchange/taler-exchange-httpd_deposits_get.c
+++ b/src/exchange/taler-exchange-httpd_deposits_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2017, 2021 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -23,6 +23,7 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include <pthread.h>
+#include "taler_dbevents.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler_signatures.h"
@@ -38,14 +39,34 @@ struct DepositWtidContext
 {
 
   /**
+   * Kept in a DLL.
+   */
+  struct DepositWtidContext *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct DepositWtidContext *prev;
+
+  /**
+   * Context for the request we are processing.
+   */
+  struct TEH_RequestContext *rc;
+
+  /**
+   * Subscription for the database event we are waiting for.
+   */
+  struct GNUNET_DB_EventHandler *eh;
+
+  /**
    * Hash over the proposal data of the contract for which this deposit is made.
    */
-  struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Hash over the wiring information of the merchant.
    */
-  struct TALER_MerchantWireHashP h_wire GNUNET_PACKED;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
    * The Merchant's public key.  The deposit inquiry request is to be
@@ -65,6 +86,12 @@ struct DepositWtidContext
   struct TALER_WireTransferIdentifierRawP wtid;
 
   /**
+   * Signature by the merchant.
+   */
+  struct TALER_MerchantSignatureP merchant_sig;
+
+
+  /**
    * Set by #handle_wtid data to the coin's contribution to the wire transfer.
    */
   struct TALER_Amount coin_contribution;
@@ -80,6 +107,11 @@ struct DepositWtidContext
   struct GNUNET_TIME_Timestamp execution_time;
 
   /**
+   * Timeout of the request, for long-polling.
+   */
+  struct GNUNET_TIME_Absolute timeout;
+
+  /**
    * Set by #handle_wtid to the coin contribution to the transaction
    * (that is, @e coin_contribution minus @e coin_fee).
    */
@@ -91,15 +123,57 @@ struct DepositWtidContext
   struct TALER_EXCHANGEDB_KycStatus kyc;
 
   /**
+   * AML status information for the receiving account.
+   */
+  enum TALER_AmlDecisionState aml_decision;
+
+  /**
    * Set to #GNUNET_YES by #handle_wtid if the wire transfer is still pending
    * (and the above were not set).
    * Set to #GNUNET_SYSERR if there was a serious error.
    */
   enum GNUNET_GenericReturnValue pending;
+
+  /**
+   * #GNUNET_YES if we were suspended, #GNUNET_SYSERR
+   * if we were woken up due to shutdown.
+   */
+  enum GNUNET_GenericReturnValue suspended;
 };
 
 
 /**
+ * Head of DLL of suspended requests.
+ */
+static struct DepositWtidContext *dwc_head;
+
+/**
+ * Tail of DLL of suspended requests.
+ */
+static struct DepositWtidContext *dwc_tail;
+
+
+void
+TEH_deposits_get_cleanup ()
+{
+  struct DepositWtidContext *n;
+
+  for (struct DepositWtidContext *ctx = dwc_head;
+       NULL != ctx;
+       ctx = n)
+  {
+    n = ctx->next;
+    GNUNET_assert (GNUNET_YES == ctx->suspended);
+    ctx->suspended = GNUNET_SYSERR;
+    MHD_resume_connection (ctx->rc->connection);
+    GNUNET_CONTAINER_DLL_remove (dwc_head,
+                                 dwc_tail,
+                                 ctx);
+  }
+}
+
+
+/**
  * A merchant asked for details about a deposit.  Provide
  * them. Generates the 200 reply.
  *
@@ -128,6 +202,7 @@ reply_deposit_details (
          &pub,
          &sig)))
   {
+    GNUNET_break (0);
     return TALER_MHD_reply_with_ec (connection,
                                     ec,
                                     NULL);
@@ -184,7 +259,8 @@ deposits_get_transaction (void *cls,
                                                &ctx->execution_time,
                                                &ctx->coin_contribution,
                                                &fee,
-                                               &ctx->kyc);
+                                               &ctx->kyc,
+                                               &ctx->aml_decision);
   if (0 > qs)
   {
     if (GNUNET_DB_STATUS_HARD_ERROR == qs)
@@ -221,130 +297,228 @@ deposits_get_transaction (void *cls,
 
 
 /**
+ * Function called on events received from Postgres.
+ * Wakes up long pollers.
+ *
+ * @param cls the `struct DepositWtidContext *`
+ * @param extra additional event data provided
+ * @param extra_size number of bytes in @a extra
+ */
+static void
+db_event_cb (void *cls,
+             const void *extra,
+             size_t extra_size)
+{
+  struct DepositWtidContext *ctx = cls;
+  struct GNUNET_AsyncScopeSave old_scope;
+
+  (void) extra;
+  (void) extra_size;
+  if (GNUNET_YES != ctx->suspended)
+    return; /* might get multiple wake-up events */
+  GNUNET_CONTAINER_DLL_remove (dwc_head,
+                               dwc_tail,
+                               ctx);
+  GNUNET_async_scope_enter (&ctx->rc->async_scope_id,
+                            &old_scope);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Resuming request handling\n");
+  TEH_check_invariants ();
+  ctx->suspended = GNUNET_NO;
+  MHD_resume_connection (ctx->rc->connection);
+  TALER_MHD_daemon_trigger ();
+  TEH_check_invariants ();
+  GNUNET_async_scope_restore (&old_scope);
+}
+
+
+/**
  * Lookup and return the wire transfer identifier.
  *
- * @param connection the MHD connection to handle
  * @param ctx context of the signed request to execute
  * @return MHD result code
  */
 static MHD_RESULT
 handle_track_transaction_request (
-  struct MHD_Connection *connection,
   struct DepositWtidContext *ctx)
 {
-  MHD_RESULT mhd_ret;
-
-  if (GNUNET_OK !=
-      TEH_DB_run_transaction (connection,
-                              "handle deposits GET",
-                              TEH_MT_REQUEST_OTHER,
-                              &mhd_ret,
-                              &deposits_get_transaction,
-                              ctx))
-    return mhd_ret;
+  struct MHD_Connection *connection = ctx->rc->connection;
+
+  if ( (GNUNET_TIME_absolute_is_future (ctx->timeout)) &&
+       (NULL == ctx->eh) )
+  {
+    struct TALER_CoinDepositEventP rep = {
+      .header.size = htons (sizeof (rep)),
+      .header.type = htons (TALER_DBEVENT_EXCHANGE_DEPOSIT_STATUS_CHANGED),
+      .merchant_pub = ctx->merchant
+    };
+
+    ctx->eh = TEH_plugin->event_listen (
+      TEH_plugin->cls,
+      GNUNET_TIME_absolute_get_remaining (ctx->timeout),
+      &rep.header,
+      &db_event_cb,
+      ctx);
+    GNUNET_break (NULL != ctx->eh);
+  }
+  {
+    MHD_RESULT mhd_ret;
+
+    if (GNUNET_OK !=
+        TEH_DB_run_transaction (connection,
+                                "handle deposits GET",
+                                TEH_MT_REQUEST_OTHER,
+                                &mhd_ret,
+                                &deposits_get_transaction,
+                                ctx))
+      return mhd_ret;
+  }
   if (GNUNET_SYSERR == ctx->pending)
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
                                        TALER_EC_GENERIC_DB_INVARIANT_FAILURE,
                                        "wire fees exceed aggregate in database");
   if (GNUNET_YES == ctx->pending)
+  {
+    if ( (GNUNET_TIME_absolute_is_future (ctx->timeout)) &&
+         (GNUNET_NO == ctx->suspended) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Suspending request handling\n");
+      GNUNET_CONTAINER_DLL_insert (dwc_head,
+                                   dwc_tail,
+                                   ctx);
+      ctx->suspended = GNUNET_YES;
+      MHD_suspend_connection (connection);
+      return MHD_YES;
+    }
     return TALER_MHD_REPLY_JSON_PACK (
       connection,
       MHD_HTTP_ACCEPTED,
-      GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                               ctx->kyc.payment_target_uuid),
+      GNUNET_JSON_pack_allow_null (
+        (0 == ctx->kyc.requirement_row)
+        ? GNUNET_JSON_pack_string ("requirement_row",
+                                   NULL)
+        : GNUNET_JSON_pack_uint64 ("requirement_row",
+                                   ctx->kyc.requirement_row)),
+      GNUNET_JSON_pack_uint64 ("aml_decision",
+                               (uint32_t) ctx->aml_decision),
       GNUNET_JSON_pack_bool ("kyc_ok",
                              ctx->kyc.ok),
       GNUNET_JSON_pack_timestamp ("execution_time",
                                   ctx->execution_time));
+  }
   return reply_deposit_details (connection,
                                 ctx);
 }
 
 
+/**
+ * Function called to clean up a context.
+ *
+ * @param rc request context with data to clean up
+ */
+static void
+dwc_cleaner (struct TEH_RequestContext *rc)
+{
+  struct DepositWtidContext *ctx = rc->rh_ctx;
+
+  GNUNET_assert (GNUNET_NO == ctx->suspended);
+  if (NULL != ctx->eh)
+  {
+    TEH_plugin->event_listen_cancel (TEH_plugin->cls,
+                                     ctx->eh);
+    ctx->eh = NULL;
+  }
+  GNUNET_free (ctx);
+}
+
+
 MHD_RESULT
 TEH_handler_deposits_get (struct TEH_RequestContext *rc,
                           const char *const args[4])
 {
-  enum GNUNET_GenericReturnValue res;
-  struct TALER_MerchantSignatureP merchant_sig;
-  struct DepositWtidContext ctx;
+  struct DepositWtidContext *ctx = rc->rh_ctx;
 
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[0],
-                                     strlen (args[0]),
-                                     &ctx.h_wire,
-                                     sizeof (ctx.h_wire)))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_WIRE,
-                                       args[0]);
-  }
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[1],
-                                     strlen (args[1]),
-                                     &ctx.merchant,
-                                     sizeof (ctx.merchant)))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_MERCHANT_PUB,
-                                       args[1]);
-  }
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[2],
-                                     strlen (args[2]),
-                                     &ctx.h_contract_terms,
-                                     sizeof (ctx.h_contract_terms)))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_CONTRACT_TERMS,
-                                       args[2]);
-  }
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[3],
-                                     strlen (args[3]),
-                                     &ctx.coin_pub,
-                                     sizeof (ctx.coin_pub)))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_COIN_PUB,
-                                       args[3]);
-  }
-  res = TALER_MHD_parse_request_arg_data (rc->connection,
-                                          "merchant_sig",
-                                          &merchant_sig,
-                                          sizeof (merchant_sig));
-  if (GNUNET_SYSERR == res)
-    return MHD_NO; /* internal error */
-  if (GNUNET_NO == res)
-    return MHD_YES; /* parse error */
-  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (NULL == ctx)
   {
+    ctx = GNUNET_new (struct DepositWtidContext);
+    ctx->rc = rc;
+    rc->rh_ctx = ctx;
+    rc->rh_cleaner = &dwc_cleaner;
+
+    if (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[0],
+                                       strlen (args[0]),
+                                       &ctx->h_wire,
+                                       sizeof (ctx->h_wire)))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_WIRE,
+                                         args[0]);
+    }
+    if (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[1],
+                                       strlen (args[1]),
+                                       &ctx->merchant,
+                                       sizeof (ctx->merchant)))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_MERCHANT_PUB,
+                                         args[1]);
+    }
+    if (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[2],
+                                       strlen (args[2]),
+                                       &ctx->h_contract_terms,
+                                       sizeof (ctx->h_contract_terms)))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_H_CONTRACT_TERMS,
+                                         args[2]);
+    }
     if (GNUNET_OK !=
-        TALER_merchant_deposit_verify (&ctx.merchant,
-                                       &ctx.coin_pub,
-                                       &ctx.h_contract_terms,
-                                       &ctx.h_wire,
-                                       &merchant_sig))
+        GNUNET_STRINGS_string_to_data (args[3],
+                                       strlen (args[3]),
+                                       &ctx->coin_pub,
+                                       sizeof (ctx->coin_pub)))
     {
       GNUNET_break_op (0);
       return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_FORBIDDEN,
-                                         TALER_EC_EXCHANGE_DEPOSITS_GET_MERCHANT_SIGNATURE_INVALID,
-                                         NULL);
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_COIN_PUB,
+                                         args[3]);
+    }
+    TALER_MHD_parse_request_arg_auto_t (rc->connection,
+                                        "merchant_sig",
+                                        &ctx->merchant_sig);
+    TALER_MHD_parse_request_timeout (rc->connection,
+                                     &ctx->timeout);
+    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+    {
+      if (GNUNET_OK !=
+          TALER_merchant_deposit_verify (&ctx->merchant,
+                                         &ctx->coin_pub,
+                                         &ctx->h_contract_terms,
+                                         &ctx->h_wire,
+                                         &ctx->merchant_sig))
+      {
+        GNUNET_break_op (0);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_FORBIDDEN,
+                                           TALER_EC_EXCHANGE_DEPOSITS_GET_MERCHANT_SIGNATURE_INVALID,
+                                           NULL);
+      }
     }
   }
 
-  return handle_track_transaction_request (rc->connection,
-                                           &ctx);
+  return handle_track_transaction_request (ctx);
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_deposits_get.h b/src/exchange/taler-exchange-httpd_deposits_get.h
index aee7521a5..c7b1698bb 100644
--- a/src/exchange/taler-exchange-httpd_deposits_get.h
+++ b/src/exchange/taler-exchange-httpd_deposits_get.h
@@ -27,6 +27,13 @@
 
 
 /**
+ * Resume long pollers on GET /deposits.
+ */
+void
+TEH_deposits_get_cleanup (void);
+
+
+/**
  * Handle a "/deposits/$H_WIRE/$MERCHANT_PUB/$H_CONTRACT_TERMS/$COIN_PUB"
  * request.
  *
diff --git a/src/exchange/taler-exchange-httpd_extensions.c b/src/exchange/taler-exchange-httpd_extensions.c
index c9d470521..d62a618ae 100644
--- a/src/exchange/taler-exchange-httpd_extensions.c
+++ b/src/exchange/taler-exchange-httpd_extensions.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021, 2023 Taler Systems SA
 
   TALER 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
@@ -14,14 +14,16 @@
 */
 /**
  * @file taler-exchange-httpd_extensions.c
- * @brief Handle extensions (age-restriction, peer2peer)
+ * @brief Handle extensions (age-restriction, policy extensions)
  * @author Özgür Kesim
  */
 #include "platform.h"
 #include <gnunet/gnunet_json_lib.h>
 #include "taler_dbevents.h"
+#include "taler-exchange-httpd_keys.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler-exchange-httpd_extensions.h"
+#include "taler_extensions_policy.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler_extensions.h"
@@ -38,8 +40,8 @@ static struct GNUNET_DB_EventHandler *extensions_eh;
  * the extensions data in the database.
  *
  * @param cls NULL
- * @param extra unused
- * @param extra_size number of bytes in @a extra unused
+ * @param extra type of the extension
+ * @param extra_size number of bytes in @a extra
  */
 static void
 extension_update_event_cb (void *cls,
@@ -47,13 +49,14 @@ extension_update_event_cb (void *cls,
                            size_t extra_size)
 {
   (void) cls;
+  uint32_t nbo_type;
   enum TALER_Extension_Type type;
   const struct TALER_Extension *extension;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Received extensions update event\n");
 
-  if (sizeof(enum TALER_Extension_Type) != extra_size)
+  if (sizeof(nbo_type) != extra_size)
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -61,8 +64,10 @@ extension_update_event_cb (void *cls,
     return;
   }
 
-  type = *(enum TALER_Extension_Type *) extra;
+  GNUNET_assert (NULL != extra);
 
+  nbo_type = *(uint32_t *) extra;
+  type = (enum TALER_Extension_Type) ntohl (nbo_type);
 
   /* Get the corresponding extension */
   extension = TALER_extensions_get_by_type (type);
@@ -74,80 +79,118 @@ extension_update_event_cb (void *cls,
     return;
   }
 
-  // Get the config from the database as string
+  // Get the manifest from the database as string
   {
-    char *config_str = NULL;
+    char *manifest_str = NULL;
     enum GNUNET_DB_QueryStatus qs;
     json_error_t err;
-    json_t *config;
+    json_t *manifest_js;
     enum GNUNET_GenericReturnValue ret;
 
-    qs = TEH_plugin->get_extension_config (TEH_plugin->cls,
-                                           extension->name,
-                                           &config_str);
+    qs = TEH_plugin->get_extension_manifest (TEH_plugin->cls,
+                                             extension->name,
+                                             &manifest_str);
 
     if (qs < 0)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Couldn't get extension config\n");
+                  "Couldn't get extension manifest\n");
       GNUNET_break (0);
       return;
     }
 
     // No config found -> disable extension
-    if (NULL == config_str)
+    if (NULL == manifest_str)
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "No manifest found for extension %s, disabling it\n",
+                  extension->name);
       extension->disable ((struct TALER_Extension *) extension);
       return;
     }
 
     // Parse the string as JSON
-    config = json_loads (config_str, JSON_DECODE_ANY, &err);
-    if (NULL == config)
+    manifest_js = json_loads (manifest_str, JSON_DECODE_ANY, &err);
+    if (NULL == manifest_js)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to parse config for extension `%s' as JSON: %s (%s)\n",
+                  "Failed to parse manifest for extension `%s' as JSON: %s (%s)\n",
                   extension->name,
                   err.text,
                   err.source);
       GNUNET_break (0);
+      free (manifest_str);
       return;
     }
 
     // Call the parser for the extension
-    ret = extension->load_json_config (
-      (struct TALER_Extension *) extension,
-      config);
+    ret = extension->load_config (
+      json_object_get (manifest_js, "config"),
+      (struct TALER_Extension *) extension);
 
     if (GNUNET_OK != ret)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Couldn't parse configuration for extension %s from the database",
-                  extension->name);
+                  "Couldn't parse configuration for extension %s from the manifest in the database: %s\n",
+                  extension->name,
+                  manifest_str);
       GNUNET_break (0);
     }
+
+    free (manifest_str);
+    json_decref (manifest_js);
   }
 
   /* Special case age restriction: Update global flag and mask  */
   if (TALER_Extension_AgeRestriction == type)
   {
-    TEH_age_restriction_enabled =
-      TALER_extensions_age_restriction_is_enabled ();
+    const struct TALER_AgeRestrictionConfig *conf =
+      TALER_extensions_get_age_restriction_config ();
+    TEH_age_restriction_enabled = false;
+    if (NULL != conf)
+    {
+      TEH_age_restriction_enabled = extension->enabled;
+      TEH_age_restriction_config = *conf;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "[age restriction] DB event has changed the config to %s with mask: %s\n",
+                  TEH_age_restriction_enabled ? "enabled": "DISABLED",
+                  TALER_age_mask_to_string (&conf->mask));
+    }
   }
+
+  // Finally, call TEH_keys_update_states in order to refresh the cached
+  // values.
+  TEH_keys_update_states ();
 }
 
 
 enum GNUNET_GenericReturnValue
 TEH_extensions_init ()
 {
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_extension_age_restriction_register ());
-
   /* Set the event handler for updates */
   struct GNUNET_DB_EventHeaderP ev = {
     .size = htons (sizeof (ev)),
     .type = htons (TALER_DBEVENT_EXCHANGE_EXTENSIONS_UPDATED),
   };
+
+  /* Load the shared libraries first */
+  if (GNUNET_OK !=
+      TALER_extensions_init (TEH_cfg))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "failed to load extensions");
+    return GNUNET_SYSERR;
+  }
+
+  /* Check for age restriction */
+  {
+    const struct TALER_AgeRestrictionConfig *arc;
+
+    if (NULL !=
+        (arc = TALER_extensions_get_age_restriction_config ()))
+      TEH_age_restriction_config = *arc;
+  }
+
   extensions_eh = TEH_plugin->event_listen (TEH_plugin->cls,
                                             GNUNET_TIME_UNIT_FOREVER_REL,
                                             &ev,
@@ -159,17 +202,28 @@ TEH_extensions_init ()
     return GNUNET_SYSERR;
   }
 
-  /* FIXME: shall we load the extensions from the config right away?
-   * We do have to for now, as otherwise denominations with age restriction
-   * will not have the age mask set right upon initial generation.
-   */
-  TALER_extensions_load_taler_config (TEH_cfg);
-
   /* Trigger the initial load of configuration from the db */
-  for (const struct TALER_Extension *it = TALER_extensions_get_head ();
-       NULL != it->next;
+  for (const struct TALER_Extensions *it = TALER_extensions_get_head ();
+       NULL != it && NULL != it->extension;
        it = it->next)
-    extension_update_event_cb (NULL, &it->type, sizeof(it->type));
+  {
+    const struct TALER_Extension *ext = it->extension;
+    uint32_t typ = htonl (ext->type);
+    json_t *jmani;
+    char *manifest;
+
+    jmani = ext->manifest (ext);
+    manifest = json_dumps (jmani,
+                           JSON_COMPACT);
+    json_decref (jmani);
+    TEH_plugin->set_extension_manifest (TEH_plugin->cls,
+                                        ext->name,
+                                        manifest);
+    free (manifest);
+    extension_update_event_cb (NULL,
+                               &typ,
+                               sizeof(typ));
+  }
 
   return GNUNET_OK;
 }
@@ -187,4 +241,202 @@ TEH_extensions_done ()
 }
 
 
+/*
+ * @brief Execute database transactions for /extensions/policy_* POST requests.
+ *
+ * @param cls a `struct TALER_PolicyFulfillmentOutcome`
+ * @param connection MHD request context
+ * @param[out] mhd_ret set to MHD status on error
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+policy_fulfillment_transaction (
+  void *cls,
+  struct MHD_Connection *connection,
+  MHD_RESULT *mhd_ret)
+{
+  struct TALER_PolicyFulfillmentTransactionData *fulfillment = cls;
+
+  /* FIXME[oec]: use connection and mhd_ret? */
+  (void) connection;
+  (void) mhd_ret;
+
+  return TEH_plugin->add_policy_fulfillment_proof (TEH_plugin->cls,
+                                                   fulfillment);
+}
+
+
+/* FIXME[oec]-#7999: In this handler: do we transition correctly between states? */
+MHD_RESULT
+TEH_extensions_post_handler (
+  struct TEH_RequestContext *rc,
+  const json_t *root,
+  const char *const args[])
+{
+  const struct TALER_Extension *ext = NULL;
+  json_t *output;
+  struct TALER_PolicyDetails *policy_details = NULL;
+  size_t policy_details_count = 0;
+
+
+  if (NULL == args[0])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                       "/extensions/$EXTENSION");
+  }
+
+  ext = TALER_extensions_get_by_name (args[0]);
+  if (NULL == ext)
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                       "/extensions/$EXTENSION unknown");
+  }
+
+  if (NULL == ext->policy_post_handler)
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_IMPLEMENTED,
+                                       TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                       "POST /extensions/$EXTENSION not supported");
+
+  /*  Extract hash_codes and retrieve related policy_details from the DB */
+  {
+    enum GNUNET_GenericReturnValue ret;
+    enum GNUNET_DB_QueryStatus qs;
+    const char *error_msg;
+    struct GNUNET_HashCode *hcs;
+    size_t len;
+    json_t*val;
+    size_t idx;
+    json_t *jhash_codes = json_object_get (root,
+                                           "policy_hash_codes");
+    if (! json_is_array (jhash_codes))
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                         "policy_hash_codes are missing");
+
+    len = json_array_size (jhash_codes);
+    hcs = GNUNET_new_array (len,
+                            struct GNUNET_HashCode);
+    policy_details = GNUNET_new_array (len,
+                                       struct TALER_PolicyDetails);
+
+    json_array_foreach (jhash_codes, idx, val)
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto (NULL, &hcs[idx]),
+        GNUNET_JSON_spec_end ()
+      };
+
+      ret = GNUNET_JSON_parse (val,
+                               spec,
+                               &error_msg,
+                               NULL);
+      if (GNUNET_OK != ret)
+        break;
+
+      qs = TEH_plugin->get_policy_details (TEH_plugin->cls,
+                                           &hcs[idx],
+                                           &policy_details[idx]);
+      if (0 > qs)
+      {
+        GNUNET_free (hcs);
+        GNUNET_free (policy_details);
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_BAD_REQUEST,
+                                           TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                           "a policy_hash_code couldn't be found");
+      }
+
+      /* We proceed according to the state of fulfillment */
+      switch (policy_details[idx].fulfillment_state)
+      {
+      case TALER_PolicyFulfillmentReady:
+        break;
+      case TALER_PolicyFulfillmentInsufficient:
+        error_msg = "a policy is not yet fully funded";
+        ret = GNUNET_SYSERR;
+        break;
+      case TALER_PolicyFulfillmentTimeout:
+        error_msg = "a policy is has already timed out";
+        ret = GNUNET_SYSERR;
+        break;
+      case TALER_PolicyFulfillmentSuccess:
+        /* FIXME[oec]-#8001: Idempotency handling. */
+        GNUNET_break (0);
+        break;
+      case TALER_PolicyFulfillmentFailure:
+        /* FIXME[oec]-#7999: What to do in the failure case? */
+        GNUNET_break (0);
+        break;
+      default:
+        /* Unknown state */
+        GNUNET_assert (0);
+      }
+
+      if (GNUNET_OK != ret)
+        break;
+    }
+
+    GNUNET_free (hcs);
+
+    if (GNUNET_OK != ret)
+    {
+      GNUNET_free (policy_details);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_GENERIC_OPERATION_UNKNOWN,
+                                         error_msg);
+    }
+  }
+
+
+  if (GNUNET_OK !=
+      ext->policy_post_handler (root,
+                                &args[1],
+                                policy_details,
+                                policy_details_count,
+                                &output))
+  {
+    return TALER_MHD_reply_json_steal (
+      rc->connection,
+      output,
+      MHD_HTTP_BAD_REQUEST);
+  }
+
+  /* execute fulfillment transaction */
+  {
+    MHD_RESULT mhd_ret;
+    struct TALER_PolicyFulfillmentTransactionData fulfillment = {
+      .proof = root,
+      .timestamp = GNUNET_TIME_timestamp_get (),
+      .details = policy_details,
+      .details_count = policy_details_count
+    };
+
+    if (GNUNET_OK !=
+        TEH_DB_run_transaction (rc->connection,
+                                "execute policy fulfillment",
+                                TEH_MT_REQUEST_POLICY_FULFILLMENT,
+                                &mhd_ret,
+                                &policy_fulfillment_transaction,
+                                &fulfillment))
+    {
+      json_decref (output);
+      return mhd_ret;
+    }
+  }
+
+  return TALER_MHD_reply_json_steal (rc->connection,
+                                     output,
+                                     MHD_HTTP_OK);
+}
+
+
 /* end of taler-exchange-httpd_extensions.c */
diff --git a/src/exchange/taler-exchange-httpd_extensions.h b/src/exchange/taler-exchange-httpd_extensions.h
index 4659b653e..e435f8f03 100644
--- a/src/exchange/taler-exchange-httpd_extensions.h
+++ b/src/exchange/taler-exchange-httpd_extensions.h
@@ -40,4 +40,19 @@ TEH_extensions_init (void);
 void
 TEH_extensions_done (void);
 
+
+/**
+ * Handle POST "/extensions/..." requests.
+ *
+ * @param rc request context
+ * @param root uploaded JSON data
+ * @param args array of additional options
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_extensions_post_handler (
+  struct TEH_RequestContext *rc,
+  const json_t *root,
+  const char *const args[]);
+
 #endif
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 0fde1d673..0ec28e950 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2020-2022 Taler Systems SA
+   Copyright (C) 2020-2023 Taler Systems SA
 
    TALER 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
@@ -17,12 +17,15 @@
  * @file taler-exchange-httpd_keys.c
  * @brief management of our various keys
  * @author Christian Grothoff
+ * @author Özgür Kesim
  */
 #include "platform.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_dbevents.h"
 #include "taler-exchange-httpd.h"
+#include "taler-exchange-httpd_config.h"
 #include "taler-exchange-httpd_keys.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler_exchangedb_plugin.h"
@@ -43,24 +46,6 @@
 
 
 /**
- * Taler protocol version in the format CURRENT:REVISION:AGE
- * as used by GNU libtool.  See
- * https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
- *
- * Please be very careful when updating and follow
- * https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
- * precisely.  Note that this version has NOTHING to do with the
- * release version, and the format is NOT the same that semantic
- * versioning uses either.
- *
- * When changing this version, you likely want to also update
- * #TALER_PROTOCOL_CURRENT and #TALER_PROTOCOL_AGE in
- * exchange_api_handle.c!
- */
-#define EXCHANGE_PROTOCOL_VERSION "13:0:1"
-
-
-/**
  * Information about a denomination on offer by the denomination helper.
  */
 struct HelperDenomination
@@ -177,10 +162,9 @@ struct HelperSignkey
 
 
 /**
- * State associated with the crypto helpers / security modules.
- * Created per-thread, but NOT updated when the #key_generation
- * is updated (instead constantly kept in sync whenever
- * #TEH_keys_get_state() is called).
+ * State associated with the crypto helpers / security modules.  NOT updated
+ * when the #key_generation is updated (instead constantly kept in sync
+ * whenever #TEH_keys_get_state() is called).
  */
 struct HelperState
 {
@@ -284,7 +268,6 @@ struct SigningKey
 
 };
 
-
 struct TEH_KeyStateHandle
 {
 
@@ -407,13 +390,119 @@ struct SuspendedKeysRequests
 
 
 /**
+ * Information we track about wire fees.
+ */
+struct WireFeeSet
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct WireFeeSet *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct WireFeeSet *prev;
+
+  /**
+   * Actual fees.
+   */
+  struct TALER_WireFeeSet fees;
+
+  /**
+   * Start date of fee validity (inclusive).
+   */
+  struct GNUNET_TIME_Timestamp start_date;
+
+  /**
+   * End date of fee validity (exclusive).
+   */
+  struct GNUNET_TIME_Timestamp end_date;
+
+  /**
+   * Wire method the fees apply to.
+   */
+  char *method;
+};
+
+
+/**
+ * State we keep per thread to cache the /wire response.
+ */
+struct WireStateHandle
+{
+
+  /**
+   * JSON reply for /wire response.
+   */
+  json_t *json_reply;
+
+  /**
+   * ETag for this response (if any).
+   */
+  char *etag;
+
+  /**
+   * head of DLL of wire fees.
+   */
+  struct WireFeeSet *wfs_head;
+
+  /**
+   * Tail of DLL of wire fees.
+   */
+  struct WireFeeSet *wfs_tail;
+
+  /**
+   * Earliest timestamp of all the wire methods when we have no more fees.
+   */
+  struct GNUNET_TIME_Absolute cache_expiration;
+
+  /**
+   * @e cache_expiration time, formatted.
+   */
+  char dat[128];
+
+  /**
+   * For which (global) wire_generation was this data structure created?
+   * Used to check when we are outdated and need to be re-generated.
+   */
+  uint64_t wire_generation;
+
+  /**
+   * Is the wire data ready?
+   */
+  bool ready;
+
+};
+
+
+/**
+ * Stores the latest generation of our wire response.
+ */
+static struct WireStateHandle *wire_state;
+
+/**
+ * Handler listening for wire updates by other exchange
+ * services.
+ */
+static struct GNUNET_DB_EventHandler *wire_eh;
+
+/**
+ * Counter incremented whenever we have a reason to re-build the #wire_state
+ * because something external changed.
+ */
+static uint64_t wire_generation;
+
+
+/**
  * Stores the latest generation of our key state.
  */
 static struct TEH_KeyStateHandle *key_state;
 
 /**
  * Counter incremented whenever we have a reason to re-build the keys because
- * something external changed (in another thread).  See #TEH_keys_get_state() and
+ * something external changed.  See #TEH_keys_get_state() and
  * #TEH_keys_update_states() for uses of this variable.
  */
 static uint64_t key_generation;
@@ -458,6 +547,11 @@ static struct GNUNET_SCHEDULER_Task *keys_tt;
 static struct GNUNET_TIME_Relative signkey_legal_duration;
 
 /**
+ * What type of asset are we dealing with here?
+ */
+static char *asset_type;
+
+/**
  * RSA security module public key, all zero if not known.
  */
 static struct TALER_SecurityModulePublicKeyP denom_rsa_sm_pub;
@@ -479,6 +573,449 @@ static bool terminating;
 
 
 /**
+ * Free memory associated with @a wsh
+ *
+ * @param[in] wsh wire state to destroy
+ */
+static void
+destroy_wire_state (struct WireStateHandle *wsh)
+{
+  struct WireFeeSet *wfs;
+
+  while (NULL != (wfs = wsh->wfs_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (wsh->wfs_head,
+                                 wsh->wfs_tail,
+                                 wfs);
+    GNUNET_free (wfs->method);
+    GNUNET_free (wfs);
+  }
+  json_decref (wsh->json_reply);
+  GNUNET_free (wsh->etag);
+  GNUNET_free (wsh);
+}
+
+
+/**
+ * Function called whenever another exchange process has updated
+ * the wire data in the database.
+ *
+ * @param cls NULL
+ * @param extra unused
+ * @param extra_size number of bytes in @a extra unused
+ */
+static void
+wire_update_event_cb (void *cls,
+                      const void *extra,
+                      size_t extra_size)
+{
+  (void) cls;
+  (void) extra;
+  (void) extra_size;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Received /wire update event\n");
+  TEH_check_invariants ();
+  wire_generation++;
+  key_generation++;
+  TEH_resume_keys_requests (false);
+}
+
+
+enum GNUNET_GenericReturnValue
+TEH_wire_init ()
+{
+  struct GNUNET_DB_EventHeaderP es = {
+    .size = htons (sizeof (es)),
+    .type = htons (TALER_DBEVENT_EXCHANGE_KEYS_UPDATED),
+  };
+
+  wire_eh = TEH_plugin->event_listen (TEH_plugin->cls,
+                                      GNUNET_TIME_UNIT_FOREVER_REL,
+                                      &es,
+                                      &wire_update_event_cb,
+                                      NULL);
+  if (NULL == wire_eh)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+void
+TEH_wire_done ()
+{
+  if (NULL != wire_state)
+  {
+    destroy_wire_state (wire_state);
+    wire_state = NULL;
+  }
+  if (NULL != wire_eh)
+  {
+    TEH_plugin->event_listen_cancel (TEH_plugin->cls,
+                                     wire_eh);
+    wire_eh = NULL;
+  }
+}
+
+
+/**
+ * Add information about a wire account to @a cls.
+ *
+ * @param cls a `json_t *` object to expand with wire account details
+ * @param payto_uri the exchange bank account URI to add
+ * @param conversion_url URL of a conversion service, NULL if there is no conversion
+ * @param debit_restrictions JSON array with debit restrictions on the account
+ * @param credit_restrictions JSON array with credit restrictions on the account
+ * @param master_sig master key signature affirming that this is a bank
+ *                   account of the exchange (of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS)
+ * @param bank_label label the wallet should use to display the account, can be NULL
+ * @param priority priority for ordering bank account labels
+ */
+static void
+add_wire_account (void *cls,
+                  const char *payto_uri,
+                  const char *conversion_url,
+                  const json_t *debit_restrictions,
+                  const json_t *credit_restrictions,
+                  const struct TALER_MasterSignatureP *master_sig,
+                  const char *bank_label,
+                  int64_t priority)
+{
+  json_t *a = cls;
+
+  if (GNUNET_OK !=
+      TALER_exchange_wire_signature_check (
+        payto_uri,
+        conversion_url,
+        debit_restrictions,
+        credit_restrictions,
+        &TEH_master_public_key,
+        master_sig))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Database has wire account with invalid signature. Skipping entry. Did the exchange offline public key change?\n");
+    return;
+  }
+  if (0 !=
+      json_array_append_new (
+        a,
+        GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_string ("payto_uri",
+                                   payto_uri),
+          GNUNET_JSON_pack_allow_null (
+            GNUNET_JSON_pack_string ("conversion_url",
+                                     conversion_url)),
+          GNUNET_JSON_pack_allow_null (
+            GNUNET_JSON_pack_string ("bank_label",
+                                     bank_label)),
+          GNUNET_JSON_pack_int64 ("priority",
+                                  priority),
+          GNUNET_JSON_pack_array_incref ("debit_restrictions",
+                                         (json_t *) debit_restrictions),
+          GNUNET_JSON_pack_array_incref ("credit_restrictions",
+                                         (json_t *) credit_restrictions),
+          GNUNET_JSON_pack_data_auto ("master_sig",
+                                      master_sig))))
+  {
+    GNUNET_break (0);   /* out of memory!? */
+    return;
+  }
+}
+
+
+/**
+ * Closure for #add_wire_fee().
+ */
+struct AddContext
+{
+  /**
+   * Wire method the fees are for.
+   */
+  char *wire_method;
+
+  /**
+   * Wire state we are building.
+   */
+  struct WireStateHandle *wsh;
+
+  /**
+   * Array to append the fee to.
+   */
+  json_t *a;
+
+  /**
+   * Set to the maximum end-date seen.
+   */
+  struct GNUNET_TIME_Absolute max_seen;
+};
+
+
+/**
+ * Add information about a wire account to @a cls.
+ *
+ * @param cls a `struct AddContext`
+ * @param fees the wire fees we charge
+ * @param start_date from when are these fees valid (start date)
+ * @param end_date until when are these fees valid (end date, exclusive)
+ * @param master_sig master key signature affirming that this is the correct
+ *                   fee (of purpose #TALER_SIGNATURE_MASTER_WIRE_FEES)
+ */
+static void
+add_wire_fee (void *cls,
+              const struct TALER_WireFeeSet *fees,
+              struct GNUNET_TIME_Timestamp start_date,
+              struct GNUNET_TIME_Timestamp end_date,
+              const struct TALER_MasterSignatureP *master_sig)
+{
+  struct AddContext *ac = cls;
+  struct WireFeeSet *wfs;
+
+  if (GNUNET_OK !=
+      TALER_exchange_offline_wire_fee_verify (
+        ac->wire_method,
+        start_date,
+        end_date,
+        fees,
+        &TEH_master_public_key,
+        master_sig))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Database has wire fee with invalid signature. Skipping entry. Did the exchange offline public key change?\n");
+    return;
+  }
+  ac->max_seen = GNUNET_TIME_absolute_max (ac->max_seen,
+                                           end_date.abs_time);
+  wfs = GNUNET_new (struct WireFeeSet);
+  wfs->start_date = start_date;
+  wfs->end_date = end_date;
+  wfs->fees = *fees;
+  wfs->method = GNUNET_strdup (ac->wire_method);
+  GNUNET_CONTAINER_DLL_insert (ac->wsh->wfs_head,
+                               ac->wsh->wfs_tail,
+                               wfs);
+  if (0 !=
+      json_array_append_new (
+        ac->a,
+        GNUNET_JSON_PACK (
+          TALER_JSON_pack_amount ("wire_fee",
+                                  &fees->wire),
+          TALER_JSON_pack_amount ("closing_fee",
+                                  &fees->closing),
+          GNUNET_JSON_pack_timestamp ("start_date",
+                                      start_date),
+          GNUNET_JSON_pack_timestamp ("end_date",
+                                      end_date),
+          GNUNET_JSON_pack_data_auto ("sig",
+                                      master_sig))))
+  {
+    GNUNET_break (0);   /* out of memory!? */
+    return;
+  }
+}
+
+
+/**
+ * Create the /wire response from our database state.
+ *
+ * @return NULL on error
+ */
+static struct WireStateHandle *
+build_wire_state (void)
+{
+  json_t *wire_accounts_array;
+  json_t *wire_fee_object;
+  uint64_t wg = wire_generation; /* must be obtained FIRST */
+  enum GNUNET_DB_QueryStatus qs;
+  struct WireStateHandle *wsh;
+  json_t *wads;
+
+  wsh = GNUNET_new (struct WireStateHandle);
+  wsh->wire_generation = wg;
+  wire_accounts_array = json_array ();
+  GNUNET_assert (NULL != wire_accounts_array);
+  qs = TEH_plugin->get_wire_accounts (TEH_plugin->cls,
+                                      &add_wire_account,
+                                      wire_accounts_array);
+  if (0 > qs)
+  {
+    GNUNET_break (0);
+    json_decref (wire_accounts_array);
+    wsh->ready = false;
+    return wsh;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Build /wire data with %u accounts\n",
+              (unsigned int) json_array_size (wire_accounts_array));
+  wire_fee_object = json_object ();
+  GNUNET_assert (NULL != wire_fee_object);
+  wsh->cache_expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  {
+    json_t *account;
+    size_t index;
+
+    json_array_foreach (wire_accounts_array,
+                        index,
+                        account)
+    {
+      char *wire_method;
+      const char *payto_uri = json_string_value (json_object_get (account,
+                                                                  "payto_uri"));
+
+      GNUNET_assert (NULL != payto_uri);
+      wire_method = TALER_payto_get_method (payto_uri);
+      if (NULL == wire_method)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "No wire method in `%s'\n",
+                    payto_uri);
+        wsh->ready = false;
+        json_decref (wire_accounts_array);
+        json_decref (wire_fee_object);
+        return wsh;
+      }
+      if (NULL == json_object_get (wire_fee_object,
+                                   wire_method))
+      {
+        struct AddContext ac = {
+          .wire_method = wire_method,
+          .wsh = wsh,
+          .a = json_array ()
+        };
+
+        GNUNET_assert (NULL != ac.a);
+        qs = TEH_plugin->get_wire_fees (TEH_plugin->cls,
+                                        wire_method,
+                                        &add_wire_fee,
+                                        &ac);
+        if (0 > qs)
+        {
+          GNUNET_break (0);
+          json_decref (ac.a);
+          json_decref (wire_fee_object);
+          json_decref (wire_accounts_array);
+          GNUNET_free (wire_method);
+          wsh->ready = false;
+          return wsh;
+        }
+        if (0 != json_array_size (ac.a))
+        {
+          wsh->cache_expiration
+            = GNUNET_TIME_absolute_min (ac.max_seen,
+                                        wsh->cache_expiration);
+          GNUNET_assert (0 ==
+                         json_object_set_new (wire_fee_object,
+                                              wire_method,
+                                              ac.a));
+        }
+        else
+        {
+          json_decref (ac.a);
+        }
+      }
+      GNUNET_free (wire_method);
+    }
+  }
+
+  wads = json_array (); /* #7271 */
+  GNUNET_assert (NULL != wads);
+  wsh->json_reply = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_array_steal ("accounts",
+                                  wire_accounts_array),
+    GNUNET_JSON_pack_array_steal ("wads",
+                                  wads),
+    GNUNET_JSON_pack_object_steal ("fees",
+                                   wire_fee_object));
+  wsh->ready = true;
+  return wsh;
+}
+
+
+void
+TEH_wire_update_state (void)
+{
+  struct GNUNET_DB_EventHeaderP es = {
+    .size = htons (sizeof (es)),
+    .type = htons (TALER_DBEVENT_EXCHANGE_WIRE_UPDATED),
+  };
+
+  TEH_plugin->event_notify (TEH_plugin->cls,
+                            &es,
+                            NULL,
+                            0);
+  wire_generation++;
+  key_generation++;
+}
+
+
+/**
+ * Return the current key state for this thread.  Possibly
+ * re-builds the key state if we have reason to believe
+ * that something changed.
+ *
+ * @return NULL on error
+ */
+struct WireStateHandle *
+get_wire_state (void)
+{
+  struct WireStateHandle *old_wsh;
+
+  old_wsh = wire_state;
+  if ( (NULL == old_wsh) ||
+       (old_wsh->wire_generation < wire_generation) )
+  {
+    struct WireStateHandle *wsh;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Rebuilding /wire, generation upgrade from %llu to %llu\n",
+                (unsigned long long) (NULL == old_wsh) ? 0LL :
+                old_wsh->wire_generation,
+                (unsigned long long) wire_generation);
+    TEH_check_invariants ();
+    wsh = build_wire_state ();
+    wire_state = wsh;
+    if (NULL != old_wsh)
+      destroy_wire_state (old_wsh);
+    TEH_check_invariants ();
+    return wsh;
+  }
+  return old_wsh;
+}
+
+
+const struct TALER_WireFeeSet *
+TEH_wire_fees_by_time (
+  struct GNUNET_TIME_Timestamp ts,
+  const char *method)
+{
+  struct WireStateHandle *wsh = get_wire_state ();
+
+  for (struct WireFeeSet *wfs = wsh->wfs_head;
+       NULL != wfs;
+       wfs = wfs->next)
+  {
+    if (0 != strcmp (method,
+                     wfs->method))
+      continue;
+    if ( (GNUNET_TIME_timestamp_cmp (wfs->start_date,
+                                     >,
+                                     ts)) ||
+         (GNUNET_TIME_timestamp_cmp (ts,
+                                     >=,
+                                     wfs->end_date)) )
+      continue;
+    return &wfs->fees;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "No wire fees for method `%s' at %s configured\n",
+              method,
+              GNUNET_TIME_timestamp2s (ts));
+  return NULL;
+}
+
+
+/**
  * Function called to forcefully resume suspended keys requests.
  *
  * @param cls unused, NULL
@@ -578,12 +1115,20 @@ check_dk (void *cls,
 
   (void) cls;
   (void) hc;
-  GNUNET_assert (TALER_DENOMINATION_INVALID != dk->denom_pub.cipher);
-  if (TALER_DENOMINATION_RSA == dk->denom_pub.cipher)
+  switch (dk->denom_pub.bsign_pub_key->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     GNUNET_assert (GNUNET_CRYPTO_rsa_public_key_check (
-                     dk->denom_pub.details.rsa_public_key));
-  // nothing to do for TALER_DENOMINATION_CS
-  return GNUNET_OK;
+                     dk->denom_pub.bsign_pub_key->details.rsa_public_key));
+    return GNUNET_OK;
+  case GNUNET_CRYPTO_BSA_CS:
+    /* nothing to do for GNUNET_CRYPTO_BSA_CS */
+    return GNUNET_OK;
+  }
+  GNUNET_assert (0);
+  return GNUNET_SYSERR;
 }
 
 
@@ -751,7 +1296,7 @@ free_denom_cb (void *cls,
  * @param value the `struct HelperSignkey` to release
  * @return #GNUNET_OK (continue to iterate)
  */
-static int
+static enum GNUNET_GenericReturnValue
 free_esign_cb (void *cls,
                const struct GNUNET_PeerIdentity *pid,
                void *value)
@@ -814,13 +1359,10 @@ destroy_key_helpers (struct HelperState *hs)
  *    denomination.
  */
 static struct TALER_AgeMask
-load_age_mask (const char*section_name)
+load_age_mask (const char *section_name)
 {
   static const struct TALER_AgeMask null_mask = {0};
-  struct TALER_AgeMask age_mask = TALER_extensions_age_restriction_ageMask ();
-
-  if (age_mask.bits == 0)
-    return null_mask;
+  enum GNUNET_GenericReturnValue ret;
 
   if (GNUNET_OK != (GNUNET_CONFIGURATION_have_value (
                       TEH_cfg,
@@ -828,22 +1370,29 @@ load_age_mask (const char*section_name)
                       "AGE_RESTRICTED")))
     return null_mask;
 
+  if (GNUNET_SYSERR ==
+      (ret = GNUNET_CONFIGURATION_get_value_yesno (TEH_cfg,
+                                                   section_name,
+                                                   "AGE_RESTRICTED")))
   {
-    enum GNUNET_GenericReturnValue ret;
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section_name,
+                               "AGE_RESTRICTED",
+                               "Value must be YES or NO\n");
+    return null_mask;
+  }
 
-    if (GNUNET_SYSERR ==
-        (ret = GNUNET_CONFIGURATION_get_value_yesno (TEH_cfg,
-                                                     section_name,
-                                                     "AGE_RESTRICTED")))
-    {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                                 section_name,
-                                 "AGE_RESTRICTED",
-                                 "Value must be YES or NO\n");
-      return null_mask;
-    }
+  if (GNUNET_OK == ret)
+  {
+    if (! TEH_age_restriction_enabled)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "age restriction set in section %s, yet, age restriction is not enabled\n",
+                  section_name);
+    return TEH_age_restriction_config.mask;
   }
-  return age_mask;
+
+
+  return null_mask;
 }
 
 
@@ -860,7 +1409,7 @@ load_age_mask (const char*section_name)
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_rsa hash of the @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -872,7 +1421,7 @@ helper_rsa_cb (
   struct GNUNET_TIME_Timestamp start_time,
   struct GNUNET_TIME_Relative validity_duration,
   const struct TALER_RsaPubHashP *h_rsa,
-  const struct TALER_DenominationPublicKey *denom_pub,
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub,
   const struct TALER_SecurityModulePublicKeyP *sm_pub,
   const struct TALER_SecurityModuleSignatureP *sm_sig)
 {
@@ -902,10 +1451,9 @@ helper_rsa_cb (
   hd->validity_duration = validity_duration;
   hd->h_details.h_rsa = *h_rsa;
   hd->sm_sig = *sm_sig;
-  GNUNET_assert (TALER_DENOMINATION_RSA == denom_pub->cipher);
-  TALER_denom_pub_deep_copy (&hd->denom_pub,
-                             denom_pub);
-  GNUNET_assert (TALER_DENOMINATION_RSA == hd->denom_pub.cipher);
+  GNUNET_assert (GNUNET_CRYPTO_BSA_RSA == bs_pub->cipher);
+  hd->denom_pub.bsign_pub_key =
+    GNUNET_CRYPTO_bsign_pub_incref (bs_pub);
   /* load the age mask for the denomination, if applicable */
   hd->denom_pub.age_mask = load_age_mask (section_name);
   TALER_denom_pub_hash (&hd->denom_pub,
@@ -941,7 +1489,7 @@ helper_rsa_cb (
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_cs hash of the @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -953,7 +1501,7 @@ helper_cs_cb (
   struct GNUNET_TIME_Timestamp start_time,
   struct GNUNET_TIME_Relative validity_duration,
   const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_DenominationPublicKey *denom_pub,
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub,
   const struct TALER_SecurityModulePublicKeyP *sm_pub,
   const struct TALER_SecurityModuleSignatureP *sm_sig)
 {
@@ -983,9 +1531,9 @@ helper_cs_cb (
   hd->validity_duration = validity_duration;
   hd->h_details.h_cs = *h_cs;
   hd->sm_sig = *sm_sig;
-  GNUNET_assert (TALER_DENOMINATION_CS == denom_pub->cipher);
-  TALER_denom_pub_deep_copy (&hd->denom_pub,
-                             denom_pub);
+  GNUNET_assert (GNUNET_CRYPTO_BSA_CS == bs_pub->cipher);
+  hd->denom_pub.bsign_pub_key
+    = GNUNET_CRYPTO_bsign_pub_incref (bs_pub);
   /* load the age mask for the denomination, if applicable */
   hd->denom_pub.age_mask = load_age_mask (section_name);
   TALER_denom_pub_hash (&hd->denom_pub,
@@ -1091,6 +1639,7 @@ setup_key_helpers (struct HelperState *hs)
     = GNUNET_CONTAINER_multipeermap_create (32,
                                             GNUNET_NO /* MUST BE NO! */);
   hs->rsadh = TALER_CRYPTO_helper_rsa_connect (TEH_cfg,
+                                               "taler-exchange",
                                                &helper_rsa_cb,
                                                hs);
   if (NULL == hs->rsadh)
@@ -1099,6 +1648,7 @@ setup_key_helpers (struct HelperState *hs)
     return GNUNET_SYSERR;
   }
   hs->csdh = TALER_CRYPTO_helper_cs_connect (TEH_cfg,
+                                             "taler-exchange",
                                              &helper_cs_cb,
                                              hs);
   if (NULL == hs->csdh)
@@ -1107,6 +1657,7 @@ setup_key_helpers (struct HelperState *hs)
     return GNUNET_SYSERR;
   }
   hs->esh = TALER_CRYPTO_helper_esign_connect (TEH_cfg,
+                                               "taler-exchange",
                                                &helper_esign_cb,
                                                hs);
   if (NULL == hs->esh)
@@ -1276,6 +1827,17 @@ TEH_keys_init ()
                                "SIGNKEY_LEGAL_DURATION");
     return GNUNET_SYSERR;
   }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (TEH_cfg,
+                                             "exchange",
+                                             "ASSET_TYPE",
+                                             &asset_type))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
+                               "exchange",
+                               "ASSET_TYPE");
+    asset_type = GNUNET_strdup ("fiat");
+  }
   keys_eh = TEH_plugin->event_listen (TEH_plugin->cls,
                                       GNUNET_TIME_UNIT_FOREVER_REL,
                                       &es,
@@ -1336,7 +1898,25 @@ denomination_info_cb (
   struct TEH_KeyStateHandle *ksh = cls;
   struct TEH_DenominationKey *dk;
 
-  GNUNET_assert (TALER_DENOMINATION_INVALID != denom_pub->cipher);
+  if (GNUNET_OK !=
+      TALER_exchange_offline_denom_validity_verify (
+        h_denom_pub,
+        meta->start,
+        meta->expire_withdraw,
+        meta->expire_deposit,
+        meta->expire_legal,
+        &meta->value,
+        &meta->fees,
+        &TEH_master_public_key,
+        master_sig))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Database has denomination with invalid signature. Skipping entry. Did the exchange offline public key change?\n");
+    return;
+  }
+
+  GNUNET_assert (GNUNET_CRYPTO_BSA_INVALID !=
+                 denom_pub->bsign_pub_key->cipher);
   if (GNUNET_TIME_absolute_is_zero (meta->start.abs_time) ||
       GNUNET_TIME_absolute_is_zero (meta->expire_withdraw.abs_time) ||
       GNUNET_TIME_absolute_is_zero (meta->expire_deposit.abs_time) ||
@@ -1348,8 +1928,8 @@ denomination_info_cb (
     return;
   }
   dk = GNUNET_new (struct TEH_DenominationKey);
-  TALER_denom_pub_deep_copy (&dk->denom_pub,
-                             denom_pub);
+  TALER_denom_pub_copy (&dk->denom_pub,
+                        denom_pub);
   dk->h_denom_pub = *h_denom_pub;
   dk->meta = *meta;
   dk->master_sig = *master_sig;
@@ -1384,6 +1964,19 @@ signkey_info_cb (
   struct SigningKey *sk;
   struct GNUNET_PeerIdentity pid;
 
+  if (GNUNET_OK !=
+      TALER_exchange_offline_signkey_validity_verify (
+        exchange_pub,
+        meta->start,
+        meta->expire_sign,
+        meta->expire_legal,
+        &TEH_master_public_key,
+        master_sig))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Database has signing key with invalid signature. Skipping entry. Did the exchange offline public key change?\n");
+    return;
+  }
   sk = GNUNET_new (struct SigningKey);
   sk->exchange_pub = *exchange_pub;
   sk->meta = *meta;
@@ -1665,14 +2258,14 @@ add_denom_key_cb (void *cls,
 /**
  * Add the headers we want to set for every /keys response.
  *
- * @param ksh the key state to use
+ * @param cls the key state to use
  * @param[in,out] response the response to modify
- * @return #GNUNET_OK on success
  */
-static enum GNUNET_GenericReturnValue
-setup_general_response_headers (struct TEH_KeyStateHandle *ksh,
+static void
+setup_general_response_headers (void *cls,
                                 struct MHD_Response *response)
 {
+  struct TEH_KeyStateHandle *ksh = cls;
   char dat[128];
 
   TALER_MHD_add_global_headers (response);
@@ -1680,27 +2273,38 @@ setup_general_response_headers (struct TEH_KeyStateHandle *ksh,
                 MHD_add_response_header (response,
                                          MHD_HTTP_HEADER_CONTENT_TYPE,
                                          "application/json"));
-  TALER_MHD_get_date_string (ksh->reload_time.abs_time,
-                             dat);
   GNUNET_break (MHD_YES ==
                 MHD_add_response_header (response,
-                                         MHD_HTTP_HEADER_LAST_MODIFIED,
-                                         dat));
+                                         MHD_HTTP_HEADER_CACHE_CONTROL,
+                                         "public,must-revalidate,max-age=86400"));
   if (! GNUNET_TIME_relative_is_zero (ksh->rekey_frequency))
   {
     struct GNUNET_TIME_Relative r;
     struct GNUNET_TIME_Absolute a;
+    struct GNUNET_TIME_Timestamp km;
     struct GNUNET_TIME_Timestamp m;
+    struct GNUNET_TIME_Timestamp we;
 
     r = GNUNET_TIME_relative_min (TEH_max_keys_caching,
                                   ksh->rekey_frequency);
     a = GNUNET_TIME_relative_to_absolute (r);
-    m = GNUNET_TIME_absolute_to_timestamp (a);
+    /* Round up to next full day to ensure the expiration
+       time does not become a fingerprint! */
+    a = GNUNET_TIME_absolute_round_down (a,
+                                         GNUNET_TIME_UNIT_DAYS);
+    a = GNUNET_TIME_absolute_add (a,
+                                  GNUNET_TIME_UNIT_DAYS);
+    km = GNUNET_TIME_absolute_to_timestamp (a);
+    we = GNUNET_TIME_absolute_to_timestamp (wire_state->cache_expiration);
+    m = GNUNET_TIME_timestamp_min (we,
+                                   km);
     TALER_MHD_get_date_string (m.abs_time,
                                dat);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Setting /keys 'Expires' header to '%s'\n",
-                dat);
+                "Setting /keys 'Expires' header to '%s' (rekey frequency is %s)\n",
+                dat,
+                GNUNET_TIME_relative2s (ksh->rekey_frequency,
+                                        false));
     GNUNET_break (MHD_YES ==
                   MHD_add_response_header (response,
                                            MHD_HTTP_HEADER_EXPIRES,
@@ -1714,12 +2318,27 @@ setup_general_response_headers (struct TEH_KeyStateHandle *ksh,
                 MHD_add_response_header (response,
                                          MHD_HTTP_HEADER_VARY,
                                          MHD_HTTP_HEADER_ACCEPT_ENCODING));
-  /* Information is always public, revalidate after 1 hour */
-  GNUNET_break (MHD_YES ==
-                MHD_add_response_header (response,
-                                         MHD_HTTP_HEADER_CACHE_CONTROL,
-                                         "public,max-age=3600"));
-  return GNUNET_OK;
+}
+
+
+/**
+ * Function called with wallet balance thresholds.
+ *
+ * @param[in,out] cls a `json **` where to put the array of json amounts discovered
+ * @param threshold another threshold amount to add
+ */
+static void
+wallet_threshold_cb (void *cls,
+                     const struct TALER_Amount *threshold)
+{
+  json_t **ret = cls;
+
+  if (NULL == *ret)
+    *ret = json_array ();
+  GNUNET_assert (0 ==
+                 json_array_append_new (*ret,
+                                        TALER_JSON_from_amount (
+                                          threshold)));
 }
 
 
@@ -1728,38 +2347,46 @@ setup_general_response_headers (struct TEH_KeyStateHandle *ksh,
  * @a recoup and @a denoms.
  *
  * @param[in,out] ksh key state handle we build @a krd for
- * @param[in] denom_keys_hash hash over all the denominatoin keys in @a denoms and age_restricted_denoms
- * @param last_cpd timestamp to use
- * @param signkeys list of sign keys to return
- * @param recoup list of revoked keys to return
- * @param denoms list of denominations to return
- * @param age_restricted_denoms list of age restricted denominations to return, can be NULL
+ * @param[in] denom_keys_hash hash over all the denomination keys in @a denoms
+ * @param last_cherry_pick_date timestamp to use
+ * @param[in,out] signkeys list of sign keys to return
+ * @param[in,out] recoup list of revoked keys to return
+ * @param[in,out] grouped_denominations list of grouped denominations to return
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
 create_krd (struct TEH_KeyStateHandle *ksh,
             const struct GNUNET_HashCode *denom_keys_hash,
-            struct GNUNET_TIME_Timestamp last_cpd,
+            struct GNUNET_TIME_Timestamp last_cherry_pick_date,
             json_t *signkeys,
             json_t *recoup,
-            json_t *denoms,
-            json_t *age_restricted_denoms)
+            json_t *grouped_denominations)
 {
   struct KeysResponseData krd;
   struct TALER_ExchangePublicKeyP exchange_pub;
   struct TALER_ExchangeSignatureP exchange_sig;
+  struct WireStateHandle *wsh;
   json_t *keys;
 
-  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (last_cpd.abs_time));
+  wsh = get_wire_state ();
+  if (! wsh->ready)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
+                   last_cherry_pick_date.abs_time));
   GNUNET_assert (NULL != signkeys);
   GNUNET_assert (NULL != recoup);
-  GNUNET_assert (NULL != denoms);
+  GNUNET_assert (NULL != grouped_denominations);
   GNUNET_assert (NULL != ksh->auditors);
   GNUNET_assert (NULL != TEH_currency);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Creating /keys at cherry pick date %s\n",
-              GNUNET_TIME_timestamp2s (last_cpd));
-  /* Sign hash over denomination keys */
+              GNUNET_TIME_timestamp2s (last_cherry_pick_date));
+
+  /* Sign hash over master signatures of all denomination keys until this time
+     (in reverse order). */
   {
     enum TALER_ErrorCode ec;
 
@@ -1768,7 +2395,7 @@ create_krd (struct TEH_KeyStateHandle *ksh,
            TALER_exchange_online_key_set_sign (
              &TEH_keys_exchange_sign2_,
              ksh,
-             last_cpd,
+             last_cherry_pick_date,
              denom_keys_hash,
              &exchange_pub,
              &exchange_sig)))
@@ -1779,6 +2406,7 @@ create_krd (struct TEH_KeyStateHandle *ksh,
       return GNUNET_SYSERR;
     }
   }
+
   {
     const struct SigningKey *sk;
 
@@ -1789,11 +2417,33 @@ create_krd (struct TEH_KeyStateHandle *ksh,
                                                         ksh->signature_expires);
   }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Build /keys data with %u wire accounts\n",
+              (unsigned int) json_array_size (
+                json_object_get (wsh->json_reply,
+                                 "accounts")));
+
   keys = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_string ("version",
                              EXCHANGE_PROTOCOL_VERSION),
+    GNUNET_JSON_pack_string ("base_url",
+                             TEH_base_url),
     GNUNET_JSON_pack_string ("currency",
                              TEH_currency),
+    GNUNET_JSON_pack_object_steal (
+      "currency_specification",
+      TALER_CONFIG_currency_specs_to_json (TEH_cspec)),
+    TALER_JSON_pack_amount ("stefan_abs",
+                            &TEH_stefan_abs),
+    TALER_JSON_pack_amount ("stefan_log",
+                            &TEH_stefan_log),
+    GNUNET_JSON_pack_double ("stefan_lin",
+                             (double) TEH_stefan_lin),
+    GNUNET_JSON_pack_string ("asset_type",
+                             asset_type),
+    GNUNET_JSON_pack_bool ("rewards_allowed",
+                           GNUNET_YES ==
+                           TEH_enable_rewards),
     GNUNET_JSON_pack_data_auto ("master_public_key",
                                 &TEH_master_public_key),
     GNUNET_JSON_pack_time_rel ("reserve_closing_delay",
@@ -1802,120 +2452,106 @@ create_krd (struct TEH_KeyStateHandle *ksh,
                                    signkeys),
     GNUNET_JSON_pack_array_incref ("recoup",
                                    recoup),
-    GNUNET_JSON_pack_array_incref ("denoms",
-                                   denoms),
+    GNUNET_JSON_pack_array_incref ("wads",
+                                   json_object_get (wsh->json_reply,
+                                                    "wads")),
+    GNUNET_JSON_pack_array_incref ("accounts",
+                                   json_object_get (wsh->json_reply,
+                                                    "accounts")),
+    GNUNET_JSON_pack_object_incref ("wire_fees",
+                                    json_object_get (wsh->json_reply,
+                                                     "fees")),
+    GNUNET_JSON_pack_array_incref ("denominations",
+                                   grouped_denominations),
     GNUNET_JSON_pack_array_incref ("auditors",
                                    ksh->auditors),
     GNUNET_JSON_pack_array_incref ("global_fees",
                                    ksh->global_fees),
     GNUNET_JSON_pack_timestamp ("list_issue_date",
-                                last_cpd),
-    GNUNET_JSON_pack_data_auto ("eddsa_pub",
+                                last_cherry_pick_date),
+    GNUNET_JSON_pack_data_auto ("exchange_pub",
                                 &exchange_pub),
-    GNUNET_JSON_pack_data_auto ("eddsa_sig",
+    GNUNET_JSON_pack_data_auto ("exchange_sig",
                                 &exchange_sig));
   GNUNET_assert (NULL != keys);
 
   /* Set wallet limit if KYC is configured */
-  if ( (TEH_KYC_NONE != TEH_kyc_config.mode) &&
-       (GNUNET_OK ==
-        TALER_amount_is_valid (&TEH_kyc_config.wallet_balance_limit)) )
   {
-    GNUNET_assert (
-      0 ==
-      json_object_set_new (
-        keys,
-        "wallet_balance_limit_without_kyc",
-        TALER_JSON_from_amount (
-          &TEH_kyc_config.wallet_balance_limit)));
+    json_t *wblwk = NULL;
+
+    TALER_KYCLOGIC_kyc_iterate_thresholds (
+      TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE,
+      &wallet_threshold_cb,
+      &wblwk);
+    if (NULL != wblwk)
+      GNUNET_assert (
+        0 ==
+        json_object_set_new (
+          keys,
+          "wallet_balance_limit_without_kyc",
+          wblwk));
   }
 
   /* Signal support for the configured, enabled extensions. */
   {
     json_t *extensions = json_object ();
     bool has_extensions = false;
-    bool age_restriction_enabled = false;
 
+    GNUNET_assert (NULL != extensions);
     /* Fill in the configurations of the enabled extensions */
-    for (const struct TALER_Extension *extension = TALER_extensions_get_head ();
-         NULL != extension;
-         extension = extension->next)
+    for (const struct TALER_Extensions *iter = TALER_extensions_get_head ();
+         NULL != iter && NULL != iter->extension;
+         iter = iter->next)
     {
-      json_t *ext;
-      json_t *config_json;
+      const struct TALER_Extension *extension = iter->extension;
+      json_t *manifest;
       int r;
 
-      /* skip if not configured == disabled */
-      if (NULL == extension->config ||
-          NULL == extension->config_json)
+      /* skip if not enabled */
+      if (! extension->enabled)
         continue;
 
       /* flag our findings so far */
       has_extensions = true;
-      age_restriction_enabled = (extension->type ==
-                                 TALER_Extension_AgeRestriction);
 
-      GNUNET_assert (NULL != extension->config_json);
 
-      config_json = json_copy (extension->config_json);
-      GNUNET_assert (NULL != config_json);
-
-      ext = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_bool ("critical",
-                               extension->critical),
-        GNUNET_JSON_pack_string ("version",
-                                 extension->version),
-        GNUNET_JSON_pack_object_steal ("config",
-                                       config_json)
-        );
-      GNUNET_assert (NULL != ext);
+      manifest = extension->manifest (extension);
+      GNUNET_assert (manifest);
 
       r = json_object_set_new (
         extensions,
         extension->name,
-        ext);
+        manifest);
       GNUNET_assert (0 == r);
     }
 
-    /* Update the keys object with the extensions */
+    /* Update the keys object with the extensions and its signature */
     if (has_extensions)
     {
       json_t *sig;
       int r;
 
-      r = json_object_set (
+      r = json_object_set_new (
         keys,
         "extensions",
         extensions);
       GNUNET_assert (0 == r);
 
-      /* add extensions_sig */
-      sig = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("extensions_sig",
-                                    &TEH_extensions_sig));
+      /* Add the signature of the extensions, if it is not zero */
+      if (TEH_extensions_signed)
+      {
+        sig = GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_data_auto ("extensions_sig",
+                                      &TEH_extensions_sig));
 
-      /* update the keys object with extensions_sig */
-      r = json_object_update (keys, sig);
-      GNUNET_assert (0 == r);
+        r = json_object_update (keys, sig);
+        GNUNET_assert (0 == r);
+      }
     }
     else
     {
       json_decref (extensions);
     }
-
-    // Special case for age restrictions: if enabled, provide the list of
-    // age-restricted denominations.
-    if (age_restriction_enabled &&
-        NULL != age_restricted_denoms)
-    {
-      GNUNET_assert (
-        0 ==
-        json_object_set (
-          keys,
-          "age_restricted_denoms",
-          age_restricted_denoms));
-    }
-
   }
 
 
@@ -1957,9 +2593,9 @@ create_krd (struct TEH_KeyStateHandle *ksh,
                                          keys_json,
                                          MHD_RESPMEM_MUST_FREE);
     GNUNET_assert (NULL != krd.response_uncompressed);
-    GNUNET_assert (GNUNET_OK ==
-                   setup_general_response_headers (ksh,
-                                                   krd.response_uncompressed));
+    setup_general_response_headers (ksh,
+                                    krd.response_uncompressed);
+    /* Information is always public, revalidate after 1 day */
     GNUNET_break (MHD_YES ==
                   MHD_add_response_header (krd.response_uncompressed,
                                            MHD_HTTP_HEADER_ETAG,
@@ -1979,16 +2615,16 @@ create_krd (struct TEH_KeyStateHandle *ksh,
                      MHD_add_response_header (krd.response_compressed,
                                               MHD_HTTP_HEADER_CONTENT_ENCODING,
                                               "deflate")) );
-    GNUNET_assert (GNUNET_OK ==
-                   setup_general_response_headers (ksh,
-                                                   krd.response_compressed));
+    setup_general_response_headers (ksh,
+                                    krd.response_compressed);
+    /* Information is always public, revalidate after 1 day */
     GNUNET_break (MHD_YES ==
                   MHD_add_response_header (krd.response_compressed,
                                            MHD_HTTP_HEADER_ETAG,
                                            etag));
     krd.etag = GNUNET_strdup (etag);
   }
-  krd.cherry_pick_date = last_cpd;
+  krd.cherry_pick_date = last_cherry_pick_date;
   GNUNET_array_append (ksh->krd_array,
                        ksh->krd_array_length,
                        krd);
@@ -1997,6 +2633,194 @@ create_krd (struct TEH_KeyStateHandle *ksh,
 
 
 /**
+ * Element in the `struct SignatureContext` array.
+ */
+struct SignatureElement
+{
+
+  /**
+   * Offset of the denomination in the group array,
+   * for sorting (2nd rank, ascending).
+   */
+  unsigned int offset;
+
+  /**
+   * Offset of the group in the denominations array,
+   * for sorting (2nd rank, ascending).
+   */
+  unsigned int group_offset;
+
+  /**
+   * Pointer to actual master signature to hash over.
+   */
+  struct TALER_MasterSignatureP master_sig;
+};
+
+/**
+ * Context for collecting the array of master signatures
+ * needed to verify the exchange_sig online signature.
+ */
+struct SignatureContext
+{
+  /**
+   * Array of signatures to hash over.
+   */
+  struct SignatureElement *elements;
+
+  /**
+   * Write offset in the @e elements array.
+   */
+  unsigned int elements_pos;
+
+  /**
+   * Allocated space for @e elements.
+   */
+  unsigned int elements_size;
+};
+
+
+/**
+ * Determine order to sort two elements by before
+ * we hash the master signatures.  Used for
+ * sorting with qsort().
+ *
+ * @param a pointer to a `struct SignatureElement`
+ * @param b pointer to a `struct SignatureElement`
+ * @return 0 if equal, -1 if a < b, 1 if a > b.
+ */
+static int
+signature_context_sort_cb (const void *a,
+                           const void *b)
+{
+  const struct SignatureElement *sa = a;
+  const struct SignatureElement *sb = b;
+
+  if (sa->group_offset < sb->group_offset)
+    return -1;
+  if (sa->group_offset > sb->group_offset)
+    return 1;
+  if (sa->offset < sb->offset)
+    return -1;
+  if (sa->offset > sb->offset)
+    return 1;
+  /* We should never have two disjoint elements
+     with same time and offset */
+  GNUNET_assert (sa == sb);
+  return 0;
+}
+
+
+/**
+ * Append a @a master_sig to the @a sig_ctx using the
+ * given attributes for (later) sorting.
+ *
+ * @param[in,out] sig_ctx signature context to update
+ * @param group_offset offset for the group
+ * @param offset offset for the entry
+ * @param master_sig master signature for the entry
+ */
+static void
+append_signature (struct SignatureContext *sig_ctx,
+                  unsigned int group_offset,
+                  unsigned int offset,
+                  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct SignatureElement *element;
+  unsigned int new_size;
+
+  if (sig_ctx->elements_pos == sig_ctx->elements_size)
+  {
+    if (0 == sig_ctx->elements_size)
+      new_size = 1024;
+    else
+      new_size = sig_ctx->elements_size * 2;
+    GNUNET_array_grow (sig_ctx->elements,
+                       sig_ctx->elements_size,
+                       new_size);
+  }
+  element = &sig_ctx->elements[sig_ctx->elements_pos++];
+  element->offset = offset;
+  element->group_offset = group_offset;
+  element->master_sig = *master_sig;
+}
+
+
+/**
+ *GroupData is the value we store for each group meta-data */
+struct GroupData
+{
+  /**
+   * The json blob with the group meta-data and list of denominations
+   */
+  json_t *json;
+
+  /**
+   * List of denominations for the group,
+   * included in @e json, do not free separately!
+   */
+  json_t *list;
+
+  /**
+   * Offset of the group in the final array.
+   */
+  unsigned int group_off;
+
+};
+
+
+/**
+ * Helper function called to clean up the group data
+ * in the denominations_by_group below.
+ *
+ * @param cls unused
+ * @param key unused
+ * @param value a `struct GroupData` to free
+ * @return #GNUNET_OK
+ */
+static int
+free_group (void *cls,
+            const struct GNUNET_HashCode *key,
+            void *value)
+{
+  struct GroupData *gd = value;
+
+  (void) cls;
+  (void) key;
+  GNUNET_free (gd);
+  return GNUNET_OK;
+}
+
+
+static void
+compute_msig_hash (struct SignatureContext *sig_ctx,
+                   struct GNUNET_HashCode *hc)
+{
+  struct GNUNET_HashContext *hash_context;
+
+  hash_context = GNUNET_CRYPTO_hash_context_start ();
+  qsort (sig_ctx->elements,
+         sig_ctx->elements_pos,
+         sizeof (struct SignatureElement),
+         &signature_context_sort_cb);
+  for (unsigned int i = 0; i<sig_ctx->elements_pos; i++)
+  {
+    struct SignatureElement *element = &sig_ctx->elements[i];
+
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Adding %u,%u,%s\n",
+                element->group_offset,
+                element->offset,
+                TALER_B2S (&element->master_sig));
+    GNUNET_CRYPTO_hash_context_read (hash_context,
+                                     &element->master_sig,
+                                     sizeof (element->master_sig));
+  }
+  GNUNET_CRYPTO_hash_context_finish (hash_context,
+                                     hc);
+}
+
+
+/**
  * Update the "/keys" responses in @a ksh, computing the detailed replies.
  *
  * This function is to recompute all (including cherry-picked) responses we
@@ -2008,24 +2832,50 @@ create_krd (struct TEH_KeyStateHandle *ksh,
 static enum GNUNET_GenericReturnValue
 finish_keys_response (struct TEH_KeyStateHandle *ksh)
 {
+  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
   json_t *recoup;
-  struct SignKeyCtx sctx;
-  json_t *denoms = NULL;
-  json_t *age_restricted_denoms = NULL;
-  struct GNUNET_TIME_Timestamp last_cpd;
+  struct SignKeyCtx sctx = {
+    .min_sk_frequency = GNUNET_TIME_UNIT_FOREVER_REL
+  };
+  json_t *grouped_denominations = NULL;
+  struct GNUNET_TIME_Timestamp last_cherry_pick_date;
   struct GNUNET_CONTAINER_Heap *heap;
-  struct GNUNET_HashContext *hash_context = NULL;
-  struct GNUNET_HashContext *hash_context_restricted = NULL;
-  bool have_age_restricted_denoms = false;
+  struct SignatureContext sig_ctx = { 0 };
+  /* Remember if we have any denomination with age restriction */
+  bool has_age_restricted_denomination = false;
+  struct WireStateHandle *wsh;
 
+  wsh = get_wire_state ();
+  if (! wsh->ready)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 ==
+      json_array_size (json_object_get (wsh->json_reply,
+                                        "accounts")) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No wire accounts available. Refusing to generate /keys response.\n");
+    return GNUNET_NO;
+  }
   sctx.signkeys = json_array ();
   GNUNET_assert (NULL != sctx.signkeys);
-  sctx.min_sk_frequency = GNUNET_TIME_UNIT_FOREVER_REL;
+  recoup = json_array ();
+  GNUNET_assert (NULL != recoup);
+  grouped_denominations = json_array ();
+  GNUNET_assert (NULL != grouped_denominations);
+
   GNUNET_CONTAINER_multipeermap_iterate (ksh->signkey_map,
                                          &add_sign_key_cb,
                                          &sctx);
-  recoup = json_array ();
-  GNUNET_assert (NULL != recoup);
+  if (0 == json_array_size (sctx.signkeys))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No online signing keys available. Refusing to generate /keys response.\n");
+    ret = GNUNET_NO;
+    goto CLEANUP;
+  }
   heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MAX);
   {
     struct DenomKeyCtx dkc = {
@@ -2042,81 +2892,175 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
                                   sctx.min_sk_frequency);
   }
 
-  denoms = json_array ();
-  GNUNET_assert (NULL != denoms);
-  hash_context = GNUNET_CRYPTO_hash_context_start ();
-
-  /* If age restriction is enabled, initialize the array of age restricted
-   denoms  and prepare a hash for them, separate from the others.  We will join
-   those hashes afterwards.*/
-  if (0)
-  {
-    age_restricted_denoms = json_array ();
-    GNUNET_assert (NULL != age_restricted_denoms);
-    hash_context_restricted = GNUNET_CRYPTO_hash_context_start ();
-  }
-
-  last_cpd = GNUNET_TIME_UNIT_ZERO_TS;
+  last_cherry_pick_date = GNUNET_TIME_UNIT_ZERO_TS;
 
   {
     struct TEH_DenominationKey *dk;
+    struct GNUNET_CONTAINER_MultiHashMap *denominations_by_group;
 
-    /* heap = min heap, sorted by start time */
+    denominations_by_group =
+      GNUNET_CONTAINER_multihashmap_create (1024,
+                                            GNUNET_NO /* NO, because keys are only on the stack */);
+    /* heap = max heap, sorted by start time */
     while (NULL != (dk = GNUNET_CONTAINER_heap_remove_root (heap)))
     {
-      if (GNUNET_TIME_timestamp_cmp (last_cpd,
+      if (GNUNET_TIME_timestamp_cmp (last_cherry_pick_date,
                                      !=,
                                      dk->meta.start) &&
-          (! GNUNET_TIME_absolute_is_zero (last_cpd.abs_time)) )
+          (! GNUNET_TIME_absolute_is_zero (last_cherry_pick_date.abs_time)) )
       {
-        struct GNUNET_HashCode hc;
-
-        /* FIXME-oec: Do we need to take hash_context_restricted into account
-         * in this if-branch!?  Current tests suggests: no, (they don't fail).
-         * But something seems to be odd about only finishing hash_context.
+        /*
+         * This is not the first entry in the heap (because last_cherry_pick_date !=
+         * GNUNET_TIME_UNIT_ZERO_TS) and the previous entry had a different
+         * start time.  Therefore, we create a new entry in ksh.
          */
+        struct GNUNET_HashCode hc;
 
-        GNUNET_CRYPTO_hash_context_finish (
-          GNUNET_CRYPTO_hash_context_copy (hash_context),
-          &hc);
+        compute_msig_hash (&sig_ctx,
+                           &hc);
         if (GNUNET_OK !=
             create_krd (ksh,
                         &hc,
-                        last_cpd,
+                        last_cherry_pick_date,
                         sctx.signkeys,
                         recoup,
-                        denoms,
-                        age_restricted_denoms))
+                        grouped_denominations))
         {
           GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                       "Failed to generate key response data for %s\n",
-                      GNUNET_TIME_timestamp2s (last_cpd));
-          GNUNET_CRYPTO_hash_context_abort (hash_context);
+                      GNUNET_TIME_timestamp2s (last_cherry_pick_date));
           /* drain heap before destroying it */
           while (NULL != (dk = GNUNET_CONTAINER_heap_remove_root (heap)))
             /* intentionally empty */;
           GNUNET_CONTAINER_heap_destroy (heap);
-          json_decref (denoms);
-          if (NULL != age_restricted_denoms)
-            json_decref (age_restricted_denoms);
-          json_decref (sctx.signkeys);
-          json_decref (recoup);
-          return GNUNET_SYSERR;
+          goto CLEANUP;
         }
       }
 
-      last_cpd = dk->meta.start;
-
+      last_cherry_pick_date = dk->meta.start;
+      /*
+       * Group the denominations by {cipher, value, fees, age_mask}.
+       *
+       * For each group we save the group meta-data and the list of
+       * denominations in this group as a json-blob in the multihashmap
+       * denominations_by_group.
+       */
       {
-        json_t *denom;
-        json_t *array;
-        struct GNUNET_HashContext *hc;
-
+        struct GroupData *group;
+        json_t *entry;
+        struct GNUNET_HashCode key;
+        struct TALER_DenominationGroup meta = {
+          .cipher = dk->denom_pub.bsign_pub_key->cipher,
+          .value = dk->meta.value,
+          .fees = dk->meta.fees,
+          .age_mask = dk->meta.age_mask,
+        };
+
+        /* Search the group/JSON-blob for the key */
+        TALER_denomination_group_get_key (&meta,
+                                          &key);
+        group = GNUNET_CONTAINER_multihashmap_get (
+          denominations_by_group,
+          &key);
+        if (NULL == group)
+        {
+          /* There is no group for this meta-data yet, so we create a new group */
+          bool age_restricted = meta.age_mask.bits != 0;
+          const char *cipher;
+
+          group = GNUNET_new (struct GroupData);
+          switch (meta.cipher)
+          {
+          case GNUNET_CRYPTO_BSA_RSA:
+            cipher = age_restricted ? "RSA+age_restricted" : "RSA";
+            break;
+          case GNUNET_CRYPTO_BSA_CS:
+            cipher = age_restricted ? "CS+age_restricted" : "CS";
+            break;
+          default:
+            GNUNET_assert (false);
+          }
+          /* Create a new array for the denominations in this group */
+          group->list = json_array ();
+          GNUNET_assert (NULL != group->list);
+          group->json = GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_string ("cipher",
+                                     cipher),
+            GNUNET_JSON_pack_array_steal ("denoms",
+                                          group->list),
+            TALER_JSON_PACK_DENOM_FEES ("fee",
+                                        &meta.fees),
+            TALER_JSON_pack_amount ("value",
+                                    &meta.value));
+          GNUNET_assert (NULL != group->json);
+          if (age_restricted)
+          {
+            GNUNET_assert (
+              0 ==
+              json_object_set_new (group->json,
+                                   "age_mask",
+                                   json_integer (
+                                     meta.age_mask.bits)));
+            /* Remember that we have found at least _one_ age restricted denomination */
+            has_age_restricted_denomination = true;
+          }
+          group->group_off
+            = json_array_size (grouped_denominations);
+          GNUNET_assert (0 ==
+                         json_array_append_new (
+                           grouped_denominations,
+                           group->json));
+          GNUNET_assert (
+            GNUNET_OK ==
+            GNUNET_CONTAINER_multihashmap_put (denominations_by_group,
+                                               &key,
+                                               group,
+                                               GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+        }
 
-        denom =
-          GNUNET_JSON_PACK (
+        /* Now that we have found/created the right group, add the
+           denomination to the list */
+        {
+          struct HelperDenomination *hd;
+          struct GNUNET_JSON_PackSpec key_spec;
+          bool private_key_lost;
+
+          hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
+                                                  &dk->h_denom_pub.hash);
+          private_key_lost
+            = (NULL == hd) ||
+              GNUNET_TIME_absolute_is_past (
+                GNUNET_TIME_absolute_add (
+                  hd->start_time.abs_time,
+                  hd->validity_duration));
+          switch (meta.cipher)
+          {
+          case GNUNET_CRYPTO_BSA_RSA:
+            key_spec =
+              GNUNET_JSON_pack_rsa_public_key (
+                "rsa_pub",
+                dk->denom_pub.bsign_pub_key->details.rsa_public_key);
+            break;
+          case GNUNET_CRYPTO_BSA_CS:
+            key_spec =
+              GNUNET_JSON_pack_data_varsize (
+                "cs_pub",
+                &dk->denom_pub.bsign_pub_key->details.cs_public_key,
+                sizeof (dk->denom_pub.bsign_pub_key->details.cs_public_key));
+            break;
+          default:
+            GNUNET_assert (false);
+          }
+
+          entry = GNUNET_JSON_PACK (
             GNUNET_JSON_pack_data_auto ("master_sig",
                                         &dk->master_sig),
+            GNUNET_JSON_pack_allow_null (
+              private_key_lost
+              ? GNUNET_JSON_pack_bool ("lost",
+                                       true)
+              : GNUNET_JSON_pack_string ("dummy",
+                                         NULL)),
             GNUNET_JSON_pack_timestamp ("stamp_start",
                                         dk->meta.start),
             GNUNET_JSON_pack_timestamp ("stamp_expire_withdraw",
@@ -2125,95 +3069,85 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
                                         dk->meta.expire_deposit),
             GNUNET_JSON_pack_timestamp ("stamp_expire_legal",
                                         dk->meta.expire_legal),
-            TALER_JSON_pack_denom_pub ("denom_pub",
-                                       &dk->denom_pub),
-            TALER_JSON_pack_amount ("value",
-                                    &dk->meta.value),
-            TALER_JSON_PACK_DENOM_FEES ("fee",
-                                        &dk->meta.fees));
-
-        /* Put the denom into the correct array depending on the settings and
-         * the properties of the denomination.  Also, we build up the right
-         * hash for the corresponding array. */
-        if (0 &&
-            (0 != dk->denom_pub.age_mask.bits))
-        {
-          have_age_restricted_denoms = true;
-          array = age_restricted_denoms;
-          hc = hash_context_restricted;
-        }
-        else
-        {
-          array = denoms;
-          hc = hash_context;
+            key_spec
+            );
+          GNUNET_assert (NULL != entry);
         }
 
-        GNUNET_CRYPTO_hash_context_read (hc,
-                                         &dk->h_denom_pub,
-                                         sizeof (struct GNUNET_HashCode));
-
-        GNUNET_assert (
-          0 ==
-          json_array_append_new (
-            array,
-            denom));
+        /* Build up the running hash of all master signatures of the
+           denominations */
+        append_signature (&sig_ctx,
+                          group->group_off,
+                          (unsigned int) json_array_size (group->list),
+                          &dk->master_sig);
+        /* Finally, add the denomination to the list of denominations in this
+           group */
+        GNUNET_assert (json_is_array (group->list));
+        GNUNET_assert (0 ==
+                       json_array_append_new (group->list,
+                                              entry));
       }
-    }
-  }
+    } /* loop over heap ends */
 
+    GNUNET_CONTAINER_multihashmap_iterate (denominations_by_group,
+                                           &free_group,
+                                           NULL);
+    GNUNET_CONTAINER_multihashmap_destroy (denominations_by_group);
+  }
   GNUNET_CONTAINER_heap_destroy (heap);
-  if (! GNUNET_TIME_absolute_is_zero (last_cpd.abs_time))
+
+  if (! GNUNET_TIME_absolute_is_zero (last_cherry_pick_date.abs_time))
   {
     struct GNUNET_HashCode hc;
 
-    /* If age restriction is active and we had at least one denomination of
-     * that sort, we simply add the hash of all age restricted denominations at
-     * the end of the others. */
-    if (0 && have_age_restricted_denoms)
-    {
-      struct GNUNET_HashCode hcr;
-      GNUNET_CRYPTO_hash_context_finish (hash_context_restricted, &hcr);
-      GNUNET_CRYPTO_hash_context_read (hash_context,
-                                       &hcr,
-                                       sizeof (struct GNUNET_HashCode));
-    }
-
-    GNUNET_CRYPTO_hash_context_finish (hash_context,
-                                       &hc);
-
+    compute_msig_hash (&sig_ctx,
+                       &hc);
     if (GNUNET_OK !=
         create_krd (ksh,
                     &hc,
-                    last_cpd,
+                    last_cherry_pick_date,
                     sctx.signkeys,
                     recoup,
-                    denoms,
-                    age_restricted_denoms))
+                    grouped_denominations))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Failed to generate key response data for %s\n",
-                  GNUNET_TIME_timestamp2s (last_cpd));
-      json_decref (denoms);
-      if (0 && NULL != age_restricted_denoms)
-        json_decref (age_restricted_denoms);
-      json_decref (sctx.signkeys);
-      json_decref (recoup);
-      return GNUNET_SYSERR;
+                  GNUNET_TIME_timestamp2s (last_cherry_pick_date));
+      goto CLEANUP;
     }
     ksh->management_only = false;
+
+    /* Sanity check:  Make sure that age restriction is enabled IFF at least
+     * one age restricted denomination exist */
+    if (! has_age_restricted_denomination && TEH_age_restriction_enabled)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Age restriction is enabled, but NO denominations with age restriction found!\n");
+      goto CLEANUP;
+    }
+    else if (has_age_restricted_denomination && ! TEH_age_restriction_enabled)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Age restriction is NOT enabled, but denominations with age restriction found!\n");
+      goto CLEANUP;
+    }
   }
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "No denomination keys available. Refusing to generate /keys response.\n");
-    GNUNET_CRYPTO_hash_context_abort (hash_context);
   }
-  json_decref (sctx.signkeys);
+  ret = GNUNET_OK;
+
+CLEANUP:
+  GNUNET_array_grow (sig_ctx.elements,
+                     sig_ctx.elements_size,
+                     0);
+  json_decref (grouped_denominations);
+  if (NULL != sctx.signkeys)
+    json_decref (sctx.signkeys);
   json_decref (recoup);
-  json_decref (denoms);
-  if (NULL != age_restricted_denoms)
-    json_decref (age_restricted_denoms);
-  return GNUNET_OK;
+  return ret;
 }
 
 
@@ -2223,7 +3157,6 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
  * @param cls `struct TEH_KeyStateHandle *` we are building
  * @param fees the global fees we charge
  * @param purse_timeout when do purses time out
- * @param kyc_timeout when do reserves without KYC time out
  * @param history_expiration how long are account histories preserved
  * @param purse_account_limit how many purses are free per account
  * @param start_date from when are these fees valid (start date)
@@ -2236,7 +3169,6 @@ global_fee_info_cb (
   void *cls,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   struct GNUNET_TIME_Timestamp start_date,
@@ -2246,6 +3178,21 @@ global_fee_info_cb (
   struct TEH_KeyStateHandle *ksh = cls;
   struct TEH_GlobalFee *gf;
 
+  if (GNUNET_OK !=
+      TALER_exchange_offline_global_fee_verify (
+        start_date,
+        end_date,
+        fees,
+        purse_timeout,
+        history_expiration,
+        purse_account_limit,
+        &TEH_master_public_key,
+        master_sig))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Database has global fee with invalid signature. Skipping entry. Did the exchange offline public key change?\n");
+    return;
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Found global fees with %u purses\n",
               purse_account_limit);
@@ -2254,7 +3201,6 @@ global_fee_info_cb (
   gf->end_date = end_date;
   gf->fees = *fees;
   gf->purse_timeout = purse_timeout;
-  gf->kyc_timeout = kyc_timeout;
   gf->history_expiration = history_expiration;
   gf->purse_account_limit = purse_account_limit;
   gf->master_sig = *master_sig;
@@ -2273,8 +3219,6 @@ global_fee_info_cb (
         TALER_JSON_PACK_GLOBAL_FEES (fees),
         GNUNET_JSON_pack_time_rel ("history_expiration",
                                    history_expiration),
-        GNUNET_JSON_pack_time_rel ("account_kyc_timeout",
-                                   kyc_timeout),
         GNUNET_JSON_pack_time_rel ("purse_timeout",
                                    purse_timeout),
         GNUNET_JSON_pack_uint64 ("purse_account_limit",
@@ -2321,9 +3265,9 @@ build_key_state (struct HelperState *hs,
     ksh->helpers = hs;
   }
   ksh->denomkey_map = GNUNET_CONTAINER_multihashmap_create (1024,
-                                                            GNUNET_YES);
+                                                            true);
   ksh->signkey_map = GNUNET_CONTAINER_multipeermap_create (32,
-                                                           GNUNET_NO /* MUST be NO! */);
+                                                           false /* MUST be false! */);
   ksh->auditors = json_array ();
   GNUNET_assert (NULL != ksh->auditors);
   /* NOTE: fetches master-signed signkeys, but ALSO those that were revoked! */
@@ -2388,20 +3332,23 @@ build_key_state (struct HelperState *hs,
                        true);
     return NULL;
   }
+
   if (management_only)
   {
     ksh->management_only = true;
     return ksh;
   }
+
   if (GNUNET_OK !=
       finish_keys_response (ksh))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Could not finish /keys response (likely no signing keys available yet)\n");
+                "Could not finish /keys response (required data not configured yet)\n");
     destroy_key_state (ksh,
                        true);
     return NULL;
   }
+
   return ksh;
 }
 
@@ -2423,16 +3370,8 @@ TEH_keys_update_states ()
 }
 
 
-/**
- * Obtain the key state for the current thread. Should ONLY be used
- * directly if @a management_only is true. Otherwise use #TEH_keys_get_state().
- *
- * @param management_only if we should NOT run 'finish_keys_response()'
- *                  because we only need the state for the /management/keys API
- * @return NULL on error
- */
 static struct TEH_KeyStateHandle *
-get_key_state (bool management_only)
+keys_get_state (bool management_only)
 {
   struct TEH_KeyStateHandle *old_ksh;
   struct TEH_KeyStateHandle *ksh;
@@ -2450,7 +3389,7 @@ get_key_state (bool management_only)
   if ( (old_ksh->key_generation < key_generation) ||
        (GNUNET_TIME_absolute_is_past (old_ksh->signature_expires.abs_time)) )
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Rebuilding /keys, generation upgrade from %llu to %llu\n",
                 (unsigned long long) old_ksh->key_generation,
                 (unsigned long long) key_generation);
@@ -2468,19 +3407,28 @@ get_key_state (bool management_only)
 
 
 struct TEH_KeyStateHandle *
+TEH_keys_get_state_for_management_only (void)
+{
+  return keys_get_state (true);
+}
+
+
+struct TEH_KeyStateHandle *
 TEH_keys_get_state (void)
 {
   struct TEH_KeyStateHandle *ksh;
 
-  ksh = get_key_state (false);
+  ksh = keys_get_state (false);
   if (NULL == ksh)
     return NULL;
+
   if (ksh->management_only)
   {
     if (GNUNET_OK !=
         finish_keys_response (ksh))
       return NULL;
   }
+
   return ksh;
 }
 
@@ -2523,16 +3471,17 @@ TEH_keys_denomination_by_hash (
                                         NULL);
     return NULL;
   }
-  return TEH_keys_denomination_by_hash2 (ksh,
-                                         h_denom_pub,
-                                         conn,
-                                         mret);
+
+  return TEH_keys_denomination_by_hash_from_state (ksh,
+                                                   h_denom_pub,
+                                                   conn,
+                                                   mret);
 }
 
 
 struct TEH_DenominationKey *
-TEH_keys_denomination_by_hash2 (
-  struct TEH_KeyStateHandle *ksh,
+TEH_keys_denomination_by_hash_from_state (
+  const struct TEH_KeyStateHandle *ksh,
   const struct TALER_DenominationHashP *h_denom_pub,
   struct MHD_Connection *conn,
   MHD_RESULT *mret)
@@ -2554,93 +3503,137 @@ TEH_keys_denomination_by_hash2 (
 
 
 enum TALER_ErrorCode
-TEH_keys_denomination_sign_withdraw (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_BlindedPlanchet *bp,
-  struct TALER_BlindedDenominationSignature *bs)
+TEH_keys_denomination_batch_sign (
+  unsigned int csds_length,
+  const struct TEH_CoinSignData csds[static csds_length],
+  bool for_melt,
+  struct TALER_BlindedDenominationSignature bss[static csds_length])
 {
   struct TEH_KeyStateHandle *ksh;
   struct HelperDenomination *hd;
+  struct TALER_CRYPTO_RsaSignRequest rsrs[csds_length];
+  struct TALER_CRYPTO_CsSignRequest csrs[csds_length];
+  struct TALER_BlindedDenominationSignature rs[csds_length];
+  struct TALER_BlindedDenominationSignature cs[csds_length];
+  unsigned int rsrs_pos = 0;
+  unsigned int csrs_pos = 0;
+  enum TALER_ErrorCode ec;
 
   ksh = TEH_keys_get_state ();
   if (NULL == ksh)
     return TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING;
-  hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
-                                          &h_denom_pub->hash);
-  if (NULL == hd)
-    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
-  if (bp->cipher != hd->denom_pub.cipher)
-    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
-  switch (hd->denom_pub.cipher)
+  for (unsigned int i = 0; i<csds_length; i++)
   {
-  case TALER_DENOMINATION_RSA:
-    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA]++;
-    return TALER_CRYPTO_helper_rsa_sign (
-      ksh->helpers->rsadh,
-      &hd->h_details.h_rsa,
-      bp->details.rsa_blinded_planchet.blinded_msg,
-      bp->details.rsa_blinded_planchet.blinded_msg_size,
-      bs);
-  case TALER_DENOMINATION_CS:
-    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_CS]++;
-    return TALER_CRYPTO_helper_cs_sign_withdraw (
-      ksh->helpers->csdh,
-      &hd->h_details.h_cs,
-      &bp->details.cs_blinded_planchet,
-      bs);
-  default:
-    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+    const struct TALER_DenominationHashP *h_denom_pub = csds[i].h_denom_pub;
+    const struct TALER_BlindedPlanchet *bp = csds[i].bp;
+
+    hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
+                                            &h_denom_pub->hash);
+    if (NULL == hd)
+      return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
+    if (bp->blinded_message->cipher !=
+        hd->denom_pub.bsign_pub_key->cipher)
+      return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+    switch (hd->denom_pub.bsign_pub_key->cipher)
+    {
+    case GNUNET_CRYPTO_BSA_RSA:
+      rsrs[rsrs_pos].h_rsa = &hd->h_details.h_rsa;
+      rsrs[rsrs_pos].msg
+        = bp->blinded_message->details.rsa_blinded_message.blinded_msg;
+      rsrs[rsrs_pos].msg_size
+        = bp->blinded_message->details.rsa_blinded_message.blinded_msg_size;
+      rsrs_pos++;
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
+      csrs[csrs_pos].h_cs = &hd->h_details.h_cs;
+      csrs[csrs_pos].blinded_planchet
+        = &bp->blinded_message->details.cs_blinded_message;
+      csrs_pos++;
+      break;
+    default:
+      return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+    }
   }
-}
-
 
-enum TALER_ErrorCode
-TEH_keys_denomination_sign_melt (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_BlindedPlanchet *bp,
-  struct TALER_BlindedDenominationSignature *bs)
-{
-  struct TEH_KeyStateHandle *ksh;
-  struct HelperDenomination *hd;
-
-  ksh = TEH_keys_get_state ();
-  if (NULL == ksh)
-    return TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING;
-  hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
-                                          &h_denom_pub->hash);
-  if (NULL == hd)
-    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
-  if (bp->cipher != hd->denom_pub.cipher)
-    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
-  switch (hd->denom_pub.cipher)
+  if ( (0 != csrs_pos) &&
+       (0 != rsrs_pos) )
   {
-  case TALER_DENOMINATION_RSA:
-    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA]++;
-    return TALER_CRYPTO_helper_rsa_sign (
-      ksh->helpers->rsadh,
-      &hd->h_details.h_rsa,
-      bp->details.rsa_blinded_planchet.blinded_msg,
-      bp->details.rsa_blinded_planchet.blinded_msg_size,
-      bs);
-  case TALER_DENOMINATION_CS:
-    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_CS]++;
-    return TALER_CRYPTO_helper_cs_sign_melt (
+    memset (rs,
+            0,
+            sizeof (rs));
+    memset (cs,
+            0,
+            sizeof (cs));
+  }
+  ec = TALER_EC_NONE;
+  if (0 != csrs_pos)
+  {
+    ec = TALER_CRYPTO_helper_cs_batch_sign (
       ksh->helpers->csdh,
-      &hd->h_details.h_cs,
-      &bp->details.cs_blinded_planchet,
-      bs);
-  default:
-    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+      csrs_pos,
+      csrs,
+      for_melt,
+      (0 == rsrs_pos) ? bss : cs);
+    if (TALER_EC_NONE != ec)
+    {
+      for (unsigned int i = 0; i<csrs_pos; i++)
+        TALER_blinded_denom_sig_free (&cs[i]);
+      return ec;
+    }
+    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_CS] += csrs_pos;
+  }
+  if (0 != rsrs_pos)
+  {
+    ec = TALER_CRYPTO_helper_rsa_batch_sign (
+      ksh->helpers->rsadh,
+      rsrs_pos,
+      rsrs,
+      (0 == csrs_pos) ? bss : rs);
+    if (TALER_EC_NONE != ec)
+    {
+      for (unsigned int i = 0; i<csrs_pos; i++)
+        TALER_blinded_denom_sig_free (&cs[i]);
+      for (unsigned int i = 0; i<rsrs_pos; i++)
+        TALER_blinded_denom_sig_free (&rs[i]);
+      return ec;
+    }
+    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA] += rsrs_pos;
+  }
+
+  if ( (0 != csrs_pos) &&
+       (0 != rsrs_pos) )
+  {
+    rsrs_pos = 0;
+    csrs_pos = 0;
+    for (unsigned int i = 0; i<csds_length; i++)
+    {
+      const struct TALER_BlindedPlanchet *bp = csds[i].bp;
+
+      switch (bp->blinded_message->cipher)
+      {
+      case GNUNET_CRYPTO_BSA_RSA:
+        bss[i] = rs[rsrs_pos++];
+        break;
+      case GNUNET_CRYPTO_BSA_CS:
+        bss[i] = cs[csrs_pos++];
+        break;
+      default:
+        GNUNET_assert (0);
+      }
+    }
   }
+  return TALER_EC_NONE;
 }
 
 
 enum TALER_ErrorCode
-TEH_keys_denomination_cs_r_pub_melt (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *r_pub)
+TEH_keys_denomination_cs_r_pub (
+  const struct TEH_CsDeriveData *cdd,
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP *r_pub)
 {
+  const struct TALER_DenominationHashP *h_denom_pub = cdd->h_denom_pub;
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce = cdd->nonce;
   struct TEH_KeyStateHandle *ksh;
   struct HelperDenomination *hd;
 
@@ -2655,47 +3648,66 @@ TEH_keys_denomination_cs_r_pub_melt (
   {
     return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
   }
-  if (TALER_DENOMINATION_CS != hd->denom_pub.cipher)
+  if (GNUNET_CRYPTO_BSA_CS !=
+      hd->denom_pub.bsign_pub_key->cipher)
   {
     return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
   }
 
-  return TALER_CRYPTO_helper_cs_r_derive_melt (ksh->helpers->csdh,
-                                               &hd->h_details.h_cs,
-                                               nonce,
-                                               r_pub);
+  {
+    struct TALER_CRYPTO_CsDeriveRequest cdr = {
+      .h_cs = &hd->h_details.h_cs,
+      .nonce = nonce
+    };
+    return TALER_CRYPTO_helper_cs_r_derive (ksh->helpers->csdh,
+                                            &cdr,
+                                            for_melt,
+                                            r_pub);
+  }
 }
 
 
 enum TALER_ErrorCode
-TEH_keys_denomination_cs_r_pub_withdraw (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *r_pub)
+TEH_keys_denomination_cs_batch_r_pub (
+  unsigned int cdds_length,
+  const struct TEH_CsDeriveData cdds[static cdds_length],
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP r_pubs[static cdds_length])
 {
   struct TEH_KeyStateHandle *ksh;
   struct HelperDenomination *hd;
+  struct TALER_CRYPTO_CsDeriveRequest cdrs[cdds_length];
 
   ksh = TEH_keys_get_state ();
   if (NULL == ksh)
   {
     return TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING;
   }
-  hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
-                                          &h_denom_pub->hash);
-  if (NULL == hd)
-  {
-    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
-  }
-  if (TALER_DENOMINATION_CS != hd->denom_pub.cipher)
+  for (unsigned int i = 0; i<cdds_length; i++)
   {
-    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+    const struct TALER_DenominationHashP *h_denom_pub = cdds[i].h_denom_pub;
+    const struct GNUNET_CRYPTO_CsSessionNonce *nonce = cdds[i].nonce;
+
+    hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
+                                            &h_denom_pub->hash);
+    if (NULL == hd)
+    {
+      return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
+    }
+    if (GNUNET_CRYPTO_BSA_CS !=
+        hd->denom_pub.bsign_pub_key->cipher)
+    {
+      return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+    }
+    cdrs[i].h_cs = &hd->h_details.h_cs;
+    cdrs[i].nonce = nonce;
   }
 
-  return TALER_CRYPTO_helper_cs_r_derive_withdraw (ksh->helpers->csdh,
-                                                   &hd->h_details.h_cs,
-                                                   nonce,
-                                                   r_pub);
+  return TALER_CRYPTO_helper_cs_r_batch_derive (ksh->helpers->csdh,
+                                                cdds_length,
+                                                cdrs,
+                                                for_melt,
+                                                r_pubs);
 }
 
 
@@ -2718,22 +3730,23 @@ TEH_keys_denomination_revoke (const struct TALER_DenominationHashP *h_denom_pub)
     GNUNET_break (0);
     return;
   }
-  switch (hd->denom_pub.cipher)
+  switch (hd->denom_pub.bsign_pub_key->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     TALER_CRYPTO_helper_rsa_revoke (ksh->helpers->rsadh,
                                     &hd->h_details.h_rsa);
     TEH_keys_update_states ();
     return;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     TALER_CRYPTO_helper_cs_revoke (ksh->helpers->csdh,
                                    &hd->h_details.h_cs);
     TEH_keys_update_states ();
     return;
-  default:
-    GNUNET_break (0);
-    return;
   }
+  GNUNET_break (0);
+  return;
 }
 
 
@@ -2898,7 +3911,8 @@ TEH_keys_get_handler (struct TEH_RequestContext *rc,
     const struct KeysResponseData *krd;
 
     ksh = TEH_keys_get_state ();
-    if (NULL == ksh)
+    if ( (NULL == ksh) ||
+         (0 == ksh->krd_array_length) )
     {
       if ( ( (SKR_LIMIT == skr_size) &&
              (rc->connection == skr_connection) ) ||
@@ -2942,28 +3956,11 @@ TEH_keys_get_handler (struct TEH_RequestContext *rc,
     if ( (NULL != etag) &&
          (0 == strcmp (etag,
                        krd->etag)) )
-    {
-      MHD_RESULT ret;
-      struct MHD_Response *resp;
-
-      resp = MHD_create_response_from_buffer (0,
-                                              NULL,
-                                              MHD_RESPMEM_PERSISTENT);
-      TALER_MHD_add_global_headers (resp);
-      GNUNET_break (GNUNET_OK ==
-                    setup_general_response_headers (ksh,
-                                                    resp));
-      GNUNET_break (MHD_YES ==
-                    MHD_add_response_header (resp,
-                                             MHD_HTTP_HEADER_ETAG,
-                                             krd->etag));
-      ret = MHD_queue_response (rc->connection,
-                                MHD_HTTP_NOT_MODIFIED,
-                                resp);
-      GNUNET_break (MHD_YES == ret);
-      MHD_destroy_response (resp);
-      return ret;
-    }
+      return TEH_RESPONSE_reply_not_modified (rc->connection,
+                                              krd->etag,
+                                              &setup_general_response_headers,
+                                              ksh);
+
     return MHD_queue_response (rc->connection,
                                MHD_HTTP_OK,
                                (MHD_YES ==
@@ -3054,21 +4051,14 @@ load_extension_data (const char *section_name,
 
 
 enum GNUNET_GenericReturnValue
-TEH_keys_load_fees (const struct TALER_DenominationHashP *h_denom_pub,
+TEH_keys_load_fees (struct TEH_KeyStateHandle *ksh,
+                    const struct TALER_DenominationHashP *h_denom_pub,
                     struct TALER_DenominationPublicKey *denom_pub,
                     struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta)
 {
-  struct TEH_KeyStateHandle *ksh;
   struct HelperDenomination *hd;
   enum GNUNET_GenericReturnValue ok;
 
-  ksh = get_key_state (true);
-  if (NULL == ksh)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
   hd = GNUNET_CONTAINER_multihashmap_get (ksh->helpers->denom_keys,
                                           &h_denom_pub->hash);
   if (NULL == hd)
@@ -3086,9 +4076,10 @@ TEH_keys_load_fees (const struct TALER_DenominationHashP *h_denom_pub,
                             meta);
   if (GNUNET_OK == ok)
   {
-    GNUNET_assert (TALER_DENOMINATION_INVALID != hd->denom_pub.cipher);
-    TALER_denom_pub_deep_copy (denom_pub,
-                               &hd->denom_pub);
+    GNUNET_assert (GNUNET_CRYPTO_BSA_INVALID !=
+                   hd->denom_pub.bsign_pub_key->cipher);
+    TALER_denom_pub_copy (denom_pub,
+                          &hd->denom_pub);
   }
   else
   {
@@ -3111,7 +4102,7 @@ TEH_keys_get_timing (const struct TALER_ExchangePublicKeyP *exchange_pub,
   struct HelperSignkey *hsk;
   struct GNUNET_PeerIdentity pid;
 
-  ksh = get_key_state (true);
+  ksh = TEH_keys_get_state_for_management_only ();
   if (NULL == ksh)
   {
     GNUNET_break (0);
@@ -3121,6 +4112,11 @@ TEH_keys_get_timing (const struct TALER_ExchangePublicKeyP *exchange_pub,
   pid.public_key = exchange_pub->eddsa_pub;
   hsk = GNUNET_CONTAINER_multipeermap_get (ksh->helpers->esign_keys,
                                            &pid);
+  if (NULL == hsk)
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
   meta->start = hsk->start_time;
 
   meta->expire_sign = GNUNET_TIME_absolute_to_timestamp (
@@ -3281,7 +4277,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
   json_t *reply;
 
   (void) rh;
-  ksh = get_key_state (true);
+  ksh = TEH_keys_get_state_for_management_only ();
   if (NULL == ksh)
   {
     return TALER_MHD_reply_with_error (connection,
@@ -3301,6 +4297,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
     if ( (GNUNET_is_zero (&denom_rsa_sm_pub)) &&
          (GNUNET_is_zero (&denom_cs_sm_pub)) )
     {
+      /* Either IPC failed, or neither helper had any denominations configured. */
       return TALER_MHD_reply_with_error (connection,
                                          MHD_HTTP_BAD_GATEWAY,
                                          TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE,
@@ -3313,7 +4310,6 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
                                          TALER_EC_EXCHANGE_SIGNKEY_HELPER_UNAVAILABLE,
                                          NULL);
     }
-    // then a secmod helper is not yet running and we should return an MHD_HTTP_BAD_GATEWAY!
     GNUNET_assert (NULL != fbc.denoms);
     GNUNET_assert (NULL != fbc.signkeys);
     GNUNET_CONTAINER_multihashmap_iterate (ksh->helpers->denom_keys,
diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
index d8fe81e5c..e526385ff 100644
--- a/src/exchange/taler-exchange-httpd_keys.h
+++ b/src/exchange/taler-exchange-httpd_keys.h
@@ -113,11 +113,6 @@ struct TEH_GlobalFee
   struct GNUNET_TIME_Relative purse_timeout;
 
   /**
-   * How long do we keep accounts without KYC?
-   */
-  struct GNUNET_TIME_Relative kyc_timeout;
-
-  /**
    * What is the longest history we return?
    */
   struct GNUNET_TIME_Relative history_expiration;
@@ -159,6 +154,48 @@ struct TEH_KeyStateHandle;
 void
 TEH_check_invariants (void);
 
+/**
+ * Clean up wire subsystem.
+ */
+void
+TEH_wire_done (void);
+
+
+/**
+ * Look up wire fee structure by @a ts.
+ *
+ * @param ts timestamp to lookup wire fees at
+ * @param method wire method to lookup fees for
+ * @return the wire fee details, or
+ *         NULL if none are configured for @a ts and @a method
+ */
+const struct TALER_WireFeeSet *
+TEH_wire_fees_by_time (
+  struct GNUNET_TIME_Timestamp ts,
+  const char *method);
+
+
+/**
+ * Initialize wire subsystem.
+ *
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_wire_init (void);
+
+
+/**
+ * Something changed in the database. Rebuild the wire replies.  This function
+ * should be called if the exchange learns about a new signature from our
+ * master key.
+ *
+ * (We do not do so immediately, but merely signal to all threads that they
+ * need to rebuild their wire state upon the next call to
+ * #TEH_keys_get_state()).
+ */
+void
+TEH_wire_update_state (void);
+
 
 /**
  * Return the current key state for this thread.  Possibly re-builds the key
@@ -173,6 +210,12 @@ TEH_check_invariants (void);
 struct TEH_KeyStateHandle *
 TEH_keys_get_state (void);
 
+/**
+ * Obtain the key state if we should NOT run finish_keys_response() because we
+ * only need the state for the /management/keys API
+ */
+struct TEH_KeyStateHandle *
+TEH_keys_get_state_for_management_only (void);
 
 /**
  * Something changed in the database. Rebuild all key states.  This function
@@ -233,77 +276,94 @@ TEH_keys_denomination_by_hash (
  *         or NULL if @a h_denom_pub could not be found
  */
 struct TEH_DenominationKey *
-TEH_keys_denomination_by_hash2 (
-  struct TEH_KeyStateHandle *ksh,
+TEH_keys_denomination_by_hash_from_state (
+  const struct TEH_KeyStateHandle *ksh,
   const struct TALER_DenominationHashP *h_denom_pub,
   struct MHD_Connection *conn,
   MHD_RESULT *mret);
 
+/**
+ * Information needed to create a blind signature.
+ */
+struct TEH_CoinSignData
+{
+  /**
+   * Hash of key to sign with.
+   */
+  const struct TALER_DenominationHashP *h_denom_pub;
+
+  /**
+   * Blinded planchet to sign over.
+   */
+  const struct TALER_BlindedPlanchet *bp;
+};
+
 
 /**
- * Request to sign @a msg using the public key corresponding to
- * @a h_denom_pub during a withdraw operation.
+ * Request to sign @a csds.
  *
- * @param h_denom_pub hash of the public key to use to sign
- * @param bp blinded planchet to sign
- * @param is_melt should we use the KDF for melting?
- * @param[out] bs set to the blind signature on success
+ * @param csds array with data to blindly sign (and keys to sign with)
+ * @param csds_length length of @a csds array
+ * @param for_melt true if this is for a melt operation
+ * @param[out] bss array set to the blind signature on success; must be of length @a csds_length
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
-TEH_keys_denomination_sign_withdraw (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_BlindedPlanchet *bp,
-  struct TALER_BlindedDenominationSignature *bs);
+TEH_keys_denomination_batch_sign (
+  unsigned int csds_length,
+  const struct TEH_CoinSignData csds[static csds_length],
+  bool for_melt,
+  struct TALER_BlindedDenominationSignature bss[static csds_length]);
 
 
 /**
- * Request to sign @a msg using the public key corresponding to
- * @a h_denom_pub during a refresh operation.
- *
- * @param h_denom_pub hash of the public key to use to sign
- * @param bp blinded planchet to sign
- * @param is_melt should we use the KDF for melting?
- * @param[out] bs set to the blind signature on success
- * @return #TALER_EC_NONE on success
+ * Information needed to derive the CS r_pub.
  */
-enum TALER_ErrorCode
-TEH_keys_denomination_sign_melt (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_BlindedPlanchet *bp,
-  struct TALER_BlindedDenominationSignature *bs);
+struct TEH_CsDeriveData
+{
+  /**
+   * Hash of key to sign with.
+   */
+  const struct TALER_DenominationHashP *h_denom_pub;
+
+  /**
+   * Nonce to use.
+   */
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce;
+};
 
 
 /**
- * Request to derive CS @a r_pub using the denomination corresponding to @a h_denom_pub
- * and @a nonce for withdrawing.
+ * Request to derive CS @a r_pub using the denomination and nonce from @a cdd.
  *
- * @param h_denom_pub hash of the public key to use to derive r_pub
- * @param nonce withdraw/refresh nonce
+ * @param cdd data to compute @a r_pub from
+ * @param for_melt true if this is for a melt operation
  * @param[out] r_pub where to write the result
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
-TEH_keys_denomination_cs_r_pub_withdraw (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *r_pub);
+TEH_keys_denomination_cs_r_pub (
+  const struct TEH_CsDeriveData *cdd,
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP *r_pub);
 
 
 /**
- * Request to derive CS @a r_pub using the denomination corresponding to @a h_denom_pub
- * and @a nonce for melting.
+ * Request to derive a bunch of CS @a r_pubs using the
+ * denominations and nonces from @a cdds.
  *
- * @param h_denom_pub hash of the public key to use to derive r_pub
- * @param nonce withdraw/refresh nonce
- * @param[out] r_pub where to write the result
+ * @param cdds array to compute @a r_pubs from
+ * @param cdds_length length of the @a cdds array
+ * @param for_melt true if this is for a melt operation
+ * @param[out] r_pubs array where to write the result; must be of length @a cdds_length
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
-TEH_keys_denomination_cs_r_pub_melt (
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *r_pub);
+TEH_keys_denomination_cs_batch_r_pub (
+  unsigned int cdds_length,
+  const struct TEH_CsDeriveData cdds[static cdds_length],
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP r_pubs[static cdds_length]);
 
 
 /**
@@ -330,7 +390,7 @@ TEH_keys_finished (void);
 
 
 /**
- * Resumse all suspended /keys requests, we may now have key material
+ * Resumes all suspended /keys requests, we may now have key material
  * (or are shutting down).
  *
  * @param do_shutdown are we shutting down?
@@ -487,6 +547,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
  * Load fees and expiration times (!) for the denomination type configured for
  * the denomination matching @a h_denom_pub.
  *
+ * @param ksh key state to load fees from
  * @param h_denom_pub hash of the denomination public key
  *        to use to derive the section name of the configuration to use
  * @param[out] denom_pub set to the denomination public key (to be freed by caller!)
@@ -496,7 +557,8 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
  *         #GNUNET_SYSERR on hard errors
  */
 enum GNUNET_GenericReturnValue
-TEH_keys_load_fees (const struct TALER_DenominationHashP *h_denom_pub,
+TEH_keys_load_fees (struct TEH_KeyStateHandle *ksh,
+                    const struct TALER_DenominationHashP *h_denom_pub,
                     struct TALER_DenominationPublicKey *denom_pub,
                     struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta);
 
diff --git a/src/exchange/taler-exchange-httpd_kyc-check.c b/src/exchange/taler-exchange-httpd_kyc-check.c
index 4a96d4c81..362c20a2e 100644
--- a/src/exchange/taler-exchange-httpd_kyc-check.c
+++ b/src/exchange/taler-exchange-httpd_kyc-check.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021-2023 Taler Systems SA
 
   TALER 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
@@ -25,6 +25,7 @@
 #include <microhttpd.h>
 #include <pthread.h>
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler_signatures.h"
 #include "taler_dbevents.h"
@@ -54,20 +55,31 @@ struct KycPoller
   struct MHD_Connection *connection;
 
   /**
+   * Logic for @e ih
+   */
+  struct TALER_KYCLOGIC_Plugin *ih_logic;
+
+  /**
+   * Handle to asynchronously running KYC initiation
+   * request.
+   */
+  struct TALER_KYCLOGIC_InitiateHandle *ih;
+
+  /**
    * Subscription for the database event we are
    * waiting for.
    */
   struct GNUNET_DB_EventHandler *eh;
 
   /**
-   * UUID being checked.
+   * Row of the requirement being checked.
    */
-  uint64_t auth_payment_target_uuid;
+  uint64_t requirement_row;
 
   /**
-   * Current KYC status.
+   * Row of KYC process being initiated.
    */
-  struct TALER_EXCHANGEDB_KycStatus kyc;
+  uint64_t process_row;
 
   /**
    * Hash of the payto:// URI we are confirming to
@@ -76,20 +88,60 @@ struct KycPoller
   struct TALER_PaytoHashP h_payto;
 
   /**
-   * Payto URL as a string, as given to us by t
+   * When will this request time out?
    */
-  const char *hps;
+  struct GNUNET_TIME_Absolute timeout;
 
   /**
-   * When will this request time out?
+   * If the KYC complete, what kind of data was collected?
    */
-  struct GNUNET_TIME_Absolute timeout;
+  json_t *kyc_details;
+
+  /**
+   * Set to starting URL of KYC process if KYC is required.
+   */
+  char *kyc_url;
+
+  /**
+   * Set to error details, on error (@ec not TALER_EC_NONE).
+   */
+  char *hint;
+
+  /**
+   * Name of the section of the provider in the configuration.
+   */
+  const char *section_name;
+
+  /**
+   * Set to AML status of the account.
+   */
+  enum TALER_AmlDecisionState aml_status;
+
+  /**
+   * Set to error encountered with KYC logic, if any.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * What kind of entity is doing the KYC check?
+   */
+  enum TALER_KYCLOGIC_KycUserType ut;
 
   /**
    * True if we are still suspended.
    */
   bool suspended;
 
+  /**
+   * False if KYC is not required.
+   */
+  bool kyc_required;
+
+  /**
+   * True if we once tried the KYC initiation.
+   */
+  bool ih_done;
+
 };
 
 
@@ -114,6 +166,11 @@ TEH_kyc_check_cleanup ()
     GNUNET_CONTAINER_DLL_remove (kyp_head,
                                  kyp_tail,
                                  kyp);
+    if (NULL != kyp->ih)
+    {
+      kyp->ih_logic->initiate_cancel (kyp->ih);
+      kyp->ih = NULL;
+    }
     if (kyp->suspended)
     {
       kyp->suspended = false;
@@ -143,11 +200,86 @@ kyp_cleanup (struct TEH_RequestContext *rc)
                                      kyp->eh);
     kyp->eh = NULL;
   }
+  if (NULL != kyp->ih)
+  {
+    kyp->ih_logic->initiate_cancel (kyp->ih);
+    kyp->ih = NULL;
+  }
+  json_decref (kyp->kyc_details);
+  GNUNET_free (kyp->kyc_url);
+  GNUNET_free (kyp->hint);
   GNUNET_free (kyp);
 }
 
 
 /**
+ * Function called with the result of a KYC initiation
+ * operation.
+ *
+ * @param cls closure with our `struct KycPoller *`
+ * @param ec #TALER_EC_NONE on success
+ * @param redirect_url set to where to redirect the user on success, NULL on failure
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param error_msg_hint set to additional details to return to user, NULL on success
+ */
+static void
+initiate_cb (
+  void *cls,
+  enum TALER_ErrorCode ec,
+  const char *redirect_url,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  const char *error_msg_hint)
+{
+  struct KycPoller *kyp = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  kyp->ih = NULL;
+  kyp->ih_done = true;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC initiation `%s' completed with ec=%d (%s)\n",
+              provider_legitimization_id,
+              ec,
+              (TALER_EC_NONE == ec)
+              ? redirect_url
+              : error_msg_hint);
+  kyp->ec = ec;
+  if (TALER_EC_NONE == ec)
+  {
+    kyp->kyc_url = GNUNET_strdup (redirect_url);
+  }
+  else
+  {
+    kyp->hint = GNUNET_strdup (error_msg_hint);
+  }
+  qs = TEH_plugin->update_kyc_process_by_row (
+    TEH_plugin->cls,
+    kyp->process_row,
+    kyp->section_name,
+    &kyp->h_payto,
+    provider_user_id,
+    provider_legitimization_id,
+    redirect_url,
+    GNUNET_TIME_UNIT_ZERO_ABS);
+  if (qs <= 0)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYC requirement update failed for %s with status %d at %s:%u\n",
+                TALER_B2S (&kyp->h_payto),
+                qs,
+                __FILE__,
+                __LINE__);
+  GNUNET_assert (kyp->suspended);
+  kyp->suspended = false;
+  GNUNET_CONTAINER_DLL_remove (kyp_head,
+                               kyp_tail,
+                               kyp);
+  MHD_resume_connection (kyp->connection);
+  TALER_MHD_daemon_trigger ();
+}
+
+
+/**
  * Function implementing database transaction to check wallet's KYC status.
  * Runs the transaction logic; IF it returns a non-error code, the transaction
  * logic MUST NOT queue a MHD response.  IF it returns an hard error, the
@@ -168,10 +300,53 @@ kyc_check (void *cls,
 {
   struct KycPoller *kyp = cls;
   enum GNUNET_DB_QueryStatus qs;
-
-  qs = TEH_plugin->select_kyc_status (TEH_plugin->cls,
-                                      &kyp->h_payto,
-                                      &kyp->kyc);
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+  enum GNUNET_GenericReturnValue ret;
+  struct TALER_PaytoHashP h_payto;
+  char *requirements;
+  char *redirect_url;
+  bool satisfied;
+
+  qs = TEH_plugin->lookup_kyc_requirement_by_row (
+    TEH_plugin->cls,
+    kyp->requirement_row,
+    &requirements,
+    &kyp->aml_status,
+    &h_payto);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "No KYC requirements open for %llu\n",
+                (unsigned long long) kyp->requirement_row);
+    return qs;
+  }
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR != qs);
+    return qs;
+  }
+  if (0 !=
+      GNUNET_memcmp (&kyp->h_payto,
+                     &h_payto))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Requirement %llu provided, but h_payto does not match\n",
+                (unsigned long long) kyp->requirement_row);
+    GNUNET_break_op (0);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_FORBIDDEN,
+                                           TALER_EC_EXCHANGE_KYC_CHECK_AUTHORIZATION_FAILED,
+                                           "h_payto");
+    GNUNET_free (requirements);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  qs = TALER_KYCLOGIC_check_satisfied (
+    &requirements,
+    &h_payto,
+    &kyp->kyc_details,
+    TEH_plugin->select_satisfied_kyc_processes,
+    TEH_plugin->cls,
+    &satisfied);
   if (qs < 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -180,9 +355,95 @@ kyc_check (void *cls,
     *mhd_ret = TALER_MHD_reply_with_error (connection,
                                            MHD_HTTP_INTERNAL_SERVER_ERROR,
                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                           "inselect_wallet_status");
+                                           "kyc_test_required");
+    GNUNET_free (requirements);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  if (satisfied)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC requirements `%s' already satisfied\n",
+                requirements);
+    GNUNET_free (requirements);
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+
+  kyp->kyc_required = true;
+  ret = TALER_KYCLOGIC_requirements_to_logic (requirements,
+                                              kyp->ut,
+                                              &kyp->ih_logic,
+                                              &pd,
+                                              &kyp->section_name);
+  if (GNUNET_OK != ret)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYC requirements `%s' cannot be checked, but are set as required in database!\n",
+                requirements);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_GONE,
+                                           requirements);
+    GNUNET_free (requirements);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  GNUNET_free (requirements);
+
+  if (kyp->ih_done)
     return qs;
+  qs = TEH_plugin->get_pending_kyc_requirement_process (
+    TEH_plugin->cls,
+    &h_payto,
+    kyp->section_name,
+    &redirect_url);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_GENERIC_DB_STORE_FAILED,
+                                           "insert_kyc_requirement_process");
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  if ( (qs > 0) &&
+       (NULL != redirect_url) )
+  {
+    kyp->kyc_url = redirect_url;
+    return qs;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    /* set up new requirement process */
+    qs = TEH_plugin->insert_kyc_requirement_process (
+      TEH_plugin->cls,
+      &h_payto,
+      kyp->section_name,
+      NULL,
+      NULL,
+      &kyp->process_row);
+    if (qs < 0)
+    {
+      if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+        return qs;
+      GNUNET_break (0);
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_GENERIC_DB_STORE_FAILED,
+                                             "insert_kyc_requirement_process");
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Initiating KYC check with logic %s\n",
+              kyp->ih_logic->name);
+  kyp->ih = kyp->ih_logic->initiate (kyp->ih_logic->cls,
+                                     pd,
+                                     &h_payto,
+                                     kyp->process_row,
+                                     &initiate_cb,
+                                     kyp);
+  GNUNET_break (NULL != kyp->ih);
   return qs;
 }
 
@@ -230,7 +491,7 @@ db_event_cb (void *cls,
 MHD_RESULT
 TEH_handler_kyc_check (
   struct TEH_RequestContext *rc,
-  const char *const args[])
+  const char *const args[3])
 {
   struct KycPoller *kyp = rc->rh_ctx;
   MHD_RESULT res;
@@ -245,83 +506,62 @@ TEH_handler_kyc_check (
     rc->rh_cleaner = &kyp_cleanup;
 
     {
-      unsigned long long payment_target_uuid;
+      unsigned long long requirement_row;
       char dummy;
 
       if (1 !=
           sscanf (args[0],
                   "%llu%c",
-                  &payment_target_uuid,
+                  &requirement_row,
                   &dummy))
       {
         GNUNET_break_op (0);
         return TALER_MHD_reply_with_error (rc->connection,
                                            MHD_HTTP_BAD_REQUEST,
                                            TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                           "payment_target_uuid");
+                                           "requirement_row");
       }
-      kyp->auth_payment_target_uuid = (uint64_t) payment_target_uuid;
+      kyp->requirement_row = (uint64_t) requirement_row;
     }
-    {
-      const char *ts;
 
-      ts = MHD_lookup_connection_value (rc->connection,
-                                        MHD_GET_ARGUMENT_KIND,
-                                        "timeout_ms");
-      if (NULL != ts)
-      {
-        char dummy;
-        unsigned long long tms;
-
-        if (1 !=
-            sscanf (ts,
-                    "%llu%c",
-                    &tms,
-                    &dummy))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (rc->connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             "timeout_ms");
-        }
-        kyp->timeout = GNUNET_TIME_relative_to_absolute (
-          GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                         tms));
-      }
-    }
-    kyp->hps = MHD_lookup_connection_value (rc->connection,
-                                            MHD_GET_ARGUMENT_KIND,
-                                            "h_payto");
-    if (NULL == kyp->hps)
+    if (GNUNET_OK !=
+        GNUNET_STRINGS_string_to_data (args[1],
+                                       strlen (args[1]),
+                                       &kyp->h_payto,
+                                       sizeof (kyp->h_payto)))
     {
       GNUNET_break_op (0);
       return TALER_MHD_reply_with_error (rc->connection,
                                          MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_GENERIC_PARAMETER_MISSING,
+                                         TALER_EC_GENERIC_PARAMETER_MALFORMED,
                                          "h_payto");
     }
+
     if (GNUNET_OK !=
-        GNUNET_STRINGS_string_to_data (kyp->hps,
-                                       strlen (kyp->hps),
-                                       &kyp->h_payto,
-                                       sizeof (kyp->h_payto)))
+        TALER_KYCLOGIC_kyc_user_type_from_string (args[2],
+                                                  &kyp->ut))
     {
       GNUNET_break_op (0);
       return TALER_MHD_reply_with_error (rc->connection,
                                          MHD_HTTP_BAD_REQUEST,
                                          TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                         "h_payto");
+                                         "usertype");
     }
-  }
 
-  if (TEH_KYC_NONE == TEH_kyc_config.mode)
-    return TALER_MHD_reply_static (
+    TALER_MHD_parse_request_timeout (rc->connection,
+                                     &kyp->timeout);
+  }
+  /* KYC plugin generated reply? */
+  if (NULL != kyp->kyc_url)
+  {
+    return TALER_MHD_REPLY_JSON_PACK (
       rc->connection,
-      MHD_HTTP_NO_CONTENT,
-      NULL,
-      NULL,
-      0);
+      MHD_HTTP_ACCEPTED,
+      GNUNET_JSON_pack_uint64 ("aml_status",
+                               kyp->aml_status),
+      GNUNET_JSON_pack_string ("kyc_url",
+                               kyp->kyc_url));
+  }
 
   if ( (NULL == kyp->eh) &&
        GNUNET_TIME_absolute_is_future (kyp->timeout) )
@@ -350,29 +590,73 @@ TEH_handler_kyc_check (
                                 &kyc_check,
                                 kyp);
   if (GNUNET_SYSERR == ret)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Transaction failed.\n");
     return res;
+  }
+  /* KYC plugin generated reply? */
+  if (NULL != kyp->kyc_url)
+  {
+    return TALER_MHD_REPLY_JSON_PACK (
+      rc->connection,
+      MHD_HTTP_ACCEPTED,
+      GNUNET_JSON_pack_uint64 ("aml_status",
+                               kyp->aml_status),
+      GNUNET_JSON_pack_string ("kyc_url",
+                               kyp->kyc_url));
+  }
 
-  if (kyp->auth_payment_target_uuid !=
-      kyp->kyc.payment_target_uuid)
+  if ( (NULL == kyp->ih) &&
+       (! kyp->kyc_required) )
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Account %llu provided, but payto %s is for %llu\n",
-                (unsigned long long) kyp->auth_payment_target_uuid,
-                kyp->hps,
-                (unsigned long long) kyp->kyc.payment_target_uuid);
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_FORBIDDEN,
-                                       TALER_EC_EXCHANGE_KYC_CHECK_AUTHORIZATION_FAILED,
-                                       "h_payto");
+    if (TALER_AML_NORMAL != kyp->aml_status)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "KYC is OK, but AML active: %d\n",
+                  (int) kyp->aml_status);
+      return TALER_MHD_REPLY_JSON_PACK (
+        rc->connection,
+        MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+        GNUNET_JSON_pack_uint64 ("aml_status",
+                                 kyp->aml_status));
+    }
+    /* KYC not required */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC not required %llu\n",
+                (unsigned long long) kyp->requirement_row);
+    return TALER_MHD_reply_static (
+      rc->connection,
+      MHD_HTTP_NO_CONTENT,
+      NULL,
+      NULL,
+      0);
+  }
+
+  if (NULL != kyp->ih)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Suspending HTTP request on KYC logic...\n");
+    kyp->suspended = true;
+    GNUNET_CONTAINER_DLL_insert (kyp_head,
+                                 kyp_tail,
+                                 kyp);
+    MHD_suspend_connection (kyp->connection);
+    return MHD_YES;
   }
 
   /* long polling? */
-  if ( (! kyp->kyc.ok) &&
+  if ( (NULL != kyp->section_name) &&
        GNUNET_TIME_absolute_is_future (kyp->timeout))
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Suspending HTTP request on timeout (%s) now...\n",
+                GNUNET_TIME_relative2s (GNUNET_TIME_absolute_get_remaining (
+                                          kyp->timeout),
+                                        true));
     GNUNET_assert (NULL != kyp->eh);
     kyp->suspended = true;
+    kyp->section_name = NULL;
     GNUNET_CONTAINER_DLL_insert (kyp_head,
                                  kyp_tail,
                                  kyp);
@@ -380,37 +664,14 @@ TEH_handler_kyc_check (
     return MHD_YES;
   }
 
-  /* KYC failed? */
-  if (! kyp->kyc.ok)
+  if (TALER_EC_NONE != kyp->ec)
   {
-    char *url;
-    char *redirect_uri;
-    char *redirect_uri_encoded;
-
-    GNUNET_assert (TEH_KYC_OAUTH2 == TEH_kyc_config.mode);
-    GNUNET_asprintf (&redirect_uri,
-                     "%s/kyc-proof/%s",
-                     TEH_base_url,
-                     kyp->hps);
-    redirect_uri_encoded = TALER_urlencode (redirect_uri);
-    GNUNET_free (redirect_uri);
-    GNUNET_asprintf (&url,
-                     "%s?client_id=%s&redirect_uri=%s",
-                     TEH_kyc_config.details.oauth2.login_url,
-                     TEH_kyc_config.details.oauth2.client_id,
-                     redirect_uri_encoded);
-    GNUNET_free (redirect_uri_encoded);
-
-    res = TALER_MHD_REPLY_JSON_PACK (
-      rc->connection,
-      MHD_HTTP_ACCEPTED,
-      GNUNET_JSON_pack_string ("kyc_url",
-                               url));
-    GNUNET_free (url);
-    return res;
+    return TALER_MHD_reply_with_ec (rc->connection,
+                                    kyp->ec,
+                                    kyp->hint);
   }
 
-  /* KYC succeeded! */
+  /* KYC must have succeeded! */
   {
     struct TALER_ExchangePublicKeyP pub;
     struct TALER_ExchangeSignatureP sig;
@@ -420,6 +681,7 @@ TEH_handler_kyc_check (
         (ec = TALER_exchange_online_account_setup_success_sign (
            &TEH_keys_exchange_sign_,
            &kyp->h_payto,
+           kyp->kyc_details,
            now,
            &pub,
            &sig)))
@@ -435,6 +697,10 @@ TEH_handler_kyc_check (
                                   &sig),
       GNUNET_JSON_pack_data_auto ("exchange_pub",
                                   &pub),
+      GNUNET_JSON_pack_uint64 ("aml_status",
+                               kyp->aml_status),
+      GNUNET_JSON_pack_object_incref ("kyc_details",
+                                      kyp->kyc_details),
       GNUNET_JSON_pack_timestamp ("now",
                                   now));
   }
diff --git a/src/exchange/taler-exchange-httpd_kyc-check.h b/src/exchange/taler-exchange-httpd_kyc-check.h
index b6434b601..f1f2c9e7d 100644
--- a/src/exchange/taler-exchange-httpd_kyc-check.h
+++ b/src/exchange/taler-exchange-httpd_kyc-check.h
@@ -30,7 +30,7 @@
  * status of the given account and returns it.
  *
  * @param rc details about the request to handle
- * @param args one argument with the payment_target_uuid
+ * @param args one argument with the legitimization_uuid
  * @return MHD result code
  */
 MHD_RESULT
diff --git a/src/exchange/taler-exchange-httpd_kyc-proof.c b/src/exchange/taler-exchange-httpd_kyc-proof.c
index 75ff81e96..bad377a2a 100644
--- a/src/exchange/taler-exchange-httpd_kyc-proof.c
+++ b/src/exchange/taler-exchange-httpd_kyc-proof.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021-2023 Taler Systems SA
 
   TALER 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
@@ -23,9 +23,12 @@
 #include <gnunet/gnunet_json_lib.h>
 #include <jansson.h>
 #include <microhttpd.h>
-#include <pthread.h>
+#include "taler_attributes.h"
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler_templating_lib.h"
+#include "taler-exchange-httpd_common_kyc.h"
 #include "taler-exchange-httpd_kyc-proof.h"
 #include "taler-exchange-httpd_responses.h"
 
@@ -52,30 +55,36 @@ struct KycProofContext
   struct TEH_RequestContext *rc;
 
   /**
-   * Handle for the OAuth 2.0 CURL request.
+   * Proof logic to run.
    */
-  struct GNUNET_CURL_Job *job;
+  struct TALER_KYCLOGIC_Plugin *logic;
 
   /**
-   * OAuth 2.0 authorization code.
+   * Configuration for @a logic.
    */
-  const char *authorization_code;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
 
   /**
-   * OAuth 2.0 token URL we are using for the
-   * request.
+   * Asynchronous operation with the proof system.
    */
-  char *token_url;
+  struct TALER_KYCLOGIC_ProofHandle *ph;
 
   /**
-   * Body of the POST request.
+   * KYC AML trigger operation.
    */
-  char *post_body;
+  struct TEH_KycAmlTrigger *kat;
 
   /**
-   * User ID extracted from the OAuth 2.0 service, or NULL.
+   * Process information about the user for the plugin from the database, can
+   * be NULL.
    */
-  char *id;
+  char *provider_user_id;
+
+  /**
+   * Process information about the legitimization process for the plugin from the
+   * database, can be NULL.
+   */
+  char *provider_legitimization_id;
 
   /**
    * Hash of payment target URI this is about.
@@ -88,16 +97,24 @@ struct KycProofContext
   struct MHD_Response *response;
 
   /**
+   * Provider configuration section name of the logic we are running.
+   */
+  const char *provider_section;
+
+  /**
+   * Row in the database for this legitimization operation.
+   */
+  uint64_t process_row;
+
+  /**
    * HTTP response code to return.
    */
   unsigned int response_code;
 
   /**
-   * #GNUNET_YES if we are suspended,
-   * #GNUNET_NO if not.
-   * #GNUNET_SYSERR if we had some error.
+   * True if we are suspended,
    */
-  enum GNUNET_GenericReturnValue suspended;
+  bool suspended;
 
 };
 
@@ -122,7 +139,7 @@ static void
 kpc_resume (struct KycProofContext *kpc)
 {
   GNUNET_assert (GNUNET_YES == kpc->suspended);
-  kpc->suspended = GNUNET_NO;
+  kpc->suspended = false;
   GNUNET_CONTAINER_DLL_remove (kpc_head,
                                kpc_tail,
                                kpc);
@@ -138,10 +155,10 @@ TEH_kyc_proof_cleanup (void)
 
   while (NULL != (kpc = kpc_head))
   {
-    if (NULL != kpc->job)
+    if (NULL != kpc->ph)
     {
-      GNUNET_CURL_job_cancel (kpc->job);
-      kpc->job = NULL;
+      kpc->logic->proof_cancel (kpc->ph);
+      kpc->ph = NULL;
     }
     kpc_resume (kpc);
   }
@@ -149,348 +166,232 @@ TEH_kyc_proof_cleanup (void)
 
 
 /**
- * Function implementing database transaction to check proof's KYC status.
- * Runs the transaction logic; IF it returns a non-error code, the transaction
- * logic MUST NOT queue a MHD response.  IF it returns an hard error, the
- * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
- * returns the soft error code, the function MAY be called again to retry and
- * MUST not queue a MHD response.
+ * Function called after the KYC-AML trigger is done.
  *
- * @param cls closure with a `struct KycProofContext *`
- * @param connection MHD proof which triggered the transaction
- * @param[out] mhd_ret set to MHD response status for @a connection,
- *             if transaction failed (!)
- * @return transaction status
+ * @param cls closure
+ * @param http_status final HTTP status to return
+ * @param[in] response final HTTP ro return
  */
-static enum GNUNET_DB_QueryStatus
-persist_kyc_ok (void *cls,
-                struct MHD_Connection *connection,
-                MHD_RESULT *mhd_ret)
+static void
+proof_finish (
+  void *cls,
+  unsigned int http_status,
+  struct MHD_Response *response)
 {
   struct KycProofContext *kpc = cls;
-  enum GNUNET_DB_QueryStatus qs;
 
-  qs = TEH_plugin->set_kyc_ok (TEH_plugin->cls,
-                               &kpc->h_payto,
-                               kpc->id);
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-  {
-    GNUNET_break (0);
-    *mhd_ret = TALER_MHD_reply_with_ec (connection,
-                                        TALER_EC_GENERIC_DB_STORE_FAILED,
-                                        "set_kyc_ok");
-  }
-  return qs;
+  kpc->kat = NULL;
+  kpc->response_code = http_status;
+  kpc->response = response;
+  kpc_resume (kpc);
 }
 
 
 /**
- * The request for @a kpc failed. We may have gotten a useful error
- * message in @a j. Generate a failure response.
+ * Generate HTML error for @a connection using @a template.
  *
- * @param[in,out] kpc request that failed
- * @param j reply from the server (or NULL)
+ * @param connection HTTP client connection
+ * @param template template to expand
+ * @param[in,out] http_status HTTP status of the response
+ * @param ec Taler error code to return
+ * @param message extended message to return
+ * @return MHD response object
  */
-static void
-handle_error (struct KycProofContext *kpc,
-              const json_t *j)
+struct MHD_Response *
+make_html_error (struct MHD_Connection *connection,
+                 const char *template,
+                 unsigned int *http_status,
+                 enum TALER_ErrorCode ec,
+                 const char *message)
 {
-  const char *msg;
-  const char *desc;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("error",
-                             &msg),
-    GNUNET_JSON_spec_string ("error_description",
-                             &desc),
-    GNUNET_JSON_spec_end ()
-  };
-
-  {
-    enum GNUNET_GenericReturnValue res;
-    const char *emsg;
-    unsigned int line;
-
-    res = GNUNET_JSON_parse (j,
-                             spec,
-                             &emsg,
-                             &line);
-    if (GNUNET_OK != res)
-    {
-      GNUNET_break_op (0);
-      kpc->response
-        = TALER_MHD_make_error (
-            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-            "Unexpected response from KYC gateway");
-      kpc->response_code
-        = MHD_HTTP_BAD_GATEWAY;
-      return;
-    }
-  }
-  /* case TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_AUTHORZATION_FAILED,
-     we MAY want to in the future look at the requested content type
-     and possibly respond in JSON if indicated. */
-  {
-    char *reply;
-
-    GNUNET_asprintf (&reply,
-                     "<html><head><title>%s</title></head><body><h1>%s</h1><p>%s</p></body></html>",
-                     msg,
-                     msg,
-                     desc);
-    kpc->response
-      = MHD_create_response_from_buffer (strlen (reply),
-                                         reply,
-                                         MHD_RESPMEM_MUST_COPY);
-    GNUNET_assert (NULL != kpc->response);
-    GNUNET_free (reply);
-  }
-  kpc->response_code = MHD_HTTP_FORBIDDEN;
+  struct MHD_Response *response = NULL;
+  json_t *body;
+
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("message",
+                               message)),
+    TALER_JSON_pack_ec (
+      ec));
+  GNUNET_break (
+    GNUNET_SYSERR !=
+    TALER_TEMPLATING_build (connection,
+                            http_status,
+                            template,
+                            NULL,
+                            NULL,
+                            body,
+                            &response));
+  json_decref (body);
+  return response;
 }
 
 
 /**
- * The request for @a kpc succeeded (presumably).
- * Parse the user ID and store it in @a kpc (if possible).
+ * Respond with an HTML message on the given @a rc.
  *
- * @param[in,out] kpc request that succeeded
- * @param j reply from the server
+ * @param[in,out] rc request to respond to
+ * @param http_status HTTP status code to use
+ * @param template template to fill in
+ * @param ec error code to use for the template
+ * @param message additional message to return
+ * @return MHD result code
  */
-static void
-parse_success_reply (struct KycProofContext *kpc,
-                     const json_t *j)
+static MHD_RESULT
+respond_html_ec (struct TEH_RequestContext *rc,
+                 unsigned int http_status,
+                 const char *template,
+                 enum TALER_ErrorCode ec,
+                 const char *message)
 {
-  const char *state;
-  json_t *data;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("status",
-                             &state),
-    GNUNET_JSON_spec_json ("data",
-                           &data),
-    GNUNET_JSON_spec_end ()
-  };
-  enum GNUNET_GenericReturnValue res;
-  const char *emsg;
-  unsigned int line;
-
-  res = GNUNET_JSON_parse (j,
-                           spec,
-                           &emsg,
-                           &line);
-  if (GNUNET_OK != res)
-  {
-    GNUNET_break_op (0);
-    kpc->response
-      = TALER_MHD_make_error (
-          TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-          "Unexpected response from KYC gateway");
-    kpc->response_code
-      = MHD_HTTP_BAD_GATEWAY;
-    return;
-  }
-  if (0 != strcasecmp (state,
-                       "success"))
-  {
-    GNUNET_break_op (0);
-    handle_error (kpc,
-                  j);
-    return;
-  }
-  {
-    const char *id;
-    struct GNUNET_JSON_Specification ispec[] = {
-      GNUNET_JSON_spec_string ("id",
-                               &id),
-      GNUNET_JSON_spec_end ()
-    };
-
-    res = GNUNET_JSON_parse (data,
-                             ispec,
-                             &emsg,
-                             &line);
-    if (GNUNET_OK != res)
-    {
-      GNUNET_break_op (0);
-      kpc->response
-        = TALER_MHD_make_error (
-            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-            "Unexpected response from KYC gateway");
-      kpc->response_code
-        = MHD_HTTP_BAD_GATEWAY;
-      return;
-    }
-    kpc->id = GNUNET_strdup (id);
-  }
+  struct MHD_Response *response;
+  MHD_RESULT res;
+
+  response = make_html_error (rc->connection,
+                              template,
+                              &http_status,
+                              ec,
+                              message);
+  res = MHD_queue_response (rc->connection,
+                            http_status,
+                            response);
+  MHD_destroy_response (response);
+  return res;
 }
 
 
 /**
- * After we are done with the CURL interaction we
- * need to update our database state with the information
- * retrieved.
+ * Function called with the result of a proof check operation.
  *
- * @param cls our `struct KycProofContext`
- * @param response_code HTTP response code from server, 0 on hard error
- * @param response in JSON, NULL if response was not in JSON format
- */
-static void
-handle_curl_fetch_finished (void *cls,
-                            long response_code,
-                            const void *response)
-{
-  struct KycProofContext *kpc = cls;
-  const json_t *j = response;
-
-  kpc->job = NULL;
-  switch (response_code)
-  {
-  case MHD_HTTP_OK:
-    parse_success_reply (kpc,
-                         j);
-    break;
-  default:
-    handle_error (kpc,
-                  j);
-    break;
-  }
-  kpc_resume (kpc);
-}
-
-
-/**
- * After we are done with the CURL interaction we
- * need to fetch the user's account details.
+ * Note that the "decref" for the @a response
+ * will be done by the callee and MUST NOT be done by the plugin.
  *
- * @param cls our `struct KycProofContext`
- * @param response_code HTTP response code from server, 0 on hard error
- * @param response in JSON, NULL if response was not in JSON format
+ * @param cls closure
+ * @param status KYC status
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param expiration until when is the KYC check valid
+ * @param attributes user attributes returned by the provider
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
  */
 static void
-handle_curl_login_finished (void *cls,
-                            long response_code,
-                            const void *response)
+proof_cb (
+  void *cls,
+  enum TALER_KYCLOGIC_KycStatus status,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response)
 {
   struct KycProofContext *kpc = cls;
-  const json_t *j = response;
+  struct TEH_RequestContext *rc = kpc->rc;
+  struct GNUNET_AsyncScopeSave old_scope;
 
-  kpc->job = NULL;
-  switch (response_code)
+  kpc->ph = NULL;
+  GNUNET_async_scope_enter (&rc->async_scope_id,
+                            &old_scope);
+  switch (status)
   {
-  case MHD_HTTP_OK:
+  case TALER_KYCLOGIC_STATUS_SUCCESS:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC process #%llu succeeded with KYC provider\n",
+                (unsigned long long) kpc->process_row);
+    kpc->kat = TEH_kyc_finished (&rc->async_scope_id,
+                                 kpc->process_row,
+                                 &kpc->h_payto,
+                                 kpc->provider_section,
+                                 provider_user_id,
+                                 provider_legitimization_id,
+                                 expiration,
+                                 attributes,
+                                 http_status,
+                                 response,
+                                 &proof_finish,
+                                 kpc);
+    if (NULL == kpc->kat)
     {
-      const char *access_token;
-      const char *token_type;
-      uint64_t expires_in_s;
-      const char *refresh_token;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_string ("access_token",
-                                 &access_token),
-        GNUNET_JSON_spec_string ("token_type",
-                                 &token_type),
-        GNUNET_JSON_spec_uint64 ("expires_in",
-                                 &expires_in_s),
-        GNUNET_JSON_spec_string ("refresh_token",
-                                 &refresh_token),
-        GNUNET_JSON_spec_end ()
-      };
-      CURL *eh;
-
-      {
-        enum GNUNET_GenericReturnValue res;
-        const char *emsg;
-        unsigned int line;
-
-        res = GNUNET_JSON_parse (j,
-                                 spec,
-                                 &emsg,
-                                 &line);
-        if (GNUNET_OK != res)
-        {
-          GNUNET_break_op (0);
-          kpc->response
-            = TALER_MHD_make_error (
-                TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-                "Unexpected response from KYC gateway");
-          kpc->response_code
-            = MHD_HTTP_BAD_GATEWAY;
-          break;
-        }
-      }
-      if (0 != strcasecmp (token_type,
-                           "bearer"))
-      {
-        GNUNET_break_op (0);
-        kpc->response
-          = TALER_MHD_make_error (
-              TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-              "Unexpected token type in response from KYC gateway");
-        kpc->response_code
-          = MHD_HTTP_BAD_GATEWAY;
-        break;
-      }
-
-      /* We guard against a few characters that could
-         conceivably be abused to mess with the HTTP header */
-      if ( (NULL != strchr (access_token,
-                            '\n')) ||
-           (NULL != strchr (access_token,
-                            '\r')) ||
-           (NULL != strchr (access_token,
-                            ' ')) ||
-           (NULL != strchr (access_token,
-                            ';')) )
-      {
-        GNUNET_break_op (0);
-        kpc->response
-          = TALER_MHD_make_error (
-              TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
-              "Illegal character in access token");
-        kpc->response_code
-          = MHD_HTTP_BAD_GATEWAY;
-        break;
-      }
-
-      eh = curl_easy_init ();
-      if (NULL == eh)
-      {
-        GNUNET_break_op (0);
-        kpc->response
-          = TALER_MHD_make_error (
-              TALER_EC_GENERIC_ALLOCATION_FAILURE,
-              "curl_easy_init");
-        kpc->response_code
-          = MHD_HTTP_INTERNAL_SERVER_ERROR;
-        break;
-      }
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_URL,
-                                       TEH_kyc_config.details.oauth2.info_url));
+      http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+      if (NULL != response)
+        MHD_destroy_response (response);
+      response = make_html_error (kpc->rc->connection,
+                                  "kyc-proof-internal-error",
+                                  &http_status,
+                                  TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+                                  "[exchange] AML_KYC_TRIGGER");
+    }
+    break;
+  case TALER_KYCLOGIC_STATUS_FAILED:
+  case TALER_KYCLOGIC_STATUS_PROVIDER_FAILED:
+  case TALER_KYCLOGIC_STATUS_USER_ABORTED:
+  case TALER_KYCLOGIC_STATUS_ABORTED:
+    GNUNET_assert (NULL == kpc->kat);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC process %s/%s (Row #%llu) failed: %d\n",
+                provider_user_id,
+                provider_legitimization_id,
+                (unsigned long long) kpc->process_row,
+                status);
+    if (5 == http_status / 100)
+    {
+      char *msg;
+
+      /* OAuth2 server had a problem, do NOT log this as a KYC failure */
+      if (NULL != response)
+        MHD_destroy_response (response);
+      GNUNET_asprintf (&msg,
+                       "Failure by KYC provider (HTTP status %u)\n",
+                       http_status);
+      http_status = MHD_HTTP_BAD_GATEWAY;
+      response = make_html_error (kpc->rc->connection,
+                                  "kyc-proof-internal-error",
+                                  &http_status,
+                                  TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+                                  msg);
+      GNUNET_free (msg);
+    }
+    else
+    {
+      if (! TEH_kyc_failed (kpc->process_row,
+                            &kpc->h_payto,
+                            kpc->provider_section,
+                            provider_user_id,
+                            provider_legitimization_id))
       {
-        char *hdr;
-        struct curl_slist *slist;
-
-        GNUNET_asprintf (&hdr,
-                         "%s: Bearer %s",
-                         MHD_HTTP_HEADER_AUTHORIZATION,
-                         access_token);
-        slist = curl_slist_append (NULL,
-                                   hdr);
-        kpc->job = GNUNET_CURL_job_add2 (TEH_curl_ctx,
-                                         eh,
-                                         slist,
-                                         &handle_curl_fetch_finished,
-                                         kpc);
-        curl_slist_free_all (slist);
-        GNUNET_free (hdr);
+        GNUNET_break (0);
+        if (NULL != response)
+          MHD_destroy_response (response);
+        http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+        response = make_html_error (kpc->rc->connection,
+                                    "kyc-proof-internal-error",
+                                    &http_status,
+                                    TALER_EC_GENERIC_DB_STORE_FAILED,
+                                    "insert_kyc_failure");
       }
-      return;
     }
+    break;
   default:
-    handle_error (kpc,
-                  j);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC status of %s/%s (Row #%llu) is %d\n",
+                provider_user_id,
+                provider_legitimization_id,
+                (unsigned long long) kpc->process_row,
+                (int) status);
     break;
   }
-  kpc_resume (kpc);
+  if (NULL == kpc->kat)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC process #%llu failed with status %d\n",
+                (unsigned long long) kpc->process_row,
+                status);
+    proof_finish (kpc,
+                  http_status,
+                  response);
+  }
+  GNUNET_async_scope_restore (&old_scope);
 }
 
 
@@ -504,19 +405,23 @@ clean_kpc (struct TEH_RequestContext *rc)
 {
   struct KycProofContext *kpc = rc->rh_ctx;
 
-  if (NULL != kpc->job)
+  if (NULL != kpc->ph)
+  {
+    kpc->logic->proof_cancel (kpc->ph);
+    kpc->ph = NULL;
+  }
+  if (NULL != kpc->kat)
   {
-    GNUNET_CURL_job_cancel (kpc->job);
-    kpc->job = NULL;
+    TEH_kyc_finished_cancel (kpc->kat);
+    kpc->kat = NULL;
   }
   if (NULL != kpc->response)
   {
     MHD_destroy_response (kpc->response);
     kpc->response = NULL;
   }
-  GNUNET_free (kpc->post_body);
-  GNUNET_free (kpc->token_url);
-  GNUNET_free (kpc->id);
+  GNUNET_free (kpc->provider_user_id);
+  GNUNET_free (kpc->provider_legitimization_id);
   GNUNET_free (kpc);
 }
 
@@ -524,188 +429,137 @@ clean_kpc (struct TEH_RequestContext *rc)
 MHD_RESULT
 TEH_handler_kyc_proof (
   struct TEH_RequestContext *rc,
-  const char *const args[])
+  const char *const args[1])
 {
   struct KycProofContext *kpc = rc->rh_ctx;
+  const char *provider_section_or_logic = args[0];
 
   if (NULL == kpc)
-  { /* first time */
+  {
+    /* first time */
+    if (NULL == provider_section_or_logic)
+    {
+      GNUNET_break_op (0);
+      return respond_html_ec (rc,
+                              MHD_HTTP_NOT_FOUND,
+                              "kyc-proof-endpoint-unknown",
+                              TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                              "'/kyc-proof/$PROVIDER_SECTION?state=$H_PAYTO' required");
+    }
     kpc = GNUNET_new (struct KycProofContext);
     kpc->rc = rc;
     rc->rh_ctx = kpc;
     rc->rh_cleaner = &clean_kpc;
+    TALER_MHD_parse_request_arg_auto_t (rc->connection,
+                                        "state",
+                                        &kpc->h_payto);
     if (GNUNET_OK !=
-        GNUNET_STRINGS_string_to_data (args[0],
-                                       strlen (args[0]),
-                                       &kpc->h_payto,
-                                       sizeof (kpc->h_payto)))
+        TALER_KYCLOGIC_lookup_logic (provider_section_or_logic,
+                                     &kpc->logic,
+                                     &kpc->pd,
+                                     &kpc->provider_section))
     {
       GNUNET_break_op (0);
-      return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                         "h_payto");
+      return respond_html_ec (rc,
+                              MHD_HTTP_NOT_FOUND,
+                              "kyc-proof-target-unknown",
+                              TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
+                              provider_section_or_logic);
     }
-    kpc->authorization_code
-      = MHD_lookup_connection_value (rc->connection,
-                                     MHD_GET_ARGUMENT_KIND,
-                                     "code");
-    if (NULL == kpc->authorization_code)
+    if (NULL != kpc->provider_section)
     {
-      GNUNET_break_op (0);
-      return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                         "code");
-    }
-    if (TEH_KYC_NONE == TEH_kyc_config.mode)
-      return TALER_MHD_reply_static (
-        rc->connection,
-        MHD_HTTP_NO_CONTENT,
-        NULL,
-        NULL,
-        0);
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_TIME_Absolute expiration;
 
-    {
-      CURL *eh;
+      if (0 != strcmp (provider_section_or_logic,
+                       kpc->provider_section))
+      {
+        GNUNET_break_op (0);
+        return respond_html_ec (rc,
+                                MHD_HTTP_BAD_REQUEST,
+                                "kyc-proof-bad-request",
+                                TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                "PROVIDER_SECTION");
+      }
 
-      eh = curl_easy_init ();
-      if (NULL == eh)
+      qs = TEH_plugin->lookup_kyc_process_by_account (
+        TEH_plugin->cls,
+        kpc->provider_section,
+        &kpc->h_payto,
+        &kpc->process_row,
+        &expiration,
+        &kpc->provider_user_id,
+        &kpc->provider_legitimization_id);
+      switch (qs)
       {
-        GNUNET_break (0);
-        return TALER_MHD_reply_with_error (rc->connection,
-                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                           TALER_EC_GENERIC_ALLOCATION_FAILURE,
-                                           "curl_easy_init");
+      case GNUNET_DB_STATUS_HARD_ERROR:
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        return respond_html_ec (rc,
+                                MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                "kyc-proof-internal-error",
+                                TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                "lookup_kyc_process_by_account");
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        return respond_html_ec (rc,
+                                MHD_HTTP_NOT_FOUND,
+                                "kyc-proof-target-unknown",
+                                TALER_EC_EXCHANGE_KYC_PROOF_REQUEST_UNKNOWN,
+                                kpc->provider_section);
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        break;
       }
-      GNUNET_asprintf (&kpc->token_url,
-                       "%s",
-                       TEH_kyc_config.details.oauth2.auth_url);
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_URL,
-                                       kpc->token_url));
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_POST,
-                                       1));
+      if (GNUNET_TIME_absolute_is_future (expiration))
       {
-        char *client_id;
-        char *redirect_uri;
-        char *client_secret;
-        char *authorization_code;
-
-        client_id = curl_easy_escape (eh,
-                                      TEH_kyc_config.details.oauth2.client_id,
-                                      0);
-        GNUNET_assert (NULL != client_id);
-        {
-          char *request_uri;
-
-          GNUNET_asprintf (&request_uri,
-                           "%s?client_id=%s",
-                           TEH_kyc_config.details.oauth2.login_url,
-                           TEH_kyc_config.details.oauth2.client_id);
-          redirect_uri = curl_easy_escape (eh,
-                                           request_uri,
-                                           0);
-          GNUNET_free (request_uri);
-        }
-        GNUNET_assert (NULL != redirect_uri);
-        client_secret = curl_easy_escape (eh,
-                                          TEH_kyc_config.details.oauth2.
-                                          client_secret,
-                                          0);
-        GNUNET_assert (NULL != client_secret);
-        authorization_code = curl_easy_escape (eh,
-                                               kpc->authorization_code,
-                                               0);
-        GNUNET_assert (NULL != authorization_code);
-        GNUNET_asprintf (&kpc->post_body,
-                         "client_id=%s&redirect_uri=%s&client_secret=%s&code=%s&grant_type=authorization_code",
-                         client_id,
-                         redirect_uri,
-                         client_secret,
-                         authorization_code);
-        curl_free (authorization_code);
-        curl_free (client_secret);
-        curl_free (redirect_uri);
-        curl_free (client_id);
+        /* KYC not required */
+        return respond_html_ec (rc,
+                                MHD_HTTP_OK,
+                                "kyc-proof-already-done",
+                                TALER_EC_NONE,
+                                NULL);
       }
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_POSTFIELDS,
-                                       kpc->post_body));
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_FOLLOWLOCATION,
-                                       1L));
-      /* limit MAXREDIRS to 5 as a simple security measure against
-         a potential infinite loop caused by a malicious target */
-      GNUNET_assert (CURLE_OK ==
-                     curl_easy_setopt (eh,
-                                       CURLOPT_MAXREDIRS,
-                                       5L));
-
-      kpc->job = GNUNET_CURL_job_add (TEH_curl_ctx,
-                                      eh,
-                                      &handle_curl_login_finished,
-                                      kpc);
-      kpc->suspended = GNUNET_YES;
-      GNUNET_CONTAINER_DLL_insert (kpc_head,
-                                   kpc_tail,
-                                   kpc);
-      MHD_suspend_connection (rc->connection);
-      return MHD_YES;
     }
-  }
+    kpc->ph = kpc->logic->proof (kpc->logic->cls,
+                                 kpc->pd,
+                                 rc->connection,
+                                 &kpc->h_payto,
+                                 kpc->process_row,
+                                 kpc->provider_user_id,
+                                 kpc->provider_legitimization_id,
+                                 &proof_cb,
+                                 kpc);
+    if (NULL == kpc->ph)
+    {
+      GNUNET_break (0);
+      return respond_html_ec (rc,
+                              MHD_HTTP_INTERNAL_SERVER_ERROR,
+                              "kyc-proof-internal-error",
+                              TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                              "could not start proof with KYC logic");
+    }
 
-  if (NULL != kpc->response)
-  {
-    /* handle _failed_ resumed cases */
-    return MHD_queue_response (rc->connection,
-                               kpc->response_code,
-                               kpc->response);
-  }
 
-  /* _successfully_ resumed case */
-  {
-    MHD_RESULT res;
-    enum GNUNET_GenericReturnValue ret;
-
-    ret = TEH_DB_run_transaction (kpc->rc->connection,
-                                  "check proof kyc",
-                                  TEH_MT_REQUEST_OTHER,
-                                  &res,
-                                  &persist_kyc_ok,
-                                  kpc);
-    if (GNUNET_SYSERR == ret)
-      return res;
+    kpc->suspended = true;
+    GNUNET_CONTAINER_DLL_insert (kpc_head,
+                                 kpc_tail,
+                                 kpc);
+    MHD_suspend_connection (rc->connection);
+    return MHD_YES;
   }
 
+  if (NULL == kpc->response)
   {
-    struct MHD_Response *response;
-    MHD_RESULT res;
-
-    response = MHD_create_response_from_buffer (0,
-                                                "",
-                                                MHD_RESPMEM_PERSISTENT);
-    if (NULL == response)
-    {
-      GNUNET_break (0);
-      return MHD_NO;
-    }
-    GNUNET_break (MHD_YES ==
-                  MHD_add_response_header (
-                    response,
-                    MHD_HTTP_HEADER_LOCATION,
-                    TEH_kyc_config.details.oauth2.post_kyc_redirect_url));
-    res = MHD_queue_response (rc->connection,
-                              MHD_HTTP_SEE_OTHER,
-                              response);
-    MHD_destroy_response (response);
-    return res;
+    GNUNET_break (0);
+    return respond_html_ec (rc,
+                            MHD_HTTP_INTERNAL_SERVER_ERROR,
+                            "kyc-proof-internal-error",
+                            TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                            "handler resumed without response");
   }
+
+  /* return response from KYC logic */
+  return MHD_queue_response (rc->connection,
+                             kpc->response_code,
+                             kpc->response);
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_kyc-proof.h b/src/exchange/taler-exchange-httpd_kyc-proof.h
index c075b2424..d40ea90a9 100644
--- a/src/exchange/taler-exchange-httpd_kyc-proof.h
+++ b/src/exchange/taler-exchange-httpd_kyc-proof.h
@@ -37,13 +37,13 @@ TEH_kyc_proof_cleanup (void);
  * Handle a "/kyc-proof" request.
  *
  * @param rc request to handle
- * @param args one argument with the payment_target_uuid
+ * @param args one argument with the legitimization_uuid
  * @return MHD result code
  */
 MHD_RESULT
 TEH_handler_kyc_proof (
   struct TEH_RequestContext *rc,
-  const char *const args[]);
+  const char *const args[1]);
 
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_kyc-wallet.c b/src/exchange/taler-exchange-httpd_kyc-wallet.c
index 0d92efd3a..21d07422d 100644
--- a/src/exchange/taler-exchange-httpd_kyc-wallet.c
+++ b/src/exchange/taler-exchange-httpd_kyc-wallet.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021, 2022 Taler Systems SA
 
   TALER 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
@@ -26,6 +26,7 @@
 #include <pthread.h>
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler-exchange-httpd_kyc-wallet.h"
 #include "taler-exchange-httpd_responses.h"
 
@@ -38,16 +39,60 @@ struct KycRequestContext
   /**
    * Public key of the reserve/wallet this is about.
    */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * The reserve's public key
+   */
   struct TALER_ReservePublicKeyP reserve_pub;
 
   /**
-   * Current KYC status.
+   * KYC status, with row with the legitimization requirement.
    */
   struct TALER_EXCHANGEDB_KycStatus kyc;
+
+  /**
+   * Balance threshold crossed by the wallet.
+   */
+  struct TALER_Amount balance;
+
+  /**
+   * Name of the required check.
+   */
+  char *required;
+
 };
 
 
 /**
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Returns the wallet balance.
+ *
+ * @param cls closure, a `struct KycRequestContext`
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
+ */
+static void
+balance_iterator (void *cls,
+                  struct GNUNET_TIME_Absolute limit,
+                  TALER_EXCHANGEDB_KycAmountCallback cb,
+                  void *cb_cls)
+{
+  struct KycRequestContext *krc = cls;
+
+  (void) limit;
+  cb (cb_cls,
+      &krc->balance,
+      GNUNET_TIME_absolute_get ());
+}
+
+
+/**
  * Function implementing database transaction to check wallet's KYC status.
  * Runs the transaction logic; IF it returns a non-error code, the transaction
  * logic MUST NOT queue a MHD response.  IF it returns an hard error, the
@@ -69,9 +114,40 @@ wallet_kyc_check (void *cls,
   struct KycRequestContext *krc = cls;
   enum GNUNET_DB_QueryStatus qs;
 
-  qs = TEH_plugin->inselect_wallet_kyc_status (TEH_plugin->cls,
-                                               &krc->reserve_pub,
-                                               &krc->kyc);
+  qs = TALER_KYCLOGIC_kyc_test_required (
+    TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE,
+    &krc->h_payto,
+    TEH_plugin->select_satisfied_kyc_processes,
+    TEH_plugin->cls,
+    &balance_iterator,
+    krc,
+    &krc->required);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                           "kyc_test_required");
+    return qs;
+  }
+  if (NULL == krc->required)
+  {
+    krc->kyc.ok = true;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC check required at %s is `%s'\n",
+              TALER_amount2s (&krc->balance),
+              krc->required);
+  krc->kyc.ok = false;
+  qs = TEH_plugin->insert_kyc_requirement_for_account (TEH_plugin->cls,
+                                                       krc->required,
+                                                       &krc->h_payto,
+                                                       &krc->reserve_pub,
+                                                       &krc->kyc.requirement_row);
   if (qs < 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -80,9 +156,14 @@ wallet_kyc_check (void *cls,
     *mhd_ret = TALER_MHD_reply_with_error (connection,
                                            MHD_HTTP_INTERNAL_SERVER_ERROR,
                                            TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                           "inselect_wallet_status");
+                                           "insert_kyc_requirement_for_account");
     return qs;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC requirement inserted for wallet %s (%llu, %d)\n",
+              TALER_B2S (&krc->h_payto),
+              (unsigned long long) krc->kyc.requirement_row,
+              qs);
   return qs;
 }
 
@@ -100,6 +181,9 @@ TEH_handler_kyc_wallet (
                                  &reserve_sig),
     GNUNET_JSON_spec_fixed_auto ("reserve_pub",
                                  &krc.reserve_pub),
+    TALER_JSON_spec_amount ("balance",
+                            TEH_currency,
+                            &krc.balance),
     GNUNET_JSON_spec_end ()
   };
   MHD_RESULT res;
@@ -117,6 +201,7 @@ TEH_handler_kyc_wallet (
   TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
   if (GNUNET_OK !=
       TALER_wallet_account_setup_verify (&krc.reserve_pub,
+                                         &krc.balance,
                                          &reserve_sig))
   {
     GNUNET_break_op (0);
@@ -126,13 +211,19 @@ TEH_handler_kyc_wallet (
       TALER_EC_EXCHANGE_KYC_WALLET_SIGNATURE_INVALID,
       NULL);
   }
-  if (TEH_KYC_NONE == TEH_kyc_config.mode)
-    return TALER_MHD_reply_static (
-      rc->connection,
-      MHD_HTTP_NO_CONTENT,
-      NULL,
-      NULL,
-      0);
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (TEH_base_url,
+                                          &krc.reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &krc.h_payto);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "h_payto of wallet %s is %s\n",
+                payto_uri,
+                TALER_B2S (&krc.h_payto));
+    GNUNET_free (payto_uri);
+  }
   ret = TEH_DB_run_transaction (rc->connection,
                                 "check wallet kyc",
                                 TEH_MT_REQUEST_OTHER,
@@ -141,11 +232,20 @@ TEH_handler_kyc_wallet (
                                 &krc);
   if (GNUNET_SYSERR == ret)
     return res;
-  return TALER_MHD_REPLY_JSON_PACK (
-    rc->connection,
-    MHD_HTTP_OK,
-    GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                             krc.kyc.payment_target_uuid));
+  if (NULL == krc.required)
+  {
+    /* KYC not required or already satisfied */
+    return TALER_MHD_reply_static (
+      rc->connection,
+      MHD_HTTP_NO_CONTENT,
+      NULL,
+      NULL,
+      0);
+  }
+  GNUNET_free (krc.required);
+  return TEH_RESPONSE_reply_kyc_required (rc->connection,
+                                          &krc.h_payto,
+                                          &krc.kyc);
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_kyc-webhook.c b/src/exchange/taler-exchange-httpd_kyc-webhook.c
new file mode 100644
index 000000000..b92b43e69
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_kyc-webhook.c
@@ -0,0 +1,420 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022-2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_kyc-webhook.c
+ * @brief Handle notification of KYC completion via webhook.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_attributes.h"
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_kyclogic_lib.h"
+#include "taler-exchange-httpd_common_kyc.h"
+#include "taler-exchange-httpd_kyc-webhook.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Context for the webhook.
+ */
+struct KycWebhookContext
+{
+
+  /**
+   * Kept in a DLL while suspended.
+   */
+  struct KycWebhookContext *next;
+
+  /**
+   * Kept in a DLL while suspended.
+   */
+  struct KycWebhookContext *prev;
+
+  /**
+   * Details about the connection we are processing.
+   */
+  struct TEH_RequestContext *rc;
+
+  /**
+   * Handle for the KYC-AML trigger interaction.
+   */
+  struct TEH_KycAmlTrigger *kat;
+
+  /**
+   * Plugin responsible for the webhook.
+   */
+  struct TALER_KYCLOGIC_Plugin *plugin;
+
+  /**
+   * Section in the configuration of the configured
+   * KYC provider.
+   */
+  const char *provider_section;
+
+  /**
+   * Configuration for the specific action.
+   */
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Webhook activity.
+   */
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+
+  /**
+   * HTTP response to return.
+   */
+  struct MHD_Response *response;
+
+  /**
+   * HTTP response code to return.
+   */
+  unsigned int response_code;
+
+  /**
+   * #GNUNET_YES if we are suspended,
+   * #GNUNET_NO if not.
+   * #GNUNET_SYSERR if we had some error.
+   */
+  enum GNUNET_GenericReturnValue suspended;
+
+};
+
+
+/**
+ * Contexts are kept in a DLL while suspended.
+ */
+static struct KycWebhookContext *kwh_head;
+
+/**
+ * Contexts are kept in a DLL while suspended.
+ */
+static struct KycWebhookContext *kwh_tail;
+
+
+/**
+ * Resume processing the @a kwh request.
+ *
+ * @param kwh request to resume
+ */
+static void
+kwh_resume (struct KycWebhookContext *kwh)
+{
+  GNUNET_assert (GNUNET_YES == kwh->suspended);
+  kwh->suspended = GNUNET_NO;
+  GNUNET_CONTAINER_DLL_remove (kwh_head,
+                               kwh_tail,
+                               kwh);
+  MHD_resume_connection (kwh->rc->connection);
+  TALER_MHD_daemon_trigger ();
+}
+
+
+void
+TEH_kyc_webhook_cleanup (void)
+{
+  struct KycWebhookContext *kwh;
+
+  while (NULL != (kwh = kwh_head))
+  {
+    if (NULL != kwh->wh)
+    {
+      kwh->plugin->webhook_cancel (kwh->wh);
+      kwh->wh = NULL;
+    }
+    kwh_resume (kwh);
+  }
+}
+
+
+/**
+ * Function called after the KYC-AML trigger is done.
+ *
+ * @param cls closure with a `struct KycWebhookContext *`
+ * @param http_status final HTTP status to return
+ * @param[in] response final HTTP ro return
+ */
+static void
+kyc_aml_webhook_finished (
+  void *cls,
+  unsigned int http_status,
+  struct MHD_Response *response)
+{
+  struct KycWebhookContext *kwh = cls;
+
+  kwh->kat = NULL;
+  kwh->response = response;
+  kwh->response_code = http_status;
+  kwh_resume (kwh);
+}
+
+
+/**
+ * Function called with the result of a KYC webhook operation.
+ *
+ * Note that the "decref" for the @a response
+ * will be done by the plugin.
+ *
+ * @param cls closure
+ * @param process_row legitimization process the webhook was about
+ * @param account_id account the webhook was about
+ * @param provider_section name of the configuration section of the logic that was run
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param status KYC status
+ * @param expiration until when is the KYC check valid
+ * @param attributes user attributes returned by the provider
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ */
+static void
+webhook_finished_cb (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *account_id,
+  const char *provider_section,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  enum TALER_KYCLOGIC_KycStatus status,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response)
+{
+  struct KycWebhookContext *kwh = cls;
+
+  kwh->wh = NULL;
+  switch (status)
+  {
+  case TALER_KYCLOGIC_STATUS_SUCCESS:
+    kwh->kat = TEH_kyc_finished (
+      &kwh->rc->async_scope_id,
+      process_row,
+      account_id,
+      provider_section,
+      provider_user_id,
+      provider_legitimization_id,
+      expiration,
+      attributes,
+      http_status,
+      response,
+      &kyc_aml_webhook_finished,
+      kwh);
+    if (NULL == kwh->kat)
+    {
+      if (NULL != response)
+        MHD_destroy_response (response);
+      http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+      response = TALER_MHD_make_error (
+        TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+        "[exchange] AML_KYC_TRIGGER");
+      break;
+    }
+    return;
+  case TALER_KYCLOGIC_STATUS_FAILED:
+  case TALER_KYCLOGIC_STATUS_PROVIDER_FAILED:
+  case TALER_KYCLOGIC_STATUS_USER_ABORTED:
+  case TALER_KYCLOGIC_STATUS_ABORTED:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC process %s/%s (Row #%llu) failed: %d\n",
+                provider_user_id,
+                provider_legitimization_id,
+                (unsigned long long) process_row,
+                status);
+    if (! TEH_kyc_failed (process_row,
+                          account_id,
+                          provider_section,
+                          provider_user_id,
+                          provider_legitimization_id))
+    {
+      GNUNET_break (0);
+      if (NULL != response)
+        MHD_destroy_response (response);
+      http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+      response = TALER_MHD_make_error (
+        TALER_EC_GENERIC_DB_STORE_FAILED,
+        "insert_kyc_failure");
+    }
+    break;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC status of %s/%s (Row #%llu) is %d\n",
+                provider_user_id,
+                provider_legitimization_id,
+                (unsigned long long) process_row,
+                (int) status);
+    break;
+  }
+  GNUNET_break (NULL == kwh->kat);
+  kyc_aml_webhook_finished (kwh,
+                            http_status,
+                            response);
+}
+
+
+/**
+ * Function called to clean up a context.
+ *
+ * @param rc request context
+ */
+static void
+clean_kwh (struct TEH_RequestContext *rc)
+{
+  struct KycWebhookContext *kwh = rc->rh_ctx;
+
+  if (NULL != kwh->wh)
+  {
+    kwh->plugin->webhook_cancel (kwh->wh);
+    kwh->wh = NULL;
+  }
+  if (NULL != kwh->kat)
+  {
+    TEH_kyc_finished_cancel (kwh->kat);
+    kwh->kat = NULL;
+  }
+  if (NULL != kwh->response)
+  {
+    MHD_destroy_response (kwh->response);
+    kwh->response = NULL;
+  }
+  GNUNET_free (kwh);
+}
+
+
+/**
+ * Handle a (GET or POST) "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param method HTTP request method used by the client
+ * @param root uploaded JSON body (can be NULL)
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+static MHD_RESULT
+handler_kyc_webhook_generic (
+  struct TEH_RequestContext *rc,
+  const char *method,
+  const json_t *root,
+  const char *const args[])
+{
+  struct KycWebhookContext *kwh = rc->rh_ctx;
+
+  if (NULL == kwh)
+  { /* first time */
+    kwh = GNUNET_new (struct KycWebhookContext);
+    kwh->rc = rc;
+    rc->rh_ctx = kwh;
+    rc->rh_cleaner = &clean_kwh;
+
+    if ( (NULL == args[0]) ||
+         (GNUNET_OK !=
+          TALER_KYCLOGIC_lookup_logic (args[0],
+                                       &kwh->plugin,
+                                       &kwh->pd,
+                                       &kwh->provider_section)) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "KYC logic `%s' unknown (check KYC provider configuration)\n",
+                  args[0]);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
+                                         args[0]);
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC logic `%s' mapped to section %s\n",
+                args[0],
+                kwh->provider_section);
+    kwh->wh = kwh->plugin->webhook (kwh->plugin->cls,
+                                    kwh->pd,
+                                    TEH_plugin->kyc_provider_account_lookup,
+                                    TEH_plugin->cls,
+                                    method,
+                                    &args[1],
+                                    rc->connection,
+                                    root,
+                                    &webhook_finished_cb,
+                                    kwh);
+    if (NULL == kwh->wh)
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                                         "failed to run webhook logic");
+    }
+    kwh->suspended = GNUNET_YES;
+    GNUNET_CONTAINER_DLL_insert (kwh_head,
+                                 kwh_tail,
+                                 kwh);
+    MHD_suspend_connection (rc->connection);
+    return MHD_YES;
+  }
+  GNUNET_break (GNUNET_NO == kwh->suspended);
+
+  if (NULL != kwh->response)
+  {
+    MHD_RESULT res;
+
+    res = MHD_queue_response (rc->connection,
+                              kwh->response_code,
+                              kwh->response);
+    GNUNET_break (MHD_YES == res);
+    return res;
+  }
+
+  /* We resumed, but got no response? This should
+     not happen. */
+  GNUNET_break (0);
+  return TALER_MHD_reply_with_error (rc->connection,
+                                     MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                     TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                                     "resumed without response");
+}
+
+
+MHD_RESULT
+TEH_handler_kyc_webhook_get (
+  struct TEH_RequestContext *rc,
+  const char *const args[])
+{
+  return handler_kyc_webhook_generic (rc,
+                                      MHD_HTTP_METHOD_GET,
+                                      NULL,
+                                      args);
+}
+
+
+MHD_RESULT
+TEH_handler_kyc_webhook_post (
+  struct TEH_RequestContext *rc,
+  const json_t *root,
+  const char *const args[])
+{
+  return handler_kyc_webhook_generic (rc,
+                                      MHD_HTTP_METHOD_POST,
+                                      root,
+                                      args);
+}
+
+
+/* end of taler-exchange-httpd_kyc-webhook.c */
diff --git a/src/exchange/taler-exchange-httpd_kyc-webhook.h b/src/exchange/taler-exchange-httpd_kyc-webhook.h
new file mode 100644
index 000000000..ea3821897
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_kyc-webhook.h
@@ -0,0 +1,64 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2021 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_kyc-webhook.h
+ * @brief Handle /kyc-webhook requests
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_KYC_WEBHOOK_H
+#define TALER_EXCHANGE_HTTPD_KYC_WEBHOOK_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Shutdown kyc-webhook subsystem.  Resumes all suspended long-polling clients
+ * and cleans up data structures.
+ */
+void
+TEH_kyc_webhook_cleanup (void);
+
+
+/**
+ * Handle a GET "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_kyc_webhook_get (
+  struct TEH_RequestContext *rc,
+  const char *const args[]);
+
+
+/**
+ * Handle a POST "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param root uploaded JSON body
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_kyc_webhook_post (
+  struct TEH_RequestContext *rc,
+  const json_t *root,
+  const char *const args[]);
+
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_link.c b/src/exchange/taler-exchange-httpd_link.c
index 9b7e297bc..3d92a11a3 100644
--- a/src/exchange/taler-exchange-httpd_link.c
+++ b/src/exchange/taler-exchange-httpd_link.c
@@ -39,7 +39,7 @@ struct HTD_Context
   /**
    * Public key of the coin for which we are running link.
    */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  const struct TALER_CoinSpendPublicKeyP *coin_pub;
 
   /**
    * Json array with transfer data we collect.
@@ -153,7 +153,7 @@ link_transaction (void *cls,
   enum GNUNET_DB_QueryStatus qs;
 
   qs = TEH_plugin->get_link_data (TEH_plugin->cls,
-                                  &ctx->coin_pub,
+                                  ctx->coin_pub,
                                   &handle_link_data,
                                   ctx);
   if (NULL == ctx->mlist)
@@ -178,26 +178,13 @@ link_transaction (void *cls,
 
 MHD_RESULT
 TEH_handler_link (struct TEH_RequestContext *rc,
-                  const char *const args[2])
+                  const struct TALER_CoinSpendPublicKeyP *coin_pub)
 {
-  struct HTD_Context ctx;
+  struct HTD_Context ctx = {
+    .coin_pub = coin_pub
+  };
   MHD_RESULT mhd_ret;
 
-  memset (&ctx,
-          0,
-          sizeof (ctx));
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[0],
-                                     strlen (args[0]),
-                                     &ctx.coin_pub,
-                                     sizeof (ctx.coin_pub)))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_GENERIC_COINS_INVALID_COIN_PUB,
-                                       args[0]);
-  }
   ctx.mlist = json_array ();
   GNUNET_assert (NULL != ctx.mlist);
   if (GNUNET_OK !=
diff --git a/src/exchange/taler-exchange-httpd_link.h b/src/exchange/taler-exchange-httpd_link.h
index 01679e877..255c0ca57 100644
--- a/src/exchange/taler-exchange-httpd_link.h
+++ b/src/exchange/taler-exchange-httpd_link.h
@@ -32,12 +32,12 @@
  * Handle a "/coins/$COIN_PUB/link" request.
  *
  * @param rc request context
- * @param args array of additional options (length: 2, first is the coin_pub, second must be "link")
+ * @param coin_pub the coin public key
  * @return MHD result code
   */
 MHD_RESULT
 TEH_handler_link (struct TEH_RequestContext *rc,
-                  const char *const args[2]);
+                  const struct TALER_CoinSpendPublicKeyP *coin_pub);
 
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_management.h b/src/exchange/taler-exchange-httpd_management.h
index 1bae49011..2fc1fe8db 100644
--- a/src/exchange/taler-exchange-httpd_management.h
+++ b/src/exchange/taler-exchange-httpd_management.h
@@ -162,6 +162,45 @@ TEH_handler_management_post_extensions (
 
 
 /**
+ * Handle a POST "/management/drain" request.
+ *
+ * @param connection the MHD connection to handle
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_management_post_drain (
+  struct MHD_Connection *connection,
+  const json_t *root);
+
+
+/**
+ * Handle a POST "/management/aml-officers" request.
+ *
+ * @param connection the MHD connection to handle
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_management_aml_officers (
+  struct MHD_Connection *connection,
+  const json_t *root);
+
+
+/**
+ * Handle a POST "/management/partners" request.
+ *
+ * @param connection the MHD connection to handle
+ * @param root uploaded JSON data
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_management_partners (
+  struct MHD_Connection *connection,
+  const json_t *root);
+
+
+/**
  * Initialize extension configuration handling.
  *
  * @return #GNUNET_OK on success
diff --git a/src/exchange/taler-exchange-httpd_management_aml-officers.c b/src/exchange/taler-exchange-httpd_management_aml-officers.c
new file mode 100644
index 000000000..abc7c3d84
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_management_aml-officers.c
@@ -0,0 +1,142 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_management_aml-officers.c
+ * @brief Handle request to update AML officer status
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd_management.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * How often do we try the DB operation at most?
+ */
+#define MAX_RETRIES 10
+
+
+MHD_RESULT
+TEH_handler_management_aml_officers (
+  struct MHD_Connection *connection,
+  const json_t *root)
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  const char *officer_name;
+  struct GNUNET_TIME_Timestamp change_date;
+  bool is_active;
+  bool read_only;
+  struct TALER_MasterSignatureP master_sig;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("officer_pub",
+                                 &officer_pub),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &master_sig),
+    GNUNET_JSON_spec_bool ("is_active",
+                           &is_active),
+    GNUNET_JSON_spec_bool ("read_only",
+                           &read_only),
+    GNUNET_JSON_spec_string ("officer_name",
+                             &officer_name),
+    GNUNET_JSON_spec_timestamp ("change_date",
+                                &change_date),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+      return MHD_NO; /* hard failure */
+    if (GNUNET_NO == res)
+      return MHD_YES; /* failure */
+  }
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_exchange_offline_aml_officer_status_verify (
+        &officer_pub,
+        officer_name,
+        change_date,
+        is_active,
+        read_only,
+        &TEH_master_public_key,
+        &master_sig))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_MANAGEMENT_UPDATE_AML_OFFICER_SIGNATURE_INVALID,
+      NULL);
+  }
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    struct GNUNET_TIME_Timestamp last_date;
+    unsigned int retries_left = MAX_RETRIES;
+
+    do {
+      qs = TEH_plugin->insert_aml_officer (TEH_plugin->cls,
+                                           &officer_pub,
+                                           &master_sig,
+                                           officer_name,
+                                           is_active,
+                                           read_only,
+                                           change_date,
+                                           &last_date);
+      if (0 == --retries_left)
+        break;
+    } while (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    if (qs < 0)
+    {
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_STORE_FAILED,
+                                         "insert_aml_officer");
+    }
+    if (GNUNET_TIME_timestamp_cmp (last_date,
+                                   >,
+                                   change_date))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_CONFLICT,
+        TALER_EC_EXCHANGE_MANAGEMENT_AML_OFFICERS_MORE_RECENT_PRESENT,
+        NULL);
+    }
+  }
+  return TALER_MHD_reply_static (
+    connection,
+    MHD_HTTP_NO_CONTENT,
+    NULL,
+    NULL,
+    0);
+}
+
+
+/* end of taler-exchange-httpd_management_aml-officers.c */
diff --git a/src/exchange/taler-exchange-httpd_management_auditors.c b/src/exchange/taler-exchange-httpd_management_auditors.c
index 9c7a5c472..7e0593534 100644
--- a/src/exchange/taler-exchange-httpd_management_auditors.c
+++ b/src/exchange/taler-exchange-httpd_management_auditors.c
@@ -153,7 +153,7 @@ TEH_handler_management_auditors (
                                  &aac.master_sig),
     GNUNET_JSON_spec_fixed_auto ("auditor_pub",
                                  &aac.auditor_pub),
-    GNUNET_JSON_spec_string ("auditor_url",
+    TALER_JSON_spec_web_url ("auditor_url",
                              &aac.auditor_url),
     GNUNET_JSON_spec_string ("auditor_name",
                              &aac.auditor_name),
diff --git a/src/exchange/taler-exchange-httpd_management_drain.c b/src/exchange/taler-exchange-httpd_management_drain.c
new file mode 100644
index 000000000..1e490d799
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_management_drain.c
@@ -0,0 +1,195 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_management_drain.c
+ * @brief Handle request to drain profits
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_management.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Closure for the #drain transaction.
+ */
+struct DrainContext
+{
+  /**
+   * Fee's signature affirming the #TALER_SIGNATURE_MASTER_DRAIN_PROFITS operation.
+   */
+  struct TALER_MasterSignatureP master_sig;
+
+  /**
+   * Wire transfer identifier to use.
+   */
+  struct TALER_WireTransferIdentifierRawP wtid;
+
+  /**
+   * Account to credit.
+   */
+  const char *payto_uri;
+
+  /**
+   * Configuration section with account to debit.
+   */
+  const char *account_section;
+
+  /**
+   * Signature time.
+   */
+  struct GNUNET_TIME_Timestamp date;
+
+  /**
+   * Amount to transfer.
+   */
+  struct TALER_Amount amount;
+
+};
+
+
+/**
+ * Function implementing database transaction to drain profits.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction logic
+ * MUST NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
+ * returns the soft error code, the function MAY be called again to retry and
+ * MUST not queue a MHD response.
+ *
+ * @param cls closure with a `struct DrainContext`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+drain (void *cls,
+       struct MHD_Connection *connection,
+       MHD_RESULT *mhd_ret)
+{
+  struct DrainContext *dc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = TEH_plugin->insert_drain_profit (
+    TEH_plugin->cls,
+    &dc->wtid,
+    dc->account_section,
+    dc->payto_uri,
+    dc->date,
+    &dc->amount,
+    &dc->master_sig);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
+    *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                           TALER_EC_GENERIC_DB_STORE_FAILED,
+                                           "insert drain profit");
+    return qs;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_management_post_drain (
+  struct MHD_Connection *connection,
+  const json_t *root)
+{
+  struct DrainContext dc;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("debit_account_section",
+                             &dc.account_section),
+    TALER_JSON_spec_payto_uri ("credit_payto_uri",
+                               &dc.payto_uri),
+    GNUNET_JSON_spec_fixed_auto ("wtid",
+                                 &dc.wtid),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &dc.master_sig),
+    GNUNET_JSON_spec_timestamp ("date",
+                                &dc.date),
+    TALER_JSON_spec_amount ("amount",
+                            TEH_currency,
+                            &dc.amount),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+      return MHD_NO; /* hard failure */
+    if (GNUNET_NO == res)
+      return MHD_YES; /* failure */
+  }
+
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_exchange_offline_profit_drain_verify (
+        &dc.wtid,
+        dc.date,
+        &dc.amount,
+        dc.account_section,
+        dc.payto_uri,
+        &TEH_master_public_key,
+        &dc.master_sig))
+  {
+    /* signature invalid */
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_MANAGEMENT_DRAIN_PROFITS_SIGNATURE_INVALID,
+      NULL);
+  }
+
+  {
+    enum GNUNET_GenericReturnValue res;
+    MHD_RESULT ret;
+
+    res = TEH_DB_run_transaction (connection,
+                                  "insert drain profit",
+                                  TEH_MT_REQUEST_OTHER,
+                                  &ret,
+                                  &drain,
+                                  &dc);
+    if (GNUNET_SYSERR == res)
+      return ret;
+  }
+  return TALER_MHD_reply_static (
+    connection,
+    MHD_HTTP_NO_CONTENT,
+    NULL,
+    NULL,
+    0);
+}
+
+
+/* end of taler-exchange-httpd_management_drain.c */
diff --git a/src/exchange/taler-exchange-httpd_management_extensions.c b/src/exchange/taler-exchange-httpd_management_extensions.c
index ce151e2e5..3b24bace7 100644
--- a/src/exchange/taler-exchange-httpd_management_extensions.c
+++ b/src/exchange/taler-exchange-httpd_management_extensions.c
@@ -38,7 +38,7 @@
 struct Extension
 {
   enum TALER_Extension_Type type;
-  json_t *config;
+  json_t *manifest;
 };
 
 /**
@@ -52,7 +52,7 @@ struct SetExtensionsContext
 };
 
 /**
- * Function implementing database transaction to set the configuration of
+ * Function implementing database transaction to set the manifests of
  * extensions.  It runs the transaction logic.
  *  - IF it returns a non-error code, the transaction logic MUST NOT queue a
  *    MHD response.
@@ -74,13 +74,13 @@ set_extensions (void *cls,
 {
   struct SetExtensionsContext *sec = cls;
 
-  /* save the configurations of all extensions */
+  /* save the manifests of all extensions */
   for (uint32_t i = 0; i<sec->num_extensions; i++)
   {
     struct Extension *ext = &sec->extensions[i];
     const struct TALER_Extension *taler_ext;
     enum GNUNET_DB_QueryStatus qs;
-    char *config;
+    char *manifest;
 
     taler_ext = TALER_extensions_get_by_type (ext->type);
     if (NULL == taler_ext)
@@ -90,10 +90,8 @@ set_extensions (void *cls,
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
 
-    GNUNET_assert (NULL != ext->config);
-
-    config = json_dumps (ext->config, JSON_COMPACT | JSON_SORT_KEYS);
-    if (NULL == config)
+    manifest = json_dumps (ext->manifest, JSON_COMPACT | JSON_SORT_KEYS);
+    if (NULL == manifest)
     {
       GNUNET_break (0);
       *mhd_ret = TALER_MHD_reply_with_error (connection,
@@ -103,10 +101,12 @@ set_extensions (void *cls,
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
 
-    qs = TEH_plugin->set_extension_config (
+    qs = TEH_plugin->set_extension_manifest (
       TEH_plugin->cls,
       taler_ext->name,
-      config);
+      manifest);
+
+    free (manifest);
 
     if (qs < 0)
     {
@@ -121,26 +121,23 @@ set_extensions (void *cls,
 
     /* Success, trigger event */
     {
-      enum TALER_Extension_Type *type = &sec->extensions[i].type;
+      uint32_t nbo_type = htonl (sec->extensions[i].type);
       struct GNUNET_DB_EventHeaderP ev = {
         .size = htons (sizeof (ev)),
         .type = htons (TALER_DBEVENT_EXCHANGE_EXTENSIONS_UPDATED)
       };
 
-      // FIXME-Oec: bug: convert type to NBO first!
-      // FIXME-Oec: bug: sizeof enum is ill-defined...
-      // FIXME-Oec: bug: don't see /keys listening to the event
-      // FIXME-Oec: why is   TEH_keys_update_states (); not enough?
       TEH_plugin->event_notify (TEH_plugin->cls,
                                 &ev,
-                                type,
-                                sizeof(*type));
+                                &nbo_type,
+                                sizeof(nbo_type));
     }
 
   }
 
   /* All extensions configured, update the signature */
   TEH_extensions_sig = sec->extensions_sig;
+  TEH_extensions_signed = true;
 
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT; /* only 'success', so >=0, matters here */
 }
@@ -148,13 +145,13 @@ set_extensions (void *cls,
 
 static enum GNUNET_GenericReturnValue
 verify_extensions_from_json (
-  json_t *extensions,
+  const json_t *extensions,
   struct SetExtensionsContext *sec)
 {
   const char*name;
   const struct TALER_Extension *extension;
   size_t i = 0;
-  json_t *blob;
+  json_t *manifest;
 
   GNUNET_assert (NULL != extensions);
   GNUNET_assert (json_is_object (extensions));
@@ -163,7 +160,7 @@ verify_extensions_from_json (
   sec->extensions = GNUNET_new_array (sec->num_extensions,
                                       struct Extension);
 
-  json_object_foreach (extensions, name, blob)
+  json_object_foreach ((json_t *) extensions, name, manifest)
   {
     int critical = 0;
     json_t *config;
@@ -179,18 +176,18 @@ verify_extensions_from_json (
     }
 
     if (GNUNET_OK !=
-        TALER_extensions_is_json_config (
-          blob, &critical, &version, &config))
+        TALER_extensions_parse_manifest (
+          manifest, &critical, &version, &config))
       return GNUNET_SYSERR;
 
     if (critical != extension->critical
-        || 0 != strcmp (version, extension->version) // TODO: libtool compare?
+        || 0 != strcmp (version, extension->version) // FIXME-oec: libtool compare
         || NULL == config
-        || GNUNET_OK != extension->test_json_config (config))
+        || GNUNET_OK != extension->load_config (config, NULL))
       return GNUNET_SYSERR;
 
     sec->extensions[i].type = extension->type;
-    sec->extensions[i].config = config;
+    sec->extensions[i].manifest = json_copy (manifest);
   }
 
   return GNUNET_OK;
@@ -203,11 +200,11 @@ TEH_handler_management_post_extensions (
   const json_t *root)
 {
   MHD_RESULT ret;
-  json_t *extensions;
+  const json_t *extensions;
   struct SetExtensionsContext sec = {0};
   struct GNUNET_JSON_Specification top_spec[] = {
-    GNUNET_JSON_spec_json ("extensions",
-                           &extensions),
+    GNUNET_JSON_spec_object_const ("extensions",
+                                   &extensions),
     GNUNET_JSON_spec_fixed_auto ("extensions_sig",
                                  &sec.extensions_sig),
     GNUNET_JSON_spec_end ()
@@ -226,30 +223,19 @@ TEH_handler_management_post_extensions (
       return MHD_YES; /* failure */
   }
 
-  /* Ensure we have an object */
-  if (! json_is_object (extensions))
-  {
-    GNUNET_JSON_parse_free (top_spec);
-    return TALER_MHD_reply_with_error (
-      connection,
-      MHD_HTTP_BAD_REQUEST,
-      TALER_EC_GENERIC_PARAMETER_MALFORMED,
-      "invalid object");
-  }
-
   /* Verify the signature */
   {
-    struct TALER_ExtensionConfigHashP h_config;
+    struct TALER_ExtensionManifestsHashP h_manifests;
 
     if (GNUNET_OK !=
-        TALER_JSON_extensions_config_hash (extensions, &h_config) ||
+        TALER_JSON_extensions_manifests_hash (extensions,
+                                              &h_manifests) ||
         GNUNET_OK !=
-        TALER_exchange_offline_extension_config_hash_verify (
-          &h_config,
+        TALER_exchange_offline_extension_manifests_hash_verify (
+          &h_manifests,
           &TEH_master_public_key,
           &sec.extensions_sig))
     {
-      GNUNET_JSON_parse_free (top_spec);
       return TALER_MHD_reply_with_error (
         connection,
         MHD_HTTP_BAD_REQUEST,
@@ -265,7 +251,6 @@ TEH_handler_management_post_extensions (
   if (GNUNET_OK !=
       verify_extensions_from_json (extensions, &sec))
   {
-    GNUNET_JSON_parse_free (top_spec);
     return TALER_MHD_reply_with_error (
       connection,
       MHD_HTTP_BAD_REQUEST,
@@ -302,13 +287,12 @@ TEH_handler_management_post_extensions (
 CLEANUP:
   for (unsigned int i = 0; i < sec.num_extensions; i++)
   {
-    if (NULL != sec.extensions[i].config)
+    if (NULL != sec.extensions[i].manifest)
     {
-      json_decref (sec.extensions[i].config);
+      json_decref (sec.extensions[i].manifest);
     }
   }
   GNUNET_free (sec.extensions);
-  GNUNET_JSON_parse_free (top_spec);
   return ret;
 }
 
diff --git a/src/exchange/taler-exchange-httpd_management_global_fees.c b/src/exchange/taler-exchange-httpd_management_global_fees.c
index 37bb40d90..8203ddefb 100644
--- a/src/exchange/taler-exchange-httpd_management_global_fees.c
+++ b/src/exchange/taler-exchange-httpd_management_global_fees.c
@@ -103,7 +103,6 @@ add_fee (void *cls,
   enum GNUNET_DB_QueryStatus qs;
   struct TALER_GlobalFeeSet fees;
   struct GNUNET_TIME_Relative purse_timeout;
-  struct GNUNET_TIME_Relative kyc_timeout;
   struct GNUNET_TIME_Relative history_expiration;
   uint32_t purse_account_limit;
 
@@ -113,7 +112,6 @@ add_fee (void *cls,
     afc->end_time,
     &fees,
     &purse_timeout,
-    &kyc_timeout,
     &history_expiration,
     &purse_account_limit);
   if (qs < 0)
@@ -155,7 +153,6 @@ add_fee (void *cls,
     afc->end_time,
     &afc->fees,
     afc->purse_timeout,
-    afc->kyc_timeout,
     afc->history_expiration,
     afc->purse_account_limit,
     &afc->master_sig);
@@ -190,9 +187,6 @@ TEH_handler_management_post_global_fees (
     TALER_JSON_spec_amount ("history_fee",
                             TEH_currency,
                             &afc.fees.history),
-    TALER_JSON_spec_amount ("kyc_fee",
-                            TEH_currency,
-                            &afc.fees.kyc),
     TALER_JSON_spec_amount ("account_fee",
                             TEH_currency,
                             &afc.fees.account),
@@ -201,8 +195,6 @@ TEH_handler_management_post_global_fees (
                             &afc.fees.purse),
     GNUNET_JSON_spec_relative_time ("purse_timeout",
                                     &afc.purse_timeout),
-    GNUNET_JSON_spec_relative_time ("kyc_timeout",
-                                    &afc.kyc_timeout),
     GNUNET_JSON_spec_relative_time ("history_expiration",
                                     &afc.history_expiration),
     GNUNET_JSON_spec_uint32 ("purse_account_limit",
@@ -229,7 +221,6 @@ TEH_handler_management_post_global_fees (
         afc.end_time,
         &afc.fees,
         afc.purse_timeout,
-        afc.kyc_timeout,
         afc.history_expiration,
         afc.purse_account_limit,
         &TEH_master_public_key,
diff --git a/src/exchange/taler-exchange-httpd_management_partners.c b/src/exchange/taler-exchange-httpd_management_partners.c
new file mode 100644
index 000000000..fc8a4207d
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_management_partners.c
@@ -0,0 +1,132 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_management_partners.c
+ * @brief Handle request to add exchange partner
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <pthread.h>
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_signatures.h"
+#include "taler-exchange-httpd_management.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+MHD_RESULT
+TEH_handler_management_partners (
+  struct MHD_Connection *connection,
+  const json_t *root)
+{
+  struct TALER_MasterPublicKeyP partner_pub;
+  struct GNUNET_TIME_Timestamp start_date;
+  struct GNUNET_TIME_Timestamp end_date;
+  struct GNUNET_TIME_Relative wad_frequency;
+  struct TALER_Amount wad_fee;
+  const char *partner_base_url;
+  struct TALER_MasterSignatureP master_sig;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("partner_pub",
+                                 &partner_pub),
+    GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                 &master_sig),
+    TALER_JSON_spec_web_url ("partner_base_url",
+                             &partner_base_url),
+    TALER_JSON_spec_amount ("wad_fee",
+                            TEH_currency,
+                            &wad_fee),
+    GNUNET_JSON_spec_timestamp ("start_date",
+                                &start_date),
+    GNUNET_JSON_spec_timestamp ("end_date",
+                                &end_date),
+    GNUNET_JSON_spec_relative_time ("wad_frequency",
+                                    &wad_frequency),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+      return MHD_NO; /* hard failure */
+    if (GNUNET_NO == res)
+      return MHD_YES; /* failure */
+  }
+  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+  if (GNUNET_OK !=
+      TALER_exchange_offline_partner_details_verify (
+        &partner_pub,
+        start_date,
+        end_date,
+        wad_frequency,
+        &wad_fee,
+        partner_base_url,
+        &TEH_master_public_key,
+        &master_sig))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (
+      connection,
+      MHD_HTTP_FORBIDDEN,
+      TALER_EC_EXCHANGE_MANAGEMENT_ADD_PARTNER_SIGNATURE_INVALID,
+      NULL);
+  }
+  {
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->insert_partner (TEH_plugin->cls,
+                                     &partner_pub,
+                                     start_date,
+                                     end_date,
+                                     wad_frequency,
+                                     &wad_fee,
+                                     partner_base_url,
+                                     &master_sig);
+    if (qs < 0)
+    {
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_STORE_FAILED,
+                                         "add_partner");
+    }
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+    {
+      /* FIXME-#7271: check for idempotency! */
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_CONFLICT,
+                                         TALER_EC_EXCHANGE_MANAGEMENT_ADD_PARTNER_DATA_CONFLICT,
+                                         NULL);
+    }
+  }
+  return TALER_MHD_reply_static (
+    connection,
+    MHD_HTTP_NO_CONTENT,
+    NULL,
+    NULL,
+    0);
+}
+
+
+/* end of taler-exchange-httpd_management_partners.c */
diff --git a/src/exchange/taler-exchange-httpd_management_post_keys.c b/src/exchange/taler-exchange-httpd_management_post_keys.c
index 1fa09f7eb..f91f24c41 100644
--- a/src/exchange/taler-exchange-httpd_management_post_keys.c
+++ b/src/exchange/taler-exchange-httpd_management_post_keys.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020, 2021 Taler Systems SA
+  Copyright (C) 2020-2023 Taler Systems SA
 
   TALER 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
@@ -47,6 +47,16 @@ struct DenomSig
    */
   struct TALER_MasterSignatureP master_sig;
 
+  /**
+   * Fee structure for this key, as per our configuration.
+   */
+  struct TALER_EXCHANGEDB_DenominationKeyMetaData meta;
+
+  /**
+   * The full public key.
+   */
+  struct TALER_DenominationPublicKey denom_pub;
+
 };
 
 
@@ -65,6 +75,11 @@ struct SigningSig
    */
   struct TALER_MasterSignatureP master_sig;
 
+  /**
+   * Our meta data on this key.
+   */
+  struct TALER_EXCHANGEDB_SignkeyMetaData meta;
+
 };
 
 
@@ -85,6 +100,11 @@ struct AddKeysContext
   struct SigningSig *s_sigs;
 
   /**
+   * Our key state.
+   */
+  struct TEH_KeyStateHandle *ksh;
+
+  /**
    * Length of the d_sigs array.
    */
   unsigned int nd_sigs;
@@ -123,14 +143,9 @@ add_keys (void *cls,
   {
     struct DenomSig *d = &akc->d_sigs[i];
     enum GNUNET_DB_QueryStatus qs;
-    bool is_active = false;
     struct TALER_EXCHANGEDB_DenominationKeyMetaData meta;
-    struct TALER_DenominationPublicKey denom_pub;
 
     /* For idempotency, check if the key is already active */
-    memset (&denom_pub,
-            0,
-            sizeof (denom_pub));
     qs = TEH_plugin->lookup_denomination_key (
       TEH_plugin->cls,
       &d->h_denom_pub,
@@ -146,65 +161,9 @@ add_keys (void *cls,
                                              "lookup denomination key");
       return qs;
     }
-    if (0 == qs)
-    {
-      enum GNUNET_GenericReturnValue rv;
-
-      rv = TEH_keys_load_fees (&d->h_denom_pub,
-                               &denom_pub,
-                               &meta);
-      switch (rv)
-      {
-      case GNUNET_SYSERR:
-        *mhd_ret = TALER_MHD_reply_with_error (
-          connection,
-          MHD_HTTP_INTERNAL_SERVER_ERROR,
-          TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
-          GNUNET_h2s (&d->h_denom_pub.hash));
-        return GNUNET_DB_STATUS_HARD_ERROR;
-      case GNUNET_NO:
-        *mhd_ret = TALER_MHD_reply_with_error (
-          connection,
-          MHD_HTTP_NOT_FOUND,
-          TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN,
-          GNUNET_h2s (&d->h_denom_pub.hash));
-        return GNUNET_DB_STATUS_HARD_ERROR;
-      case GNUNET_OK:
-        break;
-      }
-    }
-    else
-    {
-      is_active = true;
-    }
-
-    /* check signature is valid */
-    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-    if (GNUNET_OK !=
-        TALER_exchange_offline_denom_validity_verify (
-          &d->h_denom_pub,
-          meta.start,
-          meta.expire_withdraw,
-          meta.expire_deposit,
-          meta.expire_legal,
-          &meta.value,
-          &meta.fees,
-          &TEH_master_public_key,
-          &d->master_sig))
-    {
-      GNUNET_break_op (0);
-      *mhd_ret = TALER_MHD_reply_with_error (
-        connection,
-        MHD_HTTP_FORBIDDEN,
-        TALER_EC_EXCHANGE_MANAGEMENT_KEYS_DENOMKEY_ADD_SIGNATURE_INVALID,
-        GNUNET_h2s (&d->h_denom_pub.hash));
-      if (! is_active)
-        TALER_denom_pub_free (&denom_pub);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-
-    if (is_active)
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
     {
+      /* FIXME: assert meta === d->meta might be good */
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Denomination key %s already active, skipping\n",
                   GNUNET_h2s (&d->h_denom_pub.hash));
@@ -214,10 +173,9 @@ add_keys (void *cls,
     qs = TEH_plugin->add_denomination_key (
       TEH_plugin->cls,
       &d->h_denom_pub,
-      &denom_pub,
-      &meta,
+      &d->denom_pub,
+      &d->meta,
       &d->master_sig);
-    TALER_denom_pub_free (&denom_pub);
     if (qs < 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -239,7 +197,6 @@ add_keys (void *cls,
   {
     struct SigningSig *s = &akc->s_sigs[i];
     enum GNUNET_DB_QueryStatus qs;
-    bool is_active = false;
     struct TALER_EXCHANGEDB_SignkeyMetaData meta;
 
     qs = TEH_plugin->lookup_signing_key (
@@ -257,47 +214,9 @@ add_keys (void *cls,
                                              "lookup signing key");
       return qs;
     }
-    if (0 == qs)
-    {
-      if (GNUNET_OK !=
-          TEH_keys_get_timing (&s->exchange_pub,
-                               &meta))
-      {
-        /* For idempotency, check if the key is already active */
-        *mhd_ret = TALER_MHD_reply_with_error (
-          connection,
-          MHD_HTTP_NOT_FOUND,
-          TALER_EC_EXCHANGE_MANAGEMENT_KEYS_SIGNKEY_UNKNOWN,
-          TALER_B2S (&s->exchange_pub));
-        return GNUNET_DB_STATUS_HARD_ERROR;
-      }
-    }
-    else
-    {
-      is_active = true; /* if we pass, it's active! */
-    }
-
-    /* check signature is valid */
-    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-    if (GNUNET_OK !=
-        TALER_exchange_offline_signkey_validity_verify (
-          &s->exchange_pub,
-          meta.start,
-          meta.expire_sign,
-          meta.expire_legal,
-          &TEH_master_public_key,
-          &s->master_sig))
-    {
-      GNUNET_break_op (0);
-      *mhd_ret = TALER_MHD_reply_with_error (
-        connection,
-        MHD_HTTP_FORBIDDEN,
-        TALER_EC_EXCHANGE_MANAGEMENT_KEYS_SIGNKEY_ADD_SIGNATURE_INVALID,
-        TALER_B2S (&s->exchange_pub));
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if (is_active)
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
     {
+      /* FIXME: assert meta === d->meta might be good */
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Signing key %s already active, skipping\n",
                   TALER_B2S (&s->exchange_pub));
@@ -306,7 +225,7 @@ add_keys (void *cls,
     qs = TEH_plugin->activate_signing_key (
       TEH_plugin->cls,
       &s->exchange_pub,
-      &meta,
+      &s->meta,
       &s->master_sig);
     if (qs < 0)
     {
@@ -328,22 +247,40 @@ add_keys (void *cls,
 }
 
 
+/**
+ * Clean up state in @a akc, but do not free @a akc itself
+ *
+ * @param[in,out] akc state to clean up
+ */
+static void
+cleanup_akc (struct AddKeysContext *akc)
+{
+  for (unsigned int i = 0; i<akc->nd_sigs; i++)
+  {
+    struct DenomSig *d = &akc->d_sigs[i];
+
+    TALER_denom_pub_free (&d->denom_pub);
+  }
+  GNUNET_free (akc->d_sigs);
+  GNUNET_free (akc->s_sigs);
+}
+
+
 MHD_RESULT
 TEH_handler_management_post_keys (
   struct MHD_Connection *connection,
   const json_t *root)
 {
-  struct AddKeysContext akc;
-  json_t *denom_sigs;
-  json_t *signkey_sigs;
+  struct AddKeysContext akc = { 0 };
+  const json_t *denom_sigs;
+  const json_t *signkey_sigs;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("denom_sigs",
-                           &denom_sigs),
-    GNUNET_JSON_spec_json ("signkey_sigs",
-                           &signkey_sigs),
+    GNUNET_JSON_spec_array_const ("denom_sigs",
+                                  &denom_sigs),
+    GNUNET_JSON_spec_array_const ("signkey_sigs",
+                                  &signkey_sigs),
     GNUNET_JSON_spec_end ()
   };
-  bool ok;
   MHD_RESULT ret;
 
   {
@@ -357,23 +294,23 @@ TEH_handler_management_post_keys (
     if (GNUNET_NO == res)
       return MHD_YES; /* failure */
   }
-  if (! (json_is_array (denom_sigs) &&
-         json_is_array (signkey_sigs)) )
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Received POST /management/keys request\n");
+
+  akc.ksh = TEH_keys_get_state_for_management_only (); /* may start its own transaction, thus must be done here, before we run ours! */
+  if (NULL == akc.ksh)
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (
       connection,
-      MHD_HTTP_BAD_REQUEST,
-      TALER_EC_GENERIC_PARAMETER_MALFORMED,
-      "array expected for denom_sigs and signkey_sigs");
+      MHD_HTTP_INTERNAL_SERVER_ERROR,
+      TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+      "no key state (not even for management)");
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received /management/keys\n");
+
   akc.nd_sigs = json_array_size (denom_sigs);
   akc.d_sigs = GNUNET_new_array (akc.nd_sigs,
                                  struct DenomSig);
-  ok = true;
   for (unsigned int i = 0; i<akc.nd_sigs; i++)
   {
     struct DenomSig *d = &akc.d_sigs[i];
@@ -390,27 +327,64 @@ TEH_handler_management_post_keys (
                                      json_array_get (denom_sigs,
                                                      i),
                                      ispec);
-    if (GNUNET_SYSERR == res)
+    if (GNUNET_OK != res)
     {
-      ret = MHD_NO; /* hard failure */
-      ok = false;
-      break;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failure to handle /management/keys\n");
+      cleanup_akc (&akc);
+      return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
-    if (GNUNET_NO == res)
+
+    res = TEH_keys_load_fees (akc.ksh,
+                              &d->h_denom_pub,
+                              &d->denom_pub,
+                              &d->meta);
+    switch (res)
     {
-      ret = MHD_YES;
-      ok = false;
+    case GNUNET_SYSERR:
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_INTERNAL_SERVER_ERROR,
+        TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+        GNUNET_h2s (&d->h_denom_pub.hash));
+      cleanup_akc (&akc);
+      return ret;
+    case GNUNET_NO:
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_NOT_FOUND,
+        TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN,
+        GNUNET_h2s (&d->h_denom_pub.hash));
+      cleanup_akc (&akc);
+      return ret;
+    case GNUNET_OK:
       break;
     }
+    /* check signature is valid */
+    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+    if (GNUNET_OK !=
+        TALER_exchange_offline_denom_validity_verify (
+          &d->h_denom_pub,
+          d->meta.start,
+          d->meta.expire_withdraw,
+          d->meta.expire_deposit,
+          d->meta.expire_legal,
+          &d->meta.value,
+          &d->meta.fees,
+          &TEH_master_public_key,
+          &d->master_sig))
+    {
+      GNUNET_break_op (0);
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_FORBIDDEN,
+        TALER_EC_EXCHANGE_MANAGEMENT_KEYS_DENOMKEY_ADD_SIGNATURE_INVALID,
+        GNUNET_h2s (&d->h_denom_pub.hash));
+      cleanup_akc (&akc);
+      return ret;
+    }
   }
-  if (! ok)
-  {
-    GNUNET_free (akc.d_sigs);
-    GNUNET_JSON_parse_free (spec);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failure to handle /management/keys\n");
-    return ret;
-  }
+
   akc.ns_sigs = json_array_size (signkey_sigs);
   akc.s_sigs = GNUNET_new_array (akc.ns_sigs,
                                  struct SigningSig);
@@ -430,27 +404,58 @@ TEH_handler_management_post_keys (
                                      json_array_get (signkey_sigs,
                                                      i),
                                      ispec);
-    if (GNUNET_SYSERR == res)
+    if (GNUNET_OK != res)
     {
-      ret = MHD_NO; /* hard failure */
-      ok = false;
-      break;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failure to handle /management/keys\n");
+      cleanup_akc (&akc);
+      return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
-    if (GNUNET_NO == res)
+    res = TEH_keys_get_timing (&s->exchange_pub,
+                               &s->meta);
+    switch (res)
     {
-      ret = MHD_YES;
-      ok = false;
+    case GNUNET_SYSERR:
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_INTERNAL_SERVER_ERROR,
+        TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+        TALER_B2S (&s->exchange_pub));
+      cleanup_akc (&akc);
+      return ret;
+    case GNUNET_NO:
+      /* For idempotency, check if the key is already active */
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_NOT_FOUND,
+        TALER_EC_EXCHANGE_MANAGEMENT_KEYS_SIGNKEY_UNKNOWN,
+        TALER_B2S (&s->exchange_pub));
+      cleanup_akc (&akc);
+      return ret;
+    case GNUNET_OK:
       break;
     }
-  }
-  if (! ok)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failure to handle /management/keys\n");
-    GNUNET_free (akc.d_sigs);
-    GNUNET_free (akc.s_sigs);
-    GNUNET_JSON_parse_free (spec);
-    return ret;
+
+    /* check signature is valid */
+    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+    if (GNUNET_OK !=
+        TALER_exchange_offline_signkey_validity_verify (
+          &s->exchange_pub,
+          s->meta.start,
+          s->meta.expire_sign,
+          s->meta.expire_legal,
+          &TEH_master_public_key,
+          &s->master_sig))
+    {
+      GNUNET_break_op (0);
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_FORBIDDEN,
+        TALER_EC_EXCHANGE_MANAGEMENT_KEYS_SIGNKEY_ADD_SIGNATURE_INVALID,
+        TALER_B2S (&s->exchange_pub));
+      cleanup_akc (&akc);
+      return ret;
+    }
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Received %u denomination and %u signing key signatures\n",
@@ -465,9 +470,7 @@ TEH_handler_management_post_keys (
                                   &ret,
                                   &add_keys,
                                   &akc);
-    GNUNET_free (akc.d_sigs);
-    GNUNET_free (akc.s_sigs);
-    GNUNET_JSON_parse_free (spec);
+    cleanup_akc (&akc);
     if (GNUNET_SYSERR == res)
       return ret;
   }
diff --git a/src/exchange/taler-exchange-httpd_management_wire_disable.c b/src/exchange/taler-exchange-httpd_management_wire_disable.c
index 34825eda3..e0b8a3de8 100644
--- a/src/exchange/taler-exchange-httpd_management_wire_disable.c
+++ b/src/exchange/taler-exchange-httpd_management_wire_disable.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-2023 Taler Systems SA
 
   TALER 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
@@ -28,7 +28,7 @@
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_management.h"
 #include "taler-exchange-httpd_responses.h"
-#include "taler-exchange-httpd_wire.h"
+#include "taler-exchange-httpd_keys.h"
 
 
 /**
@@ -103,7 +103,7 @@ del_wire (void *cls,
       NULL);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
-  if (0 == qs)
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
   {
     *mhd_ret = TALER_MHD_reply_with_error (
       connection,
@@ -114,7 +114,13 @@ del_wire (void *cls,
   }
   qs = TEH_plugin->update_wire (TEH_plugin->cls,
                                 awc->payto_uri,
+                                NULL,
+                                NULL,
+                                NULL,
                                 awc->validity_end,
+                                NULL,
+                                NULL,
+                                0,
                                 false);
   if (qs < 0)
   {
@@ -140,8 +146,8 @@ TEH_handler_management_post_wire_disable (
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("master_sig_del",
                                  &awc.master_sig),
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &awc.payto_uri),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &awc.payto_uri),
     GNUNET_JSON_spec_timestamp ("validity_end",
                                 &awc.validity_end),
     GNUNET_JSON_spec_end ()
diff --git a/src/exchange/taler-exchange-httpd_management_wire_enable.c b/src/exchange/taler-exchange-httpd_management_wire_enable.c
index 25ee0eeac..472e19d3e 100644
--- a/src/exchange/taler-exchange-httpd_management_wire_enable.c
+++ b/src/exchange/taler-exchange-httpd_management_wire_enable.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-2024 Taler Systems SA
 
   TALER 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
@@ -29,7 +29,7 @@
 #include "taler_signatures.h"
 #include "taler-exchange-httpd_management.h"
 #include "taler-exchange-httpd_responses.h"
-#include "taler-exchange-httpd_wire.h"
+#include "taler-exchange-httpd_keys.h"
 
 
 /**
@@ -55,10 +55,35 @@ struct AddWireContext
   const char *payto_uri;
 
   /**
+   * (optional) address of a conversion service for this account.
+   */
+  const char *conversion_url;
+
+  /**
+   * Restrictions imposed when crediting this account.
+   */
+  const json_t *credit_restrictions;
+
+  /**
+   * Restrictions imposed when debiting this account.
+   */
+  const json_t *debit_restrictions;
+
+  /**
    * Timestamp for checking against replay attacks.
    */
   struct GNUNET_TIME_Timestamp validity_start;
 
+  /**
+   * Label to use for this bank. Default is empty.
+   */
+  const char *bank_label;
+
+  /**
+   * Priority of the bank in the list. Default 0.
+   */
+  int64_t priority;
+
 };
 
 
@@ -111,15 +136,26 @@ add_wire (void *cls,
       NULL);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
-  if (0 == qs)
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
     qs = TEH_plugin->insert_wire (TEH_plugin->cls,
                                   awc->payto_uri,
+                                  awc->conversion_url,
+                                  awc->debit_restrictions,
+                                  awc->credit_restrictions,
                                   awc->validity_start,
-                                  &awc->master_sig_wire);
+                                  &awc->master_sig_wire,
+                                  awc->bank_label,
+                                  awc->priority);
   else
     qs = TEH_plugin->update_wire (TEH_plugin->cls,
                                   awc->payto_uri,
+                                  awc->conversion_url,
+                                  awc->debit_restrictions,
+                                  awc->credit_restrictions,
                                   awc->validity_start,
+                                  &awc->master_sig_wire,
+                                  awc->bank_label,
+                                  awc->priority,
                                   true);
   if (qs < 0)
   {
@@ -141,16 +177,34 @@ TEH_handler_management_post_wire (
   struct MHD_Connection *connection,
   const json_t *root)
 {
-  struct AddWireContext awc;
+  struct AddWireContext awc = {
+    .conversion_url = NULL
+  };
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("master_sig_wire",
                                  &awc.master_sig_wire),
     GNUNET_JSON_spec_fixed_auto ("master_sig_add",
                                  &awc.master_sig_add),
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &awc.payto_uri),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &awc.payto_uri),
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_web_url ("conversion_url",
+                               &awc.conversion_url),
+      NULL),
+    GNUNET_JSON_spec_array_const ("credit_restrictions",
+                                  &awc.credit_restrictions),
+    GNUNET_JSON_spec_array_const ("debit_restrictions",
+                                  &awc.debit_restrictions),
     GNUNET_JSON_spec_timestamp ("validity_start",
                                 &awc.validity_start),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string ("bank_label",
+                               &awc.bank_label),
+      NULL),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_int64 ("priority",
+                              &awc.priority),
+      NULL),
     GNUNET_JSON_spec_end ()
   };
 
@@ -179,17 +233,23 @@ TEH_handler_management_post_wire (
         MHD_HTTP_BAD_REQUEST,
         TALER_EC_GENERIC_PAYTO_URI_MALFORMED,
         msg);
+      GNUNET_JSON_parse_free (spec);
       GNUNET_free (msg);
       return ret;
     }
   }
   if (GNUNET_OK !=
-      TALER_exchange_offline_wire_add_verify (awc.payto_uri,
-                                              awc.validity_start,
-                                              &TEH_master_public_key,
-                                              &awc.master_sig_add))
+      TALER_exchange_offline_wire_add_verify (
+        awc.payto_uri,
+        awc.conversion_url,
+        awc.debit_restrictions,
+        awc.credit_restrictions,
+        awc.validity_start,
+        &TEH_master_public_key,
+        &awc.master_sig_add))
   {
     GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (
       connection,
       MHD_HTTP_FORBIDDEN,
@@ -198,11 +258,16 @@ TEH_handler_management_post_wire (
   }
   TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
   if (GNUNET_OK !=
-      TALER_exchange_wire_signature_check (awc.payto_uri,
-                                           &TEH_master_public_key,
-                                           &awc.master_sig_wire))
+      TALER_exchange_wire_signature_check (
+        awc.payto_uri,
+        awc.conversion_url,
+        awc.debit_restrictions,
+        awc.credit_restrictions,
+        &TEH_master_public_key,
+        &awc.master_sig_wire))
   {
     GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (
       connection,
       MHD_HTTP_FORBIDDEN,
@@ -218,6 +283,7 @@ TEH_handler_management_post_wire (
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "payto:// URI `%s' is malformed\n",
                   awc.payto_uri);
+      GNUNET_JSON_parse_free (spec);
       return TALER_MHD_reply_with_error (
         connection,
         MHD_HTTP_BAD_REQUEST,
@@ -237,6 +303,7 @@ TEH_handler_management_post_wire (
                                   &ret,
                                   &add_wire,
                                   &awc);
+    GNUNET_JSON_parse_free (spec);
     if (GNUNET_SYSERR == res)
       return ret;
   }
diff --git a/src/exchange/taler-exchange-httpd_management_wire_fees.c b/src/exchange/taler-exchange-httpd_management_wire_fees.c
index 2a4262131..cb87592a5 100644
--- a/src/exchange/taler-exchange-httpd_management_wire_fees.c
+++ b/src/exchange/taler-exchange-httpd_management_wire_fees.c
@@ -29,7 +29,7 @@
 #include "taler_signatures.h"
 #include "taler-exchange-httpd_management.h"
 #include "taler-exchange-httpd_responses.h"
-#include "taler-exchange-httpd_wire.h"
+#include "taler-exchange-httpd_keys.h"
 
 
 /**
@@ -170,9 +170,6 @@ TEH_handler_management_post_wire_fees (
     TALER_JSON_spec_amount ("closing_fee",
                             TEH_currency,
                             &afc.fees.closing),
-    TALER_JSON_spec_amount ("wad_fee",
-                            TEH_currency,
-                            &afc.fees.wad),
     GNUNET_JSON_spec_end ()
   };
 
diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c
index 3d6f05c0a..b31078f00 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -196,10 +196,12 @@ melt_transaction (void *cls,
       = TEH_RESPONSE_reply_coin_insufficient_funds (
           connection,
           TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+          &rmc->refresh_session.coin.denom_pub_hash,
           &rmc->refresh_session.coin.coin_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
   /* All good, commit, final response will be generated by caller */
+  TEH_METRICS_num_success[TEH_MT_SUCCESS_MELT]++;
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
 }
 
@@ -286,7 +288,7 @@ static MHD_RESULT
 check_melt_valid (struct MHD_Connection *connection,
                   struct MeltContext *rmc)
 {
-  /* Baseline: check if deposits/refreshs are generally
+  /* Baseline: check if deposits/refreshes are generally
      simply still allowed for this denomination */
   struct TEH_DenominationKey *dk;
   MHD_RESULT mret;
@@ -336,12 +338,12 @@ check_melt_valid (struct MHD_Connection *connection,
                                        TALER_EC_EXCHANGE_MELT_FEES_EXCEED_CONTRIBUTION,
                                        NULL);
   }
-  switch (dk->denom_pub.cipher)
+  switch (dk->denom_pub.bsign_pub_key->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
     break;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
     break;
   default:
diff --git a/src/exchange/taler-exchange-httpd_metrics.c b/src/exchange/taler-exchange-httpd_metrics.c
index d95080844..1542801fe 100644
--- a/src/exchange/taler-exchange-httpd_metrics.c
+++ b/src/exchange/taler-exchange-httpd_metrics.c
@@ -41,6 +41,9 @@ unsigned long long TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_COUNT];
 
 unsigned long long TEH_METRICS_num_keyexchanges[TEH_MT_KEYX_COUNT];
 
+unsigned long long TEH_METRICS_num_success[TEH_MT_SUCCESS_COUNT];
+
+
 MHD_RESULT
 TEH_handler_metrics (struct TEH_RequestContext *rc,
                      const char *const args[])
@@ -51,6 +54,11 @@ TEH_handler_metrics (struct TEH_RequestContext *rc,
 
   (void) args;
   GNUNET_asprintf (&reply,
+                   "taler_exchange_success_transactions{type=\"%s\"} %llu\n"
+                   "taler_exchange_success_transactions{type=\"%s\"} %llu\n"
+                   "taler_exchange_success_transactions{type=\"%s\"} %llu\n"
+                   "taler_exchange_success_transactions{type=\"%s\"} %llu\n"
+                   "taler_exchange_success_transactions{type=\"%s\"} %llu\n"
                    "# HELP taler_exchange_serialization_failures "
                    " number of database serialization errors by type\n"
                    "# TYPE taler_exchange_serialization_failures counter\n"
@@ -65,6 +73,12 @@ TEH_handler_metrics (struct TEH_RequestContext *rc,
                    "taler_exchange_received_requests{type=\"%s\"} %llu\n"
                    "taler_exchange_received_requests{type=\"%s\"} %llu\n"
                    "taler_exchange_received_requests{type=\"%s\"} %llu\n"
+                   "taler_exchange_idempotent_requests{type=\"%s\"} %llu\n"
+#if NOT_YET_IMPLEMENTED
+                   "taler_exchange_idempotent_requests{type=\"%s\"} %llu\n"
+                   "taler_exchange_idempotent_requests{type=\"%s\"} %llu\n"
+#endif
+                   "taler_exchange_idempotent_requests{type=\"%s\"} %llu\n"
                    "# HELP taler_exchange_num_signatures "
                    " number of signatures created by cipher\n"
                    "# TYPE taler_exchange_num_signatures counter\n"
@@ -85,6 +99,16 @@ TEH_handler_metrics (struct TEH_RequestContext *rc,
                    " number of coins withdrawn in a batch-withdraw request\n"
                    "# TYPE taler_exchange_batch_withdraw_num_coins counter\n"
                    "taler_exchange_batch_withdraw_num_coins{} %llu\n",
+                   "deposit",
+                   TEH_METRICS_num_success[TEH_MT_SUCCESS_DEPOSIT],
+                   "withdraw",
+                   TEH_METRICS_num_success[TEH_MT_SUCCESS_WITHDRAW],
+                   "batch-withdraw",
+                   TEH_METRICS_num_success[TEH_MT_SUCCESS_BATCH_WITHDRAW],
+                   "melt",
+                   TEH_METRICS_num_success[TEH_MT_SUCCESS_MELT],
+                   "refresh-reveal",
+                   TEH_METRICS_num_success[TEH_MT_SUCCESS_REFRESH_REVEAL],
                    "other",
                    TEH_METRICS_num_conflict[TEH_MT_REQUEST_OTHER],
                    "deposit",
@@ -101,6 +125,17 @@ TEH_handler_metrics (struct TEH_RequestContext *rc,
                    TEH_METRICS_num_requests[TEH_MT_REQUEST_WITHDRAW],
                    "melt",
                    TEH_METRICS_num_requests[TEH_MT_REQUEST_MELT],
+                   "withdraw",
+                   TEH_METRICS_num_requests[TEH_MT_REQUEST_IDEMPOTENT_WITHDRAW],
+#if NOT_YET_IMPLEMENTED
+                   "deposit",
+                   TEH_METRICS_num_requests[TEH_MT_REQUEST_IDEMPOTENT_DEPOSIT],
+                   "melt",
+                   TEH_METRICS_num_requests[TEH_MT_REQUEST_IDEMPOTENT_MELT],
+#endif
+                   "batch-withdraw",
+                   TEH_METRICS_num_requests[
+                     TEH_MT_REQUEST_IDEMPOTENT_BATCH_WITHDRAW],
                    "rsa",
                    TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA],
                    "cs",
diff --git a/src/exchange/taler-exchange-httpd_metrics.h b/src/exchange/taler-exchange-httpd_metrics.h
index 369b675c6..318113c1f 100644
--- a/src/exchange/taler-exchange-httpd_metrics.h
+++ b/src/exchange/taler-exchange-httpd_metrics.h
@@ -34,12 +34,35 @@ enum TEH_MetricTypeRequest
   TEH_MT_REQUEST_OTHER = 0,
   TEH_MT_REQUEST_DEPOSIT = 1,
   TEH_MT_REQUEST_WITHDRAW = 2,
-  TEH_MT_REQUEST_MELT = 3,
-  TEH_MT_REQUEST_PURSE_CREATE = 4,
-  TEH_MT_REQUEST_PURSE_MERGE = 5,
-  TEH_MT_REQUEST_RESERVE_PURSE = 6,
-  TEH_MT_REQUEST_PURSE_DEPOSIT = 7,
-  TEH_MT_REQUEST_COUNT = 8 /* MUST BE LAST! */
+  TEH_MT_REQUEST_AGE_WITHDRAW = 3,
+  TEH_MT_REQUEST_MELT = 4,
+  TEH_MT_REQUEST_PURSE_CREATE = 5,
+  TEH_MT_REQUEST_PURSE_MERGE = 6,
+  TEH_MT_REQUEST_RESERVE_PURSE = 7,
+  TEH_MT_REQUEST_PURSE_DEPOSIT = 8,
+  TEH_MT_REQUEST_IDEMPOTENT_DEPOSIT = 9,
+  TEH_MT_REQUEST_IDEMPOTENT_WITHDRAW = 10,
+  TEH_MT_REQUEST_IDEMPOTENT_AGE_WITHDRAW = 11,
+  TEH_MT_REQUEST_IDEMPOTENT_MELT = 12,
+  TEH_MT_REQUEST_IDEMPOTENT_BATCH_WITHDRAW = 13,
+  TEH_MT_REQUEST_BATCH_DEPOSIT = 14,
+  TEH_MT_REQUEST_POLICY_FULFILLMENT = 15,
+  TEH_MT_REQUEST_COUNT = 16 /* MUST BE LAST! */
+};
+
+/**
+ * Success types for which we collect metrics.
+ */
+enum TEH_MetricTypeSuccess
+{
+  TEH_MT_SUCCESS_DEPOSIT = 0,
+  TEH_MT_SUCCESS_WITHDRAW = 1,
+  TEH_MT_SUCCESS_AGE_WITHDRAW = 2,
+  TEH_MT_SUCCESS_BATCH_WITHDRAW = 3,
+  TEH_MT_SUCCESS_MELT = 4,
+  TEH_MT_SUCCESS_REFRESH_REVEAL = 5,
+  TEH_MT_SUCCESS_AGE_WITHDRAW_REVEAL = 6,
+  TEH_MT_SUCCESS_COUNT = 7 /* MUST BE LAST! */
 };
 
 /**
@@ -68,6 +91,11 @@ enum TEH_MetricTypeKeyX
 extern unsigned long long TEH_METRICS_num_requests[TEH_MT_REQUEST_COUNT];
 
 /**
+ * Number of successful requests handled of the respective type.
+ */
+extern unsigned long long TEH_METRICS_num_success[TEH_MT_SUCCESS_COUNT];
+
+/**
  * Number of coins withdrawn in a batch-withdraw request
  */
 extern unsigned long long TEH_METRICS_batch_withdraw_num_coins;
@@ -79,17 +107,17 @@ extern unsigned long long TEH_METRICS_batch_withdraw_num_coins;
 extern unsigned long long TEH_METRICS_num_conflict[TEH_MT_REQUEST_COUNT];
 
 /**
- * Number of signatures created by the respecitve cipher.
+ * Number of signatures created by the respective cipher.
  */
 extern unsigned long long TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_COUNT];
 
 /**
- * Number of signatures verified by the respecitve cipher.
+ * Number of signatures verified by the respective cipher.
  */
 extern unsigned long long TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_COUNT];
 
 /**
- * Number of key exchnages done with the respective cipher.
+ * Number of key exchanges done with the respective cipher.
  */
 extern unsigned long long TEH_METRICS_num_keyexchanges[TEH_MT_KEYX_COUNT];
 
diff --git a/src/exchange/taler-exchange-httpd_purses_create.c b/src/exchange/taler-exchange-httpd_purses_create.c
index f8293981c..2de9468fe 100644
--- a/src/exchange/taler-exchange-httpd_purses_create.c
+++ b/src/exchange/taler-exchange-httpd_purses_create.c
@@ -25,9 +25,9 @@
 #include <gnunet/gnunet_json_lib.h>
 #include <jansson.h>
 #include <microhttpd.h>
-#include <pthread.h>
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_common_deposit.h"
 #include "taler-exchange-httpd_purses_create.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler_exchangedb_lib.h"
@@ -35,56 +35,10 @@
 
 
 /**
- * Information about an individual coin being deposited.
- */
-struct Coin
-{
-  /**
-   * Public information about the coin.
-   */
-  struct TALER_CoinPublicInfo cpi;
-
-  /**
-   * Signature affirming spending the coin.
-   */
-  struct TALER_CoinSpendSignatureP coin_sig;
-
-  /**
-   * Amount to be put into the purse from this coin.
-   */
-  struct TALER_Amount amount;
-
-  /**
-   * Deposit fee applicable to this coin.
-   */
-  struct TALER_Amount deposit_fee;
-
-  /**
-   * Amount to be put into the purse from this coin.
-   */
-  struct TALER_Amount amount_minus_fee;
-
-  /**
-   * ID of the coin in known_coins.
-   */
-  uint64_t known_coin_id;
-};
-
-
-/**
  * Closure for #create_transaction.
  */
 struct PurseCreateContext
 {
-  /**
-   * Public key of the purse we are creating.
-   */
-  const struct TALER_PurseContractPublicKeyP *purse_pub;
-
-  /**
-   * Total amount to be put into the purse.
-   */
-  struct TALER_Amount amount;
 
   /**
    * Total actually deposited by all the coins.
@@ -92,11 +46,6 @@ struct PurseCreateContext
   struct TALER_Amount deposit_total;
 
   /**
-   * When should the purse expire.
-   */
-  struct GNUNET_TIME_Timestamp purse_expiration;
-
-  /**
    * Our current time.
    */
   struct GNUNET_TIME_Timestamp exchange_timestamp;
@@ -107,9 +56,9 @@ struct PurseCreateContext
   struct TALER_PurseMergePublicKeyP merge_pub;
 
   /**
-   * Contract decryption key for the purse.
+   * Encrypted contract of for the purse.
    */
-  struct TALER_ContractDiffiePublicP contract_pub;
+  struct TALER_EncryptedContract econtract;
 
   /**
    * Signature of the client affiming this request.
@@ -117,29 +66,14 @@ struct PurseCreateContext
   struct TALER_PurseContractSignatureP purse_sig;
 
   /**
-   * Signature of the client affiming this encrypted contract.
+   * Fundamental details about the purse.
    */
-  struct TALER_PurseContractSignatureP econtract_sig;
-
-  /**
-   * Hash of the contract terms of the purse.
-   */
-  struct TALER_PrivateContractHashP h_contract_terms;
+  struct TEH_PurseDetails pd;
 
   /**
    * Array of coins being deposited.
    */
-  struct Coin *coins;
-
-  /**
-   * Encrypted contract, can be NULL.
-   */
-  void *econtract;
-
-  /**
-   * Number of bytes in @e econtract.
-   */
-  size_t econtract_size;
+  struct TEH_PurseDepositedCoin *coins;
 
   /**
    * Length of the @e coins array.
@@ -150,54 +84,13 @@ struct PurseCreateContext
    * Minimum age for deposits into this purse.
    */
   uint32_t min_age;
-};
 
+  /**
+   * Do we have an @e econtract?
+   */
+  bool no_econtract;
 
-/**
- * Send confirmation of purse creation success to client.
- *
- * @param connection connection to the client
- * @param pcc details about the request that succeeded
- * @return MHD result code
- */
-static MHD_RESULT
-reply_create_success (struct MHD_Connection *connection,
-                      const struct PurseCreateContext *pcc)
-{
-  struct TALER_ExchangePublicKeyP pub;
-  struct TALER_ExchangeSignatureP sig;
-  enum TALER_ErrorCode ec;
-
-  if (TALER_EC_NONE !=
-      (ec = TALER_exchange_online_purse_created_sign (
-         &TEH_keys_exchange_sign_,
-         pcc->exchange_timestamp,
-         pcc->purse_expiration,
-         &pcc->amount,
-         &pcc->deposit_total,
-         pcc->purse_pub,
-         &pcc->merge_pub,
-         &pcc->h_contract_terms,
-         &pub,
-         &sig)))
-  {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_ec (connection,
-                                    ec,
-                                    NULL);
-  }
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_amount ("total_deposited",
-                            &pcc->deposit_total),
-    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
-                                pcc->exchange_timestamp),
-    GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                &sig),
-    GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                &pub));
-}
+};
 
 
 /**
@@ -223,20 +116,22 @@ create_transaction (void *cls,
   struct TALER_Amount purse_fee;
   bool in_conflict = true;
 
-  TALER_amount_set_zero (pcc->amount.currency,
-                         &purse_fee);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (TEH_currency,
+                                        &purse_fee));
   /* 1) create purse */
-  qs = TEH_plugin->insert_purse_request (TEH_plugin->cls,
-                                         pcc->purse_pub,
-                                         &pcc->merge_pub,
-                                         pcc->purse_expiration,
-                                         &pcc->h_contract_terms,
-                                         pcc->min_age,
-                                         TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE,
-                                         &purse_fee,
-                                         &pcc->amount,
-                                         &pcc->purse_sig,
-                                         &in_conflict);
+  qs = TEH_plugin->insert_purse_request (
+    TEH_plugin->cls,
+    &pcc->pd.purse_pub,
+    &pcc->merge_pub,
+    pcc->pd.purse_expiration,
+    &pcc->pd.h_contract_terms,
+    pcc->min_age,
+    TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE,
+    &purse_fee,
+    &pcc->pd.target_amount,
+    &pcc->purse_sig,
+    &in_conflict);
   if (qs < 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -261,15 +156,15 @@ create_transaction (void *cls,
     uint32_t min_age;
 
     TEH_plugin->rollback (TEH_plugin->cls);
-    qs = TEH_plugin->select_purse_request (TEH_plugin->cls,
-                                           pcc->purse_pub,
-                                           &merge_pub,
-                                           &purse_expiration,
-                                           &h_contract_terms,
-                                           &min_age,
-                                           &target_amount,
-                                           &balance,
-                                           &purse_sig);
+    qs = TEH_plugin->get_purse_request (TEH_plugin->cls,
+                                        &pcc->pd.purse_pub,
+                                        &merge_pub,
+                                        &purse_expiration,
+                                        &h_contract_terms,
+                                        &min_age,
+                                        &target_amount,
+                                        &balance,
+                                        &purse_sig);
     if (qs < 0)
     {
       GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
@@ -303,17 +198,25 @@ create_transaction (void *cls,
   /* 2) deposit all coins */
   for (unsigned int i = 0; i<pcc->num_coins; i++)
   {
-    struct Coin *coin = &pcc->coins[i];
+    struct TEH_PurseDepositedCoin *coin = &pcc->coins[i];
     bool balance_ok = false;
     bool conflict = true;
+    bool too_late = true;
 
+    qs = TEH_make_coin_known (&coin->cpi,
+                              connection,
+                              &coin->known_coin_id,
+                              mhd_ret);
+    if (qs < 0)
+      return qs;
     qs = TEH_plugin->do_purse_deposit (TEH_plugin->cls,
-                                       pcc->purse_pub,
+                                       &pcc->pd.purse_pub,
                                        &coin->cpi.coin_pub,
                                        &coin->amount,
                                        &coin->coin_sig,
                                        &coin->amount_minus_fee,
                                        &balance_ok,
+                                       &too_late,
                                        &conflict);
     if (qs <= 0)
     {
@@ -330,25 +233,43 @@ create_transaction (void *cls,
     }
     if (! balance_ok)
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Coin %s has insufficient balance for purse deposit of amount %s\n",
+                  TALER_B2S (&coin->cpi.coin_pub),
+                  TALER_amount2s (&coin->amount));
       *mhd_ret
         = TEH_RESPONSE_reply_coin_insufficient_funds (
             connection,
             TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+            &coin->cpi.denom_pub_hash,
             &coin->cpi.coin_pub);
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
+    if (too_late)
+    {
+      *mhd_ret
+        = TALER_MHD_reply_with_ec (
+            connection,
+            TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+            "too late to deposit on purse creation");
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
     if (conflict)
     {
       struct TALER_Amount amount;
       struct TALER_CoinSpendPublicKeyP coin_pub;
       struct TALER_CoinSpendSignatureP coin_sig;
+      struct TALER_DenominationHashP h_denom_pub;
+      struct TALER_AgeCommitmentHash phac;
       char *partner_url = NULL;
 
       TEH_plugin->rollback (TEH_plugin->cls);
       qs = TEH_plugin->get_purse_deposit (TEH_plugin->cls,
-                                          pcc->purse_pub,
+                                          &pcc->pd.purse_pub,
                                           &coin->cpi.coin_pub,
                                           &amount,
+                                          &h_denom_pub,
+                                          &phac,
                                           &coin_sig,
                                           &partner_url);
       if (qs < 0)
@@ -373,6 +294,10 @@ create_transaction (void *cls,
                                         &coin_pub),
             GNUNET_JSON_pack_data_auto ("coin_sig",
                                         &coin_sig),
+            GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                        &h_denom_pub),
+            GNUNET_JSON_pack_data_auto ("h_age_restrictions",
+                                        &phac),
             GNUNET_JSON_pack_allow_null (
               GNUNET_JSON_pack_string ("partner_url",
                                        partner_url)),
@@ -383,68 +308,64 @@ create_transaction (void *cls,
     }
   }
   /* 3) if present, persist contract */
-  in_conflict = true;
-  qs = TEH_plugin->insert_contract (TEH_plugin->cls,
-                                    pcc->purse_pub,
-                                    &pcc->contract_pub,
-                                    pcc->econtract_size,
-                                    pcc->econtract,
-                                    &pcc->econtract_sig,
-                                    &in_conflict);
-  if (qs < 0)
+  if (! pcc->no_econtract)
   {
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-      return qs;
-    TALER_LOG_WARNING ("Failed to store purse information in database\n");
-    *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                           TALER_EC_GENERIC_DB_STORE_FAILED,
-                                           "purse create contract");
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (in_conflict)
-  {
-    struct TALER_ContractDiffiePublicP pub_ckey;
-    struct TALER_PurseContractSignatureP econtract_sig;
-    size_t econtract_size;
-    void *econtract;
-    struct GNUNET_HashCode h_econtract;
-
-    qs = TEH_plugin->select_contract_by_purse (TEH_plugin->cls,
-                                               pcc->purse_pub,
-                                               &pub_ckey,
-                                               &econtract_sig,
-                                               &econtract_size,
-                                               &econtract);
-    if (qs <= 0)
+    in_conflict = true;
+    qs = TEH_plugin->insert_contract (TEH_plugin->cls,
+                                      &pcc->pd.purse_pub,
+                                      &pcc->econtract,
+                                      &in_conflict);
+    if (qs < 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
         return qs;
-      GNUNET_break (0 != qs);
-      TALER_LOG_WARNING (
-        "Failed to store fetch contract information from database\n");
+      TALER_LOG_WARNING ("Failed to store purse information in database\n");
       *mhd_ret = TALER_MHD_reply_with_error (connection,
                                              MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                             TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                             "select contract");
+                                             TALER_EC_GENERIC_DB_STORE_FAILED,
+                                             "purse create contract");
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (in_conflict)
+    {
+      struct TALER_EncryptedContract econtract;
+      struct GNUNET_HashCode h_econtract;
+
+      qs = TEH_plugin->select_contract_by_purse (
+        TEH_plugin->cls,
+        &pcc->pd.purse_pub,
+        &econtract);
+      if (qs <= 0)
+      {
+        if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+          return qs;
+        GNUNET_break (0 != qs);
+        TALER_LOG_WARNING (
+          "Failed to store fetch contract information from database\n");
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                               "select contract");
+        return GNUNET_DB_STATUS_HARD_ERROR;
+      }
+      GNUNET_CRYPTO_hash (econtract.econtract,
+                          econtract.econtract_size,
+                          &h_econtract);
+      *mhd_ret
+        = TALER_MHD_REPLY_JSON_PACK (
+            connection,
+            MHD_HTTP_CONFLICT,
+            TALER_JSON_pack_ec (
+              TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA),
+            GNUNET_JSON_pack_data_auto ("h_econtract",
+                                        &h_econtract),
+            GNUNET_JSON_pack_data_auto ("econtract_sig",
+                                        &econtract.econtract_sig),
+            GNUNET_JSON_pack_data_auto ("contract_pub",
+                                        &econtract.contract_pub));
+      GNUNET_free (econtract.econtract);
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
-    GNUNET_CRYPTO_hash (econtract,
-                        econtract_size,
-                        &h_econtract);
-    *mhd_ret
-      = TALER_MHD_REPLY_JSON_PACK (
-          connection,
-          MHD_HTTP_CONFLICT,
-          TALER_JSON_pack_ec (
-            TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA),
-          GNUNET_JSON_pack_data_auto ("h_econtract",
-                                      &h_econtract),
-          GNUNET_JSON_pack_data_auto ("econtract_sig",
-                                      &econtract_sig),
-          GNUNET_JSON_pack_data_auto ("pub_ckey",
-                                      &pub_ckey));
-    return GNUNET_DB_STATUS_HARD_ERROR;
   }
   return qs;
 }
@@ -454,8 +375,8 @@ create_transaction (void *cls,
  * Parse a coin and check signature of the coin and the denomination
  * signature over the coin.
  *
- * @param[in,out] our HTTP connection
- * @param[in,out] request context
+ * @param[in,out] connection our HTTP connection
+ * @param[in,out] pcc request context
  * @param[out] coin coin to initialize
  * @param jcoin coin to parse
  * @return #GNUNET_OK on success, #GNUNET_NO if an error was returned,
@@ -464,207 +385,36 @@ create_transaction (void *cls,
 static enum GNUNET_GenericReturnValue
 parse_coin (struct MHD_Connection *connection,
             struct PurseCreateContext *pcc,
-            struct Coin *coin,
+            struct TEH_PurseDepositedCoin *coin,
             const json_t *jcoin)
 {
-  struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_amount ("amount",
-                            TEH_currency,
-                            &coin->amount),
-    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
-                                 &coin->cpi.denom_pub_hash),
-    TALER_JSON_spec_denom_sig ("ub_sig",
-                               &coin->cpi.denom_sig),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                   &coin->cpi.h_age_commitment),
-      &coin->cpi.no_age_commitment),
-    GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                 &coin->coin_sig),
-    GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                 &coin->cpi.coin_pub),
-    GNUNET_JSON_spec_end ()
-  };
-
-  {
-    enum GNUNET_GenericReturnValue res;
-
-    res = TALER_MHD_parse_json_data (connection,
-                                     jcoin,
-                                     spec);
-    if (GNUNET_OK != res)
-      return res;
-  }
+  enum GNUNET_GenericReturnValue iret;
 
   if (GNUNET_OK !=
-      TALER_wallet_purse_deposit_verify (TEH_base_url,
-                                         pcc->purse_pub,
-                                         &coin->amount,
-                                         &coin->cpi.coin_pub,
-                                         &coin->coin_sig))
+      (iret = TEH_common_purse_deposit_parse_coin (connection,
+                                                   coin,
+                                                   jcoin)))
+    return iret;
+  if (GNUNET_OK !=
+      (iret = TEH_common_deposit_check_purse_deposit (
+         connection,
+         coin,
+         &pcc->pd.purse_pub,
+         pcc->min_age)))
+    return iret;
+  if (0 >
+      TALER_amount_add (&pcc->deposit_total,
+                        &pcc->deposit_total,
+                        &coin->amount_minus_fee))
   {
-    TALER_LOG_WARNING (
-      "Invalid coin signature on /purses/$PID/create request\n");
-    GNUNET_JSON_parse_free (spec);
+    GNUNET_break (0);
     return (MHD_YES ==
             TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_FORBIDDEN,
-                                        TALER_EC_EXCHANGE_PURSE_CREATE_COIN_SIGNATURE_INVALID,
-                                        TEH_base_url))
-           ? GNUNET_NO : GNUNET_SYSERR;
-  }
-  /* check denomination exists and is valid */
-  {
-    struct TEH_DenominationKey *dk;
-    MHD_RESULT mret;
-
-    dk = TEH_keys_denomination_by_hash (&coin->cpi.denom_pub_hash,
-                                        connection,
-                                        &mret);
-    if (NULL == dk)
-    {
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES == mret) ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (0 > TALER_amount_cmp (&dk->meta.value,
-                              &coin->amount))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_BAD_REQUEST,
-                                          TALER_EC_EXCHANGE_GENERIC_AMOUNT_EXCEEDS_DENOMINATION_VALUE,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
-    {
-      /* This denomination is past the expiration time for deposits */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
-                "PURSE CREATE"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
-    {
-      /* This denomination is not yet valid */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
-                "PURSE CREATE"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (dk->recoup_possible)
-    {
-      /* This denomination has been revoked */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
-                "PURSE CREATE"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (dk->denom_pub.cipher != coin->cpi.denom_sig.cipher)
-    {
-      /* denomination cipher and denomination signature cipher not the same */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_BAD_REQUEST,
-                                          TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-
-    coin->deposit_fee = dk->meta.fees.deposit;
-    if (0 < TALER_amount_cmp (&coin->deposit_fee,
-                              &coin->amount))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
-                                         NULL);
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_subtract (&coin->amount_minus_fee,
-                                          &coin->amount,
-                                          &coin->deposit_fee));
-    /* check coin signature */
-    switch (dk->denom_pub.cipher)
-    {
-    case TALER_DENOMINATION_RSA:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
-      break;
-    case TALER_DENOMINATION_CS:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
-      break;
-    default:
-      break;
-    }
-    if (GNUNET_YES !=
-        TALER_test_coin_valid (&coin->cpi,
-                               &dk->denom_pub))
-    {
-      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_FORBIDDEN,
-                                          TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (0 >
-        TALER_amount_add (&pcc->deposit_total,
-                          &pcc->deposit_total,
-                          &coin->amount_minus_fee))
-    {
-      GNUNET_break (0);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                         TALER_EC_GENERIC_FAILED_COMPUTE_AMOUNT,
-                                         "total deposit contribution");
-    }
-  }
-  {
-    MHD_RESULT mhd_ret = MHD_NO;
-    enum GNUNET_DB_QueryStatus qs;
-
-    /* make sure coin is 'known' in database */
-    for (unsigned int tries = 0; tries<MAX_TRANSACTION_COMMIT_RETRIES; tries++)
-    {
-      qs = TEH_make_coin_known (&coin->cpi,
-                                connection,
-                                &coin->known_coin_id,
-                                &mhd_ret);
-      /* no transaction => no serialization failures should be possible */
-      if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
-        break;
-    }
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-    {
-      GNUNET_break (0);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                          TALER_EC_GENERIC_DB_COMMIT_FAILED,
-                                          "make_coin_known"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (qs < 0)
-      return (MHD_YES == mhd_ret) ? GNUNET_NO : GNUNET_SYSERR;
+                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                        TALER_EC_GENERIC_FAILED_COMPUTE_AMOUNT,
+                                        "total deposit contribution"))
+           ? GNUNET_NO
+           : GNUNET_SYSERR;
   }
   return GNUNET_OK;
 }
@@ -677,41 +427,32 @@ TEH_handler_purses_create (
   const json_t *root)
 {
   struct PurseCreateContext pcc = {
-    .purse_pub = purse_pub,
+    .pd.purse_pub = *purse_pub,
     .exchange_timestamp = GNUNET_TIME_timestamp_get ()
   };
-  json_t *deposits;
+  const json_t *deposits;
   json_t *deposit;
   unsigned int idx;
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount ("amount",
                             TEH_currency,
-                            &pcc.amount),
+                            &pcc.pd.target_amount),
     GNUNET_JSON_spec_uint32 ("min_age",
                              &pcc.min_age),
     GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_varsize ("econtract",
-                                &pcc.econtract,
-                                &pcc.econtract_size),
-      NULL),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("econtract_sig",
-                                   &pcc.econtract_sig),
-      NULL),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("contract_pub",
-                                   &pcc.contract_pub),
-      NULL),
+      TALER_JSON_spec_econtract ("econtract",
+                                 &pcc.econtract),
+      &pcc.no_econtract),
     GNUNET_JSON_spec_fixed_auto ("merge_pub",
                                  &pcc.merge_pub),
     GNUNET_JSON_spec_fixed_auto ("purse_sig",
                                  &pcc.purse_sig),
     GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                 &pcc.h_contract_terms),
-    GNUNET_JSON_spec_json ("deposits",
-                           &deposits),
+                                 &pcc.pd.h_contract_terms),
+    GNUNET_JSON_spec_array_const ("deposits",
+                                  &deposits),
     GNUNET_JSON_spec_timestamp ("purse_expiration",
-                                &pcc.purse_expiration),
+                                &pcc.pd.purse_expiration),
     GNUNET_JSON_spec_end ()
   };
   const struct TEH_GlobalFee *gf;
@@ -736,21 +477,19 @@ TEH_handler_purses_create (
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TEH_currency,
                                         &pcc.deposit_total));
-  if (GNUNET_TIME_timestamp_cmp (pcc.purse_expiration,
+  if (GNUNET_TIME_timestamp_cmp (pcc.pd.purse_expiration,
                                  <,
                                  pcc.exchange_timestamp))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_EXCHANGE_PURSE_CREATE_EXPIRATION_BEFORE_NOW,
                                        NULL);
   }
-  if (GNUNET_TIME_absolute_is_never (pcc.purse_expiration.abs_time))
+  if (GNUNET_TIME_absolute_is_never (pcc.pd.purse_expiration.abs_time))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_EXCHANGE_PURSE_CREATE_EXPIRATION_IS_NEVER,
@@ -761,14 +500,26 @@ TEH_handler_purses_create (
        (pcc.num_coins > TALER_MAX_FRESH_COINS) )
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
                                        "deposits");
   }
-  gf = TEH_keys_global_fee_by_time (TEH_keys_get_state (),
-                                    pcc.exchange_timestamp);
+  {
+    struct TEH_KeyStateHandle *keys;
+
+    keys = TEH_keys_get_state ();
+    if (NULL == keys)
+    {
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                         NULL);
+    }
+    gf = TEH_keys_global_fee_by_time (keys,
+                                      pcc.exchange_timestamp);
+  }
   if (NULL == gf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -780,11 +531,11 @@ TEH_handler_purses_create (
   }
   /* parse deposits */
   pcc.coins = GNUNET_new_array (pcc.num_coins,
-                                struct Coin);
+                                struct TEH_PurseDepositedCoin);
   json_array_foreach (deposits, idx, deposit)
   {
     enum GNUNET_GenericReturnValue res;
-    struct Coin *coin = &pcc.coins[idx];
+    struct TEH_PurseDepositedCoin *coin = &pcc.coins[idx];
 
     res = parse_coin (connection,
                       &pcc,
@@ -792,7 +543,8 @@ TEH_handler_purses_create (
                       deposit);
     if (GNUNET_OK != res)
     {
-      GNUNET_JSON_parse_free (spec);
+      for (unsigned int i = 0; i<idx; i++)
+        TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
       GNUNET_free (pcc.coins);
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
@@ -802,7 +554,6 @@ TEH_handler_purses_create (
                             &pcc.deposit_total))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     GNUNET_free (pcc.coins);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
@@ -812,32 +563,35 @@ TEH_handler_purses_create (
   TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
 
   if (GNUNET_OK !=
-      TALER_wallet_purse_create_verify (pcc.purse_expiration,
-                                        &pcc.h_contract_terms,
-                                        &pcc.merge_pub,
-                                        pcc.min_age,
-                                        &pcc.amount,
-                                        pcc.purse_pub,
-                                        &pcc.purse_sig))
+      TALER_wallet_purse_create_verify (
+        pcc.pd.purse_expiration,
+        &pcc.pd.h_contract_terms,
+        &pcc.merge_pub,
+        pcc.min_age,
+        &pcc.pd.target_amount,
+        &pcc.pd.purse_pub,
+        &pcc.purse_sig))
   {
     TALER_LOG_WARNING ("Invalid signature on /purses/$PID/create request\n");
-    GNUNET_JSON_parse_free (spec);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_FORBIDDEN,
                                        TALER_EC_EXCHANGE_PURSE_CREATE_SIGNATURE_INVALID,
                                        NULL);
   }
-  if ( (NULL != pcc.econtract) &&
+  if ( (! pcc.no_econtract) &&
        (GNUNET_OK !=
-        TALER_wallet_econtract_upload_verify (pcc.econtract,
-                                              pcc.econtract_size,
-                                              &pcc.contract_pub,
+        TALER_wallet_econtract_upload_verify (pcc.econtract.econtract,
+                                              pcc.econtract.econtract_size,
+                                              &pcc.econtract.contract_pub,
                                               purse_pub,
-                                              &pcc.econtract_sig)) )
+                                              &pcc.econtract.econtract_sig)) )
   {
     TALER_LOG_WARNING ("Invalid signature on /purses/$PID/create request\n");
-    GNUNET_JSON_parse_free (spec);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_FORBIDDEN,
@@ -850,7 +604,8 @@ TEH_handler_purses_create (
       TEH_plugin->preflight (TEH_plugin->cls))
   {
     GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -870,7 +625,8 @@ TEH_handler_purses_create (
                                 &create_transaction,
                                 &pcc))
     {
-      GNUNET_JSON_parse_free (spec);
+      for (unsigned int i = 0; i<pcc.num_coins; i++)
+        TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
       GNUNET_free (pcc.coins);
       return mhd_ret;
     }
@@ -880,10 +636,13 @@ TEH_handler_purses_create (
   {
     MHD_RESULT res;
 
-    res = reply_create_success (connection,
-                                &pcc);
+    res = TEH_RESPONSE_reply_purse_created (connection,
+                                            pcc.exchange_timestamp,
+                                            &pcc.deposit_total,
+                                            &pcc.pd);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
-    GNUNET_JSON_parse_free (spec);
     return res;
   }
 }
diff --git a/src/exchange/taler-exchange-httpd_purses_delete.c b/src/exchange/taler-exchange-httpd_purses_delete.c
new file mode 100644
index 000000000..5bf7c24c9
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_purses_delete.c
@@ -0,0 +1,141 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_purses_delete.c
+ * @brief Handle DELETE /purses/$PID requests; parses the request and
+ *        verifies the signature before handing deletion to the database.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include "taler_dbevents.h"
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_common_deposit.h"
+#include "taler-exchange-httpd_purses_delete.h"
+#include "taler-exchange-httpd_responses.h"
+#include "taler_exchangedb_lib.h"
+#include "taler-exchange-httpd_keys.h"
+
+
+MHD_RESULT
+TEH_handler_purses_delete (
+  struct TEH_RequestContext *rc,
+  const char *const args[1])
+{
+  struct MHD_Connection *connection = rc->connection;
+  struct TALER_PurseContractPublicKeyP purse_pub;
+  struct TALER_PurseContractSignatureP purse_sig;
+  bool found;
+  bool decided;
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &purse_pub,
+                                     sizeof (purse_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_PURSE_PUB_MALFORMED,
+                                       args[0]);
+  }
+  TALER_MHD_parse_request_header_auto_t (connection,
+                                         "Taler-Purse-Signature",
+                                         &purse_sig);
+  if (GNUNET_OK !=
+      TALER_wallet_purse_delete_verify (&purse_pub,
+                                        &purse_sig))
+  {
+    TALER_LOG_WARNING ("Invalid signature on /purses/$PID/delete request\n");
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_FORBIDDEN,
+                                       TALER_EC_EXCHANGE_PURSE_DELETE_SIGNATURE_INVALID,
+                                       NULL);
+  }
+  if (GNUNET_SYSERR ==
+      TEH_plugin->preflight (TEH_plugin->cls))
+  {
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                       TALER_EC_GENERIC_DB_START_FAILED,
+                                       "preflight failure");
+  }
+
+  {
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->do_purse_delete (TEH_plugin->cls,
+                                      &purse_pub,
+                                      &purse_sig,
+                                      &decided,
+                                      &found);
+    if (qs <= 0)
+    {
+      TALER_LOG_WARNING (
+        "Failed to store delete purse information in database\n");
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_STORE_FAILED,
+                                         "purse delete");
+    }
+  }
+  if (! found)
+  {
+    return TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_EXCHANGE_GENERIC_PURSE_UNKNOWN,
+      NULL);
+  }
+  if (decided)
+  {
+    return TALER_MHD_reply_with_ec (
+      connection,
+      TALER_EC_EXCHANGE_PURSE_DELETE_ALREADY_DECIDED,
+      NULL);
+  }
+  {
+    /* Possible minor optimization: integrate notification with
+       transaction above... */
+    struct TALER_PurseEventP rep = {
+      .header.size = htons (sizeof (rep)),
+      .header.type = htons (TALER_DBEVENT_EXCHANGE_PURSE_DEPOSITED),
+      .purse_pub = purse_pub
+    };
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Notifying about purse deletion %s\n",
+                TALER_B2S (&purse_pub));
+    TEH_plugin->event_notify (TEH_plugin->cls,
+                              &rep.header,
+                              NULL,
+                              0);
+  }
+  /* success */
+  return TALER_MHD_reply_static (connection,
+                                 MHD_HTTP_NO_CONTENT,
+                                 NULL,
+                                 NULL,
+                                 0);
+}
+
+
+/* end of taler-exchange-httpd_purses_delete.c */
diff --git a/src/auditor/taler-auditor-httpd_exchanges.h b/src/exchange/taler-exchange-httpd_purses_delete.h
index c7d8dd5fd..912dd43a8 100644
--- a/src/auditor/taler-auditor-httpd_exchanges.h
+++ b/src/exchange/taler-exchange-httpd_purses_delete.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018 Taler Systems SA
+  Copyright (C) 2022 Taler Systems SA
 
   TALER 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
@@ -14,33 +14,29 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-auditor-httpd_exchanges.h
- * @brief Handle /exchanges requests
+ * @file taler-exchange-httpd_purses_delete.h
+ * @brief Handle DELETE /purses/$PID requests
  * @author Christian Grothoff
  */
-#ifndef TALER_AUDITOR_HTTPD_EXCHANGES_H
-#define TALER_AUDITOR_HTTPD_EXCHANGES_H
+#ifndef TALER_EXCHANGE_HTTPD_PURSES_DELETE_H
+#define TALER_EXCHANGE_HTTPD_PURSES_DELETE_H
 
 #include <gnunet/gnunet_util_lib.h>
 #include <microhttpd.h>
-#include "taler-auditor-httpd.h"
+#include "taler-exchange-httpd.h"
 
 
 /**
- * Handle a "/exchanges" request.
+ * Handle a DELETE "/purses/$PURSE_PUB" request.
  *
- * @param rh context of the handler
- * @param connection the MHD connection to handle
- * @param[in,out] connection_cls the connection's closure (can be updated)
- * @param upload_data upload data
- * @param[in,out] upload_data_size number of bytes (left) in @a upload_data
+ * @param rc request details about the request to handle
+ * @param args argument with the public key of the purse
  * @return MHD result code
-  */
+ */
 MHD_RESULT
-TAH_EXCHANGES_handler (struct TAH_RequestHandler *rh,
-                       struct MHD_Connection *connection,
-                       void **connection_cls,
-                       const char *upload_data,
-                       size_t *upload_data_size);
+TEH_handler_purses_delete (
+  struct TEH_RequestContext *rc,
+  const char *const args[1]);
+
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_purses_deposit.c b/src/exchange/taler-exchange-httpd_purses_deposit.c
index 38bd84729..8e4d5e41a 100644
--- a/src/exchange/taler-exchange-httpd_purses_deposit.c
+++ b/src/exchange/taler-exchange-httpd_purses_deposit.c
@@ -25,10 +25,10 @@
 #include <gnunet/gnunet_json_lib.h>
 #include <jansson.h>
 #include <microhttpd.h>
-#include <pthread.h>
 #include "taler_dbevents.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_common_deposit.h"
 #include "taler-exchange-httpd_purses_deposit.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler_exchangedb_lib.h"
@@ -36,43 +36,6 @@
 
 
 /**
- * Information about an individual coin being deposited.
- */
-struct Coin
-{
-  /**
-   * Public information about the coin.
-   */
-  struct TALER_CoinPublicInfo cpi;
-
-  /**
-   * Signature affirming spending the coin.
-   */
-  struct TALER_CoinSpendSignatureP coin_sig;
-
-  /**
-   * Amount to be put into the purse from this coin.
-   */
-  struct TALER_Amount amount;
-
-  /**
-   * Deposit fee applicable for this coin.
-   */
-  struct TALER_Amount deposit_fee;
-
-  /**
-   * Amount to be put into the purse from this coin.
-   */
-  struct TALER_Amount amount_minus_fee;
-
-  /**
-   * ID of the coin in known_coins.
-   */
-  uint64_t known_coin_id;
-};
-
-
-/**
  * Closure for #deposit_transaction.
  */
 struct PurseDepositContext
@@ -98,11 +61,6 @@ struct PurseDepositContext
   struct GNUNET_TIME_Timestamp purse_expiration;
 
   /**
-   * Key with the merge capability (needed for signing).
-   */
-  struct TALER_PurseMergePublicKeyP merge_pub;
-
-  /**
    * Hash of the contract (needed for signing).
    */
   struct TALER_PrivateContractHashP h_contract_terms;
@@ -115,7 +73,7 @@ struct PurseDepositContext
   /**
    * Array of coins being deposited.
    */
-  struct Coin *coins;
+  struct TEH_PurseDepositedCoin *coins;
 
   /**
    * Length of the @e coins array.
@@ -152,7 +110,6 @@ reply_deposit_success (struct MHD_Connection *connection,
          &pcc->amount,
          &pcc->deposit_total,
          pcc->purse_pub,
-         &pcc->merge_pub,
          &pcc->h_contract_terms,
          &pub,
          &sig)))
@@ -175,8 +132,6 @@ reply_deposit_success (struct MHD_Connection *connection,
                                 pcc->purse_expiration),
     GNUNET_JSON_pack_data_auto ("h_contract_terms",
                                 &pcc->h_contract_terms),
-    GNUNET_JSON_pack_data_auto ("merge_pub",
-                                &pcc->merge_pub),
     GNUNET_JSON_pack_data_auto ("exchange_sig",
                                 &sig),
     GNUNET_JSON_pack_data_auto ("exchange_pub",
@@ -205,12 +160,20 @@ deposit_transaction (void *cls,
   struct PurseDepositContext *pcc = cls;
   enum GNUNET_DB_QueryStatus qs;
 
+  qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
   for (unsigned int i = 0; i<pcc->num_coins; i++)
   {
-    struct Coin *coin = &pcc->coins[i];
+    struct TEH_PurseDepositedCoin *coin = &pcc->coins[i];
     bool balance_ok = false;
     bool conflict = true;
+    bool too_late = true;
 
+    qs = TEH_make_coin_known (&coin->cpi,
+                              connection,
+                              &coin->known_coin_id,
+                              mhd_ret);
+    if (qs < 0)
+      return qs;
     qs = TEH_plugin->do_purse_deposit (TEH_plugin->cls,
                                        pcc->purse_pub,
                                        &coin->cpi.coin_pub,
@@ -218,18 +181,20 @@ deposit_transaction (void *cls,
                                        &coin->coin_sig,
                                        &coin->amount_minus_fee,
                                        &balance_ok,
+                                       &too_late,
                                        &conflict);
     if (qs <= 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
         return qs;
+      GNUNET_break (0 != qs);
       TALER_LOG_WARNING (
         "Failed to store purse deposit information in database\n");
       *mhd_ret = TALER_MHD_reply_with_error (connection,
                                              MHD_HTTP_INTERNAL_SERVER_ERROR,
                                              TALER_EC_GENERIC_DB_STORE_FAILED,
                                              "do purse deposit");
-      return qs;
+      return GNUNET_DB_STATUS_HARD_ERROR;
     }
     if (! balance_ok)
     {
@@ -237,14 +202,27 @@ deposit_transaction (void *cls,
         = TEH_RESPONSE_reply_coin_insufficient_funds (
             connection,
             TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+            &coin->cpi.denom_pub_hash,
             &coin->cpi.coin_pub);
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
+    if (too_late)
+    {
+      TEH_plugin->rollback (TEH_plugin->cls);
+      *mhd_ret
+        = TALER_MHD_reply_with_ec (
+            connection,
+            TALER_EC_EXCHANGE_PURSE_DEPOSIT_DECIDED_ALREADY,
+            NULL);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
     if (conflict)
     {
       struct TALER_Amount amount;
       struct TALER_CoinSpendPublicKeyP coin_pub;
       struct TALER_CoinSpendSignatureP coin_sig;
+      struct TALER_DenominationHashP h_denom_pub;
+      struct TALER_AgeCommitmentHash phac;
       char *partner_url = NULL;
 
       TEH_plugin->rollback (TEH_plugin->cls);
@@ -252,6 +230,8 @@ deposit_transaction (void *cls,
                                           pcc->purse_pub,
                                           &coin->cpi.coin_pub,
                                           &amount,
+                                          &h_denom_pub,
+                                          &phac,
                                           &coin_sig,
                                           &partner_url);
       if (qs < 0)
@@ -274,6 +254,10 @@ deposit_transaction (void *cls,
               TALER_EC_EXCHANGE_PURSE_DEPOSIT_CONFLICTING_META_DATA),
             GNUNET_JSON_pack_data_auto ("coin_pub",
                                         &coin_pub),
+            GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                        &h_denom_pub),
+            GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                        &phac),
             GNUNET_JSON_pack_data_auto ("coin_sig",
                                         &coin_sig),
             GNUNET_JSON_pack_allow_null (
@@ -293,8 +277,8 @@ deposit_transaction (void *cls,
  * Parse a coin and check signature of the coin and the denomination
  * signature over the coin.
  *
- * @param[in,out] our HTTP connection
- * @param[in,out] request context
+ * @param[in,out] connection our HTTP connection
+ * @param[in,out] pcc request context
  * @param[out] coin coin to initialize
  * @param jcoin coin to parse
  * @return #GNUNET_OK on success, #GNUNET_NO if an error was returned,
@@ -303,205 +287,33 @@ deposit_transaction (void *cls,
 static enum GNUNET_GenericReturnValue
 parse_coin (struct MHD_Connection *connection,
             struct PurseDepositContext *pcc,
-            struct Coin *coin,
+            struct TEH_PurseDepositedCoin *coin,
             const json_t *jcoin)
 {
-  struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_amount ("amount",
-                            TEH_currency,
-                            &coin->amount),
-    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
-                                 &coin->cpi.denom_pub_hash),
-    TALER_JSON_spec_denom_sig ("ub_sig",
-                               &coin->cpi.denom_sig),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                   &coin->cpi.h_age_commitment),
-      &coin->cpi.no_age_commitment),
-    GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                 &coin->coin_sig),
-    GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                 &coin->cpi.coin_pub),
-    GNUNET_JSON_spec_end ()
-  };
-
-  {
-    enum GNUNET_GenericReturnValue res;
+  enum GNUNET_GenericReturnValue iret;
 
-    res = TALER_MHD_parse_json_data (connection,
-                                     jcoin,
-                                     spec);
-    if (GNUNET_OK != res)
-      return res;
-  }
   if (GNUNET_OK !=
-      TALER_wallet_purse_deposit_verify (TEH_base_url,
-                                         pcc->purse_pub,
-                                         &coin->amount,
-                                         &coin->cpi.coin_pub,
-                                         &coin->coin_sig))
-  {
-    TALER_LOG_WARNING ("Invalid signature on /purses/$PID/deposit request\n");
-    GNUNET_JSON_parse_free (spec);
-    return (MHD_YES ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_FORBIDDEN,
-                                        TALER_EC_EXCHANGE_PURSE_DEPOSIT_COIN_SIGNATURE_INVALID,
-                                        TEH_base_url))
-           ? GNUNET_NO : GNUNET_SYSERR;
-  }
-  /* check denomination exists and is valid */
-  {
-    struct TEH_DenominationKey *dk;
-    MHD_RESULT mret;
-
-    dk = TEH_keys_denomination_by_hash (&coin->cpi.denom_pub_hash,
-                                        connection,
-                                        &mret);
-    if (NULL == dk)
-    {
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES == mret) ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (0 > TALER_amount_cmp (&dk->meta.value,
-                              &coin->amount))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_BAD_REQUEST,
-                                          TALER_EC_EXCHANGE_GENERIC_AMOUNT_EXCEEDS_DENOMINATION_VALUE,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
-    {
-      /* This denomination is past the expiration time for deposits */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
-                "PURSE DEPOSIT"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
-    {
-      /* This denomination is not yet valid */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
-                "PURSE DEPOSIT"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (dk->recoup_possible)
-    {
-      /* This denomination has been revoked */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TEH_RESPONSE_reply_expired_denom_pub_hash (
-                connection,
-                &coin->cpi.denom_pub_hash,
-                TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
-                "PURSE DEPOSIT"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (dk->denom_pub.cipher != coin->cpi.denom_sig.cipher)
-    {
-      /* denomination cipher and denomination signature cipher not the same */
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_BAD_REQUEST,
-                                          TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-
-    coin->deposit_fee = dk->meta.fees.deposit;
-    if (0 < TALER_amount_cmp (&coin->deposit_fee,
-                              &coin->amount))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_EXCHANGE_DEPOSIT_NEGATIVE_VALUE_AFTER_FEE,
-                                         NULL);
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_subtract (&coin->amount_minus_fee,
-                                          &coin->amount,
-                                          &coin->deposit_fee));
-    /* check coin signature */
-    switch (dk->denom_pub.cipher)
-    {
-    case TALER_DENOMINATION_RSA:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
-      break;
-    case TALER_DENOMINATION_CS:
-      TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
-      break;
-    default:
-      break;
-    }
-    if (GNUNET_YES !=
-        TALER_test_coin_valid (&coin->cpi,
-                               &dk->denom_pub))
-    {
-      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
-      GNUNET_JSON_parse_free (spec);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_FORBIDDEN,
-                                          TALER_EC_EXCHANGE_DENOMINATION_SIGNATURE_INVALID,
-                                          NULL))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (0 >
-        TALER_amount_add (&pcc->deposit_total,
-                          &pcc->deposit_total,
-                          &coin->amount_minus_fee))
-    {
-      GNUNET_break (0);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                         TALER_EC_GENERIC_FAILED_COMPUTE_AMOUNT,
-                                         "total deposit contribution");
-    }
-  }
+      (iret = TEH_common_purse_deposit_parse_coin (connection,
+                                                   coin,
+                                                   jcoin)))
+    return iret;
+  if (GNUNET_OK !=
+      (iret = TEH_common_deposit_check_purse_deposit (
+         connection,
+         coin,
+         pcc->purse_pub,
+         pcc->min_age)))
+    return iret;
+  if (0 >
+      TALER_amount_add (&pcc->deposit_total,
+                        &pcc->deposit_total,
+                        &coin->amount_minus_fee))
   {
-    MHD_RESULT mhd_ret = MHD_NO;
-    enum GNUNET_DB_QueryStatus qs;
-
-    /* make sure coin is 'known' in database */
-    for (unsigned int tries = 0; tries<MAX_TRANSACTION_COMMIT_RETRIES; tries++)
-    {
-      qs = TEH_make_coin_known (&coin->cpi,
-                                connection,
-                                &coin->known_coin_id,
-                                &mhd_ret);
-      /* no transaction => no serialization failures should be possible */
-      if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
-        break;
-    }
-    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-    {
-      GNUNET_break (0);
-      return (MHD_YES ==
-              TALER_MHD_reply_with_error (connection,
-                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                          TALER_EC_GENERIC_DB_COMMIT_FAILED,
-                                          "make_coin_known"))
-             ? GNUNET_NO : GNUNET_SYSERR;
-    }
-    if (qs < 0)
-      return (MHD_YES == mhd_ret) ? GNUNET_NO : GNUNET_SYSERR;
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                       TALER_EC_GENERIC_FAILED_COMPUTE_AMOUNT,
+                                       "total deposit contribution");
   }
   return GNUNET_OK;
 }
@@ -517,12 +329,12 @@ TEH_handler_purses_deposit (
     .purse_pub = purse_pub,
     .exchange_timestamp = GNUNET_TIME_timestamp_get ()
   };
-  json_t *deposits;
+  const json_t *deposits;
   json_t *deposit;
   unsigned int idx;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("deposits",
-                           &deposits),
+    GNUNET_JSON_spec_array_const ("deposits",
+                                  &deposits),
     GNUNET_JSON_spec_end ()
   };
 
@@ -551,7 +363,6 @@ TEH_handler_purses_deposit (
        (pcc.num_coins > TALER_MAX_FRESH_COINS) )
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_BAD_REQUEST,
                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
@@ -560,16 +371,22 @@ TEH_handler_purses_deposit (
 
   {
     enum GNUNET_DB_QueryStatus qs;
+    struct GNUNET_TIME_Timestamp create_timestamp;
     struct GNUNET_TIME_Timestamp merge_timestamp;
+    bool was_deleted;
+    bool was_refunded;
 
     qs = TEH_plugin->select_purse (
       TEH_plugin->cls,
       pcc.purse_pub,
+      &create_timestamp,
       &pcc.purse_expiration,
       &pcc.amount,
       &pcc.deposit_total,
       &pcc.h_contract_terms,
-      &merge_timestamp);
+      &merge_timestamp,
+      &was_deleted,
+      &was_refunded);
     switch (qs)
     {
     case GNUNET_DB_STATUS_HARD_ERROR:
@@ -592,22 +409,26 @@ TEH_handler_purses_deposit (
     case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
       break; /* handled below */
     }
-    if (GNUNET_TIME_absolute_is_past (pcc.purse_expiration.abs_time))
+    if (was_refunded ||
+        was_deleted)
     {
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_GONE,
-                                         TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
-                                         NULL);
+      return TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_GONE,
+        was_deleted
+        ? TALER_EC_EXCHANGE_GENERIC_PURSE_DELETED
+        : TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
+        GNUNET_TIME_timestamp2s (pcc.purse_expiration));
     }
   }
 
   /* parse deposits */
   pcc.coins = GNUNET_new_array (pcc.num_coins,
-                                struct Coin);
+                                struct TEH_PurseDepositedCoin);
   json_array_foreach (deposits, idx, deposit)
   {
     enum GNUNET_GenericReturnValue res;
-    struct Coin *coin = &pcc.coins[idx];
+    struct TEH_PurseDepositedCoin *coin = &pcc.coins[idx];
 
     res = parse_coin (connection,
                       &pcc,
@@ -615,7 +436,8 @@ TEH_handler_purses_deposit (
                       deposit);
     if (GNUNET_OK != res)
     {
-      GNUNET_JSON_parse_free (spec);
+      for (unsigned int i = 0; i<idx; i++)
+        TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
       GNUNET_free (pcc.coins);
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
     }
@@ -625,7 +447,8 @@ TEH_handler_purses_deposit (
       TEH_plugin->preflight (TEH_plugin->cls))
   {
     GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
     return TALER_MHD_reply_with_error (connection,
                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -645,7 +468,8 @@ TEH_handler_purses_deposit (
                                 &deposit_transaction,
                                 &pcc))
     {
-      GNUNET_JSON_parse_free (spec);
+      for (unsigned int i = 0; i<pcc.num_coins; i++)
+        TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
       GNUNET_free (pcc.coins);
       return mhd_ret;
     }
@@ -672,8 +496,9 @@ TEH_handler_purses_deposit (
 
     res = reply_deposit_success (connection,
                                  &pcc);
+    for (unsigned int i = 0; i<pcc.num_coins; i++)
+      TEH_common_purse_deposit_free_coin (&pcc.coins[i]);
     GNUNET_free (pcc.coins);
-    GNUNET_JSON_parse_free (spec);
     return res;
   }
 }
diff --git a/src/exchange/taler-exchange-httpd_purses_get.c b/src/exchange/taler-exchange-httpd_purses_get.c
index 12a244897..22328fe09 100644
--- a/src/exchange/taler-exchange-httpd_purses_get.c
+++ b/src/exchange/taler-exchange-httpd_purses_get.c
@@ -57,6 +57,12 @@ struct GetContext
   struct GNUNET_DB_EventHandler *eh;
 
   /**
+   * Subscription for refund event we are
+   * waiting for.
+   */
+  struct GNUNET_DB_EventHandler *ehr;
+
+  /**
    * Public key of our purse.
    */
   struct TALER_PurseContractPublicKeyP purse_pub;
@@ -153,6 +159,12 @@ gc_cleanup (struct TEH_RequestContext *rc)
                                      gc->eh);
     gc->eh = NULL;
   }
+  if (NULL != gc->ehr)
+  {
+    TEH_plugin->event_listen_cancel (TEH_plugin->cls,
+                                     gc->ehr);
+    gc->ehr = NULL;
+  }
   GNUNET_free (gc);
 }
 
@@ -207,6 +219,8 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
                         const char *const args[2])
 {
   struct GetContext *gc = rc->rh_ctx;
+  bool purse_deleted;
+  bool purse_refunded;
   MHD_RESULT res;
 
   if (NULL == gc)
@@ -242,36 +256,8 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
                                          args[1]);
     }
 
-    {
-      const char *long_poll_timeout_ms;
-
-      long_poll_timeout_ms
-        = MHD_lookup_connection_value (rc->connection,
-                                       MHD_GET_ARGUMENT_KIND,
-                                       "timeout_ms");
-      if (NULL != long_poll_timeout_ms)
-      {
-        unsigned int timeout_ms;
-        char dummy;
-        struct GNUNET_TIME_Relative timeout;
-
-        if (1 != sscanf (long_poll_timeout_ms,
-                         "%u%c",
-                         &timeout_ms,
-                         &dummy))
-        {
-          GNUNET_break_op (0);
-          return TALER_MHD_reply_with_error (rc->connection,
-                                             MHD_HTTP_BAD_REQUEST,
-                                             TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                             "timeout_ms (must be non-negative number)");
-        }
-        timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                                 timeout_ms);
-        gc->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-      }
-    }
-
+    TALER_MHD_parse_request_timeout (rc->connection,
+                                     &gc->timeout);
     if ( (GNUNET_TIME_absolute_is_future (gc->timeout)) &&
          (NULL == gc->eh) )
     {
@@ -279,8 +265,8 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
         .header.size = htons (sizeof (rep)),
         .header.type = htons (
           gc->wait_for_merge
-        ? TALER_DBEVENT_EXCHANGE_PURSE_MERGED
-        : TALER_DBEVENT_EXCHANGE_PURSE_DEPOSITED),
+          ? TALER_DBEVENT_EXCHANGE_PURSE_MERGED
+          : TALER_DBEVENT_EXCHANGE_PURSE_DEPOSITED),
         .purse_pub = gc->purse_pub
       };
 
@@ -298,19 +284,37 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
         GNUNET_break (0);
         gc->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
       }
+      else
+      {
+        struct GNUNET_DB_EventHeaderP repr = {
+          .size = htons (sizeof (repr)),
+          .type = htons (TALER_DBEVENT_EXCHANGE_PURSE_REFUNDED),
+        };
+
+        gc->ehr = TEH_plugin->event_listen (
+          TEH_plugin->cls,
+          GNUNET_TIME_absolute_get_remaining (gc->timeout),
+          &repr,
+          &db_event_cb,
+          rc);
+      }
     }
   } /* end first-time initialization */
 
   {
     enum GNUNET_DB_QueryStatus qs;
+    struct GNUNET_TIME_Timestamp create_timestamp;
 
     qs = TEH_plugin->select_purse (TEH_plugin->cls,
                                    &gc->purse_pub,
+                                   &create_timestamp,
                                    &gc->purse_expiration,
                                    &gc->amount,
                                    &gc->deposited,
                                    &gc->h_contract,
-                                   &gc->merge_timestamp);
+                                   &gc->merge_timestamp,
+                                   &purse_deleted,
+                                   &purse_refunded);
     switch (qs)
     {
     case GNUNET_DB_STATUS_HARD_ERROR:
@@ -333,43 +337,17 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
     case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
       break; /* handled below */
     }
-    if (GNUNET_TIME_absolute_cmp (gc->timeout,
-                                  >,
-                                  gc->purse_expiration.abs_time))
-    {
-      /* Timeout too high, need to replace event handler */
-      struct TALER_PurseEventP rep = {
-        .header.size = htons (sizeof (rep)),
-        .header.type = htons (
-          gc->wait_for_merge
-        ? TALER_DBEVENT_EXCHANGE_PURSE_MERGED
-        : TALER_DBEVENT_EXCHANGE_PURSE_DEPOSITED),
-        .purse_pub = gc->purse_pub
-      };
-      struct GNUNET_DB_EventHandler *eh2;
-
-      gc->timeout = gc->purse_expiration.abs_time;
-      eh2 = TEH_plugin->event_listen (
-        TEH_plugin->cls,
-        GNUNET_TIME_absolute_get_remaining (gc->timeout),
-        &rep.header,
-        &db_event_cb,
-        rc);
-      if (NULL == eh2)
-      {
-        GNUNET_break (0);
-        gc->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
-      }
-      TEH_plugin->event_listen_cancel (TEH_plugin->cls,
-                                       gc->eh);
-      gc->eh = eh2;
-    }
   }
-  if (GNUNET_TIME_absolute_is_past (gc->purse_expiration.abs_time))
+  if (purse_refunded ||
+      purse_deleted)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Purse refunded or deleted\n");
     return TALER_MHD_reply_with_error (rc->connection,
                                        MHD_HTTP_GONE,
-                                       TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
+                                       purse_deleted
+                                       ? TALER_EC_EXCHANGE_GENERIC_PURSE_DELETED
+                                       : TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
                                        GNUNET_TIME_timestamp2s (
                                          gc->purse_expiration));
   }
@@ -406,7 +384,10 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
     if (0 <
         TALER_amount_cmp (&gc->amount,
                           &gc->deposited))
+    {
+      /* amount > deposited: not yet fully paid */
       dt = GNUNET_TIME_UNIT_ZERO_TS;
+    }
     if (TALER_EC_NONE !=
         (ec = TALER_exchange_online_purse_status_sign (
            &TEH_keys_exchange_sign_,
@@ -415,10 +396,16 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
            &gc->deposited,
            &exchange_pub,
            &exchange_sig)))
+    {
       res = TALER_MHD_reply_with_ec (rc->connection,
                                      ec,
                                      NULL);
+    }
     else
+    {
+      /* Make sure merge_timestamp is omitted if not yet merged */
+      if (GNUNET_TIME_absolute_is_never (gc->merge_timestamp.abs_time))
+        gc->merge_timestamp = GNUNET_TIME_UNIT_ZERO_TS;
       res = TALER_MHD_REPLY_JSON_PACK (
         rc->connection,
         MHD_HTTP_OK,
@@ -428,11 +415,16 @@ TEH_handler_purses_get (struct TEH_RequestContext *rc,
                                     &exchange_sig),
         GNUNET_JSON_pack_data_auto ("exchange_pub",
                                     &exchange_pub),
-        GNUNET_JSON_pack_timestamp ("merge_timestamp",
-                                    gc->merge_timestamp),
-        GNUNET_JSON_pack_timestamp ("deposit_timestamp",
-                                    dt)
+        GNUNET_JSON_pack_timestamp ("purse_expiration",
+                                    gc->purse_expiration),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_timestamp ("merge_timestamp",
+                                      gc->merge_timestamp)),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_timestamp ("deposit_timestamp",
+                                      dt))
         );
+    }
   }
   return res;
 }
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c
index 397492d0e..fb5ce4d90 100644
--- a/src/exchange/taler-exchange-httpd_purses_merge.c
+++ b/src/exchange/taler-exchange-httpd_purses_merge.c
@@ -28,12 +28,12 @@
 #include <pthread.h>
 #include "taler_dbevents.h"
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_purses_merge.h"
 #include "taler-exchange-httpd_responses.h"
 #include "taler_exchangedb_lib.h"
 #include "taler-exchange-httpd_keys.h"
-#include "taler-exchange-httpd_wire.h"
 
 
 /**
@@ -103,11 +103,21 @@ struct PurseMergeContext
 
   /**
    * URI of the account the purse is to be merged into.
-   * Must be of the form 'payto://taler/$EXCHANGE_URL/RESERVE_PUB'.
+   * Must be of the form 'payto://taler-reserve/$EXCHANGE_URL/RESERVE_PUB'.
    */
   const char *payto_uri;
 
   /**
+   * Hash of the @e payto_uri.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * KYC status of the operation.
+   */
+  struct TALER_EXCHANGEDB_KycStatus kyc;
+
+  /**
    * Base URL of the exchange provider hosting the reserve.
    */
   char *provider_url;
@@ -139,11 +149,14 @@ reply_merge_success (struct MHD_Connection *connection,
       TALER_amount_cmp (&pcc->balance,
                         &pcc->target_amount))
   {
+    GNUNET_break (0);
     return TALER_MHD_REPLY_JSON_PACK (
       connection,
-      MHD_HTTP_ACCEPTED,
+      MHD_HTTP_INTERNAL_SERVER_ERROR,
       TALER_JSON_pack_amount ("balance",
-                              &pcc->balance));
+                              &pcc->balance),
+      TALER_JSON_pack_amount ("target_amount",
+                              &pcc->target_amount));
   }
   if ( (NULL == pcc->provider_url) ||
        (0 == strcmp (pcc->provider_url,
@@ -154,14 +167,20 @@ reply_merge_success (struct MHD_Connection *connection,
   }
   else
   {
+#if WAD_NOT_IMPLEMENTED
+    /* FIXME: figure out partner, lookup wad fee by partner! #7271 */
     if (0 >
         TALER_amount_subtract (&merge_amount,
                                &pcc->target_amount,
-                               &pcc->wf->wad))
+                               &wad_fee))
     {
-      TALER_amount_set_zero (TEH_currency,
-                             &merge_amount);
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_amount_set_zero (TEH_currency,
+                                            &merge_amount));
     }
+#else
+    merge_amount = pcc->target_amount;
+#endif
   }
   if (TALER_EC_NONE !=
       (ec = TALER_exchange_online_purse_merged_sign (
@@ -198,6 +217,46 @@ reply_merge_success (struct MHD_Connection *connection,
 
 
 /**
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param cls a `struct PurseMergeContext`
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
+ */
+static void
+amount_iterator (void *cls,
+                 struct GNUNET_TIME_Absolute limit,
+                 TALER_EXCHANGEDB_KycAmountCallback cb,
+                 void *cb_cls)
+{
+  struct PurseMergeContext *pcc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  cb (cb_cls,
+      &pcc->target_amount,
+      GNUNET_TIME_absolute_get ());
+  qs = TEH_plugin->select_merge_amounts_for_kyc_check (
+    TEH_plugin->cls,
+    &pcc->h_payto,
+    limit,
+    cb,
+    cb_cls);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Got %d additional transactions for this merge and limit %llu\n",
+              qs,
+              (unsigned long long) limit.abs_value_us);
+  GNUNET_break (qs >= 0);
+}
+
+
+/**
  * Execute database transaction for /purses/$PID/merge.  Runs the transaction
  * logic; IF it returns a non-error code, the transaction logic MUST NOT queue
  * a MHD response.  IF it returns an hard error, the transaction logic MUST
@@ -220,23 +279,66 @@ merge_transaction (void *cls,
   bool in_conflict = true;
   bool no_balance = true;
   bool no_partner = true;
-
-  qs = TEH_plugin->do_purse_merge (TEH_plugin->cls,
-                                   pcc->purse_pub,
-                                   &pcc->merge_sig,
-                                   pcc->merge_timestamp,
-                                   &pcc->reserve_sig,
-                                   pcc->provider_url,
-                                   &pcc->reserve_pub,
-                                   &no_partner,
-                                   &no_balance,
-                                   &in_conflict);
+  char *required;
+
+  qs = TALER_KYCLOGIC_kyc_test_required (
+    TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE,
+    &pcc->h_payto,
+    TEH_plugin->select_satisfied_kyc_processes,
+    TEH_plugin->cls,
+    &amount_iterator,
+    pcc,
+    &required);
   if (qs < 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
       return qs;
-    TALER_LOG_WARNING (
-      "Failed to store merge purse information in database\n");
+    GNUNET_break (0);
+    *mhd_ret =
+      TALER_MHD_reply_with_error (connection,
+                                  MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                  TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                  "kyc_test_required");
+    return qs;
+  }
+  if (NULL != required)
+  {
+    pcc->kyc.ok = false;
+    qs = TEH_plugin->insert_kyc_requirement_for_account (
+      TEH_plugin->cls,
+      required,
+      &pcc->h_payto,
+      &pcc->reserve_pub,
+      &pcc->kyc.requirement_row);
+    GNUNET_free (required);
+    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+    {
+      GNUNET_break (0);
+      *mhd_ret
+        = TALER_MHD_reply_with_error (connection,
+                                      MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                      TALER_EC_GENERIC_DB_STORE_FAILED,
+                                      "insert_kyc_requirement_for_account");
+    }
+    return qs;
+  }
+  pcc->kyc.ok = true;
+  qs = TEH_plugin->do_purse_merge (
+    TEH_plugin->cls,
+    pcc->purse_pub,
+    &pcc->merge_sig,
+    pcc->merge_timestamp,
+    &pcc->reserve_sig,
+    pcc->provider_url,
+    &pcc->reserve_pub,
+    &no_partner,
+    &no_balance,
+    &in_conflict);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
     *mhd_ret =
       TALER_MHD_reply_with_error (connection,
                                   MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -248,7 +350,7 @@ merge_transaction (void *cls,
   {
     *mhd_ret =
       TALER_MHD_reply_with_error (connection,
-                                  MHD_HTTP_BAD_REQUEST,
+                                  MHD_HTTP_NOT_FOUND,
                                   TALER_EC_EXCHANGE_MERGE_PURSE_PARTNER_UNKNOWN,
                                   pcc->provider_url);
     return GNUNET_DB_STATUS_HARD_ERROR;
@@ -268,13 +370,15 @@ merge_transaction (void *cls,
     struct GNUNET_TIME_Timestamp merge_timestamp;
     char *partner_url = NULL;
     struct TALER_ReservePublicKeyP reserve_pub;
+    bool refunded;
 
     qs = TEH_plugin->select_purse_merge (TEH_plugin->cls,
                                          pcc->purse_pub,
                                          &merge_sig,
                                          &merge_timestamp,
                                          &partner_url,
-                                         &reserve_pub);
+                                         &reserve_pub,
+                                         &refunded);
     if (qs <= 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -288,21 +392,43 @@ merge_transaction (void *cls,
                                     "select purse merge");
       return qs;
     }
-    *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
-      connection,
-      MHD_HTTP_CONFLICT,
-      GNUNET_JSON_pack_timestamp ("merge_timestamp",
-                                  merge_timestamp),
-      GNUNET_JSON_pack_data_auto ("merge_sig",
-                                  &merge_sig),
-      GNUNET_JSON_pack_allow_null (
-        GNUNET_JSON_pack_string ("partner_base_url",
-                                 partner_url)),
-      GNUNET_JSON_pack_data_auto ("reserve_pub",
-                                  &reserve_pub));
+    if (refunded)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Purse was already refunded\n");
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_GONE,
+                                             TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
+                                             NULL);
+      GNUNET_free (partner_url);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (0 !=
+        GNUNET_memcmp (&merge_sig,
+                       &pcc->merge_sig))
+    {
+      *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
+        connection,
+        MHD_HTTP_CONFLICT,
+        GNUNET_JSON_pack_timestamp ("merge_timestamp",
+                                    merge_timestamp),
+        GNUNET_JSON_pack_data_auto ("merge_sig",
+                                    &merge_sig),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_string ("partner_url",
+                                   partner_url)),
+        GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                    &reserve_pub));
+      GNUNET_free (partner_url);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    /* idempotent! */
+    *mhd_ret = reply_merge_success (connection,
+                                    pcc);
     GNUNET_free (partner_url);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
+
   return qs;
 }
 
@@ -318,8 +444,8 @@ TEH_handler_purses_merge (
     .exchange_timestamp = GNUNET_TIME_timestamp_get ()
   };
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &pcc.payto_uri),
+    TALER_JSON_spec_payto_uri ("payto_uri",
+                               &pcc.payto_uri),
     GNUNET_JSON_spec_fixed_auto ("reserve_sig",
                                  &pcc.reserve_sig),
     GNUNET_JSON_spec_fixed_auto ("merge_sig",
@@ -351,15 +477,15 @@ TEH_handler_purses_merge (
   }
 
   /* Fetch purse details */
-  qs = TEH_plugin->select_purse_request (TEH_plugin->cls,
-                                         pcc.purse_pub,
-                                         &pcc.merge_pub,
-                                         &pcc.purse_expiration,
-                                         &pcc.h_contract_terms,
-                                         &pcc.min_age,
-                                         &pcc.target_amount,
-                                         &pcc.balance,
-                                         &purse_sig);
+  qs = TEH_plugin->get_purse_request (TEH_plugin->cls,
+                                      pcc.purse_pub,
+                                      &pcc.merge_pub,
+                                      &pcc.purse_expiration,
+                                      &pcc.h_contract_terms,
+                                      &pcc.min_age,
+                                      &pcc.target_amount,
+                                      &pcc.balance,
+                                      &purse_sig);
   switch (qs)
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
@@ -391,11 +517,11 @@ TEH_handler_purses_merge (
               "Received payto: `%s'\n",
               pcc.payto_uri);
   if ( (0 != strncmp (pcc.payto_uri,
-                      "payto://taler/",
-                      strlen ("payto://taler/"))) &&
+                      "payto://taler-reserve/",
+                      strlen ("payto://taler-reserve/"))) &&
        (0 != strncmp (pcc.payto_uri,
-                      "payto://taler+http/",
-                      strlen ("payto://taler+http/"))) )
+                      "payto://taler-reserve-http/",
+                      strlen ("payto://taler-reserve+http/"))) )
   {
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (
@@ -404,15 +530,14 @@ TEH_handler_purses_merge (
       TALER_EC_GENERIC_PARAMETER_MALFORMED,
       "payto_uri");
   }
-
   http = (0 == strncmp (pcc.payto_uri,
-                        "payto://taler+http/",
-                        strlen ("payto://taler+http/")));
+                        "payto://taler-reserve-http/",
+                        strlen ("payto://taler-reserve-http/")));
 
   {
     const char *host = &pcc.payto_uri[http
-                                      ? strlen ("payto://taler+http/")
-                                      : strlen ("payto://taler/")];
+                                      ? strlen ("payto://taler-reserve-http/")
+                                      : strlen ("payto://taler-reserve/")];
     const char *slash = strchr (host,
                                 '/');
 
@@ -447,6 +572,8 @@ TEH_handler_purses_merge (
     }
     slash++;
   }
+  TALER_payto_hash (pcc.payto_uri,
+                    &pcc.h_payto);
   if (0 == strcmp (pcc.provider_url,
                    TEH_base_url))
   {
@@ -455,9 +582,9 @@ TEH_handler_purses_merge (
   }
   else
   {
-    char *method = GNUNET_strdup ("FIXME-WAD");
+    char *method = GNUNET_strdup ("FIXME-WAD #7271");
 
-    /* FIXME: lookup wire method by pcc.provider_url! */
+    /* FIXME-#7271: lookup wire method by pcc.provider_url! */
     pcc.wf = TEH_wire_fees_by_time (pcc.exchange_timestamp,
                                     method);
     if (NULL == pcc.wf)
@@ -488,15 +615,16 @@ TEH_handler_purses_merge (
     GNUNET_free (pcc.provider_url);
     return TALER_MHD_reply_with_error (
       connection,
-      MHD_HTTP_BAD_REQUEST,
+      MHD_HTTP_FORBIDDEN,
       TALER_EC_EXCHANGE_PURSE_MERGE_INVALID_MERGE_SIGNATURE,
       NULL);
   }
   {
     struct TALER_Amount zero_purse_fee;
 
-    TALER_amount_set_zero (pcc.target_amount.currency,
-                           &zero_purse_fee);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (pcc.target_amount.currency,
+                                          &zero_purse_fee));
     if (GNUNET_OK !=
         TALER_wallet_account_merge_verify (
           pcc.merge_timestamp,
@@ -514,7 +642,7 @@ TEH_handler_purses_merge (
       GNUNET_free (pcc.provider_url);
       return TALER_MHD_reply_with_error (
         connection,
-        MHD_HTTP_BAD_REQUEST,
+        MHD_HTTP_FORBIDDEN,
         TALER_EC_EXCHANGE_PURSE_MERGE_INVALID_RESERVE_SIGNATURE,
         NULL);
     }
@@ -537,6 +665,13 @@ TEH_handler_purses_merge (
     }
   }
 
+
+  GNUNET_free (pcc.provider_url);
+  if (! pcc.kyc.ok)
+    return TEH_RESPONSE_reply_kyc_required (connection,
+                                            &pcc.h_payto,
+                                            &pcc.kyc);
+
   {
     struct TALER_PurseEventP rep = {
       .header.size = htons (sizeof (rep)),
@@ -552,7 +687,6 @@ TEH_handler_purses_merge (
                               0);
   }
 
-  GNUNET_free (pcc.provider_url);
   /* generate regular response */
   return reply_merge_success (connection,
                               &pcc);
diff --git a/src/exchange/taler-exchange-httpd_recoup-refresh.c b/src/exchange/taler-exchange-httpd_recoup-refresh.c
index a00eeba4e..a5d5b2ab4 100644
--- a/src/exchange/taler-exchange-httpd_recoup-refresh.c
+++ b/src/exchange/taler-exchange-httpd_recoup-refresh.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2021 Taler Systems SA
+  Copyright (C) 2017-2023 Taler Systems SA
 
   TALER 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
@@ -55,7 +55,7 @@ struct RecoupContext
   /**
    * Key used to blind the coin.
    */
-  const union TALER_DenominationBlindingKeyP *coin_bks;
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks;
 
   /**
    * Signature of the coin requesting recoup.
@@ -146,6 +146,7 @@ recoup_refresh_transaction (void *cls,
     *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
       connection,
       TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+      &pc->coin->denom_pub_hash,
       &pc->coin->coin_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
@@ -165,6 +166,7 @@ recoup_refresh_transaction (void *cls,
  * @param exchange_vals values contributed by the exchange
  *         during refresh
  * @param coin_bks blinding data of the coin (to be checked)
+ * @param nonce withdraw nonce (if CS is used)
  * @param coin_sig signature of the coin
  * @return MHD result code
  */
@@ -173,8 +175,8 @@ verify_and_execute_recoup_refresh (
   struct MHD_Connection *connection,
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_ExchangeWithdrawValues *exchange_vals,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
-  const struct TALER_CsNonce *nonce,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
   struct RecoupContext pc;
@@ -217,12 +219,12 @@ verify_and_execute_recoup_refresh (
   }
 
   /* check denomination signature */
-  switch (dk->denom_pub.cipher)
+  switch (dk->denom_pub.bsign_pub_key->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
     break;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
     break;
   default:
@@ -263,6 +265,7 @@ verify_and_execute_recoup_refresh (
     if (GNUNET_OK !=
         TALER_denom_blind (&dk->denom_pub,
                            coin_bks,
+                           nonce,
                            &coin->h_age_commitment,
                            &coin->coin_pub,
                            exchange_vals,
@@ -276,9 +279,6 @@ verify_and_execute_recoup_refresh (
         TALER_EC_EXCHANGE_RECOUP_REFRESH_BLINDING_FAILED,
         NULL);
     }
-    if (TALER_DENOMINATION_CS == blinded_planchet.cipher)
-      blinded_planchet.details.cs_blinded_planchet.nonce
-        = *nonce;
     TALER_coin_ev_hash (&blinded_planchet,
                         &coin->denom_pub_hash,
                         &h_blind);
@@ -373,10 +373,11 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
 {
   enum GNUNET_GenericReturnValue ret;
   struct TALER_CoinPublicInfo coin = {0};
-  union TALER_DenominationBlindingKeyP coin_bks;
+  union GNUNET_CRYPTO_BlindingSecretP coin_bks;
   struct TALER_CoinSpendSignatureP coin_sig;
   struct TALER_ExchangeWithdrawValues exchange_vals;
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
+  bool no_nonce;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
                                  &coin.denom_pub_hash),
@@ -392,19 +393,17 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
       GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
                                    &coin.h_age_commitment),
       &coin.no_age_commitment),
+    // FIXME: rename to just 'nonce'
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_fixed_auto ("cs_nonce",
                                    &nonce),
-      NULL),
+      &no_nonce),
     GNUNET_JSON_spec_end ()
   };
 
   memset (&coin,
           0,
           sizeof (coin));
-  memset (&nonce,
-          0,
-          sizeof (nonce));
   coin.coin_pub = *coin_pub;
   ret = TALER_MHD_parse_json_data (connection,
                                    root,
@@ -420,7 +419,9 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
                                              &coin,
                                              &exchange_vals,
                                              &coin_bks,
-                                             &nonce,
+                                             no_nonce
+                                             ? NULL
+                                             : &nonce,
                                              &coin_sig);
     GNUNET_JSON_parse_free (spec);
     return res;
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c
index 6bda8af9e..afbbd7474 100644
--- a/src/exchange/taler-exchange-httpd_recoup.c
+++ b/src/exchange/taler-exchange-httpd_recoup.c
@@ -58,7 +58,7 @@ struct RecoupContext
   /**
    * Key used to blind the coin.
    */
-  const union TALER_DenominationBlindingKeyP *coin_bks;
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks;
 
   /**
    * Signature of the coin requesting recoup.
@@ -149,6 +149,7 @@ recoup_transaction (void *cls,
     *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
       connection,
       TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+      &pc->coin->denom_pub_hash,
       &pc->coin->coin_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
@@ -168,6 +169,7 @@ recoup_transaction (void *cls,
  * @param exchange_vals values contributed by the exchange
  *         during withdrawal
  * @param coin_bks blinding data of the coin (to be checked)
+ * @param nonce coin's nonce if CS is used
  * @param coin_sig signature of the coin
  * @return MHD result code
  */
@@ -176,8 +178,8 @@ verify_and_execute_recoup (
   struct MHD_Connection *connection,
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_ExchangeWithdrawValues *exchange_vals,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
-  const struct TALER_CsNonce *nonce,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
   struct RecoupContext pc;
@@ -219,12 +221,12 @@ verify_and_execute_recoup (
   }
 
   /* check denomination signature */
-  switch (dk->denom_pub.cipher)
+  switch (dk->denom_pub.bsign_pub_key->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
     break;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
     break;
   default:
@@ -268,6 +270,7 @@ verify_and_execute_recoup (
     if (GNUNET_OK !=
         TALER_denom_blind (&dk->denom_pub,
                            coin_bks,
+                           nonce,
                            &coin->h_age_commitment,
                            &coin->coin_pub,
                            exchange_vals,
@@ -281,20 +284,9 @@ verify_and_execute_recoup (
         TALER_EC_EXCHANGE_RECOUP_BLINDING_FAILED,
         NULL);
     }
-    if (TALER_DENOMINATION_CS == blinded_planchet.cipher)
-      blinded_planchet.details.cs_blinded_planchet.nonce
-        = *nonce;
-    if (GNUNET_OK !=
-        TALER_coin_ev_hash (&blinded_planchet,
-                            &coin->denom_pub_hash,
-                            &pc.h_coin_ev))
-    {
-      GNUNET_break (0);
-      return TALER_MHD_reply_with_error (connection,
-                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
-                                         NULL);
-    }
+    TALER_coin_ev_hash (&blinded_planchet,
+                        &coin->denom_pub_hash,
+                        &pc.h_coin_ev);
     TALER_blinded_planchet_free (&blinded_planchet);
   }
 
@@ -386,10 +378,11 @@ TEH_handler_recoup (struct MHD_Connection *connection,
 {
   enum GNUNET_GenericReturnValue ret;
   struct TALER_CoinPublicInfo coin;
-  union TALER_DenominationBlindingKeyP coin_bks;
+  union GNUNET_CRYPTO_BlindingSecretP coin_bks;
   struct TALER_CoinSpendSignatureP coin_sig;
   struct TALER_ExchangeWithdrawValues exchange_vals;
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
+  bool no_nonce;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
                                  &coin.denom_pub_hash),
@@ -405,19 +398,17 @@ TEH_handler_recoup (struct MHD_Connection *connection,
       GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
                                    &coin.h_age_commitment),
       &coin.no_age_commitment),
+    // FIXME: should be renamed to just 'nonce'!
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_fixed_auto ("cs_nonce",
                                    &nonce),
-      NULL),
+      &no_nonce),
     GNUNET_JSON_spec_end ()
   };
 
   memset (&coin,
           0,
           sizeof (coin));
-  memset (&nonce,
-          0,
-          sizeof (nonce));
   coin.coin_pub = *coin_pub;
   ret = TALER_MHD_parse_json_data (connection,
                                    root,
@@ -433,7 +424,9 @@ TEH_handler_recoup (struct MHD_Connection *connection,
                                      &coin,
                                      &exchange_vals,
                                      &coin_bks,
-                                     &nonce,
+                                     no_nonce
+                                     ? NULL
+                                     : &nonce,
                                      &coin_sig);
     GNUNET_JSON_parse_free (spec);
     return res;
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index bbccd5688..5630051cf 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -111,9 +111,6 @@ struct RevealContext
   /**
    * Array of information about fresh coins being revealed.
    */
-  /* FIXME: const would be nicer here, but we initalize
-     the 'alg_values' in the verification
-     routine; suboptimal to be fixed... */
   struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs;
 
   /**
@@ -159,14 +156,17 @@ check_commitment (struct RevealContext *rctx,
                   struct MHD_Connection *connection,
                   MHD_RESULT *mhd_ret)
 {
-  struct TALER_CsNonce nonces[rctx->num_fresh_coins];
-  unsigned int aoff = 0;
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonces[rctx->num_fresh_coins];
 
+  memset (nonces,
+          0,
+          sizeof (nonces));
   for (unsigned int j = 0; j<rctx->num_fresh_coins; j++)
   {
     const struct TALER_DenominationPublicKey *dk = &rctx->dks[j]->denom_pub;
 
-    if (dk->cipher != rctx->rcds[j].blinded_planchet.cipher)
+    if (dk->bsign_pub_key->cipher !=
+        rctx->rcds[j].blinded_planchet.blinded_message->cipher)
     {
       GNUNET_break (0);
       *mhd_ret = TALER_MHD_reply_with_error (
@@ -176,9 +176,9 @@ check_commitment (struct RevealContext *rctx,
         NULL);
       return GNUNET_SYSERR;
     }
-    switch (dk->cipher)
+    switch (dk->bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_INVALID:
+    case GNUNET_CRYPTO_BSA_INVALID:
       GNUNET_break (0);
       *mhd_ret = TALER_MHD_reply_with_error (
         connection,
@@ -186,40 +186,48 @@ check_commitment (struct RevealContext *rctx,
         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
         NULL);
       return GNUNET_SYSERR;
-    case TALER_DENOMINATION_RSA:
+    case GNUNET_CRYPTO_BSA_RSA:
       continue;
-    case TALER_DENOMINATION_CS:
-      nonces[aoff]
-        = rctx->rcds[j].blinded_planchet.details.cs_blinded_planchet.nonce;
-      aoff++;
+    case GNUNET_CRYPTO_BSA_CS:
+      nonces[j]
+        = (const union GNUNET_CRYPTO_BlindSessionNonce *)
+          &rctx->rcds[j].blinded_planchet.blinded_message->details.
+          cs_blinded_message.nonce;
       break;
     }
   }
 
   // OPTIMIZE: do this in batch later!
-  aoff = 0;
   for (unsigned int j = 0; j<rctx->num_fresh_coins; j++)
   {
     const struct TALER_DenominationPublicKey *dk = &rctx->dks[j]->denom_pub;
     struct TALER_ExchangeWithdrawValues *alg_values
       = &rctx->rrcs[j].exchange_vals;
+    struct GNUNET_CRYPTO_BlindingInputValues *bi;
 
-    alg_values->cipher = dk->cipher;
-    switch (dk->cipher)
+    bi = GNUNET_new (struct GNUNET_CRYPTO_BlindingInputValues);
+    alg_values->blinding_inputs = bi;
+    bi->rc = 1;
+    bi->cipher = dk->bsign_pub_key->cipher;
+    switch (dk->bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_INVALID:
+    case GNUNET_CRYPTO_BSA_INVALID:
       GNUNET_assert (0);
       return GNUNET_SYSERR;
-    case TALER_DENOMINATION_RSA:
+    case GNUNET_CRYPTO_BSA_RSA:
       continue;
-    case TALER_DENOMINATION_CS:
+    case GNUNET_CRYPTO_BSA_CS:
       {
         enum TALER_ErrorCode ec;
-
-        ec = TEH_keys_denomination_cs_r_pub_melt (
-          &rctx->rrcs[j].h_denom_pub,
-          &nonces[aoff],
-          &alg_values->details.cs_values);
+        const struct TEH_CsDeriveData cdd = {
+          .h_denom_pub = &rctx->rrcs[j].h_denom_pub,
+          .nonce = &nonces[j]->cs_nonce
+        };
+
+        ec = TEH_keys_denomination_cs_r_pub (
+          &cdd,
+          true,
+          &bi->details.cs_values);
         if (TALER_EC_NONE != ec)
         {
           *mhd_ret = TALER_MHD_reply_with_error (connection,
@@ -228,7 +236,6 @@ check_commitment (struct RevealContext *rctx,
                                                  NULL);
           return GNUNET_SYSERR;
         }
-        aoff++;
       }
     }
   }
@@ -259,6 +266,8 @@ check_commitment (struct RevealContext *rctx,
         const struct TALER_TransferPrivateKeyP *tpriv
           = &rctx->transfer_privs[i - off];
         struct TALER_TransferSecretP ts;
+        struct TALER_AgeCommitmentHash h = {0};
+        struct TALER_AgeCommitmentHash *hac = NULL;
 
         GNUNET_CRYPTO_ecdhe_key_get_public (&tpriv->ecdhe_priv,
                                             &rce->transfer_pub.ecdhe_pub);
@@ -268,18 +277,14 @@ check_commitment (struct RevealContext *rctx,
                                            &ts);
         rce->new_coins = GNUNET_new_array (rctx->num_fresh_coins,
                                            struct TALER_RefreshCoinData);
-        aoff = 0;
         for (unsigned int j = 0; j<rctx->num_fresh_coins; j++)
         {
-          const struct TALER_DenominationPublicKey *dk
-            = &rctx->dks[j]->denom_pub;
           struct TALER_RefreshCoinData *rcd = &rce->new_coins[j];
           struct TALER_CoinSpendPrivateKeyP coin_priv;
-          union TALER_DenominationBlindingKeyP bks;
+          union GNUNET_CRYPTO_BlindingSecretP bks;
           const struct TALER_ExchangeWithdrawValues *alg_value
             = &rctx->rrcs[j].exchange_vals;
           struct TALER_PlanchetDetail pd = {0};
-          struct TALER_AgeCommitmentHash *hac = NULL;
           struct TALER_CoinPubHashP c_hash;
           struct TALER_PlanchetMasterSecretP ps;
 
@@ -303,15 +308,15 @@ check_commitment (struct RevealContext *rctx,
               .commitment = *(rctx->old_age_commitment)
             };
             struct TALER_AgeCommitmentProof nacp = {0};
-            struct TALER_AgeCommitmentHash h = {0};
 
             GNUNET_assert (GNUNET_OK ==
                            TALER_age_commitment_derive (
                              &acp,
                              &ts.key,
                              &nacp));
-
-            TALER_age_commitment_hash (&nacp.commitment, &h);
+            TALER_age_commitment_hash (&nacp.commitment,
+                                       &h);
+            TALER_age_commitment_proof_free (&nacp);
             hac = &h;
           }
 
@@ -319,16 +324,11 @@ check_commitment (struct RevealContext *rctx,
                          TALER_planchet_prepare (rcd->dk,
                                                  alg_value,
                                                  &bks,
+                                                 nonces[j],
                                                  &coin_priv,
                                                  hac,
                                                  &c_hash,
                                                  &pd));
-          if (TALER_DENOMINATION_CS == dk->cipher)
-          {
-            pd.blinded_planchet.details.cs_blinded_planchet.nonce =
-              nonces[aoff];
-            aoff++;
-          }
           rcd->blinded_planchet = pd.blinded_planchet;
         }
       }
@@ -428,12 +428,13 @@ check_commitment (struct RevealContext *rctx,
  * @return MHD result code
  */
 static MHD_RESULT
-resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
-                                        struct RevealContext *rctx,
-                                        const json_t *link_sigs_json,
-                                        const json_t *new_denoms_h_json,
-                                        const json_t *old_age_commitment_json,
-                                        const json_t *coin_evs)
+resolve_refreshes_reveal_denominations (
+  struct MHD_Connection *connection,
+  struct RevealContext *rctx,
+  const json_t *link_sigs_json,
+  const json_t *new_denoms_h_json,
+  const json_t *old_age_commitment_json,
+  const json_t *coin_evs)
 {
   unsigned int num_fresh_coins = json_array_size (new_denoms_h_json);
   /* We know num_fresh_coins is bounded by #TALER_MAX_FRESH_COINS, so this is safe */
@@ -506,6 +507,13 @@ resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
     }
   }
 
+  old_dk = TEH_keys_denomination_by_hash_from_state (
+    ksh,
+    &rctx->melt.session.coin.denom_pub_hash,
+    connection,
+    &ret);
+  if (NULL == old_dk)
+    return ret;
 
   /* Parse denomination key hashes */
   for (unsigned int i = 0; i<num_fresh_coins; i++)
@@ -524,20 +532,14 @@ resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
                                       -1);
     if (GNUNET_OK != res)
       return (GNUNET_NO == res) ? MHD_YES : MHD_NO;
-    dks[i] = TEH_keys_denomination_by_hash2 (ksh,
-                                             &rrcs[i].h_denom_pub,
-                                             connection,
-                                             &ret);
+    dks[i] = TEH_keys_denomination_by_hash_from_state (ksh,
+                                                       &rrcs[i].h_denom_pub,
+                                                       connection,
+                                                       &ret);
     if (NULL == dks[i])
       return ret;
-    old_dk = TEH_keys_denomination_by_hash2 (ksh,
-                                             &rctx->melt.session.coin.
-                                             denom_pub_hash,
-                                             connection,
-                                             &ret);
-    if (NULL == old_dk)
-      return ret;
-    if ( (TALER_DENOMINATION_CS == dks[i]->denom_pub.cipher) &&
+    if ( (GNUNET_CRYPTO_BSA_CS ==
+          dks[i]->denom_pub.bsign_pub_key->cipher) &&
          (rctx->no_rms) )
     {
       return TALER_MHD_reply_with_error (
@@ -622,8 +624,7 @@ resolve_refreshes_reveal_denominations (struct MHD_Connection *connection,
     bool failed = true;
 
     /* Has been checked in handle_refreshes_reveal_json() */
-    GNUNET_assert (ng ==
-                   TALER_extensions_age_restriction_num_groups ());
+    GNUNET_assert (ng == TEH_age_restriction_config.num_groups);
 
     rctx->old_age_commitment = GNUNET_new (struct TALER_AgeCommitment);
     oac = rctx->old_age_commitment;
@@ -720,7 +721,8 @@ clean_age:
 
     rcd->blinded_planchet = rrc->blinded_planchet;
     rcd->dk = &dks[i]->denom_pub;
-    if (rcd->blinded_planchet.cipher != rcd->dk->cipher)
+    if (rcd->blinded_planchet.blinded_message->cipher !=
+        rcd->dk->bsign_pub_key->cipher)
     {
       GNUNET_break_op (0);
       ret = TALER_MHD_REPLY_JSON_PACK (
@@ -746,16 +748,21 @@ clean_age:
               (unsigned int) rctx->num_fresh_coins);
 
   /* create fresh coin signatures */
-  for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
   {
+    struct TEH_CoinSignData csds[rctx->num_fresh_coins];
+    struct TALER_BlindedDenominationSignature bss[rctx->num_fresh_coins];
     enum TALER_ErrorCode ec;
 
-    // FIXME: replace with a batch call that
-    // passes all coins in once go!
-    ec = TEH_keys_denomination_sign_melt (
-      &rrcs[i].h_denom_pub,
-      &rcds[i].blinded_planchet,
-      &rrcs[i].coin_sig);
+    for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
+    {
+      csds[i].h_denom_pub = &rrcs[i].h_denom_pub;
+      csds[i].bp = &rcds[i].blinded_planchet;
+    }
+    ec = TEH_keys_denomination_batch_sign (
+      rctx->num_fresh_coins,
+      csds,
+      true,
+      bss);
     if (TALER_EC_NONE != ec)
     {
       GNUNET_break (0);
@@ -764,13 +771,21 @@ clean_age:
                                      NULL);
       goto cleanup;
     }
-  }
 
+    for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
+    {
+      rrcs[i].coin_sig = bss[i];
+      rrcs[i].blinded_planchet = rcds[i].blinded_planchet;
+    }
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Signatures ready, starting DB interaction\n");
 
+
   for (unsigned int r = 0; r<MAX_TRANSACTION_COMMIT_RETRIES; r++)
   {
+    bool changed;
+
     /* Persist operation result in DB */
     if (GNUNET_OK !=
         TEH_plugin->start (TEH_plugin->cls,
@@ -783,19 +798,15 @@ clean_age:
                                         NULL);
       goto cleanup;
     }
-    for (unsigned int i = 0; i<rctx->num_fresh_coins; i++)
-    {
-      struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &rrcs[i];
 
-      rrc->blinded_planchet = rcds[i].blinded_planchet;
-    }
-    qs = TEH_plugin->insert_refresh_reveal (TEH_plugin->cls,
-                                            melt_serial_id,
-                                            num_fresh_coins,
-                                            rrcs,
-                                            TALER_CNC_KAPPA - 1,
-                                            rctx->transfer_privs,
-                                            &rctx->gamma_tp);
+    qs = TEH_plugin->insert_refresh_reveal (
+      TEH_plugin->cls,
+      melt_serial_id,
+      num_fresh_coins,
+      rrcs,
+      TALER_CNC_KAPPA - 1,
+      rctx->transfer_privs,
+      &rctx->gamma_tp);
     if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
     {
       TEH_plugin->rollback (TEH_plugin->cls);
@@ -812,9 +823,14 @@ clean_age:
                                         "insert_refresh_reveal");
       goto cleanup;
     }
+    changed = (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs);
     qs = TEH_plugin->commit (TEH_plugin->cls);
     if (qs >= 0)
+    {
+      if (changed)
+        TEH_METRICS_num_success[TEH_MT_SUCCESS_REFRESH_REVEAL]++;
       break;   /* success */
+    }
     if (GNUNET_DB_STATUS_HARD_ERROR == qs)
     {
       GNUNET_break (0);
@@ -847,7 +863,10 @@ cleanup:
   for (unsigned int i = 0; i<num_fresh_coins; i++)
   {
     struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &rrcs[i];
+    struct TALER_ExchangeWithdrawValues *alg_values
+      = &rrcs[i].exchange_vals;
 
+    GNUNET_free (alg_values->blinding_inputs);
     TALER_blinded_denom_sig_free (&rrc->coin_sig);
     TALER_blinded_planchet_free (&rrc->blinded_planchet);
   }
@@ -922,7 +941,7 @@ handle_refreshes_reveal_json (struct MHD_Connection *connection,
   /* Sanity check of age commitment: If it was provided, it _must_ be an array
    * of the size the # of age groups */
   if (NULL != old_age_commitment_json
-      && TALER_extensions_age_restriction_num_groups () !=
+      && TEH_age_restriction_config.num_groups !=
       json_array_size (old_age_commitment_json))
   {
     GNUNET_break_op (0);
@@ -965,26 +984,26 @@ TEH_handler_reveal (struct TEH_RequestContext *rc,
                     const json_t *root,
                     const char *const args[2])
 {
-  json_t *coin_evs;
-  json_t *transfer_privs;
-  json_t *link_sigs;
-  json_t *new_denoms_h;
-  json_t *old_age_commitment;
+  const json_t *coin_evs;
+  const json_t *transfer_privs;
+  const json_t *link_sigs;
+  const json_t *new_denoms_h;
+  const json_t *old_age_commitment;
   struct RevealContext rctx;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("transfer_pub",
                                  &rctx.gamma_tp),
-    GNUNET_JSON_spec_json ("transfer_privs",
-                           &transfer_privs),
-    GNUNET_JSON_spec_json ("link_sigs",
-                           &link_sigs),
-    GNUNET_JSON_spec_json ("coin_evs",
-                           &coin_evs),
-    GNUNET_JSON_spec_json ("new_denoms_h",
-                           &new_denoms_h),
+    GNUNET_JSON_spec_array_const ("transfer_privs",
+                                  &transfer_privs),
+    GNUNET_JSON_spec_array_const ("link_sigs",
+                                  &link_sigs),
+    GNUNET_JSON_spec_array_const ("coin_evs",
+                                  &coin_evs),
+    GNUNET_JSON_spec_array_const ("new_denoms_h",
+                                  &new_denoms_h),
     GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_json ("old_age_commitment",
-                             &old_age_commitment),
+      GNUNET_JSON_spec_array_const ("old_age_commitment",
+                                    &old_age_commitment),
       NULL),
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_fixed_auto ("rms",
@@ -1035,7 +1054,6 @@ TEH_handler_reveal (struct TEH_RequestContext *rc,
   /* Note we do +1 as 1 row (cut-and-choose!) is missing! */
   if (TALER_CNC_KAPPA != json_array_size (transfer_privs) + 1)
   {
-    GNUNET_JSON_parse_free (spec);
     GNUNET_break_op (0);
     return TALER_MHD_reply_with_error (rc->connection,
                                        MHD_HTTP_BAD_REQUEST,
@@ -1043,19 +1061,13 @@ TEH_handler_reveal (struct TEH_RequestContext *rc,
                                        NULL);
   }
 
-  {
-    MHD_RESULT res;
-
-    res = handle_refreshes_reveal_json (rc->connection,
-                                        &rctx,
-                                        transfer_privs,
-                                        link_sigs,
-                                        new_denoms_h,
-                                        old_age_commitment,
-                                        coin_evs);
-    GNUNET_JSON_parse_free (spec);
-    return res;
-  }
+  return handle_refreshes_reveal_json (rc->connection,
+                                       &rctx,
+                                       transfer_privs,
+                                       link_sigs,
+                                       new_denoms_h,
+                                       old_age_commitment,
+                                       coin_evs);
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c
index 3718fdedf..b8bcf7c60 100644
--- a/src/exchange/taler-exchange-httpd_refund.c
+++ b/src/exchange/taler-exchange-httpd_refund.c
@@ -158,10 +158,11 @@ refund_transaction (void *cls,
   }
   if (conflict)
   {
-    TEH_plugin->rollback (TEH_plugin->cls);
+    GNUNET_break_op (0);
     *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
       connection,
       TALER_EC_EXCHANGE_REFUND_INCONSISTENT_AMOUNT,
+      &refund->coin.denom_pub_hash,
       &refund->coin.coin_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
@@ -175,10 +176,10 @@ refund_transaction (void *cls,
   }
   if (! refund_ok)
   {
-    TEH_plugin->rollback (TEH_plugin->cls);
     *mhd_ret = TEH_RESPONSE_reply_coin_insufficient_funds (
       connection,
       TALER_EC_EXCHANGE_REFUND_CONFLICT_DEPOSIT_INSUFFICIENT,
+      &refund->coin.denom_pub_hash,
       &refund->coin.coin_pub);
     return GNUNET_DB_STATUS_HARD_ERROR;
   }
@@ -200,7 +201,6 @@ static MHD_RESULT
 verify_and_execute_refund (struct MHD_Connection *connection,
                            struct TALER_EXCHANGEDB_Refund *refund)
 {
-  struct TALER_DenominationHashP denom_hash;
   struct RefundContext rctx = {
     .refund = refund
   };
@@ -228,15 +228,16 @@ verify_and_execute_refund (struct MHD_Connection *connection,
     qs = TEH_plugin->get_coin_denomination (TEH_plugin->cls,
                                             &refund->coin.coin_pub,
                                             &rctx.known_coin_id,
-                                            &denom_hash);
+                                            &refund->coin.denom_pub_hash);
     if (0 > qs)
     {
       MHD_RESULT res;
       char *dhs;
 
       GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
-      dhs = GNUNET_STRINGS_data_to_string_alloc (&denom_hash,
-                                                 sizeof (denom_hash));
+      dhs = GNUNET_STRINGS_data_to_string_alloc (
+        &refund->coin.denom_pub_hash,
+        sizeof (refund->coin.denom_pub_hash));
       res = TALER_MHD_reply_with_error (connection,
                                         MHD_HTTP_NOT_FOUND,
                                         TALER_EC_EXCHANGE_REFUND_COIN_NOT_FOUND,
@@ -251,7 +252,7 @@ verify_and_execute_refund (struct MHD_Connection *connection,
     struct TEH_DenominationKey *dk;
     MHD_RESULT mret;
 
-    dk = TEH_keys_denomination_by_hash (&denom_hash,
+    dk = TEH_keys_denomination_by_hash (&refund->coin.denom_pub_hash,
                                         connection,
                                         &mret);
     if (NULL == dk)
diff --git a/src/exchange/taler-exchange-httpd_reserves_attest.c b/src/exchange/taler-exchange-httpd_reserves_attest.c
new file mode 100644
index 000000000..7bbebaad7
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_attest.c
@@ -0,0 +1,385 @@
+/*
+  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 Affero 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_attest.c
+ * @brief Handle /reserves/$RESERVE_PUB/attest requests
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include "taler_dbevents.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_reserves_attest.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * How far do we allow a client's time to be off when
+ * checking the request timestamp?
+ */
+#define TIMESTAMP_TOLERANCE \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
+/**
+ * Closure for #reserve_attest_transaction.
+ */
+struct ReserveAttestContext
+{
+  /**
+   * Public key of the reserve the inquiry is about.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Hash of the payto URI of this reserve.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Timestamp of the request.
+   */
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  /**
+   * Expiration time for the attestation.
+   */
+  struct GNUNET_TIME_Timestamp etime;
+
+  /**
+   * List of requested details.
+   */
+  const json_t *details;
+
+  /**
+   * Client signature approving the request.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Attributes we are affirming. JSON object.
+   */
+  json_t *json_attest;
+
+  /**
+   * Database error codes encountered.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+
+  /**
+   * Set to true if we did not find the reserve.
+   */
+  bool not_found;
+
+};
+
+
+/**
+ * Send reserve attest to client.
+ *
+ * @param connection connection to the client
+ * @param rhc reserve attest to return
+ * @return MHD result code
+ */
+static MHD_RESULT
+reply_reserve_attest_success (struct MHD_Connection *connection,
+                              const struct ReserveAttestContext *rhc)
+{
+  struct TALER_ExchangeSignatureP exchange_sig;
+  struct TALER_ExchangePublicKeyP exchange_pub;
+  enum TALER_ErrorCode ec;
+  struct GNUNET_TIME_Timestamp now;
+
+  if (NULL == rhc->json_attest)
+  {
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                       TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
+                                       NULL);
+  }
+  now = GNUNET_TIME_timestamp_get ();
+  ec = TALER_exchange_online_reserve_attest_details_sign (
+    &TEH_keys_exchange_sign_,
+    now,
+    rhc->etime,
+    &rhc->reserve_pub,
+    rhc->json_attest,
+    &exchange_pub,
+    &exchange_sig);
+  if (TALER_EC_NONE != ec)
+  {
+    GNUNET_break (0);
+    return TALER_MHD_reply_with_ec (connection,
+                                    ec,
+                                    NULL);
+  }
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                &exchange_sig),
+    GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                &exchange_pub),
+    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
+                                now),
+    GNUNET_JSON_pack_timestamp ("expiration_time",
+                                rhc->etime),
+    GNUNET_JSON_pack_object_steal ("attributes",
+                                   rhc->json_attest));
+}
+
+
+/**
+ * Function called with information about all applicable
+ * legitimization processes for the given user.  Finds the
+ * available attributes and merges them into our result
+ * set based on the details requested by the client.
+ *
+ * @param cls our `struct ReserveAttestContext *`
+ * @param h_payto account for which the attribute data is stored
+ * @param provider_section provider that must be checked
+ * @param collection_time when was the data collected
+ * @param expiration_time when does the data expire
+ * @param enc_attributes_size number of bytes in @a enc_attributes
+ * @param enc_attributes encrypted attribute data
+ */
+static void
+kyc_process_cb (void *cls,
+                const struct TALER_PaytoHashP *h_payto,
+                const char *provider_section,
+                struct GNUNET_TIME_Timestamp collection_time,
+                struct GNUNET_TIME_Timestamp expiration_time,
+                size_t enc_attributes_size,
+                const void *enc_attributes)
+{
+  struct ReserveAttestContext *rsc = cls;
+  json_t *attrs;
+  json_t *val;
+  const char *name;
+  bool match = false;
+
+  if (GNUNET_TIME_absolute_is_past (expiration_time.abs_time))
+    return;
+  attrs = TALER_CRYPTO_kyc_attributes_decrypt (&TEH_attribute_key,
+                                               enc_attributes,
+                                               enc_attributes_size);
+  json_object_foreach (attrs, name, val)
+  {
+    bool requested = false;
+    size_t idx;
+    json_t *str;
+
+    if (NULL != json_object_get (rsc->json_attest,
+                                 name))
+      continue;   /* duplicate */
+    json_array_foreach (rsc->details, idx, str)
+    {
+      if (0 == strcmp (json_string_value (str),
+                       name))
+      {
+        requested = true;
+        break;
+      }
+    }
+    if (! requested)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Skipping attribute `%s': not requested\n",
+                  name);
+      continue;
+    }
+    match = true;
+    GNUNET_assert (0 ==
+                   json_object_set (rsc->json_attest,   /* NOT set_new! */
+                                    name,
+                                    val));
+  }
+  json_decref (attrs);
+  if (! match)
+    return;
+  rsc->etime = GNUNET_TIME_timestamp_min (expiration_time,
+                                          rsc->etime);
+}
+
+
+/**
+ * Function implementing /reserves/$RID/attest transaction.  Given the public
+ * key of a reserve, return the associated transaction attest.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction logic
+ * MUST NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
+ * returns the soft error code, the function MAY be called again to retry and
+ * MUST not queue a MHD response.
+ *
+ * @param cls a `struct ReserveAttestContext *`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!); unused
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+reserve_attest_transaction (void *cls,
+                            struct MHD_Connection *connection,
+                            MHD_RESULT *mhd_ret)
+{
+  struct ReserveAttestContext *rsc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  rsc->json_attest = json_object ();
+  GNUNET_assert (NULL != rsc->json_attest);
+  qs = TEH_plugin->select_kyc_attributes (TEH_plugin->cls,
+                                          &rsc->h_payto,
+                                          &kyc_process_cb,
+                                          rsc);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                    "select_kyc_attributes");
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    rsc->not_found = true;
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    rsc->not_found = false;
+    break;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_reserves_attest (struct TEH_RequestContext *rc,
+                             const json_t *root,
+                             const char *const args[1])
+{
+  struct ReserveAttestContext rsc = {
+    .etime = GNUNET_TIME_UNIT_FOREVER_TS
+  };
+  MHD_RESULT mhd_ret;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_timestamp ("request_timestamp",
+                                &rsc.timestamp),
+    GNUNET_JSON_spec_array_const ("details",
+                                  &rsc.details),
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rsc.reserve_sig),
+    GNUNET_JSON_spec_end ()
+  };
+  struct GNUNET_TIME_Timestamp now;
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &rsc.reserve_pub,
+                                     sizeof (rsc.reserve_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_RESERVE_PUB_MALFORMED,
+                                       args[0]);
+  }
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (rc->connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_break (0);
+      return MHD_NO; /* hard failure */
+    }
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      return MHD_YES; /* failure */
+    }
+  }
+  now = GNUNET_TIME_timestamp_get ();
+  if (! GNUNET_TIME_absolute_approx_eq (now.abs_time,
+                                        rsc.timestamp.abs_time,
+                                        TIMESTAMP_TOLERANCE))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_EXCHANGE_GENERIC_CLOCK_SKEW,
+                                       NULL);
+  }
+
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_attest_request_verify (rsc.timestamp,
+                                                  rsc.details,
+                                                  &rsc.reserve_pub,
+                                                  &rsc.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_FORBIDDEN,
+                                       TALER_EC_EXCHANGE_RESERVES_ATTEST_BAD_SIGNATURE,
+                                       NULL);
+  }
+
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (TEH_base_url,
+                                          &rsc.reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &rsc.h_payto);
+    GNUNET_free (payto_uri);
+  }
+
+  if (GNUNET_OK !=
+      TEH_DB_run_transaction (rc->connection,
+                              "post reserve attest",
+                              TEH_MT_REQUEST_OTHER,
+                              &mhd_ret,
+                              &reserve_attest_transaction,
+                              &rsc))
+  {
+    return mhd_ret;
+  }
+  if (rsc.not_found)
+  {
+    json_decref (rsc.json_attest);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                       args[0]);
+  }
+  return reply_reserve_attest_success (rc->connection,
+                                       &rsc);
+}
+
+
+/* end of taler-exchange-httpd_reserves_attest.c */
diff --git a/src/exchange/taler-exchange-httpd_reserves_attest.h b/src/exchange/taler-exchange-httpd_reserves_attest.h
new file mode 100644
index 000000000..66bbdf712
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_attest.h
@@ -0,0 +1,41 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_attest.h
+ * @brief Handle /reserves/$RESERVE_PUB/attest requests
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_RESERVES_ATTEST_H
+#define TALER_EXCHANGE_HTTPD_RESERVES_ATTEST_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Handle a POST "/reserves-attest/$RID" request.
+ *
+ * @param rc request context
+ * @param root uploaded body from the client
+ * @param args args[0] has public key of the reserve
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_reserves_attest (struct TEH_RequestContext *rc,
+                             const json_t *root,
+                             const char *const args[1]);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_close.c b/src/exchange/taler-exchange-httpd_reserves_close.c
new file mode 100644
index 000000000..bbf234428
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_close.c
@@ -0,0 +1,448 @@
+/*
+  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 Affero 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_close.c
+ * @brief Handle /reserves/$RESERVE_PUB/close requests
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include "taler_kyclogic_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include "taler_dbevents.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_reserves_close.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * How far do we allow a client's time to be off when
+ * checking the request timestamp?
+ */
+#define TIMESTAMP_TOLERANCE \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
+/**
+ * Closure for #reserve_close_transaction.
+ */
+struct ReserveCloseContext
+{
+  /**
+   * Public key of the reserve the inquiry is about.
+   */
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /**
+   * Timestamp of the request.
+   */
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  /**
+   * Client signature approving the request.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Amount that will be wired (after closing fees).
+   */
+  struct TALER_Amount wire_amount;
+
+  /**
+   * Current balance of the reserve.
+   */
+  struct TALER_Amount balance;
+
+  /**
+   * Where to wire the funds, may be NULL.
+   */
+  const char *payto_uri;
+
+  /**
+   * Hash of the @e payto_uri, if given (otherwise zero).
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * KYC status for the request.
+   */
+  struct TALER_EXCHANGEDB_KycStatus kyc;
+
+  /**
+   * Hash of the payto-URI that was used for the KYC decision.
+   */
+  struct TALER_PaytoHashP kyc_payto;
+
+  /**
+   * Query status from the amount_it() helper function.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Send reserve close to client.
+ *
+ * @param connection connection to the client
+ * @param rhc reserve close to return
+ * @return MHD result code
+ */
+static MHD_RESULT
+reply_reserve_close_success (struct MHD_Connection *connection,
+                             const struct ReserveCloseContext *rhc)
+{
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    TALER_JSON_pack_amount ("wire_amount",
+                            &rhc->wire_amount));
+}
+
+
+/**
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param cls closure, identifies the event type and
+ *        account to iterate over events for
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
+ */
+static void
+amount_it (void *cls,
+           struct GNUNET_TIME_Absolute limit,
+           TALER_EXCHANGEDB_KycAmountCallback cb,
+           void *cb_cls)
+{
+  struct ReserveCloseContext *rcc = cls;
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = cb (cb_cls,
+            &rcc->balance,
+            GNUNET_TIME_absolute_get ());
+  GNUNET_break (GNUNET_SYSERR != ret);
+  if (GNUNET_OK != ret)
+    return;
+  rcc->qs
+    = TEH_plugin->iterate_reserve_close_info (
+        TEH_plugin->cls,
+        &rcc->kyc_payto,
+        limit,
+        cb,
+        cb_cls);
+}
+
+
+/**
+ * Function implementing /reserves/$RID/close transaction.  Given the public
+ * key of a reserve, return the associated transaction close.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction logic
+ * MUST NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
+ * returns the soft error code, the function MAY be called again to retry and
+ * MUST not queue a MHD response.
+ *
+ * @param cls a `struct ReserveCloseContext *`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!); unused
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+reserve_close_transaction (void *cls,
+                           struct MHD_Connection *connection,
+                           MHD_RESULT *mhd_ret)
+{
+  struct ReserveCloseContext *rcc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  char *payto_uri = NULL;
+  const struct TALER_WireFeeSet *wf;
+
+  qs = TEH_plugin->select_reserve_close_info (
+    TEH_plugin->cls,
+    rcc->reserve_pub,
+    &rcc->balance,
+    &payto_uri);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                    "select_reserve_close_info");
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_NOT_FOUND,
+                                    TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                    NULL);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break;
+  }
+
+  if ( (NULL == rcc->payto_uri) &&
+       (NULL == payto_uri) )
+  {
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_CONFLICT,
+                                    TALER_EC_EXCHANGE_RESERVES_CLOSE_NO_TARGET_ACCOUNT,
+                                    NULL);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  if ( (NULL != rcc->payto_uri) &&
+       ( (NULL == payto_uri) ||
+         (0 != strcmp (payto_uri,
+                       rcc->payto_uri)) ) )
+  {
+    /* KYC check may be needed: we're not returning
+       the money to the account that funded the reserve
+       in the first place. */
+    char *kyc_needed;
+
+    TALER_payto_hash (rcc->payto_uri,
+                      &rcc->kyc_payto);
+    rcc->qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+    qs = TALER_KYCLOGIC_kyc_test_required (
+      TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE,
+      &rcc->kyc_payto,
+      TEH_plugin->select_satisfied_kyc_processes,
+      TEH_plugin->cls,
+      &amount_it,
+      rcc,
+      &kyc_needed);
+    if (qs < 0)
+    {
+      if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+        return qs;
+      GNUNET_break (0);
+      *mhd_ret
+        = TALER_MHD_reply_with_error (connection,
+                                      MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                      TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                      "iterate_reserve_close_info");
+      return qs;
+    }
+    if (rcc->qs < 0)
+    {
+      if (GNUNET_DB_STATUS_SOFT_ERROR == rcc->qs)
+        return rcc->qs;
+      GNUNET_break (0);
+      *mhd_ret
+        = TALER_MHD_reply_with_error (connection,
+                                      MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                      TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                      "iterate_reserve_close_info");
+      return qs;
+    }
+    if (NULL != kyc_needed)
+    {
+      rcc->kyc.ok = false;
+      qs = TEH_plugin->insert_kyc_requirement_for_account (
+        TEH_plugin->cls,
+        kyc_needed,
+        &rcc->kyc_payto,
+        rcc->reserve_pub,
+        &rcc->kyc.requirement_row);
+      GNUNET_free (kyc_needed);
+      if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+      {
+        GNUNET_break (0);
+        *mhd_ret
+          = TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                        TALER_EC_GENERIC_DB_STORE_FAILED,
+                                        "insert_kyc_requirement_for_account");
+      }
+      return qs;
+    }
+  }
+
+  rcc->kyc.ok = true;
+  if (NULL == rcc->payto_uri)
+    rcc->payto_uri = payto_uri;
+
+  {
+    char *method;
+
+    method = TALER_payto_get_method (rcc->payto_uri);
+    wf = TEH_wire_fees_by_time (rcc->timestamp,
+                                method);
+    if (NULL == wf)
+    {
+      GNUNET_break (0);
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_EXCHANGE_WIRE_FEES_NOT_CONFIGURED,
+                                             method);
+      GNUNET_free (method);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    GNUNET_free (method);
+  }
+
+  if (0 >
+      TALER_amount_subtract (&rcc->wire_amount,
+                             &rcc->balance,
+                             &wf->closing))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Client attempted to close reserve with insufficient balance.\n");
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &rcc->wire_amount));
+    *mhd_ret = reply_reserve_close_success (connection,
+                                            rcc);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  qs = TEH_plugin->insert_close_request (TEH_plugin->cls,
+                                         rcc->reserve_pub,
+                                         payto_uri,
+                                         &rcc->reserve_sig,
+                                         rcc->timestamp,
+                                         &rcc->balance,
+                                         &wf->closing);
+  GNUNET_free (payto_uri);
+  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+  {
+    GNUNET_break (0);
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                    "insert_close_request");
+    return qs;
+  }
+  if (qs <= 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_reserves_close (struct TEH_RequestContext *rc,
+                            const struct TALER_ReservePublicKeyP *reserve_pub,
+                            const json_t *root)
+{
+  struct ReserveCloseContext rcc = {
+    .payto_uri = NULL,
+    .reserve_pub = reserve_pub
+  };
+  MHD_RESULT mhd_ret;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_timestamp ("request_timestamp",
+                                &rcc.timestamp),
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_payto_uri ("payto_uri",
+                                 &rcc.payto_uri),
+      NULL),
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rcc.reserve_sig),
+    GNUNET_JSON_spec_end ()
+  };
+
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (rc->connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_break (0);
+      return MHD_NO; /* hard failure */
+    }
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      return MHD_YES; /* failure */
+    }
+  }
+
+  {
+    struct GNUNET_TIME_Timestamp now;
+
+    now = GNUNET_TIME_timestamp_get ();
+    if (! GNUNET_TIME_absolute_approx_eq (now.abs_time,
+                                          rcc.timestamp.abs_time,
+                                          TIMESTAMP_TOLERANCE))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_GENERIC_CLOCK_SKEW,
+                                         NULL);
+    }
+  }
+
+  if (NULL != rcc.payto_uri)
+    TALER_payto_hash (rcc.payto_uri,
+                      &rcc.h_payto);
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_close_verify (rcc.timestamp,
+                                         &rcc.h_payto,
+                                         reserve_pub,
+                                         &rcc.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_FORBIDDEN,
+                                       TALER_EC_EXCHANGE_RESERVES_CLOSE_BAD_SIGNATURE,
+                                       NULL);
+  }
+
+  if (GNUNET_OK !=
+      TEH_DB_run_transaction (rc->connection,
+                              "reserve close",
+                              TEH_MT_REQUEST_OTHER,
+                              &mhd_ret,
+                              &reserve_close_transaction,
+                              &rcc))
+  {
+    return mhd_ret;
+  }
+  if (! rcc.kyc.ok)
+    return TEH_RESPONSE_reply_kyc_required (rc->connection,
+                                            &rcc.kyc_payto,
+                                            &rcc.kyc);
+
+  return reply_reserve_close_success (rc->connection,
+                                      &rcc);
+}
+
+
+/* end of taler-exchange-httpd_reserves_close.c */
diff --git a/src/exchange/taler-exchange-httpd_reserves_status.h b/src/exchange/taler-exchange-httpd_reserves_close.h
index 831b270f7..4c70b17cb 100644
--- a/src/exchange/taler-exchange-httpd_reserves_status.h
+++ b/src/exchange/taler-exchange-httpd_reserves_close.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2022 Taler Systems SA
 
   TALER 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
@@ -14,21 +14,19 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
 /**
- * @file taler-exchange-httpd_reserves_status.h
- * @brief Handle /reserves/$RESERVE_PUB STATUS requests
- * @author Florian Dold
- * @author Benedikt Mueller
+ * @file taler-exchange-httpd_reserves_close.h
+ * @brief Handle /reserves/$RESERVE_PUB/close requests
  * @author Christian Grothoff
  */
-#ifndef TALER_EXCHANGE_HTTPD_RESERVES_STATUS_H
-#define TALER_EXCHANGE_HTTPD_RESERVES_STATUS_H
+#ifndef TALER_EXCHANGE_HTTPD_RESERVES_CLOSE_H
+#define TALER_EXCHANGE_HTTPD_RESERVES_CLOSE_H
 
 #include <microhttpd.h>
 #include "taler-exchange-httpd.h"
 
 
 /**
- * Handle a POST "/reserves/$RID/status" request.
+ * Handle a POST "/reserves/$RID/close" request.
  *
  * @param rc request context
  * @param reserve_pub public key of the reserve
@@ -36,8 +34,8 @@
  * @return MHD result code
  */
 MHD_RESULT
-TEH_handler_reserves_status (struct TEH_RequestContext *rc,
-                             const struct TALER_ReservePublicKeyP *reserve_pub,
-                             const json_t *root);
+TEH_handler_reserves_close (struct TEH_RequestContext *rc,
+                            const struct TALER_ReservePublicKeyP *reserve_pub,
+                            const json_t *root);
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_get.c b/src/exchange/taler-exchange-httpd_reserves_get.c
index 27f8faecd..0775a4c65 100644
--- a/src/exchange/taler-exchange-httpd_reserves_get.c
+++ b/src/exchange/taler-exchange-httpd_reserves_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -52,8 +52,12 @@ struct ReservePoller
   struct MHD_Connection *connection;
 
   /**
-   * Subscription for the database event we are
-   * waiting for.
+   * Our request context.
+   */
+  struct TEH_RequestContext *rc;
+
+  /**
+   * Subscription for the database event we are waiting for.
    */
   struct GNUNET_DB_EventHandler *eh;
 
@@ -63,6 +67,16 @@ struct ReservePoller
   struct GNUNET_TIME_Absolute timeout;
 
   /**
+   * Public key of the reserve the inquiry is about.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Balance of the reserve, set in the callback.
+   */
+  struct TALER_Amount balance;
+
+  /**
    * True if we are still suspended.
    */
   bool suspended;
@@ -84,13 +98,10 @@ static struct ReservePoller *rp_tail;
 void
 TEH_reserves_get_cleanup ()
 {
-  struct ReservePoller *rp;
-
-  while (NULL != (rp = rp_head))
+  for (struct ReservePoller *rp = rp_head;
+       NULL != rp;
+       rp = rp->next)
   {
-    GNUNET_CONTAINER_DLL_remove (rp_head,
-                                 rp_tail,
-                                 rp);
     if (rp->suspended)
     {
       rp->suspended = false;
@@ -115,11 +126,14 @@ rp_cleanup (struct TEH_RequestContext *rc)
   if (NULL != rp->eh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Cancelling DB event listening\n");
+                "Cancelling DB event listening on cleanup (odd unless during shutdown)\n");
     TEH_plugin->event_listen_cancel (TEH_plugin->cls,
                                      rp->eh);
     rp->eh = NULL;
   }
+  GNUNET_CONTAINER_DLL_remove (rp_head,
+                               rp_tail,
+                               rp);
   GNUNET_free (rp);
 }
 
@@ -137,26 +151,17 @@ db_event_cb (void *cls,
              const void *extra,
              size_t extra_size)
 {
-  struct TEH_RequestContext *rc = cls;
-  struct ReservePoller *rp = rc->rh_ctx;
+  struct ReservePoller *rp = cls;
   struct GNUNET_AsyncScopeSave old_scope;
 
   (void) extra;
   (void) extra_size;
-  if (NULL == rp)
-    return; /* event triggered while main transaction
-               was still running */
   if (! rp->suspended)
     return; /* might get multiple wake-up events */
-  rp->suspended = false;
-  GNUNET_async_scope_enter (&rc->async_scope_id,
+  GNUNET_async_scope_enter (&rp->rc->async_scope_id,
                             &old_scope);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Resuming from long-polling on reserve\n");
   TEH_check_invariants ();
-  GNUNET_CONTAINER_DLL_remove (rp_head,
-                               rp_tail,
-                               rp);
+  rp->suspended = false;
   MHD_resume_connection (rp->connection);
   TALER_MHD_daemon_trigger ();
   TEH_check_invariants ();
@@ -164,191 +169,95 @@ db_event_cb (void *cls,
 }
 
 
-/**
- * Closure for #reserve_history_transaction.
- */
-struct ReserveHistoryContext
-{
-  /**
-   * Public key of the reserve the inquiry is about.
-   */
-  struct TALER_ReservePublicKeyP reserve_pub;
-
-  /**
-   * Balance of the reserve, set in the callback.
-   */
-  struct TALER_Amount balance;
-
-  /**
-   * Set to true if we did not find the reserve.
-   */
-  bool not_found;
-};
-
-
-/**
- * Function implementing /reserves/ GET transaction.
- * Execute a /reserves/ GET.  Given the public key of a reserve,
- * return the associated transaction history.  Runs the
- * transaction logic; IF it returns a non-error code, the transaction
- * logic MUST NOT queue a MHD response.  IF it returns an hard error,
- * the transaction logic MUST queue a MHD response and set @a mhd_ret.
- * IF it returns the soft error code, the function MAY be called again
- * to retry and MUST not queue a MHD response.
- *
- * @param cls a `struct ReserveHistoryContext *`
- * @param connection MHD request which triggered the transaction
- * @param[out] mhd_ret set to MHD response status for @a connection,
- *             if transaction failed (!)
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-reserve_balance_transaction (void *cls,
-                             struct MHD_Connection *connection,
-                             MHD_RESULT *mhd_ret)
-{
-  struct ReserveHistoryContext *rsc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = TEH_plugin->get_reserve_balance (TEH_plugin->cls,
-                                        &rsc->reserve_pub,
-                                        &rsc->balance);
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-  {
-    GNUNET_break (0);
-    *mhd_ret
-      = TALER_MHD_reply_with_error (connection,
-                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                    "get_reserve_balance");
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-    rsc->not_found = true;
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-    rsc->not_found = false;
-  return qs;
-}
-
-
 MHD_RESULT
-TEH_handler_reserves_get (struct TEH_RequestContext *rc,
-                          const char *const args[1])
+TEH_handler_reserves_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_ReservePublicKeyP *reserve_pub)
 {
-  struct ReserveHistoryContext rsc;
-  struct GNUNET_TIME_Relative timeout = GNUNET_TIME_UNIT_ZERO;
-  struct GNUNET_DB_EventHandler *eh = NULL;
-
-  if (GNUNET_OK !=
-      GNUNET_STRINGS_string_to_data (args[0],
-                                     strlen (args[0]),
-                                     &rsc.reserve_pub,
-                                     sizeof (rsc.reserve_pub)))
+  struct ReservePoller *rp = rc->rh_ctx;
+
+  if (NULL == rp)
   {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_MERCHANT_GENERIC_RESERVE_PUB_MALFORMED,
-                                       args[0]);
+    rp = GNUNET_new (struct ReservePoller);
+    rp->connection = rc->connection;
+    rp->rc = rc;
+    rc->rh_ctx = rp;
+    rc->rh_cleaner = &rp_cleanup;
+    GNUNET_CONTAINER_DLL_insert (rp_head,
+                                 rp_tail,
+                                 rp);
+    rp->reserve_pub = *reserve_pub;
+    TALER_MHD_parse_request_timeout (rc->connection,
+                                     &rp->timeout);
   }
-  {
-    const char *long_poll_timeout_ms;
-
-    long_poll_timeout_ms
-      = MHD_lookup_connection_value (rc->connection,
-                                     MHD_GET_ARGUMENT_KIND,
-                                     "timeout_ms");
-    if (NULL != long_poll_timeout_ms)
-    {
-      unsigned int timeout_ms;
-      char dummy;
 
-      if (1 != sscanf (long_poll_timeout_ms,
-                       "%u%c",
-                       &timeout_ms,
-                       &dummy))
-      {
-        GNUNET_break_op (0);
-        return TALER_MHD_reply_with_error (rc->connection,
-                                           MHD_HTTP_BAD_REQUEST,
-                                           TALER_EC_GENERIC_PARAMETER_MALFORMED,
-                                           "timeout_ms (must be non-negative number)");
-      }
-      timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
-                                               timeout_ms);
-    }
-  }
-  if ( (! GNUNET_TIME_relative_is_zero (timeout)) &&
-       (NULL == rc->rh_ctx) )
+  if ( (GNUNET_TIME_absolute_is_future (rp->timeout)) &&
+       (NULL == rp->eh) )
   {
     struct TALER_ReserveEventP rep = {
       .header.size = htons (sizeof (rep)),
       .header.type = htons (TALER_DBEVENT_EXCHANGE_RESERVE_INCOMING),
-      .reserve_pub = rsc.reserve_pub
+      .reserve_pub = rp->reserve_pub
     };
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Starting DB event listening\n");
-    eh = TEH_plugin->event_listen (TEH_plugin->cls,
-                                   timeout,
-                                   &rep.header,
-                                   &db_event_cb,
-                                   rc);
+                "Starting DB event listening until %s\n",
+                GNUNET_TIME_absolute2s (rp->timeout));
+    rp->eh = TEH_plugin->event_listen (
+      TEH_plugin->cls,
+      GNUNET_TIME_absolute_get_remaining (rp->timeout),
+      &rep.header,
+      &db_event_cb,
+      rp);
   }
   {
-    MHD_RESULT mhd_ret;
-
-    if (GNUNET_OK !=
-        TEH_DB_run_transaction (rc->connection,
-                                "get reserve balance",
-                                TEH_MT_REQUEST_OTHER,
-                                &mhd_ret,
-                                &reserve_balance_transaction,
-                                &rsc))
-    {
-      if (NULL != eh)
-        TEH_plugin->event_listen_cancel (TEH_plugin->cls,
-                                         eh);
-      return mhd_ret;
-    }
-  }
-  /* generate proper response */
-  if (rsc.not_found)
-  {
-    struct ReservePoller *rp = rc->rh_ctx;
+    enum GNUNET_DB_QueryStatus qs;
 
-    if ( (NULL != rp) ||
-         (GNUNET_TIME_relative_is_zero (timeout)) )
+    qs = TEH_plugin->get_reserve_balance (TEH_plugin->cls,
+                                          &rp->reserve_pub,
+                                          &rp->balance);
+    switch (qs)
     {
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      GNUNET_break (0); /* single-shot query should never have soft-errors */
       return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_NOT_FOUND,
-                                         TALER_EC_EXCHANGE_RESERVES_STATUS_UNKNOWN,
-                                         args[0]);
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_SOFT_FAILURE,
+                                         "get_reserve_balance");
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         "get_reserve_balance");
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Got reserve balance of %s\n",
+                  TALER_amount2s (&rp->balance));
+      return TALER_MHD_REPLY_JSON_PACK (rc->connection,
+                                        MHD_HTTP_OK,
+                                        TALER_JSON_pack_amount ("balance",
+                                                                &rp->balance));
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      if (! GNUNET_TIME_absolute_is_future (rp->timeout))
+      {
+        return TALER_MHD_reply_with_error (rc->connection,
+                                           MHD_HTTP_NOT_FOUND,
+                                           TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                           NULL);
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Long-polling on reserve for %s\n",
+                  GNUNET_STRINGS_relative_time_to_string (
+                    GNUNET_TIME_absolute_get_remaining (rp->timeout),
+                    true));
+      rp->suspended = true;
+      MHD_suspend_connection (rc->connection);
+      return MHD_YES;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Long-polling on reserve for %s\n",
-                GNUNET_STRINGS_relative_time_to_string (timeout,
-                                                        GNUNET_YES));
-    rp = GNUNET_new (struct ReservePoller);
-    rp->connection = rc->connection;
-    rp->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-    rp->eh = eh;
-    rc->rh_ctx = rp;
-    rc->rh_cleaner = &rp_cleanup;
-    rp->suspended = true;
-    GNUNET_CONTAINER_DLL_insert (rp_head,
-                                 rp_tail,
-                                 rp);
-    MHD_suspend_connection (rc->connection);
-    return MHD_YES;
   }
-  if (NULL != eh)
-    TEH_plugin->event_listen_cancel (TEH_plugin->cls,
-                                     eh);
-  return TALER_MHD_REPLY_JSON_PACK (
-    rc->connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_amount ("balance",
-                            &rsc.balance));
+  GNUNET_break (0);
+  return MHD_NO;
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_reserves_get.h b/src/exchange/taler-exchange-httpd_reserves_get.h
index 30c6559f6..6c453d0cd 100644
--- a/src/exchange/taler-exchange-httpd_reserves_get.h
+++ b/src/exchange/taler-exchange-httpd_reserves_get.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -43,11 +43,12 @@ TEH_reserves_get_cleanup (void);
  * status of the reserve.
  *
  * @param rc request context
- * @param args array of additional options (length: 1, just the reserve_pub)
+ * @param reserve_pub public key of the reserve
  * @return MHD result code
  */
 MHD_RESULT
-TEH_handler_reserves_get (struct TEH_RequestContext *rc,
-                          const char *const args[1]);
+TEH_handler_reserves_get (
+  struct TEH_RequestContext *rc,
+  const struct TALER_ReservePublicKeyP *reserve_pub);
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_get_attest.c b/src/exchange/taler-exchange-httpd_reserves_get_attest.c
new file mode 100644
index 000000000..ae983682a
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_get_attest.c
@@ -0,0 +1,232 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_get_attest.c
+ * @brief Handle GET /reserves/$RESERVE_PUB/attest requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include "taler_kyclogic_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include "taler_dbevents.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_reserves_get_attest.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * Closure for #reserve_attest_transaction.
+ */
+struct ReserveAttestContext
+{
+  /**
+   * Public key of the reserve the inquiry is about.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Hash of the payto URI of this reserve.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Available attributes.
+   */
+  json_t *attributes;
+
+  /**
+   * Set to true if we did not find the reserve.
+   */
+  bool not_found;
+};
+
+
+/**
+ * Function called with information about all applicable
+ * legitimization processes for the given user.
+ *
+ * @param cls our `struct ReserveAttestContext *`
+ * @param h_payto account for which the attribute data is stored
+ * @param provider_section provider that must be checked
+ * @param collection_time when was the data collected
+ * @param expiration_time when does the data expire
+ * @param enc_attributes_size number of bytes in @a enc_attributes
+ * @param enc_attributes encrypted attribute data
+ */
+static void
+kyc_process_cb (void *cls,
+                const struct TALER_PaytoHashP *h_payto,
+                const char *provider_section,
+                struct GNUNET_TIME_Timestamp collection_time,
+                struct GNUNET_TIME_Timestamp expiration_time,
+                size_t enc_attributes_size,
+                const void *enc_attributes)
+{
+  struct ReserveAttestContext *rsc = cls;
+  json_t *attrs;
+  json_t *val;
+  const char *name;
+
+  if (GNUNET_TIME_absolute_is_past (expiration_time.abs_time))
+    return;
+  attrs = TALER_CRYPTO_kyc_attributes_decrypt (&TEH_attribute_key,
+                                               enc_attributes,
+                                               enc_attributes_size);
+  json_object_foreach (attrs, name, val)
+  {
+    bool duplicate = false;
+    size_t idx;
+    json_t *str;
+
+    json_array_foreach (rsc->attributes, idx, str)
+    {
+      if (0 == strcmp (json_string_value (str),
+                       name))
+      {
+        duplicate = true;
+        break;
+      }
+    }
+    if (duplicate)
+      continue;
+    GNUNET_assert (0 ==
+                   json_array_append (rsc->attributes,
+                                      json_string (name)));
+  }
+}
+
+
+/**
+ * Function implementing GET /reserves/$RID/attest transaction.
+ * Execute a /reserves/ get attest.  Given the public key of a reserve,
+ * return the associated transaction attest.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction
+ * logic MUST NOT queue a MHD response.  IF it returns an hard error,
+ * the transaction logic MUST queue a MHD response and set @a mhd_ret.
+ * IF it returns the soft error code, the function MAY be called again
+ * to retry and MUST not queue a MHD response.
+ *
+ * @param cls a `struct ReserveAttestContext *`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+reserve_attest_transaction (void *cls,
+                            struct MHD_Connection *connection,
+                            MHD_RESULT *mhd_ret)
+{
+  struct ReserveAttestContext *rsc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  rsc->attributes = json_array ();
+  GNUNET_assert (NULL != rsc->attributes);
+  qs = TEH_plugin->select_kyc_attributes (TEH_plugin->cls,
+                                          &rsc->h_payto,
+                                          &kyc_process_cb,
+                                          rsc);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                    "iterate_kyc_reference");
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    rsc->not_found = true;
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    rsc->not_found = false;
+    break;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_reserves_get_attest (struct TEH_RequestContext *rc,
+                                 const char *const args[1])
+{
+  struct ReserveAttestContext rsc = {
+    .attributes = NULL
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (args[0],
+                                     strlen (args[0]),
+                                     &rsc.reserve_pub,
+                                     sizeof (rsc.reserve_pub)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_RESERVE_PUB_MALFORMED,
+                                       args[0]);
+  }
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (TEH_base_url,
+                                          &rsc.reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &rsc.h_payto);
+    GNUNET_free (payto_uri);
+  }
+  {
+    MHD_RESULT mhd_ret;
+
+    if (GNUNET_OK !=
+        TEH_DB_run_transaction (rc->connection,
+                                "get-attestable",
+                                TEH_MT_REQUEST_OTHER,
+                                &mhd_ret,
+                                &reserve_attest_transaction,
+                                &rsc))
+    {
+      json_decref (rsc.attributes);
+      rsc.attributes = NULL;
+      return mhd_ret;
+    }
+  }
+  /* generate proper response */
+  if (rsc.not_found)
+  {
+    json_decref (rsc.attributes);
+    rsc.attributes = NULL;
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                       args[0]);
+  }
+  return TALER_MHD_REPLY_JSON_PACK (
+    rc->connection,
+    MHD_HTTP_OK,
+    GNUNET_JSON_pack_array_steal ("details",
+                                  rsc.attributes));
+}
+
+
+/* end of taler-exchange-httpd_reserves_get_attest.c */
diff --git a/src/exchange/taler-exchange-httpd_reserves_get_attest.h b/src/exchange/taler-exchange-httpd_reserves_get_attest.h
new file mode 100644
index 000000000..8b5e3aba3
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_get_attest.h
@@ -0,0 +1,44 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Affero 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_get_attest.h
+ * @brief Handle /reserves/$RESERVE_PUB GET_ATTEST requests
+ * @author Florian Dold
+ * @author Benedikt Mueller
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_RESERVES_GET_ATTEST_H
+#define TALER_EXCHANGE_HTTPD_RESERVES_GET_ATTEST_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Handle a GET "/reserves/$RID/attest" request.  Parses the
+ * given "reserve_pub" in @a args (which should contain the
+ * EdDSA public key of a reserve) and then responds with the
+ * available attestations for the reserve.
+ *
+ * @param rc request context
+ * @param args array of additional options (length: 1, just the reserve_pub)
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_reserves_get_attest (struct TEH_RequestContext *rc,
+                                 const char *const args[1]);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_history.c b/src/exchange/taler-exchange-httpd_reserves_history.c
index 96902d01c..056d4b0ef 100644
--- a/src/exchange/taler-exchange-httpd_reserves_history.c
+++ b/src/exchange/taler-exchange-httpd_reserves_history.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -15,7 +15,7 @@
 */
 /**
  * @file taler-exchange-httpd_reserves_history.c
- * @brief Handle /reserves/$RESERVE_PUB/history requests
+ * @brief Handle /reserves/$RESERVE_PUB HISTORY requests
  * @author Florian Dold
  * @author Benedikt Mueller
  * @author Christian Grothoff
@@ -23,7 +23,6 @@
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
-#include "taler_mhd_lib.h"
 #include "taler_json_lib.h"
 #include "taler_dbevents.h"
 #include "taler-exchange-httpd_keys.h"
@@ -32,211 +31,486 @@
 
 
 /**
- * How far do we allow a client's time to be off when
- * checking the request timestamp?
+ * Compile the history of a reserve into a JSON object.
+ *
+ * @param rh reserve history to JSON-ify
+ * @return json representation of the @a rh, NULL on error
  */
-#define TIMESTAMP_TOLERANCE \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+static json_t *
+compile_reserve_history (
+  const struct TALER_EXCHANGEDB_ReserveHistory *rh)
+{
+  json_t *json_history;
 
+  json_history = json_array ();
+  GNUNET_assert (NULL != json_history);
+  for (const struct TALER_EXCHANGEDB_ReserveHistory *pos = rh;
+       NULL != pos;
+       pos = pos->next)
+  {
+    switch (pos->type)
+    {
+    case TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE:
+      {
+        const struct TALER_EXCHANGEDB_BankTransfer *bank =
+          pos->details.bank;
 
-/**
- * Closure for #reserve_history_transaction.
- */
-struct ReserveHistoryContext
-{
-  /**
-   * Public key of the reserve the inquiry is about.
-   */
-  const struct TALER_ReservePublicKeyP *reserve_pub;
-
-  /**
-   * Timestamp of the request.
-   */
-  struct GNUNET_TIME_Timestamp timestamp;
-
-  /**
-   * Client signature approving the request.
-   */
-  struct TALER_ReserveSignatureP reserve_sig;
-
-  /**
-   * History of the reserve, set in the callback.
-   */
-  struct TALER_EXCHANGEDB_ReserveHistory *rh;
-
-  /**
-   * Global fees applying to the request.
-   */
-  const struct TEH_GlobalFee *gf;
-
-  /**
-   * Current reserve balance.
-   */
-  struct TALER_Amount balance;
-};
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "CREDIT"),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            bank->execution_date),
+                GNUNET_JSON_pack_string ("sender_account_url",
+                                         bank->sender_account_details),
+                GNUNET_JSON_pack_uint64 ("wire_reference",
+                                         bank->wire_reference),
+                TALER_JSON_pack_amount ("amount",
+                                        &bank->amount))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_WITHDRAW_COIN:
+      {
+        const struct TALER_EXCHANGEDB_CollectableBlindcoin *withdraw
+          = pos->details.withdraw;
 
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "WITHDRAW"),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &withdraw->reserve_sig),
+                GNUNET_JSON_pack_data_auto ("h_coin_envelope",
+                                            &withdraw->h_coin_envelope),
+                GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                            &withdraw->denom_pub_hash),
+                TALER_JSON_pack_amount ("withdraw_fee",
+                                        &withdraw->withdraw_fee),
+                TALER_JSON_pack_amount ("amount",
+                                        &withdraw->amount_with_fee))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_RO_RECOUP_COIN:
+      {
+        const struct TALER_EXCHANGEDB_Recoup *recoup
+          = pos->details.recoup;
+        struct TALER_ExchangePublicKeyP pub;
+        struct TALER_ExchangeSignatureP sig;
 
-/**
- * Send reserve history to client.
- *
- * @param connection connection to the client
- * @param rh reserve history to return
- * @return MHD result code
- */
-static MHD_RESULT
-reply_reserve_history_success (struct MHD_Connection *connection,
-                               const struct ReserveHistoryContext *rhc)
-{
-  const struct TALER_EXCHANGEDB_ReserveHistory *rh = rhc->rh;
-  json_t *json_history;
+        if (TALER_EC_NONE !=
+            TALER_exchange_online_confirm_recoup_sign (
+              &TEH_keys_exchange_sign_,
+              recoup->timestamp,
+              &recoup->value,
+              &recoup->coin.coin_pub,
+              &recoup->reserve_pub,
+              &pub,
+              &sig))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "RECOUP"),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &pub),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &sig),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            recoup->timestamp),
+                TALER_JSON_pack_amount ("amount",
+                                        &recoup->value),
+                GNUNET_JSON_pack_data_auto ("coin_pub",
+                                            &recoup->coin.coin_pub))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK:
+      {
+        const struct TALER_EXCHANGEDB_ClosingTransfer *closing =
+          pos->details.closing;
+        struct TALER_ExchangePublicKeyP pub;
+        struct TALER_ExchangeSignatureP sig;
+
+        if (TALER_EC_NONE !=
+            TALER_exchange_online_reserve_closed_sign (
+              &TEH_keys_exchange_sign_,
+              closing->execution_date,
+              &closing->amount,
+              &closing->closing_fee,
+              closing->receiver_account_details,
+              &closing->wtid,
+              &pos->details.closing->reserve_pub,
+              &pub,
+              &sig))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "CLOSING"),
+                GNUNET_JSON_pack_string ("receiver_account_details",
+                                         closing->receiver_account_details),
+                GNUNET_JSON_pack_data_auto ("wtid",
+                                            &closing->wtid),
+                GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                            &pub),
+                GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                            &sig),
+                GNUNET_JSON_pack_timestamp ("timestamp",
+                                            closing->execution_date),
+                TALER_JSON_pack_amount ("amount",
+                                        &closing->amount),
+                TALER_JSON_pack_amount ("closing_fee",
+                                        &closing->closing_fee))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_RO_PURSE_MERGE:
+      {
+        const struct TALER_EXCHANGEDB_PurseMerge *merge =
+          pos->details.merge;
+
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "MERGE"),
+                GNUNET_JSON_pack_data_auto ("h_contract_terms",
+                                            &merge->h_contract_terms),
+                GNUNET_JSON_pack_data_auto ("merge_pub",
+                                            &merge->merge_pub),
+                GNUNET_JSON_pack_uint64 ("min_age",
+                                         merge->min_age),
+                GNUNET_JSON_pack_uint64 ("flags",
+                                         merge->flags),
+                GNUNET_JSON_pack_data_auto ("purse_pub",
+                                            &merge->purse_pub),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &merge->reserve_sig),
+                GNUNET_JSON_pack_timestamp ("merge_timestamp",
+                                            merge->merge_timestamp),
+                GNUNET_JSON_pack_timestamp ("purse_expiration",
+                                            merge->purse_expiration),
+                TALER_JSON_pack_amount ("purse_fee",
+                                        &merge->purse_fee),
+                TALER_JSON_pack_amount ("amount",
+                                        &merge->amount_with_fee),
+                GNUNET_JSON_pack_bool ("merged",
+                                       merge->merged))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+    case TALER_EXCHANGEDB_RO_HISTORY_REQUEST:
+      {
+        const struct TALER_EXCHANGEDB_HistoryRequest *history =
+          pos->details.history;
+
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "HISTORY"),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &history->reserve_sig),
+                GNUNET_JSON_pack_timestamp ("request_timestamp",
+                                            history->request_timestamp),
+                TALER_JSON_pack_amount ("amount",
+                                        &history->history_fee))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+
+    case TALER_EXCHANGEDB_RO_OPEN_REQUEST:
+      {
+        const struct TALER_EXCHANGEDB_OpenRequest *orq =
+          pos->details.open_request;
 
-  json_history = TEH_RESPONSE_compile_reserve_history (rh);
-  if (NULL == json_history)
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
-                                       NULL);
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_amount ("balance",
-                            &rhc->balance),
-    GNUNET_JSON_pack_array_steal ("history",
-                                  json_history));
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "OPEN"),
+                GNUNET_JSON_pack_uint64 ("requested_min_purses",
+                                         orq->purse_limit),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &orq->reserve_sig),
+                GNUNET_JSON_pack_timestamp ("request_timestamp",
+                                            orq->request_timestamp),
+                GNUNET_JSON_pack_timestamp ("requested_expiration",
+                                            orq->reserve_expiration),
+                TALER_JSON_pack_amount ("open_fee",
+                                        &orq->open_fee))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+
+    case TALER_EXCHANGEDB_RO_CLOSE_REQUEST:
+      {
+        const struct TALER_EXCHANGEDB_CloseRequest *crq =
+          pos->details.close_request;
+
+        if (0 !=
+            json_array_append_new (
+              json_history,
+              GNUNET_JSON_PACK (
+                GNUNET_JSON_pack_string ("type",
+                                         "CLOSE"),
+                GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                            &crq->reserve_sig),
+                GNUNET_is_zero (&crq->target_account_h_payto)
+                ? GNUNET_JSON_pack_allow_null (
+                  GNUNET_JSON_pack_string ("h_payto",
+                                           NULL))
+                : GNUNET_JSON_pack_data_auto ("h_payto",
+                                              &crq->target_account_h_payto),
+                GNUNET_JSON_pack_timestamp ("request_timestamp",
+                                            crq->request_timestamp))))
+        {
+          GNUNET_break (0);
+          json_decref (json_history);
+          return NULL;
+        }
+      }
+      break;
+    }
+  }
+
+  return json_history;
 }
 
 
 /**
- * Function implementing /reserves/$RID/history transaction.  Given the public
- * key of a reserve, return the associated transaction history.  Runs the
- * transaction logic; IF it returns a non-error code, the transaction logic
- * MUST NOT queue a MHD response.  IF it returns an hard error, the
- * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
- * returns the soft error code, the function MAY be called again to retry and
- * MUST not queue a MHD response.
+ * Add the headers we want to set for every /keys response.
  *
- * @param cls a `struct ReserveHistoryContext *`
- * @param connection MHD request which triggered the transaction
- * @param[out] mhd_ret set to MHD response status for @a connection,
- *             if transaction failed (!); unused
- * @return transaction status
+ * @param cls the key state to use
+ * @param[in,out] response the response to modify
  */
-static enum GNUNET_DB_QueryStatus
-reserve_history_transaction (void *cls,
-                             struct MHD_Connection *connection,
-                             MHD_RESULT *mhd_ret)
+static void
+add_response_headers (void *cls,
+                      struct MHD_Response *response)
 {
-  struct ReserveHistoryContext *rsc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-
-  // FIXME: first deduct rsc->gf->fees.history from reserve balance (and persist the signature justifying this)
-  qs = TEH_plugin->get_reserve_history (TEH_plugin->cls,
-                                        rsc->reserve_pub,
-                                        &rsc->balance,
-                                        &rsc->rh);
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-  {
-    GNUNET_break (0);
-    *mhd_ret
-      = TALER_MHD_reply_with_error (connection,
-                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                    "get_reserve_history");
-  }
-  return qs;
+  (void) cls;
+  TALER_MHD_add_global_headers (response);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (response,
+                                         MHD_HTTP_HEADER_CACHE_CONTROL,
+                                         "no-cache"));
 }
 
 
 MHD_RESULT
-TEH_handler_reserves_history (struct TEH_RequestContext *rc,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              const json_t *root)
+TEH_handler_reserves_history (
+  struct TEH_RequestContext *rc,
+  const struct TALER_ReservePublicKeyP *reserve_pub)
 {
-  struct ReserveHistoryContext rsc;
-  MHD_RESULT mhd_ret;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_timestamp ("request_timestamp",
-                                &rsc.timestamp),
-    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
-                                 &rsc.reserve_sig),
-    GNUNET_JSON_spec_end ()
-  };
-  struct GNUNET_TIME_Timestamp now;
-
-  rsc.reserve_pub = reserve_pub;
+  struct TALER_EXCHANGEDB_ReserveHistory *rh = NULL;
+  uint64_t start_off = 0;
+  struct TALER_Amount balance;
+  uint64_t etag_in;
+  uint64_t etag_out;
+  char etagp[24];
+  struct MHD_Response *resp;
+  unsigned int http_status;
+
+  TALER_MHD_parse_request_number (rc->connection,
+                                  "start",
+                                  &start_off);
   {
-    enum GNUNET_GenericReturnValue res;
+    struct TALER_ReserveSignatureP reserve_sig;
+    bool required = true;
+
+    TALER_MHD_parse_request_header_auto (rc->connection,
+                                         TALER_RESERVE_HISTORY_SIGNATURE_HEADER,
+                                         &reserve_sig,
+                                         required);
 
-    res = TALER_MHD_parse_json_data (rc->connection,
-                                     root,
-                                     spec);
-    if (GNUNET_SYSERR == res)
+    if (GNUNET_OK !=
+        TALER_wallet_reserve_history_verify (start_off,
+                                             reserve_pub,
+                                             &reserve_sig))
     {
-      GNUNET_break (0);
-      return MHD_NO; /* hard failure */
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_FORBIDDEN,
+                                         TALER_EC_EXCHANGE_RESERVE_HISTORY_BAD_SIGNATURE,
+                                         NULL);
     }
-    if (GNUNET_NO == res)
+  }
+
+  /* Get etag */
+  {
+    const char *etags;
+
+    etags = MHD_lookup_connection_value (rc->connection,
+                                         MHD_HEADER_KIND,
+                                         MHD_HTTP_HEADER_IF_NONE_MATCH);
+    if (NULL != etags)
     {
-      GNUNET_break_op (0);
-      return MHD_YES; /* failure */
+      char dummy;
+      unsigned long long ev;
+
+      if (1 != sscanf (etags,
+                       "\"%llu\"%c",
+                       &ev,
+                       &dummy))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Client send malformed `If-None-Match' header `%s'\n",
+                    etags);
+        etag_in = 0;
+      }
+      else
+      {
+        etag_in = (uint64_t) ev;
+      }
+    }
+    else
+    {
+      etag_in = start_off;
     }
   }
-  now = GNUNET_TIME_timestamp_get ();
-  if (! GNUNET_TIME_absolute_approx_eq (now.abs_time,
-                                        rsc.timestamp.abs_time,
-                                        TIMESTAMP_TOLERANCE))
+
   {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_GENERIC_CLOCK_SKEW,
-                                       NULL);
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = TEH_plugin->get_reserve_history (TEH_plugin->cls,
+                                          reserve_pub,
+                                          start_off,
+                                          etag_in,
+                                          &etag_out,
+                                          &balance,
+                                          &rh);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                         "get_reserve_history");
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_DB_SOFT_FAILURE,
+                                         "get_reserve_history");
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                         NULL);
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      /* Handled below */
+      break;
+    }
   }
-  rsc.gf = TEH_keys_global_fee_by_time (TEH_keys_get_state (),
-                                        rsc.timestamp);
-  if (NULL == rsc.gf)
+
+  GNUNET_snprintf (etagp,
+                   sizeof (etagp),
+                   "\"%llu\"",
+                   (unsigned long long) etag_out);
+  if (etag_in == etag_out)
   {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
-                                       NULL);
+    return TEH_RESPONSE_reply_not_modified (rc->connection,
+                                            etagp,
+                                            &add_response_headers,
+                                            NULL);
   }
-  if (GNUNET_OK !=
-      TALER_wallet_reserve_history_verify (rsc.timestamp,
-                                           &rsc.gf->fees.history,
-                                           reserve_pub,
-                                           &rsc.reserve_sig))
+  if (NULL == rh)
   {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_FORBIDDEN,
-                                       TALER_EC_EXCHANGE_RESERVES_HISTORY_BAD_SIGNATURE,
-                                       NULL);
+    /* 204: empty history */
+    resp = MHD_create_response_from_buffer (0,
+                                            "",
+                                            MHD_RESPMEM_PERSISTENT);
+    http_status = MHD_HTTP_NO_CONTENT;
   }
-  rsc.rh = NULL;
-  if (GNUNET_OK !=
-      TEH_DB_run_transaction (rc->connection,
-                              "get reserve history",
-                              TEH_MT_REQUEST_OTHER,
-                              &mhd_ret,
-                              &reserve_history_transaction,
-                              &rsc))
+  else
   {
-    return mhd_ret;
+    json_t *history;
+
+    http_status = MHD_HTTP_OK;
+    history = compile_reserve_history (rh);
+    TEH_plugin->free_reserve_history (TEH_plugin->cls,
+                                      rh);
+    rh = NULL;
+    if (NULL == history)
+    {
+      GNUNET_break (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
+                                         NULL);
+    }
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      TALER_JSON_pack_amount ("balance",
+                              &balance),
+      GNUNET_JSON_pack_array_steal ("history",
+                                    history));
   }
-  if (NULL == rsc.rh)
+  add_response_headers (NULL,
+                        resp);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (resp,
+                                         MHD_HTTP_HEADER_ETAG,
+                                         etagp));
   {
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_NOT_FOUND,
-                                       TALER_EC_EXCHANGE_RESERVES_STATUS_UNKNOWN,
-                                       NULL);
+    MHD_RESULT ret;
+
+    ret = MHD_queue_response (rc->connection,
+                              http_status,
+                              resp);
+    GNUNET_break (MHD_YES == ret);
+    MHD_destroy_response (resp);
+    return ret;
   }
-  mhd_ret = reply_reserve_history_success (rc->connection,
-                                           &rsc);
-  TEH_plugin->free_reserve_history (TEH_plugin->cls,
-                                    rsc.rh);
-  return mhd_ret;
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_reserves_history.h b/src/exchange/taler-exchange-httpd_reserves_history.h
index 9a2a93782..e1bd7ae1b 100644
--- a/src/exchange/taler-exchange-httpd_reserves_history.h
+++ b/src/exchange/taler-exchange-httpd_reserves_history.h
@@ -15,7 +15,7 @@
 */
 /**
  * @file taler-exchange-httpd_reserves_history.h
- * @brief Handle /reserves/$RESERVE_PUB HISTORY requests
+ * @brief Handle /reserves/$RESERVE_PUB/history requests
  * @author Florian Dold
  * @author Benedikt Mueller
  * @author Christian Grothoff
@@ -24,20 +24,20 @@
 #define TALER_EXCHANGE_HTTPD_RESERVES_HISTORY_H
 
 #include <microhttpd.h>
+#include "taler_mhd_lib.h"
 #include "taler-exchange-httpd.h"
 
 
 /**
- * Handle a POST "/reserves/$RID/history" request.
+ * Handle a GET "/reserves/$RID/history" request.
  *
  * @param rc request context
  * @param reserve_pub public key of the reserve
- * @param root uploaded body from the client
  * @return MHD result code
  */
 MHD_RESULT
-TEH_handler_reserves_history (struct TEH_RequestContext *rc,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              const json_t *root);
+TEH_handler_reserves_history (
+  struct TEH_RequestContext *rc,
+  const struct TALER_ReservePublicKeyP *reserve_pub);
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_open.c b/src/exchange/taler-exchange-httpd_reserves_open.c
new file mode 100644
index 000000000..5aadc9e40
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_open.c
@@ -0,0 +1,471 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_open.c
+ * @brief Handle /reserves/$RESERVE_PUB/open requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include "taler_dbevents.h"
+#include "taler-exchange-httpd_common_deposit.h"
+#include "taler-exchange-httpd_keys.h"
+#include "taler-exchange-httpd_reserves_open.h"
+#include "taler-exchange-httpd_responses.h"
+
+
+/**
+ * How far do we allow a client's time to be off when
+ * checking the request timestamp?
+ */
+#define TIMESTAMP_TOLERANCE \
+  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
+/**
+ * Closure for #reserve_open_transaction.
+ */
+struct ReserveOpenContext
+{
+  /**
+   * Public key of the reserve the inquiry is about.
+   */
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /**
+   * Desired (minimum) expiration time for the reserve.
+   */
+  struct GNUNET_TIME_Timestamp desired_expiration;
+
+  /**
+   * Actual expiration time for the reserve.
+   */
+  struct GNUNET_TIME_Timestamp reserve_expiration;
+
+  /**
+   * Timestamp of the request.
+   */
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  /**
+   * Client signature approving the request.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Global fees applying to the request.
+   */
+  const struct TEH_GlobalFee *gf;
+
+  /**
+   * Amount to be paid from the reserve.
+   */
+  struct TALER_Amount reserve_payment;
+
+  /**
+   * Actual cost to open the reserve.
+   */
+  struct TALER_Amount open_cost;
+
+  /**
+   * Total amount that was deposited.
+   */
+  struct TALER_Amount total;
+
+  /**
+   * Information about payments by coin.
+   */
+  struct TEH_PurseDepositedCoin *payments;
+
+  /**
+   * Length of the @e payments array.
+   */
+  unsigned int payments_len;
+
+  /**
+   * Desired minimum purse limit.
+   */
+  uint32_t purse_limit;
+
+  /**
+   * Set to true if the reserve balance is too low
+   * for the operation.
+   */
+  bool no_funds;
+
+};
+
+
+/**
+ * Send reserve open to client.
+ *
+ * @param connection connection to the client
+ * @param rsc reserve open data to return
+ * @return MHD result code
+ */
+static MHD_RESULT
+reply_reserve_open_success (struct MHD_Connection *connection,
+                            const struct ReserveOpenContext *rsc)
+{
+  struct GNUNET_TIME_Timestamp now;
+  struct GNUNET_TIME_Timestamp re;
+  unsigned int status;
+
+  status = MHD_HTTP_OK;
+  if (GNUNET_TIME_timestamp_cmp (rsc->reserve_expiration,
+                                 <,
+                                 rsc->desired_expiration))
+    status = MHD_HTTP_PAYMENT_REQUIRED;
+  now = GNUNET_TIME_timestamp_get ();
+  if (GNUNET_TIME_timestamp_cmp (rsc->reserve_expiration,
+                                 <,
+                                 now))
+    re = now;
+  else
+    re = rsc->reserve_expiration;
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    status,
+    GNUNET_JSON_pack_timestamp ("reserve_expiration",
+                                re),
+    TALER_JSON_pack_amount ("open_cost",
+                            &rsc->open_cost));
+}
+
+
+/**
+ * Cleans up information in @a rsc, but does not
+ * free @a rsc itself (allocated on the stack!).
+ *
+ * @param[in] rsc struct with information to clean up
+ */
+static void
+cleanup_rsc (struct ReserveOpenContext *rsc)
+{
+  for (unsigned int i = 0; i<rsc->payments_len; i++)
+  {
+    TEH_common_purse_deposit_free_coin (&rsc->payments[i]);
+  }
+  GNUNET_free (rsc->payments);
+}
+
+
+/**
+ * Function implementing /reserves/$RID/open transaction.  Given the public
+ * key of a reserve, return the associated transaction open.  Runs the
+ * transaction logic; IF it returns a non-error code, the transaction logic
+ * MUST NOT queue a MHD response.  IF it returns an hard error, the
+ * transaction logic MUST queue a MHD response and set @a mhd_ret.  IF it
+ * returns the soft error code, the function MAY be called again to retry and
+ * MUST not queue a MHD response.
+ *
+ * @param cls a `struct ReserveOpenContext *`
+ * @param connection MHD request which triggered the transaction
+ * @param[out] mhd_ret set to MHD response status for @a connection,
+ *             if transaction failed (!)
+ * @return transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+reserve_open_transaction (void *cls,
+                          struct MHD_Connection *connection,
+                          MHD_RESULT *mhd_ret)
+{
+  struct ReserveOpenContext *rsc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_Amount reserve_balance;
+
+  for (unsigned int i = 0; i<rsc->payments_len; i++)
+  {
+    struct TEH_PurseDepositedCoin *coin = &rsc->payments[i];
+    bool insufficient_funds = true;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Make coin %u known\n",
+                i);
+    qs = TEH_make_coin_known (&coin->cpi,
+                              connection,
+                              &coin->known_coin_id,
+                              mhd_ret);
+    if (qs < 0)
+      return qs;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Insert open deposit %u known\n",
+                i);
+    qs = TEH_plugin->insert_reserve_open_deposit (
+      TEH_plugin->cls,
+      &coin->cpi,
+      &coin->coin_sig,
+      coin->known_coin_id,
+      &coin->amount,
+      &rsc->reserve_sig,
+      rsc->reserve_pub,
+      &insufficient_funds);
+    /* 0 == qs is fine, then the coin was already
+       spent for this very operation as identified
+       by reserve_sig! */
+    if (qs < 0)
+    {
+      if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+        return qs;
+      GNUNET_break (0);
+      *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                             TALER_EC_GENERIC_DB_STORE_FAILED,
+                                             "insert_reserve_open_deposit");
+      return qs;
+    }
+    if (insufficient_funds)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Handle insufficient funds\n");
+      *mhd_ret
+        = TEH_RESPONSE_reply_coin_insufficient_funds (
+            connection,
+            TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS,
+            &coin->cpi.denom_pub_hash,
+            &coin->cpi.coin_pub);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Do reserve open with reserve payment of %s\n",
+              TALER_amount2s (&rsc->total));
+  qs = TEH_plugin->do_reserve_open (TEH_plugin->cls,
+                                    /* inputs */
+                                    rsc->reserve_pub,
+                                    &rsc->total,
+                                    &rsc->reserve_payment,
+                                    rsc->purse_limit,
+                                    &rsc->reserve_sig,
+                                    rsc->desired_expiration,
+                                    rsc->timestamp,
+                                    &rsc->gf->fees.account,
+                                    /* outputs */
+                                    &rsc->no_funds,
+                                    &reserve_balance,
+                                    &rsc->open_cost,
+                                    &rsc->reserve_expiration);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                    "do_reserve_open");
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    *mhd_ret
+      = TALER_MHD_reply_with_error (connection,
+                                    MHD_HTTP_NOT_FOUND,
+                                    TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN,
+                                    NULL);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break;
+  }
+  if (rsc->no_funds)
+  {
+    TEH_plugin->rollback (TEH_plugin->cls);
+    *mhd_ret
+      = TEH_RESPONSE_reply_reserve_insufficient_balance (
+          connection,
+          TALER_EC_EXCHANGE_RESERVES_OPEN_INSUFFICIENT_FUNDS,
+          &reserve_balance,
+          &rsc->reserve_payment,
+          rsc->reserve_pub);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  return qs;
+}
+
+
+MHD_RESULT
+TEH_handler_reserves_open (struct TEH_RequestContext *rc,
+                           const struct TALER_ReservePublicKeyP *reserve_pub,
+                           const json_t *root)
+{
+  struct ReserveOpenContext rsc;
+  const json_t *payments;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_timestamp ("request_timestamp",
+                                &rsc.timestamp),
+    GNUNET_JSON_spec_timestamp ("reserve_expiration",
+                                &rsc.desired_expiration),
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rsc.reserve_sig),
+    GNUNET_JSON_spec_uint32 ("purse_limit",
+                             &rsc.purse_limit),
+    GNUNET_JSON_spec_array_const ("payments",
+                                  &payments),
+    TALER_JSON_spec_amount ("reserve_payment",
+                            TEH_currency,
+                            &rsc.reserve_payment),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rsc.reserve_pub = reserve_pub;
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_json_data (rc->connection,
+                                     root,
+                                     spec);
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_break (0);
+      return MHD_NO; /* hard failure */
+    }
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      return MHD_YES; /* failure */
+    }
+  }
+
+  {
+    struct GNUNET_TIME_Timestamp now;
+
+    now = GNUNET_TIME_timestamp_get ();
+    if (! GNUNET_TIME_absolute_approx_eq (now.abs_time,
+                                          rsc.timestamp.abs_time,
+                                          TIMESTAMP_TOLERANCE))
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_BAD_REQUEST,
+                                         TALER_EC_EXCHANGE_GENERIC_CLOCK_SKEW,
+                                         NULL);
+    }
+  }
+
+  rsc.payments_len = json_array_size (payments);
+  rsc.payments = GNUNET_new_array (rsc.payments_len,
+                                   struct TEH_PurseDepositedCoin);
+  rsc.total = rsc.reserve_payment;
+  for (unsigned int i = 0; i<rsc.payments_len; i++)
+  {
+    struct TEH_PurseDepositedCoin *coin = &rsc.payments[i];
+    enum GNUNET_GenericReturnValue res;
+
+    res = TEH_common_purse_deposit_parse_coin (
+      rc->connection,
+      coin,
+      json_array_get (payments,
+                      i));
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_break (0);
+      cleanup_rsc (&rsc);
+      return MHD_NO;   /* hard failure */
+    }
+    if (GNUNET_NO == res)
+    {
+      GNUNET_break_op (0);
+      cleanup_rsc (&rsc);
+      return MHD_YES;   /* failure */
+    }
+    if (0 >
+        TALER_amount_add (&rsc.total,
+                          &rsc.total,
+                          &coin->amount_minus_fee))
+    {
+      GNUNET_break (0);
+      cleanup_rsc (&rsc);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_FAILED_COMPUTE_AMOUNT,
+                                         NULL);
+    }
+  }
+
+  {
+    struct TEH_KeyStateHandle *keys;
+
+    keys = TEH_keys_get_state ();
+    if (NULL == keys)
+    {
+      GNUNET_break (0);
+      cleanup_rsc (&rsc);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                         NULL);
+    }
+    rsc.gf = TEH_keys_global_fee_by_time (keys,
+                                          rsc.timestamp);
+  }
+  if (NULL == rsc.gf)
+  {
+    GNUNET_break (0);
+    cleanup_rsc (&rsc);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                       TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
+                                       NULL);
+  }
+
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_open_verify (&rsc.reserve_payment,
+                                        rsc.timestamp,
+                                        rsc.desired_expiration,
+                                        rsc.purse_limit,
+                                        reserve_pub,
+                                        &rsc.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    cleanup_rsc (&rsc);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_FORBIDDEN,
+                                       TALER_EC_EXCHANGE_RESERVES_OPEN_BAD_SIGNATURE,
+                                       NULL);
+  }
+
+  {
+    MHD_RESULT mhd_ret;
+
+    if (GNUNET_OK !=
+        TEH_DB_run_transaction (rc->connection,
+                                "reserve open",
+                                TEH_MT_REQUEST_OTHER,
+                                &mhd_ret,
+                                &reserve_open_transaction,
+                                &rsc))
+    {
+      cleanup_rsc (&rsc);
+      return mhd_ret;
+    }
+  }
+
+  {
+    MHD_RESULT mhd_ret;
+
+    mhd_ret = reply_reserve_open_success (rc->connection,
+                                          &rsc);
+    cleanup_rsc (&rsc);
+    return mhd_ret;
+  }
+}
+
+
+/* end of taler-exchange-httpd_reserves_open.c */
diff --git a/src/exchange/taler-exchange-httpd_reserves_open.h b/src/exchange/taler-exchange-httpd_reserves_open.h
new file mode 100644
index 000000000..e28c22c0b
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_reserves_open.h
@@ -0,0 +1,41 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler-exchange-httpd_reserves_open.h
+ * @brief Handle /reserves/$RESERVE_PUB/open requests
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_RESERVES_OPEN_H
+#define TALER_EXCHANGE_HTTPD_RESERVES_OPEN_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Handle a POST "/reserves/$RID/open" request.
+ *
+ * @param rc request context
+ * @param reserve_pub public key of the reserve
+ * @param root uploaded body from the client
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_handler_reserves_open (struct TEH_RequestContext *rc,
+                           const struct TALER_ReservePublicKeyP *reserve_pub,
+                           const json_t *root);
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c
index 77321b2c5..5e06db206 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.c
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -27,6 +27,7 @@
 #include <microhttpd.h>
 #include <pthread.h>
 #include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_reserves_purse.h"
 #include "taler-exchange-httpd_responses.h"
@@ -56,11 +57,6 @@ struct ReservePurseContext
   struct TALER_ReserveSignatureP reserve_sig;
 
   /**
-   * Total amount to be put into the purse.
-   */
-  struct TALER_Amount amount;
-
-  /**
    * Purse fee the client is willing to pay.
    */
   struct TALER_Amount purse_fee;
@@ -71,11 +67,6 @@ struct ReservePurseContext
   struct TALER_Amount deposit_total;
 
   /**
-   * When should the purse expire.
-   */
-  struct GNUNET_TIME_Timestamp purse_expiration;
-
-  /**
    * Merge time.
    */
   struct GNUNET_TIME_Timestamp merge_timestamp;
@@ -86,6 +77,11 @@ struct ReservePurseContext
   struct GNUNET_TIME_Timestamp exchange_timestamp;
 
   /**
+   * Details about an encrypted contract, if any.
+   */
+  struct TALER_EncryptedContract econtract;
+
+  /**
    * Merge key for the purse.
    */
   struct TALER_PurseMergePublicKeyP merge_pub;
@@ -96,39 +92,24 @@ struct ReservePurseContext
   struct TALER_PurseMergeSignatureP merge_sig;
 
   /**
-   * Contract decryption key for the purse.
-   */
-  struct TALER_ContractDiffiePublicP contract_pub;
-
-  /**
-   * Public key of the purse we are creating.
-   */
-  struct TALER_PurseContractPublicKeyP purse_pub;
-
-  /**
    * Signature of the client affiming this request.
    */
   struct TALER_PurseContractSignatureP purse_sig;
 
   /**
-   * Signature of the client affiming this encrypted contract.
+   * Fundamental details about the purse.
    */
-  struct TALER_PurseContractSignatureP econtract_sig;
+  struct TEH_PurseDetails pd;
 
   /**
-   * Hash of the contract terms of the purse.
+   * Hash of the @e payto_uri.
    */
-  struct TALER_PrivateContractHashP h_contract_terms;
+  struct TALER_PaytoHashP h_payto;
 
   /**
-   * Encrypted contract, can be NULL.
+   * KYC status of the operation.
    */
-  void *econtract;
-
-  /**
-   * Number of bytes in @e econtract.
-   */
-  size_t econtract_size;
+  struct TALER_EXCHANGEDB_KycStatus kyc;
 
   /**
    * Minimum age for deposits into this purse.
@@ -139,53 +120,52 @@ struct ReservePurseContext
    * Flags for the operation.
    */
   enum TALER_WalletAccountMergeFlags flags;
+
+  /**
+   * Do we lack an @e econtract?
+   */
+  bool no_econtract;
+
 };
 
 
 /**
- * Send confirmation of purse creation success to client.
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Called within a database transaction, so must
+ * not start a new one.
  *
- * @param connection connection to the client
- * @param rpc details about the request that succeeded
- * @return MHD result code
+ * @param cls a `struct ReservePurseContext`
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
  */
-static MHD_RESULT
-reply_purse_success (struct MHD_Connection *connection,
-                     const struct ReservePurseContext *rpc)
+static void
+amount_iterator (void *cls,
+                 struct GNUNET_TIME_Absolute limit,
+                 TALER_EXCHANGEDB_KycAmountCallback cb,
+                 void *cb_cls)
 {
-  struct TALER_ExchangePublicKeyP pub;
-  struct TALER_ExchangeSignatureP sig;
-  enum TALER_ErrorCode ec;
-
-  if (TALER_EC_NONE !=
-      (ec = TALER_exchange_online_purse_created_sign (
-         &TEH_keys_exchange_sign_,
-         rpc->exchange_timestamp,
-         rpc->purse_expiration,
-         &rpc->amount,
-         &rpc->deposit_total,
-         &rpc->purse_pub,
-         &rpc->merge_pub,
-         &rpc->h_contract_terms,
-         &pub,
-         &sig)))
-  {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_ec (connection,
-                                    ec,
-                                    NULL);
-  }
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_amount ("total_deposited",
-                            &rpc->deposit_total),
-    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
-                                rpc->exchange_timestamp),
-    GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                &sig),
-    GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                &pub));
+  struct ReservePurseContext *rpc = cls;
+  enum GNUNET_DB_QueryStatus qs;
+
+  cb (cb_cls,
+      &rpc->deposit_total,
+      GNUNET_TIME_absolute_get ());
+  qs = TEH_plugin->select_merge_amounts_for_kyc_check (
+    TEH_plugin->cls,
+    &rpc->h_payto,
+    limit,
+    cb,
+    cb_cls);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Got %d additional transactions for this merge and limit %llu\n",
+              qs,
+              (unsigned long long) limit.abs_value_us);
+  GNUNET_break (qs >= 0);
 }
 
 
@@ -209,27 +189,72 @@ purse_transaction (void *cls,
 {
   struct ReservePurseContext *rpc = cls;
   enum GNUNET_DB_QueryStatus qs;
+  char *required;
+
+  qs = TALER_KYCLOGIC_kyc_test_required (
+    TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE,
+    &rpc->h_payto,
+    TEH_plugin->select_satisfied_kyc_processes,
+    TEH_plugin->cls,
+    &amount_iterator,
+    rpc,
+    &required);
+  if (qs < 0)
+  {
+    if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
+      return qs;
+    GNUNET_break (0);
+    *mhd_ret =
+      TALER_MHD_reply_with_error (connection,
+                                  MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                  TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                  "kyc_test_required");
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  if (NULL != required)
+  {
+    rpc->kyc.ok = false;
+    qs = TEH_plugin->insert_kyc_requirement_for_account (
+      TEH_plugin->cls,
+      required,
+      &rpc->h_payto,
+      rpc->reserve_pub,
+      &rpc->kyc.requirement_row);
+    GNUNET_free (required);
+    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
+    {
+      GNUNET_break (0);
+      *mhd_ret
+        = TALER_MHD_reply_with_error (connection,
+                                      MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                      TALER_EC_GENERIC_DB_STORE_FAILED,
+                                      "insert_kyc_requirement_for_account");
+    }
+    return qs;
+  }
+  rpc->kyc.ok = true;
 
   {
     bool in_conflict = true;
+
     /* 1) store purse */
-    qs = TEH_plugin->insert_purse_request (TEH_plugin->cls,
-                                           &rpc->purse_pub,
-                                           &rpc->merge_pub,
-                                           rpc->purse_expiration,
-                                           &rpc->h_contract_terms,
-                                           rpc->min_age,
-                                           rpc->flags,
-                                           &rpc->purse_fee,
-                                           &rpc->amount,
-                                           &rpc->purse_sig,
-                                           &in_conflict);
+    qs = TEH_plugin->insert_purse_request (
+      TEH_plugin->cls,
+      &rpc->pd.purse_pub,
+      &rpc->merge_pub,
+      rpc->pd.purse_expiration,
+      &rpc->pd.h_contract_terms,
+      rpc->min_age,
+      rpc->flags,
+      &rpc->purse_fee,
+      &rpc->pd.target_amount,
+      &rpc->purse_sig,
+      &in_conflict);
     if (qs < 0)
     {
       if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
         return qs;
-      TALER_LOG_WARNING (
-        "Failed to store purse purse information in database\n");
+      GNUNET_break (0);
       *mhd_ret =
         TALER_MHD_reply_with_error (connection,
                                     MHD_HTTP_INTERNAL_SERVER_ERROR,
@@ -250,15 +275,16 @@ purse_transaction (void *cls,
       uint32_t min_age;
 
       TEH_plugin->rollback (TEH_plugin->cls);
-      qs = TEH_plugin->select_purse_request (TEH_plugin->cls,
-                                             &rpc->purse_pub,
-                                             &merge_pub,
-                                             &purse_expiration,
-                                             &h_contract_terms,
-                                             &min_age,
-                                             &target_amount,
-                                             &balance,
-                                             &purse_sig);
+      qs = TEH_plugin->get_purse_request (
+        TEH_plugin->cls,
+        &rpc->pd.purse_pub,
+        &merge_pub,
+        &purse_expiration,
+        &h_contract_terms,
+        &min_age,
+        &target_amount,
+        &balance,
+        &purse_sig);
       if (qs <= 0)
       {
         GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
@@ -290,16 +316,21 @@ purse_transaction (void *cls,
                                         &merge_pub));
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
+
   }
 
   /* 2) create purse with reserve (and debit reserve for purse creation!) */
   {
     bool in_conflict = true;
     bool insufficient_funds = true;
+    bool no_reserve = true;
 
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Creating purse with flags %d\n",
+                rpc->flags);
     qs = TEH_plugin->do_reserve_purse (
       TEH_plugin->cls,
-      &rpc->purse_pub,
+      &rpc->pd.purse_pub,
       &rpc->merge_sig,
       rpc->merge_timestamp,
       &rpc->reserve_sig,
@@ -309,6 +340,7 @@ purse_transaction (void *cls,
       : &rpc->gf->fees.purse,
       rpc->reserve_pub,
       &in_conflict,
+      &no_reserve,
       &insufficient_funds);
     if (qs < 0)
     {
@@ -331,6 +363,7 @@ purse_transaction (void *cls,
       struct GNUNET_TIME_Timestamp merge_timestamp;
       char *partner_url;
       struct TALER_ReservePublicKeyP reserve_pub;
+      bool refunded;
 
       TEH_plugin->rollback (TEH_plugin->cls);
       qs = TEH_plugin->select_purse_merge (
@@ -339,7 +372,8 @@ purse_transaction (void *cls,
         &merge_sig,
         &merge_timestamp,
         &partner_url,
-        &reserve_pub);
+        &reserve_pub,
+        &refunded);
       if (qs <= 0)
       {
         GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR != qs);
@@ -352,6 +386,18 @@ purse_transaction (void *cls,
                                                "select purse merge");
         return GNUNET_DB_STATUS_HARD_ERROR;
       }
+      if (refunded)
+      {
+        /* This is a bit of a strange case ... */
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Purse was already refunded\n");
+        *mhd_ret = TALER_MHD_reply_with_error (connection,
+                                               MHD_HTTP_GONE,
+                                               TALER_EC_EXCHANGE_GENERIC_PURSE_EXPIRED,
+                                               NULL);
+        GNUNET_free (partner_url);
+        return GNUNET_DB_STATUS_HARD_ERROR;
+      }
       *mhd_ret
         = TALER_MHD_REPLY_JSON_PACK (
             connection,
@@ -371,6 +417,19 @@ purse_transaction (void *cls,
       GNUNET_free (partner_url);
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
+    if ( (no_reserve) &&
+         ( (TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA
+            == rpc->flags) ||
+           (! TALER_amount_is_zero (&rpc->gf->fees.purse)) ) )
+    {
+      *mhd_ret
+        = TALER_MHD_REPLY_JSON_PACK (
+            connection,
+            MHD_HTTP_NOT_FOUND,
+            TALER_JSON_pack_ec (
+              TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN));
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
     if (insufficient_funds)
     {
       *mhd_ret
@@ -383,16 +442,13 @@ purse_transaction (void *cls,
     }
   }
   /* 3) if present, persist contract */
-  if (NULL != rpc->econtract)
+  if (! rpc->no_econtract)
   {
     bool in_conflict = true;
 
     qs = TEH_plugin->insert_contract (TEH_plugin->cls,
-                                      &rpc->purse_pub,
-                                      &rpc->contract_pub,
-                                      rpc->econtract_size,
-                                      rpc->econtract,
-                                      &rpc->econtract_sig,
+                                      &rpc->pd.purse_pub,
+                                      &rpc->econtract,
                                       &in_conflict);
     if (qs < 0)
     {
@@ -407,18 +463,13 @@ purse_transaction (void *cls,
     }
     if (in_conflict)
     {
-      struct TALER_ContractDiffiePublicP pub_ckey;
-      struct TALER_PurseContractSignatureP econtract_sig;
-      size_t econtract_size;
-      void *econtract;
+      struct TALER_EncryptedContract econtract;
       struct GNUNET_HashCode h_econtract;
 
-      qs = TEH_plugin->select_contract_by_purse (TEH_plugin->cls,
-                                                 &rpc->purse_pub,
-                                                 &pub_ckey,
-                                                 &econtract_sig,
-                                                 &econtract_size,
-                                                 &econtract);
+      qs = TEH_plugin->select_contract_by_purse (
+        TEH_plugin->cls,
+        &rpc->pd.purse_pub,
+        &econtract);
       if (qs <= 0)
       {
         if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
@@ -432,8 +483,8 @@ purse_transaction (void *cls,
                                                "select contract");
         return GNUNET_DB_STATUS_HARD_ERROR;
       }
-      GNUNET_CRYPTO_hash (econtract,
-                          econtract_size,
+      GNUNET_CRYPTO_hash (econtract.econtract,
+                          econtract.econtract_size,
                           &h_econtract);
       *mhd_ret
         = TALER_MHD_REPLY_JSON_PACK (
@@ -444,9 +495,10 @@ purse_transaction (void *cls,
             GNUNET_JSON_pack_data_auto ("h_econtract",
                                         &h_econtract),
             GNUNET_JSON_pack_data_auto ("econtract_sig",
-                                        &econtract_sig),
-            GNUNET_JSON_pack_data_auto ("pub_ckey",
-                                        &pub_ckey));
+                                        &econtract.econtract_sig),
+            GNUNET_JSON_pack_data_auto ("contract_pub",
+                                        &econtract.contract_pub));
+      GNUNET_free (econtract.econtract);
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
   }
@@ -469,7 +521,7 @@ TEH_handler_reserves_purse (
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount ("purse_value",
                             TEH_currency,
-                            &rpc.amount),
+                            &rpc.pd.target_amount),
     GNUNET_JSON_spec_uint32 ("min_age",
                              &rpc.min_age),
     GNUNET_JSON_spec_mark_optional (
@@ -478,18 +530,9 @@ TEH_handler_reserves_purse (
                               &rpc.purse_fee),
       &no_purse_fee),
     GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_varsize ("econtract",
-                                &rpc.econtract,
-                                &rpc.econtract_size),
-      NULL),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("econtract_sig",
-                                   &rpc.econtract_sig),
-      NULL),
-    GNUNET_JSON_spec_mark_optional (
-      GNUNET_JSON_spec_fixed_auto ("contract_pub",
-                                   &rpc.contract_pub),
-      NULL),
+      TALER_JSON_spec_econtract ("econtract",
+                                 &rpc.econtract),
+      &rpc.no_econtract),
     GNUNET_JSON_spec_fixed_auto ("merge_pub",
                                  &rpc.merge_pub),
     GNUNET_JSON_spec_fixed_auto ("merge_sig",
@@ -497,15 +540,15 @@ TEH_handler_reserves_purse (
     GNUNET_JSON_spec_fixed_auto ("reserve_sig",
                                  &rpc.reserve_sig),
     GNUNET_JSON_spec_fixed_auto ("purse_pub",
-                                 &rpc.purse_pub),
+                                 &rpc.pd.purse_pub),
     GNUNET_JSON_spec_fixed_auto ("purse_sig",
                                  &rpc.purse_sig),
     GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                 &rpc.h_contract_terms),
+                                 &rpc.pd.h_contract_terms),
     GNUNET_JSON_spec_timestamp ("merge_timestamp",
                                 &rpc.merge_timestamp),
     GNUNET_JSON_spec_timestamp ("purse_expiration",
-                                &rpc.purse_expiration),
+                                &rpc.pd.purse_expiration),
     GNUNET_JSON_spec_end ()
   };
 
@@ -526,10 +569,39 @@ TEH_handler_reserves_purse (
       return MHD_YES; /* failure */
     }
   }
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (TEH_base_url,
+                                          reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &rpc.h_payto);
+    TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+    if (GNUNET_OK !=
+        TALER_wallet_purse_merge_verify (payto_uri,
+                                         rpc.merge_timestamp,
+                                         &rpc.pd.purse_pub,
+                                         &rpc.merge_pub,
+                                         &rpc.merge_sig))
+    {
+      MHD_RESULT ret;
+
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      ret = TALER_MHD_reply_with_error (
+        connection,
+        MHD_HTTP_FORBIDDEN,
+        TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
+        payto_uri);
+      GNUNET_free (payto_uri);
+      return ret;
+    }
+    GNUNET_free (payto_uri);
+  }
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (TEH_currency,
                                         &rpc.deposit_total));
-  if (GNUNET_TIME_timestamp_cmp (rpc.purse_expiration,
+  if (GNUNET_TIME_timestamp_cmp (rpc.pd.purse_expiration,
                                  <,
                                  rpc.exchange_timestamp))
   {
@@ -540,7 +612,7 @@ TEH_handler_reserves_purse (
                                        TALER_EC_EXCHANGE_RESERVES_PURSE_EXPIRATION_BEFORE_NOW,
                                        NULL);
   }
-  if (GNUNET_TIME_absolute_is_never (rpc.purse_expiration.abs_time))
+  if (GNUNET_TIME_absolute_is_never (rpc.pd.purse_expiration.abs_time))
   {
     GNUNET_break_op (0);
     GNUNET_JSON_parse_free (spec);
@@ -549,8 +621,22 @@ TEH_handler_reserves_purse (
                                        TALER_EC_EXCHANGE_RESERVES_PURSE_EXPIRATION_IS_NEVER,
                                        NULL);
   }
-  rpc.gf = TEH_keys_global_fee_by_time (TEH_keys_get_state (),
-                                        rpc.exchange_timestamp);
+  {
+    struct TEH_KeyStateHandle *keys;
+
+    keys = TEH_keys_get_state ();
+    if (NULL == keys)
+    {
+      GNUNET_break (0);
+      GNUNET_JSON_parse_free (spec);
+      return TALER_MHD_reply_with_error (connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
+                                         NULL);
+    }
+    rpc.gf = TEH_keys_global_fee_by_time (keys,
+                                          rpc.exchange_timestamp);
+  }
   if (NULL == rpc.gf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -564,8 +650,9 @@ TEH_handler_reserves_purse (
   if (no_purse_fee)
   {
     rpc.flags = TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA;
-    TALER_amount_set_zero (TEH_currency,
-                           &rpc.purse_fee);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (TEH_currency,
+                                          &rpc.purse_fee));
   }
   else
   {
@@ -585,12 +672,12 @@ TEH_handler_reserves_purse (
   }
   TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
   if (GNUNET_OK !=
-      TALER_wallet_purse_create_verify (rpc.purse_expiration,
-                                        &rpc.h_contract_terms,
+      TALER_wallet_purse_create_verify (rpc.pd.purse_expiration,
+                                        &rpc.pd.h_contract_terms,
                                         &rpc.merge_pub,
                                         rpc.min_age,
-                                        &rpc.amount,
-                                        &rpc.purse_pub,
+                                        &rpc.pd.target_amount,
+                                        &rpc.pd.purse_pub,
                                         &rpc.purse_sig))
   {
     GNUNET_break_op (0);
@@ -602,26 +689,11 @@ TEH_handler_reserves_purse (
       NULL);
   }
   if (GNUNET_OK !=
-      TALER_wallet_purse_merge_verify (TEH_base_url,
-                                       rpc.merge_timestamp,
-                                       &rpc.purse_pub,
-                                       &rpc.merge_pub,
-                                       &rpc.merge_sig))
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (
-      connection,
-      MHD_HTTP_FORBIDDEN,
-      TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
-      NULL);
-  }
-  if (GNUNET_OK !=
       TALER_wallet_account_merge_verify (rpc.merge_timestamp,
-                                         &rpc.purse_pub,
-                                         rpc.purse_expiration,
-                                         &rpc.h_contract_terms,
-                                         &rpc.amount,
+                                         &rpc.pd.purse_pub,
+                                         rpc.pd.purse_expiration,
+                                         &rpc.pd.h_contract_terms,
+                                         &rpc.pd.target_amount,
                                          &rpc.purse_fee,
                                          rpc.min_age,
                                          rpc.flags,
@@ -633,16 +705,16 @@ TEH_handler_reserves_purse (
     return TALER_MHD_reply_with_error (
       connection,
       MHD_HTTP_FORBIDDEN,
-      TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
+      TALER_EC_EXCHANGE_RESERVES_RESERVE_MERGE_SIGNATURE_INVALID,
       NULL);
   }
-  if ( (NULL != rpc.econtract) &&
+  if ( (! rpc.no_econtract) &&
        (GNUNET_OK !=
-        TALER_wallet_econtract_upload_verify (rpc.econtract,
-                                              rpc.econtract_size,
-                                              &rpc.contract_pub,
-                                              &rpc.purse_pub,
-                                              &rpc.econtract_sig)) )
+        TALER_wallet_econtract_upload_verify (rpc.econtract.econtract,
+                                              rpc.econtract.econtract_size,
+                                              &rpc.econtract.contract_pub,
+                                              &rpc.pd.purse_pub,
+                                              &rpc.econtract.econtract_sig)) )
   {
     TALER_LOG_WARNING ("Invalid signature on /reserves/$PID/purse request\n");
     GNUNET_JSON_parse_free (spec);
@@ -681,12 +753,18 @@ TEH_handler_reserves_purse (
     }
   }
 
+  if (! rpc.kyc.ok)
+    return TEH_RESPONSE_reply_kyc_required (connection,
+                                            &rpc.h_payto,
+                                            &rpc.kyc);
   /* generate regular response */
   {
     MHD_RESULT res;
 
-    res = reply_purse_success (connection,
-                               &rpc);
+    res = TEH_RESPONSE_reply_purse_created (connection,
+                                            rpc.exchange_timestamp,
+                                            &rpc.deposit_total,
+                                            &rpc.pd);
     GNUNET_JSON_parse_free (spec);
     return res;
   }
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.h b/src/exchange/taler-exchange-httpd_reserves_purse.h
index 6d899a912..017e357d2 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.h
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.h
@@ -33,7 +33,7 @@
  * will ultimately lead to the "purses create" being executed, or rejected.
  *
  * @param rc request context
- * @param purse_pub public key of the purse
+ * @param reserve_pub public key of the reserve
  * @param root uploaded JSON data
  * @return MHD result code
  */
diff --git a/src/exchange/taler-exchange-httpd_reserves_status.c b/src/exchange/taler-exchange-httpd_reserves_status.c
deleted file mode 100644
index 6a3260d12..000000000
--- a/src/exchange/taler-exchange-httpd_reserves_status.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-  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 Affero 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_reserves_status.c
- * @brief Handle /reserves/$RESERVE_PUB STATUS requests
- * @author Florian Dold
- * @author Benedikt Mueller
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <jansson.h>
-#include "taler_mhd_lib.h"
-#include "taler_json_lib.h"
-#include "taler_dbevents.h"
-#include "taler-exchange-httpd_keys.h"
-#include "taler-exchange-httpd_reserves_status.h"
-#include "taler-exchange-httpd_responses.h"
-
-/**
- * How far do we allow a client's time to be off when
- * checking the request timestamp?
- */
-#define TIMESTAMP_TOLERANCE \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-
-
-/**
- * Closure for #reserve_status_transaction.
- */
-struct ReserveStatusContext
-{
-  /**
-   * Public key of the reserve the inquiry is about.
-   */
-  const struct TALER_ReservePublicKeyP *reserve_pub;
-
-  /**
-   * History of the reserve, set in the callback.
-   */
-  struct TALER_EXCHANGEDB_ReserveHistory *rh;
-
-  /**
-   * Current reserve balance.
-   */
-  struct TALER_Amount balance;
-};
-
-
-/**
- * Send reserve status to client.
- *
- * @param connection connection to the client
- * @param rh reserve history to return
- * @return MHD result code
- */
-static MHD_RESULT
-reply_reserve_status_success (struct MHD_Connection *connection,
-                              const struct ReserveStatusContext *rhc)
-{
-  const struct TALER_EXCHANGEDB_ReserveHistory *rh = rhc->rh;
-  json_t *json_history;
-
-  json_history = TEH_RESPONSE_compile_reserve_history (rh);
-  if (NULL == json_history)
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
-                                       NULL);
-  return TALER_MHD_REPLY_JSON_PACK (
-    connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_amount ("balance",
-                            &rhc->balance),
-    GNUNET_JSON_pack_array_steal ("history",
-                                  json_history));
-}
-
-
-/**
- * Function implementing /reserves/ STATUS transaction.
- * Execute a /reserves/ STATUS.  Given the public key of a reserve,
- * return the associated transaction history.  Runs the
- * transaction logic; IF it returns a non-error code, the transaction
- * logic MUST NOT queue a MHD response.  IF it returns an hard error,
- * the transaction logic MUST queue a MHD response and set @a mhd_ret.
- * IF it returns the soft error code, the function MAY be called again
- * to retry and MUST not queue a MHD response.
- *
- * @param cls a `struct ReserveStatusContext *`
- * @param connection MHD request which triggered the transaction
- * @param[out] mhd_ret set to MHD response status for @a connection,
- *             if transaction failed (!); unused
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-reserve_status_transaction (void *cls,
-                            struct MHD_Connection *connection,
-                            MHD_RESULT *mhd_ret)
-{
-  struct ReserveStatusContext *rsc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = TEH_plugin->get_reserve_history (TEH_plugin->cls,
-                                        rsc->reserve_pub,
-                                        &rsc->balance,
-                                        &rsc->rh);
-  if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-  {
-    GNUNET_break (0);
-    *mhd_ret
-      = TALER_MHD_reply_with_error (connection,
-                                    MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                    TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                    "get_reserve_status");
-  }
-  return qs;
-}
-
-
-MHD_RESULT
-TEH_handler_reserves_status (struct TEH_RequestContext *rc,
-                             const struct TALER_ReservePublicKeyP *reserve_pub,
-                             const json_t *root)
-{
-  struct ReserveStatusContext rsc;
-  MHD_RESULT mhd_ret;
-  struct GNUNET_TIME_Timestamp timestamp;
-  struct TALER_ReserveSignatureP reserve_sig;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_timestamp ("request_timestamp",
-                                &timestamp),
-    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
-                                 &reserve_sig),
-    GNUNET_JSON_spec_end ()
-  };
-  struct GNUNET_TIME_Timestamp now;
-
-  rsc.reserve_pub = reserve_pub;
-  {
-    enum GNUNET_GenericReturnValue res;
-
-    res = TALER_MHD_parse_json_data (rc->connection,
-                                     root,
-                                     spec);
-    if (GNUNET_SYSERR == res)
-    {
-      GNUNET_break (0);
-      return MHD_NO; /* hard failure */
-    }
-    if (GNUNET_NO == res)
-    {
-      GNUNET_break_op (0);
-      return MHD_YES; /* failure */
-    }
-  }
-  now = GNUNET_TIME_timestamp_get ();
-  if (! GNUNET_TIME_absolute_approx_eq (now.abs_time,
-                                        timestamp.abs_time,
-                                        TIMESTAMP_TOLERANCE))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_BAD_REQUEST,
-                                       TALER_EC_EXCHANGE_GENERIC_CLOCK_SKEW,
-                                       NULL);
-  }
-  if (GNUNET_OK !=
-      TALER_wallet_reserve_status_verify (timestamp,
-                                          reserve_pub,
-                                          &reserve_sig))
-  {
-    GNUNET_break_op (0);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_FORBIDDEN,
-                                       TALER_EC_EXCHANGE_RESERVES_STATUS_BAD_SIGNATURE,
-                                       NULL);
-  }
-  rsc.rh = NULL;
-  if (GNUNET_OK !=
-      TEH_DB_run_transaction (rc->connection,
-                              "get reserve status",
-                              TEH_MT_REQUEST_OTHER,
-                              &mhd_ret,
-                              &reserve_status_transaction,
-                              &rsc))
-  {
-    return mhd_ret;
-  }
-  if (NULL == rsc.rh)
-  {
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_NOT_FOUND,
-                                       TALER_EC_EXCHANGE_RESERVES_STATUS_UNKNOWN,
-                                       NULL);
-  }
-  mhd_ret = reply_reserve_status_success (rc->connection,
-                                          &rsc);
-  TEH_plugin->free_reserve_history (TEH_plugin->cls,
-                                    rsc.rh);
-  return mhd_ret;
-}
-
-
-/* end of taler-exchange-httpd_reserves_status.c */
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c
index 4d40303bd..8993ea50f 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -23,382 +23,17 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include <gnunet/gnunet_json_lib.h>
+#include <microhttpd.h>
 #include <zlib.h>
 #include "taler-exchange-httpd_responses.h"
+#include "taler_exchangedb_plugin.h"
 #include "taler_util.h"
 #include "taler_json_lib.h"
 #include "taler_mhd_lib.h"
 #include "taler-exchange-httpd_keys.h"
 
 
-/**
- * Compile the transaction history of a coin into a JSON object.
- *
- * @param coin_pub public key of the coin
- * @param tl transaction history to JSON-ify
- * @return json representation of the @a rh, NULL on error
- */
-json_t *
-TEH_RESPONSE_compile_transaction_history (
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_EXCHANGEDB_TransactionList *tl)
-{
-  json_t *history;
-
-  history = json_array ();
-  if (NULL == history)
-  {
-    GNUNET_break (0); /* out of memory!? */
-    return NULL;
-  }
-  for (const struct TALER_EXCHANGEDB_TransactionList *pos = tl;
-       NULL != pos;
-       pos = pos->next)
-  {
-    switch (pos->type)
-    {
-    case TALER_EXCHANGEDB_TT_DEPOSIT:
-      {
-        const struct TALER_EXCHANGEDB_DepositListEntry *deposit =
-          pos->details.deposit;
-        struct TALER_MerchantWireHashP h_wire;
-
-        TALER_merchant_wire_signature_hash (deposit->receiver_wire_account,
-                                            &deposit->wire_salt,
-                                            &h_wire);
-#if ENABLE_SANITY_CHECKS
-        /* internal sanity check before we hand out a bogus sig... */
-        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-        if (GNUNET_OK !=
-            TALER_wallet_deposit_verify (&deposit->amount_with_fee,
-                                         &deposit->deposit_fee,
-                                         &h_wire,
-                                         &deposit->h_contract_terms,
-                                         &deposit->h_age_commitment,
-                                         NULL /* h_extensions! */,
-                                         &deposit->h_denom_pub,
-                                         deposit->timestamp,
-                                         &deposit->merchant_pub,
-                                         deposit->refund_deadline,
-                                         coin_pub,
-                                         &deposit->csig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-#endif
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "DEPOSIT"),
-                TALER_JSON_pack_amount ("amount",
-                                        &deposit->amount_with_fee),
-                TALER_JSON_pack_amount ("deposit_fee",
-                                        &deposit->deposit_fee),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            deposit->timestamp),
-                GNUNET_JSON_pack_allow_null (
-                  GNUNET_JSON_pack_timestamp ("refund_deadline",
-                                              deposit->refund_deadline)),
-                GNUNET_JSON_pack_data_auto ("merchant_pub",
-                                            &deposit->merchant_pub),
-                GNUNET_JSON_pack_data_auto ("h_contract_terms",
-                                            &deposit->h_contract_terms),
-                GNUNET_JSON_pack_data_auto ("h_wire",
-                                            &h_wire),
-                GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                            &deposit->h_denom_pub),
-                GNUNET_JSON_pack_allow_null (
-                  deposit->no_age_commitment ?
-                  GNUNET_JSON_pack_string (
-                    "h_age_commitment", NULL) :
-                  GNUNET_JSON_pack_data_auto ("h_age_commitment",
-                                              &deposit->h_age_commitment)),
-                GNUNET_JSON_pack_data_auto ("coin_sig",
-                                            &deposit->csig))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        break;
-      }
-    case TALER_EXCHANGEDB_TT_MELT:
-      {
-        const struct TALER_EXCHANGEDB_MeltListEntry *melt =
-          pos->details.melt;
-        const struct TALER_AgeCommitmentHash *phac = NULL;
-
-#if ENABLE_SANITY_CHECKS
-        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-        if (GNUNET_OK !=
-            TALER_wallet_melt_verify (&melt->amount_with_fee,
-                                      &melt->melt_fee,
-                                      &melt->rc,
-                                      &melt->h_denom_pub,
-                                      &melt->h_age_commitment,
-                                      coin_pub,
-                                      &melt->coin_sig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-#endif
-
-        /* Age restriction is optional.  We communicate a NULL value to
-         * JSON_PACK below */
-        if (! melt->no_age_commitment)
-          phac = &melt->h_age_commitment;
-
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "MELT"),
-                TALER_JSON_pack_amount ("amount",
-                                        &melt->amount_with_fee),
-                TALER_JSON_pack_amount ("melt_fee",
-                                        &melt->melt_fee),
-                GNUNET_JSON_pack_data_auto ("rc",
-                                            &melt->rc),
-                GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                            &melt->h_denom_pub),
-                GNUNET_JSON_pack_allow_null (
-                  GNUNET_JSON_pack_data_auto ("h_age_commitment",
-                                              phac)),
-                GNUNET_JSON_pack_data_auto ("coin_sig",
-                                            &melt->coin_sig))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-      }
-      break;
-    case TALER_EXCHANGEDB_TT_REFUND:
-      {
-        const struct TALER_EXCHANGEDB_RefundListEntry *refund =
-          pos->details.refund;
-        struct TALER_Amount value;
-
-#if ENABLE_SANITY_CHECKS
-        TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-        if (GNUNET_OK !=
-            TALER_merchant_refund_verify (coin_pub,
-                                          &refund->h_contract_terms,
-                                          refund->rtransaction_id,
-                                          &refund->refund_amount,
-                                          &refund->merchant_pub,
-                                          &refund->merchant_sig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-#endif
-        if (0 >
-            TALER_amount_subtract (&value,
-                                   &refund->refund_amount,
-                                   &refund->refund_fee))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "REFUND"),
-                TALER_JSON_pack_amount ("amount",
-                                        &value),
-                TALER_JSON_pack_amount ("refund_fee",
-                                        &refund->refund_fee),
-                GNUNET_JSON_pack_data_auto ("h_contract_terms",
-                                            &refund->h_contract_terms),
-                GNUNET_JSON_pack_data_auto ("merchant_pub",
-                                            &refund->merchant_pub),
-                GNUNET_JSON_pack_uint64 ("rtransaction_id",
-                                         refund->rtransaction_id),
-                GNUNET_JSON_pack_data_auto ("merchant_sig",
-                                            &refund->merchant_sig))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-      }
-      break;
-    case TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP:
-      {
-        struct TALER_EXCHANGEDB_RecoupRefreshListEntry *pr =
-          pos->details.old_coin_recoup;
-        struct TALER_ExchangePublicKeyP epub;
-        struct TALER_ExchangeSignatureP esig;
-
-        if (TALER_EC_NONE !=
-            TALER_exchange_online_confirm_recoup_refresh_sign (
-              &TEH_keys_exchange_sign_,
-              pr->timestamp,
-              &pr->value,
-              &pr->coin.coin_pub,
-              &pr->old_coin_pub,
-              &epub,
-              &esig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        /* NOTE: we could also provide coin_pub's coin_sig, denomination key hash and
-           the denomination key's RSA signature over coin_pub, but as the
-           wallet should really already have this information (and cannot
-           check or do anything with it anyway if it doesn't), it seems
-           strictly unnecessary. */
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "OLD-COIN-RECOUP"),
-                TALER_JSON_pack_amount ("amount",
-                                        &pr->value),
-                GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                            &esig),
-                GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                            &epub),
-                GNUNET_JSON_pack_data_auto ("coin_pub",
-                                            &pr->coin.coin_pub),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            pr->timestamp))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        break;
-      }
-    case TALER_EXCHANGEDB_TT_RECOUP:
-      {
-        const struct TALER_EXCHANGEDB_RecoupListEntry *recoup =
-          pos->details.recoup;
-        struct TALER_ExchangePublicKeyP epub;
-        struct TALER_ExchangeSignatureP esig;
-
-        if (TALER_EC_NONE !=
-            TALER_exchange_online_confirm_recoup_sign (
-              &TEH_keys_exchange_sign_,
-              recoup->timestamp,
-              &recoup->value,
-              coin_pub,
-              &recoup->reserve_pub,
-              &epub,
-              &esig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "RECOUP"),
-                TALER_JSON_pack_amount ("amount",
-                                        &recoup->value),
-                GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                            &esig),
-                GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                            &epub),
-                GNUNET_JSON_pack_data_auto ("reserve_pub",
-                                            &recoup->reserve_pub),
-                GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                            &recoup->h_denom_pub),
-                GNUNET_JSON_pack_data_auto ("coin_sig",
-                                            &recoup->coin_sig),
-                GNUNET_JSON_pack_data_auto ("coin_blind",
-                                            &recoup->coin_blind),
-                GNUNET_JSON_pack_data_auto ("reserve_pub",
-                                            &recoup->reserve_pub),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            recoup->timestamp))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-      }
-      break;
-    case TALER_EXCHANGEDB_TT_RECOUP_REFRESH:
-      {
-        struct TALER_EXCHANGEDB_RecoupRefreshListEntry *pr =
-          pos->details.recoup_refresh;
-        struct TALER_ExchangePublicKeyP epub;
-        struct TALER_ExchangeSignatureP esig;
-
-        if (TALER_EC_NONE !=
-            TALER_exchange_online_confirm_recoup_refresh_sign (
-              &TEH_keys_exchange_sign_,
-              pr->timestamp,
-              &pr->value,
-              coin_pub,
-              &pr->old_coin_pub,
-              &epub,
-              &esig))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        /* NOTE: we could also provide coin_pub's coin_sig, denomination key
-           hash and the denomination key's RSA signature over coin_pub, but as
-           the wallet should really already have this information (and cannot
-           check or do anything with it anyway if it doesn't), it seems
-           strictly unnecessary. *///
-        if (0 !=
-            json_array_append_new (
-              history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "RECOUP-REFRESH"),
-                TALER_JSON_pack_amount ("amount",
-                                        &pr->value),
-                GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                            &esig),
-                GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                            &epub),
-                GNUNET_JSON_pack_data_auto ("old_coin_pub",
-                                            &pr->old_coin_pub),
-                GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                            &pr->coin.denom_pub_hash),
-                GNUNET_JSON_pack_data_auto ("coin_sig",
-                                            &pr->coin_sig),
-                GNUNET_JSON_pack_data_auto ("coin_blind",
-                                            &pr->coin_blind),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            pr->timestamp))))
-        {
-          GNUNET_break (0);
-          json_decref (history);
-          return NULL;
-        }
-        break;
-      }
-    default:
-      GNUNET_assert (0);
-    }
-  }
-  return history;
-}
-
-
 MHD_RESULT
 TEH_RESPONSE_reply_unknown_denom_pub_hash (
   struct MHD_Connection *connection,
@@ -529,303 +164,245 @@ MHD_RESULT
 TEH_RESPONSE_reply_coin_insufficient_funds (
   struct MHD_Connection *connection,
   enum TALER_ErrorCode ec,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CoinSpendPublicKeyP *coin_pub)
 {
-  struct TALER_EXCHANGEDB_TransactionList *tl;
-  enum GNUNET_DB_QueryStatus qs;
-  json_t *history;
-
-  // FIXME: maybe start read-committed transaction here?
-  // => check all callers (that they aborted already!)
-  qs = TEH_plugin->get_coin_transactions (TEH_plugin->cls,
-                                          coin_pub,
-                                          GNUNET_NO,
-                                          &tl);
-  if (0 > qs)
-  {
-    return TALER_MHD_reply_with_error (
-      connection,
-      MHD_HTTP_INTERNAL_SERVER_ERROR,
-      TALER_EC_GENERIC_DB_FETCH_FAILED,
-      NULL);
-  }
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    TALER_ErrorCode_get_http_status_safe (ec),
+    TALER_JSON_pack_ec (ec),
+    GNUNET_JSON_pack_data_auto ("coin_pub",
+                                coin_pub),
+    // FIXME - #7267: to be kept only for some of the error types!
+    GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                h_denom_pub));
+}
 
-  history = TEH_RESPONSE_compile_transaction_history (coin_pub,
-                                                      tl);
-  TEH_plugin->free_coin_transaction_list (TEH_plugin->cls,
-                                          tl);
-  if (NULL == history)
-  {
-    GNUNET_break (0);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_JSON_ALLOCATION_FAILURE,
-                                       "Failed to generated proof of insufficient funds");
-  }
+
+MHD_RESULT
+TEH_RESPONSE_reply_coin_conflicting_contract (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  const struct TALER_MerchantWireHashP *h_wire)
+{
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    TALER_ErrorCode_get_http_status_safe (ec),
+    GNUNET_JSON_pack_data_auto ("h_wire",
+                                h_wire),
+    TALER_JSON_pack_ec (ec));
+}
+
+
+MHD_RESULT
+TEH_RESPONSE_reply_coin_denomination_conflict (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_DenominationPublicKey *prev_denom_pub,
+  const struct TALER_DenominationSignature *prev_denom_sig)
+{
   return TALER_MHD_REPLY_JSON_PACK (
     connection,
     TALER_ErrorCode_get_http_status_safe (ec),
     TALER_JSON_pack_ec (ec),
     GNUNET_JSON_pack_data_auto ("coin_pub",
                                 coin_pub),
-    GNUNET_JSON_pack_array_steal ("history",
-                                  history));
+    TALER_JSON_pack_denom_pub ("prev_denom_pub",
+                               prev_denom_pub),
+    TALER_JSON_pack_denom_sig ("prev_denom_sig",
+                               prev_denom_sig)
+    );
+
 }
 
 
-json_t *
-TEH_RESPONSE_compile_reserve_history (
-  const struct TALER_EXCHANGEDB_ReserveHistory *rh)
+MHD_RESULT
+TEH_RESPONSE_reply_coin_age_commitment_conflict (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  enum TALER_EXCHANGEDB_CoinKnownStatus status,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment)
 {
-  json_t *json_history;
+  const char *conflict_detail;
 
-  json_history = json_array ();
-  for (const struct TALER_EXCHANGEDB_ReserveHistory *pos = rh;
-       NULL != pos;
-       pos = pos->next)
+  switch (status)
   {
-    switch (pos->type)
-    {
-    case TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE:
-      {
-        const struct TALER_EXCHANGEDB_BankTransfer *bank =
-          pos->details.bank;
-
-        if (0 !=
-            json_array_append_new (
-              json_history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "CREDIT"),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            bank->execution_date),
-                GNUNET_JSON_pack_string ("sender_account_url",
-                                         bank->sender_account_details),
-                GNUNET_JSON_pack_uint64 ("wire_reference",
-                                         bank->wire_reference),
-                TALER_JSON_pack_amount ("amount",
-                                        &bank->amount))))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-        break;
-      }
-    case TALER_EXCHANGEDB_RO_WITHDRAW_COIN:
-      {
-        const struct TALER_EXCHANGEDB_CollectableBlindcoin *withdraw
-          = pos->details.withdraw;
-
-        if (0 !=
-            json_array_append_new (
-              json_history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "WITHDRAW"),
-                GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                            &withdraw->reserve_sig),
-                GNUNET_JSON_pack_data_auto ("h_coin_envelope",
-                                            &withdraw->h_coin_envelope),
-                GNUNET_JSON_pack_data_auto ("h_denom_pub",
-                                            &withdraw->denom_pub_hash),
-                TALER_JSON_pack_amount ("withdraw_fee",
-                                        &withdraw->withdraw_fee),
-                TALER_JSON_pack_amount ("amount",
-                                        &withdraw->amount_with_fee))))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-      }
-      break;
-    case TALER_EXCHANGEDB_RO_RECOUP_COIN:
-      {
-        const struct TALER_EXCHANGEDB_Recoup *recoup
-          = pos->details.recoup;
-        struct TALER_ExchangePublicKeyP pub;
-        struct TALER_ExchangeSignatureP sig;
-
-        if (TALER_EC_NONE !=
-            TALER_exchange_online_confirm_recoup_sign (
-              &TEH_keys_exchange_sign_,
-              recoup->timestamp,
-              &recoup->value,
-              &recoup->coin.coin_pub,
-              &recoup->reserve_pub,
-              &pub,
-              &sig))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-
-        if (0 !=
-            json_array_append_new (
-              json_history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "RECOUP"),
-                GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                            &pub),
-                GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                            &sig),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            recoup->timestamp),
-                TALER_JSON_pack_amount ("amount",
-                                        &recoup->value),
-                GNUNET_JSON_pack_data_auto ("coin_pub",
-                                            &recoup->coin.coin_pub))))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-      }
-      break;
-    case TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK:
-      {
-        const struct TALER_EXCHANGEDB_ClosingTransfer *closing =
-          pos->details.closing;
-        struct TALER_ExchangePublicKeyP pub;
-        struct TALER_ExchangeSignatureP sig;
-
-        if (TALER_EC_NONE !=
-            TALER_exchange_online_reserve_closed_sign (
-              &TEH_keys_exchange_sign_,
-              closing->execution_date,
-              &closing->amount,
-              &closing->closing_fee,
-              closing->receiver_account_details,
-              &closing->wtid,
-              &pos->details.closing->reserve_pub,
-              &pub,
-              &sig))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-        if (0 !=
-            json_array_append_new (
-              json_history,
-              GNUNET_JSON_PACK (
-                GNUNET_JSON_pack_string ("type",
-                                         "CLOSING"),
-                GNUNET_JSON_pack_string ("receiver_account_details",
-                                         closing->receiver_account_details),
-                GNUNET_JSON_pack_data_auto ("wtid",
-                                            &closing->wtid),
-                GNUNET_JSON_pack_data_auto ("exchange_pub",
-                                            &pub),
-                GNUNET_JSON_pack_data_auto ("exchange_sig",
-                                            &sig),
-                GNUNET_JSON_pack_timestamp ("timestamp",
-                                            closing->execution_date),
-                TALER_JSON_pack_amount ("amount",
-                                        &closing->amount),
-                TALER_JSON_pack_amount ("closing_fee",
-                                        &closing->closing_fee))))
-        {
-          GNUNET_break (0);
-          json_decref (json_history);
-          return NULL;
-        }
-      }
-      break;
-    }
+
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NULL:
+    conflict_detail = "expected NULL age commitment hash";
+    h_age_commitment = NULL;
+    break;
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NON_NULL:
+    conflict_detail = "expected non-NULL age commitment hash";
+    break;
+  case TALER_EXCHANGEDB_CKS_AGE_CONFLICT_VALUE_DIFFERS:
+    conflict_detail = "expected age commitment hash differs";
+    break;
+  default:
+    GNUNET_assert (0);
   }
 
-  return json_history;
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    TALER_ErrorCode_get_http_status_safe (ec),
+    TALER_JSON_pack_ec (ec),
+    GNUNET_JSON_pack_data_auto ("coin_pub",
+                                coin_pub),
+    GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                h_denom_pub),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_data_auto ("expected_age_commitment_hash",
+                                  h_age_commitment)),
+    GNUNET_JSON_pack_string ("conflict_detail",
+                             conflict_detail)
+    );
 }
 
 
-/**
- * Send reserve history information to client with the
- * message that we have insufficient funds for the
- * requested withdraw operation.
- *
- * @param connection connection to the client
- * @param ebalance expected balance based on our database
- * @param withdraw_amount amount that the client requested to withdraw
- * @param rh reserve history to return
- * @return MHD result code
- */
-static MHD_RESULT
-reply_withdraw_insufficient_funds (
+MHD_RESULT
+TEH_RESPONSE_reply_reserve_insufficient_balance (
   struct MHD_Connection *connection,
-  const struct TALER_Amount *ebalance,
-  const struct TALER_Amount *withdraw_amount,
-  const struct TALER_EXCHANGEDB_ReserveHistory *rh)
+  enum TALER_ErrorCode ec,
+  const struct TALER_Amount *reserve_balance,
+  const struct TALER_Amount *balance_required,
+  const struct TALER_ReservePublicKeyP *reserve_pub)
 {
-  json_t *json_history;
-
-  json_history = TEH_RESPONSE_compile_reserve_history (rh);
-  if (NULL == json_history)
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_EXCHANGE_WITHDRAW_HISTORY_ERROR_INSUFFICIENT_FUNDS,
-                                       NULL);
   return TALER_MHD_REPLY_JSON_PACK (
     connection,
     MHD_HTTP_CONFLICT,
-    TALER_JSON_pack_ec (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS),
+    TALER_JSON_pack_ec (ec),
     TALER_JSON_pack_amount ("balance",
-                            ebalance),
+                            reserve_balance),
     TALER_JSON_pack_amount ("requested_amount",
-                            withdraw_amount),
-    GNUNET_JSON_pack_array_steal ("history",
-                                  json_history));
+                            balance_required));
 }
 
 
 MHD_RESULT
-TEH_RESPONSE_reply_reserve_insufficient_balance (
+TEH_RESPONSE_reply_reserve_age_restriction_required (
   struct MHD_Connection *connection,
-  const struct TALER_Amount *balance_required,
-  const struct TALER_ReservePublicKeyP *reserve_pub)
+  uint16_t maximum_allowed_age)
+{
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_CONFLICT,
+    TALER_JSON_pack_ec (TALER_EC_EXCHANGE_RESERVES_AGE_RESTRICTION_REQUIRED),
+    GNUNET_JSON_pack_uint64 ("maximum_allowed_age",
+                             maximum_allowed_age));
+}
+
+
+MHD_RESULT
+TEH_RESPONSE_reply_purse_created (
+  struct MHD_Connection *connection,
+  struct GNUNET_TIME_Timestamp exchange_timestamp,
+  const struct TALER_Amount *purse_balance,
+  const struct TEH_PurseDetails *pd)
 {
-  struct TALER_EXCHANGEDB_ReserveHistory *rh = NULL;
-  struct TALER_Amount balance;
-  enum GNUNET_DB_QueryStatus qs;
-  MHD_RESULT mhd_ret;
-
-  // FIXME: maybe start read-committed here?
-  if (GNUNET_OK !=
-      TEH_plugin->start (TEH_plugin->cls,
-                         "get_reserve_history on insufficient balance"))
+  struct TALER_ExchangePublicKeyP pub;
+  struct TALER_ExchangeSignatureP sig;
+  enum TALER_ErrorCode ec;
+
+  if (TALER_EC_NONE !=
+      (ec = TALER_exchange_online_purse_created_sign (
+         &TEH_keys_exchange_sign_,
+         exchange_timestamp,
+         pd->purse_expiration,
+         &pd->target_amount,
+         purse_balance,
+         &pd->purse_pub,
+         &pd->h_contract_terms,
+         &pub,
+         &sig)))
   {
     GNUNET_break (0);
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_DB_START_FAILED,
-                                       NULL);
+    return TALER_MHD_reply_with_ec (connection,
+                                    ec,
+                                    NULL);
   }
-  /* The reserve does not have the required amount (actual
-   * amount + withdraw fee) */
-  qs = TEH_plugin->get_reserve_history (TEH_plugin->cls,
-                                        reserve_pub,
-                                        &balance,
-                                        &rh);
-  TEH_plugin->rollback (TEH_plugin->cls);
-  if ( (qs < 0) ||
-       (NULL == rh) )
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_OK,
+    TALER_JSON_pack_amount ("total_deposited",
+                            purse_balance),
+    GNUNET_JSON_pack_timestamp ("exchange_timestamp",
+                                exchange_timestamp),
+    GNUNET_JSON_pack_data_auto ("exchange_sig",
+                                &sig),
+    GNUNET_JSON_pack_data_auto ("exchange_pub",
+                                &pub));
+}
+
+
+MHD_RESULT
+TEH_RESPONSE_reply_kyc_required (struct MHD_Connection *connection,
+                                 const struct TALER_PaytoHashP *h_payto,
+                                 const struct TALER_EXCHANGEDB_KycStatus *kyc)
+{
+  return TALER_MHD_REPLY_JSON_PACK (
+    connection,
+    MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+    TALER_JSON_pack_ec (TALER_EC_EXCHANGE_GENERIC_KYC_REQUIRED),
+    GNUNET_JSON_pack_data_auto ("h_payto",
+                                h_payto),
+    GNUNET_JSON_pack_uint64 ("requirement_row",
+                             kyc->requirement_row));
+}
+
+
+MHD_RESULT
+TEH_RESPONSE_reply_aml_blocked (struct MHD_Connection *connection,
+                                enum TALER_AmlDecisionState status)
+{
+  enum TALER_ErrorCode ec = TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+
+  switch (status)
   {
-    return TALER_MHD_reply_with_error (connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                       "reserve history");
+  case TALER_AML_NORMAL:
+    GNUNET_break (0);
+    return MHD_NO;
+  case TALER_AML_PENDING:
+    ec = TALER_EC_EXCHANGE_GENERIC_AML_PENDING;
+    break;
+  case TALER_AML_FROZEN:
+    ec = TALER_EC_EXCHANGE_GENERIC_AML_FROZEN;
+    break;
   }
-  mhd_ret = reply_withdraw_insufficient_funds (
+  return TALER_MHD_REPLY_JSON_PACK (
     connection,
-    &balance,
-    balance_required,
-    rh);
-  TEH_plugin->free_reserve_history (TEH_plugin->cls,
-                                    rh);
-  return mhd_ret;
+    MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+    TALER_JSON_pack_ec (ec));
+}
+
+
+MHD_RESULT
+TEH_RESPONSE_reply_not_modified (
+  struct MHD_Connection *connection,
+  const char *etags,
+  TEH_RESPONSE_SetHeaders cb,
+  void *cb_cls)
+{
+  MHD_RESULT ret;
+  struct MHD_Response *resp;
+
+  resp = MHD_create_response_from_buffer (0,
+                                          NULL,
+                                          MHD_RESPMEM_PERSISTENT);
+  cb (cb_cls,
+      resp);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (resp,
+                                         MHD_HTTP_HEADER_ETAG,
+                                         etags));
+  ret = MHD_queue_response (connection,
+                            MHD_HTTP_NOT_MODIFIED,
+                            resp);
+  GNUNET_break (MHD_YES == ret);
+  MHD_destroy_response (resp);
+  return ret;
 }
 
 
diff --git a/src/exchange/taler-exchange-httpd_responses.h b/src/exchange/taler-exchange-httpd_responses.h
index 2c4ac018c..24b24621f 100644
--- a/src/exchange/taler-exchange-httpd_responses.h
+++ b/src/exchange/taler-exchange-httpd_responses.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2019 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -24,24 +24,14 @@
  */
 #ifndef TALER_EXCHANGE_HTTPD_RESPONSES_H
 #define TALER_EXCHANGE_HTTPD_RESPONSES_H
+
 #include <gnunet/gnunet_util_lib.h>
 #include <jansson.h>
 #include <microhttpd.h>
 #include "taler_error_codes.h"
 #include "taler-exchange-httpd.h"
 #include "taler-exchange-httpd_db.h"
-#include <gnunet/gnunet_mhd_compat.h>
-
-
-/**
- * Compile the history of a reserve into a JSON object.
- *
- * @param rh reserve history to JSON-ify
- * @return json representation of the @a rh, NULL on error
- */
-json_t *
-TEH_RESPONSE_compile_reserve_history (
-  const struct TALER_EXCHANGEDB_ReserveHistory *rh);
+#include "taler_exchangedb_plugin.h"
 
 
 /**
@@ -63,6 +53,8 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash (
  * an insufficient balance for the given operation.
  *
  * @param connection connection to the client
+ * @param ec specific error code to return with the reserve history
+ * @param reserve_balance balance remaining in the reserve
  * @param balance_required the balance required for the operation
  * @param reserve_pub the reserve with insufficient balance
  * @return MHD result code
@@ -70,9 +62,53 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash (
 MHD_RESULT
 TEH_RESPONSE_reply_reserve_insufficient_balance (
   struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  const struct TALER_Amount *reserve_balance,
   const struct TALER_Amount *balance_required,
   const struct TALER_ReservePublicKeyP *reserve_pub);
 
+/**
+ * Return error message indicating that a reserve requires age
+ * restriction to be set during withdraw, that is: the age-withdraw
+ * protocol MUST be used with commitment to an admissible age.
+ *
+ * @param connection connection to the client
+ * @param maximum_allowed_age the balance required for the operation
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_reserve_age_restriction_required (
+  struct MHD_Connection *connection,
+  uint16_t maximum_allowed_age);
+
+
+/**
+ * Send information that a KYC check must be
+ * satisfied to proceed to client.
+ *
+ * @param connection connection to the client
+ * @param h_payto account identifier to include in reply
+ * @param kyc details about the KYC requirements
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_kyc_required (struct MHD_Connection *connection,
+                                 const struct TALER_PaytoHashP *h_payto,
+                                 const struct TALER_EXCHANGEDB_KycStatus *kyc);
+
+
+/**
+ * Send information that an AML process is blocking
+ * the operation right now.
+ *
+ * @param connection connection to the client
+ * @param status current AML status
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_aml_blocked (struct MHD_Connection *connection,
+                                enum TALER_AmlDecisionState status);
+
 
 /**
  * Send assertion that the given denomination key hash
@@ -113,6 +149,7 @@ TEH_RESPONSE_reply_invalid_denom_cipher_for_operation (
  *
  * @param connection connection to the client
  * @param ec error code to return
+ * @param h_denom_pub hash of the denomination of the coin
  * @param coin_pub public key of the coin
  * @return MHD result code
  */
@@ -120,20 +157,143 @@ MHD_RESULT
 TEH_RESPONSE_reply_coin_insufficient_funds (
   struct MHD_Connection *connection,
   enum TALER_ErrorCode ec,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CoinSpendPublicKeyP *coin_pub);
 
+/**
+ * Send proof that a request is invalid to client because of
+ * an conflict with the provided denomination (the exchange had seen
+ * this coin before, signed by a different denomination).
+ * This function will create a message with the denomination's public key
+ * that was seen before.
+ *
+ * @param connection connection to the client
+ * @param ec error code to return
+ * @param coin_pub the public key of the coin
+ * @param prev_denom_pub the denomination of the coin, as seen previously
+ * @param prev_denom_sig the signature with the denomination key over the coin
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_coin_denomination_conflict (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_DenominationPublicKey *prev_denom_pub,
+  const struct TALER_DenominationSignature *prev_denom_sig);
 
 /**
- * Compile the transaction history of a coin into a JSON object.
+ * Send the salted hash of the merchant's bank account from conflicting
+ * contract.  With this information, the merchant's private key and
+ * the hash of the contract terms, the client can retrieve more details
+ * about the conflicting deposit
  *
+ * @param connection connection to the client
+ * @param ec error code to return
+ * @param h_wire the salted hash of the merchant's bank account
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_coin_conflicting_contract (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  const struct TALER_MerchantWireHashP *h_wire);
+
+/**
+ * Send proof that a request is invalid to client because of
+ * a conflicting value for the age commitment hash of a coin.
+ * This function will create a message with the conflicting
+ * hash value for the age commitment of the given coin.
+ *
+ * @param connection connection to the client
+ * @param ec error code to return
+ * @param cks specific conflict type
+ * @param h_denom_pub hash of the denomination of the coin
  * @param coin_pub public key of the coin
- * @param tl transaction history to JSON-ify
- * @return json representation of the @a rh, NULL on error
+ * @param h_age_commitment hash of the age commitment as found in the database
+ * @return MHD result code
  */
-json_t *
-TEH_RESPONSE_compile_transaction_history (
+MHD_RESULT
+TEH_RESPONSE_reply_coin_age_commitment_conflict (
+  struct MHD_Connection *connection,
+  enum TALER_ErrorCode ec,
+  enum TALER_EXCHANGEDB_CoinKnownStatus cks,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_EXCHANGEDB_TransactionList *tl);
+  const struct TALER_AgeCommitmentHash *h_age_commitment);
+
+/**
+ * Fundamental details about a purse.
+ */
+struct TEH_PurseDetails
+{
+  /**
+   * When should the purse expire.
+   */
+  struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Hash of the contract terms of the purse.
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * Public key of the purse we are creating.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Total amount to be put into the purse.
+   */
+  struct TALER_Amount target_amount;
+};
+
+
+/**
+ * Send confirmation that a purse was created with
+ * the current purse balance.
+ *
+ * @param connection connection to the client
+ * @param pd purse details
+ * @param exchange_timestamp our time for purse creation
+ * @param purse_balance current balance in the purse
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_purse_created (
+  struct MHD_Connection *connection,
+  struct GNUNET_TIME_Timestamp exchange_timestamp,
+  const struct TALER_Amount *purse_balance,
+  const struct TEH_PurseDetails *pd);
+
+
+/**
+ * Callback used to set headers in a response.
+ *
+ * @param cls closure
+ * @param[in,out] resp response to modify
+ */
+typedef void
+(*TEH_RESPONSE_SetHeaders)(void *cls,
+                           struct MHD_Response *resp);
+
+
+/**
+ * Generate a HTTP "Not modified" response with the
+ * given @a etags.
+ *
+ * @param connection connection to queue response on
+ * @param etags ETag header to set
+ * @param cb callback to modify response headers
+ * @param cb_cls closure for @a cb
+ * @return MHD result code
+ */
+MHD_RESULT
+TEH_RESPONSE_reply_not_modified (
+  struct MHD_Connection *connection,
+  const char *etags,
+  TEH_RESPONSE_SetHeaders cb,
+  void *cb_cls);
 
 
 #endif
diff --git a/src/exchange/taler-exchange-httpd_spa.c b/src/exchange/taler-exchange-httpd_spa.c
new file mode 100644
index 000000000..60bed3d28
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_spa.c
@@ -0,0 +1,362 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020, 2023 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 EXCHANGEABILITY 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/>
+*/
+/**
+ * @file taler-exchange-httpd_spa.c
+ * @brief logic to load the single page app (/)
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_util.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_mhd_compat.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Resource from the WebUi.
+ */
+struct WebuiFile
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct WebuiFile *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct WebuiFile *prev;
+
+  /**
+   * Path this resource matches.
+   */
+  char *path;
+
+  /**
+   * SPA resource, compressed.
+   */
+  struct MHD_Response *zspa;
+
+  /**
+   * SPA resource, vanilla.
+   */
+  struct MHD_Response *spa;
+
+};
+
+
+/**
+ * Resources of the WebuUI, kept in a DLL.
+ */
+static struct WebuiFile *webui_head;
+
+/**
+ * Resources of the WebuUI, kept in a DLL.
+ */
+static struct WebuiFile *webui_tail;
+
+
+MHD_RESULT
+TEH_handler_spa (struct TEH_RequestContext *rc,
+                 const char *const args[])
+{
+  struct WebuiFile *w = NULL;
+  const char *infix = args[0];
+
+  if ( (NULL == infix) ||
+       (0 == strcmp (infix,
+                     "")) )
+    infix = "index.html";
+  for (struct WebuiFile *pos = webui_head;
+       NULL != pos;
+       pos = pos->next)
+    if (0 == strcmp (infix,
+                     pos->path))
+    {
+      w = pos;
+      break;
+    }
+  if (NULL == w)
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       rc->url);
+  if ( (MHD_YES ==
+        TALER_MHD_can_compress (rc->connection)) &&
+       (NULL != w->zspa) )
+    return MHD_queue_response (rc->connection,
+                               MHD_HTTP_OK,
+                               w->zspa);
+  return MHD_queue_response (rc->connection,
+                             MHD_HTTP_OK,
+                             w->spa);
+}
+
+
+/**
+ * Function called on each file to load for the WebUI.
+ *
+ * @param cls NULL
+ * @param dn name of the file to load
+ */
+static enum GNUNET_GenericReturnValue
+build_webui (void *cls,
+             const char *dn)
+{
+  static struct
+  {
+    const char *ext;
+    const char *mime;
+  } mime_map[] = {
+    {
+      .ext = "css",
+      .mime = "text/css"
+    },
+    {
+      .ext = "html",
+      .mime = "text/html"
+    },
+    {
+      .ext = "js",
+      .mime = "text/javascript"
+    },
+    {
+      .ext = "jpg",
+      .mime = "image/jpeg"
+    },
+    {
+      .ext = "jpeg",
+      .mime = "image/jpeg"
+    },
+    {
+      .ext = "png",
+      .mime = "image/png"
+    },
+    {
+      .ext = "svg",
+      .mime = "image/svg+xml"
+    },
+    {
+      .ext = NULL,
+      .mime = NULL
+    },
+  };
+  int fd;
+  struct stat sb;
+  struct MHD_Response *zspa = NULL;
+  struct MHD_Response *spa;
+  const char *ext;
+  const char *mime;
+
+  (void) cls;
+  /* finally open template */
+  fd = open (dn,
+             O_RDONLY);
+  if (-1 == fd)
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "open",
+                              dn);
+    return GNUNET_SYSERR;
+  }
+  if (0 !=
+      fstat (fd,
+             &sb))
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "open",
+                              dn);
+    GNUNET_break (0 == close (fd));
+    return GNUNET_SYSERR;
+  }
+
+  mime = NULL;
+  ext = strrchr (dn, '.');
+  if (NULL == ext)
+  {
+    GNUNET_break (0 == close (fd));
+    return GNUNET_OK;
+  }
+  ext++;
+  for (unsigned int i = 0; NULL != mime_map[i].ext; i++)
+    if (0 == strcasecmp (ext,
+                         mime_map[i].ext))
+    {
+      mime = mime_map[i].mime;
+      break;
+    }
+
+  {
+    void *in;
+    ssize_t r;
+    size_t csize;
+
+    in = GNUNET_malloc_large (sb.st_size);
+    if (NULL == in)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                           "malloc");
+      GNUNET_break (0 == close (fd));
+      return GNUNET_SYSERR;
+    }
+    r = read (fd,
+              in,
+              sb.st_size);
+    if ( (-1 == r) ||
+         (sb.st_size != (size_t) r) )
+    {
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                "read",
+                                dn);
+      GNUNET_free (in);
+      GNUNET_break (0 == close (fd));
+      return GNUNET_SYSERR;
+    }
+    csize = (size_t) r;
+    if (MHD_YES ==
+        TALER_MHD_body_compress (&in,
+                                 &csize))
+    {
+      zspa = MHD_create_response_from_buffer (csize,
+                                              in,
+                                              MHD_RESPMEM_MUST_FREE);
+      if (NULL != zspa)
+      {
+        if (MHD_NO ==
+            MHD_add_response_header (zspa,
+                                     MHD_HTTP_HEADER_CONTENT_ENCODING,
+                                     "deflate"))
+        {
+          GNUNET_break (0);
+          MHD_destroy_response (zspa);
+          zspa = NULL;
+        }
+        if (NULL != mime)
+          GNUNET_break (MHD_YES ==
+                        MHD_add_response_header (zspa,
+                                                 MHD_HTTP_HEADER_CONTENT_TYPE,
+                                                 mime));
+      }
+    }
+    else
+    {
+      GNUNET_free (in);
+    }
+  }
+
+  spa = MHD_create_response_from_fd (sb.st_size,
+                                     fd);
+  if (NULL == spa)
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "open",
+                              dn);
+    GNUNET_break (0 == close (fd));
+    if (NULL != zspa)
+    {
+      MHD_destroy_response (zspa);
+      zspa = NULL;
+    }
+    return GNUNET_SYSERR;
+  }
+  if (NULL != mime)
+    GNUNET_break (MHD_YES ==
+                  MHD_add_response_header (spa,
+                                           MHD_HTTP_HEADER_CONTENT_TYPE,
+                                           mime));
+
+  {
+    struct WebuiFile *w;
+    const char *fn;
+
+    fn = strrchr (dn, '/');
+    GNUNET_assert (NULL != fn);
+    w = GNUNET_new (struct WebuiFile);
+    w->path = GNUNET_strdup (fn + 1);
+    w->spa = spa;
+    w->zspa = zspa;
+    GNUNET_CONTAINER_DLL_insert (webui_head,
+                                 webui_tail,
+                                 w);
+  }
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TEH_spa_init ()
+{
+  char *dn;
+
+  {
+    char *path;
+
+    path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+    if (NULL == path)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_asprintf (&dn,
+                     "%sexchange/spa/",
+                     path);
+    GNUNET_free (path);
+  }
+
+  if (-1 ==
+      GNUNET_DISK_directory_scan (dn,
+                                  &build_webui,
+                                  NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to load WebUI from `%s'\n",
+                dn);
+    GNUNET_free (dn);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (dn);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Nicely shut down.
+ */
+void __attribute__ ((destructor))
+get_spa_fini ()
+{
+  struct WebuiFile *w;
+
+  while (NULL != (w = webui_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (webui_head,
+                                 webui_tail,
+                                 w);
+    if (NULL != w->spa)
+    {
+      MHD_destroy_response (w->spa);
+      w->spa = NULL;
+    }
+    if (NULL != w->zspa)
+    {
+      MHD_destroy_response (w->zspa);
+      w->zspa = NULL;
+    }
+    GNUNET_free (w->path);
+    GNUNET_free (w);
+  }
+}
diff --git a/src/exchange/taler-exchange-httpd_spa.h b/src/exchange/taler-exchange-httpd_spa.h
new file mode 100644
index 000000000..4147a853b
--- /dev/null
+++ b/src/exchange/taler-exchange-httpd_spa.h
@@ -0,0 +1,49 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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 EXCHANGEABILITY 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/>
+*/
+/**
+ * @file taler-exchange-httpd_spa.h
+ * @brief logic to preload and serve static files
+ * @author Christian Grothoff
+ */
+#ifndef TALER_EXCHANGE_HTTPD_SPA_H
+#define TALER_EXCHANGE_HTTPD_SPA_H
+
+#include <microhttpd.h>
+#include "taler-exchange-httpd.h"
+
+
+/**
+ * Return our single-page-app user interface (see contrib/wallet-core/).
+ *
+ * @param rc context of the handler
+ * @param[in,out] args remaining arguments (ignored)
+ * @return #MHD_YES on success (reply queued), #MHD_NO on error (close connection)
+ */
+MHD_RESULT
+TEH_handler_spa (struct TEH_RequestContext *rc,
+                 const char *const args[]);
+
+
+/**
+ * Preload and compress SPA files.
+ *
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_spa_init (void);
+
+
+#endif
diff --git a/src/exchange/taler-exchange-httpd_transfers_get.c b/src/exchange/taler-exchange-httpd_transfers_get.c
index 0a994d8ec..18d96f955 100644
--- a/src/exchange/taler-exchange-httpd_transfers_get.c
+++ b/src/exchange/taler-exchange-httpd_transfers_get.c
@@ -59,14 +59,20 @@ struct AggregatedDepositDetail
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
   /**
-   * Total value of the coin in the deposit.
+   * Total value of the coin in the deposit (after
+   * refunds).
    */
   struct TALER_Amount deposit_value;
 
   /**
-   * Fees charged by the exchange for the deposit of this coin.
+   * Fees charged by the exchange for the deposit of this coin (possibly after reduction due to refunds).
    */
   struct TALER_Amount deposit_fee;
+
+  /**
+   * Total amount refunded for this coin.
+   */
+  struct TALER_Amount refund_total;
 };
 
 
@@ -120,6 +126,13 @@ reply_transfer_details (struct MHD_Connection *connection,
                                         &wdd_pos->h_contract_terms),
             GNUNET_JSON_pack_data_auto ("coin_pub",
                                         &wdd_pos->coin_pub),
+
+            GNUNET_JSON_pack_allow_null (
+              TALER_JSON_pack_amount ("refund_total",
+                                      TALER_amount_is_zero (
+                                        &wdd_pos->refund_total)
+                                      ? NULL
+                                      : &wdd_pos->refund_total)),
             TALER_JSON_pack_amount ("deposit_value",
                                     &wdd_pos->deposit_value),
             TALER_JSON_pack_amount ("deposit_fee",
@@ -248,6 +261,31 @@ struct WtidTransactionContext
 
 
 /**
+ * Callback that totals up the applicable refunds.
+ *
+ * @param cls a `struct TALER_Amount` where we keep the total
+ * @param amount_with_fee amount being refunded
+ */
+static enum GNUNET_GenericReturnValue
+add_refunds (void *cls,
+             const struct TALER_Amount *amount_with_fee)
+
+{
+  struct TALER_Amount *total = cls;
+
+  if (0 >
+      TALER_amount_add (total,
+                        total,
+                        amount_with_fee))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
  * Function called with the results of the lookup of the individual deposits
  * that were aggregated for the given wire transfer.
  *
@@ -260,28 +298,96 @@ struct WtidTransactionContext
  * @param h_contract_terms which proposal was this payment about
  * @param denom_pub denomination public key of the @a coin_pub (ignored)
  * @param coin_pub which public key was this payment about
- * @param deposit_value amount contributed by this coin in total
+ * @param deposit_value amount contributed by this coin in total (including fee)
  * @param deposit_fee deposit fee charged by exchange for this coin
  */
 static void
-handle_deposit_data (void *cls,
-                     uint64_t rowid,
-                     const struct TALER_MerchantPublicKeyP *merchant_pub,
-                     const char *account_payto_uri,
-                     const struct TALER_PaytoHashP *h_payto,
-                     struct GNUNET_TIME_Timestamp exec_time,
-                     const struct TALER_PrivateContractHashP *h_contract_terms,
-                     const struct TALER_DenominationPublicKey *denom_pub,
-                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                     const struct TALER_Amount *deposit_value,
-                     const struct TALER_Amount *deposit_fee)
+handle_deposit_data (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const char *account_payto_uri,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Timestamp exec_time,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *deposit_value,
+  const struct TALER_Amount *deposit_fee)
 {
   struct WtidTransactionContext *ctx = cls;
+  struct TALER_Amount total_refunds;
+  struct TALER_Amount dval;
+  struct TALER_Amount dfee;
+  enum GNUNET_DB_QueryStatus qs;
 
   (void) rowid;
   (void) denom_pub;
+  (void) h_payto;
   if (GNUNET_SYSERR == ctx->is_valid)
     return;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (deposit_value->currency,
+                                        &total_refunds));
+  qs = TEH_plugin->select_refunds_by_coin (TEH_plugin->cls,
+                                           coin_pub,
+                                           merchant_pub,
+                                           h_contract_terms,
+                                           &add_refunds,
+                                           &total_refunds);
+  if (qs < 0)
+  {
+    GNUNET_break (0);
+    ctx->is_valid = GNUNET_SYSERR;
+    return;
+  }
+  if (1 ==
+      TALER_amount_cmp (&total_refunds,
+                        deposit_value))
+  {
+    /* Refunds exceeded total deposit? not OK! */
+    GNUNET_break (0);
+    ctx->is_valid = GNUNET_SYSERR;
+    return;
+  }
+  if (0 ==
+      TALER_amount_cmp (&total_refunds,
+                        deposit_value))
+  {
+    /* total_refunds == deposit_value;
+       in this case, the total contributed to the
+       wire transfer is zero (as are fees) */
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (deposit_value->currency,
+                                          &dval));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (deposit_value->currency,
+                                          &dfee));
+
+  }
+  else
+  {
+    /* Compute deposit value by subtracting refunds */
+    GNUNET_assert (0 <
+                   TALER_amount_subtract (&dval,
+                                          deposit_value,
+                                          &total_refunds));
+    if (-1 ==
+        TALER_amount_cmp (&dval,
+                          deposit_fee))
+    {
+      /* dval < deposit_fee, so after refunds less than
+         the deposit fee remains; reduce deposit fee to
+         the remaining value of the coin */
+      dfee = dval;
+    }
+    else
+    {
+      /* Partial refund, deposit fee remains */
+      dfee = *deposit_fee;
+    }
+  }
+
   if (GNUNET_NO == ctx->is_valid)
   {
     /* First one we encounter, setup general information in 'ctx' */
@@ -291,8 +397,8 @@ handle_deposit_data (void *cls,
     ctx->is_valid = GNUNET_YES;
     if (0 >
         TALER_amount_subtract (&ctx->total,
-                               deposit_value,
-                               deposit_fee))
+                               &dval,
+                               &dfee))
     {
       GNUNET_break (0);
       ctx->is_valid = GNUNET_SYSERR;
@@ -316,8 +422,8 @@ handle_deposit_data (void *cls,
     }
     if (0 >
         TALER_amount_subtract (&delta,
-                               deposit_value,
-                               deposit_fee))
+                               &dval,
+                               &dfee))
     {
       GNUNET_break (0);
       ctx->is_valid = GNUNET_SYSERR;
@@ -338,8 +444,9 @@ handle_deposit_data (void *cls,
     struct AggregatedDepositDetail *wdd;
 
     wdd = GNUNET_new (struct AggregatedDepositDetail);
-    wdd->deposit_value = *deposit_value;
-    wdd->deposit_fee = *deposit_fee;
+    wdd->deposit_value = dval;
+    wdd->deposit_fee = dfee;
+    wdd->refund_total = total_refunds;
     wdd->h_contract_terms = *h_contract_terms;
     wdd->coin_pub = *coin_pub;
     GNUNET_CONTAINER_DLL_insert (ctx->wdd_head,
diff --git a/src/exchange/taler-exchange-httpd_wire.c b/src/exchange/taler-exchange-httpd_wire.c
deleted file mode 100644
index ce8293c9a..000000000
--- a/src/exchange/taler-exchange-httpd_wire.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2015-2022 Taler Systems SA
-
-  TALER 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, 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_wire.c
- * @brief Handle /wire requests
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_json_lib.h>
-#include "taler_dbevents.h"
-#include "taler-exchange-httpd_responses.h"
-#include "taler-exchange-httpd_keys.h"
-#include "taler-exchange-httpd_wire.h"
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
-#include <jansson.h>
-
-/**
- * Information we track about wire fees.
- */
-struct WireFeeSet
-{
-
-  /**
-   * Kept in a DLL.
-   */
-  struct WireFeeSet *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct WireFeeSet *prev;
-
-  /**
-   * Actual fees.
-   */
-  struct TALER_WireFeeSet fees;
-
-  /**
-   * Start date of fee validity (inclusive).
-   */
-  struct GNUNET_TIME_Timestamp start_date;
-
-  /**
-   * End date of fee validity (exclusive).
-   */
-  struct GNUNET_TIME_Timestamp end_date;
-
-  /**
-   * Wire method the fees apply to.
-   */
-  char *method;
-};
-
-
-/**
- * State we keep per thread to cache the /wire response.
- */
-struct WireStateHandle
-{
-  /**
-   * Cached reply for /wire response.
-   */
-  struct MHD_Response *wire_reply;
-
-  /**
-   * ETag for this response (if any).
-   */
-  char *etag;
-
-  /**
-   * head of DLL of wire fees.
-   */
-  struct WireFeeSet *wfs_head;
-
-  /**
-   * Tail of DLL of wire fees.
-   */
-  struct WireFeeSet *wfs_tail;
-
-  /**
-   * Earliest timestamp of all the wire methods when we have no more fees.
-   */
-  struct GNUNET_TIME_Absolute cache_expiration;
-
-  /**
-   * @e cache_expiration time, formatted.
-   */
-  char dat[128];
-
-  /**
-   * For which (global) wire_generation was this data structure created?
-   * Used to check when we are outdated and need to be re-generated.
-   */
-  uint64_t wire_generation;
-
-  /**
-   * HTTP status to return with this response.
-   */
-  unsigned int http_status;
-
-};
-
-
-/**
- * Stores the latest generation of our wire response.
- */
-static struct WireStateHandle *wire_state;
-
-/**
- * Handler listening for wire updates by other exchange
- * services.
- */
-static struct GNUNET_DB_EventHandler *wire_eh;
-
-/**
- * Counter incremented whenever we have a reason to re-build the #wire_state
- * because something external changed.
- */
-static uint64_t wire_generation;
-
-
-/**
- * Free memory associated with @a wsh
- *
- * @param[in] wsh wire state to destroy
- */
-static void
-destroy_wire_state (struct WireStateHandle *wsh)
-{
-  struct WireFeeSet *wfs;
-
-  while (NULL != (wfs = wsh->wfs_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (wsh->wfs_head,
-                                 wsh->wfs_tail,
-                                 wfs);
-    GNUNET_free (wfs->method);
-    GNUNET_free (wfs);
-  }
-  MHD_destroy_response (wsh->wire_reply);
-  GNUNET_free (wsh->etag);
-  GNUNET_free (wsh);
-}
-
-
-/**
- * Function called whenever another exchange process has updated
- * the wire data in the database.
- *
- * @param cls NULL
- * @param extra unused
- * @param extra_size number of bytes in @a extra unused
- */
-static void
-wire_update_event_cb (void *cls,
-                      const void *extra,
-                      size_t extra_size)
-{
-  (void) cls;
-  (void) extra;
-  (void) extra_size;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received /wire update event\n");
-  TEH_check_invariants ();
-  wire_generation++;
-}
-
-
-enum GNUNET_GenericReturnValue
-TEH_wire_init ()
-{
-  struct GNUNET_DB_EventHeaderP es = {
-    .size = htons (sizeof (es)),
-    .type = htons (TALER_DBEVENT_EXCHANGE_KEYS_UPDATED),
-  };
-
-  wire_eh = TEH_plugin->event_listen (TEH_plugin->cls,
-                                      GNUNET_TIME_UNIT_FOREVER_REL,
-                                      &es,
-                                      &wire_update_event_cb,
-                                      NULL);
-  if (NULL == wire_eh)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-void
-TEH_wire_done ()
-{
-  if (NULL != wire_state)
-  {
-    destroy_wire_state (wire_state);
-    wire_state = NULL;
-  }
-  if (NULL != wire_eh)
-  {
-    TEH_plugin->event_listen_cancel (TEH_plugin->cls,
-                                     wire_eh);
-    wire_eh = NULL;
-  }
-}
-
-
-/**
- * Add information about a wire account to @a cls.
- *
- * @param cls a `json_t *` object to expand with wire account details
- * @param payto_uri the exchange bank account URI to add
- * @param master_sig master key signature affirming that this is a bank
- *                   account of the exchange (of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS)
- */
-static void
-add_wire_account (void *cls,
-                  const char *payto_uri,
-                  const struct TALER_MasterSignatureP *master_sig)
-{
-  json_t *a = cls;
-
-  if (0 !=
-      json_array_append_new (
-        a,
-        GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_string ("payto_uri",
-                                   payto_uri),
-          GNUNET_JSON_pack_data_auto ("master_sig",
-                                      master_sig))))
-  {
-    GNUNET_break (0);   /* out of memory!? */
-    return;
-  }
-}
-
-
-/**
- * Closure for #add_wire_fee().
- */
-struct AddContext
-{
-  /**
-   * Wire method the fees are for.
-   */
-  char *wire_method;
-
-  /**
-   * Wire state we are building.
-   */
-  struct WireStateHandle *wsh;
-
-  /**
-   * Array to append the fee to.
-   */
-  json_t *a;
-
-  /**
-   * Context we hash "everything" we add into. This is used
-   * to compute the etag. Technically, we only hash the
-   * master_sigs, as they imply the rest.
-   */
-  struct GNUNET_HashContext *hc;
-
-  /**
-   * Set to the maximum end-date seen.
-   */
-  struct GNUNET_TIME_Absolute max_seen;
-};
-
-
-/**
- * Add information about a wire account to @a cls.
- *
- * @param cls a `struct AddContext`
- * @param fees the wire fees we charge
- * @param start_date from when are these fees valid (start date)
- * @param end_date until when are these fees valid (end date, exclusive)
- * @param master_sig master key signature affirming that this is the correct
- *                   fee (of purpose #TALER_SIGNATURE_MASTER_WIRE_FEES)
- */
-static void
-add_wire_fee (void *cls,
-              const struct TALER_WireFeeSet *fees,
-              struct GNUNET_TIME_Timestamp start_date,
-              struct GNUNET_TIME_Timestamp end_date,
-              const struct TALER_MasterSignatureP *master_sig)
-{
-  struct AddContext *ac = cls;
-  struct WireFeeSet *wfs;
-
-  GNUNET_CRYPTO_hash_context_read (ac->hc,
-                                   master_sig,
-                                   sizeof (*master_sig));
-  ac->max_seen = GNUNET_TIME_absolute_max (ac->max_seen,
-                                           end_date.abs_time);
-  wfs = GNUNET_new (struct WireFeeSet);
-  wfs->start_date = start_date;
-  wfs->end_date = end_date;
-  wfs->fees = *fees;
-  wfs->method = GNUNET_strdup (ac->wire_method);
-  GNUNET_CONTAINER_DLL_insert (ac->wsh->wfs_head,
-                               ac->wsh->wfs_tail,
-                               wfs);
-  if (0 !=
-      json_array_append_new (
-        ac->a,
-        GNUNET_JSON_PACK (
-          TALER_JSON_pack_amount ("wire_fee",
-                                  &fees->wire),
-          TALER_JSON_pack_amount ("wad_fee",
-                                  &fees->wad),
-          TALER_JSON_pack_amount ("closing_fee",
-                                  &fees->closing),
-          GNUNET_JSON_pack_timestamp ("start_date",
-                                      start_date),
-          GNUNET_JSON_pack_timestamp ("end_date",
-                                      end_date),
-          GNUNET_JSON_pack_data_auto ("sig",
-                                      master_sig))))
-  {
-    GNUNET_break (0);   /* out of memory!? */
-    return;
-  }
-}
-
-
-/**
- * Create the /wire response from our database state.
- *
- * @return NULL on error
- */
-static struct WireStateHandle *
-build_wire_state (void)
-{
-  json_t *wire_accounts_array;
-  json_t *wire_fee_object;
-  uint64_t wg = wire_generation; /* must be obtained FIRST */
-  enum GNUNET_DB_QueryStatus qs;
-  struct WireStateHandle *wsh;
-  struct GNUNET_HashContext *hc;
-
-  wsh = GNUNET_new (struct WireStateHandle);
-  wsh->wire_generation = wg;
-  wire_accounts_array = json_array ();
-  GNUNET_assert (NULL != wire_accounts_array);
-  qs = TEH_plugin->get_wire_accounts (TEH_plugin->cls,
-                                      &add_wire_account,
-                                      wire_accounts_array);
-  if (0 > qs)
-  {
-    GNUNET_break (0);
-    json_decref (wire_accounts_array);
-    wsh->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    wsh->wire_reply
-      = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
-                              "get_wire_accounts");
-    return wsh;
-  }
-  if (0 == json_array_size (wire_accounts_array))
-  {
-    json_decref (wire_accounts_array);
-    wsh->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
-    wsh->wire_reply
-      = TALER_MHD_make_error (TALER_EC_EXCHANGE_WIRE_NO_ACCOUNTS_CONFIGURED,
-                              NULL);
-    return wsh;
-  }
-  wire_fee_object = json_object ();
-  GNUNET_assert (NULL != wire_fee_object);
-  wsh->cache_expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
-  hc = GNUNET_CRYPTO_hash_context_start ();
-  {
-    json_t *account;
-    size_t index;
-
-    json_array_foreach (wire_accounts_array, index, account) {
-      char *wire_method;
-      const char *payto_uri = json_string_value (json_object_get (account,
-                                                                  "payto_uri"));
-
-      GNUNET_assert (NULL != payto_uri);
-      wire_method = TALER_payto_get_method (payto_uri);
-      if (NULL == wire_method)
-      {
-        wsh->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
-        wsh->wire_reply
-          = TALER_MHD_make_error (
-              TALER_EC_EXCHANGE_WIRE_INVALID_PAYTO_CONFIGURED,
-              payto_uri);
-        json_decref (wire_accounts_array);
-        json_decref (wire_fee_object);
-        GNUNET_CRYPTO_hash_context_abort (hc);
-        return wsh;
-      }
-      if (NULL == json_object_get (wire_fee_object,
-                                   wire_method))
-      {
-        struct AddContext ac = {
-          .wire_method = wire_method,
-          .wsh = wsh,
-          .a = json_array (),
-          .hc = hc
-        };
-
-        GNUNET_assert (NULL != ac.a);
-        qs = TEH_plugin->get_wire_fees (TEH_plugin->cls,
-                                        wire_method,
-                                        &add_wire_fee,
-                                        &ac);
-        if (0 > qs)
-        {
-          GNUNET_break (0);
-          json_decref (ac.a);
-          json_decref (wire_fee_object);
-          json_decref (wire_accounts_array);
-          GNUNET_free (wire_method);
-          wsh->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
-          wsh->wire_reply
-            = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                    "get_wire_fees");
-          GNUNET_CRYPTO_hash_context_abort (hc);
-          return wsh;
-        }
-        if (0 == json_array_size (ac.a))
-        {
-          json_decref (ac.a);
-          json_decref (wire_accounts_array);
-          json_decref (wire_fee_object);
-          wsh->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
-          wsh->wire_reply
-            = TALER_MHD_make_error (TALER_EC_EXCHANGE_WIRE_FEES_NOT_CONFIGURED,
-                                    wire_method);
-          GNUNET_free (wire_method);
-          GNUNET_CRYPTO_hash_context_abort (hc);
-          return wsh;
-        }
-        wsh->cache_expiration = GNUNET_TIME_absolute_min (ac.max_seen,
-                                                          wsh->cache_expiration);
-        GNUNET_assert (0 ==
-                       json_object_set_new (wire_fee_object,
-                                            wire_method,
-                                            ac.a));
-      }
-      GNUNET_free (wire_method);
-    }
-  }
-
-
-  wsh->wire_reply = TALER_MHD_MAKE_JSON_PACK (
-    GNUNET_JSON_pack_array_steal ("accounts",
-                                  wire_accounts_array),
-    GNUNET_JSON_pack_object_steal ("fees",
-                                   wire_fee_object),
-    GNUNET_JSON_pack_data_auto ("master_public_key",
-                                &TEH_master_public_key));
-  {
-    struct GNUNET_TIME_Timestamp m;
-
-    m = GNUNET_TIME_absolute_to_timestamp (wsh->cache_expiration);
-    TALER_MHD_get_date_string (m.abs_time,
-                               wsh->dat);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Setting 'Expires' header for '/wire' to '%s'\n",
-                wsh->dat);
-    GNUNET_break (MHD_YES ==
-                  MHD_add_response_header (wsh->wire_reply,
-                                           MHD_HTTP_HEADER_EXPIRES,
-                                           wsh->dat));
-  }
-  TALER_MHD_add_global_headers (wsh->wire_reply);
-  /* Set cache control headers: our response varies depending on these headers */
-  GNUNET_break (MHD_YES ==
-                MHD_add_response_header (wsh->wire_reply,
-                                         MHD_HTTP_HEADER_VARY,
-                                         MHD_HTTP_HEADER_ACCEPT_ENCODING));
-  /* Information is always public, revalidate after 1 day */
-  GNUNET_break (MHD_YES ==
-                MHD_add_response_header (wsh->wire_reply,
-                                         MHD_HTTP_HEADER_CACHE_CONTROL,
-                                         "public,max-age=86400"));
-
-  {
-    struct GNUNET_HashCode h;
-    char etag[sizeof (h) * 2];
-    char *end;
-
-    GNUNET_CRYPTO_hash_context_finish (hc,
-                                       &h);
-    end = GNUNET_STRINGS_data_to_string (&h,
-                                         sizeof (h),
-                                         etag,
-                                         sizeof (etag));
-    *end = '\0';
-    wsh->etag = GNUNET_strdup (etag);
-    GNUNET_break (MHD_YES ==
-                  MHD_add_response_header (wsh->wire_reply,
-                                           MHD_HTTP_HEADER_ETAG,
-                                           etag));
-  }
-  wsh->http_status = MHD_HTTP_OK;
-  return wsh;
-}
-
-
-void
-TEH_wire_update_state (void)
-{
-  struct GNUNET_DB_EventHeaderP es = {
-    .size = htons (sizeof (es)),
-    .type = htons (TALER_DBEVENT_EXCHANGE_WIRE_UPDATED),
-  };
-
-  TEH_plugin->event_notify (TEH_plugin->cls,
-                            &es,
-                            NULL,
-                            0);
-  wire_generation++;
-}
-
-
-/**
- * Return the current key state for this thread.  Possibly
- * re-builds the key state if we have reason to believe
- * that something changed.
- *
- * @return NULL on error
- */
-struct WireStateHandle *
-get_wire_state (void)
-{
-  struct WireStateHandle *old_wsh;
-
-  old_wsh = wire_state;
-  if ( (NULL == old_wsh) ||
-       (old_wsh->wire_generation < wire_generation) )
-  {
-    struct WireStateHandle *wsh;
-
-    TEH_check_invariants ();
-    wsh = build_wire_state ();
-    wire_state = wsh;
-    if (NULL != old_wsh)
-      destroy_wire_state (old_wsh);
-    TEH_check_invariants ();
-    return wsh;
-  }
-  return old_wsh;
-}
-
-
-MHD_RESULT
-TEH_handler_wire (struct TEH_RequestContext *rc,
-                  const char *const args[])
-{
-  struct WireStateHandle *wsh;
-
-  (void) args;
-  wsh = get_wire_state ();
-  if (NULL == wsh)
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_EXCHANGE_GENERIC_BAD_CONFIGURATION,
-                                       NULL);
-  {
-    const char *etag;
-
-    etag = MHD_lookup_connection_value (rc->connection,
-                                        MHD_HEADER_KIND,
-                                        MHD_HTTP_HEADER_IF_NONE_MATCH);
-    if ( (NULL != etag) &&
-         (MHD_HTTP_OK == wsh->http_status) &&
-         (NULL != wsh->etag) &&
-         (0 == strcmp (etag,
-                       wsh->etag)) )
-    {
-      MHD_RESULT ret;
-      struct MHD_Response *resp;
-
-      resp = MHD_create_response_from_buffer (0,
-                                              NULL,
-                                              MHD_RESPMEM_PERSISTENT);
-      TALER_MHD_add_global_headers (resp);
-      GNUNET_break (MHD_YES ==
-                    MHD_add_response_header (resp,
-                                             MHD_HTTP_HEADER_EXPIRES,
-                                             wsh->dat));
-      GNUNET_break (MHD_YES ==
-                    MHD_add_response_header (resp,
-                                             MHD_HTTP_HEADER_ETAG,
-                                             wsh->etag));
-      ret = MHD_queue_response (rc->connection,
-                                MHD_HTTP_NOT_MODIFIED,
-                                resp);
-      GNUNET_break (MHD_YES == ret);
-      MHD_destroy_response (resp);
-      return ret;
-    }
-  }
-  return MHD_queue_response (rc->connection,
-                             wsh->http_status,
-                             wsh->wire_reply);
-}
-
-
-const struct TALER_WireFeeSet *
-TEH_wire_fees_by_time (
-  struct GNUNET_TIME_Timestamp ts,
-  const char *method)
-{
-  struct WireStateHandle *wsh = get_wire_state ();
-
-  for (struct WireFeeSet *wfs = wsh->wfs_head;
-       NULL != wfs;
-       wfs = wfs->next)
-  {
-    if (0 != strcmp (method,
-                     wfs->method))
-      continue;
-    if ( (GNUNET_TIME_timestamp_cmp (wfs->start_date,
-                                     >,
-                                     ts)) ||
-         (GNUNET_TIME_timestamp_cmp (ts,
-                                     >=,
-                                     wfs->end_date)) )
-      continue;
-    return &wfs->fees;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "No wire fees for method `%s' at %s configured\n",
-              method,
-              GNUNET_TIME_timestamp2s (ts));
-  return NULL;
-}
-
-
-/* end of taler-exchange-httpd_wire.c */
diff --git a/src/exchange/taler-exchange-httpd_wire.h b/src/exchange/taler-exchange-httpd_wire.h
deleted file mode 100644
index 75595fe69..000000000
--- a/src/exchange/taler-exchange-httpd_wire.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014--2021 Taler Systems SA
-
-  TALER 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, 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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_wire.h
- * @brief Handle /wire requests
- * @author Christian Grothoff
- */
-#ifndef TALER_EXCHANGE_HTTPD_WIRE_H
-#define TALER_EXCHANGE_HTTPD_WIRE_H
-
-#include <gnunet/gnunet_util_lib.h>
-#include <microhttpd.h>
-#include "taler-exchange-httpd.h"
-
-
-/**
- * Clean up wire subsystem.
- */
-void
-TEH_wire_done (void);
-
-
-/**
- * Look up wire fee structure by @a ts.
- *
- * @param ts timestamp to lookup wire fees at
- * @param method wire method to lookup fees for
- * @return the wire fee details, or
- *         NULL if none are configured for @a ts and @a method
- */
-const struct TALER_WireFeeSet *
-TEH_wire_fees_by_time (
-  struct GNUNET_TIME_Timestamp ts,
-  const char *method);
-
-
-/**
- * Initialize wire subsystem.
- *
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TEH_wire_init (void);
-
-
-/**
- * Something changed in the database. Rebuild the wire replies.  This function
- * should be called if the exchange learns about a new signature from our
- * master key.
- *
- * (We do not do so immediately, but merely signal to all threads that they
- * need to rebuild their wire state upon the next call to
- * #TEH_handler_wire()).
- */
-void
-TEH_wire_update_state (void);
-
-
-/**
- * Handle a "/wire" request.
- *
- * @param rc request context
- * @param args array of additional options (must be empty for this function)
- * @return MHD result code
- */
-MHD_RESULT
-TEH_handler_wire (struct TEH_RequestContext *rc,
-                  const char *const args[]);
-
-
-#endif
diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c
deleted file mode 100644
index 7ad74f2a3..000000000
--- a/src/exchange/taler-exchange-httpd_withdraw.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
-
-  TALER 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,
-  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 Affero General Public License for more details.
-
-  You should have received a copy of the GNU Affero General
-  Public License along with TALER; see the file COPYING.  If not,
-  see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_withdraw.c
- * @brief Handle /reserves/$RESERVE_PUB/withdraw requests
- * @author Florian Dold
- * @author Benedikt Mueller
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <jansson.h>
-#include "taler_json_lib.h"
-#include "taler_mhd_lib.h"
-#include "taler-exchange-httpd_withdraw.h"
-#include "taler-exchange-httpd_responses.h"
-#include "taler-exchange-httpd_keys.h"
-
-
-/**
- * Context for #withdraw_transaction.
- */
-struct WithdrawContext
-{
-
-  /**
-   * Hash of the (blinded) message to be signed by the Exchange.
-   */
-  struct TALER_BlindedCoinHashP h_coin_envelope;
-
-  /**
-   * Value of the coin being exchanged (matching the denomination key)
-   * plus the transaction fee.  We include this in what is being
-   * signed so that we can verify a reserve's remaining total balance
-   * without needing to access the respective denomination key
-   * information each time.
-   */
-  struct TALER_Amount amount_with_fee;
-
-  /**
-   * Blinded planchet.
-   */
-  struct TALER_BlindedPlanchet blinded_planchet;
-
-  /**
-   * Set to the resulting signed coin data to be returned to the client.
-   */
-  struct TALER_EXCHANGEDB_CollectableBlindcoin collectable;
-
-  /**
-   * KYC status for the operation.
-   */
-  struct TALER_EXCHANGEDB_KycStatus kyc;
-
-};
-
-
-/**
- * Function implementing withdraw transaction.  Runs the
- * transaction logic; IF it returns a non-error code, the transaction
- * logic MUST NOT queue a MHD response.  IF it returns an hard error,
- * the transaction logic MUST queue a MHD response and set @a mhd_ret.
- * IF it returns the soft error code, the function MAY be called again
- * to retry and MUST not queue a MHD response.
- *
- * Note that "wc->collectable.sig" is set before entering this function as we
- * signed before entering the transaction.
- *
- * @param cls a `struct WithdrawContext *`
- * @param connection MHD request which triggered the transaction
- * @param[out] mhd_ret set to MHD response status for @a connection,
- *             if transaction failed (!)
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-withdraw_transaction (void *cls,
-                      struct MHD_Connection *connection,
-                      MHD_RESULT *mhd_ret)
-{
-  struct WithdrawContext *wc = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  bool found = false;
-  bool balance_ok = false;
-  struct GNUNET_TIME_Timestamp now;
-  uint64_t ruuid;
-  const struct TALER_CsNonce *nonce;
-  const struct TALER_BlindedPlanchet *bp;
-
-  now = GNUNET_TIME_timestamp_get ();
-  bp = &wc->blinded_planchet;
-  nonce =
-    (TALER_DENOMINATION_CS == bp->cipher)
-    ? &bp->details.cs_blinded_planchet.nonce
-    : NULL;
-  // FIXME: what error is returned on nonce reuse?
-  // Should expand function to return this error
-  // specifically, and then we should return a
-  // TALER_EC_EXCHANGE_WITHDRAW_NONCE_REUSE,
-  qs = TEH_plugin->do_withdraw (TEH_plugin->cls,
-                                nonce,
-                                &wc->collectable,
-                                now,
-                                &found,
-                                &balance_ok,
-                                &wc->kyc,
-                                &ruuid);
-  if (0 > qs)
-  {
-    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-      *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                             MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                             TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                             "do_withdraw");
-    return qs;
-  }
-  if (! found)
-  {
-    *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                           MHD_HTTP_NOT_FOUND,
-                                           TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN,
-                                           NULL);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (! balance_ok)
-  {
-    TEH_plugin->rollback (TEH_plugin->cls);
-    *mhd_ret = TEH_RESPONSE_reply_reserve_insufficient_balance (
-      connection,
-      &wc->collectable.amount_with_fee,
-      &wc->collectable.reserve_pub);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if ( (TEH_KYC_NONE != TEH_kyc_config.mode) &&
-       (! wc->kyc.ok) &&
-       (TALER_EXCHANGEDB_KYC_W2W == wc->kyc.type) )
-  {
-    /* Wallet-to-wallet payments _always_ require KYC */
-    *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
-      connection,
-      MHD_HTTP_ACCEPTED,
-      GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                               wc->kyc.payment_target_uuid));
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if ( (TEH_KYC_NONE != TEH_kyc_config.mode) &&
-       (! wc->kyc.ok) &&
-       (TALER_EXCHANGEDB_KYC_WITHDRAW == wc->kyc.type) &&
-       (! GNUNET_TIME_relative_is_zero (TEH_kyc_config.withdraw_period)) )
-  {
-    /* Withdraws require KYC if above threshold */
-    enum GNUNET_DB_QueryStatus qs2;
-    bool below_limit;
-
-    qs2 = TEH_plugin->do_withdraw_limit_check (
-      TEH_plugin->cls,
-      ruuid,
-      GNUNET_TIME_absolute_subtract (now.abs_time,
-                                     TEH_kyc_config.withdraw_period),
-      &TEH_kyc_config.withdraw_limit,
-      &below_limit);
-    if (0 > qs2)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs2);
-      if (GNUNET_DB_STATUS_HARD_ERROR == qs2)
-        *mhd_ret = TALER_MHD_reply_with_error (connection,
-                                               MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                               TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                               "do_withdraw_limit_check");
-      return qs2;
-    }
-    if (! below_limit)
-    {
-      *mhd_ret = TALER_MHD_REPLY_JSON_PACK (
-        connection,
-        MHD_HTTP_ACCEPTED,
-        GNUNET_JSON_pack_uint64 ("payment_target_uuid",
-                                 wc->kyc.payment_target_uuid));
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
-  return qs;
-}
-
-
-/**
- * Check if the @a rc is replayed and we already have an
- * answer. If so, replay the existing answer and return the
- * HTTP response.
- *
- * @param rc request context
- * @param[in,out] wc parsed request data
- * @param[out] mret HTTP status, set if we return true
- * @return true if the request is idempotent with an existing request
- *    false if we did not find the request in the DB and did not set @a mret
- */
-static bool
-check_request_idempotent (struct TEH_RequestContext *rc,
-                          struct WithdrawContext *wc,
-                          MHD_RESULT *mret)
-{
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = TEH_plugin->get_withdraw_info (TEH_plugin->cls,
-                                      &wc->h_coin_envelope,
-                                      &wc->collectable);
-  if (0 > qs)
-  {
-    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-    if (GNUNET_DB_STATUS_HARD_ERROR == qs)
-      *mret = TALER_MHD_reply_with_error (rc->connection,
-                                          MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                          TALER_EC_GENERIC_DB_FETCH_FAILED,
-                                          "get_withdraw_info");
-    return true; /* well, kind-of */
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-    return false;
-  /* generate idempotent reply */
-  *mret = TALER_MHD_REPLY_JSON_PACK (
-    rc->connection,
-    MHD_HTTP_OK,
-    TALER_JSON_pack_blinded_denom_sig ("ev_sig",
-                                       &wc->collectable.sig));
-  TALER_blinded_denom_sig_free (&wc->collectable.sig);
-  return true;
-}
-
-
-MHD_RESULT
-TEH_handler_withdraw (struct TEH_RequestContext *rc,
-                      const struct TALER_ReservePublicKeyP *reserve_pub,
-                      const json_t *root)
-{
-  struct WithdrawContext wc;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
-                                 &wc.collectable.reserve_sig),
-    GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
-                                 &wc.collectable.denom_pub_hash),
-    TALER_JSON_spec_blinded_planchet ("coin_ev",
-                                      &wc.blinded_planchet),
-    GNUNET_JSON_spec_end ()
-  };
-  enum TALER_ErrorCode ec;
-  struct TEH_DenominationKey *dk;
-
-  memset (&wc,
-          0,
-          sizeof (wc));
-  wc.collectable.reserve_pub = *reserve_pub;
-
-  {
-    enum GNUNET_GenericReturnValue res;
-
-    res = TALER_MHD_parse_json_data (rc->connection,
-                                     root,
-                                     spec);
-    if (GNUNET_OK != res)
-      return (GNUNET_SYSERR == res) ? MHD_NO : MHD_YES;
-  }
-  {
-    MHD_RESULT mret;
-    struct TEH_KeyStateHandle *ksh;
-
-    ksh = TEH_keys_get_state ();
-    if (NULL == ksh)
-    {
-      if (! check_request_idempotent (rc,
-                                      &wc,
-                                      &mret))
-      {
-        GNUNET_JSON_parse_free (spec);
-        return TALER_MHD_reply_with_error (rc->connection,
-                                           MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                           TALER_EC_EXCHANGE_GENERIC_KEYS_MISSING,
-                                           NULL);
-      }
-      GNUNET_JSON_parse_free (spec);
-      return mret;
-    }
-    dk = TEH_keys_denomination_by_hash2 (ksh,
-                                         &wc.collectable.denom_pub_hash,
-                                         NULL,
-                                         NULL);
-    if (NULL == dk)
-    {
-      if (! check_request_idempotent (rc,
-                                      &wc,
-                                      &mret))
-      {
-        GNUNET_JSON_parse_free (spec);
-        return TEH_RESPONSE_reply_unknown_denom_pub_hash (
-          rc->connection,
-          &wc.collectable.denom_pub_hash);
-      }
-      GNUNET_JSON_parse_free (spec);
-      return mret;
-    }
-    if (GNUNET_TIME_absolute_is_past (dk->meta.expire_withdraw.abs_time))
-    {
-      /* This denomination is past the expiration time for withdraws */
-      if (! check_request_idempotent (rc,
-                                      &wc,
-                                      &mret))
-      {
-        GNUNET_JSON_parse_free (spec);
-        return TEH_RESPONSE_reply_expired_denom_pub_hash (
-          rc->connection,
-          &wc.collectable.denom_pub_hash,
-          TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
-          "WITHDRAW");
-      }
-      GNUNET_JSON_parse_free (spec);
-      return mret;
-    }
-    if (GNUNET_TIME_absolute_is_future (dk->meta.start.abs_time))
-    {
-      /* This denomination is not yet valid, no need to check
-         for idempotency! */
-      GNUNET_JSON_parse_free (spec);
-      return TEH_RESPONSE_reply_expired_denom_pub_hash (
-        rc->connection,
-        &wc.collectable.denom_pub_hash,
-        TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
-        "WITHDRAW");
-    }
-    if (dk->recoup_possible)
-    {
-      /* This denomination has been revoked */
-      if (! check_request_idempotent (rc,
-                                      &wc,
-                                      &mret))
-      {
-        GNUNET_JSON_parse_free (spec);
-        return TEH_RESPONSE_reply_expired_denom_pub_hash (
-          rc->connection,
-          &wc.collectable.denom_pub_hash,
-          TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
-          "WITHDRAW");
-      }
-      GNUNET_JSON_parse_free (spec);
-      return mret;
-    }
-    if (dk->denom_pub.cipher != wc.blinded_planchet.cipher)
-    {
-      /* denomination cipher and blinded planchet cipher not the same */
-      GNUNET_JSON_parse_free (spec);
-      return TALER_MHD_reply_with_error (rc->connection,
-                                         MHD_HTTP_BAD_REQUEST,
-                                         TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
-                                         NULL);
-    }
-  }
-
-  if (0 >
-      TALER_amount_add (&wc.collectable.amount_with_fee,
-                        &dk->meta.value,
-                        &dk->meta.fees.withdraw))
-  {
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_EXCHANGE_WITHDRAW_AMOUNT_FEE_OVERFLOW,
-                                       NULL);
-  }
-
-  if (GNUNET_OK !=
-      TALER_coin_ev_hash (&wc.blinded_planchet,
-                          &wc.collectable.denom_pub_hash,
-                          &wc.collectable.h_coin_envelope))
-  {
-    GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_INTERNAL_SERVER_ERROR,
-                                       TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
-                                       NULL);
-  }
-
-  TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
-  if (GNUNET_OK !=
-      TALER_wallet_withdraw_verify (&wc.collectable.denom_pub_hash,
-                                    &wc.collectable.amount_with_fee,
-                                    &wc.collectable.h_coin_envelope,
-                                    &wc.collectable.reserve_pub,
-                                    &wc.collectable.reserve_sig))
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_error (rc->connection,
-                                       MHD_HTTP_FORBIDDEN,
-                                       TALER_EC_EXCHANGE_WITHDRAW_RESERVE_SIGNATURE_INVALID,
-                                       NULL);
-  }
-
-  /* Sign before transaction! */
-  ec = TEH_keys_denomination_sign_withdraw (
-    &wc.collectable.denom_pub_hash,
-    &wc.blinded_planchet,
-    &wc.collectable.sig);
-  if (TALER_EC_NONE != ec)
-  {
-    GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
-    return TALER_MHD_reply_with_ec (rc->connection,
-                                    ec,
-                                    NULL);
-  }
-
-  /* run transaction */
-  {
-    MHD_RESULT mhd_ret;
-
-    if (GNUNET_OK !=
-        TEH_DB_run_transaction (rc->connection,
-                                "run withdraw",
-                                TEH_MT_REQUEST_WITHDRAW,
-                                &mhd_ret,
-                                &withdraw_transaction,
-                                &wc))
-    {
-      /* Even if #withdraw_transaction() failed, it may have created a signature
-         (or we might have done it optimistically above). */
-      TALER_blinded_denom_sig_free (&wc.collectable.sig);
-      GNUNET_JSON_parse_free (spec);
-      return mhd_ret;
-    }
-  }
-
-  /* Clean up and send back final response */
-  GNUNET_JSON_parse_free (spec);
-
-  {
-    MHD_RESULT ret;
-
-    ret = TALER_MHD_REPLY_JSON_PACK (
-      rc->connection,
-      MHD_HTTP_OK,
-      TALER_JSON_pack_blinded_denom_sig ("ev_sig",
-                                         &wc.collectable.sig));
-    TALER_blinded_denom_sig_free (&wc.collectable.sig);
-    return ret;
-  }
-}
-
-
-/* end of taler-exchange-httpd_withdraw.c */
diff --git a/src/exchange/taler-exchange-kyc-aml-pep-trigger.sh b/src/exchange/taler-exchange-kyc-aml-pep-trigger.sh
new file mode 100755
index 000000000..9baa32baf
--- /dev/null
+++ b/src/exchange/taler-exchange-kyc-aml-pep-trigger.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# This file is in the public domain.
+# This is an example of how to trigger AML if the
+# KYC attributes include '{"pep":true}'
+#
+# To be used as a script for the KYC_AML_TRIGGER.
+test "false" = $(jq .pep -)
diff --git a/src/exchange/taler-exchange-router.c b/src/exchange/taler-exchange-router.c
index 0816dfdba..a1a247194 100644
--- a/src/exchange/taler-exchange-router.c
+++ b/src/exchange/taler-exchange-router.c
@@ -32,7 +32,7 @@
 #include "taler_bank_service.h"
 
 
-// FIXME: revisit how (and if) we do sharding!
+// FIXME #7271: revisit how (and if) we do sharding!
 // Maybe use different helpers for wads than
 // for local purses?!
 /**
@@ -282,7 +282,7 @@ run_routing (void *cls)
   task = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Checking for ready P2P transfers to route\n");
-  // FIXME: do actual work here!
+  // FIXME #7271: do actual work here!
   commit_or_warn ();
   release_shard (s);
   task = GNUNET_SCHEDULER_add_now (&run_shard,
diff --git a/src/exchange/taler-exchange-transfer.c b/src/exchange/taler-exchange-transfer.c
index 011da6b57..9724b41fc 100644
--- a/src/exchange/taler-exchange-transfer.c
+++ b/src/exchange/taler-exchange-transfer.c
@@ -264,7 +264,7 @@ shutdown_task (void *cls)
 
 
 /**
- * Parse the configuration for wirewatch.
+ * Parse the configuration for taler-exchange-transfer.
  *
  * @return #GNUNET_OK on success
  */
@@ -406,25 +406,17 @@ batch_done (void)
  * except for irrecoverable errors.
  *
  * @param cls `struct WirePrepareData` we are working on
- * @param http_status_code #MHD_HTTP_OK on success
- * @param ec taler error code
- * @param row_id unique ID of the wire transfer in the bank's records
- * @param wire_timestamp when did the transfer happen
+ * @param tr transfer response
  */
 static void
 wire_confirm_cb (void *cls,
-                 unsigned int http_status_code,
-                 enum TALER_ErrorCode ec,
-                 uint64_t row_id,
-                 struct GNUNET_TIME_Timestamp wire_timestamp)
+                 const struct TALER_BANK_TransferResponse *tr)
 {
   struct WirePrepareData *wpd = cls;
   enum GNUNET_DB_QueryStatus qs;
 
-  (void) row_id;
-  (void) wire_timestamp;
   wpd->eh = NULL;
-  switch (http_status_code)
+  switch (tr->http_status)
   {
   case MHD_HTTP_OK:
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -435,11 +427,12 @@ wire_confirm_cb (void *cls,
     /* continued below */
     break;
   case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Wire transaction %llu failed: %u/%d\n",
                 (unsigned long long) wpd->row_id,
-                http_status_code,
-                ec);
+                tr->http_status,
+                tr->ec);
     qs = db_plugin->wire_prepare_data_mark_failed (db_plugin->cls,
                                                    wpd->row_id);
     /* continued below */
@@ -456,7 +449,7 @@ wire_confirm_cb (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   "Wire transfer %llu failed (%u), trying again\n",
                   (unsigned long long) wpd->row_id,
-                  http_status_code);
+                  tr->http_status);
       wpd->eh = TALER_BANK_transfer (ctx,
                                      wpd->wa->auth,
                                      &wpd[1],
@@ -468,8 +461,8 @@ wire_confirm_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Wire transaction %llu failed: %u/%d\n",
                 (unsigned long long) wpd->row_id,
-                http_status_code,
-                ec);
+                tr->http_status,
+                tr->ec);
     cleanup_wpd ();
     db_plugin->rollback (db_plugin->cls);
     global_ret = EXIT_FAILURE;
@@ -479,8 +472,8 @@ wire_confirm_cb (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Wire transfer %llu failed: %u/%d\n",
                 (unsigned long long) wpd->row_id,
-                http_status_code,
-                ec);
+                tr->http_status,
+                tr->ec);
     db_plugin->rollback (db_plugin->cls);
     cleanup_wpd ();
     global_ret = EXIT_FAILURE;
@@ -563,9 +556,9 @@ wire_prepare_cb (void *cls,
   }
   wpd = GNUNET_malloc (sizeof (struct WirePrepareData)
                        + buf_size);
-  memcpy (&wpd[1],
-          buf,
-          buf_size);
+  GNUNET_memcpy (&wpd[1],
+                 buf,
+                 buf_size);
   wpd->buf_size = buf_size;
   wpd->row_id = rowid;
   GNUNET_CONTAINER_DLL_insert (wpd_head,
@@ -582,7 +575,7 @@ wire_prepare_cb (void *cls,
     GNUNET_break (0);
     cleanup_wpd ();
     db_plugin->rollback (db_plugin->cls);
-    global_ret = EXIT_NOTCONFIGURED;
+    global_ret = EXIT_NO_RESTART;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -715,7 +708,7 @@ run_transfers (void *cls)
     }
     else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "No more pending wire transfers, going idle\n");
       GNUNET_assert (NULL == task);
       task = GNUNET_SCHEDULER_add_delayed (transfer_idle_sleep_interval,
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index 898d678a3..da5d9c098 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016--2022 Taler Systems SA
+  Copyright (C) 2016--2023 Taler Systems SA
 
   TALER 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
@@ -13,7 +13,6 @@
   You should have received a copy of the GNU Affero General Public License along with
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 */
-
 /**
  * @file taler-exchange-wirewatch.c
  * @brief Process that watches for wire transfers to the exchange's bank account
@@ -43,118 +42,111 @@
 #define MAXIMUM_BATCH_SIZE 1024
 
 /**
- * Information we keep for each supported account.
+ * Information about our account.
  */
-struct WireAccount
-{
-  /**
-   * Accounts are kept in a DLL.
-   */
-  struct WireAccount *next;
-
-  /**
-   * Plugins are kept in a DLL.
-   */
-  struct WireAccount *prev;
+static const struct TALER_EXCHANGEDB_AccountInfo *ai;
 
-  /**
-   * Information about this account.
-   */
-  const struct TALER_EXCHANGEDB_AccountInfo *ai;
-
-  /**
-   * Active request for history.
-   */
-  struct TALER_BANK_CreditHistoryHandle *hh;
+/**
+ * Active request for history.
+ */
+static struct TALER_BANK_CreditHistoryHandle *hh;
 
-  /**
-   * Until when is processing this wire plugin delayed?
-   */
-  struct GNUNET_TIME_Absolute delayed_until;
+/**
+ * Set to true if the request for history did actually
+ * return transaction items.
+ */
+static bool hh_returned_data;
 
-  /**
-   * Encoded offset in the wire transfer list from where
-   * to start the next query with the bank.
-   */
-  uint64_t batch_start;
+/**
+ * Set to true if the request for history did not
+ * succeed because the account was unknown.
+ */
+static bool hh_account_404;
 
-  /**
-   * Latest row offset seen in this transaction, becomes
-   * the new #batch_start upon commit.
-   */
-  uint64_t latest_row_off;
+/**
+ * When did we start the last @e hh request?
+ */
+static struct GNUNET_TIME_Absolute hh_start_time;
 
-  /**
-   * Maximum row offset this transaction may yield. If we got the
-   * maximum number of rows, we must not @e delay before running
-   * the next transaction.
-   */
-  uint64_t max_row_off;
+/**
+ * Until when is processing this wire plugin delayed?
+ */
+static struct GNUNET_TIME_Absolute delayed_until;
 
-  /**
-   * Offset where our current shard begins (inclusive).
-   */
-  uint64_t shard_start;
+/**
+ * Encoded offset in the wire transfer list from where
+ * to start the next query with the bank.
+ */
+static uint64_t batch_start;
 
-  /**
-   * Offset where our current shard ends (exclusive).
-   */
-  uint64_t shard_end;
+/**
+ * Latest row offset seen in this transaction, becomes
+ * the new #batch_start upon commit.
+ */
+static uint64_t latest_row_off;
 
-  /**
-   * When did we start with the shard?
-   */
-  struct GNUNET_TIME_Absolute shard_start_time;
+/**
+ * Offset where our current shard begins (inclusive).
+ */
+static uint64_t shard_start;
 
-  /**
-   * Name of our job in the shard table.
-   */
-  char *job_name;
+/**
+ * Offset where our current shard ends (exclusive).
+ */
+static uint64_t shard_end;
 
-  /**
-   * How many transactions do we retrieve per batch?
-   */
-  unsigned int batch_size;
+/**
+ * When did we start with the shard?
+ */
+static struct GNUNET_TIME_Absolute shard_start_time;
 
-  /**
-   * How much do we incremnt @e batch_size on success?
-   */
-  unsigned int batch_thresh;
+/**
+ * For how long did we lock the shard?
+ */
+static struct GNUNET_TIME_Absolute shard_end_time;
 
-  /**
-   * How many transactions did we see in the current batch?
-   */
-  unsigned int current_batch_size;
+/**
+ * How long did we take to finish the last shard
+ * for this account?
+ */
+static struct GNUNET_TIME_Relative shard_delay;
 
-  /**
-   * Should we delay the next request to the wire plugin a bit?  Set to
-   * false if we actually did some work.
-   */
-  bool delay;
+/**
+ * How long did we take to finish the last shard
+ * for this account?
+ */
+static struct GNUNET_TIME_Relative longpoll_timeout;
 
-  /**
-   * Did we start a transaction yet?
-   */
-  bool started_transaction;
+/**
+ * Name of our job in the shard table.
+ */
+static char *job_name;
 
-};
+/**
+ * How many transactions do we retrieve per batch?
+ */
+static unsigned int batch_size;
 
+/**
+ * How much do we increment @e batch_size on success?
+ */
+static unsigned int batch_thresh;
 
 /**
- * Head of list of loaded wire plugins.
+ * Did work remain in the transaction queue? Set to true
+ * if we did some work and thus there might be more.
  */
-static struct WireAccount *wa_head;
+static bool progress;
 
 /**
- * Tail of list of loaded wire plugins.
+ * Did we start a transaction yet?
  */
-static struct WireAccount *wa_tail;
+static bool started_transaction;
 
 /**
- * Wire account we are currently processing.  This would go away
- * if we ever start processing all accounts in parallel.
+ * Is this shard still open for processing.
  */
-static struct WireAccount *wa_pos;
+static bool shard_open;
 
 /**
  * Handle to the context for interacting with the bank.
@@ -185,9 +177,9 @@ static struct TALER_EXCHANGEDB_Plugin *db_plugin;
 static struct GNUNET_TIME_Relative wirewatch_idle_sleep_interval;
 
 /**
- * How long did we take to finish the last shard?
+ * How long do we sleep on serialization conflicts?
  */
-static struct GNUNET_TIME_Relative shard_delay;
+static struct GNUNET_TIME_Relative wirewatch_conflict_sleep_interval;
 
 /**
  * Modulus to apply to group shards.  The shard size must ultimately be a
@@ -201,6 +193,10 @@ static unsigned int shard_size = MAXIMUM_BATCH_SIZE;
  */
 static unsigned int max_workers = 16;
 
+/**
+ * -e command-line option: exit on errors talking to the bank?
+ */
+static int exit_on_error;
 
 /**
  * Value to return from main(). 0 on success, non-zero on
@@ -214,10 +210,20 @@ static int global_ret;
 static int test_mode;
 
 /**
+ * Should we ignore if the bank does not know our bank
+ * account?
+ */
+static int ignore_account_404;
+
+/**
  * Current task waiting for execution, if any.
  */
 static struct GNUNET_SCHEDULER_Task *task;
 
+/**
+ * Name of the configuration section with the account we should watch.
+ */
+static char *account_section;
 
 /**
  * We're being aborted with CTRL-C (or SIGTERM). Shut down.
@@ -227,40 +233,32 @@ static struct GNUNET_SCHEDULER_Task *task;
 static void
 shutdown_task (void *cls)
 {
+  enum GNUNET_DB_QueryStatus qs;
   (void) cls;
-  {
-    struct WireAccount *wa;
 
-    while (NULL != (wa = wa_head))
-    {
-      enum GNUNET_DB_QueryStatus qs;
-
-      if (NULL != wa->hh)
-      {
-        TALER_BANK_credit_history_cancel (wa->hh);
-        wa->hh = NULL;
-      }
-      GNUNET_CONTAINER_DLL_remove (wa_head,
-                                   wa_tail,
-                                   wa);
-      if (wa->started_transaction)
-      {
-        db_plugin->rollback (db_plugin->cls);
-        wa->started_transaction = false;
-      }
-      qs = db_plugin->abort_shard (db_plugin->cls,
-                                   wa_pos->job_name,
-                                   wa_pos->shard_start,
-                                   wa_pos->shard_end);
-      if (qs <= 0)
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Failed to abort work shard on shutdown\n");
-      GNUNET_free (wa->job_name);
-      GNUNET_free (wa);
-    }
+  if (NULL != hh)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "History request cancelled on shutdown\n");
+    TALER_BANK_credit_history_cancel (hh);
+    hh = NULL;
   }
-  wa_pos = NULL;
-
+  if (started_transaction)
+  {
+    db_plugin->rollback (db_plugin->cls);
+    started_transaction = false;
+  }
+  if (shard_open)
+  {
+    qs = db_plugin->abort_shard (db_plugin->cls,
+                                 job_name,
+                                 shard_start,
+                                 shard_end);
+    if (qs <= 0)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to abort work shard on shutdown\n");
+  }
+  GNUNET_free (job_name);
   if (NULL != ctx)
   {
     GNUNET_CURL_fini (ctx);
@@ -288,28 +286,36 @@ shutdown_task (void *cls)
  * account to our list (if it is enabled and we can load the plugin).
  *
  * @param cls closure, NULL
- * @param ai account information
+ * @param in_ai account information
  */
 static void
 add_account_cb (void *cls,
-                const struct TALER_EXCHANGEDB_AccountInfo *ai)
+                const struct TALER_EXCHANGEDB_AccountInfo *in_ai)
 {
-  struct WireAccount *wa;
-
   (void) cls;
-  if (! ai->credit_enabled)
+  if (! in_ai->credit_enabled)
+    return; /* not enabled for us, skip */
+  if ( (NULL != account_section) &&
+       (0 != strcasecmp (in_ai->section_name,
+                         account_section)) )
     return; /* not enabled for us, skip */
-  wa = GNUNET_new (struct WireAccount);
-  wa->ai = ai;
-  GNUNET_asprintf (&wa->job_name,
+  if (NULL != ai)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Multiple accounts enabled (%s and %s), use '-a' command-line option to select one!\n",
+                ai->section_name,
+                in_ai->section_name);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  ai = in_ai;
+  GNUNET_asprintf (&job_name,
                    "wirewatch-%s",
                    ai->section_name);
-  wa->batch_size = MAXIMUM_BATCH_SIZE;
-  if (0 != shard_size % wa->batch_size)
-    wa->batch_size = shard_size;
-  GNUNET_CONTAINER_DLL_insert (wa_head,
-                               wa_tail,
-                               wa);
+  batch_size = MAXIMUM_BATCH_SIZE;
+  if (0 != shard_size % batch_size)
+    batch_size = shard_size;
 }
 
 
@@ -347,354 +353,438 @@ exchange_serve_process_config (void)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No wire accounts configured for credit!\n");
-    TALER_EXCHANGEDB_plugin_unload (db_plugin);
-    db_plugin = NULL;
     return GNUNET_SYSERR;
   }
   TALER_EXCHANGEDB_find_accounts (&add_account_cb,
                                   NULL);
-  GNUNET_assert (NULL != wa_head);
+  if (NULL == ai)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No accounts enabled for credit!\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 }
 
 
 /**
- * Query for incoming wire transfers.
+ * Lock a shard and then begin to query for incoming wire transfers.
  *
  * @param cls NULL
  */
 static void
-find_transfers (void *cls);
+lock_shard (void *cls);
 
 
 /**
- * We encountered a serialization error.
- * Rollback the transaction and try again
+ * Continue with the credit history of the shard.
  *
- * @param wa account we are transacting on
+ * @param cls NULL
+ */
+static void
+continue_with_shard (void *cls);
+
+
+/**
+ * We encountered a serialization error.  Rollback the transaction and try
+ * again.
  */
 static void
-handle_soft_error (struct WireAccount *wa)
+handle_soft_error (void)
 {
   db_plugin->rollback (db_plugin->cls);
-  wa->started_transaction = false;
-  if (1 < wa->batch_size)
+  started_transaction = false;
+  if (1 < batch_size)
   {
-    wa->batch_thresh = wa->batch_size;
-    wa->batch_size /= 2;
+    batch_thresh = batch_size;
+    batch_size /= 2;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Reduced batch size to %llu due to serialization issue\n",
-                (unsigned long long) wa->batch_size);
+                (unsigned long long) batch_size);
   }
+  /* Reset to beginning of transaction, and go again
+     from there. */
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Encountered soft error, resetting start point to batch start\n");
+  latest_row_off = batch_start;
   GNUNET_assert (NULL == task);
-  task = GNUNET_SCHEDULER_add_now (&find_transfers,
+  task = GNUNET_SCHEDULER_add_now (&continue_with_shard,
                                    NULL);
 }
 
 
 /**
- * We are done with a shard, move on to the next one.
- *
- * @param wa wire account for which we completed a shard
+ * Schedule the #lock_shard() operation.
  */
 static void
-shard_completed (struct WireAccount *wa)
+schedule_transfers (void)
 {
-  /* transaction success, update #last_row_off */
-  wa->batch_start = wa->latest_row_off;
-  if (wa->batch_size < MAXIMUM_BATCH_SIZE)
-  {
-    int delta;
-
-    delta = ((int) wa->batch_thresh - (int) wa->batch_size) / 4;
-    if (delta < 0)
-      delta = -delta;
-    wa->batch_size = GNUNET_MIN (MAXIMUM_BATCH_SIZE,
-                                 wa->batch_size + delta + 1);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Increasing batch size to %llu\n",
-                (unsigned long long) wa->batch_size);
-  }
-  if (wa->delay)
-  {
-    wa->delayed_until
-      = GNUNET_TIME_relative_to_absolute (wirewatch_idle_sleep_interval);
-    wa_pos = wa_pos->next;
-    if (NULL == wa_pos)
-      wa_pos = wa_head;
-    GNUNET_assert (NULL != wa_pos);
-  }
+  if (shard_open)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Will retry my shard (%llu,%llu] of %s in %s\n",
+                (unsigned long long) shard_start,
+                (unsigned long long) shard_end,
+                job_name,
+                GNUNET_STRINGS_relative_time_to_string (
+                  GNUNET_TIME_absolute_get_remaining (delayed_until),
+                  true));
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Will try to lock next shard of %s in %s\n",
+                job_name,
+                GNUNET_STRINGS_relative_time_to_string (
+                  GNUNET_TIME_absolute_get_remaining (delayed_until),
+                  true));
   GNUNET_assert (NULL == task);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Will look for more transfers in %s\n",
-              GNUNET_STRINGS_relative_time_to_string (
-                GNUNET_TIME_absolute_get_remaining (wa_pos->delayed_until),
-                GNUNET_YES));
-  task = GNUNET_SCHEDULER_add_at (wa_pos->delayed_until,
-                                  &find_transfers,
+  task = GNUNET_SCHEDULER_add_at (delayed_until,
+                                  &lock_shard,
                                   NULL);
 }
 
 
 /**
- * We are finished with the current shard. Update the database, marking the
- * shard as finished.
- *
- * @param wa wire account to commit for
- * @return true on success
+ * We are done with the work that is possible right now (and the transaction
+ * was committed, if there was one to commit). Move on to the next shard.
  */
-static bool
-mark_shard_done (struct WireAccount *wa)
+static void
+transaction_completed (void)
 {
-  enum GNUNET_DB_QueryStatus qs;
-
-  if (wa->shard_end > wa->latest_row_off)
-    return false; /* actually, not done! */
-  /* shard is complete, mark this as well */
-  qs = db_plugin->complete_shard (db_plugin->cls,
-                                  wa->job_name,
-                                  wa->shard_start,
-                                  wa->shard_end);
-  switch (qs)
+  if ( (batch_start + batch_size ==
+        latest_row_off) &&
+       (batch_size < MAXIMUM_BATCH_SIZE) )
   {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-    GNUNET_break (0);
-    db_plugin->rollback (db_plugin->cls);
-    GNUNET_SCHEDULER_shutdown ();
-    return false;
-  case GNUNET_DB_STATUS_SOFT_ERROR:
+    /* The current batch size worked without serialization
+       issues, and we are allowed to grow. Do so slowly. */
+    int delta;
+
+    delta = ((int) batch_thresh - (int) batch_size) / 4;
+    if (delta < 0)
+      delta = -delta;
+    batch_size = GNUNET_MIN (MAXIMUM_BATCH_SIZE,
+                             batch_size + delta + 1);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Got DB soft error for complete_shard. Rolling back.\n");
-    handle_soft_error (wa);
-    return false;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-    /* already existed, ok, let's just continue */
-    break;
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    /* normal case */
-    shard_delay = GNUNET_TIME_absolute_get_duration (wa->shard_start_time);
+                "Increasing batch size to %llu\n",
+                (unsigned long long) batch_size);
+  }
 
-    break;
+  if ( (! progress) && test_mode)
+  {
+    /* Transaction list was drained and we are in
+       test mode. So we are done. */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Transaction list drained and in test mode. Exiting\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
-  return true;
+  if (! (hh_returned_data || hh_account_404) )
+  {
+    /* Enforce long-polling delay even if the server ignored it
+       and returned earlier */
+    struct GNUNET_TIME_Relative latency;
+    struct GNUNET_TIME_Relative left;
+
+    latency = GNUNET_TIME_absolute_get_duration (hh_start_time);
+    left = GNUNET_TIME_relative_subtract (longpoll_timeout,
+                                          latency);
+    if (! (test_mode ||
+           GNUNET_TIME_relative_is_zero (left)) )
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Server did not respect long-polling, enforcing client-side by sleeping for %s\n",
+                  GNUNET_TIME_relative2s (left,
+                                          true));
+    delayed_until = GNUNET_TIME_relative_to_absolute (left);
+  }
+  if (hh_account_404)
+    delayed_until = GNUNET_TIME_relative_to_absolute (
+      GNUNET_TIME_UNIT_MILLISECONDS);
+  if (test_mode)
+    delayed_until = GNUNET_TIME_UNIT_ZERO_ABS;
+  GNUNET_assert (NULL == task);
+  schedule_transfers ();
 }
 
 
 /**
- * Continue with the credit history of the shard
- * reserved as @a wa_pos.
+ * We got incoming transaction details from the bank. Add them
+ * to the database.
  *
- * @param[in,out] wa_pos shard to continue processing
+ * @param details array of transaction details
+ * @param details_length length of the @a details array
  */
 static void
-continue_with_shard (struct WireAccount *wa_pos);
-
-
-/**
- * We are finished with the current transaction, try
- * to commit and then schedule the next iteration.
- *
- * @param wa wire account to commit for
- */
-static void
-do_commit (struct WireAccount *wa)
+process_reply (const struct TALER_BANK_CreditDetails *details,
+               unsigned int details_length)
 {
   enum GNUNET_DB_QueryStatus qs;
   bool shard_done;
+  uint64_t lroff = latest_row_off;
 
-  wa->started_transaction = false;
-  shard_done = mark_shard_done (wa);
-  qs = db_plugin->commit (db_plugin->cls);
-  switch (qs)
+  if (0 == details_length)
   {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
+    /* Server should have used 204, not 200! */
+    GNUNET_break_op (0);
+    transaction_completed ();
     return;
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-    /* reduce transaction size to reduce rollback probability */
-    handle_soft_error (wa);
-    return;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    /* normal case */
-    break;
   }
-  if (shard_done)
-    shard_completed (wa);
-  else
-    continue_with_shard (wa);
-}
-
-
-/**
- * Callbacks of this type are used to serve the result of asking
- * the bank for the transaction history.
- *
- * @param cls closure with the `struct WioreAccount *` we are processing
- * @param http_status HTTP status code from the server
- * @param ec taler error code
- * @param serial_id identification of the position at which we are querying
- * @param details details about the wire transfer
- * @param json raw JSON response
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
- */
-static enum GNUNET_GenericReturnValue
-history_cb (void *cls,
-            unsigned int http_status,
-            enum TALER_ErrorCode ec,
-            uint64_t serial_id,
-            const struct TALER_BANK_CreditDetails *details,
-            const json_t *json)
-{
-  struct WireAccount *wa = cls;
-  enum GNUNET_DB_QueryStatus qs;
-
-  (void) json;
-  if (NULL == details)
+  hh_returned_data = true;
+  /* check serial IDs for range constraints */
+  for (unsigned int i = 0; i<details_length; i++)
   {
-    wa->hh = NULL;
-    if (TALER_EC_NONE != ec)
+    const struct TALER_BANK_CreditDetails *cd = &details[i];
+
+    if (cd->serial_id < lroff)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error fetching history: ec=%u, http_status=%u\n",
-                  (unsigned int) ec,
-                  http_status);
+                  "Serial ID %llu not monotonic (got %llu before). Failing!\n",
+                  (unsigned long long) cd->serial_id,
+                  (unsigned long long) lroff);
+      db_plugin->rollback (db_plugin->cls);
+      GNUNET_SCHEDULER_shutdown ();
+      return;
     }
-    else
+    if (cd->serial_id > shard_end)
     {
+      /* we are *past* the current shard (likely because the serial_id of the
+         shard_end happens to not exist in the DB). So commit and stop this
+         iteration! */
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "History response complete\n");
+                  "Serial ID %llu past shard end at %llu, ending iteration early!\n",
+                  (unsigned long long) cd->serial_id,
+                  (unsigned long long) shard_end);
+      details_length = i;
+      progress = true;
+      lroff = cd->serial_id - 1;
+      break;
     }
-    if (wa->started_transaction)
+    lroff = cd->serial_id;
+  }
+  if (0 != details_length)
+  {
+    enum GNUNET_DB_QueryStatus qss[details_length];
+    struct TALER_EXCHANGEDB_ReserveInInfo reserves[details_length];
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Importing %u transactions\n",
+                details_length);
+    for (unsigned int i = 0; i<details_length; i++)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "End of list. Committing progress!\n");
-      do_commit (wa);
+      const struct TALER_BANK_CreditDetails *cd = &details[i];
+      struct TALER_EXCHANGEDB_ReserveInInfo *res = &reserves[i];
+
+      res->reserve_pub = &cd->reserve_pub;
+      res->balance = &cd->amount;
+      res->execution_time = cd->execution_date;
+      res->sender_account_details = cd->debit_account_uri;
+      res->exchange_account_name = ai->section_name;
+      res->wire_reference = cd->serial_id;
     }
-    else
+    qs = db_plugin->reserves_in_insert (db_plugin->cls,
+                                        reserves,
+                                        details_length,
+                                        qss);
+    switch (qs)
     {
-      if ( (wa->delay) &&
-           (test_mode) &&
-           (NULL == wa->next) )
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Got DB soft error for reserves_in_insert (%u). Rolling back.\n",
+                  details_length);
+      handle_soft_error ();
+      return;
+    default:
+      break;
+    }
+    for (unsigned int i = 0; i<details_length; i++)
+    {
+      const struct TALER_BANK_CreditDetails *cd = &details[i];
+
+      switch (qss[i])
       {
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Shutdown due to test mode!\n");
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
         GNUNET_SCHEDULER_shutdown ();
-        return GNUNET_OK;
-      }
-      else
-      {
-        shard_completed (wa);
+        return;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Got DB soft error for batch_reserves_in_insert(%u). Rolling back.\n",
+                    i);
+        handle_soft_error ();
+        return;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        /* Either wirewatch was freshly started after the system was
+           shutdown and we're going over an incomplete shard again
+           after being restarted, or the shard lock period was too
+           short (number of workers set incorrectly?) and a 2nd
+           wirewatcher has been stealing our work while we are still
+           at it. */
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Attempted to import transaction %llu (%s) twice. "
+                    "This should happen rarely (if not, ask for support).\n",
+                    (unsigned long long) cd->serial_id,
+                    job_name);
+        break;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Imported transaction %llu.\n",
+                    (unsigned long long) cd->serial_id);
+        /* normal case */
+        progress = true;
+        break;
       }
     }
-    return GNUNET_OK; /* will be ignored anyway */
   }
-  if (serial_id < wa->latest_row_off)
+
+  latest_row_off = lroff;
+  shard_done = (shard_end <= latest_row_off);
+  if (shard_done)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Serial ID %llu not monotonic (got %llu before). Failing!\n",
-                (unsigned long long) serial_id,
-                (unsigned long long) wa->latest_row_off);
-    if (wa->started_transaction)
+    /* shard is complete, mark this as well */
+    qs = db_plugin->complete_shard (db_plugin->cls,
+                                    job_name,
+                                    shard_start,
+                                    shard_end);
+    switch (qs)
     {
-      wa->started_transaction = false;
-      db_plugin->rollback (db_plugin->cls);
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Got DB soft error for complete_shard. Rolling back.\n");
+      handle_soft_error ();
+      return;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      GNUNET_break (0);
+      /* Not expected, but let's just continue */
+      break;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      /* normal case */
+      progress = true;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Completed shard %s (%llu,%llu] after %s\n",
+                  job_name,
+                  (unsigned long long) shard_start,
+                  (unsigned long long) shard_end,
+                  GNUNET_STRINGS_relative_time_to_string (
+                    GNUNET_TIME_absolute_get_duration (shard_start_time),
+                    true));
+      break;
     }
-    GNUNET_SCHEDULER_shutdown ();
-    wa->hh = NULL;
-    return GNUNET_SYSERR;
+    shard_delay = GNUNET_TIME_absolute_get_duration (shard_start_time);
+    shard_open = false;
+    transaction_completed ();
+    return;
   }
-  if (serial_id >= wa->max_row_off)
-    wa->delay = false;
-  if (serial_id > wa->shard_end)
+  GNUNET_assert (NULL == task);
+  task = GNUNET_SCHEDULER_add_now (&continue_with_shard,
+                                   NULL);
+}
+
+
+/**
+ * Callbacks of this type are used to serve the result of asking
+ * the bank for the transaction history.
+ *
+ * @param cls NULL
+ * @param reply response we got from the bank
+ */
+static void
+history_cb (void *cls,
+            const struct TALER_BANK_CreditHistoryResponse *reply)
+{
+  (void) cls;
+  GNUNET_assert (NULL == task);
+  hh = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "History request returned with HTTP status %u\n",
+              reply->http_status);
+  switch (reply->http_status)
   {
-    /* we are done with the current shard, commit and stop this iteration! */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Serial ID %llu past shard end at %llu, ending iteration early!\n",
-                (unsigned long long) serial_id,
-                (unsigned long long) wa->shard_end);
-    wa->latest_row_off = serial_id;
-    if (wa->started_transaction)
-    {
-      do_commit (wa);
-    }
-    else
+  case MHD_HTTP_OK:
+    process_reply (reply->details.ok.details,
+                   reply->details.ok.details_length);
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    transaction_completed ();
+    return;
+  case MHD_HTTP_NOT_FOUND:
+    hh_account_404 = true;
+    if (ignore_account_404)
     {
-      if (mark_shard_done (wa))
-        shard_completed (wa);
+      transaction_completed ();
+      return;
     }
-    wa->hh = NULL;
-    return GNUNET_SYSERR;
+    break;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error fetching history: %s (%u)\n",
+                TALER_ErrorCode_get_hint (reply->ec),
+                reply->http_status);
+    break;
   }
-  if (! wa->started_transaction)
+  if (! exit_on_error)
   {
-    if (GNUNET_OK !=
-        db_plugin->start_read_committed (db_plugin->cls,
-                                         "wirewatch check for incoming wire transfers"))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to start database transaction!\n");
-      global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      wa->hh = NULL;
-      return GNUNET_SYSERR;
-    }
-    wa_pos->shard_start_time = GNUNET_TIME_absolute_get ();
-    wa->started_transaction = true;
+    transaction_completed ();
+    return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding wire transfer over %s with (hashed) subject `%s'\n",
-              TALER_amount2s (&details->amount),
-              TALER_B2S (&details->reserve_pub));
-  /* FIXME-PERFORMANCE: Consider using Postgres multi-valued insert here,
-     for up to 15x speed-up according to
-     https://dba.stackexchange.com/questions/224989/multi-row-insert-vs-transactional-single-row-inserts#225006
-     (Note: this may require changing both the
-     plugin API as well as modifying how this function is called.) */
-  qs = db_plugin->reserves_in_insert (db_plugin->cls,
-                                      &details->reserve_pub,
-                                      &details->amount,
-                                      details->execution_date,
-                                      details->debit_account_uri,
-                                      wa->ai->section_name,
-                                      serial_id);
-  switch (qs)
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+static void
+continue_with_shard (void *cls)
+{
+  unsigned int limit;
+
+  (void) cls;
+  task = NULL;
+  GNUNET_assert (shard_end > latest_row_off);
+  limit = GNUNET_MIN (batch_size,
+                      shard_end - latest_row_off);
+  GNUNET_assert (NULL == hh);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Requesting credit history starting from %llu\n",
+              (unsigned long long) latest_row_off);
+  hh_start_time = GNUNET_TIME_absolute_get ();
+  hh_returned_data = false;
+  hh_account_404 = false;
+  hh = TALER_BANK_credit_history (ctx,
+                                  ai->auth,
+                                  latest_row_off,
+                                  limit,
+                                  test_mode
+                                  ? GNUNET_TIME_UNIT_ZERO
+                                  : longpoll_timeout,
+                                  &history_cb,
+                                  NULL);
+  if (NULL == hh)
   {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-    GNUNET_break (0);
-    db_plugin->rollback (db_plugin->cls);
-    wa->started_transaction = false;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to start request for account history!\n");
+    global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
-    wa->hh = NULL;
-    return GNUNET_SYSERR;
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Got DB soft error for reserves_in_insert. Rolling back.\n");
-    handle_soft_error (wa);
-    wa->hh = NULL;
-    return GNUNET_SYSERR;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-    /* already existed, ok, let's just continue */
-    break;
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    /* normal case */
-    break;
+    return;
   }
-  wa->latest_row_off = serial_id;
-  return GNUNET_OK;
 }
 
 
 /**
- * Query for incoming wire transfers.
+ * Reserve a shard for us to work on.
  *
  * @param cls NULL
  */
 static void
-find_transfers (void *cls)
+lock_shard (void *cls)
 {
   enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_TIME_Relative delay;
+  uint64_t last_shard_start = shard_start;
+  uint64_t last_shard_end = shard_end;
 
   (void) cls;
   task = NULL;
@@ -707,109 +797,122 @@ find_transfers (void *cls)
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  wa_pos->delay = true;
-  wa_pos->current_batch_size = 0; /* reset counter */
-  if (wa_pos->shard_end <= wa_pos->batch_start)
+  if ( (shard_open) &&
+       (GNUNET_TIME_absolute_is_future (shard_end_time)) )
   {
-    uint64_t start;
-    uint64_t end;
-    struct GNUNET_TIME_Relative delay;
-    /* advance to next shard */
-
-    if (0 == max_workers)
-      delay = GNUNET_TIME_UNIT_ZERO;
-    else
-      delay.rel_value_us = GNUNET_CRYPTO_random_u64 (
-        GNUNET_CRYPTO_QUALITY_WEAK,
-        4 * GNUNET_TIME_relative_max (
-          wirewatch_idle_sleep_interval,
-          GNUNET_TIME_relative_multiply (shard_delay,
-                                         max_workers)).rel_value_us);
-    qs = db_plugin->begin_shard (db_plugin->cls,
-                                 wa_pos->job_name,
-                                 delay,
-                                 shard_size,
-                                 &start,
-                                 &end);
-    switch (qs)
-    {
-    case GNUNET_DB_STATUS_HARD_ERROR:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to obtain starting point for montoring from database!\n");
-      global_ret = EXIT_FAILURE;
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    case GNUNET_DB_STATUS_SOFT_ERROR:
-      /* try again */
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Serialization error tying to obtain shard, will try again in %s!\n",
-                  GNUNET_STRINGS_relative_time_to_string (
-                    wirewatch_idle_sleep_interval,
-                    GNUNET_YES));
-      task = GNUNET_SCHEDULER_add_delayed (wirewatch_idle_sleep_interval,
-                                           &find_transfers,
-                                           NULL);
-      return;
-    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      GNUNET_break (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "No shard available, will try again in %s!\n",
-                  GNUNET_STRINGS_relative_time_to_string (
-                    wirewatch_idle_sleep_interval,
-                    GNUNET_YES));
-      task = GNUNET_SCHEDULER_add_delayed (wirewatch_idle_sleep_interval,
-                                           &find_transfers,
-                                           NULL);
-      return;
-    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-      wa_pos->shard_start = start;
-      wa_pos->shard_end = end;
-      wa_pos->batch_start = start;
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Starting with shard at [%llu,%llu) locked for %s\n",
-                  (unsigned long long) start,
-                  (unsigned long long) end,
-                  GNUNET_STRINGS_relative_time_to_string (delay,
-                                                          GNUNET_YES));
-      break;
-    }
+    progress = false;
+    batch_start = latest_row_off;
+    task = GNUNET_SCHEDULER_add_now (&continue_with_shard,
+                                     NULL);
+    return;
   }
-  wa_pos->latest_row_off = wa_pos->batch_start;
-  continue_with_shard (wa_pos);
-}
-
-
-static void
-continue_with_shard (struct WireAccount *wa_pos)
-{
-  unsigned int limit;
-
-  limit = GNUNET_MIN (wa_pos->batch_size,
-                      wa_pos->shard_end - wa_pos->latest_row_off);
-  GNUNET_assert (NULL == wa_pos->hh);
-  wa_pos->max_row_off = wa_pos->latest_row_off + limit - 1;
-  wa_pos->hh = TALER_BANK_credit_history (ctx,
-                                          wa_pos->ai->auth,
-                                          wa_pos->latest_row_off,
-                                          limit,
-                                          test_mode
-                                          ? GNUNET_TIME_UNIT_ZERO
-                                          : LONGPOLL_TIMEOUT,
-                                          &history_cb,
-                                          wa_pos);
-  if (NULL == wa_pos->hh)
+  if (shard_open)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Shard not completed in time, will try to re-acquire\n");
+  /* How long we lock a shard depends on the number of
+     workers expected, and how long we usually took to
+     process a shard. */
+  if (0 == max_workers)
+    delay = GNUNET_TIME_UNIT_ZERO;
+  else
+    delay.rel_value_us = GNUNET_CRYPTO_random_u64 (
+      GNUNET_CRYPTO_QUALITY_WEAK,
+      4 * GNUNET_TIME_relative_max (
+        wirewatch_idle_sleep_interval,
+        GNUNET_TIME_relative_multiply (shard_delay,
+                                       max_workers)).rel_value_us);
+  shard_start_time = GNUNET_TIME_absolute_get ();
+  qs = db_plugin->begin_shard (db_plugin->cls,
+                               job_name,
+                               delay,
+                               shard_size,
+                               &shard_start,
+                               &shard_end);
+  switch (qs)
   {
+  case GNUNET_DB_STATUS_HARD_ERROR:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to start request for account history!\n");
-    if (wa_pos->started_transaction)
-    {
-      db_plugin->rollback (db_plugin->cls);
-      wa_pos->started_transaction = false;
-    }
+                "Failed to obtain starting point for montoring from database!\n");
     global_ret = EXIT_FAILURE;
     GNUNET_SCHEDULER_shutdown ();
     return;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    /* try again */
+    {
+      struct GNUNET_TIME_Relative rdelay;
+
+      wirewatch_conflict_sleep_interval
+        = GNUNET_TIME_STD_BACKOFF (wirewatch_conflict_sleep_interval);
+      rdelay = GNUNET_TIME_randomize (wirewatch_conflict_sleep_interval);
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Serialization error tying to obtain shard %s, will try again in %s!\n",
+                  job_name,
+                  GNUNET_STRINGS_relative_time_to_string (rdelay,
+                                                          true));
+#if 1
+      if (GNUNET_TIME_relative_cmp (rdelay,
+                                    >,
+                                    GNUNET_TIME_UNIT_SECONDS))
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Delay would have been for %s\n",
+                    GNUNET_TIME_relative2s (rdelay,
+                                            true));
+      rdelay = GNUNET_TIME_relative_min (rdelay,
+                                         GNUNET_TIME_UNIT_SECONDS);
+#endif
+      delayed_until = GNUNET_TIME_relative_to_absolute (rdelay);
+    }
+    GNUNET_assert (NULL == task);
+    schedule_transfers ();
+    return;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No shard available, will try again for %s in %s!\n",
+                job_name,
+                GNUNET_STRINGS_relative_time_to_string (
+                  wirewatch_idle_sleep_interval,
+                  true));
+    delayed_until = GNUNET_TIME_relative_to_absolute (
+      wirewatch_idle_sleep_interval);
+    shard_open = false;
+    GNUNET_assert (NULL == task);
+    schedule_transfers ();
+    return;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    /* continued below */
+    wirewatch_conflict_sleep_interval = GNUNET_TIME_UNIT_ZERO;
+    break;
+  }
+  shard_end_time = GNUNET_TIME_relative_to_absolute (delay);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting with shard %s at (%llu,%llu] locked for %s\n",
+              job_name,
+              (unsigned long long) shard_start,
+              (unsigned long long) shard_end,
+              GNUNET_STRINGS_relative_time_to_string (delay,
+                                                      true));
+  progress = false;
+  batch_start = shard_start;
+  if ( (shard_open) &&
+       (shard_start == last_shard_start) &&
+       (shard_end == last_shard_end) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Continuing from %llu\n",
+                (unsigned long long) latest_row_off);
+    GNUNET_break (latest_row_off >= batch_start); /* resume where we left things */
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Resetting shard start to original start point (%d)\n",
+                shard_open ? 1 : 0);
+    latest_row_off = batch_start;
+  }
+  shard_open = true;
+  task = GNUNET_SCHEDULER_add_now (&continue_with_shard,
+                                   NULL);
 }
 
 
@@ -832,27 +935,26 @@ run (void *cls,
   (void) cfgfile;
 
   cfg = c;
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 cls);
   if (GNUNET_OK !=
       exchange_serve_process_config ())
   {
     global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  wa_pos = wa_head;
-  GNUNET_assert (NULL != wa_pos);
-  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
-                                 cls);
   ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
                           &rc);
-  rc = GNUNET_CURL_gnunet_rc_create (ctx);
   if (NULL == ctx)
   {
     GNUNET_break (0);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = EXIT_NO_RESTART;
     return;
   }
-
-  task = GNUNET_SCHEDULER_add_now (&find_transfers,
-                                   NULL);
+  rc = GNUNET_CURL_gnunet_rc_create (ctx);
+  schedule_transfers ();
 }
 
 
@@ -868,6 +970,24 @@ main (int argc,
       char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('a',
+                                 "account",
+                                 "SECTION_NAME",
+                                 "name of the configuration section with the account we should watch (needed if more than one is enabled for crediting)",
+                                 &account_section),
+    GNUNET_GETOPT_option_flag ('e',
+                               "exit-on-error",
+                               "terminate wirewatch if we failed to download information from the bank",
+                               &exit_on_error),
+    GNUNET_GETOPT_option_relative_time ('f',
+                                        "longpoll-timeout",
+                                        "DELAY",
+                                        "what is the timeout when asking the bank about new transactions, specify with unit (e.g. --longpoll-timeout=30s)",
+                                        &longpoll_timeout),
+    GNUNET_GETOPT_option_flag ('I',
+                               "ignore-not-found",
+                               "continue, even if the bank account of the exchange was not found",
+                               &ignore_account_404),
     GNUNET_GETOPT_option_uint ('S',
                                "size",
                                "SIZE",
@@ -889,6 +1009,7 @@ main (int argc,
   };
   enum GNUNET_GenericReturnValue ret;
 
+  longpoll_timeout = LONGPOLL_TIMEOUT;
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
                                     &argc, &argv))
diff --git a/src/exchange/test_taler_exchange_httpd.conf b/src/exchange/test_taler_exchange_httpd.conf
index 9bd4851fb..7e7ff8b45 100644
--- a/src/exchange/test_taler_exchange_httpd.conf
+++ b/src/exchange/test_taler_exchange_httpd.conf
@@ -13,6 +13,8 @@ TINY_AMOUNT = EUR:0.01
 
 [exchange]
 
+AML_THRESHOLD = EUR:1000000
+
 # Directory with our terms of service.
 TERMS_DIR = ../../contrib/tos
 
@@ -67,7 +69,7 @@ ENABLE_CREDIT = YES
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:8082/3/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/3/taler-wire-gateway/"
 
 # Coins for the tests.
 [coin_eur_ct_1_rsa]
diff --git a/src/exchange/test_taler_exchange_httpd.sh b/src/exchange/test_taler_exchange_httpd.sh
index e8dc46af8..0fe71f3ad 100755
--- a/src/exchange/test_taler_exchange_httpd.sh
+++ b/src/exchange/test_taler_exchange_httpd.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # This file is part of TALER
-# Copyright (C) 2015-2020 Taler Systems SA
+# Copyright (C) 2015-2020, 2023 Taler Systems SA
 #
 #  TALER 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
@@ -23,6 +23,8 @@
 # Clear environment from variables that override config.
 unset XDG_DATA_HOME
 unset XDG_CONFIG_HOME
+
+set -eu
 #
 echo -n "Launching exchange ..."
 PREFIX=
@@ -30,7 +32,7 @@ PREFIX=
 #PREFIX="valgrind --leak-check=yes --track-fds=yes --error-exitcode=1 --log-file=valgrind.%p"
 
 # Setup database
-taler-exchange-dbinit -c test_taler_exchange_httpd.conf &> /dev/null
+taler-exchange-dbinit -c test_taler_exchange_httpd.conf &> /dev/null || exit 77
 # Run Exchange HTTPD (in background)
 $PREFIX taler-exchange-httpd -c test_taler_exchange_httpd.conf 2> test-exchange.log &
 
diff --git a/src/exchangedb/.gitignore b/src/exchangedb/.gitignore
index 881bbe53d..6e67fadb1 100644
--- a/src/exchangedb/.gitignore
+++ b/src/exchangedb/.gitignore
@@ -1,12 +1,16 @@
-test-exchangedb-auditors
-test-exchangedb-denomkeys
-test-exchangedb-fees
 test-exchangedb-postgres
-test-exchangedb-signkeys
-test-perf-taler-exchangedb
 bench-db-postgres
-exchange-0001.sql
-shard-0000.sql
-shard-0001.sql
-drop0001.sql
-shard-drop0001.sql
\ No newline at end of file
+perf_deposits_get_ready-postgres
+perf_get_link_data-postgres
+perf_reserves_in_insert-postgres
+perf_select_refunds_by_coin-postgres
+exchange-0002.sql
+procedures.sql
+exchange-0003.sql
+perf-exchangedb-reserves-in-insert-postgres
+test-exchangedb-batch-reserves-in-insert-postgres
+test-exchangedb-by-j-postgres
+test-exchangedb-populate-link-data-postgres
+test-exchangedb-populate-ready-deposit-postgres
+test-exchangedb-populate-select-refunds-by-coin-postgres
+exchange-0004.sql
diff --git a/src/exchangedb/0002-account_merges.sql b/src/exchangedb/0002-account_merges.sql
new file mode 100644
index 000000000..1dd7e5bf0
--- /dev/null
+++ b/src/exchangedb/0002-account_merges.sql
@@ -0,0 +1,139 @@
+--
+-- 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 FUNCTION create_table_account_merges(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'account_merges';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I '
+      '(account_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+      ',wallet_h_payto BYTEA NOT NULL CHECK (LENGTH(wallet_h_payto)=32)'
+      ',PRIMARY KEY (purse_pub)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Merge requests where a purse- and account-owner requested merging the purse into the account'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the target reserve'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'signature by the reserve private key affirming the merge, of type TALER_SIGNATURE_WALLET_ACCOUNT_MERGE'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_account_merges(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'account_merges';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  -- Note: this index *may* be useful in
+  -- pg_get_reserve_history depending on how
+  -- smart the DB is when computing the JOIN.
+  -- Removing it MAY boost performance slightly, at
+  -- the expense of trouble if the "merge_by_reserve"
+  -- query planner goes off the rails. Needs benchmarking
+  -- to be sure.
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve_pub '
+    'ON ' || table_name || ' '
+    '(reserve_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_account_merge_request_serial_id_key'
+    ' UNIQUE (account_merge_request_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_account_merges()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'account_merges';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub) '
+    ' REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_purse_pub'
+    ' FOREIGN KEY (purse_pub) '
+    ' REFERENCES purse_requests (purse_pub)'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('account_merges'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('account_merges'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('account_merges'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-age_withdraw.sql b/src/exchangedb/0002-age_withdraw.sql
new file mode 100644
index 000000000..87cac7816
--- /dev/null
+++ b/src/exchangedb/0002-age_withdraw.sql
@@ -0,0 +1,157 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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/>
+--
+-- @author Özgür Kesim
+
+CREATE FUNCTION create_table_age_withdraw(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'age_withdraw';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(age_withdraw_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_commitment BYTEA NOT NULL CONSTRAINT h_commitment_length CHECK(LENGTH(h_commitment)=64)'
+      ',max_age SMALLINT NOT NULL CONSTRAINT max_age_positive CHECK(max_age>=0)'
+      ',amount_with_fee taler_amount NOT NULL'
+      ',reserve_pub BYTEA NOT NULL CONSTRAINT reserve_pub_length CHECK(LENGTH(reserve_pub)=32)'
+      ',reserve_sig BYTEA NOT NULL CONSTRAINT reserve_sig_length CHECK(LENGTH(reserve_sig)=64)'
+      ',noreveal_index SMALLINT NOT NULL CONSTRAINT noreveal_index_positive CHECK(noreveal_index>=0)'
+      ',h_blind_evs BYTEA[] NOT NULL CONSTRAINT h_blind_evs_length CHECK(cardinality(h_blind_evs)=cardinality(denom_serials))'
+      ',denom_serials INT8[] NOT NULL CONSTRAINT denom_serials_array_length CHECK(cardinality(denom_serials)=cardinality(denom_sigs))'
+      ',denom_sigs BYTEA[] NOT NULL CONSTRAINT denom_sigs_array_length CHECK(cardinality(denom_sigs)=cardinality(denom_serials))'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Commitments made when withdrawing coins with age restriction and the gamma value chosen by the exchange. '
+     'It also contains the blindly signed coins, their signatures and denominations.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'The gamma value chosen by the exchange in the cut-and-choose protocol'
+    ,'noreveal_index'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'The maximum age (in years) that the client commits to with this request'
+    ,'max_age'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Commitment made by the client, hash over the various client inputs in the cut-and-choose protocol'
+    ,'h_commitment'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Reference to the public key of the reserve from which the coins are going to be withdrawn'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature of the reserve''s private key over the age-withdraw request'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Array of references to the denominations'
+    ,'denom_serials'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Array of the blinded envelopes of the chosen fresh coins, with value as given by the denomination in the corresponding slot in denom_serials'
+    ,'h_blind_evs'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Array of signatures over each blinded envelope'
+    ,'denom_sigs'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_age_withdraw(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'age_withdraw';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD PRIMARY KEY (h_commitment);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_h_commitment_reserve_pub_key'
+    ' UNIQUE (h_commitment, reserve_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_age_withdraw_id_key'
+    ' UNIQUE (age_withdraw_id);'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_age_withdraw()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'age_withdraw';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub)'
+    ' REFERENCES reserves(reserve_pub) ON DELETE CASCADE;'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+  (name
+  ,version
+  ,action
+  ,partitioned
+  ,by_range)
+VALUES
+  ('age_withdraw', 'exchange-0002', 'create',   TRUE ,FALSE),
+  ('age_withdraw', 'exchange-0002', 'constrain',TRUE ,FALSE),
+  ('age_withdraw', 'exchange-0002', 'foreign',  TRUE ,FALSE);
+
diff --git a/src/exchangedb/0002-aggregation_tracking.sql b/src/exchangedb/0002-aggregation_tracking.sql
new file mode 100644
index 000000000..d07960247
--- /dev/null
+++ b/src/exchangedb/0002-aggregation_tracking.sql
@@ -0,0 +1,118 @@
+--
+-- 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 FUNCTION create_table_aggregation_tracking(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aggregation_tracking';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(aggregation_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',batch_deposit_serial_id INT8 PRIMARY KEY'
+      ',wtid_raw BYTEA NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (batch_deposit_serial_id)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'mapping from wire transfer identifiers (WTID) to deposits (and back)'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'identifier of the wire transfer'
+    ,'wtid_raw'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_aggregation_tracking(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aggregation_tracking';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_wtid_raw_index '
+    'ON ' || table_name || ' '
+    '(wtid_raw);'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_wtid_raw_index '
+    'IS ' || quote_literal('for lookup_transactions') || ';'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_aggregation_serial_id_key'
+    ' UNIQUE (aggregation_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_aggregation_tracking()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aggregation_tracking';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_deposit'
+    ' FOREIGN KEY (batch_deposit_serial_id)'
+    ' REFERENCES batch_deposits (batch_deposit_serial_id)'
+    ' ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('aggregation_tracking'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('aggregation_tracking'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('aggregation_tracking'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-aggregation_transient.sql b/src/exchangedb/0002-aggregation_transient.sql
new file mode 100644
index 000000000..8e46450f0
--- /dev/null
+++ b/src/exchangedb/0002-aggregation_transient.sql
@@ -0,0 +1,71 @@
+--
+-- 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 FUNCTION create_table_aggregation_transient(
+  IN shard_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aggregation_transient';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+    '(amount taler_amount NOT NULL'
+    ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
+    ',merchant_pub BYTEA CHECK (LENGTH(merchant_pub)=32)'
+    ',exchange_account_section TEXT NOT NULL'
+    ',legitimization_requirement_serial_id INT8 NOT NULL DEFAULT(0)'
+    ',wtid_raw BYTEA NOT NULL CHECK (LENGTH(wtid_raw)=32)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (wire_target_h_payto)'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'aggregations currently happening (lacking wire_out, usually because the amount is too low); this table is not replicated'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+       'Sum of all of the aggregated deposits (without deposit fees)'
+      ,'amount'
+      ,table_name
+      ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+       'identifier of the wire transfer'
+      ,'wtid_raw'
+      ,table_name
+      ,shard_suffix
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('aggregation_transient'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-aml_history.sql b/src/exchangedb/0002-aml_history.sql
new file mode 100644
index 000000000..af81be9d8
--- /dev/null
+++ b/src/exchangedb/0002-aml_history.sql
@@ -0,0 +1,147 @@
+--
+-- 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 OR REPLACE FUNCTION create_table_aml_history(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aml_history';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(aml_history_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_payto BYTEA CHECK (LENGTH(h_payto)=32)'
+      ',new_threshold taler_amount NOT NULL DEFAULT(0,0)'
+      ',new_status INT4 NOT NULL DEFAULT(0)'
+      ',decision_time INT8 NOT NULL DEFAULT(0)'
+      ',justification TEXT NOT NULL'
+      ',kyc_requirements TEXT'
+      ',kyc_req_row INT8 NOT NULL DEFAULT(0)'
+      ',decider_pub BYTEA CHECK (LENGTH(decider_pub)=32)'
+      ',decider_sig BYTEA CHECK (LENGTH(decider_sig)=64)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (h_payto)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'AML decision history for a particular payment destination'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash of the payto://-URI this AML history is about'
+    ,'h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'new monthly inbound transaction limit below which we are OK'
+    ,'new_threshold'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     '0 for all OK, 1 for AML decision required, 2 for account is frozen (prevents further transactions)'
+    ,'new_status'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'when was the status changed'
+    ,'decision_time'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'human-readable justification for the status change'
+    ,'justification'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the staff member who made the AML decision'
+    ,'decider_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Additional KYC requirements imposed by the AML staff member. Serialized JSON array of strings.'
+    ,'kyc_requirements'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Row in the KYC table for this KYC requirement, 0 for none.'
+    ,'kyc_req_row'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature key of the staff member affirming the AML decision; of type AML_DECISION'
+    ,'decider_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+COMMENT ON FUNCTION create_table_aml_history
+  IS 'Creates the aml_history table';
+
+
+CREATE OR REPLACE FUNCTION constrain_table_aml_history(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aml_history';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+      ' ADD CONSTRAINT ' || table_name || '_serial_key '
+        'UNIQUE (aml_history_serial_id)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_main_index '
+    'ON ' || table_name || ' '
+    '(h_payto, decision_time DESC);'
+  );
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('aml_history'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('aml_history'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-aml_staff.sql b/src/exchangedb/0002-aml_staff.sql
new file mode 100644
index 000000000..cec18c62b
--- /dev/null
+++ b/src/exchangedb/0002-aml_staff.sql
@@ -0,0 +1,40 @@
+--
+-- 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 aml_staff
+  (aml_staff_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,decider_pub BYTEA PRIMARY KEY CHECK (LENGTH(decider_pub)=32)
+  ,master_sig BYTEA CHECK (LENGTH(master_sig)=64)
+  ,decider_name TEXT NOT NULL
+  ,is_active BOOLEAN NOT NULL
+  ,read_only BOOLEAN NOT NULL
+  ,last_change INT8 NOT NULL
+  );
+COMMENT ON TABLE aml_staff
+  IS 'Table with AML staff members the exchange uses or has used in the past. Entries never expire as we need to remember the last_change column indefinitely.';
+COMMENT ON COLUMN aml_staff.decider_pub
+  IS 'Public key of the AML staff member.';
+COMMENT ON COLUMN aml_staff.master_sig
+  IS 'The master public key signature on the AML staff member status, of type TALER_SIGNATURE_MASTER_AML_KEY.';
+COMMENT ON COLUMN aml_staff.decider_name
+  IS 'Name of the staff member.';
+COMMENT ON COLUMN aml_staff.is_active
+  IS 'true if we are currently supporting the use of this AML staff member.';
+COMMENT ON COLUMN aml_staff.is_active
+  IS 'true if the member has read-only access.';
+COMMENT ON COLUMN aml_staff.last_change
+  IS 'Latest time when active status changed. Used to detect replays of old messages.';
diff --git a/src/exchangedb/0002-aml_status.sql b/src/exchangedb/0002-aml_status.sql
new file mode 100644
index 000000000..a8b567a82
--- /dev/null
+++ b/src/exchangedb/0002-aml_status.sql
@@ -0,0 +1,101 @@
+--
+-- 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 OR REPLACE FUNCTION create_table_aml_status(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aml_status';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(aml_status_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_payto BYTEA PRIMARY KEY CHECK (LENGTH(h_payto)=32)'
+      ',threshold taler_amount NOT NULL DEFAULT(0,0)'
+      ',status INT4 NOT NULL DEFAULT(0)'
+      ',kyc_requirement INT8 NOT NULL DEFAULT(0)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (h_payto)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'AML status for a particular payment destination'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash of the payto://-URI this AML status is about'
+    ,'h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'monthly inbound transaction limit below which we are OK (if status is 1)'
+    ,'threshold'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     '0 for all OK, 1 for AML decision required, 2 for account is frozen (prevents further transactions)'
+    ,'status'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+COMMENT ON FUNCTION create_table_aml_status
+  IS 'Creates the aml_status table';
+
+
+CREATE OR REPLACE FUNCTION constrain_table_aml_status(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'aml_status';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+      ' ADD CONSTRAINT ' || table_name || '_serial_key '
+        'UNIQUE (aml_status_serial_id)'
+  );
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('aml_status'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('aml_status'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-auditor_denom_sigs.sql b/src/exchangedb/0002-auditor_denom_sigs.sql
new file mode 100644
index 000000000..3ed645af5
--- /dev/null
+++ b/src/exchangedb/0002-auditor_denom_sigs.sql
@@ -0,0 +1,32 @@
+--
+-- 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 auditor_denom_sigs
+  (auditor_denom_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,auditor_uuid INT8 NOT NULL REFERENCES auditors (auditor_uuid) ON DELETE CASCADE
+  ,denominations_serial INT8 NOT NULL REFERENCES denominations (denominations_serial) ON DELETE CASCADE
+  ,auditor_sig BYTEA CHECK (LENGTH(auditor_sig)=64)
+  ,PRIMARY KEY (denominations_serial, auditor_uuid)
+  );
+COMMENT ON TABLE auditor_denom_sigs
+  IS 'Table with auditor signatures on exchange denomination keys.';
+COMMENT ON COLUMN auditor_denom_sigs.auditor_uuid
+  IS 'Identifies the auditor.';
+COMMENT ON COLUMN auditor_denom_sigs.denominations_serial
+  IS 'Denomination the signature is for.';
+COMMENT ON COLUMN auditor_denom_sigs.auditor_sig
+  IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.';
diff --git a/src/exchangedb/0002-auditors.sql b/src/exchangedb/0002-auditors.sql
new file mode 100644
index 000000000..76e43b183
--- /dev/null
+++ b/src/exchangedb/0002-auditors.sql
@@ -0,0 +1,35 @@
+--
+-- 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 auditors
+  (auditor_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,auditor_pub BYTEA PRIMARY KEY CHECK (LENGTH(auditor_pub)=32)
+  ,auditor_name TEXT NOT NULL
+  ,auditor_url TEXT NOT NULL
+  ,is_active BOOLEAN NOT NULL
+  ,last_change INT8 NOT NULL
+  );
+COMMENT ON TABLE auditors
+  IS 'Table with auditors the exchange uses or has used in the past. Entries never expire as we need to remember the last_change column indefinitely.';
+COMMENT ON COLUMN auditors.auditor_pub
+  IS 'Public key of the auditor.';
+COMMENT ON COLUMN auditors.auditor_url
+  IS 'The base URL of the auditor.';
+COMMENT ON COLUMN auditors.is_active
+  IS 'true if we are currently supporting the use of this auditor.';
+COMMENT ON COLUMN auditors.last_change
+  IS 'Latest time when active status changed. Used to detect replays of old messages.';
diff --git a/src/exchangedb/0002-batch_deposits.sql b/src/exchangedb/0002-batch_deposits.sql
new file mode 100644
index 000000000..71a4b4205
--- /dev/null
+++ b/src/exchangedb/0002-batch_deposits.sql
@@ -0,0 +1,172 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_batch_deposits(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'batch_deposits';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(batch_deposit_serial_id INT8 GENERATED BY DEFAULT AS IDENTITY'
+      ',shard INT8 NOT NULL'
+      ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
+      ',wallet_timestamp INT8 NOT NULL'
+      ',exchange_timestamp INT8 NOT NULL'
+      ',refund_deadline INT8 NOT NULL'
+      ',wire_deadline INT8 NOT NULL'
+      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
+      ',wallet_data_hash BYTEA CHECK (LENGTH(wallet_data_hash)=64) DEFAULT NULL'
+      ',wire_salt BYTEA NOT NULL CHECK (LENGTH(wire_salt)=16)'
+      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
+      ',policy_details_serial_id INT8'
+      ',policy_blocked BOOLEAN NOT NULL DEFAULT FALSE'
+      ',done BOOLEAN NOT NULL DEFAULT FALSE'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (shard)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Information about the contracts for which we have received (batch) deposits.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Used for load sharding in the materialized indices. Should be set based on merchant_pub. 64-bit value because we need an *unsigned* 32-bit value.'
+    ,'shard'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Unsalted hash of the target bank account; also used to lookup the KYC status'
+    ,'wire_target_h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash over data provided by the wallet upon payment to select a more specific contract'
+    ,'wallet_data_hash'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Salt used when hashing the payto://-URI to get the h_wire that was used by the coin deposit signatures; not used to calculate wire_target_h_payto (as that one is unsalted)'
+    ,'wire_salt'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Set to TRUE once we have included this (batch) deposit (and all associated coins) in some aggregate wire transfer to the merchant'
+    ,'done'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'True if the aggregation of the (batch) deposit is currently blocked by some policy extension mechanism. Used to filter out deposits that must not be processed by the canonical deposit logic.'
+    ,'policy_blocked'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'References policy extensions table, NULL if extensions are not used'
+    ,'policy_details_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_batch_deposits(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'batch_deposits';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_batch_deposit_serial_id_pkey'
+    ' PRIMARY KEY (batch_deposit_serial_id) '
+    ',ADD CONSTRAINT ' || table_name || '_merchant_pub_h_contract_terms'
+    ' UNIQUE (shard, merchant_pub, h_contract_terms)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_ready '
+    'ON ' || table_name || ' '
+    '(shard ASC'
+    ',wire_deadline ASC'
+    ') WHERE NOT (done OR policy_blocked);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_for_matching '
+    'ON ' || table_name || ' '
+    '(shard ASC'
+    ',refund_deadline ASC'
+    ',wire_target_h_payto'
+    ') WHERE NOT (done OR policy_blocked);'
+  );
+END
+$$;
+
+CREATE OR REPLACE FUNCTION foreign_table_batch_deposits()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'batch_deposits';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_policy_details'
+    ' FOREIGN KEY (policy_details_serial_id) '
+    ' REFERENCES policy_details (policy_details_serial_id) ON DELETE RESTRICT'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('batch_deposits'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('batch_deposits'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('batch_deposits'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE)
+    ;
diff --git a/src/exchangedb/0002-close_requests.sql b/src/exchangedb/0002-close_requests.sql
new file mode 100644
index 000000000..6a7028095
--- /dev/null
+++ b/src/exchangedb/0002-close_requests.sql
@@ -0,0 +1,178 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_close_requests(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'close_requests';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(close_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)'
+      ',close_timestamp INT8 NOT NULL'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',close taler_amount NOT NULL'
+      ',close_fee taler_amount NOT NULL'
+      ',payto_uri TEXT NOT NULL'
+      ',done BOOL NOT NULL DEFAULT(FALSE)'
+      ',PRIMARY KEY (reserve_pub,close_timestamp)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Explicit requests by a reserve owner to close a reserve immediately'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'When the request was created by the client'
+    ,'close_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature affirming that the reserve is to be closed'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Balance of the reserve at the time of closing, to be wired to the associated bank account (minus the closing fee)'
+    ,'close'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the credited bank account. Optional.'
+    ,'payto_uri'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_close_requests(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'close_requests';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_close_request_uuid_index '
+    'ON ' || table_name || ' '
+    '(close_request_serial_id);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_close_request_done_index '
+    'ON ' || table_name || ' '
+    '(done);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_close_request_uuid_pkey'
+    ' UNIQUE (close_request_serial_id)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_close_requests()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'close_requests';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub) '
+    ' REFERENCES reserves(reserve_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION close_requests_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.reserve_pub
+    ,'close_requests'
+    ,NEW.close_request_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION close_requests_insert_trigger()
+  IS 'Automatically generate reserve history entry.';
+
+
+CREATE FUNCTION master_table_close_requests()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER close_requests_on_insert
+    AFTER INSERT
+     ON close_requests
+     FOR EACH ROW EXECUTE FUNCTION close_requests_insert_trigger();
+END $$;
+
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('close_requests'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('close_requests'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('close_requests'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('close_requests'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-coin_deposits.sql b/src/exchangedb/0002-coin_deposits.sql
new file mode 100644
index 000000000..c3eef6e5a
--- /dev/null
+++ b/src/exchangedb/0002-coin_deposits.sql
@@ -0,0 +1,157 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_coin_deposits(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_deposits';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(coin_deposit_serial_id INT8 GENERATED BY DEFAULT AS IDENTITY'
+      ',batch_deposit_serial_id INT8 NOT NULL'
+      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+      ',coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)'
+      ',amount_with_fee taler_amount NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Coins which have been deposited with the respective per-coin signatures.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Link to information about the batch deposit this coin was used for'
+    ,'batch_deposit_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_coin_deposits(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_deposits';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_coin_deposit_serial_id_pkey'
+    ' PRIMARY KEY (coin_deposit_serial_id) '
+    ',ADD CONSTRAINT ' || table_name || '_unique_coin_sig'
+    ' UNIQUE (coin_pub, coin_sig)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_batch '
+    'ON ' || table_name || ' '
+    '(batch_deposit_serial_id);'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_coin_deposits()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_deposits';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_batch_deposits_id'
+    ' FOREIGN KEY (batch_deposit_serial_id) '
+    ' REFERENCES batch_deposits (batch_deposit_serial_id) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION coin_deposits_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+ VALUES
+     (NEW.coin_pub
+    ,'coin_deposits'
+    ,NEW.coin_deposit_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION coin_deposits_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_coin_deposits()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER coin_deposits_on_insert
+    AFTER INSERT
+     ON coin_deposits
+     FOR EACH ROW EXECUTE FUNCTION coin_deposits_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('coin_deposits'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('coin_deposits'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('coin_deposits'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('coin_deposits'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE)
+    ;
diff --git a/src/exchangedb/0002-coin_history.sql b/src/exchangedb/0002-coin_history.sql
new file mode 100644
index 000000000..9b5efdcb6
--- /dev/null
+++ b/src/exchangedb/0002-coin_history.sql
@@ -0,0 +1,138 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_coin_history (
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_history';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(coin_history_serial_id INT8 GENERATED BY DEFAULT AS IDENTITY'
+      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+      ',table_name TEXT NOT NULL'
+      ',serial_id INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Links to tables with entries that affected the transaction history of a coin.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'For which coin is this a history entry'
+    ,'coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'In which table is the history entry'
+    ,'table_name'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Which is the generated serial ID of the entry in the table'
+    ,'serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Monotonic counter, used to generate Etags for caching'
+    ,'coin_history_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_coin_history(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_history';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_coin_history_serial_id_pkey'
+    ' PRIMARY KEY (coin_history_serial_id) '
+    ',ADD CONSTRAINT ' || table_name || '_coin_entry_key'
+    ' UNIQUE (coin_pub, table_name, serial_id)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_coin_by_time'
+    ' ON ' || table_name || ' '
+    '(coin_pub'
+    ',coin_history_serial_id DESC'
+    ');'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_coin_history()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'coin_history';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('coin_history'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('coin_history'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('coin_history'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE)
+    ;
diff --git a/src/exchangedb/0002-contracts.sql b/src/exchangedb/0002-contracts.sql
new file mode 100644
index 000000000..c1f92c9aa
--- /dev/null
+++ b/src/exchangedb/0002-contracts.sql
@@ -0,0 +1,109 @@
+--
+-- 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 FUNCTION create_table_contracts(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'contracts';
+BEGIN
+  PERFORM create_partitioned_table(
+     'CREATE TABLE %I '
+     '(contract_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+     ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+     ',pub_ckey BYTEA NOT NULL CHECK (LENGTH(pub_ckey)=32)'
+     ',contract_sig BYTEA NOT NULL CHECK (LENGTH(contract_sig)=64)'
+     ',e_contract BYTEA NOT NULL'
+     ',purse_expiration INT8 NOT NULL'
+     ',PRIMARY KEY (purse_pub)'
+     ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'encrypted contracts associated with purses'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the purse that the contract is associated with'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'signature over the encrypted contract by the purse contract key'
+    ,'contract_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public ECDH key used to encrypt the contract, to be used with the purse private key for decryption'
+    ,'pub_ckey'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'AES-GCM encrypted contract terms (contains gzip compressed JSON after decryption)'
+    ,'e_contract'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_contracts(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'contracts';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_contract_serial_id_key'
+    ' UNIQUE (contract_serial_id) '
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('contracts'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('contracts'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-cs_nonce_locks.sql b/src/exchangedb/0002-cs_nonce_locks.sql
new file mode 100644
index 000000000..36c0c7a5f
--- /dev/null
+++ b/src/exchangedb/0002-cs_nonce_locks.sql
@@ -0,0 +1,97 @@
+--
+-- 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 FUNCTION create_table_cs_nonce_locks(
+  partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(cs_nonce_lock_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',nonce BYTEA PRIMARY KEY CHECK (LENGTH(nonce)=32)'
+      ',op_hash BYTEA NOT NULL CHECK (LENGTH(op_hash)=64)'
+      ',max_denomination_serial INT8 NOT NULL'
+    ') %s ;'
+    ,'cs_nonce_locks'
+    ,'PARTITION BY HASH (nonce)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'ensures a Clause Schnorr client nonce is locked for use with an operation identified by a hash'
+    ,'cs_nonce_locks'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'actual nonce submitted by the client'
+    ,'nonce'
+    ,'cs_nonce_locks'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash (RC for refresh, blind coin hash for withdraw) the nonce may be used with'
+    ,'op_hash'
+    ,'cs_nonce_locks'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Maximum number of a CS denomination serial the nonce could be used with, for GC'
+    ,'max_denomination_serial'
+    ,'cs_nonce_locks'
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_cs_nonce_locks(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'cs_nonce_locks';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_cs_nonce_lock_serial_id_key'
+    ' UNIQUE (cs_nonce_lock_serial_id)'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('cs_nonce_locks'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('cs_nonce_locks'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-denomination_revocations.sql b/src/exchangedb/0002-denomination_revocations.sql
new file mode 100644
index 000000000..96e13cd15
--- /dev/null
+++ b/src/exchangedb/0002-denomination_revocations.sql
@@ -0,0 +1,23 @@
+--
+-- 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 denomination_revocations
+  (denom_revocations_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,denominations_serial INT8 PRIMARY KEY REFERENCES denominations (denominations_serial) ON DELETE CASCADE
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  );
+COMMENT ON TABLE denomination_revocations
+  IS 'remembering which denomination keys have been revoked';
diff --git a/src/exchangedb/0002-denominations.sql b/src/exchangedb/0002-denominations.sql
new file mode 100644
index 000000000..a3de2b149
--- /dev/null
+++ b/src/exchangedb/0002-denominations.sql
@@ -0,0 +1,45 @@
+--
+-- 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 denominations
+  (denominations_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)
+  ,denom_type INT4 NOT NULL DEFAULT (1) -- 1 == RSA (for now, remove default later!)
+  ,age_mask INT4 NOT NULL DEFAULT (0)
+  ,denom_pub BYTEA NOT NULL
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  ,valid_from INT8 NOT NULL
+  ,expire_withdraw INT8 NOT NULL
+  ,expire_deposit INT8 NOT NULL
+  ,expire_legal INT8 NOT NULL
+  ,coin taler_amount NOT NULL
+  ,fee_withdraw taler_amount NOT NULL
+  ,fee_deposit taler_amount NOT NULL
+  ,fee_refresh taler_amount NOT NULL
+  ,fee_refund taler_amount NOT NULL
+  );
+COMMENT ON TABLE denominations
+  IS 'Main denominations table. All the valid denominations the exchange knows about.';
+COMMENT ON COLUMN denominations.denom_type
+  IS 'determines cipher type for blind signatures used with this denomination; 0 is for RSA';
+COMMENT ON COLUMN denominations.age_mask
+  IS 'bitmask with the age restrictions that are being used for this denomination; 0 if denomination does not support the use of age restrictions';
+COMMENT ON COLUMN denominations.denominations_serial
+  IS 'needed for exchange-auditor replication logic';
+
+CREATE INDEX denominations_by_expire_legal_index
+  ON denominations
+  (expire_legal);
diff --git a/src/exchangedb/0002-exchange_sign_keys.sql b/src/exchangedb/0002-exchange_sign_keys.sql
new file mode 100644
index 000000000..d6acc6bb0
--- /dev/null
+++ b/src/exchangedb/0002-exchange_sign_keys.sql
@@ -0,0 +1,36 @@
+--
+-- 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 exchange_sign_keys
+  (esk_serial 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)
+  ,valid_from INT8 NOT NULL
+  ,expire_sign INT8 NOT NULL
+  ,expire_legal INT8 NOT NULL
+  );
+COMMENT ON TABLE exchange_sign_keys
+  IS 'Table with master public key signatures on exchange online signing keys.';
+COMMENT ON COLUMN exchange_sign_keys.exchange_pub
+  IS 'Public online signing key of the exchange.';
+COMMENT ON COLUMN exchange_sign_keys.master_sig
+  IS 'Signature affirming the validity of the signing key of purpose TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.';
+COMMENT ON COLUMN exchange_sign_keys.valid_from
+  IS 'Time when this online signing key will first be used to sign messages.';
+COMMENT ON COLUMN exchange_sign_keys.expire_sign
+  IS 'Time when this online signing key will no longer be used to sign.';
+COMMENT ON COLUMN exchange_sign_keys.expire_legal
+  IS 'Time when this online signing key legally expires.';
diff --git a/src/exchangedb/0002-extensions.sql b/src/exchangedb/0002-extensions.sql
new file mode 100644
index 000000000..df9e50090
--- /dev/null
+++ b/src/exchangedb/0002-extensions.sql
@@ -0,0 +1,27 @@
+--
+-- 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 extensions
+  (extension_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,name TEXT NOT NULL UNIQUE
+  ,manifest BYTEA
+  );
+COMMENT ON TABLE extensions
+  IS 'Configurations of the activated extensions';
+COMMENT ON COLUMN extensions.name
+  IS 'Name of the extension';
+COMMENT ON COLUMN extensions.manifest
+  IS 'Manifest of the extension as JSON-blob, maybe NULL.  It contains common meta-information and extension-specific configuration.';
diff --git a/src/exchangedb/0002-global_fee.sql b/src/exchangedb/0002-global_fee.sql
new file mode 100644
index 000000000..f6526798d
--- /dev/null
+++ b/src/exchangedb/0002-global_fee.sql
@@ -0,0 +1,37 @@
+--
+-- 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 global_fee
+  (global_fee_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,start_date INT8 NOT NULL
+  ,end_date INT8 NOT NULL
+  ,history_fee taler_amount NOT NULL
+  ,account_fee taler_amount NOT NULL
+  ,purse_fee taler_amount NOT NULL
+  ,purse_timeout INT8 NOT NULL
+  ,history_expiration INT8 NOT NULL
+  ,purse_account_limit INT4 NOT NULL
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  ,PRIMARY KEY (start_date)
+  );
+COMMENT ON TABLE global_fee
+  IS 'list of the global fees of this exchange, by date';
+COMMENT ON COLUMN global_fee.global_fee_serial
+  IS 'needed for exchange-auditor replication logic';
+
+CREATE INDEX global_fee_by_end_date_index
+  ON global_fee
+  (end_date);
diff --git a/src/exchangedb/0002-history_requests.sql b/src/exchangedb/0002-history_requests.sql
new file mode 100644
index 000000000..0714e1bea
--- /dev/null
+++ b/src/exchangedb/0002-history_requests.sql
@@ -0,0 +1,159 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_history_requests(
+  IN shard_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'history_requests';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(history_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)'
+      ',request_timestamp INT8 NOT NULL'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',history_fee taler_amount NOT NULL'
+      ',PRIMARY KEY (reserve_pub,request_timestamp)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Paid history requests issued by a client against a reserve'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'When was the history request made'
+    ,'request_timestamp'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature approving payment for the history request'
+    ,'reserve_sig'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'History fee approved by the signature'
+    ,'history_fee'
+    ,table_name
+    ,shard_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_history_requests(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  partition_name TEXT;
+BEGIN
+  partition_name = concat_ws('_', 'history_requests', partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name ||
+    ' ADD CONSTRAINT ' || partition_name || '_serial_id'
+    ' UNIQUE (history_request_serial_id)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_history_requests()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'history_requests';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub) '
+    ' REFERENCES reserves(reserve_pub) ON DELETE CASCADE'
+  );
+END $$;
+
+
+CREATE OR REPLACE FUNCTION history_requests_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.reserve_pub
+    ,'history_requests'
+    ,NEW.history_request_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION history_requests_insert_trigger()
+  IS 'Automatically generate reserve history entry.';
+
+
+CREATE FUNCTION master_table_history_requests()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER history_requests_on_insert
+    AFTER INSERT
+     ON history_requests
+     FOR EACH ROW EXECUTE FUNCTION history_requests_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('history_requests'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('history_requests'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('history_requests'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('history_requests'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-known_coins.sql b/src/exchangedb/0002-known_coins.sql
new file mode 100644
index 000000000..a13beff6f
--- /dev/null
+++ b/src/exchangedb/0002-known_coins.sql
@@ -0,0 +1,136 @@
+--
+-- 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 FUNCTION create_table_known_coins(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'known_coins';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(known_coin_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',denominations_serial INT8 NOT NULL'
+      ',coin_pub BYTEA NOT NULL PRIMARY KEY CHECK (LENGTH(coin_pub)=32)'
+      ',age_commitment_hash BYTEA CHECK (LENGTH(age_commitment_hash)=32)'
+      ',denom_sig BYTEA NOT NULL'
+      ',remaining taler_amount NOT NULL DEFAULT(0,0)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'information about coins and their signatures, so we do not have to store the signatures more than once if a coin is involved in multiple operations'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Denomination of the coin, determines the value of the original coin and applicable fees for coin-specific operations.'
+    ,'denominations_serial'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'EdDSA public key of the coin'
+    ,'coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Value of the coin that remains to be spent'
+    ,'remaining'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Optional hash of the age commitment for age restrictions as per DD 24 (active if denom_type has the respective bit set)'
+    ,'age_commitment_hash'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'This is the signature of the exchange that affirms that the coin is a valid coin. The specific signature type depends on denom_type of the denomination.'
+    ,'denom_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_known_coins(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'known_coins';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_known_coin_id_key'
+    ' UNIQUE (known_coin_id)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_known_coins()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'known_coins';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_denominations'
+    ' FOREIGN KEY (denominations_serial) '
+    ' REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('known_coins'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('known_coins'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('known_coins'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-kyc_alerts.sql b/src/exchangedb/0002-kyc_alerts.sql
new file mode 100644
index 000000000..8e54846cf
--- /dev/null
+++ b/src/exchangedb/0002-kyc_alerts.sql
@@ -0,0 +1,27 @@
+--
+-- 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 kyc_alerts
+  (h_payto BYTEA PRIMARY KEY CHECK (LENGTH(h_payto)=32)
+  ,trigger_type INT4 NOT NULL
+  ,UNIQUE(trigger_type,h_payto)
+  );
+COMMENT ON TABLE kyc_alerts
+  IS 'alerts about completed KYC events reliably notifying other components (even if they are not running)';
+COMMENT ON COLUMN kyc_alerts.h_payto
+  IS 'hash of the payto://-URI for which the KYC status changed';
+COMMENT ON COLUMN kyc_alerts.trigger_type
+  IS 'identifies the receiver of the alert, as the same h_payto may require multiple components to be notified';
diff --git a/src/exchangedb/0002-kyc_attributes.sql b/src/exchangedb/0002-kyc_attributes.sql
new file mode 100644
index 000000000..66f3fc315
--- /dev/null
+++ b/src/exchangedb/0002-kyc_attributes.sql
@@ -0,0 +1,162 @@
+--
+-- 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 OR REPLACE FUNCTION create_table_kyc_attributes(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'kyc_attributes';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(kyc_attributes_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_payto BYTEA PRIMARY KEY CHECK (LENGTH(h_payto)=32)'
+      ',kyc_prox BYTEA NOT NULL CHECK (LENGTH(kyc_prox)=32)'
+      ',provider TEXT NOT NULL'
+      ',satisfied_checks TEXT[] NOT NULL'
+      ',collection_time INT8 NOT NULL'
+      ',expiration_time INT8 NOT NULL'
+      ',encrypted_attributes BYTEA NOT NULL'
+      ',legitimization_serial INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (h_payto)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'KYC data about particular payment addresses'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash of payto://-URI the attributes are about'
+    ,'h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'short hash of normalized full name and birthdate; used to efficiently find likely duplicate users'
+    ,'kyc_prox'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'time when the attributes were collected by the provider'
+    ,'collection_time'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'time when the attributes should no longer be considered validated'
+    ,'expiration_time'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'configuration section name of the provider that affirmed the attributes'
+    ,'provider'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     '(encrypted) JSON object (as string) with the attributes'
+    ,'encrypted_attributes'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Reference the legitimization process for which these attributes are gathered for.'
+    ,'legitimization_serial'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+COMMENT ON FUNCTION create_table_kyc_attributes
+  IS 'Creates the kyc_attributes table';
+
+
+CREATE OR REPLACE FUNCTION constrain_table_kyc_attributes(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'kyc_attributes';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+      ' ADD CONSTRAINT ' || table_name || '_serial_key '
+        'UNIQUE (kyc_attributes_serial_id)'
+  );
+  -- To search similar users (e.g. during AML checks)
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_similarity_index '
+    'ON ' || table_name || ' '
+    '(kyc_prox);'
+  );
+  -- For garbage collection
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_expiration_time '
+    'ON ' || table_name || ' '
+    '(expiration_time ASC);'
+  );
+END $$;
+
+
+CREATE OR REPLACE FUNCTION foreign_table_kyc_attributes()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'kyc_attributes';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_legitimization_processes'
+    ' FOREIGN KEY (legitimization_serial) '
+    ' REFERENCES legitimization_processes (legitimization_process_serial_id)' -- ON DELETE CASCADE
+  );
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('kyc_attributes'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('kyc_attributes'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('kyc_attributes'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-legitimization_processes.sql b/src/exchangedb/0002-legitimization_processes.sql
new file mode 100644
index 000000000..3212b1c06
--- /dev/null
+++ b/src/exchangedb/0002-legitimization_processes.sql
@@ -0,0 +1,149 @@
+--
+-- 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 FUNCTION create_table_legitimization_processes(
+  IN shard_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(legitimization_process_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_payto BYTEA NOT NULL CHECK (LENGTH(h_payto)=32)'
+      ',start_time INT8 NOT NULL'
+      ',expiration_time INT8 NOT NULL DEFAULT (0)'
+      ',provider_section TEXT NOT NULL'
+      ',provider_user_id TEXT DEFAULT NULL'
+      ',provider_legitimization_id TEXT DEFAULT NULL'
+      ',redirect_url TEXT DEFAULT NULL'
+      ',finished BOOLEAN DEFAULT (FALSE)'
+    ') %s ;'
+    ,'legitimization_processes'
+    ,'PARTITION BY HASH (h_payto)'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'List of legitimization processes (ongoing and completed) by account and provider'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'unique ID for this legitimization process at the exchange'
+    ,'legitimization_process_serial_id'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'foreign key linking the entry to the wire_targets table, NOT a primary key (multiple legitimizations are possible per wire target)'
+    ,'h_payto'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'time when the KYC check was initiated, useful for garbage collection'
+    ,'expiration_time'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'URL where the user should go to begin the KYC process'
+    ,'redirect_url'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'in the future if the respective KYC check was passed successfully'
+    ,'expiration_time'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Configuration file section with details about this provider'
+    ,'provider_section'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifier for the user at the provider that was used for the legitimization. NULL if provider is unaware.'
+    ,'provider_user_id'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifier for the specific legitimization process at the provider. NULL if legitimization was not started.'
+    ,'provider_legitimization_id'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Set to TRUE when the specific legitimization process is finished.'
+    ,'finished'
+    ,'legitimization_processes'
+    ,shard_suffix
+  );
+END
+$$;
+
+-- We need a separate function for this, as we call create_table only once but need to add
+-- those constraints to each partition which gets created
+CREATE FUNCTION constrain_table_legitimization_processes(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  partition_name TEXT;
+BEGIN
+  partition_name = concat_ws('_', 'legitimization_processes', partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name
+    || ' '
+      'ADD CONSTRAINT ' || partition_name || '_serial_key '
+        'UNIQUE (legitimization_process_serial_id)');
+  EXECUTE FORMAT (
+    'CREATE INDEX IF NOT EXISTS ' || partition_name || '_by_provider_and_legi_index '
+        'ON '|| partition_name || ' '
+        '(provider_section,provider_legitimization_id)'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || partition_name || '_by_provider_and_legi_index '
+    'IS ' || quote_literal('used (rarely) in kyc_provider_account_lookup') || ';'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('legitimization_processes'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('legitimization_processes'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-legitimization_requirements.sql b/src/exchangedb/0002-legitimization_requirements.sql
new file mode 100644
index 000000000..d806eb424
--- /dev/null
+++ b/src/exchangedb/0002-legitimization_requirements.sql
@@ -0,0 +1,104 @@
+--
+-- 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 FUNCTION create_table_legitimization_requirements(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(legitimization_requirement_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_payto BYTEA NOT NULL CHECK (LENGTH(h_payto)=32)'
+      ',reserve_pub BYTEA'
+      ',required_checks TEXT NOT NULL'
+      ',UNIQUE (h_payto, required_checks)'
+    ') %s ;'
+    ,'legitimization_requirements'
+    ,'PARTITION BY HASH (h_payto)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'List of required legitimizations by account'
+    ,'legitimization_requirements'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'unique ID for this legitimization requirement at the exchange'
+    ,'legitimization_requirement_serial_id'
+    ,'legitimization_requirements'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'foreign key linking the entry to the wire_targets table, NOT a primary key (multiple legitimizations are possible per wire target)'
+    ,'h_payto'
+    ,'legitimization_requirements'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'if h_payto refers to a reserve, this is its public key, NULL otherwise.  It allows to lookup the corresponding reserve when the KYC process is done.'
+    ,'reserve_pub'
+    ,'legitimization_requirements'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'space-separated list of required checks'
+    ,'required_checks'
+    ,'legitimization_requirements'
+    ,partition_suffix
+  );
+END
+$$;
+
+-- We need a separate function for this, as we call create_table only once but need to add
+-- those constraints to each partition which gets created
+CREATE FUNCTION constrain_table_legitimization_requirements(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  partition_name TEXT;
+BEGIN
+  partition_name = concat_ws('_', 'legitimization_requirements', partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name || ' '
+    'ADD CONSTRAINT ' || partition_name || '_serial_id_key '
+    'UNIQUE (legitimization_requirement_serial_id)');
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('legitimization_requirements'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('legitimization_requirements'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-partner_accounts.sql b/src/exchangedb/0002-partner_accounts.sql
new file mode 100644
index 000000000..b12dc06e6
--- /dev/null
+++ b/src/exchangedb/0002-partner_accounts.sql
@@ -0,0 +1,33 @@
+--
+-- 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 partner_accounts
+  (payto_uri TEXT PRIMARY KEY
+  ,partner_serial_id INT8 REFERENCES partners(partner_serial_id) ON DELETE CASCADE
+  ,partner_master_sig BYTEA CHECK (LENGTH(partner_master_sig)=64)
+  ,last_seen INT8 NOT NULL
+  );
+CREATE INDEX IF NOT EXISTS partner_accounts_index_by_partner_and_time
+  ON partner_accounts (partner_serial_id,last_seen);
+COMMENT ON TABLE partner_accounts
+  IS 'Table with bank accounts of the partner exchange. Entries never expire as we need to remember the signature for the auditor.';
+COMMENT ON COLUMN partner_accounts.payto_uri
+  IS 'payto URI (RFC 8905) with the bank account of the partner exchange.';
+COMMENT ON COLUMN partner_accounts.partner_master_sig
+  IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS by the partner master public key';
+COMMENT ON COLUMN partner_accounts.last_seen
+  IS 'Last time we saw this account as being active at the partner exchange. Used to select the most recent entry, and to detect when we should check again.';
diff --git a/src/exchangedb/0002-partners.sql b/src/exchangedb/0002-partners.sql
new file mode 100644
index 000000000..ed09378d0
--- /dev/null
+++ b/src/exchangedb/0002-partners.sql
@@ -0,0 +1,49 @@
+--
+-- 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 partners
+  (partner_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,partner_master_pub BYTEA NOT NULL CHECK(LENGTH(partner_master_pub)=32)
+  ,start_date INT8 NOT NULL
+  ,end_date INT8 NOT NULL
+  ,next_wad INT8 NOT NULL DEFAULT (0)
+  ,wad_frequency INT8 NOT NULL
+  ,wad_fee taler_amount NOT NULL
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  ,partner_base_url TEXT NOT NULL
+  ,PRIMARY KEY (partner_master_pub, start_date)
+  );
+COMMENT ON TABLE partners
+  IS 'exchanges we do wad transfers to';
+COMMENT ON COLUMN partners.partner_master_pub
+  IS 'offline master public key of the partner';
+COMMENT ON COLUMN partners.start_date
+  IS 'starting date of the partnership';
+COMMENT ON COLUMN partners.end_date
+  IS 'end date of the partnership';
+COMMENT ON COLUMN partners.next_wad
+  IS 'at what time should we do the next wad transfer to this partner (frequently updated); set to forever after the end_date';
+COMMENT ON COLUMN partners.wad_frequency
+  IS 'how often do we promise to do wad transfers';
+COMMENT ON COLUMN partners.wad_fee
+  IS 'how high is the fee for a wallet to be added to a wad to this partner';
+COMMENT ON COLUMN partners.partner_base_url
+  IS 'base URL of the REST API for this partner';
+COMMENT ON COLUMN partners.master_sig
+  IS 'signature of our master public key affirming the partnership, of purpose TALER_SIGNATURE_MASTER_PARTNER_DETAILS';
+
+CREATE INDEX IF NOT EXISTS partner_by_wad_time
+  ON partners (next_wad ASC);
diff --git a/src/exchangedb/0002-policy_details.sql b/src/exchangedb/0002-policy_details.sql
new file mode 100644
index 000000000..3acbb5c10
--- /dev/null
+++ b/src/exchangedb/0002-policy_details.sql
@@ -0,0 +1,175 @@
+--
+-- 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/>
+--
+
+-- @author: Özgür Kesim
+
+CREATE FUNCTION create_table_policy_details(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'policy_details';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(policy_details_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',policy_hash_code gnunet_hashcode NOT NULL'
+      ',policy_json TEXT NOT NULL'
+      ',deadline INT8 NOT NULL'
+      ',commitment taler_amount NOT NULL'
+      ',accumulated_total taler_amount NOT NULL'
+      ',fee taler_amount NOT NULL'
+      ',transferable taler_amount NOT NULL'
+      ',fulfillment_state SMALLINT NOT NULL CHECK(fulfillment_state between 0 and 5)'
+      ',h_fulfillment_proof gnunet_hashcode'
+    ') %s;'
+    ,table_name
+    ,'PARTITION BY HASH (h_fulfillment_proof)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Policies that were provided with deposits via policy extensions.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'ID (GNUNET_HashCode) that identifies a policy.  Will be calculated by the policy extension based on the content'
+    ,'policy_hash_code'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'JSON object with options set that the exchange needs to consider when executing a deposit. Supported details depend on the policy extensions supported by the exchange.'
+    ,'policy_json'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Deadline until the policy must be marked as fulfilled (maybe "forever")'
+    ,'deadline'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'The amount that this policy commits to.  Invariant: commitment >= fee'
+    ,'commitment'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'The sum of all contributions of all deposit that reference this policy.  Invariant: The fulfilment_state must be Insufficient as long as accumulated_total < commitment'
+    ,'accumulated_total'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'The fee for this policy, due when the policy is fulfilled or timed out'
+    ,'fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'The amount that on fulfillment or timeout will be transferred to the payto-URI''s of the corresponding deposit''s.  The policy fees must have been already deducted from it.  Invariant: fee+transferable <= accumulated_total.  The remaining amount (accumulated_total - fee - transferable) can be refreshed by the owner of the coins when the state is Timeout or Success.'
+    ,'transferable'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'State of the fulfillment:
+       - 0 (Failure)
+       - 1 (Insufficient)
+       - 2 (Ready)
+       - 4 (Success)
+       - 5 (Timeout)'
+    ,'fulfillment_state'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Reference to the proof of the fulfillment of this policy, if it exists.  Invariant: If not NULL, this entry''s .hash_code MUST be part of the corresponding policy_fulfillments.policy_hash_codes array.'
+    ,'h_fulfillment_proof'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+COMMENT ON FUNCTION create_table_policy_details
+  IS 'Creates the policy_details table';
+
+
+
+
+CREATE FUNCTION constrain_table_policy_details(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  partition_name TEXT;
+BEGIN
+  partition_name = concat_ws('_', 'policy_details', partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name ||
+    ' ADD CONSTRAINT ' || partition_name || '_unique_serial_id '
+    ' UNIQUE (policy_details_serial_id)'
+  );
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name ||
+    ' ADD CONSTRAINT ' || partition_name || '_unique_hash_fulfillment_proof '
+    ' UNIQUE (policy_hash_code, h_fulfillment_proof)'
+  );
+
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || partition_name || '_policy_hash_code'
+    ' ON ' || partition_name ||
+    ' (policy_hash_code);'
+  );
+END
+$$;
+
+CREATE OR REPLACE FUNCTION foreign_table_policy_details()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'policy_details';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_policy_fulfillments'
+    ' FOREIGN KEY (h_fulfillment_proof) '
+    ' REFERENCES policy_fulfillments (h_fulfillment_proof) ON DELETE RESTRICT'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+  (name
+  ,version
+  ,action
+  ,partitioned
+  ,by_range)
+VALUES
+  ('policy_details', 'exchange-0002', 'create',    TRUE ,FALSE),
+  ('policy_details', 'exchange-0002', 'constrain', TRUE ,FALSE),
+  ('policy_details', 'exchange-0002', 'foreign',   TRUE ,FALSE);
diff --git a/src/exchangedb/0002-policy_fulfillments.sql b/src/exchangedb/0002-policy_fulfillments.sql
new file mode 100644
index 000000000..c00947019
--- /dev/null
+++ b/src/exchangedb/0002-policy_fulfillments.sql
@@ -0,0 +1,101 @@
+--
+-- 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/>
+--
+
+-- @author: Özgür Kesim
+
+CREATE FUNCTION create_table_policy_fulfillments(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'policy_fulfillments';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(h_fulfillment_proof gnunet_hashcode PRIMARY KEY'
+      ',fulfillment_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',fulfillment_timestamp INT8 NOT NULL'
+      ',fulfillment_proof TEXT'
+      ',policy_hash_codes gnunet_hashcode[] NOT NULL'
+      ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (h_fulfillment_proof)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Proofs of fulfillment of policies that were set in deposits'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Timestamp of the arrival of a proof of fulfillment'
+    ,'fulfillment_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'JSON object with a proof of the fulfillment of a policy. Supported details depend on the policy extensions supported by the exchange.'
+    ,'fulfillment_proof'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Hash of the fulfillment_proof'
+    ,'h_fulfillment_proof'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Array of the policy_hash_code''s of all policy_details that are fulfilled by this proof'
+    ,'policy_hash_codes'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+COMMENT ON FUNCTION create_table_policy_fulfillments
+  IS 'Creates the policy_fulfillments table';
+
+CREATE FUNCTION constrain_table_policy_fulfillments(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  partition_name TEXT;
+BEGIN
+  partition_name = concat_ws('_', 'policy_fulfillments', partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || partition_name ||
+    ' ADD CONSTRAINT ' || partition_name || '_serial_id '
+    ' UNIQUE (h_fulfillment_proof, fulfillment_id)'
+  );
+END
+$$;
+INSERT INTO exchange_tables
+  (name
+  ,version
+  ,action
+  ,partitioned
+  ,by_range)
+VALUES
+  ('policy_fulfillments', 'exchange-0002', 'create',    TRUE ,FALSE),
+  ('policy_fulfillments', 'exchange-0002', 'constrain', TRUE ,FALSE);
diff --git a/src/exchangedb/0002-prewire.sql b/src/exchangedb/0002-prewire.sql
new file mode 100644
index 000000000..396a27608
--- /dev/null
+++ b/src/exchangedb/0002-prewire.sql
@@ -0,0 +1,116 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_prewire(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'prewire';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(prewire_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
+      ',wire_method TEXT NOT NULL'
+      ',finished BOOLEAN NOT NULL DEFAULT FALSE'
+      ',failed BOOLEAN NOT NULL DEFAULT FALSE'
+      ',buf BYTEA NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (prewire_uuid)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'pre-commit data for wire transfers we are about to execute'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'set to TRUE if the bank responded with a non-transient failure to our transfer request'
+    ,'failed'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'set to TRUE once bank confirmed receiving the wire transfer request'
+    ,'finished'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'serialized data to send to the bank to execute the wire transfer'
+    ,'buf'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_prewire(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'prewire';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_finished_index '
+    'ON ' || table_name || ' '
+    '(finished)'
+    ' WHERE finished;'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_finished_index '
+    'IS ' || quote_literal('for do_gc') || ';'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_failed_finished_index '
+    'ON ' || table_name || ' '
+    '(prewire_uuid)'
+    ' WHERE finished=FALSE'
+    '   AND failed=FALSE;'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_failed_finished_index '
+    'IS ' || quote_literal('for wire_prepare_data_get') || ';'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('prewire'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('prewire'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-profit_drains.sql b/src/exchangedb/0002-profit_drains.sql
new file mode 100644
index 000000000..c4f3a7bd0
--- /dev/null
+++ b/src/exchangedb/0002-profit_drains.sql
@@ -0,0 +1,42 @@
+--
+-- 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 profit_drains
+  (profit_drain_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,wtid BYTEA PRIMARY KEY CHECK (LENGTH(wtid)=32)
+  ,account_section TEXT NOT NULL
+  ,payto_uri TEXT NOT NULL
+  ,trigger_date INT8 NOT NULL
+  ,amount taler_amount NOT NULL
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  ,executed BOOLEAN NOT NULL DEFAULT FALSE
+  );
+COMMENT ON TABLE profit_drains
+  IS 'transactions to be performed to move profits from the escrow account of the exchange to a regular account';
+COMMENT ON COLUMN profit_drains.wtid
+  IS 'randomly chosen nonce, unique to prevent double-submission';
+COMMENT ON COLUMN profit_drains.account_section
+  IS 'specifies the configuration section in the taler-exchange-drain configuration with the wire account to drain';
+COMMENT ON COLUMN profit_drains.payto_uri
+  IS 'specifies the account to be credited';
+COMMENT ON COLUMN profit_drains.trigger_date
+  IS 'set by taler-exchange-offline at the time of making the signature; not necessarily the exact date of execution of the wire transfer, just for orientation';
+COMMENT ON COLUMN profit_drains.amount
+  IS 'amount to be transferred';
+COMMENT ON COLUMN profit_drains.master_sig
+  IS 'EdDSA signature of type TALER_SIGNATURE_MASTER_DRAIN_PROFIT';
+COMMENT ON COLUMN profit_drains.executed
+  IS 'set to TRUE by taler-exchange-drain on execution of the transaction, not replicated to auditor';
diff --git a/src/exchangedb/0002-purse_actions.sql b/src/exchangedb/0002-purse_actions.sql
new file mode 100644
index 000000000..0dd6cfc4d
--- /dev/null
+++ b/src/exchangedb/0002-purse_actions.sql
@@ -0,0 +1,121 @@
+--
+-- 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 OR REPLACE FUNCTION create_table_purse_actions(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_actions';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(purse_pub BYTEA NOT NULL PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
+      ',action_date INT8 NOT NULL'
+      ',partner_serial_id INT8'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'purses awaiting some action by the router'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public (contract) key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'when is the purse ready for action'
+    ,'action_date'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'wad target of an outgoing wire transfer, 0 for local, NULL if the purse is unmerged and thus the target is still unknown'
+    ,'partner_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE OR REPLACE FUNCTION purse_requests_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO
+    purse_actions
+    (purse_pub
+    ,action_date)
+  VALUES
+    (NEW.purse_pub
+    ,NEW.purse_expiration);
+  RETURN NEW;
+END $$;
+
+COMMENT ON FUNCTION purse_requests_insert_trigger()
+  IS 'When a purse is created, insert it into the purse_action table to take action when the purse expires.';
+
+
+CREATE OR REPLACE FUNCTION master_table_purse_actions()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_actions';
+BEGIN
+  -- Create global index
+  CREATE INDEX IF NOT EXISTS purse_action_by_target
+    ON purse_actions
+    (partner_serial_id,action_date);
+
+  -- Setup trigger
+  CREATE TRIGGER purse_requests_on_insert
+    AFTER INSERT
+    ON purse_requests
+    FOR EACH ROW EXECUTE FUNCTION purse_requests_insert_trigger();
+  COMMENT ON TRIGGER purse_requests_on_insert
+          ON purse_requests
+    IS 'Here we install an entry for the purse expiration.';
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_actions'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_actions'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-purse_decision.sql b/src/exchangedb/0002-purse_decision.sql
new file mode 100644
index 000000000..091bd468b
--- /dev/null
+++ b/src/exchangedb/0002-purse_decision.sql
@@ -0,0 +1,143 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_purse_decision(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_decision';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(purse_decision_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+      ',action_timestamp INT8 NOT NULL'
+      ',refunded BOOL NOT NULL'
+      ',PRIMARY KEY (purse_pub)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Purses that were decided upon (refund or merge)'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+CREATE FUNCTION constrain_table_purse_decision(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_decision';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_purse_action_serial_id_key'
+    ' UNIQUE (purse_decision_serial_id) '
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION purse_decision_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  UPDATE purse_requests
+     SET was_decided=TRUE
+   WHERE purse_pub=NEW.purse_pub;
+  IF NEW.refunded
+  THEN
+    INSERT INTO coin_history
+      (coin_pub
+      ,table_name
+      ,serial_id)
+    SELECT
+      pd.coin_pub
+     ,'purse_decision'
+     ,NEW.purse_decision_serial_id
+    FROM purse_deposits pd
+    WHERE purse_pub = NEW.purse_pub;
+  ELSE
+    INSERT INTO reserve_history
+      (reserve_pub
+      ,table_name
+      ,serial_id)
+    SELECT
+      reserve_pub
+     ,'purse_decision'
+     ,NEW.purse_decision_serial_id
+    FROM purse_merges
+    WHERE purse_pub=NEW.purse_pub;
+  END IF;
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION purse_decision_insert_trigger()
+  IS 'Automatically generate coin history entry and update decision status for the purse.';
+
+
+CREATE FUNCTION master_table_purse_decision()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER purse_decision_on_insert
+    AFTER INSERT
+     ON purse_decision
+     FOR EACH ROW EXECUTE FUNCTION purse_decision_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_decision'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_decision'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('purse_decision'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-purse_deletion.sql b/src/exchangedb/0002-purse_deletion.sql
new file mode 100644
index 000000000..45b2e85a9
--- /dev/null
+++ b/src/exchangedb/0002-purse_deletion.sql
@@ -0,0 +1,110 @@
+--
+-- 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 OR REPLACE FUNCTION create_table_purse_deletion(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_deletion';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(purse_deletion_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',purse_sig BYTEA CHECK (LENGTH(purse_sig)=64)'
+      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'signatures affirming explicit purse deletions'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'signature of type WALLET_PURSE_DELETE'
+    ,'purse_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+COMMENT ON FUNCTION create_table_purse_deletion
+  IS 'Creates the purse_deletion table';
+
+
+CREATE OR REPLACE FUNCTION constrain_table_purse_deletion(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_deletion';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+      ' ADD CONSTRAINT ' || table_name || '_delete_serial_key '
+        'UNIQUE (purse_deletion_serial_id)'
+  );
+END $$;
+
+
+CREATE OR REPLACE FUNCTION master_table_purse_requests_was_deleted (
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_requests';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE exchange.' || table_name ||
+    ' ADD COLUMN'
+    ' was_deleted BOOLEAN NOT NULL DEFAULT(FALSE)'
+  );
+  COMMENT ON COLUMN purse_requests.was_deleted
+    IS 'TRUE if the purse was explicitly deleted (purse must have an entry in the purse_deletion table)';
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_deletion'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_deletion'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('purse_requests_was_deleted'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-purse_deposits.sql b/src/exchangedb/0002-purse_deposits.sql
new file mode 100644
index 000000000..6a07c4b62
--- /dev/null
+++ b/src/exchangedb/0002-purse_deposits.sql
@@ -0,0 +1,176 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_purse_deposits(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_deposits';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(purse_deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',partner_serial_id INT8'
+      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+      ',coin_pub BYTEA NOT NULL'
+      ',amount_with_fee taler_amount NOT NULL'
+      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
+      ',PRIMARY KEY (purse_pub,coin_pub)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Requests depositing coins into a purse'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'identifies the partner exchange, NULL in case the target purse lives at this exchange'
+    ,'partner_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the coin being deposited'
+    ,'coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total amount being deposited'
+    ,'amount_with_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature of the coin affirming the deposit into the purse, of type TALER_SIGNATURE_PURSE_DEPOSIT'
+    ,'coin_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_purse_deposits(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_deposits';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_purse_deposit_serial_id_key'
+    ' UNIQUE (purse_deposit_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_purse_deposits()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_deposits';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_partner'
+    ' FOREIGN KEY (partner_serial_id) '
+    ' REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION purse_deposits_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+ VALUES
+    (NEW.coin_pub
+    ,'purse_deposits'
+    ,NEW.purse_deposit_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION purse_deposits_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_purse_deposits()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER purse_deposits_on_insert
+    AFTER INSERT
+     ON purse_deposits
+     FOR EACH ROW EXECUTE FUNCTION purse_deposits_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_deposits'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_deposits'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('purse_deposits'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('purse_deposits'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-purse_merges.sql b/src/exchangedb/0002-purse_merges.sql
new file mode 100644
index 000000000..0b4d230b3
--- /dev/null
+++ b/src/exchangedb/0002-purse_merges.sql
@@ -0,0 +1,140 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_purse_merges(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_merges';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+    '(purse_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+    ',partner_serial_id INT8'
+    ',reserve_pub BYTEA NOT NULL CHECK(length(reserve_pub)=32)'
+    ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+    ',merge_sig BYTEA NOT NULL CHECK (LENGTH(merge_sig)=64)'
+    ',merge_timestamp INT8 NOT NULL'
+    ',PRIMARY KEY (purse_pub)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Merge requests where a purse-owner requested merging the purse into the account'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'identifies the partner exchange, NULL in case the target reserve lives at this exchange'
+    ,'partner_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the target reserve'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'signature by the purse private key affirming the merge, of type TALER_SIGNATURE_WALLET_PURSE_MERGE'
+    ,'merge_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'when was the merge message signed'
+    ,'merge_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_purse_merges(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_merges';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_purse_merge_request_serial_id_key'
+    ' UNIQUE (purse_merge_request_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_purse_merges()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_merges';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_partner_serial_id'
+    ' FOREIGN KEY (partner_serial_id) '
+    ' REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_purse_pub'
+    ' FOREIGN KEY (purse_pub) '
+    ' REFERENCES purse_requests (purse_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_merges'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_merges'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('purse_merges'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-purse_requests.sql b/src/exchangedb/0002-purse_requests.sql
new file mode 100644
index 000000000..0fa076338
--- /dev/null
+++ b/src/exchangedb/0002-purse_requests.sql
@@ -0,0 +1,163 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_purse_requests(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_requests';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(purse_requests_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
+      ',merge_pub BYTEA NOT NULL CHECK (LENGTH(merge_pub)=32)'
+      ',purse_creation INT8 NOT NULL'
+      ',purse_expiration INT8 NOT NULL'
+      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
+      ',age_limit INT4 NOT NULL'
+      ',flags INT4 NOT NULL'
+      ',in_reserve_quota BOOLEAN NOT NULL DEFAULT(FALSE)'
+      ',was_decided BOOLEAN NOT NULL DEFAULT(FALSE)'
+      ',amount_with_fee taler_amount NOT NULL'
+      ',purse_fee taler_amount NOT NULL'
+      ',balance taler_amount NOT NULL DEFAULT (0,0)'
+      ',purse_sig BYTEA NOT NULL CHECK(LENGTH(purse_sig)=64)'
+      ',PRIMARY KEY (purse_pub)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Requests establishing purses, associating them with a contract but without a target reserve'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Local time when the purse was created. Determines applicable purse fees.'
+    ,'purse_creation'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'When the purse is set to expire'
+    ,'purse_expiration'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Hash of the contract the parties are to agree to'
+    ,'h_contract_terms'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'see the enum TALER_WalletAccountMergeFlags'
+    ,'flags'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'set to TRUE if this purse currently counts against the number of free purses in the respective reserve'
+    ,'in_reserve_quota'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total amount expected to be in the purse'
+    ,'amount_with_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Purse fee the client agreed to pay from the reserve (accepted by the exchange at the time the purse was created). Zero if in_reserve_quota is TRUE.'
+    ,'purse_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Total amount actually in the purse (updated)'
+    ,'balance'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature of the purse affirming the purse parameters, of type TALER_SIGNATURE_PURSE_REQUEST'
+    ,'purse_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+CREATE FUNCTION constrain_table_purse_requests(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_requests';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_merge_pub '
+    'ON ' || table_name || ' '
+    '(merge_pub);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_purse_expiration '
+    'ON ' || table_name || ' '
+    '(purse_expiration) ' ||
+    'WHERE NOT was_decided;'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_purse_requests_serial_id_key'
+    ' UNIQUE (purse_requests_serial_id) '
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_requests'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('purse_requests'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-recoup.sql b/src/exchangedb/0002-recoup.sql
new file mode 100644
index 000000000..4b3452498
--- /dev/null
+++ b/src/exchangedb/0002-recoup.sql
@@ -0,0 +1,267 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_recoup(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(recoup_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
+      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
+      ',amount taler_amount NOT NULL'
+      ',recoup_timestamp INT8 NOT NULL'
+      ',reserve_out_serial_id INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub);'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Information about recoups that were executed between a coin and a reserve. In this type of recoup, the amount is credited back to the reserve from which the coin originated.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Coin that is being debited in the recoup. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!'
+    ,'coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the h_blind_ev of the recouped coin and provides the link to the credited reserve.'
+    ,'reserve_out_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the coin affirming the recoup, of type TALER_SIGNATURE_WALLET_COIN_RECOUP'
+    ,'coin_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the withdraw operation.'
+    ,'coin_blind'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_recoup(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_coin_pub_index '
+    'ON ' || table_name || ' '
+    '(coin_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_recoup_uuid_key'
+    ' UNIQUE (recoup_uuid) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_recoup()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserves_out'
+    ' FOREIGN KEY (reserve_out_serial_id) '
+    ' REFERENCES reserves_out (reserve_out_serial_id) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION create_table_recoup_by_reserve(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup_by_reserve';
+BEGIN
+  PERFORM create_partitioned_table(
+  'CREATE TABLE %I'
+    '(reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves (reserve_out_serial_id) ON DELETE CASCADE
+    ',coin_pub BYTEA CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_out_serial_id)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Information in this table is strictly redundant with that of recoup, but saved by a different primary key for fast lookups by reserve_out_serial_id.'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_recoup_by_reserve(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup_by_reserve';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_main_index '
+    'ON ' || table_name || ' '
+    '(reserve_out_serial_id);'
+  );
+END
+$$;
+
+
+CREATE FUNCTION recoup_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO recoup_by_reserve
+    (reserve_out_serial_id
+    ,coin_pub)
+  VALUES
+    (NEW.reserve_out_serial_id
+    ,NEW.coin_pub);
+  INSERT INTO coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.coin_pub
+    ,'recoup'
+    ,NEW.recoup_uuid);
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  SELECT
+     res.reserve_pub
+    ,'recoup'
+    ,NEW.recoup_uuid
+  FROM reserves_out rout
+  JOIN reserves res
+    USING (reserve_uuid)
+    WHERE rout.reserve_out_serial_id = NEW.reserve_out_serial_id;
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION recoup_insert_trigger()
+  IS 'Replicates recoup inserts into recoup_by_reserve table and updates the coin_history table.';
+
+
+CREATE FUNCTION recoup_delete_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  DELETE FROM recoup_by_reserve
+   WHERE reserve_out_serial_id = OLD.reserve_out_serial_id
+     AND coin_pub = OLD.coin_pub;
+  RETURN OLD;
+END $$;
+COMMENT ON FUNCTION recoup_delete_trigger()
+  IS 'Replicate recoup deletions into recoup_by_reserve table.';
+
+
+CREATE FUNCTION master_table_recoup()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER recoup_on_insert
+    AFTER INSERT
+     ON recoup
+     FOR EACH ROW EXECUTE FUNCTION recoup_insert_trigger();
+  CREATE TRIGGER recoup_on_delete
+    AFTER DELETE
+      ON recoup
+     FOR EACH ROW EXECUTE FUNCTION recoup_delete_trigger();
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('recoup'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('recoup'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('recoup'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('recoup_by_reserve'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('recoup_by_reserve'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('recoup'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-recoup_refresh.sql b/src/exchangedb/0002-recoup_refresh.sql
new file mode 100644
index 000000000..8b979a49f
--- /dev/null
+++ b/src/exchangedb/0002-recoup_refresh.sql
@@ -0,0 +1,203 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_recoup_refresh(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup_refresh';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+    '(recoup_refresh_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+    ',known_coin_id BIGINT NOT NULL'
+    ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
+    ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
+    ',amount taler_amount NOT NULL'
+    ',recoup_timestamp INT8 NOT NULL'
+    ',rrc_serial INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Table of coins that originated from a refresh operation and that were recouped. Links the (fresh) coin to the melted operation (and thus the old coin). A recoup on a refreshed coin credits the old coin and debits the fresh coin.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Refreshed coin of a revoked denomination where the residual value is credited to the old coin. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!'
+    ,'coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Used for garbage collection (in the absence of foreign constraints, in the future)'
+    ,'known_coin_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Link to the refresh operation. Also identifies the h_blind_ev of the recouped coin (as h_coin_ev).'
+    ,'rrc_serial'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the refresh operation.'
+    ,'coin_blind'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_recoup_refresh(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup_refresh';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_rrc_serial_index'
+    ' ON ' || table_name || ' '
+    '(rrc_serial);'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_rrc_serial_index '
+    'IS ' || quote_literal('used in exchange_do_melt for zombie coins (rare)') || ';'
+  );
+
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_coin_pub_index'
+    ' ON ' || table_name || ' '
+    '(coin_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_recoup_refresh_uuid_key'
+    ' UNIQUE (recoup_refresh_uuid) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_recoup_refresh()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'recoup_refresh';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub)'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_known_coin_id'
+    ' FOREIGN KEY (known_coin_id) '
+    ' REFERENCES known_coins (known_coin_id) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_rrc_serial'
+    ' FOREIGN KEY (rrc_serial) '
+    ' REFERENCES refresh_revealed_coins (rrc_serial) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION recoup_refresh_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+     (NEW.coin_pub
+    ,'recoup_refresh::NEW'
+    ,NEW.recoup_refresh_uuid);
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+  SELECT
+     melt.old_coin_pub
+    ,'recoup_refresh::OLD'
+    ,NEW.recoup_refresh_uuid
+    FROM refresh_revealed_coins rrc
+    JOIN refresh_commitments melt
+      USING (melt_serial_id)
+    WHERE rrc.rrc_serial = NEW.rrc_serial;
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION coin_deposits_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_recoup_refresh()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER recoup_refresh_on_insert
+    AFTER INSERT
+     ON recoup_refresh
+     FOR EACH ROW EXECUTE FUNCTION recoup_refresh_insert_trigger();
+END $$;
+
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('recoup_refresh'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('recoup_refresh'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('recoup_refresh'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('recoup_refresh'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-refresh_commitments.sql b/src/exchangedb/0002-refresh_commitments.sql
new file mode 100644
index 000000000..e577f1e1c
--- /dev/null
+++ b/src/exchangedb/0002-refresh_commitments.sql
@@ -0,0 +1,166 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_refresh_commitments(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_commitments';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(melt_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',rc BYTEA PRIMARY KEY CHECK (LENGTH(rc)=64)'
+      ',old_coin_pub BYTEA NOT NULL'
+      ',old_coin_sig BYTEA NOT NULL CHECK(LENGTH(old_coin_sig)=64)'
+      ',amount_with_fee taler_amount NOT NULL'
+      ',noreveal_index INT4 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (rc)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Commitments made when melting coins and the gamma value chosen by the exchange.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'The gamma value chosen by the exchange in the cut-and-choose protocol'
+    ,'noreveal_index'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Commitment made by the client, hash over the various client inputs in the cut-and-choose protocol'
+    ,'rc'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Coin being melted in the refresh process.'
+    ,'old_coin_pub'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_refresh_commitments(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_commitments';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  -- Note: index spans partitions, may need to be materialized.
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_old_coin_pub_index '
+    'ON ' || table_name || ' '
+    '(old_coin_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_melt_serial_id_key'
+    ' UNIQUE (melt_serial_id)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_refresh_commitments()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_commitments';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (old_coin_pub) '
+    ' REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION refresh_commitments_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+ VALUES
+     (NEW.old_coin_pub
+    ,'refresh_commitments'
+    ,NEW.melt_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION refresh_commitments_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_refresh_commitments()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER refresh_commitments_on_insert
+    AFTER INSERT
+     ON refresh_commitments
+     FOR EACH ROW EXECUTE FUNCTION refresh_commitments_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('refresh_commitments'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('refresh_commitments'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('refresh_commitments'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+   ('refresh_commitments'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-refresh_revealed_coins.sql b/src/exchangedb/0002-refresh_revealed_coins.sql
new file mode 100644
index 000000000..ad65c9942
--- /dev/null
+++ b/src/exchangedb/0002-refresh_revealed_coins.sql
@@ -0,0 +1,169 @@
+--
+-- 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 FUNCTION create_table_refresh_revealed_coins(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_revealed_coins';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(rrc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',melt_serial_id INT8 NOT NULL'
+      ',freshcoin_index INT4 NOT NULL'
+      ',link_sig BYTEA NOT NULL CHECK(LENGTH(link_sig)=64)'
+      ',denominations_serial INT8 NOT NULL'
+      ',coin_ev BYTEA NOT NULL'
+      ',h_coin_ev BYTEA NOT NULL CHECK(LENGTH(h_coin_ev)=64)'
+      ',ev_sig BYTEA NOT NULL'
+      ',ewv BYTEA NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (melt_serial_id)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Revelations about the new coins that are to be created during a melting session.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'needed for exchange-auditor replication logic'
+    ,'rrc_serial'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the refresh commitment (rc) of the melt operation.'
+    ,'melt_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'index of the fresh coin being created (one melt operation may result in multiple fresh coins)'
+    ,'freshcoin_index'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature of type WALLET_COIN_LINK, proves exchange did not tamper with the link data'
+    ,'link_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'envelope of the new coin to be signed'
+    ,'coin_ev'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'exchange contributed values in the creation of the fresh coin (see /csr)'
+    ,'ewv'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'hash of the envelope of the new coin to be signed (for lookups)'
+    ,'h_coin_ev'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'exchange signature over the envelope'
+    ,'ev_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_refresh_revealed_coins(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_revealed_coins';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_coins_by_melt_serial_id_index '
+    'ON ' || table_name || ' '
+    '(melt_serial_id);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_rrc_serial_key'
+    ' UNIQUE (rrc_serial) '
+    ',ADD CONSTRAINT ' || table_name || '_coin_ev_key'
+    ' UNIQUE (coin_ev) '
+    ',ADD CONSTRAINT ' || table_name || '_h_coin_ev_key'
+    ' UNIQUE (h_coin_ev) '
+    ',ADD PRIMARY KEY (melt_serial_id, freshcoin_index)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_refresh_revealed_coins()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_revealed_coins';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_melt'
+    ' FOREIGN KEY (melt_serial_id)'
+    ' REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_denom'
+    ' FOREIGN KEY (denominations_serial)'
+    ' REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('refresh_revealed_coins'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('refresh_revealed_coins'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('refresh_revealed_coins'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-refresh_transfer_keys.sql b/src/exchangedb/0002-refresh_transfer_keys.sql
new file mode 100644
index 000000000..9bcb912da
--- /dev/null
+++ b/src/exchangedb/0002-refresh_transfer_keys.sql
@@ -0,0 +1,127 @@
+--
+-- 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 FUNCTION create_table_refresh_transfer_keys(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_transfer_keys';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(rtc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',melt_serial_id INT8 PRIMARY KEY'
+      ',transfer_pub BYTEA NOT NULL CHECK(LENGTH(transfer_pub)=32)'
+      ',transfer_privs BYTEA NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (melt_serial_id)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Transfer keys of a refresh operation (the data revealed to the exchange).'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'needed for exchange-auditor replication logic'
+    ,'rtc_serial'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the refresh commitment (rc) of the operation.'
+    ,'melt_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'transfer public key for the gamma index'
+    ,'transfer_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'array of TALER_CNC_KAPPA-1 transfer private keys that have been revealed, with the gamma entry being skipped'
+    ,'transfer_privs'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_refresh_transfer_keys(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_transfer_keys';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_rtc_serial_key'
+    ' UNIQUE (rtc_serial)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_refresh_transfer_keys()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refresh_transfer_keys';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || 'foreign_melt_serial_id'
+    ' FOREIGN KEY (melt_serial_id)'
+    ' REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('refresh_transfer_keys'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('refresh_transfer_keys'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('refresh_transfer_keys'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-refunds.sql b/src/exchangedb/0002-refunds.sql
new file mode 100644
index 000000000..2a40bc192
--- /dev/null
+++ b/src/exchangedb/0002-refunds.sql
@@ -0,0 +1,162 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_refunds(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refunds';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(refund_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+      ',batch_deposit_serial_id INT8 NOT NULL'
+      ',merchant_sig BYTEA NOT NULL CHECK(LENGTH(merchant_sig)=64)'
+      ',rtransaction_id INT8 NOT NULL'
+      ',amount_with_fee taler_amount NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Data on coins that were refunded. Technically, refunds always apply against specific deposit operations involving a coin. The combination of coin_pub, merchant_pub, h_contract_terms and rtransaction_id MUST be unique, and we usually select by coin_pub so that one goes first.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies ONLY the merchant_pub, h_contract_terms and coin_pub. Multiple deposits may match a refund, this only identifies one of them.'
+    ,'batch_deposit_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'used by the merchant to make refunds unique in case the same coin for the same deposit gets a subsequent (higher) refund'
+    ,'rtransaction_id'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_refunds (
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refunds';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_coin_pub_index '
+    'ON ' || table_name || ' '
+    '(coin_pub);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_refund_serial_id_key'
+    ' UNIQUE (refund_serial_id) '
+    ',ADD PRIMARY KEY (batch_deposit_serial_id, rtransaction_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_refunds ()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refunds';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_coin_pub'
+    ' FOREIGN KEY (coin_pub) '
+    ' REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_deposit'
+    ' FOREIGN KEY (batch_deposit_serial_id) '
+    ' REFERENCES batch_deposits (batch_deposit_serial_id) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION refunds_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+ VALUES
+     (NEW.coin_pub
+    ,'refunds'
+    ,NEW.refund_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION refunds_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_refunds()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER refunds_on_insert
+    AFTER INSERT
+     ON refunds
+     FOR EACH ROW EXECUTE FUNCTION refunds_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('refunds'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('refunds'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('refunds'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('refunds'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserve_history.sql b/src/exchangedb/0002-reserve_history.sql
new file mode 100644
index 000000000..b0c764306
--- /dev/null
+++ b/src/exchangedb/0002-reserve_history.sql
@@ -0,0 +1,138 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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 FUNCTION create_table_reserve_history (
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserve_history';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(reserve_history_serial_id INT8 GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)'
+      ',table_name TEXT NOT NULL'
+      ',serial_id INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Links to tables with entries that affected the transaction history of a reserve.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'For which reserve is this a history entry'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'In which table is the history entry'
+    ,'table_name'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Which is the generated serial ID of the entry in the table'
+    ,'serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Monotonic counter, used to generate Etags for caching'
+    ,'reserve_history_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserve_history(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserve_history';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_reserve_history_serial_id_pkey'
+    ' PRIMARY KEY (reserve_history_serial_id) '
+    ',ADD CONSTRAINT ' || table_name || '_reserve_entry_key'
+    ' UNIQUE (reserve_pub, table_name, serial_id)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_reserve_by_time'
+    ' ON ' || table_name || ' '
+    '(reserve_pub'
+    ',reserve_history_serial_id DESC'
+    ');'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_reserve_history()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserve_history';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub) '
+    ' REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserve_history'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserve_history'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserve_history'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE)
+    ;
diff --git a/src/exchangedb/0002-reserves.sql b/src/exchangedb/0002-reserves.sql
new file mode 100644
index 000000000..d710dd01b
--- /dev/null
+++ b/src/exchangedb/0002-reserves.sql
@@ -0,0 +1,152 @@
+--
+-- 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 FUNCTION create_table_reserves(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserves';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(reserve_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)'
+      ',current_balance taler_amount NOT NULL DEFAULT (0, 0)'
+      ',purses_active INT8 NOT NULL DEFAULT(0)'
+      ',purses_allowed INT8 NOT NULL DEFAULT(0)'
+      ',birthday INT4 NOT NULL DEFAULT(0)'
+      ',expiration_date INT8 NOT NULL'
+      ',gc_date INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Summarizes the balance of a reserve. Updated when new funds are added or withdrawn.'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'EdDSA public key of the reserve. Knowledge of the private key implies ownership over the balance.'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Current balance remaining with the reserve.'
+    ,'current_balance'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Number of purses that were created by this reserve that are not expired and not fully paid.'
+    ,'purses_active'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Number of purses that this reserve is allowed to have active at most.'
+    ,'purses_allowed'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Used to trigger closing of reserves that have not been drained after some time'
+    ,'expiration_date'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Used to forget all information about a reserve during garbage collection'
+    ,'gc_date'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Birthday of the user in days after 1970, or 0 if user is an adult and is not subject to age restrictions'
+    ,'birthday'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserves(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserves';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_unique_uuid'
+    ' UNIQUE (reserve_uuid)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_expiration_index '
+    'ON ' || table_name || ' '
+    '(expiration_date'
+    ',current_balance'
+    ');'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_expiration_index '
+    'IS ' || quote_literal('used in get_expired_reserves') || ';'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve_uuid_index '
+    'ON ' || table_name || ' '
+    '(reserve_uuid);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_gc_date_index '
+    'ON ' || table_name || ' '
+    '(gc_date);'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_gc_date_index '
+    'IS ' || quote_literal('for reserve garbage collection') || ';'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserves_close.sql b/src/exchangedb/0002-reserves_close.sql
new file mode 100644
index 000000000..16669768d
--- /dev/null
+++ b/src/exchangedb/0002-reserves_close.sql
@@ -0,0 +1,151 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_reserves_close(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_close';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(close_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL'
+      ',execution_date INT8 NOT NULL'
+      ',wtid BYTEA NOT NULL CHECK (LENGTH(wtid)=32)'
+      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
+      ',amount taler_amount NOT NULL'
+      ',closing_fee taler_amount NOT NULL'
+      ',close_request_row INT8 NOT NULL DEFAULT(0)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'wire transfers executed by the reserve to close reserves'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the credited bank account (and KYC status). Note that closing does not depend on KYC.'
+    ,'wire_target_h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserves_close(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_close';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_close_uuid_pkey'
+    ' PRIMARY KEY (close_uuid)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve_pub_index '
+    'ON ' || table_name || ' (reserve_pub);'
+  );
+END $$;
+
+
+CREATE FUNCTION foreign_table_reserves_close()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_close';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub)'
+    ' REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
+  );
+END $$;
+
+
+CREATE OR REPLACE FUNCTION reserves_close_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.reserve_pub
+    ,'reserves_close'
+    ,NEW.close_uuid);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION reserves_close_insert_trigger()
+  IS 'Automatically generate reserve history entry.';
+
+
+CREATE FUNCTION master_table_reserves_close()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER reserves_close_on_insert
+    AFTER INSERT
+     ON reserves_close
+     FOR EACH ROW EXECUTE FUNCTION reserves_close_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves_close'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves_close'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserves_close'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('reserves_close'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserves_in.sql b/src/exchangedb/0002-reserves_in.sql
new file mode 100644
index 000000000..197a815b3
--- /dev/null
+++ b/src/exchangedb/0002-reserves_in.sql
@@ -0,0 +1,175 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_reserves_in(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_in';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(reserve_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA PRIMARY KEY'
+      ',wire_reference INT8 NOT NULL'
+      ',credit taler_amount NOT NULL'
+      ',wire_source_h_payto BYTEA CHECK (LENGTH(wire_source_h_payto)=32)'
+      ',exchange_account_section TEXT NOT NULL'
+      ',execution_date INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'list of transfers of funds into the reserves, one per incoming wire transfer'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the debited bank account and KYC status'
+    ,'wire_source_h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the reserve. Private key signifies ownership of the remaining balance.'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Amount that was transferred into the reserve'
+    ,'credit'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_reserves_in(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_in';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_reserve_in_serial_id_key'
+    ' UNIQUE (reserve_in_serial_id)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve_in_serial_id_index '
+    'ON ' || table_name || ' '
+    '(reserve_in_serial_id);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
+    'ON ' || table_name || ' '
+    '(exchange_account_section'
+    ',reserve_in_serial_id ASC'
+    ');'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
+    'IS ' || quote_literal ('for pg_select_reserves_in_above_serial_id_by_account') || ';'
+  ); 
+
+END
+$$;
+
+CREATE FUNCTION foreign_table_reserves_in()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'reserves_in';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub'
+    ' FOREIGN KEY (reserve_pub) '
+    ' REFERENCES reserves(reserve_pub) ON DELETE CASCADE'
+  );
+END $$;
+
+
+
+CREATE OR REPLACE FUNCTION reserves_in_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.reserve_pub
+    ,'reserves_in'
+    ,NEW.reserve_in_serial_id);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION reserves_in_insert_trigger()
+  IS 'Automatically generate reserve history entry.';
+
+
+CREATE FUNCTION master_table_reserves_in()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER reserves_in_on_insert
+    AFTER INSERT
+     ON reserves_in
+     FOR EACH ROW EXECUTE FUNCTION reserves_in_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves_in'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves_in'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserves_in'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('reserves_in'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserves_open_deposits.sql b/src/exchangedb/0002-reserves_open_deposits.sql
new file mode 100644
index 000000000..776859df8
--- /dev/null
+++ b/src/exchangedb/0002-reserves_open_deposits.sql
@@ -0,0 +1,135 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_reserves_open_deposits(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_open_deposits';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(reserve_open_deposit_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)'
+      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
+      ',coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)'
+      ',contribution taler_amount NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (coin_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'coin contributions paying for a reserve to remain open'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the specific reserve being paid for (possibly together with reserve_sig).'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserves_open_deposits(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_open_deposits';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name || ' '
+      'ADD CONSTRAINT ' || table_name || '_coin_unique '
+        'PRIMARY KEY (coin_pub,coin_sig)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_uuid '
+    'ON ' || table_name || ' '
+    '(reserve_open_deposit_uuid);'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve '
+    'ON ' || table_name || ' '
+    '(reserve_pub);'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION reserves_open_deposits_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO exchange.coin_history
+    (coin_pub
+    ,table_name
+    ,serial_id)
+ VALUES
+     (NEW.coin_pub
+    ,'reserves_open_deposits'
+    ,NEW.reserve_open_deposit_uuid);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION reserves_open_deposits_insert_trigger()
+  IS 'Automatically generate coin history entry.';
+
+
+CREATE FUNCTION master_table_reserves_open_deposits()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER reserves_open_deposits_on_insert
+    AFTER INSERT
+     ON reserves_open_deposits
+     FOR EACH ROW EXECUTE FUNCTION reserves_open_deposits_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves_open_deposits'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves_open_deposits'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserves_open_deposits'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserves_open_requests.sql b/src/exchangedb/0002-reserves_open_requests.sql
new file mode 100644
index 000000000..b51168dc0
--- /dev/null
+++ b/src/exchangedb/0002-reserves_open_requests.sql
@@ -0,0 +1,150 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_reserves_open_requests(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_open_requests';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(open_request_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',reserve_pub BYTEA NOT NULL'
+      ',request_timestamp INT8 NOT NULL'
+      ',expiration_date INT8 NOT NULL'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',reserve_payment taler_amount NOT NULL'
+      ',requested_purse_limit INT4 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (reserve_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table (
+     'requests to keep a reserve open'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column (
+     'Fee to pay for the request from the reserve balance itself.'
+    ,'reserve_payment'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserves_open_requests(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_open_requests';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_by_uuid'
+    ' PRIMARY KEY (open_request_uuid)'
+    ',ADD CONSTRAINT ' || table_name || '_by_time'
+    ' UNIQUE (reserve_pub,request_timestamp)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_reserves_open_requests()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_open_requests';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_reserve_pub '
+    ' FOREIGN KEY (reserve_pub)'
+    ' REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE OR REPLACE FUNCTION reserves_open_requests_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  VALUES
+    (NEW.reserve_pub
+    ,'reserves_open_requests'
+    ,NEW.open_request_uuid);
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION reserves_open_requests_insert_trigger()
+  IS 'Automatically generate reserve history entry.';
+
+
+CREATE FUNCTION master_table_reserves_open_requests()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER reserves_open_requests_on_insert
+    AFTER INSERT
+     ON reserves_open_requests
+     FOR EACH ROW EXECUTE FUNCTION reserves_open_requests_insert_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves_open_requests'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves_open_requests'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserves_open_requests'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('reserves_open_requests'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-reserves_out.sql b/src/exchangedb/0002-reserves_out.sql
new file mode 100644
index 000000000..f0965d222
--- /dev/null
+++ b/src/exchangedb/0002-reserves_out.sql
@@ -0,0 +1,173 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 FUNCTION create_table_reserves_out(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_out';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(reserve_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64) UNIQUE'
+      ',denominations_serial INT8 NOT NULL'
+      ',denom_sig BYTEA NOT NULL'
+      ',reserve_uuid INT8 NOT NULL'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',execution_date INT8 NOT NULL'
+      ',amount_with_fee taler_amount NOT NULL'
+    ') %s ;'
+    ,'reserves_out'
+    ,'PARTITION BY HASH (h_blind_ev)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table (
+     'Withdraw operations performed on reserves.'
+    ,'reserves_out'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column (
+     '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).'
+    ,'h_blind_ev'
+    ,'reserves_out'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column (
+     'We do not CASCADE ON DELETE for the foreign constrain here, as we may keep the denomination data alive'
+    ,'denominations_serial'
+    ,'reserves_out'
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_reserves_out(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_out';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_reserve_out_serial_id_key'
+    ' UNIQUE (reserve_out_serial_id)'
+  );
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_reserve_uuid_and_execution_date_index '
+    'ON ' || table_name || ' '
+    '(reserve_uuid, execution_date);'
+  );
+  EXECUTE FORMAT (
+    'COMMENT ON INDEX ' || table_name || '_by_reserve_uuid_and_execution_date_index '
+    'IS ' || quote_literal('for do_gc, do_recoup_by_reserve, select_kyc_relevant_withdraw_events and a few others') || ';'
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_reserves_out()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT default 'reserves_out';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_denom'
+    ' FOREIGN KEY (denominations_serial)'
+    ' REFERENCES denominations (denominations_serial)'
+    ',ADD CONSTRAINT ' || table_name || '_foreign_reserve '
+    ' FOREIGN KEY (reserve_uuid)'
+    ' REFERENCES reserves (reserve_uuid) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+CREATE FUNCTION reserves_out_insert_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  INSERT INTO reserve_history
+    (reserve_pub
+    ,table_name
+    ,serial_id)
+  SELECT
+     res.reserve_pub
+    ,'reserves_out'
+    ,NEW.reserve_out_serial_id
+  FROM
+    reserves res
+  WHERE res.reserve_uuid = NEW.reserve_uuid;
+  RETURN NEW;
+END $$;
+COMMENT ON FUNCTION reserves_out_insert_trigger()
+  IS 'Replicate reserve_out inserts into reserve_history table.';
+
+
+CREATE FUNCTION master_table_reserves_out()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER reserves_out_on_insert
+  AFTER INSERT
+   ON reserves_out
+   FOR EACH ROW EXECUTE FUNCTION reserves_out_insert_trigger();
+END $$;
+COMMENT ON FUNCTION master_table_reserves_out()
+  IS 'Setup triggers to replicate reserve_out into reserve_history.';
+
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('reserves_out'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('reserves_out'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('reserves_out'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE),
+    ('reserves_out'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-revolving_work_shards.sql b/src/exchangedb/0002-revolving_work_shards.sql
new file mode 100644
index 000000000..8cfff09b4
--- /dev/null
+++ b/src/exchangedb/0002-revolving_work_shards.sql
@@ -0,0 +1,46 @@
+--
+-- 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 UNLOGGED TABLE revolving_work_shards
+  (shard_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,last_attempt INT8 NOT NULL
+  ,start_row INT4 NOT NULL
+  ,end_row INT4 NOT NULL
+  ,active BOOLEAN NOT NULL DEFAULT FALSE
+  ,job_name TEXT NOT NULL
+  ,PRIMARY KEY (job_name, start_row)
+  );
+COMMENT ON TABLE revolving_work_shards
+  IS 'coordinates work between multiple processes working on the same job with partitions that need to be repeatedly processed; unlogged because on system crashes the locks represented by this table will have to be cleared anyway, typically using "taler-exchange-dbinit -s"';
+COMMENT ON COLUMN revolving_work_shards.shard_serial_id
+  IS 'unique serial number identifying the shard';
+COMMENT ON COLUMN revolving_work_shards.last_attempt
+  IS 'last time a worker attempted to work on the shard';
+COMMENT ON COLUMN revolving_work_shards.active
+  IS 'set to TRUE when a worker is active on the shard';
+COMMENT ON COLUMN revolving_work_shards.start_row
+  IS 'row at which the shard scope starts, inclusive';
+COMMENT ON COLUMN revolving_work_shards.end_row
+  IS 'row at which the shard scope ends, exclusive';
+COMMENT ON COLUMN revolving_work_shards.job_name
+  IS 'unique name of the job the workers on this shard are performing';
+
+CREATE INDEX revolving_work_shards_by_job_name_active_last_attempt_index
+  ON revolving_work_shards
+  (job_name
+  ,active
+  ,last_attempt
+  );
diff --git a/src/exchangedb/0002-signkey_revocations.sql b/src/exchangedb/0002-signkey_revocations.sql
new file mode 100644
index 000000000..37ab32c67
--- /dev/null
+++ b/src/exchangedb/0002-signkey_revocations.sql
@@ -0,0 +1,23 @@
+--
+-- 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 signkey_revocations
+  (signkey_revocations_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,esk_serial INT8 PRIMARY KEY REFERENCES exchange_sign_keys (esk_serial) ON DELETE CASCADE
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  );
+COMMENT ON TABLE signkey_revocations
+  IS 'Table storing which online signing keys have been revoked';
diff --git a/src/exchangedb/0002-wad_in_entries.sql b/src/exchangedb/0002-wad_in_entries.sql
new file mode 100644
index 000000000..3ef1f1b8e
--- /dev/null
+++ b/src/exchangedb/0002-wad_in_entries.sql
@@ -0,0 +1,175 @@
+--
+-- 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 FUNCTION create_table_wad_in_entries(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_in_entries';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',wad_in_serial_id INT8'
+      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
+      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
+      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
+      ',purse_expiration INT8 NOT NULL'
+      ',merge_timestamp INT8 NOT NULL'
+      ',amount_with_fee taler_amount NOT NULL'
+      ',wad_fee taler_amount NOT NULL'
+      ',deposit_fees taler_amount NOT NULL'
+      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'list of purses aggregated in a wad according to the sending exchange'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'wad for which the given purse was included in the aggregation'
+    ,'wad_in_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'target account of the purse (must be at the local exchange)'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'public key of the purse that was merged'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'hash of the contract terms of the purse'
+    ,'h_contract'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the purse was set to expire'
+    ,'purse_expiration'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the merge was approved'
+    ,'merge_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total amount in the purse'
+    ,'amount_with_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total wad fees paid by the purse'
+    ,'wad_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total deposit fees paid when depositing coins into the purse'
+    ,'deposit_fees'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE'
+    ,'purse_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_wad_in_entries(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_in_entries';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wad_in_entry_serial_id_key'
+    ' UNIQUE (wad_in_entry_serial_id) '
+  );
+END $$;
+
+
+CREATE FUNCTION foreign_table_wad_in_entries()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_in_entries';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_wad_in'
+    ' FOREIGN KEY(wad_in_serial_id)'
+    ' REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE'
+  );
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wad_in_entries'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wad_in_entries'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('wad_in_entries'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-wad_out_entries.sql b/src/exchangedb/0002-wad_out_entries.sql
new file mode 100644
index 000000000..de921637b
--- /dev/null
+++ b/src/exchangedb/0002-wad_out_entries.sql
@@ -0,0 +1,179 @@
+--
+-- 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 FUNCTION create_table_wad_out_entries(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_out_entries';
+BEGIN
+  PERFORM create_partitioned_table(
+     'CREATE TABLE %I '
+     '(wad_out_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+     ',wad_out_serial_id INT8'
+     ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
+     ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
+     ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
+     ',purse_expiration INT8 NOT NULL'
+     ',merge_timestamp INT8 NOT NULL'
+     ',amount_with_fee taler_amount NOT NULL'
+     ',wad_fee taler_amount NOT NULL'
+     ',deposit_fees taler_amount NOT NULL'
+     ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
+     ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
+     ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (purse_pub)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+    'Purses combined into a wad'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Wad the purse was part of'
+    ,'wad_out_serial_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Target reserve for the purse'
+    ,'reserve_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Public key of the purse'
+    ,'purse_pub'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Hash of the contract associated with the purse'
+    ,'h_contract'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the purse expires'
+    ,'purse_expiration'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the merge was approved'
+    ,'merge_timestamp'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total amount in the purse'
+    ,'amount_with_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+    'Wad fee charged to the purse'
+    ,'wad_fee'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Total deposit fees charged to the purse'
+    ,'deposit_fees'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE'
+    ,'reserve_sig'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE'
+    ,'purse_sig'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_wad_out_entries(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_out_entries';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wad_out_entry_serial_id_key'
+    ' UNIQUE (wad_out_entry_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_wad_out_entries()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wad_out_entries';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_wad_out'
+    ' FOREIGN KEY(wad_out_serial_id)'
+    ' REFERENCES wads_out (wad_out_serial_id) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wad_out_entries'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wad_out_entries'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('wad_out_entries'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-wads_in.sql b/src/exchangedb/0002-wads_in.sql
new file mode 100644
index 000000000..479589ba4
--- /dev/null
+++ b/src/exchangedb/0002-wads_in.sql
@@ -0,0 +1,107 @@
+--
+-- 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 FUNCTION create_table_wads_in(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wads_in';
+BEGIN
+  PERFORM create_partitioned_table(
+     'CREATE TABLE %I '
+     '(wad_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+     ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
+     ',origin_exchange_url TEXT NOT NULL'
+     ',amount taler_amount NOT NULL'
+     ',arrival_time INT8 NOT NULL'
+     ',UNIQUE (wad_id, origin_exchange_url)'
+     ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (wad_id)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Incoming exchange-to-exchange wad wire transfers'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Unique identifier of the wad, part of the wire transfer subject'
+    ,'wad_id'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Base URL of the originating URL, also part of the wire transfer subject'
+    ,'origin_exchange_url'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Actual amount that was received by our exchange'
+    ,'amount'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the wad was received'
+    ,'arrival_time'
+    ,table_name
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_wads_in(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wads_in';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wad_in_serial_id_key'
+    ' UNIQUE (wad_in_serial_id) '
+    ',ADD CONSTRAINT ' || table_name || '_wad_is_origin_exchange_url_key'
+    ' UNIQUE (wad_id, origin_exchange_url) '
+  );
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wads_in'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wads_in'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-wads_out.sql b/src/exchangedb/0002-wads_out.sql
new file mode 100644
index 000000000..e52010e96
--- /dev/null
+++ b/src/exchangedb/0002-wads_out.sql
@@ -0,0 +1,128 @@
+--
+-- 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 FUNCTION create_table_wads_out(
+  IN shard_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wads_out';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I '
+      '(wad_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
+      ',partner_serial_id INT8 NOT NULL'
+      ',amount taler_amount NOT NULL'
+      ',execution_time INT8 NOT NULL'
+    ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (wad_id)'
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'Wire transfers made to another exchange to transfer purse funds'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Unique identifier of the wad, part of the wire transfer subject'
+    ,'wad_id'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'target exchange of the wad'
+    ,'partner_serial_id'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Amount that was wired'
+    ,'amount'
+    ,table_name
+    ,shard_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Time when the wire transfer was scheduled'
+    ,'execution_time'
+    ,table_name
+    ,shard_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_wads_out(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wads_out';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wad_out_serial_id_key'
+    ' UNIQUE (wad_out_serial_id) '
+  );
+END
+$$;
+
+
+CREATE FUNCTION foreign_table_wads_out()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wads_out';
+BEGIN
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_foreign_partner'
+    ' FOREIGN KEY(partner_serial_id)'
+    ' REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wads_out'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wads_out'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('wads_out'
+    ,'exchange-0002'
+    ,'foreign'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-wire_accounts.sql b/src/exchangedb/0002-wire_accounts.sql
new file mode 100644
index 000000000..dba522d7b
--- /dev/null
+++ b/src/exchangedb/0002-wire_accounts.sql
@@ -0,0 +1,45 @@
+--
+-- 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 wire_accounts
+  (payto_uri TEXT PRIMARY KEY
+  ,master_sig BYTEA CHECK (LENGTH(master_sig)=64)
+  ,is_active BOOLEAN NOT NULL
+  ,last_change INT8 NOT NULL
+  ,conversion_url TEXT DEFAULT (NULL)
+  ,debit_restrictions TEXT DEFAULT (NULL)
+  ,credit_restrictions TEXT DEFAULT (NULL)
+  );
+COMMENT ON TABLE wire_accounts
+  IS 'Table with current and historic bank accounts of the exchange. Entries never expire as we need to remember the last_change column indefinitely.';
+COMMENT ON COLUMN wire_accounts.payto_uri
+  IS 'payto URI (RFC 8905) with the bank account of the exchange.';
+COMMENT ON COLUMN wire_accounts.master_sig
+  IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS';
+COMMENT ON COLUMN wire_accounts.is_active
+  IS 'true if we are currently supporting the use of this account.';
+COMMENT ON COLUMN wire_accounts.last_change
+  IS 'Latest time when active status changed. Used to detect replays of old messages.';
+COMMENT ON COLUMN wire_accounts.conversion_url
+  IS 'URL of a currency conversion service if conversion is needed when this account is used; NULL if there is no conversion.';
+COMMENT ON COLUMN wire_accounts.debit_restrictions
+  IS 'JSON array describing restrictions imposed when debiting this account. Empty for no restrictions, NULL if account was migrated from previous database revision or account is disabled.';
+COMMENT ON COLUMN wire_accounts.credit_restrictions
+  IS 'JSON array describing restrictions imposed when crediting this account. Empty for no restrictions, NULL if account was migrated from previous database revision or account is disabled.';
+
+
+-- "wire_accounts" has no sequence because it is a 'mutable' table
+--            and is of no concern to the auditor
diff --git a/src/exchangedb/0002-wire_fee.sql b/src/exchangedb/0002-wire_fee.sql
new file mode 100644
index 000000000..12cb91b98
--- /dev/null
+++ b/src/exchangedb/0002-wire_fee.sql
@@ -0,0 +1,34 @@
+--
+-- 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 wire_fee
+  (wire_fee_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,wire_method TEXT NOT NULL
+  ,start_date INT8 NOT NULL
+  ,end_date INT8 NOT NULL
+  ,wire_fee taler_amount NOT NULL
+  ,closing_fee taler_amount NOT NULL
+  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
+  ,PRIMARY KEY (wire_method, start_date)
+  );
+COMMENT ON TABLE wire_fee
+  IS 'list of the wire fees of this exchange, by date';
+COMMENT ON COLUMN wire_fee.wire_fee_serial
+  IS 'needed for exchange-auditor replication logic';
+
+CREATE INDEX wire_fee_by_end_date_index
+  ON wire_fee
+  (end_date);
diff --git a/src/exchangedb/0002-wire_out.sql b/src/exchangedb/0002-wire_out.sql
new file mode 100644
index 000000000..c0f471b56
--- /dev/null
+++ b/src/exchangedb/0002-wire_out.sql
@@ -0,0 +1,130 @@
+--
+-- 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 FUNCTION create_table_wire_out(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wire_out';
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE IF NOT EXISTS %I'
+      '(wireout_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',execution_date INT8 NOT NULL'
+      ',wtid_raw BYTEA UNIQUE NOT NULL CHECK (LENGTH(wtid_raw)=32)'
+      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
+      ',exchange_account_section TEXT NOT NULL'
+      ',amount taler_amount NOT NULL'
+      ') %s ;'
+    ,table_name
+    ,'PARTITION BY HASH (wtid_raw)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'wire transfers the exchange has executed'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'identifies the configuration section with the debit account of this payment'
+    ,'exchange_account_section'
+    ,table_name
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Identifies the credited bank account and KYC status'
+    ,'wire_target_h_payto'
+    ,table_name
+    ,partition_suffix
+  );
+END
+$$;
+
+
+CREATE FUNCTION constrain_table_wire_out(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wire_out';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'CREATE INDEX ' || table_name || '_by_wire_target_h_payto_index '
+    'ON ' || table_name || ' '
+    '(wire_target_h_payto);'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wireout_uuid_pkey'
+    ' PRIMARY KEY (wireout_uuid)'
+  );
+END
+$$;
+
+
+CREATE FUNCTION wire_out_delete_trigger()
+  RETURNS trigger
+  LANGUAGE plpgsql
+  AS $$
+BEGIN
+  DELETE FROM exchange.aggregation_tracking
+   WHERE wtid_raw = OLD.wtid_raw;
+  RETURN OLD;
+END $$;
+COMMENT ON FUNCTION wire_out_delete_trigger()
+  IS 'Replicate reserve_out deletions into aggregation_tracking. This replaces an earlier use of an ON DELETE CASCADE that required a DEFERRABLE constraint and conflicted with nice partitioning.';
+
+
+CREATE FUNCTION master_table_wire_out()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  CREATE TRIGGER wire_out_on_delete
+    AFTER DELETE
+      ON wire_out
+     FOR EACH ROW EXECUTE FUNCTION wire_out_delete_trigger();
+END $$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wire_out'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wire_out'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE),
+    ('wire_out'
+    ,'exchange-0002'
+    ,'master'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-wire_targets.sql b/src/exchangedb/0002-wire_targets.sql
new file mode 100644
index 000000000..88d67d9a5
--- /dev/null
+++ b/src/exchangedb/0002-wire_targets.sql
@@ -0,0 +1,89 @@
+--
+-- 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 FUNCTION create_table_wire_targets(
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  PERFORM create_partitioned_table(
+    'CREATE TABLE %I'
+      '(wire_target_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY'
+      ',wire_target_h_payto BYTEA PRIMARY KEY CHECK (LENGTH(wire_target_h_payto)=32)'
+      ',payto_uri TEXT NOT NULL'
+    ') %s ;'
+    ,'wire_targets'
+    ,'PARTITION BY HASH (wire_target_h_payto)'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_table(
+     'All senders and recipients of money via the exchange'
+    ,'wire_targets'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Can be a regular bank account, or also be a URI identifying a reserve-account (for P2P payments)'
+    ,'payto_uri'
+    ,'wire_targets'
+    ,partition_suffix
+  );
+  PERFORM comment_partitioned_column(
+     'Unsalted hash of payto_uri'
+    ,'wire_target_h_payto'
+    ,'wire_targets'
+    ,partition_suffix
+  );
+END $$;
+
+
+CREATE FUNCTION constrain_table_wire_targets(
+  IN partition_suffix TEXT
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'wire_targets';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_wire_target_serial_id_key'
+    ' UNIQUE (wire_target_serial_id)'
+  );
+END
+$$;
+
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('wire_targets'
+    ,'exchange-0002'
+    ,'create'
+    ,TRUE
+    ,FALSE),
+    ('wire_targets'
+    ,'exchange-0002'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0002-work_shards.sql b/src/exchangedb/0002-work_shards.sql
new file mode 100644
index 000000000..6347d42c5
--- /dev/null
+++ b/src/exchangedb/0002-work_shards.sql
@@ -0,0 +1,56 @@
+--
+-- 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 work_shards
+  (shard_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
+  ,last_attempt INT8 NOT NULL
+  ,start_row INT8 NOT NULL
+  ,end_row INT8 NOT NULL
+  ,completed BOOLEAN NOT NULL DEFAULT FALSE
+  ,job_name TEXT NOT NULL
+  ,PRIMARY KEY (job_name, start_row)
+  );
+COMMENT ON TABLE work_shards
+  IS 'coordinates work between multiple processes working on the same job';
+COMMENT ON COLUMN work_shards.shard_serial_id
+  IS 'unique serial number identifying the shard';
+COMMENT ON COLUMN work_shards.last_attempt
+  IS 'last time a worker attempted to work on the shard';
+COMMENT ON COLUMN work_shards.completed
+  IS 'set to TRUE once the shard is finished by a worker';
+COMMENT ON COLUMN work_shards.start_row
+  IS 'row at which the shard scope starts, inclusive';
+COMMENT ON COLUMN work_shards.end_row
+  IS 'row at which the shard scope ends, exclusive';
+COMMENT ON COLUMN work_shards.job_name
+  IS 'unique name of the job the workers on this shard are performing';
+
+CREATE INDEX work_shards_by_job_name_completed_last_attempt_index
+  ON work_shards
+  (job_name
+  ,completed
+  ,last_attempt ASC
+  );
+
+CREATE INDEX work_shards_by_end_row_index
+  ON work_shards
+  (end_row DESC);
+
+CREATE INDEX work_shards_by_rows
+  ON work_shards
+  (job_name
+  ,start_row
+  ,end_row);
diff --git a/src/exchangedb/0003-purse_deletion.sql b/src/exchangedb/0003-purse_deletion.sql
new file mode 100644
index 000000000..66a95ff03
--- /dev/null
+++ b/src/exchangedb/0003-purse_deletion.sql
@@ -0,0 +1,52 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+
+-- Adds a 'unique' constraint to the 'purse_pub'.
+-- This is not only semantically correct, but also
+-- creates a dramatic speed-up on the
+-- pg_select_purse query (which otherwise fails to
+-- use indices correctly).
+
+CREATE FUNCTION constrain_table_purse_decision3(
+  IN partition_suffix TEXT
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'purse_decision';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD CONSTRAINT ' || table_name || '_purse_decision_purse_pub'
+    ' UNIQUE (purse_pub) '
+  );
+END
+$$;
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('purse_decision3'
+    ,'exchange-0003'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/0003-wire_accounts.sql b/src/exchangedb/0003-wire_accounts.sql
new file mode 100644
index 000000000..51fc86c80
--- /dev/null
+++ b/src/exchangedb/0003-wire_accounts.sql
@@ -0,0 +1,25 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+
+-- new columns for #8000
+ALTER TABLE wire_accounts
+  ADD COLUMN priority INT8 NOT NULL DEFAULT (0),
+  ADD COLUMN bank_label TEXT DEFAULT (NULL);
+
+COMMENT ON COLUMN wire_accounts.priority
+  IS 'priority determines the order in which wallets should display wire accounts';
+COMMENT ON COLUMN wire_accounts.bank_label
+  IS 'label to show in the selector for this bank account in the wallet UI';
diff --git a/src/exchangedb/0004-refunds.sql b/src/exchangedb/0004-refunds.sql
new file mode 100644
index 000000000..eb9e7ad6e
--- /dev/null
+++ b/src/exchangedb/0004-refunds.sql
@@ -0,0 +1,35 @@
+
+CREATE FUNCTION constrain_table_refunds4 (
+  IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  table_name TEXT DEFAULT 'refunds';
+BEGIN
+  table_name = concat_ws('_', table_name, partition_suffix);
+
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' DROP CONSTRAINT ' || table_name || '_pkey'
+  );
+  EXECUTE FORMAT (
+    'ALTER TABLE ' || table_name ||
+    ' ADD PRIMARY KEY (batch_deposit_serial_id, coin_pub, rtransaction_id) '
+  );
+END
+$$;
+
+INSERT INTO exchange_tables
+    (name
+    ,version
+    ,action
+    ,partitioned
+    ,by_range)
+  VALUES
+    ('refunds4'
+    ,'exchange-0004'
+    ,'constrain'
+    ,TRUE
+    ,FALSE);
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
index 0470887de..fd993f968 100644
--- a/src/exchangedb/Makefile.am
+++ b/src/exchangedb/Makefile.am
@@ -14,54 +14,71 @@ pkgcfg_DATA = \
 
 sqldir = $(prefix)/share/taler/sql/exchange/
 
+sqlinputs = \
+  exchange_do_*.sql \
+  procedures.sql.in \
+  0002-*.sql \
+  0003-*.sql \
+  0004-*.sql \
+  exchange-0002.sql.in \
+  exchange-0003.sql.in \
+  exchange-0004.sql.in
+
 sql_DATA = \
-  benchmark-0000.sql \
   benchmark-0001.sql \
-  exchange-0000.sql \
+  versioning.sql \
+  auditor-triggers-0001.sql \
   exchange-0001.sql \
-  shard-0000.sql \
-  shard-0001.sql \
-  shard-drop0001.sql \
-  drop0001.sql
+  exchange-0002.sql \
+  exchange-0003.sql \
+  exchange-0004.sql \
+  drop.sql \
+  procedures.sql
 
 BUILT_SOURCES = \
-  shard-0000.sql \
-  shard-0001.sql \
+  benchmark-0001.sql \
+  drop.sql \
   exchange-0001.sql \
-  drop0001.sql \
-  shard-drop0001.sql
+  procedures.sql
 
 CLEANFILES = \
-  shard-0000.sql \
-  shard-0001.sql \
-  exchange-0001.sql \
-  drop0001.sql \
-  shard-drop0001.sql
+  exchange-0002.sql \
+  exchange-0003.sql \
+  procedures.sql
 
-exchange-0001.sql: common-0001.sql exchange-0001-part.sql
-	cat common-0001.sql exchange-0001-part.sql >$@
+procedures.sql: procedures.sql.in exchange_do_*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < procedures.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
 
-shard-0001.sql: common-0001.sql shard-0001-part.sql
-	cat common-0001.sql shard-0001-part.sql >$@
+exchange-0002.sql: exchange-0002.sql.in 0002-*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < exchange-0002.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
 
-shard-0000.sql: exchange-0000.sql
-	cp exchange-0000.sql $@
+exchange-0003.sql: exchange-0003.sql.in 0003-*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < exchange-0003.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
 
-drop0001.sql: drop-common.sql drop0001-exchange-part.sql
-	cat drop-common.sql drop0001-exchange-part.sql >$@
+exchange-0004.sql: exchange-0004.sql.in 0004-*.sql
+	chmod +w $@ 2> /dev/null || true
+	gcc -E -P -undef - < exchange-0004.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@
+	chmod ugo-w $@
 
-shard-drop0001.sql: drop-common.sql drop0001-shard-part.sql
-	cat drop-common.sql drop0001-shard-part.sql >$@
+check_SCRIPTS = \
+  test_idempotency.sh
 
 EXTRA_DIST = \
   exchangedb.conf \
   exchangedb-postgres.conf \
-  plugin_exchangedb_common.c \
-  irbt_callbacks.c \
-  lrbt_callbacks.c \
   bench-db-postgres.conf \
   test-exchange-db-postgres.conf \
-  $(sql_DATA)
+  $(sqlinputs) \
+  $(sql_DATA) \
+  $(check_SCRIPTS) \
+  pg_template.h pg_template.c \
+  pg_template.sh
 
 plugindir = $(libdir)/taler
 
@@ -71,19 +88,203 @@ plugin_LTLIBRARIES = \
 endif
 
 libtaler_plugin_exchangedb_postgres_la_SOURCES = \
-  plugin_exchangedb_postgres.c
-libtaler_plugin_exchangedb_postgres_la_LIBADD = \
-  $(LTLIBINTL)
+  plugin_exchangedb_common.c plugin_exchangedb_common.h \
+  pg_setup_wire_target.h pg_setup_wire_target.c \
+  pg_compute_shard.h pg_compute_shard.c \
+  plugin_exchangedb_postgres.c pg_helper.h \
+  pg_reserves_update.h pg_reserves_update.c \
+  pg_select_aggregation_amounts_for_kyc_check.h pg_select_aggregation_amounts_for_kyc_check.c \
+  pg_lookup_wire_fee_by_time.h pg_lookup_wire_fee_by_time.c \
+  pg_select_satisfied_kyc_processes.h pg_select_satisfied_kyc_processes.c \
+  pg_get_pending_kyc_requirement_process.h pg_get_pending_kyc_requirement_process.c \
+  pg_kyc_provider_account_lookup.h pg_kyc_provider_account_lookup.c \
+  pg_lookup_kyc_requirement_by_row.h pg_lookup_kyc_requirement_by_row.c \
+  pg_insert_kyc_requirement_for_account.h pg_insert_kyc_requirement_for_account.c \
+  pg_lookup_kyc_process_by_account.h pg_lookup_kyc_process_by_account.c \
+  pg_update_kyc_process_by_row.h pg_update_kyc_process_by_row.c \
+  pg_insert_kyc_requirement_process.h pg_insert_kyc_requirement_process.c \
+  pg_select_withdraw_amounts_for_kyc_check.h pg_select_withdraw_amounts_for_kyc_check.c \
+  pg_select_merge_amounts_for_kyc_check.h pg_select_merge_amounts_for_kyc_check.c \
+  pg_profit_drains_set_finished.h pg_profit_drains_set_finished.c \
+  pg_profit_drains_get_pending.h pg_profit_drains_get_pending.c \
+  pg_get_drain_profit.h pg_get_drain_profit.c \
+  pg_get_purse_deposit.h pg_get_purse_deposit.c \
+  pg_insert_contract.h pg_insert_contract.c \
+  pg_select_aml_threshold.h pg_select_aml_threshold.c \
+  pg_select_contract.h pg_select_contract.c \
+  pg_select_purse_merge.h pg_select_purse_merge.c \
+  pg_select_contract_by_purse.h pg_select_contract_by_purse.c \
+  pg_insert_drain_profit.h pg_insert_drain_profit.c \
+  pg_insert_kyc_failure.h pg_insert_kyc_failure.c \
+  pg_inject_auditor_triggers.h pg_inject_auditor_triggers.c \
+  pg_create_tables.h pg_create_tables.c \
+  pg_event_listen.h pg_event_listen.c \
+  pg_event_listen_cancel.h pg_event_listen_cancel.c \
+  pg_event_notify.h pg_event_notify.c \
+  pg_get_denomination_info.h pg_get_denomination_info.c \
+  pg_iterate_denomination_info.h pg_iterate_denomination_info.c \
+  pg_iterate_denominations.h pg_iterate_denominations.c \
+  pg_iterate_active_auditors.h pg_iterate_active_auditors.c \
+  pg_iterate_auditor_denominations.h pg_iterate_auditor_denominations.c \
+  pg_reserves_get.h pg_reserves_get.c \
+  pg_reserves_get_origin.h pg_reserves_get_origin.c \
+  pg_drain_kyc_alert.h pg_drain_kyc_alert.c \
+  pg_reserves_in_insert.h pg_reserves_in_insert.c \
+  pg_get_withdraw_info.h pg_get_withdraw_info.c \
+  pg_do_age_withdraw.h pg_do_age_withdraw.c \
+  pg_get_age_withdraw.h pg_get_age_withdraw.c \
+  pg_batch_ensure_coin_known.h pg_batch_ensure_coin_known.c \
+  pg_do_batch_withdraw.h pg_do_batch_withdraw.c \
+  pg_get_policy_details.h pg_get_policy_details.c \
+  pg_persist_policy_details.h pg_persist_policy_details.c \
+  pg_do_deposit.h pg_do_deposit.c \
+  pg_get_wire_hash_for_contract.h pg_get_wire_hash_for_contract.c \
+  pg_add_policy_fulfillment_proof.h pg_add_policy_fulfillment_proof.c \
+  pg_do_melt.h pg_do_melt.c \
+  pg_do_refund.h pg_do_refund.c \
+  pg_do_recoup.h pg_do_recoup.c \
+  pg_do_recoup_refresh.h pg_do_recoup_refresh.c \
+  pg_get_reserve_balance.h pg_get_reserve_balance.c \
+  pg_count_known_coins.h pg_count_known_coins.c \
+  pg_ensure_coin_known.h pg_ensure_coin_known.c \
+  pg_get_known_coin.h pg_get_known_coin.c \
+  pg_get_signature_for_known_coin.h pg_get_signature_for_known_coin.c \
+  pg_get_coin_denomination.h pg_get_coin_denomination.c \
+  pg_have_deposit2.h pg_have_deposit2.c \
+  pg_aggregate.h pg_aggregate.c \
+  pg_create_aggregation_transient.h pg_create_aggregation_transient.c \
+  pg_insert_kyc_attributes.h pg_insert_kyc_attributes.c \
+  pg_select_similar_kyc_attributes.h pg_select_similar_kyc_attributes.c \
+  pg_select_kyc_attributes.h pg_select_kyc_attributes.c \
+  pg_insert_aml_officer.h pg_insert_aml_officer.c \
+  pg_test_aml_officer.h pg_test_aml_officer.c \
+  pg_lookup_aml_officer.h pg_lookup_aml_officer.c \
+  pg_trigger_aml_process.h pg_trigger_aml_process.c \
+  pg_select_aml_process.h pg_select_aml_process.c \
+  pg_select_aml_history.h pg_select_aml_history.c \
+  pg_insert_aml_decision.h pg_insert_aml_decision.c \
+  pg_select_aggregation_transient.h pg_select_aggregation_transient.c \
+  pg_find_aggregation_transient.h pg_find_aggregation_transient.c \
+  pg_update_aggregation_transient.h pg_update_aggregation_transient.c \
+  pg_get_ready_deposit.h pg_get_ready_deposit.c \
+  pg_insert_refund.h pg_insert_refund.c \
+  pg_select_refunds_by_coin.h pg_select_refunds_by_coin.c \
+  pg_get_melt.h pg_get_melt.c \
+  pg_insert_refresh_reveal.h pg_insert_refresh_reveal.c \
+  pg_get_refresh_reveal.h pg_get_refresh_reveal.c \
+  pg_lookup_wire_transfer.h pg_lookup_wire_transfer.c \
+  pg_lookup_transfer_by_deposit.h pg_lookup_transfer_by_deposit.c \
+  pg_insert_wire_fee.h pg_insert_wire_fee.c \
+  pg_insert_global_fee.h pg_insert_global_fee.c \
+  pg_get_wire_fee.h pg_get_wire_fee.c \
+  pg_get_global_fee.h pg_get_global_fee.c \
+  pg_get_global_fees.h pg_get_global_fees.c \
+  pg_insert_reserve_closed.h pg_insert_reserve_closed.c \
+  pg_wire_prepare_data_insert.h pg_wire_prepare_data_insert.c \
+  pg_wire_prepare_data_mark_finished.h pg_wire_prepare_data_mark_finished.c \
+  pg_wire_prepare_data_mark_failed.h pg_wire_prepare_data_mark_failed.c \
+  pg_wire_prepare_data_get.h pg_wire_prepare_data_get.c \
+  pg_start_deferred_wire_out.h pg_start_deferred_wire_out.c \
+  pg_store_wire_transfer_out.h pg_store_wire_transfer_out.c \
+  pg_gc.h pg_gc.c \
+  pg_select_coin_deposits_above_serial_id.h pg_select_coin_deposits_above_serial_id.c \
+  pg_select_purse_decisions_above_serial_id.h pg_select_purse_decisions_above_serial_id.c \
+  pg_select_purse_deposits_by_purse.h pg_select_purse_deposits_by_purse.c \
+  pg_select_refreshes_above_serial_id.h pg_select_refreshes_above_serial_id.c \
+  pg_select_refunds_above_serial_id.h pg_select_refunds_above_serial_id.c \
+  pg_select_reserves_in_above_serial_id.h pg_select_reserves_in_above_serial_id.c \
+  pg_select_reserves_in_above_serial_id_by_account.h pg_select_reserves_in_above_serial_id_by_account.c \
+  pg_select_withdrawals_above_serial_id.h pg_select_withdrawals_above_serial_id.c \
+  pg_select_wire_out_above_serial_id.h pg_select_wire_out_above_serial_id.c \
+  pg_select_wire_out_above_serial_id_by_account.h pg_select_wire_out_above_serial_id_by_account.c \
+  pg_select_recoup_above_serial_id.h pg_select_recoup_above_serial_id.c \
+  pg_select_recoup_refresh_above_serial_id.h pg_select_recoup_refresh_above_serial_id.c \
+  pg_get_reserve_by_h_blind.h pg_get_reserve_by_h_blind.c \
+  pg_get_old_coin_by_h_blind.h pg_get_old_coin_by_h_blind.c \
+  pg_insert_denomination_revocation.h pg_insert_denomination_revocation.c \
+  pg_get_denomination_revocation.h pg_get_denomination_revocation.c \
+  pg_select_batch_deposits_missing_wire.h pg_select_batch_deposits_missing_wire.c \
+  pg_select_justification_for_missing_wire.h pg_select_justification_for_missing_wire.c \
+  pg_select_aggregations_above_serial.h pg_select_aggregations_above_serial.c \
+  pg_lookup_auditor_timestamp.h pg_lookup_auditor_timestamp.c \
+  pg_lookup_auditor_status.h pg_lookup_auditor_status.c \
+  pg_insert_auditor.h pg_insert_auditor.c \
+  pg_lookup_wire_timestamp.h pg_lookup_wire_timestamp.c \
+  pg_insert_wire.h pg_insert_wire.c \
+  pg_update_wire.h pg_update_wire.c \
+  pg_get_wire_accounts.h pg_get_wire_accounts.c \
+  pg_get_wire_fees.h pg_get_wire_fees.c \
+  pg_insert_signkey_revocation.h pg_insert_signkey_revocation.c \
+  pg_lookup_signkey_revocation.h pg_lookup_signkey_revocation.c \
+  pg_lookup_denomination_key.h pg_lookup_denomination_key.c \
+  pg_insert_auditor_denom_sig.h pg_insert_auditor_denom_sig.c \
+  pg_select_auditor_denom_sig.h pg_select_auditor_denom_sig.c \
+  pg_add_denomination_key.h pg_add_denomination_key.c \
+  pg_lookup_signing_key.h pg_lookup_signing_key.c \
+  pg_begin_shard.h pg_begin_shard.c \
+  pg_abort_shard.h pg_abort_shard.c \
+  pg_complete_shard.h pg_complete_shard.c \
+  pg_release_revolving_shard.h pg_release_revolving_shard.c \
+  pg_delete_shard_locks.h pg_delete_shard_locks.c \
+  pg_set_extension_manifest.h pg_set_extension_manifest.c \
+  pg_insert_partner.h pg_insert_partner.c \
+  pg_expire_purse.h pg_expire_purse.c \
+  pg_select_purse_by_merge_pub.h pg_select_purse_by_merge_pub.c \
+  pg_set_purse_balance.h pg_set_purse_balance.c \
+  pg_do_reserve_purse.h pg_do_reserve_purse.c \
+  pg_lookup_global_fee_by_time.h pg_lookup_global_fee_by_time.c \
+  pg_do_purse_deposit.h pg_do_purse_deposit.c \
+  pg_activate_signing_key.h pg_activate_signing_key.c \
+  pg_update_auditor.h pg_update_auditor.c \
+  pg_begin_revolving_shard.h pg_begin_revolving_shard.c \
+  pg_get_extension_manifest.h pg_get_extension_manifest.c \
+  pg_do_purse_merge.h pg_do_purse_merge.c \
+  pg_start_read_committed.h pg_start_read_committed.c \
+  pg_start_read_only.h pg_start_read_only.c \
+  pg_insert_denomination_info.h pg_insert_denomination_info.c \
+  pg_do_batch_withdraw_insert.h pg_do_batch_withdraw_insert.c \
+  pg_do_reserve_open.c pg_do_reserve_open.h \
+  pg_do_purse_delete.c pg_do_purse_delete.h \
+  pg_preflight.h pg_preflight.c \
+  pg_iterate_active_signkeys.h pg_iterate_active_signkeys.c \
+  pg_commit.h pg_commit.c \
+  pg_get_coin_transactions.c pg_get_coin_transactions.h \
+  pg_get_expired_reserves.c pg_get_expired_reserves.h \
+  pg_start.h pg_start.c \
+  pg_rollback.h pg_rollback.c \
+  pg_get_purse_request.c pg_get_purse_request.h \
+  pg_get_reserve_history.c pg_get_reserve_history.h \
+  pg_get_unfinished_close_requests.c pg_get_unfinished_close_requests.h \
+  pg_insert_close_request.c pg_insert_close_request.h \
+  pg_delete_aggregation_transient.h pg_delete_aggregation_transient.c \
+  pg_get_link_data.h pg_get_link_data.c \
+  pg_drop_tables.h pg_drop_tables.c \
+  pg_insert_purse_request.h pg_insert_purse_request.c \
+  pg_insert_records_by_table.c pg_insert_records_by_table.h \
+  pg_insert_reserve_open_deposit.c pg_insert_reserve_open_deposit.h \
+  pg_iterate_kyc_reference.c pg_iterate_kyc_reference.h \
+  pg_iterate_reserve_close_info.c pg_iterate_reserve_close_info.h \
+  pg_lookup_records_by_table.c pg_lookup_records_by_table.h \
+  pg_lookup_serial_by_table.c pg_lookup_serial_by_table.h \
+  pg_select_reserve_close_info.c pg_select_reserve_close_info.h \
+  pg_select_reserve_closed_above_serial_id.c pg_select_reserve_closed_above_serial_id.h \
+  pg_select_purse.h pg_select_purse.c \
+  pg_select_purse_requests_above_serial_id.h pg_select_purse_requests_above_serial_id.c \
+  pg_select_purse_merges_above_serial_id.h pg_select_purse_merges_above_serial_id.c \
+  pg_select_purse_deposits_above_serial_id.h pg_select_purse_deposits_above_serial_id.c \
+  pg_select_account_merges_above_serial_id.h pg_select_account_merges_above_serial_id.c \
+  pg_select_all_purse_decisions_above_serial_id.h pg_select_all_purse_decisions_above_serial_id.c \
+  pg_select_reserve_open_above_serial_id.c pg_select_reserve_open_above_serial_id.h
 libtaler_plugin_exchangedb_postgres_la_LDFLAGS = \
-  $(TALER_PLUGIN_LDFLAGS) \
+  $(TALER_PLUGIN_LDFLAGS)
+libtaler_plugin_exchangedb_postgres_la_LIBADD = \
+  $(LTLIBINTL) \
   $(top_builddir)/src/pq/libtalerpq.la \
-  $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lpq \
-  -lpthread \
   -lgnunetpq \
   -lgnunetutil \
   -ljansson \
+  -lpq \
   $(XLIB)
 
 lib_LTLIBRARIES = \
@@ -105,12 +306,19 @@ libtalerexchangedb_la_LDFLAGS = \
 
 
 check_PROGRAMS = \
-  test-exchangedb-postgres \
-  bench-db-postgres
+  test-exchangedb-postgres
+
+noinst_PROGRAMS = \
+  bench-db-postgres\
+  perf_get_link_data-postgres\
+  perf_select_refunds_by_coin-postgres\
+  perf_reserves_in_insert-postgres \
+  perf_deposits_get_ready-postgres
 
 AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
-  test-exchangedb-postgres
+  $(check_SCRIPTS) \
+  $(check_PROGRAMS)
 
 test_exchangedb_postgres_SOURCES = \
   test_exchangedb.c
@@ -134,5 +342,58 @@ bench_db_postgres_LDADD = \
   -lgnunetutil \
   $(XLIB)
 
+perf_reserves_in_insert_postgres_SOURCES = \
+  perf_reserves_in_insert.c
+perf_reserves_in_insert_postgres_LDADD = \
+  libtalerexchangedb.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/pq/libtalerpq.la \
+  -ljansson \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lm \
+  $(XLIB)
+
+perf_select_refunds_by_coin_postgres_SOURCES = \
+  perf_select_refunds_by_coin.c
+perf_select_refunds_by_coin_postgres_LDADD = \
+  libtalerexchangedb.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/pq/libtalerpq.la \
+  -ljansson \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lm \
+  $(XLIB)
+
+perf_get_link_data_postgres_SOURCES = \
+  perf_get_link_data.c
+perf_get_link_data_postgres_LDADD = \
+  libtalerexchangedb.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/pq/libtalerpq.la \
+  -ljansson \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lm \
+  $(XLIB)
+
+perf_deposits_get_ready_postgres_SOURCES = \
+  perf_deposits_get_ready.c
+perf_deposits_get_ready_postgres_LDADD = \
+  libtalerexchangedb.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/pq/libtalerpq.la \
+  -ljansson \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lm \
+  $(XLIB)
+
+
 EXTRA_test_exchangedb_postgres_DEPENDENCIES = \
   libtaler_plugin_exchangedb_postgres.la
diff --git a/src/exchangedb/auditor-triggers-0001.sql b/src/exchangedb/auditor-triggers-0001.sql
new file mode 100644
index 000000000..4e2ea66ce
--- /dev/null
+++ b/src/exchangedb/auditor-triggers-0001.sql
@@ -0,0 +1,41 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+
+-- Everything in one big transaction
+BEGIN;
+
+SELECT _v.register_patch('auditor-triggers-0001');
+
+SET search_path TO exchange;
+
+CREATE OR REPLACE FUNCTION auditor_new_deposits_trigger()
+    RETURNS trigger
+    LANGUAGE plpgsql
+AS $$
+BEGIN
+    NOTIFY XFIXME;
+    RETURN NEW;
+END $$;
+COMMENT ON FUNCTION auditor_new_deposits_trigger()
+    IS 'Call XXX on new entry';
+
+CREATE TRIGGER auditor_notify_helper_insert_deposits
+    AFTER INSERT
+    ON exchange.batch_deposits
+EXECUTE PROCEDURE auditor_new_deposits_trigger();
+
+
+COMMIT;
diff --git a/src/exchangedb/bench-db-postgres.conf b/src/exchangedb/bench-db-postgres.conf
index 837ae41e2..d51cf9175 100644
--- a/src/exchangedb/bench-db-postgres.conf
+++ b/src/exchangedb/bench-db-postgres.conf
@@ -8,3 +8,7 @@ CONFIG = postgres:///talercheck
 # Where are the SQL files to setup our tables?
 # Important: this MUST end with a "/"!
 SQL_DIR = $DATADIR/sql/exchange/
+
+[exchangedb]
+# Number of purses per account by default.
+DEFAULT_PURSE_LIMIT = 1
\ No newline at end of file
diff --git a/src/exchangedb/bench_db.c b/src/exchangedb/bench_db.c
index a8dbfbfa5..302d23062 100644
--- a/src/exchangedb/bench_db.c
+++ b/src/exchangedb/bench_db.c
@@ -51,32 +51,28 @@ prepare (struct GNUNET_PQ_Context *conn)
       "(hc"
       ",expiration_date"
       ") VALUES "
-      "($1, $2);",
-      2),
+      "($1, $2);"),
     /* Used in #postgres_iterate_denomination_info() */
     GNUNET_PQ_make_prepare (
       "bm_select",
       "SELECT"
       " expiration_date"
       " FROM benchmap"
-      " WHERE hc=$1;",
-      1),
+      " WHERE hc=$1;"),
     GNUNET_PQ_make_prepare (
       "bhm_insert",
       "INSERT INTO benchhmap "
       "(hc"
       ",expiration_date"
       ") VALUES "
-      "($1, $2);",
-      2),
+      "($1, $2);"),
     /* Used in #postgres_iterate_denomination_info() */
     GNUNET_PQ_make_prepare (
       "bhm_select",
       "SELECT"
       " expiration_date"
       " FROM benchhmap"
-      " WHERE hc=$1;",
-      1),
+      " WHERE hc=$1;"),
     GNUNET_PQ_make_prepare (
       "bem_insert",
       "INSERT INTO benchemap "
@@ -84,16 +80,14 @@ prepare (struct GNUNET_PQ_Context *conn)
       ",ihc"
       ",expiration_date"
       ") VALUES "
-      "($1, $2, $3);",
-      3),
+      "($1, $2, $3);"),
     /* Used in #postgres_iterate_denomination_info() */
     GNUNET_PQ_make_prepare (
       "bem_select",
       "SELECT"
       " expiration_date"
       " FROM benchemap"
-      " WHERE ihc=$1 AND hc=$2;",
-      2),
+      " WHERE ihc=$1 AND hc=$2;"),
     GNUNET_PQ_PREPARED_STATEMENT_END
   };
   enum GNUNET_GenericReturnValue ret;
@@ -175,9 +169,9 @@ bem_insert (struct GNUNET_PQ_Context *conn,
   GNUNET_CRYPTO_hash (&b,
                       sizeof (b),
                       &hc);
-  memcpy (&ihc,
-          &hc,
-          sizeof (ihc));
+  GNUNET_memcpy (&ihc,
+                 &hc,
+                 sizeof (ihc));
   {
     struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_auto_from_type (&hc),
@@ -271,9 +265,9 @@ bem_select (struct GNUNET_PQ_Context *conn,
   GNUNET_CRYPTO_hash (&b,
                       sizeof (b),
                       &hc);
-  memcpy (&ihc,
-          &hc,
-          sizeof (ihc));
+  GNUNET_memcpy (&ihc,
+                 &hc,
+                 sizeof (ihc));
   {
     struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_uint32 (&ihc),
diff --git a/src/exchangedb/common-0001.sql b/src/exchangedb/common-0001.sql
deleted file mode 100644
index cb64f446e..000000000
--- a/src/exchangedb/common-0001.sql
+++ /dev/null
@@ -1,2676 +0,0 @@
---
--- 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
--------------------- Tables ----------------------------
-
-CREATE OR REPLACE FUNCTION create_partitioned_table(
-   IN table_definition VARCHAR
-  ,IN table_name VARCHAR
-  ,IN main_table_partition_str VARCHAR -- Used only when it is the main table - we do not partition shard tables
-  ,IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  IF shard_suffix IS NOT NULL THEN
-    table_name=table_name || '_' || shard_suffix;
-    main_table_partition_str = '';
-  END IF;
-
-  EXECUTE FORMAT(
-    table_definition,
-    table_name,
-    main_table_partition_str
-  );
-
-END
-$$;
-
------------------------ wire_targets ---------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wire_targets(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wire_target_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',wire_target_h_payto BYTEA PRIMARY KEY CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',payto_uri VARCHAR NOT NULL'
-      ',kyc_ok BOOLEAN NOT NULL DEFAULT (FALSE)'
-      ',external_id VARCHAR'
-    ') %s ;'
-    ,'wire_targets'
-    ,'PARTITION BY HASH (wire_target_h_payto)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
--- We need a seperate function for this, as we call create_table only once but need to add
--- those constraints to each partition which gets created
-CREATE OR REPLACE FUNCTION add_constraints_to_wire_targets_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_targets_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_targets_' || partition_suffix || '_wire_target_serial_id_key '
-        'UNIQUE (wire_target_serial_id)'
-  );
-END
-$$;
-
------------------------- reserves -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_reserves(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY'
-      ',reserve_pub BYTEA PRIMARY KEY CHECK(LENGTH(reserve_pub)=32)'
-      ',current_balance_val INT8 NOT NULL'
-      ',current_balance_frac INT4 NOT NULL'
-      ',purses_active INT8 NOT NULL DEFAULT(0)'
-      ',purses_allowed INT8 NOT NULL DEFAULT(0)'
-      ',kyc_required BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',kyc_passed BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',max_age INT4 NOT NULL DEFAULT(120)'
-      ',expiration_date INT8 NOT NULL'
-      ',gc_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_expiration_index '
-    'ON ' || table_name || ' '
-    '(expiration_date'
-    ',current_balance_val'
-    ',current_balance_frac'
-    ');'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_expiration_index '
-    'IS ' || quote_literal('used in get_expired_reserves') || ';'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_gc_date_index '
-    'ON ' || table_name || ' '
-    '(gc_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_gc_date_index '
-    'IS ' || quote_literal('for reserve garbage collection') || ';'
-  );
-
-END
-$$;
-
------------------------ reserves_in ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_reserves_in(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',reserve_pub BYTEA PRIMARY KEY' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',wire_reference INT8 NOT NULL'
-      ',credit_val INT8 NOT NULL'
-      ',credit_frac INT4 NOT NULL'
-      ',wire_source_h_payto BYTEA CHECK (LENGTH(wire_source_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',execution_date INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_in_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_in_serial_id);'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_section_execution_date_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section '
-    ',execution_date'
-    ');'
-  );
-  -- FIXME: where do we need this index? Can we do better?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_exch_accnt_reserve_in_serial_id_idx '
-    'ON ' || table_name || ' '
-    '(exchange_account_section,'
-    'reserve_in_serial_id DESC'
-    ');'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_reserves_in_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_in_' || partition_suffix || '_reserve_in_serial_id_key '
-        'UNIQUE (reserve_in_serial_id)'
-  );
-END
-$$;
-
---------------------------- reserves_close -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_reserves_close(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_close';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(close_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE / PRIMARY KEY'
-      ',reserve_pub BYTEA NOT NULL' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE'
-      ',execution_date INT8 NOT NULL'
-      ',wtid BYTEA NOT NULL CHECK (LENGTH(wtid)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',closing_fee_val INT8 NOT NULL'
-      ',closing_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_close_uuid_index '
-    'ON ' || table_name || ' '
-    '(close_uuid);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub_index '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_reserves_close_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_close_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_close_' || partition_suffix || '_close_uuid_pkey '
-        'PRIMARY KEY (close_uuid)'
-  );
-END
-$$;
-
----------------------------- reserves_out -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_reserves_out(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR default 'reserves_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(reserve_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64) UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial)'
-      ',denom_sig BYTEA NOT NULL'
-      ',reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',execution_date INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-    ') %s ;'
-    ,'reserves_out'
-    ,'PARTITION BY HASH (h_blind_ev)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_out_serial_id_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-  -- FIXME: change query to use reserves_out_by_reserve instead and materialize execution_date there as well???
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid, execution_date);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_reserve_uuid_and_execution_date_index '
-    'IS ' || quote_literal('for get_reserves_out and exchange_do_withdraw_limit_check') || ';'
-  );
-
-END
-$$;
-
-
-CREATE OR REPLACE FUNCTION add_constraints_to_reserves_out_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE reserves_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT reserves_out_' || partition_suffix || '_reserve_out_serial_id_key '
-        'UNIQUE (reserve_out_serial_id)'
-  );
-END
-$$;
-
-CREATE OR REPLACE FUNCTION create_table_reserves_out_by_reserve(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'reserves_out_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_uuid INT8 NOT NULL' -- REFERENCES reserves (reserve_uuid) ON DELETE CASCADE
-    ',h_blind_ev BYTEA CHECK (LENGTH(h_blind_ev)=64)'
-    ') %s '
-    ,table_name
-    ,'PARTITION BY HASH (reserve_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_uuid);'
-  );
-
-END
-$$;
-
----------------------------- known_coins -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_known_coins(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR default 'known_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(known_coin_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_pub BYTEA NOT NULL PRIMARY KEY CHECK (LENGTH(coin_pub)=32)'
-      ',age_commitment_hash BYTEA CHECK (LENGTH(age_commitment_hash)=32)'
-      ',denom_sig BYTEA NOT NULL'
-      ',remaining_val INT8 NOT NULL'
-      ',remaining_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)' -- FIXME: or include denominations_serial? or multi-level partitioning?;
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_known_coins_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE known_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT known_coins_' || partition_suffix || '_known_coin_id_key '
-        'UNIQUE (known_coin_id)'
-  );
-END
-$$;
-
----------------------------- refresh_commitments -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_refresh_commitments(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_commitments';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(melt_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',rc BYTEA PRIMARY KEY CHECK (LENGTH(rc)=64)'
-      ',old_coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',old_coin_sig BYTEA NOT NULL CHECK(LENGTH(old_coin_sig)=64)'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',noreveal_index INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (rc)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- Note: index spans partitions, may need to be materialized.
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_old_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(old_coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_refresh_commitments_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_commitments_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_commitments_' || partition_suffix || '_melt_serial_id_key '
-        'UNIQUE (melt_serial_id)'
-  );
-END
-$$;
-
------------------------------- refresh_revealed_coins --------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_refresh_revealed_coins(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_revealed_coins';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rrc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 NOT NULL' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',freshcoin_index INT4 NOT NULL'
-      ',link_sig BYTEA NOT NULL CHECK(LENGTH(link_sig)=64)'
-      ',denominations_serial INT8 NOT NULL' -- REFERENCES denominations (denominations_serial) ON DELETE CASCADE'
-      ',coin_ev BYTEA NOT NULL' -- UNIQUE'
-      ',h_coin_ev BYTEA NOT NULL CHECK(LENGTH(h_coin_ev)=64)' -- UNIQUE'
-      ',ev_sig BYTEA NOT NULL'
-      ',ewv BYTEA NOT NULL'
-      --  ,PRIMARY KEY (melt_serial_id, freshcoin_index) -- done per shard
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_coins_by_melt_serial_id_index '
-    'ON ' || table_name || ' '
-    '(melt_serial_id);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_refresh_revealed_coins_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_revealed_coins_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_rrc_serial_key '
-        'UNIQUE (rrc_serial) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_coin_ev_key '
-        'UNIQUE (coin_ev) '
-      ',ADD CONSTRAINT refresh_revealed_coins_' || partition_suffix || '_h_coin_ev_key '
-        'UNIQUE (h_coin_ev) '
-      ',ADD PRIMARY KEY (melt_serial_id, freshcoin_index) '
-  );
-END
-$$;
-
------------------------------ refresh_transfer_keys ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_refresh_transfer_keys(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refresh_transfer_keys';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(rtc_serial BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',melt_serial_id INT8 PRIMARY KEY' -- REFERENCES refresh_commitments (melt_serial_id) ON DELETE CASCADE'
-      ',transfer_pub BYTEA NOT NULL CHECK(LENGTH(transfer_pub)=32)'
-      ',transfer_privs BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (melt_serial_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_refresh_transfer_keys_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refresh_transfer_keys_' || partition_suffix || ' '
-      'ADD CONSTRAINT refresh_transfer_keys_' || partition_suffix || '_rtc_serial_key '
-        'UNIQUE (rtc_serial)'
-  );
-END
-$$;
-
----------------------------- deposits -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_deposits(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',shard INT8 NOT NULL'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',known_coin_id INT8 NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE' --- FIXME: column needed???
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wallet_timestamp INT8 NOT NULL'
-      ',exchange_timestamp INT8 NOT NULL'
-      ',refund_deadline INT8 NOT NULL'
-      ',wire_deadline INT8 NOT NULL'
-      ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)'
-      ',wire_salt BYTEA NOT NULL CHECK (LENGTH(wire_salt)=16)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',done BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_blocked BOOLEAN NOT NULL DEFAULT FALSE'
-      ',extension_details_serial_id INT8' -- REFERENCES extension_details (extension_details_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_deposits_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT deposits_' || partition_suffix || '_deposit_serial_id_pkey '
-        'PRIMARY KEY (deposit_serial_id) '
-      ',ADD CONSTRAINT deposits_' || partition_suffix || '_coin_pub_merchant_pub_h_contract_terms_key '
-        'UNIQUE (coin_pub, merchant_pub, h_contract_terms)'
-  );
-END
-$$;
-
-CREATE OR REPLACE FUNCTION create_table_deposits_by_ready(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_by_ready';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(wire_deadline INT8 NOT NULL'
-    ',shard INT8 NOT NULL'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)'
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (wire_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(wire_deadline ASC, shard ASC, coin_pub);'
-  );
-
-END
-$$;
-
-
-CREATE OR REPLACE FUNCTION create_table_deposits_for_matching(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'deposits_for_matching';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(refund_deadline INT8 NOT NULL'
-    ',merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)'
-    ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-    ',deposit_serial_id INT8'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY RANGE (refund_deadline)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(refund_deadline ASC, merchant_pub, coin_pub);'
-  );
-
-END
-$$;
-
------------------------------ refunds ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_refunds(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'refunds';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(refund_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE
-      ',deposit_serial_id INT8 NOT NULL' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE'
-      ',merchant_sig BYTEA NOT NULL CHECK(LENGTH(merchant_sig)=64)'
-      ',rtransaction_id INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      -- ,PRIMARY KEY (deposit_serial_id, rtransaction_id) -- done per shard!
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_refunds_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE refunds_' || partition_suffix || ' '
-      'ADD CONSTRAINT refunds_' || partition_suffix || '_refund_serial_id_key '
-        'UNIQUE (refund_serial_id) '
-      ',ADD PRIMARY KEY (deposit_serial_id, rtransaction_id) '
-  );
-END
-$$;
-
----------------------------- wire_out -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wire_out(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wire_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(wireout_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- PRIMARY KEY'
-      ',execution_date INT8 NOT NULL'
-      ',wtid_raw BYTEA UNIQUE NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wtid_raw)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wire_target_h_payto_index '
-    'ON ' || table_name || ' '
-    '(wire_target_h_payto);'
-  );
-
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_wire_out_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS void
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wire_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wire_out_' || partition_suffix || '_wireout_uuid_pkey '
-        'PRIMARY KEY (wireout_uuid)'
-  );
-END
-$$;
-
----------------------------- aggregation_transient ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_aggregation_transient(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_transient';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)'
-      ',exchange_account_section TEXT NOT NULL'
-      ',wtid_raw BYTEA NOT NULL CHECK (LENGTH(wtid_raw)=32)'
-      ') %s ;'
-      ,table_name
-      ,'PARTITION BY HASH (wire_target_h_payto)'
-      ,shard_suffix
-  );
-
-END
-$$;
-
----------------------------- aggregation_tracking -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_aggregation_tracking(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'aggregation_tracking';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(aggregation_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-	    ',deposit_serial_id INT8 PRIMARY KEY' -- REFERENCES deposits (deposit_serial_id) ON DELETE CASCADE' -- FIXME chnage to coint_pub + deposit_serial_id for more efficient depost -- or something else ???
-      ',wtid_raw BYTEA NOT NULL' -- CONSTRAINT wire_out_ref REFERENCES wire_out(wtid_raw) ON DELETE CASCADE DEFERRABLE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (deposit_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_wtid_raw_index '
-    'ON ' || table_name || ' '
-    '(wtid_raw);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_wtid_raw_index '
-    'IS ' || quote_literal('for lookup_transactions') || ';'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_aggregation_tracking_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE aggregation_tracking_' || partition_suffix || ' '
-      'ADD CONSTRAINT aggregation_tracking_' || partition_suffix || '_aggregation_serial_id_key '
-        'UNIQUE (aggregation_serial_id) '
-  );
-END
-$$;
-
------------------------------ recoup ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_recoup(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves_out (reserve_out_serial_id) ON DELETE CASCADE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub);'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_recoup_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_' || partition_suffix || '_recoup_uuid_key '
-        'UNIQUE (recoup_uuid) '
-  );
-END
-$$;
-
-CREATE OR REPLACE FUNCTION create_table_recoup_by_reserve(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_by_reserve';
-BEGIN
-
-  PERFORM create_partitioned_table(
-  'CREATE TABLE IF NOT EXISTS %I'
-    '(reserve_out_serial_id INT8 NOT NULL' -- REFERENCES reserves (reserve_out_serial_id) ON DELETE CASCADE
-    ',coin_pub BYTEA CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_out_serial_id)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_main_index '
-    'ON ' || table_name || ' '
-    '(reserve_out_serial_id);'
-  );
-
-END
-$$;
-
----------------------------- recoup_refresh ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_recoup_refresh(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'recoup_refresh';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(recoup_refresh_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)' -- REFERENCES known_coins (coin_pub)
-      ',known_coin_id BIGINT NOT NULL' -- REFERENCES known_coins (known_coin_id) ON DELETE CASCADE
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',coin_blind BYTEA NOT NULL CHECK(LENGTH(coin_blind)=32)'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',recoup_timestamp INT8 NOT NULL'
-      ',rrc_serial INT8 NOT NULL' -- REFERENCES refresh_revealed_coins (rrc_serial) ON DELETE CASCADE -- UNIQUE'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (coin_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: any query using this index will be slow. Materialize index or change query?
-  -- Also: which query uses this index?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_rrc_serial_index '
-    'ON ' || table_name || ' '
-    '(rrc_serial);'
-  );
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub_index '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_recoup_refresh_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE recoup_refresh_' || partition_suffix || ' '
-      'ADD CONSTRAINT recoup_refresh_' || partition_suffix || '_recoup_refresh_uuid_key '
-        'UNIQUE (recoup_refresh_uuid) '
-  );
-END
-$$;
-
------------------------------ prewire ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_prewire(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'prewire';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(prewire_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY'
-      ',wire_method TEXT NOT NULL'
-      ',finished BOOLEAN NOT NULL DEFAULT false'
-      ',failed BOOLEAN NOT NULL DEFAULT false'
-      ',buf BYTEA NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (prewire_uuid)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_finished_index '
-    'ON ' || table_name || ' '
-    '(finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_finished_index '
-    'IS ' || quote_literal('for gc_prewire') || ';'
-  );
-  -- FIXME: find a way to combine these two indices?
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_failed_finished_index '
-    'ON ' || table_name || ' '
-    '(failed,finished);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_by_failed_finished_index '
-    'IS ' || quote_literal('for wire_prepare_data_get') || ';'
-  );
-
-END
-$$;
-
------------------------------ cs_nonce_locks ------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_cs_nonce_locks(
-  shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I'
-      '(cs_nonce_lock_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE'
-      ',nonce BYTEA PRIMARY KEY CHECK (LENGTH(nonce)=32)'
-      ',op_hash BYTEA NOT NULL CHECK (LENGTH(op_hash)=64)'
-      ',max_denomination_serial INT8 NOT NULL'
-    ') %s ;'
-    ,'cs_nonce_locks'
-    ,'PARTITION BY HASH (nonce)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_cs_nonce_locks_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE cs_nonce_locks_' || partition_suffix || ' '
-      'ADD CONSTRAINT cs_nonce_locks_' || partition_suffix || '_cs_nonce_lock_serial_id_key '
-        'UNIQUE (cs_nonce_lock_serial_id)'
-  );
-END
-$$;
-
---------------------------------------------------------------------------
---                        Tables for P2P payments
---------------------------------------------------------------------------
-
-------------------------------- purse_requests ----------------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_purse_requests(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_requests_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',merge_pub BYTEA NOT NULL CHECK (LENGTH(merge_pub)=32)'
-      ',purse_creation INT8 NOT NULL'
-      ',purse_expiration INT8 NOT NULL'
-      ',h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)'
-      ',age_limit INT4 NOT NULL'
-      ',flags INT4 NOT NULL'
-      ',refunded BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',finished BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',in_reserve_quota BOOLEAN NOT NULL DEFAULT(FALSE)'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',purse_fee_val INT8 NOT NULL'
-      ',purse_fee_frac INT4 NOT NULL'
-      ',balance_val INT8 NOT NULL DEFAULT (0)'
-      ',balance_frac INT4 NOT NULL DEFAULT (0)'
-      ',purse_sig BYTEA NOT NULL CHECK(LENGTH(purse_sig)=64)'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by marge_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_merge_pub '
-    'ON ' || table_name || ' '
-    '(merge_pub);'
-  );
-
-  -- FIXME: drop index on master (crosses shards)?
-  -- Or use materialized index? (needed?)
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_purse_expiration '
-    'ON ' || table_name || ' '
-    '(purse_expiration);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_purse_requests_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_requests_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_requests_' || partition_suffix || '_purse_requests_serial_id_key '
-        'UNIQUE (purse_requests_serial_id) '
-  );
-END
-$$;
-
----------------------------- purse_merges -----------------------------
-
-CREATE OR REPLACE FUNCTION create_table_purse_merges(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY '-- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(length(reserve_pub)=32)'--REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' --REFERENCES purse_requests (purse_pub) ON DELETE CASCADE
-      ',merge_sig BYTEA NOT NULL CHECK (LENGTH(merge_sig)=64)'
-      ',merge_timestamp INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_purse_merges_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_merges_' || partition_suffix || '_purse_merge_request_serial_id_key '
-        'UNIQUE (purse_merge_request_serial_id) '
-  );
-END
-$$;
-
-------------------------- account_merges ----------------------------
-
-CREATE OR REPLACE FUNCTION create_table_account_merges(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'account_merges';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(account_merge_request_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves (reserve_pub) ON DELETE CASCADE
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)' -- REFERENCES purse_requests (purse_pub)
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_account_merges_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE account_merges_' || partition_suffix || ' '
-      'ADD CONSTRAINT account_merges_' || partition_suffix || '_account_merge_request_serial_id_key '
-        'UNIQUE (account_merge_request_serial_id) '
-  );
-END
-$$;
-
-------------------------- contracts -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_contracts(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'contracts';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(contract_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',pub_ckey BYTEA NOT NULL CHECK (LENGTH(pub_ckey)=32)'
-      ',contract_sig BYTEA NOT NULL CHECK (LENGTH(contract_sig)=64)'
-      ',e_contract BYTEA NOT NULL'
-      ',purse_expiration INT8 NOT NULL'
-      ',PRIMARY KEY (purse_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_contracts_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE contracts_' || partition_suffix || ' '
-      'ADD CONSTRAINT contracts_' || partition_suffix || '_contract_serial_id_key '
-        'UNIQUE (contract_serial_id) '
-  );
-END
-$$;
-
---------------------------- history_requests --------------------------
-
-
-CREATE OR REPLACE FUNCTION create_table_history_requests(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'history_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',request_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',history_fee_val INT8 NOT NULL'
-      ',history_fee_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,request_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
---------------------------- close_requests ---------------------------
-
-CREATE OR REPLACE FUNCTION create_table_close_requests(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'close_requests';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(reserve_pub BYTEA NOT NULL CHECK (LENGTH(reserve_pub)=32)' -- REFERENCES reserves(reserve_pub) ON DELETE CASCADE
-      ',close_timestamp INT8 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',close_val INT8 NOT NULL'
-      ',close_frac INT4 NOT NULL'
-      ',PRIMARY KEY (reserve_pub,close_timestamp)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (reserve_pub)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-------------------------------- purse_deposits -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_purse_deposits(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'purse_deposits';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(purse_deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' -- UNIQUE
-      ',partner_serial_id INT8' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE'
-      ',purse_pub BYTEA NOT NULL CHECK (LENGTH(purse_pub)=32)'
-      ',coin_pub BYTEA NOT NULL' -- REFERENCES known_coins (coin_pub) ON DELETE CASCADE'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',coin_sig BYTEA NOT NULL CHECK(LENGTH(coin_sig)=64)'
-      ',PRIMARY KEY (purse_pub,coin_pub)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by coin_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_coin_pub '
-    'ON ' || table_name || ' '
-    '(coin_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_purse_deposits_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE purse_deposits_' || partition_suffix || ' '
-      'ADD CONSTRAINT purse_deposits_' || partition_suffix || '_purse_deposit_serial_id_key '
-        'UNIQUE (purse_deposit_serial_id) '
-  );
-END
-$$;
-
----------------------------- wads_out -------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wads_out(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_out';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',partner_serial_id INT8 NOT NULL' -- REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',execution_time INT8 NOT NULL'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_wads_out_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_out_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_out_' || partition_suffix || '_wad_out_serial_id_key '
-        'UNIQUE (wad_out_serial_id) '
-  );
-END
-$$;
-
---------------------------- wad_out_entries --------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wad_out_entries(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_out_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_out_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_out_serial_id INT8' -- REFERENCES wads_out (wad_out_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_by_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_wad_out_entries_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_out_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_out_entries_' || partition_suffix || '_wad_out_entry_serial_id_key '
-        'UNIQUE (wad_out_entry_serial_id) '
-  );
-END
-$$;
-
--------------------------- wads_in --------------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wads_in(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wads_in';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_id BYTEA PRIMARY KEY CHECK (LENGTH(wad_id)=24)'
-      ',origin_exchange_url TEXT NOT NULL'
-      ',amount_val INT8 NOT NULL'
-      ',amount_frac INT4 NOT NULL'
-      ',arrival_time INT8 NOT NULL'
-      ',UNIQUE (wad_id, origin_exchange_url)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (wad_id)'
-    ,shard_suffix
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_wads_in_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wads_in_' || partition_suffix || ' '
-      'ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_in_serial_id_key '
-        'UNIQUE (wad_in_serial_id) '
-      ',ADD CONSTRAINT wads_in_' || partition_suffix || '_wad_is_origin_exchange_url_key '
-        'UNIQUE (wad_id, origin_exchange_url) '
-  );
-END
-$$;
-
-
-------------------------- wads_in_entries --------------------------
-
-CREATE OR REPLACE FUNCTION create_table_wad_in_entries(
-  IN shard_suffix VARCHAR DEFAULT NULL
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  table_name VARCHAR DEFAULT 'wad_in_entries';
-BEGIN
-
-  PERFORM create_partitioned_table(
-    'CREATE TABLE IF NOT EXISTS %I '
-      '(wad_in_entry_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY' --UNIQUE
-      ',wad_in_serial_id INT8' -- REFERENCES wads_in (wad_in_serial_id) ON DELETE CASCADE
-      ',reserve_pub BYTEA NOT NULL CHECK(LENGTH(reserve_pub)=32)'
-      ',purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32)'
-      ',h_contract BYTEA NOT NULL CHECK(LENGTH(h_contract)=64)'
-      ',purse_expiration INT8 NOT NULL'
-      ',merge_timestamp INT8 NOT NULL'
-      ',amount_with_fee_val INT8 NOT NULL'
-      ',amount_with_fee_frac INT4 NOT NULL'
-      ',wad_fee_val INT8 NOT NULL'
-      ',wad_fee_frac INT4 NOT NULL'
-      ',deposit_fees_val INT8 NOT NULL'
-      ',deposit_fees_frac INT4 NOT NULL'
-      ',reserve_sig BYTEA NOT NULL CHECK (LENGTH(reserve_sig)=64)'
-      ',purse_sig BYTEA NOT NULL CHECK (LENGTH(purse_sig)=64)'
-    ') %s ;'
-    ,table_name
-    ,'PARTITION BY HASH (purse_pub)'
-    ,shard_suffix
-  );
-
-  table_name = concat_ws('_', table_name, shard_suffix);
-
-  -- FIXME: change to materialized index by reserve_pub!
-  EXECUTE FORMAT (
-    'CREATE INDEX IF NOT EXISTS ' || table_name || '_reserve_pub '
-    'ON ' || table_name || ' '
-    '(reserve_pub);'
-  );
-  EXECUTE FORMAT (
-    'COMMENT ON INDEX ' || table_name || '_reserve_pub '
-    'IS ' || quote_literal('needed in reserve history computation') || ';'
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION add_constraints_to_wad_in_entries_partition(
-  IN partition_suffix VARCHAR
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  EXECUTE FORMAT (
-    'ALTER TABLE wad_in_entries_' || partition_suffix || ' '
-      'ADD CONSTRAINT wad_in_entries_' || partition_suffix || '_wad_in_entry_serial_id_key '
-        'UNIQUE (wad_in_entry_serial_id) '
-  );
-END
-$$;
-
--------------------------------------------------------------------
-------------------------- Partitions ------------------------------
--------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION create_hash_partition(
-    source_table_name VARCHAR
-    ,modulus INTEGER
-    ,partition_num INTEGER
-  )
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating partition %_%', source_table_name, partition_num;
-
-  EXECUTE FORMAT(
-    'CREATE TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s)'
-    ,source_table_name || '_' || partition_num
-    ,source_table_name
-    ,modulus
-    ,partition_num-1
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION create_range_partition(
-  source_table_name VARCHAR
-  ,partition_num INTEGER
-)
-  RETURNS void
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-  RAISE NOTICE 'TODO';
-END
-$$;
-
-CREATE OR REPLACE FUNCTION detach_default_partitions()
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  RAISE NOTICE 'Detaching all default table partitions';
-
-  ALTER TABLE IF EXISTS wire_targets
-    DETACH PARTITION wire_targets_default;
-
-  ALTER TABLE IF EXISTS reserves
-    DETACH PARTITION reserves_default;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DETACH PARTITION reserves_in_default;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DETACH PARTITION reserves_close_default;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DETACH PARTITION reserves_out_default;
-
-  ALTER TABLE IF EXISTS reserves_out_by_reserve
-    DETACH PARTITION reserves_out_by_reserve_default;
-
-  ALTER TABLE IF EXISTS known_coins
-    DETACH PARTITION known_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DETACH PARTITION refresh_commitments_default;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DETACH PARTITION refresh_revealed_coins_default;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DETACH PARTITION refresh_transfer_keys_default;
-
-  ALTER TABLE IF EXISTS deposits
-    DETACH PARTITION deposits_default;
-
---- TODO range partitioning
---  ALTER TABLE IF EXISTS deposits_by_ready
---    DETACH PARTITION deposits_by_ready_default;
---
---  ALTER TABLE IF EXISTS deposits_for_matching
---    DETACH PARTITION deposits_default_for_matching_default;
-
-  ALTER TABLE IF EXISTS refunds
-    DETACH PARTITION refunds_default;
-
-  ALTER TABLE IF EXISTS wire_out
-    DETACH PARTITION wire_out_default;
-
-  ALTER TABLE IF EXISTS aggregation_transient
-    DETACH PARTITION aggregation_transient_default;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DETACH PARTITION aggregation_tracking_default;
-
-  ALTER TABLE IF EXISTS recoup
-    DETACH PARTITION recoup_default;
-
-  ALTER TABLE IF EXISTS recoup_by_reserve
-    DETACH PARTITION recoup_by_reserve_default;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DETACH PARTITION recoup_refresh_default;
-
-  ALTER TABLE IF EXISTS prewire
-    DETACH PARTITION prewire_default;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DETACH partition cs_nonce_locks_default;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DETACH partition purse_requests_default;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DETACH partition purse_merges_default;
-
-  ALTER TABLE IF EXISTS account_merges
-    DETACH partition account_merges_default;
-
-  ALTER TABLE IF EXISTS contracts
-    DETACH partition contracts_default;
-
-  ALTER TABLE IF EXISTS history_requests
-    DETACH partition history_requests_default;
-
-  ALTER TABLE IF EXISTS close_requests
-    DETACH partition close_requests_default;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DETACH partition purse_deposits_default;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DETACH partition wad_out_entries_default;
-
-  ALTER TABLE IF EXISTS wads_in
-    DETACH partition wads_in_default;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DETACH partition wad_in_entries_default;
-END
-$$;
-
-COMMENT ON FUNCTION detach_default_partitions
-  IS 'We need to drop default and create new one before deleting the default partitions
-      otherwise constraints get lost too. Might be needed in shardig too';
-
-
-CREATE OR REPLACE FUNCTION drop_default_partitions()
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  RAISE NOTICE 'Dropping default table partitions';
-
-  DROP TABLE IF EXISTS wire_targets_default;
-  DROP TABLE IF EXISTS reserves_default;
-  DROP TABLE IF EXISTS reserves_in_default;
-  DROP TABLE IF EXISTS reserves_close_default;
-  DROP TABLE IF EXISTS reserves_out_default;
-  DROP TABLE IF EXISTS reserves_out_by_reserve_default;
-  DROP TABLE IF EXISTS known_coins_default;
-  DROP TABLE IF EXISTS refresh_commitments_default;
-  DROP TABLE IF EXISTS refresh_revealed_coins_default;
-  DROP TABLE IF EXISTS refresh_transfer_keys_default;
-  DROP TABLE IF EXISTS deposits_default;
---DROP TABLE IF EXISTS deposits_by_ready_default;
---DROP TABLE IF EXISTS deposits_for_matching_default;
-  DROP TABLE IF EXISTS refunds_default;
-  DROP TABLE IF EXISTS wire_out_default;
-  DROP TABLE IF EXISTS aggregation_transient_default;
-  DROP TABLE IF EXISTS aggregation_tracking_default;
-  DROP TABLE IF EXISTS recoup_default;
-  DROP TABLE IF EXISTS recoup_by_reserve_default;
-  DROP TABLE IF EXISTS recoup_refresh_default;
-  DROP TABLE IF EXISTS prewire_default;
-  DROP TABLE IF EXISTS cs_nonce_locks_default;
-
-  DROP TABLE IF EXISTS purse_requests_default;
-  DROP TABLE IF EXISTS purse_merges_default;
-  DROP TABLE IF EXISTS account_merges_default;
-  DROP TABLE IF EXISTS contracts_default;
-  DROP TABLE IF EXISTS history_requests_default;
-  DROP TABLE IF EXISTS close_requests_default;
-  DROP TABLE IF EXISTS purse_deposits_default;
-  DROP TABLE IF EXISTS wad_out_entries_default;
-  DROP TABLE IF EXISTS wads_in_default;
-  DROP TABLE IF EXISTS wad_in_entries_default;
-
-END
-$$;
-
-COMMENT ON FUNCTION drop_default_partitions
-  IS 'Drop all default partitions once other partitions are attached.
-      Might be needed in sharding too.';
-
-CREATE OR REPLACE FUNCTION create_partitions(
-    num_partitions INTEGER
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  modulus INTEGER;
-BEGIN
-
-  modulus := num_partitions;
-
-  PERFORM detach_default_partitions();
-
-  LOOP
-
-    PERFORM create_hash_partition(
-      'wire_targets'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_targets_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'reserves_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_close'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_close_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_reserves_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'reserves_out_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'known_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_known_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_commitments'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_commitments_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_revealed_coins'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_revealed_coins_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'refresh_transfer_keys'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refresh_transfer_keys_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_deposits_partition(num_partitions::varchar);
-
--- TODO: dynamically (!) creating/deleting deposits partitions:
---    create new partitions 'as needed', drop old ones once the aggregator has made
---    them empty; as 'new' deposits will always have deadlines in the future, this
---    would basically guarantee no conflict between aggregator and exchange service!
--- SEE also: https://www.cybertec-postgresql.com/en/automatic-partition-creation-in-postgresql/
--- (article is slightly wrong, as this works:)
---CREATE TABLE tab (
---  id bigint GENERATED ALWAYS AS IDENTITY,
---  ts timestamp NOT NULL,
---  data text
--- PARTITION BY LIST ((ts::date));
--- CREATE TABLE tab_def PARTITION OF tab DEFAULT;
--- BEGIN
--- CREATE TABLE tab_part2 (LIKE tab);
--- insert into tab_part2 (id,ts, data) values (5,'2022-03-21', 'foo');
--- alter table tab attach partition tab_part2 for values in ('2022-03-21');
--- commit;
--- Naturally, to ensure this is actually 100% conflict-free, we'd
--- need to create tables at the granularity of the wire/refund deadlines;
--- that is right now configurable via AGGREGATOR_SHIFT option.
-
--- FIXME: range partitioning
---    PERFORM create_range_partition(
---      'deposits_by_ready'
---      ,modulus
---      ,num_partitions
---    );
---
---    PERFORM create_range_partition(
---      'deposits_for_matching'
---      ,modulus
---      ,num_partitions
---    );
-
-    PERFORM create_hash_partition(
-      'refunds'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_refunds_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wire_out'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wire_out_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'aggregation_transient'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'aggregation_tracking'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_aggregation_tracking_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'recoup_by_reserve'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'recoup_refresh'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_recoup_refresh_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'prewire'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'cs_nonce_locks'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_cs_nonce_locks_partition(num_partitions::varchar);
-
-    ---------------- P2P ----------------------
-
-    PERFORM create_hash_partition(
-      'purse_requests'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_requests_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'purse_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'account_merges'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_account_merges_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'contracts'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_contracts_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'history_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'close_requests'
-      ,modulus
-      ,num_partitions
-    );
-
-    PERFORM create_hash_partition(
-      'purse_deposits'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_purse_deposits_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_out_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_out_entries_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wads_in'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wads_in_partition(num_partitions::varchar);
-
-    PERFORM create_hash_partition(
-      'wad_in_entries'
-      ,modulus
-      ,num_partitions
-    );
-    PERFORM add_constraints_to_wad_in_entries_partition(num_partitions::varchar);
-
-    num_partitions=num_partitions-1;
-    EXIT WHEN num_partitions=0;
-
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
---------------------- Sharding ---------------------------
-
-CREATE OR REPLACE FUNCTION create_foreign_hash_partition(
-    source_table_name VARCHAR
-    ,modulus INTEGER
-    ,shard_suffix VARCHAR
-    ,current_shard_num INTEGER
-    ,local_user VARCHAR DEFAULT 'taler-exchange-httpd'
-  )
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating %_% on %', source_table_name, shard_suffix, shard_suffix;
-
-  EXECUTE FORMAT(
-    'CREATE FOREIGN TABLE IF NOT EXISTS %I '
-      'PARTITION OF %I '
-      'FOR VALUES WITH (MODULUS %s, REMAINDER %s) '
-      'SERVER %I'
-    ,source_table_name || '_' || shard_suffix
-    ,source_table_name
-    ,modulus
-    ,current_shard_num-1
-    ,shard_suffix
-  );
-
-  EXECUTE FORMAT(
-    'ALTER FOREIGN TABLE %I OWNER TO %I'
-    ,source_table_name || '_' || shard_suffix
-    ,local_user
-  );
-
-END
-$$;
-
-CREATE OR REPLACE FUNCTION create_foreign_range_partition(
-  source_table_name VARCHAR
-  ,partition_num INTEGER
-)
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-   RAISE NOTICE 'TODO';
-END
-$$;
-
-CREATE OR REPLACE FUNCTION prepare_sharding()
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  CREATE EXTENSION IF NOT EXISTS postgres_fdw;
-
-  PERFORM detach_default_partitions();
-
-  ALTER TABLE IF EXISTS wire_targets
-    DROP CONSTRAINT IF EXISTS wire_targets_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves
-    DROP CONSTRAINT IF EXISTS reserves_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_in
-    DROP CONSTRAINT IF EXISTS reserves_in_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_close
-    DROP CONSTRAINT IF EXISTS reserves_close_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS reserves_out
-    DROP CONSTRAINT IF EXISTS reserves_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS reserves_out_denominations_serial_fkey
-    ,DROP CONSTRAINT IF EXISTS reserves_out_h_blind_ev_key
-  ;
-
-  ALTER TABLE IF EXISTS known_coins
-    DROP CONSTRAINT IF EXISTS known_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS known_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_commitments
-    DROP CONSTRAINT IF EXISTS refresh_commitments_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_old_coin_pub_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_revealed_coins
-    DROP CONSTRAINT IF EXISTS refresh_revealed_coins_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS refresh_revealed_coins_denominations_serial_fkey
-  ;
-
-  ALTER TABLE IF EXISTS refresh_transfer_keys
-    DROP CONSTRAINT IF EXISTS refresh_transfer_keys_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS deposits
-    DROP CONSTRAINT IF EXISTS deposits_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS deposits_extension_details_serial_id_fkey
-    ,DROP CONSTRAINT IF EXISTS deposits_coin_pub_merchant_pub_h_contract_terms_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS refunds
-    DROP CONSTRAINT IF EXISTS refunds_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wire_out
-    DROP CONSTRAINT IF EXISTS wire_out_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wire_out_wtid_raw_key CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS aggregation_tracking
-    DROP CONSTRAINT IF EXISTS aggregation_tracking_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS aggregation_tracking_wtid_raw_fkey
-  ;
-
-  ALTER TABLE IF EXISTS recoup
-    DROP CONSTRAINT IF EXISTS recoup_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS recoup_refresh
-    DROP CONSTRAINT IF EXISTS recoup_refresh_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS prewire
-    DROP CONSTRAINT IF EXISTS prewire_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS cs_nonce_locks
-    DROP CONSTRAINT IF EXISTS cs_nonce_locks_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_requests
-    DROP CONSTRAINT IF EXISTS purse_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_merges
-    DROP CONSTRAINT IF EXISTS purse_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS account_merges
-    DROP CONSTRAINT IF EXISTS account_merges_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS contracts
-    DROP CONSTRAINT IF EXISTS contracts_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS history_requests
-    DROP CONSTRAINT IF EXISTS history_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS close_requests
-    DROP CONSTRAINT IF EXISTS close_requests_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS purse_deposits
-    DROP CONSTRAINT IF EXISTS purse_deposits_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_out
-    DROP CONSTRAINT IF EXISTS wads_out_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wad_out_entries
-    DROP CONSTRAINT IF EXISTS wad_out_entries_pkey CASCADE
-  ;
-
-  ALTER TABLE IF EXISTS wads_in
-    DROP CONSTRAINT IF EXISTS wads_in_pkey CASCADE
-    ,DROP CONSTRAINT IF EXISTS wads_in_wad_id_origin_exchange_url_key
-  ;
-
-  ALTER TABLE IF EXISTS wad_in_entries
-    DROP CONSTRAINT IF EXISTS wad_in_entries_pkey CASCADE
-  ;
-
-END
-$$;
-
-
-CREATE OR REPLACE FUNCTION create_shard_server(
-    shard_suffix VARCHAR
-    ,total_num_shards INTEGER
-    ,current_shard_num INTEGER
-    ,remote_host VARCHAR
-    ,remote_user VARCHAR
-    ,remote_user_password VARCHAR
-    ,remote_db_name VARCHAR DEFAULT 'taler-exchange'
-    ,remote_port INTEGER DEFAULT '5432'
-    ,local_user VARCHAR DEFAULT 'taler-exchange-httpd'
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  RAISE NOTICE 'Creating server %', remote_host;
-
-  EXECUTE FORMAT(
-    'CREATE SERVER IF NOT EXISTS %I '
-      'FOREIGN DATA WRAPPER postgres_fdw '
-      'OPTIONS (dbname %L, host %L, port %L)'
-    ,shard_suffix
-    ,remote_db_name
-    ,remote_host
-    ,remote_port
-  );
-
-  EXECUTE FORMAT(
-    'CREATE USER MAPPING IF NOT EXISTS '
-      'FOR %I SERVER %I '
-      'OPTIONS (user %L, password %L)'
-    ,local_user
-    ,shard_suffix
-    ,remote_user
-    ,remote_user_password
-  );
-
-  EXECUTE FORMAT(
-    'GRANT ALL PRIVILEGES '
-      'ON FOREIGN SERVER %I '
-      'TO %I;'
-    ,shard_suffix
-    ,local_user
-  );
-
-  PERFORM create_foreign_hash_partition(
-    'wire_targets'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_out_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'reserves_close'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'known_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_commitments'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_revealed_coins'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'refresh_transfer_keys'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
---  PERFORM create_foreign_range_partition(
---    'deposits_by_ready'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
---  PERFORM create_foreign_range_partition(
---    'deposits_for_matching'
---    ,total_num_shards
---    ,shard_suffix
---    ,current_shard_num
---    ,local_user
---  );
-  PERFORM create_foreign_hash_partition(
-    'refunds'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wire_out'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_transient'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'aggregation_tracking'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_by_reserve'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'recoup_refresh'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'prewire'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'cs_nonce_locks'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-  ------------------- P2P --------------------
-
-  PERFORM create_foreign_hash_partition(
-    'purse_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'account_merges'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'contracts'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'history_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'close_requests'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'purse_deposits'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_out_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wads_in'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-  PERFORM create_foreign_hash_partition(
-    'wad_in_entries'
-    ,total_num_shards
-    ,shard_suffix
-    ,current_shard_num
-    ,local_user
-  );
-
-END
-$$;
-
-COMMENT ON FUNCTION create_shard_server
-  IS 'Create a shard server on the master
-      node with all foreign tables and user mappings';
-
-CREATE OR REPLACE FUNCTION create_foreign_servers(
-  amount INTEGER
-  ,domain VARCHAR
-  ,remote_user VARCHAR DEFAULT 'taler'
-  ,remote_user_password VARCHAR DEFAULT 'taler'
-)
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-BEGIN
-
-  PERFORM prepare_sharding();
-
-  FOR i IN 1..amount LOOP
-    PERFORM create_shard_server(
-      i::varchar
-     ,amount
-     ,i
-     ,'shard-' || i::varchar || '.' || domain
-     ,remote_user
-     ,remote_user_password
-     ,'taler-exchange'
-     ,'5432'
-     ,'taler-exchange-httpd'
-    );
-  END LOOP;
-
-  PERFORM drop_default_partitions();
-
-END
-$$;
-
-COMMIT;
diff --git a/src/exchangedb/drop-common.sql b/src/exchangedb/drop-common.sql
deleted file mode 100644
index 3bdff7de0..000000000
--- a/src/exchangedb/drop-common.sql
+++ /dev/null
@@ -1,95 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2021 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
--- This script DROPs all of the common functions we create.
---
--- Unlike the other SQL files, it SHOULD be updated to reflect the
--- latest requirements for dropping tables.
-
-
-DROP FUNCTION IF EXISTS create_table_prewire;
-DROP FUNCTION IF EXISTS create_table_recoup;
-DROP FUNCTION IF EXISTS add_constraints_to_recoup_partition;
-DROP FUNCTION IF EXISTS create_table_recoup_by_reserve;
-DROP FUNCTION IF EXISTS create_table_recoup_refresh;
-DROP FUNCTION IF EXISTS add_constraints_to_recoup_refresh_partition;
-DROP FUNCTION IF EXISTS create_table_aggregation_transient;
-DROP FUNCTION IF EXISTS create_table_aggregation_tracking;
-DROP FUNCTION IF EXISTS add_constraints_to_aggregation_tracking_partition;
-DROP FUNCTION IF EXISTS create_table_wire_out;
-DROP FUNCTION IF EXISTS add_constraints_to_wire_out_partition;
-DROP FUNCTION IF EXISTS create_table_wire_targets;
-DROP FUNCTION IF EXISTS add_constraints_to_wire_targets_partition;
-DROP FUNCTION IF EXISTS create_table_deposits;
-DROP FUNCTION IF EXISTS create_table_deposits_by_ready;
-DROP FUNCTION IF EXISTS create_table_deposits_for_matching;
-DROP FUNCTION IF EXISTS add_constraints_to_deposits_partition;
-DROP FUNCTION IF EXISTS create_table_refunds;
-DROP FUNCTION IF EXISTS add_constraints_to_refunds_partition;
-DROP FUNCTION IF EXISTS create_table_refresh_commitments;
-DROP FUNCTION IF EXISTS add_constraints_to_refresh_commitments_partition;
-DROP FUNCTION IF EXISTS create_table_refresh_revealed_coins;
-DROP FUNCTION IF EXISTS add_constraints_to_refresh_revealed_coins_partition;
-DROP FUNCTION IF EXISTS create_table_refresh_transfer_keys;
-DROP FUNCTION IF EXISTS add_constraints_to_refresh_transfer_keys_partition;
-DROP FUNCTION IF EXISTS create_table_known_coins;
-DROP FUNCTION IF EXISTS add_constraints_to_known_coins_partition;
-DROP FUNCTION IF EXISTS create_table_reserves_close;
-DROP FUNCTION IF EXISTS add_constraints_to_reserves_close_partition;
-DROP FUNCTION IF EXISTS create_table_reserves_out;
-DROP FUNCTION IF EXISTS create_table_reserves_out_by_reserve;
-DROP FUNCTION IF EXISTS add_constraints_to_reserves_out_partition;
-DROP FUNCTION IF EXISTS create_table_reserves_in;
-DROP FUNCTION IF EXISTS add_constraints_to_reserves_in_partition;
-DROP FUNCTION IF EXISTS create_table_reserves;
-DROP FUNCTION IF EXISTS create_table_cs_nonce_locks;
-DROP FUNCTION IF EXISTS add_constraints_to_cs_nonce_locks_partition;
-
-DROP FUNCTION IF EXISTS create_table_purse_requests;
-DROP FUNCTION IF EXISTS add_constraints_to_purse_requests_partition;
-DROP FUNCTION IF EXISTS create_table_purse_merges;
-DROP FUNCTION IF EXISTS add_constraints_to_purse_merges_partition;
-DROP FUNCTION IF EXISTS create_table_account_merges;
-DROP FUNCTION IF EXISTS add_constraints_to_account_merges_partition;
-DROP FUNCTION IF EXISTS create_table_contracts;
-DROP FUNCTION IF EXISTS add_constraints_to_contracts_partition;
-DROP FUNCTION IF EXISTS create_table_history_requests;
-DROP FUNCTION IF EXISTS create_table_close_requests;
-DROP FUNCTION IF EXISTS create_table_purse_deposits;
-DROP FUNCTION IF EXISTS add_constraints_to_purse_deposits_partition;
-DROP FUNCTION IF EXISTS create_table_wad_out_entries;
-DROP FUNCTION IF EXISTS add_constraints_to_wad_out_entries_partition;
-DROP FUNCTION IF EXISTS create_table_wads_in;
-DROP FUNCTION IF EXISTS add_constraints_to_wads_in_partition;
-DROP FUNCTION IF EXISTS create_table_wad_in_entries;
-DROP FUNCTION IF EXISTS add_constraints_to_wad_in_entries_partition;
-
-DROP FUNCTION IF EXISTS create_partitioned_table;
-DROP FUNCTION IF EXISTS create_hash_partition;
-DROP FUNCTION IF EXISTS create_range_partition;
-DROP FUNCTION IF EXISTS create_partitions;
-DROP FUNCTION IF EXISTS detach_default_partitions;
-DROP FUNCTION IF EXISTS drop_default_partitions;
-DROP FUNCTION IF EXISTS prepare_sharding;
-DROP FUNCTION IF EXISTS create_foreign_hash_partition;
-DROP FUNCTION IF EXISTS create_foreign_range_partition;
-DROP FUNCTION IF EXISTS create_foreign_servers;
-DROP FUNCTION IF EXISTS create_shard_server;
-
-COMMIT;
diff --git a/src/exchangedb/drop.sql b/src/exchangedb/drop.sql
new file mode 100644
index 000000000..b7583f794
--- /dev/null
+++ b/src/exchangedb/drop.sql
@@ -0,0 +1,39 @@
+--
+-- 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/>
+--
+
+-- Everything in one big transaction
+BEGIN;
+
+WITH xpatches AS (
+  SELECT patch_name
+  FROM _v.patches
+  WHERE starts_with(patch_name,'exchange-')
+)
+  SELECT _v.unregister_patch(xpatches.patch_name)
+  FROM xpatches;
+
+
+WITH xpatches AS (
+  SELECT patch_name
+  FROM _v.patches
+  WHERE starts_with(patch_name,'auditor-triggers-')
+)
+  SELECT _v.unregister_patch(xpatches.patch_name)
+  FROM xpatches;
+
+DROP SCHEMA exchange CASCADE;
+
+COMMIT;
diff --git a/src/exchangedb/drop0001-exchange-part.sql b/src/exchangedb/drop0001-exchange-part.sql
deleted file mode 100644
index 6ea859fb4..000000000
--- a/src/exchangedb/drop0001-exchange-part.sql
+++ /dev/null
@@ -1,107 +0,0 @@
---
--- This file is part of TALER
--- Copyright (C) 2014--2021 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/>
---
-
-BEGIN;
-
--- Unregister patch (exchange-0001.sql)
-SELECT _v.unregister_patch('exchange-0001');
-
-
--- Drops for exchange-0001-part.sql
-DROP TRIGGER IF EXISTS reserves_out_on_insert ON reserves_out;
-DROP TRIGGER IF EXISTS reserves_out_on_delete ON reserves_out;
-DROP TRIGGER IF EXISTS deposits_on_insert ON deposits;
-DROP TRIGGER IF EXISTS deposits_on_delete ON deposits;
-DROP TRIGGER IF EXISTS recoup_on_insert ON recoup;
-DROP TRIGGER IF EXISTS recoup_on_delete ON recoup;
-
-DROP TABLE IF EXISTS revolving_work_shards CASCADE;
-DROP TABLE IF EXISTS extensions CASCADE;
-DROP TABLE IF EXISTS auditors CASCADE;
-DROP TABLE IF EXISTS auditor_denom_sigs CASCADE;
-DROP TABLE IF EXISTS exchange_sign_keys CASCADE;
-DROP TABLE IF EXISTS wire_accounts CASCADE;
-DROP TABLE IF EXISTS signkey_revocations CASCADE;
-DROP TABLE IF EXISTS work_shards CASCADE;
-DROP TABLE IF EXISTS prewire CASCADE;
-DROP TABLE IF EXISTS recoup CASCADE;
-DROP TABLE IF EXISTS recoup_refresh CASCADE;
-DROP TABLE IF EXISTS aggregation_transient CASCADE;
-DROP TABLE IF EXISTS aggregation_tracking CASCADE;
-DROP TABLE IF EXISTS wire_out CASCADE;
-DROP TABLE IF EXISTS wire_targets CASCADE;
-DROP TABLE IF EXISTS wire_fee CASCADE;
-DROP TABLE IF EXISTS deposits CASCADE;
-DROP TABLE IF EXISTS deposits_by_ready CASCADE;
-DROP TABLE IF EXISTS deposits_for_matching CASCADE;
-DROP TABLE IF EXISTS extension_details CASCADE;
-DROP TABLE IF EXISTS refunds CASCADE;
-DROP TABLE IF EXISTS refresh_commitments CASCADE;
-DROP TABLE IF EXISTS refresh_revealed_coins CASCADE;
-DROP TABLE IF EXISTS refresh_transfer_keys CASCADE;
-DROP TABLE IF EXISTS known_coins CASCADE;
-DROP TABLE IF EXISTS reserves_close CASCADE;
-DROP TABLE IF EXISTS reserves_out CASCADE;
-DROP TABLE IF EXISTS reserves_out_by_reserve CASCADE;
-DROP TABLE IF EXISTS reserves_in CASCADE;
-DROP TABLE IF EXISTS reserves CASCADE;
-DROP TABLE IF EXISTS denomination_revocations CASCADE;
-DROP TABLE IF EXISTS denominations CASCADE;
-DROP TABLE IF EXISTS cs_nonce_locks CASCADE;
-DROP TABLE IF EXISTS global_fee CASCADE;
-DROP TABLE IF EXISTS recoup_by_reserve CASCADE;
-
-
-DROP TABLE IF EXISTS partners CASCADE;
-DROP TABLE IF EXISTS account_merges CASCADE;
-DROP TABLE IF EXISTS purse_merges CASCADE;
-DROP TABLE IF EXISTS purse_deposits CASCADE;
-DROP TABLE IF EXISTS contracts CASCADE;
-DROP TABLE IF EXISTS history_requests CASCADE;
-DROP TABLE IF EXISTS close_requests CASCADE;
-DROP TABLE IF EXISTS purse_requests CASCADE;
-DROP TABLE IF EXISTS wads_out CASCADE;
-DROP TABLE IF EXISTS wad_out_entries CASCADE;
-DROP TABLE IF EXISTS wads_in CASCADE;
-DROP TABLE IF EXISTS wad_in_entries CASCADE;
-DROP TABLE IF EXISTS partner_accounts CASCADE;
-DROP TABLE IF EXISTS purse_actions CASCADE;
-
-DROP FUNCTION IF EXISTS exchange_do_withdraw;
-DROP FUNCTION IF EXISTS exchange_do_withdraw_limit_check;
-DROP FUNCTION IF EXISTS exchange_do_recoup_by_reserve;
-DROP FUNCTION IF EXISTS recoup_insert_trigger;
-DROP FUNCTION IF EXISTS recoup_delete_trigger;
-DROP FUNCTION IF EXISTS deposits_insert_trigger;
-DROP FUNCTION IF EXISTS deposits_update_trigger;
-DROP FUNCTION IF EXISTS deposits_delete_trigger;
-DROP FUNCTION IF EXISTS reserves_out_by_reserve_insert_trigger;
-DROP FUNCTION IF EXISTS reserves_out_by_reserve_delete_trigger;
-DROP FUNCTION IF EXISTS exchange_do_deposit;
-DROP FUNCTION IF EXISTS exchange_do_melt;
-DROP FUNCTION IF EXISTS exchange_do_refund;
-DROP FUNCTION IF EXISTS exchange_do_recoup_to_coin;
-DROP FUNCTION IF EXISTS exchange_do_recoup_to_reserve;
-DROP FUNCTION IF EXISTS exchange_do_purse_deposit;
-DROP FUNCTION IF EXISTS exchange_do_purse_merge;
-DROP FUNCTION IF EXISTS exchange_do_account_merge;
-DROP FUNCTION IF EXISTS exchange_do_history_request;
-DROP FUNCTION IF EXISTS exchange_do_close_request;
-DROP FUNCTION IF EXISTS exchange_do_reserve_purse;
-
--- And we're out of here...
-
-COMMIT;
diff --git a/src/exchangedb/exchange-0000.sql b/src/exchangedb/exchange-0000.sql
deleted file mode 100644
index 116f409b7..000000000
--- a/src/exchangedb/exchange-0000.sql
+++ /dev/null
@@ -1,293 +0,0 @@
--- LICENSE AND COPYRIGHT
---
--- Copyright (C) 2010 Hubert depesz Lubaczewski
---
--- This program is distributed under the (Revised) BSD License:
--- L<http://www.opensource.org/licenses/bsd-license.php>
---
--- Redistribution and use in source and binary forms, with or without
--- modification, are permitted provided that the following conditions
--- are met:
---
--- * Redistributions of source code must retain the above copyright
--- notice, this list of conditions and the following disclaimer.
---
--- * Redistributions in binary form must reproduce the above copyright
---   notice, this list of conditions and the following disclaimer in the
---   documentation and/or other materials provided with the distribution.
---
--- * Neither the name of Hubert depesz Lubaczewski's Organization
---   nor the names of its contributors may be used to endorse or
---   promote products derived from this software without specific
---   prior written permission.
---
--- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
--- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
--- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
--- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
--- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
--- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
--- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
--- Code origin: https://gitlab.com/depesz/Versioning/blob/master/install.versioning.sql
---
---
--- # NAME
---
--- **Versioning** - simplistic take on tracking and applying changes to databases.
---
--- # DESCRIPTION
---
--- This project strives to provide simple way to manage changes to
--- database.
---
--- Instead of making changes on development server, then finding
--- differences between production and development, deciding which ones
--- should be installed on production, and finding a way to install them -
--- you start with writing diffs themselves!
---
--- # INSTALLATION
---
--- To install versioning simply run install.versioning.sql in your database
--- (all of them: production, stage, test, devel, ...).
---
--- # USAGE
---
--- In your files with patches to database, put whole logic in single
--- transaction, and use \_v.\* functions - usually \_v.register_patch() at
--- least to make sure everything is OK.
---
--- For example. Let's assume you have patch files:
---
--- ## 0001.sql:
---
--- ```
--- create table users (id serial primary key, username text);
--- ```
---
--- ## 0002.sql:
---
--- ```
--- insert into users (username) values ('depesz');
--- ```
--- To change it to use versioning you would change the files, to this
--- state:
---
--- 0000.sql:
---
--- ```
--- BEGIN;
--- select _v.register_patch('000-base', NULL, NULL);
--- create table users (id serial primary key, username text);
--- COMMIT;
--- ```
---
--- ## 0002.sql:
---
--- ```
--- BEGIN;
--- select _v.register_patch('001-users', ARRAY['000-base'], NULL);
--- insert into users (username) values ('depesz');
--- COMMIT;
--- ```
---
--- This will make sure that patch 001-users can only be applied after
--- 000-base.
---
--- # AVAILABLE FUNCTIONS
---
--- ## \_v.register_patch( TEXT )
---
--- Registers named patch, or dies if it is already registered.
---
--- Returns integer which is id of patch in \_v.patches table - only if it
--- succeeded.
---
--- ## \_v.register_patch( TEXT, TEXT[] )
---
--- Same as \_v.register_patch( TEXT ), but checks is all given patches (given as
--- array in second argument) are already registered.
---
--- ## \_v.register_patch( TEXT, TEXT[], TEXT[] )
---
--- Same as \_v.register_patch( TEXT, TEXT[] ), but also checks if there are no conflicts with preexisting patches.
---
--- Third argument is array of names of patches that conflict with current one. So
--- if any of them is installed - register_patch will error out.
---
--- ## \_v.unregister_patch( TEXT )
---
--- Removes information about given patch from the versioning data.
---
--- It doesn't remove objects that were created by this patch - just removes
--- metainformation.
---
--- ## \_v.assert_user_is_superuser()
---
--- Make sure that current patch is being loaded by superuser.
---
--- If it's not - it will raise exception, and break transaction.
---
--- ## \_v.assert_user_is_not_superuser()
---
--- Make sure that current patch is not being loaded by superuser.
---
--- If it is - it will raise exception, and break transaction.
---
--- ## \_v.assert_user_is_one_of(TEXT, TEXT, ... )
---
--- Make sure that current patch is being loaded by one of listed users.
---
--- If ```current_user``` is not listed as one of arguments - function will raise
--- exception and break the transaction.
-
-BEGIN;
-
--- This file adds versioning support to database it will be loaded to.
--- It requires that PL/pgSQL is already loaded - will raise exception otherwise.
--- All versioning "stuff" (tables, functions) is in "_v" schema.
-
--- All functions are defined as 'RETURNS SETOF INT4' to be able to make them to RETURN literally nothing (0 rows).
--- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling.
-CREATE SCHEMA IF NOT EXISTS _v;
-COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
-
-CREATE TABLE IF NOT EXISTS _v.patches (
-    patch_name  TEXT        PRIMARY KEY,
-    applied_tsz TIMESTAMPTZ NOT NULL DEFAULT now(),
-    applied_by  TEXT        NOT NULL,
-    requires    TEXT[],
-    conflicts   TEXT[]
-);
-COMMENT ON TABLE _v.patches              IS 'Contains information about what patches are currently applied on database.';
-COMMENT ON COLUMN _v.patches.patch_name  IS 'Name of patch, has to be unique for every patch.';
-COMMENT ON COLUMN _v.patches.applied_tsz IS 'When the patch was applied.';
-COMMENT ON COLUMN _v.patches.applied_by  IS 'Who applied this patch (PostgreSQL username)';
-COMMENT ON COLUMN _v.patches.requires    IS 'List of patches that are required for given patch.';
-COMMENT ON COLUMN _v.patches.conflicts   IS 'List of patches that conflict with given patch.';
-
-CREATE OR REPLACE FUNCTION _v.register_patch( IN in_patch_name TEXT, IN in_requirements TEXT[], in_conflicts TEXT[], OUT versioning INT4 ) RETURNS setof INT4 AS $$
-DECLARE
-    t_text   TEXT;
-    t_text_a TEXT[];
-    i INT4;
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF FOUND THEN
-        RAISE EXCEPTION 'Patch % is already applied!', in_patch_name;
-    END IF;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE patch_name = any( in_conflicts ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Versioning patches conflict. Conflicting patche(s) installed: %.', array_to_string( t_text_a, ', ' );
-    END IF;
-
-    IF array_upper( in_requirements, 1 ) IS NOT NULL THEN
-        t_text_a := '{}';
-        FOR i IN array_lower( in_requirements, 1 ) .. array_upper( in_requirements, 1 ) LOOP
-            SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_requirements[i];
-            IF NOT FOUND THEN
-                t_text_a := t_text_a || in_requirements[i];
-            END IF;
-        END LOOP;
-        IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-            RAISE EXCEPTION 'Missing prerequisite(s): %.', array_to_string( t_text_a, ', ' );
-        END IF;
-    END IF;
-
-    INSERT INTO _v.patches (patch_name, applied_tsz, applied_by, requires, conflicts ) VALUES ( in_patch_name, now(), current_user, coalesce( in_requirements, '{}' ), coalesce( in_conflicts, '{}' ) );
-    RETURN;
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.register_patch( TEXT, TEXT[], TEXT[] ) IS 'Function to register patches in database. Raises exception if there are conflicts, prerequisites are not installed or the migration has already been installed.';
-
-CREATE OR REPLACE FUNCTION _v.register_patch( TEXT, TEXT[] ) RETURNS setof INT4 AS $$
-    SELECT _v.register_patch( $1, $2, NULL );
-$$ language sql;
-COMMENT ON FUNCTION _v.register_patch( TEXT, TEXT[] ) IS 'Wrapper to allow registration of patches without conflicts.';
-CREATE OR REPLACE FUNCTION _v.register_patch( TEXT ) RETURNS setof INT4 AS $$
-    SELECT _v.register_patch( $1, NULL, NULL );
-$$ language sql;
-COMMENT ON FUNCTION _v.register_patch( TEXT ) IS 'Wrapper to allow registration of patches without requirements and conflicts.';
-
-CREATE OR REPLACE FUNCTION _v.unregister_patch( IN in_patch_name TEXT, OUT versioning INT4 ) RETURNS setof INT4 AS $$
-DECLARE
-    i        INT4;
-    t_text_a TEXT[];
-BEGIN
-    -- Thanks to this we know only one patch will be applied at a time
-    LOCK TABLE _v.patches IN EXCLUSIVE MODE;
-
-    t_text_a := ARRAY( SELECT patch_name FROM _v.patches WHERE in_patch_name = ANY( requires ) );
-    IF array_upper( t_text_a, 1 ) IS NOT NULL THEN
-        RAISE EXCEPTION 'Cannot uninstall %, as it is required by: %.', in_patch_name, array_to_string( t_text_a, ', ' );
-    END IF;
-
-    DELETE FROM _v.patches WHERE patch_name = in_patch_name;
-    GET DIAGNOSTICS i = ROW_COUNT;
-    IF i < 1 THEN
-        RAISE EXCEPTION 'Patch % is not installed, so it can''t be uninstalled!', in_patch_name;
-    END IF;
-
-    RETURN;
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.unregister_patch( TEXT ) IS 'Function to unregister patches in database. Dies if the patch is not registered, or if unregistering it would break dependencies.';
-
-CREATE OR REPLACE FUNCTION _v.assert_patch_is_applied( IN in_patch_name TEXT ) RETURNS TEXT as $$
-DECLARE
-    t_text TEXT;
-BEGIN
-    SELECT patch_name INTO t_text FROM _v.patches WHERE patch_name = in_patch_name;
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'Patch % is not applied!', in_patch_name;
-    END IF;
-    RETURN format('Patch %s is applied.', in_patch_name);
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.assert_patch_is_applied( TEXT ) IS 'Function that can be used to make sure that patch has been applied.';
-
-CREATE OR REPLACE FUNCTION _v.assert_user_is_superuser() RETURNS TEXT as $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RETURN 'assert_user_is_superuser: OK';
-    END IF;
-    RAISE EXCEPTION 'Current user is not superuser - cannot continue.';
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.assert_user_is_superuser() IS 'Function that can be used to make sure that patch is being applied using superuser account.';
-
-CREATE OR REPLACE FUNCTION _v.assert_user_is_not_superuser() RETURNS TEXT as $$
-DECLARE
-    v_super bool;
-BEGIN
-    SELECT usesuper INTO v_super FROM pg_user WHERE usename = current_user;
-    IF v_super THEN
-        RAISE EXCEPTION 'Current user is superuser - cannot continue.';
-    END IF;
-    RETURN 'assert_user_is_not_superuser: OK';
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.assert_user_is_not_superuser() IS 'Function that can be used to make sure that patch is being applied using normal (not superuser) account.';
-
-CREATE OR REPLACE FUNCTION _v.assert_user_is_one_of(VARIADIC p_acceptable_users TEXT[] ) RETURNS TEXT as $$
-DECLARE
-BEGIN
-    IF current_user = any( p_acceptable_users ) THEN
-        RETURN 'assert_user_is_one_of: OK';
-    END IF;
-    RAISE EXCEPTION 'User is not one of: % - cannot continue.', p_acceptable_users;
-END;
-$$ language plpgsql;
-COMMENT ON FUNCTION _v.assert_user_is_one_of(TEXT[]) IS 'Function that can be used to make sure that patch is being applied by one of defined users.';
-
-COMMIT;
diff --git a/src/exchangedb/exchange-0001-part.sql b/src/exchangedb/exchange-0001-part.sql
deleted file mode 100644
index 1b1d2a38e..000000000
--- a/src/exchangedb/exchange-0001-part.sql
+++ /dev/null
@@ -1,3459 +0,0 @@
---
--- 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
--- Check patch versioning is in place.
-SELECT _v.register_patch('exchange-0001', NULL, NULL);
-
--- ------------------------------ denominations ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS denominations
-  (denominations_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64)
-  ,denom_type INT4 NOT NULL DEFAULT (1) -- 1 == RSA (for now, remove default later!)
-  ,age_mask INT4 NOT NULL DEFAULT (0)
-  ,denom_pub BYTEA NOT NULL
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  ,valid_from INT8 NOT NULL
-  ,expire_withdraw INT8 NOT NULL
-  ,expire_deposit INT8 NOT NULL
-  ,expire_legal INT8 NOT NULL
-  ,coin_val INT8 NOT NULL
-  ,coin_frac INT4 NOT NULL
-  ,fee_withdraw_val INT8 NOT NULL
-  ,fee_withdraw_frac INT4 NOT NULL
-  ,fee_deposit_val INT8 NOT NULL
-  ,fee_deposit_frac INT4 NOT NULL
-  ,fee_refresh_val INT8 NOT NULL
-  ,fee_refresh_frac INT4 NOT NULL
-  ,fee_refund_val INT8 NOT NULL
-  ,fee_refund_frac INT4 NOT NULL
-  );
-COMMENT ON TABLE denominations
-  IS 'Main denominations table. All the valid denominations the exchange knows about.';
-COMMENT ON COLUMN denominations.denom_type
-  IS 'determines cipher type for blind signatures used with this denomination; 0 is for RSA';
-COMMENT ON COLUMN denominations.age_mask
-  IS 'bitmask with the age restrictions that are being used for this denomination; 0 if denomination does not support the use of age restrictions';
-COMMENT ON COLUMN denominations.denominations_serial
-  IS 'needed for exchange-auditor replication logic';
-
-CREATE INDEX IF NOT EXISTS denominations_by_expire_legal_index
-  ON denominations
-  (expire_legal);
-
-
--- ------------------------------ denomination_revocations ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS denomination_revocations
-  (denom_revocations_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,denominations_serial INT8 PRIMARY KEY REFERENCES denominations (denominations_serial) ON DELETE CASCADE
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  );
-COMMENT ON TABLE denomination_revocations
-  IS 'remembering which denomination keys have been revoked';
-
-
--- ------------------------------ wire_targets ----------------------------------------
-
-SELECT create_table_wire_targets();
-
-COMMENT ON TABLE wire_targets
-  IS 'All senders and recipients of money via the exchange';
-COMMENT ON COLUMN wire_targets.payto_uri
-  IS 'Can be a regular bank account, or also be a URI identifying a reserve-account (for P2P payments)';
-COMMENT ON COLUMN wire_targets.wire_target_h_payto
-  IS 'Unsalted hash of payto_uri';
-COMMENT ON COLUMN wire_targets.kyc_ok
-  IS 'true if the KYC check was passed successfully';
-COMMENT ON COLUMN wire_targets.external_id
-  IS 'Name of the user that was used for OAuth 2.0-based legitimization';
-
-CREATE TABLE IF NOT EXISTS wire_targets_default
-  PARTITION OF wire_targets
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wire_targets_partition('default');
-
--- ------------------------------ reserves ----------------------------------------
-
-SELECT create_table_reserves();
-
-COMMENT ON TABLE reserves
-  IS 'Summarizes the balance of a reserve. Updated when new funds are added or withdrawn.';
-COMMENT ON COLUMN reserves.reserve_pub
-  IS 'EdDSA public key of the reserve. Knowledge of the private key implies ownership over the balance.';
-COMMENT ON COLUMN reserves.current_balance_val
-  IS 'Current balance remaining with the reserve.';
-COMMENT ON COLUMN reserves.purses_active
-  IS 'Number of purses that were created by this reserve that are not expired and not fully paid.';
-COMMENT ON COLUMN reserves.purses_allowed
-  IS 'Number of purses that this reserve is allowed to have active at most.';
-COMMENT ON COLUMN reserves.kyc_required
-  IS 'True if a KYC check must have been passed before withdrawing from this reserve. Set to true once a reserve received a P2P payment.';
-COMMENT ON COLUMN reserves.kyc_passed
-  IS 'True once KYC was passed for this reserve. The KYC details are then available via the wire_targets table under the key of wire_target_h_payto which is to be derived from the reserve_pub and the base URL of this exchange.';
-COMMENT ON COLUMN reserves.expiration_date
-  IS 'Used to trigger closing of reserves that have not been drained after some time';
-COMMENT ON COLUMN reserves.gc_date
-  IS 'Used to forget all information about a reserve during garbage collection';
-
-CREATE TABLE IF NOT EXISTS reserves_default
-  PARTITION OF reserves
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
--- ------------------------------ reserves_in ----------------------------------------
-
-SELECT create_table_reserves_in();
-
-COMMENT ON TABLE reserves_in
-  IS 'list of transfers of funds into the reserves, one per incoming wire transfer';
-COMMENT ON COLUMN reserves_in.wire_source_h_payto
-  IS 'Identifies the debited bank account and KYC status';
-COMMENT ON COLUMN reserves_in.reserve_pub
-  IS 'Public key of the reserve. Private key signifies ownership of the remaining balance.';
-COMMENT ON COLUMN reserves_in.credit_val
-  IS 'Amount that was transferred into the reserve';
-
-CREATE TABLE IF NOT EXISTS reserves_in_default
-  PARTITION OF reserves_in
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_reserves_in_partition('default');
-
--- ------------------------------ reserves_close ----------------------------------------
-
-SELECT create_table_reserves_close();
-
-COMMENT ON TABLE reserves_close
-  IS 'wire transfers executed by the reserve to close reserves';
-COMMENT ON COLUMN reserves_close.wire_target_h_payto
-  IS 'Identifies the credited bank account (and KYC status). Note that closing does not depend on KYC.';
-
-CREATE TABLE IF NOT EXISTS reserves_close_default
-  PARTITION OF reserves_close
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_reserves_close_partition('default');
-
-
--- ------------------------------ reserves_out ----------------------------------------
-
-SELECT create_table_reserves_out();
-
-COMMENT ON TABLE reserves_out
-  IS 'Withdraw operations performed on reserves.';
-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).';
-COMMENT ON COLUMN reserves_out.denominations_serial
-  IS 'We do not CASCADE ON DELETE here, we may keep the denomination data alive';
-
-CREATE TABLE IF NOT EXISTS reserves_out_default
-  PARTITION OF reserves_out
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_reserves_out_partition('default');
-
-
-SELECT create_table_reserves_out_by_reserve();
-
-COMMENT ON TABLE reserves_out_by_reserve
-  IS 'Information in this table is strictly redundant with that of reserves_out, but saved by a different primary key for fast lookups by reserve public key/uuid.';
-
-CREATE TABLE IF NOT EXISTS reserves_out_by_reserve_default
-  PARTITION OF reserves_out_by_reserve
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-CREATE OR REPLACE FUNCTION reserves_out_by_reserve_insert_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  INSERT INTO reserves_out_by_reserve
-    (reserve_uuid
-    ,h_blind_ev)
-  VALUES
-    (NEW.reserve_uuid
-    ,NEW.h_blind_ev);
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION reserves_out_by_reserve_insert_trigger()
-  IS 'Replicate reserve_out inserts into reserve_out_by_reserve table.';
-
-CREATE TRIGGER reserves_out_on_insert
-  AFTER INSERT
-   ON reserves_out
-   FOR EACH ROW EXECUTE FUNCTION reserves_out_by_reserve_insert_trigger();
-
-CREATE OR REPLACE FUNCTION reserves_out_by_reserve_delete_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  DELETE FROM reserves_out_by_reserve
-   WHERE reserve_uuid = OLD.reserve_uuid;
-  RETURN OLD;
-END $$;
-COMMENT ON FUNCTION reserves_out_by_reserve_delete_trigger()
-  IS 'Replicate reserve_out deletions into reserve_out_by_reserve table.';
-
-CREATE TRIGGER reserves_out_on_delete
-  AFTER DELETE
-    ON reserves_out
-   FOR EACH ROW EXECUTE FUNCTION reserves_out_by_reserve_delete_trigger();
-
-
--- ------------------------------ auditors ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS auditors
-  (auditor_uuid BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,auditor_pub BYTEA PRIMARY KEY CHECK (LENGTH(auditor_pub)=32)
-  ,auditor_name VARCHAR NOT NULL
-  ,auditor_url VARCHAR NOT NULL
-  ,is_active BOOLEAN NOT NULL
-  ,last_change INT8 NOT NULL
-  );
-COMMENT ON TABLE auditors
-  IS 'Table with auditors the exchange uses or has used in the past. Entries never expire as we need to remember the last_change column indefinitely.';
-COMMENT ON COLUMN auditors.auditor_pub
-  IS 'Public key of the auditor.';
-COMMENT ON COLUMN auditors.auditor_url
-  IS 'The base URL of the auditor.';
-COMMENT ON COLUMN auditors.is_active
-  IS 'true if we are currently supporting the use of this auditor.';
-COMMENT ON COLUMN auditors.last_change
-  IS 'Latest time when active status changed. Used to detect replays of old messages.';
-
-
--- ------------------------------ auditor_denom_sigs ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS auditor_denom_sigs
-  (auditor_denom_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,auditor_uuid INT8 NOT NULL REFERENCES auditors (auditor_uuid) ON DELETE CASCADE
-  ,denominations_serial INT8 NOT NULL REFERENCES denominations (denominations_serial) ON DELETE CASCADE
-  ,auditor_sig BYTEA CHECK (LENGTH(auditor_sig)=64)
-  ,PRIMARY KEY (denominations_serial, auditor_uuid)
-  );
-COMMENT ON TABLE auditor_denom_sigs
-  IS 'Table with auditor signatures on exchange denomination keys.';
-COMMENT ON COLUMN auditor_denom_sigs.auditor_uuid
-  IS 'Identifies the auditor.';
-COMMENT ON COLUMN auditor_denom_sigs.denominations_serial
-  IS 'Denomination the signature is for.';
-COMMENT ON COLUMN auditor_denom_sigs.auditor_sig
-  IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.';
-
-
--- ------------------------------ exchange_sign_keys ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS exchange_sign_keys
-  (esk_serial 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)
-  ,valid_from INT8 NOT NULL
-  ,expire_sign INT8 NOT NULL
-  ,expire_legal INT8 NOT NULL
-  );
-COMMENT ON TABLE exchange_sign_keys
-  IS 'Table with master public key signatures on exchange online signing keys.';
-COMMENT ON COLUMN exchange_sign_keys.exchange_pub
-  IS 'Public online signing key of the exchange.';
-COMMENT ON COLUMN exchange_sign_keys.master_sig
-  IS 'Signature affirming the validity of the signing key of purpose TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY.';
-COMMENT ON COLUMN exchange_sign_keys.valid_from
-  IS 'Time when this online signing key will first be used to sign messages.';
-COMMENT ON COLUMN exchange_sign_keys.expire_sign
-  IS 'Time when this online signing key will no longer be used to sign.';
-COMMENT ON COLUMN exchange_sign_keys.expire_legal
-  IS 'Time when this online signing key legally expires.';
-
-
--- ------------------------------ signkey_revocations ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS signkey_revocations
-  (signkey_revocations_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,esk_serial INT8 PRIMARY KEY REFERENCES exchange_sign_keys (esk_serial) ON DELETE CASCADE
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  );
-COMMENT ON TABLE signkey_revocations
-  IS 'Table storing which online signing keys have been revoked';
-
-
--- ------------------------------ extension ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS extensions
-  (extension_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,name VARCHAR NOT NULL UNIQUE
-  ,config BYTEA
-  );
-COMMENT ON TABLE extensions
-  IS 'Configurations of the activated extensions';
-COMMENT ON COLUMN extensions.name
-  IS 'Name of the extension';
-COMMENT ON COLUMN extensions.config
-  IS 'Configuration of the extension as JSON-blob, maybe NULL';
-
-
--- ------------------------------ known_coins ----------------------------------------
-
-SELECT create_table_known_coins();
-
-COMMENT ON TABLE known_coins
-  IS 'information about coins and their signatures, so we do not have to store the signatures more than once if a coin is involved in multiple operations';
-COMMENT ON COLUMN known_coins.denominations_serial
-  IS 'Denomination of the coin, determines the value of the original coin and applicable fees for coin-specific operations.';
-COMMENT ON COLUMN known_coins.coin_pub
-  IS 'EdDSA public key of the coin';
-COMMENT ON COLUMN known_coins.remaining_val
-  IS 'Value of the coin that remains to be spent';
-COMMENT ON COLUMN known_coins.age_commitment_hash
-  IS 'Optional hash of the age commitment for age restrictions as per DD 24 (active if denom_type has the respective bit set)';
-COMMENT ON COLUMN known_coins.denom_sig
-  IS 'This is the signature of the exchange that affirms that the coin is a valid coin. The specific signature type depends on denom_type of the denomination.';
-
-CREATE TABLE IF NOT EXISTS known_coins_default
-  PARTITION OF known_coins
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_known_coins_partition('default');
-
-
--- ------------------------------ refresh_commitments ----------------------------------------
-
-SELECT create_table_refresh_commitments();
-
-COMMENT ON TABLE refresh_commitments
-  IS 'Commitments made when melting coins and the gamma value chosen by the exchange.';
-COMMENT ON COLUMN refresh_commitments.noreveal_index
-  IS 'The gamma value chosen by the exchange in the cut-and-choose protocol';
-COMMENT ON COLUMN refresh_commitments.rc
-  IS 'Commitment made by the client, hash over the various client inputs in the cut-and-choose protocol';
-COMMENT ON COLUMN refresh_commitments.old_coin_pub
-  IS 'Coin being melted in the refresh process.';
-
-CREATE TABLE IF NOT EXISTS refresh_commitments_default
-  PARTITION OF refresh_commitments
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_refresh_commitments_partition('default');
-
-
--- ------------------------------ refresh_revealed_coins ----------------------------------------
-
-SELECT create_table_refresh_revealed_coins();
-
-COMMENT ON TABLE refresh_revealed_coins
-  IS 'Revelations about the new coins that are to be created during a melting session.';
-COMMENT ON COLUMN refresh_revealed_coins.rrc_serial
-  IS 'needed for exchange-auditor replication logic';
-COMMENT ON COLUMN refresh_revealed_coins.melt_serial_id
-  IS 'Identifies the refresh commitment (rc) of the melt operation.';
-COMMENT ON COLUMN refresh_revealed_coins.freshcoin_index
-  IS 'index of the fresh coin being created (one melt operation may result in multiple fresh coins)';
-COMMENT ON COLUMN refresh_revealed_coins.coin_ev
-  IS 'envelope of the new coin to be signed';
-COMMENT ON COLUMN refresh_revealed_coins.ewv
-  IS 'exchange contributed values in the creation of the fresh coin (see /csr)';
-COMMENT ON COLUMN refresh_revealed_coins.h_coin_ev
-  IS 'hash of the envelope of the new coin to be signed (for lookups)';
-COMMENT ON COLUMN refresh_revealed_coins.ev_sig
-  IS 'exchange signature over the envelope';
-
-CREATE TABLE IF NOT EXISTS refresh_revealed_coins_default
-  PARTITION OF refresh_revealed_coins
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_refresh_revealed_coins_partition('default');
-
-
--- ------------------------------ refresh_transfer_keys ----------------------------------------
-
-SELECT create_table_refresh_transfer_keys();
-
-COMMENT ON TABLE refresh_transfer_keys
-  IS 'Transfer keys of a refresh operation (the data revealed to the exchange).';
-COMMENT ON COLUMN refresh_transfer_keys.rtc_serial
-  IS 'needed for exchange-auditor replication logic';
-COMMENT ON COLUMN refresh_transfer_keys.melt_serial_id
-  IS 'Identifies the refresh commitment (rc) of the operation.';
-COMMENT ON COLUMN refresh_transfer_keys.transfer_pub
-  IS 'transfer public key for the gamma index';
-COMMENT ON COLUMN refresh_transfer_keys.transfer_privs
-  IS 'array of TALER_CNC_KAPPA - 1 transfer private keys that have been revealed, with the gamma entry being skipped';
-
-CREATE TABLE IF NOT EXISTS refresh_transfer_keys_default
-  PARTITION OF refresh_transfer_keys
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_refresh_transfer_keys_partition('default');
-
-
--- ------------------------------ extension_details ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS extension_details
-  (extension_details_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY
-  ,extension_options VARCHAR)
-  PARTITION BY HASH (extension_details_serial_id);
-COMMENT ON TABLE extension_details
-  IS 'Extensions that were provided with deposits (not yet used).';
-COMMENT ON COLUMN extension_details.extension_options
-  IS 'JSON object with options set that the exchange needs to consider when executing a deposit. Supported details depend on the extensions supported by the exchange.';
-
-CREATE TABLE IF NOT EXISTS extension_details_default
-  PARTITION OF extension_details
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-
--- ------------------------------ deposits ----------------------------------------
-
-SELECT create_table_deposits();
-
-COMMENT ON TABLE deposits
-  IS 'Deposits we have received and for which we need to make (aggregate) wire transfers (and manage refunds).';
-COMMENT ON COLUMN deposits.shard
-  IS 'Used for load sharding in the materialized indices. Should be set based on merchant_pub. 64-bit value because we need an *unsigned* 32-bit value.';
-COMMENT ON COLUMN deposits.known_coin_id
-  IS 'Used for garbage collection';
-COMMENT ON COLUMN deposits.wire_target_h_payto
-  IS 'Identifies the target bank account and KYC status';
-COMMENT ON COLUMN deposits.wire_salt
-  IS 'Salt used when hashing the payto://-URI to get the h_wire';
-COMMENT ON COLUMN deposits.done
-  IS 'Set to TRUE once we have included this deposit in some aggregate wire transfer to the merchant';
-COMMENT ON COLUMN deposits.extension_blocked
-  IS 'True if the aggregation of the deposit is currently blocked by some extension mechanism. Used to filter out deposits that must not be processed by the canonical deposit logic.';
-COMMENT ON COLUMN deposits.extension_details_serial_id
-  IS 'References extensions table, NULL if extensions are not used';
-
-CREATE TABLE IF NOT EXISTS deposits_default
-  PARTITION OF deposits
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_deposits_partition('default');
-
-
-SELECT create_table_deposits_by_ready();
-
-COMMENT ON TABLE deposits_by_ready
-  IS 'Enables fast lookups for deposits_get_ready, auto-populated via TRIGGER below';
-
-CREATE TABLE IF NOT EXISTS deposits_by_ready_default
-  PARTITION OF deposits_by_ready
-  DEFAULT;
-
-
-SELECT create_table_deposits_for_matching();
-
-COMMENT ON TABLE deposits_for_matching
-  IS 'Enables fast lookups for deposits_iterate_matching, auto-populated via TRIGGER below';
-
-CREATE TABLE IF NOT EXISTS deposits_for_matching_default
-  PARTITION OF deposits_for_matching
-  DEFAULT;
-
-
-CREATE OR REPLACE FUNCTION deposits_insert_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-
-  IF (is_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION deposits_insert_trigger()
-  IS 'Replicate deposit inserts into materialized indices.';
-
-CREATE TRIGGER deposits_on_insert
-  AFTER INSERT
-   ON deposits
-   FOR EACH ROW EXECUTE FUNCTION deposits_insert_trigger();
-
-CREATE OR REPLACE FUNCTION deposits_update_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-DECLARE
-  was_ready BOOLEAN;
-DECLARE
-  is_ready BOOLEAN;
-BEGIN
-  was_ready = NOT (OLD.done OR OLD.extension_blocked);
-  is_ready  = NOT (NEW.done OR NEW.extension_blocked);
-  IF (was_ready AND NOT is_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  IF (is_ready AND NOT was_ready)
-  THEN
-    INSERT INTO deposits_by_ready
-      (wire_deadline
-      ,shard
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.wire_deadline
-      ,NEW.shard
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-    INSERT INTO deposits_for_matching
-      (refund_deadline
-      ,merchant_pub
-      ,coin_pub
-      ,deposit_serial_id)
-    VALUES
-      (NEW.refund_deadline
-      ,NEW.merchant_pub
-      ,NEW.coin_pub
-      ,NEW.deposit_serial_id);
-  END IF;
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION deposits_update_trigger()
-  IS 'Replicate deposits changes into materialized indices.';
-
-CREATE TRIGGER deposits_on_update
-  AFTER UPDATE
-    ON deposits
-   FOR EACH ROW EXECUTE FUNCTION deposits_update_trigger();
-
-CREATE OR REPLACE FUNCTION deposits_delete_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-DECLARE
-  was_ready BOOLEAN;
-BEGIN
-  was_ready  = NOT (OLD.done OR OLD.extension_blocked);
-
-  IF (was_ready)
-  THEN
-    DELETE FROM deposits_by_ready
-     WHERE wire_deadline = OLD.wire_deadline
-       AND shard = OLD.shard
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-    DELETE FROM deposits_for_matching
-     WHERE refund_deadline = OLD.refund_deadline
-       AND merchant_pub = OLD.merchant_pub
-       AND coin_pub = OLD.coin_pub
-       AND deposit_serial_id = OLD.deposit_serial_id;
-  END IF;
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION deposits_delete_trigger()
-  IS 'Replicate deposit deletions into materialized indices.';
-
-CREATE TRIGGER deposits_on_delete
-  AFTER DELETE
-   ON deposits
-   FOR EACH ROW EXECUTE FUNCTION deposits_delete_trigger();
-
-
--- ------------------------------ refunds ----------------------------------------
-
-SELECT create_table_refunds();
-
-COMMENT ON TABLE refunds
-  IS 'Data on coins that were refunded. Technically, refunds always apply against specific deposit operations involving a coin. The combination of coin_pub, merchant_pub, h_contract_terms and rtransaction_id MUST be unique, and we usually select by coin_pub so that one goes first.';
-COMMENT ON COLUMN refunds.deposit_serial_id
-  IS 'Identifies ONLY the merchant_pub, h_contract_terms and coin_pub. Multiple deposits may match a refund, this only identifies one of them.';
-COMMENT ON COLUMN refunds.rtransaction_id
-  IS 'used by the merchant to make refunds unique in case the same coin for the same deposit gets a subsequent (higher) refund';
-
-CREATE TABLE IF NOT EXISTS refunds_default
-  PARTITION OF refunds
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_refunds_partition('default');
-
-
--- ------------------------------ wire_out ----------------------------------------
-
-SELECT create_table_wire_out();
-
-COMMENT ON TABLE wire_out
-  IS 'wire transfers the exchange has executed';
-COMMENT ON COLUMN wire_out.exchange_account_section
-  IS 'identifies the configuration section with the debit account of this payment';
-COMMENT ON COLUMN wire_out.wire_target_h_payto
-  IS 'Identifies the credited bank account and KYC status';
-
-CREATE TABLE IF NOT EXISTS wire_out_default
-  PARTITION OF wire_out
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wire_out_partition('default');
-
-CREATE OR REPLACE FUNCTION wire_out_delete_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  DELETE FROM aggregation_tracking
-   WHERE wtid_raw = OLD.wtid_raw;
-  RETURN OLD;
-END $$;
-COMMENT ON FUNCTION wire_out_delete_trigger()
-  IS 'Replicate reserve_out deletions into aggregation_tracking. This replaces an earlier use of an ON DELETE CASCADE that required a DEFERRABLE constraint and conflicted with nice partitioning.';
-
-CREATE TRIGGER wire_out_on_delete
-  AFTER DELETE
-    ON wire_out
-   FOR EACH ROW EXECUTE FUNCTION wire_out_delete_trigger();
-
-
-
--- ------------------------------ aggregation_transient ----------------------------------------
-
-SELECT create_table_aggregation_transient();
-
-COMMENT ON TABLE aggregation_transient
-  IS 'aggregations currently happening (lacking wire_out, usually because the amount is too low); this table is not replicated';
-COMMENT ON COLUMN aggregation_transient.amount_val
-  IS 'Sum of all of the aggregated deposits (without deposit fees)';
-COMMENT ON COLUMN aggregation_transient.wtid_raw
-  IS 'identifier of the wire transfer';
-
-CREATE TABLE IF NOT EXISTS aggregation_transient_default
-  PARTITION OF aggregation_transient
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-
--- ------------------------------ aggregation_tracking ----------------------------------------
-
-SELECT create_table_aggregation_tracking();
-
-COMMENT ON TABLE aggregation_tracking
-  IS 'mapping from wire transfer identifiers (WTID) to deposits (and back)';
-COMMENT ON COLUMN aggregation_tracking.wtid_raw
-  IS 'identifier of the wire transfer';
-
-CREATE TABLE IF NOT EXISTS aggregation_tracking_default
-  PARTITION OF aggregation_tracking
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_aggregation_tracking_partition('default');
-
-
--- ------------------------------ wire_fee ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS wire_fee
-  (wire_fee_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,wire_method VARCHAR NOT NULL
-  ,start_date INT8 NOT NULL
-  ,end_date INT8 NOT NULL
-  ,wire_fee_val INT8 NOT NULL
-  ,wire_fee_frac INT4 NOT NULL
-  ,closing_fee_val INT8 NOT NULL
-  ,closing_fee_frac INT4 NOT NULL
-  ,wad_fee_val INT8 NOT NULL
-  ,wad_fee_frac INT4 NOT NULL
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  ,PRIMARY KEY (wire_method, start_date)
-  );
-COMMENT ON TABLE wire_fee
-  IS 'list of the wire fees of this exchange, by date';
-COMMENT ON COLUMN wire_fee.wire_fee_serial
-  IS 'needed for exchange-auditor replication logic';
-
-CREATE INDEX IF NOT EXISTS wire_fee_by_end_date_index
-  ON wire_fee
-  (end_date);
-
-
--- ------------------------------ global_fee ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS global_fee
-  (global_fee_serial BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,start_date INT8 NOT NULL
-  ,end_date INT8 NOT NULL
-  ,history_fee_val INT8 NOT NULL
-  ,history_fee_frac INT4 NOT NULL
-  ,kyc_fee_val INT8 NOT NULL
-  ,kyc_fee_frac INT4 NOT NULL
-  ,account_fee_val INT8 NOT NULL
-  ,account_fee_frac INT4 NOT NULL
-  ,purse_fee_val INT8 NOT NULL
-  ,purse_fee_frac INT4 NOT NULL
-  ,purse_timeout INT8 NOT NULL
-  ,kyc_timeout INT8 NOT NULL
-  ,history_expiration INT8 NOT NULL
-  ,purse_account_limit INT4 NOT NULL
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  ,PRIMARY KEY (start_date)
-  );
-COMMENT ON TABLE global_fee
-  IS 'list of the global fees of this exchange, by date';
-COMMENT ON COLUMN global_fee.global_fee_serial
-  IS 'needed for exchange-auditor replication logic';
-
-CREATE INDEX IF NOT EXISTS global_fee_by_end_date_index
-  ON global_fee
-  (end_date);
-
-
--- ------------------------------ recoup ----------------------------------------
-
-SELECT create_table_recoup();
-
-COMMENT ON TABLE recoup
-  IS 'Information about recoups that were executed between a coin and a reserve. In this type of recoup, the amount is credited back to the reserve from which the coin originated.';
-COMMENT ON COLUMN recoup.coin_pub
-  IS 'Coin that is being debited in the recoup. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-COMMENT ON COLUMN recoup.reserve_out_serial_id
-  IS 'Identifies the h_blind_ev of the recouped coin and provides the link to the credited reserve.';
-COMMENT ON COLUMN recoup.coin_sig
-  IS 'Signature by the coin affirming the recoup, of type TALER_SIGNATURE_WALLET_COIN_RECOUP';
-COMMENT ON COLUMN recoup.coin_blind
-  IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the withdraw operation.';
-
-CREATE TABLE IF NOT EXISTS recoup_default
-  PARTITION OF recoup
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_recoup_partition('default');
-
-
-SELECT create_table_recoup_by_reserve();
-
-COMMENT ON TABLE recoup_by_reserve
-  IS 'Information in this table is strictly redundant with that of recoup, but saved by a different primary key for fast lookups by reserve_out_serial_id.';
-
-CREATE TABLE IF NOT EXISTS recoup_by_reserve_default
-  PARTITION OF recoup_by_reserve
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-CREATE OR REPLACE FUNCTION recoup_insert_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  INSERT INTO recoup_by_reserve
-    (reserve_out_serial_id
-    ,coin_pub)
-  VALUES
-    (NEW.reserve_out_serial_id
-    ,NEW.coin_pub);
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION recoup_insert_trigger()
-  IS 'Replicate recoup inserts into recoup_by_reserve table.';
-
-CREATE TRIGGER recoup_on_insert
-  AFTER INSERT
-   ON recoup
-   FOR EACH ROW EXECUTE FUNCTION recoup_insert_trigger();
-
-CREATE OR REPLACE FUNCTION recoup_delete_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  DELETE FROM recoup_by_reserve
-   WHERE reserve_out_serial_id = OLD.reserve_out_serial_id
-     AND coin_pub = OLD.coin_pub;
-  RETURN OLD;
-END $$;
-COMMENT ON FUNCTION recoup_delete_trigger()
-  IS 'Replicate recoup deletions into recoup_by_reserve table.';
-
-CREATE TRIGGER recoup_on_delete
-  AFTER DELETE
-    ON recoup
-   FOR EACH ROW EXECUTE FUNCTION recoup_delete_trigger();
-
-
--- ------------------------------ recoup_refresh ----------------------------------------
-
-SELECT create_table_recoup_refresh();
-
-COMMENT ON TABLE recoup_refresh
-  IS 'Table of coins that originated from a refresh operation and that were recouped. Links the (fresh) coin to the melted operation (and thus the old coin). A recoup on a refreshed coin credits the old coin and debits the fresh coin.';
-COMMENT ON COLUMN recoup_refresh.coin_pub
-  IS 'Refreshed coin of a revoked denomination where the residual value is credited to the old coin. Do not CASCADE ON DROP on the coin_pub, as we may keep the coin alive!';
-COMMENT ON COLUMN recoup_refresh.known_coin_id
-  IS 'FIXME: (To be) used for garbage collection (in the future)';
-COMMENT ON COLUMN recoup_refresh.rrc_serial
-  IS 'Link to the refresh operation. Also identifies the h_blind_ev of the recouped coin (as h_coin_ev).';
-COMMENT ON COLUMN recoup_refresh.coin_blind
-  IS 'Denomination blinding key used when creating the blinded coin from the planchet. Secret revealed during the recoup to provide the linkage between the coin and the refresh operation.';
-
-CREATE TABLE IF NOT EXISTS recoup_refresh_default
-  PARTITION OF recoup_refresh
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_recoup_refresh_partition('default');
-
-
--- ------------------------------ prewire ----------------------------------------
-
-SELECT create_table_prewire();
-
-COMMENT ON TABLE prewire
-  IS 'pre-commit data for wire transfers we are about to execute';
-COMMENT ON COLUMN prewire.failed
-  IS 'set to TRUE if the bank responded with a non-transient failure to our transfer request';
-COMMENT ON COLUMN prewire.finished
-  IS 'set to TRUE once bank confirmed receiving the wire transfer request';
-COMMENT ON COLUMN prewire.buf
-  IS 'serialized data to send to the bank to execute the wire transfer';
-
-CREATE TABLE IF NOT EXISTS prewire_default
-  PARTITION OF prewire
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-
--- ------------------------------ wire_accounts ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS wire_accounts
-  (payto_uri VARCHAR PRIMARY KEY
-  ,master_sig BYTEA CHECK (LENGTH(master_sig)=64)
-  ,is_active BOOLEAN NOT NULL
-  ,last_change INT8 NOT NULL
-  );
-COMMENT ON TABLE wire_accounts
-  IS 'Table with current and historic bank accounts of the exchange. Entries never expire as we need to remember the last_change column indefinitely.';
-COMMENT ON COLUMN wire_accounts.payto_uri
-  IS 'payto URI (RFC 8905) with the bank account of the exchange.';
-COMMENT ON COLUMN wire_accounts.master_sig
-  IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS';
-COMMENT ON COLUMN wire_accounts.is_active
-  IS 'true if we are currently supporting the use of this account.';
-COMMENT ON COLUMN wire_accounts.last_change
-  IS 'Latest time when active status changed. Used to detect replays of old messages.';
--- "wire_accounts" has no sequence because it is a 'mutable' table
---            and is of no concern to the auditor
-
-
--- ------------------------------ cs_nonce_locks ----------------------------------------
-
-SELECT create_table_cs_nonce_locks();
-
-COMMENT ON TABLE cs_nonce_locks
-  IS 'ensures a Clause Schnorr client nonce is locked for use with an operation identified by a hash';
-COMMENT ON COLUMN cs_nonce_locks.nonce
-  IS 'actual nonce submitted by the client';
-COMMENT ON COLUMN cs_nonce_locks.op_hash
-  IS 'hash (RC for refresh, blind coin hash for withdraw) the nonce may be used with';
-COMMENT ON COLUMN cs_nonce_locks.max_denomination_serial
-  IS 'Maximum number of a CS denomination serial the nonce could be used with, for GC';
-
-CREATE TABLE IF NOT EXISTS cs_nonce_locks_default
-  PARTITION OF cs_nonce_locks
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_cs_nonce_locks_partition('default');
-
-
--- ------------------------------ work_shards ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS work_shards
-  (shard_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,last_attempt INT8 NOT NULL
-  ,start_row INT8 NOT NULL
-  ,end_row INT8 NOT NULL
-  ,completed BOOLEAN NOT NULL DEFAULT FALSE
-  ,job_name VARCHAR NOT NULL
-  ,PRIMARY KEY (job_name, start_row)
-  );
-COMMENT ON TABLE work_shards
-  IS 'coordinates work between multiple processes working on the same job';
-COMMENT ON COLUMN work_shards.shard_serial_id
-  IS 'unique serial number identifying the shard';
-COMMENT ON COLUMN work_shards.last_attempt
-  IS 'last time a worker attempted to work on the shard';
-COMMENT ON COLUMN work_shards.completed
-  IS 'set to TRUE once the shard is finished by a worker';
-COMMENT ON COLUMN work_shards.start_row
-  IS 'row at which the shard scope starts, inclusive';
-COMMENT ON COLUMN work_shards.end_row
-  IS 'row at which the shard scope ends, exclusive';
-COMMENT ON COLUMN work_shards.job_name
-  IS 'unique name of the job the workers on this shard are performing';
-
-CREATE INDEX IF NOT EXISTS work_shards_by_job_name_completed_last_attempt_index
-  ON work_shards
-  (job_name
-  ,completed
-  ,last_attempt
-  );
-
-
--- ------------------------------ revolving_work_shards ----------------------------------------
-
-CREATE UNLOGGED TABLE IF NOT EXISTS revolving_work_shards
-  (shard_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,last_attempt INT8 NOT NULL
-  ,start_row INT4 NOT NULL
-  ,end_row INT4 NOT NULL
-  ,active BOOLEAN NOT NULL DEFAULT FALSE
-  ,job_name VARCHAR NOT NULL
-  ,PRIMARY KEY (job_name, start_row)
-  );
-COMMENT ON TABLE revolving_work_shards
-  IS 'coordinates work between multiple processes working on the same job with partitions that need to be repeatedly processed; unlogged because on system crashes the locks represented by this table will have to be cleared anyway, typically using "taler-exchange-dbinit -s"';
-COMMENT ON COLUMN revolving_work_shards.shard_serial_id
-  IS 'unique serial number identifying the shard';
-COMMENT ON COLUMN revolving_work_shards.last_attempt
-  IS 'last time a worker attempted to work on the shard';
-COMMENT ON COLUMN revolving_work_shards.active
-  IS 'set to TRUE when a worker is active on the shard';
-COMMENT ON COLUMN revolving_work_shards.start_row
-  IS 'row at which the shard scope starts, inclusive';
-COMMENT ON COLUMN revolving_work_shards.end_row
-  IS 'row at which the shard scope ends, exclusive';
-COMMENT ON COLUMN revolving_work_shards.job_name
-  IS 'unique name of the job the workers on this shard are performing';
-
-CREATE INDEX IF NOT EXISTS revolving_work_shards_by_job_name_active_last_attempt_index
-  ON revolving_work_shards
-  (job_name
-  ,active
-  ,last_attempt
-  );
-
---------------------------------------------------------------------------
---                        Tables for P2P payments
---------------------------------------------------------------------------
-
--- ------------------------------ partners ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS partners
-  (partner_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE
-  ,partner_master_pub BYTEA NOT NULL CHECK(LENGTH(partner_master_pub)=32)
-  ,start_date INT8 NOT NULL
-  ,end_date INT8 NOT NULL
-  ,next_wad INT8 NOT NULL DEFAULT (0)
-  ,wad_frequency INT8 NOT NULL
-  ,wad_fee_val INT8 NOT NULL
-  ,wad_fee_frac INT4 NOT NULL
-  ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64)
-  ,partner_base_url TEXT NOT NULL
-  );
-COMMENT ON TABLE partners
-  IS 'exchanges we do wad transfers to';
-COMMENT ON COLUMN partners.partner_master_pub
-  IS 'offline master public key of the partner';
-COMMENT ON COLUMN partners.start_date
-  IS 'starting date of the partnership';
-COMMENT ON COLUMN partners.end_date
-  IS 'end date of the partnership';
-COMMENT ON COLUMN partners.next_wad
-  IS 'at what time should we do the next wad transfer to this partner (frequently updated); set to forever after the end_date';
-COMMENT ON COLUMN partners.wad_frequency
-  IS 'how often do we promise to do wad transfers';
-COMMENT ON COLUMN partners.wad_fee_val
-  IS 'how high is the fee for a wallet to be added to a wad to this partner';
-COMMENT ON COLUMN partners.partner_base_url
-  IS 'base URL of the REST API for this partner';
-COMMENT ON COLUMN partners.master_sig
-  IS 'signature of our master public key affirming the partnership, of purpose TALER_SIGNATURE_MASTER_PARTNER_DETAILS';
-
-CREATE INDEX IF NOT EXISTS partner_by_wad_time
-  ON partners (next_wad ASC);
-
--- ------------------------------ purse_requests ----------------------------------------
-
-SELECT create_table_purse_requests();
-
-COMMENT ON TABLE purse_requests
-  IS 'Requests establishing purses, associating them with a contract but without a target reserve';
-COMMENT ON COLUMN purse_requests.purse_pub
-  IS 'Public key of the purse';
-COMMENT ON COLUMN purse_requests.purse_creation
-  IS 'Local time when the purse was created. Determines applicable purse fees.';
-COMMENT ON COLUMN purse_requests.purse_expiration
-  IS 'When the purse is set to expire';
-COMMENT ON COLUMN purse_requests.h_contract_terms
-  IS 'Hash of the contract the parties are to agree to';
-COMMENT ON COLUMN purse_requests.flags
-  IS 'see the enum TALER_WalletAccountMergeFlags';
-COMMENT ON COLUMN purse_requests.finished
-  IS 'set to TRUE once the purse has been merged (into reserve or wad) or the coins were refunded (transfer aborted)';
-COMMENT ON COLUMN purse_requests.refunded
-  IS 'set to TRUE if the purse could not be merged and thus all deposited coins were refunded';
-COMMENT ON COLUMN purse_requests.in_reserve_quota
-  IS 'set to TRUE if this purse currently counts against the number of free purses in the respective reserve';
-COMMENT ON COLUMN purse_requests.amount_with_fee_val
-  IS 'Total amount expected to be in the purse';
-COMMENT ON COLUMN purse_requests.purse_fee_val
-  IS 'Purse fee the client agreed to pay from the reserve (accepted by the exchange at the time the purse was created). Zero if in_reserve_quota is TRUE.';
-COMMENT ON COLUMN purse_requests.balance_val
-  IS 'Total amount actually in the purse';
-COMMENT ON COLUMN purse_requests.purse_sig
-  IS 'Signature of the purse affirming the purse parameters, of type TALER_SIGNATURE_PURSE_REQUEST';
-
-CREATE TABLE IF NOT EXISTS purse_requests_default
-  PARTITION OF purse_requests
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_purse_requests_partition('default');
-
-
-
--- ------------------------------ purse_merges ----------------------------------------
-
-SELECT create_table_purse_merges();
-
-COMMENT ON TABLE purse_merges
-  IS 'Merge requests where a purse-owner requested merging the purse into the account';
-COMMENT ON COLUMN purse_merges.partner_serial_id
-  IS 'identifies the partner exchange, NULL in case the target reserve lives at this exchange';
-COMMENT ON COLUMN purse_merges.reserve_pub
-  IS 'public key of the target reserve';
-COMMENT ON COLUMN purse_merges.purse_pub
-  IS 'public key of the purse';
-COMMENT ON COLUMN purse_merges.merge_sig
-  IS 'signature by the purse private key affirming the merge, of type TALER_SIGNATURE_WALLET_PURSE_MERGE';
-COMMENT ON COLUMN purse_merges.merge_timestamp
-  IS 'when was the merge message signed';
-
-CREATE TABLE IF NOT EXISTS purse_merges_default
-  PARTITION OF purse_merges
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_purse_merges_partition('default');
-
-
--- ------------------------------ account_merges ----------------------------------------
-
-SELECT create_table_account_merges();
-
-COMMENT ON TABLE account_merges
-  IS 'Merge requests where a purse- and account-owner requested merging the purse into the account';
-COMMENT ON COLUMN account_merges.reserve_pub
-  IS 'public key of the target reserve';
-COMMENT ON COLUMN account_merges.purse_pub
-  IS 'public key of the purse';
-COMMENT ON COLUMN account_merges.reserve_sig
-  IS 'signature by the reserve private key affirming the merge, of type TALER_SIGNATURE_WALLET_ACCOUNT_MERGE';
-
-CREATE TABLE IF NOT EXISTS account_merges_default
-  PARTITION OF account_merges
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_account_merges_partition('default');
-
-
--- ------------------------------ contracts ----------------------------------------
-
-SELECT create_table_contracts();
-
-COMMENT ON TABLE contracts
-  IS 'encrypted contracts associated with purses';
-COMMENT ON COLUMN contracts.purse_pub
-  IS 'public key of the purse that the contract is associated with';
-COMMENT ON COLUMN contracts.contract_sig
-  IS 'signature over the encrypted contract by the purse contract key';
-COMMENT ON COLUMN contracts.pub_ckey
-  IS 'Public ECDH key used to encrypt the contract, to be used with the purse private key for decryption';
-COMMENT ON COLUMN contracts.e_contract
-  IS 'AES-GCM encrypted contract terms (contains gzip compressed JSON after decryption)';
-
-CREATE TABLE IF NOT EXISTS contracts_default
-  PARTITION OF contracts
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_contracts_partition('default');
-
-
--- ------------------------------ history_requests ----------------------------------------
-
-SELECT create_table_history_requests();
-
-COMMENT ON TABLE history_requests
-  IS 'Paid history requests issued by a client against a reserve';
-COMMENT ON COLUMN history_requests.request_timestamp
-  IS 'When was the history request made';
-COMMENT ON COLUMN history_requests.reserve_sig
-  IS 'Signature approving payment for the history request';
-COMMENT ON COLUMN history_requests.history_fee_val
-  IS 'History fee approved by the signature';
-
-CREATE TABLE IF NOT EXISTS history_requests_default
-  PARTITION OF history_requests
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
--- ------------------------------ close_requests ----------------------------------------
-
-SELECT create_table_close_requests();
-
-COMMENT ON TABLE close_requests
-  IS 'Explicit requests by a reserve owner to close a reserve immediately';
-COMMENT ON COLUMN close_requests.close_timestamp
-  IS 'When the request was created by the client';
-COMMENT ON COLUMN close_requests.reserve_sig
-  IS 'Signature affirming that the reserve is to be closed';
-COMMENT ON COLUMN close_requests.close_val
-  IS 'Balance of the reserve at the time of closing, to be wired to the associated bank account (minus the closing fee)';
-
-CREATE TABLE IF NOT EXISTS close_requests_default
-  PARTITION OF close_requests
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-
--- ------------------------------ purse_deposits ----------------------------------------
-
-SELECT create_table_purse_deposits();
-
-COMMENT ON TABLE purse_deposits
-  IS 'Requests depositing coins into a purse';
-COMMENT ON COLUMN purse_deposits.partner_serial_id
-  IS 'identifies the partner exchange, NULL in case the target purse lives at this exchange';
-COMMENT ON COLUMN purse_deposits.purse_pub
-  IS 'Public key of the purse';
-COMMENT ON COLUMN purse_deposits.coin_pub
-  IS 'Public key of the coin being deposited';
-COMMENT ON COLUMN purse_deposits.amount_with_fee_val
-  IS 'Total amount being deposited';
-COMMENT ON COLUMN purse_deposits.coin_sig
-  IS 'Signature of the coin affirming the deposit into the purse, of type TALER_SIGNATURE_PURSE_DEPOSIT';
-
-CREATE TABLE IF NOT EXISTS purse_deposits_default
-  PARTITION OF purse_deposits
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_purse_deposits_partition('default');
-
-
--- ------------------------------ wads_out ----------------------------------------
-
-SELECT create_table_wads_out();
-
-COMMENT ON TABLE wads_out
-  IS 'Wire transfers made to another exchange to transfer purse funds';
-COMMENT ON COLUMN wads_out.wad_id
-  IS 'Unique identifier of the wad, part of the wire transfer subject';
-COMMENT ON COLUMN wads_out.partner_serial_id
-  IS 'target exchange of the wad';
-COMMENT ON COLUMN wads_out.amount_val
-  IS 'Amount that was wired';
-COMMENT ON COLUMN wads_out.execution_time
-  IS 'Time when the wire transfer was scheduled';
-
-CREATE TABLE IF NOT EXISTS wads_out_default
-  PARTITION OF wads_out
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wads_out_partition('default');
-
-
--- ------------------------------ wads_out_entries ----------------------------------------
-
-SELECT create_table_wad_out_entries();
-
-COMMENT ON TABLE wad_out_entries
-  IS 'Purses combined into a wad';
-COMMENT ON COLUMN wad_out_entries.wad_out_serial_id
-  IS 'Wad the purse was part of';
-COMMENT ON COLUMN wad_out_entries.reserve_pub
-  IS 'Target reserve for the purse';
-COMMENT ON COLUMN wad_out_entries.purse_pub
-  IS 'Public key of the purse';
-COMMENT ON COLUMN wad_out_entries.h_contract
-  IS 'Hash of the contract associated with the purse';
-COMMENT ON COLUMN wad_out_entries.purse_expiration
-  IS 'Time when the purse expires';
-COMMENT ON COLUMN wad_out_entries.merge_timestamp
-  IS 'Time when the merge was approved';
-COMMENT ON COLUMN wad_out_entries.amount_with_fee_val
-  IS 'Total amount in the purse';
-COMMENT ON COLUMN wad_out_entries.wad_fee_val
-  IS 'Wat fee charged to the purse';
-COMMENT ON COLUMN wad_out_entries.deposit_fees_val
-  IS 'Total deposit fees charged to the purse';
-COMMENT ON COLUMN wad_out_entries.reserve_sig
-  IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-COMMENT ON COLUMN wad_out_entries.purse_sig
-  IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-CREATE TABLE IF NOT EXISTS wad_out_entries_default
-  PARTITION OF wad_out_entries
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wad_out_entries_partition('default');
-
--- ------------------------------ wads_in ----------------------------------------
-
-SELECT create_table_wads_in();
-
-COMMENT ON TABLE wads_in
-  IS 'Incoming exchange-to-exchange wad wire transfers';
-COMMENT ON COLUMN wads_in.wad_id
-  IS 'Unique identifier of the wad, part of the wire transfer subject';
-COMMENT ON COLUMN wads_in.origin_exchange_url
-  IS 'Base URL of the originating URL, also part of the wire transfer subject';
-COMMENT ON COLUMN wads_in.amount_val
-  IS 'Actual amount that was received by our exchange';
-COMMENT ON COLUMN wads_in.arrival_time
-  IS 'Time when the wad was received';
-
-CREATE TABLE IF NOT EXISTS wads_in_default
-  PARTITION OF wads_in
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wads_in_partition('default');
-
-
--- ------------------------------ wads_in_entries ----------------------------------------
-
-SELECT create_table_wad_in_entries();
-
-COMMENT ON TABLE wad_in_entries
-  IS 'list of purses aggregated in a wad according to the sending exchange';
-COMMENT ON COLUMN wad_in_entries.wad_in_serial_id
-  IS 'wad for which the given purse was included in the aggregation';
-COMMENT ON COLUMN wad_in_entries.reserve_pub
-  IS 'target account of the purse (must be at the local exchange)';
-COMMENT ON COLUMN wad_in_entries.purse_pub
-  IS 'public key of the purse that was merged';
-COMMENT ON COLUMN wad_in_entries.h_contract
-  IS 'hash of the contract terms of the purse';
-COMMENT ON COLUMN wad_in_entries.purse_expiration
-  IS 'Time when the purse was set to expire';
-COMMENT ON COLUMN wad_in_entries.merge_timestamp
-  IS 'Time when the merge was approved';
-COMMENT ON COLUMN wad_in_entries.amount_with_fee_val
-  IS 'Total amount in the purse';
-COMMENT ON COLUMN wad_in_entries.wad_fee_val
-  IS 'Total wad fees paid by the purse';
-COMMENT ON COLUMN wad_in_entries.deposit_fees_val
-  IS 'Total deposit fees paid when depositing coins into the purse';
-COMMENT ON COLUMN wad_in_entries.reserve_sig
-  IS 'Signature by the receiving reserve, of purpose TALER_SIGNATURE_ACCOUNT_MERGE';
-COMMENT ON COLUMN wad_in_entries.purse_sig
-  IS 'Signature by the purse of purpose TALER_SIGNATURE_PURSE_MERGE';
-
-CREATE TABLE IF NOT EXISTS wad_in_entries_default
-  PARTITION OF wad_in_entries
-  FOR VALUES WITH (MODULUS 1, REMAINDER 0);
-
-SELECT add_constraints_to_wad_in_entries_partition('default');
-
-
--- ------------------------------ partner_accounts ----------------------------------------
-
-CREATE TABLE IF NOT EXISTS partner_accounts
-  (payto_uri VARCHAR PRIMARY KEY
-  ,partner_serial_id INT8 REFERENCES partners(partner_serial_id) ON DELETE CASCADE
-  ,partner_master_sig BYTEA CHECK (LENGTH(partner_master_sig)=64)
-  ,last_seen INT8 NOT NULL
-  );
-CREATE INDEX IF NOT EXISTS partner_accounts_index_by_partner_and_time
-  ON partner_accounts (partner_serial_id,last_seen);
-COMMENT ON TABLE partner_accounts
-  IS 'Table with bank accounts of the partner exchange. Entries never expire as we need to remember the signature for the auditor.';
-COMMENT ON COLUMN partner_accounts.payto_uri
-  IS 'payto URI (RFC 8905) with the bank account of the partner exchange.';
-COMMENT ON COLUMN partner_accounts.partner_master_sig
-  IS 'Signature of purpose TALER_SIGNATURE_MASTER_WIRE_DETAILS by the partner master public key';
-COMMENT ON COLUMN partner_accounts.last_seen
-  IS 'Last time we saw this account as being active at the partner exchange. Used to select the most recent entry, and to detect when we should check again.';
-
-
------------------------ router helper table (not synchronzied) ------------------------
-
-CREATE TABLE IF NOT EXISTS purse_actions
-  (purse_pub BYTEA NOT NULL PRIMARY KEY CHECK(LENGTH(purse_pub)=32)
-  ,action_date INT8 NOT NULL
-  ,partner_serial_id INT8
-  );
-COMMENT ON TABLE purse_actions
-  IS 'purses awaiting some action by the router';
-COMMENT ON COLUMN purse_actions.purse_pub
-  IS 'public (contract) key of the purse';
-COMMENT ON COLUMN purse_actions.action_date
-  IS 'when is the purse ready for action';
-COMMENT ON COLUMN purse_actions.partner_serial_id
-  IS 'wad target of an outgoing wire transfer, 0 for local, NULL if the purse is unmerged and thus the target is still unknown';
-
-CREATE INDEX IF NOT EXISTS purse_action_by_target
-  ON purse_actions
-  (partner_serial_id,action_date);
-
-
-CREATE OR REPLACE FUNCTION purse_requests_insert_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  ASSERT NOT NEW.finished,'Internal invariant violated';
-  INSERT INTO
-    purse_actions
-    (purse_pub
-    ,action_date)
-  VALUES
-    (NEW.purse_pub
-    ,NEW.purse_expiration);
-  RETURN NEW;
-END $$;
-COMMENT ON FUNCTION purse_requests_insert_trigger()
-  IS 'When a purse is created, insert it into the purse_action table to take action when the purse expires.';
-
-CREATE TRIGGER purse_requests_on_insert
-  AFTER INSERT
-   ON purse_requests
-   FOR EACH ROW EXECUTE FUNCTION purse_requests_insert_trigger();
-COMMENT ON TRIGGER purse_requests_on_insert
-        ON purse_requests
-  IS 'Here we install an entry for the purse expiration.';
-
-
-CREATE OR REPLACE FUNCTION purse_requests_on_update_trigger()
-  RETURNS trigger
-  LANGUAGE plpgsql
-  AS $$
-BEGIN
-  IF (NEW.finished)
-  THEN
-    -- If this purse counted against the reserve's
-    -- quota of purses, decrement the reserve accounting.
-    IF (NEW.in_reserve_quota)
-    THEN
-      UPDATE reserves
-         SET purses_active=purses_active-1
-       WHERE reserve_pub IN
-         (SELECT reserve_pub
-            FROM purse_merges
-           WHERE purse_pub=NEW.purse_pub
-           LIMIT 1);
-      NEW.in_reserve_quota=FALSE;
-    END IF;
-    -- Delete from the purse_actions table, we are done
-    -- with this purse for good.
-    DELETE FROM purse_actions
-          WHERE purse_pub=NEW.purse_pub;
-    RETURN NEW;
-  END IF;
-
-  RETURN NEW;
-END $$;
-
-COMMENT ON FUNCTION purse_requests_on_update_trigger()
-  IS 'Trigger the router if the purse is ready. Also removes the entry from the router watchlist once the purse is finished.';
-
-CREATE TRIGGER purse_requests_on_update
-  BEFORE UPDATE
-   ON purse_requests
-   FOR EACH ROW EXECUTE FUNCTION purse_requests_on_update_trigger();
-COMMENT ON TRIGGER purse_requests_on_update
-  ON purse_requests
-  IS 'This covers the case where a deposit is made into a purse, which inherently then changes the purse balance via an UPDATE. If the merge is already present and the balance matches the total, we trigger the router. Once the router sets the purse to finished, the trigger will remove the purse from the watchlist of the router.';
-
----------------------------------------------------------------------------
---                      Stored procedures
----------------------------------------------------------------------------
-
-CREATE OR REPLACE FUNCTION exchange_do_withdraw(
-  IN cs_nonce BYTEA,
-  IN amount_val INT8,
-  IN amount_frac INT4,
-  IN h_denom_pub BYTEA,
-  IN rpub BYTEA,
-  IN reserve_sig BYTEA,
-  IN h_coin_envelope BYTEA,
-  IN denom_sig BYTEA,
-  IN now INT8,
-  IN min_reserve_gc INT8,
-  OUT reserve_found BOOLEAN,
-  OUT balance_ok BOOLEAN,
-  OUT kycok BOOLEAN,
-  OUT account_uuid INT8,
-  OUT ruuid INT8)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  denom_serial INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=0;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- We optimistically insert, and then on conflict declare
--- the query successful due to idempotency.
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- idempotent query, all constraints must be satisfied
-  reserve_found=TRUE;
-  balance_ok=TRUE;
-  kycok=TRUE;
-  account_uuid=0;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
-
--- Special actions needed for a CS withdraw?
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      reserve_found=FALSE;
-      balance_ok=FALSE;
-      kycok=FALSE;
-      account_uuid=0;
-      ruuid=1; -- FIXME: return error message more nicely!
-      ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-COMMENT ON FUNCTION exchange_do_withdraw(BYTEA, INT8, INT4, BYTEA, BYTEA, BYTEA, BYTEA, BYTEA, INT8, INT8)
-  IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result';
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_batch_withdraw(
-  IN amount_val INT8,
-  IN amount_frac INT4,
-  IN rpub BYTEA,
-  IN now INT8,
-  IN min_reserve_gc INT8,
-  OUT reserve_found BOOLEAN,
-  OUT balance_ok BOOLEAN,
-  OUT kycok BOOLEAN,
-  OUT account_uuid INT8,
-  OUT ruuid INT8)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  reserve_gc INT8;
-DECLARE
-  reserve_val INT8;
-DECLARE
-  reserve_frac INT4;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-SELECT
-   current_balance_val
-  ,current_balance_frac
-  ,gc_date
-  ,reserve_uuid
- INTO
-   reserve_val
-  ,reserve_frac
-  ,reserve_gc
-  ,ruuid
-  FROM reserves
- WHERE reserves.reserve_pub=rpub;
-
-IF NOT FOUND
-THEN
-  -- reserve unknown
-  reserve_found=FALSE;
-  balance_ok=FALSE;
-  kycok=FALSE;
-  account_uuid=0;
-  ruuid=2;
-  RETURN;
-END IF;
-
--- Check reserve balance is sufficient.
-IF (reserve_val > amount_val)
-THEN
-  IF (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=reserve_val - amount_val;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_val=reserve_val - amount_val - 1;
-    reserve_frac=reserve_frac + 100000000 - amount_frac;
-  END IF;
-ELSE
-  IF (reserve_val = amount_val) AND (reserve_frac >= amount_frac)
-  THEN
-    reserve_val=0;
-    reserve_frac=reserve_frac - amount_frac;
-  ELSE
-    reserve_found=TRUE;
-    balance_ok=FALSE;
-    kycok=FALSE; -- we do not really know or care
-    account_uuid=0;
-    RETURN;
-  END IF;
-END IF;
-
--- Calculate new expiration dates.
-min_reserve_gc=GREATEST(min_reserve_gc,reserve_gc);
-
--- Update reserve balance.
-UPDATE reserves SET
-  gc_date=min_reserve_gc
- ,current_balance_val=reserve_val
- ,current_balance_frac=reserve_frac
-WHERE
-  reserves.reserve_pub=rpub;
-
-reserve_found=TRUE;
-balance_ok=TRUE;
-
-
--- Obtain KYC status based on the last wire transfer into
--- this reserve. FIXME: likely not adequate for reserves that got P2P transfers!
--- SELECT
---    kyc_ok
---   ,wire_target_serial_id
---   INTO
---    kycok
---   ,account_uuid
---   FROM reserves_in
---   JOIN wire_targets ON (wire_source_h_payto = wire_target_h_payto)
---  WHERE reserve_pub=rpub
---  LIMIT 1; -- limit 1 should not be required (without p2p transfers)
-
-WITH reserves_in AS materialized (
-  SELECT wire_source_h_payto
-  FROM reserves_in WHERE
-  reserve_pub=rpub
-)
-SELECT
-  kyc_ok
-  ,wire_target_serial_id
-INTO
-  kycok
-  ,account_uuid
-FROM wire_targets
-  WHERE wire_target_h_payto = (
-    SELECT wire_source_h_payto
-      FROM reserves_in
-  );
-
-END $$;
-
-COMMENT ON FUNCTION exchange_do_batch_withdraw(INT8, INT4, BYTEA, INT8, INT8)
-  IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and if so updates the database with the result. Excludes storing the planchets.';
-
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_batch_withdraw_insert(
-  IN cs_nonce BYTEA,
-  IN amount_val INT8,
-  IN amount_frac INT4,
-  IN h_denom_pub BYTEA,
-  IN ruuid INT8,
-  IN reserve_sig BYTEA,
-  IN h_coin_envelope BYTEA,
-  IN denom_sig BYTEA,
-  IN now INT8,
-  OUT out_denom_unknown BOOLEAN,
-  OUT out_nonce_reuse BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  denom_serial INT8;
-BEGIN
--- Shards: reserves by reserve_pub (SELECT)
---         reserves_out (INSERT, with CONFLICT detection) by wih
---         reserves by reserve_pub (UPDATE)
---         reserves_in by reserve_pub (SELECT)
---         wire_targets by wire_target_h_payto
-
-out_denom_unknown=TRUE;
-out_conflict=TRUE;
-out_nonce_reuse=TRUE;
-
-SELECT denominations_serial
-  INTO denom_serial
-  FROM denominations
- WHERE denom_pub_hash=h_denom_pub;
-
-IF NOT FOUND
-THEN
-  -- denomination unknown, should be impossible!
-  out_denom_unknown=TRUE;
-  ASSERT false, 'denomination unknown';
-  RETURN;
-END IF;
-out_denom_unknown=FALSE;
-
-INSERT INTO reserves_out
-  (h_blind_ev
-  ,denominations_serial
-  ,denom_sig
-  ,reserve_uuid
-  ,reserve_sig
-  ,execution_date
-  ,amount_with_fee_val
-  ,amount_with_fee_frac)
-VALUES
-  (h_coin_envelope
-  ,denom_serial
-  ,denom_sig
-  ,ruuid
-  ,reserve_sig
-  ,now
-  ,amount_val
-  ,amount_frac)
-ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  out_conflict=TRUE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
--- Special actions needed for a CS withdraw?
-out_nonce_reuse=FALSE;
-IF NOT NULL cs_nonce
-THEN
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_nonce
-    ,denom_serial
-    ,h_coin_envelope)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- See if the existing entry is identical.
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_nonce
-       AND op_hash=h_coin_envelope;
-    IF NOT FOUND
-    THEN
-      out_nonce_reuse=TRUE;
-      ASSERT false, 'nonce reuse attempted by client';
-      RETURN;
-    END IF;
-  END IF;
-END IF;
-
-END $$;
-
-COMMENT ON FUNCTION exchange_do_batch_withdraw_insert(BYTEA, INT8, INT4, BYTEA, INT8, BYTEA, BYTEA, BYTEA, INT8)
-  IS 'Stores information about a planchet for a batch withdraw operation. Checks if the planchet already exists, and in that case indicates a conflict';
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_withdraw_limit_check(
-  IN ruuid INT8,
-  IN start_time INT8,
-  IN upper_limit_val INT8,
-  IN upper_limit_frac INT4,
-  OUT below_limit BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  total_val INT8;
-DECLARE
-  total_frac INT8; -- INT4 could overflow during accumulation!
-BEGIN
--- NOTE: Read-only, but crosses shards.
--- Shards: reserves by reserve_pub
---         reserves_out by reserve_uuid -- crosses shards!!
-
-
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   total_val
-  ,total_frac
-  FROM reserves_out
- WHERE reserve_uuid=ruuid
-   AND execution_date > start_time;
-
--- normalize result
-total_val = total_val + total_frac / 100000000;
-total_frac = total_frac % 100000000;
-
--- compare to threshold
-below_limit = (total_val < upper_limit_val) OR
-            ( (total_val = upper_limit_val) AND
-              (total_frac <= upper_limit_frac) );
-END $$;
-
-COMMENT ON FUNCTION exchange_do_withdraw_limit_check(INT8, INT8, INT8, INT4)
-  IS 'Check whether the withdrawals from the given reserve since the given time are below the given threshold';
-
-
--- NOTE: experiment, currently dead, see postgres_Start_deferred_wire_out;
--- now done inline. FIXME: Remove code here once inline version is confirmed working nicely!
-CREATE OR REPLACE PROCEDURE defer_wire_out()
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
-IF EXISTS (
-  SELECT 1
-    FROM information_Schema.constraint_column_usage
-   WHERE table_name='wire_out'
-     AND constraint_name='wire_out_ref')
-THEN
-  SET CONSTRAINTS wire_out_ref DEFERRED;
-END IF;
-
-END $$;
-
-
-CREATE OR REPLACE FUNCTION exchange_do_recoup_by_reserve(
-  IN res_pub BYTEA
-)
-RETURNS TABLE
-(
-  denom_sig            BYTEA,
-  denominations_serial BIGINT,
-  coin_pub             BYTEA,
-  coin_sig             BYTEA,
-  coin_blind           BYTEA,
-  amount_val           BIGINT,
-  amount_frac          INTEGER,
-  recoup_timestamp     BIGINT
-)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  res_uuid BIGINT;
-  blind_ev BYTEA;
-  c_pub    BYTEA;
-BEGIN
-  SELECT reserve_uuid
-  INTO res_uuid
-  FROM reserves
-  WHERE reserves.reserve_pub = res_pub;
-
-  FOR blind_ev IN
-    SELECT h_blind_ev
-      FROM reserves_out_by_reserve
-    WHERE reserves_out_by_reserve.reserve_uuid = res_uuid
-  LOOP
-    SELECT robr.coin_pub
-      INTO c_pub
-      FROM recoup_by_reserve robr
-    WHERE robr.reserve_out_serial_id = (
-      SELECT reserves_out.reserve_out_serial_id
-        FROM reserves_out
-      WHERE reserves_out.h_blind_ev = blind_ev
-    );
-    RETURN QUERY
-      SELECT kc.denom_sig,
-             kc.denominations_serial,
-             rc.coin_pub,
-             rc.coin_sig,
-             rc.coin_blind,
-             rc.amount_val,
-             rc.amount_frac,
-             rc.recoup_timestamp
-      FROM (
-        SELECT *
-        FROM known_coins
-        WHERE known_coins.coin_pub = c_pub
-      ) kc
-      JOIN (
-        SELECT *
-        FROM recoup
-        WHERE recoup.coin_pub = c_pub
-      ) rc USING (coin_pub);
-  END LOOP;
-END;
-$$;
-
-COMMENT ON FUNCTION exchange_do_recoup_by_reserve
-  IS 'Recoup by reserve as a function to make sure we hit only the needed partition and not all when joining as joins on distributed tables fetch ALL rows from the shards';
-
-
-CREATE OR REPLACE FUNCTION exchange_do_deposit(
-  IN in_amount_with_fee_val INT8,
-  IN in_amount_with_fee_frac INT4,
-  IN in_h_contract_terms BYTEA,
-  IN in_wire_salt BYTEA,
-  IN in_wallet_timestamp INT8,
-  IN in_exchange_timestamp INT8,
-  IN in_refund_deadline INT8,
-  IN in_wire_deadline INT8,
-  IN in_merchant_pub BYTEA,
-  IN in_receiver_wire_account VARCHAR,
-  IN in_h_payto BYTEA,
-  IN in_known_coin_id INT8,
-  IN in_coin_pub BYTEA,
-  IN in_coin_sig BYTEA,
-  IN in_shard INT8,
-  IN in_extension_blocked BOOLEAN,
-  IN in_extension_details VARCHAR,
-  OUT out_exchange_timestamp INT8,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  wtsi INT8; -- wire target serial id
-DECLARE
-  xdi INT8; -- eXstension details serial id
-BEGIN
--- Shards: INSERT extension_details (by extension_details_serial_id)
---         INSERT wire_targets (by h_payto), on CONFLICT DO NOTHING;
---         INSERT deposits (by coin_pub, shard), ON CONFLICT DO NOTHING;
---         UPDATE known_coins (by coin_pub)
-
-IF NOT NULL in_extension_details
-THEN
-  INSERT INTO extension_details
-  (extension_options)
-  VALUES
-    (in_extension_details)
-  RETURNING extension_details_serial_id INTO xdi;
-ELSE
-  xdi=NULL;
-END IF;
-
-
-INSERT INTO wire_targets
-  (wire_target_h_payto
-  ,payto_uri)
-  VALUES
-  (in_h_payto
-  ,in_receiver_wire_account)
-ON CONFLICT DO NOTHING -- for CONFLICT ON (wire_target_h_payto)
-  RETURNING wire_target_serial_id INTO wtsi;
-
-IF NOT FOUND
-THEN
-  SELECT wire_target_serial_id
-  INTO wtsi
-  FROM wire_targets
-  WHERE wire_target_h_payto=in_h_payto;
-END IF;
-
-
-INSERT INTO deposits
-  (shard
-  ,coin_pub
-  ,known_coin_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,wallet_timestamp
-  ,exchange_timestamp
-  ,refund_deadline
-  ,wire_deadline
-  ,merchant_pub
-  ,h_contract_terms
-  ,coin_sig
-  ,wire_salt
-  ,wire_target_h_payto
-  ,extension_blocked
-  ,extension_details_serial_id
-  )
-  VALUES
-  (in_shard
-  ,in_coin_pub
-  ,in_known_coin_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_wallet_timestamp
-  ,in_exchange_timestamp
-  ,in_refund_deadline
-  ,in_wire_deadline
-  ,in_merchant_pub
-  ,in_h_contract_terms
-  ,in_coin_sig
-  ,in_wire_salt
-  ,in_h_payto
-  ,in_extension_blocked
-  ,xdi)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and wire_target_h_payto
-  -- primarily here to maximally use the existing index.
-  SELECT
-     exchange_timestamp
-   INTO
-     out_exchange_timestamp
-   FROM deposits
-   WHERE shard=in_shard
-     AND merchant_pub=in_merchant_pub
-     AND wire_target_h_payto=in_h_payto
-     AND coin_pub=in_coin_pub
-     AND coin_sig=in_coin_sig;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_balance_ok=TRUE;
-  out_conflict=FALSE;
-
-  RETURN;
-END IF;
-
-
-out_exchange_timestamp=in_exchange_timestamp;
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_conflict=FALSE;
-
-END $$;
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_melt(
-  IN in_cs_rms BYTEA,
-  IN in_amount_with_fee_val INT8,
-  IN in_amount_with_fee_frac INT4,
-  IN in_rc BYTEA,
-  IN in_old_coin_pub BYTEA,
-  IN in_old_coin_sig BYTEA,
-  IN in_known_coin_id INT8, -- not used, but that's OK
-  IN in_noreveal_index INT4,
-  IN in_zombie_required BOOLEAN,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_zombie_bad BOOLEAN,
-  OUT out_noreveal_index INT4)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  denom_max INT8;
-BEGIN
--- Shards: INSERT refresh_commitments (by rc)
--- (rare:) SELECT refresh_commitments (by old_coin_pub) -- crosses shards!
--- (rare:) SEELCT refresh_revealed_coins (by melt_serial_id)
--- (rare:) PERFORM recoup_refresh (by rrc_serial) -- crosses shards!
---         UPDATE known_coins (by coin_pub)
-
-INSERT INTO refresh_commitments
-  (rc
-  ,old_coin_pub
-  ,old_coin_sig
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,noreveal_index
-  )
-  VALUES
-  (in_rc
-  ,in_old_coin_pub
-  ,in_old_coin_sig
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_noreveal_index)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  out_noreveal_index=-1;
-  SELECT
-     noreveal_index
-    INTO
-     out_noreveal_index
-    FROM refresh_commitments
-   WHERE rc=in_rc;
-  out_balance_ok=FOUND;
-  out_zombie_bad=FALSE; -- zombie is OK
-  RETURN;
-END IF;
-
-
-IF in_zombie_required
-THEN
-  -- Check if this coin was part of a refresh
-  -- operation that was subsequently involved
-  -- in a recoup operation.  We begin by all
-  -- refresh operations our coin was involved
-  -- with, then find all associated reveal
-  -- operations, and then see if any of these
-  -- reveal operations was involved in a recoup.
-  PERFORM
-    FROM recoup_refresh
-   WHERE rrc_serial IN
-    (SELECT rrc_serial
-       FROM refresh_revealed_coins
-      WHERE melt_serial_id IN
-      (SELECT melt_serial_id
-         FROM refresh_commitments
-        WHERE old_coin_pub=in_old_coin_pub));
-  IF NOT FOUND
-  THEN
-    out_zombie_bad=TRUE;
-    out_balance_ok=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_zombie_bad=FALSE; -- zombie is OK
-
-
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_noreveal_index=-1;
-  out_balance_ok=FALSE;
-  RETURN;
-END IF;
-
-
-
--- Special actions needed for a CS melt?
-IF NOT NULL in_cs_rms
-THEN
-  -- Get maximum denominations serial value in
-  -- existence, this will determine how long the
-  -- nonce will be locked.
-  SELECT
-      denominations_serial
-    INTO
-      denom_max
-    FROM denominations
-      ORDER BY denominations_serial DESC
-      LIMIT 1;
-
-  -- Cache CS signature to prevent replays in the future
-  -- (and check if cached signature exists at the same time).
-  INSERT INTO cs_nonce_locks
-    (nonce
-    ,max_denomination_serial
-    ,op_hash)
-  VALUES
-    (cs_rms
-    ,denom_serial
-    ,in_rc)
-  ON CONFLICT DO NOTHING;
-
-  IF NOT FOUND
-  THEN
-    -- Record exists, make sure it is the same
-    SELECT 1
-      FROM cs_nonce_locks
-     WHERE nonce=cs_rms
-       AND op_hash=in_rc;
-
-    IF NOT FOUND
-    THEN
-       -- Nonce reuse detected
-       out_balance_ok=FALSE;
-       out_zombie_bad=FALSE;
-       out_noreveal_index=42; -- FIXME: return error message more nicely!
-       ASSERT false, 'nonce reuse attempted by client';
-    END IF;
-  END IF;
-END IF;
-
--- Everything fine, return success!
-out_balance_ok=TRUE;
-out_noreveal_index=in_noreveal_index;
-
-END $$;
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_refund(
-  IN in_amount_with_fee_val INT8,
-  IN in_amount_with_fee_frac INT4,
-  IN in_amount_val INT8,
-  IN in_amount_frac INT4,
-  IN in_deposit_fee_val INT8,
-  IN in_deposit_fee_frac INT4,
-  IN in_h_contract_terms BYTEA,
-  IN in_rtransaction_id INT8,
-  IN in_deposit_shard INT8,
-  IN in_known_coin_id INT8,
-  IN in_coin_pub BYTEA,
-  IN in_merchant_pub BYTEA,
-  IN in_merchant_sig BYTEA,
-  OUT out_not_found BOOLEAN,
-  OUT out_refund_ok BOOLEAN,
-  OUT out_gone BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  dsi INT8; -- ID of deposit being refunded
-DECLARE
-  tmp_val INT8; -- total amount refunded
-DECLARE
-  tmp_frac INT8; -- total amount refunded
-DECLARE
-  deposit_val INT8; -- amount that was originally deposited
-DECLARE
-  deposit_frac INT8; -- amount that was originally deposited
-BEGIN
--- Shards: SELECT deposits (coin_pub, shard, h_contract_terms, merchant_pub)
---         INSERT refunds (by coin_pub, rtransaction_id) ON CONFLICT DO NOTHING
---         SELECT refunds (by coin_pub)
---         UPDATE known_coins (by coin_pub)
-
-SELECT
-   deposit_serial_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,done
-INTO
-   dsi
-  ,deposit_val
-  ,deposit_frac
-  ,out_gone
-FROM deposits
- WHERE coin_pub=in_coin_pub
-  AND shard=in_deposit_shard
-  AND merchant_pub=in_merchant_pub
-  AND h_contract_terms=in_h_contract_terms;
-
-IF NOT FOUND
-THEN
-  -- No matching deposit found!
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=TRUE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-INSERT INTO refunds
-  (deposit_serial_id
-  ,coin_pub
-  ,merchant_sig
-  ,rtransaction_id
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  )
-  VALUES
-  (dsi
-  ,in_coin_pub
-  ,in_merchant_sig
-  ,in_rtransaction_id
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'coin_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  -- We do select over merchant_pub and h_contract_terms
-  -- primarily here to maximally use the existing index.
-   PERFORM
-   FROM refunds
-   WHERE coin_pub=in_coin_pub
-     AND deposit_serial_id=dsi
-     AND rtransaction_id=in_rtransaction_id
-     AND amount_with_fee_val=in_amount_with_fee_val
-     AND amount_with_fee_frac=in_amount_with_fee_frac;
-
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but have conflicting refund.
-    out_refund_ok=FALSE;
-    out_conflict=TRUE;
-    out_not_found=FALSE;
-    RETURN;
-  END IF;
-
-  -- Idempotent request known, return success.
-  out_refund_ok=TRUE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  out_gone=FALSE;
-  RETURN;
-END IF;
-
-IF out_gone
-THEN
-  -- money already sent to the merchant. Tough luck.
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Check refund balance invariant.
-SELECT
-   SUM(amount_with_fee_val) -- overflow here is not plausible
-  ,SUM(CAST(amount_with_fee_frac AS INT8)) -- compute using 64 bits
-  INTO
-   tmp_val
-  ,tmp_frac
-  FROM refunds
-  WHERE coin_pub=in_coin_pub
-    AND deposit_serial_id=dsi;
-IF tmp_val IS NULL
-THEN
-  RAISE NOTICE 'failed to sum up existing refunds';
-  out_refund_ok=FALSE;
-  out_conflict=FALSE;
-  out_not_found=FALSE;
-  RETURN;
-END IF;
-
--- Normalize result before continuing
-tmp_val = tmp_val + tmp_frac / 100000000;
-tmp_frac = tmp_frac % 100000000;
-
--- Actually check if the deposits are sufficient for the refund. Verbosely. ;-)
-IF (tmp_val < deposit_val)
-THEN
-  out_refund_ok=TRUE;
-ELSE
-  IF (tmp_val = deposit_val) AND (tmp_frac <= deposit_frac)
-  THEN
-    out_refund_ok=TRUE;
-  ELSE
-    out_refund_ok=FALSE;
-  END IF;
-END IF;
-
-IF (tmp_val = deposit_val) AND (tmp_frac = deposit_frac)
-THEN
-  -- Refunds have reached the full value of the original
-  -- deposit. Also refund the deposit fee.
-  in_amount_frac = in_amount_frac + in_deposit_fee_frac;
-  in_amount_val = in_amount_val + in_deposit_fee_val;
-
-  -- Normalize result before continuing
-  in_amount_val = in_amount_val + in_amount_frac / 100000000;
-  in_amount_frac = in_amount_frac % 100000000;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+in_amount_frac
-       - CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+in_amount_val
-       + CASE
-         WHEN remaining_frac+in_amount_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub;
-
-
-out_conflict=FALSE;
-out_not_found=FALSE;
-
-END $$;
-
--- COMMENT ON FUNCTION exchange_do_refund(INT8, INT4, BYTEA, BOOLEAN, BOOLEAN)
---  IS 'Executes a refund operation, checking that the corresponding deposit was sufficient to cover the refunded amount';
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_recoup_to_reserve(
-  IN in_reserve_pub BYTEA,
-  IN in_reserve_out_serial_id INT8,
-  IN in_coin_blind BYTEA,
-  IN in_coin_pub BYTEA,
-  IN in_known_coin_id INT8,
-  IN in_coin_sig BYTEA,
-  IN in_reserve_gc INT8,
-  IN in_reserve_expiration INT8,
-  IN in_recoup_timestamp INT8,
-  OUT out_recoup_ok BOOLEAN,
-  OUT out_internal_failure BOOLEAN,
-  OUT out_recoup_timestamp INT8)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
--- Shards: SELECT known_coins (by coin_pub)
---         SELECT recoup      (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         UPDATE reserves (by reserve_pub)
---         INSERT recoup      (by coin_pub)
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-    recoup_timestamp
-  INTO
-    out_recoup_timestamp
-    FROM recoup
-    WHERE coin_pub=in_coin_pub;
-
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the reserve and update reserve timers.
-UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac+tmp_frac
-       - CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val+tmp_val
-       + CASE
-         WHEN current_balance_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END,
-    gc_date=GREATEST(gc_date, in_reserve_gc),
-    expiration_date=GREATEST(expiration_date, in_reserve_expiration)
-  WHERE reserve_pub=in_reserve_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase reserve balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup
-  (coin_pub
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,reserve_out_serial_id
-  )
-VALUES
-  (in_coin_pub
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_reserve_out_serial_id);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
--- COMMENT ON FUNCTION exchange_do_recoup_to_reserve(INT8, INT4, BYTEA, BOOLEAN, BOOLEAN)
---  IS 'Executes a recoup of a coin that was withdrawn from a reserve';
-
-
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_recoup_to_coin(
-  IN in_old_coin_pub BYTEA,
-  IN in_rrc_serial INT8,
-  IN in_coin_blind BYTEA,
-  IN in_coin_pub BYTEA,
-  IN in_known_coin_id INT8,
-  IN in_coin_sig BYTEA,
-  IN in_recoup_timestamp INT8,
-  OUT out_recoup_ok BOOLEAN,
-  OUT out_internal_failure BOOLEAN,
-  OUT out_recoup_timestamp INT8)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  tmp_val INT8; -- amount recouped
-DECLARE
-  tmp_frac INT8; -- amount recouped
-BEGIN
-
--- Shards: UPDATE known_coins (by coin_pub)
---         SELECT recoup_refresh (by coin_pub)
---         UPDATE known_coins (by coin_pub)
---         INSERT recoup_refresh (by coin_pub)
-
-
-out_internal_failure=FALSE;
-
-
--- Check remaining balance of the coin.
-SELECT
-   remaining_frac
-  ,remaining_val
- INTO
-   tmp_frac
-  ,tmp_val
-FROM known_coins
-  WHERE coin_pub=in_coin_pub;
-
-IF NOT FOUND
-THEN
-  out_internal_failure=TRUE;
-  out_recoup_ok=FALSE;
-  RETURN;
-END IF;
-
-IF tmp_val + tmp_frac = 0
-THEN
-  -- Check for idempotency
-  SELECT
-      recoup_timestamp
-    INTO
-      out_recoup_timestamp
-    FROM recoup_refresh
-    WHERE coin_pub=in_coin_pub;
-  out_recoup_ok=FOUND;
-  RETURN;
-END IF;
-
--- Update balance of the coin.
-UPDATE known_coins
-  SET
-     remaining_frac=0
-    ,remaining_val=0
-  WHERE coin_pub=in_coin_pub;
-
-
--- Credit the old coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac+tmp_frac
-       - CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val+tmp_val
-       + CASE
-         WHEN remaining_frac+tmp_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_old_coin_pub;
-
-
-IF NOT FOUND
-THEN
-  RAISE NOTICE 'failed to increase old coin balance from recoup';
-  out_recoup_ok=TRUE;
-  out_internal_failure=TRUE;
-  RETURN;
-END IF;
-
-
-INSERT INTO recoup_refresh
-  (coin_pub
-  ,known_coin_id
-  ,coin_sig
-  ,coin_blind
-  ,amount_val
-  ,amount_frac
-  ,recoup_timestamp
-  ,rrc_serial
-  )
-VALUES
-  (in_coin_pub
-  ,in_known_coin_id
-  ,in_coin_sig
-  ,in_coin_blind
-  ,tmp_val
-  ,tmp_frac
-  ,in_recoup_timestamp
-  ,in_rrc_serial);
-
--- Normal end, everything is fine.
-out_recoup_ok=TRUE;
-out_recoup_timestamp=in_recoup_timestamp;
-
-END $$;
-
-
--- COMMENT ON FUNCTION exchange_do_recoup_to_coin(INT8, INT4, BYTEA, BOOLEAN, BOOLEAN)
---  IS 'Executes a recoup-refresh of a coin that was obtained from a refresh-reveal process';
-
-
-
-CREATE OR REPLACE PROCEDURE exchange_do_gc(
-  IN in_ancient_date INT8,
-  IN in_now INT8)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  reserve_uuid_min INT8; -- minimum reserve UUID still alive
-DECLARE
-  melt_min INT8; -- minimum melt still alive
-DECLARE
-  coin_min INT8; -- minimum known_coin still alive
-DECLARE
-  deposit_min INT8; -- minimum deposit still alive
-DECLARE
-  reserve_out_min INT8; -- minimum reserve_out still alive
-DECLARE
-  denom_min INT8; -- minimum denomination still alive
-BEGIN
-
-DELETE FROM prewire
-  WHERE finished=TRUE;
-
-DELETE FROM wire_fee
-  WHERE end_date < in_ancient_date;
-
--- TODO: use closing fee as threshold?
-DELETE FROM reserves
-  WHERE gc_date < in_now
-    AND current_balance_val = 0
-    AND current_balance_frac = 0;
-
-SELECT
-     reserve_out_serial_id
-  INTO
-     reserve_out_min
-  FROM reserves_out
-  ORDER BY reserve_out_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM recoup
-  WHERE reserve_out_serial_id < reserve_out_min;
--- FIXME: recoup_refresh lacks GC!
-
-SELECT
-     reserve_uuid
-  INTO
-     reserve_uuid_min
-  FROM reserves
-  ORDER BY reserve_uuid ASC
-  LIMIT 1;
-
-DELETE FROM reserves_out
-  WHERE reserve_uuid < reserve_uuid_min;
-
--- FIXME: this query will be horribly slow;
--- need to find another way to formulate it...
-DELETE FROM denominations
-  WHERE expire_legal < in_now
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM reserves_out)
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup))
-    AND denominations_serial NOT IN
-      (SELECT DISTINCT denominations_serial
-         FROM known_coins
-        WHERE coin_pub IN
-          (SELECT DISTINCT coin_pub
-             FROM recoup_refresh));
-
-SELECT
-     melt_serial_id
-  INTO
-     melt_min
-  FROM refresh_commitments
-  ORDER BY melt_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refresh_revealed_coins
-  WHERE melt_serial_id < melt_min;
-
-DELETE FROM refresh_transfer_keys
-  WHERE melt_serial_id < melt_min;
-
-SELECT
-     known_coin_id
-  INTO
-     coin_min
-  FROM known_coins
-  ORDER BY known_coin_id ASC
-  LIMIT 1;
-
-DELETE FROM deposits
-  WHERE known_coin_id < coin_min;
-
-SELECT
-     deposit_serial_id
-  INTO
-     deposit_min
-  FROM deposits
-  ORDER BY deposit_serial_id ASC
-  LIMIT 1;
-
-DELETE FROM refunds
-  WHERE deposit_serial_id < deposit_min;
-
-DELETE FROM aggregation_tracking
-  WHERE deposit_serial_id < deposit_min;
-
-SELECT
-     denominations_serial
-  INTO
-     denom_min
-  FROM denominations
-  ORDER BY denominations_serial ASC
-  LIMIT 1;
-
-DELETE FROM cs_nonce_locks
-  WHERE max_denomination_serial <= denom_min;
-
-END $$;
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_purse_deposit(
-  IN in_partner_id INT8,
-  IN in_purse_pub BYTEA,
-  IN in_amount_with_fee_val INT8,
-  IN in_amount_with_fee_frac INT4,
-  IN in_coin_pub BYTEA,
-  IN in_coin_sig BYTEA,
-  IN in_amount_without_fee_val INT8,
-  IN in_amount_without_fee_frac INT4,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  was_merged BOOLEAN;
-DECLARE
-  psi INT8; -- partner's serial ID (set if merged)
-DECLARE
-  my_amount_val INT8; -- total in purse
-DECLARE
-  my_amount_frac INT4; -- total in purse
-DECLARE
-  was_paid BOOLEAN;
-DECLARE
-  my_reserve_pub BYTEA;
-BEGIN
-
--- Store the deposit request.
-INSERT INTO purse_deposits
-  (partner_serial_id
-  ,purse_pub
-  ,coin_pub
-  ,amount_with_fee_val
-  ,amount_with_fee_frac
-  ,coin_sig)
-  VALUES
-  (in_partner_id
-  ,in_purse_pub
-  ,in_coin_pub
-  ,in_amount_with_fee_val
-  ,in_amount_with_fee_frac
-  ,in_coin_sig)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: check if coin_sig is the same,
-  -- if so, success, otherwise conflict!
-  PERFORM
-  FROM purse_deposits
-  WHERE coin_pub = in_coin_pub
-    AND purse_pub = in_purse_pub
-    AND coin_sig = in_cion_sig;
-  IF NOT FOUND
-  THEN
-    -- Deposit exists, but with differences. Not allowed.
-    out_balance_ok=FALSE;
-    out_conflict=TRUE;
-    RETURN;
-  END IF;
-END IF;
-
-
--- Debit the coin
--- Check and update balance of the coin.
-UPDATE known_coins
-  SET
-    remaining_frac=remaining_frac-in_amount_with_fee_frac
-       + CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    remaining_val=remaining_val-in_amount_with_fee_val
-       - CASE
-         WHEN remaining_frac < in_amount_with_fee_frac
-         THEN 1
-         ELSE 0
-         END
-  WHERE coin_pub=in_coin_pub
-    AND ( (remaining_val > in_amount_with_fee_val) OR
-          ( (remaining_frac >= in_amount_with_fee_frac) AND
-            (remaining_val >= in_amount_with_fee_val) ) );
-
-IF NOT FOUND
-THEN
-  -- Insufficient balance.
-  out_balance_ok=FALSE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-
-
--- Credit the purse.
-UPDATE purse_requests
-  SET
-    balance_frac=balance_frac+in_amount_without_fee_frac
-       - CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    balance_val=balance_val+in_amount_without_fee_val
-       + CASE
-         WHEN balance_frac+in_amount_without_fee_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE purse_pub=in_purse_pub;
-
-out_conflict=FALSE;
-out_balance_ok=TRUE;
-
--- See if we can finish the merge or need to update the trigger time and partner.
-SELECT partner_serial_id
-      ,reserve_pub
-  INTO psi
-      ,my_reserve_pub
-  FROM purse_merges
- WHERE purse_pub=in_purse_pub;
-
-IF NOT FOUND
-THEN
-  RETURN;
-END IF;
-
-SELECT
-    amount_with_fee_val
-   ,amount_with_fee_frac
-  INTO
-    my_amount_val
-   ,my_amount_frac
-  FROM purse_requests
-  WHERE (purse_pub=in_purse_pub)
-    AND ( ( ( (amount_with_fee_val <= balance_val)
-          AND (amount_with_fee_frac <= balance_frac) )
-         OR (amount_with_fee_val < balance_val) ) );
-IF NOT FOUND
-THEN
-  RETURN;
-END IF;
-
-IF (0 != psi)
-THEN
-  -- The taler-exchange-router will take care of this.
-  UPDATE purse_actions
-     SET action_date=0 --- "immediately"
-        ,partner_serial_id=psi
-   WHERE purse_pub=in_purse_pub;
-ELSE
-  -- This is a local reserve, update balance immediately.
-  UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac+my_amount_frac
-       - CASE
-         WHEN current_balance_frac + my_amount_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val+my_amount_val
-       + CASE
-         WHEN current_balance_frac + my_amount_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE reserve_pub=my_reserve_pub;
-
-  -- ... and mark purse as finished.
-  UPDATE purse_requests
-     SET finished=true
-  WHERE purse_pub=in_purse_pub;
-END IF;
-
-
-END $$;
-
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_purse_merge(
-  IN in_purse_pub BYTEA,
-  IN in_merge_sig BYTEA,
-  IN in_merge_timestamp INT8,
-  IN in_reserve_sig BYTEA,
-  IN in_partner_url VARCHAR,
-  IN in_reserve_pub BYTEA,
-  OUT out_no_partner BOOLEAN,
-  OUT out_no_balance BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  amount_val INT8;
-DECLARE
-  amount_frac INT4;
-DECLARE
-  my_partner_serial_id INT8;
-DECLARE
-  my_finished BOOLEAN;
-BEGIN
-
-IF in_partner_url IS NULL
-THEN
-  my_partner_serial_id=0;
-ELSE
-  SELECT
-    partner_serial_id
-  INTO
-    my_partner_serial_id
-  FROM partners
-  WHERE partner_base_url=in_partner_url
-    AND start_date <= in_merge_timestamp
-    AND end_date > in_merge_timestamp;
-  IF NOT FOUND
-  THEN
-    out_no_partner=TRUE;
-    out_conflict=FALSE;
-    RETURN;
-  END IF;
-END IF;
-
-out_no_partner=FALSE;
-
-
--- Check purse is 'full'.
-SELECT amount_with_fee_val
-      ,amount_with_fee_frac
-      ,finished
-  INTO amount_val
-      ,amount_frac
-      ,my_finished
-  FROM purse_requests
-  WHERE purse_pub=in_purse_pub
-    AND balance_val >= amount_with_fee_val
-    AND ( (balance_frac >= amount_with_fee_frac) OR
-          (balance_val > amount_with_fee_val) );
-IF NOT FOUND
-THEN
-  out_no_balance=TRUE;
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_no_balance=FALSE;
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (my_partner_serial_id
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
-ASSERT NOT my_finished, 'internal invariant failed';
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
--- If we need a wad transfer, mark purse ready for it.
-IF (0 != my_partner_serial_id)
-THEN
-  -- The taler-exchange-router will take care of this.
-  UPDATE purse_actions
-     SET action_date=0 --- "immediately"
-        ,partner_serial_id=my_partner_serial_id
-   WHERE purse_pub=in_purse_pub;
-ELSE
-  -- This is a local reserve, update balance immediately.
-  UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac+amount_frac
-       - CASE
-         WHEN current_balance_frac + amount_frac >= 100000000
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val+amount_val
-       + CASE
-         WHEN current_balance_frac + amount_frac >= 100000000
-         THEN 1
-         ELSE 0
-         END
-  WHERE reserve_pub=in_reserve_pub;
-
-  -- ... and mark purse as finished.
-  UPDATE purse_requests
-     SET finished=true
-  WHERE purse_pub=in_purse_pub;
-END IF;
-
-
-RETURN;
-
-END $$;
-
-COMMENT ON FUNCTION exchange_do_purse_merge(BYTEA, BYTEA, INT8, BYTEA, VARCHAR, BYTEA)
-  IS 'Checks that the partner exists, the purse has not been merged with a different reserve and that the purse is full. If so, persists the merge data and either merges the purse with the reserve or marks it as ready for the taler-exchange-router. Caller MUST abort the transaction on failures so as to not persist data by accident.';
-
-
-CREATE OR REPLACE FUNCTION exchange_do_reserve_purse(
-  IN in_purse_pub BYTEA,
-  IN in_merge_sig BYTEA,
-  IN in_merge_timestamp INT8,
-  IN in_reserve_sig BYTEA,
-  IN in_reserve_quota BOOLEAN,
-  IN in_purse_fee_val INT8,
-  IN in_purse_fee_frac INT4,
-  IN in_reserve_pub BYTEA,
-  OUT out_no_funds BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-BEGIN
-
--- Store purse merge signature, checks for purse_pub uniqueness
-INSERT INTO purse_merges
-    (partner_serial_id
-    ,reserve_pub
-    ,purse_pub
-    ,merge_sig
-    ,merge_timestamp)
-  VALUES
-    (0
-    ,in_reserve_pub
-    ,in_purse_pub
-    ,in_merge_sig
-    ,in_merge_timestamp)
-  ON CONFLICT DO NOTHING;
-
-IF NOT FOUND
-THEN
-  -- Idempotency check: see if an identical record exists.
-  -- Note that by checking 'merge_sig', we implicitly check
-  -- identity over everything that the signature covers.
-  PERFORM
-  FROM purse_merges
-  WHERE purse_pub=in_purse_pub
-     AND merge_sig=in_merge_sig;
-  IF NOT FOUND
-  THEN
-     -- Purse was merged, but to some other reserve. Not allowed.
-     out_conflict=TRUE;
-     RETURN;
-  END IF;
-
-  -- "success"
-  out_conflict=FALSE;
-  out_no_funds=FALSE;
-  RETURN;
-END IF;
-out_conflict=FALSE;
-
-
-IF (in_reserve_quota)
-THEN
-  -- Increment active purses per reserve (and check this is allowed)
-  UPDATE reserves
-     SET purses_active=purses_active+1
-        ,kyc_required=TRUE
-   WHERE reserve_pub=in_reserve_pub
-     AND purses_active < purses_allowed;
-  IF NOT FOUND
-  THEN
-    out_no_funds=TRUE;
-  END IF;
-ELSE
-  --  UPDATE reserves balance (and check if balance is enough to pay the fee)
-  UPDATE reserves
-  SET
-    current_balance_frac=current_balance_frac-in_purse_fee_frac
-       + CASE
-         WHEN current_balance_frac < in_purse_fee_frac
-         THEN 100000000
-         ELSE 0
-         END,
-    current_balance_val=current_balance_val-in_purse_fee_val
-       - CASE
-         WHEN current_balance_frac < in_purse_fee_frac
-         THEN 1
-         ELSE 0
-         END
-    ,kyc_required=TRUE
-  WHERE reserve_pub=in_reserve_pub
-    AND ( (current_balance_val > in_purse_fee_val) OR
-          ( (current_balance_frac >= in_purse_fee_frac) AND
-            (current_balance_val >= in_purse_fee_val) ) );
-  IF NOT FOUND
-  THEN
-    out_no_funds=TRUE;
-  END IF;
-END IF;
-
-out_no_funds=FALSE;
-
-
--- Store account merge signature.
-INSERT INTO account_merges
-  (reserve_pub
-  ,reserve_sig
-  ,purse_pub)
-  VALUES
-  (in_reserve_pub
-  ,in_reserve_sig
-  ,in_purse_pub);
-
-END $$;
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_account_merge(
-  IN in_purse_pub BYTEA,
-  IN in_reserve_pub BYTEA,
-  IN in_reserve_sig BYTEA,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  -- FIXME: function/API is dead! Do DCE?
-END $$;
-
-
-
-CREATE OR REPLACE FUNCTION exchange_do_expire_purse(
-  IN in_start_time INT8,
-  IN in_end_time INT8,
-  OUT out_found BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-DECLARE
-  my_purse_pub BYTEA;
-DECLARE
-  my_deposit record;
-BEGIN
-
-SELECT purse_pub
-  INTO my_purse_pub
-  FROM purse_requests
- WHERE (purse_expiration >= in_start_time) AND
-       (purse_expiration < in_end_time) AND
-       (NOT finished) AND
-       (NOT refunded)
- ORDER BY purse_expiration ASC
- LIMIT 1;
-out_found = FOUND;
-IF NOT FOUND
-THEN
-  RETURN;
-END IF;
-
-UPDATE purse_requests
- SET refunded=TRUE,
-     finished=TRUE
- WHERE purse_pub=my_purse_pub;
-
--- restore balance to each coin deposited into the purse
-FOR my_deposit IN
-  SELECT coin_pub
-        ,amount_with_fee_val
-        ,amount_with_fee_frac
-    FROM purse_deposits
-  WHERE purse_pub = my_purse_pub
-LOOP
-  UPDATE known_coins SET
-    remaining_frac=remaining_frac+my_deposit.amount_with_fee_frac
-     - CASE
-       WHEN remaining_frac+my_deposit.amount_with_fee_frac >= 100000000
-       THEN 100000000
-       ELSE 0
-       END,
-    remaining_val=remaining_val+my_deposit.amount_with_fee_val
-     + CASE
-       WHEN remaining_frac+my_deposit.amount_with_fee_frac >= 100000000
-       THEN 1
-       ELSE 0
-       END
-    WHERE coin_pub = my_deposit.coin_pub;
-  END LOOP;
-END $$;
-
-COMMENT ON FUNCTION exchange_do_expire_purse(INT8,INT8)
-  IS 'Finds an expired purse in the given time range and refunds the coins (if any).';
-
-
-CREATE OR REPLACE FUNCTION exchange_do_history_request(
-  IN in_reserve_pub BYTEA,
-  IN in_reserve_sig BYTEA,
-  IN in_request_timestamp INT8,
-  IN in_history_fee_val INT8,
-  IN in_history_fee_frac INT4,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
-CREATE OR REPLACE FUNCTION exchange_do_close_request(
-  IN in_reserve_pub BYTEA,
-  IN in_reserve_sig BYTEA,
-  OUT out_final_balance_val INT8,
-  OUT out_final_balance_frac INT4,
-  OUT out_balance_ok BOOLEAN,
-  OUT out_conflict BOOLEAN)
-LANGUAGE plpgsql
-AS $$
-BEGIN
-  -- FIXME
-END $$;
-
-
--------------------------------------------------------------
---                   THE END
--------------------------------------------------------------
-
--- Complete transaction
-COMMIT;
diff --git a/src/exchangedb/exchange-0001.sql b/src/exchangedb/exchange-0001.sql
new file mode 100644
index 000000000..a4b1c8b9f
--- /dev/null
+++ b/src/exchangedb/exchange-0001.sql
@@ -0,0 +1,296 @@
+--
+-- 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/>
+--
+
+BEGIN;
+
+SELECT _v.register_patch('exchange-0001', NULL, NULL);
+
+CREATE SCHEMA exchange;
+COMMENT ON SCHEMA exchange IS 'taler-exchange data';
+
+SET search_path TO exchange;
+
+---------------------------------------------------------------------------
+--                   General procedures for DB setup
+---------------------------------------------------------------------------
+
+CREATE TABLE exchange_tables
+  (table_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY
+  ,name TEXT NOT NULL
+  ,version TEXT NOT NULL
+  ,action TEXT NOT NULL
+  ,partitioned BOOL NOT NULL
+  ,by_range BOOL NOT NULL
+  ,finished BOOL NOT NULL DEFAULT(FALSE));
+COMMENT ON TABLE exchange_tables
+  IS 'Tables of the exchange and their status';
+COMMENT ON COLUMN exchange_tables.name
+  IS 'Base name of the table (without partition/shard)';
+COMMENT ON COLUMN exchange_tables.version
+  IS 'Version of the DB in which the given action happened';
+COMMENT ON COLUMN exchange_tables.action
+  IS 'Action to take on the table (e.g. create, constrain, or foreign). Create is done for the master table and each partition; constrain is only for partitions or for master if there are no partitions; master only on master (takes no argument); foreign only on master if there are no partitions.';
+COMMENT ON COLUMN exchange_tables.partitioned
+  IS 'TRUE if the table is partitioned';
+COMMENT ON COLUMN exchange_tables.by_range
+  IS 'TRUE if the table is partitioned by range';
+COMMENT ON COLUMN exchange_tables.finished
+  IS 'TRUE if the respective migration has been run';
+
+
+CREATE FUNCTION create_partitioned_table(
+   IN table_definition TEXT -- SQL template for table creation
+  ,IN table_name TEXT -- base name of the table
+  ,IN main_table_partition_str TEXT -- declaration for how to partition the table
+  ,IN partition_suffix TEXT DEFAULT NULL -- NULL: no partitioning, 0: yes partitioning, no sharding, >0: sharding
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF (partition_suffix IS NULL)
+  THEN
+    -- no partitioning, disable option
+    main_table_partition_str = '';
+  ELSE
+    IF (partition_suffix::int > 0)
+    THEN
+      -- sharding, add shard name
+      table_name=table_name || '_' || partition_suffix;
+    END IF;
+  END IF;
+  EXECUTE FORMAT(
+    table_definition,
+    table_name,
+    main_table_partition_str
+  );
+END $$;
+
+COMMENT ON FUNCTION create_partitioned_table
+  IS 'Generic function to create a table that is partitioned or sharded.';
+
+
+CREATE FUNCTION comment_partitioned_table(
+   IN table_comment TEXT
+  ,IN table_name TEXT
+  ,IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF ( (partition_suffix IS NOT NULL) AND
+       (partition_suffix::int > 0) )
+  THEN
+    -- sharding, add shard name
+    table_name=table_name || '_' || partition_suffix;
+  END IF;
+  EXECUTE FORMAT(
+     'COMMENT ON TABLE %s IS %s'
+    ,table_name
+    ,quote_literal(table_comment)
+  );
+END $$;
+
+COMMENT ON FUNCTION comment_partitioned_table
+  IS 'Generic function to create a comment on table that is partitioned.';
+
+
+CREATE FUNCTION comment_partitioned_column(
+   IN table_comment TEXT
+  ,IN column_name TEXT
+  ,IN table_name TEXT
+  ,IN partition_suffix TEXT DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  IF ( (partition_suffix IS NOT NULL) AND
+       (partition_suffix::int > 0) )
+  THEN
+    -- sharding, add shard name
+    table_name=table_name || '_' || partition_suffix;
+  END IF;
+  EXECUTE FORMAT(
+     'COMMENT ON COLUMN %s.%s IS %s'
+    ,table_name
+    ,column_name
+    ,quote_literal(table_comment)
+  );
+END $$;
+
+COMMENT ON FUNCTION comment_partitioned_column
+  IS 'Generic function to create a comment on column of a table that is partitioned.';
+
+
+---------------------------------------------------------------------------
+--                   Main DB setup loop
+---------------------------------------------------------------------------
+
+CREATE FUNCTION do_create_tables(
+  num_partitions INTEGER
+-- NULL: no partitions, add foreign constraints
+-- 0: no partitions, no foreign constraints
+-- 1: only 1 default partition
+-- > 1: normal partitions
+)
+  RETURNS VOID
+  LANGUAGE plpgsql
+AS $$
+DECLARE
+  tc CURSOR FOR
+    SELECT table_serial_id
+          ,name
+          ,action
+          ,partitioned
+          ,by_range
+      FROM exchange.exchange_tables
+     WHERE NOT finished
+     ORDER BY table_serial_id ASC;
+BEGIN
+  FOR rec IN tc
+  LOOP
+    CASE rec.action
+    -- "create" actions apply to master and partitions
+    WHEN 'create'
+    THEN
+      IF (rec.partitioned AND
+          (num_partitions IS NOT NULL))
+      THEN
+        -- Create master table with partitioning.
+        EXECUTE FORMAT(
+          'SELECT exchange.%s_table_%s (%s)'::text
+          ,rec.action
+          ,rec.name
+          ,quote_literal('0')
+        );
+        IF (rec.by_range OR
+            (num_partitions = 0))
+        THEN
+          -- Create default partition.
+          IF (rec.by_range)
+          THEN
+            -- Range partition
+            EXECUTE FORMAT(
+              'CREATE TABLE exchange.%s_default'
+              ' PARTITION OF %s'
+              ' DEFAULT'
+             ,rec.name
+             ,rec.name
+            );
+          ELSE
+            -- Hash partition
+            EXECUTE FORMAT(
+              'CREATE TABLE exchange.%s_default'
+              ' PARTITION OF %s'
+              ' FOR VALUES WITH (MODULUS 1, REMAINDER 0)'
+             ,rec.name
+             ,rec.name
+            );
+          END IF;
+        ELSE
+          FOR i IN 1..num_partitions LOOP
+            -- Create num_partitions
+            EXECUTE FORMAT(
+               'CREATE TABLE exchange.%I'
+               ' PARTITION OF %I'
+               ' FOR VALUES WITH (MODULUS %s, REMAINDER %s)'
+              ,rec.name || '_' || i
+              ,rec.name
+              ,num_partitions
+              ,i-1
+            );
+          END LOOP;
+        END IF;
+      ELSE
+        -- Only create master table. No partitions.
+        EXECUTE FORMAT(
+          'SELECT exchange.%s_table_%s ()'::text
+          ,rec.action
+          ,rec.name
+        );
+      END IF;
+    -- Constrain action apply to master OR each partition
+    WHEN 'constrain'
+    THEN
+      ASSERT rec.partitioned, 'constrain action only applies to partitioned tables';
+      IF (num_partitions IS NULL)
+      THEN
+        -- Constrain master table
+        EXECUTE FORMAT(
+           'SELECT exchange.%s_table_%s (NULL)'::text
+          ,rec.action
+          ,rec.name
+        );
+      ELSE
+        IF ( (num_partitions = 0) OR
+             (rec.by_range) )
+        THEN
+          -- Constrain default table
+          EXECUTE FORMAT(
+             'SELECT exchange.%s_table_%s (%s)'::text
+            ,rec.action
+            ,rec.name
+            ,quote_literal('default')
+          );
+        ELSE
+          -- Constrain each partition
+          FOR i IN 1..num_partitions LOOP
+            EXECUTE FORMAT(
+              'SELECT exchange.%s_table_%s (%s)'::text
+              ,rec.action
+              ,rec.name
+              ,quote_literal(i)
+            );
+          END LOOP;
+        END IF;
+      END IF;
+    -- Foreign actions only apply if partitioning is off
+    WHEN 'foreign'
+    THEN
+      IF (num_partitions IS NULL)
+      THEN
+        -- Add foreign constraints
+        EXECUTE FORMAT(
+          'SELECT exchange.%s_table_%s (%s)'::text
+          ,rec.action
+          ,rec.name
+          ,NULL
+        );
+      END IF;
+    WHEN 'master'
+    THEN
+      EXECUTE FORMAT(
+        'SELECT exchange.%s_table_%s ()'::text
+        ,rec.action
+        ,rec.name
+      );
+    ELSE
+      ASSERT FALSE, 'unsupported action type: ' || rec.action;
+    END CASE;  -- END CASE (rec.action)
+    -- Mark as finished
+    UPDATE exchange.exchange_tables
+       SET finished=TRUE
+     WHERE table_serial_id=rec.table_serial_id;
+  END LOOP; -- create/alter/drop actions
+END $$;
+
+COMMENT ON FUNCTION do_create_tables
+  IS 'Creates all tables for the given number of partitions that need creating. Does NOT support sharding.';
+
+
+COMMIT;
diff --git a/src/exchangedb/exchange-0002.sql.in b/src/exchangedb/exchange-0002.sql.in
new file mode 100644
index 000000000..ab13b28af
--- /dev/null
+++ b/src/exchangedb/exchange-0002.sql.in
@@ -0,0 +1,118 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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/>
+--
+
+BEGIN;
+
+SELECT _v.register_patch('exchange-0002', NULL, NULL);
+SET search_path TO exchange;
+
+CREATE DOMAIN gnunet_hashcode
+  AS BYTEA
+  CHECK(LENGTH(VALUE) = 32);
+
+CREATE TYPE taler_amount
+  AS
+  (val INT8
+  ,frac INT4
+  );
+COMMENT ON TYPE taler_amount
+  IS 'Stores an amount, fraction is in units of 1/100000000 of the base value';
+
+CREATE TYPE exchange_do_array_reserve_insert_return_type
+  AS
+  (transaction_duplicate BOOLEAN
+  ,ruuid INT8
+  );
+COMMENT ON TYPE exchange_do_array_reserve_insert_return_type
+  IS 'Return type for exchange_do_array_reserves_insert() stored procedure';
+
+CREATE TYPE exchange_do_select_deposits_missing_wire_return_type
+  AS
+  (
+    batch_deposit_serial_id INT8,
+    total_amount taler_amount,
+    wire_target_h_payto BYTEA,
+    deadline INT8
+  );
+COMMENT ON TYPE exchange_do_select_deposits_missing_wire_return_type
+  IS 'Return type for exchange_do_select_deposits_missing_wire';
+
+
+#include "0002-denominations.sql"
+#include "0002-denomination_revocations.sql"
+#include "0002-wire_targets.sql"
+#include "0002-kyc_alerts.sql"
+#include "0002-wire_fee.sql"
+#include "0002-global_fee.sql"
+#include "0002-wire_accounts.sql"
+#include "0002-auditors.sql"
+#include "0002-auditor_denom_sigs.sql"
+#include "0002-exchange_sign_keys.sql"
+#include "0002-signkey_revocations.sql"
+#include "0002-extensions.sql"
+#include "0002-policy_fulfillments.sql"
+#include "0002-policy_details.sql"
+#include "0002-profit_drains.sql"
+#include "0002-legitimization_processes.sql"
+#include "0002-legitimization_requirements.sql"
+#include "0002-reserves.sql"
+#include "0002-reserve_history.sql"
+#include "0002-reserves_in.sql"
+#include "0002-reserves_close.sql"
+#include "0002-close_requests.sql"
+#include "0002-reserves_open_deposits.sql"
+#include "0002-reserves_open_requests.sql"
+#include "0002-reserves_out.sql"
+#include "0002-known_coins.sql"
+#include "0002-coin_history.sql"
+#include "0002-refresh_commitments.sql"
+#include "0002-refresh_revealed_coins.sql"
+#include "0002-refresh_transfer_keys.sql"
+#include "0002-batch_deposits.sql"
+#include "0002-coin_deposits.sql"
+#include "0002-refunds.sql"
+#include "0002-wire_out.sql"
+#include "0002-aggregation_transient.sql"
+#include "0002-aggregation_tracking.sql"
+#include "0002-recoup.sql"
+#include "0002-recoup_refresh.sql"
+#include "0002-prewire.sql"
+#include "0002-cs_nonce_locks.sql"
+#include "0002-purse_requests.sql"
+#include "0002-purse_merges.sql"
+#include "0002-account_merges.sql"
+#include "0002-purse_decision.sql"
+#include "0002-contracts.sql"
+#include "0002-history_requests.sql"
+#include "0002-purse_deposits.sql"
+#include "0002-wads_in.sql"
+#include "0002-wad_in_entries.sql"
+#include "0002-wads_out.sql"
+#include "0002-wad_out_entries.sql"
+#include "0002-work_shards.sql"
+#include "0002-revolving_work_shards.sql"
+#include "0002-partners.sql"
+#include "0002-partner_accounts.sql"
+#include "0002-purse_actions.sql"
+#include "0002-purse_deletion.sql"
+#include "0002-kyc_attributes.sql"
+#include "0002-aml_status.sql"
+#include "0002-aml_staff.sql"
+#include "0002-aml_history.sql"
+#include "0002-age_withdraw.sql"
+
+
+COMMIT;
diff --git a/src/exchangedb/exchange-0003.sql.in b/src/exchangedb/exchange-0003.sql.in
new file mode 100644
index 000000000..c94497531
--- /dev/null
+++ b/src/exchangedb/exchange-0003.sql.in
@@ -0,0 +1,25 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+
+BEGIN;
+
+SELECT _v.register_patch('exchange-0003', NULL, NULL);
+SET search_path TO exchange;
+
+#include "0003-wire_accounts.sql"
+#include "0003-purse_deletion.sql"
+
+COMMIT;
diff --git a/src/exchangedb/exchange-0004.sql.in b/src/exchangedb/exchange-0004.sql.in
new file mode 100644
index 000000000..c966aedc5
--- /dev/null
+++ b/src/exchangedb/exchange-0004.sql.in
@@ -0,0 +1,24 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 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/>
+--
+
+BEGIN;
+
+SELECT _v.register_patch('exchange-0004', NULL, NULL);
+SET search_path TO exchange;
+
+#include "0004-refunds.sql"
+
+COMMIT;
diff --git a/src/exchangedb/exchange_do_account_merge.sql b/src/exchangedb/exchange_do_account_merge.sql
new file mode 100644
index 000000000..723154f1d
--- /dev/null
+++ b/src/exchangedb/exchange_do_account_merge.sql
@@ -0,0 +1,15 @@
+--
+-- 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/>
+--
diff --git a/src/exchangedb/exchange_do_age_withdraw.sql b/src/exchangedb/exchange_do_age_withdraw.sql
new file mode 100644
index 000000000..89a291445
--- /dev/null
+++ b/src/exchangedb/exchange_do_age_withdraw.sql
@@ -0,0 +1,165 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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/>
+--
+-- @author Özgür Kesim
+
+CREATE OR REPLACE FUNCTION exchange_do_age_withdraw(
+  IN amount_with_fee taler_amount,
+  IN rpub BYTEA,
+  IN rsig BYTEA,
+  IN now INT8,
+  IN min_reserve_gc INT8,
+  IN h_commitment BYTEA,
+  IN maximum_age_committed INT2, -- in years ϵ [0,1..)
+  IN noreveal_index INT2,
+  IN blinded_evs BYTEA[],
+  IN denom_serials INT8[],
+  IN denom_sigs BYTEA[],
+  OUT reserve_found BOOLEAN,
+  OUT balance_ok BOOLEAN,
+  OUT reserve_balance taler_amount,
+  OUT age_ok BOOLEAN,
+  OUT required_age INT2, -- in years ϵ [0,1..)
+  OUT reserve_birthday INT4,
+  OUT conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  reserve RECORD;
+  difference RECORD;
+  balance taler_amount;
+  not_before date;
+  earliest_date date;
+BEGIN
+-- Shards: reserves by reserve_pub (SELECT)
+--         reserves_out (INSERT, with CONFLICT detection) by wih
+--         reserves by reserve_pub (UPDATE)
+--         reserves_in by reserve_pub (SELECT)
+--         wire_targets by wire_target_h_payto
+
+SELECT current_balance
+      ,birthday
+      ,gc_date
+  INTO reserve
+  FROM exchange.reserves
+ WHERE reserves.reserve_pub=rpub;
+
+IF NOT FOUND
+THEN
+  reserve_found=FALSE;
+  age_ok = FALSE;
+  required_age=-1;
+  conflict=FALSE;
+  reserve_balance.val = 0;
+  reserve_balance.frac = 0;
+  balance_ok=FALSE;
+  RETURN;
+END IF;
+
+reserve_found = TRUE;
+conflict=FALSE;  -- not really yet determined
+
+reserve_balance = reserve.current_balance;
+reserve_birthday = reserve.birthday;
+
+-- Check age requirements
+IF (reserve.birthday <> 0)
+THEN
+  not_before=date '1970-01-01' + reserve.birthday;
+  earliest_date = current_date - make_interval(maximum_age_committed);
+  --
+  -- 1970-01-01 + birthday == not_before                 now
+  --     |                     |                          |
+  -- <.......not allowed......>[<.....allowed range......>]
+  --     |                     |                          |
+  -- ____*_____________________*_________*________________*  timeline
+  --                                     |
+  --                            earliest_date ==
+  --                                now - maximum_age_committed*year
+  --
+  IF (earliest_date < not_before)
+  THEN
+    required_age = extract(year from age(current_date, not_before));
+    age_ok = FALSE;
+    balance_ok=TRUE; -- NOT REALLY
+    RETURN;
+  END IF;
+END IF;
+
+age_ok = TRUE;
+required_age=0;
+
+-- Check reserve balance is sufficient.
+SELECT *
+INTO difference
+FROM amount_left_minus_right(reserve_balance
+                            ,amount_with_fee);
+
+balance_ok = difference.ok;
+
+IF NOT balance_ok
+THEN
+  RETURN;
+END IF;
+
+balance = difference.diff;
+
+-- Calculate new expiration dates.
+min_reserve_gc=GREATEST(min_reserve_gc,reserve.gc_date);
+
+-- Update reserve balance.
+UPDATE reserves SET
+  gc_date=min_reserve_gc
+ ,current_balance=balance
+WHERE
+  reserves.reserve_pub=rpub;
+
+-- Write the commitment into the age-withdraw table
+INSERT INTO exchange.age_withdraw
+  (h_commitment
+  ,max_age
+  ,amount_with_fee
+  ,reserve_pub
+  ,reserve_sig
+  ,noreveal_index
+  ,denom_serials
+  ,h_blind_evs
+  ,denom_sigs)
+VALUES
+  (h_commitment
+  ,maximum_age_committed
+  ,amount_with_fee
+  ,rpub
+  ,rsig
+  ,noreveal_index
+  ,denom_serials
+  ,blinded_evs
+  ,denom_sigs)
+ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Signal a conflict so that the caller
+  -- can fetch the actual data from the DB.
+  conflict=TRUE;
+  RETURN;
+ELSE
+  conflict=FALSE;
+END IF;
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_age_withdraw(taler_amount, BYTEA, BYTEA, INT8, INT8, BYTEA, INT2, INT2, BYTEA[], INT8[], BYTEA[])
+  IS 'Checks whether the reserve has sufficient balance for an age-withdraw operation (or the request is repeated and was previously approved) and that age requirements are met. If so updates the database with the result. Includes storing the blinded planchets and denomination signatures, or signaling conflict';
diff --git a/src/exchangedb/exchange_do_amount_specific.sql b/src/exchangedb/exchange_do_amount_specific.sql
new file mode 100644
index 000000000..9b305a3ec
--- /dev/null
+++ b/src/exchangedb/exchange_do_amount_specific.sql
@@ -0,0 +1,92 @@
+--
+-- 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/>
+--
+
+--------------------------------------------------------------
+-- Taler amounts and helper functions
+-------------------------------------------------------------
+
+CREATE OR REPLACE FUNCTION amount_normalize(
+    IN amount taler_amount
+  ,OUT normalized taler_amount
+)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  normalized.val = amount.val + amount.frac / 100000000;
+  normalized.frac = amount.frac % 100000000;
+END $$;
+
+COMMENT ON FUNCTION amount_normalize
+  IS 'Returns the normalized amount by adding to the .val the value of (.frac / 100000000) and removing the modulus 100000000 from .frac.';
+
+CREATE OR REPLACE FUNCTION amount_add(
+   IN a taler_amount
+  ,IN b taler_amount
+  ,OUT sum taler_amount
+)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  sum = (a.val + b.val, a.frac + b.frac);
+  CALL amount_normalize(sum ,sum);
+
+  IF (sum.val > (1<<52))
+  THEN
+    RAISE EXCEPTION 'addition overflow';
+  END IF;
+END $$;
+
+COMMENT ON FUNCTION amount_add
+  IS 'Returns the normalized sum of two amounts. It raises an exception when the resulting .val is larger than 2^52';
+
+CREATE OR REPLACE FUNCTION amount_left_minus_right(
+  IN  l taler_amount
+ ,IN  r taler_amount
+ ,OUT diff taler_amount
+ ,OUT ok BOOLEAN
+)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+
+IF (l.val > r.val)
+THEN
+  ok = TRUE;
+  IF (l.frac >= r.frac)
+  THEN
+    diff.val  = l.val  - r.val;
+    diff.frac = l.frac - r.frac;
+  ELSE
+    diff.val  = l.val  - r.val - 1;
+    diff.frac = l.frac + 100000000 - r.frac;
+  END IF;
+ELSE
+  IF (l.val = r.val) AND (l.frac >= r.frac)
+  THEN
+    diff.val  = 0;
+    diff.frac = l.frac - r.frac;
+    ok = TRUE;
+  ELSE
+    diff = (-1, -1);
+    ok = FALSE;
+  END IF;
+END IF;
+
+RETURN;
+END $$;
+
+COMMENT ON FUNCTION amount_left_minus_right
+  IS 'Subtracts the right amount from the left and returns the difference and TRUE, if the left amount is larger than the right, or an invalid amount and FALSE otherwise.';
diff --git a/src/exchangedb/exchange_do_batch_coin_known.sql b/src/exchangedb/exchange_do_batch_coin_known.sql
new file mode 100644
index 000000000..db96cb08c
--- /dev/null
+++ b/src/exchangedb/exchange_do_batch_coin_known.sql
@@ -0,0 +1,469 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_batch4_known_coin(
+  IN in_coin_pub1 BYTEA,
+  IN in_denom_pub_hash1 BYTEA,
+  IN in_h_age_commitment1 BYTEA,
+  IN in_denom_sig1 BYTEA,
+  IN in_coin_pub2 BYTEA,
+  IN in_denom_pub_hash2 BYTEA,
+  IN in_h_age_commitment2 BYTEA,
+  IN in_denom_sig2 BYTEA,
+  IN in_coin_pub3 BYTEA,
+  IN in_denom_pub_hash3 BYTEA,
+  IN in_h_age_commitment3 BYTEA,
+  IN in_denom_sig3 BYTEA,
+  IN in_coin_pub4 BYTEA,
+  IN in_denom_pub_hash4 BYTEA,
+  IN in_h_age_commitment4 BYTEA,
+  IN in_denom_sig4 BYTEA,
+  OUT existed1 BOOLEAN,
+  OUT existed2 BOOLEAN,
+  OUT existed3 BOOLEAN,
+  OUT existed4 BOOLEAN,
+  OUT known_coin_id1 INT8,
+  OUT known_coin_id2 INT8,
+  OUT known_coin_id3 INT8,
+  OUT known_coin_id4 INT8,
+  OUT denom_pub_hash1 BYTEA,
+  OUT denom_pub_hash2 BYTEA,
+  OUT denom_pub_hash3 BYTEA,
+  OUT denom_pub_hash4 BYTEA,
+  OUT age_commitment_hash1 BYTEA,
+  OUT age_commitment_hash2 BYTEA,
+  OUT age_commitment_hash3 BYTEA,
+  OUT age_commitment_hash4 BYTEA)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+WITH dd AS (
+SELECT
+  denominations_serial,
+  coin
+  FROM denominations
+    WHERE denom_pub_hash
+    IN
+     (in_denom_pub_hash1,
+      in_denom_pub_hash2,
+      in_denom_pub_hash3,
+      in_denom_pub_hash4)
+     ),--dd
+     input_rows AS (
+     VALUES
+      (in_coin_pub1,
+      in_denom_pub_hash1,
+      in_h_age_commitment1,
+      in_denom_sig1),
+      (in_coin_pub2,
+      in_denom_pub_hash2,
+      in_h_age_commitment2,
+      in_denom_sig2),
+      (in_coin_pub3,
+      in_denom_pub_hash3,
+      in_h_age_commitment3,
+      in_denom_sig3),
+      (in_coin_pub4,
+      in_denom_pub_hash4,
+      in_h_age_commitment4,
+      in_denom_sig4)
+      ),--ir
+      ins AS (
+      INSERT INTO known_coins (
+      coin_pub,
+      denominations_serial,
+      age_commitment_hash,
+      denom_sig,
+      remaining
+      )
+      SELECT
+        ir.coin_pub,
+        dd.denominations_serial,
+        ir.age_commitment_hash,
+        ir.denom_sig,
+        dd.coin
+        FROM input_rows ir
+        JOIN dd
+          ON dd.denom_pub_hash = ir.denom_pub_hash
+          ON CONFLICT DO NOTHING
+          RETURNING known_coin_id
+      ),--kc
+       exists AS (
+         SELECT
+         CASE
+           WHEN
+             ins.known_coin_id IS NOT NULL
+             THEN
+               FALSE
+             ELSE
+               TRUE
+         END AS existed,
+         ins.known_coin_id,
+         dd.denom_pub_hash,
+         kc.age_commitment_hash
+         FROM input_rows ir
+         LEFT JOIN ins
+           ON ins.coin_pub = ir.coin_pub
+         LEFT JOIN known_coins kc
+           ON kc.coin_pub = ir.coin_pub
+         LEFT JOIN dd
+           ON dd.denom_pub_hash = ir.denom_pub_hash
+         )--exists
+SELECT
+ exists.existed AS existed1,
+ exists.known_coin_id AS known_coin_id1,
+ exists.denom_pub_hash AS denom_pub_hash1,
+ exists.age_commitment_hash AS age_commitment_hash1,
+ (
+   SELECT exists.existed
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS existed2,
+ (
+   SELECT exists.known_coin_id
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS known_coin_id2,
+ (
+   SELECT exists.denom_pub_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS denom_pub_hash2,
+ (
+   SELECT exists.age_commitment_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ )AS age_commitment_hash2,
+ (
+   SELECT exists.existed
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash3
+ ) AS existed3,
+ (
+   SELECT exists.known_coin_id
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash3
+ ) AS known_coin_id3,
+ (
+   SELECT exists.denom_pub_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash3
+ ) AS denom_pub_hash3,
+ (
+   SELECT exists.age_commitment_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash3
+ )AS age_commitment_hash3,
+ (
+   SELECT exists.existed
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash4
+ ) AS existed4,
+ (
+   SELECT exists.known_coin_id
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash4
+ ) AS known_coin_id4,
+ (
+   SELECT exists.denom_pub_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash4
+ ) AS denom_pub_hash4,
+ (
+   SELECT exists.age_commitment_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash4
+ )AS age_commitment_hash4
+FROM exists;
+
+RETURN;
+END $$;
+
+
+CREATE OR REPLACE FUNCTION exchange_do_batch2_known_coin(
+  IN in_coin_pub1 BYTEA,
+  IN in_denom_pub_hash1 BYTEA,
+  IN in_h_age_commitment1 BYTEA,
+  IN in_denom_sig1 BYTEA,
+  IN in_coin_pub2 BYTEA,
+  IN in_denom_pub_hash2 BYTEA,
+  IN in_h_age_commitment2 BYTEA,
+  IN in_denom_sig2 BYTEA,
+  OUT existed1 BOOLEAN,
+  OUT existed2 BOOLEAN,
+  OUT known_coin_id1 INT8,
+  OUT known_coin_id2 INT8,
+  OUT denom_pub_hash1 BYTEA,
+  OUT denom_pub_hash2 BYTEA,
+  OUT age_commitment_hash1 BYTEA,
+  OUT age_commitment_hash2 BYTEA)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+WITH dd AS (
+SELECT
+  denominations_serial,
+  coin
+  FROM denominations
+    WHERE denom_pub_hash
+    IN
+     (in_denom_pub_hash1,
+      in_denom_pub_hash2)
+     ),--dd
+     input_rows AS (
+     VALUES
+      (in_coin_pub1,
+      in_denom_pub_hash1,
+      in_h_age_commitment1,
+      in_denom_sig1),
+      (in_coin_pub2,
+      in_denom_pub_hash2,
+      in_h_age_commitment2,
+      in_denom_sig2)
+      ),--ir
+      ins AS (
+      INSERT INTO known_coins (
+      coin_pub,
+      denominations_serial,
+      age_commitment_hash,
+      denom_sig,
+      remaining
+      )
+      SELECT
+        ir.coin_pub,
+        dd.denominations_serial,
+        ir.age_commitment_hash,
+        ir.denom_sig,
+        dd.coin
+        FROM input_rows ir
+        JOIN dd
+          ON dd.denom_pub_hash = ir.denom_pub_hash
+          ON CONFLICT DO NOTHING
+          RETURNING known_coin_id
+      ),--kc
+       exists AS (
+       SELECT
+        CASE
+          WHEN ins.known_coin_id IS NOT NULL
+          THEN
+            FALSE
+          ELSE
+            TRUE
+        END AS existed,
+        ins.known_coin_id,
+        dd.denom_pub_hash,
+        kc.age_commitment_hash
+        FROM input_rows ir
+        LEFT JOIN ins
+          ON ins.coin_pub = ir.coin_pub
+        LEFT JOIN known_coins kc
+          ON kc.coin_pub = ir.coin_pub
+        LEFT JOIN dd
+          ON dd.denom_pub_hash = ir.denom_pub_hash
+     )--exists
+SELECT
+ exists.existed AS existed1,
+ exists.known_coin_id AS known_coin_id1,
+ exists.denom_pub_hash AS denom_pub_hash1,
+ exists.age_commitment_hash AS age_commitment_hash1,
+ (
+   SELECT exists.existed
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS existed2,
+ (
+   SELECT exists.known_coin_id
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS known_coin_id2,
+ (
+   SELECT exists.denom_pub_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ ) AS denom_pub_hash2,
+ (
+   SELECT exists.age_commitment_hash
+   FROM exists
+   WHERE exists.denom_pub_hash = in_denom_pub_hash2
+ )AS age_commitment_hash2
+FROM exists;
+
+RETURN;
+END $$;
+
+
+CREATE OR REPLACE FUNCTION exchange_do_batch1_known_coin(
+  IN in_coin_pub1 BYTEA,
+  IN in_denom_pub_hash1 BYTEA,
+  IN in_h_age_commitment1 BYTEA,
+  IN in_denom_sig1 BYTEA,
+  OUT existed1 BOOLEAN,
+  OUT known_coin_id1 INT8,
+  OUT denom_pub_hash1 BYTEA,
+  OUT age_commitment_hash1 BYTEA)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+WITH dd AS (
+SELECT
+  denominations_serial,
+  coin
+  FROM denominations
+    WHERE denom_pub_hash
+    IN
+     (in_denom_pub_hash1,
+      in_denom_pub_hash2)
+     ),--dd
+     input_rows AS (
+     VALUES
+      (in_coin_pub1,
+      in_denom_pub_hash1,
+      in_h_age_commitment1,
+      in_denom_sig1)
+      ),--ir
+      ins AS (
+      INSERT INTO known_coins (
+      coin_pub,
+      denominations_serial,
+      age_commitment_hash,
+      denom_sig,
+      remaining
+      )
+      SELECT
+        ir.coin_pub,
+        dd.denominations_serial,
+        ir.age_commitment_hash,
+        ir.denom_sig,
+        dd.coin
+        FROM input_rows ir
+        JOIN dd
+          ON dd.denom_pub_hash = ir.denom_pub_hash
+          ON CONFLICT DO NOTHING
+          RETURNING known_coin_id
+      ),--kc
+       exists AS (
+       SELECT
+        CASE
+          WHEN ins.known_coin_id IS NOT NULL
+          THEN
+            FALSE
+          ELSE
+            TRUE
+        END AS existed,
+        ins.known_coin_id,
+        dd.denom_pub_hash,
+        kc.age_commitment_hash
+        FROM input_rows ir
+        LEFT JOIN ins
+          ON ins.coin_pub = ir.coin_pub
+        LEFT JOIN known_coins kc
+          ON kc.coin_pub = ir.coin_pub
+        LEFT JOIN dd
+          ON dd.denom_pub_hash = ir.denom_pub_hash
+       )--exists
+SELECT
+ exists.existed AS existed1,
+ exists.known_coin_id AS known_coin_id1,
+ exists.denom_pub_hash AS denom_pub_hash1,
+ exists.age_commitment_hash AS age_commitment_hash1
+FROM exists;
+
+RETURN;
+END $$;
+
+/*** Experiment using a loop ***/
+/*
+CREATE OR REPLACE FUNCTION exchange_do_batch2_known_coin(
+  IN in_coin_pub1 BYTEA,
+  IN in_denom_pub_hash1 TEXT,
+  IN in_h_age_commitment1 TEXT,
+  IN in_denom_sig1 TEXT,
+  IN in_coin_pub2 BYTEA,
+  IN in_denom_pub_hash2 TEXT,
+  IN in_h_age_commitment2 TEXT,
+  IN in_denom_sig2 TEXT,
+  OUT existed1 BOOLEAN,
+  OUT existed2 BOOLEAN,
+  OUT known_coin_id1 INT8,
+  OUT known_coin_id2 INT8,
+  OUT denom_pub_hash1 TEXT,
+  OUT denom_pub_hash2 TEXT,
+  OUT age_commitment_hash1 TEXT,
+  OUT age_commitment_hash2 TEXT)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  ins_values RECORD;
+BEGIN
+  FOR i IN 1..2 LOOP
+    ins_values := (
+      SELECT
+        in_coin_pub1 AS coin_pub,
+        in_denom_pub_hash1 AS denom_pub_hash,
+        in_h_age_commitment1 AS age_commitment_hash,
+        in_denom_sig1 AS denom_sig
+      WHERE i = 1
+      UNION
+      SELECT
+        in_coin_pub2 AS coin_pub,
+        in_denom_pub_hash2 AS denom_pub_hash,
+        in_h_age_commitment2 AS age_commitment_hash,
+        in_denom_sig2 AS denom_sig
+      WHERE i = 2
+    );
+    WITH dd (denominations_serial, coin) AS (
+      SELECT denominations_serial, coin
+      FROM denominations
+      WHERE denom_pub_hash = ins_values.denom_pub_hash
+    ),
+    input_rows(coin_pub) AS (
+      VALUES (ins_values.coin_pub)
+    ),
+    ins AS (
+      INSERT INTO known_coins (
+        coin_pub,
+        denominations_serial,
+        age_commitment_hash,
+        denom_sig,
+        remaining
+      ) SELECT
+        input_rows.coin_pub,
+        dd.denominations_serial,
+        ins_values.age_commitment_hash,
+        ins_values.denom_sig,
+        coin
+      FROM dd
+      CROSS JOIN input_rows
+      ON CONFLICT DO NOTHING
+      RETURNING known_coin_id, denom_pub_hash
+    )
+    SELECT
+      CASE i
+        WHEN 1 THEN
+          COALESCE(ins.known_coin_id, 0) <> 0 AS existed1,
+          ins.known_coin_id AS known_coin_id1,
+          ins.denom_pub_hash AS denom_pub_hash1,
+          ins.age_commitment_hash AS age_commitment_hash1
+        WHEN 2 THEN
+          COALESCE(ins.known_coin_id, 0) <> 0 AS existed2,
+          ins.known_coin_id AS known_coin_id2,
+          ins.denom_pub_hash AS denom_pub_hash2,
+          ins.age_commitment_hash AS age_commitment_hash2
+      END
+    FROM ins;
+  END LOOP;
+END;
+$$;*/
diff --git a/src/exchangedb/exchange_do_batch_reserves_update.sql b/src/exchangedb/exchange_do_batch_reserves_update.sql
new file mode 100644
index 000000000..ebb58a149
--- /dev/null
+++ b/src/exchangedb/exchange_do_batch_reserves_update.sql
@@ -0,0 +1,72 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_batch_reserves_update(
+  IN in_reserve_pub BYTEA,
+  IN in_expiration_date INT8,
+  IN in_wire_ref INT8,
+  IN in_credit taler_amount,
+  IN in_exchange_account_name TEXT,
+  IN in_wire_source_h_payto BYTEA,
+  IN in_notify text,
+  OUT out_duplicate BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  INSERT INTO reserves_in
+    (reserve_pub
+    ,wire_reference
+    ,credit
+    ,exchange_account_section
+    ,wire_source_h_payto
+    ,execution_date)
+    VALUES
+    (in_reserve_pub
+    ,in_wire_ref
+    ,in_credit
+    ,in_exchange_account_name
+    ,in_wire_source_h_payto
+    ,in_expiration_date)
+    ON CONFLICT DO NOTHING;
+  IF FOUND
+  THEN
+    --IF THE INSERTION WAS A SUCCESS IT MEANS NO DUPLICATED TRANSACTION
+    out_duplicate = FALSE;
+    UPDATE reserves rs
+      SET
+         current_balance.frac = (rs.current_balance).frac+in_credit.frac
+           - CASE
+             WHEN (rs.current_balance).frac + in_credit.frac >= 100000000
+               THEN 100000000
+             ELSE 1
+             END
+        ,current_balance.val = (rs.current_balance).val+in_credit.val
+           + CASE
+             WHEN (rs.current_balance).frac + in_credit.frac >= 100000000
+               THEN 1
+             ELSE 0
+             END
+             ,expiration_date=GREATEST(expiration_date,in_expiration_date)
+             ,gc_date=GREATEST(gc_date,in_expiration_date)
+   	        WHERE reserve_pub=in_reserve_pub;
+    EXECUTE FORMAT (
+      'NOTIFY %s'
+      ,in_notify);
+  ELSE
+    out_duplicate = TRUE;
+  END IF;
+  RETURN;
+END $$;
diff --git a/src/exchangedb/exchange_do_batch_withdraw.sql b/src/exchangedb/exchange_do_batch_withdraw.sql
new file mode 100644
index 000000000..a48561a9a
--- /dev/null
+++ b/src/exchangedb/exchange_do_batch_withdraw.sql
@@ -0,0 +1,126 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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/>
+--
+-- @author Christian Grothoff
+-- @author Özgür Kesim
+
+CREATE OR REPLACE FUNCTION exchange_do_batch_withdraw(
+  IN amount taler_amount,
+  IN rpub BYTEA,
+  IN now INT8,
+  IN min_reserve_gc INT8,
+  IN do_age_check BOOLEAN,
+  OUT reserve_found BOOLEAN,
+  OUT balance_ok BOOLEAN,
+  OUT reserve_balance taler_amount,
+  OUT age_ok BOOLEAN,
+  OUT allowed_maximum_age INT2, -- in years
+  OUT ruuid INT8)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  reserve RECORD;
+  balance taler_amount;
+  not_before date;
+BEGIN
+-- Shards: reserves by reserve_pub (SELECT)
+--         reserves_out (INSERT, with CONFLICT detection) by wih
+--         reserves by reserve_pub (UPDATE)
+--         reserves_in by reserve_pub (SELECT)
+--         wire_targets by wire_target_h_payto
+
+SELECT current_balance
+      ,reserve_uuid
+      ,birthday
+      ,gc_date
+  INTO reserve
+  FROM exchange.reserves
+ WHERE reserves.reserve_pub=rpub;
+
+IF NOT FOUND
+THEN
+  -- reserve unknown
+  reserve_found=FALSE;
+  balance_ok=FALSE;
+  reserve_balance.frac = 0;
+  reserve_balance.val = 0;
+  age_ok=FALSE;
+  allowed_maximum_age=0;
+  ruuid=2;
+  RETURN;
+END IF;
+reserve_found=TRUE;
+reserve_balance = reserve.current_balance;
+ruuid = reserve.reserve_uuid;
+
+-- Check if age requirements are present
+IF ((NOT do_age_check) OR (reserve.birthday = 0))
+THEN
+  age_ok = TRUE;
+  allowed_maximum_age = -1;
+ELSE
+  -- Age requirements are formally not met:  The exchange is setup to support
+  -- age restrictions (do_age_check == TRUE) and the reserve has a
+  -- birthday set (reserve_birthday != 0), but the client called the
+  -- batch-withdraw endpoint instead of the age-withdraw endpoint, which it
+  -- should have.
+  not_before=date '1970-01-01' + reserve.birthday;
+  allowed_maximum_age = extract(year from age(current_date, not_before));
+
+  balance_ok=FALSE;
+  age_ok = FALSE;
+  RETURN;
+END IF;
+
+
+-- Check reserve balance is sufficient.
+IF (reserve_balance.val > amount.val)
+THEN
+  IF (reserve_balance.frac >= amount.frac)
+  THEN
+    balance.val=reserve_balance.val - amount.val;
+    balance.frac=reserve_balance.frac - amount.frac;
+  ELSE
+    balance.val=reserve_balance.val - amount.val - 1;
+    balance.frac=reserve_balance.frac + 100000000 - amount.frac;
+  END IF;
+ELSE
+  IF (reserve_balance.val = amount.val) AND (reserve_balance.frac >= amount.frac)
+  THEN
+    balance.val=0;
+    balance.frac=reserve_balance.frac - amount.frac;
+  ELSE
+    balance_ok=FALSE;
+    RETURN;
+  END IF;
+END IF;
+
+-- Calculate new expiration dates.
+min_reserve_gc=GREATEST(min_reserve_gc,reserve.gc_date);
+
+-- Update reserve balance.
+UPDATE reserves SET
+  gc_date=min_reserve_gc
+ ,current_balance=balance
+WHERE
+  reserves.reserve_pub=rpub;
+
+balance_ok=TRUE;
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_batch_withdraw(taler_amount, BYTEA, INT8, INT8, BOOLEAN)
+  IS 'Checks whether the reserve has sufficient balance for a withdraw operation (or the request is repeated and was previously approved) and that age requirements are formally met. If so updates the database with the result. Excludes storing the planchets.';
+
diff --git a/src/exchangedb/exchange_do_batch_withdraw_insert.sql b/src/exchangedb/exchange_do_batch_withdraw_insert.sql
new file mode 100644
index 000000000..d36181a6b
--- /dev/null
+++ b/src/exchangedb/exchange_do_batch_withdraw_insert.sql
@@ -0,0 +1,120 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_batch_withdraw_insert(
+  IN cs_nonce BYTEA,
+  IN amount taler_amount,
+  IN h_denom_pub BYTEA, -- FIXME: denom_serials should really be a parameter to this FUNCTION.
+  IN ruuid INT8,
+  IN reserve_sig BYTEA,
+  IN h_coin_envelope BYTEA,
+  IN denom_sig BYTEA,
+  IN now INT8,
+  OUT out_denom_unknown BOOLEAN,
+  OUT out_nonce_reuse BOOLEAN,
+  OUT out_conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  denom_serial INT8;
+BEGIN
+-- Shards: reserves by reserve_pub (SELECT)
+--         reserves_out (INSERT, with CONFLICT detection) by wih
+--         reserves by reserve_pub (UPDATE)
+--         reserves_in by reserve_pub (SELECT)
+--         wire_targets by wire_target_h_payto
+
+out_denom_unknown=TRUE;
+out_conflict=TRUE;
+out_nonce_reuse=TRUE;
+
+-- FIXME: denom_serials should really be a parameter to this FUNCTION.
+
+SELECT denominations_serial
+  INTO denom_serial
+  FROM exchange.denominations
+ WHERE denom_pub_hash=h_denom_pub;
+
+IF NOT FOUND
+THEN
+  -- denomination unknown, should be impossible!
+  out_denom_unknown=TRUE;
+  ASSERT false, 'denomination unknown';
+  RETURN;
+END IF;
+out_denom_unknown=FALSE;
+
+INSERT INTO exchange.reserves_out
+  (h_blind_ev
+  ,denominations_serial
+  ,denom_sig
+  ,reserve_uuid
+  ,reserve_sig
+  ,execution_date
+  ,amount_with_fee)
+VALUES
+  (h_coin_envelope
+  ,denom_serial
+  ,denom_sig
+  ,ruuid
+  ,reserve_sig
+  ,now
+  ,amount)
+ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  out_conflict=TRUE;
+  RETURN;
+END IF;
+out_conflict=FALSE;
+
+-- Special actions needed for a CS withdraw?
+out_nonce_reuse=FALSE;
+IF NOT NULL cs_nonce
+THEN
+  -- Cache CS signature to prevent replays in the future
+  -- (and check if cached signature exists at the same time).
+  INSERT INTO exchange.cs_nonce_locks
+    (nonce
+    ,max_denomination_serial
+    ,op_hash)
+  VALUES
+    (cs_nonce
+    ,denom_serial
+    ,h_coin_envelope)
+  ON CONFLICT DO NOTHING;
+
+  IF NOT FOUND
+  THEN
+    -- See if the existing entry is identical.
+    SELECT 1
+      FROM exchange.cs_nonce_locks
+     WHERE nonce=cs_nonce
+       AND op_hash=h_coin_envelope;
+    IF NOT FOUND
+    THEN
+      out_nonce_reuse=TRUE;
+      ASSERT false, 'nonce reuse attempted by client';
+      RETURN;
+    END IF;
+  END IF;
+END IF;
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_batch_withdraw_insert(BYTEA, taler_amount, BYTEA, INT8, BYTEA, BYTEA, BYTEA, INT8)
+  IS 'Stores information about a planchet for a batch withdraw operation. Checks if the planchet already exists, and in that case indicates a conflict';
diff --git a/src/exchangedb/exchange_do_deposit.sql b/src/exchangedb/exchange_do_deposit.sql
new file mode 100644
index 000000000..c89e9e470
--- /dev/null
+++ b/src/exchangedb/exchange_do_deposit.sql
@@ -0,0 +1,206 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 OR REPLACE FUNCTION exchange_do_deposit(
+  -- For batch_deposits
+  IN in_shard INT8,
+  IN in_merchant_pub BYTEA,
+  IN in_wallet_timestamp INT8,
+  IN in_exchange_timestamp INT8,
+  IN in_refund_deadline INT8,
+  IN in_wire_deadline INT8,
+  IN in_h_contract_terms BYTEA,
+  IN in_wallet_data_hash BYTEA, -- can be NULL
+  IN in_wire_salt BYTEA,
+  IN in_wire_target_h_payto BYTEA,
+  IN in_policy_details_serial_id INT8, -- can be NULL
+  IN in_policy_blocked BOOLEAN,
+  -- For wire_targets
+  IN in_receiver_wire_account TEXT,
+  -- For coin_deposits
+  IN ina_coin_pub BYTEA[],
+  IN ina_coin_sig BYTEA[],
+  IN ina_amount_with_fee taler_amount[],
+  OUT out_exchange_timestamp INT8,
+  OUT out_insufficient_balance_coin_index INT4, -- index of coin with bad balance, NULL if none
+  OUT out_conflict BOOL
+ )
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  wtsi INT8; -- wire target serial id
+  bdsi INT8; -- batch_deposits serial id
+  i INT4;
+  ini_amount_with_fee taler_amount;
+  ini_coin_pub BYTEA;
+  ini_coin_sig BYTEA;
+BEGIN
+-- Shards:
+--         INSERT wire_targets (by h_payto), ON CONFLICT DO NOTHING;
+--         INSERT batch_deposits (by shard, merchant_pub), ON CONFLICT idempotency check;
+--         INSERT[] coin_deposits (by coin_pub), ON CONFLICT idempotency check;
+--         UPDATE[] known_coins (by coin_pub)
+
+
+-- First, get or create the 'wtsi'
+INSERT INTO wire_targets
+    (wire_target_h_payto
+    ,payto_uri)
+  VALUES
+    (in_wire_target_h_payto
+    ,in_receiver_wire_account)
+  ON CONFLICT DO NOTHING -- for CONFLICT ON (wire_target_h_payto)
+  RETURNING
+    wire_target_serial_id
+  INTO
+    wtsi;
+
+IF NOT FOUND
+THEN
+  SELECT
+    wire_target_serial_id
+  INTO
+    wtsi
+  FROM wire_targets
+  WHERE
+    wire_target_h_payto=in_wire_target_h_payto;
+END IF;
+
+
+-- Second, create the batch_deposits entry
+INSERT INTO batch_deposits
+  (shard
+  ,merchant_pub
+  ,wallet_timestamp
+  ,exchange_timestamp
+  ,refund_deadline
+  ,wire_deadline
+  ,h_contract_terms
+  ,wallet_data_hash
+  ,wire_salt
+  ,wire_target_h_payto
+  ,policy_details_serial_id
+  ,policy_blocked
+  )
+  VALUES
+  (in_shard
+  ,in_merchant_pub
+  ,in_wallet_timestamp
+  ,in_exchange_timestamp
+  ,in_refund_deadline
+  ,in_wire_deadline
+  ,in_h_contract_terms
+  ,in_wallet_data_hash
+  ,in_wire_salt
+  ,in_wire_target_h_payto
+  ,in_policy_details_serial_id
+  ,in_policy_blocked)
+  ON CONFLICT DO NOTHING -- for CONFLICT ON (merchant_pub, h_contract_terms)
+  RETURNING
+    batch_deposit_serial_id
+  INTO
+    bdsi;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: see if an identical record exists.
+  -- We do select over merchant_pub, h_contract_terms and wire_target_h_payto
+  -- first to maximally increase the chance of using the existing index.
+  SELECT
+      exchange_timestamp
+     ,batch_deposit_serial_id
+   INTO
+      out_exchange_timestamp
+     ,bdsi
+   FROM batch_deposits
+   WHERE shard=in_shard
+     AND merchant_pub=in_merchant_pub
+     AND h_contract_terms=in_h_contract_terms
+     AND wire_target_h_payto=in_wire_target_h_payto
+     -- now check the rest, too
+     AND ( (wallet_data_hash=in_wallet_data_hash) OR
+           (wallet_data_hash IS NULL AND in_wallet_data_hash IS NULL) )
+     AND wire_salt=in_wire_salt
+     AND wallet_timestamp=in_wallet_timestamp
+     AND refund_deadline=in_refund_deadline
+     AND wire_deadline=in_wire_deadline
+     AND ( (policy_details_serial_id=in_policy_details_serial_id) OR
+           (policy_details_serial_id IS NULL AND in_policy_details_serial_id IS NULL) );
+  IF NOT FOUND
+  THEN
+    -- Deposit exists, but with *strange* differences. Not allowed.
+    out_conflict=TRUE;
+    RETURN;
+  END IF;
+END IF;
+
+out_conflict=FALSE;
+
+-- Deposit each coin
+
+FOR i IN 1..array_length(ina_coin_pub,1)
+LOOP
+  ini_coin_pub = ina_coin_pub[i];
+  ini_coin_sig = ina_coin_sig[i];
+  ini_amount_with_fee = ina_amount_with_fee[i];
+
+  INSERT INTO coin_deposits
+    (batch_deposit_serial_id
+    ,coin_pub
+    ,coin_sig
+    ,amount_with_fee
+    )
+    VALUES
+    (bdsi
+    ,ini_coin_pub
+    ,ini_coin_sig
+    ,ini_amount_with_fee
+    )
+    ON CONFLICT DO NOTHING;
+
+  IF FOUND
+  THEN
+    -- Insert did happen, update balance in known_coins!
+
+    UPDATE known_coins kc
+      SET
+        remaining.frac=(kc.remaining).frac-ini_amount_with_fee.frac
+          + CASE
+              WHEN (kc.remaining).frac < ini_amount_with_fee.frac
+              THEN 100000000
+              ELSE 0
+            END,
+        remaining.val=(kc.remaining).val-ini_amount_with_fee.val
+          - CASE
+              WHEN (kc.remaining).frac < ini_amount_with_fee.frac
+              THEN 1
+              ELSE 0
+            END
+      WHERE coin_pub=ini_coin_pub
+        AND ( ((kc.remaining).val > ini_amount_with_fee.val) OR
+              ( ((kc.remaining).frac >= ini_amount_with_fee.frac) AND
+                ((kc.remaining).val >= ini_amount_with_fee.val) ) );
+
+    IF NOT FOUND
+    THEN
+      -- Insufficient balance.
+      -- Note: C arrays are 0 indexed, but i started at 1
+      out_insufficient_balance_coin_index=i-1;
+      RETURN;
+    END IF;
+  END IF;
+END LOOP; -- end FOR all coins
+
+END $$;
diff --git a/src/exchangedb/exchange_do_expire_purse.sql b/src/exchangedb/exchange_do_expire_purse.sql
new file mode 100644
index 000000000..ee9757f03
--- /dev/null
+++ b/src/exchangedb/exchange_do_expire_purse.sql
@@ -0,0 +1,98 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_expire_purse(
+  IN in_start_time INT8,
+  IN in_end_time INT8,
+  IN in_now INT8,
+  OUT out_found BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_purse_pub BYTEA;
+DECLARE
+  my_deposit record;
+DECLARE
+  my_in_reserve_quota BOOLEAN;
+BEGIN
+
+-- FIXME: we should probably do this in a loop
+-- and expire all at once, instead of one per query
+SELECT purse_pub
+      ,in_reserve_quota
+  INTO my_purse_pub
+      ,my_in_reserve_quota
+  FROM purse_requests
+ WHERE (purse_expiration >= in_start_time) AND
+       (purse_expiration < in_end_time) AND
+       NOT was_decided
+  ORDER BY purse_expiration ASC
+ LIMIT 1;
+out_found = FOUND;
+IF NOT FOUND
+THEN
+  RETURN;
+END IF;
+
+INSERT INTO purse_decision
+  (purse_pub
+  ,action_timestamp
+  ,refunded)
+VALUES
+  (my_purse_pub
+  ,in_now
+  ,TRUE);
+
+-- Code for 'TALER_DBEVENT_EXCHANGE_PURSE_REFUNDED'
+NOTIFY X8DJSPNYJMNZDAP7GN6YQ4EZVSQXMF3HRP4VAR347WP9SZYP1C200;
+
+IF (my_in_reserve_quota)
+THEN
+  UPDATE reserves
+    SET purses_active=purses_active-1
+  WHERE reserve_pub IN
+    (SELECT reserve_pub
+       FROM exchange.purse_merges
+      WHERE purse_pub=my_purse_pub
+     LIMIT 1);
+END IF;
+
+-- restore balance to each coin deposited into the purse
+FOR my_deposit IN
+  SELECT coin_pub
+        ,amount_with_fee
+    FROM purse_deposits
+  WHERE purse_pub = my_purse_pub
+LOOP
+  UPDATE known_coins kc SET
+    remaining.frac=(kc.remaining).frac+(my_deposit.amount_with_fee).frac
+     - CASE
+       WHEN (kc.remaining).frac+(my_deposit.amount_with_fee).frac >= 100000000
+       THEN 100000000
+       ELSE 0
+       END,
+    remaining.val=(kc.remaining).val+(my_deposit.amount_with_fee).val
+     + CASE
+       WHEN (kc.remaining).frac+(my_deposit.amount_with_fee).frac >= 100000000
+       THEN 1
+       ELSE 0
+       END
+    WHERE coin_pub = my_deposit.coin_pub;
+  END LOOP;
+END $$;
+
+COMMENT ON FUNCTION exchange_do_expire_purse(INT8,INT8,INT8)
+  IS 'Finds an expired purse in the given time range and refunds the coins (if any).';
diff --git a/src/exchangedb/exchange_do_gc.sql b/src/exchangedb/exchange_do_gc.sql
new file mode 100644
index 000000000..d4ecb3024
--- /dev/null
+++ b/src/exchangedb/exchange_do_gc.sql
@@ -0,0 +1,140 @@
+--
+-- 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 OR REPLACE PROCEDURE exchange_do_gc(
+  IN in_ancient_date INT8,
+  IN in_now INT8)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  reserve_uuid_min INT8; -- minimum reserve UUID still alive
+  melt_min INT8; -- minimum melt still alive
+  coin_min INT8; -- minimum known_coin still alive
+  batch_deposit_min INT8; -- minimum deposit still alive
+  reserve_out_min INT8; -- minimum reserve_out still alive
+  denom_min INT8; -- minimum denomination still alive
+BEGIN
+
+DELETE FROM prewire
+  WHERE finished=TRUE;
+
+DELETE FROM wire_fee
+  WHERE end_date < in_ancient_date;
+
+-- FIXME: use closing fee as threshold?
+DELETE FROM reserves
+  WHERE gc_date < in_now
+    AND current_balance = (0, 0);
+
+SELECT
+     reserve_out_serial_id
+  INTO
+     reserve_out_min
+  FROM reserves_out
+  ORDER BY reserve_out_serial_id ASC
+  LIMIT 1;
+
+DELETE FROM recoup
+  WHERE reserve_out_serial_id < reserve_out_min;
+
+SELECT
+     reserve_uuid
+  INTO
+     reserve_uuid_min
+  FROM reserves
+  ORDER BY reserve_uuid ASC
+  LIMIT 1;
+
+DELETE FROM reserves_out
+  WHERE reserve_uuid < reserve_uuid_min;
+
+-- FIXME: this query will be horribly slow;
+-- need to find another way to formulate it...
+DELETE FROM denominations
+  WHERE expire_legal < in_now
+    AND denominations_serial NOT IN
+      (SELECT DISTINCT denominations_serial
+         FROM reserves_out)
+    AND denominations_serial NOT IN
+      (SELECT DISTINCT denominations_serial
+         FROM known_coins
+        WHERE coin_pub IN
+          (SELECT DISTINCT coin_pub
+             FROM recoup))
+    AND denominations_serial NOT IN
+      (SELECT DISTINCT denominations_serial
+         FROM known_coins
+        WHERE coin_pub IN
+          (SELECT DISTINCT coin_pub
+             FROM recoup_refresh));
+
+SELECT
+     melt_serial_id
+  INTO
+     melt_min
+  FROM refresh_commitments
+  ORDER BY melt_serial_id ASC
+  LIMIT 1;
+
+DELETE FROM refresh_revealed_coins
+  WHERE melt_serial_id < melt_min;
+
+DELETE FROM refresh_transfer_keys
+  WHERE melt_serial_id < melt_min;
+
+SELECT
+     known_coin_id
+  INTO
+     coin_min
+  FROM known_coins
+  ORDER BY known_coin_id ASC
+  LIMIT 1;
+
+DELETE FROM recoup_refresh
+  WHERE known_coin_id < coin_min;
+
+DELETE FROM batch_deposits
+  WHERE wire_deadline < in_ancient_date;
+
+SELECT
+     batch_deposit_serial_id
+  INTO
+     batch_deposit_min
+  FROM coin_deposits
+  ORDER BY batch_deposit_serial_id ASC
+  LIMIT 1;
+
+DELETE FROM refunds
+  WHERE batch_deposit_serial_id < batch_deposit_min;
+DELETE FROM aggregation_tracking
+  WHERE batch_deposit_serial_id < batch_deposit_min;
+DELETE FROM coin_deposits
+  WHERE batch_deposit_serial_id < batch_deposit_min;
+
+
+
+SELECT
+     denominations_serial
+  INTO
+     denom_min
+  FROM denominations
+  ORDER BY denominations_serial ASC
+  LIMIT 1;
+
+DELETE FROM cs_nonce_locks
+  WHERE max_denomination_serial <= denom_min;
+
+END $$;
diff --git a/src/exchangedb/exchange_do_get_link_data.sql b/src/exchangedb/exchange_do_get_link_data.sql
new file mode 100644
index 000000000..08611a5ea
--- /dev/null
+++ b/src/exchangedb/exchange_do_get_link_data.sql
@@ -0,0 +1,59 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_get_link_data(
+  IN in_coin_pub BYTEA
+)
+RETURNS SETOF record
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  curs CURSOR
+  FOR
+  SELECT
+   melt_serial_id
+  FROM refresh_commitments
+  WHERE old_coin_pub=in_coin_pub;
+
+DECLARE
+  i RECORD;
+BEGIN
+OPEN curs;
+LOOP
+    FETCH NEXT FROM curs INTO i;
+    EXIT WHEN NOT FOUND;
+    RETURN QUERY
+      SELECT
+       tp.transfer_pub
+      ,denoms.denom_pub
+      ,rrc.ev_sig
+      ,rrc.ewv
+      ,rrc.link_sig
+      ,rrc.freshcoin_index
+      ,rrc.coin_ev
+      FROM refresh_revealed_coins rrc
+       JOIN refresh_transfer_keys tp
+         ON (tp.melt_serial_id=rrc.melt_serial_id)
+       JOIN denominations denoms
+         ON (rrc.denominations_serial=denoms.denominations_serial)
+       WHERE rrc.melt_serial_id =i.melt_serial_id
+/*       GROUP BY tp.transfer_pub, denoms.denom_pub, rrc.ev_sig,rrc.ewv,rrc.link_sig,rrc.freshcoin_index, rrc.coin_ev*/
+       ORDER BY tp.transfer_pub,
+       rrc.freshcoin_index ASC
+       ;
+END LOOP;
+CLOSE curs;
+END $$;
diff --git a/src/exchangedb/exchange_do_insert_aml_decision.sql b/src/exchangedb/exchange_do_insert_aml_decision.sql
new file mode 100644
index 000000000..c8ed7e928
--- /dev/null
+++ b/src/exchangedb/exchange_do_insert_aml_decision.sql
@@ -0,0 +1,127 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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 OR REPLACE FUNCTION exchange_do_insert_aml_decision(
+  IN in_h_payto BYTEA,
+  IN in_new_threshold taler_amount,
+  IN in_new_status INT4,
+  IN in_decision_time INT8,
+  IN in_justification TEXT,
+  IN in_decider_pub BYTEA,
+  IN in_decider_sig BYTEA,
+  IN in_notify_s TEXT,
+  IN in_kyc_requirements TEXT,
+  IN in_requirement_row INT8,
+  OUT out_invalid_officer BOOLEAN,
+  OUT out_last_date INT8)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+-- Check officer is eligible to make decisions.
+PERFORM
+  FROM aml_staff
+  WHERE decider_pub=in_decider_pub
+    AND is_active
+    AND NOT read_only;
+IF NOT FOUND
+THEN
+  out_invalid_officer=TRUE;
+  out_last_date=0;
+  RETURN;
+END IF;
+out_invalid_officer=FALSE;
+
+-- Check no more recent decision exists.
+SELECT decision_time
+  INTO out_last_date
+  FROM aml_history
+  WHERE h_payto=in_h_payto
+  ORDER BY decision_time DESC;
+IF FOUND
+THEN
+  IF out_last_date >= in_decision_time
+  THEN
+    -- Refuse to insert older decision.
+    RETURN;
+  END IF;
+  UPDATE aml_status
+    SET threshold=in_new_threshold
+       ,status=in_new_status
+       ,kyc_requirement=in_requirement_row
+   WHERE h_payto=in_h_payto;
+  ASSERT FOUND, 'cannot have AML decision history but no AML status';
+ELSE
+  out_last_date = 0;
+  INSERT INTO aml_status
+    (h_payto
+    ,threshold
+    ,status
+    ,kyc_requirement)
+    VALUES
+    (in_h_payto
+    ,in_new_threshold
+    ,in_new_status
+    ,in_requirement_row)
+    ON CONFLICT (h_payto) DO
+    UPDATE SET
+       threshold=in_new_threshold
+      ,status=in_new_status;
+END IF;
+
+
+INSERT INTO aml_history
+  (h_payto
+  ,new_threshold
+  ,new_status
+  ,decision_time
+  ,justification
+  ,kyc_requirements
+  ,kyc_req_row
+  ,decider_pub
+  ,decider_sig
+  ) VALUES
+  (in_h_payto
+  ,in_new_threshold
+  ,in_new_status
+  ,in_decision_time
+  ,in_justification
+  ,in_kyc_requirements
+  ,in_requirement_row
+  ,in_decider_pub
+  ,in_decider_sig);
+
+
+-- wake up taler-exchange-aggregator
+IF 0 = in_new_status
+THEN
+  INSERT INTO kyc_alerts
+    (h_payto
+    ,trigger_type)
+    VALUES
+    (in_h_payto,1);
+
+   EXECUTE FORMAT (
+     'NOTIFY %s'
+    ,in_notify_s);
+
+END IF;
+
+
+END $$;
+
+
+COMMENT ON FUNCTION exchange_do_insert_aml_decision(BYTEA, taler_amount, INT4, INT8, TEXT, BYTEA, BYTEA, TEXT, TEXT, INT8)
+  IS 'Checks whether the AML officer is eligible to make AML decisions and if so inserts the decision into the table';
diff --git a/src/exchangedb/exchange_do_insert_aml_officer.sql b/src/exchangedb/exchange_do_insert_aml_officer.sql
new file mode 100644
index 000000000..429ba11c7
--- /dev/null
+++ b/src/exchangedb/exchange_do_insert_aml_officer.sql
@@ -0,0 +1,74 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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 OR REPLACE FUNCTION exchange_do_insert_aml_officer(
+  IN in_decider_pub BYTEA,
+  IN in_master_sig BYTEA,
+  IN in_decider_name TEXT,
+  IN in_is_active BOOLEAN,
+  IN in_read_only BOOLEAN,
+  IN in_last_change INT8,
+  OUT out_last_change INT8)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+INSERT INTO exchange.aml_staff
+  (decider_pub
+  ,master_sig
+  ,decider_name
+  ,is_active
+  ,read_only
+  ,last_change
+  ) VALUES
+  (in_decider_pub
+  ,in_master_sig
+  ,in_decider_name
+  ,in_is_active
+  ,in_read_only
+  ,in_last_change)
+ ON CONFLICT DO NOTHING;
+IF FOUND
+THEN
+  out_last_change=0;
+  RETURN;
+END IF;
+
+-- Check update is most recent...
+SELECT last_change
+  INTO out_last_change
+  FROM exchange.aml_staff
+  WHERE decider_pub=in_decider_pub;
+ASSERT FOUND, 'cannot have INSERT conflict but no AML staff record';
+
+IF out_last_change >= in_last_change
+THEN
+  -- Refuse to insert older status
+ RETURN;
+END IF;
+
+-- We are more recent, update existing record.
+UPDATE exchange.aml_staff
+  SET master_sig=in_master_sig
+     ,decider_name=in_decider_name
+     ,is_active=in_is_active
+     ,read_only=in_read_only
+     ,last_change=in_last_change
+  WHERE decider_pub=in_decider_pub;
+END $$;
+
+
+COMMENT ON FUNCTION exchange_do_insert_aml_officer(BYTEA, BYTEA, TEXT, BOOL, BOOL, INT8)
+  IS 'Inserts or updates AML staff record, making sure the update is more recent than the previous change';
diff --git a/src/exchangedb/exchange_do_insert_kyc_attributes.sql b/src/exchangedb/exchange_do_insert_kyc_attributes.sql
new file mode 100644
index 000000000..7db4d80c0
--- /dev/null
+++ b/src/exchangedb/exchange_do_insert_kyc_attributes.sql
@@ -0,0 +1,114 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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 OR REPLACE FUNCTION exchange_do_insert_kyc_attributes(
+  IN in_process_row INT8,
+  IN in_h_payto BYTEA,
+  IN in_kyc_prox BYTEA,
+  IN in_provider_section TEXT,
+  IN in_satisfied_checks TEXT[],
+  IN in_birthday INT4,
+  IN in_provider_account_id TEXT,
+  IN in_provider_legitimization_id TEXT,
+  IN in_collection_time_ts INT8,
+  IN in_expiration_time INT8,
+  IN in_expiration_time_ts INT8,
+  IN in_enc_attributes BYTEA,
+  IN in_require_aml BOOLEAN,
+  IN in_kyc_completed_notify_s TEXT,
+  OUT out_ok BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+   orig_reserve_pub BYTEA;
+   orig_reserve_found BOOLEAN;
+BEGIN
+
+INSERT INTO exchange.kyc_attributes
+  (h_payto
+  ,kyc_prox
+  ,provider
+  ,satisfied_checks
+  ,collection_time
+  ,expiration_time
+  ,encrypted_attributes
+  ,legitimization_serial
+ ) VALUES
+  (in_h_payto
+  ,in_kyc_prox
+  ,in_provider_section
+  ,in_satisfied_checks
+  ,in_collection_time_ts
+  ,in_expiration_time_ts
+  ,in_enc_attributes
+  ,in_process_row);
+
+UPDATE legitimization_processes
+  SET provider_user_id=in_provider_account_id
+     ,provider_legitimization_id=in_provider_legitimization_id
+     ,expiration_time=GREATEST(expiration_time,in_expiration_time)
+     ,finished=TRUE
+ WHERE h_payto=in_h_payto
+   AND legitimization_process_serial_id=in_process_row
+   AND provider_section=in_provider_section;
+out_ok = FOUND;
+
+
+-- If the h_payto refers to a reserve in the original requirements
+-- update the originating reserve's birthday.
+SELECT reserve_pub
+  INTO orig_reserve_pub
+  FROM exchange.legitimization_requirements
+ WHERE h_payto=in_h_payto
+   AND NOT reserve_pub IS NULL;
+orig_reserve_found = FOUND;
+
+IF orig_reserve_found
+THEN
+  UPDATE exchange.reserves
+     SET birthday=in_birthday
+   WHERE reserve_pub=orig_reserve_pub;
+END IF;
+
+IF in_require_aml
+THEN
+  INSERT INTO exchange.aml_status
+    (h_payto
+    ,status)
+   VALUES
+    (in_h_payto
+    ,1)
+  ON CONFLICT (h_payto) DO
+    UPDATE SET status=EXCLUDED.status | 1;
+END IF;
+
+EXECUTE FORMAT (
+ 'NOTIFY %s'
+ ,in_kyc_completed_notify_s);
+
+
+INSERT INTO kyc_alerts
+ (h_payto
+ ,trigger_type)
+ VALUES
+ (in_h_payto,1);
+
+
+END $$;
+
+
+COMMENT ON FUNCTION exchange_do_insert_kyc_attributes(INT8, BYTEA, BYTEA, TEXT, TEXT[], INT4, TEXT, TEXT, INT8, INT8, INT8, BYTEA, BOOL, TEXT)
+  IS 'Inserts new KYC attributes and updates the status of the legitimization process and the AML status for the account';
diff --git a/src/exchangedb/exchange_do_insert_or_update_policy_details.sql b/src/exchangedb/exchange_do_insert_or_update_policy_details.sql
new file mode 100644
index 000000000..85e52d3d3
--- /dev/null
+++ b/src/exchangedb/exchange_do_insert_or_update_policy_details.sql
@@ -0,0 +1,114 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_insert_or_update_policy_details(
+  IN in_policy_hash_code BYTEA,
+  IN in_policy_json TEXT,
+  IN in_deadline INT8,
+  IN in_commitment taler_amount,
+  IN in_accumulated_total taler_amount,
+  IN in_fee taler_amount,
+  IN in_transferable taler_amount,
+  IN in_fulfillment_state SMALLINT,
+  OUT out_policy_details_serial_id INT8,
+  OUT out_accumulated_total taler_amount,
+  OUT out_fulfillment_state SMALLINT)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    cur_commitment taler_amount;
+DECLARE
+    cur_accumulated_total taler_amount;
+DECLARE
+    rval RECORD;
+BEGIN
+       -- First, try to create a new entry.
+       INSERT INTO policy_details
+               (policy_hash_code,
+                policy_json,
+                deadline,
+                commitment,
+                accumulated_total,
+                fee,
+                transferable,
+                fulfillment_state)
+       VALUES (in_policy_hash_code,
+                in_policy_json,
+                in_deadline,
+                in_commitment,
+                in_accumulated_total,
+                in_fee,
+                in_transferable,
+                in_fulfillment_state)
+       ON CONFLICT (policy_hash_code) DO NOTHING
+       RETURNING policy_details_serial_id INTO out_policy_details_serial_id;
+
+       -- If the insert was successful, return
+       -- We assume that the fullfilment_state was correct in first place.
+       IF FOUND THEN
+               out_accumulated_total = in_accumulated_total;
+               out_fulfillment_state = in_fulfillment_state;
+               RETURN;
+       END IF;
+
+       -- We had a conflict, grab the parts we need to update.
+       SELECT policy_details_serial_id
+         ,commitment
+         ,accumulated_total
+       INTO rval
+       FROM policy_details
+       WHERE policy_hash_code = in_policy_hash_code;
+
+       -- We use rval as workaround as we cannot select
+       -- directly into the amount due to Postgres limitations.
+       out_policy_details_serial_id := rval.policy_details_serial_id;
+       cur_commitment := rval.commitment;
+       cur_accumulated_total := rval.accumulated_total;
+
+       -- calculate the new values (overflows throws exception)
+       out_accumulated_total.val  = cur_accumulated_total.val  + in_accumulated_total.val;
+       out_accumulated_total.frac = cur_accumulated_total.frac + in_accumulated_total.frac;
+       -- normalize
+       out_accumulated_total.val = out_accumulated_total.val + out_accumulated_total.frac / 100000000;
+       out_accumulated_total.frac = out_accumulated_total.frac % 100000000;
+
+       IF (out_accumulated_total.val > (1 << 52))
+       THEN
+               RAISE EXCEPTION 'accumulation overflow';
+       END IF;
+
+
+       -- Set the fulfillment_state according to the values.
+       -- For now, we only update the state when it was INSUFFICIENT.
+       -- FIXME[oec] #7999: What to do in case of Failure or other state?
+       IF (out_fullfillment_state = 2) -- INSUFFICIENT
+       THEN
+               IF (out_accumulated_total.val >= cur_commitment.val OR
+                       (out_accumulated_total.val = cur_commitment.val AND
+                               out_accumulated_total.frac >= cur_commitment.frac))
+               THEN
+                       out_fulfillment_state = 3; -- READY
+               END IF;
+       END IF;
+
+       -- Now, update the record
+       UPDATE exchange.policy_details
+       SET
+               accumulated  = out_accumulated_total,
+               fulfillment_state = out_fulfillment_state
+       WHERE
+               policy_details_serial_id = out_policy_details_serial_id;
+END $$;
diff --git a/src/exchangedb/exchange_do_melt.sql b/src/exchangedb/exchange_do_melt.sql
new file mode 100644
index 000000000..0200986fa
--- /dev/null
+++ b/src/exchangedb/exchange_do_melt.sql
@@ -0,0 +1,182 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_melt(
+  IN in_cs_rms BYTEA,
+  IN in_amount_with_fee taler_amount,
+  IN in_rc BYTEA,
+  IN in_old_coin_pub BYTEA,
+  IN in_old_coin_sig BYTEA,
+  IN in_known_coin_id INT8, -- not used, but that's OK
+  IN in_noreveal_index INT4,
+  IN in_zombie_required BOOLEAN,
+  OUT out_balance_ok BOOLEAN,
+  OUT out_zombie_bad BOOLEAN,
+  OUT out_noreveal_index INT4)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  denom_max INT8;
+BEGIN
+-- Shards: INSERT refresh_commitments (by rc)
+-- (rare:) SELECT refresh_commitments (by old_coin_pub) -- crosses shards!
+-- (rare:) SEELCT refresh_revealed_coins (by melt_serial_id)
+-- (rare:) PERFORM recoup_refresh (by rrc_serial) -- crosses shards!
+--         UPDATE known_coins (by coin_pub)
+
+INSERT INTO exchange.refresh_commitments
+  (rc
+  ,old_coin_pub
+  ,old_coin_sig
+  ,amount_with_fee
+  ,noreveal_index
+  )
+  VALUES
+  (in_rc
+  ,in_old_coin_pub
+  ,in_old_coin_sig
+  ,in_amount_with_fee
+  ,in_noreveal_index)
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: see if an identical record exists.
+  out_noreveal_index=-1;
+  SELECT
+     noreveal_index
+    INTO
+     out_noreveal_index
+    FROM exchange.refresh_commitments
+   WHERE rc=in_rc;
+  out_balance_ok=FOUND;
+  out_zombie_bad=FALSE; -- zombie is OK
+  RETURN;
+END IF;
+
+
+IF in_zombie_required
+THEN
+  -- Check if this coin was part of a refresh
+  -- operation that was subsequently involved
+  -- in a recoup operation.  We begin by all
+  -- refresh operations our coin was involved
+  -- with, then find all associated reveal
+  -- operations, and then see if any of these
+  -- reveal operations was involved in a recoup.
+  PERFORM
+    FROM recoup_refresh
+   WHERE rrc_serial IN
+    (SELECT rrc_serial
+       FROM refresh_revealed_coins
+      WHERE melt_serial_id IN
+      (SELECT melt_serial_id
+         FROM refresh_commitments
+        WHERE old_coin_pub=in_old_coin_pub));
+  IF NOT FOUND
+  THEN
+    out_zombie_bad=TRUE;
+    out_balance_ok=FALSE;
+    RETURN;
+  END IF;
+END IF;
+
+out_zombie_bad=FALSE; -- zombie is OK
+
+
+-- Check and update balance of the coin.
+UPDATE known_coins kc
+  SET
+    remaining.frac=(kc.remaining).frac-in_amount_with_fee.frac
+       + CASE
+         WHEN (kc.remaining).frac < in_amount_with_fee.frac
+         THEN 100000000
+         ELSE 0
+         END,
+    remaining.val=(kc.remaining).val-in_amount_with_fee.val
+       - CASE
+         WHEN (kc.remaining).frac < in_amount_with_fee.frac
+         THEN 1
+         ELSE 0
+         END
+  WHERE coin_pub=in_old_coin_pub
+    AND ( ((kc.remaining).val > in_amount_with_fee.val) OR
+          ( ((kc.remaining).frac >= in_amount_with_fee.frac) AND
+            ((kc.remaining).val >= in_amount_with_fee.val) ) );
+
+IF NOT FOUND
+THEN
+  -- Insufficient balance.
+  out_noreveal_index=-1;
+  out_balance_ok=FALSE;
+  RETURN;
+END IF;
+
+
+
+-- Special actions needed for a CS melt?
+IF NOT NULL in_cs_rms
+THEN
+  -- Get maximum denominations serial value in
+  -- existence, this will determine how long the
+  -- nonce will be locked.
+  SELECT
+      denominations_serial
+    INTO
+      denom_max
+    FROM exchange.denominations
+      ORDER BY denominations_serial DESC
+      LIMIT 1;
+
+  -- Cache CS signature to prevent replays in the future
+  -- (and check if cached signature exists at the same time).
+  INSERT INTO exchange.cs_nonce_locks
+    (nonce
+    ,max_denomination_serial
+    ,op_hash)
+  VALUES
+    (cs_rms
+    ,denom_serial
+    ,in_rc)
+  ON CONFLICT DO NOTHING;
+
+  IF NOT FOUND
+  THEN
+    -- Record exists, make sure it is the same
+    SELECT 1
+      FROM exchange.cs_nonce_locks
+     WHERE nonce=cs_rms
+       AND op_hash=in_rc;
+
+    IF NOT FOUND
+    THEN
+       -- Nonce reuse detected
+       out_balance_ok=FALSE;
+       out_zombie_bad=FALSE;
+       out_noreveal_index=42; -- FIXME: return error message more nicely!
+       ASSERT false, 'nonce reuse attempted by client';
+    END IF;
+  END IF;
+END IF;
+
+-- Everything fine, return success!
+out_balance_ok=TRUE;
+out_noreveal_index=in_noreveal_index;
+
+END $$;
diff --git a/src/exchangedb/exchange_do_purse_delete.sql b/src/exchangedb/exchange_do_purse_delete.sql
new file mode 100644
index 000000000..5668f7bec
--- /dev/null
+++ b/src/exchangedb/exchange_do_purse_delete.sql
@@ -0,0 +1,118 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_purse_delete(
+  IN in_purse_pub BYTEA,
+  IN in_purse_sig BYTEA,
+  IN in_now INT8,
+  OUT out_decided BOOLEAN,
+  OUT out_found BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_deposit record;
+DECLARE
+  my_in_reserve_quota BOOLEAN;
+BEGIN
+
+PERFORM refunded FROM purse_decision
+  WHERE purse_pub=in_purse_pub;
+IF FOUND
+THEN
+  out_found=TRUE;
+  out_decided=TRUE;
+  RETURN;
+END IF;
+out_decided=FALSE;
+
+SELECT in_reserve_quota
+  INTO my_in_reserve_quota
+  FROM exchange.purse_requests
+ WHERE purse_pub=in_purse_pub;
+out_found=FOUND;
+IF NOT FOUND
+THEN
+  RETURN;
+END IF;
+
+-- store reserve deletion
+INSERT INTO exchange.purse_deletion
+  (purse_pub
+  ,purse_sig)
+VALUES
+  (in_purse_pub
+  ,in_purse_sig)
+ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  RETURN;
+END IF;
+
+-- Delete contract associated with purse, if it exists.
+DELETE FROM contracts
+  WHERE purse_pub=in_purse_pub;
+
+-- store purse decision
+INSERT INTO purse_decision
+  (purse_pub
+  ,action_timestamp
+  ,refunded)
+VALUES
+  (in_purse_pub
+  ,in_now
+  ,TRUE);
+
+-- update purse quota at reserve
+IF (my_in_reserve_quota)
+THEN
+  UPDATE reserves
+    SET purses_active=purses_active-1
+  WHERE reserve_pub IN
+    (SELECT reserve_pub
+       FROM exchange.purse_merges
+      WHERE purse_pub=in_purse_pub
+     LIMIT 1);
+END IF;
+
+-- restore balance to each coin deposited into the purse
+FOR my_deposit IN
+  SELECT coin_pub
+        ,amount_with_fee
+    FROM exchange.purse_deposits
+  WHERE purse_pub = in_purse_pub
+LOOP
+  UPDATE known_coins kc SET
+    remaining.frac=(kc.remaining).frac+(my_deposit.amount_with_fee).frac
+     - CASE
+       WHEN (kc.remaining).frac+(my_deposit.amount_with_fee).frac >= 100000000
+       THEN 100000000
+       ELSE 0
+       END,
+    remaining.val=(kc.remaining).val+(my_deposit.amount_with_fee).val
+     + CASE
+       WHEN (kc.remaining).frac+(my_deposit.amount_with_fee).frac >= 100000000
+       THEN 1
+       ELSE 0
+       END
+    WHERE coin_pub = my_deposit.coin_pub;
+END LOOP;
+
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_purse_delete(BYTEA,BYTEA,INT8)
+  IS 'Delete a previously undecided purse and refund the coins (if any).';
diff --git a/src/exchangedb/exchange_do_purse_deposit.sql b/src/exchangedb/exchange_do_purse_deposit.sql
new file mode 100644
index 000000000..49d3c919b
--- /dev/null
+++ b/src/exchangedb/exchange_do_purse_deposit.sql
@@ -0,0 +1,267 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_purse_deposit(
+  IN in_partner_id INT8,
+  IN in_purse_pub BYTEA,
+  IN in_amount_with_fee taler_amount,
+  IN in_coin_pub BYTEA,
+  IN in_coin_sig BYTEA,
+  IN in_amount_without_fee taler_amount,
+  IN in_reserve_expiration INT8,
+  IN in_now INT8,
+  OUT out_balance_ok BOOLEAN,
+  OUT out_late BOOLEAN,
+  OUT out_conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  was_merged BOOLEAN;
+DECLARE
+  psi INT8; -- partner's serial ID (set if merged)
+DECLARE
+  my_amount taler_amount; -- total in purse
+DECLARE
+  was_paid BOOLEAN;
+DECLARE
+  my_in_reserve_quota BOOLEAN;
+DECLARE
+  my_reserve_pub BYTEA;
+DECLARE
+  rval RECORD;
+BEGIN
+
+-- Store the deposit request.
+INSERT INTO purse_deposits
+  (partner_serial_id
+  ,purse_pub
+  ,coin_pub
+  ,amount_with_fee
+  ,coin_sig)
+  VALUES
+  (in_partner_id
+  ,in_purse_pub
+  ,in_coin_pub
+  ,in_amount_with_fee
+  ,in_coin_sig)
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: check if coin_sig is the same,
+  -- if so, success, otherwise conflict!
+
+  PERFORM
+  FROM purse_deposits
+  WHERE purse_pub = in_purse_pub
+    AND coin_pub = in_coin_pub
+    AND coin_sig = in_coin_sig;
+  IF NOT FOUND
+  THEN
+    -- Deposit exists, but with differences. Not allowed.
+    out_balance_ok=FALSE;
+    out_late=FALSE;
+    out_conflict=TRUE;
+    RETURN;
+  ELSE
+    -- Deposit exists, do not count for balance. Allow.
+    out_late=FALSE;
+    out_balance_ok=TRUE;
+    out_conflict=FALSE;
+    RETURN;
+  END IF;
+END IF;
+
+
+-- Check if purse was deleted, if so, abort and prevent deposit.
+PERFORM
+  FROM exchange.purse_deletion
+  WHERE purse_pub = in_purse_pub;
+IF FOUND
+THEN
+  out_late=TRUE;
+  out_balance_ok=FALSE;
+  out_conflict=FALSE;
+  RETURN;
+END IF;
+
+
+-- Debit the coin
+-- Check and update balance of the coin.
+UPDATE known_coins kc
+  SET
+    remaining.frac=(kc.remaining).frac-in_amount_with_fee.frac
+       + CASE
+         WHEN (kc.remaining).frac < in_amount_with_fee.frac
+         THEN 100000000
+         ELSE 0
+         END,
+    remaining.val=(kc.remaining).val-in_amount_with_fee.val
+       - CASE
+         WHEN (kc.remaining).frac < in_amount_with_fee.frac
+         THEN 1
+         ELSE 0
+         END
+  WHERE coin_pub=in_coin_pub
+    AND ( ((kc.remaining).val > in_amount_with_fee.val) OR
+          ( ((kc.remaining).frac >= in_amount_with_fee.frac) AND
+            ((kc.remaining).val >= in_amount_with_fee.val) ) );
+
+IF NOT FOUND
+THEN
+  -- Insufficient balance.
+  out_balance_ok=FALSE;
+  out_late=FALSE;
+  out_conflict=FALSE;
+  RETURN;
+END IF;
+
+
+-- Credit the purse.
+UPDATE purse_requests pr
+  SET
+    balance.frac=(pr.balance).frac+in_amount_without_fee.frac
+       - CASE
+         WHEN (pr.balance).frac+in_amount_without_fee.frac >= 100000000
+         THEN 100000000
+         ELSE 0
+         END,
+    balance.val=(pr.balance).val+in_amount_without_fee.val
+       + CASE
+         WHEN (pr.balance).frac+in_amount_without_fee.frac >= 100000000
+         THEN 1
+         ELSE 0
+         END
+  WHERE purse_pub=in_purse_pub;
+
+out_conflict=FALSE;
+out_balance_ok=TRUE;
+
+-- See if we can finish the merge or need to update the trigger time and partner.
+SELECT COALESCE(partner_serial_id,0)
+      ,reserve_pub
+  INTO psi
+      ,my_reserve_pub
+  FROM purse_merges
+ WHERE purse_pub=in_purse_pub;
+
+IF NOT FOUND
+THEN
+  -- Purse was not yet merged.  We are done.
+  out_late=FALSE;
+  RETURN;
+END IF;
+
+SELECT
+    amount_with_fee
+   ,in_reserve_quota
+  INTO
+    rval
+  FROM exchange.purse_requests preq
+  WHERE (purse_pub=in_purse_pub)
+    AND ( ( ( ((preq.amount_with_fee).val <= (preq.balance).val)
+          AND ((preq.amount_with_fee).frac <= (preq.balance).frac) )
+         OR ((preq.amount_with_fee).val < (preq.balance).val) ) );
+IF NOT FOUND
+THEN
+  out_late=FALSE;
+  RETURN;
+END IF;
+
+-- We use rval as workaround as we cannot select
+-- directly into the amount due to Postgres limitations.
+my_amount := rval.amount_with_fee;
+my_in_reserve_quota := rval.in_reserve_quota;
+
+-- Remember how this purse was finished.
+INSERT INTO purse_decision
+  (purse_pub
+  ,action_timestamp
+  ,refunded)
+VALUES
+  (in_purse_pub
+  ,in_now
+  ,FALSE)
+ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Purse already decided, likely expired.
+  out_late=TRUE;
+  RETURN;
+END IF;
+
+out_late=FALSE;
+
+IF (my_in_reserve_quota)
+THEN
+  UPDATE reserves
+    SET purses_active=purses_active-1
+  WHERE reserve_pub IN
+    (SELECT reserve_pub
+       FROM purse_merges
+      WHERE purse_pub=my_purse_pub
+     LIMIT 1);
+END IF;
+
+
+IF (0 != psi)
+THEN
+  -- The taler-exchange-router will take care of this.
+  UPDATE purse_actions
+     SET action_date=0 --- "immediately"
+        ,partner_serial_id=psi
+   WHERE purse_pub=in_purse_pub;
+ELSE
+  -- This is a local reserve, update balance immediately.
+  INSERT INTO reserves
+    (reserve_pub
+    ,current_balance
+    ,expiration_date
+    ,gc_date)
+  VALUES
+    (my_reserve_pub
+    ,my_amount
+    ,in_reserve_expiration
+    ,in_reserve_expiration)
+  ON CONFLICT DO NOTHING;
+
+  IF NOT FOUND
+  THEN
+    -- Reserve existed, thus UPDATE instead of INSERT.
+    UPDATE reserves
+      SET
+       current_balance.frac=(current_balance).frac+my_amount.frac
+        - CASE
+          WHEN (current_balance).frac + my_amount.frac >= 100000000
+            THEN 100000000
+          ELSE 0
+          END
+      ,current_balance.val=(current_balance).val+my_amount.val
+        + CASE
+          WHEN (current_balance).frac + my_amount.frac >= 100000000
+            THEN 1
+          ELSE 0
+          END
+      ,expiration_date=GREATEST(expiration_date,in_reserve_expiration)
+      ,gc_date=GREATEST(gc_date,in_reserve_expiration)
+      WHERE reserve_pub=my_reserve_pub;
+  END IF;
+
+END IF;
+
+
+END $$;
diff --git a/src/exchangedb/exchange_do_purse_merge.sql b/src/exchangedb/exchange_do_purse_merge.sql
new file mode 100644
index 000000000..946fd7e97
--- /dev/null
+++ b/src/exchangedb/exchange_do_purse_merge.sql
@@ -0,0 +1,237 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_purse_merge(
+  IN in_purse_pub BYTEA,
+  IN in_merge_sig BYTEA,
+  IN in_merge_timestamp INT8,
+  IN in_reserve_sig BYTEA,
+  IN in_partner_url TEXT,
+  IN in_reserve_pub BYTEA,
+  IN in_wallet_h_payto BYTEA,
+  IN in_expiration_date INT8,
+  OUT out_no_partner BOOLEAN,
+  OUT out_no_balance BOOLEAN,
+  OUT out_conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_amount taler_amount;
+DECLARE
+  my_purse_fee taler_amount;
+DECLARE
+  my_partner_serial_id INT8;
+DECLARE
+  my_in_reserve_quota BOOLEAN;
+DECLARE
+  rval RECORD;
+DECLARE
+  reserve RECORD;
+DECLARE
+  balance taler_amount;
+BEGIN
+
+-- Initialize reserve, if not yet exists.
+INSERT INTO reserves
+  (reserve_pub
+  ,expiration_date
+  ,gc_date)
+  VALUES
+  (in_reserve_pub
+  ,in_expiration_date
+  ,in_expiration_date)
+  ON CONFLICT DO NOTHING;
+
+
+IF in_partner_url IS NULL
+THEN
+  my_partner_serial_id=NULL;
+ELSE
+  SELECT
+    partner_serial_id
+  INTO
+    my_partner_serial_id
+  FROM exchange.partners
+  WHERE partner_base_url=in_partner_url
+    AND start_date <= in_merge_timestamp
+    AND end_date > in_merge_timestamp;
+  IF NOT FOUND
+  THEN
+    out_no_partner=TRUE;
+    out_conflict=FALSE;
+    RETURN;
+  END IF;
+END IF;
+
+out_no_partner=FALSE;
+
+-- Check purse is 'full'.
+SELECT amount_with_fee
+      ,purse_fee
+      ,in_reserve_quota
+  INTO rval
+  FROM purse_requests pr
+  WHERE purse_pub=in_purse_pub
+    AND (pr.balance).val >= (pr.amount_with_fee).val
+    AND ( (pr.balance).frac >= (pr.amount_with_fee).frac OR
+          (pr.balance).val > (pr.amount_with_fee).val );
+IF NOT FOUND
+THEN
+  out_no_balance=TRUE;
+  out_conflict=FALSE;
+  RETURN;
+END IF;
+
+-- We use rval as workaround as we cannot select
+-- directly into the amount due to Postgres limitations.
+my_amount := rval.amount_with_fee;
+my_purse_fee := rval.purse_fee;
+my_in_reserve_quota := rval.in_reserve_quota;
+
+out_no_balance=FALSE;
+
+-- Store purse merge signature, checks for purse_pub uniqueness
+INSERT INTO purse_merges
+    (partner_serial_id
+    ,reserve_pub
+    ,purse_pub
+    ,merge_sig
+    ,merge_timestamp)
+  VALUES
+    (my_partner_serial_id
+    ,in_reserve_pub
+    ,in_purse_pub
+    ,in_merge_sig
+    ,in_merge_timestamp)
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: see if an identical record exists.
+  -- Note that by checking 'merge_sig', we implicitly check
+  -- identity over everything that the signature covers.
+  PERFORM
+  FROM purse_merges
+  WHERE purse_pub=in_purse_pub
+     AND merge_sig=in_merge_sig;
+  IF NOT FOUND
+  THEN
+     -- Purse was merged, but to some other reserve. Not allowed.
+     out_conflict=TRUE;
+     RETURN;
+  END IF;
+
+  -- "success"
+  out_conflict=FALSE;
+  RETURN;
+END IF;
+
+
+-- Remember how this purse was finished. This will conflict
+-- if the purse was already decided previously.
+INSERT INTO purse_decision
+  (purse_pub
+  ,action_timestamp
+  ,refunded)
+VALUES
+  (in_purse_pub
+  ,in_merge_timestamp
+  ,FALSE)
+ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Purse was already decided (possibly deleted or merged differently).
+  out_conflict=TRUE;
+  RETURN;
+END IF;
+
+out_conflict=FALSE;
+
+
+
+IF (my_in_reserve_quota)
+THEN
+  UPDATE reserves
+    SET purses_active=purses_active-1
+  WHERE reserve_pub IN
+    (SELECT reserve_pub
+       FROM purse_merges
+      WHERE purse_pub=my_purse_pub
+     LIMIT 1);
+END IF;
+
+-- Store account merge signature.
+INSERT INTO account_merges
+  (reserve_pub
+  ,reserve_sig
+  ,purse_pub
+  ,wallet_h_payto)
+  VALUES
+  (in_reserve_pub
+  ,in_reserve_sig
+  ,in_purse_pub
+  ,in_wallet_h_payto);
+
+-- If we need a wad transfer, mark purse ready for it.
+IF (0 != my_partner_serial_id)
+THEN
+  -- The taler-exchange-router will take care of this.
+  UPDATE purse_actions
+     SET action_date=0 --- "immediately"
+        ,partner_serial_id=my_partner_serial_id
+   WHERE purse_pub=in_purse_pub;
+ELSE
+  -- This is a local reserve, update reserve balance immediately.
+
+  -- Refund the purse fee, by adding it to the purse value:
+  my_amount.val = my_amount.val + my_purse_fee.val;
+  my_amount.frac = my_amount.frac + my_purse_fee.frac;
+  -- normalize result
+  my_amount.val = my_amount.val + my_amount.frac / 100000000;
+  my_amount.frac = my_amount.frac % 100000000;
+
+  SELECT *
+   INTO reserve
+   FROM exchange.reserves
+  WHERE reserve_pub=in_reserve_pub;
+
+  balance = reserve.current_balance;
+  balance.frac=balance.frac+my_amount.frac
+     - CASE
+       WHEN balance.frac + my_amount.frac >= 100000000
+       THEN 100000000
+       ELSE 0
+       END;
+  balance.val=balance.val+my_amount.val
+     + CASE
+       WHEN balance.frac + my_amount.frac >= 100000000
+       THEN 1
+       ELSE 0
+       END;
+
+  UPDATE exchange.reserves
+  SET current_balance=balance
+  WHERE reserve_pub=in_reserve_pub;
+
+END IF;
+
+RETURN;
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_purse_merge(BYTEA, BYTEA, INT8, BYTEA, TEXT, BYTEA, BYTEA, INT8)
+  IS 'Checks that the partner exists, the purse has not been merged with a different reserve and that the purse is full. If so, persists the merge data and either merges the purse with the reserve or marks it as ready for the taler-exchange-router. Caller MUST abort the transaction on failures so as to not persist data by accident.';
diff --git a/src/exchangedb/exchange_do_recoup_by_reserve.sql b/src/exchangedb/exchange_do_recoup_by_reserve.sql
new file mode 100644
index 000000000..80f953c4a
--- /dev/null
+++ b/src/exchangedb/exchange_do_recoup_by_reserve.sql
@@ -0,0 +1,87 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_recoup_by_reserve(
+  IN res_pub BYTEA
+)
+RETURNS TABLE
+(
+  denom_sig            BYTEA,
+  denominations_serial BIGINT,
+  coin_pub             BYTEA,
+  coin_sig             BYTEA,
+  coin_blind           BYTEA,
+  amount               taler_amount,
+  recoup_timestamp     BIGINT
+)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  res_uuid BIGINT;
+  blind_ev BYTEA;
+  c_pub    BYTEA;
+BEGIN
+  SELECT reserve_uuid
+   INTO res_uuid
+   FROM reserves
+   WHERE reserve_pub = res_pub;
+
+  FOR blind_ev IN
+    SELECT h_blind_ev
+      FROM reserves_out ro
+      JOIN reserve_history rh
+        ON (rh.serial_id = ro.reserve_out_serial_id)
+    WHERE rh.reserve_pub = res_pub
+      AND rh.table_name='reserves_out'
+  LOOP
+    SELECT robr.coin_pub
+      INTO c_pub
+      FROM exchange.recoup_by_reserve robr
+    WHERE robr.reserve_out_serial_id = (
+      SELECT reserve_out_serial_id
+        FROM reserves_out
+      WHERE h_blind_ev = blind_ev
+    );
+    RETURN QUERY
+      SELECT kc.denom_sig,
+             kc.denominations_serial,
+             rc.coin_pub,
+             rc.coin_sig,
+             rc.coin_blind,
+             rc.amount,
+             rc.recoup_timestamp
+      FROM (
+        SELECT denom_sig
+              ,denominations_serial
+        FROM exchange.known_coins
+        WHERE known_coins.coin_pub = c_pub
+      ) kc
+      JOIN (
+        SELECT coin_pub
+              ,coin_sig
+              ,coin_blind
+              ,amount
+              ,recoup_timestamp
+        FROM exchange.recoup
+        WHERE recoup.coin_pub = c_pub
+      ) rc USING (coin_pub);
+  END LOOP;
+END;
+$$;
+
+COMMENT ON FUNCTION exchange_do_recoup_by_reserve
+  IS 'Recoup by reserve as a function to make sure we hit only the needed partition and not all when joining as joins on distributed tables fetch ALL rows from the shards';
diff --git a/src/exchangedb/exchange_do_recoup_to_coin.sql b/src/exchangedb/exchange_do_recoup_to_coin.sql
new file mode 100644
index 000000000..6cecfb7f8
--- /dev/null
+++ b/src/exchangedb/exchange_do_recoup_to_coin.sql
@@ -0,0 +1,135 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_recoup_to_coin(
+  IN in_old_coin_pub BYTEA,
+  IN in_rrc_serial INT8,
+  IN in_coin_blind BYTEA,
+  IN in_coin_pub BYTEA,
+  IN in_known_coin_id INT8,
+  IN in_coin_sig BYTEA,
+  IN in_recoup_timestamp INT8,
+  OUT out_recoup_ok BOOLEAN,
+  OUT out_internal_failure BOOLEAN,
+  OUT out_recoup_timestamp INT8)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  rval RECORD;
+DECLARE
+  tmp taler_amount; -- amount recouped
+BEGIN
+
+-- Shards: UPDATE known_coins (by coin_pub)
+--         SELECT recoup_refresh (by coin_pub)
+--         UPDATE known_coins (by coin_pub)
+--         INSERT recoup_refresh (by coin_pub)
+
+out_internal_failure=FALSE;
+
+-- Check remaining balance of the coin.
+SELECT
+   remaining
+ INTO
+   rval
+FROM exchange.known_coins
+  WHERE coin_pub=in_coin_pub;
+
+IF NOT FOUND
+THEN
+  out_internal_failure=TRUE;
+  out_recoup_ok=FALSE;
+  RETURN;
+END IF;
+
+tmp := rval.remaining;
+
+IF tmp.val + tmp.frac = 0
+THEN
+  -- Check for idempotency
+  SELECT
+      recoup_timestamp
+    INTO
+      out_recoup_timestamp
+    FROM recoup_refresh
+    WHERE coin_pub=in_coin_pub;
+  out_recoup_ok=FOUND;
+  RETURN;
+END IF;
+
+-- Update balance of the coin.
+UPDATE known_coins
+  SET
+     remaining.val = 0
+    ,remaining.frac = 0
+  WHERE coin_pub=in_coin_pub;
+
+-- Credit the old coin.
+UPDATE known_coins kc
+  SET
+    remaining.frac=(kc.remaining).frac+tmp.frac
+       - CASE
+         WHEN (kc.remaining).frac+tmp.frac >= 100000000
+         THEN 100000000
+         ELSE 0
+         END,
+    remaining.val=(kc.remaining).val+tmp.val
+       + CASE
+         WHEN (kc.remaining).frac+tmp.frac >= 100000000
+         THEN 1
+         ELSE 0
+         END
+  WHERE coin_pub=in_old_coin_pub;
+
+IF NOT FOUND
+THEN
+  RAISE NOTICE 'failed to increase old coin balance from recoup';
+  out_recoup_ok=TRUE;
+  out_internal_failure=TRUE;
+  RETURN;
+END IF;
+
+
+INSERT INTO recoup_refresh
+  (coin_pub
+  ,known_coin_id
+  ,coin_sig
+  ,coin_blind
+  ,amount
+  ,recoup_timestamp
+  ,rrc_serial
+  )
+VALUES
+  (in_coin_pub
+  ,in_known_coin_id
+  ,in_coin_sig
+  ,in_coin_blind
+  ,tmp
+  ,in_recoup_timestamp
+  ,in_rrc_serial);
+
+-- Normal end, everything is fine.
+out_recoup_ok=TRUE;
+out_recoup_timestamp=in_recoup_timestamp;
+
+END $$;
+
+
+-- COMMENT ON FUNCTION exchange_do_recoup_to_coin(INT8, INT4, BYTEA, BOOLEAN, BOOLEAN)
+--  IS 'Executes a recoup-refresh of a coin that was obtained from a refresh-reveal process';
diff --git a/src/exchangedb/exchange_do_recoup_to_reserve.sql b/src/exchangedb/exchange_do_recoup_to_reserve.sql
new file mode 100644
index 000000000..10ae063bd
--- /dev/null
+++ b/src/exchangedb/exchange_do_recoup_to_reserve.sql
@@ -0,0 +1,150 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_recoup_to_reserve(
+  IN in_reserve_pub BYTEA,
+  IN in_reserve_out_serial_id INT8,
+  IN in_coin_blind BYTEA,
+  IN in_coin_pub BYTEA,
+  IN in_known_coin_id INT8,
+  IN in_coin_sig BYTEA,
+  IN in_reserve_gc INT8,
+  IN in_reserve_expiration INT8,
+  IN in_recoup_timestamp INT8,
+  OUT out_recoup_ok BOOLEAN,
+  OUT out_internal_failure BOOLEAN,
+  OUT out_recoup_timestamp INT8)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  tmp taler_amount; -- amount recouped
+  balance taler_amount; -- current balance of the reserve
+  new_balance taler_amount; -- new balance of the reserve
+  reserve RECORD;
+  rval RECORD;
+BEGIN
+-- Shards: SELECT known_coins (by coin_pub)
+--         SELECT recoup      (by coin_pub)
+--         UPDATE known_coins (by coin_pub)
+--         UPDATE reserves (by reserve_pub)
+--         INSERT recoup      (by coin_pub)
+
+out_internal_failure=FALSE;
+
+
+-- Check remaining balance of the coin.
+SELECT
+   remaining
+ INTO
+   rval
+FROM exchange.known_coins
+  WHERE coin_pub=in_coin_pub;
+
+IF NOT FOUND
+THEN
+  out_internal_failure=TRUE;
+  out_recoup_ok=FALSE;
+  RETURN;
+END IF;
+
+tmp := rval.remaining;
+
+IF tmp.val + tmp.frac = 0
+THEN
+  -- Check for idempotency
+  SELECT
+    recoup_timestamp
+  INTO
+    out_recoup_timestamp
+    FROM exchange.recoup
+    WHERE coin_pub=in_coin_pub;
+
+  out_recoup_ok=FOUND;
+  RETURN;
+END IF;
+
+
+-- Update balance of the coin.
+UPDATE known_coins
+  SET
+     remaining.val = 0
+    ,remaining.frac = 0
+  WHERE coin_pub=in_coin_pub;
+
+-- Get current balance
+SELECT current_balance
+  INTO reserve
+  FROM reserves
+ WHERE reserve_pub=in_reserve_pub;
+
+balance = reserve.current_balance;
+new_balance.frac=balance.frac+tmp.frac
+   - CASE
+     WHEN balance.frac+tmp.frac >= 100000000
+     THEN 100000000
+     ELSE 0
+     END;
+
+new_balance.val=balance.val+tmp.val
+   + CASE
+     WHEN balance.frac+tmp.frac >= 100000000
+     THEN 1
+     ELSE 0
+     END;
+
+-- Credit the reserve and update reserve timers.
+UPDATE reserves
+  SET
+    current_balance = new_balance,
+    gc_date=GREATEST(gc_date, in_reserve_gc),
+    expiration_date=GREATEST(expiration_date, in_reserve_expiration)
+  WHERE reserve_pub=in_reserve_pub;
+
+
+IF NOT FOUND
+THEN
+  RAISE NOTICE 'failed to increase reserve balance from recoup';
+  out_recoup_ok=TRUE;
+  out_internal_failure=TRUE;
+  RETURN;
+END IF;
+
+
+INSERT INTO exchange.recoup
+  (coin_pub
+  ,coin_sig
+  ,coin_blind
+  ,amount
+  ,recoup_timestamp
+  ,reserve_out_serial_id
+  )
+VALUES
+  (in_coin_pub
+  ,in_coin_sig
+  ,in_coin_blind
+  ,tmp
+  ,in_recoup_timestamp
+  ,in_reserve_out_serial_id);
+
+-- Normal end, everything is fine.
+out_recoup_ok=TRUE;
+out_recoup_timestamp=in_recoup_timestamp;
+
+END $$;
+
+-- COMMENT ON FUNCTION exchange_do_recoup_to_reserve(INT8, INT4, BYTEA, BOOLEAN, BOOLEAN)
+--  IS 'Executes a recoup of a coin that was withdrawn from a reserve';
diff --git a/src/exchangedb/exchange_do_refund.sql b/src/exchangedb/exchange_do_refund.sql
new file mode 100644
index 000000000..a95746127
--- /dev/null
+++ b/src/exchangedb/exchange_do_refund.sql
@@ -0,0 +1,205 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 OR REPLACE FUNCTION exchange_do_refund(
+  IN in_amount_with_fee taler_amount,
+  IN in_amount taler_amount,
+  IN in_deposit_fee taler_amount,
+  IN in_h_contract_terms BYTEA,
+  IN in_rtransaction_id INT8,
+  IN in_deposit_shard INT8,
+  IN in_known_coin_id INT8,
+  IN in_coin_pub BYTEA,
+  IN in_merchant_pub BYTEA,
+  IN in_merchant_sig BYTEA,
+  OUT out_not_found BOOLEAN,
+  OUT out_refund_ok BOOLEAN,
+  OUT out_gone BOOLEAN,
+  OUT out_conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  bdsi INT8; -- ID of deposit being refunded
+DECLARE
+  tmp_val INT8; -- total amount refunded
+DECLARE
+  tmp_frac INT8; -- total amount refunded, large fraction to deal with overflows!
+DECLARE
+  tmp taler_amount; -- total amount refunded, normalized
+DECLARE
+  deposit taler_amount; -- amount that was originally deposited
+BEGIN
+-- Shards: SELECT deposits (coin_pub, shard, h_contract_terms, merchant_pub)
+--         INSERT refunds (by coin_pub, rtransaction_id) ON CONFLICT DO NOTHING
+--         SELECT refunds (by coin_pub)
+--         UPDATE known_coins (by coin_pub)
+
+SELECT
+   bdep.batch_deposit_serial_id
+  ,(cdep.amount_with_fee).val
+  ,(cdep.amount_with_fee).frac
+  ,bdep.done
+ INTO
+   bdsi
+  ,deposit.val
+  ,deposit.frac
+  ,out_gone
+ FROM batch_deposits bdep
+ JOIN coin_deposits cdep
+   USING (batch_deposit_serial_id)
+ WHERE cdep.coin_pub=in_coin_pub
+  AND shard=in_deposit_shard
+  AND merchant_pub=in_merchant_pub
+  AND h_contract_terms=in_h_contract_terms;
+
+IF NOT FOUND
+THEN
+  -- No matching deposit found!
+  out_refund_ok=FALSE;
+  out_conflict=FALSE;
+  out_not_found=TRUE;
+  out_gone=FALSE;
+  RETURN;
+END IF;
+
+INSERT INTO refunds
+  (batch_deposit_serial_id
+  ,coin_pub
+  ,merchant_sig
+  ,rtransaction_id
+  ,amount_with_fee
+  )
+  VALUES
+  (bdsi
+  ,in_coin_pub
+  ,in_merchant_sig
+  ,in_rtransaction_id
+  ,in_amount_with_fee
+  )
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: see if an identical record exists.
+  -- Note that by checking 'coin_sig', we implicitly check
+  -- identity over everything that the signature covers.
+  -- We do select over merchant_pub and h_contract_terms
+  -- primarily here to maximally use the existing index.
+   PERFORM
+   FROM exchange.refunds
+   WHERE coin_pub=in_coin_pub
+     AND batch_deposit_serial_id=bdsi
+     AND rtransaction_id=in_rtransaction_id
+     AND amount_with_fee=in_amount_with_fee;
+
+  IF NOT FOUND
+  THEN
+    -- Deposit exists, but have conflicting refund.
+    out_refund_ok=FALSE;
+    out_conflict=TRUE;
+    out_not_found=FALSE;
+    RETURN;
+  END IF;
+
+  -- Idempotent request known, return success.
+  out_refund_ok=TRUE;
+  out_conflict=FALSE;
+  out_not_found=FALSE;
+  out_gone=FALSE;
+  RETURN;
+END IF;
+
+IF out_gone
+THEN
+  -- money already sent to the merchant. Tough luck.
+  out_refund_ok=FALSE;
+  out_conflict=FALSE;
+  out_not_found=FALSE;
+  RETURN;
+END IF;
+
+-- Check refund balance invariant.
+SELECT
+   SUM((refs.amount_with_fee).val) -- overflow here is not plausible
+  ,SUM(CAST((refs.amount_with_fee).frac AS INT8)) -- compute using 64 bits
+  INTO
+   tmp_val
+  ,tmp_frac
+  FROM refunds refs
+  WHERE coin_pub=in_coin_pub
+    AND batch_deposit_serial_id=bdsi;
+IF tmp_val IS NULL
+THEN
+  RAISE NOTICE 'failed to sum up existing refunds';
+  out_refund_ok=FALSE;
+  out_conflict=FALSE;
+  out_not_found=FALSE;
+  RETURN;
+END IF;
+
+-- Normalize result before continuing
+tmp.val = tmp_val + tmp_frac / 100000000;
+tmp.frac = tmp_frac % 100000000;
+
+-- Actually check if the deposits are sufficient for the refund. Verbosely. ;-)
+IF (tmp.val < deposit.val)
+THEN
+  out_refund_ok=TRUE;
+ELSE
+  IF (tmp.val = deposit.val) AND (tmp.frac <= deposit.frac)
+  THEN
+    out_refund_ok=TRUE;
+  ELSE
+    out_refund_ok=FALSE;
+  END IF;
+END IF;
+
+IF (tmp.val = deposit.val) AND (tmp.frac = deposit.frac)
+THEN
+  -- Refunds have reached the full value of the original
+  -- deposit. Also refund the deposit fee.
+  in_amount.frac = in_amount.frac + in_deposit_fee.frac;
+  in_amount.val = in_amount.val + in_deposit_fee.val;
+
+  -- Normalize result before continuing
+  in_amount.val = in_amount.val + in_amount.frac / 100000000;
+  in_amount.frac = in_amount.frac % 100000000;
+END IF;
+
+-- Update balance of the coin.
+UPDATE known_coins kc
+  SET
+    remaining.frac=(kc.remaining).frac+in_amount.frac
+       - CASE
+         WHEN (kc.remaining).frac+in_amount.frac >= 100000000
+         THEN 100000000
+         ELSE 0
+         END,
+    remaining.val=(kc.remaining).val+in_amount.val
+       + CASE
+         WHEN (kc.remaining).frac+in_amount.frac >= 100000000
+         THEN 1
+         ELSE 0
+         END
+  WHERE coin_pub=in_coin_pub;
+
+out_conflict=FALSE;
+out_not_found=FALSE;
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_refund(taler_amount, taler_amount, taler_amount, BYTEA, INT8, INT8, INT8, BYTEA, BYTEA, BYTEA)
+  IS 'Executes a refund operation, checking that the corresponding deposit was sufficient to cover the refunded amount';
diff --git a/src/exchangedb/exchange_do_reserve_open.sql b/src/exchangedb/exchange_do_reserve_open.sql
new file mode 100644
index 000000000..dd7a578ee
--- /dev/null
+++ b/src/exchangedb/exchange_do_reserve_open.sql
@@ -0,0 +1,194 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_reserve_open(
+  IN in_reserve_pub BYTEA,
+  IN in_total_paid taler_amount,
+  IN in_reserve_payment taler_amount,
+  IN in_min_purse_limit INT4,
+  IN in_default_purse_limit INT4,
+  IN in_reserve_sig BYTEA,
+  IN in_desired_expiration INT8,
+  IN in_reserve_gc_delay INT8,
+  IN in_now INT8,
+  IN in_open_fee taler_amount,
+  OUT out_open_cost taler_amount,
+  OUT out_final_expiration INT8,
+  OUT out_no_reserve BOOLEAN,
+  OUT out_no_funds BOOLEAN,
+  OUT out_reserve_balance taler_amount)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_balance taler_amount;
+  my_cost taler_amount;
+  my_cost_tmp INT8;
+  my_years_tmp INT4;
+  my_years INT4;
+  my_needs_update BOOL;
+  my_expiration_date INT8;
+  reserve RECORD;
+BEGIN
+
+SELECT current_balance
+      ,expiration_date
+      ,purses_allowed
+  INTO reserve
+  FROM reserves
+ WHERE reserve_pub=in_reserve_pub;
+
+IF NOT FOUND
+THEN
+  RAISE NOTICE 'reserve not found';
+  out_no_reserve = TRUE;
+  out_no_funds = TRUE;
+  out_reserve_balance.val = 0;
+  out_reserve_balance.frac = 0;
+  out_open_cost.val = 0;
+  out_open_cost.frac = 0;
+  out_final_expiration = 0;
+  RETURN;
+END IF;
+
+out_no_reserve = FALSE;
+out_reserve_balance = reserve.current_balance;
+
+-- Do not allow expiration time to start in the past already
+IF (reserve.expiration_date < in_now)
+THEN
+  my_expiration_date = in_now;
+ELSE
+  my_expiration_date = reserve.expiration_date;
+END IF;
+
+my_cost.val = 0;
+my_cost.frac = 0;
+my_needs_update = FALSE;
+my_years = 0;
+
+-- Compute years based on desired expiration time
+IF (my_expiration_date < in_desired_expiration)
+THEN
+  my_years = (31535999999999 + in_desired_expiration - my_expiration_date) / 31536000000000;
+  reserve.purses_allowed = in_default_purse_limit;
+  my_expiration_date = my_expiration_date + 31536000000000 * my_years;
+END IF;
+
+-- Increase years based on purses requested
+IF (reserve.purses_allowed < in_min_purse_limit)
+THEN
+  my_years = (31535999999999 + in_desired_expiration - in_now) / 31536000000000;
+  my_expiration_date = in_now + 31536000000000 * my_years;
+  my_years_tmp = (in_min_purse_limit + in_default_purse_limit - reserve.purses_allowed - 1) / in_default_purse_limit;
+  my_years = my_years + my_years_tmp;
+  reserve.purses_allowed = reserve.purses_allowed + (in_default_purse_limit * my_years_tmp);
+END IF;
+
+
+-- Compute cost based on annual fees
+IF (my_years > 0)
+THEN
+  my_cost.val = my_years * in_open_fee.val;
+  my_cost_tmp = my_years * in_open_fee.frac / 100000000;
+  IF (CAST (my_cost.val + my_cost_tmp AS INT8) < my_cost.val)
+  THEN
+    out_open_cost.val=9223372036854775807;
+    out_open_cost.frac=2147483647;
+    out_final_expiration=my_expiration_date;
+    out_no_funds=FALSE;
+    RAISE NOTICE 'arithmetic issue computing amount';
+  RETURN;
+  END IF;
+  my_cost.val = CAST (my_cost.val + my_cost_tmp AS INT8);
+  my_cost.frac = my_years * in_open_fee.frac % 100000000;
+  my_needs_update = TRUE;
+END IF;
+
+-- check if we actually have something to do
+IF NOT my_needs_update
+THEN
+  out_final_expiration = reserve.expiration_date;
+  out_open_cost.val = 0;
+  out_open_cost.frac = 0;
+  out_no_funds=FALSE;
+  RAISE NOTICE 'no change required';
+  RETURN;
+END IF;
+
+-- Check payment (coins and reserve) would be sufficient.
+IF ( (in_total_paid.val < my_cost.val) OR
+     ( (in_total_paid.val = my_cost.val) AND
+       (in_total_paid.frac < my_cost.frac) ) )
+THEN
+  out_open_cost.val = my_cost.val;
+  out_open_cost.frac = my_cost.frac;
+  out_no_funds=FALSE;
+  -- We must return a failure, which is indicated by
+  -- the expiration being below the desired expiration.
+  IF (reserve.expiration_date >= in_desired_expiration)
+  THEN
+    -- This case is relevant especially if the purse
+    -- count was to be increased and the payment was
+    -- insufficient to cover this for the full period.
+    RAISE NOTICE 'forcing low expiration time';
+    out_final_expiration = 0;
+  ELSE
+    out_final_expiration = reserve.expiration_date;
+  END IF;
+  RAISE NOTICE 'amount paid too low';
+  RETURN;
+END IF;
+
+-- Check reserve balance is sufficient.
+IF (out_reserve_balance.val > in_reserve_payment.val)
+THEN
+  IF (out_reserve_balance.frac >= in_reserve_payment.frac)
+  THEN
+    my_balance.val=out_reserve_balance.val - in_reserve_payment.val;
+    my_balance.frac=out_reserve_balance.frac - in_reserve_payment.frac;
+  ELSE
+    my_balance.val=out_reserve_balance.val - in_reserve_payment.val - 1;
+    my_balance.frac=out_reserve_balance.frac + 100000000 - in_reserve_payment.frac;
+  END IF;
+ELSE
+  IF (out_reserve_balance.val = in_reserve_payment.val) AND (out_reserve_balance.frac >= in_reserve_payment.frac)
+  THEN
+    my_balance.val=0;
+    my_balance.frac=out_reserve_balance.frac - in_reserve_payment.frac;
+  ELSE
+    out_final_expiration = reserve.expiration_date;
+    out_open_cost.val = my_cost.val;
+    out_open_cost.frac = my_cost.frac;
+    out_no_funds=TRUE;
+    RAISE NOTICE 'reserve balance too low';
+  RETURN;
+  END IF;
+END IF;
+
+UPDATE reserves SET
+  current_balance=my_balance
+ ,gc_date=reserve.expiration_date + in_reserve_gc_delay
+ ,expiration_date=my_expiration_date
+ ,purses_allowed=reserve.purses_allowed
+WHERE
+ reserve_pub=in_reserve_pub;
+
+out_final_expiration=my_expiration_date;
+out_open_cost = my_cost;
+out_no_funds=FALSE;
+RETURN;
+
+END $$;
diff --git a/src/exchangedb/exchange_do_reserve_open_deposit.sql b/src/exchangedb/exchange_do_reserve_open_deposit.sql
new file mode 100644
index 000000000..aa6f86a9b
--- /dev/null
+++ b/src/exchangedb/exchange_do_reserve_open_deposit.sql
@@ -0,0 +1,84 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_reserve_open_deposit(
+  IN in_coin_pub BYTEA,
+  IN in_known_coin_id INT8,
+  IN in_coin_sig BYTEA,
+  IN in_reserve_sig BYTEA,
+  IN in_reserve_pub BYTEA,
+  IN in_coin_total taler_amount,
+  OUT out_insufficient_funds BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+
+INSERT INTO exchange.reserves_open_deposits
+  (reserve_sig
+  ,reserve_pub
+  ,coin_pub
+  ,coin_sig
+  ,contribution
+  )
+  VALUES
+  (in_reserve_sig
+  ,in_reserve_pub
+  ,in_coin_pub
+  ,in_coin_sig
+  ,in_coin_total
+  )
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotent request known, return success.
+  out_insufficient_funds=FALSE;
+  RETURN;
+END IF;
+
+
+-- Check and update balance of the coin.
+UPDATE exchange.known_coins kc
+  SET
+    remaining.frac=(kc.remaining).frac-in_coin_total.frac
+       + CASE
+         WHEN (kc.remaining).frac < in_coin_total.frac
+         THEN 100000000
+         ELSE 0
+         END,
+    remaining.val=(kc.remaining).val-in_coin_total.val
+       - CASE
+         WHEN (kc.remaining).frac < in_coin_total.frac
+         THEN 1
+         ELSE 0
+         END
+  WHERE coin_pub=in_coin_pub
+    AND ( ((kc.remaining).val > in_coin_total.val) OR
+          ( ((kc.remaining).frac >= in_coin_total.frac) AND
+            ((kc.remaining).val >= in_coin_total.val) ) );
+
+IF NOT FOUND
+THEN
+  -- Insufficient balance.
+  out_insufficient_funds=TRUE;
+  RETURN;
+END IF;
+
+-- Everything fine, return success!
+out_insufficient_funds=FALSE;
+
+END $$;
diff --git a/src/exchangedb/exchange_do_reserve_purse.sql b/src/exchangedb/exchange_do_reserve_purse.sql
new file mode 100644
index 000000000..8ae652e69
--- /dev/null
+++ b/src/exchangedb/exchange_do_reserve_purse.sql
@@ -0,0 +1,162 @@
+--
+-- 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 OR REPLACE FUNCTION exchange_do_reserve_purse(
+  IN in_purse_pub BYTEA,
+  IN in_merge_sig BYTEA,
+  IN in_merge_timestamp INT8,
+  IN in_reserve_expiration INT8,
+  IN in_reserve_gc INT8,
+  IN in_reserve_sig BYTEA,
+  IN in_reserve_quota BOOLEAN,
+  IN in_purse_fee taler_amount,
+  IN in_reserve_pub BYTEA,
+  IN in_wallet_h_payto BYTEA,
+  OUT out_no_funds BOOLEAN,
+  OUT out_no_reserve BOOLEAN,
+  OUT out_conflict BOOLEAN)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+
+-- Store purse merge signature, checks for purse_pub uniqueness
+INSERT INTO purse_merges
+    (partner_serial_id
+    ,reserve_pub
+    ,purse_pub
+    ,merge_sig
+    ,merge_timestamp)
+  VALUES
+    (NULL
+    ,in_reserve_pub
+    ,in_purse_pub
+    ,in_merge_sig
+    ,in_merge_timestamp)
+  ON CONFLICT DO NOTHING;
+
+IF NOT FOUND
+THEN
+  -- Idempotency check: see if an identical record exists.
+  -- Note that by checking 'merge_sig', we implicitly check
+  -- identity over everything that the signature covers.
+  PERFORM
+  FROM purse_merges
+  WHERE purse_pub=in_purse_pub
+     AND merge_sig=in_merge_sig;
+  IF NOT FOUND
+  THEN
+     -- Purse was merged, but to some other reserve. Not allowed.
+     out_conflict=TRUE;
+     out_no_reserve=FALSE;
+     out_no_funds=FALSE;
+     RETURN;
+  END IF;
+
+  -- "success"
+  out_conflict=FALSE;
+  out_no_funds=FALSE;
+  out_no_reserve=FALSE;
+  RETURN;
+END IF;
+out_conflict=FALSE;
+
+PERFORM
+  FROM exchange.reserves
+ WHERE reserve_pub=in_reserve_pub;
+
+out_no_reserve = NOT FOUND;
+
+IF (in_reserve_quota)
+THEN
+  -- Increment active purses per reserve (and check this is allowed)
+  IF (out_no_reserve)
+  THEN
+    out_no_funds=TRUE;
+    RETURN;
+  END IF;
+  UPDATE exchange.reserves
+     SET purses_active=purses_active+1
+   WHERE reserve_pub=in_reserve_pub
+     AND purses_active < purses_allowed;
+  IF NOT FOUND
+  THEN
+    out_no_funds=TRUE;
+    RETURN;
+  END IF;
+ELSE
+  --  UPDATE reserves balance (and check if balance is enough to pay the fee)
+  IF (out_no_reserve)
+  THEN
+    IF ( (0 != in_purse_fee.val) OR
+         (0 != in_purse_fee.frac) )
+    THEN
+      out_no_funds=TRUE;
+      RETURN;
+    END IF;
+    INSERT INTO exchange.reserves
+      (reserve_pub
+      ,expiration_date
+      ,gc_date)
+    VALUES
+      (in_reserve_pub
+      ,in_reserve_expiration
+      ,in_reserve_gc);
+  ELSE
+    UPDATE exchange.reserves
+      SET
+        current_balance.frac=(current_balance).frac-in_purse_fee.frac
+         + CASE
+         WHEN (current_balance).frac < in_purse_fee.frac
+         THEN 100000000
+         ELSE 0
+         END,
+       current_balance.val=(current_balance).val-in_purse_fee.val
+         - CASE
+         WHEN (current_balance).frac < in_purse_fee.frac
+         THEN 1
+         ELSE 0
+         END
+      WHERE reserve_pub=in_reserve_pub
+        AND ( ((current_balance).val > in_purse_fee.val) OR
+              ( ((current_balance).frac >= in_purse_fee.frac) AND
+                ((current_balance).val >= in_purse_fee.val) ) );
+    IF NOT FOUND
+    THEN
+      out_no_funds=TRUE;
+      RETURN;
+    END IF;
+  END IF;
+END IF;
+
+out_no_funds=FALSE;
+
+
+-- Store account merge signature.
+INSERT INTO account_merges
+  (reserve_pub
+  ,reserve_sig
+  ,purse_pub
+  ,wallet_h_payto)
+  VALUES
+  (in_reserve_pub
+  ,in_reserve_sig
+  ,in_purse_pub
+  ,in_wallet_h_payto);
+
+END $$;
+
+COMMENT ON FUNCTION exchange_do_reserve_purse(BYTEA, BYTEA, INT8, INT8, INT8, BYTEA, BOOLEAN, taler_amount, BYTEA, BYTEA)
+  IS 'Create a purse for a reserve.';
diff --git a/src/exchangedb/exchange_do_reserves_in_insert.sql b/src/exchangedb/exchange_do_reserves_in_insert.sql
new file mode 100644
index 000000000..1be06f063
--- /dev/null
+++ b/src/exchangedb/exchange_do_reserves_in_insert.sql
@@ -0,0 +1,122 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2014--2023 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 OR REPLACE FUNCTION exchange_do_array_reserves_insert(
+  IN in_gc_date INT8,
+  IN in_reserve_expiration INT8,
+  IN ina_reserve_pub BYTEA[],
+  IN ina_wire_ref INT8[],
+  IN ina_credit taler_amount[],
+  IN ina_exchange_account_name TEXT[],
+  IN ina_execution_date INT8[],
+  IN ina_wire_source_h_payto BYTEA[],
+  IN ina_payto_uri TEXT[],
+  IN ina_notify TEXT[])
+RETURNS SETOF exchange_do_array_reserve_insert_return_type
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  conflict BOOL;
+  dup BOOL;
+  uuid INT8;
+  i INT4;
+  ini_reserve_pub BYTEA;
+  ini_wire_ref INT8;
+  ini_credit taler_amount;
+  ini_exchange_account_name TEXT;
+  ini_execution_date INT8;
+  ini_wire_source_h_payto BYTEA;
+  ini_payto_uri TEXT;
+  ini_notify TEXT;
+BEGIN
+
+  FOR i IN 1..array_length(ina_reserve_pub,1)
+  LOOP
+    ini_reserve_pub = ina_reserve_pub[i];
+    ini_wire_ref = ina_wire_ref[i];
+    ini_credit = ina_credit[i];
+    ini_exchange_account_name = ina_exchange_account_name[i];
+    ini_execution_date = ina_execution_date[i];
+    ini_wire_source_h_payto = ina_wire_source_h_payto[i];
+    ini_payto_uri = ina_payto_uri[i];
+    ini_notify = ina_notify[i];
+
+--    RAISE WARNING 'Starting loop on %', ini_notify;
+
+    INSERT INTO wire_targets
+      (wire_target_h_payto
+      ,payto_uri
+      ) VALUES (
+        ini_wire_source_h_payto
+       ,ini_payto_uri
+      )
+    ON CONFLICT DO NOTHING;
+
+    INSERT INTO reserves
+      (reserve_pub
+      ,current_balance
+      ,expiration_date
+      ,gc_date
+    ) VALUES (
+      ini_reserve_pub
+     ,ini_credit
+     ,in_reserve_expiration
+     ,in_gc_date
+    )
+    ON CONFLICT DO NOTHING
+    RETURNING reserve_uuid
+      INTO uuid;
+    conflict = NOT FOUND;
+
+    INSERT INTO reserves_in
+      (reserve_pub
+      ,wire_reference
+      ,credit
+      ,exchange_account_section
+      ,wire_source_h_payto
+      ,execution_date
+    ) VALUES (
+      ini_reserve_pub
+     ,ini_wire_ref
+     ,ini_credit
+     ,ini_exchange_account_name
+     ,ini_wire_source_h_payto
+     ,ini_execution_date
+    )
+    ON CONFLICT DO NOTHING;
+
+    IF NOT FOUND
+    THEN
+      IF conflict
+      THEN
+        dup = TRUE;
+      else
+        dup = FALSE;
+      END IF;
+    ELSE
+      IF NOT conflict
+      THEN
+        EXECUTE FORMAT (
+          'NOTIFY %s'
+          ,ini_notify);
+      END IF;
+      dup = FALSE;
+    END IF;
+    RETURN NEXT (dup,uuid);
+  END LOOP;
+  RETURN;
+END $$;
diff --git a/src/exchangedb/exchange_do_select_deposits_missing_wire.sql b/src/exchangedb/exchange_do_select_deposits_missing_wire.sql
new file mode 100644
index 000000000..3d44a58c9
--- /dev/null
+++ b/src/exchangedb/exchange_do_select_deposits_missing_wire.sql
@@ -0,0 +1,73 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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/>
+--
+-- @author: Christian Grothoff
+
+CREATE OR REPLACE FUNCTION exchange_do_select_deposits_missing_wire(
+  IN in_min_serial_id INT8)
+RETURNS SETOF exchange_do_select_deposits_missing_wire_return_type
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  missing CURSOR
+  FOR
+  SELECT
+    batch_deposit_serial_id
+   ,wire_target_h_payto
+   ,wire_deadline
+    FROM batch_deposits
+    WHERE batch_deposit_serial_id > in_min_serial_id
+    ORDER BY batch_deposit_serial_id ASC;
+DECLARE
+  my_total_val INT8; -- all deposits without wire
+DECLARE
+  my_total_frac INT8; -- all deposits without wire (fraction, not normalized)
+DECLARE
+  my_total taler_amount; -- amount that was originally deposited
+DECLARE
+  my_batch_record RECORD;
+DECLARE
+  i RECORD;
+BEGIN
+
+OPEN missing;
+LOOP
+  FETCH NEXT FROM missing INTO i;
+  EXIT WHEN NOT FOUND;
+
+  SELECT
+    SUM((cdep.amount_with_fee).val) AS total_val
+   ,SUM((cdep.amount_with_fee).frac::INT8) AS total_frac
+    INTO
+      my_batch_record
+    FROM coin_deposits cdep
+    WHERE cdep.batch_deposit_serial_id = i.batch_deposit_serial_id;
+
+  my_total_val=my_batch_record.total_val;
+  my_total_frac=my_batch_record.total_frac;
+
+  -- Normalize total amount
+  my_total.val = my_total_val + my_total_frac / 100000000;
+  my_total.frac = my_total_frac % 100000000;
+  RETURN NEXT (
+       i.batch_deposit_serial_id
+      ,my_total
+      ,i.wire_target_h_payto
+      ,i.wire_deadline);
+
+END LOOP;
+CLOSE missing;
+RETURN;
+END $$;
diff --git a/src/exchangedb/exchange_do_select_justification_for_missing_wire.sql b/src/exchangedb/exchange_do_select_justification_for_missing_wire.sql
new file mode 100644
index 000000000..f02a51d3d
--- /dev/null
+++ b/src/exchangedb/exchange_do_select_justification_for_missing_wire.sql
@@ -0,0 +1,102 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2023 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/>
+--
+-- @author: Christian Grothoff
+
+CREATE OR REPLACE FUNCTION exchange_do_select_justification_missing_wire(
+  IN in_wire_target_h_payto BYTEA,
+  IN in_current_time INT8,
+  OUT out_payto_uri TEXT, -- NULL allowed
+  OUT out_kyc_pending TEXT, -- NULL allowed
+  OUT out_aml_status INT4, -- NULL allowed
+  OUT out_aml_limit taler_amount) -- NULL allowed!
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  my_required_checks TEXT[];
+DECLARE
+  my_aml_data RECORD;
+DECLARE
+  satisfied CURSOR FOR
+  SELECT satisfied_checks
+    FROM kyc_attributes
+   WHERE h_payto=in_wire_target_h_payto
+     AND expiration_time < in_current_time;
+DECLARE
+  i RECORD;
+BEGIN
+
+  -- Fetch payto URI
+  out_payto_uri = NULL;
+  SELECT payto_uri
+    INTO out_payto_uri
+    FROM wire_targets
+   WHERE wire_target_h_payto=my_wire_target_h_payto;
+
+  -- Check KYC status
+  my_required_checks = NULL;
+  SELECT string_to_array (required_checks, ' ')
+    INTO my_required_checks
+    FROM legitimization_requirements
+    WHERE h_payto=my_wire_target_h_payto;
+
+  -- Get last AML decision
+  SELECT
+      new_threshold
+     ,kyc_requirements
+     ,new_status
+    INTO
+      my_aml_data
+     FROM aml_history
+    WHERE h_payto=in_wire_target_h_payto
+    ORDER BY aml_history_serial_id -- get last decision
+      DESC LIMIT 1;
+  IF FOUND
+  THEN
+    out_aml_limit=my_aml_data.new_threshold;
+    out_aml_status=my_aml_data.kyc_status;
+    -- Combine KYC requirements
+    my_required_checks
+       = array_cat (my_required_checks,
+                    my_aml_data.kyc_requirements);
+  ELSE
+    out_aml_limit=NULL;
+    out_aml_status=0; -- or NULL? Style question!
+  END IF;
+
+  OPEN satisfied;
+  LOOP
+    FETCH NEXT FROM satisfied INTO i;
+    EXIT WHEN NOT FOUND;
+
+    -- remove all satisfied checks from the list
+    FOR i in 1..array_length(i.satisfied_checks)
+    LOOP
+      my_required_checks
+        = array_remove (my_required_checks,
+                        i.satisfied_checks[i]);
+    END LOOP;
+  END LOOP;
+
+  -- Return remaining required checks as one string
+  IF ( (my_required_checks IS NOT NULL) AND
+       (0 < array_length(my_satisfied_checks)) )
+  THEN
+    out_kyc_pending
+      = array_to_string (my_required_checks, ' ');
+  END IF;
+
+  RETURN;
+END $$;
diff --git a/src/exchangedb/exchangedb-postgres.conf b/src/exchangedb/exchangedb-postgres.conf
index 7d600586f..726d28576 100644
--- a/src/exchangedb/exchangedb-postgres.conf
+++ b/src/exchangedb/exchangedb-postgres.conf
@@ -1,6 +1,9 @@
 [exchangedb-postgres]
-CONFIG = "postgres:///taler"
+CONFIG = "postgres:///taler-exchange"
 
 # Where are the SQL files to setup our tables?
 # Important: this MUST end with a "/"!
-SQL_DIR = $DATADIR/sql/exchange/
+SQL_DIR = ${DATADIR}sql/exchange/
+
+# Number of purses per account by default.
+DEFAULT_PURSE_LIMIT = 1
\ No newline at end of file
diff --git a/src/exchangedb/exchangedb.conf b/src/exchangedb/exchangedb.conf
index 1c22301ad..2bfcb2ca0 100644
--- a/src/exchangedb/exchangedb.conf
+++ b/src/exchangedb/exchangedb.conf
@@ -30,3 +30,7 @@ LEGAL_RESERVE_EXPIRATION_TIME = 7 years
 # What is the desired delay between a transaction being ready and the
 # aggregator triggering on it?
 AGGREGATOR_SHIFT = 1 s
+
+# How many concurrent purses may be opened by a reserve
+# if the reserve is paid for a year?
+DEFAULT_PURSE_LIMIT = 1
\ No newline at end of file
diff --git a/src/exchangedb/exchangedb_accounts.c b/src/exchangedb/exchangedb_accounts.c
index e41074822..e668134e1 100644
--- a/src/exchangedb/exchangedb_accounts.c
+++ b/src/exchangedb/exchangedb_accounts.c
@@ -199,7 +199,6 @@ add_account_cb (void *cls,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
                                section,
                                "PAYTO_URI");
-    lc->res = GNUNET_SYSERR;
     return;
   }
   method = TALER_payto_get_method (payto_uri);
diff --git a/src/exchangedb/exchangedb_transactions.c b/src/exchangedb/exchangedb_transactions.c
index 81a33b172..f78393776 100644
--- a/src/exchangedb/exchangedb_transactions.c
+++ b/src/exchangedb/exchangedb_transactions.c
@@ -119,6 +119,49 @@ TALER_EXCHANGEDB_calculate_transaction_list_totals (
         return GNUNET_SYSERR;
       }
       break;
+    case TALER_EXCHANGEDB_TT_PURSE_DEPOSIT:
+      /* spent += pos->amount_with_fee */
+      if (0 >
+          TALER_amount_add (&spent,
+                            &spent,
+                            &pos->details.purse_deposit->amount))
+      {
+        GNUNET_break (0);
+        return GNUNET_SYSERR;
+      }
+      deposit_fee = pos->details.purse_deposit->deposit_fee;
+      break;
+    case TALER_EXCHANGEDB_TT_PURSE_REFUND:
+      /* refunded += pos->refund_amount - pos->refund_fee */
+      if (0 >
+          TALER_amount_add (&refunded,
+                            &refunded,
+                            &pos->details.purse_refund->refund_amount))
+      {
+        GNUNET_break (0);
+        return GNUNET_SYSERR;
+      }
+      if (0 >
+          TALER_amount_add (&spent,
+                            &spent,
+                            &pos->details.purse_refund->refund_fee))
+      {
+        GNUNET_break (0);
+        return GNUNET_SYSERR;
+      }
+      have_refund = true;
+      break;
+    case TALER_EXCHANGEDB_TT_RESERVE_OPEN:
+      /* spent += pos->amount_with_fee */
+      if (0 >
+          TALER_amount_add (&spent,
+                            &spent,
+                            &pos->details.reserve_open->coin_contribution))
+      {
+        GNUNET_break (0);
+        return GNUNET_SYSERR;
+      }
+      break;
     }
   }
   if (have_refund)
diff --git a/src/exchangedb/irbt_callbacks.c b/src/exchangedb/irbt_callbacks.c
deleted file mode 100644
index 172dfcbeb..000000000
--- a/src/exchangedb/irbt_callbacks.c
+++ /dev/null
@@ -1,804 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2020, 2021 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/irbt_callbacks.c
- * @brief callbacks used by postgres_insert_records_by_table, to be
- *        inlined into the plugin
- * @author Christian Grothoff
- */
-
-
-/**
- * Function called with denominations records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_denominations (struct PostgresClosure *pg,
-                             const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct TALER_DenominationHashP denom_hash;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&denom_hash),
-    GNUNET_PQ_query_param_uint32 (
-      &td->details.denominations.denom_type),
-    GNUNET_PQ_query_param_uint32 (
-      &td->details.denominations.age_mask),
-    TALER_PQ_query_param_denom_pub (
-      &td->details.denominations.denom_pub),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.denominations.master_sig),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.denominations.valid_from),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.denominations.expire_withdraw),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.denominations.expire_deposit),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.denominations.expire_legal),
-    TALER_PQ_query_param_amount (&td->details.denominations.coin),
-    TALER_PQ_query_param_amount (
-      &td->details.denominations.fees.withdraw),
-    TALER_PQ_query_param_amount (
-      &td->details.denominations.fees.deposit),
-    TALER_PQ_query_param_amount (
-      &td->details.denominations.fees.refresh),
-    TALER_PQ_query_param_amount (
-      &td->details.denominations.fees.refund),
-    GNUNET_PQ_query_param_end
-  };
-
-  TALER_denom_pub_hash (
-    &td->details.denominations.denom_pub,
-    &denom_hash);
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_denominations",
-                                             params);
-}
-
-
-/**
- * Function called with denomination_revocations records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_denomination_revocations (
-  struct PostgresClosure *pg,
-  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.denomination_revocations.master_sig),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.denomination_revocations.denominations_serial),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_denomination_revocations",
-                                             params);
-}
-
-
-/**
- * Function called with denominations records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_wire_targets (struct PostgresClosure *pg,
-                            const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct TALER_PaytoHashP payto_hash;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&payto_hash),
-    GNUNET_PQ_query_param_string (
-      td->details.wire_targets.payto_uri),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.wire_targets.kyc_ok),
-    NULL == td->details.wire_targets.external_id
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_string (
-      td->details.wire_targets.external_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  TALER_payto_hash (
-    td->details.wire_targets.payto_uri,
-    &payto_hash);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_wire_targets",
-                                             params);
-}
-
-
-/**
- * Function called with reserves records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_reserves (struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.reserves.reserve_pub),
-    TALER_PQ_query_param_amount (&td->details.reserves.current_balance),
-    GNUNET_PQ_query_param_timestamp (&td->details.reserves.expiration_date),
-    GNUNET_PQ_query_param_timestamp (&td->details.reserves.gc_date),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_reserves",
-                                             params);
-}
-
-
-/**
- * Function called with reserves_in records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_reserves_in (struct PostgresClosure *pg,
-                           const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint64 (&td->details.reserves_in.wire_reference),
-    TALER_PQ_query_param_amount (&td->details.reserves_in.credit),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_in.sender_account_h_payto),
-    GNUNET_PQ_query_param_string (
-      td->details.reserves_in.exchange_account_section),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.reserves_in.execution_date),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.reserves_in.reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_reserves_in",
-                                             params);
-}
-
-
-/**
- * Function called with reserves_close records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_reserves_close (struct PostgresClosure *pg,
-                              const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.reserves_close.execution_date),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_close.wtid),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_close.sender_account_h_payto),
-    TALER_PQ_query_param_amount (&td->details.reserves_close.amount),
-    TALER_PQ_query_param_amount (&td->details.reserves_close.closing_fee),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_close.reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_reserves_close",
-                                             params);
-}
-
-
-/**
- * Function called with reserves_out records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_reserves_out (struct PostgresClosure *pg,
-                            const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_out.h_blind_ev),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.reserves_out.denominations_serial),
-    TALER_PQ_query_param_blinded_denom_sig (
-      &td->details.reserves_out.denom_sig),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.reserves_out.reserve_uuid),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.reserves_out.reserve_sig),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.reserves_out.execution_date),
-    TALER_PQ_query_param_amount (
-      &td->details.reserves_out.amount_with_fee),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_reserves_out",
-                                             params);
-}
-
-
-/**
- * Function called with auditors records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_auditors (struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.auditors.auditor_pub),
-    GNUNET_PQ_query_param_string (td->details.auditors.auditor_name),
-    GNUNET_PQ_query_param_string (td->details.auditors.auditor_url),
-    GNUNET_PQ_query_param_bool (&td->details.auditors.is_active),
-    GNUNET_PQ_query_param_timestamp (&td->details.auditors.last_change),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_auditors",
-                                             params);
-}
-
-
-/**
- * Function called with auditor_denom_sigs records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_auditor_denom_sigs (struct PostgresClosure *pg,
-                                  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint64 (&td->details.auditor_denom_sigs.auditor_uuid),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.auditor_denom_sigs.denominations_serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.auditor_denom_sigs.auditor_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_auditor_denom_sigs",
-                                             params);
-}
-
-
-/**
- * Function called with exchange_sign_keys records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_exchange_sign_keys (struct PostgresClosure *pg,
-                                  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.exchange_sign_keys.exchange_pub),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.exchange_sign_keys.master_sig),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.exchange_sign_keys.meta.start),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.exchange_sign_keys.meta.expire_sign),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.exchange_sign_keys.meta.expire_legal),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_exchange_sign_keys",
-                                             params);
-}
-
-
-/**
- * Function called with signkey_revocations records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_signkey_revocations (struct PostgresClosure *pg,
-                                   const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint64 (&td->details.signkey_revocations.esk_serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.signkey_revocations.master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_signkey_revocations",
-                                             params);
-}
-
-
-/**
- * Function called with known_coins records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_known_coins (struct PostgresClosure *pg,
-                           const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.known_coins.coin_pub),
-    TALER_PQ_query_param_denom_sig (
-      &td->details.known_coins.denom_sig),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.known_coins.denominations_serial),
-    TALER_PQ_query_param_amount (
-      &td->details.known_coins.remaining),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_known_coins",
-                                             params);
-}
-
-
-/**
- * Function called with refresh_commitments records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_refresh_commitments (struct PostgresClosure *pg,
-                                   const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.refresh_commitments.rc),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.refresh_commitments.old_coin_sig),
-    TALER_PQ_query_param_amount (
-      &td->details.refresh_commitments.amount_with_fee),
-    GNUNET_PQ_query_param_uint32 (
-      &td->details.refresh_commitments.noreveal_index),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.refresh_commitments.old_coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_refresh_commitments",
-                                             params);
-}
-
-
-/**
- * Function called with refresh_revealed_coins records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_refresh_revealed_coins (
-  struct PostgresClosure *pg,
-  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_HashCode h_coin_ev;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint32 (
-      &td->details.refresh_revealed_coins.freshcoin_index),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.refresh_revealed_coins.link_sig),
-    GNUNET_PQ_query_param_fixed_size (
-      td->details.refresh_revealed_coins.coin_ev,
-      td->details.refresh_revealed_coins.
-      coin_ev_size),
-    GNUNET_PQ_query_param_auto_from_type (&h_coin_ev),
-    TALER_PQ_query_param_blinded_denom_sig (
-      &td->details.refresh_revealed_coins.ev_sig),
-    TALER_PQ_query_param_exchange_withdraw_values (
-      &td->details.refresh_revealed_coins.ewv),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.refresh_revealed_coins.denominations_serial),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.refresh_revealed_coins.melt_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_CRYPTO_hash (td->details.refresh_revealed_coins.coin_ev,
-                      td->details.refresh_revealed_coins.coin_ev_size,
-                      &h_coin_ev);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_refresh_revealed_coins",
-                                             params);
-}
-
-
-/**
- * Function called with refresh_transfer_keys records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_refresh_transfer_keys (
-  struct PostgresClosure *pg,
-  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.refresh_transfer_keys.tp),
-    GNUNET_PQ_query_param_fixed_size (
-      &td->details.refresh_transfer_keys.tprivs[0],
-      (TALER_CNC_KAPPA - 1)
-      * sizeof (struct TALER_TransferPrivateKeyP)),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.refresh_transfer_keys.melt_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_refresh_transfer_keys",
-                                             params);
-}
-
-
-/**
- * Function called with deposits records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_deposits (struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint64 (&td->details.deposits.shard),
-    GNUNET_PQ_query_param_uint64 (&td->details.deposits.known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.deposits.coin_pub),
-    TALER_PQ_query_param_amount (&td->details.deposits.amount_with_fee),
-    GNUNET_PQ_query_param_timestamp (&td->details.deposits.wallet_timestamp),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.deposits.exchange_timestamp),
-    GNUNET_PQ_query_param_timestamp (&td->details.deposits.refund_deadline),
-    GNUNET_PQ_query_param_timestamp (&td->details.deposits.wire_deadline),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.deposits.merchant_pub),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.deposits.h_contract_terms),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.deposits.coin_sig),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.deposits.wire_salt),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.deposits.wire_target_h_payto),
-    GNUNET_PQ_query_param_bool (td->details.deposits.done),
-    GNUNET_PQ_query_param_bool (td->details.deposits.extension_blocked),
-    0 == td->details.deposits.extension_details_serial_id
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_uint64 (
-      &td->details.deposits.extension_details_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_deposits",
-                                             params);
-}
-
-
-/**
- * Function called with refunds records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_refunds (struct PostgresClosure *pg,
-                       const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.merchant_sig),
-    GNUNET_PQ_query_param_uint64 (&td->details.refunds.rtransaction_id),
-    TALER_PQ_query_param_amount (&td->details.refunds.amount_with_fee),
-    GNUNET_PQ_query_param_uint64 (&td->details.refunds.deposit_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_refunds",
-                                             params);
-}
-
-
-/**
- * Function called with wire_out records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_wire_out (struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_timestamp (&td->details.wire_out.execution_date),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.wire_out.wtid_raw),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.wire_out.wire_target_h_payto),
-    GNUNET_PQ_query_param_string (
-      td->details.wire_out.exchange_account_section),
-    TALER_PQ_query_param_amount (&td->details.wire_out.amount),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_wire_out",
-                                             params);
-}
-
-
-/**
- * Function called with aggregation_tracking records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_aggregation_tracking (struct PostgresClosure *pg,
-                                    const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_uint64 (
-      &td->details.aggregation_tracking.deposit_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.aggregation_tracking.wtid_raw),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_aggregation_tracking",
-                                             params);
-}
-
-
-/**
- * Function called with wire_fee records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_wire_fee (struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_string (td->details.wire_fee.wire_method),
-    GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.start_date),
-    GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.end_date),
-    TALER_PQ_query_param_amount (&td->details.wire_fee.fees.wire),
-    TALER_PQ_query_param_amount (&td->details.wire_fee.fees.closing),
-    TALER_PQ_query_param_amount (&td->details.wire_fee.fees.wad),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.wire_fee.master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_wire_fee",
-                                             params);
-}
-
-
-/**
- * Function called with wire_fee records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_global_fee (struct PostgresClosure *pg,
-                          const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (
-      &td->serial),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.global_fee.start_date),
-    GNUNET_PQ_query_param_timestamp (
-      &td->details.global_fee.end_date),
-    TALER_PQ_query_param_amount (
-      &td->details.global_fee.fees.history),
-    TALER_PQ_query_param_amount (
-      &td->details.global_fee.fees.kyc),
-    TALER_PQ_query_param_amount (
-      &td->details.global_fee.fees.account),
-    TALER_PQ_query_param_amount (
-      &td->details.global_fee.fees.purse),
-    GNUNET_PQ_query_param_relative_time (
-      &td->details.global_fee.purse_timeout),
-    GNUNET_PQ_query_param_relative_time (
-      &td->details.global_fee.kyc_timeout),
-    GNUNET_PQ_query_param_relative_time (
-      &td->details.global_fee.history_expiration),
-    GNUNET_PQ_query_param_uint32 (
-      &td->details.global_fee.purse_account_limit),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.global_fee.master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_global_fee",
-                                             params);
-}
-
-
-/**
- * Function called with recoup records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_recoup (struct PostgresClosure *pg,
-                      const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_sig),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_blind),
-    TALER_PQ_query_param_amount (&td->details.recoup.amount),
-    GNUNET_PQ_query_param_timestamp (&td->details.recoup.timestamp),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.recoup.coin_pub),
-    GNUNET_PQ_query_param_uint64 (&td->details.recoup.reserve_out_serial_id),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_recoup",
-                                             params);
-}
-
-
-/**
- * Function called with recoup_refresh records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_recoup_refresh (struct PostgresClosure *pg,
-                              const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup_refresh.coin_sig),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.recoup_refresh.coin_blind),
-    TALER_PQ_query_param_amount (&td->details.recoup_refresh.amount),
-    GNUNET_PQ_query_param_timestamp (&td->details.recoup_refresh.timestamp),
-    GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (
-      &td->details.recoup.coin_pub),
-    GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.rrc_serial),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_recoup_refresh",
-                                             params);
-}
-
-
-/**
- * Function called with extensions records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_extensions (struct PostgresClosure *pg,
-                          const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    GNUNET_PQ_query_param_string (td->details.extensions.name),
-    NULL == td->details.extensions.config ?
-    GNUNET_PQ_query_param_null () :
-    GNUNET_PQ_query_param_string (td->details.extensions.config),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_extensions",
-                                             params);
-}
-
-
-/**
- * Function called with extension_details records to insert into table.
- *
- * @param pg plugin context
- * @param td record to insert
- */
-static enum GNUNET_DB_QueryStatus
-irbt_cb_table_extension_details (struct PostgresClosure *pg,
-                                 const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&td->serial),
-    NULL ==
-    td->details.extension_details.extension_options ?
-    GNUNET_PQ_query_param_null () :
-    GNUNET_PQ_query_param_string (
-      td->details.extension_details.extension_options),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_into_table_extension_details",
-                                             params);
-}
-
-
-/* end of irbt_callbacks.c */
diff --git a/src/exchangedb/lrbt_callbacks.c b/src/exchangedb/lrbt_callbacks.c
deleted file mode 100644
index 5451be761..000000000
--- a/src/exchangedb/lrbt_callbacks.c
+++ /dev/null
@@ -1,1489 +0,0 @@
-/*
-   This file is part of GNUnet
-   Copyright (C) 2020, 2021 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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_uint32 (
-        "denom_type",
-        &td.details.denominations.denom_type),
-      GNUNET_PQ_result_spec_uint32 (
-        "age_mask",
-        &td.details.denominations.age_mask),
-      TALER_PQ_result_spec_denom_pub (
-        "denom_pub",
-        &td.details.denominations.denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "master_sig",
-        &td.details.denominations.master_sig),
-      GNUNET_PQ_result_spec_timestamp (
-        "valid_from",
-        &td.details.denominations.valid_from),
-      GNUNET_PQ_result_spec_timestamp (
-        "expire_withdraw",
-        &td.details.denominations.
-        expire_withdraw),
-      GNUNET_PQ_result_spec_timestamp (
-        "expire_deposit",
-        &td.details.denominations.
-        expire_deposit),
-      GNUNET_PQ_result_spec_timestamp (
-        "expire_legal",
-        &td.details.denominations.expire_legal),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "coin",
-        &td.details.denominations.coin),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "fee_withdraw",
-        &td.details.denominations.fees.withdraw),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "fee_deposit",
-        &td.details.denominations.fees.deposit),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "fee_refresh",
-        &td.details.denominations.fees.refresh),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "fee_refund",
-        &td.details.denominations.fees.refund),
-      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_results 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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_uint64 (
-        "denominations_serial",
-        &td.details.denomination_revocations.denominations_serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "master_sig",
-        &td.details.denomination_revocations.master_sig),
-      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_targets table entries.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-lrbt_cb_table_wire_targets (void *cls,
-                            PGresult *result,
-                            unsigned int num_results)
-{
-  struct LookupRecordsByTableContext *ctx = cls;
-  struct TALER_EXCHANGEDB_TableData td = {
-    .table = TALER_EXCHANGEDB_RT_WIRE_TARGETS
-  };
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    bool no_xid;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &td.details.wire_targets.payto_uri),
-      GNUNET_PQ_result_spec_auto_from_type ("kyc_ok",
-                                            &td.details.wire_targets.kyc_ok),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_string ("external_id",
-                                      &td.details.wire_targets.external_id),
-        &no_xid),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &td.details.reserves.reserve_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                   &td.details.reserves.current_balance),
-      GNUNET_PQ_result_spec_timestamp ("expiration_date",
-                                       &td.details.reserves.expiration_date),
-      GNUNET_PQ_result_spec_timestamp ("gc_date",
-                                       &td.details.reserves.gc_date),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "reserve_pub",
-        &td.details.reserves_in.reserve_pub),
-      GNUNET_PQ_result_spec_uint64 (
-        "wire_reference",
-        &td.details.reserves_in.wire_reference),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "credit",
-        &td.details.reserves_in.credit),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wire_source_h_payto",
-        &td.details.reserves_in.sender_account_h_payto),
-      GNUNET_PQ_result_spec_string (
-        "exchange_account_section",
-        &td.details.reserves_in.exchange_account_section),
-      GNUNET_PQ_result_spec_timestamp (
-        "execution_date",
-        &td.details.reserves_in.execution_date),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "reserve_pub",
-        &td.details.reserves_close.reserve_pub),
-      GNUNET_PQ_result_spec_timestamp (
-        "execution_date",
-        &td.details.reserves_close.execution_date),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wtid",
-        &td.details.reserves_close.wtid),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wire_target_h_payto",
-        &td.details.reserves_close.sender_account_h_payto),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount",
-        &td.details.reserves_close.amount),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "closing_fee",
-        &td.details.reserves_close.closing_fee),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "h_blind_ev",
-        &td.details.reserves_out.h_blind_ev),
-      GNUNET_PQ_result_spec_uint64 (
-        "denominations_serial",
-        &td.details.reserves_out.denominations_serial),
-      TALER_PQ_result_spec_blinded_denom_sig (
-        "denom_sig",
-        &td.details.reserves_out.denom_sig),
-      GNUNET_PQ_result_spec_uint64 (
-        "reserve_uuid",
-        &td.details.reserves_out.reserve_uuid),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "reserve_sig",
-        &td.details.reserves_out.reserve_sig),
-      GNUNET_PQ_result_spec_timestamp (
-        "execution_date",
-        &td.details.reserves_out.execution_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount_with_fee",
-        &td.details.reserves_out.amount_with_fee),
-      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_results 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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
-                                            &td.details.auditors.auditor_pub),
-      GNUNET_PQ_result_spec_string ("auditor_url",
-                                    &td.details.auditors.auditor_url),
-      GNUNET_PQ_result_spec_string ("auditor_name",
-                                    &td.details.auditors.auditor_name),
-      GNUNET_PQ_result_spec_bool ("is_active",
-                                  &td.details.auditors.is_active),
-      GNUNET_PQ_result_spec_timestamp ("last_change",
-                                       &td.details.auditors.last_change),
-      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_results 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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_uint64 (
-        "auditor_uuid",
-        &td.details.auditor_denom_sigs.auditor_uuid),
-      GNUNET_PQ_result_spec_uint64 (
-        "denominations_serial",
-        &td.details.auditor_denom_sigs.denominations_serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "auditor_sig",
-        &td.details.auditor_denom_sigs.auditor_sig),
-      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_results 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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
-                                            &td.details.exchange_sign_keys.
-                                            exchange_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &td.details.exchange_sign_keys.
-                                            master_sig),
-      GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                       &td.details.exchange_sign_keys.meta.
-                                       start),
-      GNUNET_PQ_result_spec_timestamp ("expire_sign",
-                                       &td.details.exchange_sign_keys.meta.
-                                       expire_sign),
-      GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                       &td.details.exchange_sign_keys.meta.
-                                       expire_legal),
-      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_results 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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_uint64 ("esk_serial",
-                                    &td.details.signkey_revocations.esk_serial),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &td.details.signkey_revocations.
-                                            master_sig),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_pub",
-        &td.details.known_coins.coin_pub),
-      TALER_PQ_result_spec_denom_sig (
-        "denom_sig",
-        &td.details.known_coins.denom_sig),
-      GNUNET_PQ_result_spec_uint64 (
-        "denominations_serial",
-        &td.details.known_coins.denominations_serial),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "remaining",
-        &td.details.known_coins.remaining),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "rc",
-        &td.details.refresh_commitments.rc),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "old_coin_sig",
-        &td.details.refresh_commitments.old_coin_sig),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount_with_fee",
-        &td.details.refresh_commitments.amount_with_fee),
-      GNUNET_PQ_result_spec_uint32 (
-        "noreveal_index",
-        &td.details.refresh_commitments.noreveal_index),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "old_coin_pub",
-        &td.details.refresh_commitments.old_coin_pub),
-      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_results 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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_uint32 (
-        "freshcoin_index",
-        &td.details.refresh_revealed_coins.freshcoin_index),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "link_sig",
-        &td.details.refresh_revealed_coins.link_sig),
-      GNUNET_PQ_result_spec_variable_size (
-        "coin_ev",
-        (void **) &td.details.refresh_revealed_coins.coin_ev,
-        &td.details.refresh_revealed_coins.coin_ev_size),
-      TALER_PQ_result_spec_blinded_denom_sig (
-        "ev_sig",
-        &td.details.refresh_revealed_coins.ev_sig),
-      TALER_PQ_result_spec_exchange_withdraw_values (
-        "ewv",
-        &td.details.refresh_revealed_coins.ewv),
-      GNUNET_PQ_result_spec_uint64 (
-        "denominations_serial",
-        &td.details.refresh_revealed_coins.denominations_serial),
-      GNUNET_PQ_result_spec_uint64 (
-        "melt_serial_id",
-        &td.details.refresh_revealed_coins.melt_serial_id),
-      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_results 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++)
-  {
-    void *tpriv;
-    size_t tpriv_size;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("transfer_pub",
-                                            &td.details.refresh_transfer_keys.tp),
-      GNUNET_PQ_result_spec_variable_size ("transfer_privs",
-                                           &tpriv,
-                                           &tpriv_size),
-      GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
-                                    &td.details.refresh_transfer_keys.
-                                    melt_serial_id),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ctx->error = true;
-      return;
-    }
-    /* Both conditions should be identical, but we conservatively also guard against
-       unwarranted changes to the structure here. */
-    if ( (tpriv_size !=
-          sizeof (td.details.refresh_transfer_keys.tprivs)) ||
-         (tpriv_size !=
-          (TALER_CNC_KAPPA - 1) * sizeof (struct TALER_TransferPrivateKeyP)) )
-    {
-      GNUNET_break (0);
-      GNUNET_PQ_cleanup_result (rs);
-      ctx->error = true;
-      return;
-    }
-    memcpy (&td.details.refresh_transfer_keys.tprivs[0],
-            tpriv,
-            tpriv_size);
-    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_results 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 PostgresClosure *pg = ctx->pg;
-  struct TALER_EXCHANGEDB_TableData td = {
-    .table = TALER_EXCHANGEDB_RT_DEPOSITS
-  };
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    bool no_extension;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_uint64 (
-        "shard",
-        &td.details.deposits.shard),
-      GNUNET_PQ_result_spec_uint64 (
-        "known_coin_id",
-        &td.details.deposits.known_coin_id),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_pub",
-        &td.details.deposits.coin_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount_with_fee",
-        &td.details.deposits.amount_with_fee),
-      GNUNET_PQ_result_spec_timestamp (
-        "wallet_timestamp",
-        &td.details.deposits.wallet_timestamp),
-      GNUNET_PQ_result_spec_timestamp (
-        "exchange_timestamp",
-        &td.details.deposits.exchange_timestamp),
-      GNUNET_PQ_result_spec_timestamp (
-        "refund_deadline",
-        &td.details.deposits.refund_deadline),
-      GNUNET_PQ_result_spec_timestamp (
-        "wire_deadline",
-        &td.details.deposits.wire_deadline),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "merchant_pub",
-        &td.details.deposits.merchant_pub),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "h_contract_terms",
-        &td.details.deposits.h_contract_terms),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_sig",
-        &td.details.deposits.coin_sig),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wire_salt",
-        &td.details.deposits.wire_salt),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wire_target_h_payto",
-        &td.details.deposits.wire_target_h_payto),
-      GNUNET_PQ_result_spec_bool (
-        "done",
-        &td.details.deposits.done),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "extension_blocked",
-        &td.details.deposits.extension_blocked),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_uint64 (
-          "extension_details_serial_id",
-          &td.details.deposits.extension_details_serial_id),
-        &no_extension),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_pub",
-        &td.details.refunds.coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "merchant_sig",
-        &td.details.refunds.merchant_sig),
-      GNUNET_PQ_result_spec_uint64 (
-        "rtransaction_id",
-        &td.details.refunds.rtransaction_id),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount_with_fee",
-        &td.details.refunds.amount_with_fee),
-      GNUNET_PQ_result_spec_uint64 (
-        "deposit_serial_id",
-        &td.details.refunds.deposit_serial_id),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_timestamp (
-        "execution_date",
-        &td.details.wire_out.execution_date),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wtid_raw",
-        &td.details.wire_out.wtid_raw),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wire_target_h_payto",
-        &td.details.wire_out.wire_target_h_payto),
-      GNUNET_PQ_result_spec_string (
-        "exchange_account_section",
-        &td.details.wire_out.exchange_account_section),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "amount",
-        &td.details.wire_out.amount),
-      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_results 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_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_uint64 (
-        "deposit_serial_id",
-        &td.details.aggregation_tracking.deposit_serial_id),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "wtid_raw",
-        &td.details.aggregation_tracking.wtid_raw),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_string ("wire_method",
-                                    &td.details.wire_fee.wire_method),
-      GNUNET_PQ_result_spec_timestamp ("start_date",
-                                       &td.details.wire_fee.start_date),
-      GNUNET_PQ_result_spec_timestamp ("end_date",
-                                       &td.details.wire_fee.end_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
-                                   &td.details.wire_fee.fees.wire),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                   &td.details.wire_fee.fees.closing),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee",
-                                   &td.details.wire_fee.fees.wad),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &td.details.wire_fee.master_sig),
-      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_results the number of results in @a result
- */
-static void
-lrbt_cb_table_global_fee (void *cls,
-                          PGresult *result,
-                          unsigned int num_results)
-{
-  struct LookupRecordsByTableContext *ctx = cls;
-  struct PostgresClosure *pg = ctx->pg;
-  struct TALER_EXCHANGEDB_TableData td = {
-    .table = TALER_EXCHANGEDB_RT_GLOBAL_FEE
-  };
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 (
-        "serial",
-        &td.serial),
-      GNUNET_PQ_result_spec_timestamp (
-        "start_date",
-        &td.details.global_fee.start_date),
-      GNUNET_PQ_result_spec_timestamp (
-        "end_date",
-        &td.details.global_fee.end_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "history_fee",
-        &td.details.global_fee.fees.history),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "kyc_fee",
-        &td.details.global_fee.fees.kyc),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "account_fee",
-        &td.details.global_fee.fees.account),
-      TALER_PQ_RESULT_SPEC_AMOUNT (
-        "purse_fee",
-        &td.details.global_fee.fees.purse),
-      GNUNET_PQ_result_spec_relative_time (
-        "purse_timeout",
-        &td.details.global_fee.purse_timeout),
-      GNUNET_PQ_result_spec_relative_time (
-        "kyc_timeout",
-        &td.details.global_fee.kyc_timeout),
-      GNUNET_PQ_result_spec_relative_time (
-        "history_expiration",
-        &td.details.global_fee.history_expiration),
-      GNUNET_PQ_result_spec_uint32 (
-        "purse_account_limit",
-        &td.details.global_fee.purse_account_limit),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "master_sig",
-        &td.details.global_fee.master_sig),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                            &td.details.recoup.coin_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                            &td.details.recoup.coin_blind),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &td.details.recoup.amount),
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       &td.details.recoup.timestamp),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_pub",
-        &td.details.recoup.coin_pub),
-      GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
-                                    &td.details.recoup.reserve_out_serial_id),
-      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_results 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 PostgresClosure *pg = ctx->pg;
-  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_uint64 ("serial",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                            &td.details.recoup_refresh.coin_sig),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_blind",
-        &td.details.recoup_refresh.coin_blind),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &td.details.recoup_refresh.amount),
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       &td.details.recoup_refresh.timestamp),
-      GNUNET_PQ_result_spec_uint64 ("known_coin_id",
-                                    &td.details.recoup_refresh.known_coin_id),
-      GNUNET_PQ_result_spec_auto_from_type (
-        "coin_pub",
-        &td.details.recoup_refresh.coin_pub),
-      GNUNET_PQ_result_spec_uint64 ("rrc_serial",
-                                    &td.details.recoup_refresh.rrc_serial),
-      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 extensions table entries.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-lrbt_cb_table_extensions (void *cls,
-                          PGresult *result,
-                          unsigned int num_results)
-{
-  struct LookupRecordsByTableContext *ctx = cls;
-  struct TALER_EXCHANGEDB_TableData td = {
-    .table = TALER_EXCHANGEDB_RT_EXTENSIONS
-  };
-  bool no_config = false;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("extension_id",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_string ("name",
-                                    &td.details.extensions.name),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_string ("config",
-                                      &td.details.extensions.config),
-        &no_config),
-      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 extension_details table entries.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-lrbt_cb_table_extension_details (void *cls,
-                                 PGresult *result,
-                                 unsigned int num_results)
-{
-  struct LookupRecordsByTableContext *ctx = cls;
-  struct TALER_EXCHANGEDB_TableData td = {
-    .table = TALER_EXCHANGEDB_RT_EXTENSION_DETAILS
-  };
-  bool no_config = false;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("extension_details_serial_id",
-                                    &td.serial),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_string ("extension_options",
-                                      &td.details.extension_details.
-                                      extension_options),
-        &no_config),
-      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 */
diff --git a/src/exchangedb/perf-exchangedb-reserves-in-insert-postgres b/src/exchangedb/perf-exchangedb-reserves-in-insert-postgres
new file mode 100755
index 000000000..8eafde3ce
--- /dev/null
+++ b/src/exchangedb/perf-exchangedb-reserves-in-insert-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# perf-exchangedb-reserves-in-insert-postgres - temporary wrapper script for .libs/perf-exchangedb-reserves-in-insert-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The perf-exchangedb-reserves-in-insert-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "perf-exchangedb-reserves-in-insert-postgres:perf-exchangedb-reserves-in-insert-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "perf-exchangedb-reserves-in-insert-postgres:perf-exchangedb-reserves-in-insert-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "perf-exchangedb-reserves-in-insert-postgres:perf-exchangedb-reserves-in-insert-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='perf-exchangedb-reserves-in-insert-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/perf_deposits_get_ready.c b/src/exchangedb/perf_deposits_get_ready.c
new file mode 100644
index 000000000..005ea6843
--- /dev/null
+++ b/src/exchangedb/perf_deposits_get_ready.c
@@ -0,0 +1,565 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file exchangedb/perf_deposits_get_ready.c
+ * @brief benchmark for deposits_get_ready
+git  * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include "math.h"
+
+/**
+ * Global result from the testcase.
+ */
+static int result;
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                            \
+        do {                                          \
+          if (! (cond)) {break;}                    \
+          GNUNET_break (0);                           \
+          goto drop;                                  \
+        } while (0)
+
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+        GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
+                                    sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+        memset (ptr, 0, sizeof (*ptr))
+
+/**
+ * Currency we use.  Must match test-exchange-db-*.conf.
+ */
+#define CURRENCY "EUR"
+#define RSA_KEY_SIZE 1024
+#define NUM_ROWS 1000
+#define ROUNDS 100
+#define MELT_NEW_COINS 5
+#define MELT_NOREVEAL_INDEX 1
+
+/**
+ * Database plugin under test.
+ */
+static struct TALER_EXCHANGEDB_Plugin *plugin;
+
+static struct TALER_DenomFeeSet fees;
+
+static struct TALER_MerchantWireHashP h_wire_wt;
+
+/**
+ * Denomination keys used for fresh coins in melt test.
+ */
+static struct DenomKeyPair **new_dkp;
+
+static struct TALER_EXCHANGEDB_RefreshRevealedCoin *revealed_coins;
+
+struct DenomKeyPair
+{
+  struct TALER_DenominationPrivateKey priv;
+  struct TALER_DenominationPublicKey pub;
+};
+
+
+/**
+ * Destroy a denomination key pair.  The key is not necessarily removed from the DB.
+ *
+ * @param dkp the key pair to destroy
+ */
+static void
+destroy_denom_key_pair (struct DenomKeyPair *dkp)
+{
+  TALER_denom_pub_free (&dkp->pub);
+  TALER_denom_priv_free (&dkp->priv);
+  GNUNET_free (dkp);
+}
+
+
+/**
+ * Create a denomination key pair by registering the denomination in the DB.
+ *
+ * @param size the size of the denomination key
+ * @param now time to use for key generation, legal expiration will be 3h later.
+ * @param fees fees to use
+ * @return the denominaiton key pair; NULL upon error
+ */
+static struct DenomKeyPair *
+create_denom_key_pair (unsigned int size,
+                       struct GNUNET_TIME_Timestamp now,
+                       const struct TALER_Amount *value,
+                       const struct TALER_DenomFeeSet *fees)
+{
+  struct DenomKeyPair *dkp;
+  struct TALER_EXCHANGEDB_DenominationKey dki;
+  struct TALER_EXCHANGEDB_DenominationKeyInformation issue2;
+
+  dkp = GNUNET_new (struct DenomKeyPair);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_denom_priv_create (&dkp->priv,
+                                          &dkp->pub,
+                                          GNUNET_CRYPTO_BSA_RSA,
+                                          size));
+  memset (&dki,
+          0,
+          sizeof (struct TALER_EXCHANGEDB_DenominationKey));
+  dki.denom_pub = dkp->pub;
+  dki.issue.start = now;
+  dki.issue.expire_withdraw
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_UNIT_HOURS));
+  dki.issue.expire_deposit
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 2)));
+  dki.issue.expire_legal
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 3)));
+  dki.issue.value = *value;
+  dki.issue.fees = *fees;
+  TALER_denom_pub_hash (&dkp->pub,
+                        &dki.issue.denom_hash);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->insert_denomination_info (plugin->cls,
+                                        &dki.denom_pub,
+                                        &dki.issue))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  memset (&issue2, 0, sizeof (issue2));
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->get_denomination_info (plugin->cls,
+                                     &dki.issue.denom_hash,
+                                     &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  if (0 != GNUNET_memcmp (&dki.issue,
+                          &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  return dkp;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+
+static void
+run (void *cls)
+{
+  struct TALER_EXCHANGEDB_Refresh refresh;
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const uint32_t num_partitions = 10;
+  struct TALER_Amount value;
+  struct TALER_EXCHANGEDB_CollectableBlindcoin cbc;
+  struct TALER_DenominationPublicKey *new_denom_pubs = NULL;
+  struct GNUNET_TIME_Relative times = GNUNET_TIME_UNIT_ZERO;
+  unsigned long long sqrs = 0;
+  struct TALER_EXCHANGEDB_CoinDepositInformation *depos;
+  struct TALER_EXCHANGEDB_BatchDeposit bd;
+  struct TALER_EXCHANGEDB_Refund *ref;
+  unsigned int *perm;
+  unsigned long long duration_sq;
+  struct TALER_EXCHANGEDB_RefreshRevealedCoin *ccoin;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_RSA,
+    .rc = 0
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+
+  ref = GNUNET_new_array (ROUNDS + 1,
+                          struct TALER_EXCHANGEDB_Refund);
+  depos = GNUNET_new_array (ROUNDS + 1,
+                            struct TALER_EXCHANGEDB_CoinDepositInformation);
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_break (0);
+    result = 77;
+    return;
+  }
+  (void) plugin->drop_tables (plugin->cls);
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
+  {
+    GNUNET_break (0);
+    result = 77;
+    goto cleanup;
+  }
+  if (GNUNET_OK !=
+      plugin->preflight (plugin->cls))
+  {
+    GNUNET_break (0);
+    goto cleanup;
+  }
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":1.000010",
+                                         &value));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.withdraw));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.deposit));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refresh));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refund));
+  {
+    ZR_BLK (&cbc);
+    new_dkp = GNUNET_new_array (MELT_NEW_COINS,
+                                struct DenomKeyPair *);
+    new_denom_pubs = GNUNET_new_array (MELT_NEW_COINS,
+                                       struct TALER_DenominationPublicKey);
+    revealed_coins
+      = GNUNET_new_array (MELT_NEW_COINS,
+                          struct TALER_EXCHANGEDB_RefreshRevealedCoin);
+    for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+    {
+      struct GNUNET_TIME_Timestamp now;
+      struct GNUNET_CRYPTO_RsaBlindedMessage *rp;
+      struct TALER_BlindedPlanchet *bp;
+
+      now = GNUNET_TIME_timestamp_get ();
+      new_dkp[cnt] = create_denom_key_pair (RSA_KEY_SIZE,
+                                            now,
+                                            &value,
+                                            &fees);
+      GNUNET_assert (NULL != new_dkp[cnt]);
+      new_denom_pubs[cnt] = new_dkp[cnt]->pub;
+      ccoin = &revealed_coins[cnt];
+      bp = &ccoin->blinded_planchet;
+      bp->blinded_message = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+      bp->blinded_message->cipher = GNUNET_CRYPTO_BSA_RSA;
+      bp->blinded_message->rc = 1;
+      rp = &bp->blinded_message->details.rsa_blinded_message;
+      rp->blinded_msg_size = 1 + (size_t) GNUNET_CRYPTO_random_u64 (
+        GNUNET_CRYPTO_QUALITY_WEAK,
+        (RSA_KEY_SIZE / 8) - 1);
+      rp->blinded_msg = GNUNET_malloc (rp->blinded_msg_size);
+      GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  rp->blinded_msg,
+                                  rp->blinded_msg_size);
+      TALER_denom_pub_hash (&new_dkp[cnt]->pub,
+                            &ccoin->h_denom_pub);
+      ccoin->exchange_vals = alg_values;
+      TALER_coin_ev_hash (bp,
+                          &ccoin->h_denom_pub,
+                          &ccoin->coin_envelope_hash);
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_denom_sign_blinded (&ccoin->coin_sig,
+                                               &new_dkp[cnt]->priv,
+                                               true,
+                                               bp));
+      TALER_coin_ev_hash (bp,
+                          &cbc.denom_pub_hash,
+                          &cbc.h_coin_envelope);
+      GNUNET_assert (
+        GNUNET_OK ==
+        TALER_denom_sign_blinded (
+          &cbc.sig,
+          &new_dkp[cnt]->priv,
+          false,
+          bp));
+    }
+  }
+  perm = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_NONCE,
+                                       NUM_ROWS);
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "Transaction"));
+  for (unsigned int j = 0; j < NUM_ROWS; j++)
+  {
+    /*** NEED TO INSERT REFRESH COMMITMENTS + ENSURECOIN ***/
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    struct GNUNET_TIME_Timestamp deadline;
+    struct TALER_CoinSpendPublicKeyP coin_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_CoinPubHashP c_hash;
+    unsigned int k = (unsigned int) rand () % 5;
+    unsigned int i = perm[j];
+
+    if (i >= ROUNDS)
+      i = ROUNDS;   /* throw-away slot, do not keep around */
+    RND_BLK (&coin_pub);
+    RND_BLK (&c_hash);
+    RND_BLK (&reserve_pub);
+    RND_BLK (&cbc.reserve_sig);
+    TALER_denom_pub_hash (&new_dkp[k]->pub,
+                          &cbc.denom_pub_hash);
+    deadline = GNUNET_TIME_timestamp_get ();
+    depos[i].coin.coin_pub = coin_pub;
+    TALER_denom_pub_hash (&new_dkp[k]->pub,
+                          &depos[i].coin.denom_pub_hash);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_denom_sig_unblind (&depos[i].coin.denom_sig,
+                                            &ccoin->coin_sig,
+                                            &bks,
+                                            &c_hash,
+                                            &alg_values,
+                                            &new_dkp[k]->pub));
+    RND_BLK (&bd.merchant_pub);
+    RND_BLK (&depos[i].csig);
+    RND_BLK (&bd.h_contract_terms);
+    RND_BLK (&bd.wire_salt);
+    depos[i].amount_with_fee = value;
+    bd.refund_deadline = deadline;
+    bd.wire_deadline = deadline;
+    bd.receiver_wire_account =
+      "payto://iban/DE67830654080004822650?receiver-name=Test";
+    TALER_merchant_wire_signature_hash (
+      bd.receiver_wire_account,
+      &bd.wire_salt,
+      &h_wire_wt);
+    bd.num_cdis = 1;
+    bd.cdis = &depos[i];
+    cbc.reserve_pub = reserve_pub;
+    cbc.amount_with_fee = value;
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (CURRENCY,
+                                          &cbc.withdraw_fee));
+    {
+      bool found;
+      bool nonce_reuse;
+      bool balance_ok;
+      bool age_ok;
+      bool conflict;
+      bool denom_unknown;
+      struct TALER_Amount reserve_balance;
+      uint16_t allowed_minimum_age;
+      uint64_t ruuid;
+      struct GNUNET_TIME_Timestamp now;
+
+      now = GNUNET_TIME_timestamp_get ();
+      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+              plugin->do_batch_withdraw (plugin->cls,
+                                         now,
+                                         &reserve_pub,
+                                         &value,
+                                         true,
+                                         &found,
+                                         &balance_ok,
+                                         &reserve_balance,
+                                         &age_ok,
+                                         &allowed_minimum_age,
+                                         &ruuid));
+      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+              plugin->do_batch_withdraw_insert (plugin->cls,
+                                                NULL,
+                                                &cbc,
+                                                now,
+                                                ruuid,
+                                                &denom_unknown,
+                                                &conflict,
+                                                &nonce_reuse));
+    }
+    {
+      /* ENSURE_COIN_KNOWN */
+      uint64_t known_coin_id;
+      struct TALER_DenominationHashP dph;
+      struct TALER_AgeCommitmentHash agh;
+      FAILIF (TALER_EXCHANGEDB_CKS_ADDED !=
+              plugin->ensure_coin_known (plugin->cls,
+                                         &depos[i].coin,
+                                         &known_coin_id,
+                                         &dph,
+                                         &agh));
+      refresh.coin = depos[i].coin;
+      RND_BLK (&refresh.coin_sig);
+      RND_BLK (&refresh.rc);
+      refresh.amount_with_fee = value;
+      refresh.noreveal_index = MELT_NOREVEAL_INDEX;
+    }
+    {
+      struct GNUNET_TIME_Timestamp now;
+      bool balance_ok;
+      uint32_t bad_idx;
+      bool ctr_conflict;
+
+      now = GNUNET_TIME_timestamp_get ();
+      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+              plugin->do_deposit (plugin->cls,
+                                  &bd,
+                                  &now,
+                                  &balance_ok,
+                                  &bad_idx,
+                                  &ctr_conflict));
+    }
+    if (ROUNDS == i)
+      TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+          plugin->commit (plugin->cls));
+  GNUNET_free (perm);
+  /* End of benchmark setup */
+
+  /**** CALL GET READY DEPOSIT ****/
+  for (unsigned int r = 0; r< ROUNDS; r++)
+  {
+    struct GNUNET_TIME_Absolute time;
+    struct GNUNET_TIME_Relative duration;
+    struct TALER_MerchantPublicKeyP merchant_pub;
+    char *payto_uri;
+    enum GNUNET_DB_QueryStatus qs;
+
+    time = GNUNET_TIME_absolute_get ();
+    qs = plugin->get_ready_deposit (plugin->cls,
+                                    0,
+                                    INT32_MAX,
+                                    &merchant_pub,
+                                    &payto_uri);
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs);
+    duration = GNUNET_TIME_absolute_get_duration (time);
+    times = GNUNET_TIME_relative_add (times,
+                                      duration);
+    duration_sq = duration.rel_value_us * duration.rel_value_us;
+    GNUNET_assert (duration_sq / duration.rel_value_us ==
+                   duration.rel_value_us);
+    GNUNET_assert (sqrs + duration_sq >= sqrs);
+    sqrs += duration_sq;
+  }
+
+  /* evaluation of performance */
+  {
+    struct GNUNET_TIME_Relative avg;
+    double avg_dbl;
+    double variance;
+
+    avg = GNUNET_TIME_relative_divide (times,
+                                       ROUNDS);
+    avg_dbl = avg.rel_value_us;
+    variance = sqrs - (avg_dbl * avg_dbl * ROUNDS);
+    fprintf (stdout,
+             "%8llu ± %6.0f\n",
+             (unsigned long long) avg.rel_value_us,
+             sqrt (variance / (ROUNDS - 1)));
+  }
+  result = 0;
+drop:
+  // GNUNET_break (GNUNET_OK == plugin->drop_tables (plugin->cls));
+cleanup:
+  if (NULL != revealed_coins)
+  {
+    for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+    {
+      TALER_blinded_denom_sig_free (&revealed_coins[cnt].coin_sig);
+      TALER_blinded_planchet_free (&revealed_coins[cnt].blinded_planchet);
+    }
+    GNUNET_free (revealed_coins);
+    revealed_coins = NULL;
+  }
+  GNUNET_free (new_denom_pubs);
+  for (unsigned int cnt = 0;
+       (NULL != new_dkp) && (cnt < MELT_NEW_COINS) && (NULL != new_dkp[cnt]);
+       cnt++)
+    destroy_denom_key_pair (new_dkp[cnt]);
+  GNUNET_free (new_dkp);
+  for (unsigned int i = 0; i< ROUNDS; i++)
+  {
+    TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  GNUNET_free (depos);
+  GNUNET_free (ref);
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  (void) argc;
+  result = -1;
+  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  plugin_name++;
+  {
+    char *testname;
+
+    GNUNET_asprintf (&testname,
+                     "test-exchange-db-%s",
+                     plugin_name);
+    GNUNET_asprintf (&config_filename,
+                     "%s.conf",
+                     testname);
+    GNUNET_free (testname);
+  }
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  return result;
+}
+
+
+/* end of perf_deposits_get_ready.c */
diff --git a/src/exchangedb/perf_get_link_data.c b/src/exchangedb/perf_get_link_data.c
new file mode 100644
index 000000000..817789afc
--- /dev/null
+++ b/src/exchangedb/perf_get_link_data.c
@@ -0,0 +1,543 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file exchangedb/perf_get_link_data.c
+ * @brief benchmark for get_link_data
+ * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include "math.h"
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                            \
+  do {                                          \
+    if (! (cond)) {break;}                    \
+    GNUNET_break (0);                           \
+    goto drop;                                  \
+  } while (0)
+
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+  memset (ptr, 0, sizeof (*ptr))
+
+#define CURRENCY "EUR"
+#define RSA_KEY_SIZE 1024
+#define ROUNDS 100
+#define NUM_ROWS 1000
+#define MELT_NEW_COINS 5
+#define DENOMINATIONS 5
+#define MELT_NOREVEAL_INDEX 1
+/**
+ * Database plugin under test.
+ */
+static struct TALER_EXCHANGEDB_Plugin *plugin;
+static struct TALER_DenomFeeSet fees;
+/**
+ * Denomination keys used for fresh coins in melt test.
+ */
+static struct DenomKeyPair **new_dkp;
+static int result;
+
+static struct TALER_TransferPrivateKeyP tprivs[TALER_CNC_KAPPA];
+static struct TALER_TransferPublicKeyP tpub;
+struct DenomKeyPair
+{
+  struct TALER_DenominationPrivateKey priv;
+  struct TALER_DenominationPublicKey pub;
+};
+
+
+/**
+ * Destroy a denomination key pair.  The key is not necessarily removed from the DB.
+ *
+ * @param dkp the key pair to destroy
+ */
+static void
+destroy_denom_key_pair (struct DenomKeyPair *dkp)
+{
+  TALER_denom_pub_free (&dkp->pub);
+  TALER_denom_priv_free (&dkp->priv);
+  GNUNET_free (dkp);
+}
+
+
+/**
+ * Create a denomination key pair by registering the denomination in the DB.
+ *
+ * @param size the size of the denomination key
+ * @param now time to use for key generation, legal expiration will be 3h later.
+ * @param fees fees to use
+ * @return the denominaiton key pair; NULL upon error
+ */
+static struct DenomKeyPair *
+create_denom_key_pair (unsigned int size,
+                       struct GNUNET_TIME_Timestamp now,
+                       const struct TALER_Amount *value,
+                       const struct TALER_DenomFeeSet *fees)
+{
+  struct DenomKeyPair *dkp;
+  struct TALER_EXCHANGEDB_DenominationKey dki;
+  struct TALER_EXCHANGEDB_DenominationKeyInformation issue2;
+
+  dkp = GNUNET_new (struct DenomKeyPair);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_denom_priv_create (&dkp->priv,
+                                          &dkp->pub,
+                                          GNUNET_CRYPTO_BSA_RSA,
+                                          size));
+  memset (&dki,
+          0,
+          sizeof (struct TALER_EXCHANGEDB_DenominationKey));
+  dki.denom_pub = dkp->pub;
+  dki.issue.start = now;
+  dki.issue.expire_withdraw
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_UNIT_HOURS));
+  dki.issue.expire_deposit
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 2)));
+  dki.issue.expire_legal
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 3)));
+  dki.issue.value = *value;
+  dki.issue.fees = *fees;
+  TALER_denom_pub_hash (&dkp->pub,
+                        &dki.issue.denom_hash);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->insert_denomination_info (plugin->cls,
+                                        &dki.denom_pub,
+                                        &dki.issue))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  memset (&issue2, 0, sizeof (issue2));
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->get_denomination_info (plugin->cls,
+                                     &dki.issue.denom_hash,
+                                     &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  if (0 != GNUNET_memcmp (&dki.issue,
+                          &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  return dkp;
+}
+
+
+/**
+ * Function called with the session hashes and transfer secret
+ * information for a given coin.
+ *
+ * @param cls closure
+ * @param transfer_pub public transfer key for the session
+ * @param ldl link data for @a transfer_pub
+ */
+static void
+handle_link_data_cb (void *cls,
+                     const struct TALER_TransferPublicKeyP *transfer_pub,
+                     const struct TALER_EXCHANGEDB_LinkList *ldl)
+{
+  (void) cls;
+  (void) transfer_pub;
+  (void) ldl;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+
+static void
+run (void *cls)
+{
+  struct TALER_EXCHANGEDB_Refresh *refresh;
+  uint64_t melt_serial_id;
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const uint32_t num_partitions = 10;
+  struct DenomKeyPair *dkp = NULL;
+  struct TALER_EXCHANGEDB_Deposit *depos = NULL;
+  struct TALER_Amount value;
+  struct GNUNET_TIME_Relative times = GNUNET_TIME_UNIT_ZERO;
+  unsigned long long sqrs = 0;
+  struct TALER_EXCHANGEDB_Refund *ref = NULL;
+  unsigned int *perm;
+  unsigned long long duration_sq;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_RSA,
+    .rc = 0
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+
+  ref = GNUNET_new_array (ROUNDS + 1,
+                          struct TALER_EXCHANGEDB_Refund);
+  depos = GNUNET_new_array (ROUNDS + 1,
+                            struct TALER_EXCHANGEDB_Deposit);
+  refresh = GNUNET_new_array (ROUNDS + 1,
+                              struct TALER_EXCHANGEDB_Refresh);
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_break (0);
+    result = 77;
+    return;
+  }
+  (void) plugin->drop_tables (plugin->cls);
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
+  {
+    GNUNET_break (0);
+    result = 77;
+    goto cleanup;
+  }
+  if (GNUNET_OK !=
+      plugin->preflight (plugin->cls))
+  {
+    GNUNET_break (0);
+    goto cleanup;
+  }
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":1.000010",
+                                         &value));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.withdraw));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.deposit));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refresh));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refund));
+  {
+    new_dkp = GNUNET_new_array (MELT_NEW_COINS,
+                                struct DenomKeyPair *);
+
+    for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+    {
+      struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
+
+      new_dkp[cnt] = create_denom_key_pair (RSA_KEY_SIZE,
+                                            now,
+                                            &value,
+                                            &fees);
+      GNUNET_assert (NULL != new_dkp[cnt]);
+    }
+  }
+  perm = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_NONCE,
+                                       NUM_ROWS);
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "Transaction"));
+  for (unsigned int j = 0; j < NUM_ROWS; j++)
+  {
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    struct TALER_CoinPubHashP c_hash;
+    unsigned int i = perm[j];
+    uint64_t known_coin_id;
+    struct TALER_EXCHANGEDB_CollectableBlindcoin cbc;
+    if (i >= ROUNDS)
+      i = ROUNDS; /* throw-away slot, do not keep around */
+    RND_BLK (&depos[i].coin.coin_pub);
+    ZR_BLK (&cbc);
+    TALER_denom_pub_hash (&new_dkp[(unsigned int) rand ()
+                                   % MELT_NEW_COINS]->pub,
+                          &depos[i].coin.denom_pub_hash);
+
+
+    {
+      struct TALER_EXCHANGEDB_RefreshRevealedCoin
+        revealed_coins[MELT_NEW_COINS];
+
+      for (unsigned int p = 0; p<MELT_NEW_COINS; p++)
+      {
+        struct TALER_EXCHANGEDB_RefreshRevealedCoin *revealed_coin =
+          &revealed_coins[p];
+        struct TALER_BlindedPlanchet *bp = &revealed_coin->blinded_planchet;
+        bp->blinded_message = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+        struct GNUNET_CRYPTO_RsaBlindedMessage *rp =
+          &bp->blinded_message->details.rsa_blinded_message;
+
+        /* h_coin_ev must be unique, but we only have MELT_NEW_COINS created
+           above for NUM_ROWS iterations; instead of making "all new" coins,
+           we simply randomize the hash here as nobody is checking for consistency
+           anyway ;-) */
+        bp->blinded_message->rc = 1;
+        bp->blinded_message->cipher = GNUNET_CRYPTO_BSA_RSA;
+        rp->blinded_msg_size = 1 + (size_t) GNUNET_CRYPTO_random_u64 (
+          GNUNET_CRYPTO_QUALITY_WEAK,
+          (RSA_KEY_SIZE / 8) - 1);
+        rp->blinded_msg = GNUNET_malloc (rp->blinded_msg_size);
+        GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                    rp->blinded_msg,
+                                    rp->blinded_msg_size);
+        TALER_denom_pub_hash (&new_dkp[(unsigned int) rand ()
+                                       % MELT_NEW_COINS]->pub,
+                              &revealed_coin->h_denom_pub);
+        revealed_coin->exchange_vals = alg_values;
+        TALER_coin_ev_hash (bp,
+                            &revealed_coin->h_denom_pub,
+                            &revealed_coin->coin_envelope_hash);
+        GNUNET_assert (GNUNET_OK ==
+                       TALER_denom_sign_blinded (&revealed_coin->coin_sig,
+                                                 &new_dkp[(unsigned
+                                                           int) rand ()
+                                                          % MELT_NEW_COINS]->
+                                                 priv,
+                                                 true,
+                                                 bp));
+        GNUNET_assert (
+          GNUNET_OK ==
+          TALER_denom_sign_blinded (
+            &cbc.sig,
+            &new_dkp[(unsigned int) rand () % MELT_NEW_COINS]->priv,
+            false,
+            bp));
+      }
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_denom_sig_unblind (&depos[i].coin.denom_sig,
+                                              &cbc.sig,
+                                              &bks,
+                                              &c_hash,
+                                              &alg_values,
+                                              &new_dkp[(unsigned int) rand ()
+                                                       % MELT_NEW_COINS]->pub));
+      {
+        /* ENSURE_COIN_KNOWN */
+        struct TALER_DenominationHashP dph;
+        struct TALER_AgeCommitmentHash agh;
+        bool zombie_required = false;
+        bool balance_ok;
+
+        FAILIF (TALER_EXCHANGEDB_CKS_ADDED !=
+                plugin->ensure_coin_known (plugin->cls,
+                                           &depos[i].coin,
+                                           &known_coin_id,
+                                           &dph,
+                                           &agh));
+        /**** INSERT REFRESH COMMITMENTS ****/
+        refresh[i].coin = depos[i].coin;
+        RND_BLK (&refresh[i].coin_sig);
+        RND_BLK (&refresh[i].rc);
+        refresh[i].amount_with_fee = value;
+        refresh[i].noreveal_index = MELT_NOREVEAL_INDEX;
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->do_melt (plugin->cls,
+                                 NULL,
+                                 &refresh[i],
+                                 known_coin_id,
+                                 &zombie_required,
+                                 &balance_ok));
+      }
+      /****GET melt_serial_id generated by default****/
+      {
+        struct TALER_EXCHANGEDB_Melt ret_refresh_session;
+
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->get_melt (plugin->cls,
+                                  &refresh[i].rc,
+                                  &ret_refresh_session,
+                                  &melt_serial_id));
+      }
+      /**** INSERT REFRESH_REVEAL + TRANSFER_KEYS *****/
+      {
+        static unsigned int cnt;
+
+        RND_BLK (&tprivs);
+        RND_BLK (&tpub);
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->insert_refresh_reveal (plugin->cls,
+                                               melt_serial_id,
+                                               MELT_NEW_COINS,
+                                               revealed_coins,
+                                               TALER_CNC_KAPPA - 1,
+                                               tprivs,
+                                               &tpub));
+        cnt++;
+        //        fprintf (stderr, "CNT: %u - %llu\n", cnt, (unsigned long long) melt_serial_id);
+      }
+      for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+      {
+        TALER_blinded_denom_sig_free (&revealed_coins[cnt].coin_sig);
+        TALER_blinded_planchet_free (&revealed_coins[cnt].blinded_planchet);
+      }
+
+      /*      {
+        struct TALER_CoinSpendPublicKeyP ocp;
+        uint64_t rrc_serial;
+
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->get_old_coin_by_h_blind (plugin->cls,
+                                                 &revealed_coins->coin_envelope_hash,
+                                                 &ocp,
+                                                 &rrc_serial));
+                                                 }*/
+    }
+    if (ROUNDS == i)
+      TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  /* End of benchmark setup */
+  GNUNET_free (perm);
+  FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+          plugin->commit (plugin->cls));
+  for (unsigned int r = 0; r< ROUNDS; r++)
+  {
+    struct GNUNET_TIME_Absolute time;
+    struct GNUNET_TIME_Relative duration;
+    enum GNUNET_DB_QueryStatus qs;
+    time = GNUNET_TIME_absolute_get ();
+
+    qs = plugin->get_link_data (plugin->cls,
+                                &refresh[r].coin.coin_pub,
+                                &handle_link_data_cb,
+                                NULL);
+    FAILIF (qs < 0);
+
+    duration = GNUNET_TIME_absolute_get_duration (time);
+    times = GNUNET_TIME_relative_add (times,
+                                      duration);
+    duration_sq = duration.rel_value_us * duration.rel_value_us;
+    GNUNET_assert (duration_sq / duration.rel_value_us ==
+                   duration.rel_value_us);
+    GNUNET_assert (sqrs + duration_sq >= sqrs);
+    sqrs += duration_sq;
+  }
+
+  /* evaluation of performance */
+  {
+    struct GNUNET_TIME_Relative avg;
+    double avg_dbl;
+    double variance;
+
+    avg = GNUNET_TIME_relative_divide (times,
+                                       ROUNDS);
+    avg_dbl = avg.rel_value_us;
+    variance = sqrs - (avg_dbl * avg_dbl * ROUNDS);
+    fprintf (stdout,
+             "%8llu ± %6.0f\n",
+             (unsigned long long) avg.rel_value_us,
+             sqrt (variance / (ROUNDS - 1)));
+  }
+  result = 0;
+drop:
+  // GNUNET_break (GNUNET_OK == plugin->drop_tables (plugin->cls));
+cleanup:
+  if (NULL != dkp)
+    destroy_denom_key_pair (dkp);
+  for (unsigned int cnt = 0;
+       (NULL != new_dkp) && (cnt < MELT_NEW_COINS) && (NULL != new_dkp[cnt]);
+       cnt++)
+    destroy_denom_key_pair (new_dkp[cnt]);
+  GNUNET_free (new_dkp);
+  for (unsigned int i = 0; i< ROUNDS; i++)
+  {
+    TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  GNUNET_free (depos);
+  GNUNET_free (ref);
+  GNUNET_free (refresh);
+  dkp = NULL;
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  char *testname;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  (void) argc;
+  result = -1;
+  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  plugin_name++;
+  (void) GNUNET_asprintf (&testname,
+                          "test-exchange-db-%s",
+                          plugin_name);
+  (void) GNUNET_asprintf (&config_filename,
+                          "%s.conf",
+                          testname);
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    GNUNET_free (testname);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  GNUNET_free (testname);
+  return result;
+}
+
+
+/* end of test_exchangedb_by_j.c */
diff --git a/src/exchangedb/perf_reserves_in_insert.c b/src/exchangedb/perf_reserves_in_insert.c
new file mode 100644
index 000000000..09c4a43c5
--- /dev/null
+++ b/src/exchangedb/perf_reserves_in_insert.c
@@ -0,0 +1,232 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file exchangedb/perf_reserves_in_insert.c
+ * @brief benchmark for 'reserves_in_insert'
+ * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Global result from the testcase.
+ */
+static int result;
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                            \
+  do {                                          \
+    if (! (cond)) {break;}                    \
+    GNUNET_break (0);                           \
+    goto drop;                                  \
+  } while (0)
+
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+  memset (ptr, 0, sizeof (*ptr))
+
+/**
+ * How many rounds do we average over?
+ */
+#define ROUNDS 5
+
+/**
+ * Currency we use.  Must match test-exchange-db-*.conf.
+ */
+#define CURRENCY "EUR"
+
+/**
+ * Database plugin under test.
+ */
+static struct TALER_EXCHANGEDB_Plugin *plugin;
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+static void
+run (void *cls)
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const uint32_t num_partitions = 10;
+  static unsigned int batches[] = {1, 1, 2, 3, 4, 16, 32, 64, 128, 256, 512,
+                                   1024, 1024, 512, 256, 128, 64, 32,
+                                   16, 4, 3, 2, 1 };
+  struct GNUNET_TIME_Relative times[sizeof (batches) / sizeof(*batches)];
+  unsigned long long sqrs[sizeof (batches) / sizeof(*batches)];
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_break (0);
+    result = 77;
+    return;
+  }
+  (void) plugin->drop_tables (plugin->cls);
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
+  {
+    GNUNET_break (0);
+    result = 77;
+    goto cleanup;
+  }
+
+  memset (times, 0, sizeof (times));
+  memset (sqrs, 0, sizeof (sqrs));
+  for (unsigned int r = 0; r < ROUNDS; r++)
+  {
+    for (unsigned int i = 0;
+         i< sizeof(batches) / sizeof(*batches);
+         i++)
+    {
+      unsigned int lcm = batches[i];
+      struct TALER_Amount value;
+      struct GNUNET_TIME_Absolute now;
+      struct GNUNET_TIME_Timestamp ts;
+      unsigned long long duration_sq;
+      struct GNUNET_TIME_Relative duration;
+
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_string_to_amount (CURRENCY ":1.000010",
+                                             &value));
+      now = GNUNET_TIME_absolute_get ();
+      ts = GNUNET_TIME_timestamp_get ();
+      {
+        const char *sndr = "payto://x-taler-bank/localhost:8080/1";
+        struct TALER_ReservePublicKeyP reserve_pubs[lcm];
+        struct TALER_EXCHANGEDB_ReserveInInfo reserves[lcm];
+        enum GNUNET_DB_QueryStatus results[lcm];
+
+        for (unsigned int k = 0; k<lcm; k++)
+        {
+          RND_BLK (&reserve_pubs[k]);
+          reserves[k].reserve_pub = &reserve_pubs[k];
+          reserves[k].balance = &value;
+          reserves[k].execution_time = ts;
+          reserves[k].sender_account_details = sndr;
+          reserves[k].exchange_account_name = "name";
+          reserves[k].wire_reference = k;
+        }
+        FAILIF (lcm !=
+                plugin->reserves_in_insert (plugin->cls,
+                                            reserves,
+                                            lcm,
+                                            results));
+      }
+      duration = GNUNET_TIME_absolute_get_duration (now);
+      times[i] = GNUNET_TIME_relative_add (times[i],
+                                           duration);
+      duration_sq = duration.rel_value_us * duration.rel_value_us;
+      GNUNET_assert (duration_sq / duration.rel_value_us ==
+                     duration.rel_value_us);
+      GNUNET_assert (sqrs[i] + duration_sq >= sqrs[i]);
+      sqrs[i] += duration_sq;
+    } /* for 'i' batch size */
+  } /* for 'r' ROUNDS */
+
+  for (unsigned int i = 0;
+       i< sizeof(batches) / sizeof(*batches);
+       i++)
+  {
+    unsigned int lcm = batches[i];
+    struct GNUNET_TIME_Relative avg;
+    double avg_dbl;
+    double variance;
+
+    avg = GNUNET_TIME_relative_divide (times[i],
+                                       ROUNDS);
+    avg_dbl = avg.rel_value_us;
+    variance = sqrs[i] - (avg_dbl * avg_dbl * ROUNDS);
+    fprintf (stdout,
+             "Batch[%4u]: %8llu us/entry ± %6.0f\n",
+             batches[i],
+             (unsigned long long) avg.rel_value_us / lcm,
+             sqrt (variance / lcm / (ROUNDS - 1)));
+  }
+  result = 0;
+drop:
+  GNUNET_break (GNUNET_OK ==
+                plugin->drop_tables (plugin->cls));
+cleanup:
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  char *testname;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  (void) argc;
+  result = -1;
+  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  plugin_name++;
+  (void) GNUNET_asprintf (&testname,
+                          "test-exchange-db-%s",
+                          plugin_name);
+  (void) GNUNET_asprintf (&config_filename,
+                          "%s.conf",
+                          testname);
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    GNUNET_free (testname);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  GNUNET_free (testname);
+  return result;
+}
+
+
+/* end of perf_reserves_in_insert.c */
diff --git a/src/exchangedb/perf_select_refunds_by_coin.c b/src/exchangedb/perf_select_refunds_by_coin.c
new file mode 100644
index 000000000..84825d6d7
--- /dev/null
+++ b/src/exchangedb/perf_select_refunds_by_coin.c
@@ -0,0 +1,619 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file exchangedb/perf_select_refunds_by_coin.c
+ * @brief benchmark for select_refunds_by_coin
+ * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include "math.h"
+
+/**
+ * Global result from the testcase.
+ */
+static int result;
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                            \
+        do {                                          \
+          if (! (cond)) {break;}                    \
+          GNUNET_break (0);                           \
+          goto drop;                                  \
+        } while (0)
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+        GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
+                                    sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+        memset (ptr, 0, sizeof (*ptr))
+
+/**
+ * Currency we use.  Must match test-exchange-db-*.conf.
+ */
+#define CURRENCY "EUR"
+#define RSA_KEY_SIZE 1024
+#define ROUNDS 100
+#define NUM_ROWS 1000
+#define MELT_NEW_COINS 5
+#define MELT_NOREVEAL_INDEX 1
+
+/**
+ * Database plugin under test.
+ */
+static struct TALER_EXCHANGEDB_Plugin *plugin;
+
+static struct TALER_DenomFeeSet fees;
+
+static struct TALER_MerchantWireHashP h_wire_wt;
+
+static struct DenomKeyPair **new_dkp;
+
+static struct TALER_EXCHANGEDB_RefreshRevealedCoin *revealed_coins;
+
+struct DenomKeyPair
+{
+  struct TALER_DenominationPrivateKey priv;
+  struct TALER_DenominationPublicKey pub;
+};
+
+
+/**
+ * Destroy a denomination key pair.  The key is not necessarily removed from the DB.
+ *
+ * @param dkp the key pair to destroy
+ */
+static void
+destroy_denom_key_pair (struct DenomKeyPair *dkp)
+{
+  TALER_denom_pub_free (&dkp->pub);
+  TALER_denom_priv_free (&dkp->priv);
+  GNUNET_free (dkp);
+}
+
+
+/**
+ * Create a denomination key pair by registering the denomination in the DB.
+ *
+ * @param size the size of the denomination key
+ * @param now time to use for key generation, legal expiration will be 3h later.
+ * @param fees fees to use
+ * @return the denominaiton key pair; NULL upon error
+ */
+static struct DenomKeyPair *
+create_denom_key_pair (unsigned int size,
+                       struct GNUNET_TIME_Timestamp now,
+                       const struct TALER_Amount *value,
+                       const struct TALER_DenomFeeSet *fees)
+{
+  struct DenomKeyPair *dkp;
+  struct TALER_EXCHANGEDB_DenominationKey dki;
+  struct TALER_EXCHANGEDB_DenominationKeyInformation issue2;
+
+  dkp = GNUNET_new (struct DenomKeyPair);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_denom_priv_create (&dkp->priv,
+                                          &dkp->pub,
+                                          GNUNET_CRYPTO_BSA_RSA,
+                                          size));
+  memset (&dki,
+          0,
+          sizeof (struct TALER_EXCHANGEDB_DenominationKey));
+  dki.denom_pub = dkp->pub;
+  dki.issue.start = now;
+  dki.issue.expire_withdraw
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_UNIT_HOURS));
+  dki.issue.expire_deposit
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 2)));
+  dki.issue.expire_legal
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (
+          now.abs_time,
+          GNUNET_TIME_relative_multiply (
+            GNUNET_TIME_UNIT_HOURS, 3)));
+  dki.issue.value = *value;
+  dki.issue.fees = *fees;
+  TALER_denom_pub_hash (&dkp->pub,
+                        &dki.issue.denom_hash);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->insert_denomination_info (plugin->cls,
+                                        &dki.denom_pub,
+                                        &dki.issue))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  memset (&issue2, 0, sizeof (issue2));
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      plugin->get_denomination_info (plugin->cls,
+                                     &dki.issue.denom_hash,
+                                     &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  if (0 != GNUNET_memcmp (&dki.issue,
+                          &issue2))
+  {
+    GNUNET_break (0);
+    destroy_denom_key_pair (dkp);
+    return NULL;
+  }
+  return dkp;
+}
+
+
+/**
+ * Callback invoked with information about refunds applicable
+ * to a particular coin.
+ *
+ * @param cls closure with the `struct TALER_EXCHANGEDB_Refund *` we expect to get
+ * @param amount_with_fee amount being refunded
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+static enum GNUNET_GenericReturnValue
+check_refund_cb (void *cls,
+                 const struct TALER_Amount *amount_with_fee)
+{
+  const struct TALER_EXCHANGEDB_Refund *refund = cls;
+
+  if (0 != TALER_amount_cmp (amount_with_fee,
+                             &refund->details.refund_amount))
+  {
+    GNUNET_break (0);
+    result = 66;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+
+static void
+run (void *cls)
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const uint32_t num_partitions = 10;
+  struct GNUNET_TIME_Timestamp ts;
+  struct TALER_EXCHANGEDB_CoinDepositInformation *depos = NULL;
+  struct GNUNET_TIME_Timestamp deadline;
+  struct TALER_Amount value;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+  struct TALER_EXCHANGEDB_CollectableBlindcoin cbc;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_RSA,
+    .rc = 0
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+  struct GNUNET_TIME_Relative times = GNUNET_TIME_UNIT_ZERO;
+  unsigned long long sqrs = 0;
+  struct TALER_EXCHANGEDB_Refund *ref = NULL;
+  unsigned int *perm;
+  unsigned long long duration_sq;
+  struct TALER_EXCHANGEDB_RefreshRevealedCoin *ccoin;
+  struct TALER_DenominationPublicKey *new_denom_pubs = NULL;
+  unsigned int count = 0;
+
+  ref = GNUNET_new_array (ROUNDS + 1,
+                          struct TALER_EXCHANGEDB_Refund);
+  depos = GNUNET_new_array (ROUNDS + 1,
+                            struct TALER_EXCHANGEDB_CoinDepositInformation);
+  ZR_BLK (&cbc);
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_break (0);
+    result = 77;
+    return;
+  }
+  (void) plugin->drop_tables (plugin->cls);
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
+  {
+    GNUNET_break (0);
+    result = 77;
+    goto cleanup;
+  }
+  if (GNUNET_OK !=
+      plugin->preflight (plugin->cls))
+  {
+    GNUNET_break (0);
+    goto cleanup;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":1.000010",
+                                         &value));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.withdraw));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.deposit));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refresh));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (CURRENCY ":0.000010",
+                                         &fees.refund));
+  GNUNET_assert (NUM_ROWS >= ROUNDS);
+
+  ts = GNUNET_TIME_timestamp_get ();
+  deadline = GNUNET_TIME_timestamp_get ();
+  {
+    new_dkp = GNUNET_new_array (MELT_NEW_COINS,
+                                struct DenomKeyPair *);
+    new_denom_pubs = GNUNET_new_array (MELT_NEW_COINS,
+                                       struct TALER_DenominationPublicKey);
+    revealed_coins
+      = GNUNET_new_array (MELT_NEW_COINS,
+                          struct TALER_EXCHANGEDB_RefreshRevealedCoin);
+    for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+    {
+      struct GNUNET_TIME_Timestamp now;
+      struct GNUNET_CRYPTO_RsaBlindedMessage *rp;
+      struct TALER_BlindedPlanchet *bp;
+
+      now = GNUNET_TIME_timestamp_get ();
+      new_dkp[cnt] = create_denom_key_pair (RSA_KEY_SIZE,
+                                            now,
+                                            &value,
+                                            &fees);
+      GNUNET_assert (NULL != new_dkp[cnt]);
+      new_denom_pubs[cnt] = new_dkp[cnt]->pub;
+      ccoin = &revealed_coins[cnt];
+      bp = &ccoin->blinded_planchet;
+      bp->blinded_message = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+      bp->blinded_message->rc = 1;
+      bp->blinded_message->cipher = GNUNET_CRYPTO_BSA_RSA;
+      rp = &bp->blinded_message->details.rsa_blinded_message;
+      rp->blinded_msg_size = 1 + (size_t) GNUNET_CRYPTO_random_u64 (
+        GNUNET_CRYPTO_QUALITY_WEAK,
+        (RSA_KEY_SIZE / 8) - 1);
+      rp->blinded_msg = GNUNET_malloc (rp->blinded_msg_size);
+      GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  rp->blinded_msg,
+                                  rp->blinded_msg_size);
+      TALER_denom_pub_hash (&new_dkp[cnt]->pub,
+                            &ccoin->h_denom_pub);
+      ccoin->exchange_vals = alg_values;
+      TALER_coin_ev_hash (bp,
+                          &ccoin->h_denom_pub,
+                          &ccoin->coin_envelope_hash);
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_denom_sign_blinded (&ccoin->coin_sig,
+                                               &new_dkp[cnt]->priv,
+                                               true,
+                                               bp));
+      TALER_coin_ev_hash (bp,
+                          &cbc.denom_pub_hash,
+                          &cbc.h_coin_envelope);
+      GNUNET_assert (
+        GNUNET_OK ==
+        TALER_denom_sign_blinded (
+          &cbc.sig,
+          &new_dkp[cnt]->priv,
+          false,
+          bp));
+    }
+  }
+
+  perm = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_NONCE,
+                                       NUM_ROWS);
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "Transaction"));
+  for (unsigned int j = 0; j< NUM_ROWS; j++)
+  {
+    unsigned int i = perm[j];
+    unsigned int k = (unsigned int) rand () % 5;
+    struct TALER_CoinPubHashP c_hash;
+    uint64_t known_coin_id;
+    struct TALER_EXCHANGEDB_CoinDepositInformation *cdi
+      = &depos[i];
+    struct TALER_EXCHANGEDB_BatchDeposit bd = {
+      .cdis = cdi,
+      .num_cdis = 1,
+      .wallet_timestamp = ts,
+      .refund_deadline = deadline,
+      .wire_deadline = deadline,
+      .receiver_wire_account
+        = "payto://iban/DE67830654080004822650?receiver-name=Test"
+    };
+
+    if (i >= ROUNDS)
+      i = ROUNDS; /* throw-away slot, do not keep around */
+    RND_BLK (&bd.merchant_pub);
+    RND_BLK (&bd.h_contract_terms);
+    RND_BLK (&bd.wire_salt);
+    TALER_merchant_wire_signature_hash (
+      bd.receiver_wire_account,
+      &bd.wire_salt,
+      &h_wire_wt);
+    RND_BLK (&cdi->coin.coin_pub);
+    RND_BLK (&cdi->csig);
+    RND_BLK (&c_hash);
+    TALER_denom_pub_hash (&new_dkp[k]->pub,
+                          &cdi->coin.denom_pub_hash);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_denom_sig_unblind (&cdi->coin.denom_sig,
+                                            &cbc.sig,
+                                            &bks,
+                                            &c_hash,
+                                            &alg_values,
+                                            &new_dkp[k]->pub));
+    cdi->amount_with_fee = value;
+
+    {
+      struct TALER_DenominationHashP dph;
+      struct TALER_AgeCommitmentHash agh;
+
+      FAILIF (TALER_EXCHANGEDB_CKS_ADDED !=
+              plugin->ensure_coin_known (plugin->cls,
+                                         &cdi->coin,
+                                         &known_coin_id,
+                                         &dph,
+                                         &agh));
+    }
+    {
+      struct GNUNET_TIME_Timestamp now;
+      bool balance_ok;
+      uint32_t bad_idx;
+      bool in_conflict;
+
+      now = GNUNET_TIME_timestamp_get ();
+      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+              plugin->do_deposit (plugin->cls,
+                                  &bd,
+                                  &now,
+                                  &balance_ok,
+                                  &bad_idx,
+                                  &in_conflict));
+    }
+    {
+      bool not_found;
+      bool refund_ok;
+      bool gone;
+      bool conflict;
+      unsigned int refund_percent = 0;
+      switch (refund_percent)
+      {
+      case 2: // 100% refund
+        ref[i].coin = depos[i].coin;
+        ref[i].details.merchant_pub = bd.merchant_pub;
+        RND_BLK (&ref[i].details.merchant_sig);
+        ref[i].details.h_contract_terms = bd.h_contract_terms;
+        ref[i].coin.coin_pub = depos[i].coin.coin_pub;
+        ref[i].details.rtransaction_id = i;
+        ref[i].details.refund_amount = value;
+        ref[i].details.refund_fee = fees.refund;
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->do_refund (plugin->cls,
+                                   &ref[i],
+                                   &fees.deposit,
+                                   known_coin_id,
+                                   &not_found,
+                                   &refund_ok,
+                                   &gone,
+                                   &conflict));
+        break;
+      case 1:// 10% refund
+        if (count < (NUM_ROWS / 10))
+        {
+          ref[i].coin = depos[i].coin;
+          ref[i].details.merchant_pub = bd.merchant_pub;
+          RND_BLK (&ref[i].details.merchant_sig);
+          ref[i].details.h_contract_terms = bd.h_contract_terms;
+          ref[i].coin.coin_pub = depos[i].coin.coin_pub;
+          ref[i].details.rtransaction_id = i;
+          ref[i].details.refund_amount = value;
+          ref[i].details.refund_fee = fees.refund;
+        }
+        else
+        {
+          ref[i].coin = depos[i].coin;
+          RND_BLK (&ref[i].details.merchant_pub);
+          RND_BLK (&ref[i].details.merchant_sig);
+          RND_BLK (&ref[i].details.h_contract_terms);
+          RND_BLK (&ref[i].coin.coin_pub);
+          ref[i].details.rtransaction_id = i;
+          ref[i].details.refund_amount = value;
+          ref[i].details.refund_fee = fees.refund;
+        }
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->do_refund (plugin->cls,
+                                   &ref[i],
+                                   &fees.deposit,
+                                   known_coin_id,
+                                   &not_found,
+                                   &refund_ok,
+                                   &gone,
+                                   &conflict));
+        count++;
+        break;
+      case 0:// no refund
+        ref[i].coin = depos[i].coin;
+        RND_BLK (&ref[i].details.merchant_pub);
+        RND_BLK (&ref[i].details.merchant_sig);
+        RND_BLK (&ref[i].details.h_contract_terms);
+        RND_BLK (&ref[i].coin.coin_pub);
+        ref[i].details.rtransaction_id = i;
+        ref[i].details.refund_amount = value;
+        ref[i].details.refund_fee = fees.refund;
+        FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+                plugin->do_refund (plugin->cls,
+                                   &ref[i],
+                                   &fees.deposit,
+                                   known_coin_id,
+                                   &not_found,
+                                   &refund_ok,
+                                   &gone,
+                                   &conflict));
+        break;
+      }/* END OF SWITCH CASE */
+    }
+    if (ROUNDS == i)
+      TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  /* End of benchmark setup */
+  GNUNET_free (perm);
+  FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+          plugin->commit (plugin->cls));
+  for (unsigned int r = 0; r < ROUNDS; r++)
+  {
+    struct GNUNET_TIME_Absolute time;
+    struct GNUNET_TIME_Relative duration;
+
+    time = GNUNET_TIME_absolute_get ();
+    FAILIF (0 >
+            plugin->select_refunds_by_coin (plugin->cls,
+                                            &ref[r].coin.coin_pub,
+                                            &ref[r].details.merchant_pub,
+                                            &ref[r].details.h_contract_terms,
+                                            &check_refund_cb,
+                                            &ref[r]));
+    duration = GNUNET_TIME_absolute_get_duration (time);
+    times = GNUNET_TIME_relative_add (times,
+                                      duration);
+    duration_sq = duration.rel_value_us * duration.rel_value_us;
+    GNUNET_assert (duration_sq / duration.rel_value_us ==
+                   duration.rel_value_us);
+    GNUNET_assert (sqrs + duration_sq >= sqrs);
+    sqrs += duration_sq;
+  }
+  /* evaluation of performance */
+  {
+    struct GNUNET_TIME_Relative avg;
+    double avg_dbl;
+    double variance;
+
+    avg = GNUNET_TIME_relative_divide (times,
+                                       ROUNDS);
+    avg_dbl = avg.rel_value_us;
+    variance = sqrs - (avg_dbl * avg_dbl * ROUNDS);
+    fprintf (stdout,
+             "%8llu ± %6.0f\n",
+             (unsigned long long) avg.rel_value_us,
+             sqrt (variance / (ROUNDS - 1)));
+  }
+  result = 0;
+drop:
+  GNUNET_break (GNUNET_OK ==
+                plugin->drop_tables (plugin->cls));
+cleanup:
+  if (NULL != revealed_coins)
+  {
+    for (unsigned int cnt = 0; cnt < MELT_NEW_COINS; cnt++)
+    {
+      TALER_blinded_denom_sig_free (&revealed_coins[cnt].coin_sig);
+      TALER_blinded_planchet_free (&revealed_coins[cnt].blinded_planchet);
+    }
+    GNUNET_free (revealed_coins);
+    revealed_coins = NULL;
+  }
+  GNUNET_free (new_denom_pubs);
+  for (unsigned int cnt = 0;
+       (NULL != new_dkp) && (cnt < MELT_NEW_COINS) && (NULL != new_dkp[cnt]);
+       cnt++)
+    destroy_denom_key_pair (new_dkp[cnt]);
+  GNUNET_free (new_dkp);
+  for (unsigned int i = 0; i< ROUNDS + 1; i++)
+  {
+    TALER_denom_sig_free (&depos[i].coin.denom_sig);
+  }
+  GNUNET_free (depos);
+  GNUNET_free (ref);
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  (void) argc;
+  result = -1;
+  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  plugin_name++;
+  {
+    char *testname;
+
+    GNUNET_asprintf (&testname,
+                     "test-exchange-db-%s",
+                     plugin_name);
+    GNUNET_asprintf (&config_filename,
+                     "%s.conf",
+                     testname);
+    GNUNET_free (testname);
+  }
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  return result;
+}
+
+
+/* end of perf_select_refunds_by_coin.c */
diff --git a/src/exchangedb/pg_abort_shard.c b/src/exchangedb/pg_abort_shard.c
new file mode 100644
index 000000000..d04680a81
--- /dev/null
+++ b/src/exchangedb/pg_abort_shard.c
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_abort_shard.c
+ * @brief Implementation of the abort_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_abort_shard.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_abort_shard (void *cls,
+                    const char *job_name,
+                    uint64_t start_row,
+                    uint64_t end_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (job_name),
+    GNUNET_PQ_query_param_uint64 (&start_row),
+    GNUNET_PQ_query_param_uint64 (&end_row),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "abort_shard",
+           "UPDATE work_shards"
+           "   SET last_attempt=0"
+           " WHERE job_name=$1"
+           "   AND start_row=$2"
+           "   AND end_row=$3;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "abort_shard",
+                                             params);
+}
diff --git a/src/exchangedb/pg_abort_shard.h b/src/exchangedb/pg_abort_shard.h
new file mode 100644
index 000000000..e52ace5f6
--- /dev/null
+++ b/src/exchangedb/pg_abort_shard.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_abort_shard.h
+ * @brief implementation of the abort_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ABORT_SHARD_H
+#define PG_ABORT_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to abort work on a shard.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param job_name name of the operation to abort a word shard for
+ * @param start_row inclusive start row of the shard
+ * @param end_row exclusive end row of the shard
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_abort_shard (void *cls,
+                    const char *job_name,
+                    uint64_t start_row,
+                    uint64_t end_row);
+
+#endif
diff --git a/src/exchangedb/pg_activate_signing_key.c b/src/exchangedb/pg_activate_signing_key.c
new file mode 100644
index 000000000..fab2a0ffe
--- /dev/null
+++ b/src/exchangedb/pg_activate_signing_key.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_activate_signing_key.c
+ * @brief Implementation of the activate_signing_key function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_activate_signing_key.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_activate_signing_key (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_EXCHANGEDB_SignkeyMetaData *meta,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam iparams[] = {
+    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
+    GNUNET_PQ_query_param_timestamp (&meta->start),
+    GNUNET_PQ_query_param_timestamp (&meta->expire_sign),
+    GNUNET_PQ_query_param_timestamp (&meta->expire_legal),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_signkey",
+           "INSERT INTO exchange_sign_keys "
+           "(exchange_pub"
+           ",valid_from"
+           ",expire_sign"
+           ",expire_legal"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_signkey",
+                                             iparams);
+}
diff --git a/src/exchangedb/pg_activate_signing_key.h b/src/exchangedb/pg_activate_signing_key.h
new file mode 100644
index 000000000..2d4df0671
--- /dev/null
+++ b/src/exchangedb/pg_activate_signing_key.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_activate_signing_key.h
+ * @brief implementation of the activate_signing_key function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ACTIVATE_SIGNING_KEY_H
+#define PG_ACTIVATE_SIGNING_KEY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Add signing key.
+ *
+ * @param cls closure
+ * @param exchange_pub the exchange online signing public key
+ * @param meta meta data about @a exchange_pub
+ * @param master_sig master signature to add
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_activate_signing_key (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_EXCHANGEDB_SignkeyMetaData *meta,
+  const struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_add_denomination_key.c b/src/exchangedb/pg_add_denomination_key.c
new file mode 100644
index 000000000..eb50304d3
--- /dev/null
+++ b/src/exchangedb/pg_add_denomination_key.c
@@ -0,0 +1,86 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_add_denomination_key.c
+ * @brief Implementation of the add_denomination_key function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_add_denomination_key.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_add_denomination_key (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam iparams[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
+    TALER_PQ_query_param_denom_pub (denom_pub),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_timestamp (&meta->start),
+    GNUNET_PQ_query_param_timestamp (&meta->expire_withdraw),
+    GNUNET_PQ_query_param_timestamp (&meta->expire_deposit),
+    GNUNET_PQ_query_param_timestamp (&meta->expire_legal),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &meta->value),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &meta->fees.withdraw),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &meta->fees.deposit),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &meta->fees.refresh),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &meta->fees.refund),
+    GNUNET_PQ_query_param_uint32 (&meta->age_mask.bits),
+    GNUNET_PQ_query_param_end
+  };
+
+  /* Sanity check: ensure fees match coin currency */
+  GNUNET_assert (GNUNET_YES ==
+                 TALER_denom_fee_check_currency (meta->value.currency,
+                                                 &meta->fees));
+  PREPARE (pg,
+           "denomination_insert",
+           "INSERT INTO denominations "
+           "(denom_pub_hash"
+           ",denom_pub"
+           ",master_sig"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"     /* value of this denom */
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",age_mask"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
+           " $11, $12, $13);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "denomination_insert",
+                                             iparams);
+}
diff --git a/src/exchangedb/pg_add_denomination_key.h b/src/exchangedb/pg_add_denomination_key.h
new file mode 100644
index 000000000..d131679e8
--- /dev/null
+++ b/src/exchangedb/pg_add_denomination_key.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_add_denomination_key.h
+ * @brief implementation of the add_denomination_key function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ADD_DENOMINATION_KEY_H
+#define PG_ADD_DENOMINATION_KEY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Activate denomination key, turning it into a "current" or "valid"
+ * denomination key by adding the master signature.
+ *
+ * @param cls closure
+ * @param h_denom_pub hash of the denomination public key
+ * @param denom_pub the actual denomination key
+ * @param meta meta data about the denomination
+ * @param master_sig master signature to add
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_add_denomination_key (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta,
+  const struct TALER_MasterSignatureP *master_sig);
+#endif
diff --git a/src/exchangedb/pg_add_policy_fulfillment_proof.c b/src/exchangedb/pg_add_policy_fulfillment_proof.c
new file mode 100644
index 000000000..93d070712
--- /dev/null
+++ b/src/exchangedb/pg_add_policy_fulfillment_proof.c
@@ -0,0 +1,159 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_add_policy_fulfillment_proof.c
+ * @brief Implementation of the add_policy_fulfillment_proof function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_add_policy_fulfillment_proof.h"
+#include "pg_helper.h"
+
+
+/**
+ * Compares two indices into an array of hash codes according to
+ * GNUNET_CRYPTO_hash_cmp of the content at those index positions.
+ *
+ * Used in a call qsort_t in order to generate sorted policy_hash_codes.
+ */
+static int
+hash_code_cmp (
+  const void *hc1,
+  const void *hc2,
+  void *arg)
+{
+  size_t i1 = *(size_t *) hc1;
+  size_t i2 = *(size_t *) hc2;
+  const struct TALER_PolicyDetails *d = arg;
+
+  return GNUNET_CRYPTO_hash_cmp (&d[i1].hash_code,
+                                 &d[i2].hash_code);
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_add_policy_fulfillment_proof (
+  void *cls,
+  struct TALER_PolicyFulfillmentTransactionData *fulfillment)
+{
+  enum GNUNET_DB_QueryStatus qs;
+  struct PostgresClosure *pg = cls;
+  size_t count = fulfillment->details_count;
+  /* FIXME: this seems to be prone to VLA attacks */
+  struct GNUNET_HashCode hcs[count];
+
+  /* Create the sorted policy_hash_codes */
+  {
+    size_t idx[count];
+    for (size_t i = 0; i < count; i++)
+      idx[i] = i;
+
+    /* Sort the indices according to the hash codes of the corresponding
+     * details. */
+    qsort_r (idx,
+             count,
+             sizeof(size_t),
+             hash_code_cmp,
+             fulfillment->details);
+
+    /* Finally, concatenate all hash_codes in sorted order */
+    for (size_t i = 0; i < count; i++)
+      hcs[i] = fulfillment->details[idx[i]].hash_code;
+  }
+
+
+  /* Now, add the proof to the policy_fulfillments table, retrieve the
+   * record_id */
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_timestamp (&fulfillment->timestamp),
+      TALER_PQ_query_param_json (fulfillment->proof),
+      GNUNET_PQ_query_param_auto_from_type (&fulfillment->h_proof),
+      TALER_PQ_query_param_array_hash_code (count, hcs, pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("fulfillment_id",
+                                    &fulfillment->fulfillment_id),
+      GNUNET_PQ_result_spec_end
+    };
+
+    PREPARE (pg,
+             "insert_proof_into_policy_fulfillments",
+             "INSERT INTO policy_fulfillments"
+             "(fulfillment_timestamp"
+             ",fulfillment_proof"
+             ",h_fulfillment_proof"
+             ",policy_hash_codes"
+             ") VALUES ($1, $2, $3, $4)"
+             " ON CONFLICT DO NOTHING;");
+    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "insert_proof_into_policy_fulfillments",
+                                                   params,
+                                                   rs);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+      return qs;
+  }
+
+  /* Now, set the states of each entry corresponding to the hash_codes in
+   * policy_details accordingly */
+  for (size_t i = 0; i < count; i++)
+  {
+    struct TALER_PolicyDetails *pos = &fulfillment->details[i];
+    {
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_auto_from_type (&pos->hash_code),
+        GNUNET_PQ_query_param_timestamp (&pos->deadline),
+        TALER_PQ_query_param_amount (pg->conn,
+                                     &pos->commitment),
+        TALER_PQ_query_param_amount (pg->conn,
+                                     &pos->accumulated_total),
+        TALER_PQ_query_param_amount (pg->conn,
+                                     &pos->policy_fee),
+        TALER_PQ_query_param_amount (pg->conn,
+                                     &pos->transferable_amount),
+        GNUNET_PQ_query_param_auto_from_type (&pos->fulfillment_state),
+        GNUNET_PQ_query_param_end
+      };
+
+      PREPARE (pg,
+               "update_policy_details",
+               "UPDATE policy_details SET"
+               " deadline=$2"
+               ",commitment=$3"
+               ",accumulated_total=$4"
+               ",fee=$5"
+               ",transferable=$6"
+               ",fulfillment_state=$7"
+               " WHERE policy_hash_code=$1;");
+      qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                               "update_policy_details",
+                                               params);
+      if (qs < 0)
+        return qs;
+    }
+  }
+
+  /*
+   * FIXME[oec]-#7999: When all policies of a deposit are fulfilled,
+   * unblock it and trigger a wire-transfer.
+   */
+
+  return qs;
+}
diff --git a/src/exchangedb/pg_add_policy_fulfillment_proof.h b/src/exchangedb/pg_add_policy_fulfillment_proof.h
new file mode 100644
index 000000000..77bddaf08
--- /dev/null
+++ b/src/exchangedb/pg_add_policy_fulfillment_proof.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_add_policy_fulfillment_proof.h
+ * @brief implementation of the add_policy_fulfillment_proof function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ADD_POLICY_FULFILLMENT_PROOF_H
+#define PG_ADD_POLICY_FULFILLMENT_PROOF_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Add a proof of fulfillment into the policy_fulfillments table
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param fulfillment fullfilment transaction data to be added
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_add_policy_fulfillment_proof (
+  void *cls,
+  struct TALER_PolicyFulfillmentTransactionData *fulfillment);
+
+#endif
diff --git a/src/exchangedb/pg_aggregate.c b/src/exchangedb/pg_aggregate.c
new file mode 100644
index 000000000..ba03e4a9c
--- /dev/null
+++ b/src/exchangedb/pg_aggregate.c
@@ -0,0 +1,205 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_aggregate.c
+ * @brief Implementation of the aggregate function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_compute_shard.h"
+#include "pg_event_notify.h"
+#include "pg_aggregate.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_aggregate (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct TALER_Amount *total)
+{
+  struct PostgresClosure *pg = cls;
+  uint64_t deposit_shard = TEH_PG_compute_shard (merchant_pub);
+  struct GNUNET_TIME_Absolute now = {0};
+  uint64_t sum_deposit_value;
+  uint64_t sum_deposit_frac;
+  uint64_t sum_refund_value;
+  uint64_t sum_refund_frac;
+  uint64_t sum_fee_value;
+  uint64_t sum_fee_frac;
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_Amount sum_deposit;
+  struct TALER_Amount sum_refund;
+  struct TALER_Amount sum_fee;
+  struct TALER_Amount delta;
+
+  now = GNUNET_TIME_absolute_round_down (GNUNET_TIME_absolute_get (),
+                                         pg->aggregator_shift);
+  PREPARE (pg,
+           "aggregate",
+           "WITH bdep AS (" /* restrict to our merchant and account and mark as done */
+           "  UPDATE batch_deposits"
+           "     SET done=TRUE"
+           "   WHERE NOT (done OR policy_blocked)" /* only actually executable deposits */
+           "     AND refund_deadline<$1"
+           "     AND shard=$5" /* only for efficiency, merchant_pub is what we really filter by */
+           "     AND merchant_pub=$2" /* filter by target merchant */
+           "     AND wire_target_h_payto=$3" /* merchant could have a 2nd bank account */
+           "   RETURNING"
+           "     batch_deposit_serial_id)"
+           " ,cdep AS ("
+           "   SELECT"
+           "     coin_deposit_serial_id"
+           "    ,batch_deposit_serial_id"
+           "    ,coin_pub"
+           "    ,amount_with_fee AS amount"
+           "   FROM coin_deposits"
+           "   WHERE batch_deposit_serial_id IN (SELECT batch_deposit_serial_id FROM bdep))"
+           " ,ref AS (" /* find applicable refunds -- NOTE: may do a full join on the master, maybe find a left-join way to integrate with query above to push it to the shards? */
+           "  SELECT"
+           "    amount_with_fee AS refund"
+           "   ,coin_pub"
+           "   ,batch_deposit_serial_id" /* theoretically, coin could be in multiple refunded transactions */
+           "    FROM refunds"
+           "   WHERE coin_pub IN (SELECT coin_pub FROM cdep)"
+           "     AND batch_deposit_serial_id IN (SELECT batch_deposit_serial_id FROM bdep))"
+           " ,ref_by_coin AS (" /* total up refunds by coin */
+           "  SELECT"
+           "    SUM((ref.refund).val) AS sum_refund_val"
+           "   ,SUM((ref.refund).frac) AS sum_refund_frac"
+           "   ,coin_pub"
+           "   ,batch_deposit_serial_id" /* theoretically, coin could be in multiple refunded transactions */
+           "    FROM ref"
+           "   GROUP BY coin_pub, batch_deposit_serial_id)"
+           " ,norm_ref_by_coin AS (" /* normalize */
+           "  SELECT"
+           "    sum_refund_val + sum_refund_frac / 100000000 AS norm_refund_val"
+           "   ,sum_refund_frac % 100000000 AS norm_refund_frac"
+           "   ,coin_pub"
+           "   ,batch_deposit_serial_id" /* theoretically, coin could be in multiple refunded transactions */
+           "    FROM ref_by_coin)"
+           " ,fully_refunded_coins AS (" /* find applicable refunds -- NOTE: may do a full join on the master, maybe find a left-join way to integrate with query above to push it to the shards? */
+           "  SELECT"
+           "    cdep.coin_pub"
+           "    FROM norm_ref_by_coin norm"
+           "    JOIN cdep"
+           "      ON (norm.coin_pub = cdep.coin_pub"
+           "      AND norm.batch_deposit_serial_id = cdep.batch_deposit_serial_id"
+           "      AND norm.norm_refund_val = (cdep.amount).val"
+           "      AND norm.norm_refund_frac = (cdep.amount).frac))"
+           " ,fees AS (" /* find deposit fees for not fully refunded deposits */
+           "  SELECT"
+           "    denom.fee_deposit AS fee"
+           "   ,cs.batch_deposit_serial_id" /* ensures we get the fee for each coin, not once per denomination */
+           "    FROM cdep cs"
+           "    JOIN known_coins kc" /* NOTE: may do a full join on the master, maybe find a left-join way to integrate with query above to push it to the shards? */
+           "      USING (coin_pub)"
+           "    JOIN denominations denom"
+           "      USING (denominations_serial)"
+           "    WHERE coin_pub NOT IN (SELECT coin_pub FROM fully_refunded_coins))"
+           " ,dummy AS (" /* add deposits to aggregation_tracking */
+           "    INSERT INTO aggregation_tracking"
+           "    (batch_deposit_serial_id"
+           "    ,wtid_raw)"
+           "    SELECT batch_deposit_serial_id,$4"
+           "      FROM bdep)"
+           "SELECT" /* calculate totals (deposits, refunds and fees) */
+           "  CAST(COALESCE(SUM((cdep.amount).val),0) AS INT8) AS sum_deposit_value"
+           /* cast needed, otherwise we get NUMBER */
+           " ,COALESCE(SUM((cdep.amount).frac),0) AS sum_deposit_fraction" /* SUM over INT returns INT8 */
+           " ,CAST(COALESCE(SUM((ref.refund).val),0) AS INT8) AS sum_refund_value"
+           " ,COALESCE(SUM((ref.refund).frac),0) AS sum_refund_fraction"
+           " ,CAST(COALESCE(SUM((fees.fee).val),0) AS INT8) AS sum_fee_value"
+           " ,COALESCE(SUM((fees.fee).frac),0) AS sum_fee_fraction"
+           " FROM cdep "
+           "   FULL OUTER JOIN ref ON (FALSE)"    /* We just want all sums */
+           "   FULL OUTER JOIN fees ON (FALSE);");
+
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_absolute_time (&now),
+      GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+      GNUNET_PQ_query_param_auto_from_type (h_payto),
+      GNUNET_PQ_query_param_auto_from_type (wtid),
+      GNUNET_PQ_query_param_uint64 (&deposit_shard),
+      GNUNET_PQ_query_param_end
+    };
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("sum_deposit_value",
+                                    &sum_deposit_value),
+      GNUNET_PQ_result_spec_uint64 ("sum_deposit_fraction",
+                                    &sum_deposit_frac),
+      GNUNET_PQ_result_spec_uint64 ("sum_refund_value",
+                                    &sum_refund_value),
+      GNUNET_PQ_result_spec_uint64 ("sum_refund_fraction",
+                                    &sum_refund_frac),
+      GNUNET_PQ_result_spec_uint64 ("sum_fee_value",
+                                    &sum_fee_value),
+      GNUNET_PQ_result_spec_uint64 ("sum_fee_fraction",
+                                    &sum_fee_frac),
+      GNUNET_PQ_result_spec_end
+    };
+
+    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "aggregate",
+                                                   params,
+                                                   rs);
+  }
+  if (qs < 0)
+  {
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    return qs;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (pg->currency,
+                                          total));
+    return qs;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &sum_deposit));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &sum_refund));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &sum_fee));
+  sum_deposit.value    = sum_deposit_frac / TALER_AMOUNT_FRAC_BASE
+                         + sum_deposit_value;
+  sum_deposit.fraction = sum_deposit_frac % TALER_AMOUNT_FRAC_BASE;
+  sum_refund.value     = sum_refund_frac  / TALER_AMOUNT_FRAC_BASE
+                         + sum_refund_value;
+  sum_refund.fraction  = sum_refund_frac  % TALER_AMOUNT_FRAC_BASE;
+  sum_fee.value        = sum_fee_frac     / TALER_AMOUNT_FRAC_BASE
+                         + sum_fee_value;
+  sum_fee.fraction     = sum_fee_frac     % TALER_AMOUNT_FRAC_BASE; \
+  GNUNET_assert (0 <=
+                 TALER_amount_subtract (&delta,
+                                        &sum_deposit,
+                                        &sum_refund));
+  GNUNET_assert (0 <=
+                 TALER_amount_subtract (total,
+                                        &delta,
+                                        &sum_fee));
+  return qs;
+}
diff --git a/src/exchangedb/pg_aggregate.h b/src/exchangedb/pg_aggregate.h
new file mode 100644
index 000000000..1f986ef9e
--- /dev/null
+++ b/src/exchangedb/pg_aggregate.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_aggregate.h
+ * @brief implementation of the aggregate function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_AGGREGATE_H
+#define PG_AGGREGATE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Aggregate all matching deposits for @a h_payto and
+ * @a merchant_pub, returning the total amounts.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param merchant_pub public key of the merchant
+ * @param wtid wire transfer ID to set for the aggregate
+ * @param[out] total set to the sum of the total deposits minus applicable deposit fees and refunds
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_aggregate (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct TALER_Amount *total);
+
+#endif
diff --git a/src/exchangedb/pg_batch_ensure_coin_known.c b/src/exchangedb/pg_batch_ensure_coin_known.c
new file mode 100644
index 000000000..aca2732c6
--- /dev/null
+++ b/src/exchangedb/pg_batch_ensure_coin_known.c
@@ -0,0 +1,462 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_batch_ensure_coin_known.c
+ * @brief Implementation of the batch_ensure_coin_known function for Postgres
+ * @author Christian Grothoff
+ *
+ * FIXME: use the array support for postgres to simplify this code!
+ *
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_pq_lib.h"
+#include "pg_batch_ensure_coin_known.h"
+#include "pg_helper.h"
+
+
+static enum GNUNET_DB_QueryStatus
+insert1 (struct PostgresClosure *pg,
+         const struct TALER_CoinPublicInfo coin[1],
+         struct TALER_EXCHANGEDB_CoinInfo result[1])
+{
+  enum GNUNET_DB_QueryStatus qs;
+  bool is_denom_pub_hash_null = false;
+  bool is_age_hash_null = false;
+  PREPARE (pg,
+           "batch1_known_coin",
+           "SELECT"
+           " existed1 AS existed"
+           ",known_coin_id1 AS known_coin_id"
+           ",denom_pub_hash1 AS denom_hash"
+           ",age_commitment_hash1 AS h_age_commitment"
+           " FROM exchange_do_batch1_known_coin"
+           "  ($1, $2, $3, $4);"
+           );
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[0].denom_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("existed",
+                                &result[0].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                  &result[0].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &result[0].denom_hash),
+      &is_denom_pub_hash_null),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            &result[0].h_age_commitment),
+      &is_age_hash_null),
+    GNUNET_PQ_result_spec_end
+  };
+
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "batch1_known_coin",
+                                                 params,
+                                                 rs);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0); /* should be impossible */
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break; /* continued below */
+  }
+
+  if ( (! is_denom_pub_hash_null) &&
+       (0 != GNUNET_memcmp (&result[0].denom_hash,
+                            &coin->denom_pub_hash)) )
+  {
+    GNUNET_break_op (0);
+    result[0].denom_conflict = true;
+  }
+
+  if ( (! is_denom_pub_hash_null) &&
+       (0 != GNUNET_memcmp (&result[0].denom_hash,
+                            &coin[0].denom_pub_hash)) )
+  {
+    GNUNET_break_op (0);
+    result[0].denom_conflict = true;
+  }
+
+  result[0].age_conflict = TALER_AgeCommitmentHash_NoConflict;
+
+  if (is_age_hash_null != coin[0].no_age_commitment)
+  {
+    if (is_age_hash_null)
+    {
+      GNUNET_break_op (0);
+      result[0].age_conflict = TALER_AgeCommitmentHash_NullExpected;
+    }
+    else
+    {
+      GNUNET_break_op (0);
+      result[0].age_conflict = TALER_AgeCommitmentHash_ValueExpected;
+    }
+  }
+  else if ( (! is_age_hash_null) &&
+            (0 != GNUNET_memcmp (&result[0].h_age_commitment,
+                                 &coin[0].h_age_commitment)) )
+  {
+    GNUNET_break_op (0);
+    result[0].age_conflict = TALER_AgeCommitmentHash_ValueDiffers;
+  }
+
+  return qs;
+}
+
+
+static enum GNUNET_DB_QueryStatus
+insert2 (struct PostgresClosure *pg,
+         const struct TALER_CoinPublicInfo coin[2],
+         struct TALER_EXCHANGEDB_CoinInfo result[2])
+{
+  enum GNUNET_DB_QueryStatus qs;
+  bool is_denom_pub_hash_null[2] = {false, false};
+  bool is_age_hash_null[2] = {false, false};
+
+  PREPARE (pg,
+           "batch2_known_coin",
+           "SELECT"
+           " existed1 AS existed"
+           ",known_coin_id1 AS known_coin_id"
+           ",denom_pub_hash1 AS denom_hash"
+           ",age_commitment_hash1 AS h_age_commitment"
+           ",existed2 AS existed2"
+           ",known_coin_id2 AS known_coin_id2"
+           ",denom_pub_hash2 AS denom_hash2"
+           ",age_commitment_hash2 AS h_age_commitment2"
+           " FROM exchange_do_batch2_known_coin"
+           "  ($1, $2, $3, $4, $5, $6, $7, $8);"
+           );
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[0].denom_sig),
+
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[0].denom_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("existed",
+                                &result[0].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                  &result[0].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &result[0].denom_hash),
+      &is_denom_pub_hash_null[0]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            &result[0].h_age_commitment),
+      &is_age_hash_null[0]),
+    GNUNET_PQ_result_spec_bool ("existed2",
+                                &result[1].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id2",
+                                  &result[1].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash2",
+                                            &result[1].denom_hash),
+      &is_denom_pub_hash_null[1]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash2",
+                                            &result[1].h_age_commitment),
+      &is_age_hash_null[1]),
+    GNUNET_PQ_result_spec_end
+  };
+
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "batch2_known_coin",
+                                                 params,
+                                                 rs);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0); /* should be impossible */
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break; /* continued below */
+  }
+
+  for (int i = 0; i < 2; i++)
+  {
+    if ( (! is_denom_pub_hash_null[i]) &&
+         (0 != GNUNET_memcmp (&result[i].denom_hash,
+                              &coin[i].denom_pub_hash)) )
+    {
+      GNUNET_break_op (0);
+      result[i].denom_conflict = true;
+    }
+
+    result[i].age_conflict = TALER_AgeCommitmentHash_NoConflict;
+
+    if (is_age_hash_null[i] != coin[i].no_age_commitment)
+    {
+      if (is_age_hash_null[i])
+      {
+        GNUNET_break_op (0);
+        result[i].age_conflict = TALER_AgeCommitmentHash_NullExpected;
+      }
+      else
+      {
+        GNUNET_break_op (0);
+        result[i].age_conflict = TALER_AgeCommitmentHash_ValueExpected;
+      }
+    }
+    else if ( (! is_age_hash_null[i]) &&
+              (0 != GNUNET_memcmp (&result[i].h_age_commitment,
+                                   &coin[i].h_age_commitment)) )
+    {
+      GNUNET_break_op (0);
+      result[i].age_conflict = TALER_AgeCommitmentHash_ValueDiffers;
+    }
+  }
+
+  return qs;
+}
+
+
+static enum GNUNET_DB_QueryStatus
+insert4 (struct PostgresClosure *pg,
+         const struct TALER_CoinPublicInfo coin[4],
+         struct TALER_EXCHANGEDB_CoinInfo result[4])
+{
+  enum GNUNET_DB_QueryStatus qs;
+  bool is_denom_pub_hash_null[4] = {false, false, false, false};
+  bool is_age_hash_null[4] = {false, false, false, false};
+  PREPARE (pg,
+           "batch4_known_coin",
+           "SELECT"
+           " existed1 AS existed"
+           ",known_coin_id1 AS known_coin_id"
+           ",denom_pub_hash1 AS denom_hash"
+           ",age_commitment_hash1 AS h_age_commitment"
+           ",existed2 AS existed2"
+           ",known_coin_id2 AS known_coin_id2"
+           ",denom_pub_hash2 AS denom_hash2"
+           ",age_commitment_hash2 AS h_age_commitment2"
+           ",existed3 AS existed3"
+           ",known_coin_id3 AS known_coin_id3"
+           ",denom_pub_hash3 AS denom_hash3"
+           ",age_commitment_hash3 AS h_age_commitment3"
+           ",existed4 AS existed4"
+           ",known_coin_id4 AS known_coin_id4"
+           ",denom_pub_hash4 AS denom_hash4"
+           ",age_commitment_hash4 AS h_age_commitment4"
+           " FROM exchange_do_batch2_known_coin"
+           "  ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);"
+           );
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[0].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[0].denom_sig),
+
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[1].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[0].denom_sig),
+
+    GNUNET_PQ_query_param_auto_from_type (&coin[2].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[2].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[2].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[2].denom_sig),
+
+    GNUNET_PQ_query_param_auto_from_type (&coin[3].coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin[3].denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (&coin[3].h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin[3].denom_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("existed",
+                                &result[0].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                  &result[0].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &result[0].denom_hash),
+      &is_denom_pub_hash_null[0]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            &result[0].h_age_commitment),
+      &is_age_hash_null[0]),
+    GNUNET_PQ_result_spec_bool ("existed2",
+                                &result[1].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id2",
+                                  &result[1].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash2",
+                                            &result[1].denom_hash),
+      &is_denom_pub_hash_null[1]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash2",
+                                            &result[1].h_age_commitment),
+      &is_age_hash_null[1]),
+    GNUNET_PQ_result_spec_bool ("existed3",
+                                &result[2].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id3",
+                                  &result[2].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash3",
+                                            &result[2].denom_hash),
+      &is_denom_pub_hash_null[2]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash3",
+                                            &result[2].h_age_commitment),
+      &is_age_hash_null[2]),
+    GNUNET_PQ_result_spec_bool ("existed4",
+                                &result[3].existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id4",
+                                  &result[3].known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash4",
+                                            &result[3].denom_hash),
+      &is_denom_pub_hash_null[3]),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash4",
+                                            &result[3].h_age_commitment),
+      &is_age_hash_null[3]),
+    GNUNET_PQ_result_spec_end
+  };
+
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "batch4_known_coin",
+                                                 params,
+                                                 rs);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    return qs;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return qs;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0); /* should be impossible */
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    break; /* continued below */
+  }
+
+  for (int i = 0; i < 4; i++)
+  {
+    if ( (! is_denom_pub_hash_null[i]) &&
+         (0 != GNUNET_memcmp (&result[i].denom_hash,
+                              &coin[i].denom_pub_hash)) )
+    {
+      GNUNET_break_op (0);
+      result[i].denom_conflict = true;
+    }
+
+    result[i].age_conflict = TALER_AgeCommitmentHash_NoConflict;
+
+    if (is_age_hash_null[i] != coin[i].no_age_commitment)
+    {
+      if (is_age_hash_null[i])
+      {
+        GNUNET_break_op (0);
+        result[i].age_conflict = TALER_AgeCommitmentHash_NullExpected;
+      }
+      else
+      {
+        GNUNET_break_op (0);
+        result[i].age_conflict = TALER_AgeCommitmentHash_ValueExpected;
+      }
+    }
+    else if ( (! is_age_hash_null[i]) &&
+              (0 != GNUNET_memcmp (&result[i].h_age_commitment,
+                                   &coin[i].h_age_commitment)) )
+    {
+      GNUNET_break_op (0);
+      result[i].age_conflict = TALER_AgeCommitmentHash_ValueDiffers;
+    }
+  }
+
+  return qs;
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_batch_ensure_coin_known (
+  void *cls,
+  const struct TALER_CoinPublicInfo *coin,
+  struct TALER_EXCHANGEDB_CoinInfo *result,
+  unsigned int coin_length,
+  unsigned int batch_size)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs = 0;
+  unsigned int i = 0;
+
+  while ( (qs >= 0) &&
+          (i < coin_length) )
+  {
+    unsigned int bs = GNUNET_MIN (batch_size,
+                                  coin_length - i);
+    if (bs >= 4)
+    {
+      qs = insert4 (pg,
+                    &coin[i],
+                    &result[i]);
+      i += 4;
+      continue;
+    }
+    switch (bs)
+    {
+    case 3:
+    case 2:
+      qs = insert2 (pg,
+                    &coin[i],
+                    &result[i]);
+      i += 2;
+      break;
+    case 1:
+      qs = insert1 (pg,
+                    &coin[i],
+                    &result[i]);
+      i += 1;
+      break;
+    case 0:
+      GNUNET_assert (0);
+      break;
+    }
+  } /* end while */
+  if (qs < 0)
+    return qs;
+  return i;
+}
diff --git a/src/exchangedb/pg_batch_ensure_coin_known.h b/src/exchangedb/pg_batch_ensure_coin_known.h
new file mode 100644
index 000000000..2c53676d9
--- /dev/null
+++ b/src/exchangedb/pg_batch_ensure_coin_known.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_batch_ensure_coin_known.h
+ * @brief implementation of the batch_ensure_coin_known function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_BATCH_ENSURE_COIN_KNOWN_H
+#define PG_BATCH_ENSURE_COIN_KNOWN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Make sure the array of given @a coin is known to the database.
+ *
+ * @param cls database connection plugin state
+ * @param coin array of coins that must be made known
+ * @param[out] result array where to store information about each coin
+ * @param coin_length length of the @a coin and @a result arraysf
+ * @param batch_size desired (maximum) batch size
+ * @return database transaction status, non-negative on success
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_batch_ensure_coin_known (
+  void *cls,
+  const struct TALER_CoinPublicInfo *coin,
+  struct TALER_EXCHANGEDB_CoinInfo *result,
+  unsigned int coin_length,
+  unsigned int batch_size);
+
+#endif
diff --git a/src/exchangedb/pg_begin_revolving_shard.c b/src/exchangedb/pg_begin_revolving_shard.c
new file mode 100644
index 000000000..86cdf80fd
--- /dev/null
+++ b/src/exchangedb/pg_begin_revolving_shard.c
@@ -0,0 +1,263 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_begin_revolving_shard.c
+ * @brief Implementation of the begin_revolving_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_begin_revolving_shard.h"
+#include "pg_commit.h"
+#include "pg_helper.h"
+#include "pg_start.h"
+#include "pg_rollback.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_begin_revolving_shard (void *cls,
+                              const char *job_name,
+                              uint32_t shard_size,
+                              uint32_t shard_limit,
+                              uint32_t *start_row,
+                              uint32_t *end_row)
+{
+  struct PostgresClosure *pg = cls;
+
+  GNUNET_assert (shard_limit <= 1U + (uint32_t) INT_MAX);
+  GNUNET_assert (shard_limit > 0);
+  GNUNET_assert (shard_size > 0);
+  for (unsigned int retries = 0; retries<3; retries++)
+  {
+    if (GNUNET_OK !=
+        TEH_PG_start (pg,
+                      "begin_revolving_shard"))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+
+    /* First, find last 'end_row' */
+    {
+      enum GNUNET_DB_QueryStatus qs;
+      uint32_t last_end;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_end
+      };
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_uint32 ("end_row",
+                                      &last_end),
+        GNUNET_PQ_result_spec_end
+      };
+      /* Used in #postgres_begin_revolving_shard() */
+      PREPARE (pg,
+               "get_last_revolving_shard",
+               "SELECT"
+               " end_row"
+               " FROM revolving_work_shards"
+               " WHERE job_name=$1"
+               " ORDER BY end_row DESC"
+               " LIMIT 1;");
+      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                     "get_last_revolving_shard",
+                                                     params,
+                                                     rs);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        *start_row = 1U + last_end;
+        break;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        *start_row = 0; /* base-case: no shards yet */
+        break; /* continued below */
+      }
+    } /* get_last_shard */
+
+    if (*start_row < shard_limit)
+    {
+      /* Claim fresh shard */
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_TIME_Absolute now;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_absolute_time (&now),
+        GNUNET_PQ_query_param_uint32 (start_row),
+        GNUNET_PQ_query_param_uint32 (end_row),
+        GNUNET_PQ_query_param_end
+      };
+
+      *end_row = GNUNET_MIN (shard_limit,
+                             *start_row + shard_size - 1);
+      now = GNUNET_TIME_absolute_get ();
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Trying to claim shard %llu-%llu\n",
+                  (unsigned long long) *start_row,
+                  (unsigned long long) *end_row);
+
+      /* Used in #postgres_claim_revolving_shard() */
+      PREPARE (pg,
+               "create_revolving_shard",
+               "INSERT INTO revolving_work_shards"
+               "(job_name"
+               ",last_attempt"
+               ",start_row"
+               ",end_row"
+               ",active"
+               ") VALUES "
+               "($1, $2, $3, $4, TRUE);");
+      qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                               "create_revolving_shard",
+                                               params);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        /* continued below (with commit) */
+        break;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        /* someone else got this shard already,
+           try again */
+        TEH_PG_rollback (pg);
+        continue;
+      }
+    } /* end create fresh reovlving shard */
+    else
+    {
+      /* claim oldest existing shard */
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_end
+      };
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_uint32 ("start_row",
+                                      start_row),
+        GNUNET_PQ_result_spec_uint32 ("end_row",
+                                      end_row),
+        GNUNET_PQ_result_spec_end
+      };
+      /* Used in #postgres_begin_revolving_shard() */
+      PREPARE (pg,
+               "get_open_revolving_shard",
+               "SELECT"
+               " start_row"
+               ",end_row"
+               " FROM revolving_work_shards"
+               " WHERE job_name=$1"
+               "   AND active=FALSE"
+               " ORDER BY last_attempt ASC"
+               " LIMIT 1;");
+      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                     "get_open_revolving_shard",
+                                                     params,
+                                                     rs);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        /* no open shards available */
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        {
+          enum GNUNET_DB_QueryStatus qs;
+          struct GNUNET_TIME_Timestamp now;
+          struct GNUNET_PQ_QueryParam params[] = {
+            GNUNET_PQ_query_param_string (job_name),
+            GNUNET_PQ_query_param_timestamp (&now),
+            GNUNET_PQ_query_param_uint32 (start_row),
+            GNUNET_PQ_query_param_uint32 (end_row),
+            GNUNET_PQ_query_param_end
+          };
+
+          now = GNUNET_TIME_timestamp_get ();
+
+          /* Used in #postgres_begin_revolving_shard() */
+          PREPARE (pg,
+                   "reclaim_revolving_shard",
+                   "UPDATE revolving_work_shards"
+                   " SET last_attempt=$2"
+                   "    ,active=TRUE"
+                   " WHERE job_name=$1"
+                   "   AND start_row=$3"
+                   "   AND end_row=$4");
+          qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                                   "reclaim_revolving_shard",
+                                                   params);
+          switch (qs)
+          {
+          case GNUNET_DB_STATUS_HARD_ERROR:
+            GNUNET_break (0);
+            TEH_PG_rollback (pg);
+            return qs;
+          case GNUNET_DB_STATUS_SOFT_ERROR:
+            TEH_PG_rollback (pg);
+            continue;
+          case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+            break; /* continue with commit */
+          case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+            GNUNET_break (0); /* logic error, should be impossible */
+            TEH_PG_rollback (pg);
+            return GNUNET_DB_STATUS_HARD_ERROR;
+          }
+        }
+        break; /* continue with commit */
+      }
+    } /* end claim oldest existing shard */
+
+    /* commit */
+    {
+      enum GNUNET_DB_QueryStatus qs;
+
+      qs = TEH_PG_commit (pg);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+      }
+    }
+  } /* retry 'for' loop */
+  return GNUNET_DB_STATUS_SOFT_ERROR;
+}
diff --git a/src/exchangedb/pg_begin_revolving_shard.h b/src/exchangedb/pg_begin_revolving_shard.h
new file mode 100644
index 000000000..0755f886b
--- /dev/null
+++ b/src/exchangedb/pg_begin_revolving_shard.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_begin_revolving_shard.h
+ * @brief implementation of the begin_revolving_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_BEGIN_REVOLVING_SHARD_H
+#define PG_BEGIN_REVOLVING_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to grab a revolving work shard on an operation @a op. Runs
+ * in its own transaction. Returns the oldest inactive shard.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param job_name name of the operation to grab a revolving shard for
+ * @param shard_size desired shard size
+ * @param shard_limit exclusive end of the shard range
+ * @param[out] start_row inclusive start row of the shard (returned)
+ * @param[out] end_row inclusive end row of the shard (returned)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_begin_revolving_shard (void *cls,
+                              const char *job_name,
+                              uint32_t shard_size,
+                              uint32_t shard_limit,
+                              uint32_t *start_row,
+                              uint32_t *end_row);
+
+#endif
diff --git a/src/exchangedb/pg_begin_shard.c b/src/exchangedb/pg_begin_shard.c
new file mode 100644
index 000000000..48e077990
--- /dev/null
+++ b/src/exchangedb/pg_begin_shard.c
@@ -0,0 +1,266 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_begin_shard.c
+ * @brief Implementation of the begin_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_begin_shard.h"
+#include "pg_helper.h"
+#include "pg_start.h"
+#include "pg_rollback.h"
+#include "pg_commit.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_begin_shard (void *cls,
+                    const char *job_name,
+                    struct GNUNET_TIME_Relative delay,
+                    uint64_t shard_size,
+                    uint64_t *start_row,
+                    uint64_t *end_row)
+{
+  struct PostgresClosure *pg = cls;
+
+  for (unsigned int retries = 0; retries<10; retries++)
+  {
+    if (GNUNET_OK !=
+        TEH_PG_start (pg,
+                      "begin_shard"))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+
+    {
+      struct GNUNET_TIME_Absolute past;
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_absolute_time (&past),
+        GNUNET_PQ_query_param_end
+      };
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_uint64 ("start_row",
+                                      start_row),
+        GNUNET_PQ_result_spec_uint64 ("end_row",
+                                      end_row),
+        GNUNET_PQ_result_spec_end
+      };
+
+      past = GNUNET_TIME_absolute_get ();
+      PREPARE (pg,
+               "get_open_shard",
+               "SELECT"
+               " start_row"
+               ",end_row"
+               " FROM work_shards"
+               " WHERE job_name=$1"
+               "   AND completed=FALSE"
+               "   AND last_attempt<$2"
+               " ORDER BY last_attempt ASC"
+               " LIMIT 1;");
+      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                     "get_open_shard",
+                                                     params,
+                                                     rs);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Serialization error on getting open shard\n");
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        {
+          enum GNUNET_DB_QueryStatus qs;
+          struct GNUNET_TIME_Absolute now;
+          struct GNUNET_PQ_QueryParam params[] = {
+            GNUNET_PQ_query_param_string (job_name),
+            GNUNET_PQ_query_param_absolute_time (&now),
+            GNUNET_PQ_query_param_uint64 (start_row),
+            GNUNET_PQ_query_param_uint64 (end_row),
+            GNUNET_PQ_query_param_end
+          };
+
+          now = GNUNET_TIME_relative_to_absolute (delay);
+          PREPARE (pg,
+                   "reclaim_shard",
+                   "UPDATE work_shards"
+                   " SET last_attempt=$2"
+                   " WHERE job_name=$1"
+                   "   AND start_row=$3"
+                   "   AND end_row=$4");
+          qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                                   "reclaim_shard",
+                                                   params);
+          switch (qs)
+          {
+          case GNUNET_DB_STATUS_HARD_ERROR:
+            GNUNET_break (0);
+            TEH_PG_rollback (pg);
+            return qs;
+          case GNUNET_DB_STATUS_SOFT_ERROR:
+            GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                        "Serialization error on claiming open shard\n");
+            TEH_PG_rollback (pg);
+            continue;
+          case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+            goto commit;
+          case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+            GNUNET_break (0); /* logic error, should be impossible */
+            TEH_PG_rollback (pg);
+            return GNUNET_DB_STATUS_HARD_ERROR;
+          }
+        }
+        break; /* actually unreachable */
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        break; /* continued below */
+      }
+    } /* get_open_shard */
+
+    /* No open shard, find last 'end_row' */
+    {
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_end
+      };
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_uint64 ("end_row",
+                                      start_row),
+        GNUNET_PQ_result_spec_end
+      };
+
+      PREPARE (pg,
+               "get_last_shard",
+               "SELECT"
+               " end_row"
+               " FROM work_shards"
+               " WHERE job_name=$1"
+               " ORDER BY end_row DESC"
+               " LIMIT 1;");
+      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                     "get_last_shard",
+                                                     params,
+                                                     rs);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Serialization error on getting last shard\n");
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        break;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        *start_row = 0; /* base-case: no shards yet */
+        break; /* continued below */
+      }
+      *end_row = *start_row + shard_size;
+    } /* get_last_shard */
+
+    /* Claim fresh shard */
+    {
+      enum GNUNET_DB_QueryStatus qs;
+      struct GNUNET_TIME_Absolute now;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_string (job_name),
+        GNUNET_PQ_query_param_absolute_time (&now),
+        GNUNET_PQ_query_param_uint64 (start_row),
+        GNUNET_PQ_query_param_uint64 (end_row),
+        GNUNET_PQ_query_param_end
+      };
+
+      now = GNUNET_TIME_relative_to_absolute (delay);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Trying to claim shard (%llu-%llu]\n",
+                  (unsigned long long) *start_row,
+                  (unsigned long long) *end_row);
+
+      PREPARE (pg,
+               "claim_next_shard",
+               "INSERT INTO work_shards"
+               "(job_name"
+               ",last_attempt"
+               ",start_row"
+               ",end_row"
+               ") VALUES "
+               "($1, $2, $3, $4);");
+      qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                               "claim_next_shard",
+                                               params);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Serialization error on claiming next shard\n");
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        /* continued below */
+        break;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+        /* someone else got this shard already,
+           try again */
+        TEH_PG_rollback (pg);
+        continue;
+      }
+    } /* claim_next_shard */
+
+    /* commit */
+commit:
+    {
+      enum GNUNET_DB_QueryStatus qs;
+
+      qs = TEH_PG_commit (pg);
+      switch (qs)
+      {
+      case GNUNET_DB_STATUS_HARD_ERROR:
+        GNUNET_break (0);
+        TEH_PG_rollback (pg);
+        return qs;
+      case GNUNET_DB_STATUS_SOFT_ERROR:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Serialization error on commit for beginning shard\n");
+        TEH_PG_rollback (pg);
+        continue;
+      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Claimed new shard\n");
+        return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+      }
+    }
+  } /* retry 'for' loop */
+  return GNUNET_DB_STATUS_SOFT_ERROR;
+}
diff --git a/src/exchangedb/pg_begin_shard.h b/src/exchangedb/pg_begin_shard.h
new file mode 100644
index 000000000..16f19491d
--- /dev/null
+++ b/src/exchangedb/pg_begin_shard.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_begin_shard.h
+ * @brief implementation of the begin_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_BEGIN_SHARD_H
+#define PG_BEGIN_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to grab a work shard on an operation @a op. Runs in its
+ * own transaction.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param job_name name of the operation to grab a word shard for
+ * @param delay minimum age of a shard to grab
+ * @param shard_size desired shard size
+ * @param[out] start_row inclusive start row of the shard (returned)
+ * @param[out] end_row exclusive end row of the shard (returned)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_begin_shard (void *cls,
+                    const char *job_name,
+                    struct GNUNET_TIME_Relative delay,
+                    uint64_t shard_size,
+                    uint64_t *start_row,
+                    uint64_t *end_row);
+
+#endif
diff --git a/src/exchangedb/pg_commit.c b/src/exchangedb/pg_commit.c
new file mode 100644
index 000000000..8c4f87c90
--- /dev/null
+++ b/src/exchangedb/pg_commit.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_commit.c
+ * @brief Implementation of the commit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_commit.h"
+#include "pg_helper.h"
+
+
+/**
+ * Commit the current transaction of a database connection.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @return final transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_commit (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_break (NULL != pg->transaction_name);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Committing transaction `%s'\n",
+              pg->transaction_name);
+  /* used in #postgres_commit */
+  PREPARE (pg,
+           "do_commit",
+           "COMMIT");
+
+  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                           "do_commit",
+                                           params);
+  pg->transaction_name = NULL;
+  return qs;
+}
diff --git a/src/exchangedb/pg_commit.h b/src/exchangedb/pg_commit.h
new file mode 100644
index 000000000..b1f4f9615
--- /dev/null
+++ b/src/exchangedb/pg_commit.h
@@ -0,0 +1,37 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_commit.h
+ * @brief implementation of the commit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_COMMIT_H
+#define PG_COMMIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Commit the current transaction of a database connection.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @return final transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_commit (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_complete_shard.c b/src/exchangedb/pg_complete_shard.c
new file mode 100644
index 000000000..8e62809c5
--- /dev/null
+++ b/src/exchangedb/pg_complete_shard.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_complete_shard.c
+ * @brief Implementation of the complete_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_complete_shard.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_complete_shard (void *cls,
+                       const char *job_name,
+                       uint64_t start_row,
+                       uint64_t end_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (job_name),
+    GNUNET_PQ_query_param_uint64 (&start_row),
+    GNUNET_PQ_query_param_uint64 (&end_row),
+    GNUNET_PQ_query_param_end
+  };
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Completing shard %llu-%llu\n",
+              (unsigned long long) start_row,
+              (unsigned long long) end_row);
+  PREPARE (pg,
+           "complete_shard",
+           "UPDATE work_shards"
+           " SET completed=TRUE"
+           " WHERE job_name=$1"
+           "   AND start_row=$2"
+           "   AND end_row=$3");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "complete_shard",
+                                             params);
+}
diff --git a/src/exchangedb/pg_complete_shard.h b/src/exchangedb/pg_complete_shard.h
new file mode 100644
index 000000000..f06c0483b
--- /dev/null
+++ b/src/exchangedb/pg_complete_shard.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_complete_shard.h
+ * @brief implementation of the complete_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_COMPLETE_SHARD_H
+#define PG_COMPLETE_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to persist that work on a shard was completed.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param job_name name of the operation to grab a word shard for
+ * @param start_row inclusive start row of the shard
+ * @param end_row exclusive end row of the shard
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_complete_shard (void *cls,
+                       const char *job_name,
+                       uint64_t start_row,
+                       uint64_t end_row);
+
+#endif
diff --git a/src/exchangedb/pg_compute_shard.c b/src/exchangedb/pg_compute_shard.c
new file mode 100644
index 000000000..1dea591f1
--- /dev/null
+++ b/src/exchangedb/pg_compute_shard.c
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_compute_shard.c
+ * @brief Implementation of the compute_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_compute_shard.h"
+#include "pg_helper.h"
+
+
+uint64_t
+TEH_PG_compute_shard (const struct TALER_MerchantPublicKeyP *merchant_pub)
+{
+  uint32_t res;
+
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CRYPTO_kdf (&res,
+                                    sizeof (res),
+                                    merchant_pub,
+                                    sizeof (*merchant_pub),
+                                    "VOID",
+                                    4,
+                                    NULL, 0));
+  /* interpret hash result as NBO for platform independence,
+     convert to HBO and map to [0..2^31-1] range */
+  res = ntohl (res);
+  if (res > INT32_MAX)
+    res += INT32_MIN;
+  GNUNET_assert (res <= INT32_MAX);
+  return (uint64_t) res;
+}
diff --git a/src/exchangedb/pg_compute_shard.h b/src/exchangedb/pg_compute_shard.h
new file mode 100644
index 000000000..d9bde2d3e
--- /dev/null
+++ b/src/exchangedb/pg_compute_shard.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_compute_shard.h
+ * @brief implementation of the compute_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_COMPUTE_SHARD_H
+#define PG_COMPUTE_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Compute the shard number of a given @a merchant_pub.
+ *
+ * @param merchant_pub merchant public key to compute shard for
+ * @return shard number
+ */
+uint64_t
+TEH_PG_compute_shard (const struct TALER_MerchantPublicKeyP *merchant_pub);
+
+
+#endif
diff --git a/src/exchangedb/pg_count_known_coins.c b/src/exchangedb/pg_count_known_coins.c
new file mode 100644
index 000000000..872965ac9
--- /dev/null
+++ b/src/exchangedb/pg_count_known_coins.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_count_known_coins.c
+ * @brief Implementation of the count_known_coins function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_count_known_coins.h"
+#include "pg_helper.h"
+
+long long
+TEH_PG_count_known_coins (void *cls,
+                          const struct
+                          TALER_DenominationHashP *denom_pub_hash)
+{
+  struct PostgresClosure *pg = cls;
+  uint64_t count;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("count",
+                                  &count),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+
+  PREPARE (pg,
+           "count_known_coins",
+           "SELECT"
+           " COUNT(*) AS count"
+           " FROM known_coins"
+           " WHERE denominations_serial="
+           "  (SELECT denominations_serial"
+           "    FROM denominations"
+           "    WHERE denom_pub_hash=$1);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "count_known_coins",
+                                                 params,
+                                                 rs);
+  if (0 > qs)
+    return (long long) qs;
+  return (long long) count;
+}
diff --git a/src/exchangedb/pg_count_known_coins.h b/src/exchangedb/pg_count_known_coins.h
new file mode 100644
index 000000000..69f07bdf4
--- /dev/null
+++ b/src/exchangedb/pg_count_known_coins.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_count_known_coins.h
+ * @brief implementation of the count_known_coins function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_COUNT_KNOWN_COINS_H
+#define PG_COUNT_KNOWN_COINS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Count the number of known coins by denomination.
+ *
+ * @param cls database connection plugin state
+ * @param denom_pub_hash denomination to count by
+ * @return number of coins if non-negative, otherwise an `enum GNUNET_DB_QueryStatus`
+ */
+long long
+TEH_PG_count_known_coins (void *cls,
+                          const struct
+                          TALER_DenominationHashP *denom_pub_hash);
+
+#endif
diff --git a/src/exchangedb/pg_create_aggregation_transient.c b/src/exchangedb/pg_create_aggregation_transient.c
new file mode 100644
index 000000000..4ab537d3a
--- /dev/null
+++ b/src/exchangedb/pg_create_aggregation_transient.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_create_aggregation_transient.c
+ * @brief Implementation of the create_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_create_aggregation_transient.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_create_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *exchange_account_section,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t kyc_requirement_row,
+  const struct TALER_Amount *total)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 total),
+    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_uint64 (&kyc_requirement_row),
+    GNUNET_PQ_query_param_string (exchange_account_section),
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "create_aggregation_transient",
+           "INSERT INTO aggregation_transient"
+           " (amount"
+           " ,merchant_pub"
+           " ,wire_target_h_payto"
+           " ,legitimization_requirement_serial_id"
+           " ,exchange_account_section"
+           " ,wtid_raw)"
+           " VALUES ($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "create_aggregation_transient",
+                                             params);
+}
diff --git a/src/exchangedb/pg_create_aggregation_transient.h b/src/exchangedb/pg_create_aggregation_transient.h
new file mode 100644
index 000000000..2f0a348b2
--- /dev/null
+++ b/src/exchangedb/pg_create_aggregation_transient.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_create_aggregation_transient.h
+ * @brief implementation of the create_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_CREATE_AGGREGATION_TRANSIENT_H
+#define PG_CREATE_AGGREGATION_TRANSIENT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Create a new entry in the transient aggregation table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param exchange_account_section exchange account to use
+ * @param merchant_pub public key of the merchant receiving the transfer
+ * @param wtid the raw wire transfer identifier to be used
+ * @param kyc_requirement_row row in legitimization_requirements that need to be satisfied to continue, or 0 for none
+ * @param total amount to be wired in the future
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_create_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *exchange_account_section,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t kyc_requirement_row,
+  const struct TALER_Amount *total);
+
+#endif
diff --git a/src/exchangedb/pg_create_tables.c b/src/exchangedb/pg_create_tables.c
new file mode 100644
index 000000000..f6a061904
--- /dev/null
+++ b/src/exchangedb/pg_create_tables.c
@@ -0,0 +1,72 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_create_tables.c
+ * @brief Implementation of the create_tables function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_create_tables.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_GenericReturnValue
+TEH_PG_create_tables (void *cls,
+                      bool support_partitions,
+                      uint32_t num_partitions)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
+  struct GNUNET_PQ_QueryParam params[] = {
+    support_partitions
+    ? GNUNET_PQ_query_param_uint32 (&num_partitions)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_PreparedStatement ps[] = {
+    GNUNET_PQ_make_prepare ("create_tables",
+                            "SELECT"
+                            " exchange.do_create_tables"
+                            " ($1);"),
+    GNUNET_PQ_PREPARED_STATEMENT_END
+  };
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_try_execute ("SET search_path TO exchange;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
+                                     "exchangedb-postgres",
+                                     "exchange-",
+                                     es,
+                                     ps);
+  if (NULL == conn)
+    return GNUNET_SYSERR;
+  if (0 >
+      GNUNET_PQ_eval_prepared_non_select (conn,
+                                          "create_tables",
+                                          params))
+    ret = GNUNET_SYSERR;
+  if (GNUNET_OK == ret)
+    ret = GNUNET_PQ_exec_sql (conn,
+                              "procedures");
+  GNUNET_PQ_disconnect (conn);
+  return ret;
+}
diff --git a/src/exchangedb/pg_create_tables.h b/src/exchangedb/pg_create_tables.h
new file mode 100644
index 000000000..58f5aae73
--- /dev/null
+++ b/src/exchangedb/pg_create_tables.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_create_tables.h
+ * @brief implementation of the create_tables function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_CREATE_TABLES_H
+#define PG_CREATE_TABLES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Create the necessary tables if they are not present
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param support_partitions true to enable partitioning support (disables foreign key constraints)
+ * @param num_partitions number of partitions to create,
+ *     (0 to not actually use partitions, 1 to only
+ *      setup a default partition, >1 for real partitions)
+ * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_create_tables (void *cls,
+                      bool support_partitions,
+                      uint32_t num_partitions);
+
+
+#endif
diff --git a/src/exchangedb/pg_delete_aggregation_transient.c b/src/exchangedb/pg_delete_aggregation_transient.c
new file mode 100644
index 000000000..63c5c0a23
--- /dev/null
+++ b/src/exchangedb/pg_delete_aggregation_transient.c
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_delete_aggregation_transient.c
+ * @brief Implementation of the delete_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_delete_aggregation_transient.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_delete_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_WireTransferIdentifierRawP *wtid)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "delete_aggregation_transient",
+           "DELETE FROM aggregation_transient"
+           " WHERE wire_target_h_payto=$1"
+           "   AND wtid_raw=$2");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "delete_aggregation_transient",
+                                             params);
+}
diff --git a/src/exchangedb/pg_delete_aggregation_transient.h b/src/exchangedb/pg_delete_aggregation_transient.h
new file mode 100644
index 000000000..f74b0179e
--- /dev/null
+++ b/src/exchangedb/pg_delete_aggregation_transient.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_delete_aggregation_transient.h
+ * @brief implementation of the delete_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DELETE_AGGREGATION_TRANSIENT_H
+#define PG_DELETE_AGGREGATION_TRANSIENT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Delete existing entry in the transient aggregation table.
+ * @a h_payto is only needed for query performance.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param wtid the raw wire transfer identifier to update
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_delete_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_WireTransferIdentifierRawP *wtid);
+
+#endif
diff --git a/src/exchangedb/pg_delete_shard_locks.c b/src/exchangedb/pg_delete_shard_locks.c
new file mode 100644
index 000000000..dbb0f29ac
--- /dev/null
+++ b/src/exchangedb/pg_delete_shard_locks.c
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_delete_shard_locks.c
+ * @brief Implementation of the delete_shard_locks function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_delete_shard_locks.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_GenericReturnValue
+TEH_PG_delete_shard_locks (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("DELETE FROM work_shards;"),
+    GNUNET_PQ_make_execute ("DELETE FROM revolving_work_shards;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  return GNUNET_PQ_exec_statements (pg->conn,
+                                    es);
+}
diff --git a/src/exchangedb/pg_delete_shard_locks.h b/src/exchangedb/pg_delete_shard_locks.h
new file mode 100644
index 000000000..e8df2d67d
--- /dev/null
+++ b/src/exchangedb/pg_delete_shard_locks.h
@@ -0,0 +1,38 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_delete_shard_locks.h
+ * @brief implementation of the delete_shard_locks function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DELETE_SHARD_LOCKS_H
+#define PG_DELETE_SHARD_LOCKS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to delete all revolving shards.
+ * To be used after a crash or when the shard size is
+ * changed.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @return transaction status code
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_delete_shard_locks (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_do_age_withdraw.c b/src/exchangedb/pg_do_age_withdraw.c
new file mode 100644
index 000000000..970e65b5d
--- /dev/null
+++ b/src/exchangedb/pg_do_age_withdraw.c
@@ -0,0 +1,108 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_do_batch_withdraw.c
+ * @brief Implementation of the do_batch_withdraw function for Postgres
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_pq_lib.h"
+#include "taler_pq_lib.h"
+#include "pg_do_batch_withdraw.h"
+#include "pg_helper.h"
+#include <gnunet/gnunet_time_lib.h>
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_age_withdraw (
+  void *cls,
+  const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+  struct GNUNET_TIME_Timestamp now,
+  bool *found,
+  bool *balance_ok,
+  struct TALER_Amount *reserve_balance,
+  bool *age_ok,
+  uint16_t *required_age,
+  uint32_t *reserve_birthday,
+  bool *conflict)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp gc;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &commitment->amount_with_fee),
+    GNUNET_PQ_query_param_auto_from_type (&commitment->reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (&commitment->reserve_sig),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_timestamp (&gc),
+    GNUNET_PQ_query_param_auto_from_type (&commitment->h_commitment),
+    GNUNET_PQ_query_param_uint16 (&commitment->max_age),
+    GNUNET_PQ_query_param_uint16 (&commitment->noreveal_index),
+    TALER_PQ_query_param_array_blinded_coin_hash (commitment->num_coins,
+                                                  commitment->h_coin_evs,
+                                                  pg->conn),
+    GNUNET_PQ_query_param_array_uint64 (commitment->num_coins,
+                                        commitment->denom_serials,
+                                        pg->conn),
+    TALER_PQ_query_param_array_blinded_denom_sig (commitment->num_coins,
+                                                  commitment->denom_sigs,
+                                                  pg->conn),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("reserve_found",
+                                found),
+    GNUNET_PQ_result_spec_bool ("balance_ok",
+                                balance_ok),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_balance",
+                                 reserve_balance),
+    GNUNET_PQ_result_spec_bool ("age_ok",
+                                age_ok),
+    GNUNET_PQ_result_spec_uint16 ("required_age",
+                                  required_age),
+    GNUNET_PQ_result_spec_uint32 ("reserve_birthday",
+                                  reserve_birthday),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                conflict),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  gc = GNUNET_TIME_absolute_to_timestamp (
+    GNUNET_TIME_absolute_add (now.abs_time,
+                              pg->legal_reserve_expiration_time));
+  PREPARE (pg,
+           "call_age_withdraw",
+           "SELECT "
+           " reserve_found"
+           ",balance_ok"
+           ",reserve_balance"
+           ",age_ok"
+           ",required_age"
+           ",reserve_birthday"
+           ",conflict"
+           " FROM exchange_do_age_withdraw"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "call_age_withdraw",
+                                                 params,
+                                                 rs);
+  GNUNET_PQ_cleanup_query_params_closures (params);
+  return qs;
+}
diff --git a/src/exchangedb/pg_do_age_withdraw.h b/src/exchangedb/pg_do_age_withdraw.h
new file mode 100644
index 000000000..fb435a309
--- /dev/null
+++ b/src/exchangedb/pg_do_age_withdraw.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_do_age_withdraw.h
+ * @brief implementation of the do_age_withdraw function for Postgres
+ * @author Özgür Kesim
+ */
+#ifndef PG_DO_AGE_WITHDRAW_H
+#define PG_DO_AGE_WITHDRAW_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform reserve update as part of an age-withdraw operation, checking for
+ * sufficient balance and fulfillment of age requirements. Finally persisting
+ * the withdrawal details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param commitment the commitment with all parameters
+ * @param now current time (rounded)
+ * @param[out] found set to true if the reserve was found
+ * @param[out] balance_ok set to true if the balance was sufficient
+ * @param[out] reserve_balance set to the original reserve balance (at the start of this transaction)
+ * @param[out] age_ok set to true if no age requirements are present on the reserve
+ * @param[out] required_age if @e age_ok is false, set to the maximum allowed age when withdrawing from this reserve
+ * @param[out] reserve_birthday if @e age_ok is false, set to the birthday of the reserve
+ * @param[out] conflict set to true if there already is an entry in the database for the given pair (h_commitment, reserve_pub)
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_age_withdraw (
+  void *cls,
+  const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+  const struct GNUNET_TIME_Timestamp now,
+  bool *found,
+  bool *balance_ok,
+  struct TALER_Amount *reserve_balance,
+  bool *age_ok,
+  uint16_t *required_age,
+  uint32_t *reserve_birthday,
+  bool *conflict);
+
+#endif
diff --git a/src/exchangedb/pg_do_batch_withdraw.c b/src/exchangedb/pg_do_batch_withdraw.c
new file mode 100644
index 000000000..f5571ddbb
--- /dev/null
+++ b/src/exchangedb/pg_do_batch_withdraw.c
@@ -0,0 +1,89 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_batch_withdraw.c
+ * @brief Implementation of the do_batch_withdraw function for Postgres
+ * @author Christian Grothoff
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_batch_withdraw.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_batch_withdraw (
+  void *cls,
+  struct GNUNET_TIME_Timestamp now,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *amount,
+  bool do_age_check,
+  bool *found,
+  bool *balance_ok,
+  struct TALER_Amount *reserve_balance,
+  bool *age_ok,
+  uint16_t *allowed_maximum_age,
+  uint64_t *ruuid)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp gc;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 amount),
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_timestamp (&gc),
+    GNUNET_PQ_query_param_bool (do_age_check),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("reserve_found",
+                                found),
+    GNUNET_PQ_result_spec_bool ("balance_ok",
+                                balance_ok),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_balance",
+                                 reserve_balance),
+    GNUNET_PQ_result_spec_bool ("age_ok",
+                                age_ok),
+    GNUNET_PQ_result_spec_uint16 ("allowed_maximum_age",
+                                  allowed_maximum_age),
+    GNUNET_PQ_result_spec_uint64 ("ruuid",
+                                  ruuid),
+    GNUNET_PQ_result_spec_end
+  };
+
+  gc = GNUNET_TIME_absolute_to_timestamp (
+    GNUNET_TIME_absolute_add (now.abs_time,
+                              pg->legal_reserve_expiration_time));
+  PREPARE (pg,
+           "call_batch_withdraw",
+           "SELECT "
+           " reserve_found"
+           ",balance_ok"
+           ",reserve_balance"
+           ",age_ok"
+           ",allowed_maximum_age"
+           ",ruuid"
+           " FROM exchange_do_batch_withdraw"
+           " ($1,$2,$3,$4,$5);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_batch_withdraw",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_batch_withdraw.h b/src/exchangedb/pg_do_batch_withdraw.h
new file mode 100644
index 000000000..486f8d1b2
--- /dev/null
+++ b/src/exchangedb/pg_do_batch_withdraw.h
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_batch_withdraw.h
+ * @brief implementation of the do_batch_withdraw function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_BATCH_WITHDRAW_H
+#define PG_DO_BATCH_WITHDRAW_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform reserve update as part of a batch withdraw operation, checking
+ * for sufficient balance. Persisting the withdrawal details is done
+ * separately!
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param now current time (rounded)
+ * @param reserve_pub public key of the reserve to debit
+ * @param amount total amount to withdraw
+ * @param age_check_required if true, fail if age requirements are set on the reserve
+ * @param[out] found set to true if the reserve was found
+ * @param[out] balance_ok set to true if the balance was sufficient
+ * @param[out] reserve_balance set to the original reserve balance (at the start of this transaction)
+ * @param[out] age_ok set to true if no age requirements are present on the reserve
+ * @param[out] allowed_maximum_age if @e age_ok is false, set to the maximum allowed age when withdrawing from this reserve (client needs to call age-withdraw)
+ * @param[out] ruuid set to the reserve's UUID (reserves table row)
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_batch_withdraw (
+  void *cls,
+  struct GNUNET_TIME_Timestamp now,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *amount,
+  bool age_check_required,
+  bool *found,
+  bool *balance_ok,
+  struct TALER_Amount *reserve_balance,
+  bool *age_ok,
+  uint16_t *allowed_maximum_age,
+  uint64_t *ruuid);
+
+#endif
diff --git a/src/exchangedb/pg_do_batch_withdraw_insert.c b/src/exchangedb/pg_do_batch_withdraw_insert.c
new file mode 100644
index 000000000..758f502f2
--- /dev/null
+++ b/src/exchangedb/pg_do_batch_withdraw_insert.c
@@ -0,0 +1,77 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_batch_withdraw_insert.c
+ * @brief Implementation of the do_batch_withdraw_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_batch_withdraw_insert.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_batch_withdraw_insert (
+  void *cls,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
+  const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
+  struct GNUNET_TIME_Timestamp now,
+  uint64_t ruuid,
+  bool *denom_unknown,
+  bool *conflict,
+  bool *nonce_reuse)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    NULL == nonce
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (nonce),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &collectable->amount_with_fee),
+    GNUNET_PQ_query_param_auto_from_type (&collectable->denom_pub_hash),
+    GNUNET_PQ_query_param_uint64 (&ruuid),
+    GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_sig),
+    GNUNET_PQ_query_param_auto_from_type (&collectable->h_coin_envelope),
+    TALER_PQ_query_param_blinded_denom_sig (&collectable->sig),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("denom_unknown",
+                                denom_unknown),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                conflict),
+    GNUNET_PQ_result_spec_bool ("nonce_reuse",
+                                nonce_reuse),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "call_batch_withdraw_insert",
+           "SELECT "
+           " out_denom_unknown AS denom_unknown"
+           ",out_conflict AS conflict"
+           ",out_nonce_reuse AS nonce_reuse"
+           " FROM exchange_do_batch_withdraw_insert"
+           " ($1,$2,$3,$4,$5,$6,$7,$8);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_batch_withdraw_insert",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_batch_withdraw_insert.h b/src/exchangedb/pg_do_batch_withdraw_insert.h
new file mode 100644
index 000000000..18fcfc9ae
--- /dev/null
+++ b/src/exchangedb/pg_do_batch_withdraw_insert.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_batch_withdraw_insert.h
+ * @brief implementation of the do_batch_withdraw_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_BATCH_WITHDRAW_INSERT_H
+#define PG_DO_BATCH_WITHDRAW_INSERT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform insert as part of a batch withdraw operation, and persisting the
+ * withdrawal details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param nonce client-contributed input for CS denominations that must be checked for idempotency, or NULL for non-CS withdrawals
+ * @param collectable corresponding collectable coin (blind signature)
+ * @param now current time (rounded)
+ * @param ruuid reserve UUID
+ * @param[out] denom_unknown set if the denomination is unknown in the DB
+ * @param[out] conflict if the envelope was already in the DB
+ * @param[out] nonce_reuse if @a nonce was non-NULL and reused
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_batch_withdraw_insert (
+  void *cls,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
+  const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
+  struct GNUNET_TIME_Timestamp now,
+  uint64_t ruuid,
+  bool *denom_unknown,
+  bool *conflict,
+  bool *nonce_reuse);
+
+#endif
diff --git a/src/exchangedb/pg_do_deposit.c b/src/exchangedb/pg_do_deposit.c
new file mode 100644
index 000000000..0ba45b628
--- /dev/null
+++ b/src/exchangedb/pg_do_deposit.c
@@ -0,0 +1,119 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_do_deposit.c
+ * @brief Implementation of the do_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_deposit.h"
+#include "pg_helper.h"
+#include "pg_compute_shard.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_deposit (
+  void *cls,
+  const struct TALER_EXCHANGEDB_BatchDeposit *bd,
+  struct GNUNET_TIME_Timestamp *exchange_timestamp,
+  bool *balance_ok,
+  uint32_t *bad_balance_index,
+  bool *ctr_conflict)
+{
+  struct PostgresClosure *pg = cls;
+  uint64_t deposit_shard = TEH_PG_compute_shard (&bd->merchant_pub);
+  const struct TALER_CoinSpendPublicKeyP *coin_pubs[GNUNET_NZL (bd->num_cdis)];
+  const struct TALER_CoinSpendSignatureP *coin_sigs[GNUNET_NZL (bd->num_cdis)];
+  struct TALER_Amount amounts_with_fee[GNUNET_NZL (bd->num_cdis)];
+  struct GNUNET_PQ_QueryParam params[] = {
+    /* data for batch_deposits */
+    GNUNET_PQ_query_param_uint64 (&deposit_shard),
+    GNUNET_PQ_query_param_auto_from_type (&bd->merchant_pub),
+    GNUNET_PQ_query_param_timestamp (&bd->wallet_timestamp),
+    GNUNET_PQ_query_param_timestamp (exchange_timestamp),
+    GNUNET_PQ_query_param_timestamp (&bd->refund_deadline),
+    GNUNET_PQ_query_param_timestamp (&bd->wire_deadline),
+    GNUNET_PQ_query_param_auto_from_type (&bd->h_contract_terms),
+    (bd->no_wallet_data_hash)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (&bd->wallet_data_hash),
+    GNUNET_PQ_query_param_auto_from_type (&bd->wire_salt),
+    GNUNET_PQ_query_param_auto_from_type (&bd->wire_target_h_payto),
+    (0 == bd->policy_details_serial_id)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_uint64 (&bd->policy_details_serial_id),
+    GNUNET_PQ_query_param_bool (bd->policy_blocked),
+    /* to create entry in wire_targets */
+    GNUNET_PQ_query_param_string (bd->receiver_wire_account),
+    /* arrays for coin_deposits */
+    GNUNET_PQ_query_param_array_ptrs_auto_from_type (bd->num_cdis,
+                                                     coin_pubs,
+                                                     pg->conn),
+    GNUNET_PQ_query_param_array_ptrs_auto_from_type (bd->num_cdis,
+                                                     coin_sigs,
+                                                     pg->conn),
+    TALER_PQ_query_param_array_amount (bd->num_cdis,
+                                       amounts_with_fee,
+                                       pg->conn),
+    GNUNET_PQ_query_param_end
+  };
+  bool no_time;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
+                                       exchange_timestamp),
+      &no_time),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_uint32 ("insufficient_balance_coin_index",
+                                    bad_balance_index),
+      balance_ok),
+    GNUNET_PQ_result_spec_bool ("conflicted",
+                                ctr_conflict),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  for (unsigned int i = 0; i < bd->num_cdis; i++)
+  {
+    const struct TALER_EXCHANGEDB_CoinDepositInformation *cdi
+      = &bd->cdis[i];
+
+    amounts_with_fee[i] = cdi->amount_with_fee;
+    coin_pubs[i] = &cdi->coin.coin_pub;
+    coin_sigs[i] = &cdi->csig;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Do deposit %u = %s\n",
+                i,
+                TALER_B2S (&cdi->coin.coin_pub));
+  }
+  PREPARE (pg,
+           "call_deposit",
+           "SELECT "
+           " out_exchange_timestamp AS exchange_timestamp"
+           ",out_insufficient_balance_coin_index AS insufficient_balance_coin_index"
+           ",out_conflict AS conflicted"
+           " FROM exchange_do_deposit"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "call_deposit",
+                                                 params,
+                                                 rs);
+  GNUNET_PQ_cleanup_query_params_closures (params);
+  return qs;
+}
diff --git a/src/exchangedb/pg_do_deposit.h b/src/exchangedb/pg_do_deposit.h
new file mode 100644
index 000000000..449ec04be
--- /dev/null
+++ b/src/exchangedb/pg_do_deposit.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_deposit.h
+ * @brief implementation of the do_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_DEPOSIT_H
+#define PG_DO_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Perform deposit operation, checking for sufficient balance
+ * of the coins and possibly persisting the deposit details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param bd batch deposit operation details
+ * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated)
+ * @param[out] balance_ok set to true if the balance was sufficient
+ * @param[out] bad_balance_index set to the first index of a coin for which the balance was insufficient,
+ *             only used if @a balance_ok is set to false.
+ * @param[out] in_conflict set to true if the deposit conflicted
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_deposit (
+  void *cls,
+  const struct TALER_EXCHANGEDB_BatchDeposit *bd,
+  struct GNUNET_TIME_Timestamp *exchange_timestamp,
+  bool *balance_ok,
+  uint32_t *bad_balance_index,
+  bool *in_conflict);
+
+#endif
diff --git a/src/exchangedb/pg_do_melt.c b/src/exchangedb/pg_do_melt.c
new file mode 100644
index 000000000..0b26386d8
--- /dev/null
+++ b/src/exchangedb/pg_do_melt.c
@@ -0,0 +1,82 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_melt.c
+ * @brief Implementation of the do_melt function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_melt.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_melt (
+  void *cls,
+  const struct TALER_RefreshMasterSecretP *rms,
+  struct TALER_EXCHANGEDB_Refresh *refresh,
+  uint64_t known_coin_id,
+  bool *zombie_required,
+  bool *balance_ok)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    NULL == rms
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (rms),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &refresh->amount_with_fee),
+    GNUNET_PQ_query_param_auto_from_type (&refresh->rc),
+    GNUNET_PQ_query_param_auto_from_type (&refresh->coin.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&refresh->coin_sig),
+    GNUNET_PQ_query_param_uint64 (&known_coin_id),
+    GNUNET_PQ_query_param_uint32 (&refresh->noreveal_index),
+    GNUNET_PQ_query_param_bool (*zombie_required),
+    GNUNET_PQ_query_param_end
+  };
+  bool is_null;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("balance_ok",
+                                balance_ok),
+    GNUNET_PQ_result_spec_bool ("zombie_required",
+                                zombie_required),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_uint32 ("noreveal_index",
+                                    &refresh->noreveal_index),
+      &is_null),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "call_melt",
+           "SELECT "
+           " out_balance_ok AS balance_ok"
+           ",out_zombie_bad AS zombie_required"
+           ",out_noreveal_index AS noreveal_index"
+           " FROM exchange_do_melt"
+           " ($1,$2,$3,$4,$5,$6,$7,$8);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "call_melt",
+                                                 params,
+                                                 rs);
+  if (is_null)
+    refresh->noreveal_index = UINT32_MAX; /* set to very invalid value */
+  return qs;
+}
diff --git a/src/exchangedb/pg_do_melt.h b/src/exchangedb/pg_do_melt.h
new file mode 100644
index 000000000..554ce08b2
--- /dev/null
+++ b/src/exchangedb/pg_do_melt.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_melt.h
+ * @brief implementation of the do_melt function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_MELT_H
+#define PG_DO_MELT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform melt operation, checking for sufficient balance
+ * of the coin and possibly persisting the melt details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param rms client-contributed input for CS denominations that must be checked for idempotency, or NULL for non-CS withdrawals
+ * @param[in,out] refresh refresh operation details; the noreveal_index
+ *                is set in case the coin was already melted before
+ * @param known_coin_id row of the coin in the known_coins table
+ * @param[in,out] zombie_required true if the melt must only succeed if the coin is a zombie, set to false if the requirement was satisfied
+ * @param[out] balance_ok set to true if the balance was sufficient
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_melt (
+  void *cls,
+  const struct TALER_RefreshMasterSecretP *rms,
+  struct TALER_EXCHANGEDB_Refresh *refresh,
+  uint64_t known_coin_id,
+  bool *zombie_required,
+  bool *balance_ok);
+
+#endif
diff --git a/src/exchangedb/pg_do_purse_delete.c b/src/exchangedb/pg_do_purse_delete.c
new file mode 100644
index 000000000..27b81cab9
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_delete.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_delete.c
+ * @brief Implementation of the do_purse_delete function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_purse_delete.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_delete (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig,
+  bool *decided,
+  bool *found)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (purse_sig),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("decided",
+                                decided),
+    GNUNET_PQ_result_spec_bool ("found",
+                                found),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "call_purse_delete",
+           "SELECT "
+           " out_decided AS decided"
+           ",out_found AS found"
+           " FROM exchange_do_purse_delete"
+           " ($1,$2,$3);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_purse_delete",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_purse_delete.h b/src/exchangedb/pg_do_purse_delete.h
new file mode 100644
index 000000000..01c7dd91b
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_delete.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_delete.h
+ * @brief implementation of the do_purse_delete function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_PURSE_DELETE_H
+#define PG_DO_PURSE_DELETE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to explicitly delete a purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to delete
+ * @param purse_sig signature affirming the deletion
+ * @param[out] decided set to true if the purse was
+ *        already decided and thus could not be deleted
+ * @param[out] found set to true if the purse was found
+ *        (if false, purse could not be deleted)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_delete (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig,
+  bool *decided,
+  bool *found);
+
+#endif
diff --git a/src/exchangedb/pg_do_purse_deposit.c b/src/exchangedb/pg_do_purse_deposit.c
new file mode 100644
index 000000000..bdb1f4749
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_deposit.c
@@ -0,0 +1,90 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_deposit.c
+ * @brief Implementation of the do_purse_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_purse_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_deposit (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *amount,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  const struct TALER_Amount *amount_minus_fee,
+  bool *balance_ok,
+  bool *too_late,
+  bool *conflict)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
+  struct GNUNET_TIME_Timestamp reserve_expiration;
+  uint64_t partner_id = 0; /* FIXME #7271: WAD support... */
+  struct GNUNET_PQ_QueryParam params[] = {
+    (0 == partner_id)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_uint64 (&partner_id),
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      amount),
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (coin_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      amount_minus_fee),
+    GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("balance_ok",
+                                balance_ok),
+    GNUNET_PQ_result_spec_bool ("too_late",
+                                too_late),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                conflict),
+    GNUNET_PQ_result_spec_end
+  };
+
+  reserve_expiration
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
+                                  pg->legal_reserve_expiration_time));
+
+  PREPARE (pg,
+           "call_purse_deposit",
+           "SELECT "
+           " out_balance_ok AS balance_ok"
+           ",out_conflict AS conflict"
+           ",out_late AS too_late"
+           " FROM exchange_do_purse_deposit"
+           " ($1,$2,$3,$4,$5,$6,$7,$8);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_purse_deposit",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_purse_deposit.h b/src/exchangedb/pg_do_purse_deposit.h
new file mode 100644
index 000000000..779b6c0c8
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_deposit.h
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_deposit.h
+ * @brief implementation of the do_purse_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_PURSE_DEPOSIT_H
+#define PG_DO_PURSE_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to execute a transaction crediting
+ * a purse with @a amount from @a coin_pub. Reduces the
+ * value of @a coin_pub and increase the balance of
+ * the @a purse_pub purse. If the balance reaches the
+ * target amount and the purse has been merged, triggers
+ * the updates of the reserve/account balance.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to credit
+ * @param coin_pub coin to deposit (debit)
+ * @param amount fraction of the coin's value to deposit
+ * @param coin_sig signature affirming the operation
+ * @param amount_minus_fee amount to add to the purse
+ * @param[out] balance_ok set to false if the coin's
+ *        remaining balance is below @a amount;
+ *             in this case, the return value will be
+ *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
+ * @param[out] too_late set to true if it is too late to deposit into the purse
+ * @param[out] conflict set to true if the deposit failed due to a conflict (coin already spent,
+ *             or deposited into this purse with a different amount)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_deposit (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *amount,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  const struct TALER_Amount *amount_minus_fee,
+  bool *balance_ok,
+  bool *too_late,
+  bool *conflict);
+
+#endif
diff --git a/src/exchangedb/pg_do_purse_merge.c b/src/exchangedb/pg_do_purse_merge.c
new file mode 100644
index 000000000..5a174ed02
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_merge.c
@@ -0,0 +1,91 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_merge.c
+ * @brief Implementation of the do_purse_merge function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_purse_merge.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_merge (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const char *partner_url,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *no_partner,
+  bool *no_balance,
+  bool *in_conflict)
+{
+  struct PostgresClosure *pg = cls;
+  struct TALER_PaytoHashP h_payto;
+  struct GNUNET_TIME_Timestamp expiration
+    = GNUNET_TIME_relative_to_timestamp (pg->legal_reserve_expiration_time);
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (merge_sig),
+    GNUNET_PQ_query_param_timestamp (&merge_timestamp),
+    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
+    (NULL == partner_url)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (partner_url),
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (&h_payto),
+    GNUNET_PQ_query_param_timestamp (&expiration),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("no_partner",
+                                no_partner),
+    GNUNET_PQ_result_spec_bool ("no_balance",
+                                no_balance),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                in_conflict),
+    GNUNET_PQ_result_spec_end
+  };
+
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (pg->exchange_url,
+                                          reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &h_payto);
+    GNUNET_free (payto_uri);
+  }
+  PREPARE (pg,
+           "call_purse_merge",
+           "SELECT"
+           " out_no_partner AS no_partner"
+           ",out_no_balance AS no_balance"
+           ",out_conflict AS conflict"
+           " FROM exchange_do_purse_merge"
+           "  ($1, $2, $3, $4, $5, $6, $7, $8);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_purse_merge",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_purse_merge.h b/src/exchangedb/pg_do_purse_merge.h
new file mode 100644
index 000000000..a51de47bf
--- /dev/null
+++ b/src/exchangedb/pg_do_purse_merge.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_purse_merge.h
+ * @brief implementation of the do_purse_merge function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_PURSE_MERGE_H
+#define PG_DO_PURSE_MERGE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to approve merging a purse into a
+ * reserve by the respective purse merge key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to merge
+ * @param merge_sig signature affirming the merge
+ * @param merge_timestamp time of the merge
+ * @param reserve_sig signature of the reserve affirming the merge
+ * @param partner_url URL of the partner exchange, can be NULL if the reserves lives with us
+ * @param reserve_pub public key of the reserve to credit
+ * @param[out] no_partner set to true if @a partner_url is unknown
+ * @param[out] no_balance set to true if the @a purse_pub is not paid up yet
+ * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
+  * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_purse_merge (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const char *partner_url,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *no_partner,
+  bool *no_balance,
+  bool *in_conflict);
+
+#endif
diff --git a/src/exchangedb/pg_do_recoup.c b/src/exchangedb/pg_do_recoup.c
new file mode 100644
index 000000000..07566a607
--- /dev/null
+++ b/src/exchangedb/pg_do_recoup.c
@@ -0,0 +1,85 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_recoup.c
+ * @brief Implementation of the do_recoup function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_recoup.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_recoup (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t reserve_out_serial_id,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t known_coin_id,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  struct GNUNET_TIME_Timestamp *recoup_timestamp,
+  bool *recoup_ok,
+  bool *internal_failure)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp reserve_gc
+    = GNUNET_TIME_relative_to_timestamp (pg->legal_reserve_expiration_time);
+  struct GNUNET_TIME_Timestamp reserve_expiration
+    = GNUNET_TIME_relative_to_timestamp (pg->idle_reserve_expiration_time);
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_uint64 (&reserve_out_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (coin_bks),
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_uint64 (&known_coin_id),
+    GNUNET_PQ_query_param_auto_from_type (coin_sig),
+    GNUNET_PQ_query_param_timestamp (&reserve_gc),
+    GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+    GNUNET_PQ_query_param_timestamp (recoup_timestamp),
+    GNUNET_PQ_query_param_end
+  };
+  bool is_null;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       recoup_timestamp),
+      &is_null),
+    GNUNET_PQ_result_spec_bool ("recoup_ok",
+                                recoup_ok),
+    GNUNET_PQ_result_spec_bool ("internal_failure",
+                                internal_failure),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  PREPARE (pg,
+           "call_recoup",
+           "SELECT "
+           " out_recoup_timestamp AS recoup_timestamp"
+           ",out_recoup_ok AS recoup_ok"
+           ",out_internal_failure AS internal_failure"
+           " FROM exchange_do_recoup_to_reserve"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_recoup",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_recoup.h b/src/exchangedb/pg_do_recoup.h
new file mode 100644
index 000000000..2cf3eb976
--- /dev/null
+++ b/src/exchangedb/pg_do_recoup.h
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_recoup.h
+ * @brief implementation of the do_recoup function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_RECOUP_H
+#define PG_DO_RECOUP_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform recoup operation, checking for sufficient deposits
+ * of the coin and possibly persisting the recoup details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserve_pub public key of the reserve to credit
+ * @param reserve_out_serial_id row in the reserves_out table justifying the recoup
+ * @param coin_bks coin blinding key secret to persist
+ * @param coin_pub public key of the coin being recouped
+ * @param known_coin_id row of the @a coin_pub in the known_coins table
+ * @param coin_sig signature of the coin requesting the recoup
+ * @param[in,out] recoup_timestamp recoup timestamp, set if recoup existed
+ * @param[out] recoup_ok  set if the recoup succeeded (balance ok)
+ * @param[out] internal_failure set on internal failures
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_recoup (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t reserve_out_serial_id,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t known_coin_id,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  struct GNUNET_TIME_Timestamp *recoup_timestamp,
+  bool *recoup_ok,
+  bool *internal_failure);
+
+#endif
diff --git a/src/exchangedb/pg_do_recoup_refresh.c b/src/exchangedb/pg_do_recoup_refresh.c
new file mode 100644
index 000000000..7d099bcd5
--- /dev/null
+++ b/src/exchangedb/pg_do_recoup_refresh.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_recoup_refresh.c
+ * @brief Implementation of the do_recoup_refresh function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_recoup_refresh.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_recoup_refresh (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
+  uint64_t rrc_serial,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t known_coin_id,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  struct GNUNET_TIME_Timestamp *recoup_timestamp,
+  bool *recoup_ok,
+  bool *internal_failure)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (old_coin_pub),
+    GNUNET_PQ_query_param_uint64 (&rrc_serial),
+    GNUNET_PQ_query_param_auto_from_type (coin_bks),
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_uint64 (&known_coin_id),
+    GNUNET_PQ_query_param_auto_from_type (coin_sig),
+    GNUNET_PQ_query_param_timestamp (recoup_timestamp),
+    GNUNET_PQ_query_param_end
+  };
+  bool is_null;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       recoup_timestamp),
+      &is_null),
+    GNUNET_PQ_result_spec_bool ("recoup_ok",
+                                recoup_ok),
+    GNUNET_PQ_result_spec_bool ("internal_failure",
+                                internal_failure),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  PREPARE (pg,
+           "call_recoup_refresh",
+           "SELECT "
+           " out_recoup_timestamp AS recoup_timestamp"
+           ",out_recoup_ok AS recoup_ok"
+           ",out_internal_failure AS internal_failure"
+           " FROM exchange_do_recoup_to_coin"
+           " ($1,$2,$3,$4,$5,$6,$7);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_recoup_refresh",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_recoup_refresh.h b/src/exchangedb/pg_do_recoup_refresh.h
new file mode 100644
index 000000000..16b0fd208
--- /dev/null
+++ b/src/exchangedb/pg_do_recoup_refresh.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_recoup_refresh.h
+ * @brief implementation of the do_recoup_refresh function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_RECOUP_REFRESH_H
+#define PG_DO_RECOUP_REFRESH_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Perform recoup-refresh operation, checking for sufficient deposits of the
+ * coin and possibly persisting the recoup-refresh details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param old_coin_pub public key of the old coin to credit
+ * @param rrc_serial row in the refresh_revealed_coins table justifying the recoup-refresh
+ * @param coin_bks coin blinding key secret to persist
+ * @param coin_pub public key of the coin being recouped
+ * @param known_coin_id row of the @a coin_pub in the known_coins table
+ * @param coin_sig signature of the coin requesting the recoup
+ * @param[in,out] recoup_timestamp recoup timestamp, set if recoup existed
+ * @param[out] recoup_ok  set if the recoup-refresh succeeded (balance ok)
+ * @param[out] internal_failure set on internal failures
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_recoup_refresh (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
+  uint64_t rrc_serial,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t known_coin_id,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  struct GNUNET_TIME_Timestamp *recoup_timestamp,
+  bool *recoup_ok,
+  bool *internal_failure);
+
+#endif
diff --git a/src/exchangedb/pg_do_refund.c b/src/exchangedb/pg_do_refund.c
new file mode 100644
index 000000000..194dab18d
--- /dev/null
+++ b/src/exchangedb/pg_do_refund.c
@@ -0,0 +1,93 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_refund.c
+ * @brief Implementation of the do_refund function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_refund.h"
+#include "pg_helper.h"
+#include "pg_compute_shard.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_refund (
+  void *cls,
+  const struct TALER_EXCHANGEDB_Refund *refund,
+  const struct TALER_Amount *deposit_fee,
+  uint64_t known_coin_id,
+  bool *not_found,
+  bool *refund_ok,
+  bool *gone,
+  bool *conflict)
+{
+  struct PostgresClosure *pg = cls;
+  uint64_t deposit_shard = TEH_PG_compute_shard (&refund->details.merchant_pub);
+  struct TALER_Amount amount_without_fee;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &refund->details.refund_amount),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &amount_without_fee),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 deposit_fee),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms),
+    GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id),
+    GNUNET_PQ_query_param_uint64 (&deposit_shard),
+    GNUNET_PQ_query_param_uint64 (&known_coin_id),
+    GNUNET_PQ_query_param_auto_from_type (&refund->coin.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_pub),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("not_found",
+                                not_found),
+    GNUNET_PQ_result_spec_bool ("refund_ok",
+                                refund_ok),
+    GNUNET_PQ_result_spec_bool ("gone",
+                                gone),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                conflict),
+    GNUNET_PQ_result_spec_end
+  };
+
+  if (0 >
+      TALER_amount_subtract (&amount_without_fee,
+                             &refund->details.refund_amount,
+                             &refund->details.refund_fee))
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  PREPARE (pg,
+           "call_refund",
+           "SELECT "
+           " out_not_found AS not_found"
+           ",out_refund_ok AS refund_ok"
+           ",out_gone AS gone"
+           ",out_conflict AS conflict"
+           " FROM exchange_do_refund"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_refund",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_refund.h b/src/exchangedb/pg_do_refund.h
new file mode 100644
index 000000000..7118858dc
--- /dev/null
+++ b/src/exchangedb/pg_do_refund.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_refund.h
+ * @brief implementation of the do_refund function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_REFUND_H
+#define PG_DO_REFUND_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Perform refund operation, checking for sufficient deposits
+ * of the coin and possibly persisting the refund details.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param refund refund operation details
+ * @param deposit_fee deposit fee applicable for the coin, possibly refunded
+ * @param known_coin_id row of the coin in the known_coins table
+ * @param[out] not_found set if the deposit was not found
+ * @param[out] refund_ok  set if the refund succeeded (below deposit amount)
+ * @param[out] gone if the merchant was already paid
+ * @param[out] conflict set if the refund ID was re-used
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_refund (
+  void *cls,
+  const struct TALER_EXCHANGEDB_Refund *refund,
+  const struct TALER_Amount *deposit_fee,
+  uint64_t known_coin_id,
+  bool *not_found,
+  bool *refund_ok,
+  bool *gone,
+  bool *conflict);
+
+#endif
diff --git a/src/exchangedb/pg_do_reserve_open.c b/src/exchangedb/pg_do_reserve_open.c
new file mode 100644
index 000000000..b15c96dd1
--- /dev/null
+++ b/src/exchangedb/pg_do_reserve_open.c
@@ -0,0 +1,101 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_do_reserve_open.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_reserve_open.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_reserve_open (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *total_paid,
+  const struct TALER_Amount *reserve_payment,
+  uint32_t min_purse_limit,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  struct GNUNET_TIME_Timestamp desired_expiration,
+  struct GNUNET_TIME_Timestamp now,
+  const struct TALER_Amount *open_fee,
+  bool *no_funds,
+  struct TALER_Amount *reserve_balance,
+  struct TALER_Amount *open_cost,
+  struct GNUNET_TIME_Timestamp *final_expiration)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      total_paid),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      reserve_payment),
+    GNUNET_PQ_query_param_uint32 (&min_purse_limit),
+    GNUNET_PQ_query_param_uint32 (&pg->def_purse_limit),
+    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
+    GNUNET_PQ_query_param_timestamp (&desired_expiration),
+    GNUNET_PQ_query_param_relative_time (&pg->legal_reserve_expiration_time),
+    GNUNET_PQ_query_param_timestamp (&now),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 open_fee),
+    GNUNET_PQ_query_param_end
+  };
+  bool no_reserve = true;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_result_spec_amount ("out_open_cost",
+                                 pg->currency,
+                                 open_cost),
+    TALER_PQ_result_spec_amount ("out_reserve_balance",
+                                 pg->currency,
+                                 reserve_balance),
+    GNUNET_PQ_result_spec_timestamp ("out_final_expiration",
+                                     final_expiration),
+    GNUNET_PQ_result_spec_bool ("out_no_reserve",
+                                &no_reserve),
+    GNUNET_PQ_result_spec_bool ("out_no_funds",
+                                no_funds),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "do_reserve_open",
+           "SELECT "
+           " out_open_cost"
+           ",out_final_expiration"
+           ",out_no_funds"
+           ",out_no_reserve"
+           ",out_reserve_balance"
+           " FROM exchange_do_reserve_open"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "do_reserve_open",
+                                                 params,
+                                                 rs);
+  if (qs <= 0)
+    return qs;
+  if (no_reserve)
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  return qs;
+}
diff --git a/src/exchangedb/pg_do_reserve_open.h b/src/exchangedb/pg_do_reserve_open.h
new file mode 100644
index 000000000..432f3f664
--- /dev/null
+++ b/src/exchangedb/pg_do_reserve_open.h
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_do_reserve_open.h
+ * @brief implementation of the do_reserve_open function
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_RESERVE_OPEN_H
+#define PG_DO_RESERVE_OPEN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Perform reserve open operation on database.
+ *
+ * @param cls closure
+ * @param reserve_pub which reserve is this about?
+ * @param total_paid total amount paid (coins and reserve)
+ * @param reserve_payment amount to be paid from the reserve
+ * @param min_purse_limit minimum number of purses we should be able to open
+ * @param reserve_sig signature by the reserve for the operation
+ * @param desired_expiration when should the reserve expire (earliest time)
+ * @param now when did we the client initiate the action
+ * @param open_fee annual fee to be charged for the open operation by the exchange
+ * @param[out] no_funds set to true if reserve balance is insufficient
+ * @param[out] reserve_balance set to the original reserve balance (at the start of this transaction)
+ * @param[out] open_cost set to the actual cost
+ * @param[out] final_expiration when will the reserve expire now
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_reserve_open (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *total_paid,
+  const struct TALER_Amount *reserve_payment,
+  uint32_t min_purse_limit,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  struct GNUNET_TIME_Timestamp desired_expiration,
+  struct GNUNET_TIME_Timestamp now,
+  const struct TALER_Amount *open_fee,
+  bool *no_funds,
+  struct TALER_Amount *reserve_balance,
+  struct TALER_Amount *open_cost,
+  struct GNUNET_TIME_Timestamp *final_expiration);
+
+
+#endif
diff --git a/src/exchangedb/pg_do_reserve_purse.c b/src/exchangedb/pg_do_reserve_purse.c
new file mode 100644
index 000000000..e03e23fec
--- /dev/null
+++ b/src/exchangedb/pg_do_reserve_purse.c
@@ -0,0 +1,121 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_reserve_purse.c
+ * @brief Implementation of the do_reserve_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_do_reserve_purse.h"
+#include "pg_helper.h"
+/**
+ * Function called insert request to merge a purse into a reserve by the
+ * respective purse merge key. The purse must not have been merged into a
+ * different reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to merge
+ * @param merge_sig signature affirming the merge
+ * @param merge_timestamp time of the merge
+ * @param reserve_sig signature of the reserve affirming the merge
+ * @param purse_fee amount to charge the reserve for the purse creation, NULL to use the quota
+ * @param reserve_pub public key of the reserve to credit
+ * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
+ * @param[out] no_reserve set to true if @a reserve_pub is not a known reserve
+ * @param[out] insufficient_funds set to true if @a reserve_pub has insufficient capacity to create another purse
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_reserve_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_Amount *purse_fee,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *in_conflict,
+  bool *no_reserve,
+  bool *insufficient_funds)
+{
+  struct PostgresClosure *pg = cls;
+  struct TALER_Amount zero_fee;
+  struct TALER_PaytoHashP h_payto;
+  struct GNUNET_TIME_Timestamp reserve_expiration
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
+                                  pg->idle_reserve_expiration_time));
+  struct GNUNET_TIME_Timestamp reserve_gc
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
+                                  pg->legal_reserve_expiration_time));
+
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (merge_sig),
+    GNUNET_PQ_query_param_timestamp (&merge_timestamp),
+    GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+    GNUNET_PQ_query_param_timestamp (&reserve_gc),
+    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
+    GNUNET_PQ_query_param_bool (NULL == purse_fee),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 NULL == purse_fee
+                                        ? &zero_fee
+                                        : purse_fee),
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (&h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("insufficient_funds",
+                                insufficient_funds),
+    GNUNET_PQ_result_spec_bool ("conflict",
+                                in_conflict),
+    GNUNET_PQ_result_spec_bool ("no_reserve",
+                                no_reserve),
+    GNUNET_PQ_result_spec_end
+  };
+
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (pg->exchange_url,
+                                          reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &h_payto);
+    GNUNET_free (payto_uri);
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &zero_fee));
+  /* Used in #postgres_do_reserve_purse() */
+  PREPARE (pg,
+           "call_reserve_purse",
+           "SELECT"
+           " out_no_funds AS insufficient_funds"
+           ",out_no_reserve AS no_reserve"
+           ",out_conflict AS conflict"
+           " FROM exchange_do_reserve_purse"
+           "  ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_reserve_purse",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_do_reserve_purse.h b/src/exchangedb/pg_do_reserve_purse.h
new file mode 100644
index 000000000..dde2d6ce1
--- /dev/null
+++ b/src/exchangedb/pg_do_reserve_purse.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_do_reserve_purse.h
+ * @brief implementation of the do_reserve_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DO_RESERVE_PURSE_H
+#define PG_DO_RESERVE_PURSE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called insert request to merge a purse into a reserve by the
+ * respective purse merge key. The purse must not have been merged into a
+ * different reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to merge
+ * @param merge_sig signature affirming the merge
+ * @param merge_timestamp time of the merge
+ * @param reserve_sig signature of the reserve affirming the merge
+ * @param purse_fee amount to charge the reserve for the purse creation, NULL to use the quota
+ * @param reserve_pub public key of the reserve to credit
+ * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
+ * @param[out] no_reserve set to true if @a reserve_pub is not a known reserve
+ * @param[out] insufficient_funds set to true if @a reserve_pub has insufficient capacity to create another purse
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_do_reserve_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_Amount *purse_fee,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *in_conflict,
+  bool *no_reserve,
+  bool *insufficient_funds);
+
+#endif
diff --git a/src/exchangedb/pg_drain_kyc_alert.c b/src/exchangedb/pg_drain_kyc_alert.c
new file mode 100644
index 000000000..4388334e9
--- /dev/null
+++ b/src/exchangedb/pg_drain_kyc_alert.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_drain_kyc_alert.c
+ * @brief Implementation of the drain_kyc_alert function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_drain_kyc_alert.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_drain_kyc_alert (void *cls,
+                        uint32_t trigger_type,
+                        struct TALER_PaytoHashP *h_payto)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint32 (&trigger_type),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("h_payto",
+                                          h_payto),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "drain_kyc_alert",
+           "DELETE FROM kyc_alerts"
+           " WHERE trigger_type=$1"
+           "   AND h_payto = "
+           "   (SELECT h_payto "
+           "      FROM kyc_alerts"
+           "     WHERE trigger_type=$1"
+           "     LIMIT 1)"
+           " RETURNING h_payto;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "drain_kyc_alert",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_drain_kyc_alert.h b/src/exchangedb/pg_drain_kyc_alert.h
new file mode 100644
index 000000000..7425f472d
--- /dev/null
+++ b/src/exchangedb/pg_drain_kyc_alert.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_drain_kyc_alert.h
+ * @brief implementation of the drain_kyc_alert function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DRAIN_KYC_ALERT_H
+#define PG_DRAIN_KYC_ALERT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Extract next KYC alert.  Deletes the alert.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param trigger_type which type of alert to drain
+ * @param[out] h_payto set to hash of payto-URI where KYC status changed
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_drain_kyc_alert (void *cls,
+                        uint32_t trigger_type,
+                        struct TALER_PaytoHashP *h_payto);
+
+#endif
diff --git a/src/exchangedb/pg_drop_tables.c b/src/exchangedb/pg_drop_tables.c
new file mode 100644
index 000000000..55857018b
--- /dev/null
+++ b/src/exchangedb/pg_drop_tables.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_drop_tables.c
+ * @brief Implementation of the drop_tables function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_drop_tables.h"
+#include "pg_helper.h"
+
+
+/**
+ * Drop all Taler tables.  This should only be used by testcases.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_drop_tables (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
+
+  if (NULL != pg->conn)
+  {
+    GNUNET_PQ_disconnect (pg->conn);
+    pg->conn = NULL;
+  }
+  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
+                                     "exchangedb-postgres",
+                                     NULL,
+                                     NULL,
+                                     NULL);
+  if (NULL == conn)
+    return GNUNET_SYSERR;
+  ret = GNUNET_PQ_exec_sql (conn,
+                            "drop");
+  GNUNET_PQ_disconnect (conn);
+  return ret;
+}
diff --git a/src/exchangedb/pg_drop_tables.h b/src/exchangedb/pg_drop_tables.h
new file mode 100644
index 000000000..58729d5ec
--- /dev/null
+++ b/src/exchangedb/pg_drop_tables.h
@@ -0,0 +1,38 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_drop_tables.h
+ * @brief implementation of the drop_tables function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_DROP_TABLES_H
+#define PG_DROP_TABLES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Drop all Taler tables.  This should only be used by testcases.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_drop_tables (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_ensure_coin_known.c b/src/exchangedb/pg_ensure_coin_known.c
new file mode 100644
index 000000000..307b8df52
--- /dev/null
+++ b/src/exchangedb/pg_ensure_coin_known.c
@@ -0,0 +1,169 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_ensure_coin_known.c
+ * @brief Implementation of the ensure_coin_known function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_pq_lib.h"
+#include "pg_ensure_coin_known.h"
+#include "pg_helper.h"
+
+
+enum TALER_EXCHANGEDB_CoinKnownStatus
+TEH_PG_ensure_coin_known (void *cls,
+                          const struct TALER_CoinPublicInfo *coin,
+                          uint64_t *known_coin_id,
+                          struct TALER_DenominationHashP *denom_hash,
+                          struct TALER_AgeCommitmentHash *h_age_commitment)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  bool existed;
+  bool is_denom_pub_hash_null = false;
+  bool is_age_hash_null = false;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&coin->coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&coin->denom_pub_hash),
+    coin->no_age_commitment
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (&coin->h_age_commitment),
+    TALER_PQ_query_param_denom_sig (&coin->denom_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("existed",
+                                &existed),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                  known_coin_id),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            denom_hash),
+      &is_denom_pub_hash_null),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            h_age_commitment),
+      &is_age_hash_null),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /*
+     See also:
+     https://stackoverflow.com/questions/34708509/how-to-use-returning-with-on-conflict-in-postgresql/37543015#37543015
+  */
+  PREPARE (pg,
+           "insert_known_coin",
+           "WITH dd"
+           "  (denominations_serial"
+           "  ,coin"
+           "  ) AS ("
+           "    SELECT "
+           "       denominations_serial"
+           "      ,coin"
+           "        FROM denominations"
+           "        WHERE denom_pub_hash=$2"
+           "  ), input_rows"
+           "    (coin_pub) AS ("
+           "      VALUES ($1::BYTEA)"
+           "  ), ins AS ("
+           "  INSERT INTO known_coins "
+           "  (coin_pub"
+           "  ,denominations_serial"
+           "  ,age_commitment_hash"
+           "  ,denom_sig"
+           "  ,remaining"
+           "  ) SELECT "
+           "     $1"
+           "    ,denominations_serial"
+           "    ,$3"
+           "    ,$4"
+           "    ,coin"
+           "  FROM dd"
+           "  ON CONFLICT DO NOTHING" /* CONFLICT on (coin_pub) */
+           "  RETURNING "
+           "     known_coin_id"
+           "  ) "
+           "SELECT "
+           "   FALSE AS existed"
+           "  ,known_coin_id"
+           "  ,NULL AS denom_pub_hash"
+           "  ,NULL AS age_commitment_hash"
+           "  FROM ins "
+           "UNION ALL "
+           "SELECT "
+           "   TRUE AS existed"
+           "  ,known_coin_id"
+           "  ,denom_pub_hash"
+           "  ,kc.age_commitment_hash"
+           "  FROM input_rows"
+           "  JOIN known_coins kc USING (coin_pub)"
+           "  JOIN denominations USING (denominations_serial)"
+           "  LIMIT 1");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "insert_known_coin",
+                                                 params,
+                                                 rs);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+    GNUNET_break (0);
+    return TALER_EXCHANGEDB_CKS_HARD_FAIL;
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    return TALER_EXCHANGEDB_CKS_SOFT_FAIL;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    GNUNET_break (0); /* should be impossible */
+    return TALER_EXCHANGEDB_CKS_HARD_FAIL;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+    if (! existed)
+      return TALER_EXCHANGEDB_CKS_ADDED;
+    break; /* continued below */
+  }
+
+  if ( (! is_denom_pub_hash_null) &&
+       (0 != GNUNET_memcmp (&denom_hash->hash,
+                            &coin->denom_pub_hash.hash)) )
+  {
+    GNUNET_break_op (0);
+    return TALER_EXCHANGEDB_CKS_DENOM_CONFLICT;
+  }
+
+  if (is_age_hash_null != coin->no_age_commitment)
+  {
+    if (is_age_hash_null)
+    {
+      GNUNET_break_op (0);
+      return TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NULL;
+    }
+    else
+    {
+      GNUNET_break_op (0);
+      return TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NON_NULL;
+    }
+  }
+  else if ( (! is_age_hash_null) &&
+            (0 != GNUNET_memcmp (h_age_commitment,
+                                 &coin->h_age_commitment)) )
+  {
+    GNUNET_break_op (0);
+    return TALER_EXCHANGEDB_CKS_AGE_CONFLICT_VALUE_DIFFERS;
+  }
+
+  return TALER_EXCHANGEDB_CKS_PRESENT;
+}
diff --git a/src/exchangedb/pg_ensure_coin_known.h b/src/exchangedb/pg_ensure_coin_known.h
new file mode 100644
index 000000000..68c101735
--- /dev/null
+++ b/src/exchangedb/pg_ensure_coin_known.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_ensure_coin_known.h
+ * @brief implementation of the ensure_coin_known function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ENSURE_COIN_KNOWN_H
+#define PG_ENSURE_COIN_KNOWN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Make sure the given @a coin is known to the database.
+ *
+ * @param cls database connection plugin state
+ * @param coin the coin that must be made known
+ * @param[out] known_coin_id set to the unique row of the coin
+ * @param[out] denom_hash set to the denomination hash of the existing
+ *             coin (for conflict error reporting)
+ * @param[out] h_age_commitment  set to the conflicting age commitment hash on conflict
+ * @return database transaction status, non-negative on success
+ */
+enum TALER_EXCHANGEDB_CoinKnownStatus
+TEH_PG_ensure_coin_known (void *cls,
+                          const struct TALER_CoinPublicInfo *coin,
+                          uint64_t *known_coin_id,
+                          struct TALER_DenominationHashP *denom_hash,
+                          struct TALER_AgeCommitmentHash *h_age_commitment);
+
+#endif
diff --git a/src/exchangedb/pg_event_listen.c b/src/exchangedb/pg_event_listen.c
new file mode 100644
index 000000000..6e1d32843
--- /dev/null
+++ b/src/exchangedb/pg_event_listen.c
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_listen.c
+ * @brief Implementation of the event_listen function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_event_listen.h"
+#include "pg_helper.h"
+
+/**
+ * Register callback to be invoked on events of type @a es.
+ *
+ * @param cls database context to use
+ * @param timeout how long until to generate a timeout event
+ * @param es specification of the event to listen for
+ * @param cb function to call when the event happens, possibly
+ *         multiple times (until cancel is invoked)
+ * @param cb_cls closure for @a cb
+ * @return handle useful to cancel the listener
+ */
+struct GNUNET_DB_EventHandler *
+TEH_PG_event_listen (void *cls,
+                     struct GNUNET_TIME_Relative timeout,
+                     const struct GNUNET_DB_EventHeaderP *es,
+                     GNUNET_DB_EventCallback cb,
+                     void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+
+  return GNUNET_PQ_event_listen (pg->conn,
+                                 es,
+                                 timeout,
+                                 cb,
+                                 cb_cls);
+}
diff --git a/src/exchangedb/pg_event_listen.h b/src/exchangedb/pg_event_listen.h
new file mode 100644
index 000000000..7e1e83a0e
--- /dev/null
+++ b/src/exchangedb/pg_event_listen.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_listen.h
+ * @brief implementation of the event_listen function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_EVENT_LISTEN_H
+#define PG_EVENT_LISTEN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Register callback to be invoked on events of type @a es.
+ *
+ * @param cls database context to use
+ * @param timeout how long until to generate a timeout event
+ * @param es specification of the event to listen for
+ * @param cb function to call when the event happens, possibly
+ *         multiple times (until cancel is invoked)
+ * @param cb_cls closure for @a cb
+ * @return handle useful to cancel the listener
+ */
+struct GNUNET_DB_EventHandler *
+TEH_PG_event_listen (void *cls,
+                     struct GNUNET_TIME_Relative timeout,
+                     const struct GNUNET_DB_EventHeaderP *es,
+                     GNUNET_DB_EventCallback cb,
+                     void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_event_listen_cancel.c b/src/exchangedb/pg_event_listen_cancel.c
new file mode 100644
index 000000000..9d776684d
--- /dev/null
+++ b/src/exchangedb/pg_event_listen_cancel.c
@@ -0,0 +1,36 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_listen_cancel.c
+ * @brief Implementation of the event_listen_cancel function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_event_listen_cancel.h"
+#include "pg_helper.h"
+
+
+void
+TEH_PG_event_listen_cancel (void *cls,
+                            struct GNUNET_DB_EventHandler *eh)
+
+{
+  (void) cls;
+  GNUNET_PQ_event_listen_cancel (eh);
+}
diff --git a/src/exchangedb/pg_event_listen_cancel.h b/src/exchangedb/pg_event_listen_cancel.h
new file mode 100644
index 000000000..258d7a58b
--- /dev/null
+++ b/src/exchangedb/pg_event_listen_cancel.h
@@ -0,0 +1,38 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_listen_cancel.h
+ * @brief implementation of the event_listen_cancel function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_EVENT_LISTEN_CANCEL_H
+#define PG_EVENT_LISTEN_CANCEL_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Stop notifications.
+ *
+ * @param cls the plugin's `struct PostgresClosure`
+ * @param eh handle to unregister.
+ */
+void
+TEH_PG_event_listen_cancel (void *cls,
+                            struct GNUNET_DB_EventHandler *eh);
+#endif
diff --git a/src/exchangedb/pg_event_notify.c b/src/exchangedb/pg_event_notify.c
new file mode 100644
index 000000000..188855775
--- /dev/null
+++ b/src/exchangedb/pg_event_notify.c
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_notify.c
+ * @brief Implementation of the event_notify function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_event_notify.h"
+#include "pg_helper.h"
+
+
+void
+TEH_PG_event_notify (void *cls,
+                     const struct GNUNET_DB_EventHeaderP *es,
+                     const void *extra,
+                     size_t extra_size)
+{
+  struct PostgresClosure *pg = cls;
+
+  GNUNET_PQ_event_notify (pg->conn,
+                          es,
+                          extra,
+                          extra_size);
+}
diff --git a/src/exchangedb/pg_event_notify.h b/src/exchangedb/pg_event_notify.h
new file mode 100644
index 000000000..85069659b
--- /dev/null
+++ b/src/exchangedb/pg_event_notify.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_event_notify.h
+ * @brief implementation of the event_notify function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_EVENT_NOTIFY_H
+#define PG_EVENT_NOTIFY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Notify all that listen on @a es of an event.
+ *
+ * @param cls database context to use
+ * @param es specification of the event to generate
+ * @param extra additional event data provided
+ * @param extra_size number of bytes in @a extra
+ */
+void
+TEH_PG_event_notify (void *cls,
+                     const struct GNUNET_DB_EventHeaderP *es,
+                     const void *extra,
+                     size_t extra_size);
+
+#endif
diff --git a/src/exchangedb/pg_expire_purse.c b/src/exchangedb/pg_expire_purse.c
new file mode 100644
index 000000000..6ef7a2779
--- /dev/null
+++ b/src/exchangedb/pg_expire_purse.c
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_expire_purse.c
+ * @brief Implementation of the expire_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_expire_purse.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_expire_purse (
+  void *cls,
+  struct GNUNET_TIME_Absolute start_time,
+  struct GNUNET_TIME_Absolute end_time)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_absolute_time (&start_time),
+    GNUNET_PQ_query_param_absolute_time (&end_time),
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_end
+  };
+  bool found = false;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("found",
+                                &found),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+
+  PREPARE (pg,
+           "call_expire_purse",
+           "SELECT "
+           " out_found AS found"
+           " FROM exchange_do_expire_purse"
+           " ($1,$2,$3);");
+
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "call_expire_purse",
+                                                 params,
+                                                 rs);
+  if (qs < 0)
+    return qs;
+  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs);
+  return found
+         ? GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
+         : GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+}
diff --git a/src/exchangedb/pg_expire_purse.h b/src/exchangedb/pg_expire_purse.h
new file mode 100644
index 000000000..fe05fd52c
--- /dev/null
+++ b/src/exchangedb/pg_expire_purse.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_expire_purse.h
+ * @brief implementation of the expire_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_EXPIRE_PURSE_H
+#define PG_EXPIRE_PURSE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to clean up one expired purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param start_time select purse expired after this time
+ * @param end_time select purse expired before this time
+ * @return transaction status code (#GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if no purse expired in the given time interval).
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_expire_purse (
+  void *cls,
+  struct GNUNET_TIME_Absolute start_time,
+  struct GNUNET_TIME_Absolute end_time);
+
+#endif
diff --git a/src/exchangedb/pg_find_aggregation_transient.c b/src/exchangedb/pg_find_aggregation_transient.c
new file mode 100644
index 000000000..b931188a8
--- /dev/null
+++ b/src/exchangedb/pg_find_aggregation_transient.c
@@ -0,0 +1,150 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_find_aggregation_transient.c
+ * @brief Implementation of the find_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_find_aggregation_transient.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_refunds_cb().
+ */
+struct FindAggregationTransientContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_TransientAggregationCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct SelectRefundContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+get_transients_cb (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct FindAggregationTransientContext *srctx = cls;
+  struct PostgresClosure *pg = srctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_Amount amount;
+    char *payto_uri;
+    struct TALER_WireTransferIdentifierRawP wtid;
+    struct TALER_MerchantPublicKeyP merchant_pub;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                            &merchant_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
+                                            &wtid),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+    bool cont;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      srctx->status = GNUNET_SYSERR;
+      return;
+    }
+    cont = srctx->cb (srctx->cb_cls,
+                      payto_uri,
+                      &wtid,
+                      &merchant_pub,
+                      &amount);
+    GNUNET_free (payto_uri);
+    if (! cont)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_find_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_TransientAggregationCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct FindAggregationTransientContext srctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+
+  PREPARE (pg,
+           "find_transient_aggregations",
+           "SELECT"
+           "  amount"
+           " ,wtid_raw"
+           " ,merchant_pub"
+           " ,payto_uri"
+           " FROM aggregation_transient atr"
+           " JOIN wire_targets wt USING (wire_target_h_payto)"
+           " WHERE atr.wire_target_h_payto=$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "find_transient_aggregations",
+                                             params,
+                                             &get_transients_cb,
+                                             &srctx);
+  if (GNUNET_SYSERR == srctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_find_aggregation_transient.h b/src/exchangedb/pg_find_aggregation_transient.h
new file mode 100644
index 000000000..c7ba4ea38
--- /dev/null
+++ b/src/exchangedb/pg_find_aggregation_transient.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_find_aggregation_transient.h
+ * @brief implementation of the find_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_FIND_AGGREGATION_TRANSIENT_H
+#define PG_FIND_AGGREGATION_TRANSIENT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Find existing entry in the transient aggregation table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param cb function to call on each matching entry
+ * @param cb_cls closure for @a cb
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_find_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_TransientAggregationCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_gc.c b/src/exchangedb/pg_gc.c
new file mode 100644
index 000000000..e01c1e101
--- /dev/null
+++ b/src/exchangedb/pg_gc.c
@@ -0,0 +1,80 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_gc.c
+ * @brief Implementation of the gc function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_gc.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_GenericReturnValue
+TEH_PG_gc (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+  struct GNUNET_TIME_Absolute long_ago;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_absolute_time (&long_ago),
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
+
+  /* Keep wire fees for 10 years, that should always
+     be enough _and_ they are tiny so it does not
+     matter to make this tight */
+  long_ago = GNUNET_TIME_absolute_subtract (
+    now,
+    GNUNET_TIME_relative_multiply (
+      GNUNET_TIME_UNIT_YEARS,
+      10));
+  {
+    struct GNUNET_PQ_ExecuteStatement es[] = {
+      GNUNET_PQ_make_try_execute ("SET search_path TO exchange;"),
+      GNUNET_PQ_EXECUTE_STATEMENT_END
+    };
+    struct GNUNET_PQ_PreparedStatement ps[] = {
+      /* Used in #postgres_gc() */
+      GNUNET_PQ_make_prepare ("run_gc",
+                              "CALL"
+                              " exchange_do_gc"
+                              " ($1,$2);"),
+      GNUNET_PQ_PREPARED_STATEMENT_END
+    };
+
+    conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
+                                       "exchangedb-postgres",
+                                       NULL,
+                                       es,
+                                       ps);
+  }
+  if (NULL == conn)
+    return GNUNET_SYSERR;
+  ret = GNUNET_OK;
+  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
+                                              "run_gc",
+                                              params))
+    ret = GNUNET_SYSERR;
+  GNUNET_PQ_disconnect (conn);
+  return ret;
+}
diff --git a/src/exchangedb/pg_gc.h b/src/exchangedb/pg_gc.h
new file mode 100644
index 000000000..803581488
--- /dev/null
+++ b/src/exchangedb/pg_gc.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_gc.h
+ * @brief implementation of the gc function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GC_H
+#define PG_GC_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to perform "garbage collection" on the
+ * database, expiring records we no longer require.
+ *
+ * @param cls closure
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_SYSERR on DB errors
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_gc (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_age_withdraw.c b/src/exchangedb/pg_get_age_withdraw.c
new file mode 100644
index 000000000..ea4d3b909
--- /dev/null
+++ b/src/exchangedb/pg_get_age_withdraw.c
@@ -0,0 +1,119 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_age_withdraw.c
+ * @brief Implementation of the get_age_withdraw function for Postgres
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_age_withdraw.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_age_withdraw (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AgeWithdrawCommitmentHashP *ach,
+  struct TALER_EXCHANGEDB_AgeWithdraw *aw)
+{
+  enum GNUNET_DB_QueryStatus ret;
+  struct PostgresClosure *pg = cls;
+  size_t num_sigs;
+  size_t num_hashes;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (ach),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("h_commitment",
+                                          &aw->h_commitment),
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                          &aw->reserve_sig),
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                          &aw->reserve_pub),
+    GNUNET_PQ_result_spec_uint16 ("max_age",
+                                  &aw->max_age),
+    TALER_PQ_result_spec_amount ("amount_with_fee",
+                                 pg->currency,
+                                 &aw->amount_with_fee),
+    GNUNET_PQ_result_spec_uint16 ("noreveal_index",
+                                  &aw->noreveal_index),
+    TALER_PQ_result_spec_array_blinded_coin_hash (
+      pg->conn,
+      "h_blind_evs",
+      &aw->num_coins,
+      &aw->h_coin_evs),
+    TALER_PQ_result_spec_array_blinded_denom_sig (
+      pg->conn,
+      "denom_sigs",
+      &num_sigs,
+      &aw->denom_sigs),
+    TALER_PQ_result_spec_array_denom_hash (
+      pg->conn,
+      "denom_pub_hashes",
+      &num_hashes,
+      &aw->denom_pub_hashes),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_age_withdraw",
+           "SELECT"
+           " h_commitment"
+           ",reserve_sig"
+           ",reserve_pub"
+           ",max_age"
+           ",amount_with_fee"
+           ",noreveal_index"
+           ",h_blind_evs"
+           ",denom_sigs"
+           ",ARRAY("
+           "  SELECT denominations.denom_pub_hash FROM ("
+           "    SELECT UNNEST(denom_serials) AS id,"
+           "           generate_subscripts(denom_serials, 1) AS nr" /* for order */
+           "  ) AS denoms"
+           "  LEFT JOIN denominations ON denominations.denominations_serial=denoms.id"
+           ") AS denom_pub_hashes"
+           " FROM age_withdraw"
+           " WHERE reserve_pub=$1 and h_commitment=$2;");
+
+  ret = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                  "get_age_withdraw",
+                                                  params,
+                                                  rs);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != ret)
+    return ret;
+
+  if ((aw->num_coins != num_sigs) ||
+      (aw->num_coins != num_hashes))
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "got inconsistent number of entries from DB: "
+                "num_coins=%ld, num_sigs=%ld, num_hashes=%ld\n",
+                aw->num_coins,
+                num_sigs,
+                num_hashes);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  return ret;
+}
diff --git a/src/exchangedb/pg_get_age_withdraw.h b/src/exchangedb/pg_get_age_withdraw.h
new file mode 100644
index 000000000..2257aa43c
--- /dev/null
+++ b/src/exchangedb/pg_get_age_withdraw.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_age_withdraw.h
+ * @brief implementation of the get_age_withdraw function for Postgres
+ * @author Özgür KESIM
+ */
+#ifndef PG_GET_AGE_WITHDRAW_H
+#define PG_GET_AGE_WITHDRAW_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+   * Locate the response for a age-withdraw request under a hash that uniquely
+   * identifies the age-withdraw operation.  Used to ensure idempotency of the
+   * request.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param reserve_pub public key of the reserve for which the age-withdraw request is made
+   * @param ach hash that uniquely identifies the age-withdraw operation
+   * @param[out] aw corresponding details of the previous age-withdraw request if an entry was found
+   * @return statement execution status
+   */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_age_withdraw (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_AgeWithdrawCommitmentHashP *ach,
+  struct TALER_EXCHANGEDB_AgeWithdraw *aw);
+#endif
diff --git a/src/exchangedb/pg_get_coin_denomination.c b/src/exchangedb/pg_get_coin_denomination.c
new file mode 100644
index 000000000..9f9256f6f
--- /dev/null
+++ b/src/exchangedb/pg_get_coin_denomination.c
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_coin_denomination.c
+ * @brief Implementation of the get_coin_denomination function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_coin_denomination.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_coin_denomination (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t *known_coin_id,
+  struct TALER_DenominationHashP *denom_hash)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                          denom_hash),
+    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                  known_coin_id),
+    GNUNET_PQ_result_spec_end
+  };
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting coin denomination of coin %s\n",
+              TALER_B2S (coin_pub));
+
+  /* Used in #postgres_get_coin_denomination() to fetch
+     the denomination public key hash for
+     a coin known to the exchange. */
+  PREPARE (pg,
+           "get_coin_denomination",
+           "SELECT"
+           " denominations.denom_pub_hash"
+           ",known_coin_id"
+           " FROM known_coins"
+           " JOIN denominations USING (denominations_serial)"
+           " WHERE coin_pub=$1"
+           " FOR SHARE;");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_coin_denomination",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_coin_denomination.h b/src/exchangedb/pg_get_coin_denomination.h
new file mode 100644
index 000000000..3b9f03f31
--- /dev/null
+++ b/src/exchangedb/pg_get_coin_denomination.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_coin_denomination.h
+ * @brief implementation of the get_coin_denomination function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_COIN_DENOMINATION_H
+#define PG_GET_COIN_DENOMINATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Retrieve the denomination of a known coin.
+ *
+ * @param cls the plugin closure
+ * @param coin_pub the public key of the coin to search for
+ * @param[out] known_coin_id set to the ID of the coin in the known_coins table
+ * @param[out] denom_hash where to store the hash of the coins denomination
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_coin_denomination (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t *known_coin_id,
+  struct TALER_DenominationHashP *denom_hash);
+
+#endif
diff --git a/src/exchangedb/pg_get_coin_transactions.c b/src/exchangedb/pg_get_coin_transactions.c
new file mode 100644
index 000000000..fef33a486
--- /dev/null
+++ b/src/exchangedb/pg_get_coin_transactions.c
@@ -0,0 +1,1144 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file pg_get_coin_transactions.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_pq_lib.h"
+#include "pg_get_coin_transactions.h"
+#include "pg_helper.h"
+#include "pg_start_read_committed.h"
+#include "pg_commit.h"
+#include "pg_rollback.h"
+#include "plugin_exchangedb_common.h"
+
+/**
+ * How often do we re-try when encountering DB serialization issues?
+ * (We are read-only, so can only happen due to concurrent insert,
+ * which should be very rare.)
+ */
+#define RETRIES 3
+
+/**
+ * Closure for callbacks called from #postgres_get_coin_transactions()
+ */
+struct CoinHistoryContext
+{
+  /**
+   * Head of the coin's history list.
+   */
+  struct TALER_EXCHANGEDB_TransactionList *head;
+
+  /**
+   * Public key of the coin we are building the history for.
+   */
+  const struct TALER_CoinSpendPublicKeyP *coin_pub;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to 'true' if the transaction failed.
+   */
+  bool failed;
+
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_deposit (void *cls,
+                  PGresult *result,
+                  unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_DepositListEntry *deposit;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    deposit = GNUNET_new (struct TALER_EXCHANGEDB_DepositListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &deposit->amount_with_fee),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                     &deposit->deposit_fee),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &deposit->h_denom_pub),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                                &deposit->h_age_commitment),
+          &deposit->no_age_commitment),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_auto_from_type ("wallet_data_hash",
+                                                &deposit->wallet_data_hash),
+          &deposit->no_wallet_data_hash),
+        GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
+                                         &deposit->timestamp),
+        GNUNET_PQ_result_spec_timestamp ("refund_deadline",
+                                         &deposit->refund_deadline),
+        GNUNET_PQ_result_spec_timestamp ("wire_deadline",
+                                         &deposit->wire_deadline),
+        GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                              &deposit->merchant_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                              &deposit->h_contract_terms),
+        GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                              &deposit->wire_salt),
+        GNUNET_PQ_result_spec_string ("payto_uri",
+                                      &deposit->receiver_wire_account),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &deposit->csig),
+        GNUNET_PQ_result_spec_uint64 ("coin_deposit_serial_id",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_auto_from_type ("done",
+                                              &deposit->done),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (deposit);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_DEPOSIT;
+    tl->details.deposit = deposit;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_purse_deposit (void *cls,
+                        PGresult *result,
+                        unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_PurseDepositListEntry *deposit;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    deposit = GNUNET_new (struct TALER_EXCHANGEDB_PurseDepositListEntry);
+    {
+      bool not_finished;
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &deposit->amount),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                     &deposit->deposit_fee),
+        GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                              &deposit->purse_pub),
+        GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_string ("partner_base_url",
+                                        &deposit->exchange_base_url),
+          NULL),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &deposit->coin_sig),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                                &deposit->h_age_commitment),
+          &deposit->no_age_commitment),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_bool ("refunded",
+                                      &deposit->refunded),
+          &not_finished),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (deposit);
+        chc->failed = true;
+        return;
+      }
+      if (not_finished)
+        deposit->refunded = false;
+      deposit->no_age_commitment = GNUNET_is_zero (&deposit->h_age_commitment);
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_PURSE_DEPOSIT;
+    tl->details.purse_deposit = deposit;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_melt (void *cls,
+               PGresult *result,
+               unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_MeltListEntry *melt;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    melt = GNUNET_new (struct TALER_EXCHANGEDB_MeltListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("rc",
+                                              &melt->rc),
+        /* oldcoin_index not needed */
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &melt->h_denom_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
+                                              &melt->coin_sig),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &melt->amount_with_fee),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                     &melt->melt_fee),
+        GNUNET_PQ_result_spec_allow_null (
+          GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                                &melt->h_age_commitment),
+          &melt->no_age_commitment),
+        GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (melt);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_MELT;
+    tl->details.melt = melt;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_refund (void *cls,
+                 PGresult *result,
+                 unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_RefundListEntry *refund;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    refund = GNUNET_new (struct TALER_EXCHANGEDB_RefundListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                              &refund->merchant_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("merchant_sig",
+                                              &refund->merchant_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                              &refund->h_contract_terms),
+        GNUNET_PQ_result_spec_uint64 ("rtransaction_id",
+                                      &refund->rtransaction_id),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &refund->refund_amount),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                     &refund->refund_fee),
+        GNUNET_PQ_result_spec_uint64 ("refund_serial_id",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (refund);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_REFUND;
+    tl->details.refund = refund;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_purse_decision (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_PurseRefundListEntry *prefund;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    prefund = GNUNET_new (struct TALER_EXCHANGEDB_PurseRefundListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                              &prefund->purse_pub),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &prefund->refund_amount),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                     &prefund->refund_fee),
+        GNUNET_PQ_result_spec_uint64 ("purse_decision_serial_id",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (prefund);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_PURSE_REFUND;
+    tl->details.purse_refund = prefund;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_old_coin_recoup (void *cls,
+                     PGresult *result,
+                     unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_RecoupRefreshListEntry *recoup;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupRefreshListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                              &recoup->coin.coin_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &recoup->coin_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                              &recoup->coin_blind),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                     &recoup->value),
+        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                         &recoup->timestamp),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &recoup->coin.denom_pub_hash),
+        TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                        &recoup->coin.denom_sig),
+        GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (recoup);
+        chc->failed = true;
+        return;
+      }
+      recoup->old_coin_pub = *chc->coin_pub;
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP;
+    tl->details.old_coin_recoup = recoup;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_recoup (void *cls,
+                 PGresult *result,
+                 unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_RecoupListEntry *recoup;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                              &recoup->reserve_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &recoup->coin_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &recoup->h_denom_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                              &recoup->coin_blind),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                     &recoup->value),
+        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                         &recoup->timestamp),
+        GNUNET_PQ_result_spec_uint64 ("recoup_uuid",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (recoup);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_RECOUP;
+    tl->details.recoup = recoup;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_recoup_refresh (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_RecoupRefreshListEntry *recoup;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupRefreshListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
+                                              &recoup->old_coin_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &recoup->coin_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                              &recoup->coin_blind),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                     &recoup->value),
+        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                         &recoup->timestamp),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &recoup->coin.denom_pub_hash),
+        TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                        &recoup->coin.denom_sig),
+        GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (recoup);
+        chc->failed = true;
+        return;
+      }
+      recoup->coin.coin_pub = *chc->coin_pub;
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_RECOUP_REFRESH;
+    tl->details.recoup_refresh = recoup;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinHistoryContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_coin_reserve_open (void *cls,
+                       PGresult *result,
+                       unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_ReserveOpenListEntry *role;
+    struct TALER_EXCHANGEDB_TransactionList *tl;
+    uint64_t serial_id;
+
+    role = GNUNET_new (struct TALER_EXCHANGEDB_ReserveOpenListEntry);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                              &role->reserve_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &role->coin_sig),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("contribution",
+                                     &role->coin_contribution),
+        GNUNET_PQ_result_spec_uint64 ("reserve_open_deposit_uuid",
+                                      &serial_id),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (role);
+        chc->failed = true;
+        return;
+      }
+    }
+    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
+    tl->next = chc->head;
+    tl->type = TALER_EXCHANGEDB_TT_RESERVE_OPEN;
+    tl->details.reserve_open = role;
+    tl->serial_id = serial_id;
+    chc->head = tl;
+  }
+}
+
+
+/**
+ * Work we need to do.
+ */
+struct Work
+{
+  /**
+   * Name of the table.
+   */
+  const char *table;
+
+  /**
+   * SQL prepared statement name.
+   */
+  const char *statement;
+
+  /**
+   * Function to call to handle the result(s).
+   */
+  GNUNET_PQ_PostgresResultHandler cb;
+};
+
+
+/**
+ * We found a coin history entry. Lookup details
+ * from the respective table and store in @a cls.
+ *
+ * @param[in,out] cls a `struct CoinHistoryContext`
+ * @param result a coin history entry result set
+ * @param num_results total number of results in @a results
+ */
+static void
+handle_history_entry (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  struct CoinHistoryContext *chc = cls;
+  struct PostgresClosure *pg = chc->pg;
+  static const struct Work work[] = {
+    [TALER_EXCHANGEDB_TT_DEPOSIT] =
+    { "coin_deposits",
+      "get_deposit_with_coin_pub",
+      &add_coin_deposit },
+    [TALER_EXCHANGEDB_TT_MELT] =
+    { "refresh_commitments",
+      "get_refresh_session_by_coin",
+      &add_coin_melt },
+    [TALER_EXCHANGEDB_TT_PURSE_DEPOSIT] =
+    { "purse_deposits",
+      "get_purse_deposit_by_coin_pub",
+      &add_coin_purse_deposit },
+    [TALER_EXCHANGEDB_TT_PURSE_REFUND] =
+    { "purse_decision",
+      "get_purse_decision_by_coin_pub",
+      &add_coin_purse_decision },
+    [TALER_EXCHANGEDB_TT_REFUND] =
+    { "refunds",
+      "get_refunds_by_coin",
+      &add_coin_refund },
+    [TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP] =
+    { "recoup_refresh::OLD",
+      "recoup_by_old_coin",
+      &add_old_coin_recoup },
+    [TALER_EXCHANGEDB_TT_RECOUP] =
+    { "recoup",
+      "recoup_by_coin",
+      &add_coin_recoup },
+    [TALER_EXCHANGEDB_TT_RECOUP_REFRESH] =
+    { "recoup_refresh::NEW",
+      "recoup_by_refreshed_coin",
+      &add_coin_recoup_refresh },
+    [TALER_EXCHANGEDB_TT_RESERVE_OPEN] =
+    { "reserves_open_deposits",
+      "reserve_open_by_coin",
+      &add_coin_reserve_open },
+    { NULL, NULL, NULL }
+  };
+  char *table_name;
+  uint64_t serial_id;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_string ("table_name",
+                                  &table_name),
+    GNUNET_PQ_result_spec_uint64 ("serial_id",
+                                  &serial_id),
+    GNUNET_PQ_result_spec_end
+  };
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (chc->coin_pub),
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    bool found = false;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      chc->failed = true;
+      return;
+    }
+
+    for (unsigned int s = 0;
+         NULL != work[s].statement;
+         s++)
+    {
+      if (0 != strcmp (table_name,
+                       work[s].table))
+        continue;
+      found = true;
+      qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                                 work[s].statement,
+                                                 params,
+                                                 work[s].cb,
+                                                 chc);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Coin %s had %d transactions at %llu in table %s\n",
+                  TALER_B2S (chc->coin_pub),
+                  (int) qs,
+                  (unsigned long long) serial_id,
+                  table_name);
+      if (0 >= qs)
+        chc->failed = true;
+      break;
+    }
+    if (! found)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Coin history includes unsupported table `%s`\n",
+                  table_name);
+      chc->failed = true;
+    }
+    GNUNET_PQ_cleanup_result (rs);
+    if (chc->failed)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_coin_transactions (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t start_off,
+  uint64_t etag_in,
+  uint64_t *etag_out,
+  struct TALER_Amount *balance,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_EXCHANGEDB_TransactionList **tlp)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_QueryParam lparams[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_uint64 (&start_off),
+    GNUNET_PQ_query_param_end
+  };
+  struct CoinHistoryContext chc = {
+    .head = NULL,
+    .coin_pub = coin_pub,
+    .pg = pg
+  };
+
+  *tlp = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting transactions for coin %s\n",
+              TALER_B2S (coin_pub));
+  PREPARE (pg,
+           "get_coin_history_etag_balance",
+           "SELECT"
+           " ch.coin_history_serial_id"
+           ",kc.remaining"
+           ",denom.denom_pub_hash"
+           " FROM coin_history ch"
+           " JOIN known_coins kc"
+           "   USING (coin_pub)"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " WHERE coin_pub=$1"
+           " ORDER BY coin_history_serial_id DESC"
+           " LIMIT 1;");
+  PREPARE (pg,
+           "get_coin_history",
+           "SELECT"
+           " table_name"
+           ",serial_id"
+           " FROM coin_history"
+           " WHERE coin_pub=$1"
+           "   AND coin_history_serial_id > $2"
+           " ORDER BY coin_history_serial_id DESC;");
+  PREPARE (pg,
+           "get_deposit_with_coin_pub",
+           "SELECT"
+           " cdep.amount_with_fee"
+           ",denoms.fee_deposit"
+           ",denoms.denom_pub_hash"
+           ",kc.age_commitment_hash"
+           ",bdep.wallet_timestamp"
+           ",bdep.refund_deadline"
+           ",bdep.wire_deadline"
+           ",bdep.merchant_pub"
+           ",bdep.h_contract_terms"
+           ",bdep.wallet_data_hash"
+           ",bdep.wire_salt"
+           ",wt.payto_uri"
+           ",cdep.coin_sig"
+           ",cdep.coin_deposit_serial_id"
+           ",bdep.done"
+           " FROM coin_deposits cdep"
+           " JOIN batch_deposits bdep"
+           "   USING (batch_deposit_serial_id)"
+           " JOIN wire_targets wt"
+           "   USING (wire_target_h_payto)"
+           " JOIN known_coins kc"
+           "   ON (kc.coin_pub = cdep.coin_pub)"
+           " JOIN denominations denoms"
+           "   USING (denominations_serial)"
+           " WHERE cdep.coin_pub=$1"
+           "   AND cdep.coin_deposit_serial_id=$2;");
+  PREPARE (pg,
+           "get_refresh_session_by_coin",
+           "SELECT"
+           " rc"
+           ",old_coin_sig"
+           ",amount_with_fee"
+           ",denoms.denom_pub_hash"
+           ",denoms.fee_refresh"
+           ",kc.age_commitment_hash"
+           ",melt_serial_id"
+           " FROM refresh_commitments"
+           " JOIN known_coins kc"
+           "   ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
+           " JOIN denominations denoms"
+           "   USING (denominations_serial)"
+           " WHERE old_coin_pub=$1"
+           "   AND melt_serial_id=$2;");
+  PREPARE (pg,
+           "get_purse_deposit_by_coin_pub",
+           "SELECT"
+           " partner_base_url"
+           ",pd.amount_with_fee"
+           ",denoms.fee_deposit"
+           ",pd.purse_pub"
+           ",kc.age_commitment_hash"
+           ",pd.coin_sig"
+           ",pd.purse_deposit_serial_id"
+           ",pdes.refunded"
+           " FROM purse_deposits pd"
+           " LEFT JOIN partners"
+           "   USING (partner_serial_id)"
+           " JOIN purse_requests pr"
+           "   USING (purse_pub)"
+           " LEFT JOIN purse_decision pdes"
+           "   USING (purse_pub)"
+           " JOIN known_coins kc"
+           "   ON (pd.coin_pub = kc.coin_pub)"
+           " JOIN denominations denoms"
+           "   USING (denominations_serial)"
+           " WHERE pd.purse_deposit_serial_id=$2"
+           "   AND pd.coin_pub=$1;");
+  PREPARE (pg,
+           "get_purse_decision_by_coin_pub",
+           "SELECT"
+           " pdes.purse_pub"
+           ",pd.amount_with_fee"
+           ",denom.fee_refund"
+           ",pdes.purse_decision_serial_id"
+           " FROM purse_decision pdes"
+           " JOIN purse_deposits pd"
+           "   USING (purse_pub)"
+           " JOIN known_coins kc"
+           "   ON (pd.coin_pub = kc.coin_pub)"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " WHERE pd.coin_pub=$1"
+           "   AND pdes.purse_decision_serial_id=$2"
+           "   AND pdes.refunded;");
+  PREPARE (pg,
+           "get_refunds_by_coin",
+           "SELECT"
+           " bdep.merchant_pub"
+           ",ref.merchant_sig"
+           ",bdep.h_contract_terms"
+           ",ref.rtransaction_id"
+           ",ref.amount_with_fee"
+           ",denom.fee_refund"
+           ",ref.refund_serial_id"
+           " FROM refunds ref"
+           " JOIN coin_deposits cdep"
+           "   ON (ref.coin_pub = cdep.coin_pub AND ref.batch_deposit_serial_id = cdep.batch_deposit_serial_id)"
+           " JOIN batch_deposits bdep"
+           "   ON (ref.batch_deposit_serial_id = bdep.batch_deposit_serial_id)"
+           " JOIN known_coins kc"
+           "   ON (ref.coin_pub = kc.coin_pub)"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " WHERE ref.coin_pub=$1"
+           "   AND ref.refund_serial_id=$2;");
+  PREPARE (pg,
+           "recoup_by_old_coin",
+           "SELECT"
+           " coins.coin_pub"
+           ",rr.coin_sig"
+           ",rr.coin_blind"
+           ",rr.amount"
+           ",rr.recoup_timestamp"
+           ",denoms.denom_pub_hash"
+           ",coins.denom_sig"
+           ",rr.recoup_refresh_uuid"
+           " FROM recoup_refresh rr"
+           " JOIN known_coins coins"
+           "   USING (coin_pub)"
+           " JOIN denominations denoms"
+           "   USING (denominations_serial)"
+           " WHERE recoup_refresh_uuid=$2"
+           "   AND rrc_serial IN"
+           "   (SELECT rrc.rrc_serial"
+           "    FROM refresh_commitments melt"
+           "    JOIN refresh_revealed_coins rrc"
+           "      USING (melt_serial_id)"
+           "    WHERE melt.old_coin_pub=$1);");
+  PREPARE (pg,
+           "recoup_by_coin",
+           "SELECT"
+           " res.reserve_pub"
+           ",denoms.denom_pub_hash"
+           ",rcp.coin_sig"
+           ",rcp.coin_blind"
+           ",rcp.amount"
+           ",rcp.recoup_timestamp"
+           ",rcp.recoup_uuid"
+           " FROM recoup rcp"
+           " JOIN reserves_out ro"
+           "   USING (reserve_out_serial_id)"
+           " JOIN reserves res"
+           "   USING (reserve_uuid)"
+           " JOIN known_coins coins"
+           "   USING (coin_pub)"
+           " JOIN denominations denoms"
+           "   ON (denoms.denominations_serial = coins.denominations_serial)"
+           " WHERE rcp.recoup_uuid=$2"
+           "   AND coins.coin_pub=$1;");
+  /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
+     for a refreshed coin */
+  PREPARE (pg,
+           "recoup_by_refreshed_coin",
+           "SELECT"
+           " old_coins.coin_pub AS old_coin_pub"
+           ",rr.coin_sig"
+           ",rr.coin_blind"
+           ",rr.amount"
+           ",rr.recoup_timestamp"
+           ",denoms.denom_pub_hash"
+           ",coins.denom_sig"
+           ",recoup_refresh_uuid"
+           " FROM recoup_refresh rr"
+           "    JOIN refresh_revealed_coins rrc"
+           "      USING (rrc_serial)"
+           "    JOIN refresh_commitments rfc"
+           "      ON (rrc.melt_serial_id = rfc.melt_serial_id)"
+           "    JOIN known_coins old_coins"
+           "      ON (rfc.old_coin_pub = old_coins.coin_pub)"
+           "    JOIN known_coins coins"
+           "      ON (rr.coin_pub = coins.coin_pub)"
+           "    JOIN denominations denoms"
+           "      ON (denoms.denominations_serial = coins.denominations_serial)"
+           " WHERE rr.recoup_refresh_uuid=$2"
+           "   AND coins.coin_pub=$1;");
+  PREPARE (pg,
+           "reserve_open_by_coin",
+           "SELECT"
+           " reserve_open_deposit_uuid"
+           ",coin_sig"
+           ",reserve_sig"
+           ",contribution"
+           " FROM reserves_open_deposits"
+           " WHERE coin_pub=$1"
+           "   AND reserve_open_deposit_uuid=$2;");
+
+  for (unsigned int i = 0; i<RETRIES; i++)
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    uint64_t end;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("coin_history_serial_id",
+                                    &end),
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            h_denom_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("remaining",
+                                   balance),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        TEH_PG_start_read_committed (pg,
+                                     "get-coin-transactions"))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    /* First only check the last item, to see if
+       we even need to iterate */
+    qs = GNUNET_PQ_eval_prepared_singleton_select (
+      pg->conn,
+      "get_coin_history_etag_balance",
+      params,
+      rs);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_PG_rollback (pg);
+      continue;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      *etag_out = end;
+      if (end == etag_in)
+        return qs;
+    }
+    /* We indeed need to iterate over the history */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Current ETag for coin %s is %llu\n",
+                TALER_B2S (coin_pub),
+                (unsigned long long) end);
+
+    qs = GNUNET_PQ_eval_prepared_multi_select (
+      pg->conn,
+      "get_coin_history",
+      lparams,
+      &handle_history_entry,
+      &chc);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_PG_rollback (pg);
+      continue;
+    default:
+      break;
+    }
+    if (chc.failed)
+    {
+      TEH_PG_rollback (pg);
+      TEH_COMMON_free_coin_transaction_list (pg,
+                                             chc.head);
+      return GNUNET_DB_STATUS_SOFT_ERROR;
+    }
+    qs = TEH_PG_commit (pg);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_COMMON_free_coin_transaction_list (pg,
+                                             chc.head);
+      chc.head = NULL;
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_COMMON_free_coin_transaction_list (pg,
+                                             chc.head);
+      chc.head = NULL;
+      continue;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      *tlp = chc.head;
+      return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+    }
+  }
+  return GNUNET_DB_STATUS_SOFT_ERROR;
+}
diff --git a/src/exchangedb/pg_get_coin_transactions.h b/src/exchangedb/pg_get_coin_transactions.h
new file mode 100644
index 000000000..46e32e094
--- /dev/null
+++ b/src/exchangedb/pg_get_coin_transactions.h
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file pg_get_coin_transactions.h
+ * @brief implementation of the get_coin_transactions function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_COIN_TRANSACTIONS_H
+#define PG_GET_COIN_TRANSACTIONS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Compile a list of (historic) transactions performed with the given coin
+ * (melt, refund, recoup and deposit operations).  Should return 0 if the @a
+ * coin_pub is unknown, otherwise determine @a etag_out and if it is past @a
+ * etag_in return the history after @a start_off. @a etag_out should be set
+ * to the last row ID of the given @a coin_pub in the coin history table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param coin_pub coin to investigate
+ * @param start_off starting offset from which on to return entries
+ * @param etag_in up to this offset the client already has a response, do not
+ *                   return anything unless @a etag_out will be larger
+ * @param[out] etag_out set to the latest history offset known for this @a coin_pub
+ * @param[out] balance set to current balance of the coin
+ * @param[out] h_denom_pub set to denomination public key of the coin
+ * @param[out] tlp set to list of transactions, set to NULL if coin has no
+ *             transaction history past @a start_off or if @a etag_in is equal
+ *             to the value written to @a etag_out.
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_coin_transactions (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t start_off,
+  uint64_t etag_in,
+  uint64_t *etag_out,
+  struct TALER_Amount *balance,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_EXCHANGEDB_TransactionList **tlp);
+
+
+#endif
diff --git a/src/exchangedb/pg_get_denomination_info.c b/src/exchangedb/pg_get_denomination_info.c
new file mode 100644
index 000000000..4bae29795
--- /dev/null
+++ b/src/exchangedb/pg_get_denomination_info.c
@@ -0,0 +1,91 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_denomination_info.c
+ * @brief Implementation of the get_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_denomination_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_denomination_info (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_EXCHANGEDB_DenominationKeyInformation *issue)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          &issue->signature),
+    GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                     &issue->start),
+    GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
+                                     &issue->expire_withdraw),
+    GNUNET_PQ_result_spec_timestamp ("expire_deposit",
+                                     &issue->expire_deposit),
+    GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                     &issue->expire_legal),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
+                                 &issue->value),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                 &issue->fees.withdraw),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                 &issue->fees.deposit),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                 &issue->fees.refresh),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                 &issue->fees.refund),
+    GNUNET_PQ_result_spec_uint32 ("age_mask",
+                                  &issue->age_mask.bits),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "denomination_get",
+           "SELECT"
+           " master_sig"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"  /* value of this denom */
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",age_mask"
+           " FROM denominations"
+           " WHERE denom_pub_hash=$1;");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "denomination_get",
+                                                 params,
+                                                 rs);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+    return qs;
+  issue->denom_hash = *denom_pub_hash;
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_denomination_info.h b/src/exchangedb/pg_get_denomination_info.h
new file mode 100644
index 000000000..843227759
--- /dev/null
+++ b/src/exchangedb/pg_get_denomination_info.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_denomination_info.h
+ * @brief implementation of the get_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_DENOMINATION_INFO_H
+#define PG_GET_DENOMINATION_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Fetch information about a denomination key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub_hash hash of the public key used for signing coins of this denomination
+ * @param[out] issue set to issue information with value, fees and other info about the coin
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_denomination_info (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_EXCHANGEDB_DenominationKeyInformation *issue);
+
+#endif
diff --git a/src/exchangedb/pg_get_denomination_revocation.c b/src/exchangedb/pg_get_denomination_revocation.c
new file mode 100644
index 000000000..5e7a3a322
--- /dev/null
+++ b/src/exchangedb/pg_get_denomination_revocation.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_denomination_revocation.c
+ * @brief Implementation of the get_denomination_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_denomination_revocation.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_denomination_revocation (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_MasterSignatureP *master_sig,
+  uint64_t *rowid)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_uint64 ("denom_revocations_serial_id",
+                                  rowid),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "denomination_revocation_get",
+           "SELECT"
+           " master_sig"
+           ",denom_revocations_serial_id"
+           " FROM denomination_revocations"
+           " WHERE denominations_serial="
+           "  (SELECT denominations_serial"
+           "    FROM denominations"
+           "    WHERE denom_pub_hash=$1);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "denomination_revocation_get",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_denomination_revocation.h b/src/exchangedb/pg_get_denomination_revocation.h
new file mode 100644
index 000000000..5f7f27227
--- /dev/null
+++ b/src/exchangedb/pg_get_denomination_revocation.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_denomination_revocation.h
+ * @brief implementation of the get_denomination_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_DENOMINATION_REVOCATION_H
+#define PG_GET_DENOMINATION_REVOCATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain information about a denomination key's revocation from
+ * the database.
+ *
+ * @param cls closure
+ * @param denom_pub_hash hash of the revoked denomination key
+ * @param[out] master_sig signature affirming the revocation
+ * @param[out] rowid row where the information is stored
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_denomination_revocation (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  struct TALER_MasterSignatureP *master_sig,
+  uint64_t *rowid);
+
+#endif
diff --git a/src/exchangedb/pg_get_drain_profit.c b/src/exchangedb/pg_get_drain_profit.c
new file mode 100644
index 000000000..75fccefcd
--- /dev/null
+++ b/src/exchangedb/pg_get_drain_profit.c
@@ -0,0 +1,76 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_drain_profit.c
+ * @brief Implementation of the get_drain_profit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_drain_profit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_drain_profit (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t *serial,
+  char **account_section,
+  char **payto_uri,
+  struct GNUNET_TIME_Timestamp *request_timestamp,
+  struct TALER_Amount *amount,
+  struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("profit_drain_serial_id",
+                                  serial),
+    GNUNET_PQ_result_spec_string ("account_section",
+                                  account_section),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  payto_uri),
+    GNUNET_PQ_result_spec_timestamp ("trigger_date",
+                                     request_timestamp),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                 amount),
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_profit_drain",
+           "SELECT"
+           " profit_drain_serial_id"
+           ",account_section"
+           ",payto_uri"
+           ",trigger_date"
+           ",amount"
+           ",master_sig"
+           " FROM profit_drains"
+           " WHERE wtid=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_profit_drain",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_drain_profit.h b/src/exchangedb/pg_get_drain_profit.h
new file mode 100644
index 000000000..dd05d8afd
--- /dev/null
+++ b/src/exchangedb/pg_get_drain_profit.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_drain_profit.h
+ * @brief implementation of the get_drain_profit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_DRAIN_PROFIT_H
+#define PG_GET_DRAIN_PROFIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to get information about a profit drain event.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param wtid wire transfer ID to look up drain event for
+ * @param[out] serial set to serial ID of the entry
+ * @param[out] account_section set to account to drain
+ * @param[out] payto_uri set to account to wire funds to
+ * @param[out] request_timestamp set to time of the signature
+ * @param[out] amount set to amount to wire
+ * @param[out] master_sig set to signature affirming the operation
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_drain_profit (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t *serial,
+  char **account_section,
+  char **payto_uri,
+  struct GNUNET_TIME_Timestamp *request_timestamp,
+  struct TALER_Amount *amount,
+  struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_get_expired_reserves.c b/src/exchangedb/pg_get_expired_reserves.c
new file mode 100644
index 000000000..be9ece98a
--- /dev/null
+++ b/src/exchangedb/pg_get_expired_reserves.c
@@ -0,0 +1,174 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_expired_reserves.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_expired_reserves.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #reserve_expired_cb().
+ */
+struct ExpiredReserveContext
+{
+  /**
+   * Function to call for each expired reserve.
+   */
+  TALER_EXCHANGEDB_ReserveExpiredCallback rec;
+
+  /**
+   * Closure to give to @e rec.
+   */
+  void *rec_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserve_expired_cb (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct ExpiredReserveContext *erc = cls;
+  struct PostgresClosure *pg = erc->pg;
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = GNUNET_OK;
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_TIME_Timestamp exp_date;
+    char *account_details;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_Amount remaining_balance;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                       &exp_date),
+      GNUNET_PQ_result_spec_string ("account_details",
+                                    &account_details),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      TALER_PQ_result_spec_amount ("current_balance",
+                                   pg->currency,
+                                   &remaining_balance),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ret = GNUNET_SYSERR;
+      break;
+    }
+    ret = erc->rec (erc->rec_cls,
+                    &reserve_pub,
+                    &remaining_balance,
+                    account_details,
+                    exp_date,
+                    0);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+  erc->status = ret;
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_expired_reserves (void *cls,
+                             struct GNUNET_TIME_Timestamp now,
+                             TALER_EXCHANGEDB_ReserveExpiredCallback rec,
+                             void *rec_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct ExpiredReserveContext ectx = {
+    .rec = rec,
+    .rec_cls = rec_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "get_expired_reserves",
+           "WITH ed AS MATERIALIZED ( "
+           " SELECT * "
+           " FROM reserves "
+           " WHERE expiration_date <= $1 "
+           "   AND ((current_balance).val != 0 OR (current_balance).frac != 0) "
+           " ORDER BY expiration_date ASC "
+           " LIMIT 1 "
+           ") "
+           "SELECT "
+           " ed.expiration_date "
+           " ,payto_uri AS account_details "
+           " ,ed.reserve_pub "
+           " ,current_balance "
+           "FROM ( "
+           " SELECT "
+           "  * "
+           " FROM reserves_in "
+           " WHERE reserve_pub = ( "
+           "     SELECT reserve_pub FROM ed) "
+           " ) ri "
+           "JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto) "
+           "JOIN ed ON (ri.reserve_pub = ed.reserve_pub);");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "get_expired_reserves",
+                                             params,
+                                             &reserve_expired_cb,
+                                             &ectx);
+  switch (ectx.status)
+  {
+  case GNUNET_SYSERR:
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_NO:
+    return GNUNET_DB_STATUS_SOFT_ERROR;
+  case GNUNET_OK:
+    break;
+  }
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_expired_reserves.h b/src/exchangedb/pg_get_expired_reserves.h
new file mode 100644
index 000000000..0874b531a
--- /dev/null
+++ b/src/exchangedb/pg_get_expired_reserves.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_expired_reserves.h
+ * @brief implementation of the get_expired_reserves function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_EXPIRED_RESERVES_H
+#define PG_GET_EXPIRED_RESERVES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Obtain information about expired reserves and their
+ * remaining balances.
+ *
+ * @param cls closure of the plugin
+ * @param now timestamp based on which we decide expiration
+ * @param rec function to call on expired reserves
+ * @param rec_cls closure for @a rec
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_expired_reserves (void *cls,
+                             struct GNUNET_TIME_Timestamp now,
+                             TALER_EXCHANGEDB_ReserveExpiredCallback rec,
+                             void *rec_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_extension_manifest.c b/src/exchangedb/pg_get_extension_manifest.c
new file mode 100644
index 000000000..c6b5948cf
--- /dev/null
+++ b/src/exchangedb/pg_get_extension_manifest.c
@@ -0,0 +1,67 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_extension_manifest.c
+ * @brief Implementation of the get_extension_manifest function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_extension_manifest.h"
+#include "pg_helper.h"
+
+/**
+ * Function called to get the manifest of an extension
+ * (age-restriction, policy_extension_...)
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param extension_name the name of the extension
+ * @param[out] manifest JSON object of the manifest as string
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_extension_manifest (void *cls,
+                               const char *extension_name,
+                               char **manifest)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (extension_name),
+    GNUNET_PQ_query_param_end
+  };
+  bool is_null;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("manifest",
+                                    manifest),
+      &is_null),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *manifest = NULL;
+  PREPARE (pg,
+           "get_extension_manifest",
+           "SELECT"
+           " manifest"
+           " FROM extensions"
+           " WHERE name=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_extension_manifest",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_extension_manifest.h b/src/exchangedb/pg_get_extension_manifest.h
new file mode 100644
index 000000000..e8331ad9b
--- /dev/null
+++ b/src/exchangedb/pg_get_extension_manifest.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_extension_manifest.h
+ * @brief implementation of the get_extension_manifest function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_EXTENSION_MANIFEST_H
+#define PG_GET_EXTENSION_MANIFEST_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to get the manifest of an extension
+ * (age-restriction, policy_extension_...)
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param extension_name the name of the extension
+ * @param[out] manifest JSON object of the manifest as string
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_extension_manifest (void *cls,
+                               const char *extension_name,
+                               char **manifest);
+
+#endif
diff --git a/src/exchangedb/pg_get_global_fee.c b/src/exchangedb/pg_get_global_fee.c
new file mode 100644
index 000000000..46addfa17
--- /dev/null
+++ b/src/exchangedb/pg_get_global_fee.c
@@ -0,0 +1,86 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_global_fee.c
+ * @brief Implementation of the get_global_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_global_fee.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_global_fee (void *cls,
+                       struct GNUNET_TIME_Timestamp date,
+                       struct GNUNET_TIME_Timestamp *start_date,
+                       struct GNUNET_TIME_Timestamp *end_date,
+                       struct TALER_GlobalFeeSet *fees,
+                       struct GNUNET_TIME_Relative *purse_timeout,
+                       struct GNUNET_TIME_Relative *history_expiration,
+                       uint32_t *purse_account_limit,
+                       struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&date),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("start_date",
+                                     start_date),
+    GNUNET_PQ_result_spec_timestamp ("end_date",
+                                     end_date),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
+                                 &fees->history),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
+                                 &fees->account),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
+                                 &fees->purse),
+    GNUNET_PQ_result_spec_relative_time ("purse_timeout",
+                                         purse_timeout),
+    GNUNET_PQ_result_spec_relative_time ("history_expiration",
+                                         history_expiration),
+    GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
+                                  purse_account_limit),
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_global_fee",
+           "SELECT "
+           " start_date"
+           ",end_date"
+           ",history_fee"
+           ",account_fee"
+           ",purse_fee"
+           ",purse_timeout"
+           ",history_expiration"
+           ",purse_account_limit"
+           ",master_sig"
+           " FROM global_fee"
+           " WHERE start_date <= $1"
+           "   AND end_date > $1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_global_fee",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_global_fee.h b/src/exchangedb/pg_get_global_fee.h
new file mode 100644
index 000000000..1e7c9e94b
--- /dev/null
+++ b/src/exchangedb/pg_get_global_fee.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_global_fee.h
+ * @brief implementation of the get_global_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_GLOBAL_FEE_H
+#define PG_GET_GLOBAL_FEE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Obtain global fees from database.
+ *
+ * @param cls closure
+ * @param date for which date do we want the fee?
+ * @param[out] start_date when does the fee go into effect
+ * @param[out] end_date when does the fee end being valid
+ * @param[out] fees how high are the wire fees
+ * @param[out] purse_timeout set to how long we keep unmerged purses
+ * @param[out] history_expiration set to how long we keep account histories
+ * @param[out] purse_account_limit set to the number of free purses per account
+ * @param[out] master_sig signature over the above by the exchange master key
+ * @return status of the transaction
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_global_fee (void *cls,
+                       struct GNUNET_TIME_Timestamp date,
+                       struct GNUNET_TIME_Timestamp *start_date,
+                       struct GNUNET_TIME_Timestamp *end_date,
+                       struct TALER_GlobalFeeSet *fees,
+                       struct GNUNET_TIME_Relative *purse_timeout,
+                       struct GNUNET_TIME_Relative *history_expiration,
+                       uint32_t *purse_account_limit,
+                       struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_get_global_fees.c b/src/exchangedb/pg_get_global_fees.c
new file mode 100644
index 000000000..21be35989
--- /dev/null
+++ b/src/exchangedb/pg_get_global_fees.c
@@ -0,0 +1,165 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_global_fees.c
+ * @brief Implementation of the get_global_fees function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_global_fees.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #global_fees_cb().
+ */
+struct GlobalFeeContext
+{
+  /**
+   * Function to call for each global fee block.
+   */
+  TALER_EXCHANGEDB_GlobalFeeCallback cb;
+
+  /**
+   * Closure to give to @e rec.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+global_fees_cb (void *cls,
+                PGresult *result,
+                unsigned int num_results)
+{
+  struct GlobalFeeContext *gctx = cls;
+  struct PostgresClosure *pg = gctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_GlobalFeeSet fees;
+    struct GNUNET_TIME_Relative purse_timeout;
+    struct GNUNET_TIME_Relative history_expiration;
+    uint32_t purse_account_limit;
+    struct GNUNET_TIME_Timestamp start_date;
+    struct GNUNET_TIME_Timestamp end_date;
+    struct TALER_MasterSignatureP master_sig;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_timestamp ("start_date",
+                                       &start_date),
+      GNUNET_PQ_result_spec_timestamp ("end_date",
+                                       &end_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
+                                   &fees.history),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
+                                   &fees.account),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
+                                   &fees.purse),
+      GNUNET_PQ_result_spec_relative_time ("purse_timeout",
+                                           &purse_timeout),
+      GNUNET_PQ_result_spec_relative_time ("history_expiration",
+                                           &history_expiration),
+      GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
+                                    &purse_account_limit),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &master_sig),
+      GNUNET_PQ_result_spec_end
+    };
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      gctx->status = GNUNET_SYSERR;
+      break;
+    }
+    gctx->cb (gctx->cb_cls,
+              &fees,
+              purse_timeout,
+              history_expiration,
+              purse_account_limit,
+              start_date,
+              end_date,
+              &master_sig);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_global_fees (void *cls,
+                        TALER_EXCHANGEDB_GlobalFeeCallback cb,
+                        void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp date
+    = GNUNET_TIME_absolute_to_timestamp (
+        GNUNET_TIME_absolute_subtract (
+          GNUNET_TIME_absolute_get (),
+          GNUNET_TIME_UNIT_YEARS));
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&date),
+    GNUNET_PQ_query_param_end
+  };
+  struct GlobalFeeContext gctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+
+  PREPARE (pg,
+           "get_global_fees",
+           "SELECT "
+           " start_date"
+           ",end_date"
+           ",history_fee"
+           ",account_fee"
+           ",purse_fee"
+           ",purse_timeout"
+           ",history_expiration"
+           ",purse_account_limit"
+           ",master_sig"
+           " FROM global_fee"
+           " WHERE start_date >= $1");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "get_global_fees",
+                                               params,
+                                               &global_fees_cb,
+                                               &gctx);
+}
diff --git a/src/exchangedb/pg_get_global_fees.h b/src/exchangedb/pg_get_global_fees.h
new file mode 100644
index 000000000..80c9b812f
--- /dev/null
+++ b/src/exchangedb/pg_get_global_fees.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_global_fees.h
+ * @brief implementation of the get_global_fees function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_GLOBAL_FEES_H
+#define PG_GET_GLOBAL_FEES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain global fees from database.
+ *
+ * @param cls closure
+ * @param cb function to call on each fee entry
+ * @param cb_cls closure for @a cb
+ * @return status of the transaction
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_global_fees (void *cls,
+                        TALER_EXCHANGEDB_GlobalFeeCallback cb,
+                        void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_known_coin.c b/src/exchangedb/pg_get_known_coin.c
new file mode 100644
index 000000000..2c4a82d67
--- /dev/null
+++ b/src/exchangedb/pg_get_known_coin.c
@@ -0,0 +1,67 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_known_coin.c
+ * @brief Implementation of the get_known_coin function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_known_coin.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_known_coin (void *cls,
+                       const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                       struct TALER_CoinPublicInfo *coin_info)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                          &coin_info->denom_pub_hash),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            &coin_info->h_age_commitment),
+      &coin_info->no_age_commitment),
+    TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                    &coin_info->denom_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting known coin data for coin %s\n",
+              TALER_B2S (coin_pub));
+  coin_info->coin_pub = *coin_pub;
+  PREPARE (pg,
+           "get_known_coin",
+           "SELECT"
+           " denominations.denom_pub_hash"
+           ",age_commitment_hash"
+           ",denom_sig"
+           " FROM known_coins"
+           " JOIN denominations USING (denominations_serial)"
+           " WHERE coin_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_known_coin",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_known_coin.h b/src/exchangedb/pg_get_known_coin.h
new file mode 100644
index 000000000..c34bd2a97
--- /dev/null
+++ b/src/exchangedb/pg_get_known_coin.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_known_coin.h
+ * @brief implementation of the get_known_coin function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_KNOWN_COIN_H
+#define PG_GET_KNOWN_COIN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Retrieve the record for a known coin.
+ *
+ * @param cls the plugin closure
+ * @param coin_pub the public key of the coin to search for
+ * @param coin_info place holder for the returned coin information object
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_known_coin (void *cls,
+                       const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                       struct TALER_CoinPublicInfo *coin_info);
+
+#endif
diff --git a/src/exchangedb/pg_get_link_data.c b/src/exchangedb/pg_get_link_data.c
new file mode 100644
index 000000000..1b0cb3e20
--- /dev/null
+++ b/src/exchangedb/pg_get_link_data.c
@@ -0,0 +1,367 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_link_data.c
+ * @brief Implementation of the get_link_data function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_link_data.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #add_ldl().
+ */
+struct LinkDataContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_LinkCallback ldc;
+
+  /**
+   * Closure for @e ldc.
+   */
+  void *ldc_cls;
+
+  /**
+   * Last transfer public key for which we have information in @e last.
+   * Only valid if @e last is non-NULL.
+   */
+  struct TALER_TransferPublicKeyP transfer_pub;
+
+  /**
+   * Status, set to #GNUNET_SYSERR on errors,
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Free memory of the link data list.
+ *
+ * @param ldl link data list to release
+ */
+static void
+free_link_data_list (struct TALER_EXCHANGEDB_LinkList *ldl)
+{
+  struct TALER_EXCHANGEDB_LinkList *next;
+
+  while (NULL != ldl)
+  {
+    next = ldl->next;
+    TALER_denom_pub_free (&ldl->denom_pub);
+    TALER_blinded_denom_sig_free (&ldl->ev_sig);
+    TALER_denom_ewv_free (&ldl->alg_values);
+    GNUNET_free (ldl);
+    ldl = next;
+  }
+}
+
+
+struct Results
+{
+  struct TALER_EXCHANGEDB_LinkList *pos;
+  struct TALER_TransferPublicKeyP transfer_pub;
+};
+
+
+static int
+transfer_pub_cmp (const void *a,
+                  const void *b)
+{
+  const struct Results *ra = a;
+  const struct Results *rb = b;
+
+  return GNUNET_memcmp (&ra->transfer_pub,
+                        &rb->transfer_pub);
+}
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct LinkDataContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_ldl (void *cls,
+         PGresult *result,
+         unsigned int num_results)
+{
+  struct LinkDataContext *ldctx = cls;
+  struct Results *temp = GNUNET_new_array (num_results,
+                                           struct Results);
+  unsigned int temp_off = 0;
+
+  for (int i = num_results - 1; i >= 0; i--)
+  {
+    struct TALER_EXCHANGEDB_LinkList *pos;
+
+    pos = GNUNET_new (struct TALER_EXCHANGEDB_LinkList);
+    {
+      struct TALER_BlindedPlanchet bp;
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("transfer_pub",
+                                              &temp[temp_off].transfer_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("link_sig",
+                                              &pos->orig_coin_link_sig),
+        TALER_PQ_result_spec_blinded_denom_sig ("ev_sig",
+                                                &pos->ev_sig),
+        GNUNET_PQ_result_spec_uint32 ("freshcoin_index",
+                                      &pos->coin_refresh_offset),
+        TALER_PQ_result_spec_exchange_withdraw_values ("ewv",
+                                                       &pos->alg_values),
+        TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                        &pos->denom_pub),
+        TALER_PQ_result_spec_blinded_planchet ("coin_ev",
+                                               &bp),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    i))
+      {
+        GNUNET_break (0);
+        GNUNET_free (pos);
+        ldctx->status = GNUNET_SYSERR;
+        return;
+      }
+      if (GNUNET_CRYPTO_BSA_CS == bp.blinded_message->cipher)
+      {
+        pos->nonce.cs_nonce
+          = bp.blinded_message->details.cs_blinded_message.nonce;
+        pos->have_nonce = true;
+      }
+      TALER_blinded_planchet_free (&bp);
+    }
+    temp[temp_off].pos = pos;
+    temp_off++;
+  }
+  qsort (temp,
+         temp_off,
+         sizeof (struct Results),
+         &transfer_pub_cmp);
+  if (temp_off > 0)
+  {
+    struct TALER_EXCHANGEDB_LinkList *head = NULL;
+
+    head = temp[0].pos;
+    for (unsigned int i = 1; i < temp_off; i++)
+    {
+      struct TALER_EXCHANGEDB_LinkList *pos = temp[i].pos;
+      const struct TALER_TransferPublicKeyP *tp = &temp[i].transfer_pub;
+
+      if (0 == GNUNET_memcmp (tp,
+                              &temp[i - 1].transfer_pub))
+      {
+        pos->next = head;
+        head = pos;
+      }
+      else
+      {
+        ldctx->ldc (ldctx->ldc_cls,
+                    &temp[i - 1].transfer_pub,
+                    head);
+        free_link_data_list (head);
+        head = pos;
+      }
+    }
+    ldctx->ldc (ldctx->ldc_cls,
+                &temp[temp_off - 1].transfer_pub,
+                head);
+    free_link_data_list (head);
+  }
+  GNUNET_free (temp);
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_link_data (void *cls,
+                      const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                      TALER_EXCHANGEDB_LinkCallback ldc,
+                      void *ldc_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+  struct LinkDataContext ldctx;
+  static int percent_refund = -2;
+  const char *query;
+
+  if (-2 == percent_refund)
+  {
+    const char *mode = getenv ("TALER_POSTGRES_GET_LINK_DATA_LOGIC");
+    char dummy;
+
+    if ( (NULL==mode) ||
+         (1 != sscanf (mode,
+                       "%d%c",
+                       &percent_refund,
+                       &dummy)) )
+    {
+      if (NULL != mode)
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Bad mode `%s' specified\n",
+                    mode);
+      percent_refund = 4; /* Fastest known */
+    }
+  }
+  switch (percent_refund)
+  {
+  case 0:
+    query = "get_link";
+    PREPARE (pg,
+             query,
+             "SELECT "
+             " tp.transfer_pub"
+             ",denoms.denom_pub"
+             ",rrc.ev_sig"
+             ",rrc.ewv"
+             ",rrc.link_sig"
+             ",rrc.freshcoin_index"
+             ",rrc.coin_ev"
+             " FROM refresh_commitments"
+             "     JOIN refresh_revealed_coins rrc"
+             "       USING (melt_serial_id)"
+             "     JOIN refresh_transfer_keys tp"
+             "       USING (melt_serial_id)"
+             "     JOIN denominations denoms"
+             "       ON (rrc.denominations_serial = denoms.denominations_serial)"
+             " WHERE old_coin_pub=$1"
+             " ORDER BY tp.transfer_pub, rrc.freshcoin_index ASC");
+    break;
+  case 1:
+    query = "get_link_v1";
+    PREPARE (pg,
+             query,
+             "WITH rc AS MATERIALIZED ("
+             "SELECT"
+             " melt_serial_id"
+             " FROM refresh_commitments"
+             " WHERE old_coin_pub=$1"
+             ")"
+             "SELECT "
+             " tp.transfer_pub"
+             ",denoms.denom_pub"
+             ",rrc.ev_sig"
+             ",rrc.ewv"
+             ",rrc.link_sig"
+             ",rrc.freshcoin_index"
+             ",rrc.coin_ev "
+             "FROM "
+             "refresh_revealed_coins rrc"
+             "  JOIN refresh_transfer_keys tp"
+             "   USING (melt_serial_id)"
+             "  JOIN denominations denoms"
+             "   USING (denominations_serial)"
+             " WHERE rrc.melt_serial_id = (SELECT melt_serial_id FROM rc)"
+             " ORDER BY tp.transfer_pub, rrc.freshcoin_index ASC");
+    break;
+  case 2:
+    query = "get_link_v2";
+    PREPARE (pg,
+             query,
+             "SELECT"
+             " *"
+             " FROM"
+             " exchange_do_get_link_data"
+             " ($1) "
+             " AS "
+             " (transfer_pub BYTEA"
+             " ,denom_pub BYTEA"
+             " ,ev_sig BYTEA"
+             " ,ewv BYTEA"
+             " ,link_sig BYTEA"
+             " ,freshcoin_index INT4"
+             " ,coin_ev BYTEA);");
+    break;
+  case 3:
+    query = "get_link_v3";
+    PREPARE (pg,
+             query,
+             "SELECT "
+             " tp.transfer_pub"
+             ",denoms.denom_pub"
+             ",rrc.ev_sig"
+             ",rrc.ewv"
+             ",rrc.link_sig"
+             ",rrc.freshcoin_index"
+             ",rrc.coin_ev"
+             " FROM refresh_commitments"
+             "     JOIN refresh_revealed_coins rrc"
+             "       USING (melt_serial_id)"
+             "     JOIN refresh_transfer_keys tp"
+             "       USING (melt_serial_id)"
+             "     JOIN denominations denoms"
+             "       ON (rrc.denominations_serial = denoms.denominations_serial)"
+             " WHERE old_coin_pub=$1");
+    break;
+  case 4:
+    query = "get_link_v4";
+    PREPARE (pg,
+             query,
+             "WITH rc AS MATERIALIZED ("
+             "SELECT"
+             " melt_serial_id"
+             " FROM refresh_commitments"
+             " WHERE old_coin_pub=$1"
+             ")"
+             "SELECT "
+             " tp.transfer_pub"
+             ",denoms.denom_pub"
+             ",rrc.ev_sig"
+             ",rrc.ewv"
+             ",rrc.link_sig"
+             ",rrc.freshcoin_index"
+             ",rrc.coin_ev "
+             "FROM "
+             "refresh_revealed_coins rrc"
+             "  JOIN refresh_transfer_keys tp"
+             "   USING (melt_serial_id)"
+             "  JOIN denominations denoms"
+             "   USING (denominations_serial)"
+             " WHERE rrc.melt_serial_id = (SELECT melt_serial_id FROM rc)"
+             );
+    break;
+  default:
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  ldctx.ldc = ldc;
+  ldctx.ldc_cls = ldc_cls;
+  ldctx.status = GNUNET_OK;
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             query,
+                                             params,
+                                             &add_ldl,
+                                             &ldctx);
+  if (GNUNET_OK != ldctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_link_data.h b/src/exchangedb/pg_get_link_data.h
new file mode 100644
index 000000000..09d3a69fc
--- /dev/null
+++ b/src/exchangedb/pg_get_link_data.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_link_data.h
+ * @brief implementation of the get_link_data function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_LINK_DATA_H
+#define PG_GET_LINK_DATA_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Obtain the link data of a coin, that is the encrypted link
+ * information, the denomination keys and the signatures.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param coin_pub public key of the coin
+ * @param ldc function to call for each session the coin was melted into
+ * @param ldc_cls closure for @a tdc
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_link_data (void *cls,
+                      const struct TALER_CoinSpendPublicKeyP *coin_pub,
+                      TALER_EXCHANGEDB_LinkCallback ldc,
+                      void *ldc_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_melt.c b/src/exchangedb/pg_get_melt.c
new file mode 100644
index 000000000..2221054ba
--- /dev/null
+++ b/src/exchangedb/pg_get_melt.c
@@ -0,0 +1,124 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_melt.c
+ * @brief Implementation of the get_melt function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_melt.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_melt (void *cls,
+                 const struct TALER_RefreshCommitmentP *rc,
+                 struct TALER_EXCHANGEDB_Melt *melt,
+                 uint64_t *melt_serial_id)
+{
+  struct PostgresClosure *pg = cls;
+  bool h_age_commitment_is_null;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (rc),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                          &melt->session.coin.
+                                          denom_pub_hash),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                 &melt->melt_fee),
+    GNUNET_PQ_result_spec_uint32 ("noreveal_index",
+                                  &melt->session.noreveal_index),
+    GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
+                                          &melt->session.coin.coin_pub),
+    GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
+                                          &melt->session.coin_sig),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                            &melt->session.coin.h_age_commitment),
+      &h_age_commitment_is_null),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 &melt->session.amount_with_fee),
+    GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
+                                  melt_serial_id),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  memset (&melt->session.coin.denom_sig,
+          0,
+          sizeof (melt->session.coin.denom_sig));
+
+  /* Used in #postgres_get_melt() to fetch
+     high-level information about a melt operation */
+  PREPARE (pg,
+           "get_melt",
+           /* "SELECT"
+              " denoms.denom_pub_hash"
+              ",denoms.fee_refresh"
+              ",old_coin_pub"
+              ",old_coin_sig"
+              ",kc.age_commitment_hash"
+              ",amount_with_fee"
+              ",noreveal_index"
+              ",melt_serial_id"
+              " FROM refresh_commitments"
+              "   JOIN known_coins kc"
+              "     ON (old_coin_pub = kc.coin_pub)"
+              "   JOIN denominations denoms"
+              "     ON (kc.denominations_serial = denoms.denominations_serial)"
+              " WHERE rc=$1;", */
+           "WITH rc AS MATERIALIZED ( "
+           " SELECT"
+           "  * FROM refresh_commitments"
+           " WHERE rc=$1"
+           ")"
+           "SELECT"
+           " denoms.denom_pub_hash"
+           ",denoms.fee_refresh"
+           ",rc.old_coin_pub"
+           ",rc.old_coin_sig"
+           ",kc.age_commitment_hash"
+           ",amount_with_fee"
+           ",noreveal_index"
+           ",melt_serial_id "
+           "FROM ("
+           " SELECT"
+           "  * "
+           " FROM known_coins"
+           " WHERE coin_pub=(SELECT old_coin_pub from rc)"
+           ") kc "
+           "JOIN rc"
+           "  ON (kc.coin_pub=rc.old_coin_pub) "
+           "JOIN denominations denoms"
+           "  USING (denominations_serial);");
+
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "get_melt",
+                                                 params,
+                                                 rs);
+  if (h_age_commitment_is_null)
+    memset (&melt->session.coin.h_age_commitment,
+            0,
+            sizeof(melt->session.coin.h_age_commitment));
+
+  melt->session.rc = *rc;
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_melt.h b/src/exchangedb/pg_get_melt.h
new file mode 100644
index 000000000..269960bad
--- /dev/null
+++ b/src/exchangedb/pg_get_melt.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_melt.h
+ * @brief implementation of the get_melt function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_MELT_H
+#define PG_GET_MELT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Lookup refresh melt commitment data under the given @a rc.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param rc commitment hash to use to locate the operation
+ * @param[out] melt where to store the result; note that
+ *             melt->session.coin.denom_sig will be set to NULL
+ *             and is not fetched by this routine (as it is not needed by the client)
+ * @param[out] melt_serial_id set to the row ID of @a rc in the refresh_commitments table
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_melt (void *cls,
+                 const struct TALER_RefreshCommitmentP *rc,
+                 struct TALER_EXCHANGEDB_Melt *melt,
+                 uint64_t *melt_serial_id);
+
+#endif
diff --git a/src/exchangedb/pg_get_old_coin_by_h_blind.c b/src/exchangedb/pg_get_old_coin_by_h_blind.c
new file mode 100644
index 000000000..dcce7b32f
--- /dev/null
+++ b/src/exchangedb/pg_get_old_coin_by_h_blind.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_old_coin_by_h_blind.c
+ * @brief Implementation of the get_old_coin_by_h_blind function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_old_coin_by_h_blind.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_old_coin_by_h_blind (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *h_blind_ev,
+  struct TALER_CoinSpendPublicKeyP *old_coin_pub,
+  uint64_t *rrc_serial)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_blind_ev),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
+                                          old_coin_pub),
+    GNUNET_PQ_result_spec_uint64 ("rrc_serial",
+                                  rrc_serial),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /* Used in #postgres_get_old_coin_by_h_blind() */
+  PREPARE (pg,
+           "old_coin_by_h_blind",
+           "SELECT"
+           " okc.coin_pub AS old_coin_pub"
+           ",rrc_serial"
+           " FROM refresh_revealed_coins rrc"
+           " JOIN refresh_commitments rcom USING (melt_serial_id)"
+           " JOIN known_coins okc ON (rcom.old_coin_pub = okc.coin_pub)"
+           " WHERE h_coin_ev=$1"
+           " LIMIT 1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "old_coin_by_h_blind",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_old_coin_by_h_blind.h b/src/exchangedb/pg_get_old_coin_by_h_blind.h
new file mode 100644
index 000000000..93ed541b6
--- /dev/null
+++ b/src/exchangedb/pg_get_old_coin_by_h_blind.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_old_coin_by_h_blind.h
+ * @brief implementation of the get_old_coin_by_h_blind function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_OLD_COIN_BY_H_BLIND_H
+#define PG_GET_OLD_COIN_BY_H_BLIND_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain information about which old coin a coin was refreshed
+ * given the hash of the blinded (fresh) coin.
+ *
+ * @param cls closure
+ * @param h_blind_ev hash of the blinded coin
+ * @param[out] old_coin_pub set to information about the old coin (on success only)
+ * @param[out] rrc_serial set to serial number of the entry in the database
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_old_coin_by_h_blind (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *h_blind_ev,
+  struct TALER_CoinSpendPublicKeyP *old_coin_pub,
+  uint64_t *rrc_serial);
+
+#endif
diff --git a/src/exchangedb/pg_get_pending_kyc_requirement_process.c b/src/exchangedb/pg_get_pending_kyc_requirement_process.c
new file mode 100644
index 000000000..b9acddad1
--- /dev/null
+++ b/src/exchangedb/pg_get_pending_kyc_requirement_process.c
@@ -0,0 +1,66 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_pending_kyc_requirement_process.c
+ * @brief Implementation of the get_pending_kyc_requirement_process function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_pending_kyc_requirement_process.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_pending_kyc_requirement_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  char **redirect_url)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("redirect_url",
+                                    redirect_url),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *redirect_url = NULL;
+  PREPARE (pg,
+           "get_pending_kyc_requirement_process",
+           "SELECT"
+           "  redirect_url"
+           " FROM legitimization_processes"
+           " WHERE provider_section=$1"
+           "  AND h_payto=$2"
+           "  AND NOT finished"
+           " ORDER BY start_time DESC"
+           "  LIMIT 1");
+  return GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "get_pending_kyc_requirement_process",
+    params,
+    rs);
+}
diff --git a/src/exchangedb/pg_get_pending_kyc_requirement_process.h b/src/exchangedb/pg_get_pending_kyc_requirement_process.h
new file mode 100644
index 000000000..738c4d65b
--- /dev/null
+++ b/src/exchangedb/pg_get_pending_kyc_requirement_process.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_pending_kyc_requirement_process.h
+ * @brief implementation of the get_pending_kyc_requirement_process function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_PENDING_KYC_REQUIREMENT_PROCESS_H
+#define PG_GET_PENDING_KYC_REQUIREMENT_PROCESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Fetch information about pending KYC requirement process.
+ *
+ * @param cls closure
+ * @param h_payto account that must be KYC'ed
+ * @param provider_section provider that must be checked
+ * @param[out] redirect_url set to redirect URL for the process
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_pending_kyc_requirement_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  char **redirect_url);
+
+#endif
diff --git a/src/exchangedb/pg_get_policy_details.c b/src/exchangedb/pg_get_policy_details.c
new file mode 100644
index 000000000..6e1b5c5dc
--- /dev/null
+++ b/src/exchangedb/pg_get_policy_details.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_policy_details.c
+ * @brief Implementation of the get_policy_details function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_policy_details.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_policy_details (
+  void *cls,
+  const struct GNUNET_HashCode *hc,
+  struct TALER_PolicyDetails *details)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (hc),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("deadline",
+                                     &details->deadline),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("commitment",
+                                 &details->commitment),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("accumulated_total",
+                                 &details->accumulated_total),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("policy_fee",
+                                 &details->policy_fee),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("transferable_amount",
+                                 &details->transferable_amount),
+    GNUNET_PQ_result_spec_auto_from_type ("state",
+                                          &details->fulfillment_state),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_uint64 ("policy_fulfillment_id",
+                                    &details->policy_fulfillment_id),
+      &details->no_policy_fulfillment_id),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_policy_details",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_policy_details.h b/src/exchangedb/pg_get_policy_details.h
new file mode 100644
index 000000000..e3d2b0a2c
--- /dev/null
+++ b/src/exchangedb/pg_get_policy_details.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_policy_details.h
+ * @brief implementation of the get_policy_details function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_POLICY_DETAILS_H
+#define PG_GET_POLICY_DETAILS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/* Get the details of a policy, referenced by its hash code
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param hc The hash code under which the details to a particular policy should be found
+ * @param[out] details The found details
+ * @return query execution status
+ * */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_policy_details (
+  void *cls,
+  const struct GNUNET_HashCode *hc,
+  struct TALER_PolicyDetails *details);
+
+#endif
diff --git a/src/exchangedb/pg_get_purse_deposit.c b/src/exchangedb/pg_get_purse_deposit.c
new file mode 100644
index 000000000..cb24855a1
--- /dev/null
+++ b/src/exchangedb/pg_get_purse_deposit.c
@@ -0,0 +1,84 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_purse_deposit.c
+ * @brief Implementation of the get_purse_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_purse_deposit.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_purse_deposit (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_Amount *amount,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_AgeCommitmentHash *phac,
+  struct TALER_CoinSpendSignatureP *coin_sig,
+  char **partner_url)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  bool is_null;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                          h_denom_pub),
+    GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                          phac),
+    GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                          coin_sig),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 amount),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("partner_base_url",
+                                    partner_url),
+      &is_null),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *partner_url = NULL;
+  PREPARE (pg,
+           "select_purse_deposit_by_coin_pub",
+           "SELECT "
+           " coin_sig"
+           ",amount_with_fee"
+           ",denom_pub_hash"
+           ",age_commitment_hash"
+           ",partner_base_url"
+           " FROM purse_deposits"
+           " LEFT JOIN partners"
+           "   USING (partner_serial_id)"
+           " JOIN known_coins kc"
+           "   USING (coin_pub)"
+           " JOIN denominations"
+           "   USING (denominations_serial)"
+           " WHERE purse_pub=$1"
+           "   AND coin_pub=$2;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_purse_deposit_by_coin_pub",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_purse_deposit.h b/src/exchangedb/pg_get_purse_deposit.h
new file mode 100644
index 000000000..b9c9947f4
--- /dev/null
+++ b/src/exchangedb/pg_get_purse_deposit.h
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_purse_deposit.h
+ * @brief implementation of the get_purse_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_PURSE_DEPOSIT_H
+#define PG_GET_PURSE_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to obtain a coin deposit data from
+ * depositing the coin into a purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub purse to credit
+ * @param coin_pub coin to deposit (debit)
+ * @param[out] amount set fraction of the coin's value that was deposited (with fee)
+ * @param[out] h_denom_pub set to hash of denomination of the coin
+ * @param[out] phac set to hash of age restriction on the coin
+ * @param[out] coin_sig set to signature affirming the operation
+ * @param[out] partner_url set to the URL of the partner exchange, or NULL for ourselves, must be freed by caller
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_purse_deposit (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_Amount *amount,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_AgeCommitmentHash *phac,
+  struct TALER_CoinSpendSignatureP *coin_sig,
+  char **partner_url);
+
+#endif
diff --git a/src/exchangedb/pg_get_purse_request.c b/src/exchangedb/pg_get_purse_request.c
new file mode 100644
index 000000000..9d2ee5654
--- /dev/null
+++ b/src/exchangedb/pg_get_purse_request.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_template.c
+ * @brief Implementation of the template function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_purse_request.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_purse_request (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t *age_limit,
+  struct TALER_Amount *target_amount,
+  struct TALER_Amount *balance,
+  struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("merge_pub",
+                                          merge_pub),
+    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                     purse_expiration),
+    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                          h_contract_terms),
+    GNUNET_PQ_result_spec_uint32 ("age_limit",
+                                  age_limit),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 target_amount),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                 balance),
+    GNUNET_PQ_result_spec_auto_from_type ("purse_sig",
+                                          purse_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_purse_request",
+           "SELECT "
+           " merge_pub"
+           ",purse_expiration"
+           ",h_contract_terms"
+           ",age_limit"
+           ",amount_with_fee"
+           ",balance"
+           ",purse_sig"
+           " FROM purse_requests"
+           " WHERE purse_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_purse_request",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_purse_request.h b/src/exchangedb/pg_get_purse_request.h
new file mode 100644
index 000000000..24620e1b8
--- /dev/null
+++ b/src/exchangedb/pg_get_purse_request.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+
+
+/**
+ * @file exchangedb/pg_get_purse_request.h
+ * @brief implementation of the get_purse_request function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_PURSE_REQUEST_H
+#define PG_GET_PURSE_REQUEST_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to return meta data about a purse by the
+ * purse public key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the purse
+ * @param[out] merge_pub public key representing the merge capability
+ * @param[out] purse_expiration when would an unmerged purse expire
+ * @param[out] h_contract_terms contract associated with the purse
+ * @param[out] age_limit the age limit for deposits into the purse
+ * @param[out] target_amount amount to be put into the purse
+ * @param[out] balance amount put so far into the purse
+ * @param[out] purse_sig signature of the purse over the initialization data
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_purse_request (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t *age_limit,
+  struct TALER_Amount *target_amount,
+  struct TALER_Amount *balance,
+  struct TALER_PurseContractSignatureP *purse_sig);
+
+#endif
diff --git a/src/exchangedb/pg_get_ready_deposit.c b/src/exchangedb/pg_get_ready_deposit.c
new file mode 100644
index 000000000..d8344faf1
--- /dev/null
+++ b/src/exchangedb/pg_get_ready_deposit.c
@@ -0,0 +1,74 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_ready_deposit.c
+ * @brief Implementation of the get_ready_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_ready_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_ready_deposit (void *cls,
+                          uint64_t start_shard_row,
+                          uint64_t end_shard_row,
+                          struct TALER_MerchantPublicKeyP *merchant_pub,
+                          char **payto_uri)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now
+    = GNUNET_TIME_absolute_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_uint64 (&start_shard_row),
+    GNUNET_PQ_query_param_uint64 (&end_shard_row),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                          merchant_pub),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  payto_uri),
+    GNUNET_PQ_result_spec_end
+  };
+  const char *query = "deposits_get_ready";
+
+  PREPARE (pg,
+           query,
+           "SELECT"
+           " wts.payto_uri"
+           ",bdep.merchant_pub"
+           " FROM batch_deposits bdep"
+           " JOIN wire_targets wts"
+           "   USING (wire_target_h_payto)"
+           " WHERE NOT (bdep.done OR bdep.policy_blocked)"
+           "   AND bdep.wire_deadline<=$1"
+           "   AND bdep.shard >= $2"
+           "   AND bdep.shard <= $3"
+           " ORDER BY "
+           "   bdep.wire_deadline ASC"
+           "  ,bdep.shard ASC"
+           " LIMIT 1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   query,
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_ready_deposit.h b/src/exchangedb/pg_get_ready_deposit.h
new file mode 100644
index 000000000..b1dd7a968
--- /dev/null
+++ b/src/exchangedb/pg_get_ready_deposit.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_ready_deposit.h
+ * @brief implementation of the get_ready_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_READY_DEPOSIT_H
+#define PG_GET_READY_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Obtain information about deposits that are ready to be executed.  Such
+ * deposits must not be marked as "done", the execution time must be
+ * in the past, and the KYC status must be 'ok'.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param start_shard_row minimum shard row to select
+ * @param end_shard_row maximum shard row to select (inclusive)
+ * @param[out] merchant_pub set to the public key of a merchant with a ready deposit
+ * @param[out] payto_uri set to the account of the merchant, to be freed by caller
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_ready_deposit (void *cls,
+                          uint64_t start_shard_row,
+                          uint64_t end_shard_row,
+                          struct TALER_MerchantPublicKeyP *merchant_pub,
+                          char **payto_uri);
+
+#endif
diff --git a/src/exchangedb/pg_get_refresh_reveal.c b/src/exchangedb/pg_get_refresh_reveal.c
new file mode 100644
index 000000000..08d4b21a5
--- /dev/null
+++ b/src/exchangedb/pg_get_refresh_reveal.c
@@ -0,0 +1,213 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_refresh_reveal.c
+ * @brief Implementation of the get_refresh_reveal function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_refresh_reveal.h"
+#include "pg_helper.h"
+
+
+/**
+ * Context where we aggregate data from the database.
+ * Closure for #add_revealed_coins().
+ */
+struct GetRevealContext
+{
+  /**
+   * Array of revealed coins we obtained from the DB.
+   */
+  struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs;
+
+  /**
+   * Length of the @a rrcs array.
+   */
+  unsigned int rrcs_len;
+
+  /**
+   * Set to an error code if we ran into trouble.
+   */
+  enum GNUNET_DB_QueryStatus qs;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct GetRevealContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+add_revealed_coins (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct GetRevealContext *grctx = cls;
+
+  if (0 == num_results)
+    return;
+  grctx->rrcs = GNUNET_new_array (num_results,
+                                  struct TALER_EXCHANGEDB_RefreshRevealedCoin);
+  grctx->rrcs_len = num_results;
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    uint32_t off;
+    struct GNUNET_PQ_ResultSpec rso[] = {
+      GNUNET_PQ_result_spec_uint32 ("freshcoin_index",
+                                    &off),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rso,
+                                  i))
+    {
+      GNUNET_break (0);
+      grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    if (off >= num_results)
+    {
+      GNUNET_break (0);
+      grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
+      return;
+    }
+    {
+      struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx->rrcs[off];
+      struct GNUNET_PQ_ResultSpec rsi[] = {
+        /* NOTE: freshcoin_index selected and discarded here... */
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &rrc->h_denom_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("link_sig",
+                                              &rrc->orig_coin_link_sig),
+        GNUNET_PQ_result_spec_auto_from_type ("h_coin_ev",
+                                              &rrc->coin_envelope_hash),
+        TALER_PQ_result_spec_blinded_planchet ("coin_ev",
+                                               &rrc->blinded_planchet),
+        TALER_PQ_result_spec_exchange_withdraw_values ("ewv",
+                                                       &rrc->exchange_vals),
+        TALER_PQ_result_spec_blinded_denom_sig ("ev_sig",
+                                                &rrc->coin_sig),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (NULL !=
+          rrc->blinded_planchet.blinded_message)
+      {
+        /* duplicate offset, not allowed */
+        GNUNET_break (0);
+        grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
+        return;
+      }
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rsi,
+                                    i))
+      {
+        GNUNET_break (0);
+        grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
+        return;
+      }
+    }
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_refresh_reveal (void *cls,
+                           const struct TALER_RefreshCommitmentP *rc,
+                           TALER_EXCHANGEDB_RefreshCallback cb,
+                           void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GetRevealContext grctx;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (rc),
+    GNUNET_PQ_query_param_end
+  };
+
+  memset (&grctx,
+          0,
+          sizeof (grctx));
+
+  /* Obtain information about the coins created in a refresh
+     operation, used in #postgres_get_refresh_reveal() */
+  PREPARE (pg,
+           "get_refresh_revealed_coins",
+           "SELECT "
+           " rrc.freshcoin_index"
+           ",denom.denom_pub_hash"
+           ",rrc.h_coin_ev"
+           ",rrc.link_sig"
+           ",rrc.coin_ev"
+           ",rrc.ewv"
+           ",rrc.ev_sig"
+           " FROM refresh_commitments"
+           "    JOIN refresh_revealed_coins rrc"
+           "      USING (melt_serial_id)"
+           "    JOIN denominations denom "
+           "      USING (denominations_serial)"
+           " WHERE rc=$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "get_refresh_revealed_coins",
+                                             params,
+                                             &add_revealed_coins,
+                                             &grctx);
+  switch (qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    goto cleanup;
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+  default: /* can have more than one result */
+    break;
+  }
+  switch (grctx.qs)
+  {
+  case GNUNET_DB_STATUS_HARD_ERROR:
+  case GNUNET_DB_STATUS_SOFT_ERROR:
+    goto cleanup;
+  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: /* should be impossible */
+    break;
+  }
+
+  /* Pass result back to application */
+  cb (cb_cls,
+      grctx.rrcs_len,
+      grctx.rrcs);
+cleanup:
+  for (unsigned int i = 0; i < grctx.rrcs_len; i++)
+  {
+    struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx.rrcs[i];
+
+    TALER_blinded_denom_sig_free (&rrc->coin_sig);
+    TALER_blinded_planchet_free (&rrc->blinded_planchet);
+    TALER_denom_ewv_free (&rrc->exchange_vals);
+  }
+  GNUNET_free (grctx.rrcs);
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_refresh_reveal.h b/src/exchangedb/pg_get_refresh_reveal.h
new file mode 100644
index 000000000..15b57b343
--- /dev/null
+++ b/src/exchangedb/pg_get_refresh_reveal.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_refresh_reveal.h
+ * @brief implementation of the get_refresh_reveal function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_REFRESH_REVEAL_H
+#define PG_GET_REFRESH_REVEAL_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Lookup in the database the coins that we want to
+ * create in the given refresh operation.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param rc identify commitment and thus refresh operation
+ * @param cb function to call with the results
+ * @param cb_cls closure for @a cb
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_refresh_reveal (void *cls,
+                           const struct TALER_RefreshCommitmentP *rc,
+                           TALER_EXCHANGEDB_RefreshCallback cb,
+                           void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_reserve_balance.c b/src/exchangedb/pg_get_reserve_balance.c
new file mode 100644
index 000000000..140bf3b70
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_balance.c
@@ -0,0 +1,55 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_reserve_balance.c
+ * @brief Implementation of the get_reserve_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_reserve_balance.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_balance (void *cls,
+                            const struct TALER_ReservePublicKeyP *reserve_pub,
+                            struct TALER_Amount *balance)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_result_spec_amount ("current_balance",
+                                 pg->currency,
+                                 balance),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_reserve_balance",
+           "SELECT"
+           " current_balance"
+           " FROM reserves"
+           " WHERE reserve_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_reserve_balance",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_reserve_balance.h b/src/exchangedb/pg_get_reserve_balance.h
new file mode 100644
index 000000000..6dc88d906
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_balance.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_reserve_balance.h
+ * @brief implementation of the get_reserve_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_RESERVE_BALANCE_H
+#define PG_GET_RESERVE_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Get the balance of the specified reserve.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param[out] balance set to the reserve balance
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_balance (void *cls,
+                            const struct TALER_ReservePublicKeyP *reserve_pub,
+                            struct TALER_Amount *balance);
+
+#endif
diff --git a/src/exchangedb/pg_get_reserve_by_h_blind.c b/src/exchangedb/pg_get_reserve_by_h_blind.c
new file mode 100644
index 000000000..f87fe6cd4
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_by_h_blind.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_reserve_by_h_blind.c
+ * @brief Implementation of the get_reserve_by_h_blind function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_reserve_by_h_blind.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_by_h_blind (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *bch,
+  struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *reserve_out_serial_id)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (bch),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                          reserve_pub),
+    GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
+                                  reserve_out_serial_id),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_get_reserve_by_h_blind() */
+  PREPARE (pg,
+           "reserve_by_h_blind",
+           "SELECT"
+           " reserves.reserve_pub"
+           ",reserve_out_serial_id"
+           " FROM reserves_out"
+           " JOIN reserves"
+           "   USING (reserve_uuid)"
+           " WHERE h_blind_ev=$1"
+           " LIMIT 1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "reserve_by_h_blind",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_reserve_by_h_blind.h b/src/exchangedb/pg_get_reserve_by_h_blind.h
new file mode 100644
index 000000000..49c1c8403
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_by_h_blind.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_reserve_by_h_blind.h
+ * @brief implementation of the get_reserve_by_h_blind function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_RESERVE_BY_H_BLIND_H
+#define PG_GET_RESERVE_BY_H_BLIND_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Obtain information about which reserve a coin was generated
+ * from given the hash of the blinded coin.
+ *
+ * @param cls closure
+ * @param bch hash that uniquely identifies the withdraw request
+ * @param[out] reserve_pub set to information about the reserve (on success only)
+ * @param[out] reserve_out_serial_id set to row of the @a h_blind_ev in reserves_out
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_by_h_blind (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *bch,
+  struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *reserve_out_serial_id);
+
+#endif
diff --git a/src/exchangedb/pg_get_reserve_history.c b/src/exchangedb/pg_get_reserve_history.c
new file mode 100644
index 000000000..1f1ca95b5
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_history.c
@@ -0,0 +1,936 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file pg_get_reserve_history.c
+ * @brief Obtain (parts of) the history of a reserve.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_reserve_history.h"
+#include "pg_start_read_committed.h"
+#include "pg_commit.h"
+#include "pg_rollback.h"
+#include "plugin_exchangedb_common.h"
+#include "pg_helper.h"
+
+/**
+ * How often do we re-try when encountering DB serialization issues?
+ * (We are read-only, so can only happen due to concurrent insert,
+ * which should be very rare.)
+ */
+#define RETRIES 3
+
+
+/**
+ * Closure for callbacks invoked via #TEH_PG_get_reserve_history().
+ */
+struct ReserveHistoryContext
+{
+
+  /**
+   * Which reserve are we building the history for?
+   */
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /**
+   * Where we build the history.
+   */
+  struct TALER_EXCHANGEDB_ReserveHistory *rh;
+
+  /**
+   * Tail of @e rh list.
+   */
+  struct TALER_EXCHANGEDB_ReserveHistory *rh_tail;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Sum of all credit transactions.
+   */
+  struct TALER_Amount balance_in;
+
+  /**
+   * Sum of all debit transactions.
+   */
+  struct TALER_Amount balance_out;
+
+  /**
+   * Set to true on serious internal errors during
+   * the callbacks.
+   */
+  bool failed;
+};
+
+
+/**
+ * Append and return a fresh element to the reserve
+ * history kept in @a rhc.
+ *
+ * @param rhc where the history is kept
+ * @return the fresh element that was added
+ */
+static struct TALER_EXCHANGEDB_ReserveHistory *
+append_rh (struct ReserveHistoryContext *rhc)
+{
+  struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+  tail = GNUNET_new (struct TALER_EXCHANGEDB_ReserveHistory);
+  if (NULL != rhc->rh_tail)
+  {
+    rhc->rh_tail->next = tail;
+    rhc->rh_tail = tail;
+  }
+  else
+  {
+    rhc->rh_tail = tail;
+    rhc->rh = tail;
+  }
+  return tail;
+}
+
+
+/**
+ * Add bank transfers to result set for #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_bank_to_exchange (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_BankTransfer *bt;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    bt = GNUNET_new (struct TALER_EXCHANGEDB_BankTransfer);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_uint64 ("wire_reference",
+                                      &bt->wire_reference),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("credit",
+                                     &bt->amount),
+        GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                         &bt->execution_date),
+        GNUNET_PQ_result_spec_string ("sender_account_details",
+                                      &bt->sender_account_details),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (bt);
+        rhc->failed = true;
+        return;
+      }
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_in,
+                                     &rhc->balance_in,
+                                     &bt->amount));
+    bt->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE;
+    tail->details.bank = bt;
+  } /* end of 'while (0 < rows)' */
+}
+
+
+/**
+ * Add coin withdrawals to result set for #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_withdraw_coin (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_CollectableBlindcoin *cbc;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    cbc = GNUNET_new (struct TALER_EXCHANGEDB_CollectableBlindcoin);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
+                                              &cbc->h_coin_envelope),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &cbc->denom_pub_hash),
+        TALER_PQ_result_spec_blinded_denom_sig ("denom_sig",
+                                                &cbc->sig),
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                              &cbc->reserve_sig),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &cbc->amount_with_fee),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                     &cbc->withdraw_fee),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (cbc);
+        rhc->failed = true;
+        return;
+      }
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_out,
+                                     &rhc->balance_out,
+                                     &cbc->amount_with_fee));
+    cbc->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_WITHDRAW_COIN;
+    tail->details.withdraw = cbc;
+  }
+}
+
+
+/**
+ * Add recoups to result set for #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_recoup (void *cls,
+            PGresult *result,
+            unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_Recoup *recoup;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    recoup = GNUNET_new (struct TALER_EXCHANGEDB_Recoup);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                     &recoup->value),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                              &recoup->coin.coin_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                              &recoup->coin_blind),
+        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                              &recoup->coin_sig),
+        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                         &recoup->timestamp),
+        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                              &recoup->coin.denom_pub_hash),
+        TALER_PQ_result_spec_denom_sig (
+          "denom_sig",
+          &recoup->coin.denom_sig),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (recoup);
+        rhc->failed = true;
+        return;
+      }
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_in,
+                                     &rhc->balance_in,
+                                     &recoup->value));
+    recoup->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_RECOUP_COIN;
+    tail->details.recoup = recoup;
+  } /* end of 'while (0 < rows)' */
+}
+
+
+/**
+ * Add exchange-to-bank transfers to result set for
+ * #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_exchange_to_bank (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_ClosingTransfer *closing;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    closing = GNUNET_new (struct TALER_EXCHANGEDB_ClosingTransfer);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                     &closing->amount),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                     &closing->closing_fee),
+        GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                         &closing->execution_date),
+        GNUNET_PQ_result_spec_string ("receiver_account",
+                                      &closing->receiver_account_details),
+        GNUNET_PQ_result_spec_auto_from_type ("wtid",
+                                              &closing->wtid),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (closing);
+        rhc->failed = true;
+        return;
+      }
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_out,
+                                     &rhc->balance_out,
+                                     &closing->amount));
+    closing->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK;
+    tail->details.closing = closing;
+  } /* end of 'while (0 < rows)' */
+}
+
+
+/**
+ * Add purse merge transfers to result set for
+ * #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_p2p_merge (void *cls,
+               PGresult *result,
+               unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_PurseMerge *merge;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    merge = GNUNET_new (struct TALER_EXCHANGEDB_PurseMerge);
+    {
+      uint32_t flags32;
+      struct TALER_Amount balance;
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
+                                     &merge->purse_fee),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                     &balance),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &merge->amount_with_fee),
+        GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
+                                         &merge->merge_timestamp),
+        GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                         &merge->purse_expiration),
+        GNUNET_PQ_result_spec_uint32 ("age_limit",
+                                      &merge->min_age),
+        GNUNET_PQ_result_spec_uint32 ("flags",
+                                      &flags32),
+        GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                              &merge->h_contract_terms),
+        GNUNET_PQ_result_spec_auto_from_type ("merge_pub",
+                                              &merge->merge_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                              &merge->purse_pub),
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                              &merge->reserve_sig),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (merge);
+        rhc->failed = true;
+        return;
+      }
+      merge->flags = (enum TALER_WalletAccountMergeFlags) flags32;
+      if ( (! GNUNET_TIME_absolute_is_future (
+              merge->merge_timestamp.abs_time)) &&
+           (-1 != TALER_amount_cmp (&balance,
+                                    &merge->amount_with_fee)) )
+        merge->merged = true;
+    }
+    if (merge->merged)
+      GNUNET_assert (0 <=
+                     TALER_amount_add (&rhc->balance_in,
+                                       &rhc->balance_in,
+                                       &merge->amount_with_fee));
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_out,
+                                     &rhc->balance_out,
+                                     &merge->purse_fee));
+    merge->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_PURSE_MERGE;
+    tail->details.merge = merge;
+  }
+}
+
+
+/**
+ * Add paid for history requests to result set for
+ * #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_open_requests (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+  struct PostgresClosure *pg = rhc->pg;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_OpenRequest *orq;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    orq = GNUNET_new (struct TALER_EXCHANGEDB_OpenRequest);
+    {
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        TALER_PQ_RESULT_SPEC_AMOUNT ("open_fee",
+                                     &orq->open_fee),
+        GNUNET_PQ_result_spec_timestamp ("request_timestamp",
+                                         &orq->request_timestamp),
+        GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                         &orq->reserve_expiration),
+        GNUNET_PQ_result_spec_uint32 ("requested_purse_limit",
+                                      &orq->purse_limit),
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                              &orq->reserve_sig),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (orq);
+        rhc->failed = true;
+        return;
+      }
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&rhc->balance_out,
+                                     &rhc->balance_out,
+                                     &orq->open_fee));
+    orq->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_OPEN_REQUEST;
+    tail->details.open_request = orq;
+  }
+}
+
+
+/**
+ * Add paid for history requests to result set for
+ * #TEH_PG_get_reserve_history.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+add_close_requests (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct ReserveHistoryContext *rhc = cls;
+
+  while (0 < num_results)
+  {
+    struct TALER_EXCHANGEDB_CloseRequest *crq;
+    struct TALER_EXCHANGEDB_ReserveHistory *tail;
+
+    crq = GNUNET_new (struct TALER_EXCHANGEDB_CloseRequest);
+    {
+      char *payto_uri;
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_timestamp ("close_timestamp",
+                                         &crq->request_timestamp),
+        GNUNET_PQ_result_spec_string ("payto_uri",
+                                      &payto_uri),
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                              &crq->reserve_sig),
+        GNUNET_PQ_result_spec_end
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_PQ_extract_result (result,
+                                    rs,
+                                    --num_results))
+      {
+        GNUNET_break (0);
+        GNUNET_free (crq);
+        rhc->failed = true;
+        return;
+      }
+      TALER_payto_hash (payto_uri,
+                        &crq->target_account_h_payto);
+      GNUNET_free (payto_uri);
+    }
+    crq->reserve_pub = *rhc->reserve_pub;
+    tail = append_rh (rhc);
+    tail->type = TALER_EXCHANGEDB_RO_CLOSE_REQUEST;
+    tail->details.close_request = crq;
+  }
+}
+
+
+/**
+ * Add reserve history entries found.
+ *
+ * @param cls a `struct ReserveHistoryContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+handle_history_entry (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  static const struct
+  {
+    /**
+     * Table with reserve history entry we are responsible for.
+     */
+    const char *table;
+    /**
+     * Name of the prepared statement to run.
+     */
+    const char *statement;
+    /**
+     * Function to use to process the results.
+     */
+    GNUNET_PQ_PostgresResultHandler cb;
+  } work[] = {
+    /** #TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE */
+    { "reserves_in",
+      "reserves_in_get_transactions",
+      add_bank_to_exchange },
+    /** #TALER_EXCHANGEDB_RO_WITHDRAW_COIN */
+    { "reserves_out",
+      "get_reserves_out",
+      &add_withdraw_coin },
+    /** #TALER_EXCHANGEDB_RO_RECOUP_COIN */
+    { "recoup",
+      "recoup_by_reserve",
+      &add_recoup },
+    /** #TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK */
+    { "reserves_close",
+      "close_by_reserve",
+      &add_exchange_to_bank },
+    /** #TALER_EXCHANGEDB_RO_PURSE_MERGE */
+    { "purse_decision",
+      "merge_by_reserve",
+      &add_p2p_merge },
+    /** #TALER_EXCHANGEDB_RO_OPEN_REQUEST */
+    { "reserves_open_requests",
+      "open_request_by_reserve",
+      &add_open_requests },
+    /** #TALER_EXCHANGEDB_RO_CLOSE_REQUEST */
+    { "close_requests",
+      "close_request_by_reserve",
+      &add_close_requests },
+    /* List terminator */
+    { NULL, NULL, NULL }
+  };
+  struct ReserveHistoryContext *rhc = cls;
+  char *table_name;
+  uint64_t serial_id;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_string ("table_name",
+                                  &table_name),
+    GNUNET_PQ_result_spec_uint64 ("serial_id",
+                                  &serial_id),
+    GNUNET_PQ_result_spec_end
+  };
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (rhc->reserve_pub),
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  while (0 < num_results--)
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    bool found = false;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  num_results))
+    {
+      GNUNET_break (0);
+      rhc->failed = true;
+      return;
+    }
+
+    for (unsigned int i = 0;
+         NULL != work[i].cb;
+         i++)
+    {
+      if (0 != strcmp (table_name,
+                       work[i].table))
+        continue;
+      found = true;
+      qs = GNUNET_PQ_eval_prepared_multi_select (rhc->pg->conn,
+                                                 work[i].statement,
+                                                 params,
+                                                 work[i].cb,
+                                                 rhc);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Reserve %s had %d transactions at %llu in table %s\n",
+                  TALER_B2S (rhc->reserve_pub),
+                  (int) qs,
+                  (unsigned long long) serial_id,
+                  table_name);
+      if (0 >= qs)
+        rhc->failed = true;
+      break;
+    }
+    if (! found)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Coin history includes unsupported table `%s`\n",
+                  table_name);
+      rhc->failed = true;
+    }
+    GNUNET_PQ_cleanup_result (rs);
+    if (rhc->failed)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_history (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t start_off,
+  uint64_t etag_in,
+  uint64_t *etag_out,
+  struct TALER_Amount *balance,
+  struct TALER_EXCHANGEDB_ReserveHistory **rhp)
+{
+  struct PostgresClosure *pg = cls;
+  struct ReserveHistoryContext rhc = {
+    .pg = pg,
+    .reserve_pub = reserve_pub
+  };
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_QueryParam lparams[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_uint64 (&start_off),
+    GNUNET_PQ_query_param_end
+  };
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &rhc.balance_in));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (pg->currency,
+                                        &rhc.balance_out));
+
+  *rhp = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting transactions for reserve %s\n",
+              TALER_B2S (reserve_pub));
+  PREPARE (pg,
+           "get_reserve_history_etag",
+           "SELECT"
+           " hist.reserve_history_serial_id"
+           ",r.current_balance"
+           " FROM reserve_history hist"
+           " JOIN reserves r USING (reserve_pub)"
+           " WHERE hist.reserve_pub=$1"
+           " ORDER BY reserve_history_serial_id DESC"
+           " LIMIT 1;");
+  PREPARE (pg,
+           "get_reserve_history",
+           "SELECT"
+           " table_name"
+           ",serial_id"
+           " FROM reserve_history"
+           " WHERE reserve_pub=$1"
+           "   AND reserve_history_serial_id > $2"
+           " ORDER BY reserve_history_serial_id DESC;");
+
+  PREPARE (pg,
+           "reserves_in_get_transactions",
+           "SELECT"
+           " ri.wire_reference"
+           ",ri.credit"
+           ",ri.execution_date"
+           ",wt.payto_uri AS sender_account_details"
+           " FROM reserves_in ri"
+           " JOIN wire_targets wt"
+           "   ON (wire_source_h_payto = wire_target_h_payto)"
+           " WHERE ri.reserve_pub=$1"
+           "   AND ri.reserve_in_serial_id=$2;");
+  PREPARE (pg,
+           "get_reserves_out",
+           "SELECT"
+           " ro.h_blind_ev"
+           ",denom.denom_pub_hash"
+           ",ro.denom_sig"
+           ",ro.reserve_sig"
+           ",ro.execution_date"
+           ",ro.amount_with_fee"
+           ",denom.fee_withdraw"
+           " FROM reserves_out ro"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " JOIN reserves res"
+           "   USING (reserve_uuid)"
+           " WHERE ro.reserve_out_serial_id=$2"
+           "   AND res.reserve_pub=$1;");
+  PREPARE (pg,
+           "recoup_by_reserve",
+           "SELECT"
+           " rec.coin_pub"
+           ",rec.coin_sig"
+           ",rec.coin_blind"
+           ",rec.amount"
+           ",rec.recoup_timestamp"
+           ",denom.denom_pub_hash"
+           ",kc.denom_sig"
+           " FROM recoup rec"
+           " JOIN reserves_out ro"
+           "   USING (reserve_out_serial_id)"
+           " JOIN reserves res"
+           "   USING (reserve_uuid)"
+           " JOIN known_coins kc"
+           "   USING (coin_pub)"
+           " JOIN denominations denom"
+           "   ON (denom.denominations_serial = kc.denominations_serial)"
+           " WHERE rec.recoup_uuid=$2"
+           "   AND res.reserve_pub=$1;");
+  PREPARE (pg,
+           "close_by_reserve",
+           "SELECT"
+           " rc.amount"
+           ",rc.closing_fee"
+           ",rc.execution_date"
+           ",wt.payto_uri AS receiver_account"
+           ",rc.wtid"
+           " FROM reserves_close rc"
+           " JOIN wire_targets wt"
+           "   USING (wire_target_h_payto)"
+           " WHERE reserve_pub=$1"
+           "   AND close_uuid=$2;");
+  PREPARE (pg,
+           "merge_by_reserve",
+           "SELECT"
+           " pr.amount_with_fee"
+           ",pr.balance"
+           ",pr.purse_fee"
+           ",pr.h_contract_terms"
+           ",pr.merge_pub"
+           ",am.reserve_sig"
+           ",pm.purse_pub"
+           ",pm.merge_timestamp"
+           ",pr.purse_expiration"
+           ",pr.age_limit"
+           ",pr.flags"
+           " FROM purse_decision pdes"
+           "   JOIN purse_requests pr"
+           "     ON (pr.purse_pub = pdes.purse_pub)"
+           "   JOIN purse_merges pm"
+           "     ON (pm.purse_pub = pdes.purse_pub)"
+           "   JOIN account_merges am"
+           "     ON (am.purse_pub = pm.purse_pub AND"
+           "         am.reserve_pub = pm.reserve_pub)"
+           " WHERE pdes.purse_decision_serial_id=$2"
+           "  AND pm.reserve_pub=$1"
+           "  AND COALESCE(pm.partner_serial_id,0)=0" /* must be local! */
+           "  AND NOT pdes.refunded;");
+  PREPARE (pg,
+           "open_request_by_reserve",
+           "SELECT"
+           " reserve_payment"
+           ",request_timestamp"
+           ",expiration_date"
+           ",requested_purse_limit"
+           ",reserve_sig"
+           " FROM reserves_open_requests"
+           " WHERE reserve_pub=$1"
+           "   AND open_request_uuid=$2;");
+  PREPARE (pg,
+           "close_request_by_reserve",
+           "SELECT"
+           " close_timestamp"
+           ",payto_uri"
+           ",reserve_sig"
+           " FROM close_requests"
+           " WHERE reserve_pub=$1"
+           "   AND close_request_serial_id=$2;");
+
+  for (unsigned int i = 0; i<RETRIES; i++)
+  {
+    enum GNUNET_DB_QueryStatus qs;
+    uint64_t end;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("reserve_history_serial_id",
+                                    &end),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
+                                   balance),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        TEH_PG_start_read_committed (pg,
+                                     "get-reserve-transactions"))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    /* First only check the last item, to see if
+       we even need to iterate */
+    qs = GNUNET_PQ_eval_prepared_singleton_select (
+      pg->conn,
+      "get_reserve_history_etag",
+      params,
+      rs);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_PG_rollback (pg);
+      continue;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      *etag_out = end;
+      if (end == etag_in)
+        return qs;
+    }
+    /* We indeed need to iterate over the history */
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Current ETag for reserve %s is %llu\n",
+                TALER_B2S (reserve_pub),
+                (unsigned long long) end);
+
+    qs = GNUNET_PQ_eval_prepared_multi_select (
+      pg->conn,
+      "get_reserve_history",
+      lparams,
+      &handle_history_entry,
+      &rhc);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_PG_rollback (pg);
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_PG_rollback (pg);
+      continue;
+    default:
+      break;
+    }
+    if (rhc.failed)
+    {
+      TEH_PG_rollback (pg);
+      TEH_COMMON_free_reserve_history (pg,
+                                       rhc.rh);
+      return GNUNET_DB_STATUS_SOFT_ERROR;
+    }
+    qs = TEH_PG_commit (pg);
+    switch (qs)
+    {
+    case GNUNET_DB_STATUS_HARD_ERROR:
+      TEH_COMMON_free_reserve_history (pg,
+                                       rhc.rh);
+      return qs;
+    case GNUNET_DB_STATUS_SOFT_ERROR:
+      TEH_COMMON_free_reserve_history (pg,
+                                       rhc.rh);
+      rhc.rh = NULL;
+      continue;
+    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
+    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
+      *rhp = rhc.rh;
+      return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+    }
+  }
+  return GNUNET_DB_STATUS_SOFT_ERROR;
+}
diff --git a/src/exchangedb/pg_get_reserve_history.h b/src/exchangedb/pg_get_reserve_history.h
new file mode 100644
index 000000000..15765f127
--- /dev/null
+++ b/src/exchangedb/pg_get_reserve_history.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_reserve_history.h
+ * @brief implementation of the get_reserve_history function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_RESERVE_HISTORY_H
+#define PG_GET_RESERVE_HISTORY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Compile a list of (historic) transactions performed with the given reserve
+ * (withdraw, incoming wire, open, close operations).  Should return 0 if the @a
+ * reserve_pub is unknown, otherwise determine @a etag_out and if it is past @a
+ * etag_in return the history after @a start_off. @a etag_out should be set
+ * to the last row ID of the given @a reserve_pub in the reserve history table.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param start_off maximum starting offset in history to exclude from returning
+ * @param etag_in up to this offset the client already has a response, do not
+ *                   return anything unless @a etag_out will be larger
+ * @param[out] etag_out set to the latest history offset known for this @a coin_pub
+ * @param[out] balance set to the reserve balance
+ * @param[out] rhp set to known transaction history (NULL if reserve is unknown)
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_reserve_history (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t start_off,
+  uint64_t etag_in,
+  uint64_t *etag_out,
+  struct TALER_Amount *balance,
+  struct TALER_EXCHANGEDB_ReserveHistory **rhp);
+
+
+#endif
diff --git a/src/exchangedb/pg_get_signature_for_known_coin.c b/src/exchangedb/pg_get_signature_for_known_coin.c
new file mode 100644
index 000000000..06074312f
--- /dev/null
+++ b/src/exchangedb/pg_get_signature_for_known_coin.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_signature_for_known_coin.c
+ * @brief Implementation of the get_signature_for_known_coin function for Postgres
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_signature_for_known_coin.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_signature_for_known_coin (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_DenominationPublicKey *denom_pub,
+  struct TALER_DenominationSignature *denom_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                    denom_pub),
+    TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                    denom_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting denomination and signature for (potentially) known coin %s\n",
+              TALER_B2S (coin_pub));
+  PREPARE (pg,
+           "get_signature_for_known_coin",
+           "SELECT"
+           " denominations.denom_pub"
+           ",denom_sig"
+           " FROM known_coins"
+           " JOIN denominations USING (denominations_serial)"
+           " WHERE coin_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_signature_for_known_coin",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_signature_for_known_coin.h b/src/exchangedb/pg_get_signature_for_known_coin.h
new file mode 100644
index 000000000..ec389176b
--- /dev/null
+++ b/src/exchangedb/pg_get_signature_for_known_coin.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_signature_for_known_coin.h
+ * @brief implementation of the get_signature_for_known_coin function for Postgres
+ * @author Özgür Kesim
+ */
+#ifndef PG_GET_SIGNATURE_FOR_KNOWN_COIN_H
+#define PG_GET_SIGNATURE_FOR_KNOWN_COIN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Retrieve the denomination and the corresponding signature for a known coin.
+ *
+ * @param cls the plugin closure
+ * @param coin_pub the public key of the coin to search for
+ * @param[out] denom_pub the denomination of the public key, if coin was present
+ * @param[out] denom_sig the signature with the denomination key of the coin, if coin was present
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_signature_for_known_coin (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_DenominationPublicKey *denom_pub,
+  struct TALER_DenominationSignature *denom_sig);
+
+#endif
diff --git a/src/exchangedb/pg_get_unfinished_close_requests.c b/src/exchangedb/pg_get_unfinished_close_requests.c
new file mode 100644
index 000000000..990e8e00e
--- /dev/null
+++ b/src/exchangedb/pg_get_unfinished_close_requests.c
@@ -0,0 +1,166 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_unfinished_close_requests.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_unfinished_close_requests.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #reserve_close_cb().
+ */
+struct CloseReserveContext
+{
+  /**
+   * Function to call for each to be closed reserve.
+   */
+  TALER_EXCHANGEDB_ReserveExpiredCallback rec;
+
+  /**
+   * Closure to give to @e rec.
+   */
+  void *rec_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserve_cb (void *cls,
+            PGresult *result,
+            unsigned int num_results)
+{
+  struct CloseReserveContext *erc = cls;
+  struct PostgresClosure *pg = erc->pg;
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = GNUNET_OK;
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_TIME_Timestamp exp_date;
+    char *account_details;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_Amount remaining_balance;
+    uint64_t close_request_row;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                       &exp_date),
+      GNUNET_PQ_result_spec_string ("account_details",
+                                    &account_details),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("close",
+                                   &remaining_balance),
+      GNUNET_PQ_result_spec_uint64 ("close_request_serial_id",
+                                    &close_request_row),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ret = GNUNET_SYSERR;
+      break;
+    }
+    ret = erc->rec (erc->rec_cls,
+                    &reserve_pub,
+                    &remaining_balance,
+                    account_details,
+                    exp_date,
+                    close_request_row);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+  erc->status = ret;
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_unfinished_close_requests (
+  void *cls,
+  TALER_EXCHANGEDB_ReserveExpiredCallback rec,
+  void *rec_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct CloseReserveContext ectx = {
+    .rec = rec,
+    .rec_cls = rec_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "get_unfinished_close_requests",
+           "UPDATE close_requests AS rc"
+           " SET done=TRUE"
+           " WHERE done=FALSE"
+           " RETURNING"
+           "    reserve_pub"
+           "   ,close_request_serial_id"
+           "   ,close_timestamp AS expiration_date"
+           "   ,close"
+           "   ,(SELECT payto_uri"
+           "       FROM reserves_in ri"
+           "       JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto)"
+           "      WHERE ri.reserve_pub=rc.reserve_pub)"
+           "    AS account_details;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "get_unfinished_close_requests",
+                                             params,
+                                             &reserve_cb,
+                                             &ectx);
+  switch (ectx.status)
+  {
+  case GNUNET_SYSERR:
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  case GNUNET_NO:
+    return GNUNET_DB_STATUS_SOFT_ERROR;
+  case GNUNET_OK:
+    break;
+  }
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_unfinished_close_requests.h b/src/exchangedb/pg_get_unfinished_close_requests.h
new file mode 100644
index 000000000..4c5aa0d1d
--- /dev/null
+++ b/src/exchangedb/pg_get_unfinished_close_requests.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_get_unfinished_close_requests.h
+ * @brief implementation of the get_unfinished_close_requests function
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_UNFINISHED_CLOSE_REQUESTS_H
+#define PG_GET_UNFINISHED_CLOSE_REQUESTS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Obtain information about force-closed reserves
+ * where the close was not yet done (and their remaining
+ * balances).  Updates the returned reserve's close
+ * status to "done".
+ *
+ * @param cls closure of the plugin
+ * @param rec function to call on expired reserves
+ * @param rec_cls closure for @a rec
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_unfinished_close_requests (
+  void *cls,
+  TALER_EXCHANGEDB_ReserveExpiredCallback rec,
+  void *rec_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_wire_accounts.c b/src/exchangedb/pg_get_wire_accounts.c
new file mode 100644
index 000000000..9770be719
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_accounts.c
@@ -0,0 +1,169 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_accounts.c
+ * @brief Implementation of the get_wire_accounts function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_wire_accounts.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_wire_accounts_cb().
+ */
+struct GetWireAccountsContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_WireAccountCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct MissingWireContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_wire_accounts_cb (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  struct GetWireAccountsContext *ctx = cls;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    char *payto_uri;
+    char *conversion_url = NULL;
+    json_t *debit_restrictions = NULL;
+    json_t *credit_restrictions = NULL;
+    struct TALER_MasterSignatureP master_sig;
+    char *bank_label = NULL;
+    int64_t priority;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("conversion_url",
+                                      &conversion_url),
+        NULL),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("bank_label",
+                                      &bank_label),
+        NULL),
+      GNUNET_PQ_result_spec_int64 ("priority",
+                                   &priority),
+      GNUNET_PQ_result_spec_allow_null (
+        TALER_PQ_result_spec_json ("debit_restrictions",
+                                   &debit_restrictions),
+        NULL),
+      GNUNET_PQ_result_spec_allow_null (
+        TALER_PQ_result_spec_json ("credit_restrictions",
+                                   &credit_restrictions),
+        NULL),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &master_sig),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    if (NULL == debit_restrictions)
+    {
+      debit_restrictions = json_array ();
+      GNUNET_assert (NULL != debit_restrictions);
+    }
+    if (NULL == credit_restrictions)
+    {
+      credit_restrictions = json_array ();
+      GNUNET_assert (NULL != credit_restrictions);
+    }
+    ctx->cb (ctx->cb_cls,
+             payto_uri,
+             conversion_url,
+             debit_restrictions,
+             credit_restrictions,
+             &master_sig,
+             bank_label,
+             priority);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_accounts (void *cls,
+                          TALER_EXCHANGEDB_WireAccountCallback cb,
+                          void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GetWireAccountsContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .status = GNUNET_OK
+  };
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "get_wire_accounts",
+           "SELECT"
+           " payto_uri"
+           ",conversion_url"
+           ",debit_restrictions"
+           ",credit_restrictions"
+           ",master_sig"
+           ",bank_label"
+           ",priority"
+           " FROM wire_accounts"
+           " WHERE is_active");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "get_wire_accounts",
+                                             params,
+                                             &get_wire_accounts_cb,
+                                             &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_wire_accounts.h b/src/exchangedb/pg_get_wire_accounts.h
new file mode 100644
index 000000000..f4dc97ce0
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_accounts.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_accounts.h
+ * @brief implementation of the get_wire_accounts function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_WIRE_ACCOUNTS_H
+#define PG_GET_WIRE_ACCOUNTS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Obtain information about the enabled wire accounts of the exchange.
+ *
+ * @param cls closure
+ * @param cb function to call on each account
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_accounts (void *cls,
+                          TALER_EXCHANGEDB_WireAccountCallback cb,
+                          void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_wire_fee.c b/src/exchangedb/pg_get_wire_fee.c
new file mode 100644
index 000000000..40f517f28
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_fee.c
@@ -0,0 +1,73 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_fee.c
+ * @brief Implementation of the get_wire_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_wire_fee.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_fee (void *cls,
+                     const char *type,
+                     struct GNUNET_TIME_Timestamp date,
+                     struct GNUNET_TIME_Timestamp *start_date,
+                     struct GNUNET_TIME_Timestamp *end_date,
+                     struct TALER_WireFeeSet *fees,
+                     struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (type),
+    GNUNET_PQ_query_param_timestamp (&date),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("start_date",
+                                     start_date),
+    GNUNET_PQ_result_spec_timestamp ("end_date",
+                                     end_date),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
+                                 &fees->wire),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                 &fees->closing),
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_wire_fee",
+           "SELECT "
+           " start_date"
+           ",end_date"
+           ",wire_fee"
+           ",closing_fee"
+           ",master_sig"
+           " FROM wire_fee"
+           " WHERE wire_method=$1"
+           "   AND start_date <= $2"
+           "   AND end_date > $2;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_wire_fee",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_wire_fee.h b/src/exchangedb/pg_get_wire_fee.h
new file mode 100644
index 000000000..409a5c48b
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_fee.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_fee.h
+ * @brief implementation of the get_wire_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_WIRE_FEE_H
+#define PG_GET_WIRE_FEE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain wire fee from database.
+ *
+ * @param cls closure
+ * @param type type of wire transfer the fee applies for
+ * @param date for which date do we want the fee?
+ * @param[out] start_date when does the fee go into effect
+ * @param[out] end_date when does the fee end being valid
+ * @param[out] fees how high are the wire fees
+ * @param[out] master_sig signature over the above by the exchange master key
+ * @return status of the transaction
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_fee (void *cls,
+                     const char *type,
+                     struct GNUNET_TIME_Timestamp date,
+                     struct GNUNET_TIME_Timestamp *start_date,
+                     struct GNUNET_TIME_Timestamp *end_date,
+                     struct TALER_WireFeeSet *fees,
+                     struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_get_wire_fees.c b/src/exchangedb/pg_get_wire_fees.c
new file mode 100644
index 000000000..193ccff6a
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_fees.c
@@ -0,0 +1,147 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_fees.c
+ * @brief Implementation of the get_wire_fees function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_wire_fees.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #get_wire_fees_cb().
+ */
+struct GetWireFeesContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_WireFeeCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct GetWireFeesContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_wire_fees_cb (void *cls,
+                  PGresult *result,
+                  unsigned int num_results)
+{
+  struct GetWireFeesContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_MasterSignatureP master_sig;
+    struct TALER_WireFeeSet fees;
+    struct GNUNET_TIME_Timestamp start_date;
+    struct GNUNET_TIME_Timestamp end_date;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
+                                   &fees.wire),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                   &fees.closing),
+      GNUNET_PQ_result_spec_timestamp ("start_date",
+                                       &start_date),
+      GNUNET_PQ_result_spec_timestamp ("end_date",
+                                       &end_date),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &master_sig),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             &fees,
+             start_date,
+             end_date,
+             &master_sig);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_fees (void *cls,
+                      const char *wire_method,
+                      TALER_EXCHANGEDB_WireFeeCallback cb,
+                      void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (wire_method),
+    GNUNET_PQ_query_param_end
+  };
+  struct GetWireFeesContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "get_wire_fees",
+           "SELECT"
+           " wire_fee"
+           ",closing_fee"
+           ",start_date"
+           ",end_date"
+           ",master_sig"
+           " FROM wire_fee"
+           " WHERE wire_method=$1");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "get_wire_fees",
+                                             params,
+                                             &get_wire_fees_cb,
+                                             &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_wire_fees.h b/src/exchangedb/pg_get_wire_fees.h
new file mode 100644
index 000000000..798a514db
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_fees.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_fees.h
+ * @brief implementation of the get_wire_fees function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_WIRE_FEES_H
+#define PG_GET_WIRE_FEES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain information about the fee structure of the exchange for
+ * a given @a wire_method
+ *
+ * @param cls closure
+ * @param wire_method which wire method to obtain fees for
+ * @param cb function to call on each account
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_fees (void *cls,
+                      const char *wire_method,
+                      TALER_EXCHANGEDB_WireFeeCallback cb,
+                      void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_get_wire_hash_for_contract.c b/src/exchangedb/pg_get_wire_hash_for_contract.c
new file mode 100644
index 000000000..afd659b18
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_hash_for_contract.c
@@ -0,0 +1,81 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_hash_for_contract.c
+ * @brief Implementation of the get_wire_hash_for_contract function for Postgres
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_exchangedb_plugin.h"
+#include "taler_pq_lib.h"
+#include "pg_get_wire_hash_for_contract.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_hash_for_contract (
+  void *cls,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct TALER_MerchantWireHashP *h_wire)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
+    GNUNET_PQ_query_param_end
+  };
+  char *payto_uri;
+  struct TALER_WireSaltP wire_salt;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                          &wire_salt),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  &payto_uri),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /* check if the necessary records exist and get them */
+  PREPARE (pg,
+           "get_wire_hash_for_contract",
+           "SELECT"
+           " bdep.wire_salt"
+           ",wt.payto_uri"
+           " FROM coin_deposits"
+           "    JOIN batch_deposits bdep"
+           "      USING (batch_deposit_serial_id)"
+           "    JOIN wire_targets wt"
+           "      USING (wire_target_h_payto)"
+           " WHERE bdep.merchant_pub=$1"
+           "   AND bdep.h_contract_terms=$2");
+  /* NOTE: above query might be more efficient if we computed the shard
+     from the merchant_pub and included that in the query */
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "get_wire_hash_for_contract",
+                                                 params,
+                                                 rs);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    TALER_merchant_wire_signature_hash (payto_uri,
+                                        &wire_salt,
+                                        h_wire);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+  return qs;
+}
diff --git a/src/exchangedb/pg_get_wire_hash_for_contract.h b/src/exchangedb/pg_get_wire_hash_for_contract.h
new file mode 100644
index 000000000..f95cd29c1
--- /dev/null
+++ b/src/exchangedb/pg_get_wire_hash_for_contract.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_wire_hash_for_contract.h
+ * @brief implementation of the get_wire_hash_for_contract function for Postgres
+ * @author Özgür Kesim
+ */
+#ifndef PG_GET_WIRE_HASH_FOR_CONTRACT_H
+#define PG_GET_WIRE_HASH_FOR_CONTRACT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Try to get the salted hash of a merchant's bank account to a deposit
+ * contract. This is necessary in the event of a conflict with a given
+ * (merchant_pub, h_contract_terms) during deposit.
+ *
+ * @param cls closure
+ * @param merchant_pub merchant public key
+ * @param h_contract_terms hash of the proposal data
+ * @param[out] h_wire salted hash of a merchant's bank account
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_wire_hash_for_contract (
+  void *cls,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct TALER_MerchantWireHashP *h_wire);
+
+#endif
diff --git a/src/exchangedb/pg_get_withdraw_info.c b/src/exchangedb/pg_get_withdraw_info.c
new file mode 100644
index 000000000..e06fa3764
--- /dev/null
+++ b/src/exchangedb/pg_get_withdraw_info.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_withdraw_info.c
+ * @brief Implementation of the get_withdraw_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_withdraw_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_withdraw_info (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *bch,
+  struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (bch),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                          &collectable->denom_pub_hash),
+    TALER_PQ_result_spec_blinded_denom_sig ("denom_sig",
+                                            &collectable->sig),
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                          &collectable->reserve_sig),
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                          &collectable->reserve_pub),
+    GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
+                                          &collectable->h_coin_envelope),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 &collectable->amount_with_fee),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                 &collectable->withdraw_fee),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_withdraw_info",
+           "SELECT"
+           " denom.denom_pub_hash"
+           ",denom_sig"
+           ",reserve_sig"
+           ",reserves.reserve_pub"
+           ",execution_date"
+           ",h_blind_ev"
+           ",amount_with_fee"
+           ",denom.fee_withdraw"
+           " FROM reserves_out"
+           "    JOIN reserves"
+           "      USING (reserve_uuid)"
+           "    JOIN denominations denom"
+           "      USING (denominations_serial)"
+           " WHERE h_blind_ev=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_withdraw_info",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_get_withdraw_info.h b/src/exchangedb/pg_get_withdraw_info.h
new file mode 100644
index 000000000..7c3e06a02
--- /dev/null
+++ b/src/exchangedb/pg_get_withdraw_info.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_get_withdraw_info.h
+ * @brief implementation of the get_withdraw_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_GET_WITHDRAW_INFO_H
+#define PG_GET_WITHDRAW_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Locate the response for a /reserve/withdraw request under the
+ * key of the hash of the blinded message.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param bch hash that uniquely identifies the withdraw operation
+ * @param collectable corresponding collectable coin (blind signature)
+ *                    if a coin is found
+ * @return statement execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_get_withdraw_info (
+  void *cls,
+  const struct TALER_BlindedCoinHashP *bch,
+  struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable);
+
+#endif
diff --git a/src/exchangedb/pg_have_deposit2.c b/src/exchangedb/pg_have_deposit2.c
new file mode 100644
index 000000000..e00ad7490
--- /dev/null
+++ b/src/exchangedb/pg_have_deposit2.c
@@ -0,0 +1,117 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_have_deposit2.c
+ * @brief Implementation of the have_deposit2 function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_have_deposit2.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_have_deposit2 (
+  void *cls,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant,
+  struct GNUNET_TIME_Timestamp refund_deadline,
+  struct TALER_Amount *deposit_fee,
+  struct GNUNET_TIME_Timestamp *exchange_timestamp)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
+    GNUNET_PQ_query_param_auto_from_type (merchant),
+    GNUNET_PQ_query_param_end
+  };
+  struct TALER_EXCHANGEDB_Deposit deposit2;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 &deposit2.amount_with_fee),
+    GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
+                                     &deposit2.timestamp),
+    GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
+                                     exchange_timestamp),
+    GNUNET_PQ_result_spec_timestamp ("refund_deadline",
+                                     &deposit2.refund_deadline),
+    GNUNET_PQ_result_spec_timestamp ("wire_deadline",
+                                     &deposit2.wire_deadline),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                 deposit_fee),
+    GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                          &deposit2.wire_salt),
+    GNUNET_PQ_result_spec_string ("receiver_wire_account",
+                                  &deposit2.receiver_wire_account),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_MerchantWireHashP h_wire2;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Getting deposits for coin %s\n",
+              TALER_B2S (coin_pub));
+  PREPARE (pg,
+           "get_deposit",
+           "SELECT"
+           " cdep.amount_with_fee"
+           ",denominations.fee_deposit"
+           ",bdep.wallet_timestamp"
+           ",bdep.exchange_timestamp"
+           ",bdep.refund_deadline"
+           ",bdep.wire_deadline"
+           ",bdep.h_contract_terms"
+           ",bdep.wire_salt"
+           ",wt.payto_uri AS receiver_wire_account"
+           " FROM coin_deposits cdep"
+           " JOIN batch_deposits bdep USING (batch_deposit_serial_id)"
+           " JOIN known_coins kc ON (kc.coin_pub = cdep.coin_pub)"
+           " JOIN denominations USING (denominations_serial)"
+           " JOIN wire_targets wt USING (wire_target_h_payto)"
+           " WHERE cdep.coin_pub=$1"
+           "   AND bdep.merchant_pub=$3"
+           "   AND bdep.h_contract_terms=$2;");
+  /* Note: query might be made more efficient if we computed the 'shard'
+     from merchant_pub and included that as a constraint on bdep! */
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "get_deposit",
+                                                 params,
+                                                 rs);
+  if (0 >= qs)
+    return qs;
+  TALER_merchant_wire_signature_hash (deposit2.receiver_wire_account,
+                                      &deposit2.wire_salt,
+                                      &h_wire2);
+  GNUNET_free (deposit2.receiver_wire_account);
+  /* Now we check that the other information in @a deposit
+     also matches, and if not report inconsistencies. */
+  if ( (GNUNET_TIME_timestamp_cmp (refund_deadline,
+                                   !=,
+                                   deposit2.refund_deadline)) ||
+       (0 != GNUNET_memcmp (h_wire,
+                            &h_wire2) ) )
+  {
+    /* Inconsistencies detected! Does not match! */
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
diff --git a/src/exchangedb/pg_have_deposit2.h b/src/exchangedb/pg_have_deposit2.h
new file mode 100644
index 000000000..0e8119c20
--- /dev/null
+++ b/src/exchangedb/pg_have_deposit2.h
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_have_deposit2.h
+ * @brief implementation of the have_deposit2 function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_HAVE_DEPOSIT2_H
+#define PG_HAVE_DEPOSIT2_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Check if we have the specified deposit already in the database.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param h_contract_terms contract to check for
+ * @param h_wire wire hash to check for
+ * @param coin_pub public key of the coin to check for
+ * @param merchant merchant public key to check for
+ * @param refund_deadline expected refund deadline
+ * @param[out] deposit_fee set to the deposit fee the exchange charged
+ * @param[out] exchange_timestamp set to the time when the exchange received the deposit
+ * @return 1 if we know this operation,
+ *         0 if this exact deposit is unknown to us,
+ *         otherwise transaction error status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_have_deposit2 (
+  void *cls,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant,
+  struct GNUNET_TIME_Timestamp refund_deadline,
+  struct TALER_Amount *deposit_fee,
+  struct GNUNET_TIME_Timestamp *exchange_timestamp);
+#endif
diff --git a/src/exchangedb/pg_helper.h b/src/exchangedb/pg_helper.h
new file mode 100644
index 000000000..c63c9111d
--- /dev/null
+++ b/src/exchangedb/pg_helper.h
@@ -0,0 +1,149 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_helper.h
+ * @brief shared internal definitions for postgres DB plugin
+ * @author Christian Grothoff
+ */
+#ifndef PG_HELPER_H
+#define PG_HELPER_H
+
+
+/**
+ * Type of the "cls" argument given to each of the functions in
+ * our API.
+ */
+struct PostgresClosure
+{
+
+  /**
+   * Our configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Directory with SQL statements to run to create tables.
+   */
+  char *sql_dir;
+
+  /**
+   * After how long should idle reserves be closed?
+   */
+  struct GNUNET_TIME_Relative idle_reserve_expiration_time;
+
+  /**
+   * After how long should reserves that have seen withdraw operations
+   * be garbage collected?
+   */
+  struct GNUNET_TIME_Relative legal_reserve_expiration_time;
+
+  /**
+   * What delay should we introduce before ready transactions
+   * are actually aggregated?
+   */
+  struct GNUNET_TIME_Relative aggregator_shift;
+
+  /**
+   * Which currency should we assume all amounts to be in?
+   */
+  char *currency;
+
+  /**
+   * Our base URL.
+   */
+  char *exchange_url;
+
+  /**
+   * Postgres connection handle.
+   */
+  struct GNUNET_PQ_Context *conn;
+
+  /**
+   * Name of the current transaction, for debugging.
+   */
+  const char *transaction_name;
+
+  /**
+   * Counts how often we have established a fresh @e conn
+   * to the database. Used to re-prepare statements.
+   */
+  unsigned long long prep_gen;
+
+  /**
+   * Number of purses we allow to be opened concurrently
+   * for one year per annual fee payment.
+   */
+  uint32_t def_purse_limit;
+
+};
+
+
+/**
+ * Prepares SQL statement @a sql under @a name for
+ * connection @a pg once.
+ * Returns with #GNUNET_DB_STATUS_HARD_ERROR on failure.
+ *
+ * @param pg a `struct PostgresClosure`
+ * @param name name to prepare the statement under
+ * @param sql actual SQL text
+ */
+#define PREPARE(pg,name,sql)                      \
+  do {                                            \
+    static struct {                               \
+      unsigned long long cnt;                     \
+      struct PostgresClosure *pg;                 \
+    } preps[2]; /* 2 ctrs for taler-auditor-sync*/ \
+    unsigned int off = 0;                         \
+                                                  \
+    while ( (NULL != preps[off].pg) &&            \
+            (pg != preps[off].pg) &&              \
+            (off < sizeof(preps) / sizeof(*preps)) ) \
+    off++;                                      \
+    GNUNET_assert (off <                          \
+                   sizeof(preps) / sizeof(*preps)); \
+    if (preps[off].cnt < pg->prep_gen)            \
+    {                                             \
+      struct GNUNET_PQ_PreparedStatement ps[] = { \
+        GNUNET_PQ_make_prepare (name, sql),       \
+        GNUNET_PQ_PREPARED_STATEMENT_END          \
+      };                                          \
+                                                  \
+      if (GNUNET_OK !=                            \
+          GNUNET_PQ_prepare_statements (pg->conn, \
+                                        ps))      \
+      {                                           \
+        GNUNET_break (0);                         \
+        return GNUNET_DB_STATUS_HARD_ERROR;       \
+      }                                           \
+      preps[off].pg = pg;                         \
+      preps[off].cnt = pg->prep_gen;              \
+    }                                             \
+  } while (0)
+
+
+/**
+ * Wrapper macro to add the currency from the plugin's state
+ * when fetching amounts from the database.
+ *
+ * @param field name of the database field to fetch amount from
+ * @param[out] amountp pointer to amount to set
+ */
+#define TALER_PQ_RESULT_SPEC_AMOUNT(field, \
+                                    amountp) TALER_PQ_result_spec_amount ( \
+    field,pg->currency,amountp)
+
+
+#endif
diff --git a/src/exchangedb/pg_inject_auditor_triggers.c b/src/exchangedb/pg_inject_auditor_triggers.c
new file mode 100644
index 000000000..562a1a22c
--- /dev/null
+++ b/src/exchangedb/pg_inject_auditor_triggers.c
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_inject_auditor_triggers.c
+ * @brief Implementation of the inject_auditor_triggers function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_gc.h"
+#include "pg_helper.h"
+
+
+/**
+ * Function called to inject auditor triggers into the
+ * database, triggering the real-time auditor upon
+ * relevant INSERTs.
+ *
+ * @param cls closure
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_SYSERR on DB errors
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_inject_auditor_triggers (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_Context *conn;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_try_execute ("SET search_path TO exchange;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
+                                     "exchangedb-postgres",
+                                     "auditor-triggers-",
+                                     es,
+                                     NULL);
+  if (NULL == conn)
+    return GNUNET_SYSERR;
+  GNUNET_PQ_disconnect (conn);
+  return GNUNET_OK;
+}
diff --git a/src/exchangedb/pg_inject_auditor_triggers.h b/src/exchangedb/pg_inject_auditor_triggers.h
new file mode 100644
index 000000000..2dfa9468c
--- /dev/null
+++ b/src/exchangedb/pg_inject_auditor_triggers.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_inject_auditor_triggers.h
+ * @brief implementation of the inject_auditor_triggers function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INJECT_AUDITOR_TRIGGERS_H
+#define PG_INJECT_AUDITOR_TRIGGERS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to inject auditor triggers into the
+ * database, triggering the real-time auditor upon
+ * relevant INSERTs.
+ *
+ * @param cls closure
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_SYSERR on DB errors
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_inject_auditor_triggers (void *cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_aml_decision.c b/src/exchangedb/pg_insert_aml_decision.c
new file mode 100644
index 000000000..39419be59
--- /dev/null
+++ b/src/exchangedb/pg_insert_aml_decision.c
@@ -0,0 +1,97 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_aml_decision.c
+ * @brief Implementation of the insert_aml_decision function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_aml_decision.h"
+#include "pg_helper.h"
+#include <gnunet/gnunet_pq_lib.h>
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_aml_decision (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *new_threshold,
+  enum TALER_AmlDecisionState new_status,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const char *justification,
+  const json_t *kyc_requirements,
+  uint64_t requirements_row,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_AmlOfficerSignatureP *decider_sig,
+  bool *invalid_officer,
+  struct GNUNET_TIME_Timestamp *last_date)
+{
+  struct PostgresClosure *pg = cls;
+  uint32_t ns = (uint32_t) new_status;
+  struct TALER_KycCompletedEventP rep = {
+    .header.size = htons (sizeof (rep)),
+    .header.type = htons (TALER_DBEVENT_EXCHANGE_KYC_COMPLETED),
+    .h_payto = *h_payto
+  };
+  char *notify_s = GNUNET_PQ_get_event_notify_channel (&rep.header);
+  char *kyc_s = (NULL != kyc_requirements)
+    ? json_dumps (kyc_requirements, JSON_COMPACT)
+    : NULL;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 new_threshold),
+    GNUNET_PQ_query_param_uint32 (&ns),
+    GNUNET_PQ_query_param_timestamp (&decision_time),
+    GNUNET_PQ_query_param_string (justification),
+    GNUNET_PQ_query_param_auto_from_type (decider_pub),
+    GNUNET_PQ_query_param_auto_from_type (decider_sig),
+    GNUNET_PQ_query_param_string (notify_s),
+    NULL != kyc_requirements
+    ? GNUNET_PQ_query_param_string (kyc_s)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_uint64 (&requirements_row),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("out_invalid_officer",
+                                invalid_officer),
+    GNUNET_PQ_result_spec_timestamp ("out_last_date",
+                                     last_date),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "do_insert_aml_decision",
+           "SELECT"
+           " out_invalid_officer"
+           ",out_last_date"
+           " FROM exchange_do_insert_aml_decision"
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "do_insert_aml_decision",
+                                                 params,
+                                                 rs);
+  GNUNET_free (notify_s);
+  GNUNET_PQ_event_do_poll (pg->conn);
+  if (NULL != kyc_s)
+    free (kyc_s);
+  return qs;
+}
diff --git a/src/exchangedb/pg_insert_aml_decision.h b/src/exchangedb/pg_insert_aml_decision.h
new file mode 100644
index 000000000..073a2f50a
--- /dev/null
+++ b/src/exchangedb/pg_insert_aml_decision.h
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_aml_decision.h
+ * @brief implementation of the insert_aml_decision function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_AML_DECISION_H
+#define PG_INSERT_AML_DECISION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert an AML decision. Inserts into AML history and insert or updates AML
+ * status.
+ *
+ * @param cls closure
+ * @param h_payto account for which the attribute data is stored
+ * @param new_threshold new monthly threshold that would trigger an AML check
+ * @param new_status AML decision status
+ * @param decision_time when was the decision made
+ * @param justification human-readable text justifying the decision
+ * @param kyc_requirements JSON array with KYC requirements
+ * @param requirements_row row in the KYC table for this process, 0 for none
+ * @param decider_pub public key of the staff member
+ * @param decider_sig signature of the staff member
+ * @param[out] invalid_officer set to TRUE if @a decider_pub is not allowed to make decisions right now
+ * @param[out] last_date set to the previous decision time;
+ *   the INSERT is not performed if @a last_date is not before @a decision_time
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_aml_decision (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *new_threshold,
+  enum TALER_AmlDecisionState new_status,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const char *justification,
+  const json_t *kyc_requirements,
+  uint64_t requirements_row,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_AmlOfficerSignatureP *decider_sig,
+  bool *invalid_officer,
+  struct GNUNET_TIME_Timestamp *last_date);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_aml_officer.c b/src/exchangedb/pg_insert_aml_officer.c
new file mode 100644
index 000000000..c1f635a64
--- /dev/null
+++ b/src/exchangedb/pg_insert_aml_officer.c
@@ -0,0 +1,66 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_aml_officer.c
+ * @brief Implementation of the insert_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_aml_officer.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_MasterSignatureP *master_sig,
+  const char *decider_name,
+  bool is_active,
+  bool read_only,
+  struct GNUNET_TIME_Timestamp last_change,
+  struct GNUNET_TIME_Timestamp *previous_change)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (decider_pub),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_string (decider_name),
+    GNUNET_PQ_query_param_bool (is_active),
+    GNUNET_PQ_query_param_bool (read_only),
+    GNUNET_PQ_query_param_timestamp (&last_change),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("out_last_change",
+                                     previous_change),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "do_insert_aml_staff",
+           "SELECT"
+           " out_last_change"
+           " FROM exchange_do_insert_aml_officer"
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "do_insert_aml_staff",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_insert_aml_officer.h b/src/exchangedb/pg_insert_aml_officer.h
new file mode 100644
index 000000000..3c6f5d82e
--- /dev/null
+++ b/src/exchangedb/pg_insert_aml_officer.h
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_aml_officer.h
+ * @brief implementation of the insert_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_AML_OFFICER_H
+#define PG_INSERT_AML_OFFICER_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert AML staff record.  If the time given in
+ * @a last_change is before the previous change in the
+ * database, only @e previous_change is returned and
+ * no actual change is committed to the database.
+ *
+ * @param cls closure
+ * @param decider_pub public key of the staff member
+ * @param master_sig offline signature affirming the AML officer
+ * @param decider_name full name of the staff member
+ * @param is_active true to enable, false to set as inactive
+ * @param read_only true to set read-only access
+ * @param last_change when was the change made effective
+ * @param[out] previous_change set to the time of the previous change
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_MasterSignatureP *master_sig,
+  const char *decider_name,
+  bool is_active,
+  bool read_only,
+  struct GNUNET_TIME_Timestamp last_change,
+  struct GNUNET_TIME_Timestamp *previous_change);
+
+#endif
diff --git a/src/exchangedb/pg_insert_auditor.c b/src/exchangedb/pg_insert_auditor.c
new file mode 100644
index 000000000..2f1de7ba7
--- /dev/null
+++ b/src/exchangedb/pg_insert_auditor.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_auditor.c
+ * @brief Implementation of the insert_auditor function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_auditor.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_auditor (void *cls,
+                       const struct TALER_AuditorPublicKeyP *auditor_pub,
+                       const char *auditor_url,
+                       const char *auditor_name,
+                       struct GNUNET_TIME_Timestamp start_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_string (auditor_name),
+    GNUNET_PQ_query_param_string (auditor_url),
+    GNUNET_PQ_query_param_timestamp (&start_date),
+    GNUNET_PQ_query_param_end
+  };
+
+  /* used in #postgres_insert_auditor() */
+  PREPARE (pg,
+           "insert_auditor",
+           "INSERT INTO auditors "
+           "(auditor_pub"
+           ",auditor_name"
+           ",auditor_url"
+           ",is_active"
+           ",last_change"
+           ") VALUES "
+           "($1, $2, $3, true, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_auditor",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_auditor.h b/src/exchangedb/pg_insert_auditor.h
new file mode 100644
index 000000000..8de388f23
--- /dev/null
+++ b/src/exchangedb/pg_insert_auditor.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_auditor.h
+ * @brief implementation of the insert_auditor function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_AUDITOR_H
+#define PG_INSERT_AUDITOR_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Insert information about an auditor that will audit this exchange.
+ *
+ * @param cls closure
+ * @param auditor_pub key of the auditor
+ * @param auditor_url base URL of the auditor's REST service
+ * @param auditor_name name of the auditor (for humans)
+ * @param start_date date when the auditor was added by the offline system
+ *                      (only to be used for replay detection)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_auditor (void *cls,
+                       const struct TALER_AuditorPublicKeyP *auditor_pub,
+                       const char *auditor_url,
+                       const char *auditor_name,
+                       struct GNUNET_TIME_Timestamp start_date);
+#endif
diff --git a/src/exchangedb/pg_insert_auditor_denom_sig.c b/src/exchangedb/pg_insert_auditor_denom_sig.c
new file mode 100644
index 000000000..3643a87f2
--- /dev/null
+++ b/src/exchangedb/pg_insert_auditor_denom_sig.c
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_auditor_denom_sig.c
+ * @brief Implementation of the insert_auditor_denom_sig function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_auditor_denom_sig.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_auditor_denom_sig (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  const struct TALER_AuditorSignatureP *auditor_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
+    GNUNET_PQ_query_param_auto_from_type (auditor_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_auditor_denom_sig",
+           "WITH ax AS"
+           " (SELECT auditor_uuid"
+           "    FROM auditors"
+           "   WHERE auditor_pub=$1)"
+           "INSERT INTO auditor_denom_sigs "
+           "(auditor_uuid"
+           ",denominations_serial"
+           ",auditor_sig"
+           ") SELECT ax.auditor_uuid, denominations_serial, $3 "
+           "    FROM denominations"
+           "   CROSS JOIN ax"
+           "   WHERE denom_pub_hash=$2;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_auditor_denom_sig",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_auditor_denom_sig.h b/src/exchangedb/pg_insert_auditor_denom_sig.h
new file mode 100644
index 000000000..baa67cfe8
--- /dev/null
+++ b/src/exchangedb/pg_insert_auditor_denom_sig.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_auditor_denom_sig.h
+ * @brief implementation of the insert_auditor_denom_sig function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_AUDITOR_DENOM_SIG_H
+#define PG_INSERT_AUDITOR_DENOM_SIG_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Insert information about an auditor auditing a denomination key.
+ *
+ * @param cls closure
+ * @param h_denom_pub the audited denomination
+ * @param auditor_pub the auditor's key
+ * @param auditor_sig signature affirming the auditor's audit activity
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_auditor_denom_sig (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  const struct TALER_AuditorSignatureP *auditor_sig);
+#endif
diff --git a/src/exchangedb/pg_insert_close_request.c b/src/exchangedb/pg_insert_close_request.c
new file mode 100644
index 000000000..b4bc5f4a7
--- /dev/null
+++ b/src/exchangedb/pg_insert_close_request.c
@@ -0,0 +1,68 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_close_request.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_close_request.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_close_request (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const char *payto_uri,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_Amount *balance,
+  const struct TALER_Amount *closing_fee)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_timestamp (&request_timestamp),
+    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 balance),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 closing_fee),
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_account_close",
+           "INSERT INTO close_requests"
+           "(reserve_pub"
+           ",close_timestamp"
+           ",reserve_sig"
+           ",close"
+           ",close_fee"
+           ",payto_uri"
+           ")"
+           "VALUES "
+           "($1, $2, $3, $4, $5, $6)"
+           " ON CONFLICT DO NOTHING;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_account_close",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_close_request.h b/src/exchangedb/pg_insert_close_request.h
new file mode 100644
index 000000000..c014a10b9
--- /dev/null
+++ b/src/exchangedb/pg_insert_close_request.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_close_request.h
+ * @brief implementation of the insert_close_request function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_CLOSE_REQUEST_H
+#define PG_INSERT_CLOSE_REQUEST_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to initiate closure of an account.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param reserve_pub public key of the account to close
+ * @param payto_uri where to wire the funds
+ * @param reserve_sig signature affiming that the account is to be closed
+ * @param request_timestamp time of the close request (client-side?)
+ * @param balance final balance in the reserve
+ * @param closing_fee closing fee to charge
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_close_request (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const char *payto_uri,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_Amount *balance,
+  const struct TALER_Amount *closing_fee);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_contract.c b/src/exchangedb/pg_insert_contract.c
new file mode 100644
index 000000000..0274f8d93
--- /dev/null
+++ b/src/exchangedb/pg_insert_contract.c
@@ -0,0 +1,93 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_contract.c
+ * @brief Implementation of the insert_contract function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_contract.h"
+#include "pg_select_contract_by_purse.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_contract (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_EncryptedContract *econtract,
+  bool *in_conflict)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (&econtract->contract_pub),
+    GNUNET_PQ_query_param_fixed_size (econtract->econtract,
+                                      econtract->econtract_size),
+    GNUNET_PQ_query_param_auto_from_type (&econtract->econtract_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  *in_conflict = false;
+  /* Used in #postgres_insert_contract() */
+  PREPARE (pg,
+           "insert_contract",
+           "INSERT INTO contracts"
+           "  (purse_pub"
+           "  ,pub_ckey"
+           "  ,e_contract"
+           "  ,contract_sig"
+           "  ,purse_expiration"
+           "  ) SELECT "
+           "  $1, $2, $3, $4, purse_expiration"
+           "  FROM purse_requests"
+           "  WHERE purse_pub=$1"
+           "  ON CONFLICT DO NOTHING;");
+  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                           "insert_contract",
+                                           params);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs)
+    return qs;
+  {
+    struct TALER_EncryptedContract econtract2;
+
+    qs = TEH_PG_select_contract_by_purse (pg,
+                                          purse_pub,
+                                          &econtract2);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if ( (0 == GNUNET_memcmp (&econtract->contract_pub,
+                              &econtract2.contract_pub)) &&
+         (econtract2.econtract_size ==
+          econtract->econtract_size) &&
+         (0 == memcmp (econtract2.econtract,
+                       econtract->econtract,
+                       econtract->econtract_size)) )
+    {
+      GNUNET_free (econtract2.econtract);
+      return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+    }
+    GNUNET_free (econtract2.econtract);
+    *in_conflict = true;
+    return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+  }
+}
diff --git a/src/exchangedb/pg_insert_contract.h b/src/exchangedb/pg_insert_contract.h
new file mode 100644
index 000000000..e2e6b5ee9
--- /dev/null
+++ b/src/exchangedb/pg_insert_contract.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_contract.h
+ * @brief implementation of the insert_contract function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_CONTRACT_H
+#define PG_INSERT_CONTRACT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to persist an encrypted contract associated with a reserve.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub the purse the contract is associated with (must exist)
+ * @param econtract the encrypted contract
+ * @param[out] in_conflict set to true if @a econtract
+ *             conflicts with an existing contract;
+ *             in this case, the return value will be
+ *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_contract (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_EncryptedContract *econtract,
+  bool *in_conflict);
+
+#endif
diff --git a/src/exchangedb/pg_insert_denomination_info.c b/src/exchangedb/pg_insert_denomination_info.c
new file mode 100644
index 000000000..878bc5d81
--- /dev/null
+++ b/src/exchangedb/pg_insert_denomination_info.c
@@ -0,0 +1,101 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_denomination_info.c
+ * @brief Implementation of the insert_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_denomination_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_denomination_info (
+  void *cls,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue)
+{
+  struct PostgresClosure *pg = cls;
+  struct TALER_DenominationHashP denom_hash;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&issue->denom_hash),
+    TALER_PQ_query_param_denom_pub (denom_pub),
+    GNUNET_PQ_query_param_auto_from_type (&issue->signature),
+    GNUNET_PQ_query_param_timestamp (&issue->start),
+    GNUNET_PQ_query_param_timestamp (&issue->expire_withdraw),
+    GNUNET_PQ_query_param_timestamp (&issue->expire_deposit),
+    GNUNET_PQ_query_param_timestamp (&issue->expire_legal),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &issue->value),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &issue->fees.withdraw),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &issue->fees.deposit),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &issue->fees.refresh),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &issue->fees.refund),
+    GNUNET_PQ_query_param_uint32 (&denom_pub->age_mask.bits),
+    GNUNET_PQ_query_param_end
+  };
+
+  GNUNET_assert (denom_pub->age_mask.bits ==
+                 issue->age_mask.bits);
+  TALER_denom_pub_hash (denom_pub,
+                        &denom_hash);
+  GNUNET_assert (0 ==
+                 GNUNET_memcmp (&denom_hash,
+                                &issue->denom_hash));
+  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
+                   issue->start.abs_time));
+  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
+                   issue->expire_withdraw.abs_time));
+  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
+                   issue->expire_deposit.abs_time));
+  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
+                   issue->expire_legal.abs_time));
+  /* check fees match denomination currency */
+  GNUNET_assert (GNUNET_YES ==
+                 TALER_denom_fee_check_currency (
+                   issue->value.currency,
+                   &issue->fees));
+  PREPARE (pg,
+           "denomination_insert",
+           "INSERT INTO denominations "
+           "(denom_pub_hash"
+           ",denom_pub"
+           ",master_sig"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"  /* value of this denom */
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",age_mask"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
+           " $11, $12, $13);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "denomination_insert",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_denomination_info.h b/src/exchangedb/pg_insert_denomination_info.h
new file mode 100644
index 000000000..663f45bd4
--- /dev/null
+++ b/src/exchangedb/pg_insert_denomination_info.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_denomination_info.h
+ * @brief implementation of the insert_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_DENOMINATION_INFO_H
+#define PG_INSERT_DENOMINATION_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Insert a denomination key's public information into the database for
+ * reference by auditors and other consistency checks.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param denom_pub the public key used for signing coins of this denomination
+ * @param issue issuing information with value, fees and other info about the coin
+ * @return status of the query
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_denomination_info (
+  void *cls,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue);
+
+#endif
diff --git a/src/exchangedb/pg_insert_denomination_revocation.c b/src/exchangedb/pg_insert_denomination_revocation.c
new file mode 100644
index 000000000..49445f262
--- /dev/null
+++ b/src/exchangedb/pg_insert_denomination_revocation.c
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_denomination_revocation.c
+ * @brief Implementation of the insert_denomination_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_denomination_revocation.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_denomination_revocation (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  /* Used in #postgres_insert_denomination_revocation() */
+  PREPARE (pg,
+           "denomination_revocation_insert",
+           "INSERT INTO denomination_revocations "
+           "(denominations_serial"
+           ",master_sig"
+           ") SELECT denominations_serial,$2"
+           "    FROM denominations"
+           "   WHERE denom_pub_hash=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "denomination_revocation_insert",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_denomination_revocation.h b/src/exchangedb/pg_insert_denomination_revocation.h
new file mode 100644
index 000000000..e3da87666
--- /dev/null
+++ b/src/exchangedb/pg_insert_denomination_revocation.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_denomination_revocation.h
+ * @brief implementation of the insert_denomination_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_DENOMINATION_REVOCATION_H
+#define PG_INSERT_DENOMINATION_REVOCATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Store information that a denomination key was revoked
+ * in the database.
+ *
+ * @param cls closure
+ * @param denom_pub_hash hash of the revoked denomination key
+ * @param master_sig signature affirming the revocation
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_denomination_revocation (
+  void *cls,
+  const struct TALER_DenominationHashP *denom_pub_hash,
+  const struct TALER_MasterSignatureP *master_sig);
+#endif
diff --git a/src/exchangedb/pg_insert_drain_profit.c b/src/exchangedb/pg_insert_drain_profit.c
new file mode 100644
index 000000000..a0de02e9b
--- /dev/null
+++ b/src/exchangedb/pg_insert_drain_profit.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_drain_profit.c
+ * @brief Implementation of the insert_drain_profit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_drain_profit.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_drain_profit (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const char *account_section,
+  const char *payto_uri,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_Amount *amount,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_string (account_section),
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_timestamp (&request_timestamp),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 amount),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "drain_profit_insert",
+           "INSERT INTO profit_drains "
+           "(wtid"
+           ",account_section"
+           ",payto_uri"
+           ",trigger_date"
+           ",amount"
+           ",master_sig"
+           ") VALUES ($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "drain_profit_insert",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_drain_profit.h b/src/exchangedb/pg_insert_drain_profit.h
new file mode 100644
index 000000000..90183d850
--- /dev/null
+++ b/src/exchangedb/pg_insert_drain_profit.h
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_drain_profit.h
+ * @brief implementation of the insert_drain_profit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_DRAIN_PROFIT_H
+#define PG_INSERT_DRAIN_PROFIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to persist a request to drain profits.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param wtid wire transfer ID to use
+ * @param account_section account to drain
+ * @param payto_uri account to wire funds to
+ * @param request_timestamp when was the request made
+ * @param amount amount to wire
+ * @param master_sig signature affirming the operation
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_drain_profit (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const char *account_section,
+  const char *payto_uri,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_Amount *amount,
+  const struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_insert_global_fee.c b/src/exchangedb/pg_insert_global_fee.c
new file mode 100644
index 000000000..e78cd0b83
--- /dev/null
+++ b/src/exchangedb/pg_insert_global_fee.c
@@ -0,0 +1,137 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_global_fee.c
+ * @brief Implementation of the insert_global_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_global_fee.h"
+#include "pg_helper.h"
+#include "pg_get_global_fee.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_global_fee (void *cls,
+                          struct GNUNET_TIME_Timestamp start_date,
+                          struct GNUNET_TIME_Timestamp end_date,
+                          const struct TALER_GlobalFeeSet *fees,
+                          struct GNUNET_TIME_Relative purse_timeout,
+                          struct GNUNET_TIME_Relative history_expiration,
+                          uint32_t purse_account_limit,
+                          const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&start_date),
+    GNUNET_PQ_query_param_timestamp (&end_date),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &fees->history),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &fees->account),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &fees->purse),
+    GNUNET_PQ_query_param_relative_time (&purse_timeout),
+    GNUNET_PQ_query_param_relative_time (&history_expiration),
+    GNUNET_PQ_query_param_uint32 (&purse_account_limit),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct TALER_GlobalFeeSet wx;
+  struct TALER_MasterSignatureP sig;
+  struct GNUNET_TIME_Timestamp sd;
+  struct GNUNET_TIME_Timestamp ed;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_TIME_Relative pt;
+  struct GNUNET_TIME_Relative he;
+  uint32_t pal;
+
+  qs = TEH_PG_get_global_fee (pg,
+                              start_date,
+                              &sd,
+                              &ed,
+                              &wx,
+                              &pt,
+                              &he,
+                              &pal,
+                              &sig);
+  if (qs < 0)
+    return qs;
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    if (0 != GNUNET_memcmp (&sig,
+                            master_sig))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (0 !=
+        TALER_global_fee_set_cmp (fees,
+                                  &wx))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if ( (GNUNET_TIME_timestamp_cmp (sd,
+                                     !=,
+                                     start_date)) ||
+         (GNUNET_TIME_timestamp_cmp (ed,
+                                     !=,
+                                     end_date)) )
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if ( (GNUNET_TIME_relative_cmp (purse_timeout,
+                                    !=,
+                                    pt)) ||
+         (GNUNET_TIME_relative_cmp (history_expiration,
+                                    !=,
+                                    he)) )
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (purse_account_limit != pal)
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    /* equal record already exists */
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+
+  /* Used in #postgres_insert_global_fee */
+  PREPARE (pg,
+           "insert_global_fee",
+           "INSERT INTO global_fee "
+           "(start_date"
+           ",end_date"
+           ",history_fee"
+           ",account_fee"
+           ",purse_fee"
+           ",purse_timeout"
+           ",history_expiration"
+           ",purse_account_limit"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_global_fee",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_global_fee.h b/src/exchangedb/pg_insert_global_fee.h
new file mode 100644
index 000000000..411345dc4
--- /dev/null
+++ b/src/exchangedb/pg_insert_global_fee.h
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_global_fee.h
+ * @brief implementation of the insert_global_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_GLOBAL_FEE_H
+#define PG_INSERT_GLOBAL_FEE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Insert global fee data into database.
+ *
+ * @param cls closure
+ * @param start_date when does the fees go into effect
+ * @param end_date when does the fees end being valid
+ * @param fees how high is are the global fees
+ * @param purse_timeout when do purses time out
+ * @param history_expiration how long are account histories preserved
+ * @param purse_account_limit how many purses are free per account
+ * @param master_sig signature over the above by the exchange master key
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_global_fee (void *cls,
+                          struct GNUNET_TIME_Timestamp start_date,
+                          struct GNUNET_TIME_Timestamp end_date,
+                          const struct TALER_GlobalFeeSet *fees,
+                          struct GNUNET_TIME_Relative purse_timeout,
+                          struct GNUNET_TIME_Relative history_expiration,
+                          uint32_t purse_account_limit,
+                          const struct TALER_MasterSignatureP *master_sig);
+#endif
diff --git a/src/exchangedb/pg_insert_kyc_attributes.c b/src/exchangedb/pg_insert_kyc_attributes.c
new file mode 100644
index 000000000..3c94abb85
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_attributes.c
@@ -0,0 +1,110 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_attributes.c
+ * @brief Implementation of the insert_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_kyc_attributes.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_attributes (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct GNUNET_ShortHashCode *kyc_prox,
+  const char *provider_section,
+  unsigned int num_checks,
+  const char *satisfied_checks[static num_checks],
+  uint32_t birthday,
+  struct GNUNET_TIME_Timestamp collection_time,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  struct GNUNET_TIME_Absolute expiration_time,
+  size_t enc_attributes_size,
+  const void *enc_attributes,
+  bool require_aml)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Timestamp expiration
+    = GNUNET_TIME_absolute_to_timestamp (expiration_time);
+  struct TALER_KycCompletedEventP rep = {
+    .header.size = htons (sizeof (rep)),
+    .header.type = htons (TALER_DBEVENT_EXCHANGE_KYC_COMPLETED),
+    .h_payto = *h_payto
+  };
+  char *kyc_completed_notify_s
+    = GNUNET_PQ_get_event_notify_channel (&rep.header);
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&process_row),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_auto_from_type (kyc_prox),
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_array_ptrs_string (num_checks,
+                                             satisfied_checks,
+                                             pg->conn),
+    GNUNET_PQ_query_param_uint32 (&birthday),
+    (NULL == provider_account_id)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (provider_account_id),
+    (NULL == provider_legitimization_id)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (provider_legitimization_id),
+    GNUNET_PQ_query_param_timestamp (&collection_time),
+    GNUNET_PQ_query_param_absolute_time (&expiration_time),
+    GNUNET_PQ_query_param_timestamp (&expiration),
+    GNUNET_PQ_query_param_fixed_size (enc_attributes,
+                                      enc_attributes_size),
+    GNUNET_PQ_query_param_bool (require_aml),
+    GNUNET_PQ_query_param_string (kyc_completed_notify_s),
+    GNUNET_PQ_query_param_end
+  };
+  bool ok;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("out_ok",
+                                &ok),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Inserting KYC attributes, wake up on %s\n",
+              kyc_completed_notify_s);
+  PREPARE (pg,
+           "insert_kyc_attributes",
+           "SELECT "
+           " out_ok"
+           " FROM exchange_do_insert_kyc_attributes "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14);");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "insert_kyc_attributes",
+                                                 params,
+                                                 rs);
+  GNUNET_PQ_cleanup_query_params_closures (params);
+  GNUNET_free (kyc_completed_notify_s);
+  GNUNET_PQ_event_do_poll (pg->conn);
+  if (qs < 0)
+    return qs;
+  if (! ok)
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  return qs;
+}
diff --git a/src/exchangedb/pg_insert_kyc_attributes.h b/src/exchangedb/pg_insert_kyc_attributes.h
new file mode 100644
index 000000000..35b25bdc8
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_attributes.h
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_attributes.h
+ * @brief implementation of the insert_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_KYC_ATTRIBUTES_H
+#define PG_INSERT_KYC_ATTRIBUTES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Store KYC attribute data, update KYC process status and
+ * AML status for the given account.
+ *
+ * @param cls closure
+ * @param process_row KYC process row to update
+ * @param h_payto account for which the attribute data is stored
+ * @param kyc_prox key for similarity search
+ * @param provider_section provider that must be checked
+ * @param num_checks how many checks do these attributes satisfy
+ * @param satisfied_checks array of checks satisfied by these attributes
+ * @param provider_account_id provider account ID
+ * @param provider_legitimization_id provider legitimization ID
+ * @param birthday birthdate of user, in days after 1990, or 0 if unknown or definitively adult
+ * @param collection_time when was the data collected
+ * @param expiration_time when does the data expire
+ * @param enc_attributes_size number of bytes in @a enc_attributes
+ * @param enc_attributes encrypted attribute data
+ * @param require_aml true to trigger AML
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_attributes (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct GNUNET_ShortHashCode *kyc_prox,
+  const char *provider_section,
+  unsigned int num_checks,
+  const char *satisfied_checks[static num_checks],
+  uint32_t birthday,
+  struct GNUNET_TIME_Timestamp collection_time,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  struct GNUNET_TIME_Absolute expiration_time,
+  size_t enc_attributes_size,
+  const void *enc_attributes,
+  bool require_aml);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_kyc_failure.c b/src/exchangedb/pg_insert_kyc_failure.c
new file mode 100644
index 000000000..568c39ca8
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_failure.c
@@ -0,0 +1,82 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_failure.c
+ * @brief Implementation of the insert_kyc_failure function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_kyc_failure.h"
+#include "pg_helper.h"
+#include "pg_event_notify.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_failure (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  const char *provider_account_id,
+  const char *provider_legitimization_id)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&process_row),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_string (provider_section),
+    NULL != provider_account_id
+    ? GNUNET_PQ_query_param_string (provider_account_id)
+    : GNUNET_PQ_query_param_null (),
+    NULL != provider_legitimization_id
+    ? GNUNET_PQ_query_param_string (provider_legitimization_id)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "insert_kyc_failure",
+           "UPDATE legitimization_processes"
+           " SET"
+           "  finished=TRUE"
+           " ,provider_user_id=$4"
+           " ,provider_legitimization_id=$5"
+           " WHERE h_payto=$2"
+           "   AND legitimization_process_serial_id=$1"
+           "   AND provider_section=$3;");
+  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                           "insert_kyc_failure",
+                                           params);
+  if (qs > 0)
+  {
+    /* FIXME: might want to do this eventually in the same transaction... */
+    struct TALER_KycCompletedEventP rep = {
+      .header.size = htons (sizeof (rep)),
+      .header.type = htons (TALER_DBEVENT_EXCHANGE_KYC_COMPLETED),
+      .h_payto = *h_payto
+    };
+
+    TEH_PG_event_notify (pg,
+                         &rep.header,
+                         NULL,
+                         0);
+  }
+  return qs;
+}
diff --git a/src/exchangedb/pg_insert_kyc_failure.h b/src/exchangedb/pg_insert_kyc_failure.h
new file mode 100644
index 000000000..46d08df9c
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_failure.h
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_failure.h
+ * @brief implementation of the insert_kyc_failure function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_KYC_FAILURE_H
+#define PG_INSERT_KYC_FAILURE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Update KYC process status to finished (and failed).
+ *
+ * @param cls closure
+ * @param process_row KYC process row to update
+ * @param h_payto account for which the attribute data is stored
+ * @param provider_section provider that must be checked
+ * @param provider_account_id provider account ID
+ * @param provider_legitimization_id provider legitimization ID
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_failure (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  const char *provider_account_id,
+  const char *provider_legitimization_id);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_kyc_requirement_for_account.c b/src/exchangedb/pg_insert_kyc_requirement_for_account.c
new file mode 100644
index 000000000..95f695297
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_requirement_for_account.c
@@ -0,0 +1,67 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_requirement_for_account.c
+ * @brief Implementation of the insert_kyc_requirement_for_account function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_kyc_requirement_for_account.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_requirement_for_account (
+  void *cls,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *requirement_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    (NULL ==  reserve_pub)
+      ? GNUNET_PQ_query_param_null ()
+      : GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("legitimization_requirement_serial_id",
+                                  requirement_row),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_insert_kyc_requirement_for_account() */
+  PREPARE (pg,
+           "insert_legitimization_requirement",
+           "INSERT INTO legitimization_requirements"
+           "  (h_payto"
+           "   ,reserve_pub"
+           "  ,required_checks"
+           "  ) VALUES "
+           "  ($1, $2, $3)"
+           " ON CONFLICT (h_payto,required_checks) "
+           "   DO UPDATE SET h_payto=$1" /* syntax requirement: dummy op */
+           " RETURNING legitimization_requirement_serial_id");
+  return GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "insert_legitimization_requirement",
+    params,
+    rs);
+}
diff --git a/src/exchangedb/pg_insert_kyc_requirement_for_account.h b/src/exchangedb/pg_insert_kyc_requirement_for_account.h
new file mode 100644
index 000000000..331c8ba0c
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_requirement_for_account.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_requirement_for_account.h
+ * @brief implementation of the insert_kyc_requirement_for_account function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_KYC_REQUIREMENT_FOR_ACCOUNT_H
+#define PG_INSERT_KYC_REQUIREMENT_FOR_ACCOUNT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert KYC requirement for @a h_payto account into table.
+ *
+ * @param cls closure
+ * @param provider_section provider that must be checked
+ * @param h_payto account that must be KYC'ed
+ * @param reserve_pub if the account is a reserve, its public key.  Maybe NULL
+ * @param[out] requirement_row set to legitimization requirement row for this check
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_requirement_for_account (
+  void *cls,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  uint64_t *requirement_row);
+
+#endif
diff --git a/src/exchangedb/pg_insert_kyc_requirement_process.c b/src/exchangedb/pg_insert_kyc_requirement_process.c
new file mode 100644
index 000000000..a20db3388
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_requirement_process.c
@@ -0,0 +1,75 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_requirement_process.c
+ * @brief Implementation of the insert_kyc_requirement_process function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_kyc_requirement_process.h"
+#include "pg_helper.h"
+#include <gnunet/gnunet_pq_lib.h>
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_requirement_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  uint64_t *process_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now
+    = GNUNET_TIME_absolute_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_string (provider_section),
+    (NULL != provider_account_id)
+    ? GNUNET_PQ_query_param_string (provider_account_id)
+    : GNUNET_PQ_query_param_null (),
+    (NULL != provider_legitimization_id)
+    ? GNUNET_PQ_query_param_string (provider_legitimization_id)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("legitimization_process_serial_id",
+                                  process_row),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "insert_legitimization_process",
+           "INSERT INTO legitimization_processes"
+           "  (h_payto"
+           "  ,start_time"
+           "  ,provider_section"
+           "  ,provider_user_id"
+           "  ,provider_legitimization_id"
+           "  ) VALUES "
+           "  ($1, $2, $3, $4, $5)"
+           " RETURNING legitimization_process_serial_id");
+  return GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "insert_legitimization_process",
+    params,
+    rs);
+}
diff --git a/src/exchangedb/pg_insert_kyc_requirement_process.h b/src/exchangedb/pg_insert_kyc_requirement_process.h
new file mode 100644
index 000000000..df21db8cd
--- /dev/null
+++ b/src/exchangedb/pg_insert_kyc_requirement_process.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_kyc_requirement_process.h
+ * @brief implementation of the insert_kyc_requirement_process function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_KYC_REQUIREMENT_PROCESS_H
+#define PG_INSERT_KYC_REQUIREMENT_PROCESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Begin KYC requirement process.
+ *
+ * @param cls closure
+ * @param h_payto account that must be KYC'ed
+ * @param provider_section provider that must be checked
+ * @param provider_account_id provider account ID
+ * @param provider_legitimization_id provider legitimization ID
+ * @param[out] process_row row the process is stored under
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_kyc_requirement_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  uint64_t *process_row);
+
+#endif
diff --git a/src/exchangedb/pg_insert_partner.c b/src/exchangedb/pg_insert_partner.c
new file mode 100644
index 000000000..d1d6069de
--- /dev/null
+++ b/src/exchangedb/pg_insert_partner.c
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_partner.c
+ * @brief Implementation of the insert_partner function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_partner.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_partner (void *cls,
+                       const struct TALER_MasterPublicKeyP *master_pub,
+                       struct GNUNET_TIME_Timestamp start_date,
+                       struct GNUNET_TIME_Timestamp end_date,
+                       struct GNUNET_TIME_Relative wad_frequency,
+                       const struct TALER_Amount *wad_fee,
+                       const char *partner_base_url,
+                       const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (master_pub),
+    GNUNET_PQ_query_param_timestamp (&start_date),
+    GNUNET_PQ_query_param_timestamp (&end_date),
+    GNUNET_PQ_query_param_relative_time (&wad_frequency),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 wad_fee),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_string (partner_base_url),
+    GNUNET_PQ_query_param_end
+  };
+
+
+  PREPARE (pg,
+           "insert_partner",
+           "INSERT INTO partners"
+           "  (partner_master_pub"
+           "  ,start_date"
+           "  ,end_date"
+           "  ,wad_frequency"
+           "  ,wad_fee"
+           "  ,master_sig"
+           "  ,partner_base_url"
+           "  ) VALUES "
+           "  ($1, $2, $3, $4, $5, $6, $7)"
+           "  ON CONFLICT DO NOTHING;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_partner",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_partner.h b/src/exchangedb/pg_insert_partner.h
new file mode 100644
index 000000000..3ebae786c
--- /dev/null
+++ b/src/exchangedb/pg_insert_partner.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_partner.h
+ * @brief implementation of the insert_partner function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_PARTNER_H
+#define PG_INSERT_PARTNER_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to store configuration data about a partner
+ * exchange that we are federated with.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param master_pub public offline signing key of the partner exchange
+ * @param start_date when does the following data start to be valid
+ * @param end_date when does the validity end (exclusive)
+ * @param wad_frequency how often do we do exchange-to-exchange settlements?
+ * @param wad_fee how much do we charge for transfers to the partner
+ * @param partner_base_url base URL of the partner exchange
+ * @param master_sig signature with our offline signing key affirming the above
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_partner (void *cls,
+                       const struct TALER_MasterPublicKeyP *master_pub,
+                       struct GNUNET_TIME_Timestamp start_date,
+                       struct GNUNET_TIME_Timestamp end_date,
+                       struct GNUNET_TIME_Relative wad_frequency,
+                       const struct TALER_Amount *wad_fee,
+                       const char *partner_base_url,
+                       const struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_insert_purse_request.c b/src/exchangedb/pg_insert_purse_request.c
new file mode 100644
index 000000000..d8d68abe8
--- /dev/null
+++ b/src/exchangedb/pg_insert_purse_request.c
@@ -0,0 +1,126 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_purse_request.c
+ * @brief Implementation of the insert_purse_request function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_purse_request.h"
+#include "pg_get_purse_request.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_purse_request (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t age_limit,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *purse_fee,
+  const struct TALER_Amount *amount,
+  const struct TALER_PurseContractSignatureP *purse_sig,
+  bool *in_conflict)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
+  uint32_t flags32 = (uint32_t) flags;
+  bool in_reserve_quota = (TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA
+                           == (flags & TALER_WAMF_MERGE_MODE_MASK));
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (merge_pub),
+    GNUNET_PQ_query_param_timestamp (&now),
+    GNUNET_PQ_query_param_timestamp (&purse_expiration),
+    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
+    GNUNET_PQ_query_param_uint32 (&age_limit),
+    GNUNET_PQ_query_param_uint32 (&flags32),
+    GNUNET_PQ_query_param_bool (in_reserve_quota),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 amount),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 purse_fee),
+    GNUNET_PQ_query_param_auto_from_type (purse_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  *in_conflict = false;
+  PREPARE (pg,
+           "insert_purse_request",
+           "INSERT INTO purse_requests"
+           "  (purse_pub"
+           "  ,merge_pub"
+           "  ,purse_creation"
+           "  ,purse_expiration"
+           "  ,h_contract_terms"
+           "  ,age_limit"
+           "  ,flags"
+           "  ,in_reserve_quota"
+           "  ,amount_with_fee"
+           "  ,purse_fee"
+           "  ,purse_sig"
+           "  ) VALUES "
+           "  ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)"
+           "  ON CONFLICT DO NOTHING;");
+  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                           "insert_purse_request",
+                                           params);
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs)
+    return qs;
+  {
+    struct TALER_PurseMergePublicKeyP merge_pub2;
+    struct GNUNET_TIME_Timestamp purse_expiration2;
+    struct TALER_PrivateContractHashP h_contract_terms2;
+    uint32_t age_limit2;
+    struct TALER_Amount amount2;
+    struct TALER_Amount balance;
+    struct TALER_PurseContractSignatureP purse_sig2;
+
+    qs = TEH_PG_get_purse_request (pg,
+                                   purse_pub,
+                                   &merge_pub2,
+                                   &purse_expiration2,
+                                   &h_contract_terms2,
+                                   &age_limit2,
+                                   &amount2,
+                                   &balance,
+                                   &purse_sig2);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if ( (age_limit2 == age_limit) &&
+         (0 == TALER_amount_cmp (amount,
+                                 &amount2)) &&
+         (0 == GNUNET_memcmp (&h_contract_terms2,
+                              h_contract_terms)) &&
+         (0 == GNUNET_memcmp (&merge_pub2,
+                              merge_pub)) )
+    {
+      return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+    }
+    *in_conflict = true;
+    return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+  }
+}
diff --git a/src/exchangedb/pg_insert_purse_request.h b/src/exchangedb/pg_insert_purse_request.h
new file mode 100644
index 000000000..37cce2a96
--- /dev/null
+++ b/src/exchangedb/pg_insert_purse_request.h
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_purse_request.h
+ * @brief implementation of the insert_purse_request function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_PURSE_REQUEST_H
+#define PG_INSERT_PURSE_REQUEST_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to create a new purse with certain meta data.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the new purse
+ * @param merge_pub public key providing the merge capability
+ * @param purse_expiration time when the purse will expire
+ * @param h_contract_terms hash of the contract for the purse
+ * @param age_limit age limit to enforce for payments into the purse
+ * @param flags flags for the operation
+ * @param purse_fee fee we are allowed to charge to the reserve (depending on @a flags)
+ * @param amount target amount (with fees) to be put into the purse
+ * @param purse_sig signature with @a purse_pub's private key affirming the above
+ * @param[out] in_conflict set to true if the meta data
+ *             conflicts with an existing purse;
+ *             in this case, the return value will be
+ *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_purse_request (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t age_limit,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *purse_fee,
+  const struct TALER_Amount *amount,
+  const struct TALER_PurseContractSignatureP *purse_sig,
+  bool *in_conflict);
+
+#endif
diff --git a/src/exchangedb/pg_insert_records_by_table.c b/src/exchangedb/pg_insert_records_by_table.c
new file mode 100644
index 000000000..6ecec5bcf
--- /dev/null
+++ b/src/exchangedb/pg_insert_records_by_table.c
@@ -0,0 +1,2334 @@
+/*
+   This file is part of GNUnet
+   Copyright (C) 2020-2023 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/pg_insert_records_by_table.c
+ * @brief replicate_records_by_table implementation
+ * @author Christian Grothoff
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_records_by_table.h"
+#include "pg_helper.h"
+#include <gnunet/gnunet_pq_lib.h>
+
+
+/**
+ * Signature of helper functions of #TEH_PG_insert_records_by_table().
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ * @return transaction status code
+ */
+typedef enum GNUNET_DB_QueryStatus
+(*InsertRecordCallback)(struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td);
+
+
+/**
+ * Function called with denominations records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_denominations (struct PostgresClosure *pg,
+                             const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct TALER_DenominationHashP denom_hash;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&denom_hash),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.denominations.denom_type),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.denominations.age_mask),
+    TALER_PQ_query_param_denom_pub (
+      &td->details.denominations.denom_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.denominations.master_sig),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.denominations.valid_from),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.denominations.expire_withdraw),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.denominations.expire_deposit),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.denominations.expire_legal),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.denominations.coin),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.denominations.fees.withdraw),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.denominations.fees.deposit),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.denominations.fees.refresh),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.denominations.fees.refund),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_denominations",
+           "INSERT INTO denominations"
+           "(denominations_serial"
+           ",denom_pub_hash"
+           ",denom_type"
+           ",age_mask"
+           ",denom_pub"
+           ",master_sig"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
+           " $11, $12, $13, $14, $15);");
+
+  TALER_denom_pub_hash (
+    &td->details.denominations.denom_pub,
+    &denom_hash);
+
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_denominations",
+                                             params);
+}
+
+
+/**
+ * Function called with denomination_revocations records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_denomination_revocations (
+  struct PostgresClosure *pg,
+  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.denomination_revocations.master_sig),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.denomination_revocations.denominations_serial),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_denomination_revocations",
+           "INSERT INTO denomination_revocations"
+           "(denom_revocations_serial_id"
+           ",master_sig"
+           ",denominations_serial"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_denomination_revocations",
+                                             params);
+}
+
+
+/**
+ * Function called with denominations records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wire_targets (struct PostgresClosure *pg,
+                            const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct TALER_PaytoHashP payto_hash;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&payto_hash),
+    GNUNET_PQ_query_param_string (
+      td->details.wire_targets.payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wire_targets",
+           "INSERT INTO wire_targets"
+           "(wire_target_serial_id"
+           ",wire_target_h_payto"
+           ",payto_uri"
+           ") VALUES "
+           "($1, $2, $3);");
+  TALER_payto_hash (
+    td->details.wire_targets.payto_uri,
+    &payto_hash);
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wire_targets",
+                                             params);
+}
+
+
+/**
+ * Function called with records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_legitimization_processes (struct PostgresClosure *pg,
+                                        const struct
+                                        TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.legitimization_processes.h_payto),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.legitimization_processes.expiration_time),
+    GNUNET_PQ_query_param_string (
+      td->details.legitimization_processes.provider_section),
+    GNUNET_PQ_query_param_string (
+      td->details.legitimization_processes.provider_user_id),
+    GNUNET_PQ_query_param_string (
+      td->details.legitimization_processes.provider_legitimization_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_legitimization_processes",
+           "INSERT INTO legitimization_processes"
+           "(legitimization_process_serial_id"
+           ",h_payto"
+           ",expiration_time"
+           ",provider_section"
+           ",provider_user_id"
+           ",provider_legitimization_id"
+           ") VALUES "
+           "($1, $3, $4, $5, $6, %7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_legitimization_processes",
+                                             params);
+}
+
+
+/**
+ * Function called with records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_legitimization_requirements (struct PostgresClosure *pg,
+                                           const struct
+                                           TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.legitimization_requirements.h_payto),
+    td->details.legitimization_requirements.no_reserve_pub
+      ? GNUNET_PQ_query_param_null ()
+      : GNUNET_PQ_query_param_auto_from_type (
+      &td->details.legitimization_requirements.reserve_pub),
+    GNUNET_PQ_query_param_string (
+      td->details.legitimization_requirements.required_checks),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_legitimization_requirements",
+           "INSERT INTO legitimization_requirements"
+           "(legitimization_requirement_serial_id"
+           ",h_payto"
+           ",reserve_pub"
+           ",required_checks"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_legitimization_requirements",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves (struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.reserves.reserve_pub),
+    GNUNET_PQ_query_param_timestamp (&td->details.reserves.expiration_date),
+    GNUNET_PQ_query_param_timestamp (&td->details.reserves.gc_date),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves",
+           "INSERT INTO reserves"
+           "(reserve_uuid"
+           ",reserve_pub"
+           ",expiration_date"
+           ",gc_date"
+           ") VALUES "
+           "($1, $2, $3, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves_in records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves_in (struct PostgresClosure *pg,
+                           const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (&td->details.reserves_in.wire_reference),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_in.credit),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_in.sender_account_h_payto),
+    GNUNET_PQ_query_param_string (
+      td->details.reserves_in.exchange_account_section),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.reserves_in.execution_date),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.reserves_in.reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves_in",
+           "INSERT INTO reserves_in"
+           "(reserve_in_serial_id"
+           ",wire_reference"
+           ",credit"
+           ",wire_source_h_payto"
+           ",exchange_account_section"
+           ",execution_date"
+           ",reserve_pub"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves_in",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves_open_requests records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves_open_requests (struct PostgresClosure *pg,
+                                      const struct
+                                      TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.reserves_open_requests.expiration_date),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_open_requests.reserve_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_open_requests.reserve_payment),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.reserves_open_requests.requested_purse_limit),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves_open_requests",
+           "INSERT INTO reserves_open_requests"
+           "(open_request_uuid"
+           ",reserve_pub"
+           ",request_timestamp"
+           ",expiration_date"
+           ",reserve_sig"
+           ",reserve_payment"
+           ",requested_purse_limit"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves_open_requests",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves_open_requests records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves_open_deposits (
+  struct PostgresClosure *pg,
+  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_open_deposits.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_open_deposits.coin_sig),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_open_deposits.reserve_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_open_deposits.contribution),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves_open_deposits",
+           "INSERT INTO reserves_open_deposits"
+           "(reserve_open_deposit_uuid"
+           ",reserve_sig"
+           ",reserve_pub"
+           ",coin_pub"
+           ",coin_sig"
+           ",contribution"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves_open_deposits",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves_close records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves_close (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.reserves_close.execution_date),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_close.wtid),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_close.sender_account_h_payto),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_close.amount),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_close.closing_fee),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_close.reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves_close",
+           "INSERT INTO reserves_close"
+           "(close_uuid"
+           ",execution_date"
+           ",wtid"
+           ",wire_target_h_payto"
+           ",amount"
+           ",closing_fee"
+           ",reserve_pub"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves_close",
+                                             params);
+}
+
+
+/**
+ * Function called with reserves_out records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_reserves_out (struct PostgresClosure *pg,
+                            const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_out.h_blind_ev),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.reserves_out.denominations_serial),
+    TALER_PQ_query_param_blinded_denom_sig (
+      &td->details.reserves_out.denom_sig),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.reserves_out.reserve_uuid),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.reserves_out.reserve_sig),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.reserves_out.execution_date),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.reserves_out.amount_with_fee),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_reserves_out",
+           "INSERT INTO reserves_out"
+           "(reserve_out_serial_id"
+           ",h_blind_ev"
+           ",denominations_serial"
+           ",denom_sig"
+           ",reserve_uuid"
+           ",reserve_sig"
+           ",execution_date"
+           ",amount_with_fee"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_reserves_out",
+                                             params);
+}
+
+
+/**
+ * Function called with auditors records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_auditors (struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.auditors.auditor_pub),
+    GNUNET_PQ_query_param_string (td->details.auditors.auditor_name),
+    GNUNET_PQ_query_param_string (td->details.auditors.auditor_url),
+    GNUNET_PQ_query_param_bool (td->details.auditors.is_active),
+    GNUNET_PQ_query_param_timestamp (&td->details.auditors.last_change),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_auditors",
+           "INSERT INTO auditors"
+           "(auditor_uuid"
+           ",auditor_pub"
+           ",auditor_name"
+           ",auditor_url"
+           ",is_active"
+           ",last_change"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_auditors",
+                                             params);
+}
+
+
+/**
+ * Function called with auditor_denom_sigs records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_auditor_denom_sigs (struct PostgresClosure *pg,
+                                  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (&td->details.auditor_denom_sigs.auditor_uuid),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.auditor_denom_sigs.denominations_serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.auditor_denom_sigs.auditor_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_auditor_denom_sigs",
+           "INSERT INTO auditor_denom_sigs"
+           "(auditor_denom_serial"
+           ",auditor_uuid"
+           ",denominations_serial"
+           ",auditor_sig"
+           ") VALUES "
+           "($1, $2, $3, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_auditor_denom_sigs",
+                                             params);
+}
+
+
+/**
+ * Function called with exchange_sign_keys records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_exchange_sign_keys (struct PostgresClosure *pg,
+                                  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.exchange_sign_keys.exchange_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.exchange_sign_keys.master_sig),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.exchange_sign_keys.meta.start),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.exchange_sign_keys.meta.expire_sign),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.exchange_sign_keys.meta.expire_legal),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_exchange_sign_keys",
+           "INSERT INTO exchange_sign_keys"
+           "(esk_serial"
+           ",exchange_pub"
+           ",master_sig"
+           ",valid_from"
+           ",expire_sign"
+           ",expire_legal"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_exchange_sign_keys",
+                                             params);
+}
+
+
+/**
+ * Function called with signkey_revocations records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_signkey_revocations (struct PostgresClosure *pg,
+                                   const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (&td->details.signkey_revocations.esk_serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.signkey_revocations.master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_signkey_revocations",
+           "INSERT INTO signkey_revocations"
+           "(signkey_revocations_serial_id"
+           ",esk_serial"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_signkey_revocations",
+                                             params);
+}
+
+
+/**
+ * Function called with known_coins records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_known_coins (struct PostgresClosure *pg,
+                           const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.known_coins.coin_pub),
+    TALER_PQ_query_param_denom_sig (
+      &td->details.known_coins.denom_sig),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.known_coins.denominations_serial),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_known_coins",
+           "INSERT INTO known_coins"
+           "(known_coin_id"
+           ",coin_pub"
+           ",denom_sig"
+           ",denominations_serial"
+           ") VALUES "
+           "($1, $2, $3, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_known_coins",
+                                             params);
+}
+
+
+/**
+ * Function called with refresh_commitments records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_refresh_commitments (struct PostgresClosure *pg,
+                                   const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.refresh_commitments.rc),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.refresh_commitments.old_coin_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.refresh_commitments.amount_with_fee),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.refresh_commitments.noreveal_index),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.refresh_commitments.old_coin_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_refresh_commitments",
+           "INSERT INTO refresh_commitments"
+           "(melt_serial_id"
+           ",rc"
+           ",old_coin_sig"
+           ",amount_with_fee"
+           ",noreveal_index"
+           ",old_coin_pub"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_refresh_commitments",
+                                             params);
+}
+
+
+/**
+ * Function called with refresh_revealed_coins records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_refresh_revealed_coins (
+  struct PostgresClosure *pg,
+  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_HashCode h_coin_ev;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.refresh_revealed_coins.freshcoin_index),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.refresh_revealed_coins.link_sig),
+    GNUNET_PQ_query_param_fixed_size (
+      td->details.refresh_revealed_coins.coin_ev,
+      td->details.refresh_revealed_coins.
+      coin_ev_size),
+    GNUNET_PQ_query_param_auto_from_type (&h_coin_ev),
+    TALER_PQ_query_param_blinded_denom_sig (
+      &td->details.refresh_revealed_coins.ev_sig),
+    TALER_PQ_query_param_exchange_withdraw_values (
+      &td->details.refresh_revealed_coins.ewv),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.refresh_revealed_coins.denominations_serial),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.refresh_revealed_coins.melt_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_refresh_revealed_coins",
+           "INSERT INTO refresh_revealed_coins"
+           "(rrc_serial"
+           ",freshcoin_index"
+           ",link_sig"
+           ",coin_ev"
+           ",h_coin_ev"
+           ",ev_sig"
+           ",ewv"
+           ",denominations_serial"
+           ",melt_serial_id"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9);");
+  GNUNET_CRYPTO_hash (td->details.refresh_revealed_coins.coin_ev,
+                      td->details.refresh_revealed_coins.coin_ev_size,
+                      &h_coin_ev);
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_refresh_revealed_coins",
+                                             params);
+}
+
+
+/**
+ * Function called with refresh_transfer_keys records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_refresh_transfer_keys (
+  struct PostgresClosure *pg,
+  const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.refresh_transfer_keys.tp),
+    GNUNET_PQ_query_param_fixed_size (
+      &td->details.refresh_transfer_keys.tprivs[0],
+      (TALER_CNC_KAPPA - 1)
+      * sizeof (struct TALER_TransferPrivateKeyP)),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.refresh_transfer_keys.melt_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_refresh_transfer_keys",
+           "INSERT INTO refresh_transfer_keys"
+           "(rtc_serial"
+           ",transfer_pub"
+           ",transfer_privs"
+           ",melt_serial_id"
+           ") VALUES "
+           "($1, $2, $3, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_refresh_transfer_keys",
+                                             params);
+}
+
+
+/**
+ * Function called with batch deposits records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_batch_deposits (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (&td->details.batch_deposits.shard),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.batch_deposits.merchant_pub),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.batch_deposits.wallet_timestamp),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.batch_deposits.exchange_timestamp),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.batch_deposits.refund_deadline),
+    GNUNET_PQ_query_param_timestamp (&td->details.batch_deposits.wire_deadline),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.batch_deposits.h_contract_terms),
+    td->details.batch_deposits.no_wallet_data_hash
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (
+      &td->details.batch_deposits.wallet_data_hash),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.batch_deposits.wire_salt),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.batch_deposits.wire_target_h_payto),
+    GNUNET_PQ_query_param_bool (td->details.batch_deposits.policy_blocked),
+    td->details.batch_deposits.no_policy_details
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_uint64 (
+      &td->details.batch_deposits.policy_details_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_batch_deposits",
+           "INSERT INTO batch_deposits"
+           "(batch_deposit_serial_id"
+           ",shard"
+           ",merchant_pub"
+           ",wallet_timestamp"
+           ",exchange_timestamp"
+           ",refund_deadline"
+           ",wire_deadline"
+           ",h_contract_terms"
+           ",wallet_data_hash"
+           ",wire_salt"
+           ",wire_target_h_payto"
+           ",policy_details_serial_id"
+           ",policy_blocked"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
+           " $11, $12, $13);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_batch_deposits",
+                                             params);
+}
+
+
+/**
+ * Function called with deposits records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_coin_deposits (struct PostgresClosure *pg,
+                             const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.coin_deposits.batch_deposit_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.coin_deposits.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.coin_deposits.coin_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.coin_deposits.amount_with_fee),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_coin_deposits",
+           "INSERT INTO coin_deposits"
+           "(coin_deposit_serial_id"
+           ",batch_deposit_serial_id"
+           ",coin_pub"
+           ",coin_sig"
+           ",amount_with_fee"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_coin_deposits",
+                                             params);
+}
+
+
+/**
+ * Function called with refunds records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_refunds (struct PostgresClosure *pg,
+                       const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.refunds.merchant_sig),
+    GNUNET_PQ_query_param_uint64 (&td->details.refunds.rtransaction_id),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.refunds.amount_with_fee),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.refunds.batch_deposit_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_refunds",
+           "INSERT INTO refunds"
+           "(refund_serial_id"
+           ",coin_pub"
+           ",merchant_sig"
+           ",rtransaction_id"
+           ",amount_with_fee"
+           ",batch_deposit_serial_id"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_refunds",
+                                             params);
+}
+
+
+/**
+ * Function called with wire_out records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wire_out (struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_timestamp (&td->details.wire_out.execution_date),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.wire_out.wtid_raw),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wire_out.wire_target_h_payto),
+    GNUNET_PQ_query_param_string (
+      td->details.wire_out.exchange_account_section),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wire_out.amount),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wire_out",
+           "INSERT INTO wire_out"
+           "(wireout_uuid"
+           ",execution_date"
+           ",wtid_raw"
+           ",wire_target_h_payto"
+           ",exchange_account_section"
+           ",amount"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wire_out",
+                                             params);
+}
+
+
+/**
+ * Function called with aggregation_tracking records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_aggregation_tracking (struct PostgresClosure *pg,
+                                    const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.aggregation_tracking.batch_deposit_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aggregation_tracking.wtid_raw),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_aggregation_tracking",
+           "INSERT INTO aggregation_tracking"
+           "(aggregation_serial_id"
+           ",batch_deposit_serial_id"
+           ",wtid_raw"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_aggregation_tracking",
+                                             params);
+}
+
+
+/**
+ * Function called with wire_fee records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wire_fee (struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_string (td->details.wire_fee.wire_method),
+    GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.start_date),
+    GNUNET_PQ_query_param_timestamp (&td->details.wire_fee.end_date),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wire_fee.fees.wire),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wire_fee.fees.closing),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.wire_fee.master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wire_fee",
+           "INSERT INTO wire_fee"
+           "(wire_fee_serial"
+           ",wire_method"
+           ",start_date"
+           ",end_date"
+           ",wire_fee"
+           ",closing_fee"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wire_fee",
+                                             params);
+}
+
+
+/**
+ * Function called with wire_fee records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_global_fee (struct PostgresClosure *pg,
+                          const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (
+      &td->serial),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.global_fee.start_date),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.global_fee.end_date),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.global_fee.fees.history),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.global_fee.fees.account),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.global_fee.fees.purse),
+    GNUNET_PQ_query_param_relative_time (
+      &td->details.global_fee.purse_timeout),
+    GNUNET_PQ_query_param_relative_time (
+      &td->details.global_fee.history_expiration),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.global_fee.purse_account_limit),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.global_fee.master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_global_fee",
+           "INSERT INTO global_fee"
+           "(global_fee_serial"
+           ",start_date"
+           ",end_date"
+           ",history_fee"
+           ",account_fee"
+           ",purse_fee"
+           ",purse_timeout"
+           ",history_expiration"
+           ",purse_account_limit"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_global_fee",
+                                             params);
+}
+
+
+/**
+ * Function called with recoup records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_recoup (struct PostgresClosure *pg,
+                      const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_sig),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup.coin_blind),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.recoup.amount),
+    GNUNET_PQ_query_param_timestamp (&td->details.recoup.timestamp),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.recoup.coin_pub),
+    GNUNET_PQ_query_param_uint64 (&td->details.recoup.reserve_out_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_recoup",
+           "INSERT INTO recoup"
+           "(recoup_uuid"
+           ",coin_sig"
+           ",coin_blind"
+           ",amount"
+           ",recoup_timestamp"
+           ",coin_pub"
+           ",reserve_out_serial_id"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_recoup",
+                                             params);
+}
+
+
+/**
+ * Function called with recoup_refresh records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_recoup_refresh (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.recoup_refresh.coin_sig),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.recoup_refresh.coin_blind),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.recoup_refresh.amount),
+    GNUNET_PQ_query_param_timestamp (&td->details.recoup_refresh.timestamp),
+    GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.known_coin_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.recoup.coin_pub),
+    GNUNET_PQ_query_param_uint64 (&td->details.recoup_refresh.rrc_serial),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_recoup_refresh",
+           "INSERT INTO recoup_refresh"
+           "(recoup_refresh_uuid"
+           ",coin_sig"
+           ",coin_blind"
+           ",amount"
+           ",recoup_timestamp"
+           ",known_coin_id"
+           ",coin_pub"
+           ",rrc_serial"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_recoup_refresh",
+                                             params);
+}
+
+
+/**
+ * Function called with extensions records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_extensions (struct PostgresClosure *pg,
+                          const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_string (td->details.extensions.name),
+    NULL == td->details.extensions.manifest ?
+    GNUNET_PQ_query_param_null () :
+    GNUNET_PQ_query_param_string (td->details.extensions.manifest),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_extensions",
+           "INSERT INTO extensions"
+           "(extension_id"
+           ",name"
+           ",manifest"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_extensions",
+                                             params);
+}
+
+
+/**
+ * Function called with policy_details records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_policy_details (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.policy_details.hash_code),
+    (td->details.policy_details.no_policy_json)
+      ? GNUNET_PQ_query_param_null ()
+      : TALER_PQ_query_param_json (td->details.policy_details.policy_json),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.policy_details.commitment),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.policy_details.accumulated_total),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.policy_details.fee),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &td->details.policy_details.transferable),
+    GNUNET_PQ_query_param_timestamp (&td->details.policy_details.deadline),
+    GNUNET_PQ_query_param_uint16 (
+      &td->details.policy_details.fulfillment_state),
+    (td->details.policy_details.no_fulfillment_id)
+      ? GNUNET_PQ_query_param_null ()
+      : GNUNET_PQ_query_param_uint64 (
+      &td->details.policy_details.fulfillment_id),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_policy_details",
+           "INSERT INTO policy_details"
+           "(policy_details_serial_id"
+           ",policy_hash_code"
+           ",policy_json"
+           ",deadline"
+           ",commitment"
+           ",accumulated_total"
+           ",fee"
+           ",transferable"
+           ",fulfillment_state"
+           ",fulfillment_id"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_policy_details",
+                                             params);
+}
+
+
+/**
+ * Function called with policy_fulfillment records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_policy_fulfillments (struct PostgresClosure *pg,
+                                   const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.policy_fulfillments.fulfillment_timestamp),
+    (NULL == td->details.policy_fulfillments.fulfillment_proof)
+      ? GNUNET_PQ_query_param_null ()
+      : GNUNET_PQ_query_param_string (
+      td->details.policy_fulfillments.fulfillment_proof),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.policy_fulfillments.h_fulfillment_proof),
+    GNUNET_PQ_query_param_fixed_size (
+      td->details.policy_fulfillments.policy_hash_codes,
+      td->details.policy_fulfillments.policy_hash_codes_count),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_policy_fulfillments",
+           "INSERT INTO policy_fulfillments "
+           "(fulfillment_id"
+           ",fulfillment_timestamp"
+           ",fulfillment_proof"
+           ",h_fulfillment_proof"
+           ",policy_hash_codes"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_policy_fulfillments",
+                                             params);
+}
+
+
+/**
+ * Function called with purse_requests records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_purse_requests (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_requests.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_requests.merge_pub),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.purse_requests.purse_creation),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.purse_requests.purse_expiration),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_requests.h_contract_terms),
+    GNUNET_PQ_query_param_uint32 (&td->details.purse_requests.age_limit),
+    GNUNET_PQ_query_param_uint32 (&td->details.purse_requests.flags),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.purse_requests.amount_with_fee),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.purse_requests.purse_fee),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_requests.purse_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_purse_requests",
+           "INSERT INTO purse_requests"
+           "(purse_requests_serial_id"
+           ",purse_pub"
+           ",merge_pub"
+           ",purse_creation"
+           ",purse_expiration"
+           ",h_contract_terms"
+           ",age_limit"
+           ",flags"
+           ",amount_with_fee"
+           ",purse_fee"
+           ",purse_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_purse_requests",
+                                             params);
+}
+
+
+/**
+ * Function called with purse_decision records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_purse_decision (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_decision.purse_pub),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.purse_decision.action_timestamp),
+    GNUNET_PQ_query_param_bool (
+      td->details.purse_decision.refunded),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_purse_refunds",
+           "INSERT INTO purse_refunds"
+           "(purse_refunds_serial_id"
+           ",purse_pub"
+           ",action_timestamp"
+           ",refunded"
+           ") VALUES "
+           "($1, $2, $3, $4);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_purse_decision",
+                                             params);
+}
+
+
+/**
+ * Function called with purse_merges records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_purse_merges (struct PostgresClosure *pg,
+                            const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (&td->details.purse_merges.partner_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_merges.reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.purse_merges.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.purse_merges.merge_sig),
+    GNUNET_PQ_query_param_timestamp (&td->details.purse_merges.merge_timestamp),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_purse_merges",
+           "INSERT INTO purse_merges"
+           "(purse_merge_request_serial_id"
+           ",partner_serial_id"
+           ",reserve_pub"
+           ",purse_pub"
+           ",merge_sig"
+           ",merge_timestamp"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_purse_merges",
+                                             params);
+}
+
+
+/**
+ * Function called with purse_deposits records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_purse_deposits (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.purse_deposits.partner_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_deposits.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.purse_deposits.coin_pub),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.purse_deposits.amount_with_fee),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.purse_deposits.coin_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_purse_deposits",
+           "INSERT INTO purse_deposits"
+           "(purse_deposit_serial_id"
+           ",partner_serial_id"
+           ",purse_pub"
+           ",coin_pub"
+           ",amount_with_fee"
+           ",coin_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_purse_deposits",
+                                             params);
+}
+
+
+/**
+x * Function called with account_mergers records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_account_mergers (struct PostgresClosure *pg,
+                               const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.account_merges.reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.account_merges.reserve_sig),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.account_merges.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.account_merges.wallet_h_payto),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_account_merges",
+           "INSERT INTO account_merges"
+           "(account_merge_request_serial_id"
+           ",reserve_pub"
+           ",reserve_sig"
+           ",purse_pub"
+           ",wallet_h_payto"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_account_merges",
+                                             params);
+}
+
+
+/**
+ * Function called with history_requests records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_history_requests (struct PostgresClosure *pg,
+                                const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.history_requests.reserve_pub),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.history_requests.request_timestamp),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.history_requests.reserve_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.history_requests.history_fee),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_history_requests",
+           "INSERT INTO history_requests"
+           "(history_request_serial_id"
+           ",reserve_pub"
+           ",request_timestamp"
+           ",reserve_sig"
+           ",history_fee"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_history_requests",
+                                             params);
+}
+
+
+/**
+ * Function called with close_requests records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_close_requests (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.close_requests.reserve_pub),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.close_requests.close_timestamp),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.close_requests.reserve_sig),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.close_requests.close),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.close_requests.close_fee),
+    GNUNET_PQ_query_param_string (
+      td->details.close_requests.payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_close_requests",
+           "INSERT INTO close_requests"
+           "(close_request_serial_id"
+           ",reserve_pub"
+           ",close_timestamp"
+           ",reserve_sig"
+           ",close"
+           ",close_fee"
+           ",payto_uri"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_close_requests",
+                                             params);
+}
+
+
+/**
+ * Function called with wads_out records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wads_out (struct PostgresClosure *pg,
+                        const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.wads_out.wad_id),
+    GNUNET_PQ_query_param_uint64 (&td->details.wads_out.partner_serial_id),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_out.amount),
+    GNUNET_PQ_query_param_timestamp (&td->details.wads_out.execution_time),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wads_out",
+           "INSERT INTO wads_out"
+           "(wad_out_serial_id"
+           ",wad_id"
+           ",partner_serial_id"
+           ",amount"
+           ",execution_time"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wads_out",
+                                             params);
+}
+
+
+/**
+ * Function called with wads_out_entries records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wads_out_entries (struct PostgresClosure *pg,
+                                const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.wads_out_entries.wad_out_serial_id),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_out_entries.reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_out_entries.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_out_entries.h_contract),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.wads_out_entries.purse_expiration),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.wads_out_entries.merge_timestamp),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_out_entries.amount_with_fee),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_out_entries.wad_fee),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_out_entries.deposit_fees),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_out_entries.reserve_sig),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_out_entries.purse_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wad_out_entries",
+           "INSERT INTO wad_out_entries"
+           "(wad_out_entry_serial_id"
+           ",wad_out_serial_id"
+           ",reserve_pub"
+           ",purse_pub"
+           ",h_contract"
+           ",purse_expiration"
+           ",merge_timestamp"
+           ",amount_with_fee"
+           ",wad_fee"
+           ",deposit_fees"
+           ",reserve_sig"
+           ",purse_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wads_out_entries",
+                                             params);
+}
+
+
+/**
+ * Function called with wads_in records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wads_in (struct PostgresClosure *pg,
+                       const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (&td->details.wads_in.wad_id),
+    GNUNET_PQ_query_param_string (td->details.wads_in.origin_exchange_url),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_in.amount),
+    GNUNET_PQ_query_param_timestamp (&td->details.wads_in.arrival_time),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wads_in",
+           "INSERT INTO wads_in"
+           "(wad_in_serial_id"
+           ",wad_id"
+           ",origin_exchange_url"
+           ",amount"
+           ",arrival_time"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wads_in",
+                                             params);
+}
+
+
+/**
+ * Function called with wads_in_entries records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_wads_in_entries (struct PostgresClosure *pg,
+                               const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_in_entries.reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_in_entries.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_in_entries.h_contract),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.wads_in_entries.purse_expiration),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.wads_in_entries.merge_timestamp),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_in_entries.amount_with_fee),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_in_entries.wad_fee),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.wads_in_entries.deposit_fees),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_in_entries.reserve_sig),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.wads_in_entries.purse_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_wad_in_entries",
+           "INSERT INTO wad_in_entries"
+           "(wad_in_entry_serial_id"
+           ",wad_in_serial_id"
+           ",reserve_pub"
+           ",purse_pub"
+           ",h_contract"
+           ",purse_expiration"
+           ",merge_timestamp"
+           ",amount_with_fee"
+           ",wad_fee"
+           ",deposit_fees"
+           ",reserve_sig"
+           ",purse_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_wads_in_entries",
+                                             params);
+}
+
+
+/**
+ * Function called with profit_drains records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_profit_drains (struct PostgresClosure *pg,
+                             const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.profit_drains.wtid),
+    GNUNET_PQ_query_param_string (
+      td->details.profit_drains.account_section),
+    GNUNET_PQ_query_param_string (
+      td->details.profit_drains.payto_uri),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.profit_drains.trigger_date),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.profit_drains.amount),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.profit_drains.master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_profit_drains",
+           "INSERT INTO profit_drains"
+           "(profit_drain_serial_id"
+           ",wtid"
+           ",account_section"
+           ",payto_uri"
+           ",trigger_date"
+           ",amount"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_profit_drains",
+                                             params);
+}
+
+
+/**
+ * Function called with aml_staff records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_aml_staff (struct PostgresClosure *pg,
+                         const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aml_staff.decider_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aml_staff.master_sig),
+    GNUNET_PQ_query_param_string (
+      td->details.aml_staff.decider_name),
+    GNUNET_PQ_query_param_bool (
+      td->details.aml_staff.is_active),
+    GNUNET_PQ_query_param_bool (
+      td->details.aml_staff.read_only),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.aml_staff.last_change),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_aml_staff",
+           "INSERT INTO aml_staff"
+           "(aml_staff_uuid"
+           ",decider_pub"
+           ",master_sig"
+           ",decider_name"
+           ",is_active"
+           ",read_only"
+           ",last_change"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_aml_staff",
+                                             params);
+}
+
+
+/**
+ * Function called with aml_history records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_aml_history (struct PostgresClosure *pg,
+                           const struct TALER_EXCHANGEDB_TableData *td)
+{
+  uint32_t status32 = td->details.aml_history.new_status;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aml_history.h_payto),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.aml_history.new_threshold),
+    GNUNET_PQ_query_param_uint32 (
+      &status32),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.aml_history.decision_time),
+    GNUNET_PQ_query_param_string (
+      td->details.aml_history.justification),
+    (NULL == td->details.aml_history.kyc_requirements)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (
+      td->details.aml_history.kyc_requirements),
+    GNUNET_PQ_query_param_uint64 (
+      &td->details.aml_history.kyc_req_row),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aml_history.decider_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.aml_history.decider_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_aml_history",
+           "INSERT INTO aml_history"
+           "(aml_history_serial_id"
+           ",h_payto"
+           ",new_threshold"
+           ",new_status"
+           ",decision_time"
+           ",justification"
+           ",kyc_requirements"
+           ",kyc_req_row"
+           ",decider_pub"
+           ",decider_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_aml_history",
+                                             params);
+}
+
+
+/**
+ * Function called with kyc_attributes records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_kyc_attributes (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.kyc_attributes.h_payto),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.kyc_attributes.kyc_prox),
+    GNUNET_PQ_query_param_string (
+      td->details.kyc_attributes.provider),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.kyc_attributes.collection_time),
+    GNUNET_PQ_query_param_timestamp (
+      &td->details.kyc_attributes.expiration_time),
+    GNUNET_PQ_query_param_fixed_size (
+      &td->details.kyc_attributes.encrypted_attributes,
+      td->details.kyc_attributes.encrypted_attributes_size),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_kyc_attributes",
+           "INSERT INTO kyc_attributes"
+           "(kyc_attributes_serial_id"
+           ",h_payto"
+           ",kyc_prox"
+           ",provider"
+           ",collection_time"
+           ",expiration_time"
+           ",encrypted_attributes"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_kyc_attributes",
+                                             params);
+}
+
+
+/**
+ * Function called with purse_deletion records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_purse_deletion (struct PostgresClosure *pg,
+                              const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_deletion.purse_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.purse_deletion.purse_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_purse_deletion",
+           "INSERT INTO purse_deletion"
+           "(purse_deletion_serial_id"
+           ",purse_pub"
+           ",purse_sig"
+           ") VALUES "
+           "($1, $2, $3);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_purse_deletion",
+                                             params);
+}
+
+
+/**
+ * Function called with age_withdraw records to insert into table.
+ *
+ * @param pg plugin context
+ * @param td record to insert
+ */
+static enum GNUNET_DB_QueryStatus
+irbt_cb_table_age_withdraw (struct PostgresClosure *pg,
+                            const struct
+                            TALER_EXCHANGEDB_TableData *td)
+{
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&td->serial),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.age_withdraw.h_commitment),
+    TALER_PQ_query_param_amount (
+      pg->conn,
+      &td->details.age_withdraw.amount_with_fee),
+    GNUNET_PQ_query_param_uint16 (
+      &td->details.age_withdraw.max_age),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.age_withdraw.reserve_pub),
+    GNUNET_PQ_query_param_auto_from_type (
+      &td->details.age_withdraw.reserve_sig),
+    GNUNET_PQ_query_param_uint32 (
+      &td->details.age_withdraw.noreveal_index),
+    /* TODO: other fields, too! */
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_into_table_age_withdraw",
+           "INSERT INTO age_withdraw"
+           "(age_withdraw_commitment_id"
+           ",h_commitment"
+           ",amount_with_fee"
+           ",max_age"
+           ",reserve_pub"
+           ",reserve_sig"
+           ",noreveal_index"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6, $7, $8);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_into_table_age_withdraw",
+                                             params);
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_records_by_table (void *cls,
+                                const struct TALER_EXCHANGEDB_TableData *td)
+{
+  struct PostgresClosure *pg = cls;
+  InsertRecordCallback rh = NULL;
+
+  switch (td->table)
+  {
+  case TALER_EXCHANGEDB_RT_DENOMINATIONS:
+    rh = &irbt_cb_table_denominations;
+    break;
+  case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
+    rh = &irbt_cb_table_denomination_revocations;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_TARGETS:
+    rh = &irbt_cb_table_wire_targets;
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES:
+    rh = &irbt_cb_table_legitimization_processes;
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS:
+    rh = &irbt_cb_table_legitimization_requirements;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES:
+    rh = &irbt_cb_table_reserves;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_IN:
+    rh = &irbt_cb_table_reserves_in;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
+    rh = &irbt_cb_table_reserves_close;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS:
+    rh = &irbt_cb_table_reserves_open_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS:
+    rh = &irbt_cb_table_reserves_open_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OUT:
+    rh = &irbt_cb_table_reserves_out;
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITORS:
+    rh = &irbt_cb_table_auditors;
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
+    rh = &irbt_cb_table_auditor_denom_sigs;
+    break;
+  case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
+    rh = &irbt_cb_table_exchange_sign_keys;
+    break;
+  case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
+    rh = &irbt_cb_table_signkey_revocations;
+    break;
+  case TALER_EXCHANGEDB_RT_KNOWN_COINS:
+    rh = &irbt_cb_table_known_coins;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
+    rh = &irbt_cb_table_refresh_commitments;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
+    rh = &irbt_cb_table_refresh_revealed_coins;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
+    rh = &irbt_cb_table_refresh_transfer_keys;
+    break;
+  case TALER_EXCHANGEDB_RT_BATCH_DEPOSITS:
+    rh = &irbt_cb_table_batch_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_COIN_DEPOSITS:
+    rh = &irbt_cb_table_coin_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_REFUNDS:
+    rh = &irbt_cb_table_refunds;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_OUT:
+    rh = &irbt_cb_table_wire_out;
+    break;
+  case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
+    rh = &irbt_cb_table_aggregation_tracking;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_FEE:
+    rh = &irbt_cb_table_wire_fee;
+    break;
+  case TALER_EXCHANGEDB_RT_GLOBAL_FEE:
+    rh = &irbt_cb_table_global_fee;
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP:
+    rh = &irbt_cb_table_recoup;
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
+    rh = &irbt_cb_table_recoup_refresh;
+    break;
+  case TALER_EXCHANGEDB_RT_EXTENSIONS:
+    rh = &irbt_cb_table_extensions;
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_DETAILS:
+    rh = &irbt_cb_table_policy_details;
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS:
+    rh = &irbt_cb_table_policy_fulfillments;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_REQUESTS:
+    rh = &irbt_cb_table_purse_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DECISION:
+    rh = &irbt_cb_table_purse_decision;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_MERGES:
+    rh = &irbt_cb_table_purse_merges;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DEPOSITS:
+    rh = &irbt_cb_table_purse_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_ACCOUNT_MERGES:
+    rh = &irbt_cb_table_account_mergers;
+    break;
+  case TALER_EXCHANGEDB_RT_HISTORY_REQUESTS:
+    rh = &irbt_cb_table_history_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_CLOSE_REQUESTS:
+    rh = &irbt_cb_table_close_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT:
+    rh = &irbt_cb_table_wads_out;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES:
+    rh = &irbt_cb_table_wads_out_entries;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN:
+    rh = &irbt_cb_table_wads_in;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES:
+    rh = &irbt_cb_table_wads_in_entries;
+    break;
+  case TALER_EXCHANGEDB_RT_PROFIT_DRAINS:
+    rh = &irbt_cb_table_profit_drains;
+    break;
+  case TALER_EXCHANGEDB_RT_AML_STAFF:
+    rh = &irbt_cb_table_aml_staff;
+    break;
+  case TALER_EXCHANGEDB_RT_AML_HISTORY:
+    rh = &irbt_cb_table_aml_history;
+    break;
+  case TALER_EXCHANGEDB_RT_KYC_ATTRIBUTES:
+    rh = &irbt_cb_table_kyc_attributes;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DELETION:
+    rh = &irbt_cb_table_purse_deletion;
+    break;
+  case TALER_EXCHANGEDB_RT_AGE_WITHDRAW:
+    rh = &irbt_cb_table_age_withdraw;
+    break;
+  }
+  if (NULL == rh)
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  return rh (pg,
+             td);
+}
+
+
+/* end of pg_insert_records_by_table.c */
diff --git a/src/exchangedb/pg_insert_records_by_table.h b/src/exchangedb/pg_insert_records_by_table.h
new file mode 100644
index 000000000..d9817e0ec
--- /dev/null
+++ b/src/exchangedb/pg_insert_records_by_table.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_records_by_table.h
+ * @brief implementation of the insert_records_by_table function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_RECORDS_BY_TABLE_H
+#define PG_INSERT_RECORDS_BY_TABLE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert record set into @a table.  Used in exchange-auditor database
+ * replication.
+ *
+ * @param cls closure
+ * @param td table data to insert
+ * @return transaction status code, #GNUNET_DB_STATUS_HARD_ERROR if
+ *         @e table in @a tr is not supported
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_records_by_table (void *cls,
+                                const struct TALER_EXCHANGEDB_TableData *td);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_refresh_reveal.c b/src/exchangedb/pg_insert_refresh_reveal.c
new file mode 100644
index 000000000..bddca472b
--- /dev/null
+++ b/src/exchangedb/pg_insert_refresh_reveal.c
@@ -0,0 +1,109 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_refresh_reveal.c
+ * @brief Implementation of the insert_refresh_reveal function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_refresh_reveal.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_refresh_reveal (
+  void *cls,
+  uint64_t melt_serial_id,
+  uint32_t num_rrcs,
+  const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs,
+  unsigned int num_tprivs,
+  const struct TALER_TransferPrivateKeyP *tprivs,
+  const struct TALER_TransferPublicKeyP *tp)
+{
+  struct PostgresClosure *pg = cls;
+
+  if (TALER_CNC_KAPPA != num_tprivs + 1)
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  PREPARE (pg,
+           "insert_refresh_revealed_coin",
+           "INSERT INTO refresh_revealed_coins "
+           "(melt_serial_id "
+           ",freshcoin_index "
+           ",link_sig "
+           ",denominations_serial "
+           ",coin_ev"
+           ",ewv"
+           ",h_coin_ev"
+           ",ev_sig"
+           ") SELECT $1, $2, $3, "
+           "         denominations_serial, $5, $6, $7, $8"
+           "    FROM denominations"
+           "   WHERE denom_pub_hash=$4"
+           " ON CONFLICT DO NOTHING;");
+  for (uint32_t i = 0; i<num_rrcs; i++)
+  {
+    const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &rrcs[i];
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_uint64 (&melt_serial_id),
+      GNUNET_PQ_query_param_uint32 (&i),
+      GNUNET_PQ_query_param_auto_from_type (&rrc->orig_coin_link_sig),
+      GNUNET_PQ_query_param_auto_from_type (&rrc->h_denom_pub),
+      TALER_PQ_query_param_blinded_planchet (&rrc->blinded_planchet),
+      TALER_PQ_query_param_exchange_withdraw_values (&rrc->exchange_vals),
+      GNUNET_PQ_query_param_auto_from_type (&rrc->coin_envelope_hash),
+      TALER_PQ_query_param_blinded_denom_sig (&rrc->coin_sig),
+      GNUNET_PQ_query_param_end
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_refresh_revealed_coin",
+                                             params);
+    if (0 > qs)
+      return qs;
+  }
+
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_uint64 (&melt_serial_id),
+      GNUNET_PQ_query_param_auto_from_type (tp),
+      GNUNET_PQ_query_param_fixed_size (
+        tprivs,
+        num_tprivs * sizeof (struct TALER_TransferPrivateKeyP)),
+      GNUNET_PQ_query_param_end
+    };
+
+    /* Used in #postgres_insert_refresh_reveal() to store the transfer
+   keys we learned */
+    PREPARE (pg,
+             "insert_refresh_transfer_keys",
+             "INSERT INTO refresh_transfer_keys "
+             "(melt_serial_id"
+             ",transfer_pub"
+             ",transfer_privs"
+             ") VALUES ($1, $2, $3)"
+             " ON CONFLICT DO NOTHING;");
+    return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                               "insert_refresh_transfer_keys",
+                                               params);
+  }
+}
diff --git a/src/exchangedb/pg_insert_refresh_reveal.h b/src/exchangedb/pg_insert_refresh_reveal.h
new file mode 100644
index 000000000..ad53ab197
--- /dev/null
+++ b/src/exchangedb/pg_insert_refresh_reveal.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_refresh_reveal.h
+ * @brief implementation of the insert_refresh_reveal function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_REFRESH_REVEAL_H
+#define PG_INSERT_REFRESH_REVEAL_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Store in the database which coin(s) the wallet wanted to create
+ * in a given refresh operation and all of the other information
+ * we learned or created in the /refresh/reveal step.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param melt_serial_id row ID of the commitment / melt operation in refresh_commitments
+ * @param num_rrcs number of coins to generate, size of the @a rrcs array
+ * @param rrcs information about the new coins
+ * @param num_tprivs number of entries in @a tprivs, should be #TALER_CNC_KAPPA - 1
+ * @param tprivs transfer private keys to store
+ * @param tp public key to store
+ * @return query status for the transaction
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_refresh_reveal (
+  void *cls,
+  uint64_t melt_serial_id,
+  uint32_t num_rrcs,
+  const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs,
+  unsigned int num_tprivs,
+  const struct TALER_TransferPrivateKeyP *tprivs,
+  const struct TALER_TransferPublicKeyP *tp);
+
+#endif
diff --git a/src/exchangedb/pg_insert_refund.c b/src/exchangedb/pg_insert_refund.c
new file mode 100644
index 000000000..e989c91bc
--- /dev/null
+++ b/src/exchangedb/pg_insert_refund.c
@@ -0,0 +1,65 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_refund.c
+ * @brief Implementation of the insert_refund function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_refund.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_refund (void *cls,
+                      const struct TALER_EXCHANGEDB_Refund *refund)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&refund->coin.coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_pub),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_sig),
+    GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms),
+    GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &refund->details.refund_amount),
+    GNUNET_PQ_query_param_end
+  };
+
+  GNUNET_assert (GNUNET_YES ==
+                 TALER_amount_cmp_currency (&refund->details.refund_amount,
+                                            &refund->details.refund_fee));
+  PREPARE (pg,
+           "insert_refund",
+           "INSERT INTO refunds "
+           "(coin_pub"
+           ",batch_deposit_serial_id"
+           ",merchant_sig"
+           ",rtransaction_id"
+           ",amount_with_fee"
+           ") SELECT $1, cdep.batch_deposit_serial_id, $3, $5, $6"
+           "    FROM coin_deposits cdep"
+           "    JOIN batch_deposits bdep USING (batch_deposit_serial_id)"
+           "   WHERE coin_pub=$1"
+           "     AND h_contract_terms=$4"
+           "     AND merchant_pub=$2");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_refund",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_refund.h b/src/exchangedb/pg_insert_refund.h
new file mode 100644
index 000000000..02190bcc9
--- /dev/null
+++ b/src/exchangedb/pg_insert_refund.h
@@ -0,0 +1,38 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_refund.h
+ * @brief implementation of the insert_refund function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_REFUND_H
+#define PG_INSERT_REFUND_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Insert information about refunded coin into the database.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param refund refund information to store
+ * @return query result status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_refund (void *cls,
+                      const struct TALER_EXCHANGEDB_Refund *refund);
+
+#endif
diff --git a/src/exchangedb/pg_insert_reserve_closed.c b/src/exchangedb/pg_insert_reserve_closed.c
new file mode 100644
index 000000000..6644fb892
--- /dev/null
+++ b/src/exchangedb/pg_insert_reserve_closed.c
@@ -0,0 +1,113 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_reserve_closed.c
+ * @brief Implementation of the insert_reserve_closed function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_reserve_closed.h"
+#include "pg_helper.h"
+#include "pg_reserves_get.h"
+#include "pg_reserves_update.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_reserve_closed (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct GNUNET_TIME_Timestamp execution_date,
+  const char *receiver_account,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_Amount *closing_fee,
+  uint64_t close_request_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct TALER_EXCHANGEDB_Reserve reserve;
+  enum GNUNET_DB_QueryStatus qs;
+  struct TALER_PaytoHashP h_payto;
+
+  TALER_payto_hash (receiver_account,
+                    &h_payto);
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+      GNUNET_PQ_query_param_timestamp (&execution_date),
+      GNUNET_PQ_query_param_auto_from_type (wtid),
+      GNUNET_PQ_query_param_auto_from_type (&h_payto),
+      TALER_PQ_query_param_amount (pg->conn,
+                                   amount_with_fee),
+      TALER_PQ_query_param_amount (pg->conn,
+                                   closing_fee),
+      GNUNET_PQ_query_param_uint64 (&close_request_row),
+      GNUNET_PQ_query_param_end
+    };
+
+    PREPARE (pg,
+             "reserves_close_insert",
+             "INSERT INTO reserves_close "
+             "(reserve_pub"
+             ",execution_date"
+             ",wtid"
+             ",wire_target_h_payto"
+             ",amount"
+             ",closing_fee"
+             ",close_request_row"
+             ") VALUES ($1, $2, $3, $4, $5, $6, $7);");
+
+    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "reserves_close_insert",
+                                             params);
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
+    return qs;
+
+  /* update reserve balance */
+  reserve.pub = *reserve_pub;
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      (qs = TEH_PG_reserves_get (cls,
+                                 &reserve)))
+  {
+    /* Existence should have been checked before we got here... */
+    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+      qs = GNUNET_DB_STATUS_HARD_ERROR;
+    return qs;
+  }
+  {
+    enum TALER_AmountArithmeticResult ret;
+
+    ret = TALER_amount_subtract (&reserve.balance,
+                                 &reserve.balance,
+                                 amount_with_fee);
+    if (ret < 0)
+    {
+      /* The reserve history was checked to make sure there is enough of a balance
+         left before we tried this; however, concurrent operations may have changed
+         the situation by now.  We should re-try the transaction.  */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Closing of reserve `%s' refused due to balance mismatch. Retrying.\n",
+                  TALER_B2S (reserve_pub));
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    GNUNET_break (TALER_AAR_RESULT_ZERO == ret);
+  }
+  return TEH_PG_reserves_update (cls,
+                                 &reserve);
+}
diff --git a/src/exchangedb/pg_insert_reserve_closed.h b/src/exchangedb/pg_insert_reserve_closed.h
new file mode 100644
index 000000000..2ac1a6e30
--- /dev/null
+++ b/src/exchangedb/pg_insert_reserve_closed.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_reserve_closed.h
+ * @brief implementation of the insert_reserve_closed function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_RESERVE_CLOSED_H
+#define PG_INSERT_RESERVE_CLOSED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Insert reserve close operation into database.
+ *
+ * @param cls closure
+ * @param reserve_pub which reserve is this about?
+ * @param execution_date when did we perform the transfer?
+ * @param receiver_account to which account do we transfer?
+ * @param wtid wire transfer details
+ * @param amount_with_fee amount we charged to the reserve
+ * @param closing_fee how high is the closing fee
+ * @param close_request_row identifies explicit close request, 0 for none
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_reserve_closed (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct GNUNET_TIME_Timestamp execution_date,
+  const char *receiver_account,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_Amount *closing_fee,
+  uint64_t close_request_row);
+
+#endif
diff --git a/src/exchangedb/pg_insert_reserve_open_deposit.c b/src/exchangedb/pg_insert_reserve_open_deposit.c
new file mode 100644
index 000000000..f9cedcbe7
--- /dev/null
+++ b/src/exchangedb/pg_insert_reserve_open_deposit.c
@@ -0,0 +1,67 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_reserve_open_deposit.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_reserve_open_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_reserve_open_deposit (
+  void *cls,
+  const struct TALER_CoinPublicInfo *cpi,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  uint64_t known_coin_id,
+  const struct TALER_Amount *coin_total,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *insufficient_funds)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&cpi->coin_pub),
+    GNUNET_PQ_query_param_uint64 (&known_coin_id),
+    GNUNET_PQ_query_param_auto_from_type (coin_sig),
+    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 coin_total),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_bool ("out_insufficient_funds",
+                                insufficient_funds),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "insert_reserve_open_deposit",
+           "SELECT "
+           " out_insufficient_funds"
+           " FROM exchange_do_reserve_open_deposit"
+           " ($1,$2,$3,$4,$5,$6);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "insert_reserve_open_deposit",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_insert_reserve_open_deposit.h b/src/exchangedb/pg_insert_reserve_open_deposit.h
new file mode 100644
index 000000000..7eb2fe093
--- /dev/null
+++ b/src/exchangedb/pg_insert_reserve_open_deposit.h
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_insert_reserve_open_deposit.h
+ * @brief implementation of the insert_reserve_open_deposit function
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_RESERVE_OPEN_DEPOSIT_H
+#define PG_INSERT_RESERVE_OPEN_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert reserve open coin deposit data into database.
+ * Subtracts the @a coin_total from the coin's balance.
+ *
+ * @param cls closure
+ * @param cpi public information about the coin
+ * @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT
+ * @param known_coin_id ID of the coin in the known_coins table
+ * @param coin_total amount to be spent of the coin (including deposit fee)
+ * @param reserve_sig signature by the reserve affirming the open operation
+ * @param reserve_pub public key of the reserve being opened
+ * @param[out] insufficient_funds set to true if the coin's balance is insufficient, otherwise to false
+ * @return transaction status code, 0 if operation is already in the DB
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_reserve_open_deposit (
+  void *cls,
+  const struct TALER_CoinPublicInfo *cpi,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  uint64_t known_coin_id,
+  const struct TALER_Amount *coin_total,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *insufficient_funds);
+
+#endif
diff --git a/src/exchangedb/pg_insert_signkey_revocation.c b/src/exchangedb/pg_insert_signkey_revocation.c
new file mode 100644
index 000000000..9197be6ad
--- /dev/null
+++ b/src/exchangedb/pg_insert_signkey_revocation.c
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_signkey_revocation.c
+ * @brief Implementation of the insert_signkey_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_signkey_revocation.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_signkey_revocation (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+
+
+  PREPARE (pg,
+           "insert_signkey_revocation",
+           "INSERT INTO signkey_revocations "
+           "(esk_serial"
+           ",master_sig"
+           ") SELECT esk_serial, $2 "
+           "    FROM exchange_sign_keys"
+           "   WHERE exchange_pub=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_signkey_revocation",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_signkey_revocation.h b/src/exchangedb/pg_insert_signkey_revocation.h
new file mode 100644
index 000000000..534e6d451
--- /dev/null
+++ b/src/exchangedb/pg_insert_signkey_revocation.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_signkey_revocation.h
+ * @brief implementation of the insert_signkey_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_SIGNKEY_REVOCATION_H
+#define PG_INSERT_SIGNKEY_REVOCATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Store information about a revoked online signing key.
+ *
+ * @param cls closure
+ * @param exchange_pub exchange online signing key that was revoked
+ * @param master_sig signature affirming the revocation
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_signkey_revocation (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_MasterSignatureP *master_sig);
+#endif
diff --git a/src/exchangedb/pg_insert_wire.c b/src/exchangedb/pg_insert_wire.c
new file mode 100644
index 000000000..b1364cbb3
--- /dev/null
+++ b/src/exchangedb/pg_insert_wire.c
@@ -0,0 +1,74 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023, 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_wire.c
+ * @brief Implementation of the insert_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_wire.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_wire (void *cls,
+                    const char *payto_uri,
+                    const char *conversion_url,
+                    const json_t *debit_restrictions,
+                    const json_t *credit_restrictions,
+                    struct GNUNET_TIME_Timestamp start_date,
+                    const struct TALER_MasterSignatureP *master_sig,
+                    const char *bank_label,
+                    int64_t priority)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (payto_uri),
+    NULL == conversion_url
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (conversion_url),
+    TALER_PQ_query_param_json (debit_restrictions),
+    TALER_PQ_query_param_json (credit_restrictions),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_timestamp (&start_date),
+    NULL == bank_label
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (bank_label),
+    GNUNET_PQ_query_param_int64 (&priority),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_wire",
+           "INSERT INTO wire_accounts "
+           "(payto_uri"
+           ",conversion_url"
+           ",debit_restrictions"
+           ",credit_restrictions"
+           ",master_sig"
+           ",is_active"
+           ",last_change"
+           ",bank_label"
+           ",priority"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, true, $6, $7, $8);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_wire",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_wire.h b/src/exchangedb/pg_insert_wire.h
new file mode 100644
index 000000000..7a5e4caca
--- /dev/null
+++ b/src/exchangedb/pg_insert_wire.h
@@ -0,0 +1,55 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_wire.h
+ * @brief implementation of the insert_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_WIRE_H
+#define PG_INSERT_WIRE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Insert information about an wire account used by this exchange.
+ *
+ * @param cls closure
+ * @param payto_uri wire account of the exchange
+ * @param conversion_url URL of a conversion service, NULL if there is no conversion
+ * @param debit_restrictions JSON array with debit restrictions on the account
+ * @param credit_restrictions JSON array with credit restrictions on the account
+ * @param start_date date when the account was added by the offline system
+ *                      (only to be used for replay detection)
+ * @param master_sig public signature affirming the existence of the account,
+ *         must be of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS
+ * @param bank_label label to show this entry under in the UI, can be NULL
+ * @param priority determines order in which entries are shown in the UI
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_wire (void *cls,
+                    const char *payto_uri,
+                    const char *conversion_url,
+                    const json_t *debit_restrictions,
+                    const json_t *credit_restrictions,
+                    struct GNUNET_TIME_Timestamp start_date,
+                    const struct TALER_MasterSignatureP *master_sig,
+                    const char *bank_label,
+                    int64_t priority);
+
+
+#endif
diff --git a/src/exchangedb/pg_insert_wire_fee.c b/src/exchangedb/pg_insert_wire_fee.c
new file mode 100644
index 000000000..af818bcca
--- /dev/null
+++ b/src/exchangedb/pg_insert_wire_fee.c
@@ -0,0 +1,108 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_wire_fee.c
+ * @brief Implementation of the insert_wire_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_wire_fee.h"
+#include "pg_helper.h"
+#include "pg_get_wire_fee.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_wire_fee (void *cls,
+                        const char *type,
+                        struct GNUNET_TIME_Timestamp start_date,
+                        struct GNUNET_TIME_Timestamp end_date,
+                        const struct TALER_WireFeeSet *fees,
+                        const struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (type),
+    GNUNET_PQ_query_param_timestamp (&start_date),
+    GNUNET_PQ_query_param_timestamp (&end_date),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &fees->wire),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &fees->closing),
+    GNUNET_PQ_query_param_auto_from_type (master_sig),
+    GNUNET_PQ_query_param_end
+  };
+  struct TALER_WireFeeSet wx;
+  struct TALER_MasterSignatureP sig;
+  struct GNUNET_TIME_Timestamp sd;
+  struct GNUNET_TIME_Timestamp ed;
+  enum GNUNET_DB_QueryStatus qs;
+
+  qs = TEH_PG_get_wire_fee (pg,
+                            type,
+                            start_date,
+                            &sd,
+                            &ed,
+                            &wx,
+                            &sig);
+  if (qs < 0)
+    return qs;
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    if (0 != GNUNET_memcmp (&sig,
+                            master_sig))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if (0 !=
+        TALER_wire_fee_set_cmp (fees,
+                                &wx))
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    if ( (GNUNET_TIME_timestamp_cmp (sd,
+                                     !=,
+                                     start_date)) ||
+         (GNUNET_TIME_timestamp_cmp (ed,
+                                     !=,
+                                     end_date)) )
+    {
+      GNUNET_break (0);
+      return GNUNET_DB_STATUS_HARD_ERROR;
+    }
+    /* equal record already exists */
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+
+  PREPARE (pg,
+           "insert_wire_fee",
+           "INSERT INTO wire_fee "
+           "(wire_method"
+           ",start_date"
+           ",end_date"
+           ",wire_fee"
+           ",closing_fee"
+           ",master_sig"
+           ") VALUES "
+           "($1, $2, $3, $4, $5, $6);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_wire_fee",
+                                             params);
+}
diff --git a/src/exchangedb/pg_insert_wire_fee.h b/src/exchangedb/pg_insert_wire_fee.h
new file mode 100644
index 000000000..15c1a39f8
--- /dev/null
+++ b/src/exchangedb/pg_insert_wire_fee.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_insert_wire_fee.h
+ * @brief implementation of the insert_wire_fee function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_INSERT_WIRE_FEE_H
+#define PG_INSERT_WIRE_FEE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Insert wire transfer fee into database.
+ *
+ * @param cls closure
+ * @param type type of wire transfer this fee applies for
+ * @param start_date when does the fee go into effect
+ * @param end_date when does the fee end being valid
+ * @param fees how high are the wire fees
+ * @param master_sig signature over the above by the exchange master key
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_insert_wire_fee (void *cls,
+                        const char *type,
+                        struct GNUNET_TIME_Timestamp start_date,
+                        struct GNUNET_TIME_Timestamp end_date,
+                        const struct TALER_WireFeeSet *fees,
+                        const struct TALER_MasterSignatureP *master_sig);
+#endif
diff --git a/src/exchangedb/pg_iterate_active_auditors.c b/src/exchangedb/pg_iterate_active_auditors.c
new file mode 100644
index 000000000..4f1c6ec66
--- /dev/null
+++ b/src/exchangedb/pg_iterate_active_auditors.c
@@ -0,0 +1,123 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_active_auditors.c
+ * @brief Implementation of the iterate_active_auditors function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_active_auditors.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #auditors_cb_helper()
+ */
+struct AuditorsIteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_AuditorsCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_active_auditors().
+ * Calls the callback with each auditor.
+ *
+ * @param cls a `struct SignkeysIteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+auditors_cb_helper (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct AuditorsIteratorContext *dic = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_AuditorPublicKeyP auditor_pub;
+    char *auditor_url;
+    char *auditor_name;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
+                                            &auditor_pub),
+      GNUNET_PQ_result_spec_string ("auditor_url",
+                                    &auditor_url),
+      GNUNET_PQ_result_spec_string ("auditor_name",
+                                    &auditor_name),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    dic->cb (dic->cb_cls,
+             &auditor_pub,
+             auditor_url,
+             auditor_name);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_active_auditors (void *cls,
+                                TALER_EXCHANGEDB_AuditorsCallback cb,
+                                void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct AuditorsIteratorContext dic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+  };
+
+  PREPARE (pg,
+           "select_auditors",
+           "SELECT"
+           " auditor_pub"
+           ",auditor_url"
+           ",auditor_name"
+           " FROM auditors"
+           " WHERE"
+           "   is_active;");
+
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "select_auditors",
+                                               params,
+                                               &auditors_cb_helper,
+                                               &dic);
+}
diff --git a/src/exchangedb/pg_iterate_active_auditors.h b/src/exchangedb/pg_iterate_active_auditors.h
new file mode 100644
index 000000000..f0e2808e9
--- /dev/null
+++ b/src/exchangedb/pg_iterate_active_auditors.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_active_auditors.h
+ * @brief implementation of the iterate_active_auditors function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_ACTIVE_AUDITORS_H
+#define PG_ITERATE_ACTIVE_AUDITORS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to invoke @a cb on every active auditor. Disabled
+ * auditors are skipped. Runs in its own read-only transaction.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each active auditor
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_active_auditors (void *cls,
+                                TALER_EXCHANGEDB_AuditorsCallback cb,
+                                void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_active_signkeys.c b/src/exchangedb/pg_iterate_active_signkeys.c
new file mode 100644
index 000000000..9c280c95d
--- /dev/null
+++ b/src/exchangedb/pg_iterate_active_signkeys.c
@@ -0,0 +1,144 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_active_signkeys.c
+ * @brief Implementation of the iterate_active_signkeys function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_active_signkeys.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #signkeys_cb_helper()
+ */
+struct SignkeysIteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_ActiveSignkeysCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_active_signkeys().
+ * Calls the callback with each signkey.
+ *
+ * @param cls a `struct SignkeysIteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+signkeys_cb_helper (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct SignkeysIteratorContext *dic = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_SignkeyMetaData meta;
+    struct TALER_ExchangePublicKeyP exchange_pub;
+    struct TALER_MasterSignatureP master_sig;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &master_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
+                                            &exchange_pub),
+      GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                       &meta.start),
+      GNUNET_PQ_result_spec_timestamp ("expire_sign",
+                                       &meta.expire_sign),
+      GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                       &meta.expire_legal),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    dic->cb (dic->cb_cls,
+             &exchange_pub,
+             &meta,
+             &master_sig);
+  }
+}
+
+
+/**
+ * Function called to invoke @a cb on every non-revoked exchange signing key
+ * that has been signed by the master key.  Revoked and (for signing!)
+ * expired keys are skipped. Runs in its own read-only transaction.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each signing key
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_active_signkeys (void *cls,
+                                TALER_EXCHANGEDB_ActiveSignkeysCallback cb,
+                                void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now = {0};
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct SignkeysIteratorContext dic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+  };
+
+  PREPARE (pg,
+           "select_signkeys",
+           "SELECT"
+           " master_sig"
+           ",exchange_pub"
+           ",valid_from"
+           ",expire_sign"
+           ",expire_legal"
+           " FROM exchange_sign_keys esk"
+           " WHERE"
+           "   expire_sign > $1"
+           " AND NOT EXISTS "
+           "  (SELECT esk_serial "
+           "     FROM signkey_revocations skr"
+           "    WHERE esk.esk_serial = skr.esk_serial);");
+  now = GNUNET_TIME_absolute_get ();
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "select_signkeys",
+                                               params,
+                                               &signkeys_cb_helper,
+                                               &dic);
+}
diff --git a/src/exchangedb/pg_iterate_active_signkeys.h b/src/exchangedb/pg_iterate_active_signkeys.h
new file mode 100644
index 000000000..5ebba9f5a
--- /dev/null
+++ b/src/exchangedb/pg_iterate_active_signkeys.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_active_signkeys.h
+ * @brief implementation of the iterate_active_signkeys function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_ACTIVE_SIGNKEYS_H
+#define PG_ITERATE_ACTIVE_SIGNKEYS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to invoke @a cb on every non-revoked exchange signing key
+ * that has been signed by the master key.  Revoked and (for signing!)
+ * expired keys are skipped. Runs in its own read-only transaction.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each signing key
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_active_signkeys (void *cls,
+                                TALER_EXCHANGEDB_ActiveSignkeysCallback cb,
+                                void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_auditor_denominations.c b/src/exchangedb/pg_iterate_auditor_denominations.c
new file mode 100644
index 000000000..1fd4cdea6
--- /dev/null
+++ b/src/exchangedb/pg_iterate_auditor_denominations.c
@@ -0,0 +1,121 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_auditor_denominations.c
+ * @brief Implementation of the iterate_auditor_denominations function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_auditor_denominations.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #auditor_denoms_cb_helper()
+ */
+struct AuditorDenomsIteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_AuditorDenominationsCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_auditor_denominations().
+ * Calls the callback with each auditor and denomination pair.
+ *
+ * @param cls a `struct AuditorDenomsIteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+auditor_denoms_cb_helper (void *cls,
+                          PGresult *result,
+                          unsigned int num_results)
+{
+  struct AuditorDenomsIteratorContext *dic = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_AuditorPublicKeyP auditor_pub;
+    struct TALER_DenominationHashP h_denom_pub;
+    struct TALER_AuditorSignatureP auditor_sig;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
+                                            &auditor_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &h_denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("auditor_sig",
+                                            &auditor_sig),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    dic->cb (dic->cb_cls,
+             &auditor_pub,
+             &h_denom_pub,
+             &auditor_sig);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_auditor_denominations (
+  void *cls,
+  TALER_EXCHANGEDB_AuditorDenominationsCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct AuditorDenomsIteratorContext dic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+  };
+  /* Used in #postgres_iterate_auditor_denominations() */
+  PREPARE (pg,
+           "select_auditor_denoms",
+           "SELECT"
+           " auditors.auditor_pub"
+           ",denominations.denom_pub_hash"
+           ",auditor_denom_sigs.auditor_sig"
+           " FROM auditor_denom_sigs"
+           " JOIN auditors USING (auditor_uuid)"
+           " JOIN denominations USING (denominations_serial)"
+           " WHERE auditors.is_active;");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "select_auditor_denoms",
+                                               params,
+                                               &auditor_denoms_cb_helper,
+                                               &dic);
+}
diff --git a/src/exchangedb/pg_iterate_auditor_denominations.h b/src/exchangedb/pg_iterate_auditor_denominations.h
new file mode 100644
index 000000000..1278e8a9f
--- /dev/null
+++ b/src/exchangedb/pg_iterate_auditor_denominations.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_auditor_denominations.h
+ * @brief implementation of the iterate_auditor_denominations function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_AUDITOR_DENOMINATIONS_H
+#define PG_ITERATE_AUDITOR_DENOMINATIONS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to invoke @a cb on every denomination with an active
+ * auditor. Disabled auditors and denominations without auditor are
+ * skipped. Runs in its own read-only transaction.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each active auditor
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_auditor_denominations (
+  void *cls,
+  TALER_EXCHANGEDB_AuditorDenominationsCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_denomination_info.c b/src/exchangedb/pg_iterate_denomination_info.c
new file mode 100644
index 000000000..cab51d5ce
--- /dev/null
+++ b/src/exchangedb/pg_iterate_denomination_info.c
@@ -0,0 +1,180 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_denomination_info.c
+ * @brief Implementation of the iterate_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_denomination_info.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #domination_cb_helper()
+ */
+struct DenomIteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_DenominationCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_denomination_info().
+ * Calls the callback with each denomination key.
+ *
+ * @param cls a `struct DenomIteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+domination_cb_helper (void *cls,
+                      PGresult *result,
+                      unsigned int num_results)
+{
+  struct DenomIteratorContext *dic = cls;
+  struct PostgresClosure *pg = dic->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_DenominationKeyInformation issue;
+    struct TALER_DenominationPublicKey denom_pub;
+    struct TALER_DenominationHashP denom_hash;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &issue.signature),
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &denom_hash),
+      GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                       &issue.start),
+      GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
+                                       &issue.expire_withdraw),
+      GNUNET_PQ_result_spec_timestamp ("expire_deposit",
+                                       &issue.expire_deposit),
+      GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                       &issue.expire_legal),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
+                                   &issue.value),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                   &issue.fees.withdraw),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                   &issue.fees.deposit),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                   &issue.fees.refresh),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                   &issue.fees.refund),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_uint32 ("age_mask",
+                                    &issue.age_mask.bits),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+
+    /* Unfortunately we have to carry the age mask in both, the
+     * TALER_DenominationPublicKey and
+     * TALER_EXCHANGEDB_DenominationKeyInformation at different times.
+     * Here we use _both_ so let's make sure the values are the same. */
+    denom_pub.age_mask = issue.age_mask;
+    TALER_denom_pub_hash (&denom_pub,
+                          &issue.denom_hash);
+    if (0 !=
+        GNUNET_memcmp (&issue.denom_hash,
+                       &denom_hash))
+    {
+      GNUNET_break (0);
+    }
+    else
+    {
+      dic->cb (dic->cb_cls,
+               &denom_pub,
+               &issue);
+    }
+    TALER_denom_pub_free (&denom_pub);
+  }
+}
+
+
+/**
+ * Fetch information about all known denomination keys.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each denomination key
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_denomination_info (void *cls,
+                                  TALER_EXCHANGEDB_DenominationCallback cb,
+                                  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct DenomIteratorContext dic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "denomination_iterate",
+           "SELECT"
+           " master_sig"
+           ",denom_pub_hash"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin" /* value of this denom */
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",denom_pub"
+           ",age_mask"
+           " FROM denominations;");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "denomination_iterate",
+                                               params,
+                                               &domination_cb_helper,
+                                               &dic);
+}
diff --git a/src/exchangedb/pg_iterate_denomination_info.h b/src/exchangedb/pg_iterate_denomination_info.h
new file mode 100644
index 000000000..27c08d0a9
--- /dev/null
+++ b/src/exchangedb/pg_iterate_denomination_info.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_denomination_info.h
+ * @brief implementation of the iterate_denomination_info function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_DENOMINATION_INFO_H
+#define PG_ITERATE_DENOMINATION_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Fetch information about all known denomination keys.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each denomination key
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_denomination_info (void *cls,
+                                  TALER_EXCHANGEDB_DenominationCallback cb,
+                                  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_denominations.c b/src/exchangedb/pg_iterate_denominations.c
new file mode 100644
index 000000000..684aa165a
--- /dev/null
+++ b/src/exchangedb/pg_iterate_denominations.c
@@ -0,0 +1,172 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_denominations.c
+ * @brief Implementation of the iterate_denominations function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_denominations.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #dominations_cb_helper()
+ */
+struct DenomsIteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_DenominationsCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_denominations().
+ * Calls the callback with each denomination key.
+ *
+ * @param cls a `struct DenomsIteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+dominations_cb_helper (void *cls,
+                       PGresult *result,
+                       unsigned int num_results)
+{
+  struct DenomsIteratorContext *dic = cls;
+  struct PostgresClosure *pg = dic->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_DenominationKeyMetaData meta = {0};
+    struct TALER_DenominationPublicKey denom_pub = {0};
+    struct TALER_MasterSignatureP master_sig = {0};
+    struct TALER_DenominationHashP h_denom_pub = {0};
+    bool revoked;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("denominations_serial",
+                                    &meta.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &master_sig),
+      GNUNET_PQ_result_spec_bool ("revoked",
+                                  &revoked),
+      GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                       &meta.start),
+      GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
+                                       &meta.expire_withdraw),
+      GNUNET_PQ_result_spec_timestamp ("expire_deposit",
+                                       &meta.expire_deposit),
+      GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                       &meta.expire_legal),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
+                                   &meta.value),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                   &meta.fees.withdraw),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                   &meta.fees.deposit),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                   &meta.fees.refresh),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                   &meta.fees.refund),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_uint32 ("age_mask",
+                                    &meta.age_mask.bits),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+
+    /* make sure the mask information is the same */
+    denom_pub.age_mask = meta.age_mask;
+
+    TALER_denom_pub_hash (&denom_pub,
+                          &h_denom_pub);
+    dic->cb (dic->cb_cls,
+             &denom_pub,
+             &h_denom_pub,
+             &meta,
+             &master_sig,
+             revoked);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_denominations (void *cls,
+                              TALER_EXCHANGEDB_DenominationsCallback cb,
+                              void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct DenomsIteratorContext dic = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "select_denominations",
+           "SELECT"
+           " denominations_serial"
+           ",denominations.master_sig"
+           ",denom_revocations_serial_id IS NOT NULL AS revoked"
+           ",valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"              /* value of this denom */
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",denom_type"
+           ",age_mask"
+           ",denom_pub"
+           " FROM denominations"
+           " LEFT JOIN "
+           "   denomination_revocations USING (denominations_serial);");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "select_denominations",
+                                               params,
+                                               &dominations_cb_helper,
+                                               &dic);
+}
diff --git a/src/exchangedb/pg_iterate_denominations.h b/src/exchangedb/pg_iterate_denominations.h
new file mode 100644
index 000000000..9f59fc803
--- /dev/null
+++ b/src/exchangedb/pg_iterate_denominations.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_iterate_denominations.h
+ * @brief implementation of the iterate_denominations function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_DENOMINATIONS_H
+#define PG_ITERATE_DENOMINATIONS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to invoke @a cb on every known denomination key (revoked
+ * and non-revoked) that has been signed by the master key. Runs in its own
+ * read-only transaction.
+ *
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param cb function to call on each denomination key
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_denominations (void *cls,
+                              TALER_EXCHANGEDB_DenominationsCallback cb,
+                              void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_kyc_reference.c b/src/exchangedb/pg_iterate_kyc_reference.c
new file mode 100644
index 000000000..772c51e2c
--- /dev/null
+++ b/src/exchangedb/pg_iterate_kyc_reference.c
@@ -0,0 +1,129 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_iterate_kyc_reference.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_iterate_kyc_reference.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #iterate_kyc_reference_cb()
+ */
+struct IteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_LegitimizationProcessCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_kyc_reference().
+ * Calls the callback with each denomination key.
+ *
+ * @param cls a `struct IteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+iterate_kyc_reference_cb (void *cls,
+                          PGresult *result,
+                          unsigned int num_results)
+{
+  struct IteratorContext *ic = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    char *kyc_provider_section_name;
+    char *provider_user_id;
+    char *legitimization_id;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_string ("provider_section",
+                                    &kyc_provider_section_name),
+      GNUNET_PQ_result_spec_string ("provider_user_id",
+                                    &provider_user_id),
+      GNUNET_PQ_result_spec_string ("provider_legitimization_id",
+                                    &legitimization_id),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    ic->cb (ic->cb_cls,
+            kyc_provider_section_name,
+            provider_user_id,
+            legitimization_id);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_kyc_reference (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_LegitimizationProcessCallback lpc,
+  void *lpc_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct IteratorContext ic = {
+    .cb = lpc,
+    .cb_cls = lpc_cls,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "iterate_kyc_reference",
+           "SELECT "
+           " provider_section"
+           ",provider_user_id"
+           ",provider_legitimization_id"
+           " FROM legitimization_processes"
+           " WHERE h_payto=$1;");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "iterate_kyc_reference",
+                                               params,
+                                               &iterate_kyc_reference_cb,
+                                               &ic);
+}
diff --git a/src/exchangedb/pg_iterate_kyc_reference.h b/src/exchangedb/pg_iterate_kyc_reference.h
new file mode 100644
index 000000000..0242fdcf1
--- /dev/null
+++ b/src/exchangedb/pg_iterate_kyc_reference.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_iterate_kyc_reference.h
+ * @brief implementation of the iterate_kyc_reference function
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_KYC_REFERENCE_H
+#define PG_ITERATE_KYC_REFERENCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Call us on KYC legitimization processes satisfied and not expired for the
+ * given account.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param lpc function to call for each satisfied KYC legitimization process
+ * @param lpc_cls closure for @a lpc
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_kyc_reference (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_LegitimizationProcessCallback lpc,
+  void *lpc_cls);
+
+#endif
diff --git a/src/exchangedb/pg_iterate_reserve_close_info.c b/src/exchangedb/pg_iterate_reserve_close_info.c
new file mode 100644
index 000000000..ff0a813c3
--- /dev/null
+++ b/src/exchangedb/pg_iterate_reserve_close_info.c
@@ -0,0 +1,128 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_iterate_reserve_close_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_insert_reserve_open_deposit.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #iterate_reserve_close_info_cb()
+ */
+struct IteratorContext
+{
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_KycAmountCallback cb;
+
+  /**
+   * Closure to pass to @e cb
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_iterate_reserve_close_info().
+ * Calls the callback with each denomination key.
+ *
+ * @param cls a `struct IteratorContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+iterate_reserve_close_info_cb (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct IteratorContext *ic = cls;
+  struct PostgresClosure *pg = ic->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_Amount amount;
+    struct GNUNET_TIME_Absolute ts;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_absolute_time ("execution_date",
+                                           &ts),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    ic->cb (ic->cb_cls,
+            &amount,
+            ts);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_reserve_close_info (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&time_limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct IteratorContext ic = {
+    .cb = kac,
+    .cb_cls = kac_cls,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "iterate_reserve_close_info",
+           "SELECT"
+           " amount"
+           ",execution_date"
+           " FROM reserves_close"
+           " WHERE wire_target_h_payto=$1"
+           "   AND execution_date >= $2"
+           " ORDER BY execution_date DESC");
+  return GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "iterate_reserve_close_info",
+    params,
+    &iterate_reserve_close_info_cb,
+    &ic);
+}
diff --git a/src/exchangedb/pg_iterate_reserve_close_info.h b/src/exchangedb/pg_iterate_reserve_close_info.h
new file mode 100644
index 000000000..34692e656
--- /dev/null
+++ b/src/exchangedb/pg_iterate_reserve_close_info.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_iterate_reserve_close_info.h
+ * @brief implementation of the iterate_reserve_close_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_ITERATE_RESERVE_CLOSE_INFO_H
+#define PG_ITERATE_RESERVE_CLOSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select information needed for KYC checks on reserve close: historic
+ * reserve closures going to the same account.
+ *
+ * @param cls closure
+ * @param h_payto which target account is this about?
+ * @param time_limit oldest transaction that could be relevant
+ * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+ * @param kac_cls closure for @a kac
+ * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_iterate_reserve_close_info (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_kyc_provider_account_lookup.c b/src/exchangedb/pg_kyc_provider_account_lookup.c
new file mode 100644
index 000000000..f9db2cbc1
--- /dev/null
+++ b/src/exchangedb/pg_kyc_provider_account_lookup.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_kyc_provider_account_lookup.c
+ * @brief Implementation of the kyc_provider_account_lookup function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_kyc_provider_account_lookup.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_kyc_provider_account_lookup (
+  void *cls,
+  const char *provider_section,
+  const char *provider_legitimization_id,
+  struct TALER_PaytoHashP *h_payto,
+  uint64_t *process_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (provider_legitimization_id),
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("h_payto",
+                                          h_payto),
+    GNUNET_PQ_result_spec_uint64 ("legitimization_process_serial_id",
+                                  process_row),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "get_wire_target_by_legitimization_id",
+           "SELECT "
+           " h_payto"
+           ",legitimization_process_serial_id"
+           " FROM legitimization_processes"
+           " WHERE provider_legitimization_id=$1"
+           "   AND provider_section=$2;");
+  return GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "get_wire_target_by_legitimization_id",
+    params,
+    rs);
+}
diff --git a/src/exchangedb/pg_kyc_provider_account_lookup.h b/src/exchangedb/pg_kyc_provider_account_lookup.h
new file mode 100644
index 000000000..74f90d88d
--- /dev/null
+++ b/src/exchangedb/pg_kyc_provider_account_lookup.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_kyc_provider_account_lookup.h
+ * @brief implementation of the kyc_provider_account_lookup function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_KYC_PROVIDER_ACCOUNT_LOOKUP_H
+#define PG_KYC_PROVIDER_ACCOUNT_LOOKUP_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup an
+ * @a h_payto by @a provider_legitimization_id.
+ *
+ * @param cls closure
+ * @param provider_section
+ * @param provider_legitimization_id legi to look up
+ * @param[out] h_payto where to write the result
+ * @param[out] process_row where to write the row of the entry
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_kyc_provider_account_lookup (
+  void *cls,
+  const char *provider_section,
+  const char *provider_legitimization_id,
+  struct TALER_PaytoHashP *h_payto,
+  uint64_t *process_row);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_aml_officer.c b/src/exchangedb/pg_lookup_aml_officer.c
new file mode 100644
index 000000000..c18e47eaf
--- /dev/null
+++ b/src/exchangedb/pg_lookup_aml_officer.c
@@ -0,0 +1,71 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_aml_officer.c
+ * @brief Implementation of the lookup_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_aml_officer.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  struct TALER_MasterSignatureP *master_sig,
+  char **decider_name,
+  bool *is_active,
+  bool *read_only,
+  struct GNUNET_TIME_Absolute *last_change)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (decider_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_string ("decider_name",
+                                  decider_name),
+    GNUNET_PQ_result_spec_bool ("is_active",
+                                is_active),
+    GNUNET_PQ_result_spec_bool ("read_only",
+                                read_only),
+    GNUNET_PQ_result_spec_absolute_time ("last_change",
+                                         last_change),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "lookup_aml_officer",
+           "SELECT "
+           " master_sig"
+           ",decider_name"
+           ",is_active"
+           ",read_only"
+           ",last_change"
+           " FROM aml_staff"
+           " WHERE decider_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_aml_officer",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_aml_officer.h b/src/exchangedb/pg_lookup_aml_officer.h
new file mode 100644
index 000000000..161d2e7e7
--- /dev/null
+++ b/src/exchangedb/pg_lookup_aml_officer.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_aml_officer.h
+ * @brief implementation of the lookup_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_AML_OFFICER_H
+#define PG_LOOKUP_AML_OFFICER_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Fetch AML staff record.
+ *
+ * @param cls closure
+ * @param decider_pub public key of the staff member
+ * @param[out] master_sig offline signature affirming the AML officer
+ * @param[out] decider_name full name of the staff member
+ * @param[out] is_active true to enable, false to set as inactive
+ * @param[out] read_only true to set read-only access
+ * @param[out] last_change when was the change made effective
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  struct TALER_MasterSignatureP *master_sig,
+  char **decider_name,
+  bool *is_active,
+  bool *read_only,
+  struct GNUNET_TIME_Absolute *last_change);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_auditor_status.c b/src/exchangedb/pg_lookup_auditor_status.c
new file mode 100644
index 000000000..91afe6eaa
--- /dev/null
+++ b/src/exchangedb/pg_lookup_auditor_status.c
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_auditor_status.c
+ * @brief Implementation of the lookup_auditor_status function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_auditor_status.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_auditor_status (
+  void *cls,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  char **auditor_url,
+  bool *enabled)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_string ("auditor_url",
+                                  auditor_url),
+    GNUNET_PQ_result_spec_bool ("is_active",
+                                enabled),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /* Used in #postgres_lookup_auditor_status() */
+  PREPARE (pg,
+           "lookup_auditor_status",
+           "SELECT"
+           " auditor_url"
+           ",is_active"
+           " FROM auditors"
+           " WHERE auditor_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_auditor_status",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_auditor_status.h b/src/exchangedb/pg_lookup_auditor_status.h
new file mode 100644
index 000000000..b75788e11
--- /dev/null
+++ b/src/exchangedb/pg_lookup_auditor_status.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_auditor_status.h
+ * @brief implementation of the lookup_auditor_status function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_AUDITOR_STATUS_H
+#define PG_LOOKUP_AUDITOR_STATUS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Lookup current state of an auditor.
+ *
+ * @param cls closure
+ * @param auditor_pub key to look up information for
+ * @param[out] auditor_url set to the base URL of the auditor's REST API; memory to be
+ *            released by the caller!
+ * @param[out] enabled set if the auditor is currently in use
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_auditor_status (
+  void *cls,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  char **auditor_url,
+  bool *enabled);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_auditor_timestamp.c b/src/exchangedb/pg_lookup_auditor_timestamp.c
new file mode 100644
index 000000000..eb85876fe
--- /dev/null
+++ b/src/exchangedb/pg_lookup_auditor_timestamp.c
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_auditor_timestamp.c
+ * @brief Implementation of the lookup_auditor_timestamp function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_auditor_timestamp.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_auditor_timestamp (
+  void *cls,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  struct GNUNET_TIME_Timestamp *last_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("last_change",
+                                     last_date),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /* Used in #postgres_lookup_auditor_timestamp() */
+  PREPARE (pg,
+           "lookup_auditor_timestamp",
+           "SELECT"
+           " last_change"
+           " FROM auditors"
+           " WHERE auditor_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_auditor_timestamp",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_auditor_timestamp.h b/src/exchangedb/pg_lookup_auditor_timestamp.h
new file mode 100644
index 000000000..5674ba225
--- /dev/null
+++ b/src/exchangedb/pg_lookup_auditor_timestamp.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_auditor_timestamp.h
+ * @brief implementation of the lookup_auditor_timestamp function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_AUDITOR_TIMESTAMP_H
+#define PG_LOOKUP_AUDITOR_TIMESTAMP_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Check the last date an auditor was modified.
+ *
+ * @param cls closure
+ * @param auditor_pub key to look up information for
+ * @param[out] last_date last modification date to auditor status
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_auditor_timestamp (
+  void *cls,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  struct GNUNET_TIME_Timestamp *last_date);
+#endif
diff --git a/src/exchangedb/pg_lookup_denomination_key.c b/src/exchangedb/pg_lookup_denomination_key.c
new file mode 100644
index 000000000..a358528ad
--- /dev/null
+++ b/src/exchangedb/pg_lookup_denomination_key.c
@@ -0,0 +1,82 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_denomination_key.c
+ * @brief Implementation of the lookup_denomination_key function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_denomination_key.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_denomination_key (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                     &meta->start),
+    GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
+                                     &meta->expire_withdraw),
+    GNUNET_PQ_result_spec_timestamp ("expire_deposit",
+                                     &meta->expire_deposit),
+    GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                     &meta->expire_legal),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
+                                 &meta->value),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
+                                 &meta->fees.withdraw),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                 &meta->fees.deposit),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
+                                 &meta->fees.refresh),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
+                                 &meta->fees.refund),
+    GNUNET_PQ_result_spec_uint32 ("age_mask",
+                                  &meta->age_mask.bits),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "lookup_denomination_key",
+           "SELECT"
+           " valid_from"
+           ",expire_withdraw"
+           ",expire_deposit"
+           ",expire_legal"
+           ",coin"
+           ",fee_withdraw"
+           ",fee_deposit"
+           ",fee_refresh"
+           ",fee_refund"
+           ",age_mask"
+           " FROM denominations"
+           " WHERE denom_pub_hash=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_denomination_key",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_denomination_key.h b/src/exchangedb/pg_lookup_denomination_key.h
new file mode 100644
index 000000000..b7317ac4a
--- /dev/null
+++ b/src/exchangedb/pg_lookup_denomination_key.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_denomination_key.h
+ * @brief implementation of the lookup_denomination_key function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_DENOMINATION_KEY_H
+#define PG_LOOKUP_DENOMINATION_KEY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Lookup information about current denomination key.
+ *
+ * @param cls closure
+ * @param h_denom_pub hash of the denomination public key
+ * @param[out] meta set to various meta data about the key
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_denomination_key (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_global_fee_by_time.c b/src/exchangedb/pg_lookup_global_fee_by_time.c
new file mode 100644
index 000000000..c3a6ec8b7
--- /dev/null
+++ b/src/exchangedb/pg_lookup_global_fee_by_time.c
@@ -0,0 +1,182 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_global_fee_by_time.c
+ * @brief Implementation of the lookup_global_fee_by_time function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_global_fee_by_time.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #global_fee_by_time_helper()
+ */
+struct GlobalFeeLookupContext
+{
+
+  /**
+   * Set to the wire fees. Set to invalid if fees conflict over
+   * the given time period.
+   */
+  struct TALER_GlobalFeeSet *fees;
+
+  /**
+   * Set to timeout of unmerged purses
+   */
+  struct GNUNET_TIME_Relative *purse_timeout;
+
+  /**
+   * Set to history expiration for reserves.
+   */
+  struct GNUNET_TIME_Relative *history_expiration;
+
+  /**
+   * Set to number of free purses per account.
+   */
+  uint32_t *purse_account_limit;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_lookup_global_fee_by_time().
+ * Calls the callback with each denomination key.
+ *
+ * @param cls a `struct GlobalFeeLookupContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+global_fee_by_time_helper (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct GlobalFeeLookupContext *wlc = cls;
+  struct PostgresClosure *pg = wlc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_GlobalFeeSet fs;
+    struct GNUNET_TIME_Relative purse_timeout;
+    struct GNUNET_TIME_Relative history_expiration;
+    uint32_t purse_account_limit;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
+                                   &fs.history),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
+                                   &fs.account),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
+                                   &fs.purse),
+      GNUNET_PQ_result_spec_relative_time ("purse_timeout",
+                                           &purse_timeout),
+      GNUNET_PQ_result_spec_relative_time ("history_expiration",
+                                           &history_expiration),
+      GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
+                                    &purse_account_limit),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      /* invalidate */
+      memset (wlc->fees,
+              0,
+              sizeof (struct TALER_GlobalFeeSet));
+      return;
+    }
+    if (0 == i)
+    {
+      *wlc->fees = fs;
+      *wlc->purse_timeout = purse_timeout;
+      *wlc->history_expiration = history_expiration;
+      *wlc->purse_account_limit = purse_account_limit;
+      continue;
+    }
+    if ( (0 !=
+          TALER_global_fee_set_cmp (&fs,
+                                    wlc->fees)) ||
+         (purse_account_limit != *wlc->purse_account_limit) ||
+         (GNUNET_TIME_relative_cmp (purse_timeout,
+                                    !=,
+                                    *wlc->purse_timeout)) ||
+         (GNUNET_TIME_relative_cmp (history_expiration,
+                                    !=,
+                                    *wlc->history_expiration)) )
+    {
+      /* invalidate */
+      memset (wlc->fees,
+              0,
+              sizeof (struct TALER_GlobalFeeSet));
+      return;
+    }
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_global_fee_by_time (
+  void *cls,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  struct TALER_GlobalFeeSet *fees,
+  struct GNUNET_TIME_Relative *purse_timeout,
+  struct GNUNET_TIME_Relative *history_expiration,
+  uint32_t *purse_account_limit)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&start_time),
+    GNUNET_PQ_query_param_timestamp (&end_time),
+    GNUNET_PQ_query_param_end
+  };
+  struct GlobalFeeLookupContext wlc = {
+    .fees = fees,
+    .purse_timeout = purse_timeout,
+    .history_expiration = history_expiration,
+    .purse_account_limit = purse_account_limit,
+    .pg = pg
+  };
+
+  PREPARE (pg,
+           "lookup_global_fee_by_time",
+           "SELECT"
+           " history_fee"
+           ",account_fee"
+           ",purse_fee"
+           ",purse_timeout"
+           ",history_expiration"
+           ",purse_account_limit"
+           " FROM global_fee"
+           " WHERE end_date > $1"
+           "   AND start_date < $2;");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "lookup_global_fee_by_time",
+                                               params,
+                                               &global_fee_by_time_helper,
+                                               &wlc);
+}
diff --git a/src/exchangedb/pg_lookup_global_fee_by_time.h b/src/exchangedb/pg_lookup_global_fee_by_time.h
new file mode 100644
index 000000000..c5ff95fc6
--- /dev/null
+++ b/src/exchangedb/pg_lookup_global_fee_by_time.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_global_fee_by_time.h
+ * @brief implementation of the lookup_global_fee_by_time function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_GLOBAL_FEE_BY_TIME_H
+#define PG_LOOKUP_GLOBAL_FEE_BY_TIME_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Lookup information about known global fees.
+ *
+ * @param cls closure
+ * @param start_time starting time of fee
+ * @param end_time end time of fee
+ * @param[out] fees set to wire fees for that time period; if
+ *             different global fee exists within this time
+ *             period, an 'invalid' amount is returned.
+ * @param[out] purse_timeout set to when unmerged purses expire
+ * @param[out] history_expiration set to when we expire reserve histories
+ * @param[out] purse_account_limit set to number of free purses
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_global_fee_by_time (
+  void *cls,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  struct TALER_GlobalFeeSet *fees,
+  struct GNUNET_TIME_Relative *purse_timeout,
+  struct GNUNET_TIME_Relative *history_expiration,
+  uint32_t *purse_account_limit);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_kyc_process_by_account.c b/src/exchangedb/pg_lookup_kyc_process_by_account.c
new file mode 100644
index 000000000..b077661c5
--- /dev/null
+++ b/src/exchangedb/pg_lookup_kyc_process_by_account.c
@@ -0,0 +1,83 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_kyc_process_by_account.c
+ * @brief Implementation of the lookup_kyc_process_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_kyc_process_by_account.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_kyc_process_by_account (
+  void *cls,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  uint64_t *process_row,
+  struct GNUNET_TIME_Absolute *expiration,
+  char **provider_account_id,
+  char **provider_legitimization_id)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("legitimization_process_serial_id",
+                                  process_row),
+    GNUNET_PQ_result_spec_absolute_time ("expiration_time",
+                                         expiration),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("provider_user_id",
+                                    provider_account_id),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("provider_legitimization_id",
+                                    provider_legitimization_id),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *provider_account_id = NULL;
+  *provider_legitimization_id = NULL;
+  PREPARE (pg,
+           "lookup_process_by_account",
+           "SELECT "
+           " legitimization_process_serial_id"
+           ",expiration_time"
+           ",provider_user_id"
+           ",provider_legitimization_id"
+           " FROM legitimization_processes"
+           " WHERE h_payto=$1"
+           "   AND provider_section=$2"
+           "   AND NOT finished"
+           /* Note: there *should* only be one unfinished
+              match, so this is just to be safe(r): */
+           " ORDER BY expiration_time DESC"
+           " LIMIT 1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "lookup_process_by_account",
+    params,
+    rs);
+}
diff --git a/src/exchangedb/pg_lookup_kyc_process_by_account.h b/src/exchangedb/pg_lookup_kyc_process_by_account.h
new file mode 100644
index 000000000..0300b498c
--- /dev/null
+++ b/src/exchangedb/pg_lookup_kyc_process_by_account.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_kyc_process_by_account.h
+ * @brief implementation of the lookup_kyc_process_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_KYC_PROCESS_BY_ACCOUNT_H
+#define PG_LOOKUP_KYC_PROCESS_BY_ACCOUNT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup KYC provider meta data.
+ *
+ * @param cls closure
+ * @param provider_section provider that must be checked
+ * @param h_payto account that must be KYC'ed
+ * @param[out] process_row row with the legitimization data
+ * @param[out] expiration how long is this KYC check set to be valid (in the past if invalid)
+ * @param[out] provider_account_id provider account ID
+ * @param[out] provider_legitimization_id provider legitimization ID
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_kyc_process_by_account (
+  void *cls,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  uint64_t *process_row,
+  struct GNUNET_TIME_Absolute *expiration,
+  char **provider_account_id,
+  char **provider_legitimization_id);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_kyc_requirement_by_row.c b/src/exchangedb/pg_lookup_kyc_requirement_by_row.c
new file mode 100644
index 000000000..6f9d76786
--- /dev/null
+++ b/src/exchangedb/pg_lookup_kyc_requirement_by_row.c
@@ -0,0 +1,71 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_kyc_requirement_by_row.c
+ * @brief Implementation of the lookup_kyc_requirement_by_row function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_kyc_requirement_by_row.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_kyc_requirement_by_row (
+  void *cls,
+  uint64_t requirement_row,
+  char **requirements,
+  enum TALER_AmlDecisionState *aml_status,
+  struct TALER_PaytoHashP *h_payto)
+{
+  struct PostgresClosure *pg = cls;
+  uint32_t status = TALER_AML_NORMAL;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&requirement_row),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_string ("required_checks",
+                                  requirements),
+    GNUNET_PQ_result_spec_auto_from_type ("h_payto",
+                                          h_payto),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_uint32 ("status",
+                                    &status),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "lookup_legitimization_requirement_by_row",
+           "SELECT "
+           " lr.required_checks"
+           ",lr.h_payto"
+           ",aml.status"
+           " FROM legitimization_requirements lr"
+           " LEFT JOIN aml_status aml USING (h_payto)"
+           " WHERE legitimization_requirement_serial_id=$1;");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (
+    pg->conn,
+    "lookup_legitimization_requirement_by_row",
+    params,
+    rs);
+  *aml_status = (enum TALER_AmlDecisionState) status;
+  return qs;
+}
diff --git a/src/exchangedb/pg_lookup_kyc_requirement_by_row.h b/src/exchangedb/pg_lookup_kyc_requirement_by_row.h
new file mode 100644
index 000000000..3d223c985
--- /dev/null
+++ b/src/exchangedb/pg_lookup_kyc_requirement_by_row.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_kyc_requirement_by_row.h
+ * @brief implementation of the lookup_kyc_requirement_by_row function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_KYC_REQUIREMENT_BY_ROW_H
+#define PG_LOOKUP_KYC_REQUIREMENT_BY_ROW_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup KYC requirement.
+ *
+ * @param cls closure
+ * @param requirement_row identifies requirement to look up
+ * @param[out] requirements provider that must be checked
+ * @param[out] aml_status set to the AML status of the account
+ * @param[out] h_payto account that must be KYC'ed
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_kyc_requirement_by_row (
+  void *cls,
+  uint64_t requirement_row,
+  char **requirements,
+  enum TALER_AmlDecisionState *aml_status,
+  struct TALER_PaytoHashP *h_payto);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_records_by_table.c b/src/exchangedb/pg_lookup_records_by_table.c
new file mode 100644
index 000000000..fc4af32a8
--- /dev/null
+++ b/src/exchangedb/pg_lookup_records_by_table.c
@@ -0,0 +1,3607 @@
+/*
+   This file is part of GNUnet
+   Copyright (C) 2020-2023 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/pg_lookup_records_by_table.c
+ * @brief implementation of lookup_records_by_table
+ * @author Christian Grothoff
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_records_by_table.h"
+#include "pg_helper.h"
+#include <gnunet/gnunet_pq_lib.h>
+
+
+/**
+ * Closure for callbacks used by #postgres_lookup_records_by_table.
+ */
+struct LookupRecordsByTableContext
+{
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Function to call with the results.
+   */
+  TALER_EXCHANGEDB_ReplicationCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Set to true on errors.
+   */
+  bool error;
+};
+
+
+/**
+ * Function called with denominations table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint32 (
+        "denom_type",
+        &td.details.denominations.denom_type),
+      GNUNET_PQ_result_spec_uint32 (
+        "age_mask",
+        &td.details.denominations.age_mask),
+      TALER_PQ_result_spec_denom_pub (
+        "denom_pub",
+        &td.details.denominations.denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "master_sig",
+        &td.details.denominations.master_sig),
+      GNUNET_PQ_result_spec_timestamp (
+        "valid_from",
+        &td.details.denominations.valid_from),
+      GNUNET_PQ_result_spec_timestamp (
+        "expire_withdraw",
+        &td.details.denominations.
+        expire_withdraw),
+      GNUNET_PQ_result_spec_timestamp (
+        "expire_deposit",
+        &td.details.denominations.
+        expire_deposit),
+      GNUNET_PQ_result_spec_timestamp (
+        "expire_legal",
+        &td.details.denominations.expire_legal),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "coin",
+        &td.details.denominations.coin),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "fee_withdraw",
+        &td.details.denominations.fees.withdraw),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "fee_deposit",
+        &td.details.denominations.fees.deposit),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "fee_refresh",
+        &td.details.denominations.fees.refresh),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "fee_refund",
+        &td.details.denominations.fees.refund),
+      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_results 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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "denominations_serial",
+        &td.details.denomination_revocations.denominations_serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "master_sig",
+        &td.details.denomination_revocations.master_sig),
+      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_targets table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_wire_targets (void *cls,
+                            PGresult *result,
+                            unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_WIRE_TARGETS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &td.details.wire_targets.payto_uri),
+      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 legitimization_processes table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_legitimization_processes (void *cls,
+                                        PGresult *result,
+                                        unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_payto",
+        &td.details.legitimization_processes.h_payto),
+      GNUNET_PQ_result_spec_timestamp (
+        "expiration_time",
+        &td.details.legitimization_processes.expiration_time),
+      GNUNET_PQ_result_spec_string (
+        "provider_section",
+        &td.details.legitimization_processes.provider_section),
+      GNUNET_PQ_result_spec_string (
+        "provider_user_id",
+        &td.details.legitimization_processes.provider_user_id),
+      GNUNET_PQ_result_spec_string (
+        "provider_legitimization_id",
+        &td.details.legitimization_processes.provider_legitimization_id),
+      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 legitimization_requirements table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_legitimization_requirements (void *cls,
+                                           PGresult *result,
+                                           unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_payto",
+        &td.details.legitimization_requirements.h_payto),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type (
+          "reserve_pub",
+          &td.details.legitimization_requirements.reserve_pub),
+        &td.details.legitimization_requirements.no_reserve_pub),
+      GNUNET_PQ_result_spec_string (
+        "required_checks",
+        &td.details.legitimization_requirements.required_checks),
+      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_results 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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &td.details.reserves.reserve_pub),
+      GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                       &td.details.reserves.expiration_date),
+      GNUNET_PQ_result_spec_timestamp ("gc_date",
+                                       &td.details.reserves.gc_date),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.reserves_in.reserve_pub),
+      GNUNET_PQ_result_spec_uint64 (
+        "wire_reference",
+        &td.details.reserves_in.wire_reference),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "credit",
+        &td.details.reserves_in.credit),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wire_source_h_payto",
+        &td.details.reserves_in.sender_account_h_payto),
+      GNUNET_PQ_result_spec_string (
+        "exchange_account_section",
+        &td.details.reserves_in.exchange_account_section),
+      GNUNET_PQ_result_spec_timestamp (
+        "execution_date",
+        &td.details.reserves_in.execution_date),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.reserves_close.reserve_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "execution_date",
+        &td.details.reserves_close.execution_date),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wtid",
+        &td.details.reserves_close.wtid),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wire_target_h_payto",
+        &td.details.reserves_close.sender_account_h_payto),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount",
+        &td.details.reserves_close.amount),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "closing_fee",
+        &td.details.reserves_close.closing_fee),
+      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_open_requests table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_reserves_open_requests (void *cls,
+                                      PGresult *result,
+                                      unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.reserves_open_requests.reserve_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "request_timestamp",
+        &td.details.reserves_open_requests.request_timestamp),
+      GNUNET_PQ_result_spec_timestamp (
+        "expiration_date",
+        &td.details.reserves_open_requests.expiration_date),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.reserves_open_requests.reserve_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "reserve_payment",
+        &td.details.reserves_open_requests.reserve_payment),
+      GNUNET_PQ_result_spec_uint32 (
+        "requested_purse_limit",
+        &td.details.reserves_open_requests.requested_purse_limit),
+      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_open_deposits table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_reserves_open_deposits (void *cls,
+                                      PGresult *result,
+                                      unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.reserves_open_deposits.reserve_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.reserves_open_deposits.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.reserves_open_deposits.coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_sig",
+        &td.details.reserves_open_deposits.coin_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "contribution",
+        &td.details.reserves_open_deposits.contribution),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_blind_ev",
+        &td.details.reserves_out.h_blind_ev),
+      GNUNET_PQ_result_spec_uint64 (
+        "denominations_serial",
+        &td.details.reserves_out.denominations_serial),
+      TALER_PQ_result_spec_blinded_denom_sig (
+        "denom_sig",
+        &td.details.reserves_out.denom_sig),
+      GNUNET_PQ_result_spec_uint64 (
+        "reserve_uuid",
+        &td.details.reserves_out.reserve_uuid),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.reserves_out.reserve_sig),
+      GNUNET_PQ_result_spec_timestamp (
+        "execution_date",
+        &td.details.reserves_out.execution_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.reserves_out.amount_with_fee),
+      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_results 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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
+                                            &td.details.auditors.auditor_pub),
+      GNUNET_PQ_result_spec_string ("auditor_url",
+                                    &td.details.auditors.auditor_url),
+      GNUNET_PQ_result_spec_string ("auditor_name",
+                                    &td.details.auditors.auditor_name),
+      GNUNET_PQ_result_spec_bool ("is_active",
+                                  &td.details.auditors.is_active),
+      GNUNET_PQ_result_spec_timestamp ("last_change",
+                                       &td.details.auditors.last_change),
+      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_results 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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "auditor_uuid",
+        &td.details.auditor_denom_sigs.auditor_uuid),
+      GNUNET_PQ_result_spec_uint64 (
+        "denominations_serial",
+        &td.details.auditor_denom_sigs.denominations_serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "auditor_sig",
+        &td.details.auditor_denom_sigs.auditor_sig),
+      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_results 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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
+                                            &td.details.exchange_sign_keys.
+                                            exchange_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &td.details.exchange_sign_keys.
+                                            master_sig),
+      GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                       &td.details.exchange_sign_keys.meta.
+                                       start),
+      GNUNET_PQ_result_spec_timestamp ("expire_sign",
+                                       &td.details.exchange_sign_keys.meta.
+                                       expire_sign),
+      GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                       &td.details.exchange_sign_keys.meta.
+                                       expire_legal),
+      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_results 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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_uint64 ("esk_serial",
+                                    &td.details.signkey_revocations.esk_serial),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &td.details.signkey_revocations.
+                                            master_sig),
+      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_results 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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.known_coins.coin_pub),
+      TALER_PQ_result_spec_denom_sig (
+        "denom_sig",
+        &td.details.known_coins.denom_sig),
+      GNUNET_PQ_result_spec_uint64 (
+        "denominations_serial",
+        &td.details.known_coins.denominations_serial),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "rc",
+        &td.details.refresh_commitments.rc),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "old_coin_sig",
+        &td.details.refresh_commitments.old_coin_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.refresh_commitments.amount_with_fee),
+      GNUNET_PQ_result_spec_uint32 (
+        "noreveal_index",
+        &td.details.refresh_commitments.noreveal_index),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "old_coin_pub",
+        &td.details.refresh_commitments.old_coin_pub),
+      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_results 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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint32 (
+        "freshcoin_index",
+        &td.details.refresh_revealed_coins.freshcoin_index),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "link_sig",
+        &td.details.refresh_revealed_coins.link_sig),
+      GNUNET_PQ_result_spec_variable_size (
+        "coin_ev",
+        (void **) &td.details.refresh_revealed_coins.coin_ev,
+        &td.details.refresh_revealed_coins.coin_ev_size),
+      TALER_PQ_result_spec_blinded_denom_sig (
+        "ev_sig",
+        &td.details.refresh_revealed_coins.ev_sig),
+      TALER_PQ_result_spec_exchange_withdraw_values (
+        "ewv",
+        &td.details.refresh_revealed_coins.ewv),
+      GNUNET_PQ_result_spec_uint64 (
+        "denominations_serial",
+        &td.details.refresh_revealed_coins.denominations_serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "melt_serial_id",
+        &td.details.refresh_revealed_coins.melt_serial_id),
+      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_results 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++)
+  {
+    void *tpriv;
+    size_t tpriv_size;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("transfer_pub",
+                                            &td.details.refresh_transfer_keys.tp),
+      GNUNET_PQ_result_spec_variable_size ("transfer_privs",
+                                           &tpriv,
+                                           &tpriv_size),
+      GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
+                                    &td.details.refresh_transfer_keys.
+                                    melt_serial_id),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->error = true;
+      return;
+    }
+    /* Both conditions should be identical, but we conservatively also guard against
+       unwarranted changes to the structure here. */
+    if ( (tpriv_size !=
+          sizeof (td.details.refresh_transfer_keys.tprivs)) ||
+         (tpriv_size !=
+          (TALER_CNC_KAPPA - 1) * sizeof (struct TALER_TransferPrivateKeyP)) )
+    {
+      GNUNET_break (0);
+      GNUNET_PQ_cleanup_result (rs);
+      ctx->error = true;
+      return;
+    }
+    GNUNET_memcpy (&td.details.refresh_transfer_keys.tprivs[0],
+                   tpriv,
+                   tpriv_size);
+    ctx->cb (ctx->cb_cls,
+             &td);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+/**
+ * Function called with batch deposits table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_batch_deposits (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_BATCH_DEPOSITS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "shard",
+        &td.details.batch_deposits.shard),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "merchant_pub",
+        &td.details.batch_deposits.merchant_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "wallet_timestamp",
+        &td.details.batch_deposits.wallet_timestamp),
+      GNUNET_PQ_result_spec_timestamp (
+        "exchange_timestamp",
+        &td.details.batch_deposits.exchange_timestamp),
+      GNUNET_PQ_result_spec_timestamp (
+        "refund_deadline",
+        &td.details.batch_deposits.refund_deadline),
+      GNUNET_PQ_result_spec_timestamp (
+        "wire_deadline",
+        &td.details.batch_deposits.wire_deadline),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_contract_terms",
+        &td.details.batch_deposits.h_contract_terms),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type (
+          "wallet_data_hash",
+          &td.details.batch_deposits.wallet_data_hash),
+        &td.details.batch_deposits.no_wallet_data_hash),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wire_salt",
+        &td.details.batch_deposits.wire_salt),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wire_target_h_payto",
+        &td.details.batch_deposits.wire_target_h_payto),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "policy_blocked",
+        &td.details.batch_deposits.policy_blocked),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 (
+          "policy_details_serial_id",
+          &td.details.batch_deposits.policy_details_serial_id),
+        &td.details.batch_deposits.no_policy_details),
+      GNUNET_PQ_result_spec_end
+    };
+
+    td.details.batch_deposits.policy_details_serial_id = 0;
+    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 coin deposits table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_coin_deposits (void *cls,
+                             PGresult *result,
+                             unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_COIN_DEPOSITS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "batch_deposit_serial_id",
+        &td.details.coin_deposits.batch_deposit_serial_id),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.coin_deposits.coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_sig",
+        &td.details.coin_deposits.coin_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.coin_deposits.amount_with_fee),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.refunds.coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "merchant_sig",
+        &td.details.refunds.merchant_sig),
+      GNUNET_PQ_result_spec_uint64 (
+        "rtransaction_id",
+        &td.details.refunds.rtransaction_id),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.refunds.amount_with_fee),
+      GNUNET_PQ_result_spec_uint64 (
+        "batch_deposit_serial_id",
+        &td.details.refunds.batch_deposit_serial_id),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_timestamp (
+        "execution_date",
+        &td.details.wire_out.execution_date),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wtid_raw",
+        &td.details.wire_out.wtid_raw),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wire_target_h_payto",
+        &td.details.wire_out.wire_target_h_payto),
+      GNUNET_PQ_result_spec_string (
+        "exchange_account_section",
+        &td.details.wire_out.exchange_account_section),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount",
+        &td.details.wire_out.amount),
+      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_results 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_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "batch_deposit_serial_id",
+        &td.details.aggregation_tracking.batch_deposit_serial_id),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wtid_raw",
+        &td.details.aggregation_tracking.wtid_raw),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_string ("wire_method",
+                                    &td.details.wire_fee.wire_method),
+      GNUNET_PQ_result_spec_timestamp ("start_date",
+                                       &td.details.wire_fee.start_date),
+      GNUNET_PQ_result_spec_timestamp ("end_date",
+                                       &td.details.wire_fee.end_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
+                                   &td.details.wire_fee.fees.wire),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                   &td.details.wire_fee.fees.closing),
+      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                            &td.details.wire_fee.master_sig),
+      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_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_global_fee (void *cls,
+                          PGresult *result,
+                          unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_GLOBAL_FEE
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "serial",
+        &td.serial),
+      GNUNET_PQ_result_spec_timestamp (
+        "start_date",
+        &td.details.global_fee.start_date),
+      GNUNET_PQ_result_spec_timestamp (
+        "end_date",
+        &td.details.global_fee.end_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "history_fee",
+        &td.details.global_fee.fees.history),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "account_fee",
+        &td.details.global_fee.fees.account),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "purse_fee",
+        &td.details.global_fee.fees.purse),
+      GNUNET_PQ_result_spec_relative_time (
+        "purse_timeout",
+        &td.details.global_fee.purse_timeout),
+      GNUNET_PQ_result_spec_relative_time (
+        "history_expiration",
+        &td.details.global_fee.history_expiration),
+      GNUNET_PQ_result_spec_uint32 (
+        "purse_account_limit",
+        &td.details.global_fee.purse_account_limit),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "master_sig",
+        &td.details.global_fee.master_sig),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &td.details.recoup.coin_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                            &td.details.recoup.coin_blind),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &td.details.recoup.amount),
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       &td.details.recoup.timestamp),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.recoup.coin_pub),
+      GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
+                                    &td.details.recoup.reserve_out_serial_id),
+      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_results 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 PostgresClosure *pg = ctx->pg;
+  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_uint64 ("serial",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &td.details.recoup_refresh.coin_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_blind",
+        &td.details.recoup_refresh.coin_blind),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &td.details.recoup_refresh.amount),
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       &td.details.recoup_refresh.timestamp),
+      GNUNET_PQ_result_spec_uint64 ("known_coin_id",
+                                    &td.details.recoup_refresh.known_coin_id),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.recoup_refresh.coin_pub),
+      GNUNET_PQ_result_spec_uint64 ("rrc_serial",
+                                    &td.details.recoup_refresh.rrc_serial),
+      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 extensions table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_extensions (void *cls,
+                          PGresult *result,
+                          unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_EXTENSIONS
+  };
+  bool no_manifest = false;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("extension_id",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_string ("name",
+                                    &td.details.extensions.name),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("manifest",
+                                      &td.details.extensions.manifest),
+        &no_manifest),
+      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 policy_details table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_policy_details (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_POLICY_DETAILS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("policy_details_serial_id",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type ("hash_code",
+                                            &td.details.policy_details.
+                                            hash_code),
+      GNUNET_PQ_result_spec_allow_null (
+        TALER_PQ_result_spec_json ("policy_json",
+                                   &td.details.policy_details.
+                                   policy_json),
+        &td.details.policy_details.no_policy_json),
+      GNUNET_PQ_result_spec_timestamp ("deadline",
+                                       &td.details.policy_details.
+                                       deadline),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("commitment",
+                                   &td.details.policy_details.
+                                   commitment),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("accumulated_total",
+                                   &td.details.policy_details.
+                                   accumulated_total),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee",
+                                   &td.details.policy_details.
+                                   fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("transferable",
+                                   &td.details.policy_details.
+                                   transferable),
+      GNUNET_PQ_result_spec_uint16 ("fulfillment_state",
+                                    &td.details.policy_details.
+                                    fulfillment_state),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 ("fulfillment_id",
+                                      &td.details.policy_details.
+                                      fulfillment_id),
+        &td.details.policy_details.no_fulfillment_id),
+      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 policy_fulfillments table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_policy_fulfillments (void *cls,
+                                   PGresult *result,
+                                   unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    bool no_proof = false;
+    bool no_timestamp = false;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("fulfillment_id",
+                                    &td.serial),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_timestamp ("fulfillment_timestamp",
+                                         &td.details.policy_fulfillments.
+                                         fulfillment_timestamp),
+        &no_timestamp),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("fulfillment_proof",
+                                      &td.details.policy_fulfillments.
+                                      fulfillment_proof),
+        &no_proof),
+      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 purse_requests table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_purse_requests (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PURSE_REQUESTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "purse_requests_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.purse_requests.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "merge_pub",
+        &td.details.purse_requests.merge_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "purse_creation",
+        &td.details.purse_requests.purse_creation),
+      GNUNET_PQ_result_spec_timestamp (
+        "purse_expiration",
+        &td.details.purse_requests.purse_expiration),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_contract_terms",
+        &td.details.purse_requests.h_contract_terms),
+      GNUNET_PQ_result_spec_uint32 (
+        "age_limit",
+        &td.details.purse_requests.age_limit),
+      GNUNET_PQ_result_spec_uint32 (
+        "flags",
+        &td.details.purse_requests.flags),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.purse_requests.amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "purse_fee",
+        &td.details.purse_requests.purse_fee),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_sig",
+        &td.details.purse_requests.purse_sig),
+      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 purse_decision table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_purse_decision (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PURSE_DECISION
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "purse_refunds_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.purse_decision.purse_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "action_timestamp",
+        &td.details.purse_decision.action_timestamp),
+      GNUNET_PQ_result_spec_bool (
+        "refunded",
+        &td.details.purse_decision.refunded),
+      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 purse_merges table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_purse_merges (void *cls,
+                            PGresult *result,
+                            unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PURSE_MERGES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "purse_merge_request_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "partner_serial_id",
+        &td.details.purse_merges.partner_serial_id),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.purse_merges.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.purse_merges.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "merge_sig",
+        &td.details.purse_merges.merge_sig),
+      GNUNET_PQ_result_spec_timestamp (
+        "merge_timestamp",
+        &td.details.purse_merges.merge_timestamp),
+      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 purse_deposits table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_purse_deposits (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PURSE_DEPOSITS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "purse_deposit_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_uint64 (
+        "partner_serial_id",
+        &td.details.purse_deposits.partner_serial_id),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.purse_deposits.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_pub",
+        &td.details.purse_deposits.coin_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.purse_deposits.amount_with_fee),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "coin_sig",
+        &td.details.purse_deposits.coin_sig),
+      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 account_merges table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_account_merges (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_ACCOUNT_MERGES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "account_merge_request_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.account_merges.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.account_merges.reserve_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.account_merges.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wallet_h_payto",
+        &td.details.account_merges.wallet_h_payto),
+      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 history_requests table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_history_requests (void *cls,
+                                PGresult *result,
+                                unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_HISTORY_REQUESTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "history_request_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.history_requests.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.history_requests.reserve_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "history_fee",
+        &td.details.history_requests.history_fee),
+      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 close_requests table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_close_requests (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_CLOSE_REQUESTS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "close_request_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.close_requests.reserve_pub),
+      GNUNET_PQ_result_spec_timestamp (
+        "close_timestamp",
+        &td.details.close_requests.close_timestamp),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.close_requests.reserve_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "close",
+        &td.details.close_requests.close),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "close_fee",
+        &td.details.close_requests.close_fee),
+      GNUNET_PQ_result_spec_string (
+        "payto_uri",
+        &td.details.close_requests.payto_uri),
+      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 wads_out table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_wads_out (void *cls,
+                        PGresult *result,
+                        unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_WADS_OUT
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "wad_out_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wad_id",
+        &td.details.wads_out.wad_id),
+      GNUNET_PQ_result_spec_uint64 (
+        "partner_serial_id",
+        &td.details.wads_out.partner_serial_id),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount",
+        &td.details.wads_out.amount),
+      GNUNET_PQ_result_spec_timestamp (
+        "execution_time",
+        &td.details.wads_out.execution_time),
+      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 wads_out_entries table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_wads_out_entries (void *cls,
+                                PGresult *result,
+                                unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "wad_out_entry_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.wads_out_entries.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.wads_out_entries.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_contract",
+        &td.details.wads_out_entries.h_contract),
+      GNUNET_PQ_result_spec_timestamp (
+        "purse_expiration",
+        &td.details.wads_out_entries.purse_expiration),
+      GNUNET_PQ_result_spec_timestamp (
+        "merge_timestamp",
+        &td.details.wads_out_entries.merge_timestamp),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.wads_out_entries.amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "wad_fee",
+        &td.details.wads_out_entries.wad_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "deposit_fees",
+        &td.details.wads_out_entries.deposit_fees),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.wads_out_entries.reserve_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_sig",
+        &td.details.wads_out_entries.purse_sig),
+      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 wads_in table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_wads_in (void *cls,
+                       PGresult *result,
+                       unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_WADS_IN
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "wad_in_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wad_id",
+        &td.details.wads_in.wad_id),
+      GNUNET_PQ_result_spec_string (
+        "origin_exchange_url",
+        &td.details.wads_in.origin_exchange_url),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount",
+        &td.details.wads_in.amount),
+      GNUNET_PQ_result_spec_timestamp (
+        "arrival_time",
+        &td.details.wads_in.arrival_time),
+      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 wads_in_entries table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_wads_in_entries (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "wad_in_entry_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.wads_in_entries.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.wads_in_entries.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_contract",
+        &td.details.wads_in_entries.h_contract),
+      GNUNET_PQ_result_spec_timestamp (
+        "purse_expiration",
+        &td.details.wads_in_entries.purse_expiration),
+      GNUNET_PQ_result_spec_timestamp (
+        "merge_timestamp",
+        &td.details.wads_in_entries.merge_timestamp),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.wads_in_entries.amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "wad_fee",
+        &td.details.wads_in_entries.wad_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "deposit_fees",
+        &td.details.wads_in_entries.deposit_fees),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.wads_in_entries.reserve_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_sig",
+        &td.details.wads_in_entries.purse_sig),
+      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 profit_drains table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_profit_drains (void *cls,
+                             PGresult *result,
+                             unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PROFIT_DRAINS
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "profit_drain_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "wtid",
+        &td.details.profit_drains.wtid),
+      GNUNET_PQ_result_spec_string (
+        "account_section",
+        &td.details.profit_drains.account_section),
+      GNUNET_PQ_result_spec_string (
+        "payto_uri",
+        &td.details.profit_drains.payto_uri),
+      GNUNET_PQ_result_spec_timestamp (
+        "trigger_date",
+        &td.details.profit_drains.trigger_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount",
+        &td.details.profit_drains.amount),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "master_sig",
+        &td.details.profit_drains.master_sig),
+      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 aml_staff table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_aml_staff (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_AML_STAFF
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "aml_staff_uuid",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "decider_pub",
+        &td.details.aml_staff.decider_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "master_sig",
+        &td.details.aml_staff.master_sig),
+      GNUNET_PQ_result_spec_string (
+        "decider_name",
+        &td.details.aml_staff.decider_name),
+      GNUNET_PQ_result_spec_bool (
+        "is_active",
+        &td.details.aml_staff.is_active),
+      GNUNET_PQ_result_spec_bool (
+        "read_only",
+        &td.details.aml_staff.read_only),
+      GNUNET_PQ_result_spec_timestamp (
+        "last_change",
+        &td.details.aml_staff.last_change),
+      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 aml_history table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_aml_history (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_AML_HISTORY
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint32_t status32;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "aml_history_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_payto",
+        &td.details.aml_history.h_payto),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "new_threshold",
+        &td.details.aml_history.new_threshold),
+      GNUNET_PQ_result_spec_uint32 (
+        "new_status",
+        &status32),
+      GNUNET_PQ_result_spec_timestamp (
+        "decision_time",
+        &td.details.aml_history.decision_time),
+      GNUNET_PQ_result_spec_string (
+        "justification",
+        &td.details.aml_history.justification),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string (
+          "kyc_requirements",
+          &td.details.aml_history.kyc_requirements),
+        NULL),
+      GNUNET_PQ_result_spec_uint64 (
+        "kyc_req_row",
+        &td.details.aml_history.kyc_req_row),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "decider_pub",
+        &td.details.aml_history.decider_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "decider_sig",
+        &td.details.aml_history.decider_sig),
+      GNUNET_PQ_result_spec_end
+    };
+
+    td.details.aml_history.kyc_requirements = NULL;
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->error = true;
+      return;
+    }
+    td.details.aml_history.new_status
+      = (enum TALER_AmlDecisionState) status32;
+    ctx->cb (ctx->cb_cls,
+             &td);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+/**
+ * Function called with kyc_attributes table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_kyc_attributes (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_KYC_ATTRIBUTES
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "kyc_attributes_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_payto",
+        &td.details.kyc_attributes.h_payto),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "kyc_prox",
+        &td.details.kyc_attributes.kyc_prox),
+      GNUNET_PQ_result_spec_string (
+        "provider",
+        &td.details.kyc_attributes.provider),
+      GNUNET_PQ_result_spec_timestamp (
+        "collection_time",
+        &td.details.kyc_attributes.collection_time),
+      GNUNET_PQ_result_spec_timestamp (
+        "expiration_time",
+        &td.details.kyc_attributes.expiration_time),
+      GNUNET_PQ_result_spec_variable_size (
+        "encrypted_attributes",
+        &td.details.kyc_attributes.encrypted_attributes,
+        &td.details.kyc_attributes.encrypted_attributes_size),
+      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 purse_deletion table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_purse_deletion (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_PURSE_DELETION
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "purse_deletion_serial_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_sig",
+        &td.details.purse_deletion.purse_sig),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "purse_pub",
+        &td.details.purse_deletion.purse_pub),
+      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 age_withdraw table entries.
+ *
+ * @param cls closure
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+lrbt_cb_table_age_withdraw (void *cls,
+                            PGresult *result,
+                            unsigned int num_results)
+{
+  struct LookupRecordsByTableContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+  struct TALER_EXCHANGEDB_TableData td = {
+    .table = TALER_EXCHANGEDB_RT_AGE_WITHDRAW
+  };
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 (
+        "age_withdraw_id",
+        &td.serial),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "h_commitment",
+        &td.details.age_withdraw.h_commitment),
+      GNUNET_PQ_result_spec_uint16 (
+        "max_age",
+        &td.details.age_withdraw.max_age),
+      TALER_PQ_RESULT_SPEC_AMOUNT (
+        "amount_with_fee",
+        &td.details.age_withdraw.amount_with_fee),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_pub",
+        &td.details.age_withdraw.reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type (
+        "reserve_sig",
+        &td.details.age_withdraw.reserve_sig),
+      GNUNET_PQ_result_spec_uint32 (
+        "noreveal_index",
+        &td.details.age_withdraw.noreveal_index),
+      /* TODO[oec]: more fields! */
+      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);
+  }
+}
+
+
+/**
+ * Assign statement to @a n and PREPARE
+ * @a sql under name @a n.
+ */
+#define XPREPARE(n,sql) \
+  statement = n;        \
+  PREPARE (pg, n, sql);
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_records_by_table (void *cls,
+                                enum TALER_EXCHANGEDB_ReplicatedTable table,
+                                uint64_t serial,
+                                TALER_EXCHANGEDB_ReplicationCallback cb,
+                                void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial),
+    GNUNET_PQ_query_param_end
+  };
+  struct LookupRecordsByTableContext ctx = {
+    .pg = pg,
+    .cb = cb,
+    .cb_cls = cb_cls
+  };
+  GNUNET_PQ_PostgresResultHandler rh = NULL;
+  const char *statement = NULL;
+  enum GNUNET_DB_QueryStatus qs;
+
+  switch (table)
+  {
+  case TALER_EXCHANGEDB_RT_DENOMINATIONS:
+    XPREPARE ("select_above_serial_by_table_denominations",
+              "SELECT"
+              " denominations_serial AS serial"
+              ",denom_type"
+              ",denom_pub"
+              ",master_sig"
+              ",valid_from"
+              ",expire_withdraw"
+              ",expire_deposit"
+              ",expire_legal"
+              ",coin"
+              ",fee_withdraw"
+              ",fee_deposit"
+              ",fee_refresh"
+              ",fee_refund"
+              ",age_mask"
+              " FROM denominations"
+              " WHERE denominations_serial > $1"
+              " ORDER BY denominations_serial ASC;");
+    rh = &lrbt_cb_table_denominations;
+    break;
+  case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
+    XPREPARE ("select_above_serial_by_table_denomination_revocations",
+              "SELECT"
+              " denom_revocations_serial_id AS serial"
+              ",master_sig"
+              ",denominations_serial"
+              " FROM denomination_revocations"
+              " WHERE denom_revocations_serial_id > $1"
+              " ORDER BY denom_revocations_serial_id ASC;");
+    rh = &lrbt_cb_table_denomination_revocations;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_TARGETS:
+    XPREPARE ("select_above_serial_by_table_wire_targets",
+              "SELECT"
+              " wire_target_serial_id AS serial"
+              ",payto_uri"
+              " FROM wire_targets"
+              " WHERE wire_target_serial_id > $1"
+              " ORDER BY wire_target_serial_id ASC;");
+    rh = &lrbt_cb_table_wire_targets;
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES:
+    XPREPARE ("select_above_serial_by_table_legitimization_processes",
+              "SELECT"
+              " legitimization_process_serial_id AS serial"
+              ",h_payto"
+              ",reserve_pub"
+              ",expiration_time"
+              ",provider_section"
+              ",provider_user_id"
+              ",provider_legitimization_id"
+              " FROM legitimization_processes"
+              " WHERE legitimization_process_serial_id > $1"
+              " ORDER BY legitimization_process_serial_id ASC;");
+    rh = &lrbt_cb_table_legitimization_processes;
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS:
+    XPREPARE ("select_above_serial_by_table_legitimization_requirements",
+              "SELECT"
+              " legitimization_requirement_serial_id AS serial"
+              ",h_payto"
+              ",reserve_pub"
+              ",required_checks"
+              " FROM legitimization_requirements"
+              " WHERE legitimization_requirement_serial_id > $1"
+              " ORDER BY legitimization_requirement_serial_id ASC;");
+    rh = &lrbt_cb_table_legitimization_requirements;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES:
+    XPREPARE ("select_above_serial_by_table_reserves",
+              "SELECT"
+              " reserve_uuid AS serial"
+              ",reserve_pub"
+              ",expiration_date"
+              ",gc_date"
+              " FROM reserves"
+              " WHERE reserve_uuid > $1"
+              " ORDER BY reserve_uuid ASC;");
+    rh = &lrbt_cb_table_reserves;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_IN:
+    XPREPARE ("select_above_serial_by_table_reserves_in",
+              "SELECT"
+              " reserve_in_serial_id AS serial"
+              ",reserve_pub"
+              ",wire_reference"
+              ",credit"
+              ",wire_source_h_payto"
+              ",exchange_account_section"
+              ",execution_date"
+              " FROM reserves_in"
+              " WHERE reserve_in_serial_id > $1"
+              " ORDER BY reserve_in_serial_id ASC;");
+    rh = &lrbt_cb_table_reserves_in;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
+    XPREPARE ("select_above_serial_by_table_reserves_close",
+              "SELECT"
+              " close_uuid AS serial"
+              ",reserve_pub"
+              ",execution_date"
+              ",wtid"
+              ",wire_target_h_payto"
+              ",amount"
+              ",closing_fee"
+              " FROM reserves_close"
+              " WHERE close_uuid > $1"
+              " ORDER BY close_uuid ASC;");
+    rh = &lrbt_cb_table_reserves_close;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS:
+    XPREPARE ("select_above_serial_by_table_reserves_open_requests",
+              "SELECT"
+              " open_request_uuid AS serial"
+              ",reserve_pub"
+              ",request_timestamp"
+              ",expiration_date"
+              ",reserve_sig"
+              ",reserve_payment"
+              ",requested_purse_limit"
+              " FROM reserves_open_requests"
+              " WHERE open_request_uuid > $1"
+              " ORDER BY open_request_uuid ASC;");
+    rh = &lrbt_cb_table_reserves_open_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS:
+    XPREPARE ("select_above_serial_by_table_reserves_open_deposits",
+              "SELECT"
+              " reserves_open_deposit_uuid AS serial"
+              ",reserve_sig"
+              ",reserve_pub"
+              ",coin_pub"
+              ",coin_sig"
+              ",contribution"
+              " FROM reserves_open_deposits"
+              " WHERE reserves_open_deposit_uuid > $1"
+              " ORDER BY reserves_open_deposit_uuid ASC;");
+    rh = &lrbt_cb_table_reserves_open_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OUT:
+    XPREPARE ("select_above_serial_by_table_reserves_out",
+              "SELECT"
+              " reserve_out_serial_id AS serial"
+              ",h_blind_ev"
+              ",denominations_serial"
+              ",denom_sig"
+              ",reserve_uuid"
+              ",reserve_sig"
+              ",execution_date"
+              ",amount_with_fee"
+              " FROM reserves_out"
+              " JOIN reserves USING (reserve_uuid)"
+              " WHERE reserve_out_serial_id > $1"
+              " ORDER BY reserve_out_serial_id ASC;");
+    rh = &lrbt_cb_table_reserves_out;
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITORS:
+    XPREPARE ("select_above_serial_by_table_auditors",
+              "SELECT"
+              " auditor_uuid AS serial"
+              ",auditor_pub"
+              ",auditor_name"
+              ",auditor_url"
+              ",is_active"
+              ",last_change"
+              " FROM auditors"
+              " WHERE auditor_uuid > $1"
+              " ORDER BY auditor_uuid ASC;");
+    rh = &lrbt_cb_table_auditors;
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
+    XPREPARE ("select_above_serial_by_table_auditor_denom_sigs",
+              "SELECT"
+              " auditor_denom_serial AS serial"
+              ",auditor_uuid"
+              ",denominations_serial"
+              ",auditor_sig"
+              " FROM auditor_denom_sigs"
+              " WHERE auditor_denom_serial > $1"
+              " ORDER BY auditor_denom_serial ASC;");
+    rh = &lrbt_cb_table_auditor_denom_sigs;
+    break;
+  case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
+    XPREPARE ("select_above_serial_by_table_exchange_sign_keys",
+              "SELECT"
+              " esk_serial AS serial"
+              ",exchange_pub"
+              ",master_sig"
+              ",valid_from"
+              ",expire_sign"
+              ",expire_legal"
+              " FROM exchange_sign_keys"
+              " WHERE esk_serial > $1"
+              " ORDER BY esk_serial ASC;");
+    rh = &lrbt_cb_table_exchange_sign_keys;
+    break;
+  case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
+    XPREPARE ("select_above_serial_by_table_signkey_revocations",
+              "SELECT"
+              " signkey_revocations_serial_id AS serial"
+              ",esk_serial"
+              ",master_sig"
+              " FROM signkey_revocations"
+              " WHERE signkey_revocations_serial_id > $1"
+              " ORDER BY signkey_revocations_serial_id ASC;");
+    rh = &lrbt_cb_table_signkey_revocations;
+    break;
+  case TALER_EXCHANGEDB_RT_KNOWN_COINS:
+    XPREPARE ("select_above_serial_by_table_known_coins",
+              "SELECT"
+              " known_coin_id AS serial"
+              ",coin_pub"
+              ",denom_sig"
+              ",denominations_serial"
+              " FROM known_coins"
+              " WHERE known_coin_id > $1"
+              " ORDER BY known_coin_id ASC;");
+    rh = &lrbt_cb_table_known_coins;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
+    XPREPARE ("select_above_serial_by_table_refresh_commitments",
+              "SELECT"
+              " melt_serial_id AS serial"
+              ",rc"
+              ",old_coin_sig"
+              ",amount_with_fee"
+              ",noreveal_index"
+              ",old_coin_pub"
+              " FROM refresh_commitments"
+              " WHERE melt_serial_id > $1"
+              " ORDER BY melt_serial_id ASC;");
+    rh = &lrbt_cb_table_refresh_commitments;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
+    XPREPARE ("select_above_serial_by_table_refresh_revealed_coins",
+              "SELECT"
+              " rrc_serial AS serial"
+              ",freshcoin_index"
+              ",link_sig"
+              ",coin_ev"
+              ",ev_sig"
+              ",ewv"
+              ",denominations_serial"
+              ",melt_serial_id"
+              " FROM refresh_revealed_coins"
+              " WHERE rrc_serial > $1"
+              " ORDER BY rrc_serial ASC;");
+    rh = &lrbt_cb_table_refresh_revealed_coins;
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
+    XPREPARE ("select_above_serial_by_table_refresh_transfer_keys",
+              "SELECT"
+              " rtc_serial AS serial"
+              ",transfer_pub"
+              ",transfer_privs"
+              ",melt_serial_id"
+              " FROM refresh_transfer_keys"
+              " WHERE rtc_serial > $1"
+              " ORDER BY rtc_serial ASC;");
+    rh = &lrbt_cb_table_refresh_transfer_keys;
+    break;
+  case TALER_EXCHANGEDB_RT_BATCH_DEPOSITS:
+    XPREPARE ("select_above_serial_by_table_batch_deposits",
+              "SELECT"
+              " batch_deposit_serial_id AS serial"
+              ",shard"
+              ",merchant_pub"
+              ",wallet_timestamp"
+              ",exchange_timestamp"
+              ",refund_deadline"
+              ",wire_deadline"
+              ",h_contract_terms"
+              ",wallet_data_hash"
+              ",wire_salt"
+              ",wire_target_h_payto"
+              ",done"
+              ",policy_blocked"
+              ",policy_details_serial_id"
+              " FROM batch_deposits"
+              " WHERE batch_deposit_serial_id > $1"
+              " ORDER BY batch_deposit_serial_id ASC;");
+    rh = &lrbt_cb_table_batch_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_COIN_DEPOSITS:
+    XPREPARE ("select_above_serial_by_table_coin_deposits",
+              "SELECT"
+              " coin_deposit_serial_id AS serial"
+              ",batch_deposit_serial_id"
+              ",coin_pub"
+              ",coin_sig"
+              ",amount_with_fee"
+              " FROM coin_deposits"
+              " WHERE coin_deposit_serial_id > $1"
+              " ORDER BY coin_deposit_serial_id ASC;");
+    rh = &lrbt_cb_table_coin_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_REFUNDS:
+    XPREPARE ("select_above_serial_by_table_refunds",
+              "SELECT"
+              " refund_serial_id AS serial"
+              ",coin_pub"
+              ",merchant_sig"
+              ",rtransaction_id"
+              ",amount_with_fee"
+              ",batch_deposit_serial_id"
+              " FROM refunds"
+              " WHERE refund_serial_id > $1"
+              " ORDER BY refund_serial_id ASC;");
+    rh = &lrbt_cb_table_refunds;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_OUT:
+    XPREPARE ("select_above_serial_by_table_wire_out",
+              "SELECT"
+              " wireout_uuid AS serial"
+              ",execution_date"
+              ",wtid_raw"
+              ",wire_target_h_payto"
+              ",exchange_account_section"
+              ",amount"
+              " FROM wire_out"
+              " WHERE wireout_uuid > $1"
+              " ORDER BY wireout_uuid ASC;");
+    rh = &lrbt_cb_table_wire_out;
+    break;
+  case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
+    XPREPARE ("select_above_serial_by_table_aggregation_tracking",
+              "SELECT"
+              " aggregation_serial_id AS serial"
+              ",batch_deposit_serial_id"
+              ",wtid_raw"
+              " FROM aggregation_tracking"
+              " WHERE aggregation_serial_id > $1"
+              " ORDER BY aggregation_serial_id ASC;");
+    rh = &lrbt_cb_table_aggregation_tracking;
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_FEE:
+    XPREPARE ("select_above_serial_by_table_wire_fee",
+              "SELECT"
+              " wire_fee_serial AS serial"
+              ",wire_method"
+              ",start_date"
+              ",end_date"
+              ",wire_fee"
+              ",closing_fee"
+              ",master_sig"
+              " FROM wire_fee"
+              " WHERE wire_fee_serial > $1"
+              " ORDER BY wire_fee_serial ASC;");
+    rh = &lrbt_cb_table_wire_fee;
+    break;
+  case TALER_EXCHANGEDB_RT_GLOBAL_FEE:
+    XPREPARE ("select_above_serial_by_table_global_fee",
+              "SELECT"
+              " global_fee_serial AS serial"
+              ",start_date"
+              ",end_date"
+              ",history_fee"
+              ",account_fee"
+              ",purse_fee"
+              ",purse_timeout"
+              ",history_expiration"
+              ",purse_account_limit"
+              ",master_sig"
+              " FROM global_fee"
+              " WHERE global_fee_serial > $1"
+              " ORDER BY global_fee_serial ASC;");
+    rh = &lrbt_cb_table_global_fee;
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP:
+    XPREPARE ("select_above_serial_by_table_recoup",
+              "SELECT"
+              " recoup_uuid AS serial"
+              ",coin_sig"
+              ",coin_blind"
+              ",amount"
+              ",recoup_timestamp"
+              ",coin_pub"
+              ",reserve_out_serial_id"
+              " FROM recoup"
+              " WHERE recoup_uuid > $1"
+              " ORDER BY recoup_uuid ASC;");
+    rh = &lrbt_cb_table_recoup;
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
+    XPREPARE ("select_above_serial_by_table_recoup_refresh",
+              "SELECT"
+              " recoup_refresh_uuid AS serial"
+              ",coin_sig"
+              ",coin_blind"
+              ",amount"
+              ",recoup_timestamp"
+              ",coin_pub"
+              ",known_coin_id"
+              ",rrc_serial"
+              " FROM recoup_refresh"
+              " WHERE recoup_refresh_uuid > $1"
+              " ORDER BY recoup_refresh_uuid ASC;");
+    rh = &lrbt_cb_table_recoup_refresh;
+    break;
+  case TALER_EXCHANGEDB_RT_EXTENSIONS:
+    statement = "select_above_serial_by_table_extensions";
+    rh = &lrbt_cb_table_extensions;
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_DETAILS:
+    statement = "select_above_serial_by_table_policy_details";
+    rh = &lrbt_cb_table_policy_details;
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS:
+    statement = "select_above_serial_by_table_policy_fulfillments";
+    rh = &lrbt_cb_table_policy_fulfillments;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_REQUESTS:
+    XPREPARE ("select_above_serial_by_table_purse_requests",
+              "SELECT"
+              " purse_requests_serial_id"
+              ",purse_pub"
+              ",merge_pub"
+              ",purse_creation"
+              ",purse_expiration"
+              ",h_contract_terms"
+              ",age_limit"
+              ",flags"
+              ",amount_with_fee"
+              ",purse_fee"
+              ",purse_sig"
+              " FROM purse_requests"
+              " WHERE purse_requests_serial_id > $1"
+              " ORDER BY purse_requests_serial_id ASC;");
+    rh = &lrbt_cb_table_purse_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DECISION:
+    XPREPARE ("select_above_serial_by_table_purse_decision",
+              "SELECT"
+              " purse_decision_serial_id"
+              ",action_timestamp"
+              ",refunded"
+              ",purse_pub"
+              " FROM purse_decision"
+              " WHERE purse_decision_serial_id > $1"
+              " ORDER BY purse_decision_serial_id ASC;");
+    rh = &lrbt_cb_table_purse_decision;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_MERGES:
+    XPREPARE ("select_above_serial_by_table_purse_merges",
+              "SELECT"
+              " purse_merge_request_serial_id"
+              ",partner_serial_id"
+              ",reserve_pub"
+              ",purse_pub"
+              ",merge_sig"
+              ",merge_timestamp"
+              " FROM purse_merges"
+              " WHERE purse_merge_request_serial_id > $1"
+              " ORDER BY purse_merge_request_serial_id ASC;");
+    rh = &lrbt_cb_table_purse_merges;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DEPOSITS:
+    XPREPARE ("select_above_serial_by_table_purse_deposits",
+              "SELECT"
+              " purse_deposit_serial_id"
+              ",partner_serial_id"
+              ",purse_pub"
+              ",coin_pub"
+              ",amount_with_fee"
+              ",coin_sig"
+              " FROM purse_deposits"
+              " WHERE purse_deposit_serial_id > $1"
+              " ORDER BY purse_deposit_serial_id ASC;");
+    rh = &lrbt_cb_table_purse_deposits;
+    break;
+  case TALER_EXCHANGEDB_RT_ACCOUNT_MERGES:
+    XPREPARE ("select_above_serial_by_table_account_merges",
+              "SELECT"
+              " account_merge_request_serial_id"
+              ",reserve_pub"
+              ",reserve_sig"
+              ",purse_pub"
+              ",wallet_h_payto"
+              " FROM account_merges"
+              " WHERE account_merge_request_serial_id > $1"
+              " ORDER BY account_merge_request_serial_id ASC;");
+    rh = &lrbt_cb_table_account_merges;
+    break;
+  case TALER_EXCHANGEDB_RT_HISTORY_REQUESTS:
+    XPREPARE ("select_above_serial_by_table_history_requests",
+              "SELECT"
+              " history_request_serial_id"
+              ",reserve_pub"
+              ",request_timestamp"
+              ",reserve_sig"
+              ",history_fee"
+              " FROM history_requests"
+              " WHERE history_request_serial_id > $1"
+              " ORDER BY history_request_serial_id ASC;");
+    rh = &lrbt_cb_table_history_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_CLOSE_REQUESTS:
+    XPREPARE ("select_above_serial_by_table_close_requests",
+              "SELECT"
+              " close_request_serial_id"
+              ",reserve_pub"
+              ",close_timestamp"
+              ",reserve_sig"
+              ",close"
+              " FROM close_requests"
+              " WHERE close_request_serial_id > $1"
+              " ORDER BY close_request_serial_id ASC;");
+    rh = &lrbt_cb_table_close_requests;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT:
+    XPREPARE ("select_above_serial_by_table_wads_out",
+              "SELECT"
+              " wad_out_serial_id"
+              ",wad_id"
+              ",partner_serial_id"
+              ",amount"
+              ",execution_time"
+              " FROM wads_out"
+              " WHERE wad_out_serial_id > $1"
+              " ORDER BY wad_out_serial_id ASC;");
+    rh = &lrbt_cb_table_wads_out;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES:
+    XPREPARE ("select_above_serial_by_table_wads_out_entries",
+              "SELECT"
+              " wad_out_entry_serial_id"
+              ",reserve_pub"
+              ",purse_pub"
+              ",h_contract"
+              ",purse_expiration"
+              ",merge_timestamp"
+              ",amount_with_fee"
+              ",wad_fee"
+              ",deposit_fees"
+              ",reserve_sig"
+              ",purse_sig"
+              " FROM wad_out_entries"
+              " WHERE wad_out_entry_serial_id > $1"
+              " ORDER BY wad_out_entry_serial_id ASC;");
+    rh = &lrbt_cb_table_wads_out_entries;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN:
+    XPREPARE ("select_above_serial_by_table_wads_in",
+              "SELECT"
+              " wad_in_serial_id"
+              ",wad_id"
+              ",origin_exchange_url"
+              ",amount"
+              ",arrival_time"
+              " FROM wads_in"
+              " WHERE wad_in_serial_id > $1"
+              " ORDER BY wad_in_serial_id ASC;");
+    rh = &lrbt_cb_table_wads_in;
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES:
+    XPREPARE ("select_above_serial_by_table_wads_in_entries",
+              "SELECT"
+              " wad_in_entry_serial_id"
+              ",reserve_pub"
+              ",purse_pub"
+              ",h_contract"
+              ",purse_expiration"
+              ",merge_timestamp"
+              ",amount_with_fee"
+              ",wad_fee"
+              ",deposit_fees"
+              ",reserve_sig"
+              ",purse_sig"
+              " FROM wad_in_entries"
+              " WHERE wad_in_entry_serial_id > $1"
+              " ORDER BY wad_in_entry_serial_id ASC;");
+    rh = &lrbt_cb_table_wads_in_entries;
+    break;
+  case TALER_EXCHANGEDB_RT_PROFIT_DRAINS:
+    XPREPARE ("select_above_serial_by_table_profit_drains",
+              "SELECT"
+              " profit_drain_serial_id"
+              ",wtid"
+              ",account_section"
+              ",payto_uri"
+              ",trigger_date"
+              ",amount"
+              ",master_sig"
+              " FROM profit_drains"
+              " WHERE profit_drain_serial_id > $1"
+              " ORDER BY profit_drain_serial_id ASC;");
+    rh = &lrbt_cb_table_profit_drains;
+    break;
+
+  case TALER_EXCHANGEDB_RT_AML_STAFF:
+    XPREPARE ("select_above_serial_by_table_aml_staff",
+              "SELECT"
+              " aml_staff_uuid"
+              ",decider_pub"
+              ",master_sig"
+              ",decider_name"
+              ",is_active"
+              ",read_only"
+              ",last_change"
+              " FROM aml_staff"
+              " WHERE aml_staff_uuid > $1"
+              " ORDER BY aml_staff_uuid ASC;");
+    rh = &lrbt_cb_table_aml_staff;
+    break;
+  case TALER_EXCHANGEDB_RT_AML_HISTORY:
+    XPREPARE ("select_above_serial_by_table_aml_history",
+              "SELECT"
+              " aml_history_serial_id"
+              ",h_payto"
+              ",new_threshold"
+              ",new_status"
+              ",decision_time"
+              ",justification"
+              ",kyc_requirements"
+              ",kyc_req_row"
+              ",decider_pub"
+              ",decider_sig"
+              " FROM aml_history"
+              " WHERE aml_history_serial_id > $1"
+              " ORDER BY aml_history_serial_id ASC;");
+    rh = &lrbt_cb_table_aml_history;
+    break;
+  case TALER_EXCHANGEDB_RT_KYC_ATTRIBUTES:
+    XPREPARE ("select_above_serial_by_table_kyc_attributes",
+              "SELECT"
+              " kyc_attributes_serial_id"
+              ",h_payto"
+              ",kyc_prox"
+              ",provider"
+              ",collection_time"
+              ",expiration_time"
+              ",encrypted_attributes"
+              " FROM kyc_attributes"
+              " WHERE kyc_attributes_serial_id > $1"
+              " ORDER BY kyc_attributes_serial_id ASC;");
+    rh = &lrbt_cb_table_kyc_attributes;
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DELETION:
+    XPREPARE ("select_above_serial_by_table_purse_deletion",
+              "SELECT"
+              " purse_deletion_serial_id"
+              ",purse_pub"
+              ",purse_sig"
+              " FROM purse_deletion"
+              " WHERE purse_deletion_serial_id > $1"
+              " ORDER BY purse_deletion_serial_id ASC;");
+    rh = &lrbt_cb_table_purse_deletion;
+    break;
+  case TALER_EXCHANGEDB_RT_AGE_WITHDRAW:
+    XPREPARE ("select_above_serial_by_table_age_withdraw",
+              "SELECT"
+              " age_withdraw_id"
+              ",h_commitment"
+              ",amount_with_fee"
+              ",max_age"
+              ",reserve_pub"
+              ",reserve_sig"
+              ",noreveal_index"
+              " FROM age_withdraw"
+              " WHERE age_withdraw_id > $1"
+              " ORDER BY age_withdraw_id ASC;");
+    /* TODO[oec]: MORE FIELDS! */
+    rh = &lrbt_cb_table_age_withdraw;
+    break;
+  }
+  if (NULL == rh)
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             statement,
+                                             params,
+                                             rh,
+                                             &ctx);
+  if (qs < 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to run `%s'\n",
+                statement);
+    return qs;
+  }
+  if (ctx.error)
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  return qs;
+}
+
+
+#undef XPREPARE
+
+/* end of pg_lookup_records_by_table.c */
diff --git a/src/exchangedb/pg_lookup_records_by_table.h b/src/exchangedb/pg_lookup_records_by_table.h
new file mode 100644
index 000000000..9dc25fff4
--- /dev/null
+++ b/src/exchangedb/pg_lookup_records_by_table.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_lookup_records_by_table.h
+ * @brief implementation of the lookup_records_by_table function
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_RECORDS_BY_TABLE_H
+#define PG_LOOKUP_RECORDS_BY_TABLE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup records above @a serial number in @a table. Used in
+ * exchange-auditor database replication.
+ *
+ * @param cls closure
+ * @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
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_records_by_table (void *cls,
+                                enum TALER_EXCHANGEDB_ReplicatedTable table,
+                                uint64_t serial,
+                                TALER_EXCHANGEDB_ReplicationCallback cb,
+                                void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_lookup_serial_by_table.c b/src/exchangedb/pg_lookup_serial_by_table.c
new file mode 100644
index 000000000..9fda7ddf8
--- /dev/null
+++ b/src/exchangedb/pg_lookup_serial_by_table.c
@@ -0,0 +1,459 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file pg_lookup_serial_by_table.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_serial_by_table.h"
+#include "pg_helper.h"
+
+
+/**
+ * Assign statement to @a n and PREPARE
+ * @a sql under name @a n.
+ */
+#define XPREPARE(n,sql) \
+  statement = n;        \
+  PREPARE (pg, n, sql);
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_serial_by_table (void *cls,
+                               enum TALER_EXCHANGEDB_ReplicatedTable table,
+                               uint64_t *serial)
+{
+  struct PostgresClosure *pg = cls;
+  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 = NULL;
+
+  switch (table)
+  {
+  case TALER_EXCHANGEDB_RT_DENOMINATIONS:
+    XPREPARE ("select_serial_by_table_denominations",
+              "SELECT"
+              " denominations_serial AS serial"
+              " FROM denominations"
+              " ORDER BY denominations_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
+    XPREPARE ("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;");
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_TARGETS:
+    XPREPARE ("select_serial_by_table_wire_targets",
+              "SELECT"
+              " wire_target_serial_id AS serial"
+              " FROM wire_targets"
+              " ORDER BY wire_target_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES:
+    XPREPARE ("select_serial_by_table_legitimization_processes",
+              "SELECT"
+              " legitimization_process_serial_id AS serial"
+              " FROM legitimization_processes"
+              " ORDER BY legitimization_process_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS:
+    XPREPARE ("select_serial_by_table_legitimization_requiremetns",
+              "SELECT"
+              " legitimization_requirement_serial_id AS serial"
+              " FROM legitimization_requirements"
+              " ORDER BY legitimization_requirement_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES:
+    XPREPARE ("select_serial_by_table_reserves",
+              "SELECT"
+              " reserve_uuid AS serial"
+              " FROM reserves"
+              " ORDER BY reserve_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_IN:
+    XPREPARE ("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;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
+    XPREPARE ("select_serial_by_table_reserves_close",
+              "SELECT"
+              " close_uuid AS serial"
+              " FROM reserves_close"
+              " ORDER BY close_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS:
+    XPREPARE ("select_serial_by_table_reserves_open_requests",
+              "SELECT"
+              " open_request_uuid AS serial"
+              " FROM reserves_open_requests"
+              " ORDER BY open_request_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS:
+    XPREPARE ("select_serial_by_table_reserves_open_deposits",
+              "SELECT"
+              " reserve_open_deposit_uuid AS serial"
+              " FROM reserves_open_deposits"
+              " ORDER BY reserve_open_deposit_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RESERVES_OUT:
+    XPREPARE ("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;");
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITORS:
+    XPREPARE ("select_serial_by_table_auditors",
+              "SELECT"
+              " auditor_uuid AS serial"
+              " FROM auditors"
+              " ORDER BY auditor_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
+    XPREPARE ("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;");
+    break;
+  case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
+    XPREPARE ("select_serial_by_table_exchange_sign_keys",
+              "SELECT"
+              " esk_serial AS serial"
+              " FROM exchange_sign_keys"
+              " ORDER BY esk_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
+    XPREPARE ("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;");
+    break;
+  case TALER_EXCHANGEDB_RT_KNOWN_COINS:
+    XPREPARE ("select_serial_by_table_known_coins",
+              "SELECT"
+              " known_coin_id AS serial"
+              " FROM known_coins"
+              " ORDER BY known_coin_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
+    XPREPARE ("select_serial_by_table_refresh_commitments",
+              "SELECT"
+              " melt_serial_id AS serial"
+              " FROM refresh_commitments"
+              " ORDER BY melt_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
+    XPREPARE ("select_serial_by_table_refresh_revealed_coins",
+              "SELECT"
+              " rrc_serial AS serial"
+              " FROM refresh_revealed_coins"
+              " ORDER BY rrc_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
+    XPREPARE ("select_serial_by_table_refresh_transfer_keys",
+              "SELECT"
+              " rtc_serial AS serial"
+              " FROM refresh_transfer_keys"
+              " ORDER BY rtc_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_BATCH_DEPOSITS:
+    XPREPARE ("select_serial_by_table_batch_deposits",
+              "SELECT"
+              " batch_deposit_serial_id AS serial"
+              " FROM batch_deposits"
+              " ORDER BY batch_deposit_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_COIN_DEPOSITS:
+    XPREPARE ("select_serial_by_table_coin_deposits",
+              "SELECT"
+              " coin_deposit_serial_id AS serial"
+              " FROM coin_deposits"
+              " ORDER BY coin_deposit_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_REFUNDS:
+    XPREPARE ("select_serial_by_table_refunds",
+              "SELECT"
+              " refund_serial_id AS serial"
+              " FROM refunds"
+              " ORDER BY refund_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_OUT:
+    XPREPARE ("select_serial_by_table_wire_out",
+              "SELECT"
+              " wireout_uuid AS serial"
+              " FROM wire_out"
+              " ORDER BY wireout_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
+    XPREPARE ("select_serial_by_table_aggregation_tracking",
+              "SELECT"
+              " aggregation_serial_id AS serial"
+              " FROM aggregation_tracking"
+              " ORDER BY aggregation_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WIRE_FEE:
+    XPREPARE ("select_serial_by_table_wire_fee",
+              "SELECT"
+              " wire_fee_serial AS serial"
+              " FROM wire_fee"
+              " ORDER BY wire_fee_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_GLOBAL_FEE:
+    XPREPARE ("select_serial_by_table_global_fee",
+              "SELECT"
+              " global_fee_serial AS serial"
+              " FROM global_fee"
+              " ORDER BY global_fee_serial DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP:
+    XPREPARE ("select_serial_by_table_recoup",
+              "SELECT"
+              " recoup_uuid AS serial"
+              " FROM recoup"
+              " ORDER BY recoup_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
+    XPREPARE ("select_serial_by_table_recoup_refresh",
+              "SELECT"
+              " recoup_refresh_uuid AS serial"
+              " FROM recoup_refresh"
+              " ORDER BY recoup_refresh_uuid DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_EXTENSIONS:
+    XPREPARE ("select_serial_by_table_extensions",
+              "SELECT"
+              " extension_id AS serial"
+              " FROM extensions"
+              " ORDER BY extension_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_DETAILS:
+    XPREPARE ("select_serial_by_table_policy_details",
+              "SELECT"
+              " policy_details_serial_id AS serial"
+              " FROM policy_details"
+              " ORDER BY policy_details_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS:
+    XPREPARE ("select_serial_by_table_policy_fulfillments",
+              "SELECT"
+              " fulfillment_id AS serial"
+              " FROM policy_fulfillments"
+              " ORDER BY fulfillment_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_REQUESTS:
+    XPREPARE ("select_serial_by_table_purse_requests",
+              "SELECT"
+              " purse_requests_serial_id AS serial"
+              " FROM purse_requests"
+              " ORDER BY purse_requests_serial_id DESC"
+              " LIMIT 1;")
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DECISION:
+    XPREPARE ("select_serial_by_table_purse_decision",
+              "SELECT"
+              " purse_decision_serial_id AS serial"
+              " FROM purse_decision"
+              " ORDER BY purse_decision_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_MERGES:
+    XPREPARE ("select_serial_by_table_purse_merges",
+              "SELECT"
+              " purse_merge_request_serial_id AS serial"
+              " FROM purse_merges"
+              " ORDER BY purse_merge_request_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DEPOSITS:
+    XPREPARE ("select_serial_by_table_purse_deposits",
+              "SELECT"
+              " purse_deposit_serial_id AS serial"
+              " FROM purse_deposits"
+              " ORDER BY purse_deposit_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_ACCOUNT_MERGES:
+    XPREPARE ("select_serial_by_table_account_merges",
+              "SELECT"
+              " account_merge_request_serial_id AS serial"
+              " FROM account_merges"
+              " ORDER BY account_merge_request_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_HISTORY_REQUESTS:
+    XPREPARE ("select_serial_by_table_history_requests",
+              "SELECT"
+              " history_request_serial_id AS serial"
+              " FROM history_requests"
+              " ORDER BY history_request_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_CLOSE_REQUESTS:
+    XPREPARE ("select_serial_by_table_close_requests",
+              "SELECT"
+              " close_request_serial_id AS serial"
+              " FROM close_requests"
+              " ORDER BY close_request_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT:
+    XPREPARE ("select_serial_by_table_wads_out",
+              "SELECT"
+              " wad_out_serial_id AS serial"
+              " FROM wads_out"
+              " ORDER BY wad_out_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES:
+    XPREPARE ("select_serial_by_table_wads_out_entries",
+              "SELECT"
+              " wad_out_entry_serial_id AS serial"
+              " FROM wad_out_entries"
+              " ORDER BY wad_out_entry_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN:
+    XPREPARE ("select_serial_by_table_wads_in",
+              "SELECT"
+              " wad_in_serial_id AS serial"
+              " FROM wads_in"
+              " ORDER BY wad_in_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES:
+    XPREPARE ("select_serial_by_table_wads_in_entries",
+              "SELECT"
+              " wad_in_entry_serial_id AS serial"
+              " FROM wad_in_entries"
+              " ORDER BY wad_in_entry_serial_id DESC"
+              " LIMIT 1;");
+    break;
+  case TALER_EXCHANGEDB_RT_PROFIT_DRAINS:
+    XPREPARE ("select_serial_by_table_profit_drains",
+              "SELECT"
+              " profit_drain_serial_id AS serial"
+              " FROM profit_drains"
+              " ORDER BY profit_drain_serial_id DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_profit_drains";
+    break;
+  case TALER_EXCHANGEDB_RT_AML_STAFF:
+    XPREPARE ("select_serial_by_table_aml_staff",
+              "SELECT"
+              " aml_staff_uuid AS serial"
+              " FROM aml_staff"
+              " ORDER BY aml_staff_uuid DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_aml_staff";
+    break;
+  case TALER_EXCHANGEDB_RT_AML_HISTORY:
+    XPREPARE ("select_serial_by_table_aml_history",
+              "SELECT"
+              " aml_history_serial_id AS serial"
+              " FROM aml_history"
+              " ORDER BY aml_history_serial_id DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_aml_history";
+    break;
+  case TALER_EXCHANGEDB_RT_KYC_ATTRIBUTES:
+    XPREPARE ("select_serial_by_table_kyc_attributes",
+              "SELECT"
+              " kyc_attributes_serial_id AS serial"
+              " FROM kyc_attributes"
+              " ORDER BY kyc_attributes_serial_id DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_kyc_attributes";
+    break;
+  case TALER_EXCHANGEDB_RT_PURSE_DELETION:
+    XPREPARE ("select_serial_by_table_purse_deletion",
+              "SELECT"
+              " purse_deletion_serial_id AS serial"
+              " FROM purse_deletion"
+              " ORDER BY purse_deletion_serial_id DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_purse_deletion";
+    break;
+  case TALER_EXCHANGEDB_RT_AGE_WITHDRAW:
+    XPREPARE ("select_serial_by_table_age_withdraw",
+              "SELECT"
+              " age_withdraw_id AS serial"
+              " FROM age_withdraw"
+              " ORDER BY age_withdraw_id DESC"
+              " LIMIT 1;");
+    statement = "select_serial_by_table_age_withdraw";
+    break;
+  }
+  if (NULL == statement)
+  {
+    GNUNET_break (0);
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  }
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   statement,
+                                                   params,
+                                                   rs);
+}
+
+
+#undef XPREPARE
diff --git a/src/exchangedb/pg_lookup_serial_by_table.h b/src/exchangedb/pg_lookup_serial_by_table.h
new file mode 100644
index 000000000..815b6477d
--- /dev/null
+++ b/src/exchangedb/pg_lookup_serial_by_table.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_lookup_serial_by_table.h
+ * @brief implementation of the lookup_serial_by_table function
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_SERIAL_BY_TABLE_H
+#define PG_LOOKUP_SERIAL_BY_TABLE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup the latest serial number of @a table.  Used in
+ * exchange-auditor database replication.
+ *
+ * @param cls closure
+ * @param table table for which we should return the serial
+ * @param[out] serial latest serial number in use
+ * @return transaction status code, GNUNET_DB_STATUS_HARD_ERROR if
+ *         @a table does not have a serial number
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_serial_by_table (void *cls,
+                               enum TALER_EXCHANGEDB_ReplicatedTable table,
+                               uint64_t *serial);
+
+
+#endif
diff --git a/src/exchangedb/pg_lookup_signing_key.c b/src/exchangedb/pg_lookup_signing_key.c
new file mode 100644
index 000000000..3803d114f
--- /dev/null
+++ b/src/exchangedb/pg_lookup_signing_key.c
@@ -0,0 +1,64 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_signing_key.c
+ * @brief Implementation of the lookup_signing_key function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_signing_key.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_signing_key (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  struct TALER_EXCHANGEDB_SignkeyMetaData *meta)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("valid_from",
+                                     &meta->start),
+    GNUNET_PQ_result_spec_timestamp ("expire_sign",
+                                     &meta->expire_sign),
+    GNUNET_PQ_result_spec_timestamp ("expire_legal",
+                                     &meta->expire_legal),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  PREPARE (pg,
+           "lookup_signing_key",
+           "SELECT"
+           " valid_from"
+           ",expire_sign"
+           ",expire_legal"
+           " FROM exchange_sign_keys"
+           " WHERE exchange_pub=$1");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_signing_key",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_signing_key.h b/src/exchangedb/pg_lookup_signing_key.h
new file mode 100644
index 000000000..487d60d2b
--- /dev/null
+++ b/src/exchangedb/pg_lookup_signing_key.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_signing_key.h
+ * @brief implementation of the lookup_signing_key function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_SIGNING_KEY_H
+#define PG_LOOKUP_SIGNING_KEY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup signing key meta data.
+ *
+ * @param cls closure
+ * @param exchange_pub the exchange online signing public key
+ * @param[out] meta meta data about @a exchange_pub
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_signing_key (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  struct TALER_EXCHANGEDB_SignkeyMetaData *meta);
+#endif
diff --git a/src/exchangedb/pg_lookup_signkey_revocation.c b/src/exchangedb/pg_lookup_signkey_revocation.c
new file mode 100644
index 000000000..056ecddc4
--- /dev/null
+++ b/src/exchangedb/pg_lookup_signkey_revocation.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_signkey_revocation.c
+ * @brief Implementation of the lookup_signkey_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_signkey_revocation.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_signkey_revocation (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "lookup_signkey_revocation",
+           "SELECT "
+           " master_sig"
+           " FROM signkey_revocations"
+           " WHERE esk_serial="
+           "   (SELECT esk_serial"
+           "      FROM exchange_sign_keys"
+           "     WHERE exchange_pub=$1);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_signkey_revocation",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_signkey_revocation.h b/src/exchangedb/pg_lookup_signkey_revocation.h
new file mode 100644
index 000000000..de0fb1d74
--- /dev/null
+++ b/src/exchangedb/pg_lookup_signkey_revocation.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_signkey_revocation.h
+ * @brief implementation of the lookup_signkey_revocation function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_SIGNKEY_REVOCATION_H
+#define PG_LOOKUP_SIGNKEY_REVOCATION_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Obtain information about a revoked online signing key.
+ *
+ * @param cls closure
+ * @param exchange_pub exchange online signing key
+ * @param[out] master_sig set to signature affirming the revocation (if revoked)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_signkey_revocation (
+  void *cls,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_transfer_by_deposit.c b/src/exchangedb/pg_lookup_transfer_by_deposit.c
new file mode 100644
index 000000000..192556130
--- /dev/null
+++ b/src/exchangedb/pg_lookup_transfer_by_deposit.c
@@ -0,0 +1,239 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_transfer_by_deposit.c
+ * @brief Implementation of the lookup_transfer_by_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_transfer_by_deposit.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_transfer_by_deposit (
+  void *cls,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  bool *pending,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp *exec_time,
+  struct TALER_Amount *amount_with_fee,
+  struct TALER_Amount *deposit_fee,
+  struct TALER_EXCHANGEDB_KycStatus *kyc,
+  enum TALER_AmlDecisionState *aml_decision)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
+    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+    GNUNET_PQ_query_param_end
+  };
+  char *payto_uri;
+  struct TALER_WireSaltP wire_salt;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
+                                          wtid),
+    GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                          &wire_salt),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  &payto_uri),
+    GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                     exec_time),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 amount_with_fee),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                 deposit_fee),
+    GNUNET_PQ_result_spec_end
+  };
+
+  memset (kyc,
+          0,
+          sizeof (*kyc));
+  /* check if the aggregation record exists and get it */
+  PREPARE (pg,
+           "lookup_deposit_wtid",
+           "SELECT"
+           " atr.wtid_raw"
+           ",wire_out.execution_date"
+           ",cdep.amount_with_fee"
+           ",bdep.wire_salt"
+           ",wt.payto_uri"
+           ",denom.fee_deposit"
+           " FROM coin_deposits cdep"
+           "    JOIN batch_deposits bdep"
+           "      USING (batch_deposit_serial_id)"
+           "    JOIN wire_targets wt"
+           "      USING (wire_target_h_payto)"
+           "    JOIN aggregation_tracking atr"
+           "      ON (cdep.batch_deposit_serial_id = atr.batch_deposit_serial_id)"
+           "    JOIN known_coins kc"
+           "      ON (kc.coin_pub = cdep.coin_pub)"
+           "    JOIN denominations denom"
+           "      USING (denominations_serial)"
+           "    JOIN wire_out"
+           "      USING (wtid_raw)"
+           " WHERE cdep.coin_pub=$1"
+           "   AND bdep.merchant_pub=$3"
+           "   AND bdep.h_contract_terms=$2");
+  /* NOTE: above query might be more efficient if we computed the shard
+     from the merchant_pub and included that in the query */
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "lookup_deposit_wtid",
+                                                 params,
+                                                 rs);
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+  {
+    struct TALER_MerchantWireHashP wh;
+
+    TALER_merchant_wire_signature_hash (payto_uri,
+                                        &wire_salt,
+                                        &wh);
+    if (0 ==
+        GNUNET_memcmp (&wh,
+                       h_wire))
+    {
+      *pending = false;
+      kyc->ok = true;
+      *aml_decision = TALER_AML_NORMAL;
+      GNUNET_PQ_cleanup_result (rs);
+      return qs;
+    }
+    qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+    GNUNET_PQ_cleanup_result (rs);
+  }
+  if (0 > qs)
+    return qs;
+  *pending = true;
+  memset (wtid,
+          0,
+          sizeof (*wtid));
+  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "lookup_deposit_wtid returned 0 matching rows\n");
+  {
+    /* Check if transaction exists in deposits, so that we just
+       do not have a WTID yet. In that case, return without wtid
+       (by setting 'pending' true). */
+    uint32_t status32 = TALER_AML_NORMAL;
+    uint64_t aml_kyc_row = 0;
+    struct GNUNET_PQ_ResultSpec rs2[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                            &wire_salt),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      /* See Postgresql bug #18380 */
+#define BUG 1
+#if BUG
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 ("legitimization_requirement_serial_id",
+                                      &kyc->requirement_row),
+        NULL),
+#endif
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 ("kyc_requirement",
+                                      &aml_kyc_row),
+        NULL),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint32 ("status",
+                                      &status32),
+        NULL),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                   deposit_fee),
+      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
+                                       exec_time),
+      GNUNET_PQ_result_spec_end
+    };
+
+    PREPARE (pg,
+             "get_deposit_without_wtid",
+             "SELECT"
+             " bdep.wire_salt"
+             ",wt.payto_uri"
+             ",cdep.amount_with_fee"
+             ",denom.fee_deposit"
+             ",bdep.wire_deadline"
+#if BUG
+             ",agt.legitimization_requirement_serial_id"
+#endif
+             ",aml.status"
+             ",aml.kyc_requirement"
+             " FROM coin_deposits cdep"
+             " JOIN batch_deposits bdep"
+             "   USING (batch_deposit_serial_id)"
+             " JOIN wire_targets wt"
+             "   USING (wire_target_h_payto)"
+             " JOIN known_coins kc"
+             "   ON (kc.coin_pub = cdep.coin_pub)"
+             " JOIN denominations denom"
+             "   USING (denominations_serial)"
+#if BUG
+             " LEFT JOIN aggregation_transient agt "
+             "   ON ( (bdep.wire_target_h_payto = agt.wire_target_h_payto) AND"
+             "        (bdep.merchant_pub = agt.merchant_pub) )"
+#endif
+             " LEFT JOIN aml_status aml"
+             "   ON (wt.wire_target_h_payto = aml.h_payto)"
+             " WHERE cdep.coin_pub=$1"
+             "   AND bdep.merchant_pub=$3"
+             "   AND bdep.h_contract_terms=$2"
+             " LIMIT 1;");
+    /* NOTE: above query might be more efficient if we computed the shard
+       from the merchant_pub and included that in the query */
+    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_deposit_without_wtid",
+                                                   params,
+                                                   rs2);
+    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
+    {
+      struct TALER_MerchantWireHashP wh;
+
+      *aml_decision = (enum TALER_AmlDecisionState) status32;
+      if (0 == kyc->requirement_row)
+        kyc->ok = true; /* technically: unknown */
+      if ( (kyc->ok) &&
+           (TALER_AML_FROZEN == *aml_decision) &&
+           (0 != aml_kyc_row) )
+      {
+        /* KYC required via AML */
+        kyc->ok = false;
+        kyc->requirement_row = aml_kyc_row;
+      }
+      TALER_merchant_wire_signature_hash (payto_uri,
+                                          &wire_salt,
+                                          &wh);
+      if (0 !=
+          GNUNET_memcmp (&wh,
+                         h_wire))
+      {
+        GNUNET_PQ_cleanup_result (rs2);
+        return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+      }
+      GNUNET_PQ_cleanup_result (rs2);
+    }
+    *aml_decision = TALER_AML_NORMAL;
+    return qs;
+  }
+}
diff --git a/src/exchangedb/pg_lookup_transfer_by_deposit.h b/src/exchangedb/pg_lookup_transfer_by_deposit.h
new file mode 100644
index 000000000..83782d5a0
--- /dev/null
+++ b/src/exchangedb/pg_lookup_transfer_by_deposit.h
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_transfer_by_deposit.h
+ * @brief implementation of the lookup_transfer_by_deposit function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_TRANSFER_BY_DEPOSIT_H
+#define PG_LOOKUP_TRANSFER_BY_DEPOSIT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Try to find the wire transfer details for a deposit operation.
+ * If we did not execute the deposit yet, return when it is supposed
+ * to be executed.
+ *
+ * @param cls closure
+ * @param h_contract_terms hash of the proposal data
+ * @param h_wire hash of merchant wire details
+ * @param coin_pub public key of deposited coin
+ * @param merchant_pub merchant public key
+ * @param[out] pending set to true if the transaction is still pending
+ * @param[out] wtid wire transfer identifier, only set if @a pending is false
+ * @param[out] exec_time when was the transaction done, or
+ *         when we expect it to be done (if @a pending is false)
+ * @param[out] amount_with_fee set to the total deposited amount
+ * @param[out] deposit_fee set to how much the exchange did charge for the deposit
+ * @param[out] kyc set to the kyc status of the receiver (if @a pending)
+ * @param[out] aml_decision set to the AML status of the receiver
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_transfer_by_deposit (
+  void *cls,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  bool *pending,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp *exec_time,
+  struct TALER_Amount *amount_with_fee,
+  struct TALER_Amount *deposit_fee,
+  struct TALER_EXCHANGEDB_KycStatus *kyc,
+  enum TALER_AmlDecisionState *aml_decision);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_wire_fee_by_time.c b/src/exchangedb/pg_lookup_wire_fee_by_time.c
new file mode 100644
index 000000000..775232a48
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_fee_by_time.c
@@ -0,0 +1,156 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_fee_by_time.c
+ * @brief Implementation of the lookup_wire_fee_by_time function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_wire_fee_by_time.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #wire_fee_by_time_helper()
+ */
+struct WireFeeLookupContext
+{
+
+  /**
+   * Set to the wire fees. Set to invalid if fees conflict over
+   * the given time period.
+   */
+  struct TALER_WireFeeSet *fees;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+};
+
+
+/**
+ * Helper function for #TEH_PG_lookup_wire_fee_by_time().
+ * Calls the callback with the wire fee structure.
+ *
+ * @param cls a `struct WireFeeLookupContext`
+ * @param result db results
+ * @param num_results number of results in @a result
+ */
+static void
+wire_fee_by_time_helper (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct WireFeeLookupContext *wlc = cls;
+  struct PostgresClosure *pg = wlc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_WireFeeSet fs;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
+                                   &fs.wire),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                   &fs.closing),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      /* invalidate */
+      memset (wlc->fees,
+              0,
+              sizeof (struct TALER_WireFeeSet));
+      return;
+    }
+    if (0 == i)
+    {
+      *wlc->fees = fs;
+      continue;
+    }
+    if (0 !=
+        TALER_wire_fee_set_cmp (&fs,
+                                wlc->fees))
+    {
+      /* invalidate */
+      memset (wlc->fees,
+              0,
+              sizeof (struct TALER_WireFeeSet));
+      return;
+    }
+  }
+}
+
+
+/**
+ * Lookup information about known wire fees.  Finds all applicable
+ * fees in the given range. If they are identical, returns the
+ * respective @a fees. If any of the fees
+ * differ between @a start_time and @a end_time, the transaction
+ * succeeds BUT returns an invalid amount for both fees.
+ *
+ * @param cls closure
+ * @param wire_method the wire method to lookup fees for
+ * @param start_time starting time of fee
+ * @param end_time end time of fee
+ * @param[out] fees wire fees for that time period; if
+ *             different fees exists within this time
+ *             period, an 'invalid' amount is returned.
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_fee_by_time (
+  void *cls,
+  const char *wire_method,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  struct TALER_WireFeeSet *fees)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (wire_method),
+    GNUNET_PQ_query_param_timestamp (&start_time),
+    GNUNET_PQ_query_param_timestamp (&end_time),
+    GNUNET_PQ_query_param_end
+  };
+  struct WireFeeLookupContext wlc = {
+    .fees = fees,
+    .pg = pg
+  };
+  /* used in #postgres_lookup_wire_fee_by_time() */
+  PREPARE (pg,
+           "lookup_wire_fee_by_time",
+           "SELECT"
+           " wire_fee"
+           ",closing_fee"
+           " FROM wire_fee"
+           " WHERE wire_method=$1"
+           " AND end_date > $2"
+           " AND start_date < $3;");
+  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "lookup_wire_fee_by_time",
+                                               params,
+                                               &wire_fee_by_time_helper,
+                                               &wlc);
+}
diff --git a/src/exchangedb/pg_lookup_wire_fee_by_time.h b/src/exchangedb/pg_lookup_wire_fee_by_time.h
new file mode 100644
index 000000000..cbfc36e76
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_fee_by_time.h
@@ -0,0 +1,76 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_fee_by_time.h
+ * @brief implementation of the lookup_wire_fee_by_time function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_WIRE_FEE_BY_TIME_H
+#define PG_LOOKUP_WIRE_FEE_BY_TIME_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup information about known wire fees.  Finds all applicable
+ * fees in the given range. If they are identical, returns the
+ * respective @a fees. If any of the fees
+ * differ between @a start_time and @a end_time, the transaction
+ * succeeds BUT returns an invalid amount for both fees.
+ *
+ * @param cls closure
+ * @param wire_method the wire method to lookup fees for
+ * @param start_time starting time of fee
+ * @param end_time end time of fee
+ * @param[out] fees wire fees for that time period; if
+ *             different fees exists within this time
+ *             period, an 'invalid' amount is returned.
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_fee_by_time (
+  void *cls,
+  const char *wire_method,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  struct TALER_WireFeeSet *fees);
+
+/**
+ * Lookup information about known wire fees.  Finds all applicable
+ * fees in the given range. If they are identical, returns the
+ * respective @a fees. If any of the fees
+ * differ between @a start_time and @a end_time, the transaction
+ * succeeds BUT returns an invalid amount for both fees.
+ *
+ * @param cls closure
+ * @param wire_method the wire method to lookup fees for
+ * @param start_time starting time of fee
+ * @param end_time end time of fee
+ * @param[out] fees wire fees for that time period; if
+ *             different fees exists within this time
+ *             period, an 'invalid' amount is returned.
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_fee_by_time (
+  void *cls,
+  const char *wire_method,
+  struct GNUNET_TIME_Timestamp start_time,
+  struct GNUNET_TIME_Timestamp end_time,
+  struct TALER_WireFeeSet *fees);
+#endif
diff --git a/src/exchangedb/pg_lookup_wire_timestamp.c b/src/exchangedb/pg_lookup_wire_timestamp.c
new file mode 100644
index 000000000..17dffc706
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_timestamp.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_timestamp.c
+ * @brief Implementation of the lookup_wire_timestamp function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_wire_timestamp.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_timestamp (void *cls,
+                              const char *payto_uri,
+                              struct GNUNET_TIME_Timestamp *last_date)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("last_change",
+                                     last_date),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  PREPARE (pg,
+           "lookup_wire_timestamp",
+           "SELECT"
+           " last_change"
+           " FROM wire_accounts"
+           " WHERE payto_uri=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "lookup_wire_timestamp",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_lookup_wire_timestamp.h b/src/exchangedb/pg_lookup_wire_timestamp.h
new file mode 100644
index 000000000..f2ee117de
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_timestamp.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_timestamp.h
+ * @brief implementation of the lookup_wire_timestamp function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_WIRE_TIMESTAMP_H
+#define PG_LOOKUP_WIRE_TIMESTAMP_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Check the last date an exchange wire account was modified.
+ *
+ * @param cls closure
+ * @param payto_uri key to look up information for
+ * @param[out] last_date last modification date to auditor status
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_timestamp (void *cls,
+                              const char *payto_uri,
+                              struct GNUNET_TIME_Timestamp *last_date);
+
+#endif
diff --git a/src/exchangedb/pg_lookup_wire_transfer.c b/src/exchangedb/pg_lookup_wire_transfer.c
new file mode 100644
index 000000000..7ab023fe7
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_transfer.c
@@ -0,0 +1,188 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_transfer.c
+ * @brief Implementation of the lookup_wire_transfer function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_lookup_wire_transfer.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #handle_wt_result.
+ */
+struct WireTransferResultContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_AggregationDataCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on serious errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.  Helper function
+ * for #TEH_PG_lookup_wire_transfer().
+ *
+ * @param cls closure of type `struct WireTransferResultContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+handle_wt_result (void *cls,
+                  PGresult *result,
+                  unsigned int num_results)
+{
+  struct WireTransferResultContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    struct TALER_CoinSpendPublicKeyP coin_pub;
+    struct TALER_PaytoHashP h_payto;
+    struct TALER_MerchantPublicKeyP merchant_pub;
+    struct GNUNET_TIME_Timestamp exec_time;
+    struct TALER_Amount amount_with_fee;
+    struct TALER_Amount deposit_fee;
+    struct TALER_DenominationPublicKey denom_pub;
+    char *payto_uri;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &h_contract_terms),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      GNUNET_PQ_result_spec_auto_from_type ("wire_target_h_payto",
+                                            &h_payto),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                            &merchant_pub),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &exec_time),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
+                                   &deposit_fee),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             rowid,
+             &merchant_pub,
+             payto_uri,
+             &h_payto,
+             exec_time,
+             &h_contract_terms,
+             &denom_pub,
+             &coin_pub,
+             &amount_with_fee,
+             &deposit_fee);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_transfer (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  TALER_EXCHANGEDB_AggregationDataCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_end
+  };
+  struct WireTransferResultContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "lookup_transactions",
+           "SELECT"
+           " aggregation_serial_id"
+           ",bdep.h_contract_terms"
+           ",payto_uri"
+           ",wire_targets.wire_target_h_payto"
+           ",kc.coin_pub"
+           ",bdep.merchant_pub"
+           ",wire_out.execution_date"
+           ",cdep.amount_with_fee"
+           ",denom.fee_deposit"
+           ",denom.denom_pub"
+           " FROM aggregation_tracking"
+           "    JOIN batch_deposits bdep"
+           "      USING (batch_deposit_serial_id)"
+           "    JOIN coin_deposits cdep"
+           "      USING (batch_deposit_serial_id)"
+           "    JOIN wire_targets"
+           "      USING (wire_target_h_payto)"
+           "    JOIN known_coins kc"
+           "      USING (coin_pub)"
+           "    JOIN denominations denom"
+           "      USING (denominations_serial)"
+           "    JOIN wire_out"
+           "      USING (wtid_raw)"
+           " WHERE wtid_raw=$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "lookup_transactions",
+                                             params,
+                                             &handle_wt_result,
+                                             &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_lookup_wire_transfer.h b/src/exchangedb/pg_lookup_wire_transfer.h
new file mode 100644
index 000000000..ae5355f40
--- /dev/null
+++ b/src/exchangedb/pg_lookup_wire_transfer.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_lookup_wire_transfer.h
+ * @brief implementation of the lookup_wire_transfer function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_LOOKUP_WIRE_TRANSFER_H
+#define PG_LOOKUP_WIRE_TRANSFER_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Lookup the list of Taler transactions that were aggregated
+ * into a wire transfer by the respective @a wtid.
+ *
+ * @param cls closure
+ * @param wtid the raw wire transfer identifier we used
+ * @param cb function to call on each transaction found
+ * @param cb_cls closure for @a cb
+ * @return query status of the transaction
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_lookup_wire_transfer (
+  void *cls,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  TALER_EXCHANGEDB_AggregationDataCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_persist_policy_details.c b/src/exchangedb/pg_persist_policy_details.c
new file mode 100644
index 000000000..d97b92eac
--- /dev/null
+++ b/src/exchangedb/pg_persist_policy_details.c
@@ -0,0 +1,78 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_persist_policy_details.c
+ * @brief Implementation of the persist_policy_details function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_persist_policy_details.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_persist_policy_details (
+  void *cls,
+  const struct TALER_PolicyDetails *details,
+  uint64_t *policy_details_serial_id,
+  struct TALER_Amount *accumulated_total,
+  enum TALER_PolicyFulfillmentState *fulfillment_state)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&details->hash_code),
+    TALER_PQ_query_param_json (details->policy_json),
+    GNUNET_PQ_query_param_timestamp (&details->deadline),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &details->commitment),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &details->accumulated_total),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &details->policy_fee),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &details->transferable_amount),
+    GNUNET_PQ_query_param_auto_from_type (&details->fulfillment_state),
+    (details->no_policy_fulfillment_id)
+     ?  GNUNET_PQ_query_param_null ()
+     : GNUNET_PQ_query_param_uint64 (&details->policy_fulfillment_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("policy_details_serial_id",
+                                  policy_details_serial_id),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("accumulated_total",
+                                 accumulated_total),
+    GNUNET_PQ_result_spec_uint32 ("fulfillment_state",
+                                  fulfillment_state),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "call_insert_or_update_policy_details",
+           "SELECT"
+           " out_policy_details_serial_id AS policy_details_serial_id"
+           ",out_accumulated_total AS accumulated_total"
+           ",out_fulfillment_state AS fulfillment_state"
+           " FROM exchange_do_insert_or_update_policy_details"
+           "($1, $2, $3, $4, $5, $6, $7, $8, $9);");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "call_insert_or_update_policy_details",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_persist_policy_details.h b/src/exchangedb/pg_persist_policy_details.h
new file mode 100644
index 000000000..4fe709d92
--- /dev/null
+++ b/src/exchangedb/pg_persist_policy_details.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_persist_policy_details.h
+ * @brief implementation of the persist_policy_details function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_PERSIST_POLICY_DETAILS_H
+#define PG_PERSIST_POLICY_DETAILS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/* Persist the details to a policy in the policy_details table.  If there
+ * already exists a policy, update the fields accordingly.
+ *
+ * @param details The policy details that should be persisted.  If an entry for
+ *        the given details->hash_code exists, the values will be updated.
+ * @param[out] policy_details_serial_id The row ID of the policy details
+ * @param[out] accumulated_total The total amount accumulated in that policy
+ * @param[out] fulfillment_state The state of policy.  If the state was Insufficient prior to the call and the provided deposit raises the accumulated_total above the commitment, it will be set to Ready.
+ * @return query execution status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_persist_policy_details (
+  void *cls,
+  const struct TALER_PolicyDetails *details,
+  uint64_t *policy_details_serial_id,
+  struct TALER_Amount *accumulated_total,
+  enum TALER_PolicyFulfillmentState *fulfillment_state);
+
+#endif
diff --git a/src/exchangedb/pg_preflight.c b/src/exchangedb/pg_preflight.c
new file mode 100644
index 000000000..4533c9a97
--- /dev/null
+++ b/src/exchangedb/pg_preflight.c
@@ -0,0 +1,69 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_preflight.c
+ * @brief Implementation of the preflight function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_preflight.h"
+#include "pg_helper.h"
+
+
+/**
+ * Connect to the database if the connection does not exist yet.
+ *
+ * @param pg the plugin-specific state
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_internal_setup (struct PostgresClosure *pg);
+
+
+enum GNUNET_GenericReturnValue
+TEH_PG_preflight (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("ROLLBACK"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  if (GNUNET_OK !=
+      TEH_PG_internal_setup (pg))
+    return GNUNET_SYSERR;
+  if (NULL == pg->transaction_name)
+    return GNUNET_OK; /* all good */
+  if (GNUNET_OK ==
+      GNUNET_PQ_exec_statements (pg->conn,
+                                 es))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "BUG: Preflight check rolled back transaction `%s'!\n",
+                pg->transaction_name);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "BUG: Preflight check failed to rollback transaction `%s'!\n",
+                pg->transaction_name);
+  }
+  pg->transaction_name = NULL;
+  return GNUNET_NO;
+}
diff --git a/src/exchangedb/pg_preflight.h b/src/exchangedb/pg_preflight.h
new file mode 100644
index 000000000..ba994f1e6
--- /dev/null
+++ b/src/exchangedb/pg_preflight.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_preflight.h
+ * @brief implementation of the preflight function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_PREFLIGTH_H
+#define PG_PREFLIGTH_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Do a pre-flight check that we are not in an uncommitted transaction.
+ * If we are, try to commit the previous transaction and output a warning.
+ * Does not return anything, as we will continue regardless of the outcome.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @return #GNUNET_OK if everything is fine
+ *         #GNUNET_NO if a transaction was rolled back
+ *         #GNUNET_SYSERR on hard errors
+ */
+
+
+enum GNUNET_GenericReturnValue
+TEH_PG_preflight (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_profit_drains_get_pending.c b/src/exchangedb/pg_profit_drains_get_pending.c
new file mode 100644
index 000000000..c844a3f38
--- /dev/null
+++ b/src/exchangedb/pg_profit_drains_get_pending.c
@@ -0,0 +1,78 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_profit_drains_get_pending.c
+ * @brief Implementation of the profit_drains_get_pending function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_profit_drains_get_pending.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_profit_drains_get_pending (
+  void *cls,
+  uint64_t *serial,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  char **account_section,
+  char **payto_uri,
+  struct GNUNET_TIME_Timestamp *request_timestamp,
+  struct TALER_Amount *amount,
+  struct TALER_MasterSignatureP *master_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_uint64 ("profit_drain_serial_id",
+                                  serial),
+    GNUNET_PQ_result_spec_auto_from_type ("wtid",
+                                          wtid),
+    GNUNET_PQ_result_spec_string ("account_section",
+                                  account_section),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  payto_uri),
+    GNUNET_PQ_result_spec_timestamp ("trigger_date",
+                                     request_timestamp),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                 amount),
+    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
+                                          master_sig),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_profit_drains_get_pending() */
+  PREPARE (pg,
+           "get_ready_profit_drain",
+           "SELECT"
+           " profit_drain_serial_id"
+           ",wtid"
+           ",account_section"
+           ",payto_uri"
+           ",trigger_date"
+           ",amount"
+           ",master_sig"
+           " FROM profit_drains"
+           " WHERE NOT executed"
+           " ORDER BY trigger_date ASC;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_ready_profit_drain",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_profit_drains_get_pending.h b/src/exchangedb/pg_profit_drains_get_pending.h
new file mode 100644
index 000000000..cd793a129
--- /dev/null
+++ b/src/exchangedb/pg_profit_drains_get_pending.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_profit_drains_get_pending.h
+ * @brief implementation of the profit_drains_get_pending function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_PROFIT_DRAINS_GET_PENDING_H
+#define PG_PROFIT_DRAINS_GET_PENDING_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Get profit drain operation ready to execute.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param[out] serial set to serial ID of the entry
+ * @param[out] wtid set set to wire transfer ID to use
+ * @param[out] account_section set to  account to drain
+ * @param[out] payto_uri set to account to wire funds to
+ * @param[out] request_timestamp set to time of the signature
+ * @param[out] amount set to amount to wire
+ * @param[out] master_sig set to signature affirming the operation
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_profit_drains_get_pending (
+  void *cls,
+  uint64_t *serial,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  char **account_section,
+  char **payto_uri,
+  struct GNUNET_TIME_Timestamp *request_timestamp,
+  struct TALER_Amount *amount,
+  struct TALER_MasterSignatureP *master_sig);
+
+#endif
diff --git a/src/exchangedb/pg_profit_drains_set_finished.c b/src/exchangedb/pg_profit_drains_set_finished.c
new file mode 100644
index 000000000..f0de27945
--- /dev/null
+++ b/src/exchangedb/pg_profit_drains_set_finished.c
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_profit_drains_set_finished.c
+ * @brief Implementation of the profit_drains_set_finished function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_profit_drains_set_finished.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_profit_drains_set_finished (
+  void *cls,
+  uint64_t serial)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "drain_profit_set_finished",
+           "UPDATE profit_drains"
+           " SET"
+           " executed=TRUE"
+           " WHERE profit_drain_serial_id=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "drain_profit_set_finished",
+                                             params);
+}
diff --git a/src/exchangedb/pg_profit_drains_set_finished.h b/src/exchangedb/pg_profit_drains_set_finished.h
new file mode 100644
index 000000000..b0878b5b8
--- /dev/null
+++ b/src/exchangedb/pg_profit_drains_set_finished.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_profit_drains_set_finished.h
+ * @brief implementation of the profit_drains_set_finished function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_PROFIT_DRAINS_SET_FINISHED_H
+#define PG_PROFIT_DRAINS_SET_FINISHED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Set profit drain operation to finished.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param serial serial ID of the entry to mark finished
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_profit_drains_set_finished (
+  void *cls,
+  uint64_t serial);
+
+#endif
diff --git a/src/exchangedb/pg_release_revolving_shard.c b/src/exchangedb/pg_release_revolving_shard.c
new file mode 100644
index 000000000..43e45c4bc
--- /dev/null
+++ b/src/exchangedb/pg_release_revolving_shard.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_release_revolving_shard.c
+ * @brief Implementation of the release_revolving_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_release_revolving_shard.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_release_revolving_shard (void *cls,
+                                const char *job_name,
+                                uint32_t start_row,
+                                uint32_t end_row)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (job_name),
+    GNUNET_PQ_query_param_uint32 (&start_row),
+    GNUNET_PQ_query_param_uint32 (&end_row),
+    GNUNET_PQ_query_param_end
+  };
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Releasing revolving shard %s %u-%u\n",
+              job_name,
+              (unsigned int) start_row,
+              (unsigned int) end_row);
+
+
+  PREPARE (pg,
+           "release_revolving_shard",
+           "UPDATE revolving_work_shards"
+           " SET active=FALSE"
+           " WHERE job_name=$1"
+           "   AND start_row=$2"
+           "   AND end_row=$3");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "release_revolving_shard",
+                                             params);
+}
diff --git a/src/exchangedb/pg_release_revolving_shard.h b/src/exchangedb/pg_release_revolving_shard.h
new file mode 100644
index 000000000..ea65ab605
--- /dev/null
+++ b/src/exchangedb/pg_release_revolving_shard.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_release_revolving_shard.h
+ * @brief implementation of the release_revolving_shard function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_RELEASE_REVOLVING_SHARD_H
+#define PG_RELEASE_REVOLVING_SHARD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to release a revolving shard
+ * back into the work pool.  Clears the
+ * "completed" flag.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param job_name name of the operation to grab a word shard for
+ * @param start_row inclusive start row of the shard
+ * @param end_row exclusive end row of the shard
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_release_revolving_shard (void *cls,
+                                const char *job_name,
+                                uint32_t start_row,
+                                uint32_t end_row);
+
+#endif
diff --git a/src/exchangedb/pg_reserves_get.c b/src/exchangedb/pg_reserves_get.c
new file mode 100644
index 000000000..cae4764a5
--- /dev/null
+++ b/src/exchangedb/pg_reserves_get.c
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_get.c
+ * @brief Implementation of the reserves_get function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_reserves_get.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_get (void *cls,
+                     struct TALER_EXCHANGEDB_Reserve *reserve)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (&reserve->pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_result_spec_amount ("current_balance",
+                                 pg->currency,
+                                 &reserve->balance),
+    GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                     &reserve->expiry),
+    GNUNET_PQ_result_spec_timestamp ("gc_date",
+                                     &reserve->gc),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_reserves_get() */
+  PREPARE (pg,
+           "reserves_get",
+           "SELECT"
+           " current_balance"
+           ",expiration_date"
+           ",gc_date"
+           " FROM reserves"
+           " WHERE reserve_pub=$1"
+           " LIMIT 1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "reserves_get",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_reserves_get.h b/src/exchangedb/pg_reserves_get.h
new file mode 100644
index 000000000..8a96d53ed
--- /dev/null
+++ b/src/exchangedb/pg_reserves_get.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_get.h
+ * @brief implementation of the reserves_get function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_RESERVES_GET_H
+#define PG_RESERVES_GET_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Get the summary of a reserve.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param[in,out] reserve the reserve data.  The public key of the reserve should be
+ *          set in this structure; it is used to query the database.  The balance
+ *          and expiration are then filled accordingly.
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_get (void *cls,
+                     struct TALER_EXCHANGEDB_Reserve *reserve);
+
+#endif
diff --git a/src/exchangedb/pg_reserves_get_origin.c b/src/exchangedb/pg_reserves_get_origin.c
new file mode 100644
index 000000000..55d3179d1
--- /dev/null
+++ b/src/exchangedb/pg_reserves_get_origin.c
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_get_origin.c
+ * @brief Implementation of the reserves_get_origin function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_reserves_get_origin.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_get_origin (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct TALER_PaytoHashP *h_payto)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("wire_source_h_payto",
+                                          h_payto),
+    GNUNET_PQ_result_spec_end
+  };
+
+
+  PREPARE (pg,
+           "get_h_wire_source_of_reserve",
+           "SELECT"
+           " wire_source_h_payto"
+           " FROM reserves_in"
+           " WHERE reserve_pub=$1");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "get_h_wire_source_of_reserve",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_reserves_get_origin.h b/src/exchangedb/pg_reserves_get_origin.h
new file mode 100644
index 000000000..22085d8f0
--- /dev/null
+++ b/src/exchangedb/pg_reserves_get_origin.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_get_origin.h
+ * @brief implementation of the reserves_get_origin function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_RESERVES_GET_ORIGIN_H
+#define PG_RESERVES_GET_ORIGIN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Get the origin of funds of a reserve.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserve_pub public key of the reserve
+ * @param[out] h_payto set to hash of the wire source payto://-URI
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_get_origin (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct TALER_PaytoHashP *h_payto);
+
+#endif
diff --git a/src/exchangedb/pg_reserves_in_insert.c b/src/exchangedb/pg_reserves_in_insert.c
new file mode 100644
index 000000000..21734942a
--- /dev/null
+++ b/src/exchangedb/pg_reserves_in_insert.c
@@ -0,0 +1,373 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_in_insert.c
+ * @brief Implementation of the reserves_in_insert function for Postgres
+ * @author Christian Grothoff
+ * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_reserves_in_insert.h"
+#include "pg_helper.h"
+#include "pg_start.h"
+#include "pg_start_read_committed.h"
+#include "pg_commit.h"
+#include "pg_preflight.h"
+#include "pg_rollback.h"
+#include "pg_reserves_get.h"
+#include "pg_reserves_update.h"
+#include "pg_setup_wire_target.h"
+#include "pg_event_notify.h"
+
+
+/**
+ * Generate event notification for the reserve change.
+ *
+ * @param reserve_pub reserve to notfiy on
+ * @return string to pass to postgres for the notification
+ */
+static char *
+compute_notify_on_reserve (const struct TALER_ReservePublicKeyP *reserve_pub)
+{
+  struct TALER_ReserveEventP rep = {
+    .header.size = htons (sizeof (rep)),
+    .header.type = htons (TALER_DBEVENT_EXCHANGE_RESERVE_INCOMING),
+    .reserve_pub = *reserve_pub
+  };
+
+  return GNUNET_PQ_get_event_notify_channel (&rep.header);
+}
+
+
+/**
+ * Closure for our helper_cb()
+ */
+struct Context
+{
+  /**
+   * Array of reserve UUIDs to initialize.
+   */
+  uint64_t *reserve_uuids;
+
+  /**
+   * Array with entries set to 'true' for duplicate transactions.
+   */
+  bool *transaction_duplicates;
+
+  /**
+   * Array with entries set to 'true' for rows with conflicts.
+   */
+  bool *conflicts;
+
+  /**
+   * Set to #GNUNET_SYSERR on failures.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+  /**
+   * Single value (no array) set to true if we need
+   * to follow-up with an update.
+   */
+  bool needs_update;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct Context *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+helper_cb (void *cls,
+           PGresult *result,
+           unsigned int num_results)
+{
+  struct Context *ctx = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_bool (
+        "transaction_duplicate",
+        &ctx->transaction_duplicates[i]),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_uint64 ("ruuid",
+                                      &ctx->reserve_uuids[i]),
+        &ctx->conflicts[i]),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    if (! ctx->transaction_duplicates[i])
+      ctx->needs_update |= ctx->conflicts[i];
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_in_insert (
+  void *cls,
+  const struct TALER_EXCHANGEDB_ReserveInInfo *reserves,
+  unsigned int reserves_length,
+  enum GNUNET_DB_QueryStatus *results)
+{
+  struct PostgresClosure *pg = cls;
+  unsigned int dups = 0;
+
+  struct TALER_PaytoHashP h_paytos[GNUNET_NZL (reserves_length)];
+  char *notify_s[GNUNET_NZL (reserves_length)];
+  struct TALER_ReservePublicKeyP reserve_pubs[GNUNET_NZL (reserves_length)];
+  struct TALER_Amount balances[GNUNET_NZL (reserves_length)];
+  struct GNUNET_TIME_Timestamp execution_times[GNUNET_NZL (reserves_length)];
+  const char *sender_account_details[GNUNET_NZL (reserves_length)];
+  const char *exchange_account_names[GNUNET_NZL (reserves_length)];
+  uint64_t wire_references[GNUNET_NZL (reserves_length)];
+  uint64_t reserve_uuids[GNUNET_NZL (reserves_length)];
+  bool transaction_duplicates[GNUNET_NZL (reserves_length)];
+  bool conflicts[GNUNET_NZL (reserves_length)];
+  struct GNUNET_TIME_Timestamp reserve_expiration
+    = GNUNET_TIME_relative_to_timestamp (pg->idle_reserve_expiration_time);
+  struct GNUNET_TIME_Timestamp gc
+    = GNUNET_TIME_relative_to_timestamp (pg->legal_reserve_expiration_time);
+  enum GNUNET_DB_QueryStatus qs;
+  bool need_update;
+
+  for (unsigned int i = 0; i<reserves_length; i++)
+  {
+    const struct TALER_EXCHANGEDB_ReserveInInfo *reserve = &reserves[i];
+
+    TALER_payto_hash (reserve->sender_account_details,
+                      &h_paytos[i]);
+    notify_s[i] = compute_notify_on_reserve (reserve->reserve_pub);
+    reserve_pubs[i] = *reserve->reserve_pub;
+    balances[i] = *reserve->balance;
+    execution_times[i] = reserve->execution_time;
+    sender_account_details[i] = reserve->sender_account_details;
+    exchange_account_names[i] = reserve->exchange_account_name;
+    wire_references[i] = reserve->wire_reference;
+  }
+
+  /* NOTE: kind-of pointless to explicitly start a transaction here... */
+  if (GNUNET_OK !=
+      TEH_PG_preflight (pg))
+  {
+    GNUNET_break (0);
+    qs = GNUNET_DB_STATUS_HARD_ERROR;
+    goto finished;
+  }
+  if (GNUNET_OK !=
+      TEH_PG_start_read_committed (pg,
+                                   "READ_COMMITED"))
+  {
+    GNUNET_break (0);
+    qs = GNUNET_DB_STATUS_HARD_ERROR;
+    goto finished;
+  }
+  PREPARE (pg,
+           "reserves_insert_with_array",
+           "SELECT"
+           " transaction_duplicate"
+           ",ruuid"
+           " FROM exchange_do_array_reserves_insert"
+           " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);");
+  {
+    struct GNUNET_PQ_QueryParam params[] = {
+      GNUNET_PQ_query_param_timestamp (&gc),
+      GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+      GNUNET_PQ_query_param_array_auto_from_type (reserves_length,
+                                                  reserve_pubs,
+                                                  pg->conn),
+      GNUNET_PQ_query_param_array_uint64 (reserves_length,
+                                          wire_references,
+                                          pg->conn),
+      TALER_PQ_query_param_array_amount (
+        reserves_length,
+        balances,
+        pg->conn),
+      GNUNET_PQ_query_param_array_ptrs_string (
+        reserves_length,
+        (const char **) exchange_account_names,
+        pg->conn),
+      GNUNET_PQ_query_param_array_timestamp (
+        reserves_length,
+        execution_times,
+        pg->conn),
+      GNUNET_PQ_query_param_array_auto_from_type (
+        reserves_length,
+        h_paytos,
+        pg->conn),
+      GNUNET_PQ_query_param_array_ptrs_string (
+        reserves_length,
+        (const char **) sender_account_details,
+        pg->conn),
+      GNUNET_PQ_query_param_array_ptrs_string (
+        reserves_length,
+        (const char **) notify_s,
+        pg->conn),
+      GNUNET_PQ_query_param_end
+    };
+    struct Context ctx = {
+      .reserve_uuids = reserve_uuids,
+      .transaction_duplicates = transaction_duplicates,
+      .conflicts = conflicts,
+      .needs_update = false,
+      .status = GNUNET_OK
+    };
+
+    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                               "reserves_insert_with_array",
+                                               params,
+                                               &helper_cb,
+                                               &ctx);
+    GNUNET_PQ_cleanup_query_params_closures (params);
+    if ( (qs < 0) ||
+         (GNUNET_OK != ctx.status) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to insert into reserves (%d)\n",
+                  qs);
+      goto finished;
+    }
+    need_update = ctx.needs_update;
+  }
+
+  {
+    enum GNUNET_DB_QueryStatus cs;
+
+    cs = TEH_PG_commit (pg);
+    if (cs < 0)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to commit\n");
+      qs = cs;
+      goto finished;
+    }
+  }
+
+  for (unsigned int i = 0; i<reserves_length; i++)
+  {
+    if (transaction_duplicates[i])
+      dups++;
+    results[i] = transaction_duplicates[i]
+      ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+      : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+  }
+
+  if (! need_update)
+  {
+    qs = reserves_length;
+    goto finished;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Reserve update needed for some reserves in the batch\n");
+  PREPARE (pg,
+           "reserves_update",
+           "SELECT"
+           " out_duplicate AS duplicate "
+           "FROM exchange_do_batch_reserves_update"
+           " ($1,$2,$3,$4,$5,$6,$7);");
+
+  if (GNUNET_OK !=
+      TEH_PG_start (pg,
+                    "reserve-insert-continued"))
+  {
+    GNUNET_break (0);
+    qs = GNUNET_DB_STATUS_HARD_ERROR;
+    goto finished;
+  }
+
+  for (unsigned int i = 0; i<reserves_length; i++)
+  {
+    if (transaction_duplicates[i])
+      continue;
+    if (! conflicts[i])
+      continue;
+    {
+      bool duplicate;
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_auto_from_type (&reserve_pubs[i]),
+        GNUNET_PQ_query_param_timestamp (&reserve_expiration),
+        GNUNET_PQ_query_param_uint64 (&wire_references[i]),
+        TALER_PQ_query_param_amount (pg->conn,
+                                     &balances[i]),
+        GNUNET_PQ_query_param_string (exchange_account_names[i]),
+        GNUNET_PQ_query_param_auto_from_type (&h_paytos[i]),
+        GNUNET_PQ_query_param_string (notify_s[i]),
+        GNUNET_PQ_query_param_end
+      };
+      struct GNUNET_PQ_ResultSpec rs[] = {
+        GNUNET_PQ_result_spec_bool ("duplicate",
+                                    &duplicate),
+        GNUNET_PQ_result_spec_end
+      };
+      enum GNUNET_DB_QueryStatus qs;
+
+      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                     "reserves_update",
+                                                     params,
+                                                     rs);
+      if (qs < 0)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Failed to update reserves (%d)\n",
+                    qs);
+        results[i] = qs;
+        goto finished;
+      }
+      results[i] = duplicate
+          ? GNUNET_DB_STATUS_SUCCESS_NO_RESULTS
+          : GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+    }
+  }
+  {
+    enum GNUNET_DB_QueryStatus cs;
+
+    cs = TEH_PG_commit (pg);
+    if (cs < 0)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to commit\n");
+      qs = cs;
+      goto finished;
+    }
+  }
+finished:
+  for (unsigned int i = 0; i<reserves_length; i++)
+    GNUNET_free (notify_s[i]);
+  if (qs < 0)
+    return qs;
+  GNUNET_PQ_event_do_poll (pg->conn);
+  if (0 != dups)
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "%u/%u duplicates among incoming transactions. Try increasing WIREWATCH_IDLE_SLEEP_INTERVAL in the [exchange] configuration section (if this happens a lot).\n",
+                dups,
+                reserves_length);
+  return qs;
+}
diff --git a/src/exchangedb/pg_reserves_in_insert.h b/src/exchangedb/pg_reserves_in_insert.h
new file mode 100644
index 000000000..938df3adb
--- /dev/null
+++ b/src/exchangedb/pg_reserves_in_insert.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_in_insert.h
+ * @brief implementation of the reserves_in_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_RESERVES_IN_INSERT_H
+#define PG_RESERVES_IN_INSERT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Insert an incoming transaction into reserves.  New reserves are also
+ * created through this function. Runs its own transaction(s).
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserves array of reserves to insert
+ * @param reserves_length length of the @a reserves array
+ * @param[out] results set to query status per reserve, must be of length @a reserves_length
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_in_insert (
+  void *cls,
+  const struct TALER_EXCHANGEDB_ReserveInInfo *reserves,
+  unsigned int reserves_length,
+  enum GNUNET_DB_QueryStatus *results);
+
+
+#endif
diff --git a/src/exchangedb/pg_reserves_update.c b/src/exchangedb/pg_reserves_update.c
new file mode 100644
index 000000000..bfd32c6ce
--- /dev/null
+++ b/src/exchangedb/pg_reserves_update.c
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_update.c
+ * @brief Implementation of the reserves_update function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_reserves_update.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_update (void *cls,
+                        const struct TALER_EXCHANGEDB_Reserve *reserve)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&reserve->expiry),
+    GNUNET_PQ_query_param_timestamp (&reserve->gc),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 &reserve->balance),
+    GNUNET_PQ_query_param_auto_from_type (&reserve->pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "reserve_update",
+           "UPDATE reserves"
+           " SET"
+           " expiration_date=$1"
+           ",gc_date=$2"
+           ",current_balance=$3"
+           " WHERE reserve_pub=$4;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "reserve_update",
+                                             params);
+}
diff --git a/src/exchangedb/pg_reserves_update.h b/src/exchangedb/pg_reserves_update.h
new file mode 100644
index 000000000..24cf671da
--- /dev/null
+++ b/src/exchangedb/pg_reserves_update.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_reserves_update.h
+ * @brief implementation of the reserves_update function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_RESERVES_UPDATE_H
+#define PG_RESERVES_UPDATE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Updates a reserve with the data from the given reserve structure.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param reserve the reserve structure whose data will be used to update the
+ *          corresponding record in the database.
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_reserves_update (void *cls,
+                        const struct TALER_EXCHANGEDB_Reserve *reserve);
+
+#endif
diff --git a/src/exchangedb/pg_rollback.c b/src/exchangedb/pg_rollback.c
new file mode 100644
index 000000000..3610487f3
--- /dev/null
+++ b/src/exchangedb/pg_rollback.c
@@ -0,0 +1,50 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_rollback.c
+ * @brief Implementation of the rollback function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_rollback.h"
+#include "pg_helper.h"
+
+
+void
+TEH_PG_rollback (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("ROLLBACK"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  if (NULL == pg->transaction_name)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Skipping rollback, no transaction active\n");
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Rolling back transaction\n");
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_PQ_exec_statements (pg->conn,
+                                           es));
+  pg->transaction_name = NULL;
+}
diff --git a/src/exchangedb/pg_rollback.h b/src/exchangedb/pg_rollback.h
new file mode 100644
index 000000000..ddb9e4111
--- /dev/null
+++ b/src/exchangedb/pg_rollback.h
@@ -0,0 +1,36 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_rollback.h
+ * @brief implementation of the rollback function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ROLLBACK_H
+#define PG_ROLLBACK_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Roll back the current transaction of a database connection.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ */
+void
+TEH_PG_rollback (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_account_merges_above_serial_id.c b/src/exchangedb/pg_select_account_merges_above_serial_id.c
new file mode 100644
index 000000000..6c3c81121
--- /dev/null
+++ b/src/exchangedb/pg_select_account_merges_above_serial_id.c
@@ -0,0 +1,192 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_account_merges_above_serial_id.c
+ * @brief Implementation of the select_account_merges_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_account_merges_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #account_merge_serial_helper_cb().
+ */
+struct AccountMergeSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_AccountMergeCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct AccountMergeSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+account_merge_serial_helper_cb (void *cls,
+                                PGresult *result,
+                                unsigned int num_results)
+{
+  struct AccountMergeSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    struct GNUNET_TIME_Timestamp purse_expiration;
+    struct TALER_Amount amount;
+    uint32_t min_age;
+    uint32_t flags32;
+    enum TALER_WalletAccountMergeFlags flags;
+    struct TALER_Amount purse_fee;
+    struct GNUNET_TIME_Timestamp merge_timestamp;
+    struct TALER_ReserveSignatureP reserve_sig;
+    uint64_t rowid;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
+                                   &purse_fee),
+      GNUNET_PQ_result_spec_uint32 ("flags",
+                                    &flags32),
+      GNUNET_PQ_result_spec_uint32 ("age_limit",
+                                    &min_age),
+      GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                       &purse_expiration),
+      GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
+                                       &merge_timestamp),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &h_contract_terms),
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                            &reserve_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_uint64 ("account_merge_request_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    flags = (enum TALER_WalletAccountMergeFlags) flags32;
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &reserve_pub,
+                   &purse_pub,
+                   &h_contract_terms,
+                   purse_expiration,
+                   &amount,
+                   min_age,
+                   flags,
+                   &purse_fee,
+                   merge_timestamp,
+                   &reserve_sig);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_account_merges_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_AccountMergeCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct AccountMergeSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_account_merge_incr",
+           "SELECT"
+           " am.account_merge_request_serial_id"
+           ",am.reserve_pub"
+           ",am.purse_pub"
+           ",pr.h_contract_terms"
+           ",pr.purse_expiration"
+           ",pr.amount_with_fee"
+           ",pr.age_limit"
+           ",pr.flags"
+           ",pr.purse_fee"
+           ",pm.merge_timestamp"
+           ",am.reserve_sig"
+           " FROM account_merges am"
+           " JOIN purse_requests pr USING (purse_pub)"
+           " JOIN purse_merges pm USING (purse_pub)"
+           " WHERE ("
+           "  (account_merge_request_serial_id>=$1)"
+           " )"
+           " ORDER BY account_merge_request_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_account_merge_incr",
+                                             params,
+                                             &account_merge_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_account_merges_above_serial_id.h b/src/exchangedb/pg_select_account_merges_above_serial_id.h
new file mode 100644
index 000000000..be3bd7124
--- /dev/null
+++ b/src/exchangedb/pg_select_account_merges_above_serial_id.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_account_merges_above_serial_id.h
+ * @brief implementation of the select_account_merges_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_ACCOUNT_MERGES_ABOVE_SERIAL_ID_H
+#define PG_SELECT_ACCOUNT_MERGES_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select account merges above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_account_merges_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_AccountMergeCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.c b/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.c
new file mode 100644
index 000000000..0d5d0ee25
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.c
@@ -0,0 +1,154 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregation_amounts_for_kyc_check.c
+ * @brief Implementation of the select_aggregation_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aggregation_amounts_for_kyc_check.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_kyc_amounts_cb().
+ */
+struct KycAmountCheckContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_KycAmountCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct KycAmountCheckContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_kyc_amounts_cb (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct KycAmountCheckContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct GNUNET_TIME_Absolute date;
+    struct TALER_Amount amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_absolute_time ("date",
+                                           &date),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = ctx->cb (ctx->cb_cls,
+                   &amount,
+                   date);
+    GNUNET_PQ_cleanup_result (rs);
+    switch (ret)
+    {
+    case GNUNET_OK:
+      continue;
+    case GNUNET_NO:
+      break;
+    case GNUNET_SYSERR:
+      ctx->status = GNUNET_SYSERR;
+      break;
+    }
+    break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregation_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&time_limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct KycAmountCheckContext ctx = {
+    .cb = kac,
+    .cb_cls = kac_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "select_kyc_relevant_aggregation_events",
+           "SELECT"
+           " amount"
+           ",execution_date AS date"
+           " FROM wire_out"
+           " WHERE wire_target_h_payto=$1"
+           "   AND execution_date >= $2"
+           " ORDER BY execution_date DESC");
+
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "select_kyc_relevant_aggregation_events",
+    params,
+    &get_kyc_amounts_cb,
+    &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.h b/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.h
new file mode 100644
index 000000000..b91740581
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregation_amounts_for_kyc_check.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregation_amounts_for_kyc_check.h
+ * @brief implementation of the select_aggregation_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AGGREGATION_AMOUNTS_FOR_KYC_CHECK_H
+#define PG_SELECT_AGGREGATION_AMOUNTS_FOR_KYC_CHECK_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Call @a kac on deposited amounts after @a time_limit which are relevant for a
+ * KYC trigger for a the (credited) account identified by @a h_payto.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param time_limit oldest transaction that could be relevant
+ * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+ * @param kac_cls closure for @a kac
+ * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregation_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_aggregation_transient.c b/src/exchangedb/pg_select_aggregation_transient.c
new file mode 100644
index 000000000..f9b6193ed
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregation_transient.c
@@ -0,0 +1,66 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregation_transient.c
+ * @brief Implementation of the select_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aggregation_transient.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const char *exchange_account_section,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  struct TALER_Amount *total)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+    GNUNET_PQ_query_param_string (exchange_account_section),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                 total),
+    GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
+                                          wtid),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_select_aggregation_transient() */
+  PREPARE (pg,
+           "select_aggregation_transient",
+           "SELECT"
+           "  amount"
+           " ,wtid_raw"
+           " FROM aggregation_transient"
+           " WHERE wire_target_h_payto=$1"
+           "   AND merchant_pub=$2"
+           "   AND exchange_account_section=$3;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_aggregation_transient",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_aggregation_transient.h b/src/exchangedb/pg_select_aggregation_transient.h
new file mode 100644
index 000000000..fd82a97aa
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregation_transient.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregation_transient.h
+ * @brief implementation of the select_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AGGREGATION_TRANSIENT_H
+#define PG_SELECT_AGGREGATION_TRANSIENT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Find existing entry in the transient aggregation table.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param merchant_pub public key of the merchant receiving the transfer
+ * @param exchange_account_section exchange account to use
+ * @param[out] wtid set to the raw wire transfer identifier to be used
+ * @param[out] total existing amount to be wired in the future
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const char *exchange_account_section,
+  struct TALER_WireTransferIdentifierRawP *wtid,
+  struct TALER_Amount *total);
+#endif
diff --git a/src/exchangedb/pg_select_aggregations_above_serial.c b/src/exchangedb/pg_select_aggregations_above_serial.c
new file mode 100644
index 000000000..52d202702
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregations_above_serial.c
@@ -0,0 +1,137 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregations_above_serial.c
+ * @brief Implementation of the select_aggregations_above_serial function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aggregations_above_serial.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #aggregation_serial_helper_cb().
+ */
+struct AggregationSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_AggregationCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct AggregationSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+aggregation_serial_helper_cb (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct AggregationSerialContext *dsc = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t tracking_rowid;
+    uint64_t batch_deposit_serial_id;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id",
+                                    &tracking_rowid),
+      GNUNET_PQ_result_spec_uint64 ("batch_deposit_serial_id",
+                                    &batch_deposit_serial_id),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    dsc->cb (dsc->cb_cls,
+             tracking_rowid,
+             batch_deposit_serial_id);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregations_above_serial (
+  void *cls,
+  uint64_t min_tracking_serial_id,
+  TALER_EXCHANGEDB_AggregationCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&min_tracking_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct AggregationSerialContext asc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  /* Fetch aggregations with rowid '\geq' the given parameter */
+  PREPARE (pg,
+           "select_aggregations_above_serial",
+           "SELECT"
+           " aggregation_serial_id"
+           ",batch_deposit_serial_id"
+           " FROM aggregation_tracking"
+           " WHERE aggregation_serial_id>=$1"
+           " ORDER BY aggregation_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "select_aggregations_above_serial",
+                                             params,
+                                             &aggregation_serial_helper_cb,
+                                             &asc);
+  if (GNUNET_OK != asc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_aggregations_above_serial.h b/src/exchangedb/pg_select_aggregations_above_serial.h
new file mode 100644
index 000000000..2883b19f2
--- /dev/null
+++ b/src/exchangedb/pg_select_aggregations_above_serial.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aggregations_above_serial.h
+ * @brief implementation of the select_aggregations_above_serial function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AGGREGATIONS_ABOVE_SERIAL_H
+#define PG_SELECT_AGGREGATIONS_ABOVE_SERIAL_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select all aggregation tracking IDs in the database
+ * above a given @a min_tracking_serial_id.
+ *
+ * @param cls closure
+ * @param min_tracking_serial_id only return entries strictly above this row (and in order)
+ * @param cb function to call on all such aggregations
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aggregations_above_serial (
+  void *cls,
+  uint64_t min_tracking_serial_id,
+  TALER_EXCHANGEDB_AggregationCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.c b/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.c
new file mode 100644
index 000000000..ba3307690
--- /dev/null
+++ b/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.c
@@ -0,0 +1,146 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_all_purse_decisions_above_serial_id.c
+ * @brief Implementation of the select_all_purse_decisions_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_all_purse_decisions_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #all_purse_decision_serial_helper_cb().
+ */
+struct AllPurseDecisionSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_AllPurseDecisionCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseRefundSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+all_purse_decision_serial_helper_cb (void *cls,
+                                     PGresult *result,
+                                     unsigned int num_results)
+{
+  struct AllPurseDecisionSerialContext *dsc = cls;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    bool refunded;
+    uint64_t rowid;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      GNUNET_PQ_result_spec_bool ("refunded",
+                                  &refunded),
+      GNUNET_PQ_result_spec_uint64 ("purse_decision_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &purse_pub,
+                   refunded);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_all_purse_decisions_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_AllPurseDecisionCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct AllPurseDecisionSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_all_purse_decision_incr",
+           "SELECT"
+           " purse_pub"
+           ",refunded"
+           ",purse_decision_serial_id"
+           " FROM purse_decision"
+           " WHERE purse_decision_serial_id>=$1"
+           " ORDER BY purse_decision_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "audit_get_all_purse_decision_incr",
+    params,
+    &all_purse_decision_serial_helper_cb,
+    &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.h b/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.h
new file mode 100644
index 000000000..634be4965
--- /dev/null
+++ b/src/exchangedb/pg_select_all_purse_decisions_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_all_purse_decisions_above_serial_id.h
+ * @brief implementation of the select_all_purse_decisions_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_ALL_PURSE_DECISIONS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_ALL_PURSE_DECISIONS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select purse decisions above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_all_purse_decisions_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_AllPurseDecisionCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_aml_history.c b/src/exchangedb/pg_select_aml_history.c
new file mode 100644
index 000000000..0461e0d9b
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_history.c
@@ -0,0 +1,157 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_history.c
+ * @brief Implementation of the select_aml_history function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aml_history.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #handle_aml_result.
+ */
+struct AmlHistoryResultContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_AmlHistoryCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on serious errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.  Helper function
+ * for #TEH_PG_select_aml_history().
+ *
+ * @param cls closure of type `struct AmlHistoryResultContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+handle_aml_result (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct AmlHistoryResultContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_Amount new_threshold;
+    uint32_t ns;
+    struct GNUNET_TIME_Timestamp decision_time;
+    char *justification;
+    struct TALER_AmlOfficerPublicKeyP decider_pub;
+    struct TALER_AmlOfficerSignatureP decider_sig;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("new_threshold",
+                                   &new_threshold),
+      GNUNET_PQ_result_spec_uint32 ("new_status",
+                                    &ns),
+      GNUNET_PQ_result_spec_timestamp ("decision_time",
+                                       &decision_time),
+      GNUNET_PQ_result_spec_string ("justification",
+                                    &justification),
+      GNUNET_PQ_result_spec_auto_from_type ("decider_pub",
+                                            &decider_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("decider_sig",
+                                            &decider_sig),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             &new_threshold,
+             (enum TALER_AmlDecisionState) ns,
+             decision_time,
+             justification,
+             &decider_pub,
+             &decider_sig);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_history (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_AmlHistoryCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct AmlHistoryResultContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "lookup_aml_history",
+           "SELECT"
+           " new_threshold"
+           ",new_status"
+           ",decision_time"
+           ",justification"
+           ",decider_pub"
+           ",decider_sig"
+           " FROM aml_history"
+           " WHERE h_payto=$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "lookup_aml_history",
+                                             params,
+                                             &handle_aml_result,
+                                             &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_aml_history.h b/src/exchangedb/pg_select_aml_history.h
new file mode 100644
index 000000000..78569947f
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_history.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_history.h
+ * @brief implementation of the select_aml_history function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AML_HISTORY_H
+#define PG_SELECT_AML_HISTORY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup AML decision history for a particular account.
+ *
+ * @param cls closure
+ * @param h_payto which account should we return the AML decision history for
+ * @param cb callback to invoke on each match
+ * @param cb_cls closure for @a cb
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_history (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_AmlHistoryCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_aml_process.c b/src/exchangedb/pg_select_aml_process.c
new file mode 100644
index 000000000..c34cae4bb
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_process.c
@@ -0,0 +1,170 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_process.c
+ * @brief Implementation of the select_aml_process function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aml_process.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #handle_aml_result.
+ */
+struct AmlProcessResultContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_AmlStatusCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on serious errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.  Helper function
+ * for #TEH_PG_select_aml_process().
+ *
+ * @param cls closure of type `struct AmlProcessResultContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+handle_aml_result (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct AmlProcessResultContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_PaytoHashP h_payto;
+    struct TALER_Amount threshold;
+    uint64_t rowid;
+    uint32_t sv;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("aml_status_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_auto_from_type ("h_payto",
+                                            &h_payto),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("threshold",
+                                   &threshold),
+      GNUNET_PQ_result_spec_uint32 ("status",
+                                    &sv),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             rowid,
+             &h_payto,
+             &threshold,
+             (enum TALER_AmlDecisionState) sv);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_process (
+  void *cls,
+  enum TALER_AmlDecisionState decision,
+  uint64_t row_off,
+  uint64_t limit,
+  bool forward,
+  TALER_EXCHANGEDB_AmlStatusCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint32 (&decision),
+    GNUNET_PQ_query_param_uint64 (&row_off),
+    GNUNET_PQ_query_param_uint64 (&limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct AmlProcessResultContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+  const char *stmt = forward
+    ? "select_aml_process_inc"
+    : "select_aml_process_dec";
+
+  PREPARE (pg,
+           "select_aml_process_inc",
+           "SELECT"
+           " aml_status_serial_id"
+           ",h_payto"
+           ",threshold"
+           ",status"
+           " FROM aml_status"
+           " WHERE aml_status_serial_id > $2"
+           "   AND status = $1"
+           " ORDER BY aml_status_serial_id ASC"
+           " LIMIT $3");
+  PREPARE (pg,
+           "select_aml_process_dec",
+           "SELECT"
+           " aml_status_serial_id"
+           ",h_payto"
+           ",threshold"
+           ",status"
+           " FROM aml_status"
+           " WHERE aml_status_serial_id < $2"
+           "   AND status = $1"
+           " ORDER BY aml_status_serial_id DESC"
+           " LIMIT $3");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             stmt,
+                                             params,
+                                             &handle_aml_result,
+                                             &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_aml_process.h b/src/exchangedb/pg_select_aml_process.h
new file mode 100644
index 000000000..648cace2e
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_process.h
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_process.h
+ * @brief implementation of the select_aml_process function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AML_PROCESS_H
+#define PG_SELECT_AML_PROCESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup AML decisions that have a particular state.
+ *
+ * @param cls closure
+ * @param decision which decision states to filter by
+ * @param row_off offset to start from
+ * @param limit how many rows to return at most
+ * @param forward true to go forward in time, false to go backwards
+ * @param cb callback to invoke on each match
+ * @param cb_cls closure for @a cb
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_process (
+  void *cls,
+  enum TALER_AmlDecisionState decision,
+  uint64_t row_off,
+  uint64_t limit,
+  bool forward,
+  TALER_EXCHANGEDB_AmlStatusCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_aml_threshold.c b/src/exchangedb/pg_select_aml_threshold.c
new file mode 100644
index 000000000..23286f029
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_threshold.c
@@ -0,0 +1,70 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_threshold.c
+ * @brief Implementation of the select_aml_threshold function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_aml_threshold.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_threshold (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState *decision,
+  struct TALER_EXCHANGEDB_KycStatus *kyc,
+  struct TALER_Amount *threshold)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  uint32_t status32 = TALER_AML_NORMAL;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_RESULT_SPEC_AMOUNT ("threshold",
+                                 threshold),
+    GNUNET_PQ_result_spec_uint32 ("status",
+                                  &status32),
+    GNUNET_PQ_result_spec_uint64 ("kyc_requirement",
+                                  &kyc->requirement_row),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "select_aml_threshold",
+           "SELECT"
+           " threshold"
+           ",status"
+           ",kyc_requirement"
+           " FROM aml_status"
+           " WHERE h_payto=$1;");
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "select_aml_threshold",
+                                                 params,
+                                                 rs);
+  *decision = (enum TALER_AmlDecisionState) status32;
+  kyc->ok = (TALER_AML_FROZEN != *decision)
+            || (0 != kyc->requirement_row);
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_aml_threshold.h b/src/exchangedb/pg_select_aml_threshold.h
new file mode 100644
index 000000000..8f0e3bcfc
--- /dev/null
+++ b/src/exchangedb/pg_select_aml_threshold.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_aml_threshold.h
+ * @brief implementation of the select_aml_threshold function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AML_THRESHOLD_H
+#define PG_SELECT_AML_THRESHOLD_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Obtain the current AML threshold set for an account.
+ *
+ * @param cls closure
+ * @param h_payto account for which the AML threshold is stored
+ * @param[out] decision set to current AML decision
+ * @param[out] kyc set to KYC requirements imposed by AML, if any
+ * @param[out] threshold set to the existing threshold
+ * @return database transaction status, 0 if no threshold was set
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_aml_threshold (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState *decision,
+  struct TALER_EXCHANGEDB_KycStatus *kyc,
+  struct TALER_Amount *threshold);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_auditor_denom_sig.c b/src/exchangedb/pg_select_auditor_denom_sig.c
new file mode 100644
index 000000000..1dd6bd3d1
--- /dev/null
+++ b/src/exchangedb/pg_select_auditor_denom_sig.c
@@ -0,0 +1,66 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_auditor_denom_sig.c
+ * @brief Implementation of the select_auditor_denom_sig function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_auditor_denom_sig.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_auditor_denom_sig (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  struct TALER_AuditorSignatureP *auditor_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("auditor_sig",
+                                          auditor_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "select_auditor_denom_sig",
+           "SELECT"
+           " auditor_sig"
+           " FROM auditor_denom_sigs"
+           " WHERE auditor_uuid="
+           "  (SELECT auditor_uuid"
+           "    FROM auditors"
+           "    WHERE auditor_pub=$1)"
+           " AND denominations_serial="
+           "  (SELECT denominations_serial"
+           "    FROM denominations"
+           "    WHERE denom_pub_hash=$2);");
+
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_auditor_denom_sig",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_auditor_denom_sig.h b/src/exchangedb/pg_select_auditor_denom_sig.h
new file mode 100644
index 000000000..0f635cf42
--- /dev/null
+++ b/src/exchangedb/pg_select_auditor_denom_sig.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_auditor_denom_sig.h
+ * @brief implementation of the select_auditor_denom_sig function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_AUDITOR_DENOM_SIG_H
+#define PG_SELECT_AUDITOR_DENOM_SIG_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Select information about an auditor auditing a denomination key.
+ *
+ * @param cls closure
+ * @param h_denom_pub the audited denomination
+ * @param auditor_pub the auditor's key
+ * @param[out] auditor_sig set to signature affirming the auditor's audit activity
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_auditor_denom_sig (
+  void *cls,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AuditorPublicKeyP *auditor_pub,
+  struct TALER_AuditorSignatureP *auditor_sig);
+
+#endif
diff --git a/src/exchangedb/pg_select_batch_deposits_missing_wire.c b/src/exchangedb/pg_select_batch_deposits_missing_wire.c
new file mode 100644
index 000000000..8f966326a
--- /dev/null
+++ b/src/exchangedb/pg_select_batch_deposits_missing_wire.c
@@ -0,0 +1,144 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_batch_deposits_missing_wire.c
+ * @brief Implementation of the select_batch_deposits_missing_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_batch_deposits_missing_wire.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #missing_wire_cb().
+ */
+struct MissingWireContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_WireMissingCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct MissingWireContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+missing_wire_cb (void *cls,
+                 PGresult *result,
+                 unsigned int num_results)
+{
+  struct MissingWireContext *mwc = cls;
+  struct PostgresClosure *pg = mwc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t batch_deposit_serial_id;
+    struct GNUNET_TIME_Timestamp deadline;
+    struct TALER_PaytoHashP wire_target_h_payto;
+    struct TALER_Amount total_amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("batch_deposit_serial_id",
+                                    &batch_deposit_serial_id),
+      GNUNET_PQ_result_spec_auto_from_type ("wire_target_h_payto",
+                                            &wire_target_h_payto),
+      GNUNET_PQ_result_spec_timestamp ("deadline",
+                                       &deadline),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("total_amount",
+                                   &total_amount),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      mwc->status = GNUNET_SYSERR;
+      return;
+    }
+    mwc->cb (mwc->cb_cls,
+             batch_deposit_serial_id,
+             &total_amount,
+             &wire_target_h_payto,
+             deadline);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_batch_deposits_missing_wire (
+  void *cls,
+  uint64_t min_batch_deposit_serial_id,
+  TALER_EXCHANGEDB_WireMissingCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&min_batch_deposit_serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct MissingWireContext mwc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "deposits_get_deposits_missing_wire",
+           "SELECT"
+           " batch_deposit_serial_id"
+           ",wire_target_h_payto"
+           ",deadline"
+           ",total_amount"
+           " FROM exchange_do_select_deposits_missing_wire"
+           " ($1);");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "deposits_get_deposits_missing_wire",
+                                             params,
+                                             &missing_wire_cb,
+                                             &mwc);
+  if (GNUNET_OK != mwc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_batch_deposits_missing_wire.h b/src/exchangedb/pg_select_batch_deposits_missing_wire.h
new file mode 100644
index 000000000..16f1d0cb3
--- /dev/null
+++ b/src/exchangedb/pg_select_batch_deposits_missing_wire.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_batch_deposits_missing_wire.h
+ * @brief implementation of the select_batch_deposits_missing_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_DEPOSITS_MISSING_WIRE_H
+#define PG_SELECT_DEPOSITS_MISSING_WIRE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Select all of those batch deposits in the database
+ * above the given serial ID.
+ *
+ * @param cls closure
+ * @param min_batch_deposit_serial_id select all batch deposits above this ID
+ * @param cb function to call on all such deposits
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_batch_deposits_missing_wire (
+  void *cls,
+  uint64_t min_batch_deposit_serial_id,
+  TALER_EXCHANGEDB_WireMissingCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_coin_deposits_above_serial_id.c b/src/exchangedb/pg_select_coin_deposits_above_serial_id.c
new file mode 100644
index 000000000..000b908ed
--- /dev/null
+++ b/src/exchangedb/pg_select_coin_deposits_above_serial_id.c
@@ -0,0 +1,204 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_coin_deposits_above_serial_id.c
+ * @brief Implementation of the select_coin_deposits_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_coin_deposits_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #deposit_serial_helper_cb().
+ */
+struct CoinDepositSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_DepositCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct CoinDepositSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+coin_deposit_serial_helper_cb (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct CoinDepositSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_Deposit deposit;
+    struct GNUNET_TIME_Timestamp exchange_timestamp;
+    struct TALER_DenominationPublicKey denom_pub;
+    bool done;
+    uint64_t rowid;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &deposit.amount_with_fee),
+      GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
+                                       &deposit.timestamp),
+      GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
+                                       &exchange_timestamp),
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                            &deposit.merchant_pub),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &deposit.coin.coin_pub),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                              &deposit.coin.h_age_commitment),
+        &deposit.coin.no_age_commitment),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("wallet_data_hash",
+                                              &deposit.wallet_data_hash),
+        &deposit.no_wallet_data_hash),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &deposit.csig),
+      GNUNET_PQ_result_spec_timestamp ("refund_deadline",
+                                       &deposit.refund_deadline),
+      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
+                                       &deposit.wire_deadline),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &deposit.h_contract_terms),
+      GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
+                                            &deposit.wire_salt),
+      GNUNET_PQ_result_spec_string ("receiver_wire_account",
+                                    &deposit.receiver_wire_account),
+      GNUNET_PQ_result_spec_bool ("done",
+                                  &done),
+      GNUNET_PQ_result_spec_uint64 ("coin_deposit_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    memset (&deposit,
+            0,
+            sizeof (deposit));
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   exchange_timestamp,
+                   &deposit,
+                   &denom_pub,
+                   done);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_coin_deposits_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_DepositCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct CoinDepositSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  /* Fetch deposits with rowid '\geq' the given parameter */
+  PREPARE (pg,
+           "audit_get_coin_deposits_incr",
+           "SELECT"
+           " cdep.amount_with_fee"
+           ",bdep.wallet_timestamp"
+           ",bdep.exchange_timestamp"
+           ",bdep.merchant_pub"
+           ",bdep.wallet_data_hash"
+           ",denom.denom_pub"
+           ",kc.coin_pub"
+           ",kc.age_commitment_hash"
+           ",cdep.coin_sig"
+           ",bdep.refund_deadline"
+           ",bdep.wire_deadline"
+           ",bdep.h_contract_terms"
+           ",bdep.wire_salt"
+           ",wt.payto_uri AS receiver_wire_account"
+           ",bdep.done"
+           ",cdep.coin_deposit_serial_id"
+           " FROM coin_deposits cdep"
+           " JOIN batch_deposits bdep"
+           "   USING (batch_deposit_serial_id)"
+           " JOIN wire_targets wt"
+           "   USING (wire_target_h_payto)"
+           " JOIN known_coins kc"
+           "   USING (coin_pub)"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " WHERE (coin_deposit_serial_id>=$1)"
+           " ORDER BY coin_deposit_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_coin_deposits_incr",
+                                             params,
+                                             &coin_deposit_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_coin_deposits_above_serial_id.h b/src/exchangedb/pg_select_coin_deposits_above_serial_id.h
new file mode 100644
index 000000000..5202336a4
--- /dev/null
+++ b/src/exchangedb/pg_select_coin_deposits_above_serial_id.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_coin_deposits_above_serial_id.h
+ * @brief implementation of the select_coin_deposits_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_DEPOSITS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_DEPOSITS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Select deposits above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_coin_deposits_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_DepositCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_contract.c b/src/exchangedb/pg_select_contract.c
new file mode 100644
index 000000000..3e6bf22bc
--- /dev/null
+++ b/src/exchangedb/pg_select_contract.c
@@ -0,0 +1,66 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_contract.c
+ * @brief Implementation of the select_contract function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_contract.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_contract (void *cls,
+                        const struct TALER_ContractDiffiePublicP *pub_ckey,
+                        struct TALER_PurseContractPublicKeyP *purse_pub,
+                        struct TALER_PurseContractSignatureP *econtract_sig,
+                        size_t *econtract_size,
+                        void **econtract)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (pub_ckey),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                          purse_pub),
+    GNUNET_PQ_result_spec_auto_from_type ("contract_sig",
+                                          econtract_sig),
+    GNUNET_PQ_result_spec_variable_size ("e_contract",
+                                         econtract,
+                                         econtract_size),
+    GNUNET_PQ_result_spec_end
+  };
+
+  /* Used in #postgres_select_contract */
+  PREPARE (pg,
+           "select_contract",
+           "SELECT "
+           " purse_pub"
+           ",e_contract"
+           ",contract_sig"
+           " FROM contracts"
+           "   WHERE pub_ckey=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_contract",
+                                                   params,
+                                                   rs);
+
+}
diff --git a/src/exchangedb/pg_select_contract.h b/src/exchangedb/pg_select_contract.h
new file mode 100644
index 000000000..747a82753
--- /dev/null
+++ b/src/exchangedb/pg_select_contract.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_contract.h
+ * @brief implementation of the select_contract function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_CONTRACT_H
+#define PG_SELECT_CONTRACT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to retrieve an encrypted contract.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub key to lookup the contract by
+ * @param[out] pub_ckey set to the ephemeral DH used to encrypt the contract
+ * @param[out] econtract_sig set to the signature over the encrypted contract
+ * @param[out] econtract_size set to the number of bytes in @a econtract
+ * @param[out] econtract set to the encrypted contract on success, to be freed by the caller
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_contract (void *cls,
+                        const struct TALER_ContractDiffiePublicP *pub_ckey,
+                        struct TALER_PurseContractPublicKeyP *purse_pub,
+                        struct TALER_PurseContractSignatureP *econtract_sig,
+                        size_t *econtract_size,
+                        void **econtract);
+
+#endif
diff --git a/src/exchangedb/pg_select_contract_by_purse.c b/src/exchangedb/pg_select_contract_by_purse.c
new file mode 100644
index 000000000..8d29b3954
--- /dev/null
+++ b/src/exchangedb/pg_select_contract_by_purse.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_contract_by_purse.c
+ * @brief Implementation of the select_contract_by_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_contract_by_purse.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_contract_by_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_EncryptedContract *econtract)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("pub_ckey",
+                                          &econtract->contract_pub),
+    GNUNET_PQ_result_spec_auto_from_type ("contract_sig",
+                                          &econtract->econtract_sig),
+    GNUNET_PQ_result_spec_variable_size ("e_contract",
+                                         &econtract->econtract,
+                                         &econtract->econtract_size),
+    GNUNET_PQ_result_spec_end
+  };
+  /* Used in #postgres_select_contract_by_purse */
+  PREPARE (pg,
+           "select_contract_by_purse",
+           "SELECT "
+           " pub_ckey"
+           ",e_contract"
+           ",contract_sig"
+           " FROM contracts"
+           "   WHERE purse_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_contract_by_purse",
+                                                   params,
+                                                   rs);
+
+}
diff --git a/src/exchangedb/pg_select_contract_by_purse.h b/src/exchangedb/pg_select_contract_by_purse.h
new file mode 100644
index 000000000..0e33a6ba1
--- /dev/null
+++ b/src/exchangedb/pg_select_contract_by_purse.h
@@ -0,0 +1,42 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_contract_by_purse.h
+ * @brief implementation of the select_contract_by_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_CONTRACT_BY_PURSE_H
+#define PG_SELECT_CONTRACT_BY_PURSE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to retrieve an encrypted contract.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub key to lookup the contract by
+ * @param[out] econtract set to the encrypted contract on success, to be freed by the caller
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_contract_by_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_EncryptedContract *econtract);
+#endif
diff --git a/src/exchangedb/pg_select_justification_for_missing_wire.c b/src/exchangedb/pg_select_justification_for_missing_wire.c
new file mode 100644
index 000000000..77d5b4de7
--- /dev/null
+++ b/src/exchangedb/pg_select_justification_for_missing_wire.c
@@ -0,0 +1,89 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_batch_deposits_missing_wire.c
+ * @brief Implementation of the select_batch_deposits_missing_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_batch_deposits_missing_wire.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_justification_for_missing_wire (
+  void *cls,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  char **payto_uri,
+  char **kyc_pending,
+  enum TALER_AmlDecisionState *status,
+  struct TALER_Amount *aml_limit)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now
+    = GNUNET_TIME_absolute_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (wire_target_h_payto),
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_end
+  };
+  uint32_t aml_status32;
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    payto_uri),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("kyc_pending",
+                                    kyc_pending),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_uint32 ("aml_status",
+                                    &aml_status32),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      TALER_PQ_RESULT_SPEC_AMOUNT ("aml_limit",
+                                   aml_limit),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "deposits_get_overdue",
+           "SELECT"
+           " out_payto_uri AS payto_uri"
+           ",out_kyc_pending AS kyc_pending"
+           ",out_deadline AS deadline"
+           ",out_aml_status AS aml_status"
+           ",out_aml_limit AS aml_limit"
+           " FROM exchange_do_select_justification_missing_wire"
+           " ($1, $2);");
+  memset (aml_limit,
+          0,
+          sizeof (*aml_limit));
+  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                 "",
+                                                 params,
+                                                 rs);
+  if (qs <= 0)
+    return qs;
+  *status = (enum TALER_AmlDecisionState) aml_status32;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_justification_for_missing_wire.h b/src/exchangedb/pg_select_justification_for_missing_wire.h
new file mode 100644
index 000000000..7f73eb511
--- /dev/null
+++ b/src/exchangedb/pg_select_justification_for_missing_wire.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_justification_for_missing_wire.h
+ * @brief implementation of the select_justification_for_missing_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_JUSTIFICATION_FOR_MISSING_WIRE_H
+#define PG_SELECT_JUSTIFICATION_FOR_MISSING_WIRE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select all of those justifications for why we might not have
+ * done a wire transfer from in the database for a particular target account.
+ *
+ * @param cls closure
+ * @param wire_target_h_payto effected target account
+ * @param[out] payto_uri target account URI, set to NULL if unknown
+ * @param[out] kyc_pending set to string describing missing KYC data
+ * @param[out] status set to AML status
+ * @param[out] aml_limit set to AML limit, or invalid amount for none
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_justification_for_missing_wire (
+  void *cls,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  char **payto_uri,
+  char **kyc_pending,
+  enum TALER_AmlDecisionState *status,
+  struct TALER_Amount *aml_limit);
+
+#endif
diff --git a/src/exchangedb/pg_select_kyc_attributes.c b/src/exchangedb/pg_select_kyc_attributes.c
new file mode 100644
index 000000000..99ac43b3e
--- /dev/null
+++ b/src/exchangedb/pg_select_kyc_attributes.c
@@ -0,0 +1,156 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_kyc_attributes.c
+ * @brief Implementation of the select_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_kyc_attributes.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_attributes_cb().
+ */
+struct GetAttributesContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_AttributeCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Key of our query.
+   */
+  const struct TALER_PaytoHashP *h_payto;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct GetAttributesContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_attributes_cb (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct GetAttributesContext *ctx = cls;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct GNUNET_TIME_Timestamp collection_time;
+    struct GNUNET_TIME_Timestamp expiration_time;
+    size_t enc_attributes_size;
+    void *enc_attributes;
+    char *provider;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_string ("provider",
+                                    &provider),
+      GNUNET_PQ_result_spec_timestamp ("collection_time",
+                                       &collection_time),
+      GNUNET_PQ_result_spec_timestamp ("expiration_time",
+                                       &expiration_time),
+      GNUNET_PQ_result_spec_variable_size ("encrypted_attributes",
+                                           &enc_attributes,
+                                           &enc_attributes_size),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             ctx->h_payto,
+             provider,
+             collection_time,
+             expiration_time,
+             enc_attributes_size,
+             enc_attributes);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_kyc_attributes (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_AttributeCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_end
+  };
+  struct GetAttributesContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .h_payto = h_payto,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "select_kyc_attributes",
+           "SELECT "
+           " provider"
+           ",collection_time"
+           ",expiration_time"
+           ",encrypted_attributes"
+           " FROM kyc_attributes"
+           " WHERE h_payto=$1");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "select_kyc_attributes",
+    params,
+    &get_attributes_cb,
+    &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_kyc_attributes.h b/src/exchangedb/pg_select_kyc_attributes.h
new file mode 100644
index 000000000..7458aefe8
--- /dev/null
+++ b/src/exchangedb/pg_select_kyc_attributes.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_kyc_attributes.h
+ * @brief implementation of the select_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_KYC_ATTRIBUTES_H
+#define PG_SELECT_KYC_ATTRIBUTES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup KYC attribute data for a specific account.
+ *
+ * @param cls closure
+ * @param h_payto account for which the attribute data is stored
+ * @param cb callback to invoke on each match
+ * @param cb_cls closure for @a cb
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_kyc_attributes (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_AttributeCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_merge_amounts_for_kyc_check.c b/src/exchangedb/pg_select_merge_amounts_for_kyc_check.c
new file mode 100644
index 000000000..417d78ec7
--- /dev/null
+++ b/src/exchangedb/pg_select_merge_amounts_for_kyc_check.c
@@ -0,0 +1,157 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_merge_amounts_for_kyc_check.c
+ * @brief Implementation of the select_merge_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_merge_amounts_for_kyc_check.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_kyc_amounts_cb().
+ */
+struct KycAmountCheckContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_KycAmountCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct KycAmountCheckContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_kyc_amounts_cb (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct KycAmountCheckContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct GNUNET_TIME_Absolute date;
+    struct TALER_Amount amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_absolute_time ("date",
+                                           &date),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = ctx->cb (ctx->cb_cls,
+                   &amount,
+                   date);
+    GNUNET_PQ_cleanup_result (rs);
+    switch (ret)
+    {
+    case GNUNET_OK:
+      continue;
+    case GNUNET_NO:
+      break;
+    case GNUNET_SYSERR:
+      ctx->status = GNUNET_SYSERR;
+      break;
+    }
+    break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_merge_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&time_limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct KycAmountCheckContext ctx = {
+    .cb = kac,
+    .cb_cls = kac_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+
+  PREPARE (pg,
+           "select_kyc_relevant_merge_events",
+           "SELECT"
+           " amount_with_fee AS amount"
+           ",merge_timestamp AS date"
+           " FROM account_merges"
+           " JOIN purse_merges USING (purse_pub)"
+           " JOIN purse_requests USING (purse_pub)"
+           " JOIN purse_decision USING (purse_pub)"
+           " WHERE wallet_h_payto=$1"
+           "   AND merge_timestamp >= $2"
+           "   AND NOT refunded"
+           " ORDER BY merge_timestamp DESC");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "select_kyc_relevant_merge_events",
+    params,
+    &get_kyc_amounts_cb,
+    &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_merge_amounts_for_kyc_check.h b/src/exchangedb/pg_select_merge_amounts_for_kyc_check.h
new file mode 100644
index 000000000..5d0a96359
--- /dev/null
+++ b/src/exchangedb/pg_select_merge_amounts_for_kyc_check.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_merge_amounts_for_kyc_check.h
+ * @brief implementation of the select_merge_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_MERGE_AMOUNTS_FOR_KYC_CHECK_H
+#define PG_SELECT_MERGE_AMOUNTS_FOR_KYC_CHECK_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Call @a kac on merged reserve amounts after @a time_limit which are relevant for a
+ * KYC trigger for a the wallet identified by @a h_payto.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param time_limit oldest transaction that could be relevant
+ * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+ * @param kac_cls closure for @a kac
+ * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_merge_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse.c b/src/exchangedb/pg_select_purse.c
new file mode 100644
index 000000000..ffccb905c
--- /dev/null
+++ b/src/exchangedb/pg_select_purse.c
@@ -0,0 +1,94 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse.c
+ * @brief Implementation of the select_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp *purse_creation,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_Amount *amount,
+  struct TALER_Amount *deposited,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp *merge_timestamp,
+  bool *purse_deleted,
+  bool *purse_refunded)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                     purse_expiration),
+    GNUNET_PQ_result_spec_timestamp ("purse_creation",
+                                     purse_creation),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 amount),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                 deposited),
+    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                          h_contract_terms),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
+                                       merge_timestamp),
+      NULL),
+    GNUNET_PQ_result_spec_bool ("purse_deleted",
+                                purse_deleted),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_bool ("purse_refunded",
+                                  purse_refunded),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "select_purse",
+           "SELECT "
+           " pr.merge_pub"
+           ",pr.purse_creation"
+           ",pr.purse_expiration"
+           ",pr.h_contract_terms"
+           ",pr.amount_with_fee"
+           ",pr.balance"
+           ",pm.merge_timestamp"
+           ",pd.purse_sig IS NOT NULL AS purse_deleted"
+           ",pc.refunded AS purse_refunded"
+           " FROM purse_requests pr"
+           " LEFT JOIN purse_merges pm ON (pm.purse_pub = pr.purse_pub)"
+           " LEFT JOIN purse_decision pc ON (pc.purse_pub = pr.purse_pub)"
+           " LEFT JOIN purse_deletion pd ON (pd.purse_pub = pr.purse_pub)"
+           " WHERE pr.purse_pub=$1;");
+  *merge_timestamp = GNUNET_TIME_UNIT_FOREVER_TS;
+  *purse_refunded = false;
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_purse",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_purse.h b/src/exchangedb/pg_select_purse.h
new file mode 100644
index 000000000..8f88c5cf7
--- /dev/null
+++ b/src/exchangedb/pg_select_purse.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse.h
+ * @brief implementation of the select_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_H
+#define PG_SELECT_PURSE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to obtain information about a purse.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the new purse
+ * @param[out] purse_creation set to time when the purse was created
+ * @param[out] purse_expiration set to time when the purse will expire
+ * @param[out] amount set to target amount (with fees) to be put into the purse
+ * @param[out] deposited set to actual amount put into the purse so far
+ * @param[out] h_contract_terms set to hash of the contract for the purse
+ * @param[out] merge_timestamp set to time when the purse was merged, or NEVER if not
+ * @param[out] purse_deleted set to true if purse was deleted
+ * @param[out] purse_refunded set to true if purse was refunded
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp *purse_creation,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_Amount *amount,
+  struct TALER_Amount *deposited,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp *merge_timestamp,
+  bool *purse_deleted,
+  bool *purse_refunded);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_by_merge_pub.c b/src/exchangedb/pg_select_purse_by_merge_pub.c
new file mode 100644
index 000000000..d035b3255
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_by_merge_pub.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_by_merge_pub.c
+ * @brief Implementation of the select_purse_by_merge_pub function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_by_merge_pub.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_by_merge_pub (
+  void *cls,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t *age_limit,
+  struct TALER_Amount *target_amount,
+  struct TALER_Amount *balance,
+  struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (merge_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                          purse_pub),
+    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                     purse_expiration),
+    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                          h_contract_terms),
+    GNUNET_PQ_result_spec_uint32 ("age_limit",
+                                  age_limit),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                 target_amount),
+    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                 balance),
+    GNUNET_PQ_result_spec_auto_from_type ("purse_sig",
+                                          purse_sig),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "select_purse_by_merge_pub",
+           "SELECT "
+           " purse_pub"
+           ",purse_expiration"
+           ",h_contract_terms"
+           ",age_limit"
+           ",amount_with_fee"
+           ",balance"
+           ",purse_sig"
+           " FROM purse_requests"
+           " WHERE merge_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_purse_by_merge_pub",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_purse_by_merge_pub.h b/src/exchangedb/pg_select_purse_by_merge_pub.h
new file mode 100644
index 000000000..2a7667132
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_by_merge_pub.h
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_by_merge_pub.h
+ * @brief implementation of the select_purse_by_merge_pub function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_BY_MERGE_PUB_H
+#define PG_SELECT_PURSE_BY_MERGE_PUB_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to return meta data about a purse by the
+ * merge capability key.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param merge_pub public key representing the merge capability
+ * @param[out] purse_pub public key of the purse
+ * @param[out] purse_expiration when would an unmerged purse expire
+ * @param[out] h_contract_terms contract associated with the purse
+ * @param[out] age_limit the age limit for deposits into the purse
+ * @param[out] target_amount amount to be put into the purse
+ * @param[out] balance amount put so far into the purse
+ * @param[out] purse_sig signature of the purse over the initialization data
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_by_merge_pub (
+  void *cls,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp *purse_expiration,
+  struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t *age_limit,
+  struct TALER_Amount *target_amount,
+  struct TALER_Amount *balance,
+  struct TALER_PurseContractSignatureP *purse_sig);
+#endif
diff --git a/src/exchangedb/pg_select_purse_decisions_above_serial_id.c b/src/exchangedb/pg_select_purse_decisions_above_serial_id.c
new file mode 100644
index 000000000..f301ea78a
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_decisions_above_serial_id.c
@@ -0,0 +1,162 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_decisions_above_serial_id.c
+ * @brief Implementation of the select_purse_decisions_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_decisions_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #purse_decision_serial_helper_cb().
+ */
+struct PurseDecisionSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_PurseDecisionCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseRefundSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_decision_serial_helper_cb (void *cls,
+                                 PGresult *result,
+                                 unsigned int num_results)
+{
+  struct PurseDecisionSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    bool no_reserve = true;
+    uint64_t rowid;
+    struct TALER_Amount val;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                              &reserve_pub),
+        &no_reserve),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &val),
+      GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &purse_pub,
+                   no_reserve ? NULL : &reserve_pub,
+                   &val);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_decisions_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  bool refunded,
+  TALER_EXCHANGEDB_PurseDecisionCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_bool (refunded),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseDecisionSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_purse_decisions_incr",
+           "SELECT"
+           " pd.purse_pub"
+           ",pm.reserve_pub"
+           ",pd.purse_decision_serial_id"
+           ",pr.amount_with_fee"
+           " FROM purse_decision pd"
+           " JOIN purse_requests pr ON (pd.purse_pub = pr.purse_pub)"
+           " LEFT JOIN purse_merges pm ON (pm.purse_pub = pd.purse_pub)"
+           " WHERE ("
+           "  (purse_decision_serial_id>=$1) AND "
+           "  (refunded=$2)"
+           " )"
+           " ORDER BY purse_decision_serial_id ASC;");
+
+
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_purse_decisions_incr",
+                                             params,
+                                             &purse_decision_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_purse_decisions_above_serial_id.h b/src/exchangedb/pg_select_purse_decisions_above_serial_id.h
new file mode 100644
index 000000000..83168d546
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_decisions_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_decisions_above_serial_id.h
+ * @brief implementation of the select_purse_decisions_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_DECISIONS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_PURSE_DECISIONS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select purse decisions above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param refunded which refund status to select for
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_decisions_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  bool refunded,
+  TALER_EXCHANGEDB_PurseDecisionCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_deposits_above_serial_id.c b/src/exchangedb/pg_select_purse_deposits_above_serial_id.c
new file mode 100644
index 000000000..bb4320663
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_deposits_above_serial_id.c
@@ -0,0 +1,201 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_deposits_above_serial_id.c
+ * @brief Implementation of the select_purse_deposits_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_deposits_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #purse_deposit_serial_helper_cb().
+ */
+struct PurseDepositSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_PurseDepositCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct DepositSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_deposit_serial_helper_cb (void *cls,
+                                PGresult *result,
+                                unsigned int num_results)
+{
+  struct PurseDepositSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_PurseDeposit deposit = {
+      .exchange_base_url = NULL
+    };
+    struct TALER_DenominationPublicKey denom_pub;
+    uint64_t rowid;
+    uint32_t flags32;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    bool not_merged = false;
+    struct TALER_Amount purse_balance;
+    struct TALER_Amount purse_total;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &deposit.amount),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                   &purse_balance),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("total",
+                                   &purse_total),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("deposit_fee",
+                                   &deposit.deposit_fee),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("partner_base_url",
+                                      &deposit.exchange_base_url),
+        NULL),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                              &reserve_pub),
+        &not_merged),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &deposit.purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &deposit.coin_sig),
+      GNUNET_PQ_result_spec_uint32 ("flags",
+                                    &flags32),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &deposit.coin_pub),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                              &deposit.h_age_commitment),
+        &deposit.no_age_commitment),
+      GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    memset (&deposit,
+            0,
+            sizeof (deposit));
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &deposit,
+                   not_merged ? NULL : &reserve_pub,
+                   (enum TALER_WalletAccountMergeFlags) flags32,
+                   &purse_balance,
+                   &purse_total,
+                   &denom_pub);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_deposits_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseDepositCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseDepositSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_purse_deposits_incr",
+           "SELECT"
+           " pd.amount_with_fee"
+           ",pr.amount_with_fee AS total"
+           ",pr.balance"
+           ",pr.flags"
+           ",pd.purse_pub"
+           ",pd.coin_sig"
+           ",partner_base_url"
+           ",denom.denom_pub"
+           ",pm.reserve_pub"
+           ",kc.coin_pub"
+           ",kc.age_commitment_hash"
+           ",pd.purse_deposit_serial_id"
+           " FROM purse_deposits pd"
+           " LEFT JOIN partners USING (partner_serial_id)"
+           " LEFT JOIN purse_merges pm USING (purse_pub)"
+           " JOIN purse_requests pr USING (purse_pub)"
+           " JOIN known_coins kc USING (coin_pub)"
+           " JOIN denominations denom USING (denominations_serial)"
+           " WHERE ("
+           "  (purse_deposit_serial_id>=$1)"
+           " )"
+           " ORDER BY purse_deposit_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_purse_deposits_incr",
+                                             params,
+                                             &purse_deposit_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_purse_deposits_above_serial_id.h b/src/exchangedb/pg_select_purse_deposits_above_serial_id.h
new file mode 100644
index 000000000..34d50b2ab
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_deposits_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_deposits_above_serial_id.h
+ * @brief implementation of the select_purse_deposits_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_DEPOSITS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_PURSE_DEPOSITS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select deposits above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_deposits_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseDepositCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_deposits_by_purse.c b/src/exchangedb/pg_select_purse_deposits_by_purse.c
new file mode 100644
index 000000000..94b935cb4
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_deposits_by_purse.c
@@ -0,0 +1,153 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_deposits_by_purse.c
+ * @brief Implementation of the select_purse_deposits_by_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_deposits_by_purse.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #purse_refund_coin_helper_cb().
+ */
+struct PurseRefundCoinContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_PurseRefundCoinCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseRefundCoinContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_refund_coin_helper_cb (void *cls,
+                             PGresult *result,
+                             unsigned int num_results)
+{
+  struct PurseRefundCoinContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_Amount amount_with_fee;
+    struct TALER_CoinSpendPublicKeyP coin_pub;
+    struct TALER_DenominationPublicKey denom_pub;
+    uint64_t rowid;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount_with_fee),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &coin_pub),
+      GNUNET_PQ_result_spec_uint64 ("purse_deposit_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &amount_with_fee,
+                   &coin_pub,
+                   &denom_pub);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_deposits_by_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  TALER_EXCHANGEDB_PurseRefundCoinCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseRefundCoinContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_purse_deposits_by_purse",
+           "SELECT"
+           " pd.purse_deposit_serial_id"
+           ",pd.amount_with_fee"
+           ",pd.coin_pub"
+           ",denom.denom_pub"
+           " FROM purse_deposits pd"
+           " JOIN known_coins kc"
+           "   USING (coin_pub)"
+           " JOIN denominations denom"
+           "   USING (denominations_serial)"
+           " WHERE purse_pub=$1;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_purse_deposits_by_purse",
+                                             params,
+                                             &purse_refund_coin_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_purse_deposits_by_purse.h b/src/exchangedb/pg_select_purse_deposits_by_purse.h
new file mode 100644
index 000000000..203f9a151
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_deposits_by_purse.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_deposits_by_purse.h
+ * @brief implementation of the select_purse_deposits_by_purse function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_DEPOSITS_BY_PURSE_H
+#define PG_SELECT_PURSE_DEPOSITS_BY_PURSE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select coin affected by purse refund.
+ *
+ * @param cls closure
+ * @param purse_pub purse that was refunded
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_deposits_by_purse (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  TALER_EXCHANGEDB_PurseRefundCoinCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_merge.c b/src/exchangedb/pg_select_purse_merge.c
new file mode 100644
index 000000000..ecc047cc5
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_merge.c
@@ -0,0 +1,80 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_merge.c
+ * @brief Implementation of the select_purse_merge function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_merge.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_merge (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_PurseMergeSignatureP *merge_sig,
+  struct GNUNET_TIME_Timestamp *merge_timestamp,
+  char **partner_url,
+  struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *refunded)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("merge_sig",
+                                          merge_sig),
+    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                          reserve_pub),
+    GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
+                                     merge_timestamp),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("partner_base_url",
+                                    partner_url),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_bool ("refunded",
+                                  refunded),
+      NULL),
+    GNUNET_PQ_result_spec_end
+  };
+
+  *partner_url = NULL;
+  *refunded = false;
+  PREPARE (pg,
+           "select_purse_merge",
+           "SELECT "
+           " pm.reserve_pub"
+           ",pm.merge_sig"
+           ",pm.merge_timestamp"
+           ",pr.partner_base_url"
+           ",pd.refunded"
+           " FROM purse_merges pm"
+           " LEFT JOIN purse_decision pd USING (purse_pub)"
+           " LEFT JOIN partners pr USING (partner_serial_id)"
+           " WHERE pm.purse_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_purse_merge",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_purse_merge.h b/src/exchangedb/pg_select_purse_merge.h
new file mode 100644
index 000000000..8054974aa
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_merge.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_purse_merge.h
+ * @brief implementation of the select_purse_merge function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_MERGE_H
+#define PG_SELECT_PURSE_MERGE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to approve merging of a purse with
+ * an account, made by the receiving account.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param purse_pub public key of the purse
+ * @param[out] merge_sig set to the signature confirming the merge
+ * @param[out] merge_timestamp set to the time of the merge
+ * @param[out] partner_url set to the URL of the target exchange, or NULL if the target exchange is us. To be freed by the caller.
+ * @param[out] reserve_pub set to the public key of the reserve/account being credited
+ * @param[out] refunded set to true if purse was refunded
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_merge (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_PurseMergeSignatureP *merge_sig,
+  struct GNUNET_TIME_Timestamp *merge_timestamp,
+  char **partner_url,
+  struct TALER_ReservePublicKeyP *reserve_pub,
+  bool *refunded);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_merges_above_serial_id.c b/src/exchangedb/pg_select_purse_merges_above_serial_id.c
new file mode 100644
index 000000000..cd06d65e9
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_merges_above_serial_id.c
@@ -0,0 +1,190 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_merges_above_serial_id.c
+ * @brief Implementation of the select_purse_merges_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_merges_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #purse_deposit_serial_helper_cb().
+ */
+struct PurseMergeSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_PurseMergeCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseMergeSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_merges_serial_helper_cb (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct PurseMergeSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    char *partner_base_url = NULL;
+    struct TALER_Amount amount;
+    struct TALER_Amount balance;
+    uint32_t flags32;
+    enum TALER_WalletAccountMergeFlags flags;
+    struct TALER_PurseMergePublicKeyP merge_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_PurseMergeSignatureP merge_sig;
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    struct GNUNET_TIME_Timestamp merge_timestamp;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
+                                   &balance),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_string ("partner_base_url",
+                                      &partner_base_url),
+        NULL),
+      GNUNET_PQ_result_spec_uint32 ("flags",
+                                    &flags32),
+      GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
+                                       &merge_timestamp),
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("merge_sig",
+                                            &merge_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("merge_pub",
+                                            &merge_pub),
+      GNUNET_PQ_result_spec_uint64 ("purse_merge_request_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    flags = (enum TALER_WalletAccountMergeFlags) flags32;
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   partner_base_url,
+                   &amount,
+                   &balance,
+                   flags,
+                   &merge_pub,
+                   &reserve_pub,
+                   &merge_sig,
+                   &purse_pub,
+                   merge_timestamp);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_merges_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseMergeCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseMergeSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_purse_merge_incr",
+           "SELECT"
+           " pm.purse_merge_request_serial_id"
+           ",partner_base_url"
+           ",pr.amount_with_fee"
+           ",pr.balance"
+           ",pr.flags"
+           ",pr.merge_pub"
+           ",pm.reserve_pub"
+           ",pm.merge_sig"
+           ",pm.purse_pub"
+           ",pm.merge_timestamp"
+           " FROM purse_merges pm"
+           " JOIN purse_requests pr USING (purse_pub)"
+           " LEFT JOIN partners USING (partner_serial_id)"
+           " WHERE ("
+           "  (purse_merge_request_serial_id>=$1)"
+           " )"
+           " ORDER BY purse_merge_request_serial_id ASC;");
+
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_purse_merge_incr",
+                                             params,
+                                             &purse_merges_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_purse_merges_above_serial_id.h b/src/exchangedb/pg_select_purse_merges_above_serial_id.h
new file mode 100644
index 000000000..d63db55dd
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_merges_above_serial_id.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_merges_above_serial_id.h
+ * @brief implementation of the select_purse_merges_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_MERGES_ABOVE_SERIAL_ID_H
+#define PG_SELECT_PURSE_MERGES_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select purse merges deposits above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_merges_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseMergeCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_purse_requests_above_serial_id.c b/src/exchangedb/pg_select_purse_requests_above_serial_id.c
new file mode 100644
index 000000000..61a4f2041
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_requests_above_serial_id.c
@@ -0,0 +1,178 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_requests_above_serial_id.c
+ * @brief Implementation of the select_purse_requests_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_purse_requests_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #purse_deposit_serial_helper_cb().
+ */
+struct PurseRequestsSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_PurseRequestCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct PurseRequestsSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+purse_requests_serial_helper_cb (void *cls,
+                                 PGresult *result,
+                                 unsigned int num_results)
+{
+  struct PurseRequestsSerialContext *dsc = cls;
+  struct PostgresClosure *pg = dsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_Amount target_amount;
+    uint32_t age_limit;
+    struct TALER_PurseMergePublicKeyP merge_pub;
+    struct TALER_PurseContractPublicKeyP purse_pub;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    struct TALER_PurseContractSignatureP purse_sig;
+    struct GNUNET_TIME_Timestamp purse_creation;
+    struct GNUNET_TIME_Timestamp purse_expiration;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &target_amount),
+      GNUNET_PQ_result_spec_uint32 ("age_limit",
+                                    &age_limit),
+      GNUNET_PQ_result_spec_timestamp ("purse_creation",
+                                       &purse_creation),
+      GNUNET_PQ_result_spec_timestamp ("purse_expiration",
+                                       &purse_expiration),
+      GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
+                                            &purse_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &h_contract_terms),
+      GNUNET_PQ_result_spec_auto_from_type ("purse_sig",
+                                            &purse_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("merge_pub",
+                                            &merge_pub),
+      GNUNET_PQ_result_spec_uint64 ("purse_requests_request_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      dsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = dsc->cb (dsc->cb_cls,
+                   rowid,
+                   &purse_pub,
+                   &merge_pub,
+                   purse_creation,
+                   purse_expiration,
+                   &h_contract_terms,
+                   age_limit,
+                   &target_amount,
+                   &purse_sig);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_requests_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseRequestCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct PurseRequestsSerialContext dsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_purse_requests_incr",
+           "SELECT"
+           " purse_requests_serial_id"
+           ",purse_pub"
+           ",amount_with_fee"
+           ",age_limit"
+           ",h_contract_terms"
+           ",purse_creation"
+           ",purse_expiration"
+           ",merge_pub"
+           ",purse_sig"
+           " FROM purse_requests"
+           " WHERE ("
+           "  (purse_requests_serial_id>=$1)"
+           " )"
+           " ORDER BY purse_requests_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_purse_requests_incr",
+                                             params,
+                                             &purse_requests_serial_helper_cb,
+                                             &dsc);
+  if (GNUNET_OK != dsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_purse_requests_above_serial_id.h b/src/exchangedb/pg_select_purse_requests_above_serial_id.h
new file mode 100644
index 000000000..25323e3d0
--- /dev/null
+++ b/src/exchangedb/pg_select_purse_requests_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_purse_requests_above_serial_id.h
+ * @brief implementation of the select_purse_requests_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_PURSE_REQUESTS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_PURSE_REQUESTS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select purse requestss deposits above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_purse_requests_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_PurseRequestCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_recoup_above_serial_id.c b/src/exchangedb/pg_select_recoup_above_serial_id.c
new file mode 100644
index 000000000..5791ee500
--- /dev/null
+++ b/src/exchangedb/pg_select_recoup_above_serial_id.c
@@ -0,0 +1,194 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_recoup_above_serial_id.c
+ * @brief Implementation of the select_recoup_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_recoup_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #recoup_serial_helper_cb().
+ */
+struct RecoupSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_RecoupCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct RecoupSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+recoup_serial_helper_cb (void *cls,
+                         PGresult *result,
+                         unsigned int num_results)
+{
+  struct RecoupSerialContext *psc = cls;
+  struct PostgresClosure *pg = psc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_CoinPublicInfo coin;
+    struct TALER_CoinSpendSignatureP coin_sig;
+    union GNUNET_CRYPTO_BlindingSecretP coin_blind;
+    struct TALER_Amount amount;
+    struct TALER_DenominationPublicKey denom_pub;
+    struct TALER_BlindedCoinHashP h_blind_ev;
+    struct GNUNET_TIME_Timestamp timestamp;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("recoup_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       &timestamp),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &coin.coin_pub),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &coin_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                            &coin_blind),
+      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
+                                            &h_blind_ev),
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &coin.denom_pub_hash),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                              &coin.h_age_commitment),
+        &coin.no_age_commitment),
+      TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                      &coin.denom_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+    int ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      psc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = psc->cb (psc->cb_cls,
+                   rowid,
+                   timestamp,
+                   &amount,
+                   &reserve_pub,
+                   &coin,
+                   &denom_pub,
+                   &coin_sig,
+                   &coin_blind);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_recoup_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RecoupCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct RecoupSerialContext psc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "recoup_get_incr",
+           "SELECT"
+           " recoup_uuid"
+           ",recoup_timestamp"
+           ",reserves.reserve_pub"
+           ",coins.coin_pub"
+           ",coin_sig"
+           ",coin_blind"
+           ",ro.h_blind_ev"
+           ",denoms.denom_pub_hash"
+           ",coins.denom_sig"
+           ",coins.age_commitment_hash"
+           ",denoms.denom_pub"
+           ",amount"
+           " FROM recoup"
+           "    JOIN known_coins coins"
+           "      USING (coin_pub)"
+           "    JOIN reserves_out ro"
+           "      USING (reserve_out_serial_id)"
+           "    JOIN reserves"
+           "      USING (reserve_uuid)"
+           "    JOIN denominations denoms"
+           "      ON (coins.denominations_serial = denoms.denominations_serial)"
+           " WHERE recoup_uuid>=$1"
+           " ORDER BY recoup_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "recoup_get_incr",
+                                             params,
+                                             &recoup_serial_helper_cb,
+                                             &psc);
+  if (GNUNET_OK != psc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_recoup_above_serial_id.h b/src/exchangedb/pg_select_recoup_above_serial_id.h
new file mode 100644
index 000000000..9be0b5c35
--- /dev/null
+++ b/src/exchangedb/pg_select_recoup_above_serial_id.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_recoup_above_serial_id.h
+ * @brief implementation of the select_recoup_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RECOUP_ABOVE_SERIAL_ID_H
+#define PG_SELECT_RECOUP_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Function called to select recoup requests the exchange
+ * received, ordered by serial ID (monotonically increasing).
+ *
+ * @param cls closure
+ * @param serial_id lowest serial ID to include (select larger or equal)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_recoup_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RecoupCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_recoup_refresh_above_serial_id.c b/src/exchangedb/pg_select_recoup_refresh_above_serial_id.c
new file mode 100644
index 000000000..22f906738
--- /dev/null
+++ b/src/exchangedb/pg_select_recoup_refresh_above_serial_id.c
@@ -0,0 +1,203 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_recoup_refresh_above_serial_id.c
+ * @brief Implementation of the select_recoup_refresh_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_recoup_refresh_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #recoup_refresh_serial_helper_cb().
+ */
+struct RecoupRefreshSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_RecoupRefreshCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct RecoupRefreshSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+recoup_refresh_serial_helper_cb (void *cls,
+                                 PGresult *result,
+                                 unsigned int num_results)
+{
+  struct RecoupRefreshSerialContext *psc = cls;
+  struct PostgresClosure *pg = psc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_CoinSpendPublicKeyP old_coin_pub;
+    struct TALER_CoinPublicInfo coin;
+    struct TALER_CoinSpendSignatureP coin_sig;
+    union GNUNET_CRYPTO_BlindingSecretP coin_blind;
+    struct TALER_DenominationPublicKey denom_pub;
+    struct TALER_DenominationHashP old_denom_pub_hash;
+    struct TALER_Amount amount;
+    struct TALER_BlindedCoinHashP h_blind_ev;
+    struct GNUNET_TIME_Timestamp timestamp;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
+                                       &timestamp),
+      GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
+                                            &old_coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("old_denom_pub_hash",
+                                            &old_denom_pub_hash),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &coin.coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
+                                            &coin_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
+                                            &coin_blind),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
+                                            &h_blind_ev),
+      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
+                                            &coin.denom_pub_hash),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                              &coin.h_age_commitment),
+        &coin.no_age_commitment),
+      TALER_PQ_result_spec_denom_sig ("denom_sig",
+                                      &coin.denom_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      psc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = psc->cb (psc->cb_cls,
+                   rowid,
+                   timestamp,
+                   &amount,
+                   &old_coin_pub,
+                   &old_denom_pub_hash,
+                   &coin,
+                   &denom_pub,
+                   &coin_sig,
+                   &coin_blind);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_recoup_refresh_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RecoupRefreshCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct RecoupRefreshSerialContext psc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "recoup_refresh_get_incr",
+           "SELECT"
+           " recoup_refresh_uuid"
+           ",recoup_timestamp"
+           ",old_coins.coin_pub AS old_coin_pub"
+           ",new_coins.age_commitment_hash"
+           ",old_denoms.denom_pub_hash AS old_denom_pub_hash"
+           ",new_coins.coin_pub As coin_pub"
+           ",coin_sig"
+           ",coin_blind"
+           ",new_denoms.denom_pub AS denom_pub"
+           ",rrc.h_coin_ev AS h_blind_ev"
+           ",new_denoms.denom_pub_hash"
+           ",new_coins.denom_sig AS denom_sig"
+           ",amount"
+           " FROM recoup_refresh"
+           "    INNER JOIN refresh_revealed_coins rrc"
+           "      USING (rrc_serial)"
+           "    INNER JOIN refresh_commitments rfc"
+           "      ON (rrc.melt_serial_id = rfc.melt_serial_id)"
+           "    INNER JOIN known_coins old_coins"
+           "      ON (rfc.old_coin_pub = old_coins.coin_pub)"
+           "    INNER JOIN known_coins new_coins"
+           "      ON (new_coins.coin_pub = recoup_refresh.coin_pub)"
+           "    INNER JOIN denominations new_denoms"
+           "      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"
+           " ORDER BY recoup_refresh_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "recoup_refresh_get_incr",
+                                             params,
+                                             &recoup_refresh_serial_helper_cb,
+                                             &psc);
+  if (GNUNET_OK != psc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_recoup_refresh_above_serial_id.h b/src/exchangedb/pg_select_recoup_refresh_above_serial_id.h
new file mode 100644
index 000000000..0d7b72fc3
--- /dev/null
+++ b/src/exchangedb/pg_select_recoup_refresh_above_serial_id.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_recoup_refresh_above_serial_id.h
+ * @brief implementation of the select_recoup_refresh_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RECOUP_REFRESH_ABOVE_SERIAL_ID_H
+#define PG_SELECT_RECOUP_REFRESH_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to select recoup requests the exchange received for
+ * refreshed coins, ordered by serial ID (monotonically increasing).
+ *
+ * @param cls closure
+ * @param serial_id lowest serial ID to include (select larger or equal)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_recoup_refresh_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RecoupRefreshCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_refreshes_above_serial_id.c b/src/exchangedb/pg_select_refreshes_above_serial_id.c
new file mode 100644
index 000000000..db432269c
--- /dev/null
+++ b/src/exchangedb/pg_select_refreshes_above_serial_id.c
@@ -0,0 +1,179 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refreshes_above_serial_id.c
+ * @brief Implementation of the select_refreshes_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_refreshes_above_serial_id.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #refreshs_serial_helper_cb().
+ */
+struct RefreshsSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_RefreshesCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct RefreshsSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+refreshs_serial_helper_cb (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct RefreshsSerialContext *rsc = cls;
+  struct PostgresClosure *pg = rsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_DenominationPublicKey denom_pub;
+    struct TALER_CoinSpendPublicKeyP coin_pub;
+    struct TALER_CoinSpendSignatureP coin_sig;
+    struct TALER_AgeCommitmentHash h_age_commitment;
+    bool ac_isnull;
+    struct TALER_Amount amount_with_fee;
+    uint32_t noreveal_index;
+    uint64_t rowid;
+    struct TALER_RefreshCommitmentP rc;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_allow_null (
+        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
+                                              &h_age_commitment),
+        &ac_isnull),
+      GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
+                                            &coin_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
+                                            &coin_sig),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount_with_fee),
+      GNUNET_PQ_result_spec_uint32 ("noreveal_index",
+                                    &noreveal_index),
+      GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_auto_from_type ("rc",
+                                            &rc),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      rsc->status = GNUNET_SYSERR;
+      return;
+    }
+
+    ret = rsc->cb (rsc->cb_cls,
+                   rowid,
+                   &denom_pub,
+                   ac_isnull ? NULL : &h_age_commitment,
+                   &coin_pub,
+                   &coin_sig,
+                   &amount_with_fee,
+                   noreveal_index,
+                   &rc);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refreshes_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RefreshesCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct RefreshsSerialContext rsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_refresh_commitments_incr",
+           "SELECT"
+           " denom.denom_pub"
+           ",kc.coin_pub AS old_coin_pub"
+           ",kc.age_commitment_hash"
+           ",old_coin_sig"
+           ",amount_with_fee"
+           ",noreveal_index"
+           ",melt_serial_id"
+           ",rc"
+           " FROM refresh_commitments"
+           "   JOIN known_coins kc"
+           "     ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
+           "   JOIN denominations denom"
+           "     ON (kc.denominations_serial = denom.denominations_serial)"
+           " WHERE melt_serial_id>=$1"
+           " ORDER BY melt_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_refresh_commitments_incr",
+                                             params,
+                                             &refreshs_serial_helper_cb,
+                                             &rsc);
+  if (GNUNET_OK != rsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_refreshes_above_serial_id.h b/src/exchangedb/pg_select_refreshes_above_serial_id.h
new file mode 100644
index 000000000..2d1db275c
--- /dev/null
+++ b/src/exchangedb/pg_select_refreshes_above_serial_id.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refreshes_above_serial_id.h
+ * @brief implementation of the select_refreshes_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_REFRESHES_ABOVE_SERIAL_ID_H
+#define PG_SELECT_REFRESHES_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select refresh sessions above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refreshes_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RefreshesCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_refunds_above_serial_id.c b/src/exchangedb/pg_select_refunds_above_serial_id.c
new file mode 100644
index 000000000..396e8d3d5
--- /dev/null
+++ b/src/exchangedb/pg_select_refunds_above_serial_id.c
@@ -0,0 +1,223 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refunds_above_serial_id.c
+ * @brief Implementation of the select_refunds_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_refunds_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #refunds_serial_helper_cb().
+ */
+struct RefundsSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_RefundCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct RefundsSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+refunds_serial_helper_cb (void *cls,
+                          PGresult *result,
+                          unsigned int num_results)
+{
+  struct RefundsSerialContext *rsc = cls;
+  struct PostgresClosure *pg = rsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_EXCHANGEDB_Refund refund;
+    struct TALER_DenominationPublicKey denom_pub;
+    uint64_t rowid;
+    bool full_refund;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
+                                            &refund.details.merchant_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("merchant_sig",
+                                            &refund.details.merchant_sig),
+      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
+                                            &refund.details.h_contract_terms),
+      GNUNET_PQ_result_spec_uint64 ("rtransaction_id",
+                                    &refund.details.rtransaction_id),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
+                                            &refund.coin.coin_pub),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &refund.details.refund_amount),
+      GNUNET_PQ_result_spec_uint64 ("refund_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      rsc->status = GNUNET_SYSERR;
+      return;
+    }
+    {
+      struct GNUNET_PQ_QueryParam params[] = {
+        GNUNET_PQ_query_param_uint64 (&rowid),
+        GNUNET_PQ_query_param_end
+      };
+      struct TALER_Amount amount_with_fee;
+      uint64_t s_f;
+      uint64_t s_v;
+      struct GNUNET_PQ_ResultSpec rs2[] = {
+        GNUNET_PQ_result_spec_uint64 ("s_v",
+                                      &s_v),
+        GNUNET_PQ_result_spec_uint64 ("s_f",
+                                      &s_f),
+        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                     &amount_with_fee),
+        GNUNET_PQ_result_spec_end
+      };
+      enum GNUNET_DB_QueryStatus qs;
+
+      qs = GNUNET_PQ_eval_prepared_singleton_select (
+        pg->conn,
+        "test_refund_full",
+        params,
+        rs2);
+      if (qs <= 0)
+      {
+        GNUNET_break (0);
+        rsc->status = GNUNET_SYSERR;
+        return;
+      }
+      /* normalize */
+      s_v += s_f / TALER_AMOUNT_FRAC_BASE;
+      s_f %= TALER_AMOUNT_FRAC_BASE;
+      full_refund = (s_v >= amount_with_fee.value) &&
+                    (s_f >= amount_with_fee.fraction);
+    }
+    ret = rsc->cb (rsc->cb_cls,
+                   rowid,
+                   &denom_pub,
+                   &refund.coin.coin_pub,
+                   &refund.details.merchant_pub,
+                   &refund.details.merchant_sig,
+                   &refund.details.h_contract_terms,
+                   refund.details.rtransaction_id,
+                   full_refund,
+                   &refund.details.refund_amount);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refunds_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RefundCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct RefundsSerialContext rsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  /* Fetch refunds with rowid '\geq' the given parameter */
+  PREPARE (pg,
+           "audit_get_refunds_incr",
+           "SELECT"
+           " bdep.merchant_pub"
+           ",ref.merchant_sig"
+           ",bdep.h_contract_terms"
+           ",ref.rtransaction_id"
+           ",denom.denom_pub"
+           ",kc.coin_pub"
+           ",ref.amount_with_fee"
+           ",ref.refund_serial_id"
+           " FROM refunds ref"
+           "   JOIN batch_deposits bdep"
+           "     ON (ref.batch_deposit_serial_id=bdep.batch_deposit_serial_id)"
+           "   JOIN coin_deposits cdep"
+           "     ON (ref.coin_pub=cdep.coin_pub AND ref.batch_deposit_serial_id=cdep.batch_deposit_serial_id)"
+           "   JOIN known_coins kc"
+           "     ON (cdep.coin_pub=kc.coin_pub)"
+           "   JOIN denominations denom"
+           "     ON (kc.denominations_serial=denom.denominations_serial)"
+           " WHERE ref.refund_serial_id>=$1"
+           " ORDER BY ref.refund_serial_id ASC;");
+  PREPARE (pg,
+           "test_refund_full",
+           "SELECT"
+           " CAST(SUM(CAST((ref.amount_with_fee).frac AS INT8)) AS INT8) AS s_f"
+           ",CAST(SUM((ref.amount_with_fee).val) AS INT8) AS s_v"
+           ",cdep.amount_with_fee"
+           " FROM refunds ref"
+           "   JOIN coin_deposits cdep"
+           "     ON (ref.coin_pub=cdep.coin_pub AND ref.batch_deposit_serial_id=cdep.batch_deposit_serial_id)"
+           " WHERE ref.refund_serial_id=$1"
+           " GROUP BY (cdep.amount_with_fee);");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_refunds_incr",
+                                             params,
+                                             &refunds_serial_helper_cb,
+                                             &rsc);
+  if (GNUNET_OK != rsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_refunds_above_serial_id.h b/src/exchangedb/pg_select_refunds_above_serial_id.h
new file mode 100644
index 000000000..b33816a94
--- /dev/null
+++ b/src/exchangedb/pg_select_refunds_above_serial_id.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refunds_above_serial_id.h
+ * @brief implementation of the select_refunds_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_REFUNDS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_REFUNDS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select refunds above @a serial_id in monotonically increasing
+ * order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refunds_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_RefundCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_refunds_by_coin.c b/src/exchangedb/pg_select_refunds_by_coin.c
new file mode 100644
index 000000000..d9cd6dd3c
--- /dev/null
+++ b/src/exchangedb/pg_select_refunds_by_coin.c
@@ -0,0 +1,143 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022-2023 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refunds_by_coin.c
+ * @brief Implementation of the select_refunds_by_coin function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_refunds_by_coin.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_refunds_cb().
+ */
+struct SelectRefundContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_RefundCoinCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Set to #GNUNET_SYSERR on error.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct SelectRefundContext *`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+get_refunds_cb (void *cls,
+                PGresult *result,
+                unsigned int num_results)
+{
+  struct SelectRefundContext *srctx = cls;
+  struct PostgresClosure *pg = srctx->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_Amount amount_with_fee;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount_with_fee),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      srctx->status = GNUNET_SYSERR;
+      return;
+    }
+    if (GNUNET_OK !=
+        srctx->cb (srctx->cb_cls,
+                   &amount_with_fee))
+      return;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refunds_by_coin (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_PrivateContractHashP *h_contract,
+  TALER_EXCHANGEDB_RefundCoinCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  enum GNUNET_DB_QueryStatus qs;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (coin_pub),
+    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
+    GNUNET_PQ_query_param_auto_from_type (h_contract),
+    GNUNET_PQ_query_param_end
+  };
+  struct SelectRefundContext srctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  const char *query = "get_refunds_by_coin_and_contract";
+
+  PREPARE (pg,
+           query,
+           "SELECT"
+           "   ref.amount_with_fee"
+           " FROM refunds ref"
+           " JOIN coin_deposits cdep"
+           "   USING (coin_pub,batch_deposit_serial_id)"
+           " JOIN batch_deposits bdep"
+           "   ON (ref.batch_deposit_serial_id = bdep.batch_deposit_serial_id)"
+           " WHERE ref.coin_pub=$1"
+           "   AND bdep.merchant_pub=$2"
+           "   AND bdep.h_contract_terms=$3;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             query,
+                                             params,
+                                             &get_refunds_cb,
+                                             &srctx);
+  if (GNUNET_SYSERR == srctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_refunds_by_coin.h b/src/exchangedb/pg_select_refunds_by_coin.h
new file mode 100644
index 000000000..72df13fda
--- /dev/null
+++ b/src/exchangedb/pg_select_refunds_by_coin.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_refunds_by_coin.h
+ * @brief implementation of the select_refunds_by_coin function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_REFUNDS_BY_COIN_H
+#define PG_SELECT_REFUNDS_BY_COIN_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select refunds by @a coin_pub, @a merchant_pub and @a h_contract.
+ *
+ * @param cls closure of plugin
+ * @param coin_pub coin to get refunds for
+ * @param merchant_pub merchant to get refunds for
+ * @param h_contract contract (hash) to get refunds for
+ * @param cb function to call for each refund found
+ * @param cb_cls closure for @a cb
+ * @return query result status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_refunds_by_coin (
+  void *cls,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_PrivateContractHashP *h_contract,
+  TALER_EXCHANGEDB_RefundCoinCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_reserve_close_info.c b/src/exchangedb/pg_select_reserve_close_info.c
new file mode 100644
index 000000000..eccba8e4c
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_close_info.c
@@ -0,0 +1,63 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_close_info.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_reserve_close_info.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_close_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct TALER_Amount *balance,
+  char **payto_uri)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    TALER_PQ_result_spec_amount ("current_balance",
+                                 pg->currency,
+                                 balance),
+    GNUNET_PQ_result_spec_string ("payto_uri",
+                                  payto_uri),
+    GNUNET_PQ_result_spec_end
+  };
+
+  PREPARE (pg,
+           "select_reserve_close_info",
+           "SELECT "
+           " r.current_balance"
+           ",wt.payto_uri"
+           " FROM reserves r"
+           " LEFT JOIN reserves_in ri USING (reserve_pub)"
+           " LEFT JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto)"
+           " WHERE reserve_pub=$1;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_reserve_close_info",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/exchangedb/pg_select_reserve_close_info.h b/src/exchangedb/pg_select_reserve_close_info.h
new file mode 100644
index 000000000..2b90ffd05
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_close_info.h
@@ -0,0 +1,49 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_close_info.h
+ * @brief implementation of the select_reserve_close_info function
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RESERVE_CLOSE_INFO_H
+#define PG_SELECT_RESERVE_CLOSE_INFO_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Select information needed to see if we can close
+ * a reserve.
+ *
+ * @param cls closure
+ * @param reserve_pub which reserve is this about?
+ * @param[out] balance current reserve balance
+ * @param[out] payto_uri set to URL of account that
+ *             originally funded the reserve;
+ *             could be set to NULL if not known
+ * @return transaction status code, 0 if reserve unknown
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_close_info (
+  void *cls,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  struct TALER_Amount *balance,
+  char **payto_uri);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_reserve_closed_above_serial_id.c b/src/exchangedb/pg_select_reserve_closed_above_serial_id.c
new file mode 100644
index 000000000..d24d6a600
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_closed_above_serial_id.c
@@ -0,0 +1,178 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_closed_above_serial_id.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_get_reserve_history.h"
+#include "plugin_exchangedb_common.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #reserve_closed_serial_helper_cb().
+ */
+struct ReserveClosedSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_ReserveClosedCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin's context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct ReserveClosedSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserve_closed_serial_helper_cb (void *cls,
+                                 PGresult *result,
+                                 unsigned int num_results)
+{
+  struct ReserveClosedSerialContext *rcsc = cls;
+  struct PostgresClosure *pg = rcsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    char *receiver_account;
+    struct TALER_WireTransferIdentifierRawP wtid;
+    struct TALER_Amount amount_with_fee;
+    struct TALER_Amount closing_fee;
+    struct GNUNET_TIME_Timestamp execution_date;
+    uint64_t close_request_row;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("close_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &execution_date),
+      GNUNET_PQ_result_spec_auto_from_type ("wtid",
+                                            &wtid),
+      GNUNET_PQ_result_spec_string ("receiver_account",
+                                    &receiver_account),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount_with_fee),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
+                                   &closing_fee),
+      GNUNET_PQ_result_spec_uint64 ("close_request_row",
+                                    &close_request_row),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      rcsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = rcsc->cb (rcsc->cb_cls,
+                    rowid,
+                    execution_date,
+                    &amount_with_fee,
+                    &closing_fee,
+                    &reserve_pub,
+                    receiver_account,
+                    &wtid,
+                    close_request_row);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_closed_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveClosedCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct ReserveClosedSerialContext rcsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  /* Used in #postgres_select_reserve_closed_above_serial_id() to
+     obtain information about closed reserves */
+  PREPARE (
+    pg,
+    "reserves_close_get_incr",
+    "SELECT"
+    " close_uuid"
+    ",reserves.reserve_pub"
+    ",execution_date"
+    ",wtid"
+    ",payto_uri AS receiver_account"
+    ",amount"
+    ",closing_fee"
+    ",close_request_row"
+    " FROM reserves_close"
+    "   JOIN wire_targets"
+    "     USING (wire_target_h_payto)"
+    "   JOIN reserves"
+    "     USING (reserve_pub)"
+    " WHERE close_uuid>=$1"
+    " ORDER BY close_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "reserves_close_get_incr",
+                                             params,
+                                             &reserve_closed_serial_helper_cb,
+                                             &rcsc);
+  if (GNUNET_OK != rcsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_reserve_closed_above_serial_id.h b/src/exchangedb/pg_select_reserve_closed_above_serial_id.h
new file mode 100644
index 000000000..af3c8631e
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_closed_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_closed_above_serial_id.h
+ * @brief implementation of the select_reserve_closed_above_serial_id function
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RESERVE_CLOSED_ABOVE_SERIAL_ID_H
+#define PG_SELECT_RESERVE_CLOSED_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to select reserve close operations the aggregator
+ * triggered, ordered by serial ID (monotonically increasing).
+ *
+ * @param cls closure
+ * @param serial_id lowest serial ID to include (select larger or equal)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_closed_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveClosedCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_reserve_open_above_serial_id.c b/src/exchangedb/pg_select_reserve_open_above_serial_id.c
new file mode 100644
index 000000000..1675e71a7
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_open_above_serial_id.c
@@ -0,0 +1,168 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_open_above_serial_id.c
+ * @brief Low-level (statement-level) Postgres database access for the exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_reserve_open_above_serial_id.h"
+#include "plugin_exchangedb_common.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #reserve_open_serial_helper_cb().
+ */
+struct ReserveOpenSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_ReserveOpenCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin's context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct ReserveOpenSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserve_open_serial_helper_cb (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct ReserveOpenSerialContext *rcsc = cls;
+  struct PostgresClosure *pg = rcsc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_ReserveSignatureP reserve_sig;
+    uint32_t requested_purse_limit;
+    struct GNUNET_TIME_Timestamp request_timestamp;
+    struct GNUNET_TIME_Timestamp reserve_expiration;
+    struct TALER_Amount reserve_payment;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("open_request_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                            &reserve_sig),
+      GNUNET_PQ_result_spec_timestamp ("request_timestamp",
+                                       &request_timestamp),
+      GNUNET_PQ_result_spec_timestamp ("expiration_date",
+                                       &reserve_expiration),
+      GNUNET_PQ_result_spec_uint32 ("requested_purse_limit",
+                                    &requested_purse_limit),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_payment",
+                                   &reserve_payment),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      rcsc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = rcsc->cb (rcsc->cb_cls,
+                    rowid,
+                    &reserve_payment,
+                    request_timestamp,
+                    reserve_expiration,
+                    requested_purse_limit,
+                    &reserve_pub,
+                    &reserve_sig);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_open_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveOpenCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct ReserveOpenSerialContext rcsc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (
+    pg,
+    "reserves_open_get_incr",
+    "SELECT"
+    " open_request_uuid"
+    ",reserve_pub"
+    ",request_timestamp"
+    ",expiration_date"
+    ",reserve_sig"
+    ",reserve_payment"
+    ",requested_purse_limit"
+    " FROM reserves_open_requests"
+    " WHERE open_request_uuid>=$1"
+    " ORDER BY open_request_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "reserves_open_get_incr",
+                                             params,
+                                             &reserve_open_serial_helper_cb,
+                                             &rcsc);
+  if (GNUNET_OK != rcsc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_reserve_open_above_serial_id.h b/src/exchangedb/pg_select_reserve_open_above_serial_id.h
new file mode 100644
index 000000000..4ec5b705a
--- /dev/null
+++ b/src/exchangedb/pg_select_reserve_open_above_serial_id.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file pg_select_reserve_open_above_serial_id.h
+ * @brief implementation of the select_reserve_open_above_serial_id function
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RESERVE_OPEN_ABOVE_SERIAL_ID_H
+#define PG_SELECT_RESERVE_OPEN_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Function called to select reserve open operations, ordered by serial ID
+ * (monotonically increasing).
+ *
+ * @param cls closure
+ * @param serial_id lowest serial ID to include (select larger or equal)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserve_open_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveOpenCallback cb,
+  void *cb_cls);
+
+
+#endif
diff --git a/src/exchangedb/pg_select_reserves_in_above_serial_id.c b/src/exchangedb/pg_select_reserves_in_above_serial_id.c
new file mode 100644
index 000000000..21033e80d
--- /dev/null
+++ b/src/exchangedb/pg_select_reserves_in_above_serial_id.c
@@ -0,0 +1,164 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_reserves_in_above_serial_id.c
+ * @brief Implementation of the select_reserves_in_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_reserves_in_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #reserves_in_serial_helper_cb().
+ */
+struct ReservesInSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_ReserveInCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct ReservesInSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserves_in_serial_helper_cb (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct ReservesInSerialContext *risc = cls;
+  struct PostgresClosure *pg = risc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_Amount credit;
+    char *sender_account_details;
+    struct GNUNET_TIME_Timestamp execution_date;
+    uint64_t rowid;
+    uint64_t wire_reference;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_uint64 ("wire_reference",
+                                    &wire_reference),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("credit",
+                                   &credit),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &execution_date),
+      GNUNET_PQ_result_spec_string ("sender_account_details",
+                                    &sender_account_details),
+      GNUNET_PQ_result_spec_uint64 ("reserve_in_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      risc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = risc->cb (risc->cb_cls,
+                    rowid,
+                    &reserve_pub,
+                    &credit,
+                    sender_account_details,
+                    wire_reference,
+                    execution_date);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserves_in_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveInCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct ReservesInSerialContext risc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_reserves_in_get_transactions_incr",
+           "SELECT"
+           " reserves.reserve_pub"
+           ",wire_reference"
+           ",credit"
+           ",execution_date"
+           ",payto_uri AS sender_account_details"
+           ",reserve_in_serial_id"
+           " FROM reserves_in"
+           " JOIN reserves"
+           "   USING (reserve_pub)"
+           " JOIN wire_targets"
+           "   ON (wire_source_h_payto = wire_target_h_payto)"
+           " WHERE reserve_in_serial_id>=$1"
+           " ORDER BY reserve_in_serial_id;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_reserves_in_get_transactions_incr",
+                                             params,
+                                             &reserves_in_serial_helper_cb,
+                                             &risc);
+  if (GNUNET_OK != risc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_reserves_in_above_serial_id.h b/src/exchangedb/pg_select_reserves_in_above_serial_id.h
new file mode 100644
index 000000000..5f5dd2ecc
--- /dev/null
+++ b/src/exchangedb/pg_select_reserves_in_above_serial_id.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_reserves_in_above_serial_id.h
+ * @brief implementation of the select_reserves_in_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RESERVES_IN_ABOVE_SERIAL_ID_H
+#define PG_SELECT_RESERVES_IN_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Select inbound wire transfers into reserves_in above @a serial_id
+ * in monotonically increasing order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserves_in_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveInCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
new file mode 100644
index 000000000..1c7bc15a0
--- /dev/null
+++ b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
@@ -0,0 +1,168 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_reserves_in_above_serial_id_by_account.c
+ * @brief Implementation of the select_reserves_in_above_serial_id_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_reserves_in_above_serial_id_by_account.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #reserves_in_serial_helper_cb().
+ */
+struct ReservesInSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_ReserveInCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct ReservesInSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserves_in_serial_helper_cb (void *cls,
+                              PGresult *result,
+                              unsigned int num_results)
+{
+  struct ReservesInSerialContext *risc = cls;
+  struct PostgresClosure *pg = risc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_Amount credit;
+    char *sender_account_details;
+    struct GNUNET_TIME_Timestamp execution_date;
+    uint64_t rowid;
+    uint64_t wire_reference;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_uint64 ("wire_reference",
+                                    &wire_reference),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("credit",
+                                   &credit),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &execution_date),
+      GNUNET_PQ_result_spec_string ("sender_account_details",
+                                    &sender_account_details),
+      GNUNET_PQ_result_spec_uint64 ("reserve_in_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      risc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = risc->cb (risc->cb_cls,
+                    rowid,
+                    &reserve_pub,
+                    &credit,
+                    sender_account_details,
+                    wire_reference,
+                    execution_date);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserves_in_above_serial_id_by_account (
+  void *cls,
+  const char *account_name,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveInCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_string (account_name),
+    GNUNET_PQ_query_param_end
+  };
+  struct ReservesInSerialContext risc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_reserves_in_get_transactions_incr_by_account",
+           "SELECT"
+           " reserves.reserve_pub"
+           ",wire_reference"
+           ",credit"
+           ",execution_date"
+           ",payto_uri AS sender_account_details"
+           ",reserve_in_serial_id"
+           " FROM reserves_in"
+           " JOIN reserves "
+           "   USING (reserve_pub)"
+           " JOIN wire_targets"
+           "   ON (wire_source_h_payto = wire_target_h_payto)"
+           " WHERE reserve_in_serial_id>=$1"
+           "   AND exchange_account_section=$2"
+           " ORDER BY reserve_in_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_reserves_in_get_transactions_incr_by_account",
+                                             params,
+                                             &reserves_in_serial_helper_cb,
+                                             &risc);
+  if (GNUNET_OK != risc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.h b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.h
new file mode 100644
index 000000000..81855ede9
--- /dev/null
+++ b/src/exchangedb/pg_select_reserves_in_above_serial_id_by_account.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_reserves_in_above_serial_id_by_account.h
+ * @brief implementation of the select_reserves_in_above_serial_id_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_RESERVES_IN_ABOVE_SERIAL_ID_BY_ACCOUNT_H
+#define PG_SELECT_RESERVES_IN_ABOVE_SERIAL_ID_BY_ACCOUNT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Select inbound wire transfers into reserves_in above @a serial_id
+ * in monotonically increasing order by account.
+ *
+ * @param cls closure
+ * @param account_name name of the account to select by
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_reserves_in_above_serial_id_by_account (
+  void *cls,
+  const char *account_name,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_ReserveInCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_satisfied_kyc_processes.c b/src/exchangedb/pg_select_satisfied_kyc_processes.c
new file mode 100644
index 000000000..e0d884ef1
--- /dev/null
+++ b/src/exchangedb/pg_select_satisfied_kyc_processes.c
@@ -0,0 +1,141 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_satisfied_kyc_processes.c
+ * @brief Implementation of the select_satisfied_kyc_processes function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_satisfied_kyc_processes.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_legitimizations_cb().
+ */
+struct GetLegitimizationsContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_SatisfiedProviderCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct GetLegitimizationsContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_legitimizations_cb (void *cls,
+                        PGresult *result,
+                        unsigned int num_results)
+{
+  struct GetLegitimizationsContext *ctx = cls;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    char *provider_section;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_string ("provider_section",
+                                    &provider_section),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Found satisfied LEGI: %s\n",
+                provider_section);
+    ctx->cb (ctx->cb_cls,
+             provider_section);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_satisfied_kyc_processes (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_SatisfiedProviderCallback spc,
+  void *spc_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_TIME_Absolute now
+    = GNUNET_TIME_absolute_get ();
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&now),
+    GNUNET_PQ_query_param_end
+  };
+  struct GetLegitimizationsContext ctx = {
+    .cb = spc,
+    .cb_cls = spc_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "get_satisfied_legitimizations",
+           "SELECT "
+           " provider_section"
+           " FROM legitimization_processes"
+           " WHERE h_payto=$1"
+           "   AND expiration_time>=$2;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "get_satisfied_legitimizations",
+    params,
+    &get_legitimizations_cb,
+    &ctx);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Satisfied LEGI check returned %d\n",
+              qs);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_satisfied_kyc_processes.h b/src/exchangedb/pg_select_satisfied_kyc_processes.h
new file mode 100644
index 000000000..bc1639ff9
--- /dev/null
+++ b/src/exchangedb/pg_select_satisfied_kyc_processes.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_satisfied_kyc_processes.h
+ * @brief implementation of the select_satisfied_kyc_processes function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_SATISFIED_KYC_PROCESSES_H
+#define PG_SELECT_SATISFIED_KYC_PROCESSES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Call us on KYC processes satisfied for the given
+ * account.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param spc function to call for each satisfied KYC process
+ * @param spc_cls closure for @a spc
+ * @return transaction status code
+ */
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_satisfied_kyc_processes (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_SatisfiedProviderCallback spc,
+  void *spc_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_similar_kyc_attributes.c b/src/exchangedb/pg_select_similar_kyc_attributes.c
new file mode 100644
index 000000000..342f9ef33
--- /dev/null
+++ b/src/exchangedb/pg_select_similar_kyc_attributes.c
@@ -0,0 +1,154 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_similar_kyc_attributes.c
+ * @brief Implementation of the select_similar_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_similar_kyc_attributes.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_similar_attributes_cb().
+ */
+struct GetAttributesContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_AttributeCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct GetAttributesContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_attributes_cb (void *cls,
+                   PGresult *result,
+                   unsigned int num_results)
+{
+  struct GetAttributesContext *ctx = cls;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct TALER_PaytoHashP h_payto;
+    struct GNUNET_TIME_Timestamp collection_time;
+    struct GNUNET_TIME_Timestamp expiration_time;
+    size_t enc_attributes_size;
+    void *enc_attributes;
+    char *provider;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("h_payto",
+                                            &h_payto),
+      GNUNET_PQ_result_spec_string ("provider",
+                                    &provider),
+      GNUNET_PQ_result_spec_timestamp ("collection_time",
+                                       &collection_time),
+      GNUNET_PQ_result_spec_timestamp ("expiration_time",
+                                       &expiration_time),
+      GNUNET_PQ_result_spec_variable_size ("encrypted_attributes",
+                                           &enc_attributes,
+                                           &enc_attributes_size),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ctx->cb (ctx->cb_cls,
+             &h_payto,
+             provider,
+             collection_time,
+             expiration_time,
+             enc_attributes_size,
+             enc_attributes);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_similar_kyc_attributes (
+  void *cls,
+  const struct GNUNET_ShortHashCode *kyc_prox,
+  TALER_EXCHANGEDB_AttributeCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (kyc_prox),
+    GNUNET_PQ_query_param_end
+  };
+  struct GetAttributesContext ctx = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "select_similar_kyc_attributes",
+           "SELECT "
+           " h_payto"
+           ",provider"
+           ",collection_time"
+           ",expiration_time"
+           ",encrypted_attributes"
+           " FROM kyc_attributes"
+           " WHERE kyc_prox=$1");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "select_similar_kyc_attributes",
+    params,
+    &get_attributes_cb,
+    &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_similar_kyc_attributes.h b/src/exchangedb/pg_select_similar_kyc_attributes.h
new file mode 100644
index 000000000..72f2407e8
--- /dev/null
+++ b/src/exchangedb/pg_select_similar_kyc_attributes.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_similar_kyc_attributes.h
+ * @brief implementation of the select_similar_kyc_attributes function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_SIMILAR_KYC_ATTRIBUTES_H
+#define PG_SELECT_SIMILAR_KYC_ATTRIBUTES_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Lookup similar KYC attribute data.
+ *
+ * @param cls closure
+ * @param kyc_prox key for similarity search
+ * @param cb callback to invoke on each match
+ * @param cb_cls closure for @a cb
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_similar_kyc_attributes (
+  void *cls,
+  const struct GNUNET_ShortHashCode *kyc_prox,
+  TALER_EXCHANGEDB_AttributeCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_wire_out_above_serial_id.c b/src/exchangedb/pg_select_wire_out_above_serial_id.c
new file mode 100644
index 000000000..8668c429d
--- /dev/null
+++ b/src/exchangedb/pg_select_wire_out_above_serial_id.c
@@ -0,0 +1,157 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_wire_out_above_serial_id.c
+ * @brief Implementation of the select_wire_out_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_wire_out_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #wire_out_serial_helper_cb().
+ */
+struct WireOutSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_WireTransferOutCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  int status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct WireOutSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+wire_out_serial_helper_cb (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct WireOutSerialContext *wosc = cls;
+  struct PostgresClosure *pg = wosc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct GNUNET_TIME_Timestamp date;
+    struct TALER_WireTransferIdentifierRawP wtid;
+    char *payto_uri;
+    struct TALER_Amount amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("wireout_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &date),
+      GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
+                                            &wtid),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+    int ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      wosc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = wosc->cb (wosc->cb_cls,
+                    rowid,
+                    date,
+                    &wtid,
+                    payto_uri,
+                    &amount);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_wire_out_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WireTransferOutCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct WireOutSerialContext wosc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+  /* Used in #postgres_select_wire_out_above_serial_id() */
+  PREPARE (pg,
+           "audit_get_wire_incr",
+           "SELECT"
+           " wireout_uuid"
+           ",execution_date"
+           ",wtid_raw"
+           ",payto_uri"
+           ",amount"
+           " FROM wire_out"
+           "   JOIN wire_targets"
+           "     USING (wire_target_h_payto)"
+           " WHERE wireout_uuid>=$1"
+           " ORDER BY wireout_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_wire_incr",
+                                             params,
+                                             &wire_out_serial_helper_cb,
+                                             &wosc);
+  if (GNUNET_OK != wosc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_wire_out_above_serial_id.h b/src/exchangedb/pg_select_wire_out_above_serial_id.h
new file mode 100644
index 000000000..e42cb9b0f
--- /dev/null
+++ b/src/exchangedb/pg_select_wire_out_above_serial_id.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_wire_out_above_serial_id.h
+ * @brief implementation of the select_wire_out_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_WIRE_OUT_ABOVE_SERIAL_ID_H
+#define PG_SELECT_WIRE_OUT_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to select all wire transfers the exchange
+ * executed.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_wire_out_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WireTransferOutCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.c b/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.c
new file mode 100644
index 000000000..3448c5a49
--- /dev/null
+++ b/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.c
@@ -0,0 +1,161 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_wire_out_above_serial_id_by_account.c
+ * @brief Implementation of the select_wire_out_above_serial_id_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_wire_out_above_serial_id_by_account.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #wire_out_serial_helper_cb().
+ */
+struct WireOutSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_WireTransferOutCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  int status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct WireOutSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+wire_out_serial_helper_cb (void *cls,
+                           PGresult *result,
+                           unsigned int num_results)
+{
+  struct WireOutSerialContext *wosc = cls;
+  struct PostgresClosure *pg = wosc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    uint64_t rowid;
+    struct GNUNET_TIME_Timestamp date;
+    struct TALER_WireTransferIdentifierRawP wtid;
+    char *payto_uri;
+    struct TALER_Amount amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("wireout_uuid",
+                                    &rowid),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &date),
+      GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
+                                            &wtid),
+      GNUNET_PQ_result_spec_string ("payto_uri",
+                                    &payto_uri),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_end
+    };
+    int ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      wosc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = wosc->cb (wosc->cb_cls,
+                    rowid,
+                    date,
+                    &wtid,
+                    payto_uri,
+                    &amount);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_wire_out_above_serial_id_by_account (
+  void *cls,
+  const char *account_name,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WireTransferOutCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_string (account_name),
+    GNUNET_PQ_query_param_end
+  };
+  struct WireOutSerialContext wosc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "audit_get_wire_incr_by_account",
+           "SELECT"
+           " wireout_uuid"
+           ",execution_date"
+           ",wtid_raw"
+           ",payto_uri"
+           ",amount"
+           " FROM wire_out"
+           "   JOIN wire_targets"
+           "     USING (wire_target_h_payto)"
+           " WHERE "
+           "      wireout_uuid>=$1 "
+           "  AND exchange_account_section=$2"
+           " ORDER BY wireout_uuid ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_wire_incr_by_account",
+                                             params,
+                                             &wire_out_serial_helper_cb,
+                                             &wosc);
+  if (GNUNET_OK != wosc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.h b/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.h
new file mode 100644
index 000000000..04c6a62b2
--- /dev/null
+++ b/src/exchangedb/pg_select_wire_out_above_serial_id_by_account.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_wire_out_above_serial_id_by_account.h
+ * @brief implementation of the select_wire_out_above_serial_id_by_account function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_WIRE_OUT_ABOVE_SERIAL_ID_BY_ACCOUNT_H
+#define PG_SELECT_WIRE_OUT_ABOVE_SERIAL_ID_BY_ACCOUNT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to select all wire transfers the exchange
+ * executed by account.
+ *
+ * @param cls closure
+ * @param account_name account to select
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_wire_out_above_serial_id_by_account (
+  void *cls,
+  const char *account_name,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WireTransferOutCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.c b/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.c
new file mode 100644
index 000000000..71ed81833
--- /dev/null
+++ b/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.c
@@ -0,0 +1,158 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_withdraw_amounts_for_kyc_check.c
+ * @brief Implementation of the select_withdraw_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_withdraw_amounts_for_kyc_check.h"
+#include "pg_select_aggregation_amounts_for_kyc_check.h"
+#include "pg_helper.h"
+
+
+/**
+ * Closure for #get_kyc_amounts_cb().
+ */
+struct KycAmountCheckContext
+{
+  /**
+   * Function to call per result.
+   */
+  TALER_EXCHANGEDB_KycAmountCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Flag set to #GNUNET_OK as long as everything is fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+
+};
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct KycAmountCheckContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+get_kyc_amounts_cb (void *cls,
+                    PGresult *result,
+                    unsigned int num_results)
+{
+  struct KycAmountCheckContext *ctx = cls;
+  struct PostgresClosure *pg = ctx->pg;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    struct GNUNET_TIME_Absolute date;
+    struct TALER_Amount amount;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
+                                   &amount),
+      GNUNET_PQ_result_spec_absolute_time ("date",
+                                           &date),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      ctx->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = ctx->cb (ctx->cb_cls,
+                   &amount,
+                   date);
+    GNUNET_PQ_cleanup_result (rs);
+    switch (ret)
+    {
+    case GNUNET_OK:
+      continue;
+    case GNUNET_NO:
+      break;
+    case GNUNET_SYSERR:
+      ctx->status = GNUNET_SYSERR;
+      break;
+    }
+    break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_withdraw_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_absolute_time (&time_limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct KycAmountCheckContext ctx = {
+    .cb = kac,
+    .cb_cls = kac_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "select_kyc_relevant_withdraw_events",
+           "SELECT"
+           " ro.amount_with_fee AS amount"
+           ",ro.execution_date AS date"
+           " FROM reserves_in ri"
+           " JOIN reserve_history rh"
+           "   ON (rh.reserve_pub = ri.reserve_pub)"
+           " JOIN reserves_out ro"
+           "   ON (ro.reserve_out_serial_id = rh.serial_id)"
+           " WHERE ri.wire_source_h_payto=$1"
+           "   AND rh.table_name='reserves_out'"
+           "   AND ro.execution_date >= $2"
+           " ORDER BY rh.reserve_history_serial_id DESC");
+  qs = GNUNET_PQ_eval_prepared_multi_select (
+    pg->conn,
+    "select_kyc_relevant_withdraw_events",
+    params,
+    &get_kyc_amounts_cb,
+    &ctx);
+  if (GNUNET_OK != ctx.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.h b/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.h
new file mode 100644
index 000000000..9a780adbe
--- /dev/null
+++ b/src/exchangedb/pg_select_withdraw_amounts_for_kyc_check.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_withdraw_amounts_for_kyc_check.h
+ * @brief implementation of the select_withdraw_amounts_for_kyc_check function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_WITHDRAW_AMOUNTS_FOR_KYC_CHECK_H
+#define PG_SELECT_WITHDRAW_AMOUNTS_FOR_KYC_CHECK_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Call @a kac on withdrawn amounts after @a time_limit which are relevant
+ * for a KYC trigger for a the (debited) account identified by @a h_payto.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param time_limit oldest transaction that could be relevant
+ * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+ * @param kac_cls closure for @a kac
+ * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_withdraw_amounts_for_kyc_check (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  struct GNUNET_TIME_Absolute time_limit,
+  TALER_EXCHANGEDB_KycAmountCallback kac,
+  void *kac_cls);
+
+#endif
diff --git a/src/exchangedb/pg_select_withdrawals_above_serial_id.c b/src/exchangedb/pg_select_withdrawals_above_serial_id.c
new file mode 100644
index 000000000..9beb0f936
--- /dev/null
+++ b/src/exchangedb/pg_select_withdrawals_above_serial_id.c
@@ -0,0 +1,170 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_withdrawals_above_serial_id.c
+ * @brief Implementation of the select_withdrawals_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_select_withdrawals_above_serial_id.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #reserves_out_serial_helper_cb().
+ */
+struct ReservesOutSerialContext
+{
+
+  /**
+   * Callback to call.
+   */
+  TALER_EXCHANGEDB_WithdrawCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Plugin context.
+   */
+  struct PostgresClosure *pg;
+
+  /**
+   * Status code, set to #GNUNET_SYSERR on hard errors.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Helper function to be called with the results of a SELECT statement
+ * that has returned @a num_results results.
+ *
+ * @param cls closure of type `struct ReservesOutSerialContext`
+ * @param result the postgres result
+ * @param num_results the number of results in @a result
+ */
+static void
+reserves_out_serial_helper_cb (void *cls,
+                               PGresult *result,
+                               unsigned int num_results)
+{
+  struct ReservesOutSerialContext *rosc = cls;
+  struct PostgresClosure *pg = rosc->pg;
+
+  for (unsigned int i = 0; i<num_results; i++)
+  {
+    struct TALER_BlindedCoinHashP h_blind_ev;
+    struct TALER_DenominationPublicKey denom_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_ReserveSignatureP reserve_sig;
+    struct GNUNET_TIME_Timestamp execution_date;
+    struct TALER_Amount amount_with_fee;
+    uint64_t rowid;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
+                                            &h_blind_ev),
+      TALER_PQ_result_spec_denom_pub ("denom_pub",
+                                      &denom_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
+                                            &reserve_pub),
+      GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
+                                            &reserve_sig),
+      GNUNET_PQ_result_spec_timestamp ("execution_date",
+                                       &execution_date),
+      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
+                                   &amount_with_fee),
+      GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
+                                    &rowid),
+      GNUNET_PQ_result_spec_end
+    };
+    enum GNUNET_GenericReturnValue ret;
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      rosc->status = GNUNET_SYSERR;
+      return;
+    }
+    ret = rosc->cb (rosc->cb_cls,
+                    rowid,
+                    &h_blind_ev,
+                    &denom_pub,
+                    &reserve_pub,
+                    &reserve_sig,
+                    execution_date,
+                    &amount_with_fee);
+    GNUNET_PQ_cleanup_result (rs);
+    if (GNUNET_OK != ret)
+      break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_withdrawals_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WithdrawCallback cb,
+  void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&serial_id),
+    GNUNET_PQ_query_param_end
+  };
+  struct ReservesOutSerialContext rosc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .pg = pg,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  /* Fetch deposits with rowid '\geq' the given parameter */
+  PREPARE (pg,
+           "audit_get_reserves_out_incr",
+           "SELECT"
+           " h_blind_ev"
+           ",denom.denom_pub"
+           ",reserve_sig"
+           ",reserves.reserve_pub"
+           ",execution_date"
+           ",amount_with_fee"
+           ",reserve_out_serial_id"
+           " FROM reserves_out"
+           "    JOIN reserves"
+           "      USING (reserve_uuid)"
+           "    JOIN denominations denom"
+           "      USING (denominations_serial)"
+           " WHERE reserve_out_serial_id>=$1"
+           " ORDER BY reserve_out_serial_id ASC;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "audit_get_reserves_out_incr",
+                                             params,
+                                             &reserves_out_serial_helper_cb,
+                                             &rosc);
+  if (GNUNET_OK != rosc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_select_withdrawals_above_serial_id.h b/src/exchangedb/pg_select_withdrawals_above_serial_id.h
new file mode 100644
index 000000000..2b741a3b4
--- /dev/null
+++ b/src/exchangedb/pg_select_withdrawals_above_serial_id.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_select_withdrawals_above_serial_id.h
+ * @brief implementation of the select_withdrawals_above_serial_id function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_WITHDRAWALS_ABOVE_SERIAL_ID_H
+#define PG_SELECT_WITHDRAWALS_ABOVE_SERIAL_ID_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Select withdraw operations from reserves_out above @a serial_id
+ * in monotonically increasing order.
+ *
+ * @param cls closure
+ * @param serial_id highest serial ID to exclude (select strictly larger)
+ * @param cb function to call on each result
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_select_withdrawals_above_serial_id (
+  void *cls,
+  uint64_t serial_id,
+  TALER_EXCHANGEDB_WithdrawCallback cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_set_extension_manifest.c b/src/exchangedb/pg_set_extension_manifest.c
new file mode 100644
index 000000000..c7db04312
--- /dev/null
+++ b/src/exchangedb/pg_set_extension_manifest.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_set_extension_manifest.c
+ * @brief Implementation of the set_extension_manifest function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_set_extension_manifest.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_set_extension_manifest (void *cls,
+                               const char *extension_name,
+                               const char *manifest)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam pcfg =
+    (NULL == manifest || 0 == *manifest)
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (manifest);
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (extension_name),
+    pcfg,
+    GNUNET_PQ_query_param_end
+  };
+
+
+  PREPARE (pg,
+           "set_extension_manifest",
+           "INSERT INTO extensions (name, manifest) VALUES ($1, $2) "
+           "ON CONFLICT (name) "
+           "DO UPDATE SET manifest=$2");
+
+
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "set_extension_manifest",
+                                             params);
+}
diff --git a/src/exchangedb/pg_set_extension_manifest.h b/src/exchangedb/pg_set_extension_manifest.h
new file mode 100644
index 000000000..0befeedd8
--- /dev/null
+++ b/src/exchangedb/pg_set_extension_manifest.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_set_extension_manifest.h
+ * @brief implementation of the set_extension_manifest function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SET_EXTENSION_MANIFEST_H
+#define PG_SET_EXTENSION_MANIFEST_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to save the manifest of an extension
+ * (age-restriction, policy_extension_...) After successful storage of the
+ * configuration it triggers the corresponding event.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param extension_name the name of the extension
+ * @param manifest JSON object of the configuration as string
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_set_extension_manifest (void *cls,
+                               const char *extension_name,
+                               const char *manifest);
+
+#endif
diff --git a/src/exchangedb/pg_set_purse_balance.c b/src/exchangedb/pg_set_purse_balance.c
new file mode 100644
index 000000000..1e34ea6ed
--- /dev/null
+++ b/src/exchangedb/pg_set_purse_balance.c
@@ -0,0 +1,52 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_set_purse_balance.c
+ * @brief Implementation of the set_purse_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_set_purse_balance.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_set_purse_balance (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (purse_pub),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 balance),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "set_purse_balance",
+           "UPDATE purse_requests"
+           " SET balance=$2"
+           " WHERE purse_pub=$1;");
+
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "set_purse_balance",
+                                             params);
+}
diff --git a/src/exchangedb/pg_set_purse_balance.h b/src/exchangedb/pg_set_purse_balance.h
new file mode 100644
index 000000000..44b765568
--- /dev/null
+++ b/src/exchangedb/pg_set_purse_balance.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_set_purse_balance.h
+ * @brief implementation of the set_purse_balance function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SET_PURSE_BALANCE_H
+#define PG_SET_PURSE_BALANCE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Set the current @a balance in the purse
+ * identified by @a purse_pub. Used by the auditor
+ * to update the balance as calculated by the auditor.
+ *
+ * @param cls closure
+ * @param purse_pub public key of a purse
+ * @param balance new balance to store under the purse
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_set_purse_balance (
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance);
+
+#endif
diff --git a/src/exchangedb/pg_setup_wire_target.c b/src/exchangedb/pg_setup_wire_target.c
new file mode 100644
index 000000000..ed6fbe338
--- /dev/null
+++ b/src/exchangedb/pg_setup_wire_target.c
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_setup_wire_target.c
+ * @brief Implementation of the setup_wire_target function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_setup_wire_target.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_setup_wire_target (
+  struct PostgresClosure *pg,
+  const char *payto_uri,
+  struct TALER_PaytoHashP *h_payto)
+{
+  struct GNUNET_PQ_QueryParam iparams[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+
+  TALER_payto_hash (payto_uri,
+                    h_payto);
+
+  PREPARE (pg,
+           "insert_kyc_status",
+           "INSERT INTO wire_targets"
+           "  (wire_target_h_payto"
+           "  ,payto_uri"
+           "  ) VALUES "
+           "  ($1, $2)"
+           " ON CONFLICT DO NOTHING");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_kyc_status",
+                                             iparams);
+}
diff --git a/src/exchangedb/pg_setup_wire_target.h b/src/exchangedb/pg_setup_wire_target.h
new file mode 100644
index 000000000..77512a600
--- /dev/null
+++ b/src/exchangedb/pg_setup_wire_target.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_setup_wire_target.h
+ * @brief implementation of the setup_wire_target function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SETUP_WIRE_TARGET_H
+#define PG_SETUP_WIRE_TARGET_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "pg_helper.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Setup new wire target for @a payto_uri.
+ *
+ * @param pg the plugin-specific state
+ * @param payto_uri the payto URI to check
+ * @param[out] h_payto set to the hash of @a payto_uri
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_setup_wire_target (
+  struct PostgresClosure *pg,
+  const char *payto_uri,
+  struct TALER_PaytoHashP *h_payto);
+
+#endif
diff --git a/src/exchangedb/pg_start.c b/src/exchangedb/pg_start.c
new file mode 100644
index 000000000..de5d698f6
--- /dev/null
+++ b/src/exchangedb/pg_start.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start.c
+ * @brief Implementation of the start function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_preflight.h"
+#include "pg_start.h"
+#include "pg_helper.h"
+
+enum GNUNET_GenericReturnValue
+TEH_PG_start (void *cls,
+              const char *name)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("START TRANSACTION ISOLATION LEVEL SERIALIZABLE"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  GNUNET_assert (NULL != name);
+  if (GNUNET_SYSERR ==
+      TEH_PG_preflight (pg))
+    return GNUNET_SYSERR;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting transaction `%s'\n",
+              name);
+  if (GNUNET_OK !=
+      GNUNET_PQ_exec_statements (pg->conn,
+                                 es))
+  {
+    TALER_LOG_ERROR ("Failed to start transaction\n");
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  pg->transaction_name = name;
+  return GNUNET_OK;
+}
diff --git a/src/exchangedb/pg_start.h b/src/exchangedb/pg_start.h
new file mode 100644
index 000000000..0a3bb9e43
--- /dev/null
+++ b/src/exchangedb/pg_start.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start.h
+ * @brief implementation of the start function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_START_H
+#define PG_START_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Start a transaction.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param name unique name identifying the transaction (for debugging)
+ *             must point to a constant
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_start (void *cls,
+              const char *name);
+
+#endif
diff --git a/src/exchangedb/pg_start_deferred_wire_out.c b/src/exchangedb/pg_start_deferred_wire_out.c
new file mode 100644
index 000000000..abdc16028
--- /dev/null
+++ b/src/exchangedb/pg_start_deferred_wire_out.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_deferred_wire_out.c
+ * @brief Implementation of the start_deferred_wire_out function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_start_deferred_wire_out.h"
+#include "pg_helper.h"
+#include "pg_preflight.h"
+#include "pg_rollback.h"
+
+enum GNUNET_GenericReturnValue
+TEH_PG_start_deferred_wire_out (void *cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute (
+      "START TRANSACTION ISOLATION LEVEL READ COMMITTED;"),
+    GNUNET_PQ_make_execute ("SET CONSTRAINTS ALL DEFERRED;"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  if (GNUNET_SYSERR ==
+      TEH_PG_preflight (pg))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK !=
+      GNUNET_PQ_exec_statements (pg->conn,
+                                 es))
+  {
+    TALER_LOG_ERROR (
+      "Failed to defer wire_out_ref constraint on transaction\n");
+    GNUNET_break (0);
+    TEH_PG_rollback (pg);
+    return GNUNET_SYSERR;
+  }
+  pg->transaction_name = "deferred wire out";
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting READ COMMITTED DEFERRED transaction `%s'\n",
+              pg->transaction_name);
+  return GNUNET_OK;
+}
diff --git a/src/exchangedb/pg_start_deferred_wire_out.h b/src/exchangedb/pg_start_deferred_wire_out.h
new file mode 100644
index 000000000..ed444ef70
--- /dev/null
+++ b/src/exchangedb/pg_start_deferred_wire_out.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_deferred_wire_out.h
+ * @brief implementation of the start_deferred_wire_out function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_START_DEFERRED_WIRE_OUT_H
+#define PG_START_DEFERRED_WIRE_OUT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Starts a READ COMMITTED transaction where we transiently violate the foreign
+ * constraints on the "wire_out" table as we insert aggregations
+ * and only add the wire transfer out at the end.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_start_deferred_wire_out (void *cls);
+
+#endif
diff --git a/src/exchangedb/pg_start_read_committed.c b/src/exchangedb/pg_start_read_committed.c
new file mode 100644
index 000000000..1c8248ab0
--- /dev/null
+++ b/src/exchangedb/pg_start_read_committed.c
@@ -0,0 +1,56 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_read_committed.c
+ * @brief Implementation of the start_read_committed function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_start_read_committed.h"
+#include "pg_preflight.h"
+#include "pg_helper.h"
+
+enum GNUNET_GenericReturnValue
+TEH_PG_start_read_committed (void *cls,
+                             const char *name)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("START TRANSACTION ISOLATION LEVEL READ COMMITTED"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  GNUNET_assert (NULL != name);
+  if (GNUNET_SYSERR ==
+      TEH_PG_preflight (pg))
+    return GNUNET_SYSERR;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting READ COMMITTED transaction `%s`\n",
+              name);
+  if (GNUNET_OK !=
+      GNUNET_PQ_exec_statements (pg->conn,
+                                 es))
+  {
+    TALER_LOG_ERROR ("Failed to start transaction\n");
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  pg->transaction_name = name;
+  return GNUNET_OK;
+}
diff --git a/src/exchangedb/pg_start_read_committed.h b/src/exchangedb/pg_start_read_committed.h
new file mode 100644
index 000000000..08b60e688
--- /dev/null
+++ b/src/exchangedb/pg_start_read_committed.h
@@ -0,0 +1,39 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_read_committed.h
+ * @brief implementation of the start_read_committed function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_START_READ_COMMITTED_H
+#define PG_START_READ_COMMITTED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Start a READ COMMITTED transaction.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param name unique name identifying the transaction (for debugging)
+ *             must point to a constant
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_start_read_committed (void *cls,
+                             const char *name);
+
+#endif
diff --git a/src/exchangedb/pg_start_read_only.c b/src/exchangedb/pg_start_read_only.c
new file mode 100644
index 000000000..741d94ba1
--- /dev/null
+++ b/src/exchangedb/pg_start_read_only.c
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_read_only.c
+ * @brief Implementation of the start_read_only function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_start_read_only.h"
+#include "pg_preflight.h"
+#include "pg_helper.h"
+
+enum GNUNET_GenericReturnValue
+TEH_PG_start_read_only (void *cls,
+                        const char *name)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute (
+      "START TRANSACTION ISOLATION LEVEL SERIALIZABLE READ ONLY"),
+    GNUNET_PQ_EXECUTE_STATEMENT_END
+  };
+
+  GNUNET_assert (NULL != name);
+  if (GNUNET_SYSERR ==
+      TEH_PG_preflight (pg))
+    return GNUNET_SYSERR;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting READ ONLY transaction `%s`\n",
+              name);
+  if (GNUNET_OK !=
+      GNUNET_PQ_exec_statements (pg->conn,
+                                 es))
+  {
+    TALER_LOG_ERROR ("Failed to start transaction\n");
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  pg->transaction_name = name;
+  return GNUNET_OK;
+}
diff --git a/src/exchangedb/pg_start_read_only.h b/src/exchangedb/pg_start_read_only.h
new file mode 100644
index 000000000..bf639c19b
--- /dev/null
+++ b/src/exchangedb/pg_start_read_only.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_start_read_only.h
+ * @brief implementation of the start_read_only function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_START_READ_ONLY_H
+#define PG_START_READ_ONLY_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Start a READ ONLY serializable transaction.
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param name unique name identifying the transaction (for debugging)
+ *             must point to a constant
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TEH_PG_start_read_only (void *cls,
+                        const char *name);
+
+#endif
diff --git a/src/exchangedb/pg_store_wire_transfer_out.c b/src/exchangedb/pg_store_wire_transfer_out.c
new file mode 100644
index 000000000..337dc5855
--- /dev/null
+++ b/src/exchangedb/pg_store_wire_transfer_out.c
@@ -0,0 +1,61 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_store_wire_transfer_out.c
+ * @brief Implementation of the store_wire_transfer_out function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_store_wire_transfer_out.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_store_wire_transfer_out (
+  void *cls,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *exchange_account_section,
+  const struct TALER_Amount *amount)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_timestamp (&date),
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_string (exchange_account_section),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 amount),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "insert_wire_out",
+           "INSERT INTO wire_out "
+           "(execution_date"
+           ",wtid_raw"
+           ",wire_target_h_payto"
+           ",exchange_account_section"
+           ",amount"
+           ") VALUES "
+           "($1, $2, $3, $4, $5);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "insert_wire_out",
+                                             params);
+}
diff --git a/src/exchangedb/pg_store_wire_transfer_out.h b/src/exchangedb/pg_store_wire_transfer_out.h
new file mode 100644
index 000000000..79950e65a
--- /dev/null
+++ b/src/exchangedb/pg_store_wire_transfer_out.h
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_store_wire_transfer_out.h
+ * @brief implementation of the store_wire_transfer_out function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_STORE_WIRE_TRANSFER_OUT_H
+#define PG_STORE_WIRE_TRANSFER_OUT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Store information about an outgoing wire transfer that was executed.
+ *
+ * @param cls closure
+ * @param date time of the wire transfer
+ * @param wtid subject of the wire transfer
+ * @param h_payto identifies the receiver account of the wire transfer
+ * @param exchange_account_section configuration section of the exchange specifying the
+ *        exchange's bank account being used
+ * @param amount amount that was transmitted
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_store_wire_transfer_out (
+  void *cls,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *exchange_account_section,
+  const struct TALER_Amount *amount);
+
+#endif
diff --git a/src/exchangedb/pg_template.c b/src/exchangedb/pg_template.c
new file mode 100644
index 000000000..69cd45035
--- /dev/null
+++ b/src/exchangedb/pg_template.c
@@ -0,0 +1,26 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_template.c
+ * @brief Implementation of the template function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_template.h"
+#include "pg_helper.h"
diff --git a/src/exchangedb/pg_template.h b/src/exchangedb/pg_template.h
new file mode 100644
index 000000000..d858689fb
--- /dev/null
+++ b/src/exchangedb/pg_template.h
@@ -0,0 +1,29 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_template.h
+ * @brief implementation of the template function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_TEMPLATE_H
+#define PG_TEMPLATE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+#endif
diff --git a/src/exchangedb/pg_template.sh b/src/exchangedb/pg_template.sh
new file mode 100755
index 000000000..73bd7e989
--- /dev/null
+++ b/src/exchangedb/pg_template.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# This file is in the public domain.
+#
+# Instantiates pg_template for a particular function.
+
+for n in $*
+do
+    NCAPS=`echo $n | tr a-z A-Z`
+    if test ! -e pg_$n.c
+    then
+        cat pg_template.c | sed -e s/template/$n/g -e s/TEMPLATE/$NCAPS/g > pg_$n.c
+        cat pg_template.h | sed -e s/template/$n/g -e s/TEMPLATE/$NCAPS/g > pg_$n.h
+        echo "  plugin->$n\n    = &TEH_PG_$n;" >> tmpl.c
+        echo "#include \"pg_$n.h\"" >> tmpl.inc
+        echo "  pg_$n.h pg_$n.c \\" >> tmpl.am
+    fi
+done
+
+echo "Add lines from tmpl.am to Makefile.am"
+echo "Add lines from tmpl.inc to plugin_exchangedb_postgres.c at the beginning"
+echo "Add lines from tmpl.c to plugin_exchangedb_postgres.c at the end"
diff --git a/src/exchangedb/pg_test_aml_officer.c b/src/exchangedb/pg_test_aml_officer.c
new file mode 100644
index 000000000..b00828244
--- /dev/null
+++ b/src/exchangedb/pg_test_aml_officer.c
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_test_aml_officer.c
+ * @brief Implementation of the test_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_test_aml_officer.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_test_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (decider_pub),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "test_aml_staff",
+           "SELECT 1 FROM aml_staff"
+           " WHERE decider_pub=$1"
+           "   AND is_active;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "test_aml_staff",
+                                             params);
+}
diff --git a/src/exchangedb/pg_test_aml_officer.h b/src/exchangedb/pg_test_aml_officer.h
new file mode 100644
index 000000000..e034007bd
--- /dev/null
+++ b/src/exchangedb/pg_test_aml_officer.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_test_aml_officer.h
+ * @brief implementation of the test_aml_officer function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_TEST_AML_OFFICER_H
+#define PG_TEST_AML_OFFICER_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Test if the given AML staff member is active
+ * (at least read-only).
+ *
+ * @param cls closure
+ * @param decider_pub public key of the staff member
+ * @return database transaction status, if member is unknown or not active, 1 if member is active
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_test_aml_officer (
+  void *cls,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub);
+
+
+#endif
diff --git a/src/exchangedb/pg_trigger_aml_process.c b/src/exchangedb/pg_trigger_aml_process.c
new file mode 100644
index 000000000..7534fe3df
--- /dev/null
+++ b/src/exchangedb/pg_trigger_aml_process.c
@@ -0,0 +1,58 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_trigger_aml_process.c
+ * @brief Implementation of the trigger_aml_process function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_trigger_aml_process.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_trigger_aml_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *threshold_crossed)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    TALER_PQ_query_param_amount (pg->conn,
+                                 threshold_crossed),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "trigger_aml_process",
+           "INSERT INTO aml_status"
+           "(h_payto"
+           ",threshold"
+           ",status)"
+           " VALUES"
+           " ($1, $2, 1)" // 1: decision needed
+           " ON CONFLICT (h_payto) DO"
+           " UPDATE SET"
+           "   threshold=$2"
+           "  ,status=aml_status.status | 1;"); // do not clear 'frozen' status
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "trigger_aml_process",
+                                             params);
+}
diff --git a/src/exchangedb/pg_trigger_aml_process.h b/src/exchangedb/pg_trigger_aml_process.h
new file mode 100644
index 000000000..2283571af
--- /dev/null
+++ b/src/exchangedb/pg_trigger_aml_process.h
@@ -0,0 +1,45 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_trigger_aml_process.h
+ * @brief implementation of the trigger_aml_process function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_TRIGGER_AML_PROCESS_H
+#define PG_TRIGGER_AML_PROCESS_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Trigger AML process, an account has crossed the threshold. Inserts or
+ * updates the AML status.
+ *
+ * @param cls closure
+ * @param h_payto account for which the attribute data is stored
+ * @param threshold_crossed existing threshold that was crossed
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_trigger_aml_process (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *threshold_crossed);
+
+
+#endif
diff --git a/src/exchangedb/pg_update_aggregation_transient.c b/src/exchangedb/pg_update_aggregation_transient.c
new file mode 100644
index 000000000..38b65316e
--- /dev/null
+++ b/src/exchangedb/pg_update_aggregation_transient.c
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_aggregation_transient.c
+ * @brief Implementation of the update_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_aggregation_transient.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t kyc_requirement_row,
+  const struct TALER_Amount *total)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    TALER_PQ_query_param_amount (pg->conn,
+                                 total),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    GNUNET_PQ_query_param_auto_from_type (wtid),
+    GNUNET_PQ_query_param_uint64 (&kyc_requirement_row),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "update_aggregation_transient",
+           "UPDATE aggregation_transient"
+           " SET amount=$1"
+           "    ,legitimization_requirement_serial_id=$4"
+           " WHERE wire_target_h_payto=$2"
+           "   AND wtid_raw=$3");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "update_aggregation_transient",
+                                             params);
+}
diff --git a/src/exchangedb/pg_update_aggregation_transient.h b/src/exchangedb/pg_update_aggregation_transient.h
new file mode 100644
index 000000000..c444e85bb
--- /dev/null
+++ b/src/exchangedb/pg_update_aggregation_transient.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_aggregation_transient.h
+ * @brief implementation of the update_aggregation_transient function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_AGGREGATION_TRANSIENT_H
+#define PG_UPDATE_AGGREGATION_TRANSIENT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Update existing entry in the transient aggregation table.
+ * @a h_payto is only needed for query performance.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto destination of the wire transfer
+ * @param wtid the raw wire transfer identifier to update
+ * @param kyc_requirement_row row in legitimization_requirements that need to be satisfied to continue, or 0 for none
+ * @param total new total amount to be wired in the future
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_aggregation_transient (
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t kyc_requirement_row,
+  const struct TALER_Amount *total);
+
+#endif
diff --git a/src/exchangedb/pg_update_auditor.c b/src/exchangedb/pg_update_auditor.c
new file mode 100644
index 000000000..167a270b9
--- /dev/null
+++ b/src/exchangedb/pg_update_auditor.c
@@ -0,0 +1,59 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_auditor.c
+ * @brief Implementation of the update_auditor function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_auditor.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_auditor (void *cls,
+                       const struct TALER_AuditorPublicKeyP *auditor_pub,
+                       const char *auditor_url,
+                       const char *auditor_name,
+                       struct GNUNET_TIME_Timestamp change_date,
+                       bool enabled)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
+    GNUNET_PQ_query_param_string (auditor_url),
+    GNUNET_PQ_query_param_string (auditor_name),
+    GNUNET_PQ_query_param_bool (enabled),
+    GNUNET_PQ_query_param_timestamp (&change_date),
+    GNUNET_PQ_query_param_end
+  };
+  /* used in #postgres_update_auditor() */
+  PREPARE (pg,
+           "update_auditor",
+           "UPDATE auditors"
+           " SET"
+           "  auditor_url=$2"
+           " ,auditor_name=$3"
+           " ,is_active=$4"
+           " ,last_change=$5"
+           " WHERE auditor_pub=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "update_auditor",
+                                             params);
+}
diff --git a/src/exchangedb/pg_update_auditor.h b/src/exchangedb/pg_update_auditor.h
new file mode 100644
index 000000000..ee869f8b7
--- /dev/null
+++ b/src/exchangedb/pg_update_auditor.h
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_auditor.h
+ * @brief implementation of the update_auditor function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_AUDITOR_H
+#define PG_UPDATE_AUDITOR_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+/**
+ * Update information about an auditor that will audit this exchange.
+ *
+ * @param cls closure
+ * @param auditor_pub key of the auditor (primary key for the existing record)
+ * @param auditor_url base URL of the auditor's REST service, to be updated
+ * @param auditor_name name of the auditor (for humans)
+ * @param change_date date when the auditor status was last changed
+ *                      (only to be used for replay detection)
+ * @param enabled true to enable, false to disable
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_auditor (void *cls,
+                       const struct TALER_AuditorPublicKeyP *auditor_pub,
+                       const char *auditor_url,
+                       const char *auditor_name,
+                       struct GNUNET_TIME_Timestamp change_date,
+                       bool enabled);
+
+#endif
diff --git a/src/exchangedb/pg_update_kyc_process_by_row.c b/src/exchangedb/pg_update_kyc_process_by_row.c
new file mode 100644
index 000000000..c339436a8
--- /dev/null
+++ b/src/exchangedb/pg_update_kyc_process_by_row.c
@@ -0,0 +1,122 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_kyc_process_by_row.c
+ * @brief Implementation of the update_kyc_process_by_row function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_kyc_process_by_row.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_kyc_process_by_row (
+  void *cls,
+  uint64_t process_row,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  const char *redirect_url,
+  struct GNUNET_TIME_Absolute expiration)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&process_row),
+    GNUNET_PQ_query_param_string (provider_section),
+    GNUNET_PQ_query_param_auto_from_type (h_payto),
+    (NULL != provider_account_id)
+    ? GNUNET_PQ_query_param_string (provider_account_id)
+    : GNUNET_PQ_query_param_null (),
+    (NULL != provider_legitimization_id)
+    ? GNUNET_PQ_query_param_string (provider_legitimization_id)
+    : GNUNET_PQ_query_param_null (),
+    (NULL != redirect_url)
+    ? GNUNET_PQ_query_param_string (redirect_url)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_absolute_time (&expiration),
+    GNUNET_PQ_query_param_end
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Updating KYC data for %llu (%s)\n",
+              (unsigned long long) process_row,
+              provider_section);
+  PREPARE (pg,
+           "update_legitimization_process",
+           "UPDATE legitimization_processes"
+           " SET provider_user_id=$4"
+           "    ,provider_legitimization_id=$5"
+           "    ,redirect_url=$6"
+           "    ,expiration_time=GREATEST(expiration_time,$7)"
+           " WHERE"
+           "      h_payto=$3"
+           "  AND legitimization_process_serial_id=$1"
+           "  AND provider_section=$2;");
+  qs = GNUNET_PQ_eval_prepared_non_select (
+    pg->conn,
+    "update_legitimization_process",
+    params);
+  if (qs <= 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to update legitimization process %llu: %d\n",
+                (unsigned long long) process_row,
+                qs);
+    return qs;
+  }
+  if (GNUNET_TIME_absolute_is_future (expiration))
+  {
+    enum GNUNET_DB_QueryStatus qs2;
+    struct TALER_KycCompletedEventP rep = {
+      .header.size = htons (sizeof (rep)),
+      .header.type = htons (TALER_DBEVENT_EXCHANGE_KYC_COMPLETED),
+      .h_payto = *h_payto
+    };
+    uint32_t trigger_type = 1;
+    struct GNUNET_PQ_QueryParam params2[] = {
+      GNUNET_PQ_query_param_auto_from_type (h_payto),
+      GNUNET_PQ_query_param_uint32 (&trigger_type),
+      GNUNET_PQ_query_param_end
+    };
+
+    GNUNET_PQ_event_notify (pg->conn,
+                            &rep.header,
+                            NULL,
+                            0);
+    PREPARE (pg,
+             "alert_kyc_status_change",
+             "INSERT INTO kyc_alerts"
+             " (h_payto"
+             " ,trigger_type)"
+             " VALUES"
+             " ($1,$2);");
+    qs2 = GNUNET_PQ_eval_prepared_non_select (
+      pg->conn,
+      "alert_kyc_status_change",
+      params2);
+    if (qs2 < 0)
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to store KYC alert: %d\n",
+                  qs2);
+  }
+  return qs;
+}
diff --git a/src/exchangedb/pg_update_kyc_process_by_row.h b/src/exchangedb/pg_update_kyc_process_by_row.h
new file mode 100644
index 000000000..7ef5285e9
--- /dev/null
+++ b/src/exchangedb/pg_update_kyc_process_by_row.h
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_kyc_process_by_row.h
+ * @brief implementation of the update_kyc_process_by_row function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_KYC_PROCESS_BY_ROW_H
+#define PG_UPDATE_KYC_PROCESS_BY_ROW_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Update KYC requirement check with provider-linkage and/or
+ * expiration data.
+ *
+ * @param cls closure
+ * @param process_row row to select by
+ * @param provider_section provider that must be checked (technically redundant)
+ * @param h_payto account that must be KYC'ed (helps access by shard, otherwise also redundant)
+ * @param provider_account_id provider account ID
+ * @param provider_legitimization_id provider legitimization ID
+ * @param redirect_url where the user should be redirected to start the KYC process
+ * @param expiration how long is this KYC check set to be valid (in the past if invalid)
+ * @return database transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_kyc_process_by_row (
+  void *cls,
+  uint64_t process_row,
+  const char *provider_section,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_account_id,
+  const char *provider_legitimization_id,
+  const char *redirect_url,
+  struct GNUNET_TIME_Absolute expiration);
+
+#endif
diff --git a/src/exchangedb/pg_update_wire.c b/src/exchangedb/pg_update_wire.c
new file mode 100644
index 000000000..5c4bb9045
--- /dev/null
+++ b/src/exchangedb/pg_update_wire.c
@@ -0,0 +1,81 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022, 2023, 2024 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/>
+ */
+/**
+ * @file exchangedb/pg_update_wire.c
+ * @brief Implementation of the update_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_update_wire.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_wire (void *cls,
+                    const char *payto_uri,
+                    const char *conversion_url,
+                    const json_t *debit_restrictions,
+                    const json_t *credit_restrictions,
+                    struct GNUNET_TIME_Timestamp change_date,
+                    const struct TALER_MasterSignatureP *master_sig,
+                    const char *bank_label,
+                    int64_t priority,
+                    bool enabled)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_bool (enabled),
+    NULL == conversion_url
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (conversion_url),
+    enabled
+    ? TALER_PQ_query_param_json (debit_restrictions)
+    : GNUNET_PQ_query_param_null (),
+    enabled
+    ? TALER_PQ_query_param_json (credit_restrictions)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_timestamp (&change_date),
+    NULL == master_sig
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_auto_from_type (master_sig),
+    NULL == bank_label
+    ? GNUNET_PQ_query_param_null ()
+    : GNUNET_PQ_query_param_string (bank_label),
+    GNUNET_PQ_query_param_int64 (&priority),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "update_wire",
+           "UPDATE wire_accounts"
+           " SET"
+           "  is_active=$2"
+           " ,conversion_url=$3"
+           " ,debit_restrictions=$4"
+           " ,credit_restrictions=$5"
+           " ,last_change=$6"
+           " ,master_sig=$7"
+           " ,bank_label=$8"
+           " ,priority=$9"
+           " WHERE payto_uri=$1");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "update_wire",
+                                             params);
+}
diff --git a/src/exchangedb/pg_update_wire.h b/src/exchangedb/pg_update_wire.h
new file mode 100644
index 000000000..a596a0802
--- /dev/null
+++ b/src/exchangedb/pg_update_wire.h
@@ -0,0 +1,57 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_update_wire.h
+ * @brief implementation of the update_wire function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_UPDATE_WIRE_H
+#define PG_UPDATE_WIRE_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+
+/**
+ * Update information about a wire account of the exchange.
+ *
+ * @param cls closure
+ * @param payto_uri account the update is about
+ * @param conversion_url URL of a conversion service, NULL if there is no conversion
+ * @param debit_restrictions JSON array with debit restrictions on the account; NULL allowed if not @a enabled
+ * @param credit_restrictions JSON array with credit restrictions on the account; NULL allowed if not @a enabled
+ * @param change_date date when the account status was last changed
+ *                      (only to be used for replay detection)
+ * @param master_sig master signature to store, can be NULL (if @a enabled is false)
+ * @param bank_label label to show this entry under in the UI, can be NULL
+ * @param priority determines order in which entries are shown in the UI
+ * @param enabled true to enable, false to disable (the actual change)
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_update_wire (void *cls,
+                    const char *payto_uri,
+                    const char *conversion_url,
+                    const json_t *debit_restrictions,
+                    const json_t *credit_restrictions,
+                    struct GNUNET_TIME_Timestamp change_date,
+                    const struct TALER_MasterSignatureP *master_sig,
+                    const char *bank_label,
+                    int64_t priority,
+                    bool enabled);
+
+#endif
diff --git a/src/exchangedb/pg_wire_prepare_data_get.c b/src/exchangedb/pg_wire_prepare_data_get.c
new file mode 100644
index 000000000..0cc57e41f
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_get.c
@@ -0,0 +1,140 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_get.c
+ * @brief Implementation of the wire_prepare_data_get function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_wire_prepare_data_get.h"
+#include "pg_helper.h"
+
+/**
+ * Closure for #prewire_cb().
+ */
+struct PrewireContext
+{
+  /**
+   * Function to call on each result.
+   */
+  TALER_EXCHANGEDB_WirePreparationIterator cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * #GNUNET_OK if everything went fine.
+   */
+  enum GNUNET_GenericReturnValue status;
+};
+
+
+/**
+ * Invoke the callback for each result.
+ *
+ * @param cls a `struct MissingWireContext *`
+ * @param result SQL result
+ * @param num_results number of rows in @a result
+ */
+static void
+prewire_cb (void *cls,
+            PGresult *result,
+            unsigned int num_results)
+{
+  struct PrewireContext *pc = cls;
+
+  for (unsigned int i = 0; i < num_results; i++)
+  {
+    uint64_t prewire_uuid;
+    char *wire_method;
+    void *buf = NULL;
+    size_t buf_size;
+    struct GNUNET_PQ_ResultSpec rs[] = {
+      GNUNET_PQ_result_spec_uint64 ("prewire_uuid",
+                                    &prewire_uuid),
+      GNUNET_PQ_result_spec_string ("wire_method",
+                                    &wire_method),
+      GNUNET_PQ_result_spec_variable_size ("buf",
+                                           &buf,
+                                           &buf_size),
+      GNUNET_PQ_result_spec_end
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_PQ_extract_result (result,
+                                  rs,
+                                  i))
+    {
+      GNUNET_break (0);
+      pc->status = GNUNET_SYSERR;
+      return;
+    }
+    pc->cb (pc->cb_cls,
+            prewire_uuid,
+            wire_method,
+            buf,
+            buf_size);
+    GNUNET_PQ_cleanup_result (rs);
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_get (void *cls,
+                              uint64_t start_row,
+                              uint64_t limit,
+                              TALER_EXCHANGEDB_WirePreparationIterator cb,
+                              void *cb_cls)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&start_row),
+    GNUNET_PQ_query_param_uint64 (&limit),
+    GNUNET_PQ_query_param_end
+  };
+  struct PrewireContext pc = {
+    .cb = cb,
+    .cb_cls = cb_cls,
+    .status = GNUNET_OK
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  PREPARE (pg,
+           "wire_prepare_data_get",
+           "SELECT"
+           " prewire_uuid"
+           ",wire_method"
+           ",buf"
+           " FROM prewire"
+           " WHERE prewire_uuid >= $1"
+           "   AND finished=FALSE"
+           "   AND failed=FALSE"
+           " ORDER BY prewire_uuid ASC"
+           " LIMIT $2;");
+  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
+                                             "wire_prepare_data_get",
+                                             params,
+                                             &prewire_cb,
+                                             &pc);
+  if (GNUNET_OK != pc.status)
+    return GNUNET_DB_STATUS_HARD_ERROR;
+  return qs;
+}
diff --git a/src/exchangedb/pg_wire_prepare_data_get.h b/src/exchangedb/pg_wire_prepare_data_get.h
new file mode 100644
index 000000000..815c14bdf
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_get.h
@@ -0,0 +1,46 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_get.h
+ * @brief implementation of the wire_prepare_data_get function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_WIRE_PREPARE_DATA_GET_H
+#define PG_WIRE_PREPARE_DATA_GET_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to get an unfinished wire transfer
+ * preparation data. Fetches at most one item.
+ *
+ * @param cls closure
+ * @param start_row offset to query table at
+ * @param limit maximum number of results to return
+ * @param cb function to call for ONE unfinished item
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_get (void *cls,
+                              uint64_t start_row,
+                              uint64_t limit,
+                              TALER_EXCHANGEDB_WirePreparationIterator cb,
+                              void *cb_cls);
+
+#endif
diff --git a/src/exchangedb/pg_wire_prepare_data_insert.c b/src/exchangedb/pg_wire_prepare_data_insert.c
new file mode 100644
index 000000000..919fccdaf
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_insert.c
@@ -0,0 +1,54 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_insert.c
+ * @brief Implementation of the wire_prepare_data_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_wire_prepare_data_insert.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_insert (void *cls,
+                                 const char *type,
+                                 const char *buf,
+                                 size_t buf_size)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (type),
+    GNUNET_PQ_query_param_fixed_size (buf, buf_size),
+    GNUNET_PQ_query_param_end
+  };
+
+
+  /* Used in #postgres_wire_prepare_data_insert() to store
+     wire transfer information before actually committing it with the bank */
+  PREPARE (pg,
+           "wire_prepare_data_insert",
+           "INSERT INTO prewire "
+           "(wire_method"
+           ",buf"
+           ") VALUES "
+           "($1, $2);");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "wire_prepare_data_insert",
+                                             params);
+}
diff --git a/src/exchangedb/pg_wire_prepare_data_insert.h b/src/exchangedb/pg_wire_prepare_data_insert.h
new file mode 100644
index 000000000..e73ee152d
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_insert.h
@@ -0,0 +1,43 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_insert.h
+ * @brief implementation of the wire_prepare_data_insert function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_WIRE_PREPARE_DATA_INSERT_H
+#define PG_WIRE_PREPARE_DATA_INSERT_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to insert wire transfer commit data into the DB.
+ *
+ * @param cls closure
+ * @param type type of the wire transfer (i.e. "iban")
+ * @param buf buffer with wire transfer preparation data
+ * @param buf_size number of bytes in @a buf
+ * @return query status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_insert (void *cls,
+                                 const char *type,
+                                 const char *buf,
+                                 size_t buf_size);
+
+#endif
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_failed.c b/src/exchangedb/pg_wire_prepare_data_mark_failed.c
new file mode 100644
index 000000000..1d46c84d4
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_mark_failed.c
@@ -0,0 +1,48 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_mark_failed.c
+ * @brief Implementation of the wire_prepare_data_mark_failed function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_wire_prepare_data_mark_failed.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_mark_failed (
+  void *cls,
+  uint64_t rowid)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&rowid),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "wire_prepare_data_mark_failed",
+           "UPDATE prewire"
+           " SET failed=TRUE"
+           " WHERE prewire_uuid=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "wire_prepare_data_mark_failed",
+                                             params);
+}
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_failed.h b/src/exchangedb/pg_wire_prepare_data_mark_failed.h
new file mode 100644
index 000000000..98846b284
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_mark_failed.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_mark_failed.h
+ * @brief implementation of the wire_prepare_data_mark_failed function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_WIRE_PREPARE_DATA_MARK_FAILED_H
+#define PG_WIRE_PREPARE_DATA_MARK_FAILED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to mark wire transfer commit data as failed.
+ *
+ * @param cls closure
+ * @param rowid which entry to mark as failed
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_mark_failed (
+  void *cls,
+  uint64_t rowid);
+
+#endif
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_finished.c b/src/exchangedb/pg_wire_prepare_data_mark_finished.c
new file mode 100644
index 000000000..998b9d731
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_mark_finished.c
@@ -0,0 +1,47 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_mark_finished.c
+ * @brief Implementation of the wire_prepare_data_mark_finished function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_error_codes.h"
+#include "taler_dbevents.h"
+#include "taler_pq_lib.h"
+#include "pg_wire_prepare_data_mark_finished.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_mark_finished (
+  void *cls,
+  uint64_t rowid)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint64 (&rowid),
+    GNUNET_PQ_query_param_end
+  };
+
+  PREPARE (pg,
+           "wire_prepare_data_mark_done",
+           "UPDATE prewire"
+           " SET finished=TRUE"
+           " WHERE prewire_uuid=$1;");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "wire_prepare_data_mark_done",
+                                             params);
+}
diff --git a/src/exchangedb/pg_wire_prepare_data_mark_finished.h b/src/exchangedb/pg_wire_prepare_data_mark_finished.h
new file mode 100644
index 000000000..ba2e384cd
--- /dev/null
+++ b/src/exchangedb/pg_wire_prepare_data_mark_finished.h
@@ -0,0 +1,40 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file exchangedb/pg_wire_prepare_data_mark_finished.h
+ * @brief implementation of the wire_prepare_data_mark_finished function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_WIRE_PREPARE_DATA_MARK_FINISHED_H
+#define PG_WIRE_PREPARE_DATA_MARK_FINISHED_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Function called to mark wire transfer commit data as finished.
+ *
+ * @param cls closure
+ * @param rowid which entry to mark as finished
+ * @return transaction status code
+ */
+enum GNUNET_DB_QueryStatus
+TEH_PG_wire_prepare_data_mark_finished (
+  void *cls,
+  uint64_t rowid);
+
+#endif
diff --git a/src/exchangedb/plugin_exchangedb_common.c b/src/exchangedb/plugin_exchangedb_common.c
index a07ae78c1..562710eaa 100644
--- a/src/exchangedb/plugin_exchangedb_common.c
+++ b/src/exchangedb/plugin_exchangedb_common.c
@@ -19,16 +19,14 @@
  *        included in each plugin.
  * @author Christian Grothoff
  */
+#include "platform.h"
+#include "plugin_exchangedb_common.h"
 
-/**
- * Free memory associated with the given reserve history.
- *
- * @param cls the @e cls of this struct with the plugin-specific state (unused)
- * @param rh history to free.
- */
-static void
-common_free_reserve_history (void *cls,
-                             struct TALER_EXCHANGEDB_ReserveHistory *rh)
+
+void
+TEH_COMMON_free_reserve_history (
+  void *cls,
+  struct TALER_EXCHANGEDB_ReserveHistory *rh)
 {
   (void) cls;
   while (NULL != rh)
@@ -71,6 +69,38 @@ common_free_reserve_history (void *cls,
         GNUNET_free (closing);
         break;
       }
+    case TALER_EXCHANGEDB_RO_PURSE_MERGE:
+      {
+        struct TALER_EXCHANGEDB_PurseMerge *merge;
+
+        merge = rh->details.merge;
+        GNUNET_free (merge);
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_HISTORY_REQUEST:
+      {
+        struct TALER_EXCHANGEDB_HistoryRequest *history;
+
+        history = rh->details.history;
+        GNUNET_free (history);
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_OPEN_REQUEST:
+      {
+        struct TALER_EXCHANGEDB_OpenRequest *or;
+
+        or = rh->details.open_request;
+        GNUNET_free (or);
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_CLOSE_REQUEST:
+      {
+        struct TALER_EXCHANGEDB_CloseRequest *cr;
+
+        cr = rh->details.close_request;
+        GNUNET_free (cr);
+        break;
+      }
     }
     {
       struct TALER_EXCHANGEDB_ReserveHistory *next;
@@ -83,15 +113,10 @@ common_free_reserve_history (void *cls,
 }
 
 
-/**
- * Free linked list of transactions.
- *
- * @param cls the @e cls of this struct with the plugin-specific state (unused)
- * @param tl list to free
- */
-static void
-common_free_coin_transaction_list (void *cls,
-                                   struct TALER_EXCHANGEDB_TransactionList *tl)
+void
+TEH_COMMON_free_coin_transaction_list (
+  void *cls,
+  struct TALER_EXCHANGEDB_TransactionList *tl)
 {
   (void) cls;
   while (NULL != tl)
@@ -134,6 +159,31 @@ common_free_coin_transaction_list (void *cls,
         GNUNET_free (rr);
         break;
       }
+    case TALER_EXCHANGEDB_TT_PURSE_DEPOSIT:
+      {
+        struct TALER_EXCHANGEDB_PurseDepositListEntry *deposit;
+
+        deposit = tl->details.purse_deposit;
+        GNUNET_free (deposit->exchange_base_url);
+        GNUNET_free (deposit);
+        break;
+      }
+    case TALER_EXCHANGEDB_TT_PURSE_REFUND:
+      {
+        struct TALER_EXCHANGEDB_PurseRefundListEntry *prefund;
+
+        prefund = tl->details.purse_refund;
+        GNUNET_free (prefund);
+        break;
+      }
+    case TALER_EXCHANGEDB_TT_RESERVE_OPEN:
+      {
+        struct TALER_EXCHANGEDB_ReserveOpenListEntry *role;
+
+        role = tl->details.reserve_open;
+        GNUNET_free (role);
+        break;
+      }
     }
     {
       struct TALER_EXCHANGEDB_TransactionList *next;
diff --git a/src/exchangedb/plugin_exchangedb_common.h b/src/exchangedb/plugin_exchangedb_common.h
new file mode 100644
index 000000000..0355c44ab
--- /dev/null
+++ b/src/exchangedb/plugin_exchangedb_common.h
@@ -0,0 +1,51 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file plugin_exchangedb_common.h
+ * @brief implementation of database-independent functions
+ * @author Christian Grothoff
+ */
+#ifndef PLUGIN_EXCHANGEDB_COMMON_H
+#define PLUGIN_EXCHANGEDB_COMMON_H
+
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+
+/**
+ * Free memory associated with the given reserve history.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state (unused)
+ * @param[in] rh history to free.
+ */
+void
+TEH_COMMON_free_reserve_history (
+  void *cls,
+  struct TALER_EXCHANGEDB_ReserveHistory *rh);
+
+
+/**
+ * Free linked list of transactions.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state (unused)
+ * @param[in] tl list to free
+ */
+void
+TEH_COMMON_free_coin_transaction_list (
+  void *cls,
+  struct TALER_EXCHANGEDB_TransactionList *tl);
+
+#endif
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 2c113cf19..108b55219 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2014--2022 Taler Systems SA
+   Copyright (C) 2014--2023 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
@@ -21,47 +21,213 @@
  * @author Christian Grothoff
  * @author Sree Harsha Totakura
  * @author Marcello Stanisci
+ * @author Özgür Kesim
  */
 #include "platform.h"
+#include <poll.h>
+#include <pthread.h>
+#include <libpq-fe.h>
 #include "taler_error_codes.h"
 #include "taler_dbevents.h"
 #include "taler_pq_lib.h"
 #include "taler_util.h"
 #include "taler_json_lib.h"
 #include "taler_exchangedb_plugin.h"
-#include <poll.h>
-#include <pthread.h>
-#include <libpq-fe.h>
-
-#include "plugin_exchangedb_common.c"
+#include "plugin_exchangedb_common.h"
+#include "pg_delete_aggregation_transient.h"
+#include "pg_get_link_data.h"
+#include "pg_helper.h"
+#include "pg_do_reserve_open.h"
+#include "pg_get_coin_transactions.h"
+#include "pg_get_expired_reserves.h"
+#include "pg_get_purse_request.h"
+#include "pg_get_reserve_history.h"
+#include "pg_get_unfinished_close_requests.h"
+#include "pg_insert_close_request.h"
+#include "pg_insert_records_by_table.h"
+#include "pg_insert_reserve_open_deposit.h"
+#include "pg_get_pending_kyc_requirement_process.h"
+#include "pg_iterate_kyc_reference.h"
+#include "pg_iterate_reserve_close_info.h"
+#include "pg_lookup_records_by_table.h"
+#include "pg_lookup_serial_by_table.h"
+#include "pg_select_account_merges_above_serial_id.h"
+#include "pg_select_aml_threshold.h"
+#include "pg_select_all_purse_decisions_above_serial_id.h"
+#include "pg_select_purse.h"
+#include "pg_select_purse_deposits_above_serial_id.h"
+#include "pg_select_purse_merges_above_serial_id.h"
+#include "pg_select_purse_requests_above_serial_id.h"
+#include "pg_select_reserve_close_info.h"
+#include "pg_select_reserve_closed_above_serial_id.h"
+#include "pg_select_reserve_open_above_serial_id.h"
+#include "pg_insert_purse_request.h"
+#include "pg_iterate_active_signkeys.h"
+#include "pg_preflight.h"
+#include "pg_commit.h"
+#include "pg_drop_tables.h"
+#include "pg_select_satisfied_kyc_processes.h"
+#include "pg_select_aggregation_amounts_for_kyc_check.h"
+#include "pg_kyc_provider_account_lookup.h"
+#include "pg_lookup_kyc_requirement_by_row.h"
+#include "pg_insert_kyc_requirement_for_account.h"
+#include "pg_lookup_kyc_process_by_account.h"
+#include "pg_update_kyc_process_by_row.h"
+#include "pg_insert_kyc_requirement_process.h"
+#include "pg_select_withdraw_amounts_for_kyc_check.h"
+#include "pg_select_merge_amounts_for_kyc_check.h"
+#include "pg_profit_drains_set_finished.h"
+#include "pg_profit_drains_get_pending.h"
+#include "pg_get_drain_profit.h"
+#include "pg_get_purse_deposit.h"
+#include "pg_insert_contract.h"
+#include "pg_insert_kyc_failure.h"
+#include "pg_select_contract.h"
+#include "pg_select_purse_merge.h"
+#include "pg_select_contract_by_purse.h"
+#include "pg_insert_drain_profit.h"
+#include "pg_do_reserve_purse.h"
+#include "pg_lookup_global_fee_by_time.h"
+#include "pg_do_purse_deposit.h"
+#include "pg_activate_signing_key.h"
+#include "pg_update_auditor.h"
+#include "pg_begin_revolving_shard.h"
+#include "pg_get_extension_manifest.h"
+#include "pg_do_purse_delete.h"
+#include "pg_do_purse_merge.h"
+#include "pg_start_read_committed.h"
+#include "pg_start_read_only.h"
+#include "pg_insert_denomination_info.h"
+#include "pg_do_batch_withdraw_insert.h"
+#include "pg_lookup_wire_fee_by_time.h"
+#include "pg_start.h"
+#include "pg_rollback.h"
+#include "pg_create_tables.h"
+#include "pg_event_listen.h"
+#include "pg_event_listen_cancel.h"
+#include "pg_event_notify.h"
+#include "pg_get_denomination_info.h"
+#include "pg_iterate_denomination_info.h"
+#include "pg_iterate_denominations.h"
+#include "pg_iterate_active_auditors.h"
+#include "pg_iterate_auditor_denominations.h"
+#include "pg_reserves_get.h"
+#include "pg_reserves_get_origin.h"
+#include "pg_drain_kyc_alert.h"
+#include "pg_reserves_in_insert.h"
+#include "pg_get_withdraw_info.h"
+#include "pg_get_age_withdraw.h"
+#include "pg_do_batch_withdraw.h"
+#include "pg_do_age_withdraw.h"
+#include "pg_get_policy_details.h"
+#include "pg_persist_policy_details.h"
+#include "pg_do_deposit.h"
+#include "pg_get_wire_hash_for_contract.h"
+#include "pg_add_policy_fulfillment_proof.h"
+#include "pg_do_melt.h"
+#include "pg_do_refund.h"
+#include "pg_do_recoup.h"
+#include "pg_do_recoup_refresh.h"
+#include "pg_get_reserve_balance.h"
+#include "pg_count_known_coins.h"
+#include "pg_ensure_coin_known.h"
+#include "pg_get_known_coin.h"
+#include "pg_get_signature_for_known_coin.h"
+#include "pg_get_coin_denomination.h"
+#include "pg_have_deposit2.h"
+#include "pg_aggregate.h"
+#include "pg_create_aggregation_transient.h"
+#include "pg_select_aggregation_transient.h"
+#include "pg_find_aggregation_transient.h"
+#include "pg_update_aggregation_transient.h"
+#include "pg_get_ready_deposit.h"
+#include "pg_insert_refund.h"
+#include "pg_select_refunds_by_coin.h"
+#include "pg_get_melt.h"
+#include "pg_insert_refresh_reveal.h"
+#include "pg_get_refresh_reveal.h"
+#include "pg_lookup_wire_transfer.h"
+#include "pg_lookup_transfer_by_deposit.h"
+#include "pg_insert_wire_fee.h"
+#include "pg_insert_global_fee.h"
+#include "pg_get_wire_fee.h"
+#include "pg_get_global_fee.h"
+#include "pg_get_global_fees.h"
+#include "pg_insert_reserve_closed.h"
+#include "pg_wire_prepare_data_insert.h"
+#include "pg_wire_prepare_data_mark_finished.h"
+#include "pg_wire_prepare_data_mark_failed.h"
+#include "pg_wire_prepare_data_get.h"
+#include "pg_start_deferred_wire_out.h"
+#include "pg_store_wire_transfer_out.h"
+#include "pg_gc.h"
+#include "pg_inject_auditor_triggers.h"
+#include "pg_select_coin_deposits_above_serial_id.h"
+#include "pg_select_purse_decisions_above_serial_id.h"
+#include "pg_select_purse_deposits_by_purse.h"
+#include "pg_select_refreshes_above_serial_id.h"
+#include "pg_select_refunds_above_serial_id.h"
+#include "pg_select_reserves_in_above_serial_id.h"
+#include "pg_select_reserves_in_above_serial_id_by_account.h"
+#include "pg_select_withdrawals_above_serial_id.h"
+#include "pg_select_wire_out_above_serial_id.h"
+#include "pg_select_wire_out_above_serial_id_by_account.h"
+#include "pg_select_recoup_above_serial_id.h"
+#include "pg_select_recoup_refresh_above_serial_id.h"
+#include "pg_get_reserve_by_h_blind.h"
+#include "pg_get_old_coin_by_h_blind.h"
+#include "pg_insert_denomination_revocation.h"
+#include "pg_get_denomination_revocation.h"
+#include "pg_select_batch_deposits_missing_wire.h"
+#include "pg_select_justification_for_missing_wire.h"
+#include "pg_select_aggregations_above_serial.h"
+#include "pg_lookup_auditor_timestamp.h"
+#include "pg_lookup_auditor_status.h"
+#include "pg_insert_auditor.h"
+#include "pg_lookup_wire_timestamp.h"
+#include "pg_insert_wire.h"
+#include "pg_update_wire.h"
+#include "pg_get_wire_accounts.h"
+#include "pg_get_wire_fees.h"
+#include "pg_insert_signkey_revocation.h"
+#include "pg_lookup_signkey_revocation.h"
+#include "pg_lookup_denomination_key.h"
+#include "pg_insert_auditor_denom_sig.h"
+#include "pg_select_auditor_denom_sig.h"
+#include "pg_add_denomination_key.h"
+#include "pg_lookup_signing_key.h"
+#include "pg_begin_shard.h"
+#include "pg_abort_shard.h"
+#include "pg_complete_shard.h"
+#include "pg_release_revolving_shard.h"
+#include "pg_delete_shard_locks.h"
+#include "pg_set_extension_manifest.h"
+#include "pg_insert_partner.h"
+#include "pg_expire_purse.h"
+#include "pg_select_purse_by_merge_pub.h"
+#include "pg_set_purse_balance.h"
+#include "pg_reserves_update.h"
+#include "pg_setup_wire_target.h"
+#include "pg_compute_shard.h"
+#include "pg_insert_kyc_attributes.h"
+#include "pg_select_similar_kyc_attributes.h"
+#include "pg_select_kyc_attributes.h"
+#include "pg_insert_aml_officer.h"
+#include "pg_test_aml_officer.h"
+#include "pg_lookup_aml_officer.h"
+#include "pg_trigger_aml_process.h"
+#include "pg_select_aml_process.h"
+#include "pg_select_aml_history.h"
+#include "pg_insert_aml_decision.h"
+#include "pg_batch_ensure_coin_known.h"
 
 /**
  * Set to 1 to enable Postgres auto_explain module. This will
  * slow down things a _lot_, but also provide extensive logging
  * in the Postgres database logger for performance analysis.
  */
-#define AUTO_EXPLAIN 1
-
-/**
- * Wrapper macro to add the currency from the plugin's state
- * when fetching amounts from the database.
- *
- * @param field name of the database field to fetch amount from
- * @param[out] amountp pointer to amount to set
- */
-#define TALER_PQ_RESULT_SPEC_AMOUNT(field,amountp) TALER_PQ_result_spec_amount ( \
-    field,pg->currency,amountp)
+#define AUTO_EXPLAIN 0
 
-/**
- * Wrapper macro to add the currency from the plugin's state
- * when fetching amounts from the database.  NBO variant.
- *
- * @param field name of the database field to fetch amount from
- * @param[out] amountp pointer to amount to set
- */
-#define TALER_PQ_RESULT_SPEC_AMOUNT_NBO(field,                          \
-                                        amountp) TALER_PQ_result_spec_amount_nbo ( \
-    field,pg->currency,amountp)
 
 /**
  * Log a really unexpected PQ error with all the details we can get hold of.
@@ -82,3601 +248,13 @@
 
 
 /**
- * Type of the "cls" argument given to each of the functions in
- * our API.
- */
-struct PostgresClosure
-{
-
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Directory with SQL statements to run to create tables.
-   */
-  char *sql_dir;
-
-  /**
-   * After how long should idle reserves be closed?
-   */
-  struct GNUNET_TIME_Relative idle_reserve_expiration_time;
-
-  /**
-   * After how long should reserves that have seen withdraw operations
-   * be garbage collected?
-   */
-  struct GNUNET_TIME_Relative legal_reserve_expiration_time;
-
-  /**
-   * What delay should we introduce before ready transactions
-   * are actually aggregated?
-   */
-  struct GNUNET_TIME_Relative aggregator_shift;
-
-  /**
-   * Which currency should we assume all amounts to be in?
-   */
-  char *currency;
-
-  /**
-   * Our base URL.
-   */
-  char *exchange_url;
-
-  /**
-   * Postgres connection handle.
-   */
-  struct GNUNET_PQ_Context *conn;
-
-  /**
-   * Name of the current transaction, for debugging.
-   */
-  const char *transaction_name;
-
-  /**
-   * Did we initialize the prepared statements
-   * for this session?
-   */
-  bool init;
-
-};
-
-
-/**
- * Drop all Taler tables.  This should only be used by testcases.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_drop_tables (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     "drop",
-                                     NULL,
-                                     NULL);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  if (NULL != pg->conn)
-  {
-    GNUNET_PQ_disconnect (pg->conn);
-    pg->conn = NULL;
-    pg->init = false;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Drop all Taler shard tables.  This should only be used by testcases.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param old_idx the index which was used when the shard database was initialized
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_drop_shard_tables (void *cls,
-                            uint32_t old_idx)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&old_idx),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    GNUNET_PQ_make_prepare ("drop_shard_tables",
-                            "SELECT"
-                            " drop_shard"
-                            " ($1);",
-                            1),
-    GNUNET_PQ_PREPARED_STATEMENT_END
-  };
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     NULL,
-                                     NULL,
-                                     ps);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
-                                              "drop_shard_tables",
-                                              params))
-    ret = GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     "shard-drop",
-                                     NULL,
-                                     NULL);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  if (NULL != pg->conn)
-  {
-    GNUNET_PQ_disconnect (pg->conn);
-    pg->conn = NULL;
-    pg->init = false;
-  }
-  return ret;
-}
-
-
-/**
- * Create the necessary tables if they are not present
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_create_tables (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     "exchange-",
-                                     NULL,
-                                     NULL);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  return GNUNET_OK;
-}
-
-
-/**
- * Create tables of a shard node with index idx
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param idx the shards index, will be appended as suffix to all tables
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_create_shard_tables (void *cls,
-                              uint32_t idx)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&idx),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    GNUNET_PQ_make_prepare ("create_shard_tables",
-                            "SELECT"
-                            " setup_shard"
-                            " ($1);",
-                            1),
-    GNUNET_PQ_PREPARED_STATEMENT_END
-  };
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     "shard-",
-                                     NULL,
-                                     ps);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
-                                              "create_shard_tables",
-                                              params))
-    ret = GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  return ret;
-}
-
-
-/**
- * Setup partitions of already existing tables
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param num the number of partitions to create for each partitioned table
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_setup_partitions (void *cls,
-                           uint32_t num)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&num),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    GNUNET_PQ_make_prepare ("setup_partitions",
-                            "SELECT"
-                            " create_partitions"
-                            " ($1);",
-                            1),
-    GNUNET_PQ_PREPARED_STATEMENT_END
-  };
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     NULL,
-                                     NULL,
-                                     ps);
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  ret = GNUNET_OK;
-  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
-                                              "setup_partitions",
-                                              params))
-    ret = GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  return ret;
-}
-
-
-/**
- * Setup foreign servers (shards) for already existing tables
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param num the number of foreign servers (shards) to create for each partitioned table
- * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
- */
-static enum GNUNET_GenericReturnValue
-postgres_setup_foreign_servers (void *cls,
-                                uint32_t num)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_Context *conn;
-  enum GNUNET_GenericReturnValue ret = GNUNET_OK;
-  char *shard_domain = NULL;
-  char *remote_user = NULL;
-  char *remote_user_pw = NULL;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (pg->cfg,
-                                             "exchange",
-                                             "SHARD_DOMAIN",
-                                             &shard_domain))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "SHARD_DOMAIN");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (pg->cfg,
-                                             "exchangedb-postgres",
-                                             "SHARD_REMOTE_USER",
-                                             &remote_user))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchangedb-postgres",
-                               "SHARD_REMOTE_USER");
-    GNUNET_free (shard_domain);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (pg->cfg,
-                                             "exchangedb-postgres",
-                                             "SHARD_REMOTE_USER_PW",
-                                             &remote_user_pw))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchangedb-postgres",
-                               "SHARD_REMOTE_USER_PW");
-    GNUNET_free (shard_domain);
-    GNUNET_free (remote_user);
-    return GNUNET_SYSERR;
-  }
-
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&num),
-    GNUNET_PQ_query_param_string (shard_domain),
-    GNUNET_PQ_query_param_string (remote_user),
-    GNUNET_PQ_query_param_string (remote_user_pw),
-    GNUNET_PQ_query_param_end
-  };
-
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    GNUNET_PQ_make_prepare ("create_foreign_servers",
-                            "SELECT"
-                            " create_foreign_servers"
-                            " ($1, $2, $3, $4);",
-                            4),
-    GNUNET_PQ_PREPARED_STATEMENT_END
-  };
-
-  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                     "exchangedb-postgres",
-                                     NULL,
-                                     NULL,
-                                     ps);
-  if (NULL == conn)
-  {
-    ret = GNUNET_SYSERR;
-  }
-  else if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
-                                                   "create_foreign_servers",
-                                                   params))
-  {
-    ret = GNUNET_SYSERR;
-  }
-  GNUNET_free (shard_domain);
-  GNUNET_free (remote_user);
-  GNUNET_free (remote_user_pw);
-  GNUNET_PQ_disconnect (conn);
-  return ret;
-}
-
-
-/**
- * Initialize prepared statements for @a pg.
- *
- * @param[in,out] pg connection to initialize
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-prepare_statements (struct PostgresClosure *pg)
-{
-  enum GNUNET_GenericReturnValue ret;
-  struct GNUNET_PQ_PreparedStatement ps[] = {
-    /* Used in #postgres_insert_denomination_info() and
-     #postgres_add_denomination_key() */
-    GNUNET_PQ_make_prepare (
-      "denomination_insert",
-      "INSERT INTO denominations "
-      "(denom_pub_hash"
-      ",denom_pub"
-      ",master_sig"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"                                                /* value of this denom */
-      ",coin_frac"                                                /* fractional value of this denom */
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",age_mask"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
-      " $11, $12, $13, $14, $15, $16, $17, $18);",
-      18),
-    /* Used in #postgres_iterate_denomination_info() */
-    GNUNET_PQ_make_prepare (
-      "denomination_iterate",
-      "SELECT"
-      " master_sig"
-      ",denom_pub_hash"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"                                                /* value of this denom */
-      ",coin_frac"                                                /* fractional value of this denom */
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",denom_pub"
-      ",age_mask"
-      " FROM denominations;",
-      0),
-    /* Used in #postgres_iterate_denominations() */
-    GNUNET_PQ_make_prepare (
-      "select_denominations",
-      "SELECT"
-      " denominations.master_sig"
-      ",denom_revocations_serial_id IS NOT NULL AS revoked"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"                                                /* value of this denom */
-      ",coin_frac"                                                /* fractional value of this denom */
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",denom_type"
-      ",age_mask"
-      ",denom_pub"
-      " FROM denominations"
-      " LEFT JOIN "
-      "   denomination_revocations USING (denominations_serial);",
-      0),
-    /* Used in #postgres_iterate_active_signkeys() */
-    GNUNET_PQ_make_prepare (
-      "select_signkeys",
-      "SELECT"
-      " master_sig"
-      ",exchange_pub"
-      ",valid_from"
-      ",expire_sign"
-      ",expire_legal"
-      " FROM exchange_sign_keys esk"
-      " WHERE"
-      "   expire_sign > $1"
-      " AND NOT EXISTS "
-      "  (SELECT esk_serial "
-      "     FROM signkey_revocations skr"
-      "    WHERE esk.esk_serial = skr.esk_serial);",
-      1),
-    /* Used in #postgres_iterate_auditor_denominations() */
-    GNUNET_PQ_make_prepare (
-      "select_auditor_denoms",
-      "SELECT"
-      " auditors.auditor_pub"
-      ",denominations.denom_pub_hash"
-      ",auditor_denom_sigs.auditor_sig"
-      " FROM auditor_denom_sigs"
-      " JOIN auditors USING (auditor_uuid)"
-      " JOIN denominations USING (denominations_serial)"
-      " WHERE auditors.is_active;",
-      0),
-    /* Used in #postgres_iterate_active_auditors() */
-    GNUNET_PQ_make_prepare (
-      "select_auditors",
-      "SELECT"
-      " auditor_pub"
-      ",auditor_url"
-      ",auditor_name"
-      " FROM auditors"
-      " WHERE"
-      "   is_active;",
-      0),
-    /* Used in #postgres_get_denomination_info() */
-    GNUNET_PQ_make_prepare (
-      "denomination_get",
-      "SELECT"
-      " master_sig"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"                                                /* value of this denom */
-      ",coin_frac"                                                /* fractional value of this denom */
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",age_mask"
-      " FROM denominations"
-      " WHERE denom_pub_hash=$1;",
-      1),
-    /* Used in #postgres_insert_denomination_revocation() */
-    GNUNET_PQ_make_prepare (
-      "denomination_revocation_insert",
-      "INSERT INTO denomination_revocations "
-      "(denominations_serial"
-      ",master_sig"
-      ") SELECT denominations_serial,$2"
-      "    FROM denominations"
-      "   WHERE denom_pub_hash=$1;",
-      2),
-    /* Used in #postgres_get_denomination_revocation() */
-    GNUNET_PQ_make_prepare (
-      "denomination_revocation_get",
-      "SELECT"
-      " master_sig"
-      ",denom_revocations_serial_id"
-      " FROM denomination_revocations"
-      " WHERE denominations_serial="
-      "  (SELECT denominations_serial"
-      "    FROM denominations"
-      "    WHERE denom_pub_hash=$1);",
-      1),
-    /* Used in #postgres_reserves_get() */
-    GNUNET_PQ_make_prepare (
-      "reserves_get_with_kyc",
-      "SELECT"
-      " current_balance_val"
-      ",current_balance_frac"
-      ",expiration_date"
-      ",gc_date"
-      ",kyc_ok"
-      ",wire_target_serial_id AS payment_target_uuid"
-      " FROM reserves"
-      " JOIN reserves_in ri USING (reserve_pub)"
-      " JOIN wire_targets wt "
-      "  ON (ri.wire_source_h_payto = wt.wire_target_h_payto)"
-      " WHERE reserve_pub=$1"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_set_kyc_ok() */
-    GNUNET_PQ_make_prepare (
-      "set_kyc_ok",
-      "UPDATE wire_targets"
-      " SET kyc_ok=TRUE"
-      ",external_id=$2"
-      " WHERE wire_target_h_payto=$1",
-      2),
-    GNUNET_PQ_make_prepare (
-      "get_kyc_h_payto",
-      "SELECT"
-      " wire_target_h_payto"
-      " FROM wire_targets"
-      " WHERE wire_target_h_payto=$1"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_insert_partner() */
-    GNUNET_PQ_make_prepare (
-      "insert_partner",
-      "INSERT INTO partners"
-      "  (partner_master_pub"
-      "  ,start_date"
-      "  ,end_date"
-      "  ,wad_frequency"
-      "  ,wad_fee_val"
-      "  ,wad_fee_frac"
-      "  ,master_sig"
-      "  ,partner_base_url"
-      "  ) VALUES "
-      "  ($1, $2, $3, $4, $5, $6, $7, $8);",
-      8),
-    /* Used in #postgres_inselect_wallet_kyc_status() */
-    GNUNET_PQ_make_prepare (
-      "insert_kyc_status",
-      "INSERT INTO wire_targets"
-      "  (wire_target_h_payto"
-      "  ,payto_uri"
-      "  ) VALUES "
-      "  ($1, $2)"
-      " RETURNING wire_target_serial_id",
-      2),
-    GNUNET_PQ_make_prepare (
-      "select_kyc_status_by_payto",
-      "SELECT "
-      " kyc_ok"
-      ",wire_target_serial_id"
-      " FROM wire_targets"
-      " WHERE wire_target_h_payto=$1;",
-      1),
-    /* Used in #reserves_get() */
-    GNUNET_PQ_make_prepare (
-      "reserves_get",
-      "SELECT"
-      " current_balance_val"
-      ",current_balance_frac"
-      ",expiration_date"
-      ",gc_date"
-      " FROM reserves"
-      " WHERE reserve_pub=$1"
-      " LIMIT 1;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "reserve_create",
-      "INSERT INTO reserves "
-      "(reserve_pub"
-      ",current_balance_val"
-      ",current_balance_frac"
-      ",expiration_date"
-      ",gc_date"
-      ") VALUES "
-      "($1, $2, $3, $4, $5)"
-      " ON CONFLICT DO NOTHING"
-      " RETURNING reserve_uuid;",
-      5),
-    /* Used in #postgres_insert_reserve_closed() */
-    GNUNET_PQ_make_prepare (
-      "reserves_close_insert",
-      "INSERT INTO reserves_close "
-      "(reserve_pub"
-      ",execution_date"
-      ",wtid"
-      ",wire_target_h_payto"
-      ",amount_val"
-      ",amount_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ") VALUES ($1, $2, $3, $4, $5, $6, $7, $8);",
-      8),
-    /* Used in #reserves_update() when the reserve is updated */
-    GNUNET_PQ_make_prepare (
-      "reserve_update",
-      "UPDATE reserves"
-      " SET"
-      " expiration_date=$1"
-      ",gc_date=$2"
-      ",current_balance_val=$3"
-      ",current_balance_frac=$4"
-      " WHERE reserve_pub=$5;",
-      5),
-    /* Used in #postgres_reserves_in_insert() to store transaction details */
-    GNUNET_PQ_make_prepare (
-      "reserves_in_add_transaction",
-      "INSERT INTO reserves_in "
-      "(reserve_pub"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",exchange_account_section"
-      ",wire_source_h_payto"
-      ",execution_date"
-      ") VALUES ($1, $2, $3, $4, $5, $6, $7)"
-      " ON CONFLICT DO NOTHING;",
-      7),
-#if FIXME_DEAD
-    /* Used in #postgres_reserves_in_insert() to store transaction details */
-    GNUNET_PQ_make_prepare (
-      "reserves_in_add_by_pub",
-      "INSERT INTO reserves_in "
-      "(reserve_pub"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",exchange_account_section"
-      ",wire_source_h_payto"
-      ",execution_date"
-      ") VALUES ($1, $2, $3, $4, $5, $6, $7)"
-      " ON CONFLICT DO NOTHING;",
-      7),
-#endif
-    /* Used in postgres_select_reserves_in_above_serial_id() to obtain inbound
-       transactions for reserves with serial id '\geq' the given parameter */
-    GNUNET_PQ_make_prepare (
-      "audit_reserves_in_get_transactions_incr",
-      "SELECT"
-      " reserves.reserve_pub"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",execution_date"
-      ",payto_uri AS sender_account_details"
-      ",reserve_in_serial_id"
-      " FROM reserves_in"
-      " JOIN reserves"
-      "   USING (reserve_pub)"
-      " JOIN wire_targets"
-      "   ON (wire_source_h_payto = wire_target_h_payto)"
-      " WHERE reserve_in_serial_id>=$1"
-      " ORDER BY reserve_in_serial_id;",
-      1),
-    /* Used in postgres_select_reserves_in_above_serial_id() to obtain inbound
-       transactions for reserves with serial id '\geq' the given parameter */
-    GNUNET_PQ_make_prepare (
-      "audit_reserves_in_get_transactions_incr_by_account",
-      "SELECT"
-      " reserves.reserve_pub"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",execution_date"
-      ",payto_uri AS sender_account_details"
-      ",reserve_in_serial_id"
-      " FROM reserves_in"
-      " JOIN reserves "
-      "   USING (reserve_pub)"
-      " JOIN wire_targets"
-      "   ON (wire_source_h_payto = wire_target_h_payto)"
-      " WHERE reserve_in_serial_id>=$1 AND exchange_account_section=$2"
-      " ORDER BY reserve_in_serial_id;",
-      2),
-    /* Used in #postgres_get_reserve_history() to obtain inbound transactions
-       for a reserve */
-    GNUNET_PQ_make_prepare (
-      "reserves_in_get_transactions",
-      /*
-      "SELECT"
-      " wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",execution_date"
-      ",payto_uri AS sender_account_details"
-      " FROM reserves_in"
-      " JOIN wire_targets"
-      "   ON (wire_source_h_payto = wire_target_h_payto)"
-      " WHERE reserve_pub=$1;",
-      */
-      "WITH ri AS MATERIALIZED ( "
-      "  SELECT * "
-      "  FROM reserves_in "
-      "  WHERE reserve_pub = $1 "
-      ") "
-      "SELECT  "
-      "  wire_reference "
-      "  ,credit_val "
-      "  ,credit_frac "
-      "  ,execution_date "
-      "  ,payto_uri AS sender_account_details "
-      "FROM wire_targets "
-      "JOIN ri  "
-      "  ON (wire_target_h_payto = wire_source_h_payto) "
-      "WHERE wire_target_h_payto = ( "
-      "  SELECT wire_source_h_payto FROM ri "
-      "); ",
-      1),
-    /* Used in #postgres_do_withdraw() to store
-       the signature of a blinded coin with the blinded coin's
-       details before returning it during /reserve/withdraw. We store
-       the coin's denomination information (public key, signature)
-       and the blinded message as well as the reserve that the coin
-       is being withdrawn from and the signature of the message
-       authorizing the withdrawal. */
-    GNUNET_PQ_make_prepare (
-      "call_withdraw",
-      "SELECT "
-      " reserve_found"
-      ",balance_ok"
-      ",kycok AS kyc_ok"
-      ",account_uuid AS payment_target_uuid"
-      ",ruuid"
-      " FROM exchange_do_withdraw"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);",
-      10),
-    /* Used in #postgres_do_batch_withdraw() to
-       update the reserve balance and check its status */
-    GNUNET_PQ_make_prepare (
-      "call_batch_withdraw",
-      "SELECT "
-      " reserve_found"
-      ",balance_ok"
-      ",kycok AS kyc_ok"
-      ",account_uuid AS payment_target_uuid"
-      ",ruuid"
-      " FROM exchange_do_batch_withdraw"
-      " ($1,$2,$3,$4,$5);",
-      5),
-    /* Used in #postgres_do_batch_withdraw_insert() to store
-       the signature of a blinded coin with the blinded coin's
-       details. */
-    GNUNET_PQ_make_prepare (
-      "call_batch_withdraw_insert",
-      "SELECT "
-      " out_denom_unknown AS denom_unknown"
-      ",out_conflict AS conflict"
-      ",out_nonce_reuse AS nonce_reuse"
-      " FROM exchange_do_batch_withdraw_insert"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9);",
-      9),
-    /* Used in #postgres_do_withdraw_limit_check() to check
-       if the withdrawals remain below the limit under which
-       KYC is not required. */
-    GNUNET_PQ_make_prepare (
-      "call_withdraw_limit_check",
-      "SELECT "
-      " below_limit"
-      " FROM exchange_do_withdraw_limit_check"
-      " ($1,$2,$3,$4);",
-      4),
-    /* Used in #postgres_do_deposit() to execute a deposit,
-       checking the coin's balance in the process as needed. */
-    GNUNET_PQ_make_prepare (
-      "call_deposit",
-      "SELECT "
-      " out_exchange_timestamp AS exchange_timestamp"
-      ",out_balance_ok AS balance_ok"
-      ",out_conflict AS conflicted"
-      " FROM exchange_do_deposit"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17);",
-      17),
-    /* used in postgres_do_purse_deposit() */
-    GNUNET_PQ_make_prepare (
-      "call_purse_deposit",
-      "SELECT "
-      " out_balance_ok AS balance_ok"
-      ",out_conflict AS conflict"
-      " FROM exchange_do_purse_deposit"
-      " ($1,$2,$3,$4,$5,$6,$7,$8);",
-      8),
-    /* used in #postgres_expire_purse() */
-    GNUNET_PQ_make_prepare (
-      "call_expire_purse",
-      "SELECT "
-      " out_found AS found"
-      " FROM exchange_do_expire_purse"
-      " ($1,$2);",
-      2),
-    /* Used in #postgres_do_melt() to melt a coin. */
-    GNUNET_PQ_make_prepare (
-      "call_melt",
-      "SELECT "
-      " out_balance_ok AS balance_ok"
-      ",out_zombie_bad AS zombie_required"
-      ",out_noreveal_index AS noreveal_index"
-      " FROM exchange_do_melt"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9);",
-      9),
-    /* Used in #postgres_do_refund() to refund a deposit. */
-    GNUNET_PQ_make_prepare (
-      "call_refund",
-      "SELECT "
-      " out_not_found AS not_found"
-      ",out_refund_ok AS refund_ok"
-      ",out_gone AS gone"
-      ",out_conflict AS conflict"
-      " FROM exchange_do_refund"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13);",
-      13),
-    /* Used in #postgres_do_recoup() to recoup a coin to a reserve. */
-    GNUNET_PQ_make_prepare (
-      "call_recoup",
-      "SELECT "
-      " out_recoup_timestamp AS recoup_timestamp"
-      ",out_recoup_ok AS recoup_ok"
-      ",out_internal_failure AS internal_failure"
-      " FROM exchange_do_recoup_to_reserve"
-      " ($1,$2,$3,$4,$5,$6,$7,$8,$9);",
-      9),
-    /* Used in #postgres_do_recoup_refresh() to recoup a coin to a zombie coin. */
-    GNUNET_PQ_make_prepare (
-      "call_recoup_refresh",
-      "SELECT "
-      " out_recoup_timestamp AS recoup_timestamp"
-      ",out_recoup_ok AS recoup_ok"
-      ",out_internal_failure AS internal_failure"
-      " FROM exchange_do_recoup_to_coin"
-      " ($1,$2,$3,$4,$5,$6,$7);",
-      7),
-    /* Used in #postgres_get_withdraw_info() to
-       locate the response for a /reserve/withdraw request
-       using the hash of the blinded message.  Used to
-       make sure /reserve/withdraw requests are idempotent. */
-    GNUNET_PQ_make_prepare (
-      "get_withdraw_info",
-      "SELECT"
-      " denom.denom_pub_hash"
-      ",denom_sig"
-      ",reserve_sig"
-      ",reserves.reserve_pub"
-      ",execution_date"
-      ",h_blind_ev"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",denom.fee_withdraw_val"
-      ",denom.fee_withdraw_frac"
-      " FROM reserves_out"
-      "    JOIN reserves"
-      "      USING (reserve_uuid)"
-      "    JOIN denominations denom"
-      "      USING (denominations_serial)"
-      " WHERE h_blind_ev=$1;",
-      1),
-    /* Used during #postgres_get_reserve_history() to
-       obtain all of the /reserve/withdraw operations that
-       have been performed on a given reserve. (i.e. to
-       demonstrate double-spending) */
-    GNUNET_PQ_make_prepare (
-      "get_reserves_out",
-      /*
-      "SELECT"
-      " ro.h_blind_ev"
-      ",denom.denom_pub_hash"
-      ",ro.denom_sig"
-      ",ro.reserve_sig"
-      ",ro.execution_date"
-      ",ro.amount_with_fee_val"
-      ",ro.amount_with_fee_frac"
-      ",denom.fee_withdraw_val"
-      ",denom.fee_withdraw_frac"
-      " FROM reserves res"
-      " JOIN reserves_out_by_reserve ror"
-      "   ON (res.reserve_uuid = ror.reserve_uuid)"
-      " JOIN reserves_out ro"
-      "   ON (ro.h_blind_ev = ror.h_blind_ev)"
-      " JOIN denominations denom"
-      "   ON (ro.denominations_serial = denom.denominations_serial)"
-      " WHERE res.reserve_pub=$1;",
-      */
-      "WITH robr AS MATERIALIZED ( "
-      "  SELECT h_blind_ev "
-      "  FROM reserves_out_by_reserve "
-      "  WHERE reserve_uuid= ( "
-      "    SELECT reserve_uuid "
-      "    FROM reserves "
-      "    WHERE reserve_pub = $1 "
-      "  ) "
-      ") SELECT "
-      "  ro.h_blind_ev "
-      "  ,denom.denom_pub_hash "
-      "  ,ro.denom_sig "
-      "  ,ro.reserve_sig "
-      "  ,ro.execution_date "
-      "  ,ro.amount_with_fee_val "
-      "  ,ro.amount_with_fee_frac "
-      "  ,denom.fee_withdraw_val "
-      "  ,denom.fee_withdraw_frac "
-      "FROM robr "
-      "JOIN reserves_out ro "
-      "  ON (ro.h_blind_ev = robr.h_blind_ev) "
-      "JOIN denominations denom "
-      "  ON (ro.denominations_serial = denom.denominations_serial); ",
-      1),
-    /* Used in #postgres_select_withdrawals_above_serial_id() */
-
-    GNUNET_PQ_make_prepare (
-      "get_reserve_balance",
-      "SELECT"
-      " current_balance_val"
-      ",current_balance_frac"
-      " FROM reserves"
-      " WHERE reserve_pub=$1;",
-      1),
-    /* Fetch deposits with rowid '\geq' the given parameter */
-
-    GNUNET_PQ_make_prepare (
-      "audit_get_reserves_out_incr",
-      "SELECT"
-      " h_blind_ev"
-      ",denom.denom_pub"
-      ",reserve_sig"
-      ",reserves.reserve_pub"
-      ",execution_date"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",reserve_out_serial_id"
-      " FROM reserves_out"
-      "    JOIN reserves"
-      "      USING (reserve_uuid)"
-      "    JOIN denominations denom"
-      "      USING (denominations_serial)"
-      " WHERE reserve_out_serial_id>=$1"
-      " ORDER BY reserve_out_serial_id ASC;",
-      1),
-
-    /* Used in #postgres_count_known_coins() */
-    GNUNET_PQ_make_prepare (
-      "count_known_coins",
-      "SELECT"
-      " COUNT(*) AS count"
-      " FROM known_coins"
-      " WHERE denominations_serial="
-      "  (SELECT denominations_serial"
-      "    FROM denominations"
-      "    WHERE denom_pub_hash=$1);",
-      1),
-    /* Used in #postgres_get_known_coin() to fetch
-       the denomination public key and signature for
-       a coin known to the exchange. */
-    GNUNET_PQ_make_prepare (
-      "get_known_coin",
-      "SELECT"
-      " denominations.denom_pub_hash"
-      ",age_commitment_hash"
-      ",denom_sig"
-      " FROM known_coins"
-      " JOIN denominations USING (denominations_serial)"
-      " WHERE coin_pub=$1;",
-      1),
-    /* Used in #postgres_ensure_coin_known() */
-    GNUNET_PQ_make_prepare (
-      "get_known_coin_dh",
-      "SELECT"
-      " denominations.denom_pub_hash"
-      " FROM known_coins"
-      " JOIN denominations USING (denominations_serial)"
-      " WHERE coin_pub=$1;",
-      1),
-    /* Used in #postgres_get_coin_denomination() to fetch
-       the denomination public key hash for
-       a coin known to the exchange. */
-    GNUNET_PQ_make_prepare (
-      "get_coin_denomination",
-      "SELECT"
-      " denominations.denom_pub_hash"
-      ",known_coin_id"
-      " FROM known_coins"
-      " JOIN denominations USING (denominations_serial)"
-      " WHERE coin_pub=$1"
-      " FOR SHARE;",
-      1),
-    /* Used in #postgres_insert_known_coin() to store the denomination public
-       key and signature for a coin known to the exchange.
-
-       See also:
-       https://stackoverflow.com/questions/34708509/how-to-use-returning-with-on-conflict-in-postgresql/37543015#37543015
-     */
-    GNUNET_PQ_make_prepare (
-      "insert_known_coin",
-      "WITH dd"
-      "  (denominations_serial"
-      "  ,coin_val"
-      "  ,coin_frac"
-      "  ) AS ("
-      "    SELECT "
-      "       denominations_serial"
-      "      ,coin_val"
-      "      ,coin_frac"
-      "        FROM denominations"
-      "        WHERE denom_pub_hash=$2"
-      "  ), input_rows"
-      "    (coin_pub) AS ("
-      "      VALUES ($1::BYTEA)"
-      "  ), ins AS ("
-      "  INSERT INTO known_coins "
-      "  (coin_pub"
-      "  ,denominations_serial"
-      "  ,age_commitment_hash"
-      "  ,denom_sig"
-      "  ,remaining_val"
-      "  ,remaining_frac"
-      "  ) SELECT "
-      "     $1"
-      "    ,denominations_serial"
-      "    ,$3"
-      "    ,$4"
-      "    ,coin_val"
-      "    ,coin_frac"
-      "  FROM dd"
-      "  ON CONFLICT DO NOTHING" /* CONFLICT on (coin_pub) */
-      "  RETURNING "
-      "     known_coin_id"
-      "  ) "
-      "SELECT "
-      "   FALSE AS existed"
-      "  ,known_coin_id"
-      "  ,NULL AS denom_pub_hash"
-      "  ,NULL AS age_commitment_hash"
-      "  FROM ins "
-      "UNION ALL "
-      "SELECT "
-      "   TRUE AS existed"
-      "  ,known_coin_id"
-      "  ,denom_pub_hash"
-      "  ,kc.age_commitment_hash"
-      "  FROM input_rows"
-      "  JOIN known_coins kc USING (coin_pub)"
-      "  JOIN denominations USING (denominations_serial)"
-      "  LIMIT 1",
-      4),
-
-    /* Used in #postgres_get_melt() to fetch
-       high-level information about a melt operation */
-    GNUNET_PQ_make_prepare (
-      "get_melt",
-      /* "SELECT"
-      " denoms.denom_pub_hash"
-      ",denoms.fee_refresh_val"
-      ",denoms.fee_refresh_frac"
-      ",old_coin_pub"
-      ",old_coin_sig"
-      ",kc.age_commitment_hash"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",noreveal_index"
-      ",melt_serial_id"
-      " FROM refresh_commitments"
-      "   JOIN known_coins kc"
-      "     ON (old_coin_pub = kc.coin_pub)"
-      "   JOIN denominations denoms"
-      "     ON (kc.denominations_serial = denoms.denominations_serial)"
-      " WHERE rc=$1;", */
-      "WITH rc AS MATERIALIZED ( "
-      " SELECT"
-      "  * FROM refresh_commitments"
-      " WHERE rc=$1"
-      ")"
-      "SELECT"
-      " denoms.denom_pub_hash"
-      ",denoms.fee_refresh_val"
-      ",denoms.fee_refresh_frac"
-      ",rc.old_coin_pub"
-      ",rc.old_coin_sig"
-      ",kc.age_commitment_hash"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",noreveal_index"
-      ",melt_serial_id "
-      "FROM ("
-      " SELECT"
-      "  * "
-      " FROM known_coins"
-      " WHERE coin_pub=(SELECT old_coin_pub from rc)"
-      ") kc "
-      "JOIN rc"
-      "  ON (kc.coin_pub=rc.old_coin_pub) "
-      "JOIN denominations denoms"
-      "  USING (denominations_serial);",
-      1),
-    /* Used in #postgres_select_refreshes_above_serial_id() to fetch
-       refresh session with id '\geq' the given parameter */
-    GNUNET_PQ_make_prepare (
-      "audit_get_refresh_commitments_incr",
-      "SELECT"
-      " denom.denom_pub"
-      ",kc.coin_pub AS old_coin_pub"
-      ",kc.age_commitment_hash"
-      ",old_coin_sig"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",noreveal_index"
-      ",melt_serial_id"
-      ",rc"
-      " FROM refresh_commitments"
-      "   JOIN known_coins kc"
-      "     ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
-      "   JOIN denominations denom"
-      "     ON (kc.denominations_serial = denom.denominations_serial)"
-      " WHERE melt_serial_id>=$1"
-      " ORDER BY melt_serial_id ASC;",
-      1),
-    /* Query the 'refresh_commitments' by coin public key */
-    GNUNET_PQ_make_prepare (
-      "get_refresh_session_by_coin",
-      "SELECT"
-      " rc"
-      ",old_coin_sig"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",denoms.denom_pub_hash"
-      ",denoms.fee_refresh_val"
-      ",denoms.fee_refresh_frac"
-      ",kc.age_commitment_hash"
-      ",melt_serial_id"
-      " FROM refresh_commitments"
-      " JOIN known_coins kc"
-      "   ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
-      " JOIN denominations denoms"
-      "   USING (denominations_serial)"
-      " WHERE old_coin_pub=$1;",
-      1),
-    /* Store information about the desired denominations for a
-       refresh operation, used in #postgres_insert_refresh_reveal() */
-    GNUNET_PQ_make_prepare (
-      "insert_refresh_revealed_coin",
-      "INSERT INTO refresh_revealed_coins "
-      "(melt_serial_id "
-      ",freshcoin_index "
-      ",link_sig "
-      ",denominations_serial "
-      ",coin_ev"
-      ",ewv"
-      ",h_coin_ev"
-      ",ev_sig"
-      ") SELECT $1, $2, $3, "
-      "         denominations_serial, $5, $6, $7, $8"
-      "    FROM denominations"
-      "   WHERE denom_pub_hash=$4"
-      " ON CONFLICT DO NOTHING;",
-      8),
-    /* Obtain information about the coins created in a refresh
-       operation, used in #postgres_get_refresh_reveal() */
-    GNUNET_PQ_make_prepare (
-      "get_refresh_revealed_coins",
-      "SELECT "
-      " rrc.freshcoin_index"
-      ",denom.denom_pub_hash"
-      ",rrc.h_coin_ev"
-      ",rrc.link_sig"
-      ",rrc.coin_ev"
-      ",rrc.ewv"
-      ",rrc.ev_sig"
-      " FROM refresh_commitments"
-      "    JOIN refresh_revealed_coins rrc"
-      "      USING (melt_serial_id)"
-      "    JOIN denominations denom "
-      "      USING (denominations_serial)"
-      " WHERE rc=$1;",
-      1),
-
-    /* Used in #postgres_insert_refresh_reveal() to store the transfer
-       keys we learned */
-    GNUNET_PQ_make_prepare (
-      "insert_refresh_transfer_keys",
-      "INSERT INTO refresh_transfer_keys "
-      "(melt_serial_id"
-      ",transfer_pub"
-      ",transfer_privs"
-      ") VALUES ($1, $2, $3)"
-      " ON CONFLICT DO NOTHING;",
-      3),
-    /* Used in #postgres_insert_refund() to store refund information */
-    GNUNET_PQ_make_prepare (
-      "insert_refund",
-      "INSERT INTO refunds "
-      "(coin_pub "
-      ",deposit_serial_id"
-      ",merchant_sig "
-      ",rtransaction_id "
-      ",amount_with_fee_val "
-      ",amount_with_fee_frac "
-      ") SELECT $1, deposit_serial_id, $3, $5, $6, $7"
-      "    FROM deposits"
-      "   WHERE coin_pub=$1"
-      "     AND h_contract_terms=$4"
-      "     AND merchant_pub=$2",
-      7),
-    /* Query the 'refunds' by coin public key */
-    GNUNET_PQ_make_prepare (
-      "get_refunds_by_coin",
-      "SELECT"
-      " dep.merchant_pub"
-      ",ref.merchant_sig"
-      ",dep.h_contract_terms"
-      ",ref.rtransaction_id"
-      ",ref.amount_with_fee_val"
-      ",ref.amount_with_fee_frac"
-      ",denom.fee_refund_val "
-      ",denom.fee_refund_frac "
-      ",ref.refund_serial_id"
-      " FROM refunds ref"
-      " JOIN deposits dep"
-      "   ON (ref.coin_pub = dep.coin_pub AND ref.deposit_serial_id = dep.deposit_serial_id)"
-      " JOIN known_coins kc"
-      "   ON (ref.coin_pub = kc.coin_pub)"
-      " JOIN denominations denom"
-      "   USING (denominations_serial)"
-      " WHERE ref.coin_pub=$1;",
-      1),
-    /* Query the 'refunds' by coin public key, merchant_pub and contract hash */
-    GNUNET_PQ_make_prepare (
-      "get_refunds_by_coin_and_contract",
-      "SELECT"
-      " ref.amount_with_fee_val"
-      ",ref.amount_with_fee_frac"
-      " FROM refunds ref"
-      " JOIN deposits dep"
-      "   USING (coin_pub,deposit_serial_id)"
-      " WHERE ref.coin_pub=$1"
-      "   AND dep.merchant_pub=$2"
-      "   AND dep.h_contract_terms=$3;",
-      3),
-    /* Fetch refunds with rowid '\geq' the given parameter */
-    GNUNET_PQ_make_prepare (
-      "audit_get_refunds_incr",
-      "SELECT"
-      " dep.merchant_pub"
-      ",ref.merchant_sig"
-      ",dep.h_contract_terms"
-      ",ref.rtransaction_id"
-      ",denom.denom_pub"
-      ",kc.coin_pub"
-      ",ref.amount_with_fee_val"
-      ",ref.amount_with_fee_frac"
-      ",ref.refund_serial_id"
-      " FROM refunds ref"
-      "   JOIN deposits dep"
-      "     ON (ref.coin_pub=dep.coin_pub AND ref.deposit_serial_id=dep.deposit_serial_id)"
-      "   JOIN known_coins kc"
-      "     ON (dep.coin_pub=kc.coin_pub)"
-      "   JOIN denominations denom"
-      "     ON (kc.denominations_serial=denom.denominations_serial)"
-      " WHERE ref.refund_serial_id>=$1"
-      " ORDER BY ref.refund_serial_id ASC;",
-      1),
-
-    /* Store information about a /deposit the exchange is to execute.
-       Used in #postgres_insert_deposit().  Only used in test cases. */
-    GNUNET_PQ_make_prepare (
-      "insert_deposit",
-      "INSERT INTO deposits "
-      "(known_coin_id"
-      ",coin_pub"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",wallet_timestamp"
-      ",refund_deadline"
-      ",wire_deadline"
-      ",merchant_pub"
-      ",h_contract_terms"
-      ",wire_salt"
-      ",wire_target_h_payto"
-      ",coin_sig"
-      ",exchange_timestamp"
-      ",shard"
-      ") SELECT known_coin_id, $1, $2, $3, $4, $5, $6, "
-      " $7, $8, $9, $10, $11, $12, $13"
-      "    FROM known_coins"
-      "   WHERE coin_pub=$1"
-      " ON CONFLICT DO NOTHING;",
-      13),
-    /* Fetch an existing deposit request, used to ensure idempotency
-       during /deposit processing. Used in #postgres_have_deposit(). */
-    GNUNET_PQ_make_prepare (
-      "get_deposit",
-      "SELECT"
-      " dep.amount_with_fee_val"
-      ",dep.amount_with_fee_frac"
-      ",denominations.fee_deposit_val"
-      ",denominations.fee_deposit_frac"
-      ",dep.wallet_timestamp"
-      ",dep.exchange_timestamp"
-      ",dep.refund_deadline"
-      ",dep.wire_deadline"
-      ",dep.h_contract_terms"
-      ",dep.wire_salt"
-      ",wt.payto_uri AS receiver_wire_account"
-      " FROM deposits dep"
-      " JOIN known_coins kc ON (kc.coin_pub = dep.coin_pub)"
-      " JOIN denominations USING (denominations_serial)"
-      " JOIN wire_targets wt USING (wire_target_h_payto)"
-      " WHERE dep.coin_pub=$1"
-      "   AND dep.merchant_pub=$3"
-      "   AND dep.h_contract_terms=$2;",
-      3),
-    /* Fetch deposits with rowid '\geq' the given parameter */
-    GNUNET_PQ_make_prepare (
-      "audit_get_deposits_incr",
-      "SELECT"
-      " amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",wallet_timestamp"
-      ",exchange_timestamp"
-      ",merchant_pub"
-      ",denom.denom_pub"
-      ",kc.coin_pub"
-      ",kc.age_commitment_hash"
-      ",coin_sig"
-      ",refund_deadline"
-      ",wire_deadline"
-      ",h_contract_terms"
-      ",wire_salt"
-      ",payto_uri AS receiver_wire_account"
-      ",done"
-      ",deposit_serial_id"
-      " FROM deposits"
-      "    JOIN wire_targets USING (wire_target_h_payto)"
-      "    JOIN known_coins kc USING (coin_pub)"
-      "    JOIN denominations denom USING (denominations_serial)"
-      " WHERE ("
-      "  (deposit_serial_id>=$1)" // FIXME: also select by shard!?
-      " )"
-      " ORDER BY deposit_serial_id ASC;",
-      1),
-    /* Fetch an existing deposit request.
-       Used in #postgres_lookup_transfer_by_deposit(). */
-    GNUNET_PQ_make_prepare (
-      "get_deposit_without_wtid",
-      "SELECT"
-      " wt.kyc_ok"
-      ",wt.wire_target_serial_id AS payment_target_uuid"
-      ",dep.wire_salt"
-      ",wt.payto_uri"
-      ",dep.amount_with_fee_val"
-      ",dep.amount_with_fee_frac"
-      ",denom.fee_deposit_val"
-      ",denom.fee_deposit_frac"
-      ",dep.wire_deadline"
-      " FROM deposits dep"
-      "    JOIN wire_targets wt USING (wire_target_h_payto)"
-      "    JOIN known_coins kc ON (kc.coin_pub = dep.coin_pub)"
-      "    JOIN denominations denom USING (denominations_serial)"
-      " WHERE dep.coin_pub=$1"
-      "   AND dep.merchant_pub=$3"
-      "   AND dep.h_contract_terms=$2;",
-      3),
-    /* Used in #postgres_get_ready_deposit() */
-    GNUNET_PQ_make_prepare (
-      "deposits_get_ready",
-      "SELECT"
-      " payto_uri"
-      ",merchant_pub"
-      " FROM deposits_by_ready dbr"
-      "  JOIN deposits dep"
-      "    ON (dbr.coin_pub = dep.coin_pub AND dbr.deposit_serial_id = dep.deposit_serial_id)"
-      "  JOIN wire_targets wt"
-      "    USING (wire_target_h_payto)"
-      " WHERE dbr.wire_deadline<=$1"
-      "   AND dbr.shard >= $2"
-      "   AND dbr.shard <= $3"
-      "   AND (wt.kyc_ok OR $4)"
-      " ORDER BY "
-      "   dbr.wire_deadline ASC"
-      "  ,dbr.shard ASC"
-      " LIMIT 1;",
-      4),
-    /* Used in #postgres_aggregate() */
-    GNUNET_PQ_make_prepare (
-      "aggregate",
-      "WITH rdy AS (" /* find deposits ready by merchant */
-      "  SELECT"
-      "    coin_pub"
-      "    FROM deposits_for_matching"
-      "    WHERE refund_deadline<$1" /* filter by shard, only actually executable deposits */
-      "      AND merchant_pub=$2" /* filter by target merchant */
-      "    ORDER BY refund_deadline ASC" /* ordering is not critical */
-      "    LIMIT "
-      TALER_QUOTE (TALER_EXCHANGEDB_MATCHING_DEPOSITS_LIMIT) /* limits transaction size */
-      " )"
-      " ,dep AS (" /* restrict to our merchant and account and mark as done */
-      "  UPDATE deposits"
-      "     SET done=TRUE"
-      "   WHERE coin_pub IN (SELECT coin_pub FROM rdy)"
-      "     AND merchant_pub=$2" /* theoretically, same coin could be spent at another merchant */
-      "     AND wire_target_h_payto=$3" /* merchant could have a 2nd bank account */
-      "     AND done=FALSE" /* theoretically, same coin could be spend at the same merchant a 2nd time */
-      "   RETURNING"
-      "     deposit_serial_id"
-      "    ,coin_pub"
-      "    ,amount_with_fee_val AS amount_val"
-      "    ,amount_with_fee_frac AS amount_frac)"
-      " ,ref AS (" /* find applicable refunds -- NOTE: may do a full join on the master, maybe find a left-join way to integrate with query above to push it to the shards? */
-      "  SELECT"
-      "    amount_with_fee_val AS refund_val"
-      "   ,amount_with_fee_frac AS refund_frac"
-      "   ,coin_pub"
-      "   ,deposit_serial_id" /* theoretically, coin could be in multiple refunded transactions */
-      "    FROM refunds"
-      "   WHERE coin_pub IN (SELECT coin_pub FROM dep)"
-      "     AND deposit_serial_id IN (SELECT deposit_serial_id FROM dep))"
-      " ,coins_with_fees AS (" /* find coins for which deposit fees apply */
-      "  SELECT"
-      "     coin_pub"
-      "    ,deposit_serial_id" /* ensures that if the same coin is deposited twice, it is in the list twice */
-      "    FROM dep"
-      "   WHERE deposit_serial_id NOT IN (SELECT deposit_serial_id FROM ref))"
-      " ,fees AS (" /* find deposit fees for non-refunded deposits */
-      "  SELECT"
-      "    denom.fee_deposit_val AS fee_val"
-      "   ,denom.fee_deposit_frac AS fee_frac"
-      "   ,cs.deposit_serial_id" /* ensures we get the fee for each coin, not once per denomination */
-      "    FROM coins_with_fees cs"
-      "    JOIN known_coins kc" /* NOTE: may do a full join on the master, maybe find a left-join way to integrate with query above to push it to the shards? */
-      "      USING (coin_pub)"
-      "    JOIN denominations denom"
-      "      USING (denominations_serial))"
-      " ,dummy AS (" /* add deposits to aggregation_tracking */
-      "    INSERT INTO aggregation_tracking"
-      "    (deposit_serial_id"
-      "    ,wtid_raw)"
-      "    SELECT deposit_serial_id,$4"
-      "      FROM dep)"
-      "SELECT" /* calculate totals (deposits, refunds and fees) */
-      "  CAST(COALESCE(SUM(dep.amount_val),0) AS INT8) AS sum_deposit_value" /* cast needed, otherwise we get NUMBER */
-      " ,COALESCE(SUM(dep.amount_frac),0) AS sum_deposit_fraction" /* SUM over INT returns INT8 */
-      " ,CAST(COALESCE(SUM(ref.refund_val),0) AS INT8) AS sum_refund_value"
-      " ,COALESCE(SUM(ref.refund_frac),0) AS sum_refund_fraction"
-      " ,CAST(COALESCE(SUM(fees.fee_val),0) AS INT8) AS sum_fee_value"
-      " ,COALESCE(SUM(fees.fee_frac),0) AS sum_fee_fraction"
-      " FROM dep "
-      "   FULL OUTER JOIN ref ON (FALSE)"    /* We just want all sums */
-      "   FULL OUTER JOIN fees ON (FALSE);",
-      4),
-
-
-    /* Used in #postgres_create_aggregation_transient() */
-    GNUNET_PQ_make_prepare (
-      "create_aggregation_transient",
-      "INSERT INTO aggregation_transient"
-      " (amount_val"
-      " ,amount_frac"
-      " ,wire_target_h_payto"
-      " ,exchange_account_section"
-      " ,wtid_raw)"
-      " VALUES ($1, $2, $3, $4, $5);",
-      5),
-    /* Used in #postgres_select_aggregation_transient() */
-    GNUNET_PQ_make_prepare (
-      "select_aggregation_transient",
-      "SELECT"
-      "  amount_val"
-      " ,amount_frac"
-      " ,wtid_raw"
-      " FROM aggregation_transient"
-      " WHERE wire_target_h_payto=$1"
-      "   AND exchange_account_section=$2;",
-      2),
-    /* Used in #postgres_update_aggregation_transient() */
-    GNUNET_PQ_make_prepare (
-      "update_aggregation_transient",
-      "UPDATE aggregation_transient"
-      " SET amount_val=$1"
-      "    ,amount_frac=$2"
-      " WHERE wire_target_h_payto=$3"
-      "   AND wtid_raw=$4",
-      4),
-    /* Used in #postgres_delete_aggregation_transient() */
-    GNUNET_PQ_make_prepare (
-      "delete_aggregation_transient",
-      "DELETE FROM aggregation_transient"
-      " WHERE wire_target_h_payto=$1"
-      "   AND wtid_raw=$2",
-      2),
-
-    /* Used in #postgres_get_coin_transactions() to obtain information
-       about how a coin has been spend with /deposit requests. */
-    GNUNET_PQ_make_prepare (
-      "get_deposit_with_coin_pub",
-      "SELECT"
-      " dep.amount_with_fee_val"
-      ",dep.amount_with_fee_frac"
-      ",denoms.fee_deposit_val"
-      ",denoms.fee_deposit_frac"
-      ",denoms.denom_pub_hash"
-      ",kc.age_commitment_hash"
-      ",dep.wallet_timestamp"
-      ",dep.refund_deadline"
-      ",dep.wire_deadline"
-      ",dep.merchant_pub"
-      ",dep.h_contract_terms"
-      ",dep.wire_salt"
-      ",wt.payto_uri"
-      ",dep.coin_sig"
-      ",dep.deposit_serial_id"
-      ",dep.done"
-      " FROM deposits dep"
-      "    JOIN wire_targets wt"
-      "      USING (wire_target_h_payto)"
-      "    JOIN known_coins kc"
-      "      ON (kc.coin_pub = dep.coin_pub)"
-      "    JOIN denominations denoms"
-      "      USING (denominations_serial)"
-      " WHERE dep.coin_pub=$1;",
-      1),
-
-    /* Used in #postgres_get_link_data(). */
-    GNUNET_PQ_make_prepare (
-      "get_link",
-      "SELECT "
-      " tp.transfer_pub"
-      ",denoms.denom_pub"
-      ",rrc.ev_sig"
-      ",rrc.ewv"
-      ",rrc.link_sig"
-      ",rrc.freshcoin_index"
-      ",rrc.coin_ev"
-      " FROM refresh_commitments"
-      "     JOIN refresh_revealed_coins rrc"
-      "       USING (melt_serial_id)"
-      "     JOIN refresh_transfer_keys tp"
-      "       USING (melt_serial_id)"
-      "     JOIN denominations denoms"
-      "       ON (rrc.denominations_serial = denoms.denominations_serial)"
-      " WHERE old_coin_pub=$1"
-      " ORDER BY tp.transfer_pub, rrc.freshcoin_index ASC",
-      1),
-    /* Used in #postgres_lookup_wire_transfer */
-    GNUNET_PQ_make_prepare (
-      "lookup_transactions",
-      "SELECT"
-      " aggregation_serial_id"
-      ",deposits.h_contract_terms"
-      ",payto_uri"
-      ",wire_targets.wire_target_h_payto"
-      ",kc.coin_pub"
-      ",deposits.merchant_pub"
-      ",wire_out.execution_date"
-      ",deposits.amount_with_fee_val"
-      ",deposits.amount_with_fee_frac"
-      ",denom.fee_deposit_val"
-      ",denom.fee_deposit_frac"
-      ",denom.denom_pub"
-      " FROM aggregation_tracking"
-      "    JOIN deposits"
-      "      USING (deposit_serial_id)"
-      "    JOIN wire_targets"
-      "      USING (wire_target_h_payto)"
-      "    JOIN known_coins kc"
-      "      USING (coin_pub)"
-      "    JOIN denominations denom"
-      "      USING (denominations_serial)"
-      "    JOIN wire_out"
-      "      USING (wtid_raw)"
-      " WHERE wtid_raw=$1;",
-      1),
-    /* Used in #postgres_lookup_transfer_by_deposit */
-    GNUNET_PQ_make_prepare (
-      "lookup_deposit_wtid",
-      "SELECT"
-      " aggregation_tracking.wtid_raw"
-      ",wire_out.execution_date"
-      ",dep.amount_with_fee_val"
-      ",dep.amount_with_fee_frac"
-      ",dep.wire_salt"
-      ",wt.payto_uri"
-      ",denom.fee_deposit_val"
-      ",denom.fee_deposit_frac"
-      " FROM deposits dep"
-      "    JOIN wire_targets wt"
-      "      USING (wire_target_h_payto)"
-      "    JOIN aggregation_tracking"
-      "      USING (deposit_serial_id)"
-      "    JOIN known_coins kc"
-      "      ON (kc.coin_pub = dep.coin_pub)"
-      "    JOIN denominations denom"
-      "      USING (denominations_serial)"
-      "    JOIN wire_out"
-      "      USING (wtid_raw)"
-      " WHERE dep.coin_pub=$1"
-      "   AND dep.merchant_pub=$3"
-      "   AND dep.h_contract_terms=$2",
-      3),
-    /* Used in #postgres_insert_aggregation_tracking */
-    GNUNET_PQ_make_prepare (
-      "insert_aggregation_tracking",
-      "INSERT INTO aggregation_tracking "
-      "(deposit_serial_id"
-      ",wtid_raw"
-      ") VALUES "
-      "($1, $2);",
-      2),
-    /* Used in #postgres_get_wire_fee() */
-    GNUNET_PQ_make_prepare (
-      "get_wire_fee",
-      "SELECT "
-      " start_date"
-      ",end_date"
-      ",wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      ",master_sig"
-      " FROM wire_fee"
-      " WHERE wire_method=$1"
-      "   AND start_date <= $2"
-      "   AND end_date > $2;",
-      2),
-    /* Used in #postgres_get_global_fee() */
-    GNUNET_PQ_make_prepare (
-      "get_global_fee",
-      "SELECT "
-      " start_date"
-      ",end_date"
-      ",history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      ",master_sig"
-      " FROM global_fee"
-      " WHERE start_date <= $1"
-      "   AND end_date > $1;",
-      1),
-    /* Used in #postgres_get_global_fees() */
-    GNUNET_PQ_make_prepare (
-      "get_global_fees",
-      "SELECT "
-      " start_date"
-      ",end_date"
-      ",history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      ",master_sig"
-      " FROM global_fee"
-      " WHERE start_date >= $1",
-      1),
-    /* Used in #postgres_insert_wire_fee */
-    GNUNET_PQ_make_prepare (
-      "insert_wire_fee",
-      "INSERT INTO wire_fee "
-      "(wire_method"
-      ",start_date"
-      ",end_date"
-      ",wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10);",
-      10),
-    /* Used in #postgres_insert_global_fee */
-    GNUNET_PQ_make_prepare (
-      "insert_global_fee",
-      "INSERT INTO global_fee "
-      "(start_date"
-      ",end_date"
-      ",history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15);",
-      15),
-    /* Used in #postgres_store_wire_transfer_out */
-    GNUNET_PQ_make_prepare (
-      "insert_wire_out",
-      "INSERT INTO wire_out "
-      "(execution_date"
-      ",wtid_raw"
-      ",wire_target_h_payto"
-      ",exchange_account_section"
-      ",amount_val"
-      ",amount_frac"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6);",
-      6),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_wire_out",
-      "INSERT INTO wire_out"
-      "(wireout_uuid"
-      ",execution_date"
-      ",wtid_raw"
-      ",wire_target_h_payto"
-      ",exchange_account_section"
-      ",amount_val"
-      ",amount_frac"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7);",
-      7),
-    /* Used in #postgres_wire_prepare_data_insert() to store
-       wire transfer information before actually committing it with the bank */
-    GNUNET_PQ_make_prepare (
-      "wire_prepare_data_insert",
-      "INSERT INTO prewire "
-      "(wire_method"
-      ",buf"
-      ") VALUES "
-      "($1, $2);",
-      2),
-    /* Used in #postgres_wire_prepare_data_mark_finished() */
-    GNUNET_PQ_make_prepare (
-      "wire_prepare_data_mark_done",
-      "UPDATE prewire"
-      " SET finished=TRUE"
-      " WHERE prewire_uuid=$1;",
-      1),
-    /* Used in #postgres_wire_prepare_data_mark_failed() */
-    GNUNET_PQ_make_prepare (
-      "wire_prepare_data_mark_failed",
-      "UPDATE prewire"
-      " SET failed=TRUE"
-      " WHERE prewire_uuid=$1;",
-      1),
-    /* Used in #postgres_wire_prepare_data_get() */
-    GNUNET_PQ_make_prepare (
-      "wire_prepare_data_get",
-      "SELECT"
-      " prewire_uuid"
-      ",wire_method"
-      ",buf"
-      " FROM prewire"
-      " WHERE prewire_uuid >= $1"
-      "   AND finished=FALSE"
-      "   AND failed=FALSE"
-      " ORDER BY prewire_uuid ASC"
-      " LIMIT $2;",
-      2),
-    /* Used in #postgres_select_deposits_missing_wire */
-    // FIXME: used by the auditor; can probably be done
-    // smarter by checking if 'done' or 'blocked'
-    // are set correctly when going over deposits, instead
-    // of JOINing with refunds.
-    GNUNET_PQ_make_prepare (
-      "deposits_get_overdue",
-      "SELECT"
-      " deposit_serial_id"
-      ",coin_pub"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",payto_uri"
-      ",wire_deadline"
-      ",done"
-      " FROM deposits d"
-      "   JOIN known_coins"
-      "     USING (coin_pub)"
-      "   JOIN wire_targets"
-      "     USING (wire_target_h_payto)"
-      " WHERE wire_deadline >= $1"
-      " AND wire_deadline < $2"
-      " AND NOT (EXISTS (SELECT 1"
-      "            FROM refunds r"
-      "            WHERE (r.coin_pub = d.coin_pub) AND (r.deposit_serial_id = d.deposit_serial_id))"
-      "       OR EXISTS (SELECT 1"
-      "            FROM aggregation_tracking"
-      "            WHERE (aggregation_tracking.deposit_serial_id = d.deposit_serial_id)))"
-      " ORDER BY wire_deadline ASC",
-      2),
-    /* Used in #postgres_select_wire_out_above_serial_id() */
-    GNUNET_PQ_make_prepare (
-      "audit_get_wire_incr",
-      "SELECT"
-      " wireout_uuid"
-      ",execution_date"
-      ",wtid_raw"
-      ",payto_uri"
-      ",amount_val"
-      ",amount_frac"
-      " FROM wire_out"
-      "   JOIN wire_targets"
-      "     USING (wire_target_h_payto)"
-      " WHERE wireout_uuid>=$1"
-      " ORDER BY wireout_uuid ASC;",
-      1),
-    /* Used in #postgres_select_wire_out_above_serial_id_by_account() */
-    GNUNET_PQ_make_prepare (
-      "audit_get_wire_incr_by_account",
-      "SELECT"
-      " wireout_uuid"
-      ",execution_date"
-      ",wtid_raw"
-      ",payto_uri"
-      ",amount_val"
-      ",amount_frac"
-      " FROM wire_out"
-      "   JOIN wire_targets"
-      "     USING (wire_target_h_payto)"
-      " WHERE "
-      "      wireout_uuid>=$1 "
-      "  AND exchange_account_section=$2"
-      " ORDER BY wireout_uuid ASC;",
-      2),
-    /* Used in #postgres_select_recoup_above_serial_id() to obtain recoup transactions */
-    GNUNET_PQ_make_prepare (
-      "recoup_get_incr",
-      "SELECT"
-      " recoup_uuid"
-      ",recoup_timestamp"
-      ",reserves.reserve_pub"
-      ",coins.coin_pub"
-      ",coin_sig"
-      ",coin_blind"
-      ",ro.h_blind_ev"
-      ",denoms.denom_pub_hash"
-      ",coins.denom_sig"
-      ",coins.age_commitment_hash"
-      ",denoms.denom_pub"
-      ",amount_val"
-      ",amount_frac"
-      " FROM recoup"
-      "    JOIN known_coins coins"
-      "      USING (coin_pub)"
-      "    JOIN reserves_out ro"
-      "      USING (reserve_out_serial_id)"
-      "    JOIN reserves"
-      "      USING (reserve_uuid)"
-      "    JOIN denominations denoms"
-      "      ON (coins.denominations_serial = denoms.denominations_serial)"
-      " WHERE recoup_uuid>=$1"
-      " ORDER BY recoup_uuid ASC;",
-      1),
-    /* Used in #postgres_select_recoup_refresh_above_serial_id() to obtain
-       recoup-refresh transactions */
-    GNUNET_PQ_make_prepare (
-      "recoup_refresh_get_incr",
-      "SELECT"
-      " recoup_refresh_uuid"
-      ",recoup_timestamp"
-      ",old_coins.coin_pub AS old_coin_pub"
-      ",new_coins.age_commitment_hash"
-      ",old_denoms.denom_pub_hash AS old_denom_pub_hash"
-      ",new_coins.coin_pub As coin_pub"
-      ",coin_sig"
-      ",coin_blind"
-      ",new_denoms.denom_pub AS denom_pub"
-      ",rrc.h_coin_ev AS h_blind_ev"
-      ",new_denoms.denom_pub_hash"
-      ",new_coins.denom_sig AS denom_sig"
-      ",amount_val"
-      ",amount_frac"
-      " FROM recoup_refresh"
-      "    INNER JOIN refresh_revealed_coins rrc"
-      "      USING (rrc_serial)"
-      "    INNER JOIN refresh_commitments rfc"
-      "      ON (rrc.melt_serial_id = rfc.melt_serial_id)"
-      "    INNER JOIN known_coins old_coins"
-      "      ON (rfc.old_coin_pub = old_coins.coin_pub)"
-      "    INNER JOIN known_coins new_coins"
-      "      ON (new_coins.coin_pub = recoup_refresh.coin_pub)"
-      "    INNER JOIN denominations new_denoms"
-      "      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"
-      " ORDER BY recoup_refresh_uuid ASC;",
-      1),
-    /* Used in #postgres_select_reserve_closed_above_serial_id() to
-       obtain information about closed reserves */
-    GNUNET_PQ_make_prepare (
-      "reserves_close_get_incr",
-      "SELECT"
-      " close_uuid"
-      ",reserves.reserve_pub"
-      ",execution_date"
-      ",wtid"
-      ",payto_uri AS receiver_account"
-      ",amount_val"
-      ",amount_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      " FROM reserves_close"
-      "   JOIN wire_targets"
-      "     USING (wire_target_h_payto)"
-      "   JOIN reserves"
-      "     USING (reserve_pub)"
-      " WHERE close_uuid>=$1"
-      " ORDER BY close_uuid ASC;",
-      1),
-    /* Used in #postgres_get_reserve_history() to obtain recoup transactions
-       for a reserve - query optimization should be disabled i.e.
-       BEGIN; SET LOCAL join_collapse_limit=1; query; COMMIT; */
-    GNUNET_PQ_make_prepare (
-      "recoup_by_reserve",
-      /*
-      "SELECT"
-      " recoup.coin_pub"
-      ",recoup.coin_sig"
-      ",recoup.coin_blind"
-      ",recoup.amount_val"
-      ",recoup.amount_frac"
-      ",recoup.recoup_timestamp"
-      ",denominations.denom_pub_hash"
-      ",known_coins.denom_sig"
-      " FROM denominations"
-      " JOIN (known_coins"
-      "   JOIN recoup "
-      "   ON (recoup.coin_pub = known_coins.coin_pub))"
-      "  ON (known_coins.denominations_serial = denominations.denominations_serial)"
-      " WHERE recoup.coin_pub"
-      " IN (SELECT coin_pub"
-      "     FROM recoup_by_reserve"
-      "     JOIN (reserves_out"
-      "       JOIN (reserves_out_by_reserve"
-      "         JOIN reserves"
-      "           ON (reserves.reserve_uuid = reserves_out_by_reserve.reserve_uuid))"
-      "       ON (reserves_out_by_reserve.h_blind_ev = reserves_out.h_blind_ev))"
-      "     ON (recoup_by_reserve.reserve_out_serial_id = reserves_out.reserve_out_serial_id)"
-      "     WHERE reserves.reserve_pub=$1);",
-      */
-      "SELECT robr.coin_pub "
-      "  ,robr.coin_sig "
-      "  ,robr.coin_blind "
-      "  ,robr.amount_val "
-      "  ,robr.amount_frac "
-      "  ,robr.recoup_timestamp "
-      "  ,denominations.denom_pub_hash "
-      "  ,robr.denom_sig "
-      "FROM denominations "
-      "  JOIN exchange_do_recoup_by_reserve($1) robr"
-      " USING (denominations_serial);",
-      1),
-    /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
-       affecting old coins of refreshed coins */
-    GNUNET_PQ_make_prepare (
-      "recoup_by_old_coin",
-      "SELECT"
-      " coins.coin_pub"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",denoms.denom_pub_hash"
-      ",coins.denom_sig"
-      ",recoup_refresh_uuid"
-      " FROM recoup_refresh"
-      " JOIN known_coins coins"
-      "   USING (coin_pub)"
-      " JOIN denominations denoms"
-      "   USING (denominations_serial)"
-      " WHERE rrc_serial IN"
-      "   (SELECT rrc.rrc_serial"
-      "    FROM refresh_commitments"
-      "       JOIN refresh_revealed_coins rrc"
-      "           USING (melt_serial_id)"
-      "    WHERE old_coin_pub=$1);",
-      1),
-    /* Used in #postgres_get_reserve_history() */
-    GNUNET_PQ_make_prepare (
-      "close_by_reserve",
-      "SELECT"
-      " amount_val"
-      ",amount_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",execution_date"
-      ",payto_uri AS receiver_account"
-      ",wtid"
-      " FROM reserves_close"
-      "   JOIN wire_targets"
-      "     USING (wire_target_h_payto)"
-      " WHERE reserve_pub=$1;",
-      1),
-    /* Used in #postgres_get_expired_reserves() */
-    GNUNET_PQ_make_prepare (
-      "get_expired_reserves",
-      /*
-      "SELECT"
-      " expiration_date"
-      ",payto_uri AS account_details"
-      ",reserve_pub"
-      ",current_balance_val"
-      ",current_balance_frac"
-      " FROM reserves"
-      "   JOIN reserves_in ri"
-      "     USING (reserve_pub)"
-      "   JOIN wire_targets wt"
-      "     ON (ri.wire_source_h_payto = wt.wire_target_h_payto)"
-      " WHERE expiration_date<=$1"
-      "   AND (current_balance_val != 0 "
-      "        OR current_balance_frac != 0)"
-      " ORDER BY expiration_date ASC"
-      " LIMIT 1;",
-      */
-      "WITH ed AS MATERIALIZED ( "
-      " SELECT * "
-      " FROM reserves "
-      " WHERE expiration_date <= $1 "
-      "   AND (current_balance_val != 0 OR current_balance_frac != 0) "
-      " ORDER BY expiration_date ASC "
-      " LIMIT 1 "
-      ") "
-      "SELECT "
-      " ed.expiration_date "
-      " ,payto_uri AS account_details "
-      " ,ed.reserve_pub "
-      " ,current_balance_val "
-      " ,current_balance_frac "
-      "FROM ( "
-      " SELECT "
-      "  * "
-      " FROM reserves_in "
-      " WHERE reserve_pub = ( "
-      "     SELECT reserve_pub FROM ed) "
-      " ) ri "
-      "JOIN wire_targets wt ON (ri.wire_source_h_payto = wt.wire_target_h_payto) "
-      "JOIN ed ON (ri.reserve_pub = ed.reserve_pub); ",
-      1),
-    /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
-       for a coin */
-    GNUNET_PQ_make_prepare (
-      "recoup_by_coin",
-      "SELECT"
-      " reserves.reserve_pub"
-      ",denoms.denom_pub_hash"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",recoup_uuid"
-      " FROM recoup rcp"
-      /* NOTE: suboptimal JOIN follows: crosses shards!
-         Could theoretically be improved via a materialized
-         index. But likely not worth it (query is rare and
-         number of reserve shards might be limited) */
-      " JOIN reserves_out ro"
-      "   USING (reserve_out_serial_id)"
-      " JOIN reserves"
-      "   USING (reserve_uuid)"
-      " JOIN known_coins coins"
-      "   USING (coin_pub)"
-      " JOIN denominations denoms"
-      "   ON (denoms.denominations_serial = coins.denominations_serial)"
-      " WHERE coins.coin_pub=$1;",
-      1),
-    /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
-       for a refreshed coin */
-    GNUNET_PQ_make_prepare (
-      "recoup_by_refreshed_coin",
-      "SELECT"
-      " old_coins.coin_pub AS old_coin_pub"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",denoms.denom_pub_hash"
-      ",coins.denom_sig"
-      ",recoup_refresh_uuid"
-      " FROM recoup_refresh"
-      "    JOIN refresh_revealed_coins rrc"
-      "      USING (rrc_serial)"
-      "    JOIN refresh_commitments rfc"
-      "      ON (rrc.melt_serial_id = rfc.melt_serial_id)"
-      "    JOIN known_coins old_coins"
-      "      ON (rfc.old_coin_pub = old_coins.coin_pub)"
-      "    JOIN known_coins coins"
-      "      ON (recoup_refresh.coin_pub = coins.coin_pub)"
-      "    JOIN denominations denoms"
-      "      ON (denoms.denominations_serial = coins.denominations_serial)"
-      " WHERE coins.coin_pub=$1;",
-      1),
-    /* Used in #postgres_get_reserve_by_h_blind() */
-    GNUNET_PQ_make_prepare (
-      "reserve_by_h_blind",
-      "SELECT"
-      " reserves.reserve_pub"
-      ",reserve_out_serial_id"
-      " FROM reserves_out"
-      " JOIN reserves"
-      "   USING (reserve_uuid)"
-      " WHERE h_blind_ev=$1"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_get_old_coin_by_h_blind() */
-    GNUNET_PQ_make_prepare (
-      "old_coin_by_h_blind",
-      "SELECT"
-      " okc.coin_pub AS old_coin_pub"
-      ",rrc_serial"
-      " FROM refresh_revealed_coins rrc"
-      " JOIN refresh_commitments rcom USING (melt_serial_id)"
-      " JOIN known_coins okc ON (rcom.old_coin_pub = okc.coin_pub)"
-      " WHERE h_coin_ev=$1"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_lookup_auditor_timestamp() */
-    GNUNET_PQ_make_prepare (
-      "lookup_auditor_timestamp",
-      "SELECT"
-      " last_change"
-      " FROM auditors"
-      " WHERE auditor_pub=$1;",
-      1),
-    /* Used in #postgres_lookup_auditor_status() */
-    GNUNET_PQ_make_prepare (
-      "lookup_auditor_status",
-      "SELECT"
-      " auditor_url"
-      ",is_active"
-      " FROM auditors"
-      " WHERE auditor_pub=$1;",
-      1),
-    /* Used in #postgres_lookup_wire_timestamp() */
-    GNUNET_PQ_make_prepare (
-      "lookup_wire_timestamp",
-      "SELECT"
-      " last_change"
-      " FROM wire_accounts"
-      " WHERE payto_uri=$1;",
-      1),
-    /* used in #postgres_insert_auditor() */
-    GNUNET_PQ_make_prepare (
-      "insert_auditor",
-      "INSERT INTO auditors "
-      "(auditor_pub"
-      ",auditor_name"
-      ",auditor_url"
-      ",is_active"
-      ",last_change"
-      ") VALUES "
-      "($1, $2, $3, true, $4);",
-      4),
-    /* used in #postgres_update_auditor() */
-    GNUNET_PQ_make_prepare (
-      "update_auditor",
-      "UPDATE auditors"
-      " SET"
-      "  auditor_url=$2"
-      " ,auditor_name=$3"
-      " ,is_active=$4"
-      " ,last_change=$5"
-      " WHERE auditor_pub=$1",
-      5),
-    /* used in #postgres_insert_wire() */
-    GNUNET_PQ_make_prepare (
-      "insert_wire",
-      "INSERT INTO wire_accounts "
-      "(payto_uri"
-      ",master_sig"
-      ",is_active"
-      ",last_change"
-      ") VALUES "
-      "($1, $2, true, $3);",
-      3),
-    /* used in #postgres_update_wire() */
-    GNUNET_PQ_make_prepare (
-      "update_wire",
-      "UPDATE wire_accounts"
-      " SET"
-      "  is_active=$2"
-      " ,last_change=$3"
-      " WHERE payto_uri=$1",
-      3),
-    /* used in #postgres_update_wire() */
-    GNUNET_PQ_make_prepare (
-      "get_wire_accounts",
-      "SELECT"
-      " payto_uri"
-      ",master_sig"
-      " FROM wire_accounts"
-      " WHERE is_active",
-      0),
-    /* used in #postgres_update_wire() */
-    GNUNET_PQ_make_prepare (
-      "get_wire_fees",
-      "SELECT"
-      " wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      ",start_date"
-      ",end_date"
-      ",master_sig"
-      " FROM wire_fee"
-      " WHERE wire_method=$1",
-      1),
-    /* used in #postgres_insert_signkey_revocation() */
-    GNUNET_PQ_make_prepare (
-      "insert_signkey_revocation",
-      "INSERT INTO signkey_revocations "
-      "(esk_serial"
-      ",master_sig"
-      ") SELECT esk_serial, $2 "
-      "    FROM exchange_sign_keys"
-      "   WHERE exchange_pub=$1;",
-      2),
-    /* used in #postgres_insert_signkey_revocation() */
-    GNUNET_PQ_make_prepare (
-      "lookup_signkey_revocation",
-      "SELECT "
-      " master_sig"
-      " FROM signkey_revocations"
-      " WHERE esk_serial="
-      "   (SELECT esk_serial"
-      "      FROM exchange_sign_keys"
-      "     WHERE exchange_pub=$1);",
-      1),
-    /* used in #postgres_insert_signkey() */
-    GNUNET_PQ_make_prepare (
-      "insert_signkey",
-      "INSERT INTO exchange_sign_keys "
-      "(exchange_pub"
-      ",valid_from"
-      ",expire_sign"
-      ",expire_legal"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3, $4, $5);",
-      5),
-    /* used in #postgres_lookup_signing_key() */
-    GNUNET_PQ_make_prepare (
-      "lookup_signing_key",
-      "SELECT"
-      " valid_from"
-      ",expire_sign"
-      ",expire_legal"
-      " FROM exchange_sign_keys"
-      " WHERE exchange_pub=$1",
-      1),
-    /* used in #postgres_lookup_denomination_key() */
-    GNUNET_PQ_make_prepare (
-      "lookup_denomination_key",
-      "SELECT"
-      " valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"
-      ",coin_frac"
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",age_mask"
-      " FROM denominations"
-      " WHERE denom_pub_hash=$1;",
-      1),
-    /* used in #postgres_insert_auditor_denom_sig() */
-    GNUNET_PQ_make_prepare (
-      "insert_auditor_denom_sig",
-      "WITH ax AS"
-      " (SELECT auditor_uuid"
-      "    FROM auditors"
-      "   WHERE auditor_pub=$1)"
-      "INSERT INTO auditor_denom_sigs "
-      "(auditor_uuid"
-      ",denominations_serial"
-      ",auditor_sig"
-      ") SELECT ax.auditor_uuid, denominations_serial, $3 "
-      "    FROM denominations"
-      "   CROSS JOIN ax"
-      "   WHERE denom_pub_hash=$2;",
-      3),
-    /* used in #postgres_select_auditor_denom_sig() */
-    GNUNET_PQ_make_prepare (
-      "select_auditor_denom_sig",
-      "SELECT"
-      " auditor_sig"
-      " FROM auditor_denom_sigs"
-      " WHERE auditor_uuid="
-      "  (SELECT auditor_uuid"
-      "    FROM auditors"
-      "    WHERE auditor_pub=$1)"
-      " AND denominations_serial="
-      "  (SELECT denominations_serial"
-      "    FROM denominations"
-      "    WHERE denom_pub_hash=$2);",
-      2),
-    /* used in #postgres_lookup_wire_fee_by_time() */
-    GNUNET_PQ_make_prepare (
-      "lookup_wire_fee_by_time",
-      "SELECT"
-      " wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      " FROM wire_fee"
-      " WHERE wire_method=$1"
-      " AND end_date > $2"
-      " AND start_date < $3;",
-      1),
-    /* used in #postgres_lookup_wire_fee_by_time() */
-    GNUNET_PQ_make_prepare (
-      "lookup_global_fee_by_time",
-      "SELECT"
-      " history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      " FROM global_fee"
-      " WHERE end_date > $1"
-      "   AND start_date < $2;",
-      1),
-    /* used in #postgres_commit */
-    GNUNET_PQ_make_prepare (
-      "do_commit",
-      "COMMIT",
-      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_wire_targets",
-      "SELECT"
-      " wire_target_serial_id AS serial"
-      " FROM wire_targets"
-      " ORDER BY wire_target_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_global_fee",
-      "SELECT"
-      " global_fee_serial AS serial"
-      " FROM global_fee"
-      " ORDER BY global_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),
-    GNUNET_PQ_make_prepare (
-      "select_serial_by_table_extensions",
-      "SELECT"
-      " extension_id AS serial"
-      " FROM extensions"
-      " ORDER BY extension_id DESC"
-      " LIMIT 1;",
-      0),
-    GNUNET_PQ_make_prepare (
-      "select_serial_by_table_extension_details",
-      "SELECT"
-      " extension_details_serial_id AS serial"
-      " FROM extension_details"
-      " ORDER BY extension_details_serial_id DESC"
-      " LIMIT 1;",
-      0),
-    /* For postgres_lookup_records_by_table */
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_denominations",
-      "SELECT"
-      " denominations_serial AS serial"
-      ",denom_type"
-      ",denom_pub"
-      ",master_sig"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"
-      ",coin_frac"
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ",age_mask"
-      " FROM denominations"
-      " WHERE denominations_serial > $1"
-      " ORDER BY denominations_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_denomination_revocations",
-      "SELECT"
-      " denom_revocations_serial_id AS serial"
-      ",master_sig"
-      ",denominations_serial"
-      " FROM denomination_revocations"
-      " WHERE denom_revocations_serial_id > $1"
-      " ORDER BY denom_revocations_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_wire_targets",
-      "SELECT"
-      " wire_target_serial_id AS serial"
-      ",payto_uri"
-      ",kyc_ok"
-      ",external_id"
-      " FROM wire_targets"
-      " WHERE wire_target_serial_id > $1"
-      " ORDER BY wire_target_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_reserves",
-      "SELECT"
-      " reserve_uuid AS serial"
-      ",reserve_pub"
-      ",current_balance_val"
-      ",current_balance_frac"
-      ",expiration_date"
-      ",gc_date"
-      " FROM reserves"
-      " WHERE reserve_uuid > $1"
-      " ORDER BY reserve_uuid ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_reserves_in",
-      "SELECT"
-      " reserve_in_serial_id AS serial"
-      ",reserve_pub"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",wire_source_h_payto"
-      ",exchange_account_section"
-      ",execution_date"
-      " FROM reserves_in"
-      " WHERE reserve_in_serial_id > $1"
-      " ORDER BY reserve_in_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_reserves_close",
-      "SELECT"
-      " close_uuid AS serial"
-      ",reserve_pub"
-      ",execution_date"
-      ",wtid"
-      ",wire_target_h_payto"
-      ",amount_val"
-      ",amount_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      " FROM reserves_close"
-      " WHERE close_uuid > $1"
-      " ORDER BY close_uuid ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_reserves_out",
-      "SELECT"
-      " reserve_out_serial_id AS serial"
-      ",h_blind_ev"
-      ",denominations_serial"
-      ",denom_sig"
-      ",reserve_uuid"
-      ",reserve_sig"
-      ",execution_date"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      " FROM reserves_out"
-      " JOIN reserves USING (reserve_uuid)"
-      " WHERE reserve_out_serial_id > $1"
-      " ORDER BY reserve_out_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_auditors",
-      "SELECT"
-      " auditor_uuid AS serial"
-      ",auditor_pub"
-      ",auditor_name"
-      ",auditor_url"
-      ",is_active"
-      ",last_change"
-      " FROM auditors"
-      " WHERE auditor_uuid > $1"
-      " ORDER BY auditor_uuid ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_auditor_denom_sigs",
-      "SELECT"
-      " auditor_denom_serial AS serial"
-      ",auditor_uuid"
-      ",denominations_serial"
-      ",auditor_sig"
-      " FROM auditor_denom_sigs"
-      " WHERE auditor_denom_serial > $1"
-      " ORDER BY auditor_denom_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_exchange_sign_keys",
-      "SELECT"
-      " esk_serial AS serial"
-      ",exchange_pub"
-      ",master_sig"
-      ",valid_from"
-      ",expire_sign"
-      ",expire_legal"
-      " FROM exchange_sign_keys"
-      " WHERE esk_serial > $1"
-      " ORDER BY esk_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_signkey_revocations",
-      "SELECT"
-      " signkey_revocations_serial_id AS serial"
-      ",esk_serial"
-      ",master_sig"
-      " FROM signkey_revocations"
-      " WHERE signkey_revocations_serial_id > $1"
-      " ORDER BY signkey_revocations_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_known_coins",
-      "SELECT"
-      " known_coin_id AS serial"
-      ",coin_pub"
-      ",denom_sig"
-      ",denominations_serial"
-      ",remaining_val"
-      ",remaining_frac"
-      " FROM known_coins"
-      " WHERE known_coin_id > $1"
-      " ORDER BY known_coin_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_refresh_commitments",
-      "SELECT"
-      " melt_serial_id AS serial"
-      ",rc"
-      ",old_coin_sig"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",noreveal_index"
-      ",old_coin_pub"
-      " FROM refresh_commitments"
-      " WHERE melt_serial_id > $1"
-      " ORDER BY melt_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_refresh_revealed_coins",
-      "SELECT"
-      " rrc_serial AS serial"
-      ",freshcoin_index"
-      ",link_sig"
-      ",coin_ev"
-      ",ev_sig"
-      ",ewv"
-      ",denominations_serial"
-      ",melt_serial_id"
-      " FROM refresh_revealed_coins"
-      " WHERE rrc_serial > $1"
-      " ORDER BY rrc_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_refresh_transfer_keys",
-      "SELECT"
-      " rtc_serial AS serial"
-      ",transfer_pub"
-      ",transfer_privs"
-      ",melt_serial_id"
-      " FROM refresh_transfer_keys"
-      " WHERE rtc_serial > $1"
-      " ORDER BY rtc_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_deposits",
-      "SELECT"
-      " deposit_serial_id AS serial"
-      ",shard"
-      ",coin_pub"
-      ",known_coin_id"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",wallet_timestamp"
-      ",exchange_timestamp"
-      ",refund_deadline"
-      ",wire_deadline"
-      ",merchant_pub"
-      ",h_contract_terms"
-      ",coin_sig"
-      ",wire_salt"
-      ",wire_target_h_payto"
-      ",done"
-      ",extension_blocked"
-      ",extension_details_serial_id"
-      " FROM deposits"
-      " WHERE deposit_serial_id > $1"
-      " ORDER BY deposit_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_refunds",
-      "SELECT"
-      " refund_serial_id AS serial"
-      ",coin_pub"
-      ",merchant_sig"
-      ",rtransaction_id"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",deposit_serial_id"
-      " FROM refunds"
-      " WHERE refund_serial_id > $1"
-      " ORDER BY refund_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_wire_out",
-      "SELECT"
-      " wireout_uuid AS serial"
-      ",execution_date"
-      ",wtid_raw"
-      ",wire_target_h_payto"
-      ",exchange_account_section"
-      ",amount_val"
-      ",amount_frac"
-      " FROM wire_out"
-      " WHERE wireout_uuid > $1"
-      " ORDER BY wireout_uuid ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_aggregation_tracking",
-      "SELECT"
-      " aggregation_serial_id AS serial"
-      ",deposit_serial_id"
-      ",wtid_raw"
-      " FROM aggregation_tracking"
-      " WHERE aggregation_serial_id > $1"
-      " ORDER BY aggregation_serial_id ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_wire_fee",
-      "SELECT"
-      " wire_fee_serial AS serial"
-      ",wire_method"
-      ",start_date"
-      ",end_date"
-      ",wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      ",master_sig"
-      " FROM wire_fee"
-      " WHERE wire_fee_serial > $1"
-      " ORDER BY wire_fee_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_global_fee",
-      "SELECT"
-      " global_fee_serial AS serial"
-      ",start_date"
-      ",end_date"
-      ",history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      ",master_sig"
-      " FROM global_fee"
-      " WHERE global_fee_serial > $1"
-      " ORDER BY global_fee_serial ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_recoup",
-      "SELECT"
-      " recoup_uuid AS serial"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",coin_pub"
-      ",reserve_out_serial_id"
-      " FROM recoup"
-      " WHERE recoup_uuid > $1"
-      " ORDER BY recoup_uuid ASC;",
-      1),
-    GNUNET_PQ_make_prepare (
-      "select_above_serial_by_table_recoup_refresh",
-      "SELECT"
-      " recoup_refresh_uuid AS serial"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",coin_pub"
-      ",known_coin_id"
-      ",rrc_serial"
-      " FROM recoup_refresh"
-      " WHERE recoup_refresh_uuid > $1"
-      " ORDER BY recoup_refresh_uuid ASC;",
-      1),
-    /* For postgres_insert_records_by_table */
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_denominations",
-      "INSERT INTO denominations"
-      "(denominations_serial"
-      ",denom_pub_hash"
-      ",denom_type"
-      ",age_mask"
-      ",denom_pub"
-      ",master_sig"
-      ",valid_from"
-      ",expire_withdraw"
-      ",expire_deposit"
-      ",expire_legal"
-      ",coin_val"
-      ",coin_frac"
-      ",fee_withdraw_val"
-      ",fee_withdraw_frac"
-      ",fee_deposit_val"
-      ",fee_deposit_frac"
-      ",fee_refresh_val"
-      ",fee_refresh_frac"
-      ",fee_refund_val"
-      ",fee_refund_frac"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
-      " $11, $12, $13, $14, $15, $16, $17, $18, $19, $20);",
-      20),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_denomination_revocations",
-      "INSERT INTO denomination_revocations"
-      "(denom_revocations_serial_id"
-      ",master_sig"
-      ",denominations_serial"
-      ") VALUES "
-      "($1, $2, $3);",
-      3),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_wire_targets",
-      "INSERT INTO wire_targets"
-      "(wire_target_serial_id"
-      ",wire_target_h_payto"
-      ",payto_uri"
-      ",kyc_ok"
-      ",external_id"
-      ") VALUES "
-      "($1, $2, $3, $4, $5);",
-      5),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_reserves",
-      "INSERT INTO reserves"
-      "(reserve_uuid"
-      ",reserve_pub"
-      ",current_balance_val"
-      ",current_balance_frac"
-      ",expiration_date"
-      ",gc_date"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6);",
-      6),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_reserves_in",
-      "INSERT INTO reserves_in"
-      "(reserve_in_serial_id"
-      ",wire_reference"
-      ",credit_val"
-      ",credit_frac"
-      ",wire_source_h_payto"
-      ",exchange_account_section"
-      ",execution_date"
-      ",reserve_pub"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8);",
-      8),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_reserves_close",
-      "INSERT INTO reserves_close"
-      "(close_uuid"
-      ",execution_date"
-      ",wtid"
-      ",wire_target_h_payto"
-      ",amount_val"
-      ",amount_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",reserve_pub"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9);",
-      9),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_reserves_out",
-      "INSERT INTO reserves_out"
-      "(reserve_out_serial_id"
-      ",h_blind_ev"
-      ",denominations_serial"
-      ",denom_sig"
-      ",reserve_uuid"
-      ",reserve_sig"
-      ",execution_date"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9);",
-      9),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_auditors",
-      "INSERT INTO auditors"
-      "(auditor_uuid"
-      ",auditor_pub"
-      ",auditor_name"
-      ",auditor_url"
-      ",is_active"
-      ",last_change"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6);",
-      6),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_auditor_denom_sigs",
-      "INSERT INTO auditor_denom_sigs"
-      "(auditor_denom_serial"
-      ",auditor_uuid"
-      ",denominations_serial"
-      ",auditor_sig"
-      ") VALUES "
-      "($1, $2, $3, $4);",
-      4),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_exchange_sign_keys",
-      "INSERT INTO exchange_sign_keys"
-      "(esk_serial"
-      ",exchange_pub"
-      ",master_sig"
-      ",valid_from"
-      ",expire_sign"
-      ",expire_legal"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6);",
-      6),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_signkey_revocations",
-      "INSERT INTO signkey_revocations"
-      "(signkey_revocations_serial_id"
-      ",esk_serial"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3);",
-      3),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_known_coins",
-      "INSERT INTO known_coins"
-      "(known_coin_id"
-      ",coin_pub"
-      ",denom_sig"
-      ",denominations_serial"
-      ",remaining_val"
-      ",remaining_frac"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6);",
-      6),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_refresh_commitments",
-      "INSERT INTO refresh_commitments"
-      "(melt_serial_id"
-      ",rc"
-      ",old_coin_sig"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",noreveal_index"
-      ",old_coin_pub"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7);",
-      7),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_refresh_revealed_coins",
-      "INSERT INTO refresh_revealed_coins"
-      "(rrc_serial"
-      ",freshcoin_index"
-      ",link_sig"
-      ",coin_ev"
-      ",h_coin_ev"
-      ",ev_sig"
-      ",ewv"
-      ",denominations_serial"
-      ",melt_serial_id"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9);",
-      9),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_refresh_transfer_keys",
-      "INSERT INTO refresh_transfer_keys"
-      "(rtc_serial"
-      ",transfer_pub"
-      ",transfer_privs"
-      ",melt_serial_id"
-      ") VALUES "
-      "($1, $2, $3, $4);",
-      4),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_deposits",
-      "INSERT INTO deposits"
-      "(deposit_serial_id"
-      ",shard"
-      ",known_coin_id"
-      ",coin_pub"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",wallet_timestamp"
-      ",exchange_timestamp"
-      ",refund_deadline"
-      ",wire_deadline"
-      ",merchant_pub"
-      ",h_contract_terms"
-      ",coin_sig"
-      ",wire_salt"
-      ",wire_target_h_payto"
-      ",done"
-      ",extension_blocked"
-      ",extension_details_serial_id"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10,"
-      " $11, $12, $13, $14, $15, $16, $17, $18);",
-      18),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_refunds",
-      "INSERT INTO refunds"
-      "(refund_serial_id"
-      ",coin_pub"
-      ",merchant_sig"
-      ",rtransaction_id"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",deposit_serial_id"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7);",
-      7),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_aggregation_tracking",
-      "INSERT INTO aggregation_tracking"
-      "(aggregation_serial_id"
-      ",deposit_serial_id"
-      ",wtid_raw"
-      ") VALUES "
-      "($1, $2, $3);",
-      3),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_wire_fee",
-      "INSERT INTO wire_fee"
-      "(wire_fee_serial"
-      ",wire_method"
-      ",start_date"
-      ",end_date"
-      ",wire_fee_val"
-      ",wire_fee_frac"
-      ",closing_fee_val"
-      ",closing_fee_frac"
-      ",wad_fee_val"
-      ",wad_fee_frac"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);",
-      11),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_global_fee",
-      "INSERT INTO global_fee"
-      "(global_fee_serial"
-      ",start_date"
-      ",end_date"
-      ",history_fee_val"
-      ",history_fee_frac"
-      ",kyc_fee_val"
-      ",kyc_fee_frac"
-      ",account_fee_val"
-      ",account_fee_frac"
-      ",purse_fee_val"
-      ",purse_fee_frac"
-      ",purse_timeout"
-      ",kyc_timeout"
-      ",history_expiration"
-      ",purse_account_limit"
-      ",master_sig"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16);",
-      16),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_recoup",
-      "INSERT INTO recoup"
-      "(recoup_uuid"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",coin_pub"
-      ",reserve_out_serial_id"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8);",
-      8),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_recoup_refresh",
-      "INSERT INTO recoup_refresh"
-      "(recoup_refresh_uuid"
-      ",coin_sig"
-      ",coin_blind"
-      ",amount_val"
-      ",amount_frac"
-      ",recoup_timestamp"
-      ",known_coin_id"
-      ",coin_pub"
-      ",rrc_serial"
-      ") VALUES "
-      "($1, $2, $3, $4, $5, $6, $7, $8, $9);",
-      9),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_extensions",
-      "INSERT INTO extensions"
-      "(extension_id"
-      ",name"
-      ",config"
-      ") VALUES "
-      "($1, $2, $3);",
-      3),
-    GNUNET_PQ_make_prepare (
-      "insert_into_table_extension_details",
-      "INSERT INTO extension_details"
-      "(extension_details_serial_id"
-      ",extension_options"
-      ") VALUES "
-      "($1, $2);",
-      2),
-
-    /* Used in #postgres_begin_shard() */
-    GNUNET_PQ_make_prepare (
-      "get_open_shard",
-      "SELECT"
-      " start_row"
-      ",end_row"
-      " FROM work_shards"
-      " WHERE job_name=$1"
-      "   AND last_attempt<$2"
-      "   AND completed=FALSE"
-      " ORDER BY last_attempt ASC"
-      " LIMIT 1;",
-      2),
-    /* Used in #postgres_begin_revolving_shard() */
-    GNUNET_PQ_make_prepare (
-      "get_open_revolving_shard",
-      "SELECT"
-      " start_row"
-      ",end_row"
-      " FROM revolving_work_shards"
-      " WHERE job_name=$1"
-      "   AND active=FALSE"
-      " ORDER BY last_attempt ASC"
-      " LIMIT 1;",
-      2),
-    /* Used in #postgres_begin_shard() */
-    GNUNET_PQ_make_prepare (
-      "reclaim_shard",
-      "UPDATE work_shards"
-      " SET last_attempt=$2"
-      " WHERE job_name=$1"
-      "   AND start_row=$3"
-      "   AND end_row=$4",
-      4),
-    /* Used in #postgres_begin_revolving_shard() */
-    GNUNET_PQ_make_prepare (
-      "reclaim_revolving_shard",
-      "UPDATE revolving_work_shards"
-      " SET last_attempt=$2"
-      "    ,active=TRUE"
-      " WHERE job_name=$1"
-      "   AND start_row=$3"
-      "   AND end_row=$4",
-      4),
-    /* Used in #postgres_begin_shard() */
-    GNUNET_PQ_make_prepare (
-      "get_last_shard",
-      "SELECT"
-      " end_row"
-      " FROM work_shards"
-      " WHERE job_name=$1"
-      " ORDER BY end_row DESC"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_begin_revolving_shard() */
-    GNUNET_PQ_make_prepare (
-      "get_last_revolving_shard",
-      "SELECT"
-      " end_row"
-      " FROM revolving_work_shards"
-      " WHERE job_name=$1"
-      " ORDER BY end_row DESC"
-      " LIMIT 1;",
-      1),
-    /* Used in #postgres_abort_shard() */
-    GNUNET_PQ_make_prepare (
-      "abort_shard",
-      "UPDATE work_shards"
-      "   SET last_attempt=0"
-      " WHERE job_name = $1 "
-      "    AND start_row = $2 "
-      "    AND end_row = $3;",
-      3),
-    /* Used in #postgres_begin_shard() */
-    GNUNET_PQ_make_prepare (
-      "claim_next_shard",
-      "INSERT INTO work_shards"
-      "(job_name"
-      ",last_attempt"
-      ",start_row"
-      ",end_row"
-      ") VALUES "
-      "($1, $2, $3, $4);",
-      4),
-    /* Used in #postgres_claim_revolving_shard() */
-    GNUNET_PQ_make_prepare (
-      "create_revolving_shard",
-      "INSERT INTO revolving_work_shards"
-      "(job_name"
-      ",last_attempt"
-      ",start_row"
-      ",end_row"
-      ",active"
-      ") VALUES "
-      "($1, $2, $3, $4, TRUE);",
-      4),
-    /* Used in #postgres_complete_shard() */
-    GNUNET_PQ_make_prepare (
-      "complete_shard",
-      "UPDATE work_shards"
-      " SET completed=TRUE"
-      " WHERE job_name=$1"
-      "   AND start_row=$2"
-      "   AND end_row=$3",
-      3),
-    /* Used in #postgres_complete_shard() */
-    GNUNET_PQ_make_prepare (
-      "release_revolving_shard",
-      "UPDATE revolving_work_shards"
-      " SET active=FALSE"
-      " WHERE job_name=$1"
-      "   AND start_row=$2"
-      "   AND end_row=$3",
-      3),
-    /* Used in #postgres_set_extension_config */
-    GNUNET_PQ_make_prepare (
-      "set_extension_config",
-      "INSERT INTO extensions (name, config) VALUES ($1, $2) "
-      "ON CONFLICT (name) "
-      "DO UPDATE SET config=$2",
-      2),
-    /* Used in #postgres_get_extension_config */
-    GNUNET_PQ_make_prepare (
-      "get_extension_config",
-      "SELECT "
-      " config "
-      "FROM extensions"
-      "   WHERE name=$1;",
-      1),
-    /* Used in #postgres_insert_contract() */
-    GNUNET_PQ_make_prepare (
-      "insert_contract",
-      "INSERT INTO contracts"
-      "  (purse_pub"
-      "  ,pub_ckey"
-      "  ,e_contract"
-      "  ,contract_sig"
-      "  ,purse_expiration"
-      "  ) SELECT "
-      "  $1, $2, $3, $4, purse_expiration"
-      "  FROM purse_requests"
-      "  WHERE purse_pub=$1"
-      "  ON CONFLICT DO NOTHING;",
-      4),
-    /* Used in #postgres_select_contract */
-    GNUNET_PQ_make_prepare (
-      "select_contract",
-      "SELECT "
-      " purse_pub"
-      ",e_contract"
-      ",contract_sig"
-      " FROM contracts"
-      "   WHERE pub_ckey=$1;",
-      1),
-    /* Used in #postgres_select_contract_by_purse */
-    GNUNET_PQ_make_prepare (
-      "select_contract_by_purse",
-      "SELECT "
-      " pub_ckey"
-      ",e_contract"
-      ",contract_sig"
-      " FROM contracts"
-      "   WHERE purse_pub=$1;",
-      1),
-    /* Used in #postgres_insert_purse_request() */
-    GNUNET_PQ_make_prepare (
-      "insert_purse_request",
-      "INSERT INTO purse_requests"
-      "  (purse_pub"
-      "  ,merge_pub"
-      "  ,purse_creation"
-      "  ,purse_expiration"
-      "  ,h_contract_terms"
-      "  ,age_limit"
-      "  ,flags"
-      "  ,in_reserve_quota"
-      "  ,amount_with_fee_val"
-      "  ,amount_with_fee_frac"
-      "  ,purse_fee_val"
-      "  ,purse_fee_frac"
-      "  ,purse_sig"
-      "  ) VALUES "
-      "  ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"
-      "  ON CONFLICT DO NOTHING;",
-      13),
-    /* Used in #postgres_select_purse */
-    GNUNET_PQ_make_prepare (
-      "select_purse",
-      "SELECT "
-      " merge_pub"
-      ",purse_expiration"
-      ",h_contract_terms"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",balance_val"
-      ",balance_frac"
-      ",merge_timestamp"
-      " FROM purse_requests"
-      " LEFT JOIN purse_merges USING (purse_pub)"
-      " WHERE purse_pub=$1;",
-      1),
-    /* Used in #postgres_select_purse_request */
-    GNUNET_PQ_make_prepare (
-      "select_purse_request",
-      "SELECT "
-      " merge_pub"
-      ",purse_expiration"
-      ",h_contract_terms"
-      ",age_limit"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",balance_val"
-      ",balance_frac"
-      ",purse_sig"
-      " FROM purse_requests"
-      " WHERE purse_pub=$1;",
-      1),
-    /* Used in #postgres_select_purse_by_merge_pub */
-    GNUNET_PQ_make_prepare (
-      "select_purse_by_merge_pub",
-      "SELECT "
-      " purse_pub"
-      ",purse_expiration"
-      ",h_contract_terms"
-      ",age_limit"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",balance_val"
-      ",balance_frac"
-      ",purse_sig"
-      " FROM purse_requests"
-      " WHERE merge_pub=$1;",
-      1),
-    /* Used in #postgres_get_purse_deposit */
-    GNUNET_PQ_make_prepare (
-      "select_purse_deposit_by_coin_pub",
-      "SELECT "
-      " coin_sig"
-      ",amount_with_fee_val"
-      ",amount_with_fee_frac"
-      ",partner_base_url"
-      " FROM purse_deposits"
-      " LEFT JOIN partners USING (partner_serial_id)"
-      " WHERE coin_pub=$2"
-      "   AND purse_pub=$1;",
-      2),
-    /* Used in #postgres_do_purse_merge() */
-    GNUNET_PQ_make_prepare (
-      "call_purse_merge",
-      "SELECT"
-      " out_no_partner AS no_partner"
-      ",out_no_balance AS no_balance"
-      ",out_conflict AS conflict"
-      " FROM exchange_do_purse_merge"
-      "  ($1, $2, $3, $4, $5, $6);",
-      6),
-    /* Used in #postgres_do_reserve_purse() */
-    GNUNET_PQ_make_prepare (
-      "call_reserve_purse",
-      "SELECT"
-      " out_no_funds AS insufficient_funds"
-      ",out_conflict AS conflict"
-      " FROM exchange_do_reserve_purse"
-      "  ($1, $2, $3, $4, $5, $6, $7, $8);",
-      8),
-    /* Used in #postgres_select_purse_merge */
-    GNUNET_PQ_make_prepare (
-      "select_purse_merge",
-      "SELECT "
-      " reserve_pub"
-      ",merge_sig"
-      ",merge_timestamp"
-      ",partner_base_url"
-      " FROM purse_merges"
-      " LEFT JOIN partners USING (partner_serial_id)"
-      " WHERE purse_pub=$1;",
-      1),
-    /* Used in #postgres_do_account_merge() */
-    GNUNET_PQ_make_prepare (
-      "call_account_merge",
-      "SELECT 1"
-      " FROM exchange_do_account_merge"
-      "  ($1, $2, $3);",
-      3),
-    /* Used in #postgres_insert_history_request() */
-    GNUNET_PQ_make_prepare (
-      "call_history_request",
-      "SELECT 1"
-      " FROM exchange_do_history_request"
-      "  ($1, $2, $3, $4, $5)",
-      5),
-    /* Used in #postgres_insert_close_request() */
-    GNUNET_PQ_make_prepare (
-      "call_account_close",
-      "SELECT "
-      " out_final_balance_val"
-      ",out_final_balance_frac"
-      " FROM exchange_do_close_request"
-      "  ($1, $2)",
-      2),
-
-    GNUNET_PQ_PREPARED_STATEMENT_END
-  };
-
-  ret = GNUNET_PQ_prepare_statements (pg->conn,
-                                      ps);
-  if (GNUNET_OK != ret)
-    return ret;
-  pg->init = true;
-  return GNUNET_OK;
-}
-
-
-/**
  * Connect to the database if the connection does not exist yet.
  *
  * @param pg the plugin-specific state
- * @param skip_prepare true if we should skip prepared statement setup
  * @return #GNUNET_OK on success
  */
-static enum GNUNET_GenericReturnValue
-internal_setup (struct PostgresClosure *pg,
-                bool skip_prepare)
+enum GNUNET_GenericReturnValue
+TEH_PG_internal_setup (struct PostgresClosure *pg)
 {
   if (NULL == pg->conn)
   {
@@ -3694,6 +272,9 @@ internal_setup (struct PostgresClosure *pg,
         "SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL SERIALIZABLE;"),
       GNUNET_PQ_make_try_execute ("SET enable_sort=OFF;"),
       GNUNET_PQ_make_try_execute ("SET enable_seqscan=OFF;"),
+      GNUNET_PQ_make_try_execute ("SET search_path TO exchange;"),
+      /* Mergejoin causes issues, see Postgres #18380 */
+      GNUNET_PQ_make_try_execute ("SET enable_mergejoin=OFF;"),
       GNUNET_PQ_EXECUTE_STATEMENT_END
     };
 #else
@@ -3702,7 +283,9 @@ internal_setup (struct PostgresClosure *pg,
         "SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL SERIALIZABLE;"),
       GNUNET_PQ_make_try_execute ("SET enable_sort=OFF;"),
       GNUNET_PQ_make_try_execute ("SET enable_seqscan=OFF;"),
-      GNUNET_PQ_make_try_execute ("SET autocommit=OFF;"),
+      /* Mergejoin causes issues, see Postgres #18380 */
+      GNUNET_PQ_make_try_execute ("SET enable_mergejoin=OFF;"),
+      GNUNET_PQ_make_try_execute ("SET search_path TO exchange;"),
       GNUNET_PQ_EXECUTE_STATEMENT_END
     };
 #endif
@@ -3715,10342 +298,17 @@ internal_setup (struct PostgresClosure *pg,
                                           NULL);
     if (NULL == db_conn)
       return GNUNET_SYSERR;
+
+    pg->prep_gen++;
     pg->conn = db_conn;
   }
   if (NULL == pg->transaction_name)
     GNUNET_PQ_reconnect_if_down (pg->conn);
-  if (pg->init)
-    return GNUNET_OK;
-  if (skip_prepare)
-    return GNUNET_OK;
-  return prepare_statements (pg);
-}
-
-
-/**
- * Do a pre-flight check that we are not in an uncommitted transaction.
- * If we are, try to commit the previous transaction and output a warning.
- * Does not return anything, as we will continue regardless of the outcome.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @return #GNUNET_OK if everything is fine
- *         #GNUNET_NO if a transaction was rolled back
- *         #GNUNET_SYSERR on hard errors
- */
-static enum GNUNET_GenericReturnValue
-postgres_preflight (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute ("ROLLBACK"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  if (! pg->init)
-  {
-    if (GNUNET_OK !=
-        internal_setup (pg,
-                        false))
-      return GNUNET_SYSERR;
-  }
-  if (NULL == pg->transaction_name)
-    return GNUNET_OK; /* all good */
-  if (GNUNET_OK ==
-      GNUNET_PQ_exec_statements (pg->conn,
-                                 es))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "BUG: Preflight check rolled back transaction `%s'!\n",
-                pg->transaction_name);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "BUG: Preflight check failed to rollback transaction `%s'!\n",
-                pg->transaction_name);
-  }
-  pg->transaction_name = NULL;
-  return GNUNET_NO;
-}
-
-
-/**
- * Start a transaction.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param name unique name identifying the transaction (for debugging)
- *             must point to a constant
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-postgres_start (void *cls,
-                const char *name)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute ("START TRANSACTION ISOLATION LEVEL SERIALIZABLE"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  if (GNUNET_SYSERR ==
-      postgres_preflight (pg))
-    return GNUNET_SYSERR;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting transaction named %s on %p\n",
-              name,
-              pg->conn);
-  if (GNUNET_OK !=
-      GNUNET_PQ_exec_statements (pg->conn,
-                                 es))
-  {
-    TALER_LOG_ERROR ("Failed to start transaction\n");
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  pg->transaction_name = name;
-  return GNUNET_OK;
-}
-
-
-/**
- * Start a READ COMMITTED transaction.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param name unique name identifying the transaction (for debugging)
- *             must point to a constant
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-postgres_start_read_committed (void *cls,
-                               const char *name)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute ("START TRANSACTION ISOLATION LEVEL READ COMMITTED"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  if (GNUNET_SYSERR ==
-      postgres_preflight (pg))
-    return GNUNET_SYSERR;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Starting transaction named %s on %p\n",
-              name,
-              pg->conn);
-  if (GNUNET_OK !=
-      GNUNET_PQ_exec_statements (pg->conn,
-                                 es))
-  {
-    TALER_LOG_ERROR ("Failed to start transaction\n");
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  pg->transaction_name = name;
   return GNUNET_OK;
 }
 
 
 /**
- * Roll back the current transaction of a database connection.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- */
-static void
-postgres_rollback (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute ("ROLLBACK"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Rolling back transaction on %p\n",
-              pg->conn);
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_PQ_exec_statements (pg->conn,
-                                           es));
-  pg->transaction_name = NULL;
-}
-
-
-/**
- * Commit the current transaction of a database connection.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @return final transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_commit (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                           "do_commit",
-                                           params);
-  pg->transaction_name = NULL;
-  return qs;
-}
-
-
-/**
- * Register callback to be invoked on events of type @a es.
- *
- * @param cls database context to use
- * @param timeout how long until to generate a timeout event
- * @param es specification of the event to listen for
- * @param cb function to call when the event happens, possibly
- *         multiple times (until cancel is invoked)
- * @param cb_cls closure for @a cb
- * @return handle useful to cancel the listener
- */
-static struct GNUNET_DB_EventHandler *
-postgres_event_listen (void *cls,
-                       struct GNUNET_TIME_Relative timeout,
-                       const struct GNUNET_DB_EventHeaderP *es,
-                       GNUNET_DB_EventCallback cb,
-                       void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-
-  return GNUNET_PQ_event_listen (pg->conn,
-                                 es,
-                                 timeout,
-                                 cb,
-                                 cb_cls);
-}
-
-
-/**
- * Stop notifications.
- *
- * @param cls the plugin's `struct PostgresClosure`
- * @param eh handle to unregister.
- */
-static void
-postgres_event_listen_cancel (void *cls,
-                              struct GNUNET_DB_EventHandler *eh)
-{
-  (void) cls;
-  GNUNET_PQ_event_listen_cancel (eh);
-}
-
-
-/**
- * Notify all that listen on @a es of an event.
- *
- * @param cls database context to use
- * @param es specification of the event to generate
- * @param extra additional event data provided
- * @param extra_size number of bytes in @a extra
- */
-static void
-postgres_event_notify (void *cls,
-                       const struct GNUNET_DB_EventHeaderP *es,
-                       const void *extra,
-                       size_t extra_size)
-{
-  struct PostgresClosure *pg = cls;
-
-  GNUNET_PQ_event_notify (pg->conn,
-                          es,
-                          extra,
-                          extra_size);
-}
-
-
-/**
- * Insert a denomination key's public information into the database for
- * reference by auditors and other consistency checks.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param denom_pub the public key used for signing coins of this denomination
- * @param issue issuing information with value, fees and other info about the coin
- * @return status of the query
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_denomination_info (
-  void *cls,
-  const struct TALER_DenominationPublicKey *denom_pub,
-  const struct TALER_EXCHANGEDB_DenominationKeyInformation *issue)
-{
-  struct PostgresClosure *pg = cls;
-  struct TALER_DenominationHashP denom_hash;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&issue->denom_hash),
-    TALER_PQ_query_param_denom_pub (denom_pub),
-    GNUNET_PQ_query_param_auto_from_type (&issue->signature),
-    GNUNET_PQ_query_param_timestamp (&issue->start),
-    GNUNET_PQ_query_param_timestamp (&issue->expire_withdraw),
-    GNUNET_PQ_query_param_timestamp (&issue->expire_deposit),
-    GNUNET_PQ_query_param_timestamp (&issue->expire_legal),
-    TALER_PQ_query_param_amount (&issue->value),
-    TALER_PQ_query_param_amount (&issue->fees.withdraw),
-    TALER_PQ_query_param_amount (&issue->fees.deposit),
-    TALER_PQ_query_param_amount (&issue->fees.refresh),
-    TALER_PQ_query_param_amount (&issue->fees.refund),
-    GNUNET_PQ_query_param_uint32 (&denom_pub->age_mask.bits),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (denom_pub->age_mask.bits ==
-                 issue->age_mask.bits);
-  TALER_denom_pub_hash (denom_pub,
-                        &denom_hash);
-  GNUNET_assert (0 ==
-                 GNUNET_memcmp (&denom_hash,
-                                &issue->denom_hash));
-  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
-                   issue->start.abs_time));
-  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
-                   issue->expire_withdraw.abs_time));
-  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
-                   issue->expire_deposit.abs_time));
-  GNUNET_assert (! GNUNET_TIME_absolute_is_zero (
-                   issue->expire_legal.abs_time));
-  /* check fees match denomination currency */
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_denom_fee_check_currency (
-                   issue->value.currency,
-                   &issue->fees));
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "denomination_insert",
-                                             params);
-}
-
-
-/**
- * Fetch information about a denomination key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param denom_pub_hash hash of the public key used for signing coins of this denomination
- * @param[out] issue set to issue information with value, fees and other info about the coin
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_denomination_info (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  struct TALER_EXCHANGEDB_DenominationKeyInformation *issue)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                          &issue->signature),
-    GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                     &issue->start),
-    GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
-                                     &issue->expire_withdraw),
-    GNUNET_PQ_result_spec_timestamp ("expire_deposit",
-                                     &issue->expire_deposit),
-    GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                     &issue->expire_legal),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
-                                 &issue->value),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                 &issue->fees.withdraw),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                 &issue->fees.deposit),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                 &issue->fees.refresh),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
-                                 &issue->fees.refund),
-    GNUNET_PQ_result_spec_uint32 ("age_mask",
-                                  &issue->age_mask.bits),
-    GNUNET_PQ_result_spec_end
-  };
-
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "denomination_get",
-                                                 params,
-                                                 rs);
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
-    return qs;
-  issue->denom_hash = *denom_pub_hash;
-  return qs;
-}
-
-
-/**
- * Closure for #domination_cb_helper()
- */
-struct DenomIteratorContext
-{
-  /**
-   * Function to call with the results.
-   */
-  TALER_EXCHANGEDB_DenominationCallback cb;
-
-  /**
-   * Closure to pass to @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-};
-
-
-/**
- * Helper function for #postgres_iterate_denomination_info().
- * Calls the callback with each denomination key.
- *
- * @param cls a `struct DenomIteratorContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-domination_cb_helper (void *cls,
-                      PGresult *result,
-                      unsigned int num_results)
-{
-  struct DenomIteratorContext *dic = cls;
-  struct PostgresClosure *pg = dic->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_DenominationKeyInformation issue;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct TALER_DenominationHashP denom_hash;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &issue.signature),
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            &denom_hash),
-      GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                       &issue.start),
-      GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
-                                       &issue.expire_withdraw),
-      GNUNET_PQ_result_spec_timestamp ("expire_deposit",
-                                       &issue.expire_deposit),
-      GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                       &issue.expire_legal),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
-                                   &issue.value),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                   &issue.fees.withdraw),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                   &issue.fees.deposit),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                   &issue.fees.refresh),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
-                                   &issue.fees.refund),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_uint32 ("age_mask",
-                                    &issue.age_mask.bits),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      return;
-    }
-
-    /* Unfortunately we have to carry the age mask in both, the
-     * TALER_DenominationPublicKey and
-     * TALER_EXCHANGEDB_DenominationKeyInformation at different times.
-     * Here we use _both_ so let's make sure the values are the same. */
-    denom_pub.age_mask = issue.age_mask;
-    TALER_denom_pub_hash (&denom_pub,
-                          &issue.denom_hash);
-    if (0 !=
-        GNUNET_memcmp (&issue.denom_hash,
-                       &denom_hash))
-    {
-      GNUNET_break (0);
-    }
-    else
-    {
-      dic->cb (dic->cb_cls,
-               &denom_pub,
-               &issue);
-    }
-    TALER_denom_pub_free (&denom_pub);
-  }
-}
-
-
-/**
- * Fetch information about all known denomination keys.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call on each denomination key
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_iterate_denomination_info (void *cls,
-                                    TALER_EXCHANGEDB_DenominationCallback cb,
-                                    void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  struct DenomIteratorContext dic = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "denomination_iterate",
-                                               params,
-                                               &domination_cb_helper,
-                                               &dic);
-}
-
-
-/**
- * Closure for #dominations_cb_helper()
- */
-struct DenomsIteratorContext
-{
-  /**
-   * Function to call with the results.
-   */
-  TALER_EXCHANGEDB_DenominationsCallback cb;
-
-  /**
-   * Closure to pass to @e cb
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-};
-
-
-/**
- * Helper function for #postgres_iterate_denominations().
- * Calls the callback with each denomination key.
- *
- * @param cls a `struct DenomsIteratorContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-dominations_cb_helper (void *cls,
-                       PGresult *result,
-                       unsigned int num_results)
-{
-  struct DenomsIteratorContext *dic = cls;
-  struct PostgresClosure *pg = dic->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_DenominationKeyMetaData meta = {0};
-    struct TALER_DenominationPublicKey denom_pub = {0};
-    struct TALER_MasterSignatureP master_sig = {0};
-    struct TALER_DenominationHashP h_denom_pub = {0};
-    bool revoked;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &master_sig),
-      GNUNET_PQ_result_spec_bool ("revoked",
-                                  &revoked),
-      GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                       &meta.start),
-      GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
-                                       &meta.expire_withdraw),
-      GNUNET_PQ_result_spec_timestamp ("expire_deposit",
-                                       &meta.expire_deposit),
-      GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                       &meta.expire_legal),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
-                                   &meta.value),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                   &meta.fees.withdraw),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                   &meta.fees.deposit),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                   &meta.fees.refresh),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
-                                   &meta.fees.refund),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_uint32 ("age_mask",
-                                    &meta.age_mask.bits),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      return;
-    }
-
-    /* make sure the mask information is the same */
-    denom_pub.age_mask = meta.age_mask;
-
-    TALER_denom_pub_hash (&denom_pub,
-                          &h_denom_pub);
-    dic->cb (dic->cb_cls,
-             &denom_pub,
-             &h_denom_pub,
-             &meta,
-             &master_sig,
-             revoked);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Function called to invoke @a cb on every known denomination key (revoked
- * and non-revoked) that has been signed by the master key. Runs in its own
- * read-only transaction.
- *
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call on each denomination key
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_iterate_denominations (void *cls,
-                                TALER_EXCHANGEDB_DenominationsCallback cb,
-                                void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  struct DenomsIteratorContext dic = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "select_denominations",
-                                               params,
-                                               &dominations_cb_helper,
-                                               &dic);
-}
-
-
-/**
- * Closure for #signkeys_cb_helper()
- */
-struct SignkeysIteratorContext
-{
-  /**
-   * Function to call with the results.
-   */
-  TALER_EXCHANGEDB_ActiveSignkeysCallback cb;
-
-  /**
-   * Closure to pass to @e cb
-   */
-  void *cb_cls;
-
-};
-
-
-/**
- * Helper function for #postgres_iterate_active_signkeys().
- * Calls the callback with each signkey.
- *
- * @param cls a `struct SignkeysIteratorContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-signkeys_cb_helper (void *cls,
-                    PGresult *result,
-                    unsigned int num_results)
-{
-  struct SignkeysIteratorContext *dic = cls;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_SignkeyMetaData meta;
-    struct TALER_ExchangePublicKeyP exchange_pub;
-    struct TALER_MasterSignatureP master_sig;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &master_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("exchange_pub",
-                                            &exchange_pub),
-      GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                       &meta.start),
-      GNUNET_PQ_result_spec_timestamp ("expire_sign",
-                                       &meta.expire_sign),
-      GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                       &meta.expire_legal),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      return;
-    }
-    dic->cb (dic->cb_cls,
-             &exchange_pub,
-             &meta,
-             &master_sig);
-  }
-}
-
-
-/**
- * Function called to invoke @a cb on every non-revoked exchange signing key
- * that has been signed by the master key.  Revoked and (for signing!)
- * expired keys are skipped. Runs in its own read-only transaction.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call on each signing key
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_iterate_active_signkeys (void *cls,
-                                  TALER_EXCHANGEDB_ActiveSignkeysCallback cb,
-                                  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Absolute now = {0};
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_absolute_time (&now),
-    GNUNET_PQ_query_param_end
-  };
-  struct SignkeysIteratorContext dic = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-  };
-
-  now = GNUNET_TIME_absolute_get ();
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "select_signkeys",
-                                               params,
-                                               &signkeys_cb_helper,
-                                               &dic);
-}
-
-
-/**
- * Closure for #auditors_cb_helper()
- */
-struct AuditorsIteratorContext
-{
-  /**
-   * Function to call with the results.
-   */
-  TALER_EXCHANGEDB_AuditorsCallback cb;
-
-  /**
-   * Closure to pass to @e cb
-   */
-  void *cb_cls;
-
-};
-
-
-/**
- * Helper function for #postgres_iterate_active_auditors().
- * Calls the callback with each auditor.
- *
- * @param cls a `struct SignkeysIteratorContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-auditors_cb_helper (void *cls,
-                    PGresult *result,
-                    unsigned int num_results)
-{
-  struct AuditorsIteratorContext *dic = cls;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_AuditorPublicKeyP auditor_pub;
-    char *auditor_url;
-    char *auditor_name;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
-                                            &auditor_pub),
-      GNUNET_PQ_result_spec_string ("auditor_url",
-                                    &auditor_url),
-      GNUNET_PQ_result_spec_string ("auditor_name",
-                                    &auditor_name),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      return;
-    }
-    dic->cb (dic->cb_cls,
-             &auditor_pub,
-             auditor_url,
-             auditor_name);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Function called to invoke @a cb on every active auditor. Disabled
- * auditors are skipped. Runs in its own read-only transaction.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call on each active auditor
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_iterate_active_auditors (void *cls,
-                                  TALER_EXCHANGEDB_AuditorsCallback cb,
-                                  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  struct AuditorsIteratorContext dic = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "select_auditors",
-                                               params,
-                                               &auditors_cb_helper,
-                                               &dic);
-}
-
-
-/**
- * Closure for #auditor_denoms_cb_helper()
- */
-struct AuditorDenomsIteratorContext
-{
-  /**
-   * Function to call with the results.
-   */
-  TALER_EXCHANGEDB_AuditorDenominationsCallback cb;
-
-  /**
-   * Closure to pass to @e cb
-   */
-  void *cb_cls;
-};
-
-
-/**
- * Helper function for #postgres_iterate_auditor_denominations().
- * Calls the callback with each auditor and denomination pair.
- *
- * @param cls a `struct AuditorDenomsIteratorContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-auditor_denoms_cb_helper (void *cls,
-                          PGresult *result,
-                          unsigned int num_results)
-{
-  struct AuditorDenomsIteratorContext *dic = cls;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_AuditorPublicKeyP auditor_pub;
-    struct TALER_DenominationHashP h_denom_pub;
-    struct TALER_AuditorSignatureP auditor_sig;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("auditor_pub",
-                                            &auditor_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            &h_denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("auditor_sig",
-                                            &auditor_sig),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      return;
-    }
-    dic->cb (dic->cb_cls,
-             &auditor_pub,
-             &h_denom_pub,
-             &auditor_sig);
-  }
-}
-
-
-/**
- * Function called to invoke @a cb on every denomination with an active
- * auditor. Disabled auditors and denominations without auditor are
- * skipped. Runs in its own read-only transaction.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param cb function to call on each active auditor
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_iterate_auditor_denominations (
-  void *cls,
-  TALER_EXCHANGEDB_AuditorDenominationsCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  struct AuditorDenomsIteratorContext dic = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "select_auditor_denoms",
-                                               params,
-                                               &auditor_denoms_cb_helper,
-                                               &dic);
-}
-
-
-/**
- * Get the summary of a reserve.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param[in,out] reserve the reserve data.  The public key of the reserve should be
- *          set in this structure; it is used to query the database.  The balance
- *          and expiration are then filled accordingly.
- * @param[out] kyc set to the KYC status of the reserve
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_reserves_get (void *cls,
-                       struct TALER_EXCHANGEDB_Reserve *reserve,
-                       struct TALER_EXCHANGEDB_KycStatus *kyc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&reserve->pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                 &reserve->balance),
-    GNUNET_PQ_result_spec_timestamp ("expiration_date",
-                                     &reserve->expiry),
-    GNUNET_PQ_result_spec_timestamp ("gc_date",
-                                     &reserve->gc),
-    GNUNET_PQ_result_spec_uint64 ("payment_target_uuid",
-                                  &kyc->payment_target_uuid),
-    GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                &kyc->ok),
-    GNUNET_PQ_result_spec_end
-  };
-
-  kyc->type = TALER_EXCHANGEDB_KYC_WITHDRAW;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "reserves_get_with_kyc",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Set the KYC status to "OK" for a bank account.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto which account has been checked
- * @param id external ID to persist
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_set_kyc_ok (void *cls,
-                     const struct TALER_PaytoHashP *h_payto,
-                     const char *id)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_QueryParam params2[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_string (id),
-    GNUNET_PQ_query_param_end
-  };
-  struct TALER_KycCompletedEventP rep = {
-    .header.size = htons (sizeof (rep)),
-    .header.type = htons (TALER_DBEVENT_EXCHANGE_KYC_COMPLETED)
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("wire_target_h_payto",
-                                          &rep.h_payto),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                           "set_kyc_ok",
-                                           params2);
-  if (qs <= 0)
-    return qs;
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "get_kyc_h_payto",
-                                                 params,
-                                                 rs);
-  if (qs <= 0)
-    return qs;
-  postgres_event_notify (pg,
-                         &rep.header,
-                         NULL,
-                         0);
-  return qs;
-}
-
-
-/**
- * Get the @a kyc status and @a h_payto by UUID.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto set to the hash of the account's payto URI (unsalted)
- * @param[out] kyc set to the KYC status of the account
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_kyc_status (void *cls,
-                            const struct TALER_PaytoHashP *h_payto,
-                            struct TALER_EXCHANGEDB_KycStatus *kyc)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("wire_target_serial_id",
-                                  &kyc->payment_target_uuid),
-    GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                &kyc->ok),
-    GNUNET_PQ_result_spec_end
-  };
-
-  kyc->type = TALER_EXCHANGEDB_KYC_UNKNOWN;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_kyc_status_by_payto",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Compute the hash of the @a payto_uri and use it to get the KYC status for a
- * wallet. If the status is unknown, inserts a new status record (hence
- * INsertSELECT).
- *
- * @param pg the plugin-specific state
- * @param payto_uri the payto URI to check
- * @param[out] h_payto set to the hash of @a payto_uri
- * @param[out] kyc set to the KYC status of the wallet
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-inselect_account_kyc_status (
-  struct PostgresClosure *pg,
-  const char *payto_uri,
-  struct TALER_PaytoHashP *h_payto,
-  struct TALER_EXCHANGEDB_KycStatus *kyc)
-{
-  enum GNUNET_DB_QueryStatus qs;
-
-  TALER_payto_hash (payto_uri,
-                    h_payto);
-  {
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_auto_from_type (h_payto),
-      GNUNET_PQ_query_param_end
-    };
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("wire_target_serial_id",
-                                    &kyc->payment_target_uuid),
-      GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                  &kyc->ok),
-      GNUNET_PQ_result_spec_end
-    };
-
-    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_kyc_status_by_payto",
-                                                   params,
-                                                   rs);
-    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-    {
-      struct GNUNET_PQ_QueryParam iparams[] = {
-        GNUNET_PQ_query_param_auto_from_type (h_payto),
-        GNUNET_PQ_query_param_string (payto_uri),
-        GNUNET_PQ_query_param_end
-      };
-      struct GNUNET_PQ_ResultSpec irs[] = {
-        GNUNET_PQ_result_spec_uint64 ("wire_target_serial_id",
-                                      &kyc->payment_target_uuid),
-        GNUNET_PQ_result_spec_end
-      };
-
-      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                     "insert_kyc_status",
-                                                     iparams,
-                                                     irs);
-      if (qs < 0)
-        return qs;
-      if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-        return GNUNET_DB_STATUS_SOFT_ERROR;
-      kyc->ok = false;
-    }
-  }
-  kyc->type = TALER_EXCHANGEDB_KYC_BALANCE;
-  return qs;
-}
-
-
-/**
- * Get the KYC status for a wallet. If the status is unknown,
- * inserts a new status record (hence INsertSELECT).
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the wallet
- * @param[out] kyc set to the KYC status of the wallet
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_inselect_wallet_kyc_status (
-  void *cls,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  struct TALER_EXCHANGEDB_KycStatus *kyc)
-{
-  struct PostgresClosure *pg = cls;
-  char *payto_uri;
-  enum GNUNET_DB_QueryStatus qs;
-  struct TALER_PaytoHashP h_payto;
-
-  payto_uri = TALER_payto_from_reserve (pg->exchange_url,
-                                        reserve_pub);
-  qs = inselect_account_kyc_status (pg,
-                                    payto_uri,
-                                    &h_payto,
-                                    kyc);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Wire account for `%s' is %llu\n",
-              payto_uri,
-              (unsigned long long) kyc->payment_target_uuid);
-  GNUNET_free (payto_uri);
-  return qs;
-}
-
-
-/**
- * Get the summary of a reserve.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param[in,out] reserve the reserve data.  The public key of the reserve should be
- *          set in this structure; it is used to query the database.  The balance
- *          and expiration are then filled accordingly.
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-reserves_get_internal (void *cls,
-                       struct TALER_EXCHANGEDB_Reserve *reserve)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&reserve->pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                 &reserve->balance),
-    GNUNET_PQ_result_spec_timestamp ("expiration_date",
-                                     &reserve->expiry),
-    GNUNET_PQ_result_spec_timestamp ("gc_date",
-                                     &reserve->gc),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "reserves_get",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Updates a reserve with the data from the given reserve structure.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve the reserve structure whose data will be used to update the
- *          corresponding record in the database.
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-reserves_update (void *cls,
-                 const struct TALER_EXCHANGEDB_Reserve *reserve)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&reserve->expiry),
-    GNUNET_PQ_query_param_timestamp (&reserve->gc),
-    TALER_PQ_query_param_amount (&reserve->balance),
-    GNUNET_PQ_query_param_auto_from_type (&reserve->pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "reserve_update",
-                                             params);
-}
-
-
-/**
- * Generate event notification for the reserve
- * change.
- *
- * @param pg plugin state
- * @param reserve_pub reserve to notfiy on
- */
-static void
-notify_on_reserve (struct PostgresClosure *pg,
-                   const struct TALER_ReservePublicKeyP *reserve_pub)
-{
-  struct TALER_ReserveEventP rep = {
-    .header.size = htons (sizeof (rep)),
-    .header.type = htons (TALER_DBEVENT_EXCHANGE_RESERVE_INCOMING),
-    .reserve_pub = *reserve_pub
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Notifying on reserve!\n");
-  postgres_event_notify (pg,
-                         &rep.header,
-                         NULL,
-                         0);
-}
-
-
-/**
- * Insert an incoming transaction into reserves.  New reserves are also
- * created through this function. Started within the scope of an ongoing
- * transaction.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param balance the amount that has to be added to the reserve
- * @param execution_time when was the amount added
- * @param sender_account_details account information for the sender (payto://-URL)
- * @param exchange_account_section name of the section in the configuration for the exchange's
- *                       account into which the deposit was made
- * @param wire_ref unique reference identifying the wire transfer
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_reserves_in_insert (void *cls,
-                             const struct TALER_ReservePublicKeyP *reserve_pub,
-                             const struct TALER_Amount *balance,
-                             struct GNUNET_TIME_Timestamp execution_time,
-                             const char *sender_account_details,
-                             const char *exchange_account_section,
-                             uint64_t wire_ref)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs1;
-  struct TALER_EXCHANGEDB_Reserve reserve;
-  struct GNUNET_TIME_Timestamp expiry;
-  struct GNUNET_TIME_Timestamp gc;
-  uint64_t reserve_uuid;
-
-  reserve.pub = *reserve_pub;
-  expiry = GNUNET_TIME_absolute_to_timestamp (
-    GNUNET_TIME_absolute_add (execution_time.abs_time,
-                              pg->idle_reserve_expiration_time));
-  gc = GNUNET_TIME_absolute_to_timestamp (
-    GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (),
-                              pg->legal_reserve_expiration_time));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Creating reserve %s with expiration in %s\n",
-              TALER_B2S (reserve_pub),
-              GNUNET_STRINGS_relative_time_to_string (
-                pg->idle_reserve_expiration_time,
-                GNUNET_NO));
-  /* Optimistically assume this is a new reserve, create balance for the first
-     time; we do this before adding the actual transaction to "reserves_in",
-     as for a new reserve it can't be a duplicate 'add' operation, and as
-     the 'add' operation needs the reserve entry as a foreign key. */
-  {
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-      TALER_PQ_query_param_amount (balance),
-      GNUNET_PQ_query_param_timestamp (&expiry),
-      GNUNET_PQ_query_param_timestamp (&gc),
-      GNUNET_PQ_query_param_end
-    };
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("reserve_uuid",
-                                    &reserve_uuid),
-      GNUNET_PQ_result_spec_end
-    };
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Reserve does not exist; creating a new one\n");
-    /* Note: query uses 'on conflict do nothing' */
-    qs1 = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                    "reserve_create",
-                                                    params,
-                                                    rs);
-    if (qs1 < 0)
-      return qs1;
-  }
-
-  /* Create new incoming transaction, "ON CONFLICT DO NOTHING"
-     is again used to guard against duplicates. */
-  {
-    enum GNUNET_DB_QueryStatus qs2;
-    struct TALER_EXCHANGEDB_KycStatus kyc;
-    enum GNUNET_DB_QueryStatus qs3;
-    struct TALER_PaytoHashP h_payto;
-
-    memset (&kyc,
-            0,
-            sizeof (kyc));
-    qs3 = inselect_account_kyc_status (pg,
-                                       sender_account_details,
-                                       &h_payto,
-                                       &kyc);
-    if (qs3 <= 0)
-    {
-      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs3);
-      return qs3;
-    }
-    GNUNET_assert (0 != kyc.payment_target_uuid);
-    /* We do not have the UUID, so insert by public key */
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_auto_from_type (&reserve.pub),
-      GNUNET_PQ_query_param_uint64 (&wire_ref),
-      TALER_PQ_query_param_amount (balance),
-      GNUNET_PQ_query_param_string (exchange_account_section),
-      GNUNET_PQ_query_param_auto_from_type (&h_payto),
-      GNUNET_PQ_query_param_timestamp (&execution_time),
-      GNUNET_PQ_query_param_end
-    };
-
-    qs2 = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                              "reserves_in_add_transaction",
-                                              params);
-    /* qs2 could be 0 as statement used 'ON CONFLICT DO NOTHING' */
-    if (0 >= qs2)
-    {
-      if ( (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs2) &&
-           (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs1) )
-      {
-        /* Conflict for the transaction, but the reserve was
-           just now created, that should be impossible. */
-        GNUNET_break (0); /* should be impossible: reserve was fresh,
-                             but transaction already known */
-        return GNUNET_DB_STATUS_HARD_ERROR;
-      }
-      /* Transaction was already known or error. We are finished. */
-      return qs2;
-    }
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs1)
-  {
-    /* New reserve, we are finished */
-    notify_on_reserve (pg,
-                       reserve_pub);
-    return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-  }
-
-  /* we were wrong with our optimistic assumption:
-     reserve did already exist, need to do an update instead */
-  {
-    /* We need to move away from 'read committed' to serializable.
-       Also, we know that it should be safe to commit at this point.
-       (We are only run in a larger transaction for performance.) */
-    enum GNUNET_DB_QueryStatus cs;
-
-    cs = postgres_commit (pg);
-    if (cs < 0)
-      return cs;
-    if (GNUNET_OK !=
-        postgres_start (pg,
-                        "reserve-update-serializable"))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
-  {
-    enum GNUNET_DB_QueryStatus reserve_exists;
-
-    reserve_exists = reserves_get_internal (pg,
-                                            &reserve);
-    switch (reserve_exists)
-    {
-    case GNUNET_DB_STATUS_HARD_ERROR:
-      GNUNET_break (0);
-      return reserve_exists;
-    case GNUNET_DB_STATUS_SOFT_ERROR:
-      return reserve_exists;
-    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      /* First we got a conflict, but then we cannot select? Very strange. */
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_SOFT_ERROR;
-    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-      /* continued below */
-      break;
-    }
-  }
-
-  {
-    struct TALER_EXCHANGEDB_Reserve updated_reserve;
-    enum GNUNET_DB_QueryStatus qs3;
-
-    /* If the reserve already existed, we need to still update the
-       balance; we do this after checking for duplication, as
-       otherwise we might have to actually pay the cost to roll this
-       back for duplicate transactions; like this, we should virtually
-       never actually have to rollback anything. */
-    updated_reserve.pub = reserve.pub;
-    if (0 >
-        TALER_amount_add (&updated_reserve.balance,
-                          &reserve.balance,
-                          balance))
-    {
-      /* currency overflow or incompatible currency */
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Attempt to deposit incompatible amount into reserve\n");
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    updated_reserve.expiry = GNUNET_TIME_timestamp_max (expiry,
-                                                        reserve.expiry);
-    updated_reserve.gc = GNUNET_TIME_timestamp_max (gc,
-                                                    reserve.gc);
-    qs3 = reserves_update (pg,
-                           &updated_reserve);
-    switch (qs3)
-    {
-    case GNUNET_DB_STATUS_HARD_ERROR:
-      GNUNET_break (0);
-      return qs3;
-    case GNUNET_DB_STATUS_SOFT_ERROR:
-      return qs3;
-    case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      /* How can the UPDATE not work here? Very strange. */
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-      /* continued below */
-      break;
-    }
-  }
-  notify_on_reserve (pg,
-                     reserve_pub);
-  /* Go back to original transaction mode */
-  {
-    enum GNUNET_DB_QueryStatus cs;
-
-    cs = postgres_commit (pg);
-    if (cs < 0)
-      return cs;
-    if (GNUNET_OK !=
-        postgres_start_read_committed (pg,
-                                       "reserve-insert-continued"))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
-  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-}
-
-
-/**
- * Locate the response for a /reserve/withdraw request under the
- * key of the hash of the blinded message.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param bch hash that uniquely identifies the withdraw operation
- * @param collectable corresponding collectable coin (blind signature)
- *                    if a coin is found
- * @return statement execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_withdraw_info (
-  void *cls,
-  const struct TALER_BlindedCoinHashP *bch,
-  struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (bch),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                          &collectable->denom_pub_hash),
-    TALER_PQ_result_spec_blinded_denom_sig ("denom_sig",
-                                            &collectable->sig),
-    GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
-                                          &collectable->reserve_sig),
-    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                          &collectable->reserve_pub),
-    GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
-                                          &collectable->h_coin_envelope),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 &collectable->amount_with_fee),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                 &collectable->withdraw_fee),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_withdraw_info",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform withdraw operation, checking for sufficient balance
- * and possibly persisting the withdrawal details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param nonce client-contributed input for CS denominations that must be checked for idempotency, or NULL for non-CS withdrawals
- * @param[in,out] collectable corresponding collectable coin (blind signature) if a coin is found; possibly updated if a (different) signature exists already
- * @param now current time (rounded)
- * @param[out] found set to true if the reserve was found
- * @param[out] balance_ok set to true if the balance was sufficient
- * @param[out] kyc set to true if the kyc status of the reserve is satisfied
- * @param[out] ruuid set to the reserve's UUID (reserves table row)
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_withdraw (
-  void *cls,
-  const struct TALER_CsNonce *nonce,
-  const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
-  struct GNUNET_TIME_Timestamp now,
-  bool *found,
-  bool *balance_ok,
-  struct TALER_EXCHANGEDB_KycStatus *kyc,
-  uint64_t *ruuid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Timestamp gc;
-  struct GNUNET_PQ_QueryParam params[] = {
-    NULL == nonce
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_auto_from_type (nonce),
-    TALER_PQ_query_param_amount (&collectable->amount_with_fee),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->denom_pub_hash),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_pub),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_sig),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->h_coin_envelope),
-    TALER_PQ_query_param_blinded_denom_sig (&collectable->sig),
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_timestamp (&gc),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("reserve_found",
-                                found),
-    GNUNET_PQ_result_spec_bool ("balance_ok",
-                                balance_ok),
-    GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                &kyc->ok),
-    GNUNET_PQ_result_spec_uint64 ("payment_target_uuid",
-                                  &kyc->payment_target_uuid),
-    GNUNET_PQ_result_spec_uint64 ("ruuid",
-                                  ruuid),
-    GNUNET_PQ_result_spec_end
-  };
-
-  gc = GNUNET_TIME_absolute_to_timestamp (
-    GNUNET_TIME_absolute_add (now.abs_time,
-                              pg->legal_reserve_expiration_time));
-  kyc->type = TALER_EXCHANGEDB_KYC_WITHDRAW;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_withdraw",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform reserve update as part of a batch withdraw operation, checking
- * for sufficient balance. Persisting the withdrawal details is done
- * separately!
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param now current time (rounded)
- * @param reserve_pub public key of the reserve to debit
- * @param amount total amount to withdraw
- * @param[out] found set to true if the reserve was found
- * @param[out] balance_ok set to true if the balance was sufficient
- * @param[out] kyc set to the KYC status of the reserve
- * @param[out] ruuid set to the reserve's UUID (reserves table row)
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_batch_withdraw (
-  void *cls,
-  struct GNUNET_TIME_Timestamp now,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_Amount *amount,
-  bool *found,
-  bool *balance_ok,
-  struct TALER_EXCHANGEDB_KycStatus *kyc,
-  uint64_t *ruuid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Timestamp gc;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (amount),
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_timestamp (&gc),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("reserve_found",
-                                found),
-    GNUNET_PQ_result_spec_bool ("balance_ok",
-                                balance_ok),
-    GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                &kyc->ok),
-    GNUNET_PQ_result_spec_uint64 ("payment_target_uuid",
-                                  &kyc->payment_target_uuid),
-    GNUNET_PQ_result_spec_uint64 ("ruuid",
-                                  ruuid),
-    GNUNET_PQ_result_spec_end
-  };
-
-  gc = GNUNET_TIME_absolute_to_timestamp (
-    GNUNET_TIME_absolute_add (now.abs_time,
-                              pg->legal_reserve_expiration_time));
-  kyc->type = TALER_EXCHANGEDB_KYC_WITHDRAW;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_batch_withdraw",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform insert as part of a batch withdraw operation, and persisting the
- * withdrawal details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param nonce client-contributed input for CS denominations that must be checked for idempotency, or NULL for non-CS withdrawals
- * @param collectable corresponding collectable coin (blind signature)
- * @param now current time (rounded)
- * @param ruuid reserve UUID
- * @param[out] denom_unknown set if the denomination is unknown in the DB
- * @param[out] conflict if the envelope was already in the DB
- * @param[out] nonce_reuse if @a nonce was non-NULL and reused
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_batch_withdraw_insert (
-  void *cls,
-  const struct TALER_CsNonce *nonce,
-  const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
-  struct GNUNET_TIME_Timestamp now,
-  uint64_t ruuid,
-  bool *denom_unknown,
-  bool *conflict,
-  bool *nonce_reuse)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    NULL == nonce
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_auto_from_type (nonce),
-    TALER_PQ_query_param_amount (&collectable->amount_with_fee),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->denom_pub_hash),
-    GNUNET_PQ_query_param_uint64 (&ruuid),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->reserve_sig),
-    GNUNET_PQ_query_param_auto_from_type (&collectable->h_coin_envelope),
-    TALER_PQ_query_param_blinded_denom_sig (&collectable->sig),
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("denom_unknown",
-                                denom_unknown),
-    GNUNET_PQ_result_spec_bool ("conflict",
-                                conflict),
-    GNUNET_PQ_result_spec_bool ("nonce_reuse",
-                                nonce_reuse),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_batch_withdraw_insert",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Check that reserve remains below threshold for KYC
- * checks after withdraw operation.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param ruuid reserve to check
- * @param withdraw_start starting point to accumulate from
- * @param upper_limit maximum amount allowed
- * @param[out] below_limit set to true if the limit was not exceeded
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_withdraw_limit_check (
-  void *cls,
-  uint64_t ruuid,
-  struct GNUNET_TIME_Absolute withdraw_start,
-  const struct TALER_Amount *upper_limit,
-  bool *below_limit)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&ruuid),
-    GNUNET_PQ_query_param_absolute_time (&withdraw_start),
-    TALER_PQ_query_param_amount (upper_limit),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("below_limit",
-                                below_limit),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_withdraw_limit_check",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Compute the shard number of a given @a merchant_pub.
- *
- * @param merchant_pub merchant public key to compute shard for
- * @return shard number
- */
-static uint64_t
-compute_shard (const struct TALER_MerchantPublicKeyP *merchant_pub)
-{
-  uint32_t res;
-
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (&res,
-                                    sizeof (res),
-                                    merchant_pub,
-                                    sizeof (*merchant_pub),
-                                    "VOID",
-                                    4,
-                                    NULL, 0));
-  /* interpret hash result as NBO for platform independence,
-     convert to HBO and map to [0..2^31-1] range */
-  res = ntohl (res);
-  if (res > INT32_MAX)
-    res += INT32_MIN;
-  GNUNET_assert (res <= INT32_MAX);
-  return (uint64_t) res;
-}
-
-
-/**
- * Perform deposit operation, checking for sufficient balance
- * of the coin and possibly persisting the deposit details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param deposit deposit operation details
- * @param known_coin_id row of the coin in the known_coins table
- * @param h_payto hash of the merchant's bank account details
- * @param extension_blocked true if an extension is blocking the wire transfer
- * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated)
- * @param[out] balance_ok set to true if the balance was sufficient
- * @param[out] in_conflict set to true if the deposit conflicted
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_deposit (
-  void *cls,
-  const struct TALER_EXCHANGEDB_Deposit *deposit,
-  uint64_t known_coin_id,
-  const struct TALER_PaytoHashP *h_payto,
-  bool extension_blocked,
-  struct GNUNET_TIME_Timestamp *exchange_timestamp,
-  bool *balance_ok,
-  bool *in_conflict)
-{
-  struct PostgresClosure *pg = cls;
-  uint64_t deposit_shard = compute_shard (&deposit->merchant_pub);
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (&deposit->amount_with_fee),
-    GNUNET_PQ_query_param_auto_from_type (&deposit->h_contract_terms),
-    GNUNET_PQ_query_param_auto_from_type (&deposit->wire_salt),
-    GNUNET_PQ_query_param_timestamp (&deposit->timestamp),
-    GNUNET_PQ_query_param_timestamp (exchange_timestamp),
-    GNUNET_PQ_query_param_timestamp (&deposit->refund_deadline),
-    GNUNET_PQ_query_param_timestamp (&deposit->wire_deadline),
-    GNUNET_PQ_query_param_auto_from_type (&deposit->merchant_pub),
-    GNUNET_PQ_query_param_string (deposit->receiver_wire_account),
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_uint64 (&known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&deposit->csig),
-    GNUNET_PQ_query_param_uint64 (&deposit_shard),
-    GNUNET_PQ_query_param_bool (extension_blocked),
-    (NULL == deposit->extension_details)
-    ? GNUNET_PQ_query_param_null ()
-    : TALER_PQ_query_param_json (deposit->extension_details),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("balance_ok",
-                                balance_ok),
-    GNUNET_PQ_result_spec_bool ("conflicted",
-                                in_conflict),
-    GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
-                                     exchange_timestamp),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_deposit",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform melt operation, checking for sufficient balance
- * of the coin and possibly persisting the melt details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param[in,out] refresh refresh operation details; the noreveal_index
- *                is set in case the coin was already melted before
- * @param known_coin_id row of the coin in the known_coins table
- * @param[in,out] zombie_required true if the melt must only succeed if the coin is a zombie, set to false if the requirement was satisfied
- * @param[out] balance_ok set to true if the balance was sufficient
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_melt (
-  void *cls,
-  const struct TALER_RefreshMasterSecretP *rms,
-  struct TALER_EXCHANGEDB_Refresh *refresh,
-  uint64_t known_coin_id,
-  bool *zombie_required,
-  bool *balance_ok)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    NULL == rms
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_auto_from_type (rms),
-    TALER_PQ_query_param_amount (&refresh->amount_with_fee),
-    GNUNET_PQ_query_param_auto_from_type (&refresh->rc),
-    GNUNET_PQ_query_param_auto_from_type (&refresh->coin.coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&refresh->coin_sig),
-    GNUNET_PQ_query_param_uint64 (&known_coin_id),
-    GNUNET_PQ_query_param_uint32 (&refresh->noreveal_index),
-    GNUNET_PQ_query_param_bool (*zombie_required),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("balance_ok",
-                                balance_ok),
-    GNUNET_PQ_result_spec_bool ("zombie_required",
-                                zombie_required),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_uint32 ("noreveal_index",
-                                    &refresh->noreveal_index),
-      &is_null),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "call_melt",
-                                                 params,
-                                                 rs);
-  if (is_null)
-    refresh->noreveal_index = UINT32_MAX; /* set to very invalid value */
-  return qs;
-}
-
-
-/**
- * Perform refund operation, checking for sufficient deposits
- * of the coin and possibly persisting the refund details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param refund refund operation details
- * @param deposit_fee deposit fee applicable for the coin, possibly refunded
- * @param known_coin_id row of the coin in the known_coins table
- * @param[out] not_found set if the deposit was not found
- * @param[out] refund_ok  set if the refund succeeded (below deposit amount)
- * @param[out] gone if the merchant was already paid
- * @param[out] conflict set if the refund ID was re-used
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_refund (
-  void *cls,
-  const struct TALER_EXCHANGEDB_Refund *refund,
-  const struct TALER_Amount *deposit_fee,
-  uint64_t known_coin_id,
-  bool *not_found,
-  bool *refund_ok,
-  bool *gone,
-  bool *conflict)
-{
-  struct PostgresClosure *pg = cls;
-  uint64_t deposit_shard = compute_shard (&refund->details.merchant_pub);
-  struct TALER_Amount amount_without_fee;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (&refund->details.refund_amount),
-    TALER_PQ_query_param_amount (&amount_without_fee),
-    TALER_PQ_query_param_amount (deposit_fee),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms),
-    GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id),
-    GNUNET_PQ_query_param_uint64 (&deposit_shard),
-    GNUNET_PQ_query_param_uint64 (&known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (&refund->coin.coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_pub),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_sig),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("not_found",
-                                not_found),
-    GNUNET_PQ_result_spec_bool ("refund_ok",
-                                refund_ok),
-    GNUNET_PQ_result_spec_bool ("gone",
-                                gone),
-    GNUNET_PQ_result_spec_bool ("conflict",
-                                conflict),
-    GNUNET_PQ_result_spec_end
-  };
-
-  if (0 >
-      TALER_amount_subtract (&amount_without_fee,
-                             &refund->details.refund_amount,
-                             &refund->details.refund_fee))
-  {
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_refund",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform recoup operation, checking for sufficient deposits
- * of the coin and possibly persisting the recoup details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve_pub public key of the reserve to credit
- * @param reserve_out_serial_id row in the reserves_out table justifying the recoup
- * @param coin_bks coin blinding key secret to persist
- * @param coin_pub public key of the coin being recouped
- * @param known_coin_id row of the @a coin_pub in the known_coins table
- * @param coin_sig signature of the coin requesting the recoup
- * @param[in,out] recoup_timestamp recoup timestamp, set if recoup existed
- * @param[out] recoup_ok  set if the recoup succeeded (balance ok)
- * @param[out] internal_failure set on internal failures
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_recoup (
-  void *cls,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  uint64_t reserve_out_serial_id,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  uint64_t known_coin_id,
-  const struct TALER_CoinSpendSignatureP *coin_sig,
-  struct GNUNET_TIME_Timestamp *recoup_timestamp,
-  bool *recoup_ok,
-  bool *internal_failure)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Timestamp reserve_gc
-    = GNUNET_TIME_relative_to_timestamp (pg->legal_reserve_expiration_time);
-  struct GNUNET_TIME_Timestamp reserve_expiration
-    = GNUNET_TIME_relative_to_timestamp (pg->idle_reserve_expiration_time);
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_uint64 (&reserve_out_serial_id),
-    GNUNET_PQ_query_param_auto_from_type (coin_bks),
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_uint64 (&known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (coin_sig),
-    GNUNET_PQ_query_param_timestamp (&reserve_gc),
-    GNUNET_PQ_query_param_timestamp (&reserve_expiration),
-    GNUNET_PQ_query_param_timestamp (recoup_timestamp),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       recoup_timestamp),
-      &is_null),
-    GNUNET_PQ_result_spec_bool ("recoup_ok",
-                                recoup_ok),
-    GNUNET_PQ_result_spec_bool ("internal_failure",
-                                internal_failure),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_recoup",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Perform recoup-refresh operation, checking for sufficient deposits of the
- * coin and possibly persisting the recoup-refresh details.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param old_coin_pub public key of the old coin to credit
- * @param rrc_serial row in the refresh_revealed_coins table justifying the recoup-refresh
- * @param coin_bks coin blinding key secret to persist
- * @param coin_pub public key of the coin being recouped
- * @param known_coin_id row of the @a coin_pub in the known_coins table
- * @param coin_sig signature of the coin requesting the recoup
- * @param[in,out] recoup_timestamp recoup timestamp, set if recoup existed
- * @param[out] recoup_ok  set if the recoup-refresh succeeded (balance ok)
- * @param[out] internal_failure set on internal failures
- * @return query execution status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_recoup_refresh (
-  void *cls,
-  const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
-  uint64_t rrc_serial,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  uint64_t known_coin_id,
-  const struct TALER_CoinSpendSignatureP *coin_sig,
-  struct GNUNET_TIME_Timestamp *recoup_timestamp,
-  bool *recoup_ok,
-  bool *internal_failure)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (old_coin_pub),
-    GNUNET_PQ_query_param_uint64 (&rrc_serial),
-    GNUNET_PQ_query_param_auto_from_type (coin_bks),
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_uint64 (&known_coin_id),
-    GNUNET_PQ_query_param_auto_from_type (coin_sig),
-    GNUNET_PQ_query_param_timestamp (recoup_timestamp),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       recoup_timestamp),
-      &is_null),
-    GNUNET_PQ_result_spec_bool ("recoup_ok",
-                                recoup_ok),
-    GNUNET_PQ_result_spec_bool ("internal_failure",
-                                internal_failure),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_recoup_refresh",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Closure for callbacks invoked via #postgres_get_reserve_history.
- */
-struct ReserveHistoryContext
-{
-
-  /**
-   * Which reserve are we building the history for?
-   */
-  const struct TALER_ReservePublicKeyP *reserve_pub;
-
-  /**
-   * Where we build the history.
-   */
-  struct TALER_EXCHANGEDB_ReserveHistory *rh;
-
-  /**
-   * Tail of @e rh list.
-   */
-  struct TALER_EXCHANGEDB_ReserveHistory *rh_tail;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Sum of all credit transactions.
-   */
-  struct TALER_Amount balance_in;
-
-  /**
-   * Sum of all debit transactions.
-   */
-  struct TALER_Amount balance_out;
-
-  /**
-   * Set to #GNUNET_SYSERR on serious internal errors during
-   * the callbacks.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Append and return a fresh element to the reserve
- * history kept in @a rhc.
- *
- * @param rhc where the history is kept
- * @return the fresh element that was added
- */
-static struct TALER_EXCHANGEDB_ReserveHistory *
-append_rh (struct ReserveHistoryContext *rhc)
-{
-  struct TALER_EXCHANGEDB_ReserveHistory *tail;
-
-  tail = GNUNET_new (struct TALER_EXCHANGEDB_ReserveHistory);
-  if (NULL != rhc->rh_tail)
-  {
-    rhc->rh_tail->next = tail;
-    rhc->rh_tail = tail;
-  }
-  else
-  {
-    rhc->rh_tail = tail;
-    rhc->rh = tail;
-  }
-  return tail;
-}
-
-
-/**
- * Add bank transfers to result set for #postgres_get_reserve_history.
- *
- * @param cls a `struct ReserveHistoryContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-add_bank_to_exchange (void *cls,
-                      PGresult *result,
-                      unsigned int num_results)
-{
-  struct ReserveHistoryContext *rhc = cls;
-  struct PostgresClosure *pg = rhc->pg;
-
-  while (0 < num_results)
-  {
-    struct TALER_EXCHANGEDB_BankTransfer *bt;
-    struct TALER_EXCHANGEDB_ReserveHistory *tail;
-
-    bt = GNUNET_new (struct TALER_EXCHANGEDB_BankTransfer);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_uint64 ("wire_reference",
-                                      &bt->wire_reference),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("credit",
-                                     &bt->amount),
-        GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                         &bt->execution_date),
-        GNUNET_PQ_result_spec_string ("sender_account_details",
-                                      &bt->sender_account_details),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    --num_results))
-      {
-        GNUNET_break (0);
-        GNUNET_free (bt);
-        rhc->status = GNUNET_SYSERR;
-        return;
-      }
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_add (&rhc->balance_in,
-                                     &rhc->balance_in,
-                                     &bt->amount));
-    bt->reserve_pub = *rhc->reserve_pub;
-    tail = append_rh (rhc);
-    tail->type = TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE;
-    tail->details.bank = bt;
-  } /* end of 'while (0 < rows)' */
-}
-
-
-/**
- * Add coin withdrawals to result set for #postgres_get_reserve_history.
- *
- * @param cls a `struct ReserveHistoryContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-add_withdraw_coin (void *cls,
-                   PGresult *result,
-                   unsigned int num_results)
-{
-  struct ReserveHistoryContext *rhc = cls;
-  struct PostgresClosure *pg = rhc->pg;
-
-  while (0 < num_results)
-  {
-    struct TALER_EXCHANGEDB_CollectableBlindcoin *cbc;
-    struct TALER_EXCHANGEDB_ReserveHistory *tail;
-
-    cbc = GNUNET_new (struct TALER_EXCHANGEDB_CollectableBlindcoin);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
-                                              &cbc->h_coin_envelope),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &cbc->denom_pub_hash),
-        TALER_PQ_result_spec_blinded_denom_sig ("denom_sig",
-                                                &cbc->sig),
-        GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
-                                              &cbc->reserve_sig),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                     &cbc->amount_with_fee),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                     &cbc->withdraw_fee),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    --num_results))
-      {
-        GNUNET_break (0);
-        GNUNET_free (cbc);
-        rhc->status = GNUNET_SYSERR;
-        return;
-      }
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_add (&rhc->balance_out,
-                                     &rhc->balance_out,
-                                     &cbc->amount_with_fee));
-    cbc->reserve_pub = *rhc->reserve_pub;
-    tail = append_rh (rhc);
-    tail->type = TALER_EXCHANGEDB_RO_WITHDRAW_COIN;
-    tail->details.withdraw = cbc;
-  }
-}
-
-
-/**
- * Add recoups to result set for #postgres_get_reserve_history.
- *
- * @param cls a `struct ReserveHistoryContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-add_recoup (void *cls,
-            PGresult *result,
-            unsigned int num_results)
-{
-  struct ReserveHistoryContext *rhc = cls;
-  struct PostgresClosure *pg = rhc->pg;
-
-  while (0 < num_results)
-  {
-    struct TALER_EXCHANGEDB_Recoup *recoup;
-    struct TALER_EXCHANGEDB_ReserveHistory *tail;
-
-    recoup = GNUNET_new (struct TALER_EXCHANGEDB_Recoup);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                     &recoup->value),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                              &recoup->coin.coin_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                              &recoup->coin_blind),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                              &recoup->coin_sig),
-        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                         &recoup->timestamp),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &recoup->coin.denom_pub_hash),
-        TALER_PQ_result_spec_denom_sig (
-          "denom_sig",
-          &recoup->coin.denom_sig),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    --num_results))
-      {
-        GNUNET_break (0);
-        GNUNET_free (recoup);
-        rhc->status = GNUNET_SYSERR;
-        return;
-      }
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_add (&rhc->balance_in,
-                                     &rhc->balance_in,
-                                     &recoup->value));
-    recoup->reserve_pub = *rhc->reserve_pub;
-    tail = append_rh (rhc);
-    tail->type = TALER_EXCHANGEDB_RO_RECOUP_COIN;
-    tail->details.recoup = recoup;
-  } /* end of 'while (0 < rows)' */
-}
-
-
-/**
- * Add exchange-to-bank transfers to result set for
- * #postgres_get_reserve_history.
- *
- * @param cls a `struct ReserveHistoryContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-add_exchange_to_bank (void *cls,
-                      PGresult *result,
-                      unsigned int num_results)
-{
-  struct ReserveHistoryContext *rhc = cls;
-  struct PostgresClosure *pg = rhc->pg;
-
-  while (0 < num_results)
-  {
-    struct TALER_EXCHANGEDB_ClosingTransfer *closing;
-    struct TALER_EXCHANGEDB_ReserveHistory *tail;
-
-    closing = GNUNET_new (struct TALER_EXCHANGEDB_ClosingTransfer);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                     &closing->amount),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                     &closing->closing_fee),
-        GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                         &closing->execution_date),
-        GNUNET_PQ_result_spec_string ("receiver_account",
-                                      &closing->receiver_account_details),
-        GNUNET_PQ_result_spec_auto_from_type ("wtid",
-                                              &closing->wtid),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    --num_results))
-      {
-        GNUNET_break (0);
-        GNUNET_free (closing);
-        rhc->status = GNUNET_SYSERR;
-        return;
-      }
-    }
-    GNUNET_assert (0 <=
-                   TALER_amount_add (&rhc->balance_out,
-                                     &rhc->balance_out,
-                                     &closing->amount));
-    closing->reserve_pub = *rhc->reserve_pub;
-    tail = append_rh (rhc);
-    tail->type = TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK;
-    tail->details.closing = closing;
-  } /* end of 'while (0 < rows)' */
-}
-
-
-/**
- * Get all of the transaction history associated with the specified
- * reserve.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param[out] balance set to the reserve balance
- * @param[out] rhp set to known transaction history (NULL if reserve is unknown)
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_history (void *cls,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              struct TALER_Amount *balance,
-                              struct TALER_EXCHANGEDB_ReserveHistory **rhp)
-{
-  struct PostgresClosure *pg = cls;
-  struct ReserveHistoryContext rhc;
-  struct
-  {
-    /**
-     * Name of the prepared statement to run.
-     */
-    const char *statement;
-    /**
-     * Function to use to process the results.
-     */
-    GNUNET_PQ_PostgresResultHandler cb;
-  } work[] = {
-    /** #TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE */
-    { "reserves_in_get_transactions",
-      add_bank_to_exchange },
-#ifndef GRID5K_MARCO_OPT
-    /** #TALER_EXCHANGEDB_RO_WITHDRAW_COIN */
-    { "get_reserves_out",
-      &add_withdraw_coin },
-    /** #TALER_EXCHANGEDB_RO_RECOUP_COIN */
-    { "recoup_by_reserve",
-      &add_recoup },
-    /** #TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK */
-    { "close_by_reserve",
-      &add_exchange_to_bank },
-#endif
-    /* List terminator */
-    { NULL,
-      NULL }
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  rhc.reserve_pub = reserve_pub;
-  rhc.rh = NULL;
-  rhc.rh_tail = NULL;
-  rhc.pg = pg;
-  rhc.status = GNUNET_OK;
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &rhc.balance_in));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &rhc.balance_out));
-  qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS; /* make static analysis happy */
-  for (unsigned int i = 0; NULL != work[i].cb; i++)
-  {
-    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               work[i].statement,
-                                               params,
-                                               work[i].cb,
-                                               &rhc);
-    if ( (0 > qs) ||
-         (GNUNET_OK != rhc.status) )
-      break;
-  }
-  if ( (qs < 0) ||
-       (rhc.status != GNUNET_OK) )
-  {
-    common_free_reserve_history (cls,
-                                 rhc.rh);
-    rhc.rh = NULL;
-    if (qs >= 0)
-    {
-      /* status == SYSERR is a very hard error... */
-      qs = GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
-  *rhp = rhc.rh;
-  GNUNET_assert (0 <=
-                 TALER_amount_subtract (balance,
-                                        &rhc.balance_in,
-                                        &rhc.balance_out));
-  return qs;
-}
-
-
-/**
- * Get a truncated transaction history associated with the specified
- * reserve.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param[out] balance set to the reserve balance
- * @param[out] rhp set to known transaction history (NULL if reserve is unknown)
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_status (void *cls,
-                             const struct TALER_ReservePublicKeyP *reserve_pub,
-                             struct TALER_Amount *balance,
-                             struct TALER_EXCHANGEDB_ReserveHistory **rhp)
-{
-  struct PostgresClosure *pg = cls;
-  struct ReserveHistoryContext rhc;
-  struct
-  {
-    /**
-     * Name of the prepared statement to run.
-     */
-    const char *statement;
-    /**
-     * Function to use to process the results.
-     */
-    GNUNET_PQ_PostgresResultHandler cb;
-  } work[] = {
-    /** #TALER_EXCHANGEDB_RO_BANK_TO_EXCHANGE */
-    { "reserves_in_get_transactions",
-      add_bank_to_exchange },
-    /** #TALER_EXCHANGEDB_RO_WITHDRAW_COIN */
-    { "get_reserves_out",
-      &add_withdraw_coin },
-    /** #TALER_EXCHANGEDB_RO_RECOUP_COIN */
-    { "recoup_by_reserve",
-      &add_recoup },
-    /** #TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK */
-    { "close_by_reserve",
-      &add_exchange_to_bank },
-    /* List terminator */
-    { NULL,
-      NULL }
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-
-  /* FIXME: actually implement reserve history truncation logic! */
-  rhc.reserve_pub = reserve_pub;
-  rhc.rh = NULL;
-  rhc.rh_tail = NULL;
-  rhc.pg = pg;
-  rhc.status = GNUNET_OK;
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &rhc.balance_in));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &rhc.balance_out));
-  qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS; /* make static analysis happy */
-  for (unsigned int i = 0; NULL != work[i].cb; i++)
-  {
-    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               work[i].statement,
-                                               params,
-                                               work[i].cb,
-                                               &rhc);
-    if ( (0 > qs) ||
-         (GNUNET_OK != rhc.status) )
-      break;
-  }
-  if ( (qs < 0) ||
-       (rhc.status != GNUNET_OK) )
-  {
-    common_free_reserve_history (cls,
-                                 rhc.rh);
-    rhc.rh = NULL;
-    if (qs >= 0)
-    {
-      /* status == SYSERR is a very hard error... */
-      qs = GNUNET_DB_STATUS_HARD_ERROR;
-    }
-  }
-  *rhp = rhc.rh;
-  GNUNET_assert (0 <=
-                 TALER_amount_subtract (balance,
-                                        &rhc.balance_in,
-                                        &rhc.balance_out));
-  return qs;
-}
-
-
-/**
- * Get the balance of the specified reserve.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param reserve_pub public key of the reserve
- * @param[out] balance set to the reserve balance
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_balance (void *cls,
-                              const struct TALER_ReservePublicKeyP *reserve_pub,
-                              struct TALER_Amount *balance)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                 balance),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_reserve_balance",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Check if we have the specified deposit already in the database.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param h_contract_terms contract to check for
- * @param h_wire wire hash to check for
- * @param coin_pub public key of the coin to check for
- * @param merchant merchant public key to check for
- * @param refund_deadline expected refund deadline
- * @param[out] deposit_fee set to the deposit fee the exchange charged
- * @param[out] exchange_timestamp set to the time when the exchange received the deposit
- * @return 1 if we know this operation,
- *         0 if this exact deposit is unknown to us,
- *         otherwise transaction error status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_have_deposit2 (
-  void *cls,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantPublicKeyP *merchant,
-  struct GNUNET_TIME_Timestamp refund_deadline,
-  struct TALER_Amount *deposit_fee,
-  struct GNUNET_TIME_Timestamp *exchange_timestamp)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
-    GNUNET_PQ_query_param_auto_from_type (merchant),
-    GNUNET_PQ_query_param_end
-  };
-  struct TALER_EXCHANGEDB_Deposit deposit2;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 &deposit2.amount_with_fee),
-    GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
-                                     &deposit2.timestamp),
-    GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
-                                     exchange_timestamp),
-    GNUNET_PQ_result_spec_timestamp ("refund_deadline",
-                                     &deposit2.refund_deadline),
-    GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                     &deposit2.wire_deadline),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                 deposit_fee),
-    GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
-                                          &deposit2.wire_salt),
-    GNUNET_PQ_result_spec_string ("receiver_wire_account",
-                                  &deposit2.receiver_wire_account),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct TALER_MerchantWireHashP h_wire2;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting deposits for coin %s\n",
-              TALER_B2S (coin_pub));
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "get_deposit",
-                                                 params,
-                                                 rs);
-  if (0 >= qs)
-    return qs;
-  TALER_merchant_wire_signature_hash (deposit2.receiver_wire_account,
-                                      &deposit2.wire_salt,
-                                      &h_wire2);
-  GNUNET_free (deposit2.receiver_wire_account);
-  /* Now we check that the other information in @a deposit
-     also matches, and if not report inconsistencies. */
-  if ( (GNUNET_TIME_timestamp_cmp (refund_deadline,
-                                   !=,
-                                   deposit2.refund_deadline)) ||
-       (0 != GNUNET_memcmp (h_wire,
-                            &h_wire2) ) )
-  {
-    /* Inconsistencies detected! Does not match!  (We might want to
-       expand the API with a 'get_deposit' function to return the
-       original transaction details to be used for an error message
-       in the future!) FIXME #3838 */
-    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-  }
-  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-}
-
-
-/**
- * Aggregate all matching deposits for @a h_payto and
- * @a merchant_pub, returning the total amounts.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto destination of the wire transfer
- * @param merchant_pub public key of the merchant
- * @param wtid wire transfer ID to set for the aggregate
- * @param[out] total set to the sum of the total deposits minus applicable deposit fees and refunds
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_aggregate (
-  void *cls,
-  const struct TALER_PaytoHashP *h_payto,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  struct TALER_Amount *total)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Absolute now = {0};
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_absolute_time (&now),
-    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-  uint64_t sum_deposit_value;
-  uint64_t sum_deposit_frac;
-  uint64_t sum_refund_value;
-  uint64_t sum_refund_frac;
-  uint64_t sum_fee_value;
-  uint64_t sum_fee_frac;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("sum_deposit_value",
-                                  &sum_deposit_value),
-    GNUNET_PQ_result_spec_uint64 ("sum_deposit_fraction",
-                                  &sum_deposit_frac),
-    GNUNET_PQ_result_spec_uint64 ("sum_refund_value",
-                                  &sum_refund_value),
-    GNUNET_PQ_result_spec_uint64 ("sum_refund_fraction",
-                                  &sum_refund_frac),
-    GNUNET_PQ_result_spec_uint64 ("sum_fee_value",
-                                  &sum_fee_value),
-    GNUNET_PQ_result_spec_uint64 ("sum_fee_fraction",
-                                  &sum_fee_frac),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct TALER_Amount sum_deposit;
-  struct TALER_Amount sum_refund;
-  struct TALER_Amount sum_fee;
-  struct TALER_Amount delta;
-
-  now = GNUNET_TIME_absolute_round_down (GNUNET_TIME_absolute_get (),
-                                         pg->aggregator_shift);
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "aggregate",
-                                                 params,
-                                                 rs);
-  if (qs < 0)
-  {
-    GNUNET_assert (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-    return qs;
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-  {
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_amount_set_zero (pg->currency,
-                                          total));
-    return qs;
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &sum_deposit));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &sum_refund));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (pg->currency,
-                                        &sum_fee));
-  sum_deposit.value    = sum_deposit_frac / TALER_AMOUNT_FRAC_BASE
-                         + sum_deposit_value;
-  sum_deposit.fraction = sum_deposit_frac % TALER_AMOUNT_FRAC_BASE;
-  sum_refund.value     = sum_refund_frac  / TALER_AMOUNT_FRAC_BASE
-                         + sum_refund_value;
-  sum_refund.fraction  = sum_refund_frac  % TALER_AMOUNT_FRAC_BASE;
-  sum_fee.value        = sum_fee_frac     / TALER_AMOUNT_FRAC_BASE
-                         + sum_fee_value;
-  sum_fee.fraction     = sum_fee_frac     % TALER_AMOUNT_FRAC_BASE; \
-  GNUNET_assert (0 <=
-                 TALER_amount_subtract (&delta,
-                                        &sum_deposit,
-                                        &sum_refund));
-  GNUNET_assert (0 <=
-                 TALER_amount_subtract (total,
-                                        &delta,
-                                        &sum_fee));
-  return qs;
-}
-
-
-/**
- * Create a new entry in the transient aggregation table.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto destination of the wire transfer
- * @param exchange_account_section exchange account to use
- * @param wtid the raw wire transfer identifier to be used
- * @param total amount to be wired in the future
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_create_aggregation_transient (
-  void *cls,
-  const struct TALER_PaytoHashP *h_payto,
-  const char *exchange_account_section,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  const struct TALER_Amount *total)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (total),
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_string (exchange_account_section),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "create_aggregation_transient",
-                                             params);
-}
-
-
-/**
- * Find existing entry in the transient aggregation table.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto destination of the wire transfer
- * @param exchange_account_section exchange account to use
- * @param[out] wtid set to the raw wire transfer identifier to be used
- * @param[out] total existing amount to be wired in the future
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_aggregation_transient (
-  void *cls,
-  const struct TALER_PaytoHashP *h_payto,
-  const char *exchange_account_section,
-  struct TALER_WireTransferIdentifierRawP *wtid,
-  struct TALER_Amount *total)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_string (exchange_account_section),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                 total),
-    GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
-                                          wtid),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_aggregation_transient",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Update existing entry in the transient aggregation table.
- * @a h_payto is only needed for query performance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto destination of the wire transfer
- * @param wtid the raw wire transfer identifier to update
- * @param total new total amount to be wired in the future
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_aggregation_transient (
-  void *cls,
-  const struct TALER_PaytoHashP *h_payto,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  const struct TALER_Amount *total)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    TALER_PQ_query_param_amount (total),
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "update_aggregation_transient",
-                                             params);
-}
-
-
-/**
- * Delete existing entry in the transient aggregation table.
- * @a h_payto is only needed for query performance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param h_payto destination of the wire transfer
- * @param wtid the raw wire transfer identifier to update
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_delete_aggregation_transient (
-  void *cls,
-  const struct TALER_PaytoHashP *h_payto,
-  const struct TALER_WireTransferIdentifierRawP *wtid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "delete_aggregation_transient",
-                                             params);
-}
-
-
-/**
- * Obtain information about deposits that are ready to be executed.  Such
- * deposits must not be marked as "done", the execution time must be
- * in the past, and the KYC status must be 'ok'.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param start_shard_row minimum shard row to select
- * @param end_shard_row maximum shard row to select (inclusive)
- * @param kyc_off true if we should not check the KYC status because
- *                this exchange does not need/support KYC checks.
- * @param[out] merchant_pub set to the public key of a merchant with a ready deposit
- * @param[out] payto_uri set to the account of the merchant, to be freed by caller
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_ready_deposit (void *cls,
-                            uint64_t start_shard_row,
-                            uint64_t end_shard_row,
-                            bool kyc_off,
-                            struct TALER_MerchantPublicKeyP *merchant_pub,
-                            char **payto_uri)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Absolute now = {0};
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_absolute_time (&now),
-    GNUNET_PQ_query_param_uint64 (&start_shard_row),
-    GNUNET_PQ_query_param_uint64 (&end_shard_row),
-    GNUNET_PQ_query_param_bool (kyc_off),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                          merchant_pub),
-    GNUNET_PQ_result_spec_string ("payto_uri",
-                                  payto_uri),
-    GNUNET_PQ_result_spec_end
-  };
-
-  now = GNUNET_TIME_absolute_round_down (GNUNET_TIME_absolute_get (),
-                                         pg->aggregator_shift);
-  GNUNET_assert (start_shard_row < end_shard_row);
-  GNUNET_assert (end_shard_row <= INT32_MAX);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Finding ready deposits by deadline %s (%llu)\n",
-              GNUNET_TIME_absolute2s (now),
-              (unsigned long long) now.abs_value_us);
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "deposits_get_ready",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Retrieve the record for a known coin.
- *
- * @param cls the plugin closure
- * @param coin_pub the public key of the coin to search for
- * @param coin_info place holder for the returned coin information object
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_known_coin (void *cls,
-                         const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                         struct TALER_CoinPublicInfo *coin_info)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                          &coin_info->denom_pub_hash),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                            &coin_info->h_age_commitment),
-      &coin_info->no_age_commitment),
-    TALER_PQ_result_spec_denom_sig ("denom_sig",
-                                    &coin_info->denom_sig),
-    GNUNET_PQ_result_spec_end
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting known coin data for coin %s\n",
-              TALER_B2S (coin_pub));
-  coin_info->coin_pub = *coin_pub;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_known_coin",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Retrieve the denomination of a known coin.
- *
- * @param cls the plugin closure
- * @param coin_pub the public key of the coin to search for
- * @param[out] known_coin_id set to the ID of the coin in the known_coins table
- * @param[out] denom_hash where to store the hash of the coins denomination
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_coin_denomination (
-  void *cls,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  uint64_t *known_coin_id,
-  struct TALER_DenominationHashP *denom_hash)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                          denom_hash),
-    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
-                                  known_coin_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting coin denomination of coin %s\n",
-              TALER_B2S (coin_pub));
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_coin_denomination",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Count the number of known coins by denomination.
- *
- * @param cls database connection plugin state
- * @param denom_pub_hash denomination to count by
- * @return number of coins if non-negative, otherwise an `enum GNUNET_DB_QueryStatus`
- */
-static long long
-postgres_count_known_coins (void *cls,
-                            const struct
-                            TALER_DenominationHashP *denom_pub_hash)
-{
-  struct PostgresClosure *pg = cls;
-  uint64_t count;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_uint64 ("count",
-                                  &count),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "count_known_coins",
-                                                 params,
-                                                 rs);
-  if (0 > qs)
-    return (long long) qs;
-  return (long long) count;
-}
-
-
-/**
- * Make sure the given @a coin is known to the database.
- *
- * @param cls database connection plugin state
- * @param coin the coin that must be made known
- * @param[out] known_coin_id set to the unique row of the coin
- * @param[out] denom_hash set to the denomination hash of the existing
- *             coin (for conflict error reporting)
- * @param[out] h_age_commitment  set to the conflicting age commitment hash on conflict
- * @return database transaction status, non-negative on success
- */
-static enum TALER_EXCHANGEDB_CoinKnownStatus
-postgres_ensure_coin_known (void *cls,
-                            const struct TALER_CoinPublicInfo *coin,
-                            uint64_t *known_coin_id,
-                            struct TALER_DenominationHashP *denom_hash,
-                            struct TALER_AgeCommitmentHash *h_age_commitment)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  bool existed;
-  bool is_denom_pub_hash_null = false;
-  bool is_age_hash_null = false;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&coin->coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&coin->denom_pub_hash),
-    GNUNET_PQ_query_param_auto_from_type (&coin->h_age_commitment),
-    TALER_PQ_query_param_denom_sig (&coin->denom_sig),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("existed",
-                                &existed),
-    GNUNET_PQ_result_spec_uint64 ("known_coin_id",
-                                  known_coin_id),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            denom_hash),
-      &is_denom_pub_hash_null),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                            h_age_commitment),
-      &is_age_hash_null),
-    GNUNET_PQ_result_spec_end
-  };
-
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "insert_known_coin",
-                                                 params,
-                                                 rs);
-  switch (qs)
-  {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-    GNUNET_break (0);
-    return TALER_EXCHANGEDB_CKS_HARD_FAIL;
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-    return TALER_EXCHANGEDB_CKS_SOFT_FAIL;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-    GNUNET_break (0); /* should be impossible */
-    return TALER_EXCHANGEDB_CKS_HARD_FAIL;
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-    if (! existed)
-      return TALER_EXCHANGEDB_CKS_ADDED;
-    break; /* continued below */
-  }
-
-  if ( (! is_denom_pub_hash_null) &&
-       (0 != GNUNET_memcmp (&denom_hash->hash,
-                            &coin->denom_pub_hash.hash)) )
-  {
-    GNUNET_break_op (0);
-    return TALER_EXCHANGEDB_CKS_DENOM_CONFLICT;
-  }
-
-  if ( (! is_age_hash_null) &&
-       (0 != GNUNET_memcmp (h_age_commitment,
-                            &coin->h_age_commitment)) )
-  {
-    GNUNET_break (GNUNET_is_zero (h_age_commitment));
-    GNUNET_break_op (0);
-    return TALER_EXCHANGEDB_CKS_AGE_CONFLICT;
-  }
-
-  return TALER_EXCHANGEDB_CKS_PRESENT;
-}
-
-
-/**
- * Insert information about deposited coin into the database.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param exchange_timestamp time the exchange received the deposit request
- * @param deposit deposit information to store
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_deposit (void *cls,
-                         struct GNUNET_TIME_Timestamp exchange_timestamp,
-                         const struct TALER_EXCHANGEDB_Deposit *deposit)
-{
-  struct PostgresClosure *pg = cls;
-  struct TALER_EXCHANGEDB_KycStatus kyc;
-  enum GNUNET_DB_QueryStatus qs;
-  struct TALER_PaytoHashP h_payto;
-
-  qs = inselect_account_kyc_status (pg,
-                                    deposit->receiver_wire_account,
-                                    &h_payto,
-                                    &kyc);
-  if (qs <= 0)
-  {
-    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-    return qs;
-  }
-  if (GNUNET_TIME_timestamp_cmp (deposit->wire_deadline,
-                                 <,
-                                 deposit->refund_deadline))
-  {
-    GNUNET_break (0);
-  }
-  {
-    uint64_t shard = compute_shard (&deposit->merchant_pub);
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
-      TALER_PQ_query_param_amount (&deposit->amount_with_fee),
-      GNUNET_PQ_query_param_timestamp (&deposit->timestamp),
-      GNUNET_PQ_query_param_timestamp (&deposit->refund_deadline),
-      GNUNET_PQ_query_param_timestamp (&deposit->wire_deadline),
-      GNUNET_PQ_query_param_auto_from_type (&deposit->merchant_pub),
-      GNUNET_PQ_query_param_auto_from_type (&deposit->h_contract_terms),
-      GNUNET_PQ_query_param_auto_from_type (&deposit->wire_salt),
-      GNUNET_PQ_query_param_auto_from_type (&h_payto),
-      GNUNET_PQ_query_param_auto_from_type (&deposit->csig),
-      GNUNET_PQ_query_param_timestamp (&exchange_timestamp),
-      GNUNET_PQ_query_param_uint64 (&shard),
-      GNUNET_PQ_query_param_end
-    };
-
-    GNUNET_assert (shard <= INT32_MAX);
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_INFO,
-      "Inserting deposit to be executed at %s (%llu/%llu)\n",
-      GNUNET_TIME_timestamp2s (deposit->wire_deadline),
-      (unsigned long long) deposit->wire_deadline.abs_time.abs_value_us,
-      (unsigned long long) deposit->refund_deadline.abs_time.abs_value_us);
-    return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                               "insert_deposit",
-                                               params);
-  }
-}
-
-
-/**
- * Insert information about refunded coin into the database.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param refund refund information to store
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_refund (void *cls,
-                        const struct TALER_EXCHANGEDB_Refund *refund)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (&refund->coin.coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_pub),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.merchant_sig),
-    GNUNET_PQ_query_param_auto_from_type (&refund->details.h_contract_terms),
-    GNUNET_PQ_query_param_uint64 (&refund->details.rtransaction_id),
-    TALER_PQ_query_param_amount (&refund->details.refund_amount),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_amount_cmp_currency (&refund->details.refund_amount,
-                                            &refund->details.refund_fee));
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_refund",
-                                             params);
-}
-
-
-/**
- * Closure for #get_refunds_cb().
- */
-struct SelectRefundContext
-{
-  /**
-   * Function to call on each result.
-   */
-  TALER_EXCHANGEDB_RefundCoinCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on error.
-   */
-  int status;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct SelectRefundContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-get_refunds_cb (void *cls,
-                PGresult *result,
-                unsigned int num_results)
-{
-  struct SelectRefundContext *srctx = cls;
-  struct PostgresClosure *pg = srctx->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_Amount amount_with_fee;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &amount_with_fee),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      srctx->status = GNUNET_SYSERR;
-      return;
-    }
-    if (GNUNET_OK !=
-        srctx->cb (srctx->cb_cls,
-                   &amount_with_fee))
-      return;
-  }
-}
-
-
-/**
- * Select refunds by @a coin_pub, @a merchant_pub and @a h_contract.
- *
- * @param cls closure of plugin
- * @param coin_pub coin to get refunds for
- * @param merchant_pub merchant to get refunds for
- * @param h_contract contract (hash) to get refunds for
- * @param cb function to call for each refund found
- * @param cb_cls closure for @a cb
- * @return query result status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_refunds_by_coin (
-  void *cls,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  const struct TALER_PrivateContractHashP *h_contract,
-  TALER_EXCHANGEDB_RefundCoinCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_contract),
-    GNUNET_PQ_query_param_end
-  };
-  struct SelectRefundContext srctx = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_refunds_by_coin_and_contract",
-                                             params,
-                                             &get_refunds_cb,
-                                             &srctx);
-  if (GNUNET_SYSERR == srctx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Lookup refresh melt commitment data under the given @a rc.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param rc commitment hash to use to locate the operation
- * @param[out] melt where to store the result; note that
- *             melt->session.coin.denom_sig will be set to NULL
- *             and is not fetched by this routine (as it is not needed by the client)
- * @param[out] melt_serial_id set to the row ID of @a rc in the refresh_commitments table
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_melt (void *cls,
-                   const struct TALER_RefreshCommitmentP *rc,
-                   struct TALER_EXCHANGEDB_Melt *melt,
-                   uint64_t *melt_serial_id)
-{
-  struct PostgresClosure *pg = cls;
-  bool h_age_commitment_is_null;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (rc),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                          &melt->session.coin.
-                                          denom_pub_hash),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                 &melt->melt_fee),
-    GNUNET_PQ_result_spec_uint32 ("noreveal_index",
-                                  &melt->session.noreveal_index),
-    GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
-                                          &melt->session.coin.coin_pub),
-    GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
-                                          &melt->session.coin_sig),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                            &melt->session.coin.h_age_commitment),
-      &h_age_commitment_is_null),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 &melt->session.amount_with_fee),
-    GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
-                                  melt_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  memset (&melt->session.coin.denom_sig,
-          0,
-          sizeof (melt->session.coin.denom_sig));
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "get_melt",
-                                                 params,
-                                                 rs);
-  if (h_age_commitment_is_null)
-    memset (&melt->session.coin.h_age_commitment,
-            0,
-            sizeof(melt->session.coin.h_age_commitment));
-
-  melt->session.rc = *rc;
-  return qs;
-}
-
-
-/**
- * Store in the database which coin(s) the wallet wanted to create
- * in a given refresh operation and all of the other information
- * we learned or created in the /refresh/reveal step.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param melt_serial_id row ID of the commitment / melt operation in refresh_commitments
- * @param num_rrcs number of coins to generate, size of the @a rrcs array
- * @param rrcs information about the new coins
- * @param num_tprivs number of entries in @a tprivs, should be #TALER_CNC_KAPPA - 1
- * @param tprivs transfer private keys to store
- * @param tp public key to store
- * @return query status for the transaction
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_refresh_reveal (
-  void *cls,
-  uint64_t melt_serial_id,
-  uint32_t num_rrcs,
-  const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs,
-  unsigned int num_tprivs,
-  const struct TALER_TransferPrivateKeyP *tprivs,
-  const struct TALER_TransferPublicKeyP *tp)
-{
-  struct PostgresClosure *pg = cls;
-
-  if (TALER_CNC_KAPPA != num_tprivs + 1)
-  {
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  for (uint32_t i = 0; i<num_rrcs; i++)
-  {
-    const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &rrcs[i];
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_uint64 (&melt_serial_id),
-      GNUNET_PQ_query_param_uint32 (&i),
-      GNUNET_PQ_query_param_auto_from_type (&rrc->orig_coin_link_sig),
-      GNUNET_PQ_query_param_auto_from_type (&rrc->h_denom_pub),
-      TALER_PQ_query_param_blinded_planchet (&rrc->blinded_planchet),
-      TALER_PQ_query_param_exchange_withdraw_values (&rrc->exchange_vals),
-      GNUNET_PQ_query_param_auto_from_type (&rrc->coin_envelope_hash),
-      TALER_PQ_query_param_blinded_denom_sig (&rrc->coin_sig),
-      GNUNET_PQ_query_param_end
-    };
-    enum GNUNET_DB_QueryStatus qs;
-
-    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_refresh_revealed_coin",
-                                             params);
-    if (0 > qs)
-      return qs;
-  }
-
-  {
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_uint64 (&melt_serial_id),
-      GNUNET_PQ_query_param_auto_from_type (tp),
-      GNUNET_PQ_query_param_fixed_size (
-        tprivs,
-        num_tprivs * sizeof (struct TALER_TransferPrivateKeyP)),
-      GNUNET_PQ_query_param_end
-    };
-
-    return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                               "insert_refresh_transfer_keys",
-                                               params);
-  }
-}
-
-
-/**
- * Context where we aggregate data from the database.
- * Closure for #add_revealed_coins().
- */
-struct GetRevealContext
-{
-  /**
-   * Array of revealed coins we obtained from the DB.
-   */
-  struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs;
-
-  /**
-   * Length of the @a rrcs array.
-   */
-  unsigned int rrcs_len;
-
-  /**
-   * Set to an error code if we ran into trouble.
-   */
-  enum GNUNET_DB_QueryStatus qs;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct GetRevealContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_revealed_coins (void *cls,
-                    PGresult *result,
-                    unsigned int num_results)
-{
-  struct GetRevealContext *grctx = cls;
-
-  if (0 == num_results)
-    return;
-  grctx->rrcs = GNUNET_new_array (num_results,
-                                  struct TALER_EXCHANGEDB_RefreshRevealedCoin);
-  grctx->rrcs_len = num_results;
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    uint32_t off;
-    struct GNUNET_PQ_ResultSpec rso[] = {
-      GNUNET_PQ_result_spec_uint32 ("freshcoin_index",
-                                    &off),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rso,
-                                  i))
-    {
-      GNUNET_break (0);
-      grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-    if (off >= num_results)
-    {
-      GNUNET_break (0);
-      grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return;
-    }
-    {
-      struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx->rrcs[off];
-      struct GNUNET_PQ_ResultSpec rsi[] = {
-        /* NOTE: freshcoin_index selected and discarded here... */
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &rrc->h_denom_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("link_sig",
-                                              &rrc->orig_coin_link_sig),
-        GNUNET_PQ_result_spec_auto_from_type ("h_coin_ev",
-                                              &rrc->coin_envelope_hash),
-        TALER_PQ_result_spec_blinded_planchet ("coin_ev",
-                                               &rrc->blinded_planchet),
-        TALER_PQ_result_spec_exchange_withdraw_values ("ewv",
-                                                       &rrc->exchange_vals),
-        TALER_PQ_result_spec_blinded_denom_sig ("ev_sig",
-                                                &rrc->coin_sig),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (TALER_DENOMINATION_INVALID != rrc->blinded_planchet.cipher)
-      {
-        /* duplicate offset, not allowed */
-        GNUNET_break (0);
-        grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
-        return;
-      }
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rsi,
-                                    i))
-      {
-        GNUNET_break (0);
-        grctx->qs = GNUNET_DB_STATUS_HARD_ERROR;
-        return;
-      }
-    }
-  }
-}
-
-
-/**
- * Lookup in the database the coins that we want to
- * create in the given refresh operation.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param rc identify commitment and thus refresh operation
- * @param cb function to call with the results
- * @param cb_cls closure for @a cb
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_refresh_reveal (void *cls,
-                             const struct TALER_RefreshCommitmentP *rc,
-                             TALER_EXCHANGEDB_RefreshCallback cb,
-                             void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GetRevealContext grctx;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (rc),
-    GNUNET_PQ_query_param_end
-  };
-
-  memset (&grctx,
-          0,
-          sizeof (grctx));
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_refresh_revealed_coins",
-                                             params,
-                                             &add_revealed_coins,
-                                             &grctx);
-  switch (qs)
-  {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-    goto cleanup;
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-  default: /* can have more than one result */
-    break;
-  }
-  switch (grctx.qs)
-  {
-  case GNUNET_DB_STATUS_HARD_ERROR:
-  case GNUNET_DB_STATUS_SOFT_ERROR:
-    goto cleanup;
-  case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-  case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: /* should be impossible */
-    break;
-  }
-
-  /* Pass result back to application */
-  cb (cb_cls,
-      grctx.rrcs_len,
-      grctx.rrcs);
-cleanup:
-  for (unsigned int i = 0; i < grctx.rrcs_len; i++)
-  {
-    struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrc = &grctx.rrcs[i];
-
-    TALER_blinded_denom_sig_free (&rrc->coin_sig);
-    TALER_blinded_planchet_free (&rrc->blinded_planchet);
-  }
-  GNUNET_free (grctx.rrcs);
-  return qs;
-}
-
-
-/**
- * Closure for #add_ldl().
- */
-struct LinkDataContext
-{
-  /**
-   * Function to call on each result.
-   */
-  TALER_EXCHANGEDB_LinkCallback ldc;
-
-  /**
-   * Closure for @e ldc.
-   */
-  void *ldc_cls;
-
-  /**
-   * Last transfer public key for which we have information in @e last.
-   * Only valid if @e last is non-NULL.
-   */
-  struct TALER_TransferPublicKeyP transfer_pub;
-
-  /**
-   * Link data for @e transfer_pub
-   */
-  struct TALER_EXCHANGEDB_LinkList *last;
-
-  /**
-   * Status, set to #GNUNET_SYSERR on errors,
-   */
-  int status;
-};
-
-
-/**
- * Free memory of the link data list.
- *
- * @param cls the @e cls of this struct with the plugin-specific state (unused)
- * @param ldl link data list to release
- */
-static void
-free_link_data_list (void *cls,
-                     struct TALER_EXCHANGEDB_LinkList *ldl)
-{
-  struct TALER_EXCHANGEDB_LinkList *next;
-
-  (void) cls;
-  while (NULL != ldl)
-  {
-    next = ldl->next;
-    TALER_denom_pub_free (&ldl->denom_pub);
-    TALER_blinded_denom_sig_free (&ldl->ev_sig);
-    GNUNET_free (ldl);
-    ldl = next;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct LinkDataContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_ldl (void *cls,
-         PGresult *result,
-         unsigned int num_results)
-{
-  struct LinkDataContext *ldctx = cls;
-
-  for (int i = num_results - 1; i >= 0; i--)
-  {
-    struct TALER_EXCHANGEDB_LinkList *pos;
-    struct TALER_TransferPublicKeyP transfer_pub;
-
-    pos = GNUNET_new (struct TALER_EXCHANGEDB_LinkList);
-    {
-      struct TALER_BlindedPlanchet bp;
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("transfer_pub",
-                                              &transfer_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("link_sig",
-                                              &pos->orig_coin_link_sig),
-        TALER_PQ_result_spec_blinded_denom_sig ("ev_sig",
-                                                &pos->ev_sig),
-        GNUNET_PQ_result_spec_uint32 ("freshcoin_index",
-                                      &pos->coin_refresh_offset),
-        TALER_PQ_result_spec_exchange_withdraw_values ("ewv",
-                                                       &pos->alg_values),
-        TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                        &pos->denom_pub),
-        TALER_PQ_result_spec_blinded_planchet ("coin_ev",
-                                               &bp),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (pos);
-        ldctx->status = GNUNET_SYSERR;
-        return;
-      }
-      if (TALER_DENOMINATION_CS == bp.cipher)
-      {
-        pos->nonce = bp.details.cs_blinded_planchet.nonce;
-        pos->have_nonce = true;
-      }
-      TALER_blinded_planchet_free (&bp);
-    }
-    if ( (NULL != ldctx->last) &&
-         (0 == GNUNET_memcmp (&transfer_pub,
-                              &ldctx->transfer_pub)) )
-    {
-      pos->next = ldctx->last;
-    }
-    else
-    {
-      if (NULL != ldctx->last)
-      {
-        ldctx->ldc (ldctx->ldc_cls,
-                    &ldctx->transfer_pub,
-                    ldctx->last);
-        free_link_data_list (cls,
-                             ldctx->last);
-      }
-      ldctx->transfer_pub = transfer_pub;
-    }
-    ldctx->last = pos;
-  }
-}
-
-
-/**
- * Obtain the link data of a coin, that is the encrypted link
- * information, the denomination keys and the signatures.
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param coin_pub public key of the coin
- * @param ldc function to call for each session the coin was melted into
- * @param ldc_cls closure for @a tdc
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_link_data (void *cls,
-                        const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                        TALER_EXCHANGEDB_LinkCallback ldc,
-                        void *ldc_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  struct LinkDataContext ldctx;
-
-  ldctx.ldc = ldc;
-  ldctx.ldc_cls = ldc_cls;
-  ldctx.last = NULL;
-  ldctx.status = GNUNET_OK;
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_link",
-                                             params,
-                                             &add_ldl,
-                                             &ldctx);
-  if (NULL != ldctx.last)
-  {
-    if (GNUNET_OK == ldctx.status)
-    {
-      /* call callback one more time! */
-      ldc (ldc_cls,
-           &ldctx.transfer_pub,
-           ldctx.last);
-    }
-    free_link_data_list (cls,
-                         ldctx.last);
-    ldctx.last = NULL;
-  }
-  if (GNUNET_OK != ldctx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for callbacks called from #postgres_get_coin_transactions()
- */
-struct CoinHistoryContext
-{
-  /**
-   * Head of the coin's history list.
-   */
-  struct TALER_EXCHANGEDB_TransactionList *head;
-
-  /**
-   * Public key of the coin we are building the history for.
-   */
-  const struct TALER_CoinSpendPublicKeyP *coin_pub;
-
-  /**
-   * Closure for all callbacks of this database plugin.
-   */
-  void *db_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to 'true' if the transaction failed.
-   */
-  bool failed;
-
-  /**
-   * Set to 'true' if we found a deposit or melt (for invariant check).
-   */
-  bool have_deposit_or_melt;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_coin_deposit (void *cls,
-                  PGresult *result,
-                  unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_DepositListEntry *deposit;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    chc->have_deposit_or_melt = true;
-    deposit = GNUNET_new (struct TALER_EXCHANGEDB_DepositListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                     &deposit->amount_with_fee),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                     &deposit->deposit_fee),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &deposit->h_denom_pub),
-        GNUNET_PQ_result_spec_allow_null (
-          GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                                &deposit->h_age_commitment),
-          &deposit->no_age_commitment),
-        GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
-                                         &deposit->timestamp),
-        GNUNET_PQ_result_spec_timestamp ("refund_deadline",
-                                         &deposit->refund_deadline),
-        GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                         &deposit->wire_deadline),
-        GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                              &deposit->merchant_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                              &deposit->h_contract_terms),
-        GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
-                                              &deposit->wire_salt),
-        GNUNET_PQ_result_spec_string ("payto_uri",
-                                      &deposit->receiver_wire_account),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                              &deposit->csig),
-        GNUNET_PQ_result_spec_uint64 ("deposit_serial_id",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_auto_from_type ("done",
-                                              &deposit->done),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (deposit);
-        chc->failed = true;
-        return;
-      }
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_DEPOSIT;
-    tl->details.deposit = deposit;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_coin_melt (void *cls,
-               PGresult *result,
-               unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_MeltListEntry *melt;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    chc->have_deposit_or_melt = true;
-    melt = GNUNET_new (struct TALER_EXCHANGEDB_MeltListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("rc",
-                                              &melt->rc),
-        /* oldcoin_index not needed */
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &melt->h_denom_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
-                                              &melt->coin_sig),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                     &melt->amount_with_fee),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                     &melt->melt_fee),
-        GNUNET_PQ_result_spec_allow_null (
-          GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                                &melt->h_age_commitment),
-          &melt->no_age_commitment),
-        GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (melt);
-        chc->failed = true;
-        return;
-      }
-
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_MELT;
-    tl->details.melt = melt;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_coin_refund (void *cls,
-                 PGresult *result,
-                 unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_RefundListEntry *refund;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    refund = GNUNET_new (struct TALER_EXCHANGEDB_RefundListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                              &refund->merchant_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("merchant_sig",
-                                              &refund->merchant_sig),
-        GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                              &refund->h_contract_terms),
-        GNUNET_PQ_result_spec_uint64 ("rtransaction_id",
-                                      &refund->rtransaction_id),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                     &refund->refund_amount),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
-                                     &refund->refund_fee),
-        GNUNET_PQ_result_spec_uint64 ("refund_serial_id",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (refund);
-        chc->failed = true;
-        return;
-      }
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_REFUND;
-    tl->details.refund = refund;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_old_coin_recoup (void *cls,
-                     PGresult *result,
-                     unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_RecoupRefreshListEntry *recoup;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupRefreshListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                              &recoup->coin.coin_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                              &recoup->coin_sig),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                              &recoup->coin_blind),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                     &recoup->value),
-        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                         &recoup->timestamp),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &recoup->coin.denom_pub_hash),
-        TALER_PQ_result_spec_denom_sig ("denom_sig",
-                                        &recoup->coin.denom_sig),
-        GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (recoup);
-        chc->failed = true;
-        return;
-      }
-      recoup->old_coin_pub = *chc->coin_pub;
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP;
-    tl->details.old_coin_recoup = recoup;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_coin_recoup (void *cls,
-                 PGresult *result,
-                 unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_RecoupListEntry *recoup;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                              &recoup->reserve_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                              &recoup->coin_sig),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &recoup->h_denom_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                              &recoup->coin_blind),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                     &recoup->value),
-        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                         &recoup->timestamp),
-        GNUNET_PQ_result_spec_uint64 ("recoup_uuid",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (recoup);
-        chc->failed = true;
-        return;
-      }
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_RECOUP;
-    tl->details.recoup = recoup;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct CoinHistoryContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-add_coin_recoup_refresh (void *cls,
-                         PGresult *result,
-                         unsigned int num_results)
-{
-  struct CoinHistoryContext *chc = cls;
-  struct PostgresClosure *pg = chc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_RecoupRefreshListEntry *recoup;
-    struct TALER_EXCHANGEDB_TransactionList *tl;
-    uint64_t serial_id;
-
-    recoup = GNUNET_new (struct TALER_EXCHANGEDB_RecoupRefreshListEntry);
-    {
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
-                                              &recoup->old_coin_pub),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                              &recoup->coin_sig),
-        GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                              &recoup->coin_blind),
-        TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                     &recoup->value),
-        GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                         &recoup->timestamp),
-        GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                              &recoup->coin.denom_pub_hash),
-        TALER_PQ_result_spec_denom_sig ("denom_sig",
-                                        &recoup->coin.denom_sig),
-        GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
-                                      &serial_id),
-        GNUNET_PQ_result_spec_end
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_PQ_extract_result (result,
-                                    rs,
-                                    i))
-      {
-        GNUNET_break (0);
-        GNUNET_free (recoup);
-        chc->failed = true;
-        return;
-      }
-      recoup->coin.coin_pub = *chc->coin_pub;
-    }
-    tl = GNUNET_new (struct TALER_EXCHANGEDB_TransactionList);
-    tl->next = chc->head;
-    tl->type = TALER_EXCHANGEDB_TT_RECOUP_REFRESH;
-    tl->details.recoup_refresh = recoup;
-    tl->serial_id = serial_id;
-    chc->head = tl;
-  }
-}
-
-
-/**
- * Work we need to do.
- */
-struct Work
-{
-  /**
-   * SQL prepared statement name.
-   */
-  const char *statement;
-
-  /**
-   * Function to call to handle the result(s).
-   */
-  GNUNET_PQ_PostgresResultHandler cb;
-};
-
-
-/**
- * Compile a list of all (historic) transactions performed with the given coin
- * (/refresh/melt, /deposit, /refund and /recoup operations).
- *
- * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param coin_pub coin to investigate
- * @param include_recoup should recoup transactions be included in the @a tlp
- * @param[out] tlp set to list of transactions, NULL if coin is fresh
- * @return database transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_coin_transactions (
-  void *cls,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  int include_recoup,
-  struct TALER_EXCHANGEDB_TransactionList **tlp)
-{
-  struct PostgresClosure *pg = cls;
-  static const struct Work work_op[] = {
-    /** #TALER_EXCHANGEDB_TT_DEPOSIT */
-    { "get_deposit_with_coin_pub",
-      &add_coin_deposit },
-    /** #TALER_EXCHANGEDB_TT_MELT */
-    { "get_refresh_session_by_coin",
-      &add_coin_melt },
-    /** #TALER_EXCHANGEDB_TT_REFUND */
-    { "get_refunds_by_coin",
-      &add_coin_refund },
-    { NULL, NULL }
-  };
-  static const struct Work work_wp[] = {
-    /** #TALER_EXCHANGEDB_TT_DEPOSIT */
-    { "get_deposit_with_coin_pub",
-      &add_coin_deposit },
-    /** #TALER_EXCHANGEDB_TT_MELT */
-    { "get_refresh_session_by_coin",
-      &add_coin_melt },
-    /** #TALER_EXCHANGEDB_TT_REFUND */
-    { "get_refunds_by_coin",
-      &add_coin_refund },
-    /** #TALER_EXCHANGEDB_TT_OLD_COIN_RECOUP */
-    { "recoup_by_old_coin",
-      &add_old_coin_recoup },
-    /** #TALER_EXCHANGEDB_TT_RECOUP */
-    { "recoup_by_coin",
-      &add_coin_recoup },
-    /** #TALER_EXCHANGEDB_TT_RECOUP_REFRESH */
-    { "recoup_by_refreshed_coin",
-      &add_coin_recoup_refresh },
-    { NULL, NULL }
-  };
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-  const struct Work *work;
-  struct CoinHistoryContext chc = {
-    .head = NULL,
-    .coin_pub = coin_pub,
-    .pg = pg,
-    .db_cls = cls
-  };
-
-  work = (GNUNET_YES == include_recoup) ? work_wp : work_op;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Getting transactions for coin %s\n",
-              TALER_B2S (coin_pub));
-  for (unsigned int i = 0; NULL != work[i].statement; i++)
-  {
-    qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               work[i].statement,
-                                               params,
-                                               work[i].cb,
-                                               &chc);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Coin %s yielded %d transactions of type %s\n",
-                TALER_B2S (coin_pub),
-                qs,
-                work[i].statement);
-    if ( (0 > qs) ||
-         (chc.failed) )
-    {
-      if (NULL != chc.head)
-        common_free_coin_transaction_list (cls,
-                                           chc.head);
-      *tlp = NULL;
-      if (chc.failed)
-        qs = GNUNET_DB_STATUS_HARD_ERROR;
-      return qs;
-    }
-  }
-  *tlp = chc.head;
-  if (NULL == chc.head)
-    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-}
-
-
-/**
- * Closure for #handle_wt_result.
- */
-struct WireTransferResultContext
-{
-  /**
-   * Function to call on each result.
-   */
-  TALER_EXCHANGEDB_AggregationDataCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on serious errors.
-   */
-  int status;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.  Helper function
- * for #postgres_lookup_wire_transfer().
- *
- * @param cls closure of type `struct WireTransferResultContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-handle_wt_result (void *cls,
-                  PGresult *result,
-                  unsigned int num_results)
-{
-  struct WireTransferResultContext *ctx = cls;
-  struct PostgresClosure *pg = ctx->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    uint64_t rowid;
-    struct TALER_PrivateContractHashP h_contract_terms;
-    struct TALER_CoinSpendPublicKeyP coin_pub;
-    struct TALER_PaytoHashP h_payto;
-    struct TALER_MerchantPublicKeyP merchant_pub;
-    struct GNUNET_TIME_Timestamp exec_time;
-    struct TALER_Amount amount_with_fee;
-    struct TALER_Amount deposit_fee;
-    struct TALER_DenominationPublicKey denom_pub;
-    char *payto_uri;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("aggregation_serial_id", &rowid),
-      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                            &h_contract_terms),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      GNUNET_PQ_result_spec_auto_from_type ("wire_target_h_payto",
-                                            &h_payto),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                            &merchant_pub),
-      GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                       &exec_time),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &amount_with_fee),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                   &deposit_fee),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ctx->status = GNUNET_SYSERR;
-      return;
-    }
-    ctx->cb (ctx->cb_cls,
-             rowid,
-             &merchant_pub,
-             payto_uri,
-             &h_payto,
-             exec_time,
-             &h_contract_terms,
-             &denom_pub,
-             &coin_pub,
-             &amount_with_fee,
-             &deposit_fee);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Lookup the list of Taler transactions that were aggregated
- * into a wire transfer by the respective @a wtid.
- *
- * @param cls closure
- * @param wtid the raw wire transfer identifier we used
- * @param cb function to call on each transaction found
- * @param cb_cls closure for @a cb
- * @return query status of the transaction
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_wire_transfer (
-  void *cls,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  TALER_EXCHANGEDB_AggregationDataCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-  struct WireTransferResultContext ctx;
-  enum GNUNET_DB_QueryStatus qs;
-
-  ctx.cb = cb;
-  ctx.cb_cls = cb_cls;
-  ctx.pg = pg;
-  ctx.status = GNUNET_OK;
-  /* check if the melt record exists and get it */
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "lookup_transactions",
-                                             params,
-                                             &handle_wt_result,
-                                             &ctx);
-  if (GNUNET_OK != ctx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Try to find the wire transfer details for a deposit operation.
- * If we did not execute the deposit yet, return when it is supposed
- * to be executed.
- *
- * @param cls closure
- * @param h_contract_terms hash of the proposal data
- * @param h_wire hash of merchant wire details
- * @param coin_pub public key of deposited coin
- * @param merchant_pub merchant public key
- * @param[out] pending set to true if the transaction is still pending
- * @param[out] wtid wire transfer identifier, only set if @a pending is false
- * @param[out] exec_time when was the transaction done, or
- *         when we expect it to be done (if @a pending is false)
- * @param[out] amount_with_fee set to the total deposited amount
- * @param[out] deposit_fee set to how much the exchange did charge for the deposit
- * @param[out] kyc set to the kyc status of the receiver (if @a pending)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_transfer_by_deposit (
-  void *cls,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  bool *pending,
-  struct TALER_WireTransferIdentifierRawP *wtid,
-  struct GNUNET_TIME_Timestamp *exec_time,
-  struct TALER_Amount *amount_with_fee,
-  struct TALER_Amount *deposit_fee,
-  struct TALER_EXCHANGEDB_KycStatus *kyc)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
-    GNUNET_PQ_query_param_auto_from_type (merchant_pub),
-    GNUNET_PQ_query_param_end
-  };
-  char *payto_uri;
-  struct TALER_WireSaltP wire_salt;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
-                                          wtid),
-    GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
-                                          &wire_salt),
-    GNUNET_PQ_result_spec_string ("payto_uri",
-                                  &payto_uri),
-    GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                     exec_time),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 amount_with_fee),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                 deposit_fee),
-    GNUNET_PQ_result_spec_end
-  };
-
-  /* check if the aggregation record exists and get it */
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "lookup_deposit_wtid",
-                                                 params,
-                                                 rs);
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-  {
-    struct TALER_MerchantWireHashP wh;
-
-    TALER_merchant_wire_signature_hash (payto_uri,
-                                        &wire_salt,
-                                        &wh);
-    GNUNET_PQ_cleanup_result (rs);
-    if (0 ==
-        GNUNET_memcmp (&wh,
-                       h_wire))
-    {
-      *pending = false;
-      memset (kyc,
-              0,
-              sizeof (*kyc));
-      kyc->type = TALER_EXCHANGEDB_KYC_DEPOSIT;
-      kyc->ok = true;
-      return qs;
-    }
-    qs = GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-  }
-  if (0 > qs)
-    return qs;
-  *pending = true;
-  memset (wtid,
-          0,
-          sizeof (*wtid));
-  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "lookup_deposit_wtid returned 0 matching rows\n");
-  {
-    /* Check if transaction exists in deposits, so that we just
-       do not have a WTID yet. In that case, return without wtid
-       (by setting 'pending' true). */
-    struct GNUNET_PQ_ResultSpec rs2[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
-                                            &wire_salt),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      GNUNET_PQ_result_spec_uint64 ("payment_target_uuid",
-                                    &kyc->payment_target_uuid),
-      GNUNET_PQ_result_spec_auto_from_type ("kyc_ok",
-                                            &kyc->ok),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   amount_with_fee),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                   deposit_fee),
-      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                       exec_time),
-      GNUNET_PQ_result_spec_end
-    };
-
-    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_deposit_without_wtid",
-                                                   params,
-                                                   rs2);
-    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-    {
-      struct TALER_MerchantWireHashP wh;
-
-      TALER_merchant_wire_signature_hash (payto_uri,
-                                          &wire_salt,
-                                          &wh);
-      GNUNET_PQ_cleanup_result (rs);
-      if (0 !=
-          GNUNET_memcmp (&wh,
-                         h_wire))
-        return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-    }
-    kyc->type = TALER_EXCHANGEDB_KYC_DEPOSIT;
-    return qs;
-  }
-}
-
-
-/**
- * Function called to insert aggregation information into the DB.
- *
- * @param cls closure
- * @param wtid the raw wire transfer identifier we used
- * @param deposit_serial_id row in the deposits table for which this is aggregation data
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_aggregation_tracking (
-  void *cls,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  unsigned long long deposit_serial_id)
-{
-  struct PostgresClosure *pg = cls;
-  uint64_t rid = deposit_serial_id;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&rid),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_aggregation_tracking",
-                                             params);
-}
-
-
-/**
- * Obtain wire fee from database.
- *
- * @param cls closure
- * @param type type of wire transfer the fee applies for
- * @param date for which date do we want the fee?
- * @param[out] start_date when does the fee go into effect
- * @param[out] end_date when does the fee end being valid
- * @param[out] fees how high are the wire fees
- * @param[out] master_sig signature over the above by the exchange master key
- * @return status of the transaction
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_fee (void *cls,
-                       const char *type,
-                       struct GNUNET_TIME_Timestamp date,
-                       struct GNUNET_TIME_Timestamp *start_date,
-                       struct GNUNET_TIME_Timestamp *end_date,
-                       struct TALER_WireFeeSet *fees,
-                       struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (type),
-    GNUNET_PQ_query_param_timestamp (&date),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("start_date",
-                                     start_date),
-    GNUNET_PQ_result_spec_timestamp ("end_date",
-                                     end_date),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
-                                 &fees->wire),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee",
-                                 &fees->wad),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                 &fees->closing),
-    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                          master_sig),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_wire_fee",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Obtain global fees from database.
- *
- * @param cls closure
- * @param date for which date do we want the fee?
- * @param[out] start_date when does the fee go into effect
- * @param[out] end_date when does the fee end being valid
- * @param[out] fees how high are the wire fees
- * @param[out] purse_timeout set to how long we keep unmerged purses
- * @param[out] kyc_timeout set to how long we keep accounts without KYC
- * @param[out] history_expiration set to how long we keep account histories
- * @param[out] purse_account_limit set to the number of free purses per account
- * @param[out] master_sig signature over the above by the exchange master key
- * @return status of the transaction
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_global_fee (void *cls,
-                         struct GNUNET_TIME_Timestamp date,
-                         struct GNUNET_TIME_Timestamp *start_date,
-                         struct GNUNET_TIME_Timestamp *end_date,
-                         struct TALER_GlobalFeeSet *fees,
-                         struct GNUNET_TIME_Relative *purse_timeout,
-                         struct GNUNET_TIME_Relative *kyc_timeout,
-                         struct GNUNET_TIME_Relative *history_expiration,
-                         uint32_t *purse_account_limit,
-                         struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&date),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("start_date",
-                                     start_date),
-    GNUNET_PQ_result_spec_timestamp ("end_date",
-                                     end_date),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
-                                 &fees->history),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee",
-                                 &fees->kyc),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
-                                 &fees->account),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
-                                 &fees->purse),
-    GNUNET_PQ_result_spec_relative_time ("purse_timeout",
-                                         purse_timeout),
-    GNUNET_PQ_result_spec_relative_time ("kyc_timeout",
-                                         kyc_timeout),
-    GNUNET_PQ_result_spec_relative_time ("history_expiration",
-                                         history_expiration),
-    GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
-                                  purse_account_limit),
-    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                          master_sig),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_global_fee",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Closure for #global_fees_cb().
- */
-struct GlobalFeeContext
-{
-  /**
-   * Function to call for each global fee block.
-   */
-  TALER_EXCHANGEDB_GlobalFeeCallback cb;
-
-  /**
-   * Closure to give to @e rec.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on error.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-global_fees_cb (void *cls,
-                PGresult *result,
-                unsigned int num_results)
-{
-  struct GlobalFeeContext *gctx = cls;
-  struct PostgresClosure *pg = gctx->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_GlobalFeeSet fees;
-    struct GNUNET_TIME_Relative purse_timeout;
-    struct GNUNET_TIME_Relative kyc_timeout;
-    struct GNUNET_TIME_Relative history_expiration;
-    uint32_t purse_account_limit;
-    struct GNUNET_TIME_Timestamp start_date;
-    struct GNUNET_TIME_Timestamp end_date;
-    struct TALER_MasterSignatureP master_sig;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_timestamp ("start_date",
-                                       &start_date),
-      GNUNET_PQ_result_spec_timestamp ("end_date",
-                                       &end_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
-                                   &fees.history),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee",
-                                   &fees.kyc),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
-                                   &fees.account),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
-                                   &fees.purse),
-      GNUNET_PQ_result_spec_relative_time ("purse_timeout",
-                                           &purse_timeout),
-      GNUNET_PQ_result_spec_relative_time ("kyc_timeout",
-                                           &kyc_timeout),
-      GNUNET_PQ_result_spec_relative_time ("history_expiration",
-                                           &history_expiration),
-      GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
-                                    &purse_account_limit),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &master_sig),
-      GNUNET_PQ_result_spec_end
-    };
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      gctx->status = GNUNET_SYSERR;
-      break;
-    }
-    gctx->cb (gctx->cb_cls,
-              &fees,
-              purse_timeout,
-              kyc_timeout,
-              history_expiration,
-              purse_account_limit,
-              start_date,
-              end_date,
-              &master_sig);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Obtain global fees from database.
- *
- * @param cls closure
- * @param cb function to call on each fee entry
- * @param cb_cls closure for @a cb
- * @return status of the transaction
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_global_fees (void *cls,
-                          TALER_EXCHANGEDB_GlobalFeeCallback cb,
-                          void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Timestamp date
-    = GNUNET_TIME_absolute_to_timestamp (
-        GNUNET_TIME_absolute_subtract (
-          GNUNET_TIME_absolute_get (),
-          GNUNET_TIME_UNIT_YEARS));
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&date),
-    GNUNET_PQ_query_param_end
-  };
-  struct GlobalFeeContext gctx = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "get_global_fees",
-                                               params,
-                                               &global_fees_cb,
-                                               &gctx);
-}
-
-
-/**
- * Insert wire transfer fee into database.
- *
- * @param cls closure
- * @param type type of wire transfer this fee applies for
- * @param start_date when does the fee go into effect
- * @param end_date when does the fee end being valid
- * @param fees how high are the wire fees
- * @param master_sig signature over the above by the exchange master key
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_wire_fee (void *cls,
-                          const char *type,
-                          struct GNUNET_TIME_Timestamp start_date,
-                          struct GNUNET_TIME_Timestamp end_date,
-                          const struct TALER_WireFeeSet *fees,
-                          const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (type),
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_timestamp (&end_date),
-    TALER_PQ_query_param_amount (&fees->wire),
-    TALER_PQ_query_param_amount (&fees->closing),
-    TALER_PQ_query_param_amount (&fees->wad),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_end
-  };
-  struct TALER_WireFeeSet wx;
-  struct TALER_MasterSignatureP sig;
-  struct GNUNET_TIME_Timestamp sd;
-  struct GNUNET_TIME_Timestamp ed;
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = postgres_get_wire_fee (pg,
-                              type,
-                              start_date,
-                              &sd,
-                              &ed,
-                              &wx,
-                              &sig);
-  if (qs < 0)
-    return qs;
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-  {
-    if (0 != GNUNET_memcmp (&sig,
-                            master_sig))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if (0 !=
-        TALER_wire_fee_set_cmp (fees,
-                                &wx))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if ( (GNUNET_TIME_timestamp_cmp (sd,
-                                     !=,
-                                     start_date)) ||
-         (GNUNET_TIME_timestamp_cmp (ed,
-                                     !=,
-                                     end_date)) )
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    /* equal record already exists */
-    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-  }
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_wire_fee",
-                                             params);
-}
-
-
-/**
- * Insert global fee data into database.
- *
- * @param cls closure
- * @param start_date when does the fee go into effect
- * @param fees how high is are the global fees
- * @param purse_timeout when do purses time out
- * @param kyc_timeout when do reserves without KYC time out
- * @param history_expiration how long are account histories preserved
- * @param purse_account_limit how many purses are free per account * @param master_sig signature over the above by the exchange master key
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_global_fee (void *cls,
-                            struct GNUNET_TIME_Timestamp start_date,
-                            struct GNUNET_TIME_Timestamp end_date,
-                            const struct TALER_GlobalFeeSet *fees,
-                            struct GNUNET_TIME_Relative purse_timeout,
-                            struct GNUNET_TIME_Relative kyc_timeout,
-                            struct GNUNET_TIME_Relative history_expiration,
-                            uint32_t purse_account_limit,
-                            const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_timestamp (&end_date),
-    TALER_PQ_query_param_amount (&fees->history),
-    TALER_PQ_query_param_amount (&fees->kyc),
-    TALER_PQ_query_param_amount (&fees->account),
-    TALER_PQ_query_param_amount (&fees->purse),
-    GNUNET_PQ_query_param_relative_time (&purse_timeout),
-    GNUNET_PQ_query_param_relative_time (&kyc_timeout),
-    GNUNET_PQ_query_param_relative_time (&history_expiration),
-    GNUNET_PQ_query_param_uint32 (&purse_account_limit),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_end
-  };
-  struct TALER_GlobalFeeSet wx;
-  struct TALER_MasterSignatureP sig;
-  struct GNUNET_TIME_Timestamp sd;
-  struct GNUNET_TIME_Timestamp ed;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_TIME_Relative pt;
-  struct GNUNET_TIME_Relative kt;
-  struct GNUNET_TIME_Relative he;
-  uint32_t pal;
-
-  qs = postgres_get_global_fee (pg,
-                                start_date,
-                                &sd,
-                                &ed,
-                                &wx,
-                                &pt,
-                                &kt,
-                                &he,
-                                &pal,
-                                &sig);
-  if (qs < 0)
-    return qs;
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs)
-  {
-    if (0 != GNUNET_memcmp (&sig,
-                            master_sig))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if (0 !=
-        TALER_global_fee_set_cmp (fees,
-                                  &wx))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if ( (GNUNET_TIME_timestamp_cmp (sd,
-                                     !=,
-                                     start_date)) ||
-         (GNUNET_TIME_timestamp_cmp (ed,
-                                     !=,
-                                     end_date)) )
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if ( (GNUNET_TIME_relative_cmp (purse_timeout,
-                                    !=,
-                                    pt)) ||
-         (GNUNET_TIME_relative_cmp (kyc_timeout,
-                                    !=,
-                                    kt)) ||
-         (GNUNET_TIME_relative_cmp (history_expiration,
-                                    !=,
-                                    he)) )
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if (purse_account_limit != pal)
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    /* equal record already exists */
-    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-  }
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_global_fee",
-                                             params);
-}
-
-
-/**
- * Closure for #reserve_expired_cb().
- */
-struct ExpiredReserveContext
-{
-  /**
-   * Function to call for each expired reserve.
-   */
-  TALER_EXCHANGEDB_ReserveExpiredCallback rec;
-
-  /**
-   * Closure to give to @e rec.
-   */
-  void *rec_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on error.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-reserve_expired_cb (void *cls,
-                    PGresult *result,
-                    unsigned int num_results)
-{
-  struct ExpiredReserveContext *erc = cls;
-  struct PostgresClosure *pg = erc->pg;
-  enum GNUNET_GenericReturnValue ret;
-
-  ret = GNUNET_OK;
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct GNUNET_TIME_Timestamp exp_date;
-    char *account_details;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    struct TALER_Amount remaining_balance;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_timestamp ("expiration_date",
-                                       &exp_date),
-      GNUNET_PQ_result_spec_string ("account_details",
-                                    &account_details),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("current_balance",
-                                   &remaining_balance),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ret = GNUNET_SYSERR;
-      break;
-    }
-    ret = erc->rec (erc->rec_cls,
-                    &reserve_pub,
-                    &remaining_balance,
-                    account_details,
-                    exp_date);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-  erc->status = ret;
-}
-
-
-/**
- * Obtain information about expired reserves and their
- * remaining balances.
- *
- * @param cls closure of the plugin
- * @param now timestamp based on which we decide expiration
- * @param rec function to call on expired reserves
- * @param rec_cls closure for @a rec
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_expired_reserves (void *cls,
-                               struct GNUNET_TIME_Timestamp now,
-                               TALER_EXCHANGEDB_ReserveExpiredCallback rec,
-                               void *rec_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_end
-  };
-  struct ExpiredReserveContext ectx = {
-    .rec = rec,
-    .rec_cls = rec_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_expired_reserves",
-                                             params,
-                                             &reserve_expired_cb,
-                                             &ectx);
-  if (GNUNET_OK != ectx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Insert reserve close operation into database.
- *
- * @param cls closure
- * @param reserve_pub which reserve is this about?
- * @param execution_date when did we perform the transfer?
- * @param receiver_account to which account do we transfer?
- * @param wtid wire transfer details
- * @param amount_with_fee amount we charged to the reserve
- * @param closing_fee how high is the closing fee
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_reserve_closed (
-  void *cls,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  struct GNUNET_TIME_Timestamp execution_date,
-  const char *receiver_account,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  const struct TALER_Amount *amount_with_fee,
-  const struct TALER_Amount *closing_fee)
-{
-  struct PostgresClosure *pg = cls;
-  struct TALER_EXCHANGEDB_Reserve reserve;
-  struct TALER_EXCHANGEDB_KycStatus kyc;
-  enum GNUNET_DB_QueryStatus qs;
-  struct TALER_PaytoHashP h_payto;
-
-  qs = inselect_account_kyc_status (pg,
-                                    receiver_account,
-                                    &h_payto,
-                                    &kyc);
-  if (qs <= 0)
-  {
-    GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
-    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-    return qs;
-  }
-  {
-    struct GNUNET_PQ_QueryParam params[] = {
-      GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-      GNUNET_PQ_query_param_timestamp (&execution_date),
-      GNUNET_PQ_query_param_auto_from_type (wtid),
-      GNUNET_PQ_query_param_auto_from_type (&h_payto),
-      TALER_PQ_query_param_amount (amount_with_fee),
-      TALER_PQ_query_param_amount (closing_fee),
-      GNUNET_PQ_query_param_end
-    };
-
-    qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "reserves_close_insert",
-                                             params);
-  }
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
-    return qs;
-
-  /* update reserve balance */
-  reserve.pub = *reserve_pub;
-  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-      (qs = reserves_get_internal (cls,
-                                   &reserve)))
-  {
-    /* Existence should have been checked before we got here... */
-    GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
-    if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
-      qs = GNUNET_DB_STATUS_HARD_ERROR;
-    return qs;
-  }
-  {
-    enum TALER_AmountArithmeticResult ret;
-
-    ret = TALER_amount_subtract (&reserve.balance,
-                                 &reserve.balance,
-                                 amount_with_fee);
-    if (ret < 0)
-    {
-      /* The reserve history was checked to make sure there is enough of a balance
-         left before we tried this; however, concurrent operations may have changed
-         the situation by now.  We should re-try the transaction.  */
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Closing of reserve `%s' refused due to balance mismatch. Retrying.\n",
-                  TALER_B2S (reserve_pub));
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    GNUNET_break (TALER_AAR_RESULT_ZERO == ret);
-  }
-  return reserves_update (cls,
-                          &reserve);
-}
-
-
-/**
- * Function called to insert wire transfer commit data into the DB.
- *
- * @param cls closure
- * @param type type of the wire transfer (i.e. "iban")
- * @param buf buffer with wire transfer preparation data
- * @param buf_size number of bytes in @a buf
- * @return query status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_wire_prepare_data_insert (void *cls,
-                                   const char *type,
-                                   const char *buf,
-                                   size_t buf_size)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (type),
-    GNUNET_PQ_query_param_fixed_size (buf, buf_size),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_prepare_data_insert",
-                                             params);
-}
-
-
-/**
- * Function called to mark wire transfer commit data as finished.
- *
- * @param cls closure
- * @param rowid which entry to mark as finished
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_wire_prepare_data_mark_finished (
-  void *cls,
-  uint64_t rowid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&rowid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_prepare_data_mark_done",
-                                             params);
-}
-
-
-/**
- * Function called to mark wire transfer commit data as failed.
- *
- * @param cls closure
- * @param rowid which entry to mark as failed
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_wire_prepare_data_mark_failed (
-  void *cls,
-  uint64_t rowid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&rowid),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "wire_prepare_data_mark_failed",
-                                             params);
-}
-
-
-/**
- * Closure for #prewire_cb().
- */
-struct PrewireContext
-{
-  /**
-   * Function to call on each result.
-   */
-  TALER_EXCHANGEDB_WirePreparationIterator cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * #GNUNET_OK if everything went fine.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Invoke the callback for each result.
- *
- * @param cls a `struct MissingWireContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-prewire_cb (void *cls,
-            PGresult *result,
-            unsigned int num_results)
-{
-  struct PrewireContext *pc = cls;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    uint64_t prewire_uuid;
-    char *wire_method;
-    void *buf = NULL;
-    size_t buf_size;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("prewire_uuid",
-                                    &prewire_uuid),
-      GNUNET_PQ_result_spec_string ("wire_method",
-                                    &wire_method),
-      GNUNET_PQ_result_spec_variable_size ("buf",
-                                           &buf,
-                                           &buf_size),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      pc->status = GNUNET_SYSERR;
-      return;
-    }
-    pc->cb (pc->cb_cls,
-            prewire_uuid,
-            wire_method,
-            buf,
-            buf_size);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Function called to get an unfinished wire transfer
- * preparation data. Fetches at most one item.
- *
- * @param cls closure
- * @param start_row offset to query table at
- * @param limit maximum number of results to return
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_wire_prepare_data_get (void *cls,
-                                uint64_t start_row,
-                                uint64_t limit,
-                                TALER_EXCHANGEDB_WirePreparationIterator cb,
-                                void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&start_row),
-    GNUNET_PQ_query_param_uint64 (&limit),
-    GNUNET_PQ_query_param_end
-  };
-  struct PrewireContext pc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "wire_prepare_data_get",
-                                             params,
-                                             &prewire_cb,
-                                             &pc);
-  if (GNUNET_OK != pc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Starts a READ COMMITTED transaction where we transiently violate the foreign
- * constraints on the "wire_out" table as we insert aggregations
- * and only add the wire transfer out at the end.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-postgres_start_deferred_wire_out (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute (
-      "START TRANSACTION ISOLATION LEVEL READ COMMITTED;"),
-    GNUNET_PQ_make_execute ("SET CONSTRAINTS ALL DEFERRED;"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  if (GNUNET_SYSERR ==
-      postgres_preflight (pg))
-    return GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      GNUNET_PQ_exec_statements (pg->conn,
-                                 es))
-  {
-    TALER_LOG_ERROR (
-      "Failed to defer wire_out_ref constraint on transaction\n");
-    GNUNET_break (0);
-    postgres_rollback (pg);
-    return GNUNET_SYSERR;
-  }
-  pg->transaction_name = "deferred wire out";
-  return GNUNET_OK;
-}
-
-
-/**
- * Store information about an outgoing wire transfer that was executed.
- *
- * @param cls closure
- * @param date time of the wire transfer
- * @param wtid subject of the wire transfer
- * @param h_payto identifies the receiver account of the wire transfer
- * @param exchange_account_section configuration section of the exchange specifying the
- *        exchange's bank account being used
- * @param amount amount that was transmitted
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_store_wire_transfer_out (
-  void *cls,
-  struct GNUNET_TIME_Timestamp date,
-  const struct TALER_WireTransferIdentifierRawP *wtid,
-  const struct TALER_PaytoHashP *h_payto,
-  const char *exchange_account_section,
-  const struct TALER_Amount *amount)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&date),
-    GNUNET_PQ_query_param_auto_from_type (wtid),
-    GNUNET_PQ_query_param_auto_from_type (h_payto),
-    GNUNET_PQ_query_param_string (exchange_account_section),
-    TALER_PQ_query_param_amount (amount),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_wire_out",
-                                             params);
-}
-
-
-/**
- * Function called to perform "garbage collection" on the
- * database, expiring records we no longer require.
- *
- * @param cls closure
- * @return #GNUNET_OK on success,
- *         #GNUNET_SYSERR on DB errors
- */
-static enum GNUNET_GenericReturnValue
-postgres_gc (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  struct GNUNET_TIME_Absolute long_ago;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_absolute_time (&long_ago),
-    GNUNET_PQ_query_param_absolute_time (&now),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_Context *conn;
-  enum GNUNET_GenericReturnValue ret;
-
-  /* Keep wire fees for 10 years, that should always
-     be enough _and_ they are tiny so it does not
-     matter to make this tight */
-  long_ago = GNUNET_TIME_absolute_subtract (
-    now,
-    GNUNET_TIME_relative_multiply (
-      GNUNET_TIME_UNIT_YEARS,
-      10));
-  {
-    struct GNUNET_PQ_PreparedStatement ps[] = {
-      /* Used in #postgres_gc() */
-      GNUNET_PQ_make_prepare ("run_gc",
-                              "CALL"
-                              " exchange_do_gc"
-                              " ($1,$2);",
-                              2),
-      GNUNET_PQ_PREPARED_STATEMENT_END
-    };
-
-    conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
-                                       "exchangedb-postgres",
-                                       NULL,
-                                       NULL,
-                                       ps);
-  }
-  if (NULL == conn)
-    return GNUNET_SYSERR;
-  ret = GNUNET_OK;
-  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
-                                              "run_gc",
-                                              params))
-    ret = GNUNET_SYSERR;
-  GNUNET_PQ_disconnect (conn);
-  return ret;
-}
-
-
-/**
- * Closure for #deposit_serial_helper_cb().
- */
-struct DepositSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_DepositCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  int status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct DepositSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-deposit_serial_helper_cb (void *cls,
-                          PGresult *result,
-                          unsigned int num_results)
-{
-  struct DepositSerialContext *dsc = cls;
-  struct PostgresClosure *pg = dsc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_Deposit deposit;
-    struct GNUNET_TIME_Timestamp exchange_timestamp;
-    struct TALER_DenominationPublicKey denom_pub;
-    bool done;
-    uint64_t rowid;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &deposit.amount_with_fee),
-      GNUNET_PQ_result_spec_timestamp ("wallet_timestamp",
-                                       &deposit.timestamp),
-      GNUNET_PQ_result_spec_timestamp ("exchange_timestamp",
-                                       &exchange_timestamp),
-      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                            &deposit.merchant_pub),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &deposit.coin.coin_pub),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                              &deposit.coin.h_age_commitment),
-        &deposit.coin.no_age_commitment),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                            &deposit.csig),
-      GNUNET_PQ_result_spec_timestamp ("refund_deadline",
-                                       &deposit.refund_deadline),
-      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                       &deposit.wire_deadline),
-      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                            &deposit.h_contract_terms),
-      GNUNET_PQ_result_spec_auto_from_type ("wire_salt",
-                                            &deposit.wire_salt),
-      GNUNET_PQ_result_spec_string ("receiver_wire_account",
-                                    &deposit.receiver_wire_account),
-      GNUNET_PQ_result_spec_bool ("done",
-                                  &done),
-      GNUNET_PQ_result_spec_uint64 ("deposit_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_end
-    };
-    int ret;
-
-    memset (&deposit,
-            0,
-            sizeof (deposit));
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      dsc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = dsc->cb (dsc->cb_cls,
-                   rowid,
-                   exchange_timestamp,
-                   &deposit,
-                   &denom_pub,
-                   done);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Select deposits above @a serial_id in monotonically increasing
- * order.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_deposits_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_DepositCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct DepositSerialContext dsc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_deposits_incr",
-                                             params,
-                                             &deposit_serial_helper_cb,
-                                             &dsc);
-  if (GNUNET_OK != dsc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #refreshs_serial_helper_cb().
- */
-struct RefreshsSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_RefreshesCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct RefreshsSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-refreshs_serial_helper_cb (void *cls,
-                           PGresult *result,
-                           unsigned int num_results)
-{
-  struct RefreshsSerialContext *rsc = cls;
-  struct PostgresClosure *pg = rsc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_DenominationPublicKey denom_pub;
-    struct TALER_CoinSpendPublicKeyP coin_pub;
-    struct TALER_CoinSpendSignatureP coin_sig;
-    struct TALER_AgeCommitmentHash h_age_commitment;
-    bool ac_isnull;
-    struct TALER_Amount amount_with_fee;
-    uint32_t noreveal_index;
-    uint64_t rowid;
-    struct TALER_RefreshCommitmentP rc;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                              &h_age_commitment),
-        &ac_isnull),
-      GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
-                                            &coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("old_coin_sig",
-                                            &coin_sig),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &amount_with_fee),
-      GNUNET_PQ_result_spec_uint32 ("noreveal_index",
-                                    &noreveal_index),
-      GNUNET_PQ_result_spec_uint64 ("melt_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_auto_from_type ("rc",
-                                            &rc),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      rsc->status = GNUNET_SYSERR;
-      return;
-    }
-
-    ret = rsc->cb (rsc->cb_cls,
-                   rowid,
-                   &denom_pub,
-                   ac_isnull ? NULL : &h_age_commitment,
-                   &coin_pub,
-                   &coin_sig,
-                   &amount_with_fee,
-                   noreveal_index,
-                   &rc);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Select refresh sessions above @a serial_id in monotonically increasing
- * order.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_refreshes_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_RefreshesCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct RefreshsSerialContext rsc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_refresh_commitments_incr",
-                                             params,
-                                             &refreshs_serial_helper_cb,
-                                             &rsc);
-  if (GNUNET_OK != rsc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #refunds_serial_helper_cb().
- */
-struct RefundsSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_RefundCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct RefundsSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-refunds_serial_helper_cb (void *cls,
-                          PGresult *result,
-                          unsigned int num_results)
-{
-  struct RefundsSerialContext *rsc = cls;
-  struct PostgresClosure *pg = rsc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_EXCHANGEDB_Refund refund;
-    struct TALER_DenominationPublicKey denom_pub;
-    uint64_t rowid;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("merchant_pub",
-                                            &refund.details.merchant_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("merchant_sig",
-                                            &refund.details.merchant_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                            &refund.details.h_contract_terms),
-      GNUNET_PQ_result_spec_uint64 ("rtransaction_id",
-                                    &refund.details.rtransaction_id),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &refund.coin.coin_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &refund.details.refund_amount),
-      GNUNET_PQ_result_spec_uint64 ("refund_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      rsc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = rsc->cb (rsc->cb_cls,
-                   rowid,
-                   &denom_pub,
-                   &refund.coin.coin_pub,
-                   &refund.details.merchant_pub,
-                   &refund.details.merchant_sig,
-                   &refund.details.h_contract_terms,
-                   refund.details.rtransaction_id,
-                   &refund.details.refund_amount);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Select refunds above @a serial_id in monotonically increasing
- * order.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_refunds_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_RefundCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct RefundsSerialContext rsc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_refunds_incr",
-                                             params,
-                                             &refunds_serial_helper_cb,
-                                             &rsc);
-  if (GNUNET_OK != rsc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #reserves_in_serial_helper_cb().
- */
-struct ReservesInSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_ReserveInCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct ReservesInSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-reserves_in_serial_helper_cb (void *cls,
-                              PGresult *result,
-                              unsigned int num_results)
-{
-  struct ReservesInSerialContext *risc = cls;
-  struct PostgresClosure *pg = risc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_ReservePublicKeyP reserve_pub;
-    struct TALER_Amount credit;
-    char *sender_account_details;
-    struct GNUNET_TIME_Timestamp execution_date;
-    uint64_t rowid;
-    uint64_t wire_reference;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      GNUNET_PQ_result_spec_uint64 ("wire_reference",
-                                    &wire_reference),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("credit",
-                                   &credit),
-      GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                       &execution_date),
-      GNUNET_PQ_result_spec_string ("sender_account_details",
-                                    &sender_account_details),
-      GNUNET_PQ_result_spec_uint64 ("reserve_in_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      risc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = risc->cb (risc->cb_cls,
-                    rowid,
-                    &reserve_pub,
-                    &credit,
-                    sender_account_details,
-                    wire_reference,
-                    execution_date);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Select inbound wire transfers into reserves_in above @a serial_id
- * in monotonically increasing order.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_reserves_in_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_ReserveInCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct ReservesInSerialContext risc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_reserves_in_get_transactions_incr",
-                                             params,
-                                             &reserves_in_serial_helper_cb,
-                                             &risc);
-  if (GNUNET_OK != risc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Select inbound wire transfers into reserves_in above @a serial_id
- * in monotonically increasing order by account.
- *
- * @param cls closure
- * @param account_name name of the account to select by
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_reserves_in_above_serial_id_by_account (
-  void *cls,
-  const char *account_name,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_ReserveInCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_string (account_name),
-    GNUNET_PQ_query_param_end
-  };
-  struct ReservesInSerialContext risc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_reserves_in_get_transactions_incr_by_account",
-                                             params,
-                                             &reserves_in_serial_helper_cb,
-                                             &risc);
-  if (GNUNET_OK != risc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #reserves_out_serial_helper_cb().
- */
-struct ReservesOutSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_WithdrawCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct ReservesOutSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-reserves_out_serial_helper_cb (void *cls,
-                               PGresult *result,
-                               unsigned int num_results)
-{
-  struct ReservesOutSerialContext *rosc = cls;
-  struct PostgresClosure *pg = rosc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_BlindedCoinHashP h_blind_ev;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    struct TALER_ReserveSignatureP reserve_sig;
-    struct GNUNET_TIME_Timestamp execution_date;
-    struct TALER_Amount amount_with_fee;
-    uint64_t rowid;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
-                                            &h_blind_ev),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_sig",
-                                            &reserve_sig),
-      GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                       &execution_date),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &amount_with_fee),
-      GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      rosc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = rosc->cb (rosc->cb_cls,
-                    rowid,
-                    &h_blind_ev,
-                    &denom_pub,
-                    &reserve_pub,
-                    &reserve_sig,
-                    execution_date,
-                    &amount_with_fee);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Select withdraw operations from reserves_out above @a serial_id
- * in monotonically increasing order.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call on each result
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_withdrawals_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_WithdrawCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct ReservesOutSerialContext rosc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_reserves_out_incr",
-                                             params,
-                                             &reserves_out_serial_helper_cb,
-                                             &rosc);
-  if (GNUNET_OK != rosc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #wire_out_serial_helper_cb().
- */
-struct WireOutSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_WireTransferOutCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  int status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct WireOutSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-wire_out_serial_helper_cb (void *cls,
-                           PGresult *result,
-                           unsigned int num_results)
-{
-  struct WireOutSerialContext *wosc = cls;
-  struct PostgresClosure *pg = wosc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    uint64_t rowid;
-    struct GNUNET_TIME_Timestamp date;
-    struct TALER_WireTransferIdentifierRawP wtid;
-    char *payto_uri;
-    struct TALER_Amount amount;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("wireout_uuid",
-                                    &rowid),
-      GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                       &date),
-      GNUNET_PQ_result_spec_auto_from_type ("wtid_raw",
-                                            &wtid),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &amount),
-      GNUNET_PQ_result_spec_end
-    };
-    int ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      wosc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = wosc->cb (wosc->cb_cls,
-                    rowid,
-                    date,
-                    &wtid,
-                    payto_uri,
-                    &amount);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Function called to select all wire transfers the exchange
- * executed.
- *
- * @param cls closure
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_wire_out_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_WireTransferOutCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct WireOutSerialContext wosc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_wire_incr",
-                                             params,
-                                             &wire_out_serial_helper_cb,
-                                             &wosc);
-  if (GNUNET_OK != wosc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Function called to select all wire transfers the exchange
- * executed by account.
- *
- * @param cls closure
- * @param account_name account to select
- * @param serial_id highest serial ID to exclude (select strictly larger)
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_wire_out_above_serial_id_by_account (
-  void *cls,
-  const char *account_name,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_WireTransferOutCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_string (account_name),
-    GNUNET_PQ_query_param_end
-  };
-  struct WireOutSerialContext wosc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "audit_get_wire_incr_by_account",
-                                             params,
-                                             &wire_out_serial_helper_cb,
-                                             &wosc);
-  if (GNUNET_OK != wosc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #recoup_serial_helper_cb().
- */
-struct RecoupSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_RecoupCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct RecoupSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-recoup_serial_helper_cb (void *cls,
-                         PGresult *result,
-                         unsigned int num_results)
-{
-  struct RecoupSerialContext *psc = cls;
-  struct PostgresClosure *pg = psc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    uint64_t rowid;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    struct TALER_CoinPublicInfo coin;
-    struct TALER_CoinSpendSignatureP coin_sig;
-    union TALER_DenominationBlindingKeyP coin_blind;
-    struct TALER_Amount amount;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct TALER_BlindedCoinHashP h_blind_ev;
-    struct GNUNET_TIME_Timestamp timestamp;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("recoup_uuid",
-                                    &rowid),
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       &timestamp),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &coin.coin_pub),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                            &coin_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                            &coin_blind),
-      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
-                                            &h_blind_ev),
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            &coin.denom_pub_hash),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                              &coin.h_age_commitment),
-        &coin.no_age_commitment),
-      TALER_PQ_result_spec_denom_sig ("denom_sig",
-                                      &coin.denom_sig),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &amount),
-      GNUNET_PQ_result_spec_end
-    };
-    int ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      psc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = psc->cb (psc->cb_cls,
-                   rowid,
-                   timestamp,
-                   &amount,
-                   &reserve_pub,
-                   &coin,
-                   &denom_pub,
-                   &coin_sig,
-                   &coin_blind);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Function called to select recoup requests the exchange
- * received, ordered by serial ID (monotonically increasing).
- *
- * @param cls closure
- * @param serial_id lowest serial ID to include (select larger or equal)
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_recoup_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_RecoupCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct RecoupSerialContext psc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "recoup_get_incr",
-                                             params,
-                                             &recoup_serial_helper_cb,
-                                             &psc);
-  if (GNUNET_OK != psc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #recoup_refresh_serial_helper_cb().
- */
-struct RecoupRefreshSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_RecoupRefreshCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct RecoupRefreshSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-recoup_refresh_serial_helper_cb (void *cls,
-                                 PGresult *result,
-                                 unsigned int num_results)
-{
-  struct RecoupRefreshSerialContext *psc = cls;
-  struct PostgresClosure *pg = psc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    uint64_t rowid;
-    struct TALER_CoinSpendPublicKeyP old_coin_pub;
-    struct TALER_CoinPublicInfo coin;
-    struct TALER_CoinSpendSignatureP coin_sig;
-    union TALER_DenominationBlindingKeyP coin_blind;
-    struct TALER_DenominationPublicKey denom_pub;
-    struct TALER_DenominationHashP old_denom_pub_hash;
-    struct TALER_Amount amount;
-    struct TALER_BlindedCoinHashP h_blind_ev;
-    struct GNUNET_TIME_Timestamp timestamp;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("recoup_refresh_uuid",
-                                    &rowid),
-      GNUNET_PQ_result_spec_timestamp ("recoup_timestamp",
-                                       &timestamp),
-      GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
-                                            &old_coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("old_denom_pub_hash",
-                                            &old_denom_pub_hash),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &coin.coin_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                            &coin_sig),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_blind",
-                                            &coin_blind),
-      TALER_PQ_result_spec_denom_pub ("denom_pub",
-                                      &denom_pub),
-      GNUNET_PQ_result_spec_auto_from_type ("h_blind_ev",
-                                            &h_blind_ev),
-      GNUNET_PQ_result_spec_auto_from_type ("denom_pub_hash",
-                                            &coin.denom_pub_hash),
-      GNUNET_PQ_result_spec_allow_null (
-        GNUNET_PQ_result_spec_auto_from_type ("age_commitment_hash",
-                                              &coin.h_age_commitment),
-        &coin.no_age_commitment),
-      TALER_PQ_result_spec_denom_sig ("denom_sig",
-                                      &coin.denom_sig),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &amount),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      psc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = psc->cb (psc->cb_cls,
-                   rowid,
-                   timestamp,
-                   &amount,
-                   &old_coin_pub,
-                   &old_denom_pub_hash,
-                   &coin,
-                   &denom_pub,
-                   &coin_sig,
-                   &coin_blind);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Function called to select recoup requests the exchange received for
- * refreshed coins, ordered by serial ID (monotonically increasing).
- *
- * @param cls closure
- * @param serial_id lowest serial ID to include (select larger or equal)
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_recoup_refresh_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_RecoupRefreshCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct RecoupRefreshSerialContext psc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "recoup_refresh_get_incr",
-                                             params,
-                                             &recoup_refresh_serial_helper_cb,
-                                             &psc);
-  if (GNUNET_OK != psc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Closure for #reserve_closed_serial_helper_cb().
- */
-struct ReserveClosedSerialContext
-{
-
-  /**
-   * Callback to call.
-   */
-  TALER_EXCHANGEDB_ReserveClosedCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin's context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Status code, set to #GNUNET_SYSERR on hard errors.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Helper function to be called with the results of a SELECT statement
- * that has returned @a num_results results.
- *
- * @param cls closure of type `struct ReserveClosedSerialContext`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-reserve_closed_serial_helper_cb (void *cls,
-                                 PGresult *result,
-                                 unsigned int num_results)
-{
-  struct ReserveClosedSerialContext *rcsc = cls;
-  struct PostgresClosure *pg = rcsc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    uint64_t rowid;
-    struct TALER_ReservePublicKeyP reserve_pub;
-    char *receiver_account;
-    struct TALER_WireTransferIdentifierRawP wtid;
-    struct TALER_Amount amount_with_fee;
-    struct TALER_Amount closing_fee;
-    struct GNUNET_TIME_Timestamp execution_date;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("close_uuid",
-                                    &rowid),
-      GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                            &reserve_pub),
-      GNUNET_PQ_result_spec_timestamp ("execution_date",
-                                       &execution_date),
-      GNUNET_PQ_result_spec_auto_from_type ("wtid",
-                                            &wtid),
-      GNUNET_PQ_result_spec_string ("receiver_account",
-                                    &receiver_account),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount",
-                                   &amount_with_fee),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                   &closing_fee),
-      GNUNET_PQ_result_spec_end
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      rcsc->status = GNUNET_SYSERR;
-      return;
-    }
-    ret = rcsc->cb (rcsc->cb_cls,
-                    rowid,
-                    execution_date,
-                    &amount_with_fee,
-                    &closing_fee,
-                    &reserve_pub,
-                    receiver_account,
-                    &wtid);
-    GNUNET_PQ_cleanup_result (rs);
-    if (GNUNET_OK != ret)
-      break;
-  }
-}
-
-
-/**
- * Function called to select reserve close operations the aggregator
- * triggered, ordered by serial ID (monotonically increasing).
- *
- * @param cls closure
- * @param serial_id lowest serial ID to include (select larger or equal)
- * @param cb function to call for ONE unfinished item
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_reserve_closed_above_serial_id (
-  void *cls,
-  uint64_t serial_id,
-  TALER_EXCHANGEDB_ReserveClosedCallback cb,
-  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial_id),
-    GNUNET_PQ_query_param_end
-  };
-  struct ReserveClosedSerialContext rcsc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "reserves_close_get_incr",
-                                             params,
-                                             &reserve_closed_serial_helper_cb,
-                                             &rcsc);
-  if (GNUNET_OK != rcsc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Obtain information about which reserve a coin was generated
- * from given the hash of the blinded coin.
- *
- * @param cls closure
- * @param bch hash that uniquely identifies the withdraw request
- * @param[out] reserve_pub set to information about the reserve (on success only)
- * @param[out] reserve_out_serial_id set to row of the @a h_blind_ev in reserves_out
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_reserve_by_h_blind (
-  void *cls,
-  const struct TALER_BlindedCoinHashP *bch,
-  struct TALER_ReservePublicKeyP *reserve_pub,
-  uint64_t *reserve_out_serial_id)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (bch),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                          reserve_pub),
-    GNUNET_PQ_result_spec_uint64 ("reserve_out_serial_id",
-                                  reserve_out_serial_id),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "reserve_by_h_blind",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Obtain information about which old coin a coin was refreshed
- * given the hash of the blinded (fresh) coin.
- *
- * @param cls closure
- * @param h_blind_ev hash of the blinded coin
- * @param[out] old_coin_pub set to information about the old coin (on success only)
- * @param[out] rrc_serial set to serial number of the entry in the database
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_old_coin_by_h_blind (
-  void *cls,
-  const struct TALER_BlindedCoinHashP *h_blind_ev,
-  struct TALER_CoinSpendPublicKeyP *old_coin_pub,
-  uint64_t *rrc_serial)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_blind_ev),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("old_coin_pub",
-                                          old_coin_pub),
-    GNUNET_PQ_result_spec_uint64 ("rrc_serial",
-                                  rrc_serial),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "old_coin_by_h_blind",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Store information that a denomination key was revoked
- * in the database.
- *
- * @param cls closure
- * @param denom_pub_hash hash of the revoked denomination key
- * @param master_sig signature affirming the revocation
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_denomination_revocation (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "denomination_revocation_insert",
-                                             params);
-}
-
-
-/**
- * Obtain information about a denomination key's revocation from
- * the database.
- *
- * @param cls closure
- * @param denom_pub_hash hash of the revoked denomination key
- * @param[out] master_sig signature affirming the revocation
- * @param[out] rowid row where the information is stored
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_denomination_revocation (
-  void *cls,
-  const struct TALER_DenominationHashP *denom_pub_hash,
-  struct TALER_MasterSignatureP *master_sig,
-  uint64_t *rowid)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (denom_pub_hash),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                          master_sig),
-    GNUNET_PQ_result_spec_uint64 ("denom_revocations_serial_id",
-                                  rowid),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "denomination_revocation_get",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Closure for #missing_wire_cb().
- */
-struct MissingWireContext
-{
-  /**
-   * Function to call per result.
-   */
-  TALER_EXCHANGEDB_WireMissingCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Set to #GNUNET_SYSERR on error.
-   */
-  enum GNUNET_GenericReturnValue status;
-};
-
-
-/**
- * Invoke the callback for each result.
- *
- * @param cls a `struct MissingWireContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-missing_wire_cb (void *cls,
-                 PGresult *result,
-                 unsigned int num_results)
-{
-  struct MissingWireContext *mwc = cls;
-  struct PostgresClosure *pg = mwc->pg;
-
-  while (0 < num_results)
-  {
-    uint64_t rowid;
-    struct TALER_CoinSpendPublicKeyP coin_pub;
-    struct TALER_Amount amount;
-    char *payto_uri;
-    struct GNUNET_TIME_Timestamp deadline;
-    bool done;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_uint64 ("deposit_serial_id",
-                                    &rowid),
-      GNUNET_PQ_result_spec_auto_from_type ("coin_pub",
-                                            &coin_pub),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                   &amount),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      GNUNET_PQ_result_spec_timestamp ("wire_deadline",
-                                       &deadline),
-      GNUNET_PQ_result_spec_bool ("done",
-                                  &done),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  --num_results))
-    {
-      GNUNET_break (0);
-      mwc->status = GNUNET_SYSERR;
-      return;
-    }
-    mwc->cb (mwc->cb_cls,
-             rowid,
-             &coin_pub,
-             &amount,
-             payto_uri,
-             deadline,
-             done);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Select all of those deposits in the database for which we do
- * not have a wire transfer (or a refund) and which should have
- * been deposited between @a start_date and @a end_date.
- *
- * @param cls closure
- * @param start_date lower bound on the requested wire execution date
- * @param end_date upper bound on the requested wire execution date
- * @param cb function to call on all such deposits
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_deposits_missing_wire (void *cls,
-                                       struct GNUNET_TIME_Timestamp start_date,
-                                       struct GNUNET_TIME_Timestamp end_date,
-                                       TALER_EXCHANGEDB_WireMissingCallback cb,
-                                       void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_timestamp (&end_date),
-    GNUNET_PQ_query_param_end
-  };
-  struct MissingWireContext mwc = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "deposits_get_overdue",
-                                             params,
-                                             &missing_wire_cb,
-                                             &mwc);
-  if (GNUNET_OK != mwc.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Check the last date an auditor was modified.
- *
- * @param cls closure
- * @param auditor_pub key to look up information for
- * @param[out] last_date last modification date to auditor status
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_auditor_timestamp (
-  void *cls,
-  const struct TALER_AuditorPublicKeyP *auditor_pub,
-  struct GNUNET_TIME_Timestamp *last_date)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("last_change",
-                                     last_date),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_auditor_timestamp",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Lookup current state of an auditor.
- *
- * @param cls closure
- * @param auditor_pub key to look up information for
- * @param[out] auditor_url set to the base URL of the auditor's REST API; memory to be
- *            released by the caller!
- * @param[out] enabled set if the auditor is currently in use
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_auditor_status (
-  void *cls,
-  const struct TALER_AuditorPublicKeyP *auditor_pub,
-  char **auditor_url,
-  bool *enabled)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_string ("auditor_url",
-                                  auditor_url),
-    GNUNET_PQ_result_spec_bool ("is_active",
-                                enabled),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_auditor_status",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about an auditor that will audit this exchange.
- *
- * @param cls closure
- * @param auditor_pub key of the auditor
- * @param auditor_url base URL of the auditor's REST service
- * @param auditor_name name of the auditor (for humans)
- * @param start_date date when the auditor was added by the offline system
- *                      (only to be used for replay detection)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor (void *cls,
-                         const struct TALER_AuditorPublicKeyP *auditor_pub,
-                         const char *auditor_url,
-                         const char *auditor_name,
-                         struct GNUNET_TIME_Timestamp start_date)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_string (auditor_name),
-    GNUNET_PQ_query_param_string (auditor_url),
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_auditor",
-                                             params);
-}
-
-
-/**
- * Update information about an auditor that will audit this exchange.
- *
- * @param cls closure
- * @param auditor_pub key of the auditor (primary key for the existing record)
- * @param auditor_url base URL of the auditor's REST service, to be updated
- * @param auditor_name name of the auditor (for humans)
- * @param change_date date when the auditor status was last changed
- *                      (only to be used for replay detection)
- * @param enabled true to enable, false to disable
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_auditor (void *cls,
-                         const struct TALER_AuditorPublicKeyP *auditor_pub,
-                         const char *auditor_url,
-                         const char *auditor_name,
-                         struct GNUNET_TIME_Timestamp change_date,
-                         bool enabled)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_string (auditor_url),
-    GNUNET_PQ_query_param_string (auditor_name),
-    GNUNET_PQ_query_param_bool (enabled),
-    GNUNET_PQ_query_param_timestamp (&change_date),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "update_auditor",
-                                             params);
-}
-
-
-/**
- * Check the last date an exchange wire account was modified.
- *
- * @param cls closure
- * @param payto_uri key to look up information for
- * @param[out] last_date last modification date to auditor status
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_wire_timestamp (void *cls,
-                                const char *payto_uri,
-                                struct GNUNET_TIME_Timestamp *last_date)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (payto_uri),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("last_change",
-                                     last_date),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_wire_timestamp",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about an wire account used by this exchange.
- *
- * @param cls closure
- * @param payto_uri wire account of the exchange
- * @param start_date date when the account was added by the offline system
- *                      (only to be used for replay detection)
- * @param master_sig public signature affirming the existence of the account,
- *         must be of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_wire (void *cls,
-                      const char *payto_uri,
-                      struct GNUNET_TIME_Timestamp start_date,
-                      const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (payto_uri),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_wire",
-                                             params);
-}
-
-
-/**
- * Update information about a wire account of the exchange.
- *
- * @param cls closure
- * @param payto_uri account the update is about
- * @param change_date date when the account status was last changed
- *                      (only to be used for replay detection)
- * @param enabled true to enable, false to disable (the actual change)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_update_wire (void *cls,
-                      const char *payto_uri,
-                      struct GNUNET_TIME_Timestamp change_date,
-                      bool enabled)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (payto_uri),
-    GNUNET_PQ_query_param_bool (enabled),
-    GNUNET_PQ_query_param_timestamp (&change_date),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "update_wire",
-                                             params);
-}
-
-
-/**
- * Closure for #get_wire_accounts_cb().
- */
-struct GetWireAccountsContext
-{
-  /**
-   * Function to call per result.
-   */
-  TALER_EXCHANGEDB_WireAccountCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Flag set to #GNUNET_OK as long as everything is fine.
-   */
-  enum GNUNET_GenericReturnValue status;
-
-};
-
-
-/**
- * Invoke the callback for each result.
- *
- * @param cls a `struct MissingWireContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-get_wire_accounts_cb (void *cls,
-                      PGresult *result,
-                      unsigned int num_results)
-{
-  struct GetWireAccountsContext *ctx = cls;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    char *payto_uri;
-    struct TALER_MasterSignatureP master_sig;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &master_sig),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ctx->status = GNUNET_SYSERR;
-      return;
-    }
-    ctx->cb (ctx->cb_cls,
-             payto_uri,
-             &master_sig);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Obtain information about the enabled wire accounts of the exchange.
- *
- * @param cls closure
- * @param cb function to call on each account
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_accounts (void *cls,
-                            TALER_EXCHANGEDB_WireAccountCallback cb,
-                            void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GetWireAccountsContext ctx = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .status = GNUNET_OK
-  };
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_wire_accounts",
-                                             params,
-                                             &get_wire_accounts_cb,
-                                             &ctx);
-  if (GNUNET_OK != ctx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-
-}
-
-
-/**
- * Closure for #get_wire_fees_cb().
- */
-struct GetWireFeesContext
-{
-  /**
-   * Function to call per result.
-   */
-  TALER_EXCHANGEDB_WireFeeCallback cb;
-
-  /**
-   * Closure for @e cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * Flag set to #GNUNET_OK as long as everything is fine.
-   */
-  enum GNUNET_GenericReturnValue status;
-
-};
-
-
-/**
- * Invoke the callback for each result.
- *
- * @param cls a `struct MissingWireContext *`
- * @param result SQL result
- * @param num_results number of rows in @a result
- */
-static void
-get_wire_fees_cb (void *cls,
-                  PGresult *result,
-                  unsigned int num_results)
-{
-  struct GetWireFeesContext *ctx = cls;
-  struct PostgresClosure *pg = ctx->pg;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct TALER_MasterSignatureP master_sig;
-    struct TALER_WireFeeSet fees;
-    struct GNUNET_TIME_Timestamp start_date;
-    struct GNUNET_TIME_Timestamp end_date;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
-                                   &fees.wire),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                   &fees.closing),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee",
-                                   &fees.wad),
-      GNUNET_PQ_result_spec_timestamp ("start_date",
-                                       &start_date),
-      GNUNET_PQ_result_spec_timestamp ("end_date",
-                                       &end_date),
-      GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                            &master_sig),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ctx->status = GNUNET_SYSERR;
-      return;
-    }
-    ctx->cb (ctx->cb_cls,
-             &fees,
-             start_date,
-             end_date,
-             &master_sig);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Obtain information about the fee structure of the exchange for
- * a given @a wire_method
- *
- * @param cls closure
- * @param wire_method which wire method to obtain fees for
- * @param cb function to call on each account
- * @param cb_cls closure for @a cb
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_wire_fees (void *cls,
-                        const char *wire_method,
-                        TALER_EXCHANGEDB_WireFeeCallback cb,
-                        void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (wire_method),
-    GNUNET_PQ_query_param_end
-  };
-  struct GetWireFeesContext ctx = {
-    .cb = cb,
-    .cb_cls = cb_cls,
-    .pg = pg,
-    .status = GNUNET_OK
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "get_wire_fees",
-                                             params,
-                                             &get_wire_fees_cb,
-                                             &ctx);
-  if (GNUNET_OK != ctx.status)
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  return qs;
-}
-
-
-/**
- * Store information about a revoked online signing key.
- *
- * @param cls closure
- * @param exchange_pub exchange online signing key that was revoked
- * @param master_sig signature affirming the revocation
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_signkey_revocation (
-  void *cls,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_signkey_revocation",
-                                             params);
-}
-
-
-/**
- * Obtain information about a revoked online signing key.
- *
- * @param cls closure
- * @param exchange_pub exchange online signing key
- * @param[out] master_sig set to signature affirming the revocation (if revoked)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_signkey_revocation (
-  void *cls,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("master_sig",
-                                          master_sig),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_signkey_revocation",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Lookup information about current denomination key.
- *
- * @param cls closure
- * @param h_denom_pub hash of the denomination public key
- * @param[out] meta set to various meta data about the key
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_denomination_key (
-  void *cls,
-  const struct TALER_DenominationHashP *h_denom_pub,
-  struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                     &meta->start),
-    GNUNET_PQ_result_spec_timestamp ("expire_withdraw",
-                                     &meta->expire_withdraw),
-    GNUNET_PQ_result_spec_timestamp ("expire_deposit",
-                                     &meta->expire_deposit),
-    GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                     &meta->expire_legal),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("coin",
-                                 &meta->value),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_withdraw",
-                                 &meta->fees.withdraw),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_deposit",
-                                 &meta->fees.deposit),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refresh",
-                                 &meta->fees.refresh),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("fee_refund",
-                                 &meta->fees.refund),
-    GNUNET_PQ_result_spec_uint32 ("age_mask",
-                                  &meta->age_mask.bits),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_denomination_key",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Activate denomination key, turning it into a "current" or "valid"
- * denomination key by adding the master signature.
- *
- * @param cls closure
- * @param h_denom_pub hash of the denomination public key
- * @param denom_pub the actual denomination key
- * @param meta meta data about the denomination
- * @param master_sig master signature to add
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_add_denomination_key (
-  void *cls,
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_DenominationPublicKey *denom_pub,
-  const struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta,
-  const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam iparams[] = {
-    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
-    TALER_PQ_query_param_denom_pub (denom_pub),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_timestamp (&meta->start),
-    GNUNET_PQ_query_param_timestamp (&meta->expire_withdraw),
-    GNUNET_PQ_query_param_timestamp (&meta->expire_deposit),
-    GNUNET_PQ_query_param_timestamp (&meta->expire_legal),
-    TALER_PQ_query_param_amount (&meta->value),
-    TALER_PQ_query_param_amount (&meta->fees.withdraw),
-    TALER_PQ_query_param_amount (&meta->fees.deposit),
-    TALER_PQ_query_param_amount (&meta->fees.refresh),
-    TALER_PQ_query_param_amount (&meta->fees.refund),
-    GNUNET_PQ_query_param_uint32 (&meta->age_mask.bits),
-    GNUNET_PQ_query_param_end
-  };
-
-  /* Sanity check: ensure fees match coin currency */
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_denom_fee_check_currency (meta->value.currency,
-                                                 &meta->fees));
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "denomination_insert",
-                                             iparams);
-}
-
-
-/**
- * Add signing key.
- *
- * @param cls closure
- * @param exchange_pub the exchange online signing public key
- * @param meta meta data about @a exchange_pub
- * @param master_sig master signature to add
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_activate_signing_key (
-  void *cls,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  const struct TALER_EXCHANGEDB_SignkeyMetaData *meta,
-  const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam iparams[] = {
-    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
-    GNUNET_PQ_query_param_timestamp (&meta->start),
-    GNUNET_PQ_query_param_timestamp (&meta->expire_sign),
-    GNUNET_PQ_query_param_timestamp (&meta->expire_legal),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_signkey",
-                                             iparams);
-}
-
-
-/**
- * Lookup signing key meta data.
- *
- * @param cls closure
- * @param exchange_pub the exchange online signing public key
- * @param[out] meta meta data about @a exchange_pub
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_signing_key (
-  void *cls,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  struct TALER_EXCHANGEDB_SignkeyMetaData *meta)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (exchange_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("valid_from",
-                                     &meta->start),
-    GNUNET_PQ_result_spec_timestamp ("expire_sign",
-                                     &meta->expire_sign),
-    GNUNET_PQ_result_spec_timestamp ("expire_legal",
-                                     &meta->expire_legal),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "lookup_signing_key",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Insert information about an auditor auditing a denomination key.
- *
- * @param cls closure
- * @param h_denom_pub the audited denomination
- * @param auditor_pub the auditor's key
- * @param auditor_sig signature affirming the auditor's audit activity
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_auditor_denom_sig (
-  void *cls,
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_AuditorPublicKeyP *auditor_pub,
-  const struct TALER_AuditorSignatureP *auditor_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
-    GNUNET_PQ_query_param_auto_from_type (auditor_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_auditor_denom_sig",
-                                             params);
-}
-
-
-/**
- * Select information about an auditor auditing a denomination key.
- *
- * @param cls closure
- * @param h_denom_pub the audited denomination
- * @param auditor_pub the auditor's key
- * @param[out] auditor_sig set to signature affirming the auditor's audit activity
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_auditor_denom_sig (
-  void *cls,
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_AuditorPublicKeyP *auditor_pub,
-  struct TALER_AuditorSignatureP *auditor_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (auditor_pub),
-    GNUNET_PQ_query_param_auto_from_type (h_denom_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("auditor_sig",
-                                          auditor_sig),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_auditor_denom_sig",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Closure for #wire_fee_by_time_helper()
- */
-struct WireFeeLookupContext
-{
-
-  /**
-   * Set to the wire fees. Set to invalid if fees conflict over
-   * the given time period.
-   */
-  struct TALER_WireFeeSet *fees;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-};
-
-
-/**
- * Helper function for #postgres_lookup_wire_fee_by_time().
- * Calls the callback with the wire fee structure.
- *
- * @param cls a `struct WireFeeLookupContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-wire_fee_by_time_helper (void *cls,
-                         PGresult *result,
-                         unsigned int num_results)
-{
-  struct WireFeeLookupContext *wlc = cls;
-  struct PostgresClosure *pg = wlc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_WireFeeSet fs;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wire_fee",
-                                   &fs.wire),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
-                                   &fs.closing),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee",
-                                   &fs.wad),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      /* invalidate */
-      memset (wlc->fees,
-              0,
-              sizeof (struct TALER_WireFeeSet));
-      return;
-    }
-    if (0 == i)
-    {
-      *wlc->fees = fs;
-      continue;
-    }
-    if (0 !=
-        TALER_wire_fee_set_cmp (&fs,
-                                wlc->fees))
-    {
-      /* invalidate */
-      memset (wlc->fees,
-              0,
-              sizeof (struct TALER_WireFeeSet));
-      return;
-    }
-  }
-}
-
-
-/**
- * Lookup information about known wire fees.  Finds all applicable
- * fees in the given range. If they are identical, returns the
- * respective @a fees. If any of the fees
- * differ between @a start_time and @a end_time, the transaction
- * succeeds BUT returns an invalid amount for both fees.
- *
- * @param cls closure
- * @param wire_method the wire method to lookup fees for
- * @param start_time starting time of fee
- * @param end_time end time of fee
- * @param[out] fees wire fees for that time period; if
- *             different fees exists within this time
- *             period, an 'invalid' amount is returned.
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_wire_fee_by_time (
-  void *cls,
-  const char *wire_method,
-  struct GNUNET_TIME_Timestamp start_time,
-  struct GNUNET_TIME_Timestamp end_time,
-  struct TALER_WireFeeSet *fees)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (wire_method),
-    GNUNET_PQ_query_param_timestamp (&start_time),
-    GNUNET_PQ_query_param_timestamp (&end_time),
-    GNUNET_PQ_query_param_end
-  };
-  struct WireFeeLookupContext wlc = {
-    .fees = fees,
-    .pg = pg
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "lookup_wire_fee_by_time",
-                                               params,
-                                               &wire_fee_by_time_helper,
-                                               &wlc);
-}
-
-
-/**
- * Closure for #global_fee_by_time_helper()
- */
-struct GlobalFeeLookupContext
-{
-
-  /**
-   * Set to the wire fees. Set to invalid if fees conflict over
-   * the given time period.
-   */
-  struct TALER_GlobalFeeSet *fees;
-
-  /**
-   * Set to timeout of unmerged purses
-   */
-  struct GNUNET_TIME_Relative *purse_timeout;
-
-  /**
-   * Set to timeout of accounts without kyc.
-   */
-  struct GNUNET_TIME_Relative *kyc_timeout;
-
-  /**
-   * Set to history expiration for reserves.
-   */
-  struct GNUNET_TIME_Relative *history_expiration;
-
-  /**
-   * Set to number of free purses per account.
-   */
-  uint32_t *purse_account_limit;
-
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-};
-
-
-/**
- * Helper function for #postgres_lookup_global_fee_by_time().
- * Calls the callback with each denomination key.
- *
- * @param cls a `struct GlobalFeeLookupContext`
- * @param result db results
- * @param num_results number of results in @a result
- */
-static void
-global_fee_by_time_helper (void *cls,
-                           PGresult *result,
-                           unsigned int num_results)
-{
-  struct GlobalFeeLookupContext *wlc = cls;
-  struct PostgresClosure *pg = wlc->pg;
-
-  for (unsigned int i = 0; i<num_results; i++)
-  {
-    struct TALER_GlobalFeeSet fs;
-    struct GNUNET_TIME_Relative purse_timeout;
-    struct GNUNET_TIME_Relative kyc_timeout;
-    struct GNUNET_TIME_Relative history_expiration;
-    uint32_t purse_account_limit;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      TALER_PQ_RESULT_SPEC_AMOUNT ("history_fee",
-                                   &fs.history),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("kyc_fee",
-                                   &fs.kyc),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("account_fee",
-                                   &fs.account),
-      TALER_PQ_RESULT_SPEC_AMOUNT ("purse_fee",
-                                   &fs.purse),
-      GNUNET_PQ_result_spec_relative_time ("purse_timeout",
-                                           &purse_timeout),
-      GNUNET_PQ_result_spec_relative_time ("kyc_timeout",
-                                           &kyc_timeout),
-      GNUNET_PQ_result_spec_relative_time ("history_expiration",
-                                           &history_expiration),
-      GNUNET_PQ_result_spec_uint32 ("purse_account_limit",
-                                    &purse_account_limit),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      /* invalidate */
-      memset (wlc->fees,
-              0,
-              sizeof (struct TALER_GlobalFeeSet));
-      return;
-    }
-    if (0 == i)
-    {
-      *wlc->fees = fs;
-      *wlc->purse_timeout = purse_timeout;
-      *wlc->kyc_timeout = kyc_timeout;
-      *wlc->history_expiration = history_expiration;
-      *wlc->purse_account_limit = purse_account_limit;
-      continue;
-    }
-    if ( (0 !=
-          TALER_global_fee_set_cmp (&fs,
-                                    wlc->fees)) ||
-         (purse_account_limit != *wlc->purse_account_limit) ||
-         (GNUNET_TIME_relative_cmp (purse_timeout,
-                                    !=,
-                                    *wlc->purse_timeout)) ||
-         (GNUNET_TIME_relative_cmp (kyc_timeout,
-                                    !=,
-                                    *wlc->kyc_timeout)) ||
-         (GNUNET_TIME_relative_cmp (history_expiration,
-                                    !=,
-                                    *wlc->history_expiration)) )
-    {
-      /* invalidate */
-      memset (wlc->fees,
-              0,
-              sizeof (struct TALER_GlobalFeeSet));
-      return;
-    }
-  }
-}
-
-
-/**
- * Lookup information about known global fees.
- *
- * @param cls closure
- * @param start_time starting time of fee
- * @param end_time end time of fee
- * @param[out] fees set to wire fees for that time period; if
- *             different global fee exists within this time
- *             period, an 'invalid' amount is returned.
- * @param[out] purse_timeout set to when unmerged purses expire
- * @param[out] kyc_timeout set to when reserves without kyc expire
- * @param[out] history_expiration set to when we expire reserve histories
- * @param[out] purse_account_limit set to number of free purses
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_lookup_global_fee_by_time (
-  void *cls,
-  struct GNUNET_TIME_Timestamp start_time,
-  struct GNUNET_TIME_Timestamp end_time,
-  struct TALER_GlobalFeeSet *fees,
-  struct GNUNET_TIME_Relative *purse_timeout,
-  struct GNUNET_TIME_Relative *kyc_timeout,
-  struct GNUNET_TIME_Relative *history_expiration,
-  uint32_t *purse_account_limit)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_timestamp (&start_time),
-    GNUNET_PQ_query_param_timestamp (&end_time),
-    GNUNET_PQ_query_param_end
-  };
-  struct GlobalFeeLookupContext wlc = {
-    .fees = fees,
-    .purse_timeout = purse_timeout,
-    .kyc_timeout = kyc_timeout,
-    .history_expiration = history_expiration,
-    .purse_account_limit = purse_account_limit,
-    .pg = pg
-  };
-
-  return GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                               "lookup_global_fee_by_time",
-                                               params,
-                                               &global_fee_by_time_helper,
-                                               &wlc);
-}
-
-
-/**
- * Lookup the latest serial number of @a table.  Used in
- * exchange-auditor database replication.
- *
- * @param cls closure
- * @param table table for which we should return the serial
- * @param[out] serial 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,
-                                 enum TALER_EXCHANGEDB_ReplicatedTable table,
-                                 uint64_t *serial)
-{
-  struct PostgresClosure *pg = cls;
-  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_WIRE_TARGETS:
-    statement = "select_serial_by_table_wire_targets";
-    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_GLOBAL_FEE:
-    statement = "select_serial_by_table_global_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;
-  case TALER_EXCHANGEDB_RT_EXTENSIONS:
-    statement = "select_serial_by_table_extensions";
-    break;
-  case TALER_EXCHANGEDB_RT_EXTENSION_DETAILS:
-    statement = "select_serial_by_table_extension_details";
-    break;
-  default:
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   statement,
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Closure for callbacks used by #postgres_lookup_records_by_table.
- */
-struct LookupRecordsByTableContext
-{
-  /**
-   * Plugin context.
-   */
-  struct PostgresClosure *pg;
-
-  /**
-   * 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 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,
-                                  enum TALER_EXCHANGEDB_ReplicatedTable table,
-                                  uint64_t serial,
-                                  TALER_EXCHANGEDB_ReplicationCallback cb,
-                                  void *cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&serial),
-    GNUNET_PQ_query_param_end
-  };
-  struct LookupRecordsByTableContext ctx = {
-    .pg = pg,
-    .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_WIRE_TARGETS:
-    statement = "select_above_serial_by_table_wire_targets";
-    rh = &lrbt_cb_table_wire_targets;
-    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_GLOBAL_FEE:
-    statement = "select_above_serial_by_table_global_fee";
-    rh = &lrbt_cb_table_global_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;
-  case TALER_EXCHANGEDB_RT_EXTENSIONS:
-    statement = "select_above_serial_by_table_extensions";
-    rh = &lrbt_cb_table_extensions;
-    break;
-  case TALER_EXCHANGEDB_RT_EXTENSION_DETAILS:
-    statement = "select_above_serial_by_table_extension_details";
-    rh = &lrbt_cb_table_extension_details;
-    break;
-  default:
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             statement,
-                                             params,
-                                             rh,
-                                             &ctx);
-  if (qs < 0)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to run `%s'\n",
-                statement);
-    return qs;
-  }
-  if (ctx.error)
-  {
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  return qs;
-}
-
-
-/**
- * Signature of helper functions of #postgres_insert_records_by_table.
- *
- * @param pg plugin context
- * @param td record to insert
- * @return transaction status code
- */
-typedef enum GNUNET_DB_QueryStatus
-(*InsertRecordCallback)(struct PostgresClosure *pg,
-                        const struct TALER_EXCHANGEDB_TableData *td);
-
-
-#include "irbt_callbacks.c"
-
-
-/**
- * Insert record set into @a table.  Used in exchange-auditor database
- * replication.
- *
- * @param cls closure
- * @param td table data to insert
- * @return transaction status code, #GNUNET_DB_STATUS_HARD_ERROR if
- *         @e table in @a tr is not supported
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_records_by_table (void *cls,
-                                  const struct TALER_EXCHANGEDB_TableData *td)
-{
-  struct PostgresClosure *pg = cls;
-  InsertRecordCallback rh;
-
-  switch (td->table)
-  {
-  case TALER_EXCHANGEDB_RT_DENOMINATIONS:
-    rh = &irbt_cb_table_denominations;
-    break;
-  case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
-    rh = &irbt_cb_table_denomination_revocations;
-    break;
-  case TALER_EXCHANGEDB_RT_WIRE_TARGETS:
-    rh = &irbt_cb_table_wire_targets;
-    break;
-  case TALER_EXCHANGEDB_RT_RESERVES:
-    rh = &irbt_cb_table_reserves;
-    break;
-  case TALER_EXCHANGEDB_RT_RESERVES_IN:
-    rh = &irbt_cb_table_reserves_in;
-    break;
-  case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
-    rh = &irbt_cb_table_reserves_close;
-    break;
-  case TALER_EXCHANGEDB_RT_RESERVES_OUT:
-    rh = &irbt_cb_table_reserves_out;
-    break;
-  case TALER_EXCHANGEDB_RT_AUDITORS:
-    rh = &irbt_cb_table_auditors;
-    break;
-  case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
-    rh = &irbt_cb_table_auditor_denom_sigs;
-    break;
-  case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
-    rh = &irbt_cb_table_exchange_sign_keys;
-    break;
-  case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
-    rh = &irbt_cb_table_signkey_revocations;
-    break;
-  case TALER_EXCHANGEDB_RT_KNOWN_COINS:
-    rh = &irbt_cb_table_known_coins;
-    break;
-  case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
-    rh = &irbt_cb_table_refresh_commitments;
-    break;
-  case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
-    rh = &irbt_cb_table_refresh_revealed_coins;
-    break;
-  case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
-    rh = &irbt_cb_table_refresh_transfer_keys;
-    break;
-  case TALER_EXCHANGEDB_RT_DEPOSITS:
-    rh = &irbt_cb_table_deposits;
-    break;
-  case TALER_EXCHANGEDB_RT_REFUNDS:
-    rh = &irbt_cb_table_refunds;
-    break;
-  case TALER_EXCHANGEDB_RT_WIRE_OUT:
-    rh = &irbt_cb_table_wire_out;
-    break;
-  case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
-    rh = &irbt_cb_table_aggregation_tracking;
-    break;
-  case TALER_EXCHANGEDB_RT_WIRE_FEE:
-    rh = &irbt_cb_table_wire_fee;
-    break;
-  case TALER_EXCHANGEDB_RT_GLOBAL_FEE:
-    rh = &irbt_cb_table_global_fee;
-    break;
-  case TALER_EXCHANGEDB_RT_RECOUP:
-    rh = &irbt_cb_table_recoup;
-    break;
-  case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
-    rh = &irbt_cb_table_recoup_refresh;
-    break;
-  case TALER_EXCHANGEDB_RT_EXTENSIONS:
-    rh = &irbt_cb_table_extensions;
-    break;
-  case TALER_EXCHANGEDB_RT_EXTENSION_DETAILS:
-    rh = &irbt_cb_table_extension_details;
-    break;
-  default:
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  return rh (pg,
-             td);
-}
-
-
-/**
- * Function called to grab a work shard on an operation @a op. Runs in its
- * own transaction.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param job_name name of the operation to grab a word shard for
- * @param delay minimum age of a shard to grab
- * @param shard_size desired shard size
- * @param[out] start_row inclusive start row of the shard (returned)
- * @param[out] end_row exclusive end row of the shard (returned)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_begin_shard (void *cls,
-                      const char *job_name,
-                      struct GNUNET_TIME_Relative delay,
-                      uint64_t shard_size,
-                      uint64_t *start_row,
-                      uint64_t *end_row)
-{
-  struct PostgresClosure *pg = cls;
-
-  for (unsigned int retries = 0; retries<3; retries++)
-  {
-    if (GNUNET_OK !=
-        postgres_start (pg,
-                        "begin_shard"))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-
-    {
-      struct GNUNET_TIME_Absolute past;
-      enum GNUNET_DB_QueryStatus qs;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_absolute_time (&past),
-        GNUNET_PQ_query_param_end
-      };
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_uint64 ("start_row",
-                                      start_row),
-        GNUNET_PQ_result_spec_uint64 ("end_row",
-                                      end_row),
-        GNUNET_PQ_result_spec_end
-      };
-
-      past = GNUNET_TIME_absolute_subtract (GNUNET_TIME_absolute_get (),
-                                            delay);
-      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                     "get_open_shard",
-                                                     params,
-                                                     rs);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        {
-          enum GNUNET_DB_QueryStatus qs;
-          struct GNUNET_TIME_Timestamp now;
-          struct GNUNET_PQ_QueryParam params[] = {
-            GNUNET_PQ_query_param_string (job_name),
-            GNUNET_PQ_query_param_timestamp (&now),
-            GNUNET_PQ_query_param_uint64 (start_row),
-            GNUNET_PQ_query_param_uint64 (end_row),
-            GNUNET_PQ_query_param_end
-          };
-
-          now = GNUNET_TIME_timestamp_get ();
-          qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                                   "reclaim_shard",
-                                                   params);
-          switch (qs)
-          {
-          case GNUNET_DB_STATUS_HARD_ERROR:
-            GNUNET_break (0);
-            postgres_rollback (pg);
-            return qs;
-          case GNUNET_DB_STATUS_SOFT_ERROR:
-            postgres_rollback (pg);
-            continue;
-          case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-            goto commit;
-          case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-            GNUNET_break (0); /* logic error, should be impossible */
-            postgres_rollback (pg);
-            return GNUNET_DB_STATUS_HARD_ERROR;
-          }
-        }
-        break; /* actually unreachable */
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        break; /* continued below */
-      }
-    } /* get_open_shard */
-
-    /* No open shard, find last 'end_row' */
-    {
-      enum GNUNET_DB_QueryStatus qs;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_end
-      };
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_uint64 ("end_row",
-                                      start_row),
-        GNUNET_PQ_result_spec_end
-      };
-
-      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                     "get_last_shard",
-                                                     params,
-                                                     rs);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        break;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        *start_row = 0; /* base-case: no shards yet */
-        break; /* continued below */
-      }
-      *end_row = *start_row + shard_size;
-    } /* get_last_shard */
-
-    /* Claim fresh shard */
-    {
-      enum GNUNET_DB_QueryStatus qs;
-      struct GNUNET_TIME_Timestamp now;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_timestamp (&now),
-        GNUNET_PQ_query_param_uint64 (start_row),
-        GNUNET_PQ_query_param_uint64 (end_row),
-        GNUNET_PQ_query_param_end
-      };
-
-      now = GNUNET_TIME_timestamp_get ();
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Trying to claim shard %llu-%llu\n",
-                  (unsigned long long) *start_row,
-                  (unsigned long long) *end_row);
-      qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                               "claim_next_shard",
-                                               params);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        /* continued below */
-        break;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        /* someone else got this shard already,
-           try again */
-        postgres_rollback (pg);
-        continue;
-      }
-    } /* claim_next_shard */
-
-    /* commit */
-commit:
-    {
-      enum GNUNET_DB_QueryStatus qs;
-
-      qs = postgres_commit (pg);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-      }
-    }
-  } /* retry 'for' loop */
-  return GNUNET_DB_STATUS_SOFT_ERROR;
-}
-
-
-/**
- * Function called to abort work on a shard.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param job_name name of the operation to abort a word shard for
- * @param start_row inclusive start row of the shard
- * @param end_row exclusive end row of the shard
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_abort_shard (void *cls,
-                      const char *job_name,
-                      uint64_t start_row,
-                      uint64_t end_row)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (job_name),
-    GNUNET_PQ_query_param_uint64 (&start_row),
-    GNUNET_PQ_query_param_uint64 (&end_row),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "abort_shard",
-                                             params);
-}
-
-
-/**
- * Function called to persist that work on a shard was completed.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param job_name name of the operation to grab a word shard for
- * @param start_row inclusive start row of the shard
- * @param end_row exclusive end row of the shard
- * @return transaction status code
- */
-enum GNUNET_DB_QueryStatus
-postgres_complete_shard (void *cls,
-                         const char *job_name,
-                         uint64_t start_row,
-                         uint64_t end_row)
-{
-  struct PostgresClosure *pg = cls;
-
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (job_name),
-    GNUNET_PQ_query_param_uint64 (&start_row),
-    GNUNET_PQ_query_param_uint64 (&end_row),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Completing shard %llu-%llu\n",
-              (unsigned long long) start_row,
-              (unsigned long long) end_row);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "complete_shard",
-                                             params);
-}
-
-
-/**
- * Function called to grab a revolving work shard on an operation @a op. Runs
- * in its own transaction. Returns the oldest inactive shard.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param job_name name of the operation to grab a revolving shard for
- * @param shard_size desired shard size
- * @param shard_limit exclusive end of the shard range
- * @param[out] start_row inclusive start row of the shard (returned)
- * @param[out] end_row inclusive end row of the shard (returned)
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_begin_revolving_shard (void *cls,
-                                const char *job_name,
-                                uint32_t shard_size,
-                                uint32_t shard_limit,
-                                uint32_t *start_row,
-                                uint32_t *end_row)
-{
-  struct PostgresClosure *pg = cls;
-
-  GNUNET_assert (shard_limit <= 1U + (uint32_t) INT_MAX);
-  GNUNET_assert (shard_limit > 0);
-  GNUNET_assert (shard_size > 0);
-  for (unsigned int retries = 0; retries<3; retries++)
-  {
-    if (GNUNET_OK !=
-        postgres_start (pg,
-                        "begin_revolving_shard"))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-
-    /* First, find last 'end_row' */
-    {
-      enum GNUNET_DB_QueryStatus qs;
-      uint32_t last_end;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_end
-      };
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_uint32 ("end_row",
-                                      &last_end),
-        GNUNET_PQ_result_spec_end
-      };
-
-      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                     "get_last_revolving_shard",
-                                                     params,
-                                                     rs);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        *start_row = 1U + last_end;
-        break;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        *start_row = 0; /* base-case: no shards yet */
-        break; /* continued below */
-      }
-    } /* get_last_shard */
-
-    if (*start_row < shard_limit)
-    {
-      /* Claim fresh shard */
-      enum GNUNET_DB_QueryStatus qs;
-      struct GNUNET_TIME_Timestamp now;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_timestamp (&now),
-        GNUNET_PQ_query_param_uint32 (start_row),
-        GNUNET_PQ_query_param_uint32 (end_row),
-        GNUNET_PQ_query_param_end
-      };
-
-      *end_row = GNUNET_MIN (shard_limit,
-                             *start_row + shard_size - 1);
-      now = GNUNET_TIME_timestamp_get ();
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Trying to claim shard %llu-%llu\n",
-                  (unsigned long long) *start_row,
-                  (unsigned long long) *end_row);
-      qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                               "create_revolving_shard",
-                                               params);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        /* continued below (with commit) */
-        break;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        /* someone else got this shard already,
-           try again */
-        postgres_rollback (pg);
-        continue;
-      }
-    } /* end create fresh reovlving shard */
-    else
-    {
-      /* claim oldest existing shard */
-      enum GNUNET_DB_QueryStatus qs;
-      struct GNUNET_PQ_QueryParam params[] = {
-        GNUNET_PQ_query_param_string (job_name),
-        GNUNET_PQ_query_param_end
-      };
-      struct GNUNET_PQ_ResultSpec rs[] = {
-        GNUNET_PQ_result_spec_uint32 ("start_row",
-                                      start_row),
-        GNUNET_PQ_result_spec_uint32 ("end_row",
-                                      end_row),
-        GNUNET_PQ_result_spec_end
-      };
-
-      qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                     "get_open_revolving_shard",
-                                                     params,
-                                                     rs);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-        /* no open shards available */
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        {
-          enum GNUNET_DB_QueryStatus qs;
-          struct GNUNET_TIME_Timestamp now;
-          struct GNUNET_PQ_QueryParam params[] = {
-            GNUNET_PQ_query_param_string (job_name),
-            GNUNET_PQ_query_param_timestamp (&now),
-            GNUNET_PQ_query_param_uint32 (start_row),
-            GNUNET_PQ_query_param_uint32 (end_row),
-            GNUNET_PQ_query_param_end
-          };
-
-          now = GNUNET_TIME_timestamp_get ();
-          qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                                   "reclaim_revolving_shard",
-                                                   params);
-          switch (qs)
-          {
-          case GNUNET_DB_STATUS_HARD_ERROR:
-            GNUNET_break (0);
-            postgres_rollback (pg);
-            return qs;
-          case GNUNET_DB_STATUS_SOFT_ERROR:
-            postgres_rollback (pg);
-            continue;
-          case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-            break; /* continue with commit */
-          case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-            GNUNET_break (0); /* logic error, should be impossible */
-            postgres_rollback (pg);
-            return GNUNET_DB_STATUS_HARD_ERROR;
-          }
-        }
-        break; /* continue with commit */
-      }
-    } /* end claim oldest existing shard */
-
-    /* commit */
-    {
-      enum GNUNET_DB_QueryStatus qs;
-
-      qs = postgres_commit (pg);
-      switch (qs)
-      {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-        GNUNET_break (0);
-        postgres_rollback (pg);
-        return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-        postgres_rollback (pg);
-        continue;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-        return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-      }
-    }
-  } /* retry 'for' loop */
-  return GNUNET_DB_STATUS_SOFT_ERROR;
-}
-
-
-/**
- * Function called to release a revolving shard
- * back into the work pool.  Clears the
- * "completed" flag.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param job_name name of the operation to grab a word shard for
- * @param start_row inclusive start row of the shard
- * @param end_row exclusive end row of the shard
- * @return transaction status code
- */
-enum GNUNET_DB_QueryStatus
-postgres_release_revolving_shard (void *cls,
-                                  const char *job_name,
-                                  uint32_t start_row,
-                                  uint32_t end_row)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (job_name),
-    GNUNET_PQ_query_param_uint32 (&start_row),
-    GNUNET_PQ_query_param_uint32 (&end_row),
-    GNUNET_PQ_query_param_end
-  };
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Releasing revolving shard %s %u-%u\n",
-              job_name,
-              (unsigned int) start_row,
-              (unsigned int) end_row);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "release_revolving_shard",
-                                             params);
-}
-
-
-/**
- * Function called to delete all revolving shards.
- * To be used after a crash or when the shard size is
- * changed.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @return transaction status code
- */
-enum GNUNET_DB_QueryStatus
-postgres_delete_shard_locks (void *cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_ExecuteStatement es[] = {
-    GNUNET_PQ_make_execute ("DELETE FROM work_shards;"),
-    GNUNET_PQ_make_execute ("DELETE FROM revolving_work_shards;"),
-    GNUNET_PQ_EXECUTE_STATEMENT_END
-  };
-
-  return GNUNET_PQ_exec_statements (pg->conn,
-                                    es);
-}
-
-
-/**
- * Function called to save the configuration of an extension
- * (age-restriction, peer2peer, ...).  After succesfull storage of the
- * configuration it triggers the corresponding event.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param extension_name the name of the extension
- * @param config JSON object of the configuration as string
- * @return transaction status code
- */
-enum GNUNET_DB_QueryStatus
-postgres_set_extension_config (void *cls,
-                               const char *extension_name,
-                               const char *config)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam pcfg =
-    (NULL == config || 0 == *config)
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_string (config);
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (extension_name),
-    pcfg,
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "set_extension_config",
-                                             params);
-}
-
-
-/**
- * Function called to get the configuration of an extension
- * (age-restriction, peer2peer, ...)
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param extension_name the name of the extension
- * @param[out] config JSON object of the configuration as string
- * @return transaction status code
- */
-enum GNUNET_DB_QueryStatus
-postgres_get_extension_config (void *cls,
-                               const char *extension_name,
-                               char **config)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (extension_name),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_string ("config",
-                                    config),
-      &is_null),
-    GNUNET_PQ_result_spec_end
-  };
-
-  *config = NULL;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "get_extension_config",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to store configuration data about a partner
- * exchange that we are federated with.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub public offline signing key of the partner exchange
- * @param start_date when does the following data start to be valid
- * @param end_date when does the validity end (exclusive)
- * @param wad_frequency how often do we do exchange-to-exchange settlements?
- * @param wad_fee how much do we charge for transfers to the partner
- * @param partner_base_url base URL of the partner exchange
- * @param master_sig signature with our offline signing key affirming the above
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_partner (void *cls,
-                         const struct TALER_MasterPublicKeyP *master_pub,
-                         struct GNUNET_TIME_Timestamp start_date,
-                         struct GNUNET_TIME_Timestamp end_date,
-                         struct GNUNET_TIME_Relative wad_frequency,
-                         const struct TALER_Amount *wad_fee,
-                         const char *partner_base_url,
-                         const struct TALER_MasterSignatureP *master_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (master_pub),
-    GNUNET_PQ_query_param_timestamp (&start_date),
-    GNUNET_PQ_query_param_timestamp (&end_date),
-    GNUNET_PQ_query_param_relative_time (&wad_frequency),
-    TALER_PQ_query_param_amount (wad_fee),
-    GNUNET_PQ_query_param_auto_from_type (master_sig),
-    GNUNET_PQ_query_param_string (partner_base_url),
-    GNUNET_PQ_query_param_end
-  };
-
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "insert_partner",
-                                             params);
-}
-
-
-/**
- * Function called to retrieve an encrypted contract.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub key to lookup the contract by
- * @param[out] pub_ckey set to the ephemeral DH used to encrypt the contract
- * @param[out] econtract_sig set to the signature over the encrypted contract
- * @param[out] econtract_size set to the number of bytes in @a econtract
- * @param[out] econtract set to the encrypted contract on success, to be freed by the caller
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_contract (void *cls,
-                          const struct TALER_ContractDiffiePublicP *pub_ckey,
-                          struct TALER_PurseContractPublicKeyP *purse_pub,
-                          struct TALER_PurseContractSignatureP *econtract_sig,
-                          size_t *econtract_size,
-                          void **econtract)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (pub_ckey),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
-                                          purse_pub),
-    GNUNET_PQ_result_spec_auto_from_type ("contract_sig",
-                                          econtract_sig),
-    GNUNET_PQ_result_spec_variable_size ("e_contract",
-                                         econtract,
-                                         econtract_size),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_contract",
-                                                   params,
-                                                   rs);
-
-}
-
-
-/**
- * Function called to retrieve an encrypted contract.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub key to lookup the contract by
- * @param[out] pub_ckey set to the ephemeral DH used to encrypt the contract
- * @param[out] econtract_sig set to the signature over the encrypted contract
- * @param[out] econtract_size set to the number of bytes in @a econtract
- * @param[out] econtract set to the encrypted contract on success, to be freed by the caller
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_contract_by_purse (void *cls,
-                                   const struct
-                                   TALER_PurseContractPublicKeyP *purse_pub,
-                                   struct TALER_ContractDiffiePublicP *pub_ckey,
-                                   struct TALER_PurseContractSignatureP *
-                                   econtract_sig,
-                                   size_t *econtract_size,
-                                   void **econtract)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("pub_ckey",
-                                          pub_ckey),
-    GNUNET_PQ_result_spec_auto_from_type ("contract_sig",
-                                          econtract_sig),
-    GNUNET_PQ_result_spec_variable_size ("e_contract",
-                                         econtract,
-                                         econtract_size),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_contract_by_purse",
-                                                   params,
-                                                   rs);
-
-}
-
-
-/**
- * Function called to persist an encrypted contract associated with a reserve.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub the purse the contract is associated with (must exist)
- * @param pub_ckey ephemeral key for DH used to encrypt the contract
- * @param econtract_size number of bytes in @a econtract
- * @param econtract the encrypted contract
- * @param[out] econtract_sig set to the signature over the encrypted contract
- * @param[out] in_conflict set to true if @a econtract
- *             conflicts with an existing contract;
- *             in this case, the return value will be
- *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_contract (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_ContractDiffiePublicP *pub_ckey,
-  size_t econtract_size,
-  const void *econtract,
-  const struct TALER_PurseContractSignatureP *econtract_sig,
-  bool *in_conflict)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_auto_from_type (pub_ckey),
-    GNUNET_PQ_query_param_fixed_size (econtract,
-                                      econtract_size),
-    GNUNET_PQ_query_param_auto_from_type (econtract_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  *in_conflict = false;
-  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                           "insert_contract",
-                                           params);
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs)
-    return qs;
-  {
-    struct TALER_ContractDiffiePublicP pub_ckey2;
-    struct TALER_PurseContractSignatureP esig2;
-    size_t econtract_size2;
-    void *econtract2;
-
-    qs = postgres_select_contract_by_purse (pg,
-                                            purse_pub,
-                                            &pub_ckey2,
-                                            &esig2,
-                                            &econtract_size2,
-                                            &econtract2);
-    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if ( (0 == GNUNET_memcmp (&pub_ckey2,
-                              pub_ckey)) &&
-         (econtract_size2 == econtract_size) &&
-         (0 == memcmp (econtract2,
-                       econtract,
-                       econtract_size)) )
-    {
-      return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-    }
-    *in_conflict = true;
-    return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-  }
-}
-
-
-/**
- * Function called to reutrn meta data about a purse by the
- * purse public key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub public key of the purse
- * @param[out] merge_pub public key representing the merge capability
- * @param[out] purse_expiration when would an unmerged purse expire
- * @param[out] h_contract_terms contract associated with the purse
- * @param[out] age_limit the age limit for deposits into the purse
- * @param[out] target_amount amount to be put into the purse
- * @param[out] balance amount put so far into the purse
- * @param[out] purse_sig signature of the purse over the initialization data
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_purse_request (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  struct TALER_PurseMergePublicKeyP *merge_pub,
-  struct GNUNET_TIME_Timestamp *purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
-  uint32_t *age_limit,
-  struct TALER_Amount *target_amount,
-  struct TALER_Amount *balance,
-  struct TALER_PurseContractSignatureP *purse_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("merge_pub",
-                                          merge_pub),
-    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
-                                     purse_expiration),
-    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                          h_contract_terms),
-    GNUNET_PQ_result_spec_uint32 ("age_limit",
-                                  age_limit),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 target_amount),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
-                                 balance),
-    GNUNET_PQ_result_spec_auto_from_type ("purse_sig",
-                                          purse_sig),
-    GNUNET_PQ_result_spec_end
-  };
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_purse_request",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to create a new purse with certain meta data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub public key of the new purse
- * @param merge_pub public key providing the merge capability
- * @param purse_expiration time when the purse will expire
- * @param h_contract_terms hash of the contract for the purse
- * @param age_limit age limit to enforce for payments into the purse
- * @param flags flags for the operation
- * @param purse_fee fee we are allowed to charge to the reserve (depending on @a flags)
- * @param amount target amount (with fees) to be put into the purse
- * @param purse_sig signature with @a purse_pub's private key affirming the above
- * @param[out] in_conflict set to true if the meta data
- *             conflicts with an existing purse;
- *             in this case, the return value will be
- *             #GNUNET_DB_STATUS_SUCCESS_ONE despite the failure
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_purse_request (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
-  struct GNUNET_TIME_Timestamp purse_expiration,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  uint32_t age_limit,
-  enum TALER_WalletAccountMergeFlags flags,
-  const struct TALER_Amount *purse_fee,
-  const struct TALER_Amount *amount,
-  const struct TALER_PurseContractSignatureP *purse_sig,
-  bool *in_conflict)
-{
-  struct PostgresClosure *pg = cls;
-  enum GNUNET_DB_QueryStatus qs;
-  struct GNUNET_TIME_Timestamp now = GNUNET_TIME_timestamp_get ();
-  uint32_t flags32 = (uint32_t) flags;
-  bool in_reserve_quota = (TALER_WAMF_MODE_CREATE_WITH_PURSE_FEE
-                           == (flags & TALER_WAMF_MERGE_MODE_MASK));
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_auto_from_type (merge_pub),
-    GNUNET_PQ_query_param_timestamp (&now),
-    GNUNET_PQ_query_param_timestamp (&purse_expiration),
-    GNUNET_PQ_query_param_auto_from_type (h_contract_terms),
-    GNUNET_PQ_query_param_uint32 (&age_limit),
-    GNUNET_PQ_query_param_uint32 (&flags32),
-    GNUNET_PQ_query_param_bool (in_reserve_quota),
-    TALER_PQ_query_param_amount (amount),
-    TALER_PQ_query_param_amount (purse_fee),
-    GNUNET_PQ_query_param_auto_from_type (purse_sig),
-    GNUNET_PQ_query_param_end
-  };
-
-  *in_conflict = false;
-  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                           "insert_purse_request",
-                                           params);
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS != qs)
-    return qs;
-  {
-    struct TALER_PurseMergePublicKeyP merge_pub2;
-    struct GNUNET_TIME_Timestamp purse_expiration2;
-    struct TALER_PrivateContractHashP h_contract_terms2;
-    uint32_t age_limit2;
-    struct TALER_Amount amount2;
-    struct TALER_Amount balance;
-    struct TALER_PurseContractSignatureP purse_sig2;
-
-    qs = postgres_select_purse_request (pg,
-                                        purse_pub,
-                                        &merge_pub2,
-                                        &purse_expiration2,
-                                        &h_contract_terms2,
-                                        &age_limit2,
-                                        &amount2,
-                                        &balance,
-                                        &purse_sig2);
-    if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-    if ( (age_limit2 == age_limit) &&
-         (0 == TALER_amount_cmp (amount,
-                                 &amount2)) &&
-         (0 == GNUNET_memcmp (&h_contract_terms2,
-                              h_contract_terms)) &&
-         (0 == GNUNET_memcmp (&merge_pub2,
-                              merge_pub)) )
-    {
-      return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-    }
-    *in_conflict = true;
-    return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-  }
-}
-
-
-/**
- * Function called to clean up one expired purse.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param start_time select purse expired after this time
- * @param end_time select purse expired before this time
- * @return transaction status code (#GNUNET_DB_STATUS_SUCCESS_NO_RESULTS if no purse expired in the given time interval).
- */
-static enum GNUNET_DB_QueryStatus
-postgres_expire_purse (
-  void *cls,
-  struct GNUNET_TIME_Absolute start_time,
-  struct GNUNET_TIME_Absolute end_time)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_absolute_time (&start_time),
-    GNUNET_PQ_query_param_absolute_time (&end_time),
-    GNUNET_PQ_query_param_end
-  };
-  bool found = false;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("found",
-                                &found),
-    GNUNET_PQ_result_spec_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                 "call_expire_purse",
-                                                 params,
-                                                 rs);
-  if (qs < 0)
-    return qs;
-  GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == qs);
-  return found
-    ? GNUNET_DB_STATUS_SUCCESS_ONE_RESULT
-    : GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
-}
-
-
-/**
- * Function called to obtain information about a purse.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub public key of the new purse
- * @param[out] purse_expiration set to time when the purse will expire
- * @param[out] amount set to target amount (with fees) to be put into the purse
- * @param[out] deposited set to actual amount put into the purse so far
- * @param[out] h_contract_terms set to hash of the contract for the purse
- * @param[out] merge_timestamp set to time when the purse was merged, or NEVER if not
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_purse (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  struct GNUNET_TIME_Timestamp *purse_expiration,
-  struct TALER_Amount *amount,
-  struct TALER_Amount *deposited,
-  struct TALER_PrivateContractHashP *h_contract_terms,
-  struct GNUNET_TIME_Timestamp *merge_timestamp)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
-                                     purse_expiration),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 amount),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
-                                 deposited),
-    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                          h_contract_terms),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
-                                       merge_timestamp),
-      NULL),
-    GNUNET_PQ_result_spec_end
-  };
-
-  *merge_timestamp = GNUNET_TIME_UNIT_FOREVER_TS;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_purse",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to return meta data about a purse by the
- * merge capability key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param merge_pub public key representing the merge capability
- * @param[out] purse_pub public key of the purse
- * @param[out] purse_expiration when would an unmerged purse expire
- * @param[out] h_contract_terms contract associated with the purse
- * @param[out] age_limit the age limit for deposits into the purse
- * @param[out] target_amount amount to be put into the purse
- * @param[out] balance amount put so far into the purse
- * @param[out] purse_sig signature of the purse over the initialization data
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_purse_by_merge_pub (
-  void *cls,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
-  struct TALER_PurseContractPublicKeyP *purse_pub,
-  struct GNUNET_TIME_Timestamp *purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
-  uint32_t *age_limit,
-  struct TALER_Amount *target_amount,
-  struct TALER_Amount *balance,
-  struct TALER_PurseContractSignatureP *purse_sig)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (merge_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("purse_pub",
-                                          purse_pub),
-    GNUNET_PQ_result_spec_timestamp ("purse_expiration",
-                                     purse_expiration),
-    GNUNET_PQ_result_spec_auto_from_type ("h_contract_terms",
-                                          h_contract_terms),
-    GNUNET_PQ_result_spec_uint32 ("age_limit",
-                                  age_limit),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 target_amount),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("balance",
-                                 balance),
-    GNUNET_PQ_result_spec_auto_from_type ("purse_sig",
-                                          purse_sig),
-    GNUNET_PQ_result_spec_end
-  };
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_purse_by_merge_pub",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to execute a transaction crediting
- * a purse with @a amount from @a coin_pub. Reduces the
- * value of @a coin_pub and increase the balance of
- * the @a purse_pub purse. If the balance reaches the
- * target amount and the purse has been merged, triggers
- * the updates of the reserve/account balance.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub purse to credit
- * @param coin_pub coin to deposit (debit)
- * @param amount fraction of the coin's value to deposit
- * @param coin_sig signature affirming the operation
- * @param amount_minus_fee amount to add to the purse
- * @param[out] balance_ok set to false if the coin's
- *        remaining balance is below @a amount;
- *             in this case, the return value will be
- *             #GNUNET_DB_STATUS_SUCCESS_ONE despite the failure
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_purse_deposit (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_Amount *amount,
-  const struct TALER_CoinSpendSignatureP *coin_sig,
-  const struct TALER_Amount *amount_minus_fee,
-  bool *balance_ok,
-  bool *conflict)
-{
-  struct PostgresClosure *pg = cls;
-  uint64_t partner_id = 0; /* FIXME: WAD support... */
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint64 (&partner_id),
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    TALER_PQ_query_param_amount (amount),
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_auto_from_type (coin_sig),
-    TALER_PQ_query_param_amount (amount_minus_fee),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("balance_ok",
-                                balance_ok),
-    GNUNET_PQ_result_spec_bool ("conflict",
-                                conflict),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_purse_deposit",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to obtain a coin deposit data from
- * depositing the coin into a purse.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub purse to credit
- * @param coin_pub coin to deposit (debit)
- * @param[out] amount set fraction of the coin's value that was deposited (with fee)
- * @param[out] coin_sig set to signature affirming the operation
- * @param[out] partner_url set to the URL of the partner exchange, or NULL for ourselves, must be freed by caller
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_get_purse_deposit (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  struct TALER_Amount *amount,
-  struct TALER_CoinSpendSignatureP *coin_sig,
-  char **partner_url)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_auto_from_type (coin_pub),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("coin_sig",
-                                          coin_sig),
-    TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee",
-                                 amount),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_string ("partner_base_url",
-                                    partner_url),
-      &is_null),
-    GNUNET_PQ_result_spec_end
-  };
-
-  *partner_url = NULL;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_purse_deposit_by_coin_pub",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to approve merging a purse into a
- * reserve by the respective purse merge key.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub purse to merge
- * @param merge_sig signature affirming the merge
- * @param merge_timestamp time of the merge
- * @param reserve_sig signature of the reserve affirming the merge
- * @param partner_url URL of the partner exchange, can be NULL if the reserves lives with us
- * @param reserve_pub public key of the reserve to credit
- * @param[out] no_partner set to true if @a partner_url is unknown
- * @param[out] no_balance set to true if the @a purse_pub is not paid up yet
- * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
-  * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_purse_merge (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergeSignatureP *merge_sig,
-  const struct GNUNET_TIME_Timestamp merge_timestamp,
-  const struct TALER_ReserveSignatureP *reserve_sig,
-  const char *partner_url,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  bool *no_partner,
-  bool *no_balance,
-  bool *in_conflict)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_auto_from_type (merge_sig),
-    GNUNET_PQ_query_param_timestamp (&merge_timestamp),
-    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
-    (NULL == partner_url)
-    ? GNUNET_PQ_query_param_null ()
-    : GNUNET_PQ_query_param_string (partner_url),
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("no_partner",
-                                no_partner),
-    GNUNET_PQ_result_spec_bool ("no_balance",
-                                no_balance),
-    GNUNET_PQ_result_spec_bool ("conflict",
-                                in_conflict),
-    GNUNET_PQ_result_spec_end
-  };
-
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_purse_merge",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called insert request to merge a purse into a reserve by the
- * respective purse merge key. The purse must not have been merged into a
- * different reserve.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub purse to merge
- * @param merge_sig signature affirming the merge
- * @param merge_timestamp time of the merge
- * @param reserve_sig signature of the reserve affirming the merge
- * @param purse_fee amount to charge the reserve for the purse creation, NULL to use the quota
- * @param reserve_pub public key of the reserve to credit
- * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
- * @param[out] insufficient_funds set to true if @a reserve_pub has insufficient capacity to create another purse
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_reserve_purse (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergeSignatureP *merge_sig,
-  const struct GNUNET_TIME_Timestamp merge_timestamp,
-  const struct TALER_ReserveSignatureP *reserve_sig,
-  const struct TALER_Amount *purse_fee,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  bool *in_conflict,
-  bool *insufficient_funds)
-{
-  struct PostgresClosure *pg = cls;
-  struct TALER_Amount zero_fee;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_auto_from_type (merge_sig),
-    GNUNET_PQ_query_param_timestamp (&merge_timestamp),
-    GNUNET_PQ_query_param_auto_from_type (reserve_sig),
-    GNUNET_PQ_query_param_bool (NULL == purse_fee),
-    TALER_PQ_query_param_amount (NULL == purse_fee
-                                 ? &zero_fee
-                                 : purse_fee),
-    GNUNET_PQ_query_param_auto_from_type (reserve_pub),
-    GNUNET_PQ_query_param_end
-  };
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_bool ("insufficient_funds",
-                                insufficient_funds),
-    GNUNET_PQ_result_spec_bool ("conflict",
-                                in_conflict),
-    GNUNET_PQ_result_spec_end
-  };
-
-  TALER_amount_set_zero (pg->currency,
-                         &zero_fee);
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "call_reserve_purse",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to approve merging of a purse with
- * an account, made by the receiving account.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub public key of the purse
- * @param[out] merge_sig set to the signature confirming the merge
- * @param[out] merge_timestamp set to the time of the merge
- * @param[out] partner_url set to the URL of the target exchange, or NULL if the target exchange is us. To be freed by the caller.
- * @param[out] reserve_pub set to the public key of the reserve/account being credited
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_select_purse_merge (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  struct TALER_PurseMergeSignatureP *merge_sig,
-  struct GNUNET_TIME_Timestamp *merge_timestamp,
-  char **partner_url,
-  struct TALER_ReservePublicKeyP *reserve_pub)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_auto_from_type (purse_pub),
-    GNUNET_PQ_query_param_end
-  };
-  bool is_null;
-  struct GNUNET_PQ_ResultSpec rs[] = {
-    GNUNET_PQ_result_spec_auto_from_type ("merge_sig",
-                                          merge_sig),
-    GNUNET_PQ_result_spec_auto_from_type ("reserve_pub",
-                                          reserve_pub),
-    GNUNET_PQ_result_spec_timestamp ("merge_timestamp",
-                                     merge_timestamp),
-    GNUNET_PQ_result_spec_allow_null (
-      GNUNET_PQ_result_spec_string ("partner_base_url",
-                                    partner_url),
-      &is_null),
-    GNUNET_PQ_result_spec_end
-  };
-
-  *partner_url = NULL;
-  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "select_purse_merge",
-                                                   params,
-                                                   rs);
-}
-
-
-/**
- * Function called to approve merging of a purse with
- * an account, made by the receiving account.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param purse_pub public key of the purse being merged
- * @param reserve_pub public key of the account being credited
- * @param reserve_sig signature of the account holder affirming the merge
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_do_account_merge (
-  void *cls,
-  const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_ReserveSignatureP *reserve_sig)
-{
-  GNUNET_break (0); // FIXME: Function dead, eliminate? (DCE)
-  return GNUNET_DB_STATUS_HARD_ERROR;
-}
-
-
-/**
- * Function called to persist a signature that
- * prove that the client requested an
- * account history.  Debits the @a history_fee from
- * the reserve (if possible).
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub account that the history was requested for
- * @param reserve_sig signature affirming the request
- * @param request_timestamp when was the request made
- * @param history_fee how much should the @a reserve_pub be charged for the request
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_history_request (
-  void *cls,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_ReserveSignatureP *reserve_sig,
-  struct GNUNET_TIME_Absolute request_timestamp,
-  const struct TALER_Amount *history)
-{
-  GNUNET_break (0); // FIXME
-  return GNUNET_DB_STATUS_HARD_ERROR;
-}
-
-
-/**
- * Function called to initiate closure of an account.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param reserve_pub public key of the account to close
- * @param reserve_sig signature affiming that the account is to be closed
- * @param[out] final_balance set to the final balance in the account that will be wired back to the origin account
- * @return transaction status code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_insert_close_request (
-  void *cls,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_ReserveSignatureP *reserve_sig,
-  struct TALER_Amount *final_balance)
-{
-  GNUNET_break (0); // FIXME
-  return GNUNET_DB_STATUS_HARD_ERROR;
-}
-
-
-/**
  * Initialize Postgres database subsystem.
  *
  * @param cls a configuration instance
@@ -14063,6 +321,7 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct PostgresClosure *pg;
   struct TALER_EXCHANGEDB_Plugin *plugin;
+  unsigned long long dpl;
 
   pg = GNUNET_new (struct PostgresClosure);
   pg->cfg = cfg;
@@ -14074,7 +333,7 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "exchangedb-postgres",
-                               "CONFIG");
+                               "SQL_DIR");
     GNUNET_free (pg);
     return NULL;
   }
@@ -14091,21 +350,29 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
     GNUNET_free (pg);
     return NULL;
   }
-  if ( (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_time (cfg,
-                                             "exchangedb",
-                                             "IDLE_RESERVE_EXPIRATION_TIME",
-                                             &pg->idle_reserve_expiration_time))
-       ||
-       (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_time (cfg,
-                                             "exchangedb",
-                                             "LEGAL_RESERVE_EXPIRATION_TIME",
-                                             &pg->legal_reserve_expiration_time)) )
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                           "exchangedb",
+                                           "IDLE_RESERVE_EXPIRATION_TIME",
+                                           &pg->idle_reserve_expiration_time))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchangedb",
+                               "IDLE_RESERVE_EXPIRATION_TIME");
+    GNUNET_free (pg->exchange_url);
+    GNUNET_free (pg->sql_dir);
+    GNUNET_free (pg);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                           "exchangedb",
+                                           "LEGAL_RESERVE_EXPIRATION_TIME",
+                                           &pg->legal_reserve_expiration_time))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                "exchangedb",
-                               "LEGAL/IDLE_RESERVE_EXPIRATION_TIME");
+                               "LEGAL_RESERVE_EXPIRATION_TIME");
     GNUNET_free (pg->exchange_url);
     GNUNET_free (pg->sql_dir);
     GNUNET_free (pg);
@@ -14121,6 +388,21 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
                                "exchangedb",
                                "AGGREGATOR_SHIFT");
   }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg,
+                                             "exchangedb",
+                                             "DEFAULT_PURSE_LIMIT",
+                                             &dpl))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
+                               "exchangedb",
+                               "DEFAULT_PURSE_LIMIT");
+    pg->def_purse_limit = 1;
+  }
+  else
+  {
+    pg->def_purse_limit = (uint32_t) dpl;
+  }
 
   if (GNUNET_OK !=
       TALER_config_get_currency (cfg,
@@ -14132,8 +414,7 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
     return NULL;
   }
   if (GNUNET_OK !=
-      internal_setup (pg,
-                      true))
+      TEH_PG_internal_setup (pg))
   {
     GNUNET_free (pg->exchange_url);
     GNUNET_free (pg->currency);
@@ -14141,219 +422,378 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
     GNUNET_free (pg);
     return NULL;
   }
-
   plugin = GNUNET_new (struct TALER_EXCHANGEDB_Plugin);
   plugin->cls = pg;
-  plugin->drop_tables = &postgres_drop_tables;
-  plugin->drop_shard_tables = &postgres_drop_shard_tables;
-  plugin->create_tables = &postgres_create_tables;
-  plugin->create_shard_tables = &postgres_create_shard_tables;
-  plugin->setup_partitions = &postgres_setup_partitions;
-  plugin->setup_foreign_servers = &postgres_setup_foreign_servers;
-  plugin->start = &postgres_start;
-  plugin->start_read_committed = &postgres_start_read_committed;
-  plugin->commit = &postgres_commit;
-  plugin->preflight = &postgres_preflight;
-  plugin->rollback = &postgres_rollback;
-  plugin->event_listen = &postgres_event_listen;
-  plugin->event_listen_cancel = &postgres_event_listen_cancel;
-  plugin->event_notify = &postgres_event_notify;
-  plugin->insert_denomination_info = &postgres_insert_denomination_info;
-  plugin->get_denomination_info = &postgres_get_denomination_info;
-  plugin->iterate_denomination_info = &postgres_iterate_denomination_info;
-  plugin->iterate_denominations = &postgres_iterate_denominations;
-  plugin->iterate_active_signkeys = &postgres_iterate_active_signkeys;
-  plugin->iterate_active_auditors = &postgres_iterate_active_auditors;
-  plugin->iterate_auditor_denominations =
-    &postgres_iterate_auditor_denominations;
-  plugin->select_kyc_status = &postgres_select_kyc_status;
-  plugin->reserves_get = &postgres_reserves_get;
-  plugin->set_kyc_ok = &postgres_set_kyc_ok;
-  plugin->inselect_wallet_kyc_status = &postgres_inselect_wallet_kyc_status;
-  plugin->reserves_in_insert = &postgres_reserves_in_insert;
-  plugin->get_withdraw_info = &postgres_get_withdraw_info;
-  plugin->do_withdraw = &postgres_do_withdraw;
-  plugin->do_batch_withdraw = &postgres_do_batch_withdraw;
-  plugin->do_batch_withdraw_insert = &postgres_do_batch_withdraw_insert;
-  plugin->do_withdraw_limit_check = &postgres_do_withdraw_limit_check;
-  plugin->do_deposit = &postgres_do_deposit;
-  plugin->do_melt = &postgres_do_melt;
-  plugin->do_refund = &postgres_do_refund;
-  plugin->do_recoup = &postgres_do_recoup;
-  plugin->do_recoup_refresh = &postgres_do_recoup_refresh;
-  plugin->get_reserve_balance = &postgres_get_reserve_balance;
-  plugin->get_reserve_history = &postgres_get_reserve_history;
-  plugin->get_reserve_status = &postgres_get_reserve_status;
-  plugin->free_reserve_history = &common_free_reserve_history;
-  plugin->count_known_coins = &postgres_count_known_coins;
-  plugin->ensure_coin_known = &postgres_ensure_coin_known;
-  plugin->get_known_coin = &postgres_get_known_coin;
-  plugin->get_coin_denomination = &postgres_get_coin_denomination;
-  plugin->have_deposit2 = &postgres_have_deposit2;
-  plugin->aggregate = &postgres_aggregate;
+  plugin->do_reserve_open
+    = &TEH_PG_do_reserve_open;
+  plugin->drop_tables
+    = &TEH_PG_drop_tables;
+  plugin->free_coin_transaction_list
+    = &TEH_COMMON_free_coin_transaction_list;
+  plugin->free_reserve_history
+    = &TEH_COMMON_free_reserve_history;
+  plugin->get_coin_transactions
+    = &TEH_PG_get_coin_transactions;
+  plugin->get_expired_reserves
+    = &TEH_PG_get_expired_reserves;
+  plugin->get_purse_request
+    = &TEH_PG_get_purse_request;
+  plugin->get_reserve_history
+    = &TEH_PG_get_reserve_history;
+  plugin->get_unfinished_close_requests
+    = &TEH_PG_get_unfinished_close_requests;
+  plugin->insert_records_by_table
+    = &TEH_PG_insert_records_by_table;
+  plugin->insert_reserve_open_deposit
+    = &TEH_PG_insert_reserve_open_deposit;
+  plugin->insert_close_request
+    = &TEH_PG_insert_close_request;
+  plugin->delete_aggregation_transient
+    = &TEH_PG_delete_aggregation_transient;
+  plugin->get_link_data
+    = &TEH_PG_get_link_data;
+  plugin->iterate_reserve_close_info
+    = &TEH_PG_iterate_reserve_close_info;
+  plugin->iterate_kyc_reference
+    = &TEH_PG_iterate_kyc_reference;
+  plugin->lookup_records_by_table
+    = &TEH_PG_lookup_records_by_table;
+  plugin->lookup_serial_by_table
+    = &TEH_PG_lookup_serial_by_table;
+  plugin->select_account_merges_above_serial_id
+    = &TEH_PG_select_account_merges_above_serial_id;
+  plugin->select_all_purse_decisions_above_serial_id
+    = &TEH_PG_select_all_purse_decisions_above_serial_id;
+  plugin->select_aml_threshold
+    = &TEH_PG_select_aml_threshold;
+  plugin->select_purse
+    = &TEH_PG_select_purse;
+  plugin->select_purse_deposits_above_serial_id
+    = &TEH_PG_select_purse_deposits_above_serial_id;
+  plugin->select_purse_merges_above_serial_id
+    = &TEH_PG_select_purse_merges_above_serial_id;
+  plugin->select_purse_requests_above_serial_id
+    = &TEH_PG_select_purse_requests_above_serial_id;
+  plugin->select_reserve_close_info
+    = &TEH_PG_select_reserve_close_info;
+  plugin->select_reserve_closed_above_serial_id
+    = &TEH_PG_select_reserve_closed_above_serial_id;
+  plugin->select_reserve_open_above_serial_id
+    = &TEH_PG_select_reserve_open_above_serial_id;
+  plugin->insert_purse_request
+    = &TEH_PG_insert_purse_request;
+  plugin->iterate_active_signkeys
+    = &TEH_PG_iterate_active_signkeys;
+  plugin->commit
+    = &TEH_PG_commit;
+  plugin->preflight
+    = &TEH_PG_preflight;
+  plugin->select_aggregation_amounts_for_kyc_check
+    = &TEH_PG_select_aggregation_amounts_for_kyc_check;
+  plugin->select_satisfied_kyc_processes
+    = &TEH_PG_select_satisfied_kyc_processes;
+  plugin->kyc_provider_account_lookup
+    = &TEH_PG_kyc_provider_account_lookup;
+  plugin->lookup_kyc_requirement_by_row
+    = &TEH_PG_lookup_kyc_requirement_by_row;
+  plugin->insert_kyc_requirement_for_account
+    = &TEH_PG_insert_kyc_requirement_for_account;
+  plugin->lookup_kyc_process_by_account
+    = &TEH_PG_lookup_kyc_process_by_account;
+  plugin->update_kyc_process_by_row
+    = &TEH_PG_update_kyc_process_by_row;
+  plugin->insert_kyc_requirement_process
+    = &TEH_PG_insert_kyc_requirement_process;
+  plugin->select_withdraw_amounts_for_kyc_check
+    = &TEH_PG_select_withdraw_amounts_for_kyc_check;
+  plugin->select_merge_amounts_for_kyc_check
+    = &TEH_PG_select_merge_amounts_for_kyc_check;
+  plugin->profit_drains_set_finished
+    = &TEH_PG_profit_drains_set_finished;
+  plugin->profit_drains_get_pending
+    = &TEH_PG_profit_drains_get_pending;
+  plugin->get_drain_profit
+    = &TEH_PG_get_drain_profit;
+  plugin->get_purse_deposit
+    = &TEH_PG_get_purse_deposit;
+  plugin->insert_contract
+    = &TEH_PG_insert_contract;
+  plugin->select_contract
+    = &TEH_PG_select_contract;
+  plugin->select_purse_merge
+    = &TEH_PG_select_purse_merge;
+  plugin->select_contract_by_purse
+    = &TEH_PG_select_contract_by_purse;
+  plugin->insert_drain_profit
+    = &TEH_PG_insert_drain_profit;
+  plugin->do_reserve_purse
+    = &TEH_PG_do_reserve_purse;
+  plugin->lookup_global_fee_by_time
+    = &TEH_PG_lookup_global_fee_by_time;
+  plugin->do_purse_deposit
+    = &TEH_PG_do_purse_deposit;
+  plugin->activate_signing_key
+    = &TEH_PG_activate_signing_key;
+  plugin->update_auditor
+    = &TEH_PG_update_auditor;
+  plugin->begin_revolving_shard
+    = &TEH_PG_begin_revolving_shard;
+  plugin->get_extension_manifest
+    = &TEH_PG_get_extension_manifest;
+  plugin->do_purse_merge
+    = &TEH_PG_do_purse_merge;
+  plugin->do_purse_delete
+    = &TEH_PG_do_purse_delete;
+  plugin->start_read_committed
+    = &TEH_PG_start_read_committed;
+  plugin->start_read_only
+    = &TEH_PG_start_read_only;
+  plugin->insert_denomination_info
+    = &TEH_PG_insert_denomination_info;
+  plugin->do_batch_withdraw_insert
+    = &TEH_PG_do_batch_withdraw_insert;
+  plugin->lookup_wire_fee_by_time
+    = &TEH_PG_lookup_wire_fee_by_time;
+  plugin->start
+    = &TEH_PG_start;
+  plugin->rollback
+    = &TEH_PG_rollback;
+  plugin->create_tables
+    = &TEH_PG_create_tables;
+  plugin->event_listen
+    = &TEH_PG_event_listen;
+  plugin->event_listen_cancel
+    = &TEH_PG_event_listen_cancel;
+  plugin->event_notify
+    = &TEH_PG_event_notify;
+  plugin->get_denomination_info
+    = &TEH_PG_get_denomination_info;
+  plugin->iterate_denomination_info
+    = &TEH_PG_iterate_denomination_info;
+  plugin->iterate_denominations
+    = &TEH_PG_iterate_denominations;
+  plugin->iterate_active_auditors
+    = &TEH_PG_iterate_active_auditors;
+  plugin->iterate_auditor_denominations
+    = &TEH_PG_iterate_auditor_denominations;
+  plugin->reserves_get
+    = &TEH_PG_reserves_get;
+  plugin->reserves_get_origin
+    = &TEH_PG_reserves_get_origin;
+  plugin->drain_kyc_alert
+    = &TEH_PG_drain_kyc_alert;
+  plugin->reserves_in_insert
+    = &TEH_PG_reserves_in_insert;
+  plugin->get_withdraw_info
+    = &TEH_PG_get_withdraw_info;
+  plugin->do_batch_withdraw
+    = &TEH_PG_do_batch_withdraw;
+  plugin->do_age_withdraw
+    = &TEH_PG_do_age_withdraw;
+  plugin->get_age_withdraw
+    = &TEH_PG_get_age_withdraw;
+  plugin->get_policy_details
+    = &TEH_PG_get_policy_details;
+  plugin->persist_policy_details
+    = &TEH_PG_persist_policy_details;
+  plugin->do_deposit
+    = &TEH_PG_do_deposit;
+  plugin->get_wire_hash_for_contract
+    = &TEH_PG_get_wire_hash_for_contract;
+  plugin->add_policy_fulfillment_proof
+    = &TEH_PG_add_policy_fulfillment_proof;
+  plugin->do_melt
+    = &TEH_PG_do_melt;
+  plugin->do_refund
+    = &TEH_PG_do_refund;
+  plugin->do_recoup
+    = &TEH_PG_do_recoup;
+  plugin->do_recoup_refresh
+    = &TEH_PG_do_recoup_refresh;
+  plugin->get_reserve_balance
+    = &TEH_PG_get_reserve_balance;
+  plugin->count_known_coins
+    = &TEH_PG_count_known_coins;
+  plugin->ensure_coin_known
+    = &TEH_PG_ensure_coin_known;
+  plugin->get_known_coin
+    = &TEH_PG_get_known_coin;
+  plugin->get_signature_for_known_coin
+    = &TEH_PG_get_signature_for_known_coin;
+  plugin->get_coin_denomination
+    = &TEH_PG_get_coin_denomination;
+  plugin->have_deposit2
+    = &TEH_PG_have_deposit2;
+  plugin->aggregate
+    = &TEH_PG_aggregate;
   plugin->create_aggregation_transient
-    = &postgres_create_aggregation_transient;
+    = &TEH_PG_create_aggregation_transient;
   plugin->select_aggregation_transient
-    = &postgres_select_aggregation_transient;
+    = &TEH_PG_select_aggregation_transient;
+  plugin->find_aggregation_transient
+    = &TEH_PG_find_aggregation_transient;
   plugin->update_aggregation_transient
-    = &postgres_update_aggregation_transient;
-  plugin->delete_aggregation_transient
-    = &postgres_delete_aggregation_transient;
-  plugin->get_ready_deposit = &postgres_get_ready_deposit;
-  plugin->insert_deposit = &postgres_insert_deposit;
-  plugin->insert_refund = &postgres_insert_refund;
-  plugin->select_refunds_by_coin = &postgres_select_refunds_by_coin;
-  plugin->get_melt = &postgres_get_melt;
-  plugin->insert_refresh_reveal = &postgres_insert_refresh_reveal;
-  plugin->get_refresh_reveal = &postgres_get_refresh_reveal;
-  plugin->get_link_data = &postgres_get_link_data;
-  plugin->get_coin_transactions = &postgres_get_coin_transactions;
-  plugin->free_coin_transaction_list = &common_free_coin_transaction_list;
-  plugin->lookup_wire_transfer = &postgres_lookup_wire_transfer;
-  plugin->lookup_transfer_by_deposit = &postgres_lookup_transfer_by_deposit;
-  plugin->insert_aggregation_tracking = &postgres_insert_aggregation_tracking;
-  plugin->insert_wire_fee = &postgres_insert_wire_fee;
-  plugin->insert_global_fee = &postgres_insert_global_fee;
-  plugin->get_wire_fee = &postgres_get_wire_fee;
-  plugin->get_global_fee = &postgres_get_global_fee;
-  plugin->get_global_fees = &postgres_get_global_fees;
-  plugin->get_expired_reserves = &postgres_get_expired_reserves;
-  plugin->insert_reserve_closed = &postgres_insert_reserve_closed;
-  plugin->wire_prepare_data_insert = &postgres_wire_prepare_data_insert;
-  plugin->wire_prepare_data_mark_finished =
-    &postgres_wire_prepare_data_mark_finished;
-  plugin->wire_prepare_data_mark_failed =
-    &postgres_wire_prepare_data_mark_failed;
-  plugin->wire_prepare_data_get = &postgres_wire_prepare_data_get;
-  plugin->start_deferred_wire_out = &postgres_start_deferred_wire_out;
-  plugin->store_wire_transfer_out = &postgres_store_wire_transfer_out;
-  plugin->gc = &postgres_gc;
-  plugin->select_deposits_above_serial_id
-    = &postgres_select_deposits_above_serial_id;
+    = &TEH_PG_update_aggregation_transient;
+  plugin->get_ready_deposit
+    = &TEH_PG_get_ready_deposit;
+  plugin->insert_refund
+    = &TEH_PG_insert_refund;
+  plugin->select_refunds_by_coin
+    = &TEH_PG_select_refunds_by_coin;
+  plugin->get_melt
+    = &TEH_PG_get_melt;
+  plugin->insert_refresh_reveal
+    = &TEH_PG_insert_refresh_reveal;
+  plugin->get_refresh_reveal
+    = &TEH_PG_get_refresh_reveal;
+  plugin->lookup_wire_transfer
+    = &TEH_PG_lookup_wire_transfer;
+  plugin->lookup_transfer_by_deposit
+    = &TEH_PG_lookup_transfer_by_deposit;
+  plugin->insert_wire_fee
+    = &TEH_PG_insert_wire_fee;
+  plugin->insert_global_fee
+    = &TEH_PG_insert_global_fee;
+  plugin->get_wire_fee
+    = &TEH_PG_get_wire_fee;
+  plugin->get_global_fee
+    = &TEH_PG_get_global_fee;
+  plugin->get_global_fees
+    = &TEH_PG_get_global_fees;
+  plugin->insert_reserve_closed
+    = &TEH_PG_insert_reserve_closed;
+  plugin->wire_prepare_data_insert
+    = &TEH_PG_wire_prepare_data_insert;
+  plugin->wire_prepare_data_mark_finished
+    = &TEH_PG_wire_prepare_data_mark_finished;
+  plugin->wire_prepare_data_mark_failed
+    = &TEH_PG_wire_prepare_data_mark_failed;
+  plugin->wire_prepare_data_get
+    = &TEH_PG_wire_prepare_data_get;
+  plugin->start_deferred_wire_out
+    = &TEH_PG_start_deferred_wire_out;
+  plugin->store_wire_transfer_out
+    = &TEH_PG_store_wire_transfer_out;
+  plugin->gc
+    = &TEH_PG_gc;
+  plugin->select_coin_deposits_above_serial_id
+    = &TEH_PG_select_coin_deposits_above_serial_id;
+  plugin->select_purse_decisions_above_serial_id
+    = &TEH_PG_select_purse_decisions_above_serial_id;
+  plugin->select_purse_deposits_by_purse
+    = &TEH_PG_select_purse_deposits_by_purse;
   plugin->select_refreshes_above_serial_id
-    = &postgres_select_refreshes_above_serial_id;
+    = &TEH_PG_select_refreshes_above_serial_id;
   plugin->select_refunds_above_serial_id
-    = &postgres_select_refunds_above_serial_id;
+    = &TEH_PG_select_refunds_above_serial_id;
   plugin->select_reserves_in_above_serial_id
-    = &postgres_select_reserves_in_above_serial_id;
+    = &TEH_PG_select_reserves_in_above_serial_id;
   plugin->select_reserves_in_above_serial_id_by_account
-    = &postgres_select_reserves_in_above_serial_id_by_account;
+    = &TEH_PG_select_reserves_in_above_serial_id_by_account;
   plugin->select_withdrawals_above_serial_id
-    = &postgres_select_withdrawals_above_serial_id;
+    = &TEH_PG_select_withdrawals_above_serial_id;
   plugin->select_wire_out_above_serial_id
-    = &postgres_select_wire_out_above_serial_id;
+    = &TEH_PG_select_wire_out_above_serial_id;
   plugin->select_wire_out_above_serial_id_by_account
-    = &postgres_select_wire_out_above_serial_id_by_account;
+    = &TEH_PG_select_wire_out_above_serial_id_by_account;
   plugin->select_recoup_above_serial_id
-    = &postgres_select_recoup_above_serial_id;
+    = &TEH_PG_select_recoup_above_serial_id;
   plugin->select_recoup_refresh_above_serial_id
-    = &postgres_select_recoup_refresh_above_serial_id;
-  plugin->select_reserve_closed_above_serial_id
-    = &postgres_select_reserve_closed_above_serial_id;
+    = &TEH_PG_select_recoup_refresh_above_serial_id;
   plugin->get_reserve_by_h_blind
-    = &postgres_get_reserve_by_h_blind;
+    = &TEH_PG_get_reserve_by_h_blind;
   plugin->get_old_coin_by_h_blind
-    = &postgres_get_old_coin_by_h_blind;
+    = &TEH_PG_get_old_coin_by_h_blind;
   plugin->insert_denomination_revocation
-    = &postgres_insert_denomination_revocation;
+    = &TEH_PG_insert_denomination_revocation;
   plugin->get_denomination_revocation
-    = &postgres_get_denomination_revocation;
-  plugin->select_deposits_missing_wire
-    = &postgres_select_deposits_missing_wire;
+    = &TEH_PG_get_denomination_revocation;
+  plugin->select_batch_deposits_missing_wire
+    = &TEH_PG_select_batch_deposits_missing_wire;
+  plugin->select_justification_for_missing_wire
+    = &TEH_PG_select_justification_for_missing_wire;
+  plugin->select_aggregations_above_serial
+    = &TEH_PG_select_aggregations_above_serial;
   plugin->lookup_auditor_timestamp
-    = &postgres_lookup_auditor_timestamp;
+    = &TEH_PG_lookup_auditor_timestamp;
   plugin->lookup_auditor_status
-    = &postgres_lookup_auditor_status;
+    = &TEH_PG_lookup_auditor_status;
   plugin->insert_auditor
-    = &postgres_insert_auditor;
-  plugin->update_auditor
-    = &postgres_update_auditor;
+    = &TEH_PG_insert_auditor;
   plugin->lookup_wire_timestamp
-    = &postgres_lookup_wire_timestamp;
+    = &TEH_PG_lookup_wire_timestamp;
   plugin->insert_wire
-    = &postgres_insert_wire;
+    = &TEH_PG_insert_wire;
   plugin->update_wire
-    = &postgres_update_wire;
+    = &TEH_PG_update_wire;
   plugin->get_wire_accounts
-    = &postgres_get_wire_accounts;
+    = &TEH_PG_get_wire_accounts;
   plugin->get_wire_fees
-    = &postgres_get_wire_fees;
+    = &TEH_PG_get_wire_fees;
   plugin->insert_signkey_revocation
-    = &postgres_insert_signkey_revocation;
+    = &TEH_PG_insert_signkey_revocation;
   plugin->lookup_signkey_revocation
-    = &postgres_lookup_signkey_revocation;
+    = &TEH_PG_lookup_signkey_revocation;
   plugin->lookup_denomination_key
-    = &postgres_lookup_denomination_key;
+    = &TEH_PG_lookup_denomination_key;
   plugin->insert_auditor_denom_sig
-    = &postgres_insert_auditor_denom_sig;
+    = &TEH_PG_insert_auditor_denom_sig;
   plugin->select_auditor_denom_sig
-    = &postgres_select_auditor_denom_sig;
-  plugin->lookup_wire_fee_by_time
-    = &postgres_lookup_wire_fee_by_time;
-  plugin->lookup_global_fee_by_time
-    = &postgres_lookup_global_fee_by_time;
+    = &TEH_PG_select_auditor_denom_sig;
   plugin->add_denomination_key
-    = &postgres_add_denomination_key;
-  plugin->activate_signing_key
-    = &postgres_activate_signing_key;
+    = &TEH_PG_add_denomination_key;
   plugin->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;
+    = &TEH_PG_lookup_signing_key;
   plugin->begin_shard
-    = &postgres_begin_shard;
+    = &TEH_PG_begin_shard;
   plugin->abort_shard
-    = &postgres_abort_shard;
+    = &TEH_PG_abort_shard;
+  plugin->insert_kyc_failure
+    = &TEH_PG_insert_kyc_failure;
   plugin->complete_shard
-    = &postgres_complete_shard;
-  plugin->begin_revolving_shard
-    = &postgres_begin_revolving_shard;
+    = &TEH_PG_complete_shard;
   plugin->release_revolving_shard
-    = &postgres_release_revolving_shard;
+    = &TEH_PG_release_revolving_shard;
   plugin->delete_shard_locks
-    = &postgres_delete_shard_locks;
-  plugin->set_extension_config
-    = &postgres_set_extension_config;
-  plugin->get_extension_config
-    = &postgres_get_extension_config;
+    = &TEH_PG_delete_shard_locks;
+  plugin->set_extension_manifest
+    = &TEH_PG_set_extension_manifest;
   plugin->insert_partner
-    = &postgres_insert_partner;
-  plugin->insert_contract
-    = &postgres_insert_contract;
-  plugin->select_contract
-    = &postgres_select_contract;
-  plugin->select_contract_by_purse
-    = &postgres_select_contract_by_purse;
-  plugin->insert_purse_request
-    = &postgres_insert_purse_request;
-  plugin->select_purse_request
-    = &postgres_select_purse_request;
+    = &TEH_PG_insert_partner;
   plugin->expire_purse
-    = &postgres_expire_purse;
-  plugin->select_purse
-    = &postgres_select_purse;
+    = &TEH_PG_expire_purse;
   plugin->select_purse_by_merge_pub
-    = &postgres_select_purse_by_merge_pub;
-  plugin->do_purse_deposit
-    = &postgres_do_purse_deposit;
-  plugin->get_purse_deposit
-    = &postgres_get_purse_deposit;
-  plugin->do_purse_merge
-    = &postgres_do_purse_merge;
-  plugin->do_reserve_purse
-    = &postgres_do_reserve_purse;
-  plugin->select_purse_merge
-    = &postgres_select_purse_merge;
-  plugin->do_account_merge
-    = &postgres_do_account_merge;
-  plugin->insert_history_request
-    = &postgres_insert_history_request;
-  plugin->insert_close_request
-    = &postgres_insert_close_request;
+    = &TEH_PG_select_purse_by_merge_pub;
+  plugin->set_purse_balance
+    = &TEH_PG_set_purse_balance;
+  plugin->get_pending_kyc_requirement_process
+    = &TEH_PG_get_pending_kyc_requirement_process;
+  plugin->insert_kyc_attributes
+    = &TEH_PG_insert_kyc_attributes;
+  plugin->select_similar_kyc_attributes
+    = &TEH_PG_select_similar_kyc_attributes;
+  plugin->select_kyc_attributes
+    = &TEH_PG_select_kyc_attributes;
+  plugin->insert_aml_officer
+    = &TEH_PG_insert_aml_officer;
+  plugin->test_aml_officer
+    = &TEH_PG_test_aml_officer;
+  plugin->lookup_aml_officer
+    = &TEH_PG_lookup_aml_officer;
+  plugin->trigger_aml_process
+    = &TEH_PG_trigger_aml_process;
+  plugin->select_aml_process
+    = &TEH_PG_select_aml_process;
+  plugin->select_aml_history
+    = &TEH_PG_select_aml_history;
+  plugin->insert_aml_decision
+    = &TEH_PG_insert_aml_decision;
+
+  plugin->batch_ensure_coin_known
+    = &TEH_PG_batch_ensure_coin_known;
+  plugin->inject_auditor_triggers
+    = &TEH_PG_inject_auditor_triggers;
+
   return plugin;
 }
 
diff --git a/src/exchangedb/procedures.sql.in b/src/exchangedb/procedures.sql.in
new file mode 100644
index 000000000..7afb01f0b
--- /dev/null
+++ b/src/exchangedb/procedures.sql.in
@@ -0,0 +1,49 @@
+--
+-- 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/>
+--
+
+BEGIN;
+
+SET search_path TO exchange;
+
+#include "exchange_do_amount_specific.sql"
+#include "exchange_do_batch_withdraw.sql"
+#include "exchange_do_batch_withdraw_insert.sql"
+#include "exchange_do_age_withdraw.sql"
+#include "exchange_do_deposit.sql"
+#include "exchange_do_melt.sql"
+#include "exchange_do_select_deposits_missing_wire.sql"
+#include "exchange_do_select_justification_for_missing_wire.sql"
+#include "exchange_do_refund.sql"
+#include "exchange_do_recoup_to_reserve.sql"
+#include "exchange_do_recoup_to_coin.sql"
+#include "exchange_do_gc.sql"
+#include "exchange_do_purse_delete.sql"
+#include "exchange_do_purse_deposit.sql"
+#include "exchange_do_purse_merge.sql"
+#include "exchange_do_reserve_purse.sql"
+#include "exchange_do_expire_purse.sql"
+#include "exchange_do_reserve_open_deposit.sql"
+#include "exchange_do_reserve_open.sql"
+#include "exchange_do_insert_or_update_policy_details.sql"
+#include "exchange_do_insert_aml_decision.sql"
+#include "exchange_do_insert_aml_officer.sql"
+#include "exchange_do_insert_kyc_attributes.sql"
+#include "exchange_do_reserves_in_insert.sql"
+#include "exchange_do_batch_reserves_update.sql"
+#include "exchange_do_get_link_data.sql"
+#include "exchange_do_batch_coin_known.sql"
+
+COMMIT;
diff --git a/src/exchangedb/shard-0001-part.sql b/src/exchangedb/shard-0001-part.sql
deleted file mode 100644
index aa912c058..000000000
--- a/src/exchangedb/shard-0001-part.sql
+++ /dev/null
@@ -1,266 +0,0 @@
---
--- 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/>
---
-
--- Everything in one big transaction
-BEGIN;
-
--- Check patch versioning is in place.
-SELECT _v.register_patch('shard-0001', NULL, NULL);
-
-CREATE OR REPLACE FUNCTION setup_shard(
-  shard_idx INTEGER
-)
-RETURNS VOID
-LANGUAGE plpgsql
-AS $$
-DECLARE 
-  shard_suffix VARCHAR;
-BEGIN
-
-  shard_suffix = shard_idx::varchar;
-
-  PERFORM create_table_wire_targets(shard_suffix);
-  PERFORM add_constraints_to_wire_targets_partition(shard_suffix);
-
-  PERFORM create_table_reserves(shard_suffix);
-
-  PERFORM create_table_reserves_in(shard_suffix);
-  PERFORM add_constraints_to_reserves_in_partition(shard_suffix);
-
-  PERFORM create_table_reserves_close(shard_suffix);
-
-  PERFORM create_table_reserves_out(shard_suffix);
-
-  PERFORM create_table_reserves_out_by_reserve(shard_suffix);
-
-  PERFORM create_table_known_coins(shard_suffix);
-  PERFORM add_constraints_to_known_coins_partition(shard_suffix);
-
-  PERFORM create_table_refresh_commitments(shard_suffix);
-  PERFORM add_constraints_to_refresh_commitments_partition(shard_suffix);
- 
-  PERFORM create_table_refresh_revealed_coins(shard_suffix);
-  PERFORM add_constraints_to_refresh_revealed_coins_partition(shard_suffix);
-  
-  PERFORM create_table_refresh_transfer_keys(shard_suffix);
-  PERFORM add_constraints_to_refresh_transfer_keys_partition(shard_suffix);
-  
-  PERFORM create_table_deposits(shard_suffix);
-  PERFORM add_constraints_to_deposits_partition(shard_suffix);
-
-  PERFORM create_table_deposits_by_ready(shard_suffix);
-
-  PERFORM create_table_deposits_for_matching(shard_suffix);
-  
-  PERFORM create_table_refunds(shard_suffix);
-  PERFORM add_constraints_to_refunds_partition(shard_suffix);
-  
-  PERFORM create_table_wire_out(shard_suffix);
-  PERFORM add_constraints_to_wire_out_partition(shard_suffix);
-  
-  PERFORM create_table_aggregation_transient(shard_suffix);
-
-  PERFORM create_table_aggregation_tracking(shard_suffix);
-  PERFORM add_constraints_to_aggregation_tracking_partition(shard_suffix);
-
-  PERFORM create_table_recoup(shard_suffix);
-  PERFORM add_constraints_to_recoup_partition(shard_suffix);
-
-  PERFORM create_table_recoup_by_reserve(shard_suffix);
-
-  PERFORM create_table_recoup_refresh(shard_suffix);
-  PERFORM add_constraints_to_recoup_refresh_partition(shard_suffix);
-
-  PERFORM create_table_prewire(shard_suffix);
-
-  PERFORM create_table_cs_nonce_locks(shard_suffix);
-  PERFORM add_constraints_to_cs_nonce_locks_partition(shard_suffix);
-
-  PERFORM create_table_purse_requests(shard_suffix);
-  PERFORM add_constraints_to_purse_requests_partition(shard_suffix);
-
-  PERFORM create_table_purse_merges(shard_suffix);
-  PERFORM add_constraints_to_purse_merges_partition(shard_suffix);
-
-  PERFORM create_table_account_merges(shard_suffix);
-  PERFORM add_constraints_to_account_merges_partition(shard_suffix);
-
-  PERFORM create_table_contracts(shard_suffix);
-  PERFORM add_constraints_to_contracts_partition(shard_suffix);
-
-  PERFORM create_table_history_requests(shard_suffix);
-
-  PERFORM create_table_close_requests(shard_suffix);
-
-  PERFORM create_table_purse_deposits(shard_suffix);
-  PERFORM add_constraints_to_purse_deposits_partition(shard_suffix);
-
-  PERFORM create_table_wad_out_entries(shard_suffix);
-  PERFORM add_constraints_to_wad_out_entries_partition(shard_suffix);
-
-  PERFORM create_table_wads_in(shard_suffix);
-  PERFORM add_constraints_to_wads_in_partition(shard_suffix);
-
-  PERFORM create_table_wad_in_entries(shard_suffix);
-  PERFORM add_constraints_to_wad_in_entries_partition(shard_suffix);
-END
-$$;
-
-
-CREATE OR REPLACE FUNCTION drop_shard(
-  shard_idx INTEGER 
-)
-  RETURNS VOID
-  LANGUAGE plpgsql
-AS $$
-DECLARE 
-  shard_suffix VARCHAR;
-BEGIN
- 
-  shard_suffix = shard_idx::varchar;
-
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'wire_targets_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'reserves_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'reserves_in_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'reserves_out_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'reserves_close_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'known_coins_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'refresh_commitments_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'refresh_revealed_coins_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'refresh_transfer_keys_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'deposits_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'deposits_by_ready_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'deposits_for_matching_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'refunds_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'wire_out_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'aggregation_transient_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'aggregation_tracking_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'recoup_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'recoup_by_reserve_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'reserves_out_by_reserve_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'recoup_refresh_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'prewire_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'cs_nonce_locks_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'purse_requests_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'purse_merges_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'account_merges_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'contracts_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'history_requests_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'close_requests_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'purse_deposits_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'wad_out_entries_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'wads_in_' || shard_suffix
-  );
-  EXECUTE FORMAT(
-    'DROP TABLE IF EXISTS %I CASCADE'
-    ,'wad_in_entries_' || shard_suffix
-  );
-END
-$$;
-
-COMMIT;
diff --git a/src/exchangedb/spi/Makefile b/src/exchangedb/spi/Makefile
new file mode 100644
index 000000000..d654d91e9
--- /dev/null
+++ b/src/exchangedb/spi/Makefile
@@ -0,0 +1,9 @@
+EXTENSION = own_test
+MODULES = own_test
+DATA = own_test.sql
+PG_CPPFLAGS = -I /usr/include/postgresql
+
+# postgresql build stuff
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
diff --git a/src/exchangedb/spi/README.md b/src/exchangedb/spi/README.md
new file mode 100644
index 000000000..47eb37b94
--- /dev/null
+++ b/src/exchangedb/spi/README.md
@@ -0,0 +1,37 @@
+                Server Programming Interface (SPI)
+
+
+Overview
+========
+
+This folder contains results from an experiment by Joseph Xu
+to use the Postgres SPI. They are not currently used at all
+by the GNU Taler exchange.
+
+
+Dependencies
+============
+
+These are the direct dependencies for compiling the code:
+
+# apt-get install libpq-dev postgresql-server-dev-13
+# apt-get install libkrb5-dev
+# apt-get install libssl-dev
+
+
+Compilation
+===========
+
+$ make
+
+Loading functions
+=================
+
+# make install
+$ psql "$DB_NAME" < own_test.sql
+
+
+Calling functions
+==================
+
+$ psql -c "SELECT $FUNCTION_NAME($ARGS);" "$DB_NAME"
diff --git a/src/exchangedb/spi/own_test.c b/src/exchangedb/spi/own_test.c
new file mode 100644
index 000000000..ac72fad7b
--- /dev/null
+++ b/src/exchangedb/spi/own_test.c
@@ -0,0 +1,873 @@
+#include "postgres.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <postgresql/libpq-fe.h>
+#include <libpq-int.h>
+#include <catalog/pg_type.h>
+#include <executor/spi.h>
+#include <funcapi.h>
+#include <fmgr.h>
+#include <utils/builtins.h>
+#include <utils/array.h>
+#include <sys/time.h>
+#include <utils/numeric.h>
+#include <utils/timestamp.h>
+#include <utils/bytea.h>
+
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
+#endif
+
+typedef struct
+{
+  Datum col1;
+  Datum col2;
+} valuest;
+
+void _PG_init (void);
+
+void _PG_fini (void);
+
+void
+_PG_init (void)
+{
+}
+
+
+PG_FUNCTION_INFO_V1 (pg_spi_insert_int);
+PG_FUNCTION_INFO_V1 (pg_spi_select_from_x);
+PG_FUNCTION_INFO_V1 (pg_spi_select_pair_from_y);
+// PG_FUNCTION_INFO_V1(pg_spi_select_with_cond);
+PG_FUNCTION_INFO_V1 (pg_spi_update_y);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_example);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_example_without_saveplan);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_insert);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_insert_without_saveplan);
+// PG_FUNCTION_INFO_V1(pg_spi_prepare_select_with_cond);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_select_with_cond_without_saveplan);
+PG_FUNCTION_INFO_V1 (pg_spi_prepare_update);
+PG_FUNCTION_INFO_V1 (pg_spi_get_dep_ref_fees);
+// SIMPLE SELECT
+Datum
+pg_spi_prepare_example (PG_FUNCTION_ARGS)
+{
+  static SPIPlanPtr prepared_plan;
+  int ret;
+  int64 result;
+  char *value;
+  SPIPlanPtr new_plan;
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "DB connection failed ! \n");
+  }
+  {
+    if (prepared_plan == NULL)
+    {
+      new_plan = SPI_prepare ("SELECT 1 FROM X", 0, NULL);
+      prepared_plan = SPI_saveplan (new_plan);
+
+      if (prepared_plan == NULL)
+      {
+        elog (ERROR, "FAIL TO SAVE !\n");
+      }
+    }
+
+    ret = SPI_execute_plan (prepared_plan, NULL, 0,false, 0);
+    if (ret != SPI_OK_SELECT)
+    {
+      elog (ERROR, "SELECT FAILED %d !\n", ret);
+    }
+
+    if (SPI_tuptable != NULL && SPI_tuptable->vals != NULL &&
+        SPI_tuptable->tupdesc != NULL)
+    {
+      value = SPI_getvalue (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1);
+      result = atoi (value);
+    }
+    else
+    {
+      elog (ERROR, "EMPTY TABLE !\n");
+    }
+  }
+  SPI_finish ();
+  PG_RETURN_INT64 (result);
+}
+
+
+Datum
+pg_spi_prepare_example_without_saveplan (PG_FUNCTION_ARGS)
+{
+  int ret;
+  int64 result;
+  char *value;
+  SPIPlanPtr new_plan;
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "DB connection failed ! \n");
+  }
+
+  {
+    new_plan = SPI_prepare ("SELECT 1 FROM X", 0, NULL);
+    ret = SPI_execute_plan (new_plan, NULL, 0,false, 0);
+    if (ret != SPI_OK_SELECT)
+    {
+      elog (ERROR, "SELECT FAILED %d !\n", ret);
+    }
+
+    if (SPI_tuptable != NULL
+        && SPI_tuptable->vals != NULL
+        && SPI_tuptable->tupdesc != NULL)
+    {
+      value = SPI_getvalue (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1);
+      result = atoi (value);
+    }
+    else
+    {
+      elog (ERROR, "EMPTY TABLE !\n");
+    }
+  }
+  SPI_finish ();
+  PG_RETURN_INT64 (result);//  PG_RETURN_INT64(result);
+}
+
+
+// SELECT 1 FROM X
+// V1
+Datum
+pg_spi_select_from_x (PG_FUNCTION_ARGS)
+{
+  int ret;
+  char *query = "SELECT 1 FROM X";
+  uint64 proc;
+  ret = SPI_connect ();
+
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed");
+  }
+
+  ret = SPI_exec (query, 10);
+  proc = SPI_processed;
+  if (ret != SPI_OK_SELECT)
+  {
+    elog (ERROR, "SPI_exec failed");
+  }
+
+  SPI_finish ();
+
+  PG_RETURN_INT64 (proc);
+}
+
+
+// INSERT INTO X VALUES (1)
+Datum
+pg_spi_insert_int (PG_FUNCTION_ARGS)
+{
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  char *query = "INSERT INTO X (a) VALUES ($1)";
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed");
+  }
+
+  nargs = 1;
+  argtypes[0] = INT4OID;
+  values[0] = Int32GetDatum (3);
+
+  ret = SPI_execute_with_args (query, nargs, argtypes, values, NULL, false, 0);
+  if (ret != SPI_OK_INSERT)
+  {
+    elog (ERROR, "SPI_execute_with_args failed");
+  }
+
+  SPI_finish ();
+
+  PG_RETURN_VOID ();
+}
+
+
+Datum
+pg_spi_prepare_insert (PG_FUNCTION_ARGS)
+{
+  static SPIPlanPtr prepared_plan = NULL;
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  const char *query = "INSERT INTO X (a) VALUES ($1)";
+  SPIPlanPtr new_plan;
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed ! \n");
+  }
+  if (prepared_plan == NULL)
+  {
+
+    argtypes[0] = INT4OID;
+    nargs = 1;
+    values[0] = Int32GetDatum (3);
+    new_plan = SPI_prepare (query, nargs, argtypes);
+    if (new_plan== NULL)
+    {
+      elog (ERROR, "SPI_prepare failed ! \n");
+    }
+    prepared_plan = SPI_saveplan (new_plan);
+    if (prepared_plan == NULL)
+    {
+      elog (ERROR, "SPI_saveplan failed ! \n");
+    }
+  }
+
+  ret = SPI_execute_plan (prepared_plan, values, NULL, false, 0);
+  if (ret != SPI_OK_INSERT)
+  {
+    elog (ERROR, "SPI_execute_plan failed ! \n");
+  }
+
+  SPI_finish ();
+
+  PG_RETURN_VOID ();
+}
+
+
+/*
+Datum
+pg_spi_prepare_insert_bytea(PG_FUNCTION_ARGS)
+{
+  static SPIPlanPtr prepared_plan = NULL;
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  Oid argtypes2[1];
+  Datum val[1];
+  char *query = "INSERT INTO X (a) VALUES ($1)";
+  SPIPlanPtr new_plan;
+  ret = SPI_connect();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog(ERROR, "SPI_connect failed ! \n");
+  }
+  if (prepared_plan == NULL) {
+    argtypes2[0] = BOOLOID;
+    val[0] = BoolGetDatum();
+    argtypes[0] = BYTEAOID;
+    nargs = 1;
+    values[0] = Int32GetDatum(3);
+    new_plan = SPI_prepare(query, nargs, argtypes);
+    if (new_plan== NULL)
+    {
+      elog(ERROR, "SPI_prepare failed ! \n");
+    }
+    prepared_plan = SPI_saveplan(new_plan);
+    if (prepared_plan == NULL)
+    {
+      elog(ERROR, "SPI_saveplan failed ! \n");
+    }
+  }
+
+  ret = SPI_execute_plan(prepared_plan, values, NULL, false, 0);
+  if (ret != SPI_OK_INSERT)
+  {
+    elog(ERROR, "SPI_execute_plan failed ! \n");
+  }
+
+  SPI_finish();
+
+  PG_RETURN_VOID();
+}
+*/
+
+Datum
+pg_spi_prepare_insert_without_saveplan (PG_FUNCTION_ARGS)
+{
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  const char *query = "INSERT INTO X (a) VALUES ($1)";
+  SPIPlanPtr new_plan;
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed");
+  }
+  {
+    argtypes[0] = INT4OID;
+    nargs = 1;
+    values[0] = Int32GetDatum (3);
+    new_plan = SPI_prepare (query, nargs, argtypes);
+    if (new_plan== NULL)
+    {
+      elog (ERROR, "SPI_prepare failed");
+    }
+  }
+
+  ret = SPI_execute_plan (new_plan, values, NULL, false, 0);
+  if (ret != SPI_OK_INSERT)
+  {
+    elog (ERROR, "SPI_execute_plan failed");
+  }
+
+  SPI_finish ();
+
+  PG_RETURN_VOID ();
+}
+
+
+/*
+Datum
+pg_spi_select_pair_from_y(PG_FUNCTION_ARGS)
+{
+  int ret;
+  valuest result;
+  bool isnull;
+  char *query = "SELECT 1,1 FROM Y";
+  result.col1 = 0;
+  result.col2 = 0;
+
+  if ((ret = SPI_connect()) < 0) {
+    fprintf(stderr, "SPI_connect returned %d\n", ret);
+    exit(1);
+  }
+  ret = SPI_exec(query, 0);
+  if (ret == SPI_OK_SELECT && SPI_processed > 0) {
+    int i;
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+    for (i = 0; i < SPI_processed; i++) {
+      HeapTuple tuple = tuptable->vals[i];
+      result.col1 = SPI_getbinval(tuple, tupdesc, 1, &isnull);
+      result.col2 = SPI_getbinval(tuple, tupdesc, 2, &isnull);
+    }
+  }
+  SPI_finish();
+  PG_RETURN_TEXT_P(result);
+}
+*/
+
+// SELECT X FROM Y WHERE Z=$1
+/*
+Datum
+pg_spi_select_with_cond(PG_FUNCTION_ARGS)
+{
+    int ret;
+    char *query;
+    int nargs;
+    Oid argtypes[1];
+    Datum values[1];
+    uint64 proc;
+    query = "SELECT col1 FROM Y WHERE col2 = $1";
+
+    ret = SPI_connect();
+    if (ret != SPI_OK_CONNECT) {
+        elog(ERROR, "SPI_connect failed: %d", ret);
+    }
+    nargs = 1;
+    argtypes[0] = INT4OID;
+    values[0] = Int32GetDatum(2);
+
+    ret = SPI_execute_with_args(query, nargs, argtypes, values, NULL, false, 0);
+    proc = SPI_processed;
+    if (ret != SPI_OK_SELECT)
+    {
+      elog(ERROR, "SPI_execute_with_args failed");
+    }
+
+    SPI_finish();
+
+
+    PG_RETURN_INT64(proc);
+    }*/
+
+////////SELECT WITH COND
+/*
+Datum pg_spi_prepare_select_with_cond(PG_FUNCTION_ARGS) {
+  static SPIPlanPtr prepared_plan = NULL;
+  SPIPlanPtr new_plan;
+  int ret;
+  Datum values[1];
+  uint64 proc;
+  int nargs;
+  Oid argtypes[1];
+  char *query = "SELECT col1 FROM Y WHERE col1 = $1";
+  int result = 0;
+
+  ret = SPI_connect();
+  if (ret != SPI_OK_CONNECT)
+    elog(ERROR, "SPI_connect failed ! \n");
+
+  if (prepared_plan == NULL) {
+
+    argtypes[0] = INT4OID;
+    nargs = 1;
+    values[0] = DatumGetByteaP(SPI_getbinval(tuptable->vals[0], tupdesc, 1, &isnull)); //Value col2
+
+    new_plan = SPI_prepare(query, nargs, argtypes);
+    if (new_plan == NULL)
+      elog(ERROR, "SPI_prepare failed ! \n");
+
+    prepared_plan = SPI_saveplan(new_plan);
+    if (prepared_plan == NULL)
+      elog(ERROR, "SPI_saveplan failed ! \n");
+  }
+
+
+  ret = SPI_execute_plan(prepared_plan, values, NULL, false, 0);
+
+  if (ret != SPI_OK_SELECT) {
+    elog(ERROR, "SPI_execute_plan failed: %d \n", ret);
+    }
+
+  proc = SPI_processed;
+
+  if (proc > 0) {
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+    HeapTuple tuple;
+    int i;
+
+    for (i = 0; i < proc; i++) {
+      tuple = tuptable->vals[i];
+      for (int j = 1; j <= tupdesc->natts; j++) {
+        char * value = SPI_getvalue(tuple, tupdesc, j);
+        result += atoi(value);
+      }
+    }
+    }
+  SPI_finish();
+  PG_RETURN_INT64(result);
+}
+*/
+
+Datum
+pg_spi_prepare_select_with_cond_without_saveplan (PG_FUNCTION_ARGS)
+{
+
+  SPIPlanPtr new_plan;
+  int ret;
+  Datum values[1];
+  uint64 proc;
+  int nargs;
+  Oid argtypes[1];
+  char *query = "SELECT col1 FROM Y WHERE col2 = $1";
+  int result = 0;
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+    elog (ERROR, "SPI_connect failed ! \n");
+
+  {
+
+    argtypes[0] = INT4OID;
+    nargs = 1;
+    values[0] = Int32GetDatum (2); // Value col2
+
+    new_plan = SPI_prepare (query, nargs, argtypes);
+    if (new_plan == NULL)
+      elog (ERROR, "SPI_prepare failed ! \n");
+
+  }
+
+
+  ret = SPI_execute_plan (new_plan, values, NULL, false, 0);
+
+  if (ret != SPI_OK_SELECT)
+  {
+    elog (ERROR, "SPI_execute_plan failed: %d \n", ret);
+  }
+
+  proc = SPI_processed;
+
+  if (proc > 0)
+  {
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+    HeapTuple tuple;
+    int i;
+
+    for (i = 0; i < proc; i++)
+    {
+      tuple = tuptable->vals[i];
+      for (int j = 1; j <= tupdesc->natts; j++)
+      {
+        char *value = SPI_getvalue (tuple, tupdesc, j);
+        result += atoi (value);
+      }
+    }
+  }
+  SPI_finish ();
+  PG_RETURN_INT64 (result);
+}
+
+
+Datum
+pg_spi_update_y (PG_FUNCTION_ARGS)
+{
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  const char *query = "UPDATE Y SET col1 = 4 WHERE (col2 = $1)";
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed ! \n");
+  }
+
+  nargs = 1;
+  argtypes[0] = INT4OID;
+  values[0] = Int32GetDatum (0);
+
+  ret = SPI_execute_with_args (query, nargs, argtypes, values, NULL, false, 0);
+  if (ret != SPI_OK_UPDATE)
+  {
+    elog (ERROR, "SPI_execute_with_args failed ! \n");
+  }
+
+  SPI_finish ();
+
+  PG_RETURN_VOID ();
+}
+
+
+Datum
+pg_spi_prepare_update (PG_FUNCTION_ARGS)
+{
+  static SPIPlanPtr prepared_plan = NULL;
+  SPIPlanPtr new_plan;
+  int ret;
+  int nargs;
+  Oid argtypes[1];
+  Datum values[1];
+  const char *query = "UPDATE Y SET col1 = 4 WHERE (col2 = $1)";
+
+  ret = SPI_connect ();
+  if (ret != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "SPI_connect failed ! \n");
+  }
+
+  if (prepared_plan == NULL)
+  {
+    argtypes[0] = INT4OID;
+    nargs = 1;
+    values[0] = Int32GetDatum (3);
+    // PREPARE
+    new_plan = SPI_prepare (query, nargs, argtypes);
+    if (new_plan == NULL)
+      elog (ERROR, "SPI_prepare failed ! \n");
+    // SAVEPLAN
+    prepared_plan = SPI_saveplan (new_plan);
+    if (prepared_plan == NULL)
+      elog (ERROR, "SPI_saveplan failed ! \n");
+  }
+  ret = SPI_execute_plan (prepared_plan, values, NULL, false, 0);
+  if (ret != SPI_OK_UPDATE)
+    elog (ERROR, "SPI_execute_plan failed ! \n");
+
+  SPI_finish ();
+  PG_RETURN_VOID ();
+}
+
+
+/*
+Datum
+pg_spi_prepare_update_without_saveplan(PG_FUNCTION_ARGS)
+{}*/
+void
+_PG_fini (void)
+{
+}
+
+
+/*
+
+*/
+
+
+Datum
+pg_spi_get_dep_ref_fees (PG_FUNCTION_ARGS)
+{
+  /* Define plan to save */
+  static SPIPlanPtr deposit_plan;
+  static SPIPlanPtr ref_plan;
+  static SPIPlanPtr fees_plan;
+  static SPIPlanPtr dummy_plan;
+  /* Define variables to update */
+  Timestamp refund_deadline = PG_GETARG_TIMESTAMP (0);
+  bytea *merchant_pub = PG_GETARG_BYTEA_P (1);
+  bytea *wire_target_h_payto = PG_GETARG_BYTEA_P (2);
+  bytea *wtid_raw = PG_GETARG_BYTEA_P (3);
+  bool is_null;
+  /* Define variables to store the results of each SPI query */
+  uint64_t sum_deposit_val  = 0;
+  uint32_t sum_deposit_frac = 0;
+  uint64_t s_refund_val     = 0;
+  uint32_t s_refund_frac    = 0;
+  uint64_t sum_dep_fee_val  = 0;
+  uint32_t sum_dep_fee_frac = 0;
+  uint64_t norm_refund_val  = 0;
+  uint32_t norm_refund_frac = 0;
+  uint64_t sum_refund_val   = 0;
+  uint32_t sum_refund_frac  = 0;
+  /* Define variables to store the Tuptable */
+  SPITupleTable *dep_res;
+  SPITupleTable *ref_res;
+  SPITupleTable *ref_by_coin_res;
+  SPITupleTable *norm_ref_by_coin_res;
+  SPITupleTable *fully_refunded_coins_res;
+  SPITupleTable *fees_res;
+  SPITupleTable *dummys_res;
+  /* Define variable to update */
+  Datum values_refund[2];
+  Datum values_deposit[3];
+  Datum values_fees[2];
+  Datum values_dummys[2];
+  TupleDesc tupdesc;
+  /* Define variables to replace some tables */
+  bytea *ref_by_coin_coin_pub;
+  int64 ref_by_coin_deposit_serial_id = 0;
+  bytea *norm_ref_by_coin_coin_pub;
+  int64_t norm_ref_by_coin_deposit_serial_id = 0;
+  bytea *new_dep_coin_pub = NULL;
+  int res = SPI_connect ();
+
+  /* Connect to SPI */
+  if (res < 0)
+  {
+    elog (ERROR, "Could not connect to SPI manager");
+  }
+  if (deposit_plan == NULL)
+  {
+    const char *dep_sql;
+    SPIPlanPtr new_plan;
+
+    // Execute first query and store results in variables
+    dep_sql =
+      "UPDATE deposits SET done=TRUE "
+      "WHERE NOT (done OR policy_blocked) "
+      "AND refund_deadline=$1 "
+      "AND merchant_pub=$2 "
+      "AND wire_target_h_payto=$3 "
+      "RETURNING "
+      "deposit_serial_id,"
+      "coin_pub,"
+      "amount_with_fee_val,"
+      "amount_with_fee_frac;";
+    fprintf (stderr, "dep sql %d\n", 1);
+    new_plan =
+      SPI_prepare (dep_sql, 4,(Oid[]){INT8OID, BYTEAOID, BYTEAOID});
+    fprintf (stderr, "dep sql %d\n", 2);
+    if (new_plan == NULL)
+      elog (ERROR, "SPI_prepare failed for dep \n");
+    deposit_plan = SPI_saveplan (new_plan);
+    if (deposit_plan == NULL)
+      elog (ERROR, "SPI_saveplan failed for dep \n");
+  }
+  fprintf (stdout, "dep sql %d\n", 3);
+
+  values_deposit[0] = Int64GetDatum (refund_deadline);
+  values_deposit[1] = PointerGetDatum (merchant_pub);
+  values_deposit[2] = PointerGetDatum (wire_target_h_payto);
+
+  res = SPI_execute_plan (deposit_plan,
+                          values_deposit,
+                          NULL,
+                          true,
+                          0);
+  fprintf (stdout, "dep sql %d\n", 4);
+  if (res != SPI_OK_UPDATE)
+  {
+    elog (ERROR, "Failed to execute subquery 1 \n");
+  }
+  // STORE TUPTABLE deposit
+  dep_res = SPI_tuptable;
+
+  for (unsigned int i = 0; i < SPI_processed; i++)
+  {
+    int64 dep_deposit_serial_ids = DatumGetInt64 (SPI_getbinval (
+                                                    SPI_tuptable->vals[i],
+                                                    SPI_tuptable->tupdesc, 1,
+                                                    &is_null));
+    bytea *dep_coin_pub = DatumGetByteaP (SPI_getbinval (SPI_tuptable->vals[i],
+                                                         SPI_tuptable->tupdesc,
+                                                         2, &is_null));
+    int64 dep_amount_val = DatumGetInt64 (SPI_getbinval (SPI_tuptable->vals[i],
+                                                         SPI_tuptable->tupdesc,
+                                                         3, &is_null));
+    int32 dep_amount_frac = DatumGetInt32 (SPI_getbinval (SPI_tuptable->vals[i],
+                                                          SPI_tuptable->tupdesc,
+                                                          4, &is_null));
+
+    if (is_null)
+      elog (ERROR, "Failed to retrieve data from deposit \n");
+    if (ref_plan == NULL)
+    {
+      // Execute second query with parameters from first query and store results in variables
+      const char *ref_sql =
+        "SELECT amount_with_fee_val, amount_with_fee_frac, coin_pub, deposit_serial_id "
+        "FROM refunds "
+        "WHERE coin_pub=$1 "
+        "AND deposit_serial_id=$2;";
+      SPIPlanPtr new_plan = SPI_prepare (ref_sql, 3, (Oid[]){BYTEAOID,
+                                                             INT8OID});
+      if (new_plan == NULL)
+        elog (ERROR, "SPI_prepare failed for refund\n");
+      ref_plan = SPI_saveplan (new_plan);
+      if (ref_plan == NULL)
+        elog (ERROR, "SPI_saveplan failed for refund\n");
+    }
+    values_refund[0] = PointerGetDatum (dep_coin_pub);
+    values_refund[1] = Int64GetDatum (dep_deposit_serial_ids);
+    res = SPI_execute_plan (ref_plan,
+                            values_refund,
+                            NULL,
+                            false,
+                            0);
+    if (res != SPI_OK_SELECT)
+      elog (ERROR, "Failed to execute subquery 2\n");
+    // STORE TUPTABLE refund
+    ref_res = SPI_tuptable;
+    for (unsigned int j = 0; j < SPI_processed; j++)
+    {
+      int64 ref_refund_val = DatumGetInt64 (SPI_getbinval (
+                                              SPI_tuptable->vals[j],
+                                              SPI_tuptable->tupdesc, 1,
+                                              &is_null));
+      int32 ref_refund_frac = DatumGetInt32 (SPI_getbinval (
+                                               SPI_tuptable->vals[j],
+                                               SPI_tuptable->tupdesc, 2,
+                                               &is_null));
+      bytea *ref_coin_pub = DatumGetByteaP (SPI_getbinval (
+                                              SPI_tuptable->vals[j],
+                                              SPI_tuptable->tupdesc, 3,
+                                              &is_null));
+      int64 ref_deposit_serial_id = DatumGetInt64 (SPI_getbinval (
+                                                     SPI_tuptable->vals[j],
+                                                     SPI_tuptable->tupdesc, 4,
+                                                     &is_null));
+      // Execute third query with parameters from second query and store results in variables
+      ref_by_coin_coin_pub = ref_coin_pub;
+      ref_by_coin_deposit_serial_id = ref_deposit_serial_id;
+      // LOOP TO GET THE SUM FROM REFUND BY COIN
+      for (unsigned int i = 0; i<SPI_processed; i++)
+      {
+        if ((ref_by_coin_coin_pub ==
+             DatumGetByteaP (SPI_getbinval (SPI_tuptable->vals[i],
+                                            SPI_tuptable->tupdesc, 1,
+                                            &is_null)))
+            &&
+            (ref_by_coin_deposit_serial_id ==
+             DatumGetUInt64 (SPI_getbinval (SPI_tuptable->vals[i],
+                                            SPI_tuptable->tupdesc, 2,
+                                            &is_null)))
+            )
+        {
+          sum_refund_val += ref_refund_val;
+          sum_refund_frac += ref_refund_frac;
+          norm_ref_by_coin_coin_pub = ref_by_coin_coin_pub;
+          norm_ref_by_coin_deposit_serial_id = ref_by_coin_deposit_serial_id;
+        }
+      }// END SUM CALCULATION
+      // NORMALIZE REFUND VAL FRAC
+      norm_refund_val =
+        (sum_refund_val + sum_refund_frac) / 100000000;
+      norm_refund_frac =
+        sum_refund_frac % 100000000;
+      // Get refund values
+      s_refund_val += sum_refund_val;
+      s_refund_frac = sum_refund_frac;
+    }// END REFUND
+    if (norm_ref_by_coin_coin_pub == dep_coin_pub
+        && ref_by_coin_deposit_serial_id == dep_deposit_serial_ids
+        && norm_refund_val == dep_amount_val
+        && norm_refund_frac == dep_amount_frac)
+    {
+      new_dep_coin_pub = dep_coin_pub;
+    }
+    // Ensure we get the fee for each coin and not only once per denomination
+    if (fees_plan == NULL)
+    {
+      const char *fees_sql =
+        "SELECT "
+        "  denom.fee_deposit_val AS fee_val, "
+        "  denom.fee_deposit_frac AS fee_frac, "
+        "FROM known_coins kc"
+        "JOIN denominations denom USING (denominations_serial) "
+        "WHERE kc.coin_pub = $1 AND kc.coin_pub != $2;";
+      SPIPlanPtr new_plan = SPI_prepare (fees_sql, 3, (Oid[]){BYTEAOID,
+                                                              BYTEAOID});
+      if (new_plan == NULL)
+      {
+        elog (ERROR, "SPI_prepare for fees failed ! \n");
+      }
+      fees_plan = SPI_saveplan (new_plan);
+      if (fees_plan == NULL)
+      {
+        elog (ERROR, "SPI_saveplan for fees failed ! \n");
+      }
+    }
+    values_fees[0] = PointerGetDatum (dep_coin_pub);
+    values_fees[1] = PointerGetDatum (new_dep_coin_pub);
+    res = SPI_execute_plan (fees_plan, values_fees, NULL, false, 0);
+    if (res != SPI_OK_SELECT)
+      elog (ERROR, "SPI_execute_plan failed for fees \n");
+    fees_res = SPI_tuptable;
+    tupdesc = fees_res->tupdesc;
+    for (unsigned int i = 0; i<SPI_processed; i++)
+    {
+      HeapTuple tuple = fees_res->vals[i];
+      bool is_null;
+      uint64_t fee_val = DatumGetUInt64 (SPI_getbinval (tuple, tupdesc, 1,
+                                                        &is_null));
+      uint32_t fee_frac = DatumGetUInt32 (SPI_getbinval (tuple, tupdesc, 2,
+                                                         &is_null));
+      uint64_t fees_deposit_serial_id = DatumGetUInt64 (SPI_getbinval (tuple,
+                                                                       tupdesc,
+                                                                       3,
+                                                                       &is_null));
+      if (dummy_plan == NULL)
+      {
+        const char *insert_dummy_sql =
+          "INSERT INTO "
+          "aggregation_tracking(deposit_serial_id, wtid_raw)"
+          " VALUES ($1, $2)";
+
+        SPIPlanPtr new_plan = SPI_prepare (insert_dummy_sql, 2, (Oid[]){INT8OID,
+                                                                        BYTEAOID});
+        if (new_plan == NULL)
+          elog (ERROR, "FAILED to prepare aggregation tracking \n");
+        dummy_plan = SPI_saveplan (new_plan);
+        if (dummy_plan == NULL)
+          elog (ERROR, "FAILED to saveplan aggregation tracking\n");
+      }
+      values_dummys[0] = Int64GetDatum (dep_deposit_serial_ids);
+      values_dummys[1] = PointerGetDatum (wtid_raw);
+      res = SPI_execute_plan (dummy_plan, values_dummys, NULL, false, 0);
+      if (res != SPI_OK_INSERT)
+        elog (ERROR, "Failed to insert dummy\n");
+      dummys_res = SPI_tuptable;
+      // Calculation of deposit fees for not fully refunded deposits
+      sum_dep_fee_val  += fee_val;
+      sum_dep_fee_frac += fee_frac;
+    }
+    // Get deposit values
+    sum_deposit_val += dep_amount_val;
+    sum_deposit_frac += dep_amount_frac;
+  }// END DEPOSIT
+  SPI_finish ();
+  PG_RETURN_VOID ();
+}
diff --git a/src/exchangedb/spi/own_test.control b/src/exchangedb/spi/own_test.control
new file mode 100644
index 000000000..4e73e207f
--- /dev/null
+++ b/src/exchangedb/spi/own_test.control
@@ -0,0 +1,4 @@
+comment = 'Example extension for testing purposes'
+default_version = '1.0'
+module_pathname = '$libdir/own_test'
+relocatable = true
diff --git a/src/exchangedb/spi/own_test.sql b/src/exchangedb/spi/own_test.sql
new file mode 100644
index 000000000..12729d068
--- /dev/null
+++ b/src/exchangedb/spi/own_test.sql
@@ -0,0 +1,201 @@
+DROP TABLE IF EXISTS X;
+CREATE TABLE X (
+  a integer
+);
+
+INSERT INTO X (a)
+  VALUES (1), (2), (3), (4), (5), (6), (7);
+
+DROP TABLE IF EXISTS Y;
+CREATE TABLE Y (col1 INT, col2 INT);
+INSERT INTO Y (col1,col2)
+  VALUES (1,2), (2,0), (0,4), (4,0), (0,6), (6,7), (7,8);
+
+DROP TABLE IF EXISTS Z;
+CREATE TABLE Z (col1 BYTEA);
+
+DROP TABLE IF EXISTS deposits;
+CREATE TABLE deposits(
+       deposit_serial_id BIGINT GENERATED BY DEFAULT AS IDENTITY
+      ,shard INT8 NOT NULL
+      ,coin_pub BYTEA NOT NULL CHECK (LENGTH(coin_pub)=32)
+      ,known_coin_id INT8 NOT NULL
+      ,amount_with_fee_val INT8 NOT NULL
+      ,amount_with_fee_frac INT4 NOT NULL
+      ,wallet_timestamp INT8 NOT NULL
+      ,exchange_timestamp INT8 NOT NULL
+      ,refund_deadline INT8 NOT NULL
+      ,wire_deadline INT8 NOT NULL
+      ,merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)
+      ,h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)
+      ,coin_sig BYTEA NOT NULL CHECK (LENGTH(coin_sig)=64)
+      ,wire_salt BYTEA NOT NULL CHECK (LENGTH(wire_salt)=16)
+      ,wire_target_h_payto BYTEA CHECK (LENGTH(wire_target_h_payto)=32)
+      ,done BOOLEAN NOT NULL DEFAULT FALSE
+      ,policy_blocked BOOLEAN NOT NULL DEFAULT FALSE
+      ,policy_details_serial_id INT8);
+
+
+DROP FUNCTION IF EXISTS pg_spi_insert_int;
+CREATE FUNCTION pg_spi_insert_int()
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_insert_int';
+
+DROP FUNCTION IF EXISTS pg_spi_select_from_x;
+CREATE FUNCTION pg_spi_select_from_x()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_select_from_x';
+
+/*
+CREATE FUNCTION pg_spi_select_pair_from_y()
+  RETURNS valuest
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_select_pair_from_y';
+*/
+/*CREATE FUNCTION pg_spi_select_with_cond()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_select_with_cond';
+*/
+
+DROP FUNCTION IF EXISTS pg_spi_update_y;
+CREATE FUNCTION pg_spi_update_y()
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_update_y';
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_example;
+CREATE FUNCTION pg_spi_prepare_example()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_example';
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_example_without_saveplan;
+CREATE FUNCTION pg_spi_prepare_example_without_saveplan()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_example_without_saveplan';
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_insert;
+CREATE FUNCTION pg_spi_prepare_insert()
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_insert';
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_insert_without_saveplan;
+CREATE FUNCTION pg_spi_prepare_insert_without_saveplan()
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_insert_without_saveplan';
+
+/*
+CREATE FUNCTION pg_spi_prepare_select_with_cond()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_select_with_cond';
+*/
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_select_with_cond_without_saveplan;
+CREATE FUNCTION pg_spi_prepare_select_with_cond_without_saveplan()
+  RETURNS INT8
+  LANGUAGE c COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_select_with_cond_without_saveplan';
+
+DROP FUNCTION IF EXISTS pg_spi_prepare_update;
+CREATE FUNCTION pg_spi_prepare_update()
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_prepare_update';
+
+DROP FUNCTION IF EXISTS pg_spi_get_dep_ref_fees;
+CREATE FUNCTION pg_spi_get_dep_ref_fees(
+  IN in_timestamp INT8
+ ,IN merchant_pub BYTEA
+ ,IN wire_target_h_payto BYTEA
+ ,IN wtid BYTEA
+)
+  RETURNS VOID
+  LANGUAGE c VOLATILE COST 100
+AS '$libdir/own_test', 'pg_spi_get_dep_ref_fees';
+
+DROP FUNCTION IF EXISTS update_pg_spi_get_dep_ref_fees;
+CREATE FUNCTION update_pg_spi_get_dep_ref_fees(
+ IN in_refund_deadline INT8,
+ IN in_merchant_pub BYTEA,
+ IN in_wire_target_h_payto BYTEA
+)
+RETURNS SETOF record
+LANGUAGE plpgsql VOLATILE
+AS $$
+DECLARE
+
+BEGIN
+RETURN QUERY
+  UPDATE deposits
+  SET done = TRUE
+  WHERE NOT (done OR policy_blocked)
+  AND refund_deadline < in_refund_deadline
+  AND merchant_pub = in_merchant_pub
+  AND wire_target_h_payto = in_wire_target_h_payto
+  RETURNING
+  deposit_serial_id,
+  coin_pub,
+  amount_with_fee_val,
+  amount_with_fee_frac;
+END $$;
+
+DROP FUNCTION IF EXISTS stored_procedure_update;
+CREATE FUNCTION stored_procedure_update(
+IN in_number INT8
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  UPDATE Y
+  SET col1 = 4
+  WHERE col2 = in_number;
+END $$;
+
+DROP FUNCTION IF EXISTS stored_procedure_select;
+CREATE FUNCTION stored_procedure_select(OUT out_value INT8)
+RETURNS INT8
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  SELECT 1
+    INTO out_value
+  FROM X;
+  RETURN;
+END $$;
+
+
+DROP FUNCTION IF EXISTS stored_procedure_insert;
+CREATE FUNCTION stored_procedure_insert(
+IN in_number INT8,
+OUT out_number INT8)
+RETURNS INT8
+LANGUAGE plpgsql
+AS $$
+BEGIN
+  INSERT INTO X (a)
+  VALUES (in_number)
+  RETURNING a INTO out_number;
+END $$;
+
+DROP FUNCTION IF EXISTS stored_procedure_select_with_cond;
+CREATE FUNCTION stored_procedure_select_with_cond(
+IN in_number INT8,
+OUT out_number INT8
+)
+RETURNS INT8
+LANGUAGE plpgsql
+AS $$
+BEGIN
+ SELECT col1 INTO out_number
+ FROM Y
+ WHERE col2 = in_number;
+ RETURN;
+END $$;
diff --git a/src/exchangedb/spi/perf_own_test.c b/src/exchangedb/spi/perf_own_test.c
new file mode 100644
index 000000000..92be2235e
--- /dev/null
+++ b/src/exchangedb/spi/perf_own_test.c
@@ -0,0 +1,25 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file exchangedb/spi/perf_own_test.c
+ * @brief benchmark for 'own_test'
+ * @author Joseph Xu
+ */
+#include "exchangedb/platform.h"
+#include "exchangedb/taler_exchangedb_lib.h"
+#include "exchangedb/taler_json_lib.h"
+#include "exchangedb/taler_exchangedb_plugin.h"
+#include "own_test.sql"
diff --git a/src/exchangedb/spi/pg_aggregate.c b/src/exchangedb/spi/pg_aggregate.c
new file mode 100644
index 000000000..721f247c7
--- /dev/null
+++ b/src/exchangedb/spi/pg_aggregate.c
@@ -0,0 +1,411 @@
+#include "postgres.h"
+#include "fmgr.h"
+#include "utils/numeric.h"
+#include "utils/builtins.h"
+#include "executor/spi.h"
+
+PG_MODULE_MAGIC;
+
+PG_FUNCTION_INFO_V1 (get_deposit_summary);
+
+Datum
+get_deposit_summary (PG_FUNCTION_ARGS)
+{
+
+  static SPIPlanPtr deposit_plan;
+  static SPIPlanPtr refund_plan;
+  static SPIPlanPtr refund_by_coin_plan;
+  static SPIPlanPtr norm_refund_by_coin_plan;
+  static SPIPlanPtr fully_refunded_by_coins_plan;
+  static SPIPlanPtr fees_plan;
+
+  int shard = PG_GETARG_INT32 (0);
+  char *sql;
+  char *merchant_pub = text_to_cstring (PG_GETARG_TEXT_P (1));
+  char *wire_target_h_payto = text_to_cstring (PG_GETARG_TEXT_P (2));
+  char *wtid_raw = text_to_cstring (PG_GETARG_TEXT_P (3));
+  int refund_deadline = PG_GETARG_INT32 (4);
+  int conn = SPI_connect ();
+  if (conn != SPI_OK_CONNECT)
+  {
+    elog (ERROR, "DB connection failed ! \n");
+  }
+
+  if (deposit_plan == NULL
+      || refund_plan == NULL
+      || refund_by_coin_plan == NULL
+      || norm_refund_by_coin_plan = NULL
+                                    || fully_refunded_coins_plan = NULL
+                                                                   || fees_plan
+                                                                   == NULL)
+  {
+    if (deposit_plan == NULL)
+    {
+      int nargs = 3;
+      Oid argtypes[3];
+      argtypes[0] = INT8OID;
+      argtypes[1] = BYTEAOID;
+      argtypes[2] = BYTEAOID;
+      const char *dep_sql =
+        "    UPDATE deposits"
+        "    SET done=TRUE"
+        "    WHERE NOT (done OR policy_blocked)"
+        "        AND refund_deadline < $1"
+        "        AND merchant_pub = $2"
+        "        AND wire_target_h_payto = $3"
+        "    RETURNING"
+        "        deposit_serial_id"
+        "        ,coin_pub"
+        "        ,amount_with_fee_val AS amount_val"
+        "        ,amount_with_fee_frac AS amount_frac";
+      SPIPlanPtr new_plan =
+        SPI_prepare (dep_sql, 4, argtypes);
+      if (new_plan == NULL)
+      {
+        elog (ERROR, "SPI_prepare for deposit failed ! \n");
+      }
+      deposit_plan = SPI_saveplan (new_plan);
+      if (deposit_plan == NULL)
+      {
+        elog (ERROR, "SPI_saveplan for deposit failed ! \n");
+      }
+    }
+
+    Datum values[4];
+    values[0] = Int64GetDatum (refund_deadline);
+    values[1] = CStringGetDatum (merchant_pub);
+    values[2] = CStringGetDatum (wire_target_h_payto);
+    int ret = SPI_execute_plan (deposit_plan,
+                                values,
+                                NULL,
+                                true,
+                                0);
+    if (ret != SPI_OK_UPDATE)
+    {
+      elog (ERROR, "Failed to execute subquery 1\n");
+    }
+    uint64_t *dep_deposit_serial_ids = palloc (sizeof(uint64_t)
+                                               * SPI_processed);
+    BYTEA **dep_coin_pubs = palloc (sizeof(BYTEA *) * SPI_processed);
+    uint64_t *dep_amount_vals = palloc (sizeof(uint64_t) * SPI_processed);
+    uint32_t *dep_amount_fracs = palloc (sizeof(uint32_t) * SPI_processed);
+    for (unsigned int i = 0; i < SPI_processed; i++)
+    {
+      HeapTuple tuple = SPI_tuptable->vals[i];
+      dep_deposit_serial_ids[i] =
+        DatumGetInt64 (SPI_getbinval (tuple, SPI_tuptable->tupdesc, 1, &ret));
+      dep_coin_pubs[i] =
+        DatumGetByteaP (SPI_getbinval (tuple, SPI_tuptable->tupdesc, 2, &ret));
+      dep_amount_vals[i] =
+        DatumGetInt64 (SPI_getbinval (tuple, SPI_tuptable->tupdesc, 3, &ret));
+      dep_amount_fracs[i] =
+        DatumGetInt32 (SPI_getbinval (tuple, SPI_tuptable->tupdesc, 4, &ret));
+    }
+
+
+    if (refund_plan == NULL)
+    {
+      const char *ref_sql =
+        "ref AS ("
+        "  SELECT"
+        "    amount_with_fee_val AS refund_val"
+        "   ,amount_with_fee_frac AS refund_frac"
+        "   ,coin_pub"
+        "   ,deposit_serial_id"
+        "    FROM refunds"
+        "   WHERE coin_pub IN (SELECT coin_pub FROM dep)"
+        "     AND deposit_serial_id IN (SELECT deposit_serial_id FROM dep)) ";
+      SPIPlanPtr new_plan = SPI_prepare (ref_sql, 0, NULL);
+      if (new_plan == NULL)
+        elog (ERROR, "SPI_prepare for refund failed ! \n");
+      refund_plan = SPI_saveplan (new_plan);
+      if (refund_plan == NULL)
+      {
+        elog (ERROR, "SPI_saveplan for refund failed ! \n");
+      }
+    }
+
+    int64t_t *ref_deposit_serial_ids = palloc (sizeof(int64_t) * SPI_processed);
+
+    int res = SPI_execute_plan (refund_plan, NULL, NULL, false, 0);
+    if (res != SPI_OK_SELECT)
+    {
+      elog (ERROR, "Failed to execute subquery 2\n");
+    }
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+    for (unsigned int i = 0; i < SPI_processed; i++)
+    {
+      HeapTuple tuple = tuptable->vals[i];
+      Datum refund_val = SPI_getbinval (tuple, tupdesc, 1, &refund_val_isnull);
+      Datum refund_frac = SPI_getbinval (tuple, tupdesc, 2,
+                                         &refund_frac_isnull);
+      Datum coin_pub = SPI_getbinval (tuple, tupdesc, 3, &coin_pub_isnull);
+      Datum deposit_serial_id = SPI_getbinval (tuple, tupdesc, 4,
+                                               &deposit_serial_id_isnull);
+      if (refund_val_isnull
+          || refund_frac_isnull
+          || coin_pub_isnull
+          || deposit_serial_id_isnull)
+      {
+        elog (ERROR, "Failed to retrieve data from subquery 2");
+      }
+      uint64_t refund_val_int = DatumGetUInt64 (refund_val);
+      uint32_t refund_frac_int = DatumGetUInt32 (refund_frac);
+      BYTEA coin_pub = DatumGetByteaP (coin_pub);
+      ref_deposit_serial_ids = DatumGetInt64 (deposit_serial_id);
+
+      refund *new_refund = (refund*) palloc (sizeof(refund));
+      new_refund->coin_pub = coin_pub_str;
+      new_refund->deposit_serial_id = deposit_serial_id_int;
+      new_refund->amount_with_fee_val = refund_val_int;
+      new_refund->amount_with_fee_frac = refund_frac_int;
+    }
+
+
+    if (refund_by_coin_plan == NULL)
+    {
+      const char *ref_by_coin_sql =
+        "ref_by_coin AS ("
+        "  SELECT"
+        "    SUM(refund_val) AS sum_refund_val"
+        "   ,SUM(refund_frac) AS sum_refund_frac"
+        "   ,coin_pub"
+        "   ,deposit_serial_id"
+        "    FROM ref"
+        "   GROUP BY coin_pub, deposit_serial_id) ";
+      SPIPlanPtr new_plan = SPI_prepare (ref_by_coin_sql, 0, NULL);
+      if (new_plan == NULL)
+        elog (ERROR, "SPI_prepare for refund by coin failed ! \n");
+      refund_by_coin_plan = SPI_saveplan (new_plan);
+      if (refund_by_coin_plan == NULL)
+        elog (ERROR, "SPI_saveplan for refund failed");
+    }
+
+
+    int res = SPI_execute_plan (refund_by_coin_plan, NULL, NULL, false, 0);
+    if (res != SPI_OK_SELECT)
+    {
+      elog (ERROR, "Failed to execute subquery 2\n");
+    }
+
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+    for (unsigned int i = 0; i < SPI_processed; i++)
+    {
+      HeapTuple tuple = tuptable->vals[i];
+      Datum sum_refund_val = SPI_getbinval (tuple, tupdesc, 1,
+                                            &refund_val_isnull);
+      Datum sum_refund_frac = SPI_getbinval (tuple, tupdesc, 2,
+                                             &refund_frac_isnull);
+      Datum coin_pub = SPI_getbinval (tuple, tupdesc, 3, &coin_pub_isnull);
+      Datum deposit_serial_id_int = SPI_getbinval (tuple, tupdesc, 4,
+                                                   &deposit_serial_id_isnull);
+      if (refund_val_isnull
+          || refund_frac_isnull
+          || coin_pub_isnull
+          || deposit_serial_id_isnull)
+      {
+        elog (ERROR, "Failed to retrieve data from subquery 2");
+      }
+      uint64_t s_refund_val_int = DatumGetUInt64 (sum_refund_val);
+      uint32_t s_refund_frac_int = DatumGetUInt32 (sum_refund_frac);
+      BYTEA coin_pub = DatumGetByteaP (coin_pub);
+      uint64_t deposit_serial_id_int = DatumGetInt64 (deposit_serial_id_int);
+      refund *new_refund_by_coin = (refund*) palloc (sizeof(refund));
+      new_refund_by_coin->coin_pub = coin_pub;
+      new_refund_by_coin->deposit_serial_id = deposit_serial_id_int;
+      new_refund_by_coin->refund_amount_with_fee_val = s_refund_val_int;
+      new_refund_by_coin->refund_amount_with_fee_frac = s_refund_frac_int;
+    }
+
+
+    if (norm_refund_by_coin_plan == NULL)
+    {
+      const char *norm_ref_by_coin_sql =
+        "norm_ref_by_coin AS ("
+        "  SELECT"
+        "   coin_pub"
+        "   ,deposit_serial_id"
+        "    FROM ref_by_coin) ";
+      SPIPlanPtr new_plan = SPI_prepare (norm_ref_by_coin_sql, 0, NULL);
+      if (new_plan == NULL)
+        elog (ERROR, "SPI_prepare for norm refund by coin failed ! \n");
+      norm_refund_by_coin_plan = SPI_saveplan (new_plan);
+      if (norm_refund_by_coin_plan == NULL)
+        elog (ERROR, "SPI_saveplan for norm refund by coin failed ! \n");
+    }
+
+    double norm_refund_val =
+      ((double) new_refund_by_coin->refund_amount_with_fee_val
+       + (double) new_refund_by_coin->refund_amount_with_fee_frac) / 100000000;
+    double norm_refund_frac =
+      (double) new_refund_by_coin->refund_amount_with_fee_frac % 100000000;
+
+    if (fully_refunded_coins_plan == NULL)
+    {
+      const char *fully_refunded_coins_sql =
+        "fully_refunded_coins AS ("
+        "  SELECT"
+        "    dep.coin_pub"
+        "    FROM norm_ref_by_coin norm"
+        "    JOIN dep"
+        "      ON (norm.coin_pub = dep.coin_pub"
+        "      AND norm.deposit_serial_id = dep.deposit_serial_id"
+        "      AND norm.norm_refund_val = dep.amount_val"
+        "      AND norm.norm_refund_frac = dep.amount_frac)) ";
+      SPIPlanPtr new_plan =
+        SPI_prepare (fully_refunded_coins_sql, 0, NULL);
+      if (new_plan == NULL)
+        elog (ERROR, "SPI_prepare for fully refunded coins failed ! \n");
+      fully_refunded_coins_plan = SPI_saveplan (new_plan);
+      if (fully_refunded_coins_plan == NULL)
+        elog (ERROR, "SPI_saveplan for fully refunded coins failed ! \n");
+    }
+
+    int res = SPI_execute_plan (fully_refunded_coins_sql);
+    if (res != SPI_OK_SELECT)
+      elog (ERROR, "Failed to execute subquery 4\n");
+    SPITupleTable *tuptable = SPI_tuptable;
+    TupleDesc tupdesc = tuptable->tupdesc;
+
+    BYTEA coin_pub = SPI_getbinval (tuple, tupdesc, 1, &coin_pub_isnull);
+    if (fees_plan == NULL)
+    {
+      const char *fees_sql =
+        "SELECT "
+        "  denom.fee_deposit_val AS fee_val, "
+        "  denom.fee_deposit_frac AS fee_frac, "
+        "  cs.deposit_serial_id "
+        "FROM dep cs "
+        "JOIN known_coins kc USING (coin_pub) "
+        "JOIN denominations denom USING (denominations_serial) "
+        "WHERE coin_pub NOT IN (SELECT coin_pub FROM fully_refunded_coins)";
+      SPIPlanPtr new_plan =
+        SPI_prepare (fees_sql, 0, NULL);
+      if (new_plan == NULL)
+      {
+        elog (ERROR, "SPI_prepare for fees failed ! \n");
+      }
+      fees_plan = SPI_saveplan (new_plan);
+      if (fees_plan == NULL)
+      {
+        elog (ERROR, "SPI_saveplan for fees failed ! \n");
+      }
+    }
+  }
+  int fees_ntuples;
+  SPI_execute (fees_sql, true, 0);
+  if (SPI_result_code () != SPI_OK_SELECT)
+  {
+    ereport (
+      ERROR,
+      (errcode (ERRCODE_INTERNAL_ERROR),
+       errmsg ("deposit fee query failed: error code %d \n",
+               SPI_result_code ())));
+  }
+  fees_ntuples = SPI_processed;
+
+  if (fees_ntuples > 0)
+  {
+    for (i = 0; i < fees_ntuples; i++)
+    {
+      Datum fee_val_datum =
+        SPI_getbinval (SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 1,
+                       &fee_null);
+      Datum fee_frac_datum =
+        SPI_getbinval (SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 2,
+                       &fee_null);
+      Datum deposit_id_datum =
+        SPI_getbinval (SPI_tuptable->vals[i], SPI_tuptable->tupdesc, 3,
+                       &deposit_null);
+      if (! fee_null && ! deposit_null)
+      {
+        int64 fee_val = DatumGetInt64 (fee_val_datum);
+        int32 fee_frac = DatumGetInt32 (fee_frac_datum);
+        int64 deposit_id = DatumGetInt64 (deposit_id_datum);
+        sum_fee_value += fee_val;
+        sum_fee_fraction += fee_frac;
+        char *insert_agg_sql =
+          psprintf (
+            "INSERT INTO "
+            "aggregation_tracking(deposit_serial_id, wtid_raw)"
+            " VALUES (%lld, '%s')",
+            deposit_id, wtid_raw);
+        SPI_execute (insert_agg_sql, false, 0);
+      }
+    }
+  }
+
+  TupleDesc tupdesc;
+  SPITupleTable *tuptable = SPI_tuptable;
+  HeapTuple tuple;
+  Datum result;
+
+  if (tuptable == NULL || SPI_processed != 1)
+  {
+    ereport (
+      ERROR,
+      (errcode (ERRCODE_INTERNAL_ERROR),
+       errmsg ("Unexpected result \n")));
+  }
+  tupdesc = SPI_tuptable->tupdesc;
+  tuple = SPI_tuptable->vals[0];
+  result = HeapTupleGetDatum (tuple);
+
+  TupleDesc result_desc = CreateTemplateTupleDesc (6, false);
+  TupleDescInitEntry (result_desc, (AttrNumber) 1, "sum_deposit_value", INT8OID,
+                      -1, 0);
+  TupleDescInitEntry (result_desc, (AttrNumber) 2, "sum_deposit_fraction",
+                      INT4OID, -1, 0);
+  TupleDescInitEntry (result_desc, (AttrNumber) 3, "sum_refund_value", INT8OID,
+                      -1, 0);
+  TupleDescInitEntry (result_desc, (AttrNumber) 4, "sum_refund_fraction",
+                      INT4OID, -1, 0);
+  TupleDescInitEntry (result_desc, (AttrNumber) 5, "sum_fee_value", INT8OID, -1,
+                      0);
+  TupleDescInitEntry (result_desc, (AttrNumber) 6, "sum_fee_fraction", INT4OID,
+                      -1, 0);
+
+  int ret = SPI_prepare (sql, 4, argtypes);
+  if (ret != SPI_OK_PREPARE)
+  {
+    elog (ERROR, "Failed to prepare statement: %s \n", sql);
+  }
+
+  ret = SPI_execute_plan (plan, args, nulls, true, 0);
+  if (ret != SPI_OK_SELECT)
+  {
+    elog (ERROR, "Failed to execute statement: %s \n", sql);
+  }
+
+  if (SPI_processed > 0)
+  {
+    HeapTuple tuple;
+    Datum values[6];
+    bool nulls[6] = {false};
+    values[0] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1,
+                     &nulls[0]);
+    values[1] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 2,
+                     &nulls[1]);
+    values[2] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 3,
+                     &nulls[2]);
+    values[3] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 4,
+                     &nulls[3]);
+    values[4] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 5,
+                     &nulls[4]);
+    values[5] =
+      SPI_getbinval (SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 6,
+                     &nulls[5]);
+    tuple = heap_form_tuple (result_desc, values, nulls);
+    PG_RETURN_DATUM (HeapTupleGetDatum (tuple));
+  }
+  SPI_finish ();
+
+  PG_RETURN_NULL ();
+}
diff --git a/src/exchangedb/test-exchange-db-postgres.conf b/src/exchangedb/test-exchange-db-postgres.conf
index ab70bcfce..7f0332686 100644
--- a/src/exchangedb/test-exchange-db-postgres.conf
+++ b/src/exchangedb/test-exchange-db-postgres.conf
@@ -30,4 +30,7 @@ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
 LEGAL_RESERVE_EXPIRATION_TIME = 7 years
 
 # Shift to apply before aggregating.
-AGGREGATOR_SHIFT = 1s
\ No newline at end of file
+AGGREGATOR_SHIFT = 1s
+
+# Number of purses per account by default.
+DEFAULT_PURSE_LIMIT = 1
diff --git a/src/exchangedb/test-exchangedb-batch-reserves-in-insert-postgres b/src/exchangedb/test-exchangedb-batch-reserves-in-insert-postgres
new file mode 100755
index 000000000..bc044232a
--- /dev/null
+++ b/src/exchangedb/test-exchangedb-batch-reserves-in-insert-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# test-exchangedb-batch-reserves-in-insert-postgres - temporary wrapper script for .libs/test-exchangedb-batch-reserves-in-insert-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The test-exchangedb-batch-reserves-in-insert-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "test-exchangedb-batch-reserves-in-insert-postgres:test-exchangedb-batch-reserves-in-insert-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "test-exchangedb-batch-reserves-in-insert-postgres:test-exchangedb-batch-reserves-in-insert-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "test-exchangedb-batch-reserves-in-insert-postgres:test-exchangedb-batch-reserves-in-insert-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='test-exchangedb-batch-reserves-in-insert-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/test-exchangedb-by-j-postgres b/src/exchangedb/test-exchangedb-by-j-postgres
new file mode 100755
index 000000000..11d295cc2
--- /dev/null
+++ b/src/exchangedb/test-exchangedb-by-j-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# test-exchangedb-by-j-postgres - temporary wrapper script for .libs/test-exchangedb-by-j-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The test-exchangedb-by-j-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "test-exchangedb-by-j-postgres:test-exchangedb-by-j-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "test-exchangedb-by-j-postgres:test-exchangedb-by-j-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "test-exchangedb-by-j-postgres:test-exchangedb-by-j-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='test-exchangedb-by-j-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/test-exchangedb-populate-link-data-postgres b/src/exchangedb/test-exchangedb-populate-link-data-postgres
new file mode 100755
index 000000000..f3d673519
--- /dev/null
+++ b/src/exchangedb/test-exchangedb-populate-link-data-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# test-exchangedb-populate-link-data-postgres - temporary wrapper script for .libs/test-exchangedb-populate-link-data-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The test-exchangedb-populate-link-data-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "test-exchangedb-populate-link-data-postgres:test-exchangedb-populate-link-data-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "test-exchangedb-populate-link-data-postgres:test-exchangedb-populate-link-data-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "test-exchangedb-populate-link-data-postgres:test-exchangedb-populate-link-data-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='test-exchangedb-populate-link-data-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/test-exchangedb-populate-ready-deposit-postgres b/src/exchangedb/test-exchangedb-populate-ready-deposit-postgres
new file mode 100755
index 000000000..7747f381c
--- /dev/null
+++ b/src/exchangedb/test-exchangedb-populate-ready-deposit-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# test-exchangedb-populate-ready-deposit-postgres - temporary wrapper script for .libs/test-exchangedb-populate-ready-deposit-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The test-exchangedb-populate-ready-deposit-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "test-exchangedb-populate-ready-deposit-postgres:test-exchangedb-populate-ready-deposit-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "test-exchangedb-populate-ready-deposit-postgres:test-exchangedb-populate-ready-deposit-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "test-exchangedb-populate-ready-deposit-postgres:test-exchangedb-populate-ready-deposit-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='test-exchangedb-populate-ready-deposit-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/test-exchangedb-populate-select-refunds-by-coin-postgres b/src/exchangedb/test-exchangedb-populate-select-refunds-by-coin-postgres
new file mode 100755
index 000000000..ce7ebb712
--- /dev/null
+++ b/src/exchangedb/test-exchangedb-populate-select-refunds-by-coin-postgres
@@ -0,0 +1,210 @@
+#! /bin/bash
+
+# test-exchangedb-populate-select-refunds-by-coin-postgres - temporary wrapper script for .libs/test-exchangedb-populate-select-refunds-by-coin-postgres
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15
+#
+# The test-exchangedb-populate-select-refunds-by-coin-postgres program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' libtalerexchangedb.la ../../src/json/libtalerjson.la ../../src/util/libtalerutil.la ../../src/pq/libtalerpq.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    file="$0"
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+    ECHO="printf %s\\n"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ that is used only on
+# windows platforms, and (c) all begin with the string --lt-
+# (application programs are unlikely to have options that match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's ../../libtool value, followed by no.
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=$0
+  shift
+  for lt_opt
+  do
+    case "$lt_opt" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%/[^/]*$%%'`
+        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 's%^.*/%%'`
+        cat "$lt_dump_D/$lt_dump_F"
+        exit 0
+      ;;
+    --lt-*)
+        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n "$lt_option_debug"; then
+    echo "test-exchangedb-populate-select-refunds-by-coin-postgres:test-exchangedb-populate-select-refunds-by-coin-postgres:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    $ECHO "test-exchangedb-populate-select-refunds-by-coin-postgres:test-exchangedb-populate-select-refunds-by-coin-postgres:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
+    lt_dump_args_N=`expr $lt_dump_args_N + 1`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+
+      if test -n "$lt_option_debug"; then
+        $ECHO "test-exchangedb-populate-select-refunds-by-coin-postgres:test-exchangedb-populate-select-refunds-by-coin-postgres:$LINENO: newargv[0]: $progdir/$program" 1>&2
+        func_lt_dump_args ${1+"$@"} 1>&2
+      fi
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from $@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case " $* " in
+  *\ --lt-*)
+    for lt_wr_arg
+    do
+      case $lt_wr_arg in
+      --lt-*) ;;
+      *) set x "$@" "$lt_wr_arg"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core ${1+"$@"}
+}
+
+  # Parse options
+  func_parse_lt_options "$0" ${1+"$@"}
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='test-exchangedb-populate-select-refunds-by-coin-postgres'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    LD_LIBRARY_PATH="/home/priscilla/exchange/src/exchangedb/.libs:/home/priscilla/exchange/src/json/.libs:/home/priscilla/exchange/src/util/.libs:/home/priscilla/exchange/src/pq/.libs:$LD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /usr/bin/sed 's/::*$//'`
+
+    export LD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+      func_exec_program ${1+"$@"}
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    $ECHO "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
index 4112b3d15..22788a562 100644
--- a/src/exchangedb/test_exchangedb.c
+++ b/src/exchangedb/test_exchangedb.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -33,9 +33,9 @@ static int result;
 /**
  * Report line of error if @a cond is true, and jump to label "drop".
  */
-#define FAILIF(cond)                              \
+#define FAILIF(cond)                            \
   do {                                          \
-    if (! (cond)) { break;}                      \
+    if (! (cond)) { break;}                     \
     GNUNET_break (0);                           \
     goto drop;                                  \
   } while (0)
@@ -45,7 +45,8 @@ static int result;
  * Initializes @a ptr with random data.
  */
 #define RND_BLK(ptr)                                                    \
-  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, sizeof (*ptr))
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, \
+                              sizeof (*ptr))
 
 /**
  * Initializes @a ptr with zeros.
@@ -112,53 +113,53 @@ mark_prepare_cb (void *cls,
  * Simple check that config retrieval and setting for extensions work
  */
 static enum GNUNET_GenericReturnValue
-test_extension_config (void)
+test_extension_manifest (void)
 {
-  char *config;
+  char *manifest;
 
   FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
-          plugin->get_extension_config (plugin->cls,
-                                        "fnord",
-                                        &config));
+          plugin->get_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          &manifest));
 
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->set_extension_config (plugin->cls,
-                                        "fnord",
-                                        "bar"));
+          plugin->set_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          "bar"));
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_extension_config (plugin->cls,
-                                        "fnord",
-                                        &config));
+          plugin->get_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          &manifest));
 
-  FAILIF (0 != strcmp ("bar", config));
-  GNUNET_free (config);
+  FAILIF (0 != strcmp ("bar", manifest));
+  GNUNET_free (manifest);
 
   /* let's do this again! */
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->set_extension_config (plugin->cls,
-                                        "fnord",
-                                        "buzz"));
+          plugin->set_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          "buzz"));
 
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_extension_config (plugin->cls,
-                                        "fnord",
-                                        &config));
+          plugin->get_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          &manifest));
 
-  FAILIF (0 != strcmp ("buzz", config));
-  GNUNET_free (config);
+  FAILIF (0 != strcmp ("buzz", manifest));
+  GNUNET_free (manifest);
 
   /* let's do this again, with NULL */
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->set_extension_config (plugin->cls,
-                                        "fnord",
-                                        NULL));
+          plugin->set_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          NULL));
 
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->get_extension_config (plugin->cls,
-                                        "fnord",
-                                        &config));
+          plugin->get_extension_manifest (plugin->cls,
+                                          "fnord",
+                                          &manifest));
 
-  FAILIF (NULL != config);
+  FAILIF (NULL != manifest);
 
   return GNUNET_OK;
 drop:
@@ -220,18 +221,15 @@ check_reserve (const struct TALER_ReservePublicKeyP *pub,
                const char *currency)
 {
   struct TALER_EXCHANGEDB_Reserve reserve;
-  struct TALER_EXCHANGEDB_KycStatus kyc;
 
   reserve.pub = *pub;
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->reserves_get (plugin->cls,
-                                &reserve,
-                                &kyc));
+                                &reserve));
   FAILIF (value != reserve.balance.value);
   FAILIF (fraction != reserve.balance.fraction);
   FAILIF (0 != strcmp (currency,
                        reserve.balance.currency));
-  FAILIF (kyc.ok);
   return GNUNET_OK;
 drop:
   return GNUNET_SYSERR;
@@ -281,7 +279,7 @@ create_denom_key_pair (unsigned int size,
   GNUNET_assert (GNUNET_OK ==
                  TALER_denom_priv_create (&dkp->priv,
                                           &dkp->pub,
-                                          TALER_DENOMINATION_RSA,
+                                          GNUNET_CRYPTO_BSA_RSA,
                                           size));
   /* Using memset() as fields like master key and signature
      are not properly initialized for this test. */
@@ -321,7 +319,6 @@ create_denom_key_pair (unsigned int size,
     return NULL;
   }
   memset (&issue2, 0, sizeof (issue2));
-  plugin->commit (plugin->cls);
   if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
       plugin->get_denomination_info (plugin->cls,
                                      &dki.issue.denom_hash,
@@ -449,16 +446,16 @@ static unsigned int auditor_row_cnt;
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
 static enum GNUNET_GenericReturnValue
-audit_refresh_session_cb (void *cls,
-                          uint64_t rowid,
-                          const struct TALER_DenominationPublicKey *denom_pub,
-                          const struct
-                          TALER_AgeCommitmentHash *h_age_commitment,
-                          const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                          const struct TALER_CoinSpendSignatureP *coin_sig,
-                          const struct TALER_Amount *amount_with_fee,
-                          uint32_t noreveal_index,
-                          const struct TALER_RefreshCommitmentP *rc)
+audit_refresh_session_cb (
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_DenominationPublicKey *denom_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig,
+  const struct TALER_Amount *amount_with_fee,
+  uint32_t noreveal_index,
+  const struct TALER_RefreshCommitmentP *rc)
 {
   (void) cls;
   (void) rowid;
@@ -468,6 +465,7 @@ audit_refresh_session_cb (void *cls,
   (void) amount_with_fee;
   (void) noreveal_index;
   (void) rc;
+  (void) h_age_commitment;
   auditor_row_cnt++;
   return GNUNET_OK;
 }
@@ -539,6 +537,7 @@ cb_wt_never (void *cls,
   (void) serial_id;
   (void) merchant_pub;
   (void) account_payto_uri;
+  (void) h_payto;
   (void) exec_time;
   (void) h_contract_terms;
   (void) denom_pub;
@@ -578,6 +577,7 @@ cb_wt_check (void *cls,
 {
   (void) rowid;
   (void) denom_pub;
+  (void) h_payto;
   GNUNET_assert (cls == &cb_wt_never);
   GNUNET_assert (0 == GNUNET_memcmp (merchant_pub,
                                      &merchant_pub_wt));
@@ -604,7 +604,7 @@ static struct TALER_PaytoHashP wire_target_h_payto;
 
 
 /**
- * Callback for #select_deposits_above_serial_id ()
+ * Callback for #select_coin_deposits_above_serial_id ()
  *
  * @param cls closure
  * @param rowid unique serial ID for the deposit in our DB
@@ -646,6 +646,7 @@ audit_deposit_cb (void *cls,
  * @param h_contract_terms hash of the proposal data in
  *                        the contract between merchant and customer
  * @param rtransaction_id refund transaction ID chosen by the merchant
+ * @param full_refund the deposit
  * @param amount_with_fee amount that was deposited including fee
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
@@ -658,6 +659,7 @@ audit_refund_cb (void *cls,
                  const struct TALER_MerchantSignatureP *merchant_sig,
                  const struct TALER_PrivateContractHashP *h_contract_terms,
                  uint64_t rtransaction_id,
+                 bool full_refund,
                  const struct TALER_Amount *amount_with_fee)
 {
   (void) cls;
@@ -669,6 +671,7 @@ audit_refund_cb (void *cls,
   (void) h_contract_terms;
   (void) rtransaction_id;
   (void) amount_with_fee;
+  (void) full_refund;
   auditor_row_cnt++;
   return GNUNET_OK;
 }
@@ -817,9 +820,6 @@ test_wire_fees (void)
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (CURRENCY ":2.424242",
                                          &fees.closing));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (CURRENCY ":3.424242",
-                                         &fees.wad));
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                               &master_sig,
                               sizeof (master_sig));
@@ -931,14 +931,17 @@ audit_wire_cb (void *cls,
 /**
  * Test API relating to wire_out handling.
  *
+ * @param bd batch deposit to test
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
-test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
+test_wire_out (const struct TALER_EXCHANGEDB_BatchDeposit *bd)
 {
+  const struct TALER_EXCHANGEDB_CoinDepositInformation *deposit = &bd->cdis[0];
   struct TALER_PaytoHashP h_payto;
 
-  TALER_payto_hash (deposit->receiver_wire_account,
+  GNUNET_assert (0 < bd->num_cdis);
+  TALER_payto_hash (bd->receiver_wire_account,
                     &h_payto);
   auditor_row_cnt = 0;
   memset (&wire_out_wtid,
@@ -956,8 +959,8 @@ test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
           plugin->start_deferred_wire_out (plugin->cls));
 
   /* setup values for wire transfer aggregation data */
-  merchant_pub_wt = deposit->merchant_pub;
-  h_contract_terms_wt = deposit->h_contract_terms;
+  merchant_pub_wt = bd->merchant_pub;
+  h_contract_terms_wt = bd->h_contract_terms;
   coin_pub_wt = deposit->coin.coin_pub;
 
   coin_value_wt = deposit->amount_with_fee;
@@ -981,6 +984,7 @@ test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
     struct TALER_Amount coin_fee2;
     struct GNUNET_TIME_Timestamp execution_time2;
     struct TALER_EXCHANGEDB_KycStatus kyc;
+    enum TALER_AmlDecisionState aml;
 
     h_contract_terms_wt2.hash.bits[0]++;
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
@@ -994,20 +998,16 @@ test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
                                                 &execution_time2,
                                                 &coin_contribution2,
                                                 &coin_fee2,
-                                                &kyc));
+                                                &kyc,
+                                                &aml));
   }
   {
     struct TALER_ReservePublicKeyP rpub;
-    struct TALER_EXCHANGEDB_KycStatus kyc;
 
     memset (&rpub,
             44,
             sizeof (rpub));
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-            plugin->inselect_wallet_kyc_status (plugin->cls,
-                                                &rpub,
-                                                &kyc));
-    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->store_wire_transfer_out (plugin->cls,
                                              wire_out_date,
                                              &wire_out_wtid,
@@ -1031,6 +1031,7 @@ test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
     struct TALER_Amount coin_fee2;
     struct GNUNET_TIME_Timestamp execution_time2;
     struct TALER_EXCHANGEDB_KycStatus kyc;
+    enum TALER_AmlDecisionState aml = TALER_AML_FROZEN;
 
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->lookup_transfer_by_deposit (plugin->cls,
@@ -1043,7 +1044,9 @@ test_wire_out (const struct TALER_EXCHANGEDB_Deposit *deposit)
                                                 &execution_time2,
                                                 &coin_contribution2,
                                                 &coin_fee2,
-                                                &kyc));
+                                                &kyc,
+                                                &aml));
+    FAILIF (TALER_AML_NORMAL != aml);
     GNUNET_assert (0 == GNUNET_memcmp (&wtid2,
                                        &wire_out_wtid));
     GNUNET_assert (GNUNET_TIME_timestamp_cmp (execution_time2,
@@ -1090,9 +1093,9 @@ recoup_cb (void *cls,
            const struct TALER_CoinPublicInfo *coin,
            const struct TALER_DenominationPublicKey *denom_pub,
            const struct TALER_CoinSpendSignatureP *coin_sig,
-           const union TALER_DenominationBlindingKeyP *coin_blind)
+           const union GNUNET_CRYPTO_BlindingSecretP *coin_blind)
 {
-  const union TALER_DenominationBlindingKeyP *cb = cls;
+  const union GNUNET_CRYPTO_BlindingSecretP *cb = cls;
 
   (void) rowid;
   (void) timestamp;
@@ -1111,48 +1114,32 @@ drop:
 
 
 /**
- * Function called on deposits that are past their due date
- * and have not yet seen a wire transfer.
+ * Function called on batch deposits that may require a
+ * wire transfer.
  *
  * @param cls closure a `struct TALER_EXCHANGEDB_Deposit *`
- * @param rowid deposit table row of the coin's deposit
- * @param coin_pub public key of the coin
- * @param amount value of the deposit, including fee
- * @param payto_uri where should the funds be wired
- * @param deadline what was the requested wire transfer deadline
- * @param done did the exchange claim that it made a transfer?
+ * @param batch_deposit_serial_id where in the table are we
+ * @param total_amount value of all missing deposits, including fees
+ * @param wire_target_h_payto hash of the recipient account's payto URI
+ * @param deadline what was the earliest requested wire transfer deadline
  */
 static void
-wire_missing_cb (void *cls,
-                 uint64_t rowid,
-                 const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                 const struct TALER_Amount *amount,
-                 const char *payto_uri,
-                 struct GNUNET_TIME_Timestamp deadline,
-                 bool done)
+wire_missing_cb (
+  void *cls,
+  uint64_t batch_deposit_serial_id,
+  const struct TALER_Amount *total_amount,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  struct GNUNET_TIME_Timestamp deadline)
 {
-  const struct TALER_EXCHANGEDB_Deposit *deposit = cls;
+  const struct TALER_EXCHANGEDB_CoinDepositInformation *deposit = cls;
 
-  (void) payto_uri;
+  (void) batch_deposit_serial_id;
   (void) deadline;
-  (void) rowid;
-  if (done)
-  {
-    GNUNET_break (0);
-    result = 66;
-  }
-  if (0 != TALER_amount_cmp (amount,
-                             &deposit->amount_with_fee))
-  {
-    GNUNET_break (0);
-    result = 66;
-  }
-  if (0 != GNUNET_memcmp (coin_pub,
-                          &deposit->coin.coin_pub))
-  {
-    GNUNET_break (0);
-    result = 66;
-  }
+  (void) wire_target_h_payto;
+  if (0 ==
+      TALER_amount_cmp (total_amount,
+                        &deposit->amount_with_fee))
+    result = 8;
 }
 
 
@@ -1191,7 +1178,7 @@ run (void *cls)
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct TALER_CoinSpendSignatureP coin_sig;
   struct GNUNET_TIME_Timestamp deadline;
-  union TALER_DenominationBlindingKeyP coin_blind;
+  union GNUNET_CRYPTO_BlindingSecretP coin_blind;
   struct TALER_ReservePublicKeyP reserve_pub;
   struct TALER_ReservePublicKeyP reserve_pub2;
   struct TALER_ReservePublicKeyP reserve_pub3;
@@ -1203,8 +1190,10 @@ run (void *cls)
   struct TALER_EXCHANGEDB_ReserveHistory *rh_head;
   struct TALER_EXCHANGEDB_BankTransfer *bt;
   struct TALER_EXCHANGEDB_CollectableBlindcoin *withdraw;
-  struct TALER_EXCHANGEDB_Deposit deposit;
-  struct TALER_EXCHANGEDB_Deposit deposit2;
+  struct TALER_EXCHANGEDB_CoinDepositInformation deposit;
+  struct TALER_EXCHANGEDB_BatchDeposit bd;
+  struct TALER_CoinSpendPublicKeyP cpub2;
+  struct TALER_MerchantPublicKeyP mpub2;
   struct TALER_EXCHANGEDB_Refund refund;
   struct TALER_EXCHANGEDB_TransactionList *tl;
   struct TALER_EXCHANGEDB_TransactionList *tlp;
@@ -1224,17 +1213,19 @@ run (void *cls)
   uint64_t reserve_out_serial_id;
   uint64_t melt_serial_id;
   struct TALER_PlanchetMasterSecretP ps;
-  union TALER_DenominationBlindingKeyP bks;
-  struct TALER_ExchangeWithdrawValues alg_values = {
-    /* RSA is simpler, and for the DB there is no real difference between
-       CS and RSA, just one should be used, so we use RSA */
-    .cipher = TALER_DENOMINATION_RSA
-  };
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+  const struct TALER_ExchangeWithdrawValues *alg_values
+    = TALER_denom_ewv_rsa_singleton ();
 
   memset (&deposit,
           0,
           sizeof (deposit));
-  deposit.receiver_wire_account = (char *) rcvr;
+  memset (&bd,
+          0,
+          sizeof (bd));
+  bd.receiver_wire_account = (char *) rcvr;
+  bd.cdis = &deposit;
+  bd.num_cdis = 1;
   memset (&salt,
           45,
           sizeof (salt));
@@ -1251,13 +1242,9 @@ run (void *cls)
   }
   (void) plugin->drop_tables (plugin->cls);
   if (GNUNET_OK !=
-      plugin->create_tables (plugin->cls))
-  {
-    result = 77;
-    goto cleanup;
-  }
-  if (GNUNET_OK !=
-      plugin->setup_partitions (plugin->cls, num_partitions))
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
   {
     result = 77;
     goto cleanup;
@@ -1275,7 +1262,7 @@ run (void *cls)
                                                  NULL));
   /* simple extension check */
   FAILIF (GNUNET_OK !=
-          test_extension_config ());
+          test_extension_manifest ());
 
   RND_BLK (&reserve_pub);
   GNUNET_assert (GNUNET_OK ==
@@ -1287,7 +1274,6 @@ run (void *cls)
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (CURRENCY ":0.000010",
                                          &fees.deposit));
-  deposit.deposit_fee = fees.deposit;
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (CURRENCY ":0.000010",
                                          &fees.refresh));
@@ -1298,15 +1284,28 @@ run (void *cls)
                  TALER_string_to_amount (CURRENCY ":1.000010",
                                          &amount_with_fee));
   result = 4;
+  FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+          plugin->commit (plugin->cls));
   now = GNUNET_TIME_timestamp_get ();
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->reserves_in_insert (plugin->cls,
-                                      &reserve_pub,
-                                      &value,
-                                      now,
-                                      sndr,
-                                      "exchange-account-1",
-                                      4));
+  {
+    struct TALER_EXCHANGEDB_ReserveInInfo reserve = {
+      .reserve_pub = &reserve_pub,
+      .balance = &value,
+      .execution_time = now,
+      .sender_account_details = sndr,
+      .exchange_account_name = "exchange-account-1",
+      .wire_reference = 4
+    };
+    enum GNUNET_DB_QueryStatus qsr;
+
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->reserves_in_insert (plugin->cls,
+                                        &reserve,
+                                        1,
+                                        &qsr));
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            qsr);
+  }
   FAILIF (GNUNET_OK !=
           check_reserve (&reserve_pub,
                          value.value,
@@ -1314,14 +1313,28 @@ run (void *cls)
                          value.currency));
   now = GNUNET_TIME_timestamp_get ();
   RND_BLK (&reserve_pub2);
-  FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          plugin->reserves_in_insert (plugin->cls,
-                                      &reserve_pub2,
-                                      &value,
-                                      now,
-                                      sndr,
-                                      "exchange-account-1",
-                                      5));
+  {
+    struct TALER_EXCHANGEDB_ReserveInInfo reserve = {
+      .reserve_pub = &reserve_pub2,
+      .balance = &value,
+      .execution_time = now,
+      .sender_account_details = sndr,
+      .exchange_account_name = "exchange-account-1",
+      .wire_reference = 5
+    };
+    enum GNUNET_DB_QueryStatus qsr;
+
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->reserves_in_insert (plugin->cls,
+                                        &reserve,
+                                        1,
+                                        &qsr));
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            qsr);
+  }
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "test-2"));
   FAILIF (GNUNET_OK !=
           check_reserve (&reserve_pub,
                          value.value,
@@ -1344,7 +1357,7 @@ run (void *cls)
   RND_BLK (&cbc.reserve_sig);
   RND_BLK (&ps);
   TALER_planchet_blinding_secret_create (&ps,
-                                         &alg_values,
+                                         alg_values,
                                          &bks);
   {
     struct TALER_PlanchetDetail pd;
@@ -1360,19 +1373,20 @@ run (void *cls)
     RND_BLK (&age_hash);
     for (size_t i = 0; i < sizeof(p_ah) / sizeof(p_ah[0]); i++)
     {
+
       RND_BLK (&coin_pub);
       GNUNET_assert (GNUNET_OK ==
                      TALER_denom_blind (&dkp->pub,
                                         &bks,
+                                        NULL,
                                         p_ah[i],
                                         &coin_pub,
-                                        &alg_values,
+                                        alg_values,
                                         &c_hash,
                                         &pd.blinded_planchet));
-      GNUNET_assert (GNUNET_OK ==
-                     TALER_coin_ev_hash (&pd.blinded_planchet,
-                                         &cbc.denom_pub_hash,
-                                         &cbc.h_coin_envelope));
+      TALER_coin_ev_hash (&pd.blinded_planchet,
+                          &cbc.denom_pub_hash,
+                          &cbc.h_coin_envelope);
       if (i != 0)
         TALER_blinded_denom_sig_free (&cbc.sig);
       GNUNET_assert (
@@ -1394,23 +1408,43 @@ run (void *cls)
 
   {
     bool found;
+    bool nonce_reuse;
     bool balance_ok;
-    struct TALER_EXCHANGEDB_KycStatus kyc;
+    bool age_ok;
+    bool conflict;
+    bool denom_unknown;
+    uint16_t maximum_age;
     uint64_t ruuid;
+    struct TALER_Amount reserve_balance;
 
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-            plugin->do_withdraw (plugin->cls,
-                                 NULL,
-                                 &cbc,
-                                 now,
-                                 &found,
-                                 &balance_ok,
-                                 &kyc,
-                                 &ruuid));
+            plugin->do_batch_withdraw (plugin->cls,
+                                       now,
+                                       &reserve_pub,
+                                       &value,
+                                       true,
+                                       &found,
+                                       &balance_ok,
+                                       &reserve_balance,
+                                       &age_ok,
+                                       &maximum_age,
+                                       &ruuid));
+    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+            plugin->do_batch_withdraw_insert (plugin->cls,
+                                              NULL,
+                                              &cbc,
+                                              now,
+                                              ruuid,
+                                              &denom_unknown,
+                                              &conflict,
+                                              &nonce_reuse));
     GNUNET_assert (found);
+    GNUNET_assert (! nonce_reuse);
+    GNUNET_assert (! denom_unknown);
     GNUNET_assert (balance_ok);
-    GNUNET_assert (! kyc.ok);
   }
+
+
   FAILIF (GNUNET_OK !=
           check_reserve (&reserve_pub,
                          0,
@@ -1447,7 +1481,7 @@ run (void *cls)
                                             &cbc2.sig,
                                             &bks,
                                             &c_hash,
-                                            &alg_values,
+                                            alg_values,
                                             &dkp->pub));
     FAILIF (GNUNET_OK !=
             TALER_denom_pub_verify (&dkp->pub,
@@ -1466,7 +1500,7 @@ run (void *cls)
                                           &cbc.sig,
                                           &bks,
                                           &c_hash,
-                                          &alg_values,
+                                          alg_values,
                                           &dkp->pub));
   deadline = GNUNET_TIME_timestamp_get ();
   {
@@ -1486,23 +1520,22 @@ run (void *cls)
     struct GNUNET_TIME_Timestamp deposit_timestamp
       = GNUNET_TIME_timestamp_get ();
     bool balance_ok;
+    uint32_t bad_balance_idx;
     bool in_conflict;
     struct TALER_PaytoHashP h_payto;
 
     RND_BLK (&h_payto);
-    deposit.refund_deadline
+    bd.refund_deadline
       = GNUNET_TIME_relative_to_timestamp (GNUNET_TIME_UNIT_MONTHS);
-    deposit.wire_deadline
+    bd.wire_deadline
       = GNUNET_TIME_relative_to_timestamp (GNUNET_TIME_UNIT_MONTHS);
     deposit.amount_with_fee = value;
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->do_deposit (plugin->cls,
-                                &deposit,
-                                known_coin_id,
-                                &h_payto,
-                                false,
+                                &bd,
                                 &deposit_timestamp,
                                 &balance_ok,
+                                &bad_balance_idx,
                                 &in_conflict));
     FAILIF (! balance_ok);
     FAILIF (in_conflict);
@@ -1515,9 +1548,9 @@ run (void *cls)
     bool conflict;
 
     refund.coin = deposit.coin;
-    refund.details.merchant_pub = deposit.merchant_pub;
+    refund.details.merchant_pub = bd.merchant_pub;
     RND_BLK (&refund.details.merchant_sig);
-    refund.details.h_contract_terms = deposit.h_contract_terms;
+    refund.details.h_contract_terms = bd.h_contract_terms;
     refund.details.rtransaction_id = 1;
     refund.details.refund_amount = value;
     refund.details.refund_fee = fees.refund;
@@ -1620,7 +1653,8 @@ run (void *cls)
     {
       struct TALER_EXCHANGEDB_RefreshRevealedCoin *ccoin;
       struct GNUNET_TIME_Timestamp now;
-      struct TALER_BlindedRsaPlanchet *rp;
+      struct GNUNET_CRYPTO_BlindedMessage *rp;
+      struct GNUNET_CRYPTO_RsaBlindedMessage *rsa;
       struct TALER_BlindedPlanchet *bp;
 
       now = GNUNET_TIME_timestamp_get ();
@@ -1632,18 +1666,22 @@ run (void *cls)
       new_denom_pubs[cnt] = new_dkp[cnt]->pub;
       ccoin = &revealed_coins[cnt];
       bp = &ccoin->blinded_planchet;
-      bp->cipher = TALER_DENOMINATION_RSA;
-      rp = &bp->details.rsa_blinded_planchet;
-      rp->blinded_msg_size = 1 + (size_t) GNUNET_CRYPTO_random_u64 (
+      rp = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+      bp->blinded_message = rp;
+      rp->cipher = GNUNET_CRYPTO_BSA_RSA;
+      rp->rc = 1;
+      rsa = &rp->details.rsa_blinded_message;
+      rsa->blinded_msg_size = 1 + (size_t) GNUNET_CRYPTO_random_u64 (
         GNUNET_CRYPTO_QUALITY_WEAK,
         (RSA_KEY_SIZE / 8) - 1);
-      rp->blinded_msg = GNUNET_malloc (rp->blinded_msg_size);
+      rsa->blinded_msg = GNUNET_malloc (rsa->blinded_msg_size);
       GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
-                                  rp->blinded_msg,
-                                  rp->blinded_msg_size);
+                                  rsa->blinded_msg,
+                                  rsa->blinded_msg_size);
       TALER_denom_pub_hash (&new_dkp[cnt]->pub,
                             &ccoin->h_denom_pub);
-      ccoin->exchange_vals = alg_values;
+      TALER_denom_ewv_copy (&ccoin->exchange_vals,
+                            alg_values);
       TALER_coin_ev_hash (bp,
                           &ccoin->h_denom_pub,
                           &ccoin->coin_envelope_hash);
@@ -1701,12 +1739,20 @@ run (void *cls)
       /* Just to test fetching a coin with melt history */
       struct TALER_EXCHANGEDB_TransactionList *tl;
       enum GNUNET_DB_QueryStatus qs;
+      uint64_t etag;
+      struct TALER_Amount balance;
+      struct TALER_DenominationHashP h_denom_pub;
 
       qs = plugin->get_coin_transactions (plugin->cls,
                                           &refresh.coin.coin_pub,
-                                          GNUNET_YES,
+                                          0,
+                                          0,
+                                          &etag,
+                                          &balance,
+                                          &h_denom_pub,
                                           &tl);
-      FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs);
+      FAILIF (0 >= qs);
+      FAILIF (NULL == tl);
       plugin->free_coin_transaction_list (plugin->cls,
                                           tl);
     }
@@ -1716,7 +1762,7 @@ run (void *cls)
   {
     struct GNUNET_TIME_Timestamp recoup_timestamp
       = GNUNET_TIME_timestamp_get ();
-    union TALER_DenominationBlindingKeyP coin_bks;
+    union GNUNET_CRYPTO_BlindingSecretP coin_bks;
     uint64_t new_known_coin_id;
     struct TALER_CoinPublicInfo new_coin;
     struct TALER_DenominationHashP dph;
@@ -1753,7 +1799,6 @@ run (void *cls)
     struct TALER_EXCHANGEDB_Reserve pre_reserve;
     struct TALER_EXCHANGEDB_Reserve post_reserve;
     struct TALER_Amount delta;
-    struct TALER_EXCHANGEDB_KycStatus kyc;
     bool recoup_ok;
     bool internal_failure;
     struct GNUNET_TIME_Timestamp recoup_timestamp
@@ -1762,8 +1807,7 @@ run (void *cls)
     pre_reserve.pub = reserve_pub;
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->reserves_get (plugin->cls,
-                                  &pre_reserve,
-                                  &kyc));
+                                  &pre_reserve));
     FAILIF (! TALER_amount_is_zero (&pre_reserve.balance));
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->do_recoup (plugin->cls,
@@ -1781,8 +1825,7 @@ run (void *cls)
     post_reserve.pub = reserve_pub;
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->reserves_get (plugin->cls,
-                                  &post_reserve,
-                                  &kyc));
+                                  &post_reserve));
     FAILIF (0 >=
             TALER_amount_subtract (&delta,
                                    &post_reserve.balance,
@@ -1813,7 +1856,8 @@ run (void *cls)
                                          sndr,
                                          &wire_out_wtid,
                                          &amount_with_fee,
-                                         &fee_closing));
+                                         &fee_closing,
+                                         0));
   FAILIF (GNUNET_OK !=
           check_reserve (&reserve_pub2,
                          0,
@@ -1827,20 +1871,27 @@ run (void *cls)
                                          sndr,
                                          &wire_out_wtid,
                                          &value,
-                                         &fee_closing));
+                                         &fee_closing,
+                                         0));
   FAILIF (GNUNET_OK !=
           check_reserve (&reserve_pub,
                          0,
                          0,
                          value.currency));
   result = 7;
+  FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+          plugin->commit (plugin->cls));
 
   /* check reserve history */
   {
     struct TALER_Amount balance;
+    uint64_t etag_out;
 
     qs = plugin->get_reserve_history (plugin->cls,
                                       &reserve_pub,
+                                      0,
+                                      0,
+                                      &etag_out,
                                       &balance,
                                       &rh);
   }
@@ -1906,8 +1957,29 @@ run (void *cls)
                                        &fee_closing));
       }
       break;
+    case TALER_EXCHANGEDB_RO_PURSE_MERGE:
+      {
+        /* FIXME: not yet tested */
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_HISTORY_REQUEST:
+      {
+        /* FIXME: not yet tested */
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_OPEN_REQUEST:
+      {
+        /* FIXME: not yet tested */
+        break;
+      }
+    case TALER_EXCHANGEDB_RO_CLOSE_REQUEST:
+      {
+        /* FIXME: not yet tested */
+        break;
+      }
     }
   }
+  GNUNET_assert (4 == cnt);
   FAILIF (4 != cnt);
 
   auditor_row_cnt = 0;
@@ -1931,10 +2003,20 @@ run (void *cls)
                                                   &audit_refund_cb,
                                                   NULL));
   FAILIF (1 != auditor_row_cnt);
-  qs = plugin->get_coin_transactions (plugin->cls,
-                                      &refund.coin.coin_pub,
-                                      GNUNET_YES,
-                                      &tl);
+  {
+    uint64_t etag = 0;
+    struct TALER_Amount balance;
+    struct TALER_DenominationHashP h_denom_pub;
+
+    qs = plugin->get_coin_transactions (plugin->cls,
+                                        &refund.coin.coin_pub,
+                                        0,
+                                        0,
+                                        &etag,
+                                        &balance,
+                                        &h_denom_pub,
+                                        &tl);
+  }
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs);
   GNUNET_assert (NULL != tl);
   matched = 0;
@@ -1954,26 +2036,24 @@ run (void *cls)
                                &deposit.csig));
         FAILIF (0 !=
                 GNUNET_memcmp (&have->merchant_pub,
-                               &deposit.merchant_pub));
+                               &bd.merchant_pub));
         FAILIF (0 !=
                 GNUNET_memcmp (&have->h_contract_terms,
-                               &deposit.h_contract_terms));
+                               &bd.h_contract_terms));
         FAILIF (0 !=
                 GNUNET_memcmp (&have->wire_salt,
-                               &deposit.wire_salt));
+                               &bd.wire_salt));
         FAILIF (GNUNET_TIME_timestamp_cmp (have->timestamp,
                                            !=,
-                                           deposit.timestamp));
+                                           bd.wallet_timestamp));
         FAILIF (GNUNET_TIME_timestamp_cmp (have->refund_deadline,
                                            !=,
-                                           deposit.refund_deadline));
+                                           bd.refund_deadline));
         FAILIF (GNUNET_TIME_timestamp_cmp (have->wire_deadline,
                                            !=,
-                                           deposit.wire_deadline));
+                                           bd.wire_deadline));
         FAILIF (0 != TALER_amount_cmp (&have->amount_with_fee,
                                        &deposit.amount_with_fee));
-        FAILIF (0 != TALER_amount_cmp (&have->deposit_fee,
-                                       &deposit.deposit_fee));
         matched |= 1;
         break;
       }
@@ -2044,7 +2124,6 @@ run (void *cls)
   memset (&deposit,
           0,
           sizeof (deposit));
-  deposit.deposit_fee = fees.deposit;
   RND_BLK (&deposit.coin.coin_pub);
   TALER_denom_pub_hash (&dkp->pub,
                         &deposit.coin.denom_pub_hash);
@@ -2053,24 +2132,25 @@ run (void *cls)
                                           &cbc.sig,
                                           &bks,
                                           &c_hash,
-                                          &alg_values,
+                                          alg_values,
                                           &dkp->pub));
   RND_BLK (&deposit.csig);
-  RND_BLK (&deposit.merchant_pub);
-  RND_BLK (&deposit.h_contract_terms);
-  RND_BLK (&deposit.wire_salt);
-  deposit.receiver_wire_account =
+  RND_BLK (&bd.merchant_pub);
+  RND_BLK (&bd.h_contract_terms);
+  RND_BLK (&bd.wire_salt);
+  bd.receiver_wire_account =
     "payto://iban/DE67830654080004822650?receiver-name=Test";
   TALER_merchant_wire_signature_hash (
     "payto://iban/DE67830654080004822650?receiver-name=Test",
-    &deposit.wire_salt,
+    &bd.wire_salt,
     &h_wire_wt);
   deposit.amount_with_fee = value;
-  deposit.deposit_fee = fees.deposit;
-
-  deposit.refund_deadline = deadline;
-  deposit.wire_deadline = deadline;
+  bd.refund_deadline = deadline;
+  bd.wire_deadline = deadline;
   result = 8;
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "test-3"));
   {
     uint64_t known_coin_id;
     struct TALER_DenominationHashP dph;
@@ -2088,22 +2168,30 @@ run (void *cls)
     struct GNUNET_TIME_Timestamp r;
     struct TALER_Amount deposit_fee;
     struct TALER_MerchantWireHashP h_wire;
+    bool balance_ok;
+    uint32_t bad_idx;
+    bool ctr_conflict;
 
     now = GNUNET_TIME_timestamp_get ();
+    TALER_payto_hash (bd.receiver_wire_account,
+                      &bd.wire_target_h_payto);
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-            plugin->insert_deposit (plugin->cls,
-                                    now,
-                                    &deposit));
-    TALER_merchant_wire_signature_hash (deposit.receiver_wire_account,
-                                        &deposit.wire_salt,
+            plugin->do_deposit (plugin->cls,
+                                &bd,
+                                &now,
+                                &balance_ok,
+                                &bad_idx,
+                                &ctr_conflict));
+    TALER_merchant_wire_signature_hash (bd.receiver_wire_account,
+                                        &bd.wire_salt,
                                         &h_wire);
     FAILIF (1 !=
             plugin->have_deposit2 (plugin->cls,
-                                   &deposit.h_contract_terms,
+                                   &bd.h_contract_terms,
                                    &h_wire,
                                    &deposit.coin.coin_pub,
-                                   &deposit.merchant_pub,
-                                   deposit.refund_deadline,
+                                   &bd.merchant_pub,
+                                   bd.refund_deadline,
                                    &deposit_fee,
                                    &r));
     FAILIF (GNUNET_TIME_timestamp_cmp (now,
@@ -2111,29 +2199,20 @@ run (void *cls)
                                        r));
   }
   {
-    struct GNUNET_TIME_Timestamp start_range;
-    struct GNUNET_TIME_Timestamp end_range;
-
-    start_range = GNUNET_TIME_absolute_to_timestamp (
-      GNUNET_TIME_absolute_subtract (deadline.abs_time,
-                                     GNUNET_TIME_UNIT_SECONDS));
-    end_range = GNUNET_TIME_absolute_to_timestamp (
-      GNUNET_TIME_absolute_add (deadline.abs_time,
-                                GNUNET_TIME_UNIT_SECONDS));
-    FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-            plugin->select_deposits_missing_wire (plugin->cls,
-                                                  start_range,
-                                                  end_range,
-                                                  &wire_missing_cb,
-                                                  &deposit));
+    result = 66;
+    FAILIF (0 >=
+            plugin->select_batch_deposits_missing_wire (plugin->cls,
+                                                        0,
+                                                        &wire_missing_cb,
+                                                        &deposit));
     FAILIF (8 != result);
   }
   auditor_row_cnt = 0;
   FAILIF (0 >=
-          plugin->select_deposits_above_serial_id (plugin->cls,
-                                                   0,
-                                                   &audit_deposit_cb,
-                                                   NULL));
+          plugin->select_coin_deposits_above_serial_id (plugin->cls,
+                                                        0,
+                                                        &audit_deposit_cb,
+                                                        NULL));
   FAILIF (0 == auditor_row_cnt);
   result = 8;
   sleep (2); /* give deposit time to be ready */
@@ -2145,13 +2224,12 @@ run (void *cls)
             plugin->get_ready_deposit (plugin->cls,
                                        0,
                                        INT32_MAX,
-                                       true,
                                        &merchant_pub2,
                                        &payto_uri2));
     FAILIF (0 != GNUNET_memcmp (&merchant_pub2,
-                                &deposit.merchant_pub));
+                                &bd.merchant_pub));
     FAILIF (0 != strcmp (payto_uri2,
-                         deposit.receiver_wire_account));
+                         bd.receiver_wire_account));
     TALER_payto_hash (payto_uri2,
                       &wire_target_h_payto);
     GNUNET_free (payto_uri2);
@@ -2167,7 +2245,7 @@ run (void *cls)
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->aggregate (plugin->cls,
                                &wire_target_h_payto,
-                               &deposit.merchant_pub,
+                               &bd.merchant_pub,
                                &wtid,
                                &total));
   }
@@ -2191,6 +2269,7 @@ run (void *cls)
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
             plugin->select_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
+                                                  &bd.merchant_pub,
                                                   "x-bank",
                                                   &wtid2,
                                                   &total2));
@@ -2198,11 +2277,14 @@ run (void *cls)
             plugin->create_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
                                                   "x-bank",
+                                                  &bd.merchant_pub,
                                                   &wtid,
+                                                  0,
                                                   &total));
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->select_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
+                                                  &bd.merchant_pub,
                                                   "x-bank",
                                                   &wtid2,
                                                   &total2));
@@ -2219,10 +2301,12 @@ run (void *cls)
             plugin->update_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
                                                   &wtid,
+                                                  0,
                                                   &total));
     FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
             plugin->select_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
+                                                  &bd.merchant_pub,
                                                   "x-bank",
                                                   &wtid2,
                                                   &total2));
@@ -2239,6 +2323,7 @@ run (void *cls)
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
             plugin->select_aggregation_transient (plugin->cls,
                                                   &wire_target_h_payto,
+                                                  &bd.merchant_pub,
                                                   "x-bank",
                                                   &wtid2,
                                                   &total2));
@@ -2247,37 +2332,35 @@ run (void *cls)
           plugin->commit (plugin->cls));
 
   result = 10;
-  deposit2 = deposit;
   FAILIF (GNUNET_OK !=
           plugin->start (plugin->cls,
                          "test-2"));
-  RND_BLK (&deposit2.merchant_pub); /* should fail if merchant is different */
+  RND_BLK (&mpub2); /* should fail if merchant is different */
   {
     struct TALER_MerchantWireHashP h_wire;
     struct GNUNET_TIME_Timestamp r;
     struct TALER_Amount deposit_fee;
 
-    TALER_merchant_wire_signature_hash (deposit2.receiver_wire_account,
-                                        &deposit2.wire_salt,
+    TALER_merchant_wire_signature_hash (bd.receiver_wire_account,
+                                        &bd.wire_salt,
                                         &h_wire);
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
             plugin->have_deposit2 (plugin->cls,
-                                   &deposit2.h_contract_terms,
+                                   &bd.h_contract_terms,
                                    &h_wire,
-                                   &deposit2.coin.coin_pub,
-                                   &deposit2.merchant_pub,
-                                   deposit2.refund_deadline,
+                                   &deposit.coin.coin_pub,
+                                   &mpub2,
+                                   bd.refund_deadline,
                                    &deposit_fee,
                                    &r));
-    deposit2.merchant_pub = deposit.merchant_pub;
-    RND_BLK (&deposit2.coin.coin_pub); /* should fail if coin is different */
+    RND_BLK (&cpub2); /* should fail if coin is different */
     FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
             plugin->have_deposit2 (plugin->cls,
-                                   &deposit2.h_contract_terms,
+                                   &bd.h_contract_terms,
                                    &h_wire,
-                                   &deposit2.coin.coin_pub,
-                                   &deposit2.merchant_pub,
-                                   deposit2.refund_deadline,
+                                   &cpub2,
+                                   &bd.merchant_pub,
+                                   bd.refund_deadline,
                                    &deposit_fee,
                                    &r));
   }
@@ -2286,6 +2369,9 @@ run (void *cls)
 
 
   /* test revocation */
+  FAILIF (GNUNET_OK !=
+          plugin->start (plugin->cls,
+                         "test-3b"));
   RND_BLK (&master_sig);
   FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           plugin->insert_denomination_revocation (plugin->cls,
@@ -2324,7 +2410,7 @@ run (void *cls)
   FAILIF (GNUNET_OK !=
           test_wire_prepare ());
   FAILIF (GNUNET_OK !=
-          test_wire_out (&deposit));
+          test_wire_out (&bd));
   FAILIF (GNUNET_OK !=
           test_gc ());
   FAILIF (GNUNET_OK !=
@@ -2388,8 +2474,9 @@ main (int argc,
     return -1;
   }
   GNUNET_log_setup (argv[0],
-                    "WARNING",
+                    "INFO",
                     NULL);
+  TALER_OS_init ();
   plugin_name++;
   (void) GNUNET_asprintf (&testname,
                           "test-exchange-db-%s",
diff --git a/src/exchangedb/test_exchangedb_by_j.c b/src/exchangedb/test_exchangedb_by_j.c
new file mode 100644
index 000000000..24b24d5b0
--- /dev/null
+++ b/src/exchangedb/test_exchangedb_by_j.c
@@ -0,0 +1,232 @@
+/*
+  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/>
+*/
+/**
+ * @file exchangedb/test_exchangedb_by_j.c
+ * @brief test cases for DB interaction functions
+ * @author Joseph Xu
+ */
+#include "platform.h"
+#include "taler_exchangedb_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchangedb_plugin.h"
+#include "math.h"
+#define ROUNDS 10
+
+/**
+ * Global result from the testcase.
+ */
+static int result;
+
+/**
+ * Report line of error if @a cond is true, and jump to label "drop".
+ */
+#define FAILIF(cond)                            \
+  do {                                          \
+    if (! (cond)) {break;}                    \
+    GNUNET_break (0);                           \
+    goto drop;                                  \
+  } while (0)
+
+
+/**
+ * Initializes @a ptr with random data.
+ */
+#define RND_BLK(ptr)                                                    \
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, sizeof (*ptr))
+
+/**
+ * Initializes @a ptr with zeros.
+ */
+#define ZR_BLK(ptr) \
+  memset (ptr, 0, sizeof (*ptr))
+
+
+/**
+ * Currency we use.  Must match test-exchange-db-*.conf.
+ */
+#define CURRENCY "EUR"
+
+/**
+ * Database plugin under test.
+ */
+static struct TALER_EXCHANGEDB_Plugin *plugin;
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure with config
+ */
+static void
+run (void *cls)
+{
+  static const unsigned int batches[] = {1, 2, 3, 4, 8, 16 };
+  struct GNUNET_TIME_Relative times[sizeof (batches) / sizeof(*batches)];
+  unsigned long long sqrs[sizeof (batches) / sizeof(*batches)];
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  const uint32_t num_partitions = 10;
+
+  if (NULL ==
+      (plugin = TALER_EXCHANGEDB_plugin_load (cfg)))
+  {
+    GNUNET_break (0);
+    result = 77;
+    return;
+  }
+
+
+  if (GNUNET_OK !=
+      plugin->create_tables (plugin->cls,
+                             true,
+                             num_partitions))
+  {
+    GNUNET_break (0);
+    result = 77;
+    goto cleanup;
+  }
+
+  memset (times, 0, sizeof (times));
+  memset (sqrs, 0, sizeof (sqrs));
+  for (unsigned int r = 0; r < ROUNDS; r++)
+  {
+    for (unsigned int i = 0; i< 6; i++)
+    {
+      const char *sndr = "payto://x-taler-bank/localhost:8080/1";
+      struct TALER_Amount value;
+      unsigned int batch_size = batches[i];
+      unsigned int iterations = 16;  // 1024*10;
+      struct TALER_ReservePublicKeyP reserve_pubs[iterations];
+      struct GNUNET_TIME_Absolute now;
+      struct GNUNET_TIME_Timestamp ts;
+      struct GNUNET_TIME_Relative duration;
+      struct TALER_EXCHANGEDB_ReserveInInfo reserves[iterations];
+      enum GNUNET_DB_QueryStatus results[iterations];
+      unsigned long long duration_sq;
+
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_string_to_amount (CURRENCY ":1.000010",
+                                             &value));
+      now = GNUNET_TIME_absolute_get ();
+      ts = GNUNET_TIME_timestamp_get ();
+      for (unsigned int r = 0; r<iterations; r++)
+      {
+        RND_BLK (&reserve_pubs[r]);
+        reserves[r].reserve_pub = &reserve_pubs[r];
+        reserves[r].balance = &value;
+        reserves[r].execution_time = ts;
+        reserves[r].sender_account_details = sndr;
+        reserves[r].exchange_account_name = "name";
+        reserves[r].wire_reference = r;
+      }
+      FAILIF (iterations !=
+              plugin->batch2_reserves_in_insert (plugin->cls,
+                                                 reserves,
+                                                 iterations,
+                                                 batch_size,
+                                                 results));
+      duration = GNUNET_TIME_absolute_get_duration (now);
+      times[i] = GNUNET_TIME_relative_add (times[i],
+                                           duration);
+      duration_sq = duration.rel_value_us * duration.rel_value_us;
+      GNUNET_assert (duration_sq / duration.rel_value_us ==
+                     duration.rel_value_us);
+      GNUNET_assert (sqrs[i] + duration_sq >= sqrs[i]);
+      sqrs[i] += duration_sq;
+      fprintf (stdout,
+               "for a batchsize equal to %d it took %s\n",
+               batch_size,
+               GNUNET_STRINGS_relative_time_to_string (duration,
+                                                       GNUNET_NO) );
+
+      system ("./test.sh");   // DELETE AFTER TIMER
+    }
+  }
+  for (unsigned int i = 0; i< 6; i++)
+  {
+    struct GNUNET_TIME_Relative avg;
+    double avg_dbl;
+    double variance;
+
+    avg = GNUNET_TIME_relative_divide (times[i],
+                                       ROUNDS);
+    avg_dbl = avg.rel_value_us;
+    variance = sqrs[i] - (avg_dbl * avg_dbl * ROUNDS);
+    fprintf (stdout,
+             "Batch[%2u]: %8llu ± %6.0f\n",
+             batches[i],
+             (unsigned long long) avg.rel_value_us,
+             sqrt (variance / (ROUNDS - 1)));
+  }
+
+  result = 0;
+drop:
+  GNUNET_break (GNUNET_OK ==
+                plugin->drop_tables (plugin->cls));
+cleanup:
+  TALER_EXCHANGEDB_plugin_unload (plugin);
+  plugin = NULL;
+}
+
+
+int
+main (int argc,
+      char *const argv[])
+{
+  const char *plugin_name;
+  char *config_filename;
+  char *testname;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  (void) argc;
+  result = -1;
+  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
+  {
+    GNUNET_break (0);
+    return -1;
+  }
+
+  GNUNET_log_setup (argv[0],
+                    "WARNING",
+                    NULL);
+  plugin_name++;
+  (void) GNUNET_asprintf (&testname,
+                          "test-exchange-db-%s",
+                          plugin_name);
+  (void) GNUNET_asprintf (&config_filename,
+                          "%s.conf",
+                          testname);
+  fprintf (stdout,
+           "Using config: %s\n",
+           config_filename);
+  cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_parse (cfg,
+                                  config_filename))
+  {
+    GNUNET_break (0);
+    GNUNET_free (config_filename);
+    GNUNET_free (testname);
+    return 2;
+  }
+  GNUNET_SCHEDULER_run (&run,
+                        cfg);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_free (config_filename);
+  GNUNET_free (testname);
+  return result;
+}
+
+
+/* end of test_exchangedb_by_j.c */
diff --git a/src/exchangedb/test_idempotency.sh b/src/exchangedb/test_idempotency.sh
new file mode 100755
index 000000000..7314b8c3f
--- /dev/null
+++ b/src/exchangedb/test_idempotency.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# This file is in the public domain.
+set -eu
+psql talercheck < /dev/null || exit 77
+echo "Initializing DB"
+taler-exchange-dbinit -r -c test-exchange-db-postgres.conf
+echo "Re-initializing DB"
+taler-exchange-dbinit -c test-exchange-db-postgres.conf
+echo "Re-loading procedures"
+psql talercheck < procedures.sql
+echo "Test PASSED"
+exit 0
diff --git a/src/exchangedb/benchmark-0000.sql b/src/exchangedb/versioning.sql
index 116f409b7..444cf95ed 100644
--- a/src/exchangedb/benchmark-0000.sql
+++ b/src/exchangedb/versioning.sql
@@ -146,12 +146,13 @@
 
 BEGIN;
 
+
 -- This file adds versioning support to database it will be loaded to.
 -- It requires that PL/pgSQL is already loaded - will raise exception otherwise.
 -- All versioning "stuff" (tables, functions) is in "_v" schema.
 
 -- All functions are defined as 'RETURNS SETOF INT4' to be able to make them to RETURN literally nothing (0 rows).
--- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling.
+-- >> RETURNS VOID<< IS similar, but it still outputs "empty line" in psql when calling
 CREATE SCHEMA IF NOT EXISTS _v;
 COMMENT ON SCHEMA _v IS 'Schema for versioning data and functionality.';
 
diff --git a/src/extensions/Makefile.am b/src/extensions/Makefile.am
index 792b7eeb3..c867a9512 100644
--- a/src/extensions/Makefile.am
+++ b/src/extensions/Makefile.am
@@ -11,7 +11,7 @@ if USE_COVERAGE
 endif
 
 
-# Libraries
+# Basic extension handling library
 
 lib_LTLIBRARIES = \
   libtalerextensions.la
@@ -22,9 +22,13 @@ libtalerextensions_la_LDFLAGS = \
 
 libtalerextensions_la_SOURCES = \
   extensions.c \
-  extension_age_restriction.c
+  age_restriction_helper.c
 
 libtalerextensions_la_LIBADD = \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetjson \
+  -lgnunetutil \
   -ljansson \
   $(XLIB)
+
diff --git a/src/extensions/age_restriction/Makefile.am b/src/extensions/age_restriction/Makefile.am
new file mode 100644
index 000000000..bf5b2f5f5
--- /dev/null
+++ b/src/extensions/age_restriction/Makefile.am
@@ -0,0 +1,32 @@
+# This Makefile.am is in the public domain
+
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/src/include \
+  $(LIBGCRYPT_CFLAGS) \
+  $(POSTGRESQL_CPPFLAGS)
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+# Age restriction as extension library
+
+plugindir = $(libdir)/taler
+
+plugin_LTLIBRARIES = \
+  libtaler_extension_age_restriction.la
+
+libtaler_extension_age_restriction_la_LDFLAGS = \
+  $(TALER_PLUGIN_LDFLAGS) \
+  -no-undefined
+
+libtaler_extension_age_restriction_la_SOURCES = \
+  age_restriction.c
+libtaler_extension_age_restriction_la_LIBADD = \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
diff --git a/src/extensions/age_restriction/age_restriction.c b/src/extensions/age_restriction/age_restriction.c
new file mode 100644
index 000000000..08b598d50
--- /dev/null
+++ b/src/extensions/age_restriction/age_restriction.c
@@ -0,0 +1,256 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2021-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/>
+ */
+/**
+ * @file age_restriction.c
+ * @brief Utility functions regarding age restriction
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_extensions.h"
+#include "stdint.h"
+
+/* ==================================================
+ *
+ * Age Restriction  TALER_Extension implementation
+ *
+ * ==================================================
+ */
+
+/**
+ * @brief local configuration
+ */
+
+static struct TALER_AgeRestrictionConfig AR_config = {0};
+
+/**
+ * @brief implements the TALER_Extension.disable interface.
+ *
+ * @param ext Pointer to the current extension
+ */
+static void
+age_restriction_disable (
+  struct TALER_Extension *ext)
+{
+  if (NULL == ext)
+    return;
+
+  ext->enabled = false;
+  ext->config = NULL;
+
+  AR_config.mask.bits = 0;
+  AR_config.num_groups = 0;
+}
+
+
+/**
+ * @brief implements the TALER_Extension.load_config interface.
+ *
+ * @param ext if NULL, only tests the configuration
+ * @param jconfig the configuration as json
+ */
+static enum GNUNET_GenericReturnValue
+age_restriction_load_config (
+  const json_t *jconfig,
+  struct TALER_Extension *ext)
+{
+  struct TALER_AgeMask mask = {0};
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = TALER_JSON_parse_age_groups (jconfig, &mask);
+  if (GNUNET_OK != ret)
+    return ret;
+
+  /* only testing the parser */
+  if (ext == NULL)
+    return GNUNET_OK;
+
+  if (TALER_Extension_AgeRestriction != ext->type)
+    return GNUNET_SYSERR;
+
+  if (mask.bits > 0)
+  {
+    /* if the mask is not zero, the first bit MUST be set */
+    if (0 == (mask.bits & 1))
+      return GNUNET_SYSERR;
+
+    AR_config.mask.bits = mask.bits;
+    AR_config.num_groups = __builtin_popcount (mask.bits) - 1;
+  }
+
+  ext->config = &AR_config;
+  ext->enabled = true;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "loaded new age restriction config with age groups: %s\n",
+              TALER_age_mask_to_string (&mask));
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * @brief implements the TALER_Extension.manifest interface.
+ *
+ * @param ext if NULL, only tests the configuration
+ * @return configuration as json_t* object, maybe NULL
+ */
+static json_t *
+age_restriction_manifest (
+  const struct TALER_Extension *ext)
+{
+  json_t *conf;
+
+  GNUNET_assert (NULL != ext);
+
+  if (NULL == ext->config)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "age restriction not configured");
+    return json_null ();
+  }
+
+  conf = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("age_groups",
+                             TALER_age_mask_to_string (&AR_config.mask))
+    );
+  return GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_bool ("critical",
+                           ext->critical),
+    GNUNET_JSON_pack_string ("version",
+                             ext->version),
+    GNUNET_JSON_pack_object_steal ("config",
+                                   conf)
+    );
+}
+
+
+/* The extension for age restriction */
+struct TALER_Extension TE_age_restriction = {
+  .type = TALER_Extension_AgeRestriction,
+  .name = "age_restriction",
+  .critical = false,
+  .version = "1",
+  .enabled = false, /* disabled per default */
+  .config = NULL,
+  .disable = &age_restriction_disable,
+  .load_config = &age_restriction_load_config,
+  .manifest = &age_restriction_manifest,
+
+  /* This extension is not a policy extension */
+  .create_policy_details = NULL,
+  .policy_get_handler = NULL,
+  .policy_post_handler = NULL,
+};
+
+
+/**
+ * @brief implements the init() function for GNUNET_PLUGIN_load
+ *
+ * @param arg Pointer to the GNUNET_CONFIGURATION_Handle
+ * @return pointer to TALER_Extension on success or NULL otherwise.
+ */
+void *
+libtaler_extension_age_restriction_init (void *arg)
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg = arg;
+  char *groups = NULL;
+  struct TALER_AgeMask mask = {0};
+
+  if ((GNUNET_YES !=
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                        "ENABLED"))
+      ||
+      (GNUNET_YES !=
+       GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                             TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                             "ENABLED")))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "[age restriction] no section %s found in configuration\n",
+                TALER_EXTENSION_SECTION_AGE_RESTRICTION);
+
+    return NULL;
+  }
+
+  /* Age restriction is enabled, extract age groups */
+  if ((GNUNET_YES ==
+       GNUNET_CONFIGURATION_have_value (cfg,
+                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                        "AGE_GROUPS"))
+      &&
+      (GNUNET_YES !=
+       GNUNET_CONFIGURATION_get_value_string (cfg,
+                                              TALER_EXTENSION_SECTION_AGE_RESTRICTION,
+                                              "AGE_GROUPS",
+                                              &groups)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "[age restriction] AGE_GROUPS in %s is not a string\n",
+                TALER_EXTENSION_SECTION_AGE_RESTRICTION);
+
+    return NULL;
+  }
+
+  if (NULL == groups)
+    groups = GNUNET_strdup (TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_GROUPS);
+
+  if (GNUNET_OK != TALER_parse_age_group_string (groups, &mask))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "[age restriction] couldn't parse age groups: '%s'\n",
+                groups);
+    return NULL;
+  }
+
+  AR_config.mask = mask;
+  AR_config.num_groups = __builtin_popcount (mask.bits) - 1;   /* no underflow, first bit always set */
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "[age restriction] setting age mask to %s with #groups: %d\n",
+              TALER_age_mask_to_string (&AR_config.mask),
+              __builtin_popcount (AR_config.mask.bits) - 1);
+
+  TE_age_restriction.config = &AR_config;
+
+  /* Note: we do now have TE_age_restriction_config set, however the extension
+   * is not yet enabled! For age restriction to become active, load_config must
+   * have been called. */
+
+  GNUNET_free (groups);
+  return &TE_age_restriction;
+}
+
+
+/**
+ * @brief implements the done() function for GNUNET_PLUGIN_load
+ *
+ * @param arg unused
+ * @return pointer to TALER_Extension on success or NULL otherwise.
+ */
+void *
+libtaler_extension_age_restriction_done (void *arg)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "[age restriction] disabling and unloading");
+  AR_config.mask.bits = 0;
+  AR_config.num_groups = 0;
+  return NULL;
+}
+
+
+/* end of age_restriction.c */
diff --git a/src/extensions/age_restriction_helper.c b/src/extensions/age_restriction_helper.c
new file mode 100644
index 000000000..8ba835117
--- /dev/null
+++ b/src/extensions/age_restriction_helper.c
@@ -0,0 +1,73 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file age_restriction_helper.c
+ * @brief Helper functions for age restriction
+ * @author Özgür Kesim
+ */
+
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_signatures.h"
+#include "taler_extensions.h"
+#include "stdint.h"
+
+
+const struct TALER_AgeRestrictionConfig *
+TALER_extensions_get_age_restriction_config ()
+{
+  const struct TALER_Extension *ext;
+
+  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
+  if (NULL == ext)
+    return NULL;
+
+  return ext->config;
+}
+
+
+bool
+TALER_extensions_is_age_restriction_enabled ()
+{
+  const struct TALER_Extension *ext;
+
+  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
+  if (NULL == ext)
+    return false;
+
+  return ext->enabled;
+}
+
+
+struct TALER_AgeMask
+TALER_extensions_get_age_restriction_mask ()
+{
+  const struct TALER_Extension *ext;
+  const struct TALER_AgeRestrictionConfig *conf;
+
+  ext = TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
+
+  if ((NULL == ext) ||
+      (NULL == ext->config))
+    return (struct TALER_AgeMask) {0}
+  ;
+
+  conf = ext->config;
+  return conf->mask;
+}
+
+
+/* end age_restriction_helper.c */
diff --git a/src/extensions/extension_age_restriction.c b/src/extensions/extension_age_restriction.c
deleted file mode 100644
index fb0146b88..000000000
--- a/src/extensions/extension_age_restriction.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-   This file is part of TALER
-   Copyright (C) 2021-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/>
- */
-/**
- * @file extension_age_restriction.c
- * @brief Utility functions regarding age restriction
- * @author Özgür Kesim
- */
-#include "platform.h"
-#include "taler_util.h"
-#include "taler_extensions.h"
-#include "stdint.h"
-
-/**
- * Carries all the information we need for age restriction
- */
-struct age_restriction_config
-{
-  struct TALER_AgeMask mask;
-  size_t num_groups;
-};
-
-/**
- * Global config for this extension
- */
-static struct age_restriction_config TE_age_restriction_config = {0};
-
-/**
- * @param groups String representation of the age groups. Must be of the form
- *  a:b:...:n:m
- * with
- *  0 < a < b <...< n < m < 32
- * @param[out] mask Bit representation of the age groups.
- * @return Error if string was invalid, OK otherwise.
- */
-enum GNUNET_GenericReturnValue
-TALER_parse_age_group_string (
-  const char *groups,
-  struct TALER_AgeMask *mask)
-{
-
-  const char *pos = groups;
-  unsigned int prev = 0;
-  unsigned int val = 0;
-  char c;
-
-  while (*pos)
-  {
-    c = *pos++;
-    if (':' == c)
-    {
-      if (prev >= val)
-        return GNUNET_SYSERR;
-
-      mask->bits |= 1 << val;
-      prev = val;
-      val = 0;
-      continue;
-    }
-
-    if ('0'>c || '9'<c)
-      return GNUNET_SYSERR;
-
-    val = 10 * val + c - '0';
-
-    if (0>=val || 32<=val)
-      return GNUNET_SYSERR;
-  }
-
-  if (0>val || 32<=val || prev>=val)
-    return GNUNET_SYSERR;
-
-  mask->bits |= (1 << val);
-  mask->bits |= 1; // mark zeroth group, too
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
- *
- * @param mask Age mask
- * @return String representation of the age mask, allocated by GNUNET_malloc.
- *         Can be used as value in the TALER config.
- */
-char *
-TALER_age_mask_to_string (
-  const struct TALER_AgeMask *m)
-{
-  uint32_t bits = m->bits;
-  unsigned int n = 0;
-  char *buf = GNUNET_malloc (32 * 3); // max characters possible
-  char *pos = buf;
-
-  if (NULL == buf)
-  {
-    return buf;
-  }
-
-  while (bits != 0)
-  {
-    bits >>= 1;
-    n++;
-    if (0 == (bits & 1))
-    {
-      continue;
-    }
-
-    if (n > 9)
-    {
-      *(pos++) = '0' + n / 10;
-    }
-    *(pos++) = '0' + n % 10;
-
-    if (0 != (bits >> 1))
-    {
-      *(pos++) = ':';
-    }
-  }
-  return buf;
-}
-
-
-/* ==================================================
- *
- * Age Restriction  TALER_Extension imlementation
- *
- * ==================================================
- */
-
-/**
- * @brief implements the TALER_Extension.disable interface.
- */
-void
-age_restriction_disable (
-  struct TALER_Extension *this)
-{
-  if (NULL == this)
-    return;
-
-  this->config = NULL;
-
-  if (NULL != this->config_json)
-  {
-    json_decref (this->config_json);
-    this->config_json = NULL;
-  }
-
-  TE_age_restriction_config.mask.bits = 0;
-  TE_age_restriction_config.num_groups = 0;
-}
-
-
-/**
- * @brief implements the TALER_Extension.load_taler_config interface.
- * @param cfg Handle to the GNUNET configuration
- * @param[out] enabled Set to true if age restriction is enabled in the config, false otherwise.
- * @param[out] mask Mask for age restriction. Will be 0 if age restriction was not enabled in the config.
- * @return Error if extension for age restriction was set, but age groups were
- *         invalid, OK otherwise.
- */
-static enum GNUNET_GenericReturnValue
-age_restriction_load_taler_config (
-  struct TALER_Extension *this,
-  const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  char *groups = NULL;
-  enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
-  struct TALER_AgeMask mask = {0};
-
-  if ((GNUNET_YES !=
-       GNUNET_CONFIGURATION_have_value (cfg,
-                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                        "ENABLED"))
-      ||
-      (GNUNET_YES !=
-       GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                             TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                             "ENABLED")))
-  {
-    /* Age restriction is not enabled */
-    this->config = NULL;
-    this->config_json = NULL;
-    return GNUNET_OK;
-  }
-
-  /* Age restriction is enabled, extract age groups */
-  if ((GNUNET_YES ==
-       GNUNET_CONFIGURATION_have_value (cfg,
-                                        TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                        "AGE_GROUPS"))
-      &&
-      (GNUNET_YES !=
-       GNUNET_CONFIGURATION_get_value_string (cfg,
-                                              TALER_EXTENSION_SECTION_AGE_RESTRICTION,
-                                              "AGE_GROUPS",
-                                              &groups)))
-    return GNUNET_SYSERR;
-
-
-  mask.bits = TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK;
-  ret = GNUNET_OK;
-
-  if (groups != NULL)
-  {
-    ret = TALER_parse_age_group_string (groups, &mask);
-    if (GNUNET_OK != ret)
-      mask.bits = TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK;
-  }
-
-  if (GNUNET_OK == ret)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "setting age mask to %x with #groups: %d\n", mask.bits,
-                __builtin_popcount (mask.bits) - 1);
-    TE_age_restriction_config.mask.bits = mask.bits;
-    TE_age_restriction_config.num_groups = __builtin_popcount (mask.bits) - 1; /* no underflow, first bit always set */
-    this->config = &TE_age_restriction_config;
-
-    /* Note: we do now have TE_age_restriction_config set, however
-     * this->config_json is NOT set, i.e. the extension is not yet active! For
-     * age restriction to become active, load_json_config must have been
-     * called. */
-  }
-
-
-  GNUNET_free (groups);
-  return ret;
-}
-
-
-/**
- * @brief implements the TALER_Extension.load_json_config interface.
- * @param this if NULL, only tests the configuration
- * @param config the configuration as json
- */
-static enum GNUNET_GenericReturnValue
-age_restriction_load_json_config (
-  struct TALER_Extension *this,
-  json_t *jconfig)
-{
-  struct TALER_AgeMask mask = {0};
-  enum GNUNET_GenericReturnValue ret;
-
-  ret = TALER_JSON_parse_age_groups (jconfig, &mask);
-  if (GNUNET_OK != ret)
-    return ret;
-
-  /* only testing the parser */
-  if (this == NULL)
-    return GNUNET_OK;
-
-  if (TALER_Extension_AgeRestriction != this->type)
-    return GNUNET_SYSERR;
-
-  TE_age_restriction_config.mask.bits = mask.bits;
-  TE_age_restriction_config.num_groups = 0;
-
-  if (mask.bits > 0)
-  {
-    /* if the mask is not zero, the first bit MUST be set */
-    if (0 == (mask.bits & 1))
-      return GNUNET_SYSERR;
-
-    TE_age_restriction_config.num_groups = __builtin_popcount (mask.bits) - 1;
-  }
-
-  this->config = &TE_age_restriction_config;
-
-  if (NULL != this->config_json)
-    json_decref (this->config_json);
-
-  this->config_json = jconfig;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "loaded new age restriction config with age groups: %s\n",
-              TALER_age_mask_to_string (&mask));
-
-  return GNUNET_OK;
-}
-
-
-/**
- * @brief implements the TALER_Extension.load_json_config interface.
- * @param this if NULL, only tests the configuration
- * @param config the configuration as json
- */
-json_t *
-age_restriction_config_to_json (
-  const struct TALER_Extension *this)
-{
-  char *mask_str;
-  json_t *conf;
-
-  GNUNET_assert (NULL != this);
-  GNUNET_assert (NULL != this->config);
-
-  if (NULL != this->config_json)
-  {
-    return json_copy (this->config_json);
-  }
-
-  mask_str = TALER_age_mask_to_string (&TE_age_restriction_config.mask);
-  conf = GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_string ("age_groups", mask_str)
-    );
-
-  return GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_bool ("critical", this->critical),
-    GNUNET_JSON_pack_string ("version", this->version),
-    GNUNET_JSON_pack_object_steal ("config", conf)
-    );
-}
-
-
-/**
- * @brief implements the TALER_Extension.test_json_config interface.
- */
-static enum GNUNET_GenericReturnValue
-age_restriction_test_json_config (
-  const json_t *config)
-{
-  struct TALER_AgeMask mask = {0};
-
-  return TALER_JSON_parse_age_groups (config, &mask);
-}
-
-
-/* The extension for age restriction */
-struct TALER_Extension TE_age_restriction = {
-  .next = NULL,
-  .type = TALER_Extension_AgeRestriction,
-  .name = "age_restriction",
-  .critical = false,
-  .version = "1",
-  .config = NULL,   // disabled per default
-  .config_json = NULL,
-  .disable = &age_restriction_disable,
-  .test_json_config = &age_restriction_test_json_config,
-  .load_json_config = &age_restriction_load_json_config,
-  .config_to_json = &age_restriction_config_to_json,
-  .load_taler_config = &age_restriction_load_taler_config,
-};
-
-enum GNUNET_GenericReturnValue
-TALER_extension_age_restriction_register ()
-{
-  return TALER_extensions_add (&TE_age_restriction);
-}
-
-
-bool
-TALER_extensions_age_restriction_is_configured ()
-{
-  return (0 != TE_age_restriction_config.mask.bits);
-}
-
-
-struct TALER_AgeMask
-TALER_extensions_age_restriction_ageMask ()
-{
-  return TE_age_restriction_config.mask;
-}
-
-
-size_t
-TALER_extensions_age_restriction_num_groups ()
-{
-  return TE_age_restriction_config.num_groups;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_JSON_parse_age_groups (const json_t *root,
-                             struct TALER_AgeMask *mask)
-{
-  enum GNUNET_GenericReturnValue ret;
-  const char *str;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("age_groups",
-                             &str),
-    GNUNET_JSON_spec_end ()
-  };
-
-  ret = GNUNET_JSON_parse (root,
-                           spec,
-                           NULL,
-                           NULL);
-  if (GNUNET_OK == ret)
-    TALER_parse_age_group_string (str, mask);
-
-  GNUNET_JSON_parse_free (spec);
-
-  return ret;
-}
-
-
-/* end of extension_age_restriction.c */
diff --git a/src/extensions/extensions.c b/src/extensions/extensions.c
index 55a7dcd81..999e9317a 100644
--- a/src/extensions/extensions.c
+++ b/src/extensions/extensions.c
@@ -19,25 +19,27 @@
  * @author Özgür Kesim
  */
 #include "platform.h"
+#include "taler_extensions_policy.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
 #include "taler_extensions.h"
 #include "stdint.h"
 
-
 /* head of the list of all registered extensions */
-static struct TALER_Extension *TE_extensions = NULL;
-
+static struct TALER_Extensions TE_extensions = {
+  .next = NULL,
+  .extension = NULL,
+};
 
-const struct TALER_Extension *
+const struct TALER_Extensions *
 TALER_extensions_get_head ()
 {
-  return TE_extensions;
+  return &TE_extensions;
 }
 
 
-enum GNUNET_GenericReturnValue
-TALER_extensions_add (
+static enum GNUNET_GenericReturnValue
+add_extension (
   const struct TALER_Extension *extension)
 {
   /* Sanity checks */
@@ -45,28 +47,31 @@ TALER_extensions_add (
       (NULL == extension->name) ||
       (NULL == extension->version) ||
       (NULL == extension->disable) ||
-      (NULL == extension->test_json_config) ||
-      (NULL == extension->load_json_config) ||
-      (NULL == extension->config_to_json) ||
-      (NULL == extension->load_taler_config))
+      (NULL == extension->load_config) ||
+      (NULL == extension->manifest))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "invalid extension\n");
     return GNUNET_SYSERR;
   }
 
-  if (NULL == TE_extensions) /* first extension ?*/
-    TE_extensions = (struct TALER_Extension *) extension;
+  if (NULL == TE_extensions.extension) /* first extension ?*/
+    TE_extensions.extension = extension;
   else
   {
-    struct TALER_Extension *iter;
+    struct TALER_Extensions *iter;
+    struct TALER_Extensions *last;
 
     /* Check for collisions */
-    for (iter = TE_extensions; NULL != iter; iter = iter->next)
+    for (iter = &TE_extensions;
+         NULL != iter && NULL != iter->extension;
+         iter = iter->next)
     {
-      if (extension->type == iter->type ||
+      const struct TALER_Extension *ext = iter->extension;
+      last = iter;
+      if (extension->type == ext->type ||
           0 == strcasecmp (extension->name,
-                           iter->name))
+                           ext->name))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "extension collision for `%s'\n",
@@ -76,7 +81,11 @@ TALER_extensions_add (
     }
 
     /* No collisions found, so add this extension to the list */
-    iter->next = (struct TALER_Extension *) extension;
+    {
+      struct TALER_Extensions *extn = GNUNET_new (struct TALER_Extensions);
+      extn->extension = extension;
+      last->next = extn;
+    }
   }
 
   return GNUNET_OK;
@@ -87,12 +96,12 @@ const struct TALER_Extension *
 TALER_extensions_get_by_type (
   enum TALER_Extension_Type type)
 {
-  for (const struct TALER_Extension *it = TE_extensions;
-       NULL != it;
+  for (const struct TALER_Extensions *it = &TE_extensions;
+       NULL != it && NULL != it->extension;
        it = it->next)
   {
-    if (it->type == type)
-      return it;
+    if (it->extension->type == type)
+      return it->extension;
   }
 
   /* No extension found. */
@@ -107,8 +116,7 @@ TALER_extensions_is_enabled_type (
   const struct TALER_Extension *ext =
     TALER_extensions_get_by_type (type);
 
-  return (NULL != ext &&
-          TALER_extensions_is_enabled (ext));
+  return (NULL != ext && ext->enabled);
 }
 
 
@@ -116,33 +124,34 @@ const struct TALER_Extension *
 TALER_extensions_get_by_name (
   const char *name)
 {
-  for (const struct TALER_Extension *it = TE_extensions;
+  for (const struct TALER_Extensions *it = &TE_extensions;
        NULL != it;
        it = it->next)
   {
-    if (0 == strcasecmp (name, it->name))
-      return it;
+    if (0 == strcasecmp (name, it->extension->name))
+      return it->extension;
   }
-  /* No extension found. */
+  /* No extension found, try to load it. */
+
   return NULL;
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_extensions_verify_json_config_signature (
-  json_t *extensions,
+TALER_extensions_verify_manifests_signature (
+  const json_t *manifests,
   struct TALER_MasterSignatureP *extensions_sig,
   struct TALER_MasterPublicKeyP *master_pub)
 {
-  struct TALER_ExtensionConfigHashP h_config;
+  struct TALER_ExtensionManifestsHashP h_manifests;
 
   if (GNUNET_OK !=
-      TALER_JSON_extensions_config_hash (extensions,
-                                         &h_config))
+      TALER_JSON_extensions_manifests_hash (manifests,
+                                            &h_manifests))
     return GNUNET_SYSERR;
   if (GNUNET_OK !=
-      TALER_exchange_offline_extension_config_hash_verify (
-        &h_config,
+      TALER_exchange_offline_extension_manifests_hash_verify (
+        &h_manifests,
         master_pub,
         extensions_sig))
     return GNUNET_NO;
@@ -176,7 +185,8 @@ configure_extension (
 {
   struct LoadConfClosure *col = cls;
   const char *name;
-  const struct TALER_Extension *extension;
+  char lib_name[1024] = {0};
+  struct TALER_Extension *extension;
 
   if (GNUNET_OK != col->error)
     return;
@@ -188,33 +198,53 @@ configure_extension (
 
   name = section + sizeof(TALER_EXTENSION_SECTION_PREFIX) - 1;
 
-  if (NULL ==
-      (extension = TALER_extensions_get_by_name (name)))
+
+  /* Load the extension library */
+  GNUNET_snprintf (lib_name,
+                   sizeof(lib_name),
+                   "libtaler_extension_%s",
+                   name);
+  /* Lower-case extension name, config is case-insensitive */
+  for (unsigned int i = 0; i < strlen (lib_name); i++)
+    lib_name[i] = tolower (lib_name[i]);
+
+  extension = GNUNET_PLUGIN_load (lib_name,
+                                  (void *) col->cfg);
+  if (NULL == extension)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unsupported extension `%s` (section [%s]).\n", name,
+                "Couldn't load extension library to `%s` (section [%s]).\n",
+                name,
                 section);
     col->error = GNUNET_SYSERR;
     return;
   }
 
-  if (GNUNET_OK !=
-      extension->load_taler_config (
-        (struct TALER_Extension *) extension,
-        col->cfg))
+
+  if (GNUNET_OK != add_extension (extension))
   {
+    /* TODO: Ignoring return values here */
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Couldn't parse configuration for extension `%s` (section [%s]).\n",
+                "Couldn't add extension `%s` (section [%s]).\n",
                 name,
                 section);
     col->error = GNUNET_SYSERR;
+    GNUNET_PLUGIN_unload (
+      lib_name,
+      (void *) col->cfg);
     return;
   }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "extension library '%s' loaded\n",
+              lib_name);
 }
 
 
+static bool extensions_loaded = false;
+
 enum GNUNET_GenericReturnValue
-TALER_extensions_load_taler_config (
+TALER_extensions_init (
   const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct LoadConfClosure col = {
@@ -222,112 +252,200 @@ TALER_extensions_load_taler_config (
     .error = GNUNET_OK,
   };
 
+  if (extensions_loaded)
+    return GNUNET_OK;
+
   GNUNET_CONFIGURATION_iterate_sections (cfg,
                                          &configure_extension,
                                          &col);
+
+  if (GNUNET_OK == col.error)
+    extensions_loaded = true;
+
   return col.error;
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_extensions_is_json_config (
+TALER_extensions_parse_manifest (
   json_t *obj,
   int *critical,
   const char **version,
   json_t **config)
 {
   enum GNUNET_GenericReturnValue ret;
-  json_t *cfg;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_boolean ("critical",
                               critical),
     GNUNET_JSON_spec_string ("version",
                              version),
     GNUNET_JSON_spec_json ("config",
-                           &cfg),
+                           config),
     GNUNET_JSON_spec_end ()
   };
 
+  *config = NULL;
   if (GNUNET_OK !=
       (ret = GNUNET_JSON_parse (obj,
                                 spec,
                                 NULL,
                                 NULL)))
     return ret;
-
-  *config = json_copy (cfg);
-  GNUNET_JSON_parse_free (spec);
-
   return GNUNET_OK;
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_extensions_load_json_config (
-  json_t *extensions)
+TALER_extensions_load_manifests (
+  const json_t *extensions)
 {
-  const char*name;
-  json_t *blob;
+  const char *name;
+  json_t *manifest;
 
   GNUNET_assert (NULL != extensions);
   GNUNET_assert (json_is_object (extensions));
 
-  json_object_foreach (extensions, name, blob)
+  json_object_foreach ((json_t *) extensions, name, manifest)
   {
     int critical;
     const char *version;
     json_t *config;
-    const struct TALER_Extension *extension =
-      TALER_extensions_get_by_name (name);
+    struct TALER_Extension *extension
+      = (struct TALER_Extension *)
+        TALER_extensions_get_by_name (name);
 
     if (NULL == extension)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "no such extension: %s\n", name);
+                  "no such extension: %s\n",
+                  name);
       return GNUNET_SYSERR;
     }
 
     /* load and verify criticality, version, etc. */
     if (GNUNET_OK !=
-        TALER_extensions_is_json_config (
-          blob, &critical, &version, &config))
+        TALER_extensions_parse_manifest (
+          manifest,
+          &critical,
+          &version,
+          &config))
       return GNUNET_SYSERR;
 
     if (critical != extension->critical
-        || 0 != strcmp (version, extension->version) // TODO: libtool compare?
+        || 0 != strcmp (version,
+                        extension->version) // TODO: libtool compare?
         || NULL == config
-        || GNUNET_OK != extension->test_json_config (config))
+        || (GNUNET_OK !=
+            extension->load_config (config,
+                                    NULL)) )
       return GNUNET_SYSERR;
 
     /* This _should_ work now */
     if (GNUNET_OK !=
-        extension->load_json_config ((struct TALER_Extension *) extension,
-                                     config))
+        extension->load_config (config,
+                                extension))
       return GNUNET_SYSERR;
+
+    extension->enabled = true;
   }
 
   /* make sure to disable all extensions that weren't mentioned in the json */
-  for (const struct TALER_Extension *it = TALER_extensions_get_head ();
+  for (const struct TALER_Extensions *it = TALER_extensions_get_head ();
        NULL != it;
        it = it->next)
   {
-    if (NULL == json_object_get (extensions, it->name))
-      it->disable ((struct TALER_Extension *) it);
+    if (NULL == json_object_get (extensions, it->extension->name))
+      it->extension->disable ((struct TALER_Extension *) it);
   }
 
   return GNUNET_OK;
 }
 
 
-bool
-TALER_extensions_age_restriction_is_enabled ()
+/*
+ * Policy related
+ */
+
+static char *fulfillment2str[] =  {
+  [TALER_PolicyFulfillmentInitial]      = "<init>",
+  [TALER_PolicyFulfillmentReady]        = "Ready",
+  [TALER_PolicyFulfillmentSuccess]      = "Success",
+  [TALER_PolicyFulfillmentFailure]      = "Failure",
+  [TALER_PolicyFulfillmentTimeout]      = "Timeout",
+  [TALER_PolicyFulfillmentInsufficient] = "Insufficient",
+};
+
+const char *
+TALER_policy_fulfillment_state_str (
+  enum TALER_PolicyFulfillmentState state)
+{
+  GNUNET_assert (TALER_PolicyFulfillmentStateCount > state);
+  return fulfillment2str[state];
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_extensions_create_policy_details (
+  const char *currency,
+  const json_t *policy_options,
+  struct TALER_PolicyDetails *details,
+  const char **error_hint)
 {
-  const struct TALER_Extension *age =
-    TALER_extensions_get_by_type (TALER_Extension_AgeRestriction);
+  enum GNUNET_GenericReturnValue ret;
+  const struct TALER_Extension *extension;
+  const json_t *jtype;
+  const char *type;
+
+  *error_hint = NULL;
+
+  if ((NULL == policy_options) ||
+      (! json_is_object (policy_options)))
+  {
+    *error_hint = "invalid policy object";
+    return GNUNET_SYSERR;
+  }
+
+  jtype = json_object_get (policy_options, "type");
+  if (NULL == jtype)
+  {
+    *error_hint = "no type in policy object";
+    return GNUNET_SYSERR;
+  }
+
+  type = json_string_value (jtype);
+  if (NULL == type)
+  {
+    *error_hint = "invalid type in policy object";
+    return GNUNET_SYSERR;
+  }
+
+  extension = TALER_extensions_get_by_name (type);
+  if ((NULL == extension) ||
+      (NULL == extension->create_policy_details))
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Unsupported extension policy '%s' requested\n",
+                type);
+    return GNUNET_NO;
+  }
+
+  /* Set state fields in the policy details to initial values. */
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        &details->accumulated_total));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        &details->policy_fee));
+  details->deadline = GNUNET_TIME_UNIT_FOREVER_TS;
+  details->fulfillment_state = TALER_PolicyFulfillmentInitial;
+  details->no_policy_fulfillment_id = true;
+  ret = extension->create_policy_details (currency,
+                                          policy_options,
+                                          details,
+                                          error_hint);
+  return ret;
 
-  return (NULL != age &&
-          NULL != age->config_json &&
-          TALER_extensions_age_restriction_is_configured ());
 }
 
 
diff --git a/src/include/.gitignore b/src/include/.gitignore
new file mode 100644
index 000000000..beba883b6
--- /dev/null
+++ b/src/include/.gitignore
@@ -0,0 +1 @@
+taler_signatures.h
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 13b9a1444..45d74ab8e 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -5,6 +5,7 @@ talerinclude_HEADERS = \
   platform.h gettext.h \
   taler_auditor_service.h \
   taler_amount_lib.h \
+  taler_attributes.h \
   taler_auditordb_lib.h \
   taler_auditordb_plugin.h \
   taler_bank_service.h \
@@ -16,7 +17,10 @@ talerinclude_HEADERS = \
   taler_exchangedb_lib.h \
   taler_exchangedb_plugin.h \
   taler_extensions.h \
+  taler_extensions_policy.h \
   taler_fakebank_lib.h \
+  taler_kyclogic_lib.h \
+  taler_kyclogic_plugin.h \
   taler_json_lib.h \
   taler_testing_lib.h \
   taler_util.h \
@@ -24,6 +28,7 @@ talerinclude_HEADERS = \
   taler_pq_lib.h \
   taler_signatures.h \
   taler_sq_lib.h \
+  taler_templating_lib.h \
   taler_twister_testing_lib.h
 
 EXTRA_DIST = \
diff --git a/src/include/platform.h b/src/include/platform.h
index b2c286b74..db04cb972 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -15,22 +15,22 @@
 */
 
 /**
- * @file exchange/src/include/platform.h
+ * @file include/platform.h
  * @brief This file contains the includes and definitions which are used by the
  *        rest of the modules
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
-
 #ifndef PLATFORM_H_
 #define PLATFORM_H_
 
 /* Include our configuration header */
 #ifndef HAVE_USED_CONFIG_H
-# define HAVE_USED_CONFIG_H
-# ifdef HAVE_CONFIG_H
-#  include "taler_config.h"
-# endif
+#define HAVE_USED_CONFIG_H
+#ifdef HAVE_CONFIG_H
+#include "taler_config.h"
+#endif
 #endif
+
 /* For the exchange build, we do NOT want gettext, even
    if it is available! */
 #undef ENABLE_NLS
@@ -45,9 +45,6 @@
 /* Include the features available for GNU source */
 #define _GNU_SOURCE
 
-/* Include GNUnet's platform file */
-#include <gnunet/platform.h>
-
 /* Do not use shortcuts for gcrypt mpi */
 #define GCRYPT_NO_MPI_MACROS 1
 
@@ -67,24 +64,209 @@
 #define ENABLE_SANITY_CHECKS 1
 
 
+#include <netdb.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#if HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#if HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#if HAVE_NETINET_IP_H
+#include <netinet/ip.h>         /* superset of previous */
+#endif
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <pwd.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <grp.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <signal.h>
+#include <libgen.h>
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>             /* for mallinfo on GNU */
+#endif
+#include <unistd.h>             /* KLB_FIX */
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>             /* KLB_FIX */
+#include <fcntl.h>
+#include <math.h>
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <time.h>
+#ifdef BSD
+#include <net/if.h>
+#endif
+#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__)
+#include <semaphore.h>
+#endif
+#ifdef DARWIN
+#include <dlfcn.h>
+#include <semaphore.h>
+#include <net/if.h>
+#endif
+#if defined(__linux__) || defined(GNU)
+#include <net/if.h>
+#endif
+#ifdef SOLARIS
+#include <sys/sockio.h>
+#include <sys/filio.h>
+#include <sys/loadavg.h>
+#include <semaphore.h>
+#endif
+#if HAVE_UCRED_H
+#include <ucred.h>
+#endif
+#if HAVE_SYS_UCRED_H
+#include <sys/ucred.h>
+#endif
+#if HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#endif
+#include <errno.h>
+#include <limits.h>
+
+#if HAVE_VFORK_H
+#include <vfork.h>
+#endif
+
+#include <ctype.h>
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
+#if HAVE_ENDIAN_H
+#include <endian.h>
+#endif
+#if HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#endif
+
+#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR_STR "/"
+#define PATH_SEPARATOR ':'
+#define PATH_SEPARATOR_STR ":"
+#define NEWLINE "\n"
+
+
+#include <locale.h>
+#include "gettext.h"
+/**
+ * GNU gettext support macro.
+ */
+#define _(String) dgettext (PACKAGE, String)
+
+
+#include <sys/mman.h>
+
+/* FreeBSD_kernel is not defined on the now discontinued kFreeBSD  */
+#if defined(BSD) && defined(__FreeBSD__) && defined(__FreeBSD_kernel__)
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+#endif
+
+#ifdef DARWIN
+#define __BYTE_ORDER BYTE_ORDER
+#define __BIG_ENDIAN BIG_ENDIAN
+/* not available on darwin, override configure */
+#undef HAVE_STAT64
+#undef HAVE_MREMAP
+#endif
+
+#if ! HAVE_ATOLL
+long long
+atoll (const char *nptr);
+
+#endif
+
+#if ENABLE_NLS
+#include "langinfo.h"
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) (-1))
+#endif
+
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
+
+#if defined(__sparc__)
+#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp, &(val), \
+                                                                 sizeof((val))); \
+                               __tmp; })
+#else
+#define MAKE_UNALIGNED(val) val
+#endif
+
+
+#ifndef PATH_MAX
+/**
+ * Assumed maximum path length.
+ */
+#define PATH_MAX 4096
+#endif
+
+#if HAVE_THREAD_LOCAL_GCC
+#define TALER_THREAD_LOCAL __thread
+#else
+#define TALER_THREAD_LOCAL
+#endif
+
+
 /* LSB-style exit status codes */
 #ifndef EXIT_INVALIDARGUMENT
+/**
+ * Command-line arguments are invalid.
+ * Restarting useless.
+ */
 #define EXIT_INVALIDARGUMENT 2
 #endif
 
 #ifndef EXIT_NOTIMPLEMENTED
+/**
+ * The requested operation is not implemented.
+ * Restarting useless.
+ */
 #define EXIT_NOTIMPLEMENTED 3
 #endif
 
 #ifndef EXIT_NOPERMISSION
+/**
+ * Permissions needed to run are not available.
+ * Restarting useless.
+ */
 #define EXIT_NOPERMISSION 4
 #endif
 
 #ifndef EXIT_NOTINSTALLED
+/**
+ * Key resources are not installed.
+ * Restarting useless.
+ */
 #define EXIT_NOTINSTALLED 5
 #endif
 
 #ifndef EXIT_NOTCONFIGURED
+/**
+ * Key configuration settings are missing or invalid.
+ * Restarting useless.
+ */
 #define EXIT_NOTCONFIGURED 6
 #endif
 
@@ -93,6 +275,25 @@
 #endif
 
 
+#ifndef EXIT_NO_RESTART
+/**
+ * Exit code from 'main' if we do not want to be restarted,
+ * except by manual intervention (hard failure).
+ */
+#define EXIT_NO_RESTART 9
+#endif
+
+
+/**
+ * clang et al do not have such an attribute
+ */
+#if __has_attribute (__nonstring__)
+# define __nonstring                    __attribute__((__nonstring__))
+#else
+# define __nonstring
+#endif
+
+
 #endif  /* PLATFORM_H_ */
 
 /* end of platform.h */
diff --git a/src/include/taler_amount_lib.h b/src/include/taler_amount_lib.h
index a529cfb84..937238d15 100644
--- a/src/include/taler_amount_lib.h
+++ b/src/include/taler_amount_lib.h
@@ -18,6 +18,10 @@
  * @brief amount-representation utility functions
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
+#if ! defined (__TALER_UTIL_LIB_H_INSIDE__)
+#error "Only <taler_util.h> can be included directly."
+#endif
+
 #ifndef TALER_AMOUNT_LIB_H
 #define TALER_AMOUNT_LIB_H
 
@@ -124,6 +128,16 @@ struct TALER_Amount
 
 
 /**
+ * Check that the currency code in @a str is well-formed.
+ *
+ * @param str currency code name to validate
+ * @return #GNUNET_OK if @a str is a valid currency code
+ */
+enum GNUNET_GenericReturnValue
+TALER_check_currency (const char *str);
+
+
+/**
  * Parse monetary amount, in the format "T:V.F".
  *
  * @param str amount string
@@ -398,7 +412,7 @@ TALER_amount_multiply (struct TALER_Amount *result,
  *         #GNUNET_NO if value was already normalized
  *         #GNUNET_SYSERR if value was invalid or could not be normalized
  */
-int
+enum GNUNET_GenericReturnValue
 TALER_amount_normalize (struct TALER_Amount *amount);
 
 
diff --git a/src/include/taler_attributes.h b/src/include/taler_attributes.h
new file mode 100644
index 000000000..862a26928
--- /dev/null
+++ b/src/include/taler_attributes.h
@@ -0,0 +1,129 @@
+/*
+     This file is part of GNU Taler
+     Copyright (C) 2023 Taler Systems SA
+
+     GNU Taler is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Lesser General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNU 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
+     Lesser General Public License for more details.
+
+     You should have received a copy of the GNU Lesser General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: LGPL3.0-or-later
+
+     Note: the LGPL does not apply to all components of GNU Taler,
+     but it does apply to this file.
+ */
+/**
+  * @file src/include/taler_attributes.h
+  * @brief GNU Taler database event types, TO BE generated via https://gana.gnunet.org/
+  */
+#ifndef GNU_TALER_ATTRIBUTES_H
+#define GNU_TALER_ATTRIBUTES_H
+
+#ifdef __cplusplus
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+/**
+ * Legal name of the business/company.
+ */
+#define TALER_ATTRIBUTE_COMPANY_NAME "company_name"
+
+/**
+ * Legal country of registration of the business/company,
+ * 2-letter country code using ISO 3166-2.
+ */
+#define TALER_ATTRIBUTE_REGISTRATION_COUNTRY "registration_country"
+
+/**
+ * Full name, when known/possible using "Lastname, Firstname(s)" format,
+ * but "Firstname(s) Lastname" or "Firstname M. Lastname" should also be
+ * tolerated (as is "Name", especially if the person only has one name).
+ * If the person has no name, an empty string must be given.
+ * NULL for not collected.
+ */
+#define TALER_ATTRIBUTE_FULL_NAME "full_name"
+
+/**
+ * True/false indicator if the individual is a politically
+ * exposed person.
+ */
+#define TALER_ATTRIBUTE_PEP "pep"
+
+/**
+ * Street-level address. Usually includes the street and the house number. May
+ * consist of multiple lines (separated by '\n'). Identifies a house in a city.  The city is not
+ * part of the street.
+ */
+#define TALER_ATTRIBUTE_ADDRESS_STREET "street"
+
+/**
+ * City including postal code.  If available, a 2-letter country-code prefixes
+ * the postal code, which is before the city (e.g. "DE-42289 Wuppertal").  If
+ * the country code is unknown, the "CC-" prefix is missing.  If the ZIP code
+ * is unknown, the hyphen is followed by a space ("DE- Wuppertal"). If only
+ * the city name is known, it is prefixed by a space (" ").
+ * If the city name is unknown, a space is at the end of the value.
+ */
+#define TALER_ATTRIBUTE_ADDRESS_CITY "city"
+
+/**
+ * Phone number (of business or individual).  Should come with the "+CC"
+ * prefix including the country code.
+ */
+#define TALER_ATTRIBUTE_PHONE "phone"
+
+/**
+ * Email address (of business or individual).  Should be
+ * in the format "user@hostname".
+ */
+#define TALER_ATTRIBUTE_EMAIL "email"
+
+/**
+ * Birthdate of the person, as far as known. YYYY-MM-DD, a value
+ * of 0 (for DD, MM or even YYYY) is to be used for 'unknown'
+ * according to official records.
+ * Thus, 1950-00-00 stands for a birthdate in 1950 with unknown
+ * day and month.  If official documents record January 1st or
+ * some other date instead, that day may also be specified.
+ * NULL for not collected.
+ */
+#define TALER_ATTRIBUTE_BIRTHDATE "birthdate"
+
+/**
+ * Citizenship(s) of the person using 2-letter country codes ("US", "DE",
+ * "FR", "IT", etc.) separated by commas if multiple citizenships are
+ * confirmed ("EN,US,DE"). Note that in the latter case it is not guaranteed
+ * that all nationalities were necessarily recorded.  Empty string for
+ * stateless persons.  NULL for not collected.
+ */
+#define TALER_ATTRIBUTE_NATIONALITIES "nationalities"
+
+/**
+ * Residence countries(s) of the person using 2-letter country codes ("US",
+ * "DE", "FR", "IT", etc.) separated by commas if multiple residences are
+ * confirmed ("EN,US,DE"). Note that in the latter case it is not guaranteed
+ * that all residences were necessarily recorded.  Empty string for
+ * international nomads.  NULL for not collected.
+ */
+#define TALER_ATTRIBUTE_RESIDENCES "residences"
+
+
+#if 0 /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/include/taler_auditor_service.h b/src/include/taler_auditor_service.h
index 30d18e6e9..36ea781b1 100644
--- a/src/include/taler_auditor_service.h
+++ b/src/include/taler_auditor_service.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 Taler Systems SA
 
   TALER 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
@@ -16,6 +16,8 @@
 /**
  * @file include/taler_auditor_service.h
  * @brief C interface of libtalerauditor, a C library to use auditor's HTTP API
+ *        This library is not thread-safe, all APIs must only be used from a single thread.
+ *        This library calls abort() if it runs out of memory. Be aware of these limitations.
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
  */
@@ -28,12 +30,12 @@
 #include <gnunet/gnunet_curl_lib.h>
 
 
-/* *********************  /version *********************** */
+/* *********************  /config *********************** */
 
 /**
- * @brief Information we get from the auditor about auditors.
+ * @brief Information we get from the auditor about itself.
  */
-struct TALER_AUDITOR_VersionInformation
+struct TALER_AUDITOR_ConfigInformation
 {
   /**
    * Public key of the auditing institution.  Wallets and merchants
@@ -44,6 +46,11 @@ struct TALER_AUDITOR_VersionInformation
   struct TALER_AuditorPublicKeyP auditor_pub;
 
   /**
+   * Master public key of the audited exchange.
+   */
+  struct TALER_MasterPublicKeyP exchange_master_public_key;
+
+  /**
    * Supported Taler protocol version by the auditor.
    * String in the format current:revision:age using the
    * semantics of GNU libtool.  See
@@ -147,56 +154,90 @@ struct TALER_AUDITOR_HttpResponse
 
 
 /**
+ * Response to /config request.
+ */
+struct TALER_AUDITOR_ConfigResponse
+{
+  /**
+   * HTTP response.
+   */
+  struct TALER_AUDITOR_HttpResponse hr;
+
+  /**
+   * Details depending on HTTP status.
+   */
+  union
+  {
+
+    /**
+     * Details for #MHD_HTTP_OK.
+     */
+    struct
+    {
+
+      /**
+       * Protocol compatibility evaluation.
+       */
+      enum TALER_AUDITOR_VersionCompatibility compat;
+
+      /**
+       * Config data returned by /config.
+       */
+      struct TALER_AUDITOR_ConfigInformation vi;
+
+    } ok;
+
+  } details;
+
+};
+
+
+/**
  * Function called with information about the auditor.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param vi basic information about the auditor
- * @param compat protocol compatibility information
+ * @param vr response data
  */
 typedef void
-(*TALER_AUDITOR_VersionCallback) (
+(*TALER_AUDITOR_ConfigCallback) (
   void *cls,
-  const struct TALER_AUDITOR_HttpResponse *hr,
-  const struct TALER_AUDITOR_VersionInformation *vi,
-  enum TALER_AUDITOR_VersionCompatibility compat);
+  const struct TALER_AUDITOR_ConfigResponse *vr);
 
 
 /**
  * @brief Handle to the auditor.  This is where we interact with
  * a particular auditor and keep the per-auditor information.
  */
-struct TALER_AUDITOR_Handle;
+struct TALER_AUDITOR_GetConfigHandle;
 
 
 /**
- * Initialise a connection to the auditor. Will connect to the
+ * Obtain meta data about an auditor. Will connect to the
  * auditor and obtain information about the auditor's master public
  * key and the auditor's auditor.  The respective information will
- * be passed to the @a version_cb once available, and all future
- * interactions with the auditor will be checked to be signed
- * (where appropriate) by the respective master key.
+ * be passed to the @a config_cb once available.
  *
- * @param ctx the context
+ * @param ctx the context for CURL requests
  * @param url HTTP base URL for the auditor
- * @param version_cb function to call with the auditor's version information
- * @param version_cb_cls closure for @a version_cb
+ * @param config_cb function to call with the auditor's config information
+ * @param config_cb_cls closure for @a config_cb
  * @return the auditor handle; NULL upon error
  */
-struct TALER_AUDITOR_Handle *
-TALER_AUDITOR_connect (struct GNUNET_CURL_Context *ctx,
-                       const char *url,
-                       TALER_AUDITOR_VersionCallback version_cb,
-                       void *version_cb_cls);
+struct TALER_AUDITOR_GetConfigHandle *
+TALER_AUDITOR_get_config (struct GNUNET_CURL_Context *ctx,
+                          const char *url,
+                          TALER_AUDITOR_ConfigCallback config_cb,
+                          void *config_cb_cls);
 
 
 /**
- * Disconnect from the auditor.
+ * Cancel auditor config request.
  *
- * @param auditor the auditor handle
+ * @param[in] auditor the auditor handle
  */
 void
-TALER_AUDITOR_disconnect (struct TALER_AUDITOR_Handle *auditor);
+TALER_AUDITOR_get_config_cancel (
+  struct TALER_AUDITOR_GetConfigHandle *auditor);
 
 
 /**
@@ -206,16 +247,28 @@ struct TALER_AUDITOR_DepositConfirmationHandle;
 
 
 /**
+ * Response to /deposit-confirmation request.
+ */
+struct TALER_AUDITOR_DepositConfirmationResponse
+{
+  /**
+   * HTTP response.
+   */
+  struct TALER_AUDITOR_HttpResponse hr;
+};
+
+
+/**
  * Signature of functions called with the result from our call to the
  * auditor's /deposit-confirmation handler.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param dcr response data
  */
 typedef void
 (*TALER_AUDITOR_DepositConfirmationResultCallback)(
   void *cls,
-  const struct TALER_AUDITOR_HttpResponse *hr);
+  const struct TALER_AUDITOR_DepositConfirmationResponse *dcr);
 
 
 /**
@@ -225,21 +278,23 @@ typedef void
  * that the response is well-formed.  If the auditor's reply is not
  * well-formed, we return an HTTP status code of zero to @a cb.
  *
- * We also verify that the @a exchange_sig is valid for this deposit-confirmation
- * request, and that the @a master_sig is a valid signature for @a
- * exchange_pub.  Also, the @a auditor must be ready to operate (i.e.  have
- * finished processing the /version reply).  If either check fails, we do
- * NOT initiate the transaction with the auditor and instead return NULL.
+ * We also verify that the @a exchange_sig is valid for this
+ * deposit-confirmation request, and that the @a master_sig is a valid
+ * signature for @a exchange_pub.  If the check fails, we do NOT initiate the
+ * transaction with the auditor and instead return NULL.
  *
- * @param auditor the auditor handle; the auditor must be ready to operate
+ * @param ctx the context for CURL requests
+ * @param url HTTP base URL for the auditor
  * @param h_wire hash of merchant wire details
- * @param h_extensions hash over the extensions, if any
+ * @param h_policy hash over the policy, if any
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor)
  * @param exchange_timestamp timestamp when the contract was finalized, must not be too far in the future
  * @param wire_deadline date until which the exchange should wire the funds
  * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline
- * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant
- * @param coin_pub coin’s public key
+ * @param total_without_fee the amount confirmed to be wired by the exchange to the merchant
+ * @param num_coins number of coins involved in the batch deposit
+ * @param coin_pubs array of the coin’s public keys
+ * @param coin_sigs array of the original deposit signatures of the coins in the batch
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
  * @param exchange_sig the signature made with purpose #TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT
  * @param exchange_pub the public key of the exchange that matches @a exchange_sig
@@ -255,15 +310,18 @@ typedef void
  */
 struct TALER_AUDITOR_DepositConfirmationHandle *
 TALER_AUDITOR_deposit_confirmation (
-  struct TALER_AUDITOR_Handle *auditor,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendPublicKeyP *coin_pubs[static num_coins],
+  const struct TALER_CoinSpendSignatureP *coin_sigs[static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_ExchangePublicKeyP *exchange_pub,
   const struct TALER_ExchangeSignatureP *exchange_sig,
@@ -287,72 +345,4 @@ TALER_AUDITOR_deposit_confirmation_cancel (
   struct TALER_AUDITOR_DepositConfirmationHandle *deposit_confirmation);
 
 
-/**
- * Handle for /exchanges API returned by
- * #TALER_AUDITOR_list_exchanges() so that the operation can be
- * cancelled with #TALER_AUDITOR_list_exchanges_cancel()
- */
-struct TALER_AUDITOR_ListExchangesHandle;
-
-
-/**
- * Information about an exchange kept by the auditor.
- */
-struct TALER_AUDITOR_ExchangeInfo
-{
-  /**
-   * Master public key of the exchange.
-   */
-  struct TALER_MasterPublicKeyP master_pub;
-
-  /**
-   * Base URL of the exchange's API.
-   */
-  const char *exchange_url;
-};
-
-
-/**
- * Function called with the result from /exchanges.
- *
- * @param cls closure
- * @param hr HTTP response data
- * @param num_exchanges length of array at @a ei
- * @param ei information about exchanges returned by the auditor
- */
-typedef void
-(*TALER_AUDITOR_ListExchangesResultCallback)(
-  void *cls,
-  const struct TALER_AUDITOR_HttpResponse *hr,
-  unsigned int num_exchanges,
-  const struct TALER_AUDITOR_ExchangeInfo *ei);
-
-/**
- * Submit an /exchanges request to the auditor and get the
- * auditor's response.  If the auditor's reply is not
- * well-formed, we return an HTTP status code of zero to @a cb.
- *
- * @param auditor the auditor handle; the auditor must be ready to operate
- * @param cb the callback to call when a reply for this request is available
- * @param cb_cls closure for the above callback
- * @return a handle for this request; NULL if the inputs are invalid (i.e.
- *         signatures fail to verify).  In this case, the callback is not called.
- */
-struct TALER_AUDITOR_ListExchangesHandle *
-TALER_AUDITOR_list_exchanges (struct TALER_AUDITOR_Handle *auditor,
-                              TALER_AUDITOR_ListExchangesResultCallback cb,
-                              void *cb_cls);
-
-
-/**
- * Cancel a list exchanges request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param leh the list exchanges request handle
- */
-void
-TALER_AUDITOR_list_exchanges_cancel (
-  struct TALER_AUDITOR_ListExchangesHandle *leh);
-
-
 #endif  /* _TALER_AUDITOR_SERVICE_H */
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index 71cd79808..c0a771343 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -25,26 +25,12 @@
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_db_lib.h>
+#include "taler_util.h"
 #include "taler_auditordb_lib.h"
 #include "taler_signatures.h"
 
 
 /**
- * Function called with information about exchanges this
- * auditor is monitoring.
- *
- * @param cls closure
- * @param master_pub master public key of the exchange
- * @param exchange_url base URL of the exchange's API
- */
-typedef void
-(*TALER_AUDITORDB_ExchangeCallback)(
-  void *cls,
-  const struct TALER_MasterPublicKeyP *master_pub,
-  const char *exchange_url);
-
-
-/**
  * Function called with the results of select_historic_denom_revenue()
  *
  * @param cls closure
@@ -90,262 +76,201 @@ typedef enum GNUNET_GenericReturnValue
 
 
 /**
- * Structure for remembering the wire auditor's progress over the
- * various tables and (auditor) transactions.
- */
-struct TALER_AUDITORDB_WireProgressPoint
-{
-
-  /**
-   * Time until which we have confirmed that all wire transactions
-   * that the exchange should do, have indeed been done.
-   */
-  struct GNUNET_TIME_Timestamp last_timestamp;
-
-  /**
-   * reserves_close uuid until which we have checked
-   * reserve closures.
-   */
-  uint64_t last_reserve_close_uuid;
-};
-
-
-/**
- * Structure for remembering the wire auditor's progress over the
- * various tables and (auditor) transactions per wire account.
+ * Information about a signing key of an exchange.
  */
-struct TALER_AUDITORDB_WireAccountProgressPoint
+struct TALER_AUDITORDB_ExchangeSigningKey
 {
-  /**
-   * serial ID of the last reserve_in transfer the wire auditor processed
-   */
-  uint64_t last_reserve_in_serial_id;
 
   /**
-   * serial ID of the last wire_out the wire auditor processed
+   * When does @e exchange_pub start to be used?
    */
-  uint64_t last_wire_out_serial_id;
-
-};
-
+  struct GNUNET_TIME_Timestamp ep_start;
 
-/**
- * Structure for remembering the auditor's progress over the various
- * tables and (auditor) transactions when analyzing reserves.
- */
-struct TALER_AUDITORDB_ProgressPointReserve
-{
   /**
-   * serial ID of the last reserve_in transfer the auditor processed
+   * When will the exchange stop signing with @e exchange_pub?
    */
-  uint64_t last_reserve_in_serial_id;
+  struct GNUNET_TIME_Timestamp ep_expire;
 
   /**
-   * serial ID of the last reserve_out the auditor processed
+   * When does the signing key expire (for legal disputes)?
    */
-  uint64_t last_reserve_out_serial_id;
+  struct GNUNET_TIME_Timestamp ep_end;
 
   /**
-   * serial ID of the last recoup entry the auditor processed when
-   * considering reserves.
+   * What is the public offline signing key this is all about?
    */
-  uint64_t last_reserve_recoup_serial_id;
+  struct TALER_ExchangePublicKeyP exchange_pub;
 
   /**
-   * serial ID of the last reserve_close
-   * entry the auditor processed.
+   * Signature by the offline master key affirming the above.
    */
-  uint64_t last_reserve_close_serial_id;
-
+  struct TALER_MasterSignatureP master_sig;
 };
 
 
 /**
- * Structure for remembering the auditor's progress over the various
- * tables and (auditor) transactions when analyzing reserves.
+ * Information about a deposit confirmation we received from
+ * a merchant.
  */
-struct TALER_AUDITORDB_ProgressPointDepositConfirmation
+struct TALER_AUDITORDB_DepositConfirmation
 {
+
   /**
-   * serial ID of the last deposit_confirmation the auditor processed
+   * Hash over the contract for which this deposit is made.
    */
-  uint64_t last_deposit_confirmation_serial_id;
-
-};
-
-
-/**
- * Structure for remembering the auditor's progress over the various
- * tables and (auditor) transactions when analyzing aggregations.
- */
-struct TALER_AUDITORDB_ProgressPointAggregation
-{
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
-   * serial ID of the last prewire transfer the auditor processed
+   * Hash over the policy extension for the deposit.
    */
-  uint64_t last_wire_out_serial_id;
-};
+  struct TALER_ExtensionPolicyHashP h_policy;
 
-
-/**
- * Structure for remembering the auditor's progress over the various
- * tables and (auditor) transactions when analyzing coins.
- */
-struct TALER_AUDITORDB_ProgressPointCoin
-{
   /**
-   * serial ID of the last withdraw the auditor processed
+   * Hash over the wiring information of the merchant.
    */
-  uint64_t last_withdraw_serial_id;
+  struct TALER_MerchantWireHashP h_wire;
 
   /**
-   * serial ID of the last deposit the auditor processed
+   * Time when this deposit confirmation was generated by the exchange.
    */
-  uint64_t last_deposit_serial_id;
+  struct GNUNET_TIME_Timestamp exchange_timestamp;
 
   /**
-   * serial ID of the last refresh the auditor processed
+   * How much time does the @e merchant have to issue a refund
+   * request?  Zero if refunds are not allowed.  After this time, the
+   * coin cannot be refunded.  Note that the wire transfer will not be
+   * performed by the exchange until the refund deadline.  This value
+   * is taken from the original deposit request.
    */
-  uint64_t last_melt_serial_id;
+  struct GNUNET_TIME_Timestamp refund_deadline;
 
   /**
-   * serial ID of the last refund the auditor processed
+   * How much time does the @e exchange have to wire the funds?
    */
-  uint64_t last_refund_serial_id;
+  struct GNUNET_TIME_Timestamp wire_deadline;
 
   /**
-   * Serial ID of the last recoup operation the auditor processed.
+   * Amount to be deposited, excluding fee.  Calculated from the
+   * amount with fee and the fee from the deposit request.
    */
-  uint64_t last_recoup_serial_id;
+  struct TALER_Amount total_without_fee;
 
   /**
-   * Serial ID of the last recoup-of-refresh operation the auditor processed.
+   * Length of the @e coin_pubs and @e coin_sigs arrays.
    */
-  uint64_t last_recoup_refresh_serial_id;
-
-};
-
+  unsigned int num_coins;
 
-/**
- * Information about a signing key of an exchange.
- */
-struct TALER_AUDITORDB_ExchangeSigningKey
-{
   /**
-   * Public master key of the exchange that certified @e master_sig.
+   * Array of the coin public keys involved in the
+   * batch deposit operation.
    */
-  struct TALER_MasterPublicKeyP master_public_key;
+  const struct TALER_CoinSpendPublicKeyP *coin_pubs;
 
   /**
-   * When does @e exchange_pub start to be used?
+   * Array of coin deposit signatures from the deposit operation.
    */
-  struct GNUNET_TIME_Timestamp ep_start;
+  const struct TALER_CoinSpendSignatureP *coin_sigs;
 
   /**
-   * When will the exchange stop signing with @e exchange_pub?
+   * The Merchant's public key.  Allows the merchant to later refund
+   * the transaction or to inquire about the wire transfer identifier.
    */
-  struct GNUNET_TIME_Timestamp ep_expire;
+  struct TALER_MerchantPublicKeyP merchant;
 
   /**
-   * When does the signing key expire (for legal disputes)?
+   * Signature from the exchange of type
+   * #TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT.
    */
-  struct GNUNET_TIME_Timestamp ep_end;
+  struct TALER_ExchangeSignatureP exchange_sig;
 
   /**
-   * What is the public offline signing key this is all about?
+   * Public signing key from the exchange matching @e exchange_sig.
    */
   struct TALER_ExchangePublicKeyP exchange_pub;
 
   /**
-   * Signature by the offline master key affirming the above.
+   * Exchange master signature over @e exchange_sig.
    */
   struct TALER_MasterSignatureP master_sig;
+
 };
 
 
 /**
- * Information about a deposit confirmation we received from
- * a merchant.
+ * Balance values for a reserve (or all reserves).
  */
-struct TALER_AUDITORDB_DepositConfirmation
+struct TALER_AUDITORDB_ReserveFeeBalance
 {
-
   /**
-   * Hash over the contract for which this deposit is made.
+   * Remaining funds.
    */
-  struct TALER_PrivateContractHashP h_contract_terms;
+  struct TALER_Amount reserve_balance;
 
   /**
-   * Hash over the extensions for the deposit.
+   * Losses from operations that should not have
+   * happened (e.g. negative balance).
    */
-  struct TALER_ExtensionContractHashP h_extensions;
+  struct TALER_Amount reserve_loss;
 
   /**
-   * Hash over the wiring information of the merchant.
+   * Fees charged for withdraw.
    */
-  struct TALER_MerchantWireHashP h_wire;
+  struct TALER_Amount withdraw_fee_balance;
 
   /**
-   * Time when this deposit confirmation was generated by the exchange.
+   * Fees charged for closing.
    */
-  struct GNUNET_TIME_Timestamp exchange_timestamp;
+  struct TALER_Amount close_fee_balance;
 
   /**
-   * How much time does the @e merchant have to issue a refund
-   * request?  Zero if refunds are not allowed.  After this time, the
-   * coin cannot be refunded.  Note that the wire transfer will not be
-   * performed by the exchange until the refund deadline.  This value
-   * is taken from the original deposit request.
+   * Fees charged for purse creation.
    */
-  struct GNUNET_TIME_Timestamp refund_deadline;
+  struct TALER_Amount purse_fee_balance;
 
   /**
-   * How much time does the @e exchange have to wire the funds?
+   * Opening fees charged.
    */
-  struct GNUNET_TIME_Timestamp wire_deadline;
+  struct TALER_Amount open_fee_balance;
 
   /**
-   * Amount to be deposited, excluding fee.  Calculated from the
-   * amount with fee and the fee from the deposit request.
+   * History fees charged.
    */
-  struct TALER_Amount amount_without_fee;
+  struct TALER_Amount history_fee_balance;
+};
 
-  /**
-   * The coin's public key.  This is the value that must have been
-   * signed (blindly) by the Exchange.  The deposit request is to be
-   * signed by the corresponding private key (using EdDSA).
-   */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
 
+/**
+ * Balance data for denominations in circulation.
+ */
+struct TALER_AUDITORDB_DenominationCirculationData
+{
   /**
-   * The Merchant's public key.  Allows the merchant to later refund
-   * the transaction or to inquire about the wire transfer identifier.
+   * Amount of outstanding coins in circulation.
    */
-  struct TALER_MerchantPublicKeyP merchant;
+  struct TALER_Amount denom_balance;
 
   /**
-   * Signature from the exchange of type
-   * #TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT.
+   * Amount lost due coins illicitly accepted (effectively, a
+   * negative @a denom_balance).
    */
-  struct TALER_ExchangeSignatureP exchange_sig;
+  struct TALER_Amount denom_loss;
 
   /**
-   * Public signing key from the exchange matching @e exchange_sig.
+   * Total amount that could still be theoretically lost in the future due to
+   * recoup operations.  (Total put into circulation minus @e recoup_loss).
    */
-  struct TALER_ExchangePublicKeyP exchange_pub;
+  struct TALER_Amount denom_risk;
 
   /**
-   * Exchange master signature over @e exchange_sig.
+   * Amount lost due to recoups.
    */
-  struct TALER_MasterSignatureP master_sig;
+  struct TALER_Amount recoup_loss;
 
   /**
-   * Master public key of the exchange corresponding to @e master_sig.
-   * Identifies the exchange this is about.
+   * Number of coins of this denomination that the exchange signed into
+   * existence.
    */
-  struct TALER_MasterPublicKeyP master_public_key;
-
+  uint64_t num_issued;
 };
 
 
@@ -366,6 +291,42 @@ typedef enum GNUNET_GenericReturnValue
 
 
 /**
+ * Function called on deposits that are past their due date
+ * and have not yet seen a wire transfer.
+ *
+ * @param cls closure
+ * @param batch_deposit_serial_id where in the table are we
+ * @param total_amount value of all missing deposits, including fees
+ * @param wire_target_h_payto hash of the recipient account's payto URI
+ * @param deadline what was the earliest requested wire transfer deadline
+ */
+typedef void
+(*TALER_AUDITORDB_WireMissingCallback)(
+  void *cls,
+  uint64_t batch_deposit_serial_id,
+  const struct TALER_Amount *total_amount,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  struct GNUNET_TIME_Timestamp deadline);
+
+
+/**
+ * Function called on expired purses.
+ *
+ * @param cls closure
+ * @param purse_pub public key of the purse
+ * @param balance amount of money in the purse
+ * @param expiration_date when did the purse expire?
+ * @return #GNUNET_OK to continue to iterate
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_AUDITORDB_ExpiredPurseCallback)(
+  void *cls,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_Amount *balance,
+  struct GNUNET_TIME_Timestamp expiration_date);
+
+
+/**
  * @brief The plugin API, returned from the plugin's "init" function.
  * The argument given to "init" is simply a configuration handle.
  *
@@ -400,6 +361,48 @@ struct TALER_AUDITORDB_Plugin
 
 
   /**
+   * Register callback to be invoked on events of type @a es.
+   *
+   * @param cls database context to use
+   * @param es specification of the event to listen for
+   * @param timeout how long to wait for the event
+   * @param cb function to call when the event happens, possibly
+   *         mulrewardle times (until cancel is invoked)
+   * @param cb_cls closure for @a cb
+   * @return handle useful to cancel the listener
+   */
+  struct GNUNET_DB_EventHandler *
+  (*event_listen)(void *cls,
+                  const struct GNUNET_DB_EventHeaderP *es,
+                  struct GNUNET_TIME_Relative timeout,
+                  GNUNET_DB_EventCallback cb,
+                  void *cb_cls);
+
+  /**
+   * Stop notifications.
+   *
+   * @param eh handle to unregister.
+   */
+  void
+  (*event_listen_cancel)(struct GNUNET_DB_EventHandler *eh);
+
+
+  /**
+   * Notify all that listen on @a es of an event.
+   *
+   * @param cls database context to use
+   * @param es specification of the event to generate
+   * @param extra additional event data provided
+   * @param extra_size number of bytes in @a extra
+   */
+  void
+  (*event_notify)(void *cls,
+                  const struct GNUNET_DB_EventHeaderP *es,
+                  const void *extra,
+                  size_t extra_size);
+
+
+  /**
    * Drop all auditor tables OR deletes recoverable auditor state.
    * This should only be used by testcases or when restarting the
    * auditor from scratch.
@@ -412,17 +415,21 @@ struct TALER_AUDITORDB_Plugin
    */
   enum GNUNET_GenericReturnValue
   (*drop_tables)(void *cls,
-                 int drop_exchangelist);
+                 bool drop_exchangelist);
 
 
   /**
    * Create the necessary tables if they are not present
    *
    * @param cls the @e cls of this struct with the plugin-specific state
+   * @param support_partitions true to support partitioning
+   * @param num_partitions number of partitions to use
    * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
    */
   enum GNUNET_GenericReturnValue
-  (*create_tables)(void *cls);
+  (*create_tables)(void *cls,
+                   bool support_partitions,
+                   uint32_t num_partitions);
 
 
   /**
@@ -467,106 +474,21 @@ struct TALER_AUDITORDB_Plugin
 
 
   /**
-   * Insert information about an exchange this auditor will be auditing.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param exchange_url public (base) URL of the API of the exchange
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_exchange)(void *cls,
-                     const struct TALER_MasterPublicKeyP *master_pub,
-                     const char *exchange_url);
-
-
-  /**
-   * Delete an exchange from the list of exchanges this auditor is auditing.
-   * Warning: this will cascade and delete all knowledge of this auditor related
-   * to this exchange!
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*delete_exchange)(void *cls,
-                     const struct TALER_MasterPublicKeyP *master_pub);
-
-
-  /**
-   * Obtain information about exchanges this auditor is auditing.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param cb function to call with the results
-   * @param cb_cls closure for @a cb
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*list_exchanges)(void *cls,
-                    TALER_AUDITORDB_ExchangeCallback cb,
-                    void *cb_cls);
-
-  /**
-   * Insert information about a signing key of the exchange.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param sk signing key information to store
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_exchange_signkey)(
-    void *cls,
-    const struct TALER_AUDITORDB_ExchangeSigningKey *sk);
-
-
-  /**
-   * Insert information about a deposit confirmation into the database.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param dc deposit confirmation information to store
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_deposit_confirmation)(
-    void *cls,
-    const struct TALER_AUDITORDB_DepositConfirmation *dc);
-
-
-  /**
-   * Get information about deposit confirmations from the database.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_public_key for which exchange do we want to get deposit confirmations
-   * @param start_id row/serial ID where to start the iteration (0 from
-   *                  the start, exclusive, i.e. serial_ids must start from 1)
-   * @param cb function to call with results
-   * @param cb_cls closure for @a cb
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_deposit_confirmations)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_public_key,
-    uint64_t start_id,
-    TALER_AUDITORDB_DepositConfirmationCallback cb,
-    void *cb_cls);
-
-
-  /**
    * Insert information about the auditor's progress with an exchange's
    * data.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppc where is the auditor in processing
+   * @param progress_key name of the progress indicator
+   * @param progress_offset offset until which we have made progress
+   * @param ... NULL terminated list of additional key-value pairs to insert
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_auditor_progress_coin)(
+  (*insert_auditor_progress)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointCoin *ppc);
+    const char *progress_key,
+    uint64_t progress_offset,
+    ...);
 
 
   /**
@@ -574,282 +496,142 @@ struct TALER_AUDITORDB_Plugin
    * must be an existing record for the exchange.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppc where is the auditor in processing
+   * @param progress_key name of the progress indicator
+   * @param progress_offset offset until which we have made progress
+   * @param ... NULL terminated list of additional key-value pairs to update
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_auditor_progress_coin)(
+  (*update_auditor_progress)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointCoin *ppc);
+    const char *progress_key,
+    uint64_t progress_offset,
+    ...);
 
 
   /**
    * Get information about the progress of the auditor.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] ppc set to where the auditor is in processing
+   * @param progress_key name of the progress indicator
+   * @param[out] progress_offset set to offset until which we have made progress, set to 0 if key was not found
+   * @param ... NULL terminated list of additional key-value pairs to fetch
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_auditor_progress_coin)(void *cls,
-                               const struct TALER_MasterPublicKeyP *master_pub,
-                               struct TALER_AUDITORDB_ProgressPointCoin *ppc);
-
-  /**
- * Insert information about the auditor's progress with an exchange's
- * data.
- *
- * @param cls the @e cls of this struct with the plugin-specific state
- * @param master_pub master key of the exchange
- * @param ppr where is the auditor in processing
- * @return transaction status code
- */
-  enum GNUNET_DB_QueryStatus
-  (*insert_auditor_progress_reserve)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointReserve *ppr);
+  (*get_auditor_progress)(void *cls,
+                          const char *progress_key,
+                          uint64_t *progress_offset,
+                          ...);
 
 
   /**
-   * Update information about the progress of the auditor.  There
-   * must be an existing record for the exchange.
+   * Insert information about a balance tracked by the auditor. There must not be an
+   * existing record.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppr where is the auditor in processing
+   * @param balance_key key of the balance to store
+   * @param balance_value value to store
+   * @param ... NULL terminated list of additional key-value pairs to insert
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_auditor_progress_reserve)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointReserve *ppr);
-
+  (*insert_balance)(void *cls,
+                    const char *balance_key,
+                    const struct TALER_Amount *balance_value,
+                    ...);
 
-  /**
-   * Get information about the progress of the auditor.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] ppr set to where the auditor is in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_auditor_progress_reserve)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    struct TALER_AUDITORDB_ProgressPointReserve *ppr);
 
   /**
-   * Insert information about the auditor's progress with an exchange's
-   * data.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppdc where is the auditor in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_auditor_progress_deposit_confirmation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc);
-
-
-  /**
-   * Update information about the progress of the auditor.  There
-   * must be an existing record for the exchange.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppdc where is the auditor in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*update_auditor_progress_deposit_confirmation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc);
-
-
-  /**
-   * Get information about the progress of the auditor.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] ppdc set to where the auditor is in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_auditor_progress_deposit_confirmation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    struct TALER_AUDITORDB_ProgressPointDepositConfirmation *ppdc);
-
-
-  /**
-   * Insert information about the auditor's progress with an exchange's
-   * data.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppa where is the auditor in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_auditor_progress_aggregation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointAggregation *ppa);
-
-
-  /**
-   * Update information about the progress of the auditor.  There
-   * must be an existing record for the exchange.
+   * Insert information about a balance tracked by the auditor.  Destructively updates an
+   * existing record, which must already exist.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param ppa where is the auditor in processing
+   * @param balance_key key of the balance to store
+   * @param balance_amount value to store
+   * @param ... NULL terminated list of additional key-value pairs to update
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_auditor_progress_aggregation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_ProgressPointAggregation *ppa);
+  (*update_balance)(void *cls,
+                    const char *balance_key,
+                    const struct TALER_Amount *balance_amount,
+                    ...);
 
 
   /**
-   * Get information about the progress of the auditor.
+   * Get summary information about balance tracked by the auditor.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] ppa set to where the auditor is in processing
+   * @param balance_key key of the balance to store
+   * @param[out] balance_value set to amount stored under @a balance_key, set to invalid amount (all zero) if key was not found
+   * @param ... NULL terminated list of additional key-value pairs to fetch
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_auditor_progress_aggregation)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    struct TALER_AUDITORDB_ProgressPointAggregation *ppa);
+  (*get_balance)(void *cls,
+                 const char *balance_key,
+                 struct TALER_Amount *balance_value,
+                 ...);
 
 
   /**
-   * Insert information about the wire auditor's progress with an exchange's
-   * data.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param pp where is the auditor in processing
-   * @param in_wire_off how far are we in the incoming wire transaction history
-   * @param out_wire_off how far are we in the outgoing wire transaction history
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_wire_auditor_account_progress)(
-    void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const char *account_name,
-    const struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-    uint64_t in_wire_off,
-    uint64_t out_wire_off);
-
-
-  /**
-   * Update information about the progress of the wire auditor.  There
-   * must be an existing record for the exchange.
+   * Insert information about a signing key of the exchange.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param pp where is the auditor in processing
-   * @param in_wire_off how far are we in the incoming wire transaction history
-   * @param out_wire_off how far are we in the outgoing wire transaction history
-   * @return transaction status code
+   * @param sk signing key information to store
+   * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*update_wire_auditor_account_progress)(
+  (*insert_exchange_signkey)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const char *account_name,
-    const struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-    uint64_t in_wire_off,
-    uint64_t out_wire_off);
+    const struct TALER_AUDITORDB_ExchangeSigningKey *sk);
 
 
   /**
-   * Get information about the progress of the wire auditor.
+   * Insert information about a deposit confirmation into the database.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param[out] pp where is the auditor in processing
-   * @param[out] in_wire_off how far are we in the incoming wire transaction history
-   * @param[out] out_wire_off how far are we in the outgoing wire transaction history
-   * @return transaction status code
+   * @param dc deposit confirmation information to store
+   * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_auditor_account_progress)(
+  (*insert_deposit_confirmation)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const char *account_name,
-    struct TALER_AUDITORDB_WireAccountProgressPoint *pp,
-    uint64_t *in_wire_off,
-    uint64_t *out_wire_off);
+    const struct TALER_AUDITORDB_DepositConfirmation *dc);
 
 
   /**
-   * Insert information about the wire auditor's progress with an exchange's
-   * data.
+   * Get information about deposit confirmations from the database.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param pp where is the auditor in processing
-   * @return transaction status code
+   * @param start_id row/serial ID where to start the iteration (0 from
+   *                  the start, exclusive, i.e. serial_ids must start from 1)
+   * @param return_suppressed should suppressed rows be returned anyway?
+   * @param cb function to call with results
+   * @param cb_cls closure for @a cb
+   * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_wire_auditor_progress)(
+  (*get_deposit_confirmations)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_WireProgressPoint *pp);
+    uint64_t start_id,
+    bool return_suppressed,
+    TALER_AUDITORDB_DepositConfirmationCallback cb,
+    void *cb_cls);
 
 
   /**
-   * Update information about the progress of the wire auditor.  There
-   * must be an existing record for the exchange.
+   * Delete information about a deposit confirmation from the database.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param pp where is the auditor in processing
-   * @return transaction status code
+   * @param row_id row to delete
+   * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*update_wire_auditor_progress)(
+  (*delete_deposit_confirmation)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
-    const struct TALER_AUDITORDB_WireProgressPoint *pp);
-
-
-  /**
-   * Get information about the progress of the wire auditor.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param account_name name of the wire account we are auditing
-   * @param[out] pp set to where the auditor is in processing
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_wire_auditor_progress)(void *cls,
-                               const struct TALER_MasterPublicKeyP *master_pub,
-                               struct TALER_AUDITORDB_WireProgressPoint *pp);
+    uint64_t row_id);
 
 
   /**
@@ -858,22 +640,18 @@ struct TALER_AUDITORDB_Plugin
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param reserve_pub public key of the reserve
-   * @param master_pub master public key of the exchange
-   * @param reserve_balance amount stored in the reserve
-   * @param withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param rfb balance amounts for the reserve
    * @param expiration_date expiration date of the reserve
    * @param origin_account where did the money in the reserve originally come from
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_reserve_info)(void *cls,
-                         const struct TALER_ReservePublicKeyP *reserve_pub,
-                         const struct TALER_MasterPublicKeyP *master_pub,
-                         const struct TALER_Amount *reserve_balance,
-                         const struct TALER_Amount *withdraw_fee_balance,
-                         struct GNUNET_TIME_Timestamp expiration_date,
-                         const char *origin_account);
+  (*insert_reserve_info)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+    struct GNUNET_TIME_Timestamp expiration_date,
+    const char *origin_account);
 
 
   /**
@@ -882,20 +660,16 @@ struct TALER_AUDITORDB_Plugin
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param reserve_pub public key of the reserve
-   * @param master_pub master public key of the exchange
-   * @param reserve_balance amount stored in the reserve
-   * @param withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param rfb balance amounts for the reserve
    * @param expiration_date expiration date of the reserve
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_reserve_info)(void *cls,
-                         const struct TALER_ReservePublicKeyP *reserve_pub,
-                         const struct TALER_MasterPublicKeyP *master_pub,
-                         const struct TALER_Amount *reserve_balance,
-                         const struct TALER_Amount *withdraw_fee_balance,
-                         struct GNUNET_TIME_Timestamp expiration_date);
+  (*update_reserve_info)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    const struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+    struct GNUNET_TIME_Timestamp expiration_date);
 
 
   /**
@@ -903,24 +677,20 @@ struct TALER_AUDITORDB_Plugin
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param reserve_pub public key of the reserve
-   * @param master_pub master public key of the exchange
    * @param[out] rowid which row did we get the information from
-   * @param[out] reserve_balance amount stored in the reserve
-   * @param[out] withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param[out] rfb set to balances associated with the reserve
    * @param[out] expiration_date expiration date of the reserve
    * @param[out] sender_account from where did the money in the reserve originally come from
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_info)(void *cls,
-                      const struct TALER_ReservePublicKeyP *reserve_pub,
-                      const struct TALER_MasterPublicKeyP *master_pub,
-                      uint64_t *rowid,
-                      struct TALER_Amount *reserve_balance,
-                      struct TALER_Amount *withdraw_fee_balance,
-                      struct GNUNET_TIME_Timestamp *expiration_date,
-                      char **sender_account);
+  (*get_reserve_info)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    uint64_t *rowid,
+    struct TALER_AUDITORDB_ReserveFeeBalance *rfb,
+    struct GNUNET_TIME_Timestamp *expiration_date,
+    char **sender_account);
 
 
   /**
@@ -928,277 +698,202 @@ struct TALER_AUDITORDB_Plugin
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param reserve_pub public key of the reserve
-   * @param master_pub master public key of the exchange
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
   (*del_reserve_info)(void *cls,
-                      const struct TALER_ReservePublicKeyP *reserve_pub,
-                      const struct TALER_MasterPublicKeyP *master_pub);
+                      const struct TALER_ReservePublicKeyP *reserve_pub);
 
 
   /**
-   * Insert information about all reserves.  There must not be an
-   * existing record for the @a master_pub.
+   * Insert new row into the pending deposits table.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param reserve_balance amount stored in the reserve
-   * @param withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param batch_deposit_serial_id where in the table are we
+   * @param total_amount value of all missing deposits, including fees
+   * @param wire_target_h_payto hash of the recipient account's payto URI
+   * @param deadline what was the requested wire transfer deadline
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_reserve_summary)(void *cls,
-                            const struct TALER_MasterPublicKeyP *master_pub,
-                            const struct TALER_Amount *reserve_balance,
-                            const struct TALER_Amount *withdraw_fee_balance);
+  (*insert_pending_deposit)(
+    void *cls,
+    uint64_t batch_deposit_serial_id,
+    const struct TALER_PaytoHashP *wire_target_h_payto,
+    const struct TALER_Amount *total_amount,
+    struct GNUNET_TIME_Timestamp deadline);
 
 
   /**
-   * Update information about all reserves.  Destructively updates an
-   * existing record, which must already exist.
+   * Delete a row from the pending deposit table.
+   * Usually done when the respective wire transfer
+   * was finally detected.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param reserve_balance amount stored in the reserve
-   * @param withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param batch_deposit_serial_id which entry to delete
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_reserve_summary)(void *cls,
-                            const struct TALER_MasterPublicKeyP *master_pub,
-                            const struct TALER_Amount *reserve_balance,
-                            const struct TALER_Amount *withdraw_fee_balance);
+  (*delete_pending_deposit)(
+    void *cls,
+    uint64_t batch_deposit_serial_id);
 
 
   /**
-   * Get summary information about all reserves.
+   * Return (batch) deposits for which we have not yet
+   * seen the required wire transfer.
    *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param[out] reserve_balance amount stored in the reserve
-   * @param[out] withdraw_fee_balance amount the exchange gained in withdraw fees
-   *                             due to withdrawals from this reserve
+   * @param deadline only return up to this deadline
+   * @param cb function to call on each entry
+   * @param cb_cls closure for @a cb
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_summary)(void *cls,
-                         const struct TALER_MasterPublicKeyP *master_pub,
-                         struct TALER_Amount *reserve_balance,
-                         struct TALER_Amount *withdraw_fee_balance);
+  (*select_pending_deposits)(
+    void *cls,
+    struct GNUNET_TIME_Absolute deadline,
+    TALER_AUDITORDB_WireMissingCallback cb,
+    void *cb_cls);
 
 
   /**
-   * Insert information about exchange's wire fee balance. There must not be an
-   * existing record for the same @a master_pub.
+   * Insert information about a purse.  There must not be an
+   * existing record for the purse.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param wire_fee_balance amount the exchange gained in wire fees
+   * @param purse_pub public key of the purse
+   * @param balance balance of the purse
+   * @param expiration_date expiration date of the purse
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_wire_fee_summary)(void *cls,
-                             const struct TALER_MasterPublicKeyP *master_pub,
-                             const struct TALER_Amount *wire_fee_balance);
+  (*insert_purse_info)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    const struct TALER_Amount *balance,
+    struct GNUNET_TIME_Timestamp expiration_date);
 
 
   /**
-   * Insert information about exchange's wire fee balance.  Destructively updates an
+   * Update information about a purse.  Destructively updates an
    * existing record, which must already exist.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param wire_fee_balance amount the exchange gained in wire fees
+   * @param purse_pub public key of the purse
+   * @param balance new balance for the purse
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_wire_fee_summary)(void *cls,
-                             const struct TALER_MasterPublicKeyP *master_pub,
-                             const struct TALER_Amount *wire_fee_balance);
+  (*update_purse_info)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    const struct TALER_Amount *balance);
 
 
   /**
-   * Get summary information about an exchanges wire fee balance.
+   * Get information about a purse.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master public key of the exchange
-   * @param[out] wire_fee_balance set amount the exchange gained in wire fees
+   * @param purse_pub public key of the purse
+   * @param[out] rowid which row did we get the information from
+   * @param[out] balance set to balance of the purse
+   * @param[out] expiration_date expiration date of the purse
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_wire_fee_summary)(void *cls,
-                          const struct TALER_MasterPublicKeyP *master_pub,
-                          struct TALER_Amount *wire_fee_balance);
+  (*get_purse_info)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    uint64_t *rowid,
+    struct TALER_Amount *balance,
+    struct GNUNET_TIME_Timestamp *expiration_date);
 
 
   /**
-   * Insert information about a denomination key's balances.  There
-   * must not be an existing record for the denomination key.
+   * Delete information about a purse.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param denom_pub_hash hash of the denomination public key
-   * @param denom_balance value of coins outstanding with this denomination key
-   * @param denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
-   * @param denom_risk value of coins issued with this denomination key
-   * @param denom_recoup value of coins paid back if this denomination key was revoked
-   * @param num_issued how many coins of this denomination did the exchange blind-sign
+   * @param purse_pub public key of the reserve
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_denomination_balance)(
+  (*delete_purse_info)(
     void *cls,
-    const struct TALER_DenominationHashP *denom_pub_hash,
-    const struct TALER_Amount *denom_balance,
-    const struct TALER_Amount *denom_loss,
-    const struct TALER_Amount *denom_risk,
-    const struct TALER_Amount *recoup_loss,
-    uint64_t num_issued);
+    const struct TALER_PurseContractPublicKeyP *purse_pub);
 
 
   /**
-   * Update information about a denomination key's balances.  There
-   * must be an existing record for the denomination key.
+   * Get information about expired purses.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param denom_pub_hash hash of the denomination public key
-   * @param denom_balance value of coins outstanding with this denomination key
-   * @param denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
-   * @param denom_risk value of coins issued with this denomination key
-   * @param denom_recoup value of coins paid back if this denomination key was revoked
-   * @param num_issued how many coins of this denomination did the exchange blind-sign
+   * @param cb function to call on expired purses
+   * @param cb_cls closure for @a cb
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_denomination_balance)(
+  (*select_purse_expired)(
     void *cls,
-    const struct TALER_DenominationHashP *denom_pub_hash,
-    const struct TALER_Amount *denom_balance,
-    const struct TALER_Amount *denom_loss,
-    const struct TALER_Amount *denom_risk,
-    const struct TALER_Amount *recoup_loss,
-    uint64_t num_issued);
+    TALER_AUDITORDB_ExpiredPurseCallback cb,
+    void *cb_cls);
 
 
   /**
-   * Get information about a denomination key's balances.
+   * Insert information about a denomination key's balances.  There
+   * must not be an existing record for the denomination key.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param denom_pub_hash hash of the denomination public key
-   * @param[out] denom_balance value of coins outstanding with this denomination key
-   * @param[out] denom_loss value of coins redeemed that were not outstanding (effectively, negative @a denom_balance)
-   * @param[out] denom_risk value of coins issued with this denomination key
-   * @param[out] denom_recoup value of coins paid back if this denomination key was revoked
-   * @param[out] num_issued how many coins of this denomination did the exchange blind-sign
+   * @param dcd denomination circulation data to store
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_denomination_balance)(
+  (*insert_denomination_balance)(
     void *cls,
     const struct TALER_DenominationHashP *denom_pub_hash,
-    struct TALER_Amount *denom_balance,
-    struct TALER_Amount *denom_loss,
-    struct TALER_Amount *denom_risk,
-    struct TALER_Amount *recoup_loss,
-    uint64_t *num_issued);
+    const struct TALER_AUDITORDB_DenominationCirculationData *dcd);
 
 
   /**
-   * Delete information about a denomination key's balances.
+   * Update information about a denomination key's balances.  There
+   * must be an existing record for the denomination key.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param denom_pub_hash hash of the denomination public key
+   * @param dcd denomination circulation data to store
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*del_denomination_balance)(
+  (*update_denomination_balance)(
     void *cls,
-    const struct TALER_DenominationHashP *denom_pub_hash);
-
-
-  /**
-   * Insert information about an exchange's denomination balances.  There
-   * must not be an existing record for the exchange.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param denom_balance value of coins outstanding with this denomination key
-   * @param deposit_fee_balance total deposit fees collected for this DK
-   * @param melt_fee_balance total melt fees collected for this DK
-   * @param refund_fee_balance total refund fees collected for this DK
-   * @param risk maximum risk exposure of the exchange
-   * @param recoup_loss actual losses from recoup (actualized @a risk)
-   * @param irregular_recoups recoups made of non-revoked coins (reduces
-   *             risk, but should never happen)
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_balance_summary)(void *cls,
-                            const struct TALER_MasterPublicKeyP *master_pub,
-                            const struct TALER_Amount *denom_balance,
-                            const struct TALER_Amount *deposit_fee_balance,
-                            const struct TALER_Amount *melt_fee_balance,
-                            const struct TALER_Amount *refund_fee_balance,
-                            const struct TALER_Amount *risk,
-                            const struct TALER_Amount *recoup_loss,
-                            const struct TALER_Amount *irregular_recoups);
-
+    const struct TALER_DenominationHashP *denom_pub_hash,
+    const struct TALER_AUDITORDB_DenominationCirculationData *dcd);
 
   /**
-   * Update information about an exchange's denomination balances.  There
-   * must be an existing record for the exchange.
+   * Delete information about a denomination key's balances.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param denom_balance value of coins outstanding with this denomination key
-   * @param deposit_fee_balance total deposit fees collected for this DK
-   * @param melt_fee_balance total melt fees collected for this DK
-   * @param refund_fee_balance total refund fees collected for this DK
-   * @param risk maximum risk exposure of the exchange
-   * @param recoup_loss actual losses from recoup (actualized @a risk)
-   * @param irregular_recoups recoups made of non-revoked coins (reduces
-   *             risk, but should never happen)
+   * @param denom_pub_hash hash of the denomination public key
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_balance_summary)(void *cls,
-                            const struct TALER_MasterPublicKeyP *master_pub,
-                            const struct TALER_Amount *denom_balance,
-                            const struct TALER_Amount *deposit_fee_balance,
-                            const struct TALER_Amount *melt_fee_balance,
-                            const struct TALER_Amount *refund_fee_balance,
-                            const struct TALER_Amount *risk,
-                            const struct TALER_Amount *recoup_loss,
-                            const struct TALER_Amount *irregular_recoups);
+  (*del_denomination_balance)(
+    void *cls,
+    const struct TALER_DenominationHashP *denom_pub_hash);
 
 
   /**
-   * Get information about an exchange's denomination balances.
+   * Get information about a denomination key's balances.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] denom_balance value of coins outstanding with this denomination key
-   * @param[out] deposit_fee_balance total deposit fees collected for this DK
-   * @param[out] melt_fee_balance total melt fees collected for this DK
-   * @param[out] refund_fee_balance total refund fees collected for this DK
-   * @param[out] risk maximum risk exposure of the exchange
-   * @param[out] recoup_loss actual losses from recoup (actualized @a risk)
-   * @param[out] irregular_recoups recoups made of non-revoked coins (reduces
-   *             risk, but should never happen)
+   * @param denom_pub_hash hash of the denomination public key
+   * @param[out] dcd denomination circulation data to initialize
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_balance_summary)(void *cls,
-                         const struct TALER_MasterPublicKeyP *master_pub,
-                         struct TALER_Amount *denom_balance,
-                         struct TALER_Amount *deposit_fee_balance,
-                         struct TALER_Amount *melt_fee_balance,
-                         struct TALER_Amount *refund_fee_balance,
-                         struct TALER_Amount *risk,
-                         struct TALER_Amount *recoup_loss,
-                         struct TALER_Amount *irregular_recoup);
+  (*get_denomination_balance)(
+    void *cls,
+    const struct TALER_DenominationHashP *denom_pub_hash,
+    struct TALER_AUDITORDB_DenominationCirculationData *dcd);
 
 
   /**
@@ -1206,7 +901,6 @@ struct TALER_AUDITORDB_Plugin
    * revenue about a denomination key.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
    * @param denom_pub_hash hash of the denomination key
    * @param revenue_timestamp when did this profit get realized
    * @param revenue_balance what was the total profit made from
@@ -1218,7 +912,6 @@ struct TALER_AUDITORDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*insert_historic_denom_revenue)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
     const struct TALER_DenominationHashP *denom_pub_hash,
     struct GNUNET_TIME_Timestamp revenue_timestamp,
     const struct TALER_Amount *revenue_balance,
@@ -1226,11 +919,9 @@ struct TALER_AUDITORDB_Plugin
 
 
   /**
-   * Obtain all of the historic denomination key revenue
-   * of the given @a master_pub.
+   * Obtain all of the historic denomination key revenue.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
    * @param cb function to call with the results
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -1238,7 +929,6 @@ struct TALER_AUDITORDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*select_historic_denom_revenue)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
     TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb,
     void *cb_cls);
 
@@ -1247,7 +937,6 @@ struct TALER_AUDITORDB_Plugin
    * Insert information about an exchange's historic revenue from reserves.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
    * @param start_time beginning of aggregated time interval
    * @param end_time end of aggregated time interval
    * @param reserve_profits total profits made
@@ -1256,7 +945,6 @@ struct TALER_AUDITORDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*insert_historic_reserve_revenue)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
     struct GNUNET_TIME_Timestamp start_time,
     struct GNUNET_TIME_Timestamp end_time,
     const struct TALER_Amount *reserve_profits);
@@ -1266,7 +954,6 @@ struct TALER_AUDITORDB_Plugin
    * Return information about an exchange's historic revenue from reserves.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
    * @param cb function to call with results
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -1274,55 +961,9 @@ struct TALER_AUDITORDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*select_historic_reserve_revenue)(
     void *cls,
-    const struct TALER_MasterPublicKeyP *master_pub,
     TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb,
     void *cb_cls);
 
-
-  /**
-   * Insert information about the predicted exchange's bank
-   * account balance.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param balance what the bank account balance of the exchange should show
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_predicted_result)(void *cls,
-                             const struct TALER_MasterPublicKeyP *master_pub,
-                             const struct TALER_Amount *balance);
-
-
-  /**
-   * Update information about an exchange's predicted balance.  There
-   * must be an existing record for the exchange.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param balance what the bank account balance of the exchange should show
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*update_predicted_result)(void *cls,
-                             const struct TALER_MasterPublicKeyP *master_pub,
-                             const struct TALER_Amount *balance);
-
-
-  /**
-   * Get an exchange's predicted balance.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param master_pub master key of the exchange
-   * @param[out] balance expected bank account balance of the exchange
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_predicted_balance)(void *cls,
-                           const struct TALER_MasterPublicKeyP *master_pub,
-                           struct TALER_Amount *balance);
-
-
 };
 
 
diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h
index bb7f3d33b..e8e32947b 100644
--- a/src/include/taler_bank_service.h
+++ b/src/include/taler_bank_service.h
@@ -100,25 +100,64 @@ struct TALER_BANK_AdminAddIncomingHandle;
 
 
 /**
+ * Response details for a history request.
+ */
+struct TALER_BANK_AdminAddIncomingResponse
+{
+
+  /**
+   * HTTP status.
+   */
+  unsigned int http_status;
+
+  /**
+   * Taler error code, #TALER_EC_NONE on success.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * Full response, NULL if body was not in JSON format.
+   */
+  const json_t *response;
+
+  /**
+   * Details returned depending on the @e http_status.
+   */
+  union
+  {
+
+    /**
+     * Details if status was #MHD_HTTP_OK
+     */
+    struct
+    {
+      /**
+       * unique ID of the wire transfer in the bank's records
+       */
+      uint64_t serial_id;
+
+      /**
+       * time when the transaction was made.
+       */
+      struct GNUNET_TIME_Timestamp timestamp;
+
+    } ok;
+
+  } details;
+
+};
+
+/**
  * Callbacks of this type are used to return the result of submitting
  * a request to transfer funds to the exchange.
  *
  * @param cls closure
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
- *                    0 if the bank's reply is bogus (fails to follow the protocol)
- * @param ec detailed error code
- * @param serial_id unique ID of the wire transfer in the bank's records; UINT64_MAX on error
- * @param timestamp time when the transaction was made.
- * @param json detailed response from the HTTPD, or NULL if reply was not in JSON
+ * @param air response details
  */
 typedef void
 (*TALER_BANK_AdminAddIncomingCallback) (
   void *cls,
-  unsigned int http_status,
-  enum TALER_ErrorCode ec,
-  uint64_t serial_id,
-  struct GNUNET_TIME_Timestamp timestamp,
-  const json_t *json);
+  const struct TALER_BANK_AdminAddIncomingResponse *air);
 
 
 /**
@@ -191,21 +230,64 @@ struct TALER_BANK_TransferHandle;
 
 
 /**
+ * Response details for a history request.
+ */
+struct TALER_BANK_TransferResponse
+{
+
+  /**
+   * HTTP status.
+   */
+  unsigned int http_status;
+
+  /**
+   * Taler error code, #TALER_EC_NONE on success.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * Full response, NULL if body was not in JSON format.
+   */
+  const json_t *response;
+
+  /**
+   * Details returned depending on the @e http_status.
+   */
+  union
+  {
+
+    /**
+     * Details if status was #MHD_HTTP_OK
+     */
+    struct
+    {
+
+
+      /**
+       * unique ID of the wire transfer in the bank's records
+       */
+      uint64_t row_id;
+
+      /**
+       * when did the transaction go into effect
+       */
+      struct GNUNET_TIME_Timestamp timestamp;
+
+    } ok;
+  } details;
+};
+
+
+/**
  * Function called with the result from the execute step.
  *
  * @param cls closure
- * @param response_code HTTP status code
- * @param ec taler error code
- * @param row_id unique ID of the wire transfer in the bank's records
- * @param timestamp when did the transaction go into effect
+ * @param tr response details
  */
 typedef void
 (*TALER_BANK_TransferCallback)(
   void *cls,
-  unsigned int response_code,
-  enum TALER_ErrorCode ec,
-  uint64_t row_id,
-  struct GNUNET_TIME_Timestamp timestamp);
+  const struct TALER_BANK_TransferResponse *tr);
 
 
 /**
@@ -261,6 +343,11 @@ struct TALER_BANK_CreditHistoryHandle;
 struct TALER_BANK_CreditDetails
 {
   /**
+   * Serial ID of the wire transfer.
+   */
+  uint64_t serial_id;
+
+  /**
    * Amount that was transferred
    */
   struct TALER_Amount amount;
@@ -271,22 +358,72 @@ struct TALER_BANK_CreditDetails
   struct GNUNET_TIME_Timestamp execution_date;
 
   /**
-   * Reserve public key encoded in the wire
-   * transfer subject.
+   * Reserve public key encoded in the wire transfer subject.
    */
   struct TALER_ReservePublicKeyP reserve_pub;
 
   /**
-   * payto://-URL of the source account that
-   * send the funds.
+   * payto://-URL of the source account that send the funds.
    */
   const char *debit_account_uri;
 
+};
+
+
+/**
+ * Response details for a history request.
+ */
+struct TALER_BANK_CreditHistoryResponse
+{
+
   /**
-   * payto://-URL of the target account that
-   * received the funds.
+   * HTTP status.  Note that #MHD_HTTP_OK and #MHD_HTTP_NO_CONTENT are both
+   * successful replies, but @e details will only contain @e success information
+   * if this is set to #MHD_HTTP_OK.
    */
-  const char *credit_account_uri;
+  unsigned int http_status;
+
+  /**
+   * Taler error code, #TALER_EC_NONE on success.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * Full response, NULL if body was not in JSON format.
+   */
+  const json_t *response;
+
+  /**
+   * Details returned depending on the @e http_status.
+   */
+  union
+  {
+
+    /**
+     * Details if status was #MHD_HTTP_OK
+     */
+    struct
+    {
+
+      /**
+       * payto://-URL of the target account that received the funds.
+       */
+      const char *credit_account_uri;
+
+      /**
+       * Array of transactions received.
+       */
+      const struct TALER_BANK_CreditDetails *details;
+
+      /**
+       * Length of the @e details array.
+       */
+      unsigned int details_length;
+
+    } ok;
+
+  } details;
+
 };
 
 
@@ -295,25 +432,12 @@ struct TALER_BANK_CreditDetails
  * the bank for the credit transaction history.
  *
  * @param cls closure
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
- *                    0 if the bank's reply is bogus (fails to follow the protocol),
- *                    #MHD_HTTP_NO_CONTENT if there are no more results; on success the
- *                    last callback is always of this status (even if `abs(num_results)` were
- *                    already returned).
- * @param ec detailed error code
- * @param serial_id monotonically increasing counter corresponding to the transaction
- * @param details details about the wire transfer
- * @param json detailed response from the HTTPD, or NULL if reply was not in JSON
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
+ * @param reply details about the response
  */
-typedef enum GNUNET_GenericReturnValue
+typedef void
 (*TALER_BANK_CreditHistoryCallback)(
   void *cls,
-  unsigned int http_status,
-  enum TALER_ErrorCode ec,
-  uint64_t serial_id,
-  const struct TALER_BANK_CreditDetails *details,
-  const json_t *json);
+  const struct TALER_BANK_CreditHistoryResponse *reply);
 
 
 /**
@@ -370,6 +494,11 @@ struct TALER_BANK_DebitHistoryHandle;
 struct TALER_BANK_DebitDetails
 {
   /**
+   * Serial ID of the wire transfer.
+   */
+  uint64_t serial_id;
+
+  /**
    * Amount that was transferred
    */
   struct TALER_Amount amount;
@@ -390,16 +519,66 @@ struct TALER_BANK_DebitDetails
   const char *exchange_base_url;
 
   /**
-   * payto://-URI of the source account that
-   * send the funds.
+   * payto://-URI of the target account that received the funds.
    */
-  const char *debit_account_uri;
+  const char *credit_account_uri;
+
+};
+
+
+/**
+ * Response details for a history request.
+ */
+struct TALER_BANK_DebitHistoryResponse
+{
 
   /**
-   * payto://-URI of the target account that
-   * received the funds.
+   * HTTP status.  Note that #MHD_HTTP_OK and #MHD_HTTP_NO_CONTENT are both
+   * successful replies, but @e details will only contain @e success information
+   * if this is set to #MHD_HTTP_OK.
    */
-  const char *credit_account_uri;
+  unsigned int http_status;
+
+  /**
+   * Taler error code, #TALER_EC_NONE on success.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * Full response, NULL if body was not in JSON format.
+   */
+  const json_t *response;
+
+  /**
+   * Details returned depending on the @e http_status.
+   */
+  union
+  {
+
+    /**
+     * Details if status was #MHD_HTTP_OK
+     */
+    struct
+    {
+
+      /**
+       * payto://-URI of the source account that send the funds.
+       */
+      const char *debit_account_uri;
+
+      /**
+       * Array of transactions initiated.
+       */
+      const struct TALER_BANK_DebitDetails *details;
+
+      /**
+       * Length of the @e details array.
+       */
+      unsigned int details_length;
+
+    } ok;
+
+  } details;
 
 };
 
@@ -409,25 +588,12 @@ struct TALER_BANK_DebitDetails
  * the bank for the debit transaction history.
  *
  * @param cls closure
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for successful status request
- *                    0 if the bank's reply is bogus (fails to follow the protocol),
- *                    #MHD_HTTP_NO_CONTENT if there are no more results; on success the
- *                    last callback is always of this status (even if `abs(num_results)` were
- *                    already returned).
- * @param ec detailed error code
- * @param serial_id monotonically increasing counter corresponding to the transaction
- * @param details details about the wire transfer
- * @param json detailed response from the HTTPD, or NULL if reply was not in JSON
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
+ * @param reply details about the response
  */
-typedef enum GNUNET_GenericReturnValue
+typedef void
 (*TALER_BANK_DebitHistoryCallback)(
   void *cls,
-  unsigned int http_status,
-  enum TALER_ErrorCode ec,
-  uint64_t serial_id,
-  const struct TALER_BANK_DebitDetails *details,
-  const json_t *json);
+  const struct TALER_BANK_DebitHistoryResponse *reply);
 
 
 /**
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 3c413aaf6..b941316b5 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -18,7 +18,12 @@
  * @brief taler-specific crypto functions
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff <christian@grothoff.org>
+ * @author Özgür Kesim <oec-taler@kesim.org>
  */
+#if ! defined (__TALER_UTIL_LIB_H_INSIDE__)
+#error "Only <taler_util.h> can be included directly."
+#endif
+
 #ifndef TALER_CRYPTO_LIB_H
 #define TALER_CRYPTO_LIB_H
 
@@ -42,6 +47,59 @@
  * fixed and part of the protocol.
  */
 #define TALER_CNC_KAPPA 3
+#define TALER_CNC_KAPPA_MINUS_ONE_STR "2"
+
+
+/**
+ * Possible AML decision states.
+ */
+enum TALER_AmlDecisionState
+{
+
+  /**
+   * All AML requirements are currently satisfied.
+   */
+  TALER_AML_NORMAL = 0,
+
+  /**
+   * An AML investigation is pending.
+   */
+  TALER_AML_PENDING = 1,
+
+  /**
+   * An AML decision has concluded that the funds must be frozen.
+   */
+  TALER_AML_FROZEN = 2,
+
+  /**
+   * Maximum allowed numeric value for AML status.
+   */
+  TALER_AML_MAX = 2
+};
+
+
+/**
+ * Possible algorithms for confirmation code generation.
+ */
+enum TALER_MerchantConfirmationAlgorithm
+{
+
+  /**
+   * No purchase confirmation.
+   */
+  TALER_MCA_NONE = 0,
+
+  /**
+   * Purchase confirmation without payment
+   */
+  TALER_MCA_WITHOUT_PRICE = 1,
+
+  /**
+   * Purchase confirmation with payment
+   */
+  TALER_MCA_WITH_PRICE = 2
+
+};
 
 
 /* ****************** Coin crypto primitives ************* */
@@ -143,6 +201,18 @@ struct TALER_ReserveSignatureP
 
 
 /**
+ * (Symmetric) key used to encrypt KYC attribute data in the database.
+ */
+struct TALER_AttributeKeyP
+{
+  /**
+   * Actual key material.
+   */
+  struct GNUNET_HashCode key;
+};
+
+
+/**
  * @brief Type of public keys to for merchant authorizations.
  * Merchants can issue refunds using the corresponding
  * private key.
@@ -420,6 +490,17 @@ struct TALER_AgeCommitmentPublicKeyP
 };
 
 
+/*
+ * @brief Hash to represent the commitment to n*kappa blinded keys during a
+ * age-withdrawal. It is the running SHA512 hash over the hashes of the blinded
+ * envelopes of n*kappa coins.
+ */
+struct TALER_AgeWithdrawCommitmentHashP
+{
+  struct GNUNET_HashCode hash;
+};
+
+
 /**
  * @brief Type of online public keys used by the wallet to establish a purse and the associated contract meta data.
  */
@@ -496,20 +577,39 @@ struct TALER_PurseMergeSignatureP
 
 
 /**
- * @brief Type of blinding keys for Taler.
- * must be 32 bytes (DB)
+ * @brief Type of online public keys used by AML officers.
  */
-union TALER_DenominationBlindingKeyP
+struct TALER_AmlOfficerPublicKeyP
 {
   /**
-   * Clause Schnorr Signatures have 2 blinding secrets, each containing two unpredictable values. (must be 32 bytes)
+   * Taler uses EdDSA for AML decision signing.
    */
-  struct GNUNET_CRYPTO_CsNonce nonce;
+  struct GNUNET_CRYPTO_EddsaPublicKey eddsa_pub;
+};
 
+
+/**
+ * @brief Type of online private keys used to identify
+ * AML officers.
+ */
+struct TALER_AmlOfficerPrivateKeyP
+{
+  /**
+   * Taler uses EdDSA for AML decision signing.
+   */
+  struct GNUNET_CRYPTO_EddsaPrivateKey eddsa_priv;
+};
+
+
+/**
+ * @brief Type of signatures used by AML officers.
+ */
+struct TALER_AmlOfficerSignatureP
+{
   /**
-   * Taler uses RSA for blind signatures.
+   * Taler uses EdDSA for AML decision signing.
    */
-  struct GNUNET_CRYPTO_RsaBlindingKeySecret rsa_bks;
+  struct GNUNET_CRYPTO_EddsaSignature eddsa_signature;
 };
 
 
@@ -527,6 +627,19 @@ struct TALER_RefreshCommitmentP
 
 
 /**
+ * Symmetric key we use to encrypt KYC attributes
+ * in our database.
+ */
+struct TALER_AttributeEncryptionKeyP
+{
+  /**
+   * The key is a hash code.
+   */
+  struct GNUNET_HashCode hash;
+};
+
+
+/**
  * Token used for access control to the merchant's unclaimed
  * orders.
  */
@@ -638,10 +751,9 @@ struct TALER_PrivateContractHashP
 
 
 /**
- * Hash used to represent the "public" extensions to
- * a contract that is shared with the exchange.
+ * Hash used to represent the policy extension to a deposit
  */
-struct TALER_ExtensionContractHashP
+struct TALER_ExtensionPolicyHashP
 {
   /**
    * Actual hash value.
@@ -703,9 +815,9 @@ struct TALER_CoinPubHashP
 
 
 /**
- * @brief Value that uniquely identifies a tip.
+ * @brief Value that uniquely identifies a reward.
  */
-struct TALER_TipIdentifierP
+struct TALER_RewardIdentifierP
 {
   /**
    * The tip identifier is a SHA-512 hash code.
@@ -727,10 +839,10 @@ struct TALER_PickupIdentifierP
 
 
 /**
- * @brief Salted hash over the JSON object representing the configuration of an
- * extension.
+ * @brief Salted hash over the JSON object representing the manifests of
+ * extensions.
  */
-struct TALER_ExtensionConfigHashP
+struct TALER_ExtensionManifestsHashP
 {
   /**
    * Actual hash value.
@@ -792,12 +904,6 @@ struct TALER_WireFeeSetNBOP
    */
   struct TALER_AmountNBO closing;
 
-  /**
-   * The fee the exchange charges for cross-exchange
-   * P2P payments.
-   */
-  struct TALER_AmountNBO wad;
-
 };
 
 
@@ -809,28 +915,20 @@ struct TALER_GlobalFeeSetNBOP
 {
 
   /**
-   * The fee the exchange charges for returning the
-   * history of a reserve or account.
+   * The fee the exchange charges for returning the history of a reserve or
+   * account.
    */
   struct TALER_AmountNBO history;
 
   /**
-   * The fee the exchange charges for performing a
-   * KYC check on a reserve to turn it into an account
-   * that can be used for P2P payments.
-   */
-  struct TALER_AmountNBO kyc;
-
-  /**
-   * The fee the exchange charges for keeping
-   * an account or reserve open for a year.
+   * The fee the exchange charges for keeping an account or reserve open for a
+   * year.
    */
   struct TALER_AmountNBO account;
 
   /**
-   * The fee the exchange charges if a purse
-   * is abandoned and this was not covered by
-   * the account limit.
+   * The fee the exchange charges if a purse is abandoned and this was not
+   * covered by the account limit.
    */
   struct TALER_AmountNBO purse;
 };
@@ -840,6 +938,38 @@ GNUNET_NETWORK_STRUCT_END
 
 
 /**
+ * Compute RFC 3548 base32 decoding of @a val and write
+ * result to @a udata.
+ *
+ * @param val value to decode
+ * @param val_size number of bytes in @a val
+ * @param key is the val in bits
+ * @param key_len is the size of @a key
+ */
+int
+TALER_rfc3548_base32decode (const char *val,
+                            size_t val_size,
+                            void *key,
+                            size_t key_len);
+
+
+/**
+ * @brief Builds POS confirmation token to verify payment.
+ *
+ * @param pos_key encoded key for verification payment
+ * @param pos_alg algorithm to compute the payment verification
+ * @param total of the order paid
+ * @param ts is the time given
+ * @return POS token on success, NULL otherwise
+ */
+char *
+TALER_build_pos_confirmation (const char *pos_key,
+                              enum TALER_MerchantConfirmationAlgorithm pos_alg,
+                              const struct TALER_Amount *total,
+                              struct GNUNET_TIME_Timestamp ts);
+
+
+/**
  * Set of the fees applying to a denomination.
  */
 struct TALER_DenomFeeSet
@@ -874,15 +1004,13 @@ struct TALER_DenomFeeSet
 
 
 /**
- * Set of the fees applying for a given
- * time-range and wire method.
+ * Set of the fees applying for a given time-range and wire method.
  */
 struct TALER_WireFeeSet
 {
 
   /**
-   * The fee the exchange charges for wiring funds
-   * to a merchant.
+   * The fee the exchange charges for wiring funds to a merchant.
    */
   struct TALER_Amount wire;
 
@@ -892,12 +1020,6 @@ struct TALER_WireFeeSet
    */
   struct TALER_Amount closing;
 
-  /**
-   * The fee the exchange charges for cross-exchange
-   * P2P payments.
-   */
-  struct TALER_Amount wad;
-
 };
 
 
@@ -915,13 +1037,6 @@ struct TALER_GlobalFeeSet
   struct TALER_Amount history;
 
   /**
-   * The fee the exchange charges for performing a
-   * KYC check on a reserve to turn it into an account
-   * that can be used for P2P payments.
-   */
-  struct TALER_Amount kyc;
-
-  /**
    * The fee the exchange charges for keeping
    * an account or reserve open for a year.
    */
@@ -1036,6 +1151,7 @@ void
 TALER_rsa_pub_hash (const struct GNUNET_CRYPTO_RsaPublicKey *rsa,
                     struct TALER_RsaPubHashP *h_rsa);
 
+
 /**
  * Hash @a cs.
  *
@@ -1048,75 +1164,16 @@ TALER_cs_pub_hash (const struct GNUNET_CRYPTO_CsPublicKey *cs,
 
 
 /**
- * Types of public keys used for denominations in Taler.
- */
-enum TALER_DenominationCipher
-{
-
-  /**
-   * Invalid type of signature.
-   */
-  TALER_DENOMINATION_INVALID = 0,
-
-  /**
-   * RSA blind signature.
-   */
-  TALER_DENOMINATION_RSA = 1,
-
-  /**
-   * Clause Blind Schnorr signature.
-   */
-  TALER_DENOMINATION_CS = 2
-};
-
-
-/**
  * @brief Type of (unblinded) coin signatures for Taler.
  */
 struct TALER_DenominationSignature
 {
-
   /**
-   * Type of the signature.
-   */
-  enum TALER_DenominationCipher cipher;
-
-  /**
-   * Details, depending on @e cipher.
+   * Denominations use blind signatures.
    */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     */
-    struct GNUNET_CRYPTO_CsSignature cs_signature;
-
-    /**
-     * If we use #TALER_DENOMINATION_RSA in @a cipher.
-     */
-    struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
-
-  } details;
-
+  struct GNUNET_CRYPTO_UnblindedSignature *unblinded_sig;
 };
 
-/**
- * The Sign Answer for Clause Blind Schnorr signature.
- * The sign operation returns a parameter @param b and the signature
- * scalar @param s_scalar.
- */
-struct TALER_BlindedDenominationCsSignAnswer
-{
-  /**
-   * To make ROS problem harder, the signer chooses an unpredictable b and only calculates signature of c_b
-   */
-  unsigned int b;
-
-  /**
-   * The blinded s scalar calculated from c_b
-   */
-  struct GNUNET_CRYPTO_CsBlindS s_scalar;
-};
 
 /**
  * @brief Type for *blinded* denomination signatures for Taler.
@@ -1124,33 +1181,13 @@ struct TALER_BlindedDenominationCsSignAnswer
  */
 struct TALER_BlindedDenominationSignature
 {
-
   /**
-   * Type of the signature.
+   * Denominations use blind signatures.
    */
-  enum TALER_DenominationCipher cipher;
-
-  /**
-   * Details, depending on @e cipher.
-   */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     * At this point only the blinded s scalar is used.
-     * The final signature consisting of r,s is built after unblinding.
-     */
-    struct TALER_BlindedDenominationCsSignAnswer blinded_cs_answer;
-
-    /**
-     * If we use #TALER_DENOMINATION_RSA in @a cipher.
-     */
-    struct GNUNET_CRYPTO_RsaSignature *blinded_rsa_signature;
-
-  } details;
-
+  struct GNUNET_CRYPTO_BlindedSignature *blinded_sig;
 };
 
+
 /* *************** Age Restriction *********************************** */
 
 /*
@@ -1158,7 +1195,7 @@ struct TALER_BlindedDenominationSignature
  *
  * The bits set in the mask mark the edges at the beginning of a next age
  * group.  F.e. for the age groups
- *     0-7, 8-9, 10-11, 12-14, 14-15, 16-17, 18-21, 21-*
+ *     0-7, 8-9, 10-11, 12-13, 14-15, 16-17, 18-21, 21-*
  * the following bits are set:
  *
  *   31     24        16        8         0
@@ -1167,6 +1204,9 @@ struct TALER_BlindedDenominationSignature
  *
  * A value of 0 means that the exchange does not support the extension for
  * age-restriction.
+ *
+ * For a non-0 age mask, the 0th bit always must be set, otherwise the age
+ * mask is considered invalid.
  */
 struct TALER_AgeMask
 {
@@ -1196,13 +1236,8 @@ struct TALER_AgeAttestation
 #endif
 };
 
-extern const struct TALER_AgeCommitmentHash TALER_ZeroAgeCommitmentHash;
 #define TALER_AgeCommitmentHash_isNullOrZero(ph) ((NULL == ph) || \
-                                                  (0 == memcmp (ph, \
-                                                                & \
-                                                                TALER_ZeroAgeCommitmentHash, \
-                                                                sizeof(struct \
-                                                                       TALER_AgeCommitmentHash))))
+                                                  GNUNET_is_zero (ph))
 
 /**
  * @brief Type of public signing keys for verifying blindly signed coins.
@@ -1211,31 +1246,15 @@ struct TALER_DenominationPublicKey
 {
 
   /**
-   * Type of the public key.
-   */
-  enum TALER_DenominationCipher cipher;
-
-  /**
    * Age restriction mask used for the key.
    */
   struct TALER_AgeMask age_mask;
 
   /**
-   * Details, depending on @e cipher.
+   * Type of the public key.
    */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     */
-    struct GNUNET_CRYPTO_CsPublicKey cs_public_key;
-
-    /**
-     * If we use #TALER_DENOMINATION_RSA in @a cipher.
-     */
-    struct GNUNET_CRYPTO_RsaPublicKey *rsa_public_key;
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bsign_pub_key;
 
-  } details;
 };
 
 
@@ -1245,121 +1264,21 @@ struct TALER_DenominationPublicKey
 struct TALER_DenominationPrivateKey
 {
 
-  /**
-   * Type of the public key.
-   */
-  enum TALER_DenominationCipher cipher;
+  struct GNUNET_CRYPTO_BlindSignPrivateKey *bsign_priv_key;
 
-  /**
-   * Details, depending on @e cipher.
-   */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     */
-    struct GNUNET_CRYPTO_CsPrivateKey cs_private_key;
-
-    /**
-     * If we use #TALER_DENOMINATION_RSA in @a cipher.
-     */
-    struct GNUNET_CRYPTO_RsaPrivateKey *rsa_private_key;
-
-  } details;
-};
-
-/**
- * @brief RSA Parameters to create blinded signature
- *
- */
-struct TALER_BlindedRsaPlanchet
-{
-  /**
-   * Blinded message to be signed
-   * Note: is malloc()'ed!
-   */
-  void *blinded_msg;
-
-  /**
-   * Size of the @e blinded_msg to be signed.
-   */
-  size_t blinded_msg_size;
 };
 
 
 /**
- * Withdraw nonce for CS denominations
- */
-struct TALER_CsNonce
-{
-  /**
-   * 32 bit nonce to include in withdrawals when using CS.
-   */
-  struct GNUNET_CRYPTO_CsNonce nonce;
-};
-
-
-/**
- * @brief CS Parameters to create blinded signature
- */
-struct TALER_BlindedCsPlanchet
-{
-  /**
-   * The Clause Schnorr c_0 and c_1 containing the blinded message
-   */
-  struct GNUNET_CRYPTO_CsC c[2];
-
-  /**
-   * Public nonce.
-   */
-  struct TALER_CsNonce nonce;
-};
-
-
-/**
- * @brief Type including Parameters to create blinded signature
+ * @brief Blinded planchet send to exchange for blind signing.
  */
 struct TALER_BlindedPlanchet
 {
   /**
-   * Type of the sign blinded message
-   */
-  enum TALER_DenominationCipher cipher;
-
-  /**
-   * Details, depending on @e cipher.
+   * A blinded message.
    */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     */
-    struct TALER_BlindedCsPlanchet cs_blinded_planchet;
-
-    /**
-     * If we use #TALER_DENOMINATION_RSA in @a cipher.
-     */
-    struct TALER_BlindedRsaPlanchet rsa_blinded_planchet;
+  struct GNUNET_CRYPTO_BlindedMessage *blinded_message;
 
-  } details;
-};
-
-
-/**
- * Pair of Public R values for Cs denominations
- */
-struct TALER_DenominationCSPublicRPairP
-{
-  struct GNUNET_CRYPTO_CsRPublic r_pub[2];
-};
-
-
-/**
- * Secret r for Cs denominations
- */
-struct TALER_DenominationCSPrivateRPairP
-{
-  struct GNUNET_CRYPTO_CsRSecret r[2];
 };
 
 
@@ -1417,51 +1336,58 @@ struct TALER_TrackTransferDetails
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
   /**
-   * Value of the deposit (including fee).
+   * Value of the deposit (including fee), after refunds.
    */
   struct TALER_Amount coin_value;
 
   /**
-   * Fee charged by the exchange for the deposit.
+   * Fee charged by the exchange for the deposit,
+   * possibly reduced (or waived) due to refunds.
    */
   struct TALER_Amount coin_fee;
 
+  /**
+   * Total amount of refunds applied to this coin.
+   */
+  struct TALER_Amount refund_total;
+
 };
 
 
 /**
- * @brief Type of algorithm specific Values for withdrawal
+ * @brief Inputs needed from the exchange for blind signing.
  */
 struct TALER_ExchangeWithdrawValues
 {
 
   /**
-   * Type of the signature.
+   * Input values.
    */
-  enum TALER_DenominationCipher cipher;
-
-  /**
-   * Details, depending on @e cipher.
-   */
-  union
-  {
-    /**
-     * If we use #TALER_DENOMINATION_CS in @a cipher.
-     */
-    struct TALER_DenominationCSPublicRPairP cs_values;
+  struct GNUNET_CRYPTO_BlindingInputValues *blinding_inputs;
+};
 
-  } details;
 
-};
+/**
+ * Return the alg value singleton for creation of
+ * blinding secrets for RSA.
+ *
+ * @return singleton to use for RSA blinding
+ */
+const struct TALER_ExchangeWithdrawValues *
+TALER_denom_ewv_rsa_singleton (void);
 
 
 /**
- * Free internals of @a denom_pub, but not @a denom_pub itself.
+ * Make a (deep) copy of the given @a bi_src to
+ * @a bi_dst.
  *
- * @param[in] denom_pub key to free
+ * @param[out] bi_dst target to copy to
+ * @param bi_src blinding input values to copy
  */
 void
-TALER_denom_pub_free (struct TALER_DenominationPublicKey *denom_pub);
+TALER_denom_ewv_copy (
+  struct TALER_ExchangeWithdrawValues *bi_dst,
+  const struct TALER_ExchangeWithdrawValues *bi_src);
 
 
 /**
@@ -1486,7 +1412,7 @@ TALER_planchet_setup_coin_priv (
 void
 TALER_cs_withdraw_nonce_derive (
   const struct TALER_PlanchetMasterSecretP *ps,
-  struct TALER_CsNonce *nonce);
+  struct GNUNET_CRYPTO_CsSessionNonce *nonce);
 
 
 /**
@@ -1501,13 +1427,13 @@ void
 TALER_cs_refresh_nonce_derive (
   const struct TALER_RefreshMasterSecretP *rms,
   uint32_t idx,
-  struct TALER_CsNonce *nonce);
+  struct GNUNET_CRYPTO_CsSessionNonce *nonce);
 
 
 /**
  * Initialize denomination public-private key pair.
  *
- * For #TALER_DENOMINATION_RSA, an additional "unsigned int"
+ * For #GNUNET_CRYPTO_BSA_RSA, an additional "unsigned int"
  * argument with the number of bits for 'n' (e.g. 2048) must
  * be passed.
  *
@@ -1520,11 +1446,29 @@ TALER_cs_refresh_nonce_derive (
 enum GNUNET_GenericReturnValue
 TALER_denom_priv_create (struct TALER_DenominationPrivateKey *denom_priv,
                          struct TALER_DenominationPublicKey *denom_pub,
-                         enum TALER_DenominationCipher cipher,
+                         enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher,
                          ...);
 
 
 /**
+ * Free internals of @a denom_pub, but not @a denom_pub itself.
+ *
+ * @param[in] denom_pub key to free
+ */
+void
+TALER_denom_pub_free (struct TALER_DenominationPublicKey *denom_pub);
+
+
+/**
+ * Free internals of @a ewv, but not @a ewv itself.
+ *
+ * @param[in] ewv input values to free
+ */
+void
+TALER_denom_ewv_free (struct TALER_ExchangeWithdrawValues *ewv);
+
+
+/**
  * Free internals of @a denom_priv, but not @a denom_priv itself.
  *
  * @param[in] denom_priv key to free
@@ -1551,6 +1495,8 @@ TALER_denom_sig_free (struct TALER_DenominationSignature *denom_sig);
  *
  * @param dk denomination public key to blind for
  * @param coin_bks blinding secret to use
+ * @param nonce nonce used to derive session values,
+ *        could be NULL for ciphers that do not use it
  * @param age_commitment_hash hash of the age commitment to be used for the coin. NULL if no commitment is made.
  * @param coin_pub public key of the coin to blind
  * @param alg_values algorithm specific values to blind the planchet
@@ -1560,7 +1506,8 @@ TALER_denom_sig_free (struct TALER_DenominationSignature *denom_sig);
  */
 enum GNUNET_GenericReturnValue
 TALER_denom_blind (const struct TALER_DenominationPublicKey *dk,
-                   const union TALER_DenominationBlindingKeyP *coin_bks,
+                   const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+                   const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
                    const struct TALER_AgeCommitmentHash *age_commitment_hash,
                    const struct TALER_CoinSpendPublicKeyP *coin_pub,
                    const struct TALER_ExchangeWithdrawValues *alg_values,
@@ -1599,7 +1546,7 @@ enum GNUNET_GenericReturnValue
 TALER_denom_sig_unblind (
   struct TALER_DenominationSignature *denom_sig,
   const struct TALER_BlindedDenominationSignature *bdenom_sig,
-  const union TALER_DenominationBlindingKeyP *bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *bks,
   const struct TALER_CoinPubHashP *c_hash,
   const struct TALER_ExchangeWithdrawValues *alg_values,
   const struct TALER_DenominationPublicKey *denom_pub);
@@ -1634,8 +1581,8 @@ TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub,
  * @param denom_src public key to copy
  */
 void
-TALER_denom_pub_deep_copy (struct TALER_DenominationPublicKey *denom_dst,
-                           const struct TALER_DenominationPublicKey *denom_src);
+TALER_denom_pub_copy (struct TALER_DenominationPublicKey *denom_dst,
+                      const struct TALER_DenominationPublicKey *denom_src);
 
 
 /**
@@ -1646,8 +1593,8 @@ TALER_denom_pub_deep_copy (struct TALER_DenominationPublicKey *denom_dst,
  * @param denom_src public key to copy
  */
 void
-TALER_denom_sig_deep_copy (struct TALER_DenominationSignature *denom_dst,
-                           const struct TALER_DenominationSignature *denom_src);
+TALER_denom_sig_copy (struct TALER_DenominationSignature *denom_dst,
+                      const struct TALER_DenominationSignature *denom_src);
 
 
 /**
@@ -1658,7 +1605,7 @@ TALER_denom_sig_deep_copy (struct TALER_DenominationSignature *denom_dst,
  * @param denom_src public key to copy
  */
 void
-TALER_blinded_denom_sig_deep_copy (
+TALER_blinded_denom_sig_copy (
   struct TALER_BlindedDenominationSignature *denom_dst,
   const struct TALER_BlindedDenominationSignature *denom_src);
 
@@ -1714,19 +1661,6 @@ TALER_blinded_planchet_cmp (
 
 
 /**
- * Obtain denomination public key from a denomination private key.
- *
- * @param denom_priv private key to convert
- * @param age_mask age mask to be applied
- * @param[out] denom_pub where to return the public key
- */
-void
-TALER_denom_priv_to_pub (const struct TALER_DenominationPrivateKey *denom_priv,
-                         const struct TALER_AgeMask age_mask,
-                         struct TALER_DenominationPublicKey *denom_pub);
-
-
-/**
  * Verify signature made with a denomination public key
  * over a coin.
  *
@@ -1742,6 +1676,51 @@ TALER_denom_pub_verify (const struct TALER_DenominationPublicKey *denom_pub,
 
 
 /**
+ * Encrypts KYC attributes for storage in the database.
+ *
+ * @param key encryption key to use
+ * @param attr set of attributes to encrypt
+ * @param[out] enc_attr encrypted attribute data
+ * @param[out] enc_attr_size number of bytes in @a enc_attr
+ */
+void
+TALER_CRYPTO_kyc_attributes_encrypt (
+  const struct TALER_AttributeEncryptionKeyP *key,
+  const json_t *attr,
+  void **enc_attr,
+  size_t *enc_attr_size);
+
+
+/**
+ * Encrypts KYC attributes for storage in the database.
+ *
+ * @param key encryption key to use
+ * @param enc_attr encrypted attribute data
+ * @param enc_attr_size number of bytes in @a enc_attr
+ * @return set of decrypted attributes, NULL on failure
+ */
+json_t *
+TALER_CRYPTO_kyc_attributes_decrypt (
+  const struct TALER_AttributeEncryptionKeyP *key,
+  const void *enc_attr,
+  size_t enc_attr_size);
+
+
+/**
+ * Takes a set of KYC attributes and extracts key
+ * data that we use to detect similar / duplicate
+ * entries in the database.
+ *
+ * @param attr set of KYC attributes
+ * @param[out] kyc_prox set to the proximity hash
+ */
+void
+TALER_CRYPTO_attributes_to_kyc_prox (
+  const json_t *attr,
+  struct GNUNET_ShortHashCode *kyc_prox);
+
+
+/**
  * Check if a coin is valid; that is, whether the denomination key exists,
  * is not expired, and the signature is correct.
  *
@@ -1760,11 +1739,10 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info,
  * Compute the hash of a blinded coin.
  *
  * @param blinded_planchet blinded planchet
- * @param denom_hash hash of the denomination publick key
+ * @param denom_hash hash of the denomination public key
  * @param[out] bch where to write the hash
- * @return #GNUNET_OK when successful, #GNUNET_SYSERR if an internal error occured
  */
-enum GNUNET_GenericReturnValue
+void
 TALER_coin_ev_hash (const struct TALER_BlindedPlanchet *blinded_planchet,
                     const struct TALER_DenominationHashP *denom_hash,
                     struct TALER_BlindedCoinHashP *bch);
@@ -1793,6 +1771,7 @@ void
 TALER_payto_hash (const char *payto,
                   struct TALER_PaytoHashP *h_payto);
 
+
 /**
  * Details about a planchet that the customer wants to obtain
  * a withdrawal authorization.  This is the information that
@@ -1995,7 +1974,7 @@ void
 TALER_planchet_blinding_secret_create (
   const struct TALER_PlanchetMasterSecretP *ps,
   const struct TALER_ExchangeWithdrawValues *alg_values,
-  union TALER_DenominationBlindingKeyP *bks);
+  union GNUNET_CRYPTO_BlindingSecretP *bks);
 
 
 /**
@@ -2004,6 +1983,7 @@ TALER_planchet_blinding_secret_create (
  * @param dk denomination key for the coin to be created
  * @param alg_values algorithm specific values
  * @param bks blinding secrets
+ * @param nonce session nonce used to get @a alg_values
  * @param coin_priv coin private key
  * @param ach hash of age commitment to bind to this coin, maybe NULL
  * @param[out] c_hash set to the hash of the public key of the coin (needed later)
@@ -2013,13 +1993,15 @@ TALER_planchet_blinding_secret_create (
  * @return #GNUNET_OK on success
  */
 enum GNUNET_GenericReturnValue
-TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk,
-                        const struct TALER_ExchangeWithdrawValues *alg_values,
-                        const union TALER_DenominationBlindingKeyP *bks,
-                        const struct TALER_CoinSpendPrivateKeyP *coin_priv,
-                        const struct TALER_AgeCommitmentHash *ach,
-                        struct TALER_CoinPubHashP *c_hash,
-                        struct TALER_PlanchetDetail *pd);
+TALER_planchet_prepare (
+  const struct TALER_DenominationPublicKey *dk,
+  const struct TALER_ExchangeWithdrawValues *alg_values,
+  const union GNUNET_CRYPTO_BlindingSecretP *bks,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  const struct TALER_AgeCommitmentHash *ach,
+  struct TALER_CoinPubHashP *c_hash,
+  struct TALER_PlanchetDetail *pd);
 
 
 /**
@@ -2059,7 +2041,7 @@ enum GNUNET_GenericReturnValue
 TALER_planchet_to_coin (
   const struct TALER_DenominationPublicKey *dk,
   const struct TALER_BlindedDenominationSignature *blind_sig,
-  const union TALER_DenominationBlindingKeyP *bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   const struct TALER_AgeCommitmentHash *ach,
   const struct TALER_CoinPubHashP *c_hash,
@@ -2260,6 +2242,89 @@ TALER_CRYPTO_contract_decrypt_for_deposit (
   size_t econtract_size);
 
 
+/* **************** AML officer signatures **************** */
+
+/**
+ * Sign AML query. Simple authentication, doesn't actually
+ * sign anything.
+ *
+ * @param officer_priv private key of AML officer
+ * @param[out] officer_sig where to write the signature
+ */
+void
+TALER_officer_aml_query_sign (
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  struct TALER_AmlOfficerSignatureP *officer_sig);
+
+
+/**
+ * Verify AML query authorization.
+ *
+ * @param officer_pub public key of AML officer
+ * @param officer_sig signature to verify
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_officer_aml_query_verify (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const struct TALER_AmlOfficerSignatureP *officer_sig);
+
+
+/**
+ * Sign AML decision.
+ *
+ * @param justification human-readable justification
+ * @param decision_time when was the decision made
+ * @param new_threshold at what monthly amount threshold
+ *                      should a revision be triggered
+ * @param h_payto payto URI hash of the account the
+ *                      decision is about
+ * @param new_state updated AML state
+ * @param kyc_requirements additional KYC requirements to
+ *           impose, can be NULL
+ * @param officer_priv private key of AML officer
+ * @param[out] officer_sig where to write the signature
+ */
+void
+TALER_officer_aml_decision_sign (
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  struct TALER_AmlOfficerSignatureP *officer_sig);
+
+
+/**
+ * Verify AML decision.
+ *
+ * @param justification human-readable justification
+ * @param decision_time when was the decision made
+ * @param new_threshold at what monthly amount threshold
+ *                      should a revision be triggered
+ * @param h_payto payto URI hash of the account the
+ *                      decision is about
+ * @param new_state updated AML state
+ * @param kyc_requirements additional KYC requirements to
+ *           impose, can be NULL
+ * @param officer_pub public key of AML officer
+ * @param officer_sig signature to verify
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_officer_aml_decision_verify (
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const struct TALER_AmlOfficerSignatureP *officer_sig);
+
+
 /* **************** Helper-based RSA operations **************** */
 
 /**
@@ -2280,7 +2345,7 @@ struct TALER_CRYPTO_RsaDenominationHelper;
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_rsa hash of the RSA @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -2292,7 +2357,7 @@ typedef void
   struct GNUNET_TIME_Timestamp start_time,
   struct GNUNET_TIME_Relative validity_duration,
   const struct TALER_RsaPubHashP *h_rsa,
-  const struct TALER_DenominationPublicKey *denom_pub,
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub,
   const struct TALER_SecurityModulePublicKeyP *sm_pub,
   const struct TALER_SecurityModuleSignatureP *sm_sig);
 
@@ -2301,6 +2366,7 @@ typedef void
  * Initiate connection to an denomination key helper.
  *
  * @param cfg configuration to use
+ * @param section configuration section prefix to use, usually 'taler' or 'donau'
  * @param dkc function to call with key information
  * @param dkc_cls closure for @a dkc
  * @return NULL on error (such as bad @a cfg).
@@ -2308,6 +2374,7 @@ typedef void
 struct TALER_CRYPTO_RsaDenominationHelper *
 TALER_CRYPTO_helper_rsa_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_RsaDenominationKeyStatusCallback dkc,
   void *dkc_cls);
 
@@ -2326,8 +2393,30 @@ TALER_CRYPTO_helper_rsa_poll (struct TALER_CRYPTO_RsaDenominationHelper *dh);
 
 
 /**
- * Request helper @a dh to sign @a msg using the public key corresponding to
- * @a h_denom_pub.
+ * Information needed for an RSA signature request.
+ */
+struct TALER_CRYPTO_RsaSignRequest
+{
+  /**
+   * Hash of the RSA public key.
+   */
+  const struct TALER_RsaPubHashP *h_rsa;
+
+  /**
+   * Message to be (blindly) signed.
+   */
+  const void *msg;
+
+  /**
+   * Number of bytes in @e msg.
+   */
+  size_t msg_size;
+};
+
+
+/**
+ * Request helper @a dh to sign message in @a rsr using the public key
+ * corresponding to the key in @a rsr.
  *
  * This operation will block until the signature has been obtained.  Should
  * this process receive a signal (that is not ignored) while the operation is
@@ -2336,22 +2425,47 @@ TALER_CRYPTO_helper_rsa_poll (struct TALER_CRYPTO_RsaDenominationHelper *dh);
  * differences in the signature counters.  Retrying in this case may work.
  *
  * @param dh helper process connection
- * @param h_rsa hash of the RSA public key to use to sign
- * @param msg message to sign
- * @param msg_size number of bytes in @a msg
+ * @param rsr details about the requested signature
  * @param[out] bs set to the blind signature
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_CRYPTO_helper_rsa_sign (
   struct TALER_CRYPTO_RsaDenominationHelper *dh,
-  const struct TALER_RsaPubHashP *h_rsa,
-  const void *msg,
-  size_t msg_size,
+  const struct TALER_CRYPTO_RsaSignRequest *rsr,
   struct TALER_BlindedDenominationSignature *bs);
 
 
 /**
+ * Request helper @a dh to batch sign messages in @a rsrs using the public key
+ * corresponding to the keys in @a rsrs.
+ *
+ * This operation will block until all the signatures have been obtained.  Should
+ * this process receive a signal (that is not ignored) while the operation is
+ * pending, the operation will fail.  Note that the helper may still believe
+ * that it created the signature. Thus, signals may result in a small
+ * differences in the signature counters.  Retrying in this case may work.
+ *
+ * Note that in case of errors, the @a bss array may still have been partially
+ * filled with signatures, which in this case must be freed by the caller
+ * (this is in contrast to the #TALER_CRYPTO_helper_rsa_sign() API which never
+ * returns any signatures if there was an error).
+ *
+ * @param dh helper process connection
+ * @param rsrs array with details about the requested signatures
+ * @param rsrs_length length of the @a rsrs array
+ * @param[out] bss array set to the blind signatures, must be of length @a rsrs_length!
+ * @return #TALER_EC_NONE on success
+ */
+enum TALER_ErrorCode
+TALER_CRYPTO_helper_rsa_batch_sign (
+  struct TALER_CRYPTO_RsaDenominationHelper *dh,
+  unsigned int rsrs_length,
+  const struct TALER_CRYPTO_RsaSignRequest rsrs[static rsrs_length],
+  struct TALER_BlindedDenominationSignature bss[static rsrs_length]);
+
+
+/**
  * Ask the helper to revoke the public key associated with @a h_denom_pub.
  * Will cause the helper to tell all clients that the key is now unavailable,
  * and to create a replacement key.
@@ -2381,6 +2495,7 @@ void
 TALER_CRYPTO_helper_rsa_disconnect (
   struct TALER_CRYPTO_RsaDenominationHelper *dh);
 
+
 /* **************** Helper-based CS operations **************** */
 
 /**
@@ -2401,7 +2516,7 @@ struct TALER_CRYPTO_CsDenominationHelper;
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_cs hash of the CS @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bsign_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -2413,7 +2528,7 @@ typedef void
   struct GNUNET_TIME_Timestamp start_time,
   struct GNUNET_TIME_Relative validity_duration,
   const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_DenominationPublicKey *denom_pub,
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bsign_pub,
   const struct TALER_SecurityModulePublicKeyP *sm_pub,
   const struct TALER_SecurityModuleSignatureP *sm_sig);
 
@@ -2422,6 +2537,7 @@ typedef void
  * Initiate connection to an denomination key helper.
  *
  * @param cfg configuration to use
+ * @param section configuration section prefix to use, usually 'taler' or 'donau'
  * @param dkc function to call with key information
  * @param dkc_cls closure for @a dkc
  * @return NULL on error (such as bad @a cfg).
@@ -2429,6 +2545,7 @@ typedef void
 struct TALER_CRYPTO_CsDenominationHelper *
 TALER_CRYPTO_helper_cs_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_CsDenominationKeyStatusCallback dkc,
   void *dkc_cls);
 
@@ -2447,8 +2564,25 @@ TALER_CRYPTO_helper_cs_poll (struct TALER_CRYPTO_CsDenominationHelper *dh);
 
 
 /**
- * Request helper @a dh to sign @a msg using the public key corresponding to
- * @a h_denom_pub.
+ * Information about what we should sign over.
+ */
+struct TALER_CRYPTO_CsSignRequest
+{
+  /**
+   * Hash of the CS public key to use to sign.
+   */
+  const struct TALER_CsPubHashP *h_cs;
+
+  /**
+   * Blinded planchet containing c and the nonce.
+   */
+  const struct GNUNET_CRYPTO_CsBlindedMessage *blinded_planchet;
+
+};
+
+
+/**
+ * Request helper @a dh to sign @a req.
  *
  * This operation will block until the signature has been obtained.  Should
  * this process receive a signal (that is not ignored) while the operation is
@@ -2457,22 +2591,21 @@ TALER_CRYPTO_helper_cs_poll (struct TALER_CRYPTO_CsDenominationHelper *dh);
  * differences in the signature counters.  Retrying in this case may work.
  *
  * @param dh helper process connection
- * @param h_cs hash of the CS public key to use to sign
- * @param blinded_planchet blinded planchet containing c and nonce
+ * @param req information about the key to sign with and the value to sign
+ * @param for_melt true if for melt operation
  * @param[out] bs set to the blind signature
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_sign_melt (
+TALER_CRYPTO_helper_cs_sign (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_BlindedCsPlanchet *blinded_planchet,
+  const struct TALER_CRYPTO_CsSignRequest *req,
+  bool for_melt,
   struct TALER_BlindedDenominationSignature *bs);
 
 
 /**
- * Request helper @a dh to sign @a msg using the public key corresponding to
- * @a h_denom_pub.
+ * Request helper @a dh to sign batch of @a reqs requests.
  *
  * This operation will block until the signature has been obtained.  Should
  * this process receive a signal (that is not ignored) while the operation is
@@ -2481,17 +2614,19 @@ TALER_CRYPTO_helper_cs_sign_melt (
  * differences in the signature counters.  Retrying in this case may work.
  *
  * @param dh helper process connection
- * @param h_cs hash of the CS public key to use to sign
- * @param blinded_planchet blinded planchet containing c and nonce
- * @param[out] bs set to the blind signature
+ * @param reqs information about the keys to sign with and the values to sign
+ * @param reqs_length length of the @a reqs array
+ * @param for_melt true if this is for a melt operation
+ * @param[out] bss array set to the blind signatures, must be of length @a reqs_length!
  * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_sign_withdraw (
+TALER_CRYPTO_helper_cs_batch_sign (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_BlindedCsPlanchet *blinded_planchet,
-  struct TALER_BlindedDenominationSignature *bs);
+  unsigned int reqs_length,
+  const struct TALER_CRYPTO_CsSignRequest reqs[static reqs_length],
+  bool for_melt,
+  struct TALER_BlindedDenominationSignature bss[static reqs_length]);
 
 
 /**
@@ -2516,8 +2651,25 @@ TALER_CRYPTO_helper_cs_revoke (
 
 
 /**
- * Ask the helper to derive R using the @a nonce and denomination key
- * associated with @a h_cs.
+ * Information about what we should derive for.
+ */
+struct TALER_CRYPTO_CsDeriveRequest
+{
+  /**
+   * Hash of the CS public key to use to sign.
+   */
+  const struct TALER_CsPubHashP *h_cs;
+
+  /**
+   * Nonce to use for the /csr request.
+   */
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce;
+};
+
+
+/**
+ * Ask the helper to derive R using the information
+ * from @a cdr.
  *
  * This operation will block until the R has been obtained.  Should
  * this process receive a signal (that is not ignored) while the operation is
@@ -2526,22 +2678,21 @@ TALER_CRYPTO_helper_cs_revoke (
  * differences in the signature counters.  Retrying in this case may work.
  *
  * @param dh helper to process connection
- * @param h_cs hash of the CS public key to revoke
- * @param nonce witdhraw nonce
+ * @param cdr derivation input data
+ * @param for_melt true if this is for a melt operation
  * @param[out] crp set to the pair of R values
  * @return set to the error code (or #TALER_EC_NONE on success)
  */
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_r_derive_withdraw (
+TALER_CRYPTO_helper_cs_r_derive (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *crp);
+  const struct TALER_CRYPTO_CsDeriveRequest *cdr,
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP *crp);
 
 
 /**
- * Ask the helper to derive R using the @a nonce and denomination key
- * associated with @a h_cs.
+ * Ask the helper to derive R using the information from @a cdrs.
  *
  * This operation will block until the R has been obtained.  Should
  * this process receive a signal (that is not ignored) while the operation is
@@ -2550,17 +2701,19 @@ TALER_CRYPTO_helper_cs_r_derive_withdraw (
  * differences in the signature counters.  Retrying in this case may work.
  *
  * @param dh helper to process connection
- * @param h_cs hash of the CS public key to revoke
- * @param nonce witdhraw nonce
- * @param[out] crp set to the pair of R values
+ * @param cdrs_length length of the @a cdrs array
+ * @param cdrs array with derivation input data
+ * @param for_melt true if this is for a melt operation
+ * @param[out] crps array set to the pair of R values, must be of length @a cdrs_length
  * @return set to the error code (or #TALER_EC_NONE on success)
  */
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_r_derive_melt (
+TALER_CRYPTO_helper_cs_r_batch_derive (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *crp);
+  unsigned int cdrs_length,
+  const struct TALER_CRYPTO_CsDeriveRequest cdrs[static cdrs_length],
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP crps[static cdrs_length]);
 
 
 /**
@@ -2606,6 +2759,7 @@ typedef void
  * Initiate connection to an online signing key helper.
  *
  * @param cfg configuration to use
+ * @param section configuration section prefix to use, usually 'taler' or 'donau'
  * @param ekc function to call with key information
  * @param ekc_cls closure for @a ekc
  * @return NULL on error (such as bad @a cfg).
@@ -2613,6 +2767,7 @@ typedef void
 struct TALER_CRYPTO_ExchangeSignHelper *
 TALER_CRYPTO_helper_esign_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_ExchangeKeyStatusCallback ekc,
   void *ekc_cls);
 
@@ -2729,7 +2884,7 @@ TALER_CRYPTO_helper_esign_disconnect (
 void
 TALER_wallet_purse_create_sign (
   struct GNUNET_TIME_Timestamp purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
   uint32_t min_age,
   const struct TALER_Amount *amount,
@@ -2752,7 +2907,7 @@ TALER_wallet_purse_create_sign (
 enum GNUNET_GenericReturnValue
 TALER_wallet_purse_create_verify (
   struct GNUNET_TIME_Timestamp purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
   uint32_t min_age,
   const struct TALER_Amount *amount,
@@ -2761,6 +2916,31 @@ TALER_wallet_purse_create_verify (
 
 
 /**
+ * Sign a request to delete a purse.
+ *
+ * @param purse_priv key identifying the purse
+ * @param[out] purse_sig resulting signature
+ */
+void
+TALER_wallet_purse_delete_sign (
+  const struct TALER_PurseContractPrivateKeyP *purse_priv,
+  struct TALER_PurseContractSignatureP *purse_sig);
+
+
+/**
+ * Verify a purse deletion request.
+ *
+ * @param purse_pub purse’s public key
+ * @param purse_sig the signature made with purpose #TALER_SIGNATURE_WALLET_PURSE_DELETE
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_purse_delete_verify (
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig);
+
+
+/**
  * Sign a request to upload an encrypted contract.
  *
  * @param econtract encrypted contract
@@ -2798,6 +2978,23 @@ TALER_wallet_econtract_upload_verify (
 
 
 /**
+ * Verify a signature over encrypted contract.
+ *
+ * @param h_econtract hashed encrypted contract
+ * @param contract_pub public key for the DH-encryption
+ * @param purse_pub purse’s public key
+ * @param purse_sig the signature made with purpose #TALER_SIGNATURE_WALLET_PURSE_CREATE
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_econtract_upload_verify2 (
+  const struct GNUNET_HashCode *h_econtract,
+  const struct TALER_ContractDiffiePublicP *contract_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig);
+
+
+/**
  * Sign a request to inquire about a purse's status.
  *
  * @param purse_priv key identifying the purse
@@ -2813,7 +3010,7 @@ TALER_wallet_purse_status_sign (
  * Verify a purse status request signature.
  *
  * @param purse_pub purse’s public key
- * @param purse_sig the signature made with purpose #TALER_SIGNATURE_WALLET_PURSE_STATUS_REQUEST
+ * @param purse_sig the signature made with purpose #TALER_SIGNATURE_WALLET_PURSE_STATUS
  * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
@@ -2828,6 +3025,8 @@ TALER_wallet_purse_status_verify (
  * @param exchange_base_url URL of the exchange hosting the purse
  * @param purse_pub purse’s public key
  * @param amount amount of the coin's value to transfer to the purse
+ * @param h_denom_pub hash of the coin's denomination
+ * @param h_age_commitment hash of the coin's age commitment
  * @param coin_priv key identifying the coin to be deposited
  * @param[out] coin_sig resulting signature
  */
@@ -2836,6 +3035,8 @@ TALER_wallet_purse_deposit_sign (
   const char *exchange_base_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_Amount *amount,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -2846,6 +3047,8 @@ TALER_wallet_purse_deposit_sign (
  * @param exchange_base_url URL of the exchange hosting the purse
  * @param purse_pub purse’s public key
  * @param amount amount of the coin's value to transfer to the purse
+ * @param h_denom_pub hash of the coin's denomination
+ * @param h_age_commitment hash of the coin's age commitment
  * @param coin_pub key identifying the coin that is being deposited
  * @param[out] coin_sig resulting signature
  * @return #GNUNET_OK if the signature is valid
@@ -2855,6 +3058,8 @@ TALER_wallet_purse_deposit_verify (
   const char *exchange_base_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_Amount *amount,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -2862,7 +3067,7 @@ TALER_wallet_purse_deposit_verify (
 /**
  * Sign a request by a purse to merge it into an account.
  *
- * @param reserve_url identifies the location of the reserve
+ * @param reserve_uri identifies the location of the reserve
  * @param merge_timestamp time when the merge happened
  * @param purse_pub key identifying the purse
  * @param merge_priv key identifying the merge capability
@@ -2870,7 +3075,7 @@ TALER_wallet_purse_deposit_verify (
  */
 void
 TALER_wallet_purse_merge_sign (
-  const char *reserve_url,
+  const char *reserve_uri,
   struct GNUNET_TIME_Timestamp merge_timestamp,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -2880,7 +3085,7 @@ TALER_wallet_purse_merge_sign (
 /**
  * Verify a purse merge request.
  *
- * @param reserve_url identifies the location of the reserve
+ * @param reserve_uri identifies the location of the reserve
  * @param merge_timestamp time when the merge happened
  * @param purse_pub public key of the purse to merge
  * @param merge_pub public key of the merge capability
@@ -2889,7 +3094,7 @@ TALER_wallet_purse_merge_sign (
  */
 enum GNUNET_GenericReturnValue
 TALER_wallet_purse_merge_verify (
-  const char *reserve_url,
+  const char *reserve_uri,
   struct GNUNET_TIME_Timestamp merge_timestamp,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
@@ -2992,13 +3197,96 @@ TALER_wallet_account_merge_verify (
 
 
 /**
- * Sign a request to delete/close an account.
+ * Sign a request to keep a reserve open.
+ *
+ * @param reserve_payment how much to pay from the
+ *        reserve's own balance for opening the reserve
+ * @param request_timestamp when was the request created
+ * @param reserve_expiration desired expiration time for the reserve
+ * @param purse_limit minimum number of purses the client
+ *       wants to have concurrently open for this reserve
+ * @param reserve_priv key identifying the reserve
+ * @param[out] reserve_sig resulting signature
+ */
+void
+TALER_wallet_reserve_open_sign (
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig);
+
+
+/**
+ * Verify a request to keep a reserve open.
+ *
+ * @param reserve_payment how much to pay from the
+ *        reserve's own balance for opening the reserve
+ * @param request_timestamp when was the request created
+ * @param reserve_expiration desired expiration time for the reserve
+ * @param purse_limit minimum number of purses the client
+ *       wants to have concurrently open for this reserve
+ * @param reserve_pub key identifying the reserve
+ * @param reserve_sig resulting signature
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_open_verify (
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig);
+
+
+/**
+ * Sign to deposit coin to pay for keeping a reserve open.
+ *
+ * @param coin_contribution how much the coin should contribute
+ * @param reserve_sig signature over the reserve open operation
+ * @param coin_priv private key of the coin
+ * @param[out] coin_sig signature by the coin
+ */
+void
+TALER_wallet_reserve_open_deposit_sign (
+  const struct TALER_Amount *coin_contribution,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  struct TALER_CoinSpendSignatureP *coin_sig);
+
+
+/**
+ * Verify signature that deposits coin to pay for keeping a reserve open.
  *
+ * @param coin_contribution how much the coin should contribute
+ * @param reserve_sig signature over the reserve open operation
+ * @param coin_pub public key of the coin
+ * @param coin_sig signature by the coin
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_open_deposit_verify (
+  const struct TALER_Amount *coin_contribution,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig);
+
+
+/**
+ * Sign a request to close a reserve.
+ *
+ * @param request_timestamp when was the request created
+ * @param h_payto where to send the funds (NULL allowed to send
+ *        to origin of the reserve)
  * @param reserve_priv key identifying the reserve
  * @param[out] reserve_sig resulting signature
  */
 void
-TALER_wallet_account_close_sign (
+TALER_wallet_reserve_close_sign (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_PaytoHashP *h_payto,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   struct TALER_ReserveSignatureP *reserve_sig);
 
@@ -3006,12 +3294,17 @@ TALER_wallet_account_close_sign (
 /**
  * Verify wallet request to close an account.
  *
+ * @param request_timestamp when was the request created
+ * @param h_payto where to send the funds (NULL/all zeros
+ *        allowed to send to origin of the reserve)
  * @param reserve_pub account’s public key
  * @param reserve_sig the signature made with purpose #TALER_SIGNATURE_WALLET_RESERVE_CLOSE
  * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
-TALER_wallet_account_close_verify (
+TALER_wallet_reserve_close_verify (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_PaytoHashP *h_payto,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_ReserveSignatureP *reserve_sig);
 
@@ -3020,11 +3313,13 @@ TALER_wallet_account_close_verify (
  * Sign a request by a wallet to perform a KYC check.
  *
  * @param reserve_priv key identifying the wallet/account
+ * @param balance_threshold the balance threshold the wallet is about to cross
  * @param[out] reserve_sig resulting signature
  */
 void
 TALER_wallet_account_setup_sign (
   const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *balance_threshold,
   struct TALER_ReserveSignatureP *reserve_sig);
 
 
@@ -3032,12 +3327,49 @@ TALER_wallet_account_setup_sign (
  * Verify account setup request.
  *
  * @param reserve_pub reserve the setup request was for
+ * @param balance_threshold the balance threshold the wallet is about to cross
  * @param reserve_sig resulting signature
  * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_wallet_account_setup_verify (
   const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *balance_threshold,
+  const struct TALER_ReserveSignatureP *reserve_sig);
+
+
+/**
+ * Sign request to the exchange to confirm certain
+ * @a details about the owner of a reserve.
+ *
+ * @param request_timestamp when was the request created
+ * @param details which attributes are requested
+ * @param reserve_priv private key of the reserve
+ * @param[out] reserve_sig where to store the signature
+ */
+void
+TALER_wallet_reserve_attest_request_sign (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const json_t *details,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig);
+
+
+/**
+ * Verify request to the exchange to confirm certain
+ * @a details about the owner of a reserve.
+ *
+ * @param request_timestamp when was the request created
+ * @param details which attributes are requested
+ * @param reserve_pub public key of the reserve
+ * @param reserve_sig where to store the signature
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_attest_request_verify (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const json_t *details,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_ReserveSignatureP *reserve_sig);
 
 
@@ -3048,8 +3380,9 @@ TALER_wallet_account_setup_verify (
  * @param deposit_fee the deposit fee we expect to pay
  * @param h_wire hash of the merchant’s account details
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
+ * @param wallet_data_hash hash over wallet inputs into the contract (maybe NULL)
  * @param h_age_commitment hash over the age commitment, if applicable to the denomination (maybe NULL)
- * @param h_extensions hash over the extensions
+ * @param h_policy hash over the policy extension
  * @param h_denom_pub hash of the coin denomination's public key
  * @param coin_priv coin’s private key
  * @param wallet_timestamp timestamp when the contract was finalized, must not be too far in the future
@@ -3063,8 +3396,9 @@ TALER_wallet_deposit_sign (
   const struct TALER_Amount *deposit_fee,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct GNUNET_HashCode *wallet_data_hash,
   const struct TALER_AgeCommitmentHash *h_age_commitment,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_DenominationHashP *h_denom_pub,
   struct GNUNET_TIME_Timestamp wallet_timestamp,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -3080,8 +3414,9 @@ TALER_wallet_deposit_sign (
  * @param deposit_fee the deposit fee we expect to pay
  * @param h_wire hash of the merchant’s account details
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
+ * @param wallet_data_hash hash over wallet inputs into the contract (maybe NULL)
  * @param h_age_commitment hash over the age commitment (maybe all zeroes, if not applicable to the denomination)
- * @param h_extensions hash over the extensions
+ * @param h_policy hash over the policy extension
  * @param h_denom_pub hash of the coin denomination's public key
  * @param wallet_timestamp timestamp when the contract was finalized, must not be too far in the future
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
@@ -3096,8 +3431,9 @@ TALER_wallet_deposit_verify (
   const struct TALER_Amount *deposit_fee,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_AgeCommitmentHash *h_commitment_hash,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct GNUNET_HashCode *wallet_data_hash,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_DenominationHashP *h_denom_pub,
   struct GNUNET_TIME_Timestamp wallet_timestamp,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -3226,6 +3562,45 @@ TALER_wallet_withdraw_verify (
 
 
 /**
+ * Sign age-withdraw request.
+ *
+ * @param h_commitment hash over all n*kappa blinded coins in the commitment for the age-withdraw
+ * @param amount_with_fee amount to debit the reserve for
+ * @param mask the mask that defines the age groups
+ * @param max_age maximum age from which the age group is derived, that the withdrawn coins must be restricted to.
+ * @param reserve_priv private key to sign with
+ * @param[out] reserve_sig resulting signature
+ */
+void
+TALER_wallet_age_withdraw_sign (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_AgeMask *mask,
+  uint8_t max_age,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig);
+
+/**
+ * Verify an age-withdraw request.
+ *
+ * @param h_commitment hash all n*kappa blinded coins in the commitment for the age-withdraw
+ * @param amount_with_fee amount to debit the reserve for
+ * @param mask the mask that defines the age groups
+ * @param max_age maximum age from which the age group is derived, that the withdrawn coins must be restricted to.
+ * @param reserve_pub public key of the reserve
+ * @param reserve_sig resulting signature
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_wallet_age_withdraw_verify (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_AgeMask *mask,
+  uint8_t max_age,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig);
+
+/**
  * Verify exchange melt confirmation.
  *
  * @param rc refresh session this is about
@@ -3254,7 +3629,7 @@ TALER_exchange_melt_confirmation_verify (
 enum GNUNET_GenericReturnValue
 TALER_wallet_recoup_verify (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -3270,7 +3645,7 @@ TALER_wallet_recoup_verify (
 void
 TALER_wallet_recoup_sign (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -3287,7 +3662,7 @@ TALER_wallet_recoup_sign (
 enum GNUNET_GenericReturnValue
 TALER_wallet_recoup_refresh_verify (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -3303,7 +3678,7 @@ TALER_wallet_recoup_refresh_verify (
 void
 TALER_wallet_recoup_refresh_sign (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig);
 
@@ -3311,63 +3686,59 @@ TALER_wallet_recoup_refresh_sign (
 /**
  * Verify reserve history request signature.
  *
- * @param ts timestamp used
- * @param history_fee how much did the wallet say it would pay
+ * @param start_off start of the requested range
  * @param reserve_pub reserve the history request was for
  * @param reserve_sig resulting signature
  * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_wallet_reserve_history_verify (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_Amount *history_fee,
+  uint64_t start_off,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_ReserveSignatureP *reserve_sig);
 
 
 /**
- * Create reserve history request signature.
+ * Create reserve status request signature.
  *
- * @param ts timestamp used
- * @param history_fee how much do we expect to pay
- * @param reserve_pub reserve the history request is for
+ * @param start_off start of the requested range
+ * @param reserve_priv private key of the reserve the history request is for
  * @param[out] reserve_sig resulting signature
  */
 void
 TALER_wallet_reserve_history_sign (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_Amount *history_fee,
+  uint64_t start_off,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   struct TALER_ReserveSignatureP *reserve_sig);
 
 
 /**
- * Verify reserve status request signature.
+ * Verify coin history request signature.
  *
- * @param ts timestamp used
- * @param reserve_pub reserve the status request was for
- * @param reserve_sig resulting signature
+ * @param start_off start of the requested range
+ * @param coin_pub coin the history request was for
+ * @param coin_sig resulting signature
  * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
-TALER_wallet_reserve_status_verify (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_ReserveSignatureP *reserve_sig);
+TALER_wallet_coin_history_verify (
+  uint64_t start_off,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig);
 
 
 /**
- * Create reserve status request signature.
+ * Create coin status request signature.
  *
- * @param ts timestamp used
- * @param reserve_pub reserve the status request is for
- * @param[out] reserve_sig resulting signature
+ * @param start_off start of the requested range
+ * @param coin_priv private key of the coin the history request is for
+ * @param[out] coin_sig resulting signature
  */
 void
-TALER_wallet_reserve_status_sign (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_ReservePrivateKeyP *reserve_priv,
-  struct TALER_ReserveSignatureP *reserve_sig);
+TALER_wallet_coin_history_sign (
+  uint64_t start_off,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  struct TALER_CoinSpendSignatureP *coin_sig);
 
 
 /* ********************* merchant signing ************************** */
@@ -3422,7 +3793,6 @@ TALER_merchant_refund_verify (
  * @param h_contract_terms hash of contract terms
  * @param h_wire hash of the merchant account details
  * @param coin_pub coin to be deposited
- * @param merchant_pub merchant public key
  * @param merchant_priv private key to sign with
  * @param[out] merchant_sig where to write the signature
  */
@@ -3431,15 +3801,15 @@ TALER_merchant_deposit_sign (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   struct TALER_MerchantSignatureP *merchant_sig);
 
+
 /**
  * Verify a deposit.
  *
  * @param merchant merchant public key
- * @param public key of the deposited coin
+ * @param coin_pub public key of the deposited coin
  * @param h_contract_terms hash of contract terms
  * @param h_wire hash of the merchant account details
  * @param merchant_sig signature of the merchant
@@ -3503,27 +3873,30 @@ typedef enum TALER_ErrorCode
  * @param scb function to call to create the signature
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
  * @param h_wire hash of the merchant’s account details
- * @param h_extensions hash over the extensions, can be NULL
+ * @param h_policy hash over the policy extension, can be NULL
  * @param exchange_timestamp timestamp when the contract was finalized, must not be too far off
  * @param wire_deadline date until which the exchange should wire the funds
  * @param refund_deadline date until which the merchant can issue a refund to the customer via the exchange (can be zero if refunds are not allowed); must not be after the @a wire_deadline
- * @param amount_without_fee the amount to be deposited after fees
- * @param coin_pub public key of the deposited coin
+ * @param total_without_fee the total amount to be deposited after fees over all coins
+ * @param num_coins length of @a coin_sigs array
+ * @param coin_sigs signatures of the deposited coins
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_deposit_confirmation_sign (
   TALER_ExchangeSignCallback scb,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendSignatureP *coin_sigs[static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig);
@@ -3534,26 +3907,29 @@ TALER_exchange_online_deposit_confirmation_sign (
  *
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
  * @param h_wire hash of the merchant’s account details
- * @param h_extensions hash over the extensions, can be NULL
+ * @param h_policy hash over the policy extension, can be NULL
  * @param exchange_timestamp timestamp when the contract was finalized, must not be too far off
  * @param wire_deadline date until which the exchange should wire the funds
  * @param refund_deadline date until which the merchant can issue a refund to the customer via the exchange (can be zero if refunds are not allowed); must not be after the @a wire_deadline
- * @param amount_without_fee the amount to be deposited after fees
- * @param coin_pub public key of the deposited coin
+ * @param total_without_fee the total amount to be deposited after fees over all coins
+ * @param num_coins length of @a coin_sigs array
+ * @param coin_sigs signatures of the deposited coins
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_deposit_confirmation_verify (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendSignatureP *coin_sigs[static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_ExchangePublicKeyP *pub,
   const struct TALER_ExchangeSignatureP *sig);
@@ -3563,9 +3939,14 @@ TALER_exchange_online_deposit_confirmation_verify (
  * Create refund confirmation signature.
  *
  * @param scb function to call to create the signature
- * @param XXX wire transfer subject used
- * @param[out] pub where to write the public key
- * @param[out] sig where to write the signature
+ * @param h_contract_terms hash of contract being refunded
+ * @param coin_pub public key of the coin receiving the refund
+ * @param merchant public key of the merchant that granted the refund
+ * @param rtransaction_id refund transaction ID used by the merchant
+ * @param refund_amount amount refunded
+ * @param[out] pub where to write the exchange public key
+ * @param[out] sig where to write the exchange signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_refund_confirmation_sign (
@@ -3582,8 +3963,14 @@ TALER_exchange_online_refund_confirmation_sign (
 /**
  * Verify refund confirmation signature.
  *
+ * @param h_contract_terms hash of contract being refunded
+ * @param coin_pub public key of the coin receiving the refund
+ * @param merchant public key of the merchant that granted the refund
+ * @param rtransaction_id refund transaction ID used by the merchant
+ * @param refund_amount amount refunded
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_refund_confirmation_verify (
@@ -3600,9 +3987,11 @@ TALER_exchange_online_refund_confirmation_verify (
  * Create refresh melt confirmation signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
- * @param[out] pub where to write the public key
- * @param[out] sig where to write the signature
+ * @param rc refresh commitment that identifies the melt operation
+ * @param noreveal_index gamma cut-and-choose value chosen by the exchange
+ * @param[out] pub where to write the exchange public key
+ * @param[out] sig where to write the exchange signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_melt_confirmation_sign (
@@ -3616,8 +4005,11 @@ TALER_exchange_online_melt_confirmation_sign (
 /**
  * Verify refresh melt confirmation signature.
  *
+ * @param rc refresh commitment that identifies the melt operation
+ * @param noreveal_index gamma cut-and-choose value chosen by the exchange
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_melt_confirmation_verify (
@@ -3628,13 +4020,60 @@ TALER_exchange_online_melt_confirmation_verify (
 
 
 /**
+ * Create exchange purse refund confirmation signature.
+ *
+ * @param scb function to call to create the signature
+ * @param amount_without_fee refunded amount
+ * @param refund_fee refund fee charged
+ * @param coin_pub coin that was refunded
+ * @param purse_pub public key of the expired purse
+ * @param[out] pub where to write the public key
+ * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
+ */
+enum TALER_ErrorCode
+TALER_exchange_online_purse_refund_sign (
+  TALER_ExchangeSignCallback scb,
+  const struct TALER_Amount *amount_without_fee,
+  const struct TALER_Amount *refund_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig);
+
+
+/**
+ * Verify signature of exchange affirming purse refund
+ * from purse expiration.
+ *
+ * @param amount_without_fee refunded amount
+ * @param refund_fee refund fee charged
+ * @param coin_pub coin that was refunded
+ * @param purse_pub public key of the expired purse
+ * @param pub public key to verify signature against
+ * @param sig signature to verify
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_purse_refund_verify (
+  const struct TALER_Amount *amount_without_fee,
+  const struct TALER_Amount *refund_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_ExchangePublicKeyP *pub,
+  const struct TALER_ExchangeSignatureP *sig);
+
+
+/**
  * Create exchange key set signature.
  *
  * @param scb function to call to create the signature
+ * @param cls closure for @a scb
  * @param timestamp time when the key set was issued
  * @param hc hash over all the keys
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_key_set_sign (
@@ -3651,8 +4090,9 @@ TALER_exchange_online_key_set_sign (
  *
  * @param timestamp time when the key set was issued
  * @param hc hash over all the keys
- * @param pub where to write the public key
- * @param sig where to write the signature
+ * @param pub public key to verify signature against
+ * @param sig signature to verify
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_key_set_verify (
@@ -3663,39 +4103,70 @@ TALER_exchange_online_key_set_verify (
 
 
 /**
- * Create account setup success signature.
+ * Create account KYC setup success signature.
  *
  * @param scb function to call to create the signature
  * @param h_payto target of the KYC account
+ * @param kyc JSON data describing which KYC checks
+ *            were satisfied
  * @param timestamp time when the KYC was confirmed
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_account_setup_success_sign (
   TALER_ExchangeSignCallback scb,
   const struct TALER_PaytoHashP *h_payto,
+  const json_t *kyc,
   struct GNUNET_TIME_Timestamp timestamp,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig);
 
 
 /**
- * Verify account setup success signature.
+ * Verify account KYC setup success signature.
  *
  * @param h_payto target of the KYC account
+ * @param kyc JSON data describing which KYC checks
+ *            were satisfied
  * @param timestamp time when the KYC was confirmed
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_account_setup_success_verify (
   const struct TALER_PaytoHashP *h_payto,
+  const json_t *kyc,
   struct GNUNET_TIME_Timestamp timestamp,
   const struct TALER_ExchangePublicKeyP *pub,
   const struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Hash normalized @a j JSON object or array and
+ * store the result in @a hc.
+ *
+ * @param j JSON to hash
+ * @param[out] hc where to write the hash
+ */
+void
+TALER_json_hash (const json_t *j,
+                 struct GNUNET_HashCode *hc);
+
+
+/**
+ * Update the @a hash_context in the computation of the
+ * h_details for a wire status signature.
+ *
+ * @param[in,out] hash_context context to update
+ * @param h_contract_terms hash of the contract
+ * @param execution_time when was the wire transfer initiated
+ * @param coin_pub deposited coin
+ * @param deposit_value contribution of the coin
+ * @param deposit_fee how high was the deposit fee
+ */
 void
 TALER_exchange_online_wire_deposit_append (
   struct GNUNET_HashContext *hash_context,
@@ -3710,9 +4181,14 @@ TALER_exchange_online_wire_deposit_append (
  * Create wire deposit signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param total amount the merchant was credited
+ * @param wire_fee fee charged by the exchange for the wire transfer
+ * @param merchant_pub which merchant was credited
+ * @param payto payto://-URI of the merchant account
+ * @param h_details hash over the aggregation details
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_wire_deposit_sign (
@@ -3729,8 +4205,14 @@ TALER_exchange_online_wire_deposit_sign (
 /**
  * Verify wire deposit signature.
  *
+ * @param total amount the merchant was credited
+ * @param wire_fee fee charged by the exchange for the wire transfer
+ * @param merchant_pub which merchant was credited
+ * @param h_payto hash of the payto://-URI of the merchant account
+ * @param h_details hash over the aggregation details
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_wire_deposit_verify (
@@ -3747,9 +4229,15 @@ TALER_exchange_online_wire_deposit_verify (
  * Create wire confirmation signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param h_wire hash of the merchant's account
+ * @param h_contract_terms hash of the contract
+ * @param wtid wire transfer this deposit was aggregated into
+ * @param coin_pub public key of the deposited coin
+ * @param execution_time when was wire transfer initiated
+ * @param coin_contribution what was @a coin_pub's contribution to the wire transfer
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_confirm_wire_sign (
@@ -3767,8 +4255,15 @@ TALER_exchange_online_confirm_wire_sign (
 /**
  * Verify confirm wire signature.
  *
+ * @param h_wire hash of the merchant's account
+ * @param h_contract_terms hash of the contract
+ * @param wtid wire transfer this deposit was aggregated into
+ * @param coin_pub public key of the deposited coin
+ * @param execution_time when was wire transfer initiated
+ * @param coin_contribution what was @a coin_pub's contribution to the wire transfer
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_confirm_wire_verify (
@@ -3786,9 +4281,13 @@ TALER_exchange_online_confirm_wire_verify (
  * Create confirm recoup signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param timestamp when was the recoup done
+ * @param recoup_amount how much was recouped
+ * @param coin_pub coin that was recouped
+ * @param reserve_pub reserve that was credited
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_confirm_recoup_sign (
@@ -3804,8 +4303,13 @@ TALER_exchange_online_confirm_recoup_sign (
 /**
  * Verify confirm recoup signature.
  *
+ * @param timestamp when was the recoup done
+ * @param recoup_amount how much was recouped
+ * @param coin_pub coin that was recouped
+ * @param reserve_pub reserve that was credited
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_confirm_recoup_verify (
@@ -3821,9 +4325,13 @@ TALER_exchange_online_confirm_recoup_verify (
  * Create confirm recoup refresh signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param timestamp when was the recoup done
+ * @param recoup_amount how much was recouped
+ * @param coin_pub coin that was recouped
+ * @param old_coin_pub old coin that was credited
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_confirm_recoup_refresh_sign (
@@ -3839,8 +4347,13 @@ TALER_exchange_online_confirm_recoup_refresh_sign (
 /**
  * Verify confirm recoup refresh signature.
  *
+ * @param timestamp when was the recoup done
+ * @param recoup_amount how much was recouped
+ * @param coin_pub coin that was recouped
+ * @param old_coin_pub old coin that was credited
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_confirm_recoup_refresh_verify (
@@ -3856,9 +4369,11 @@ TALER_exchange_online_confirm_recoup_refresh_verify (
  * Create denomination unknown signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param timestamp when was the error created
+ * @param h_denom_pub hash of denomination that is unknown
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_denomination_unknown_sign (
@@ -3872,8 +4387,11 @@ TALER_exchange_online_denomination_unknown_sign (
 /**
  * Verify denomination unknown signature.
  *
+ * @param timestamp when was the error created
+ * @param h_denom_pub hash of denomination that is unknown
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_denomination_unknown_verify (
@@ -3887,9 +4405,13 @@ TALER_exchange_online_denomination_unknown_verify (
  * Create denomination expired signature.
  *
  * @param scb function to call to create the signature
- * @param XXX
+ * @param timestamp when was the error created
+ * @param h_denom_pub hash of denomination that is expired
+ * @param op character string describing the operation for which
+ *           the denomination is expired
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_denomination_expired_sign (
@@ -3904,8 +4426,13 @@ TALER_exchange_online_denomination_expired_sign (
 /**
  * Verify denomination expired signature.
  *
+ * @param timestamp when was the error created
+ * @param h_denom_pub hash of denomination that is expired
+ * @param op character string describing the operation for which
+ *           the denomination is expired
  * @param pub where to write the public key
  * @param sig where to write the signature
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_denomination_expired_verify (
@@ -3928,6 +4455,7 @@ TALER_exchange_online_denomination_expired_verify (
  * @param reserve_pub public key of the closed reserve
  * @param[out] pub where to write the public key
  * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
  */
 enum TALER_ErrorCode
 TALER_exchange_online_reserve_closed_sign (
@@ -3951,8 +4479,9 @@ TALER_exchange_online_reserve_closed_sign (
  * @param payto target of the wire transfer
  * @param wtid wire transfer subject used
  * @param reserve_pub public key of the closed reserve
- * @param pub where to write the public key
- * @param sig where to write the signature
+ * @param pub the public key of the exchange to check against
+ * @param sig the signature to check
+ * @return #GNUNET_OK if the signature is valid
  */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_reserve_closed_verify (
@@ -3966,6 +4495,66 @@ TALER_exchange_online_reserve_closed_verify (
   const struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Create signature by exchange affirming that a reserve
+ * has had certain attributes verified via KYC.
+ *
+ * @param scb function to call to create the signature
+ * @param attest_timestamp our time
+ * @param expiration_time when does the KYC data expire
+ * @param reserve_pub for which reserve are attributes attested
+ * @param attributes JSON object with attributes being attested to
+ * @param[out] pub where to write the public key
+ * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
+ */
+enum TALER_ErrorCode
+TALER_exchange_online_reserve_attest_details_sign (
+  TALER_ExchangeSignCallback scb,
+  struct GNUNET_TIME_Timestamp attest_timestamp,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const json_t *attributes,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig);
+
+
+/**
+ * Verify signature by exchange affirming that a reserve
+ * has had certain attributes verified via KYC.
+ *
+ * @param attest_timestamp our time
+ * @param expiration_time when does the KYC data expire
+ * @param reserve_pub for which reserve are attributes attested
+ * @param attributes JSON object with attributes being attested to
+ * @param pub exchange public key
+ * @param sig exchange signature to verify
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_reserve_attest_details_verify (
+  struct GNUNET_TIME_Timestamp attest_timestamp,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const json_t *attributes,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig);
+
+
+/**
+ * Create signature by exchange affirming that a purse was created.
+ *
+ * @param scb function to call to create the signature
+ * @param exchange_time our time
+ * @param purse_expiration when will the purse expire
+ * @param amount_without_fee total amount to be put into the purse (without deposit fees)
+ * @param total_deposited total currently in the purse
+ * @param purse_pub public key of the purse
+ * @param h_contract_terms hash of the contract for the purse
+ * @param[out] pub where to write the public key
+ * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
+ */
 enum TALER_ErrorCode
 TALER_exchange_online_purse_created_sign (
   TALER_ExchangeSignCallback scb,
@@ -3974,12 +4563,24 @@ TALER_exchange_online_purse_created_sign (
   const struct TALER_Amount *amount_without_fee,
   const struct TALER_Amount *total_deposited,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Verify exchange signature about a purse creation and balance.
+ *
+ * @param exchange_time our time
+ * @param purse_expiration when will the purse expire
+ * @param amount_without_fee total amount to be put into the purse (without deposit fees)
+ * @param total_deposited total currently in the purse
+ * @param purse_pub public key of the purse
+ * @param h_contract_terms hash of the contract for the purse
+ * @param pub the public key of the exchange to check against
+ * @param sig the signature to check
+ * @return #GNUNET_OK if the signature is valid
+ */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_purse_created_verify (
   struct GNUNET_TIME_Timestamp exchange_time,
@@ -3987,12 +4588,26 @@ TALER_exchange_online_purse_created_verify (
   const struct TALER_Amount *amount_without_fee,
   const struct TALER_Amount *total_deposited,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_ExchangePublicKeyP *pub,
   const struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Sign affirmation that a purse was merged.
+ *
+ * @param scb function to call to create the signature
+ * @param exchange_time our time
+ * @param purse_expiration when does the purse expire
+ * @param amount_without_fee total amount that should be in the purse without deposit fees
+ * @param purse_pub public key of the purse
+ * @param h_contract_terms hash of the contract of the purse
+ * @param reserve_pub reserve the purse will be merged into
+ * @param exchange_url exchange at which the @a reserve_pub lives
+ * @param[out] pub where to write the public key
+ * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
+ */
 enum TALER_ErrorCode
 TALER_exchange_online_purse_merged_sign (
   TALER_ExchangeSignCallback scb,
@@ -4007,6 +4622,20 @@ TALER_exchange_online_purse_merged_sign (
   struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Verify affirmation that a purse will be merged.
+ *
+ * @param exchange_time our time
+ * @param purse_expiration when does the purse expire
+ * @param amount_without_fee total amount that should be in the purse without deposit fees
+ * @param purse_pub public key of the purse
+ * @param h_contract_terms hash of the contract of the purse
+ * @param reserve_pub reserve the purse will be merged into
+ * @param exchange_url exchange at which the @a reserve_pub lives
+ * @param pub the public key of the exchange to check against
+ * @param sig the signature to check
+ * @return #GNUNET_OK if the signature is valid
+ */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_purse_merged_verify (
   struct GNUNET_TIME_Timestamp exchange_time,
@@ -4020,6 +4649,17 @@ TALER_exchange_online_purse_merged_verify (
   const struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Sign information about the status of a purse.
+ *
+ * @param scb function to call to create the signature
+ * @param merge_timestamp when was the purse merged (can be never)
+ * @param deposit_timestamp when was the purse fully paid up (can be never)
+ * @param balance current balance of the purse
+ * @param[out] pub where to write the public key
+ * @param[out] sig where to write the signature
+ * @return #TALER_EC_NONE on success
+ */
 enum TALER_ErrorCode
 TALER_exchange_online_purse_status_sign (
   TALER_ExchangeSignCallback scb,
@@ -4030,6 +4670,16 @@ TALER_exchange_online_purse_status_sign (
   struct TALER_ExchangeSignatureP *sig);
 
 
+/**
+ * Verify signature over information about the status of a purse.
+ *
+ * @param merge_timestamp when was the purse merged (can be never)
+ * @param deposit_timestamp when was the purse fully paid up (can be never)
+ * @param balance current balance of the purse
+ * @param exchange_pub the public key of the exchange to check against
+ * @param exchange_sig the signature to check
+ * @return #GNUNET_OK if the signature is valid
+ */
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_purse_status_verify (
   struct GNUNET_TIME_Timestamp merge_timestamp,
@@ -4039,10 +4689,90 @@ TALER_exchange_online_purse_status_verify (
   const struct TALER_ExchangeSignatureP *exchange_sig);
 
 
+/**
+ * Create age-withdraw confirmation signature.
+ *
+ * @param scb function to call to create the signature
+ * @param h_commitment age-withdraw commitment that identifies the n*kappa blinded coins
+ * @param noreveal_index gamma cut-and-choose value chosen by the exchange
+ * @param[out] pub where to write the exchange public key
+ * @param[out] sig where to write the exchange signature
+ * @return #TALER_EC_NONE on success
+ */
+enum TALER_ErrorCode
+TALER_exchange_online_age_withdraw_confirmation_sign (
+  TALER_ExchangeSignCallback scb,
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  uint32_t noreveal_index,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig);
+
+
+/**
+ * Verify an exchange age-withdraw confirmation
+ *
+ * @param h_commitment Commitment over all n*kappa coin candidates from the original request to age-withdraw
+ * @param noreveal_index The index returned by the exchange
+ * @param exchange_pub The public key used for signing
+ * @param exchange_sig The signature from the exchange
+ */
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_age_withdraw_confirmation_verify (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  uint32_t noreveal_index,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_ExchangeSignatureP *exchange_sig);
+
+
 /* ********************* offline signing ************************** */
 
 
 /**
+ * Create AML officer status change signature.
+ *
+ * @param officer_pub public key of the AML officer
+ * @param officer_name name of the officer
+ * @param change_date when to affect the status change
+ * @param is_active true to enable the officer
+ * @param read_only true to only allow read-only access
+ * @param master_priv private key to sign with
+ * @param[out] master_sig where to write the signature
+ */
+void
+TALER_exchange_offline_aml_officer_status_sign (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterPrivateKeyP *master_priv,
+  struct TALER_MasterSignatureP *master_sig);
+
+
+/**
+ * Verify AML officer status change signature.
+ *
+ * @param officer_pub public key of the AML officer
+ * @param officer_name name of the officer
+ * @param change_date when to affect the status change
+ * @param is_active true to enable the officer
+ * @param read_only true to only allow read-only access
+ * @param master_pub public key to verify against
+ * @param master_sig the signature the signature
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_exchange_offline_aml_officer_status_verify (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const struct TALER_MasterSignatureP *master_sig);
+
+
+/**
  * Create auditor addition signature.
  *
  * @param auditor_pub public key of the auditor
@@ -4264,7 +4994,18 @@ TALER_exchange_offline_denom_validity_verify (
   const struct TALER_MasterSignatureP *master_sig);
 
 
-// FIXME: document
+/**
+ * Create offline signature about an exchange's partners.
+ *
+ * @param partner_pub master public key of the partner
+ * @param start_date validity period start
+ * @param end_date validity period end
+ * @param wad_frequency how often will we do wad transfers to this partner
+ * @param wad_fee what is the wad fee to this partner
+ * @param partner_base_url what is the base URL of the @a partner_pub exchange
+ * @param master_priv private key to sign with
+ * @param[out] master_sig where to write the signature
+ */
 void
 TALER_exchange_offline_partner_details_sign (
   const struct TALER_MasterPublicKeyP *partner_pub,
@@ -4277,7 +5018,19 @@ TALER_exchange_offline_partner_details_sign (
   struct TALER_MasterSignatureP *master_sig);
 
 
-// FIXME: document
+/**
+ * Verify signature about an exchange's partners.
+ *
+ * @param partner_pub master public key of the partner
+ * @param start_date validity period start
+ * @param end_date validity period end
+ * @param wad_frequency how often will we do wad transfers to this partner
+ * @param wad_fee what is the wad fee to this partner
+ * @param partner_base_url what is the base URL of the @a partner_pub exchange
+ * @param master_pub public key to verify against
+ * @param master_sig the signature the signature
+ * @return #GNUNET_OK if the signature is valid
+ */
 enum GNUNET_GenericReturnValue
 TALER_exchange_offline_partner_details_verify (
   const struct TALER_MasterPublicKeyP *partner_pub,
@@ -4291,6 +5044,55 @@ TALER_exchange_offline_partner_details_verify (
 
 
 /**
+ * Create offline signature about wiring profits to a
+ * regular non-escrowed account of the exchange.
+ *
+ * @param wtid (random) wire transfer ID to be used
+ * @param date when was the profit drain approved (not exact time of execution)
+ * @param amount how much should be wired
+ * @param account_section configuration section of the
+ *        exchange specifying the account to be debited
+ * @param payto_uri target account to be credited
+ * @param master_priv private key to sign with
+ * @param[out] master_sig where to write the signature
+ */
+void
+TALER_exchange_offline_profit_drain_sign (
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_Amount *amount,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterPrivateKeyP *master_priv,
+  struct TALER_MasterSignatureP *master_sig);
+
+
+/**
+ * Verify offline signature about wiring profits to a
+ * regular non-escrowed account of the exchange.
+ *
+ * @param wtid (random) wire transfer ID to be used
+ * @param date when was the profit drain approved (not exact time of execution)
+ * @param amount how much should be wired
+ * @param account_section configuration section of the
+ *        exchange specifying the account to be debited
+ * @param payto_uri target account to be credited
+ * @param master_pub public key to verify signature against
+ * @param master_sig the signature
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_exchange_offline_profit_drain_verify (
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_Amount *amount,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const struct TALER_MasterSignatureP *master_sig);
+
+
+/**
  * Create security module EdDSA signature.
  *
  * @param exchange_pub public signing key to validate
@@ -4521,7 +5323,6 @@ TALER_exchange_offline_wire_fee_verify (
  * @param end_time when do the fees start to apply
  * @param fees the global fees
  * @param purse_timeout how long do unmerged purses stay around
- * @param kyc_timeout how long do we keep funds in a reserve without KYC?
  * @param history_expiration how long do we keep the history of an account
  * @param purse_account_limit how many concurrent purses are free per account holder
  * @param master_priv private key to sign with
@@ -4533,7 +5334,6 @@ TALER_exchange_offline_global_fee_sign (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPrivateKeyP *master_priv,
@@ -4547,7 +5347,6 @@ TALER_exchange_offline_global_fee_sign (
  * @param end_time when do the fees start to apply
  * @param fees the global fees
  * @param purse_timeout how long do unmerged purses stay around
- * @param kyc_timeout how long do we keep funds in a reserve without KYC?
  * @param history_expiration how long do we keep the history of an account
  * @param purse_account_limit how many concurrent purses are free per account holder
  * @param master_pub public key to verify against
@@ -4560,7 +5359,6 @@ TALER_exchange_offline_global_fee_verify (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPublicKeyP *master_pub,
@@ -4571,6 +5369,9 @@ TALER_exchange_offline_global_fee_verify (
  * Create wire account addition signature.
  *
  * @param payto_uri bank account
+ * @param conversion_url URL of the conversion service, or NULL if none
+ * @param debit_restrictions JSON encoding of debit restrictions on the account; see AccountRestriction in the spec
+ * @param credit_restrictions JSON encoding of credit restrictions on the account; see AccountRestriction in the spec
  * @param now timestamp to use for the signature (rounded)
  * @param master_priv private key to sign with
  * @param[out] master_sig where to write the signature
@@ -4578,6 +5379,9 @@ TALER_exchange_offline_global_fee_verify (
 void
 TALER_exchange_offline_wire_add_sign (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp now,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig);
@@ -4587,6 +5391,9 @@ TALER_exchange_offline_wire_add_sign (
  * Verify wire account addition signature.
  *
  * @param payto_uri bank account
+ * @param conversion_url URL of the conversion service, or NULL if none
+ * @param debit_restrictions JSON encoding of debit restrictions on the account; see AccountRestriction in the spec
+ * @param credit_restrictions JSON encoding of credit restrictions on the account; see AccountRestriction in the spec
  * @param sign_time timestamp when signature was created
  * @param master_pub public key to verify against
  * @param master_sig the signature the signature
@@ -4595,6 +5402,9 @@ TALER_exchange_offline_wire_add_sign (
 enum GNUNET_GenericReturnValue
 TALER_exchange_offline_wire_add_verify (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp sign_time,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig);
@@ -4637,6 +5447,9 @@ TALER_exchange_offline_wire_del_verify (
  * Check the signature in @a master_sig.
  *
  * @param payto_uri URI that is signed
+ * @param conversion_url URL of the conversion service, or NULL if none
+ * @param debit_restrictions JSON encoding of debit restrictions on the account; see AccountRestriction in the spec
+ * @param credit_restrictions JSON encoding of credit restrictions on the account; see AccountRestriction in the spec
  * @param master_pub master public key of the exchange
  * @param master_sig signature of the exchange
  * @return #GNUNET_OK if signature is valid
@@ -4644,6 +5457,9 @@ TALER_exchange_offline_wire_del_verify (
 enum GNUNET_GenericReturnValue
 TALER_exchange_wire_signature_check (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig);
 
@@ -4652,12 +5468,18 @@ TALER_exchange_wire_signature_check (
  * Create a signed wire statement for the given account.
  *
  * @param payto_uri account specification
+ * @param conversion_url URL of the conversion service, or NULL if none
+ * @param debit_restrictions JSON encoding of debit restrictions on the account; see AccountRestriction in the spec
+ * @param credit_restrictions JSON encoding of credit restrictions on the account; see AccountRestriction in the spec
  * @param master_priv private key to sign with
  * @param[out] master_sig where to write the signature
  */
 void
 TALER_exchange_wire_signature_make (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig);
 
@@ -4721,7 +5543,8 @@ void
 TALER_merchant_pay_sign (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantPrivateKeyP *merch_priv,
-  struct GNUNET_CRYPTO_EddsaSignature *merch_sig);
+  struct TALER_MerchantSignatureP *merch_sig);
+
 
 /**
  * Verify payment confirmation signature.
@@ -4755,36 +5578,37 @@ TALER_merchant_contract_sign (
 /* **************** /management/extensions offline signing **************** */
 
 /**
- * Create a signature for the hash of the configuration of an extension
+ * Create a signature for the hash of the manifests of extensions
  *
- * @param h_config hash of the JSON object representing the configuration
+ * @param h_manifests hash of the JSON object representing the manifests
  * @param master_priv private key to sign with
  * @param[out] master_sig where to write the signature
  */
 void
-TALER_exchange_offline_extension_config_hash_sign (
-  const struct TALER_ExtensionConfigHashP *h_config,
+TALER_exchange_offline_extension_manifests_hash_sign (
+  const struct TALER_ExtensionManifestsHashP *h_manifests,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig);
 
 
 /**
  * Verify the signature in @a master_sig of the given hash, taken over the JSON
- * blob representing the configuration of an extension
+ * blob representing the manifests of extensions
  *
- * @param h_config hash of the JSON blob of a configuration of an extension
+ * @param h_manifest hash of the JSON blob of manifests of extensions
  * @param master_pub master public key of the exchange
  * @param master_sig signature of the exchange
  * @return #GNUNET_OK if signature is valid
  */
 enum GNUNET_GenericReturnValue
-TALER_exchange_offline_extension_config_hash_verify (
-  const struct TALER_ExtensionConfigHashP *h_config,
+TALER_exchange_offline_extension_manifests_hash_verify (
+  const struct TALER_ExtensionManifestsHashP *h_manifest,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig
   );
 
-/*
+
+/**
  * @brief Representation of an age commitment:  one public key per age group.
  *
  * The number of keys must be be the same as the number of bits set in the
@@ -4793,30 +5617,45 @@ TALER_exchange_offline_extension_config_hash_verify (
 struct TALER_AgeCommitment
 {
 
-  /* The age mask defines the age groups that were a parameter during the
-   * generation of this age commitment */
+  /**
+   * The age mask defines the age groups that were a parameter during the
+   * generation of this age commitment
+   */
   struct TALER_AgeMask mask;
 
-  /* The number of public keys, which must be the same as the number of
+  /**
+   * The number of public keys, which must be the same as the number of
    * groups in the mask.
    */
   size_t num;
 
-  /* The list of #num_pub public keys.  In must have same size as the number of
+  /**
+   * The list of @e num public keys.  In must have same size as the number of
    * age groups defined in the mask.
    *
    * A hash of this list is the hashed commitment that goes into FDC
    * calculation during the withdraw and refresh operations for new coins. That
    * way, the particular age commitment becomes mandatory and bound to a coin.
    *
-   * The list has been allocated via GNUNET_malloc.
+   * The list has been allocated via GNUNET_malloc().
    */
   struct TALER_AgeCommitmentPublicKeyP *keys;
 };
 
+
+/**
+ * @brief Proof for a particular age commitment, used in age attestation
+ *
+ * This struct is used in a call to TALER_age_commitment_attest to create an
+ * attestation for a minimum age (if that minimum age is less or equal to the
+ * committed age for this proof).  It consists of a list private keys, one per
+ * age group, for which the committed age is either lager or within that
+ * particular group.
+ */
 struct TALER_AgeProof
 {
-  /* The number of private keys, which must be at most num_pub_keys.  One minus
+  /**
+   * The number of private keys, which must be at most num_pub_keys.  One minus
    * this number corresponds to the largest age group that is supported with
    * this age commitment.
    * **Note**, that this and the next field are only relevant on the wallet
@@ -4824,7 +5663,8 @@ struct TALER_AgeProof
    */
   size_t num;
 
-  /* List of #num_priv private keys.
+  /**
+   * List of @e num private keys.
    *
    * Note that the list can be _smaller_ than the corresponding list of public
    * keys. In that case, the wallet can sign off only for a subset of the age
@@ -4835,9 +5675,33 @@ struct TALER_AgeProof
   struct TALER_AgeCommitmentPrivateKeyP *keys;
 };
 
+
+/**
+ * @brief Commitment and Proof for a maximum age
+ *
+ * Calling TALER_age_restriction_commit on an (maximum) age value returns this
+ * data structure.  It consists of the proof, which is used to create
+ * attestations for compatible minimum ages, and the commitment, which is used
+ * to verify the attestations and derived commitments.
+ *
+ * The hash value of the commitment is bound to a particular coin with age
+ * restriction.
+ */
 struct TALER_AgeCommitmentProof
 {
+  /**
+   * The commitment is used to verify a particular attestation.  Its hash value
+   * is bound to a particular coin with age restriction.  This structure is
+   * sent to the merchant in order to verify a particular attestation for a
+   * minimum age.
+   * In itself, it does not convey any information about the maximum age that
+   * went into the call to TALER_age_restriction_commit.
+   */
   struct TALER_AgeCommitment commitment;
+
+  /**
+   * The proof is used to create an attestation for a (compatible) minimum age.
+   */
   struct TALER_AgeProof proof;
 };
 
@@ -4859,14 +5723,13 @@ TALER_age_commitment_hash (
  *
  * @param mask The age mask the defines the age groups
  * @param age The actual age for which an age commitment is generated
- * @param seed The seed that goes into the key generation.  MUST be choosen uniformly random.
- * @param comm_proof[out] The generated age commitment, ->priv and ->pub allocated via GNUNET_malloc on success
- * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
+ * @param seed The seed that goes into the key generation.  MUST be chosen uniformly random.
+ * @param[out] comm_proof The generated age commitment, ->priv and ->pub allocated via GNUNET_malloc() on success
  */
-enum GNUNET_GenericReturnValue
+void
 TALER_age_restriction_commit (
   const struct TALER_AgeMask *mask,
-  const uint8_t age,
+  uint8_t age,
   const struct GNUNET_HashCode *seed,
   struct TALER_AgeCommitmentProof *comm_proof);
 
@@ -4876,7 +5739,7 @@ TALER_age_restriction_commit (
  *
  * @param orig Original age commitment
  * @param salt Salt to randomly move the points on the elliptic curve in order to generate another, equivalent commitment.
- * @param[out] derived The resulting age commitment, ->priv and ->pub allocated via GNUNET_malloc on success.
+ * @param[out] derived The resulting age commitment, ->priv and ->pub allocated via GNUNET_malloc() on success.
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
@@ -4891,7 +5754,7 @@ TALER_age_commitment_derive (
  *
  * @param comm_proof The age commitment to be used for attestation.  For successful attestation, it must contain the private key for the corresponding age group.
  * @param age Age (not age group) for which the an attestation should be done
- * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
+ * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
  * @return #GNUNET_OK on success, #GNUNET_NO when no attestation can be made for that age with the given commitment, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
@@ -4900,13 +5763,14 @@ TALER_age_commitment_attest (
   uint8_t age,
   struct TALER_AgeAttestation *attest);
 
-/*
+
+/**
  * @brief Verify the attestation for an given age and age commitment
  *
- * @param commitent The age commitment that went into the attestation.  Only the public keys are needed.
+ * @param commitment The age commitment that went into the attestation.  Only the public keys are needed.
  * @param age Age (not age group) for which the an attestation should be done
- * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
- * @return GNUNET_OK when the attestation was successfull, GNUNET_NO no attestation couldn't be verified, GNUNET_SYSERR otherwise
+ * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
+ * @return #GNUNET_OK when the attestation was successful, #GNUNET_NO no attestation couldn't be verified, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
 TALER_age_commitment_verify (
@@ -4914,31 +5778,193 @@ TALER_age_commitment_verify (
   uint8_t age,
   const struct TALER_AgeAttestation *attest);
 
-/*
+
+/**
  * @brief helper function to free memory of a struct TALER_AgeCommitment
  *
- * @param p the commitment from which all memory should be freed.
+ * @param ac the commitment from which all memory should be freed.
  */
 void
 TALER_age_commitment_free (
-  struct TALER_AgeCommitment *p);
+  struct TALER_AgeCommitment *ac);
 
-/*
+
+/**
  * @brief helper function to free memory of a struct TALER_AgeProof
  *
- * @param p the proof of commitment from which all memory should be freed.
+ * @param ap the proof of commitment from which all memory should be freed.
  */
 void
 TALER_age_proof_free (
-  struct TALER_AgeProof *p);
+  struct TALER_AgeProof *ap);
 
-/*
+
+/**
  * @brief helper function to free memory of a struct TALER_AgeCommitmentProof
  *
- * @param p the commitment and its proof from which all memory should be freed.
+ * @param acp the commitment and its proof from which all memory should be freed.
  */
 void
 TALER_age_commitment_proof_free (
-  struct TALER_AgeCommitmentProof *p);
+  struct TALER_AgeCommitmentProof *acp);
+
+
+/**
+ * @brief helper function to allocate and copy a struct TALER_AgeCommitmentProof
+ *
+ * @param[in] acp The original age commitment proof
+ * @return The deep copy of @e acp, allocated
+ */
+struct TALER_AgeCommitmentProof *
+TALER_age_commitment_proof_duplicate (
+  const struct TALER_AgeCommitmentProof *acp);
+
+/**
+ * @brief helper function to copy a struct TALER_AgeCommitmentProof
+ *
+ * @param[in] acp The original age commitment proof
+ * @param[out] nacp The struct to copy the data into, with freshly allocated and copied keys.
+ */
+void
+TALER_age_commitment_proof_deep_copy (
+  const struct TALER_AgeCommitmentProof *acp,
+  struct TALER_AgeCommitmentProof *nacp);
+
+/**
+ * @brief For age-withdraw, clients have to prove that the public keys for all
+ * age groups larger than the allowed maximum age group are derived by scalar
+ * multiplication from this Edx25519 public key (in Crockford Base32 encoding):
+ *
+ *       DZJRF6HXN520505XDAWM8NMH36QV9J3VH77265WQ09EBQ76QSKCG
+ *
+ * Its private key was chosen randomly and then deleted.
+ */
+extern struct
+#ifndef AGE_RESTRICTION_WITH_ECDSA
+GNUNET_CRYPTO_Edx25519PublicKey
+#else
+GNUNET_CRYPTO_EcdsaPublicKey
+#endif
+TALER_age_commitment_base_public_key;
+
+/**
+ * @brief Similar to TALER_age_restriction_commit, but takes the coin's
+ * private key as seed input and calculates the public keys in the slots larger
+ * than the given age as derived from TALER_age_commitment_base_public_key.
+ *
+ * See https://docs.taler.net/core/api-exchange.html#withdraw-with-age-restriction
+ *
+ * @param secret The master secret of the coin from which we derive the age restriction
+ * @param mask The age mask, defining the age groups
+ * @param max_age The maximum age for this coin.
+ * @param[out] comm_proof The commitment and proof for age restriction for age @a max_age
+ */
+void
+TALER_age_restriction_from_secret (
+  const struct TALER_PlanchetMasterSecretP *secret,
+  const struct TALER_AgeMask *mask,
+  const uint8_t max_age,
+  struct TALER_AgeCommitmentProof *comm_proof);
+
+
+/**
+ * Group of Denominations.  These are the common fields of an array of
+ * denominations.
+ *
+ * The corresponding JSON-blob will also contain an array of particular
+ * denominations with only the timestamps, cipher-specific public key and the
+ * master signature.
+ */
+struct TALER_DenominationGroup
+{
+
+  /**
+   * Value of coins in this denomination group.
+   */
+  struct TALER_Amount value;
+
+  /**
+   * Fee structure for all coins in the group.
+   */
+  struct TALER_DenomFeeSet fees;
+
+  /**
+   * Cipher used for the denomination.
+   */
+  enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher;
+
+  /**
+   * Age mask for the denomination.
+   */
+  struct TALER_AgeMask age_mask;
+
+};
+
+
+/**
+ * Compute a unique key for the meta data of a denomination group.
+ *
+ * @param dg denomination group to evaluate
+ * @param[out] key key to set
+ */
+void
+TALER_denomination_group_get_key (
+  const struct TALER_DenominationGroup *dg,
+  struct GNUNET_HashCode *key);
+
+
+/**
+ * Token family public key.
+ */
+struct TALER_TokenFamilyPublicKey
+{
+  /**
+   * Type of the signature.
+   */
+  struct GNUNET_CRYPTO_BlindSignPublicKey public_key;
+};
+
+/**
+ * Hash of a public key of a token family.
+ */
+struct TALER_TokenFamilyPublicKeyHash
+{
+  /**
+   * Hash of the token public key.
+   */
+  struct GNUNET_HashCode hash;
+};
+
+/**
+ * Token family private key.
+ */
+struct TALER_TokenFamilyPrivateKey
+{
+  struct GNUNET_CRYPTO_BlindSignPrivateKey private_key;
+};
+
+/**
+ * Token public key.
+ */
+struct TALER_TokenPublicKey
+{
+  struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+};
+
+/**
+ * Signature made using a token private key.
+ */
+struct TALER_TokenSignature
+{
+  struct GNUNET_CRYPTO_EddsaSignature signature;
+};
+
+/**
+ * Blind signature for a token (signed by merchant).
+ */
+struct TALER_TokenBlindSignature
+{
+  struct GNUNET_CRYPTO_BlindedSignature signature;
+};
 
 #endif
diff --git a/src/include/taler_curl_lib.h b/src/include/taler_curl_lib.h
index 5151f4cf6..f108e6158 100644
--- a/src/include/taler_curl_lib.h
+++ b/src/include/taler_curl_lib.h
@@ -47,6 +47,11 @@ struct TALER_CURL_PostContext
    * Custom headers.
    */
   struct curl_slist *headers;
+
+  /**
+   * Set to true to disable compression of the body.
+   */
+  bool disable_compression;
 };
 
 
@@ -74,4 +79,17 @@ void
 TALER_curl_easy_post_finished (struct TALER_CURL_PostContext *ctx);
 
 
+/**
+ * Set a secure redirection policy, allowing a limited
+ * number of redirects and only going from HTTP to HTTPS
+ * but not from HTTPS to HTTP.
+ *
+ * @param[in,out] eh easy handle to modify
+ * @param url URL to base the redirect policy on;
+ *        must start with "http://" or "https://"
+ */
+void
+TALER_curl_set_secure_redirect_policy (CURL *eh,
+                                       const char *url);
+
 #endif
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index c615ca7c3..0597799b5 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2014-2022 Taler Systems SA
+   Copyright (C) 2014-2024 Taler Systems SA
 
    TALER 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
@@ -16,8 +16,11 @@
 /**
  * @file include/taler_exchange_service.h
  * @brief C interface of libtalerexchange, a C library to use exchange's HTTP API
+ *        This library is not thread-safe, all APIs must only be used from a single thread.
+ *        This library calls abort() if it runs out of memory. Be aware of these limitations.
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
+ * @author Özgür Kesim
  */
 #ifndef _TALER_EXCHANGE_SERVICE_H
 #define _TALER_EXCHANGE_SERVICE_H
@@ -25,31 +28,17 @@
 #include <jansson.h>
 #include "taler_util.h"
 #include "taler_error_codes.h"
+#include "taler_kyclogic_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
 
 
-/* *********************  /keys *********************** */
-
 /**
- * List of possible options to be passed to
- * #TALER_EXCHANGE_connect().
+ * Version of the Taler Exchange API, in hex.
+ * Thus 0.8.4-1 = 0x00080401.
  */
-enum TALER_EXCHANGE_Option
-{
-  /**
-   * Terminator (end of option list).
-   */
-  TALER_EXCHANGE_OPTION_END = 0,
+#define TALER_EXCHANGE_API_VERSION 0x00100000
 
-  /**
-   * Followed by a "const json_t *" that was previously returned for
-   * this exchange URL by #TALER_EXCHANGE_serialize_data().  Used to
-   * resume a connection to an exchange without having to re-download
-   * /keys data (or at least only download the deltas).
-   */
-  TALER_EXCHANGE_OPTION_DATA
-
-};
+/* *********************  /keys *********************** */
 
 
 /**
@@ -140,10 +129,18 @@ struct TALER_EXCHANGE_DenomPublicKey
   struct TALER_DenomFeeSet fees;
 
   /**
+   * Set to true if the private denomination key has been
+   * lost by the exchange and thus the key cannot be
+   * used for withdrawing at this time.
+   */
+  bool lost;
+
+  /**
    * Set to true if this denomination key has been
    * revoked by the exchange.
    */
   bool revoked;
+
 };
 
 
@@ -230,11 +227,6 @@ struct TALER_EXCHANGE_GlobalFee
   struct GNUNET_TIME_Relative purse_timeout;
 
   /**
-   * Accounts without KYC will be closed after this time.
-   */
-  struct GNUNET_TIME_Relative kyc_timeout;
-
-  /**
    * Account history is limited to this timeframe.
    */
   struct GNUNET_TIME_Relative history_expiration;
@@ -253,6 +245,183 @@ struct TALER_EXCHANGE_GlobalFee
 
 
 /**
+ * List sorted by @a start_date with fees to be paid for aggregate wire transfers.
+ */
+struct TALER_EXCHANGE_WireAggregateFees
+{
+  /**
+   * This is a linked list.
+   */
+  struct TALER_EXCHANGE_WireAggregateFees *next;
+
+  /**
+   * Fee to be paid whenever the exchange wires funds to the merchant.
+   */
+  struct TALER_WireFeeSet fees;
+
+  /**
+   * Time when this fee goes into effect (inclusive)
+   */
+  struct GNUNET_TIME_Timestamp start_date;
+
+  /**
+   * Time when this fee stops being in effect (exclusive).
+   */
+  struct GNUNET_TIME_Timestamp end_date;
+
+  /**
+   * Signature affirming the above fee structure.
+   */
+  struct TALER_MasterSignatureP master_sig;
+};
+
+
+/**
+ * Information about wire fees by wire method.
+ */
+struct TALER_EXCHANGE_WireFeesByMethod
+{
+  /**
+   * Wire method with the given @e fees.
+   */
+  char *method;
+
+  /**
+   * Linked list of wire fees the exchange charges for
+   * accounts of the wire @e method.
+   */
+  struct TALER_EXCHANGE_WireAggregateFees *fees_head;
+
+};
+
+
+/**
+ * Type of an account restriction.
+ */
+enum TALER_EXCHANGE_AccountRestrictionType
+{
+  /**
+   * Invalid restriction.
+   */
+  TALER_EXCHANGE_AR_INVALID = 0,
+
+  /**
+   * Account must not be used for this operation.
+   */
+  TALER_EXCHANGE_AR_DENY = 1,
+
+  /**
+   * Other account must match given regular expression.
+   */
+  TALER_EXCHANGE_AR_REGEX = 2
+};
+
+/**
+ * Restrictions that apply to using a given exchange bank account.
+ */
+struct TALER_EXCHANGE_AccountRestriction
+{
+
+  /**
+   * Type of the account restriction.
+   */
+  enum TALER_EXCHANGE_AccountRestrictionType type;
+
+  /**
+   * Restriction details depending on @e type.
+   */
+  union
+  {
+    /**
+     * Details if type is #TALER_EXCHANGE_AR_REGEX.
+     */
+    struct
+    {
+      /**
+       * Regular expression that the payto://-URI of the partner account must
+       * follow.  The regular expression should follow posix-egrep, but
+       * without support for character classes, GNU extensions,
+       * back-references or intervals. See
+       * https://www.gnu.org/software/findutils/manual/html_node/find_html/posix_002degrep-regular-expression-syntax.html
+       * for a description of the posix-egrep syntax. Applications may support
+       * regexes with additional features, but exchanges must not use such
+       * regexes.
+       */
+      char *posix_egrep;
+
+      /**
+       * Hint for a human to understand the restriction.
+       */
+      char *human_hint;
+
+      /**
+       * Internationalizations for the @e human_hint.  Map from IETF BCP 47
+       * language tax to localized human hints.
+       */
+      json_t *human_hint_i18n;
+    } regex;
+  } details;
+
+};
+
+
+/**
+ * Information about a wire account of the exchange.
+ */
+struct TALER_EXCHANGE_WireAccount
+{
+  /**
+   * payto://-URI of the exchange.
+   */
+  char *payto_uri;
+
+  /**
+   * URL of a conversion service in case using this account is subject to
+   * currency conversion.  NULL for no conversion needed.
+   */
+  char *conversion_url;
+
+  /**
+   * Array of restrictions that apply when crediting
+   * this account.
+   */
+  struct TALER_EXCHANGE_AccountRestriction *credit_restrictions;
+
+  /**
+   * Array of restrictions that apply when debiting
+   * this account.
+   */
+  struct TALER_EXCHANGE_AccountRestriction *debit_restrictions;
+
+  /**
+   * Length of the @e credit_restrictions array.
+   */
+  unsigned int credit_restrictions_length;
+
+  /**
+   * Length of the @e debit_restrictions array.
+   */
+  unsigned int debit_restrictions_length;
+
+  /**
+   * Signature of the exchange over the account (was checked by the API).
+   */
+  struct TALER_MasterSignatureP master_sig;
+
+  /**
+   * Display label for the account, can be NULL.
+   */
+  char *bank_label;
+
+  /**
+   * Priority for ordering the account in the display.
+   */
+  int64_t priority;
+
+};
+
+
+/**
  * @brief Information about keys from the exchange.
  */
 struct TALER_EXCHANGE_Keys
@@ -264,6 +433,11 @@ struct TALER_EXCHANGE_Keys
   struct TALER_MasterPublicKeyP master_pub;
 
   /**
+   * Signature over extension configuration data, if any.
+   */
+  struct TALER_MasterSignatureP extensions_sig;
+
+  /**
    * Array of the exchange's online signing keys.
    */
   struct TALER_EXCHANGE_SigningPublicKey *sign_keys;
@@ -284,6 +458,11 @@ struct TALER_EXCHANGE_Keys
   struct TALER_EXCHANGE_GlobalFee *global_fees;
 
   /**
+   * Configuration data for extensions.
+   */
+  json_t *extensions;
+
+  /**
    * Supported Taler protocol version by the exchange.
    * String in the format current:revision:age using the
    * semantics of GNU libtool.  See
@@ -297,6 +476,41 @@ struct TALER_EXCHANGE_Keys
   char *currency;
 
   /**
+   * What is the base URL of the exchange that returned
+   * these keys?
+   */
+  char *exchange_url;
+
+  /**
+   * Asset type used by the exchange. Typical values
+   * are "fiat" or "crypto" or "regional" or "stock".
+   * Wallets should adjust their UI/UX based on this
+   * value.
+   */
+  char *asset_type;
+
+  /**
+   * Array of amounts a wallet is allowed to hold from
+   * this exchange before it must undergo further KYC checks.
+   */
+  struct TALER_Amount *wallet_balance_limit_without_kyc;
+
+  /**
+   * Array of accounts of the exchange.
+   */
+  struct TALER_EXCHANGE_WireAccount *accounts;
+
+  /**
+   * Array of wire fees by wire method.
+   */
+  struct TALER_EXCHANGE_WireFeesByMethod *fees;
+
+  /**
+   * Currency rendering specification for this exchange.
+   */
+  struct TALER_CurrencySpecification cspec;
+
+  /**
    * How long after a reserve went idle will the exchange close it?
    * This is an approximate number, not cryptographically signed by
    * the exchange (advisory-only, may change anytime).
@@ -304,15 +518,14 @@ struct TALER_EXCHANGE_Keys
   struct GNUNET_TIME_Relative reserve_closing_delay;
 
   /**
-   * Maximum amount a wallet is allowed to hold from
-   * this exchange before it must undergo a KYC check.
+   * Timestamp indicating the /keys generation.
    */
-  struct TALER_Amount wallet_balance_limit_without_kyc;
+  struct GNUNET_TIME_Timestamp list_issue_date;
 
   /**
-   * Timestamp indicating the /keys generation.
+   * When does this keys data expire?
    */
-  struct GNUNET_TIME_Timestamp list_issue_date;
+  struct GNUNET_TIME_Timestamp key_data_expiration;
 
   /**
    * Timestamp indicating the creation time of the last
@@ -327,6 +540,37 @@ struct TALER_EXCHANGE_Keys
   struct TALER_AgeMask age_mask;
 
   /**
+   * Absolute STEFAN parameter.
+   */
+  struct TALER_Amount stefan_abs;
+
+  /**
+   * Logarithmic STEFAN parameter.
+   */
+  struct TALER_Amount stefan_log;
+
+  /**
+   * Linear STEFAN parameter.
+   */
+  double stefan_lin;
+
+  /**
+   * Length of @e accounts array.
+   */
+  unsigned int accounts_len;
+
+  /**
+   * Length of @e fees array.
+   */
+  unsigned int fees_len;
+
+  /**
+   * Length of the @e wallet_balance_limit_without_kyc
+   * array.
+   */
+  unsigned int wblwk_length;
+
+  /**
    * Length of the @e global_fees array.
    */
   unsigned int num_global_fees;
@@ -356,6 +600,16 @@ struct TALER_EXCHANGE_Keys
    */
   unsigned int denom_keys_size;
 
+  /**
+   * Reference counter for this structure.
+   * Freed when it reaches 0.
+   */
+  unsigned int rc;
+
+  /**
+   * Set to true if rewards are allowed at this exchange.
+   */
+  bool rewards_allowed;
 };
 
 
@@ -452,151 +706,195 @@ struct TALER_EXCHANGE_HttpResponse
 
 
 /**
+ * Response from /keys.
+ */
+struct TALER_EXCHANGE_KeysResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on the HTTP status code.
+   */
+  union
+  {
+
+    /**
+     * Details on #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * Information about the various keys used by the exchange.
+       */
+      const struct TALER_EXCHANGE_Keys *keys;
+
+      /**
+       * Protocol compatibility information
+       */
+      enum TALER_EXCHANGE_VersionCompatibility compat;
+    } ok;
+  } details;
+
+};
+
+
+/**
  * Function called with information about who is auditing
  * a particular exchange and what keys the exchange is using.
+ * The ownership over the @a keys object is passed to
+ * the callee, thus it is given explicitly and not
+ * (only) via @a kr.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param keys information about the various keys used
- *        by the exchange, NULL if /keys failed
- * @param compat protocol compatibility information
+ * @param kr response from /keys
+ * @param[in] keys keys object passed to callback with
+ *  reference counter of 1. Must be freed by callee
+ *  using #TALER_EXCHANGE_keys_decref(). NULL on failure.
  */
 typedef void
-(*TALER_EXCHANGE_CertificationCallback) (
+(*TALER_EXCHANGE_GetKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_EXCHANGE_Keys *keys,
-  enum TALER_EXCHANGE_VersionCompatibility compat);
+  const struct TALER_EXCHANGE_KeysResponse *kr,
+  struct TALER_EXCHANGE_Keys *keys);
 
 
 /**
- * @brief Handle to the exchange.  This is where we interact with
- * a particular exchange and keep the per-exchange information.
+ * @brief Handle for a GET /keys request.
  */
-struct TALER_EXCHANGE_Handle;
+struct TALER_EXCHANGE_GetKeysHandle;
 
 
 /**
- * Initialise a connection to the exchange.  Will connect to the
- * exchange and obtain information about the exchange's master public
- * key and the exchange's auditor.  The respective information will
- * be passed to the @a cert_cb once available, and all future
- * interactions with the exchange will be checked to be signed
- * (where appropriate) by the respective master key.
+ * Fetch the main /keys resources from an exchange.  Does an incremental
+ * fetch if @a last_keys is given.  The obtained information will be passed to
+ * the @a cert_cb (possibly after first merging it with @a last_keys to
+ * produce a full picture; expired keys (for deposit) will be removed from @a
+ * last_keys if there are any).
  *
  * @param ctx the context
  * @param url HTTP base URL for the exchange
+ * @param[in,out] last_keys previous keys object, NULL for none
  * @param cert_cb function to call with the exchange's certification information,
  *                possibly called repeatedly if the information changes
  * @param cert_cb_cls closure for @a cert_cb
- * @param ... list of additional arguments, terminated by #TALER_EXCHANGE_OPTION_END.
  * @return the exchange handle; NULL upon error
  */
-struct TALER_EXCHANGE_Handle *
-TALER_EXCHANGE_connect (struct GNUNET_CURL_Context *ctx,
-                        const char *url,
-                        TALER_EXCHANGE_CertificationCallback cert_cb,
-                        void *cert_cb_cls,
-                        ...);
+struct TALER_EXCHANGE_GetKeysHandle *
+TALER_EXCHANGE_get_keys (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *last_keys,
+  TALER_EXCHANGE_GetKeysCallback cert_cb,
+  void *cert_cb_cls);
 
 
 /**
- * Serialize the latest key data from @a exchange to be persisted
- * on disk (to be used with #TALER_EXCHANGE_OPTION_DATA to more
- * efficiently recover the state).
+ * Serialize the latest data from @a keys to be persisted
+ * (for example, to be used as @a last_keys later).
  *
- * @param exchange which exchange's key and wire data should be serialized
- * @return NULL on error (i.e. no current data available); otherwise
- *         json object owned by the caller
+ * @param kd the key data to serialize
+ * @return NULL on error; otherwise JSON object owned by the caller
  */
 json_t *
-TALER_EXCHANGE_serialize_data (struct TALER_EXCHANGE_Handle *exchange);
+TALER_EXCHANGE_keys_to_json (const struct TALER_EXCHANGE_Keys *kd);
 
 
 /**
- * Disconnect from the exchange.
+ * Deserialize keys data stored in @a j.
  *
- * @param exchange the exchange handle
+ * @param j JSON keys data previously returned from #TALER_EXCHANGE_keys_to_json()
+ * @return NULL on error (i.e. invalid JSON); otherwise
+ *         keys object with reference counter 1 owned by the caller
  */
-void
-TALER_EXCHANGE_disconnect (struct TALER_EXCHANGE_Handle *exchange);
+struct TALER_EXCHANGE_Keys *
+TALER_EXCHANGE_keys_from_json (const json_t *j);
 
 
 /**
- * Obtain the keys from the exchange.
+ * Cancel GET /keys operation.
  *
- * @param exchange the exchange handle
- * @return the exchange's key set
+ * @param[in] gkh the GET /keys handle
  */
-const struct TALER_EXCHANGE_Keys *
-TALER_EXCHANGE_get_keys (struct TALER_EXCHANGE_Handle *exchange);
+void
+TALER_EXCHANGE_get_keys_cancel (struct TALER_EXCHANGE_GetKeysHandle *gkh);
 
 
 /**
- * Let the user set the last valid denomination time manually.
+ * Increment reference counter for @a keys
  *
- * @param exchange the exchange handle.
- * @param last_denom_new new last denomination time.
+ * @param[in,out] keys object to increment reference counter for
+ * @return keys, with incremented reference counter
  */
-void
-TALER_EXCHANGE_set_last_denom (struct TALER_EXCHANGE_Handle *exchange,
-                               struct GNUNET_TIME_Timestamp last_denom_new);
+struct TALER_EXCHANGE_Keys *
+TALER_EXCHANGE_keys_incref (struct TALER_EXCHANGE_Keys *keys);
 
 
 /**
- * Flags for #TALER_EXCHANGE_check_keys_current().
+ * Decrement reference counter for @a keys.
+ * Frees @a keys if reference counter becomes zero.
+ *
+ * @param[in,out] keys object to decrement reference counter for
  */
-enum TALER_EXCHANGE_CheckKeysFlags
-{
-  /**
-   * No special options.
-   */
-  TALER_EXCHANGE_CKF_NONE,
-
-  /**
-   * Force downloading /keys now, even if /keys is still valid
-   * (that is, the period advertised by the exchange for re-downloads
-   * has not yet expired).
-   */
-  TALER_EXCHANGE_CKF_FORCE_DOWNLOAD = 1,
-
-  /**
-   * Pull all keys again, resetting the client state to the original state.
-   * Using this flag disables the incremental download, and also prevents using
-   * the context until the re-download has completed.
-   */
-  TALER_EXCHANGE_CKF_PULL_ALL_KEYS = 2,
+void
+TALER_EXCHANGE_keys_decref (struct TALER_EXCHANGE_Keys *keys);
 
-  /**
-   * Force downloading all keys now.
-   */
-  TALER_EXCHANGE_CKF_FORCE_ALL_NOW = TALER_EXCHANGE_CKF_FORCE_DOWNLOAD
-                                     | TALER_EXCHANGE_CKF_PULL_ALL_KEYS
 
-};
+/**
+ * Use STEFAN curve in @a keys to convert @a brut to @a net.  Computes the
+ * expected minimum (!) @a net amount that should for sure arrive in the
+ * target amount at cost of @a brut to the wallet. Note that STEFAN curves by
+ * design over-estimate actual fees and a wallet may be able to achieve the
+ * same @a net amount with less fees --- or if the available coins are
+ * abnormal in structure, it may take more.
+ *
+ * @param keys exchange key data
+ * @param brut gross amount (actual cost including fees)
+ * @param[out] net net amount (effective amount)
+ * @return #GNUNET_OK on success, #GNUNET_NO if the
+ *   resulting @a net is zero (or lower)
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_keys_stefan_b2n (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *brut,
+  struct TALER_Amount *net);
 
 
 /**
- * Check if our current response for /keys is valid, and if
- * not, trigger /keys download.
+ * Use STEFAN curve in @a keys to convert @a net to @a brut.  Computes the
+ * expected maximum (!) @a brut amount that should be needed in the wallet to
+ * transfer @a net amount to the target account.  Note that STEFAN curves by
+ * design over-estimate actual fees and a wallet may be able to achieve the
+ * same @a net amount with less fees --- or if the available coins are
+ * abnormal in structure, it may take more.
  *
- * @param exchange exchange to check keys for
- * @param flags options controlling when to download what
- * @return until when the existing response is current, 0 if we are re-downloading now
+ * @param keys exchange key data
+ * @param net net amount (effective amount)
+ * @param[out] brut gross amount (actual cost including fees)
+ * @return #GNUNET_OK on success, #GNUNET_NO if the
+ *   resulting @a brut is zero (only if @a net was zero)
  */
-struct GNUNET_TIME_Timestamp
-TALER_EXCHANGE_check_keys_current (struct TALER_EXCHANGE_Handle *exchange,
-                                   enum TALER_EXCHANGE_CheckKeysFlags flags);
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_keys_stefan_n2b (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *net,
+  struct TALER_Amount *brut);
 
 
 /**
- * Obtain the keys from the exchange in the raw JSON format.
+ * Round brutto or netto value computed via STEFAN
+ * curve to decimal places commonly used at the exchange.
  *
- * @param exchange the exchange handle
- * @return the exchange's keys in raw JSON
+ * @param keys exchange keys response data
+ * @param[in,out] val value to round
  */
-json_t *
-TALER_EXCHANGE_get_keys_raw (struct TALER_EXCHANGE_Handle *exchange);
+void
+TALER_EXCHANGE_keys_stefan_round (
+  const struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_Amount *val);
 
 
 /**
@@ -608,18 +906,9 @@ TALER_EXCHANGE_get_keys_raw (struct TALER_EXCHANGE_Handle *exchange);
  * @return #GNUNET_OK if @a pub is (according to /keys) a current signing key
  */
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_test_signing_key (const struct TALER_EXCHANGE_Keys *keys,
-                                 const struct TALER_ExchangePublicKeyP *pub);
-
-
-/**
- * Get exchange's base URL.
- *
- * @param exchange exchange handle.
- * @return the base URL from the handle.
- */
-const char *
-TALER_EXCHANGE_get_base_url (const struct TALER_EXCHANGE_Handle *exchange);
+TALER_EXCHANGE_test_signing_key (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ExchangePublicKeyP *pub);
 
 
 /**
@@ -653,7 +942,8 @@ TALER_EXCHANGE_get_global_fee (
  * Create a copy of a denomination public key.
  *
  * @param key key to copy
- * @returns a copy, must be freed with #TALER_EXCHANGE_destroy_denomination_key
+ * @returns a copy, must be freed with #TALER_EXCHANGE_destroy_denomination_key()
+ * @deprecated
  */
 struct TALER_EXCHANGE_DenomPublicKey *
 TALER_EXCHANGE_copy_denomination_key (
@@ -662,9 +952,10 @@ TALER_EXCHANGE_copy_denomination_key (
 
 /**
  * Destroy a denomination public key.
- * Should only be called with keys created by #TALER_EXCHANGE_copy_denomination_key.
+ * Should only be called with keys created by #TALER_EXCHANGE_copy_denomination_key().
  *
  * @param key key to destroy.
+ * @deprecated
  */
 void
 TALER_EXCHANGE_destroy_denomination_key (
@@ -698,172 +989,156 @@ TALER_EXCHANGE_get_signing_key_info (
   const struct TALER_ExchangePublicKeyP *exchange_pub);
 
 
-/* *********************  /wire *********************** */
+/* *********************  wire helpers *********************** */
 
 
 /**
- * Sorted list of fees to be paid for aggregate wire transfers.
+ * Parse array of @a accounts of the exchange into @a was.
+ *
+ * @param master_pub master public key of the exchange, NULL to not verify signatures
+ * @param accounts array of accounts to parse
+ * @param[out] was where to write the result (already allocated)
+ * @param was_length length of the @a was array, must match the length of @a accounts
+ * @return #GNUNET_OK if parsing @a accounts succeeded
  */
-struct TALER_EXCHANGE_WireAggregateFees
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_parse_accounts (
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const json_t *accounts,
+  unsigned int was_length,
+  struct TALER_EXCHANGE_WireAccount was[static was_length]);
+
+
+/**
+ * Free data within @a was, but not @a was itself.
+ *
+ * @param was array of wire account data
+ * @param was_len length of the @a was array
+ */
+void
+TALER_EXCHANGE_free_accounts (
+  unsigned int was_len,
+  struct TALER_EXCHANGE_WireAccount was[static was_len]);
+
+
+/* *********************  /coins/$COIN_PUB/deposit *********************** */
+
+
+/**
+ * Information needed for a coin to be deposited.
+ */
+struct TALER_EXCHANGE_CoinDepositDetail
 {
+
   /**
-   * This is a linked list.
+   * The amount to be deposited.
    */
-  struct TALER_EXCHANGE_WireAggregateFees *next;
+  struct TALER_Amount amount;
 
   /**
-   * Fee to be paid whenever the exchange wires funds to the merchant.
+   * Hash over the age commitment of the coin.
    */
-  struct TALER_WireFeeSet fees;
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
-   * Time when this fee goes into effect (inclusive)
+   * The coin’s public key.
    */
-  struct GNUNET_TIME_Timestamp start_date;
+  struct TALER_CoinSpendPublicKeyP coin_pub;
 
   /**
-   * Time when this fee stops being in effect (exclusive).
+   * The signature made with purpose #TALER_SIGNATURE_WALLET_COIN_DEPOSIT made
+   * by the customer with the coin’s private key.
    */
-  struct GNUNET_TIME_Timestamp end_date;
+  struct TALER_CoinSpendSignatureP coin_sig;
 
   /**
-   * Signature affirming the above fee structure.
+   * Exchange’s unblinded signature of the coin.
    */
-  struct TALER_MasterSignatureP master_sig;
+  struct TALER_DenominationSignature denom_sig;
+
+  /**
+   * Hash of the public key of the coin.
+   */
+  struct TALER_DenominationHashP h_denom_pub;
 };
 
 
 /**
- * Information about a wire account of the exchange.
+ * Meta information about the contract relevant for a coin's deposit
+ * operation.
  */
-struct TALER_EXCHANGE_WireAccount
+struct TALER_EXCHANGE_DepositContractDetail
 {
+
   /**
-   * payto://-URI of the exchange.
+   * Hash of the contact of the merchant with the customer (further details
+   * are never disclosed to the exchange)
    */
-  const char *payto_uri;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
-   * Signature of the exchange over the account (was checked by the API).
+   * The public key of the merchant (used to identify the merchant for refund
+   * requests).
    */
-  struct TALER_MasterSignatureP master_sig;
+  struct TALER_MerchantPublicKeyP merchant_pub;
 
   /**
-   * Linked list of wire fees the exchange charges for
-   * accounts of the wire method matching @e payto_uri.
+   * Salt used to hash the @e merchant_payto_uri.
    */
-  const struct TALER_EXCHANGE_WireAggregateFees *fees;
-
-};
+  struct TALER_WireSaltP wire_salt;
 
+  /**
+   * Hash over data provided by the wallet to customize the contract.
+   * All zero if not used.
+   */
+  struct GNUNET_HashCode wallet_data_hash;
 
-/**
- * Callbacks of this type are used to serve the result of submitting a
- * wire format inquiry request to a exchange.
- *
- * If the request fails to generate a valid response from the
- * exchange, @a http_status will also be zero.
- *
- * @param cls closure
- * @param hr HTTP response data
- * @param accounts_len length of the @a accounts array
- * @param accounts list of wire accounts of the exchange, NULL on error
- */
-typedef void
-(*TALER_EXCHANGE_WireCallback) (
-  void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  unsigned int accounts_len,
-  const struct TALER_EXCHANGE_WireAccount *accounts);
-
-
-/**
- * @brief A Wire format inquiry handle
- */
-struct TALER_EXCHANGE_WireHandle;
-
-
-/**
- * Obtain information about a exchange's wire instructions.  A
- * exchange may provide wire instructions for creating a reserve.  The
- * wire instructions also indicate which wire formats merchants may
- * use with the exchange.  This API is typically used by a wallet for
- * wiring funds, and possibly by a merchant to determine supported
- * wire formats.
- *
- * Note that while we return the (main) response verbatim to the
- * caller for further processing, we do already verify that the
- * response is well-formed (i.e. that signatures included in the
- * response are all valid).  If the exchange's reply is not
- * well-formed, we return an HTTP status code of zero to @a cb.
- *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param wire_cb the callback to call when a reply for this request is available
- * @param wire_cb_cls closure for the above callback
- * @return a handle for this request
- */
-struct TALER_EXCHANGE_WireHandle *
-TALER_EXCHANGE_wire (struct TALER_EXCHANGE_Handle *exchange,
-                     TALER_EXCHANGE_WireCallback wire_cb,
-                     void *wire_cb_cls);
-
+  /**
+   * Date until which the merchant can issue a refund to the customer via the
+   * exchange (can be zero if refunds are not allowed); must not be after the
+   * @e wire_deadline.
+   */
+  struct GNUNET_TIME_Timestamp refund_deadline;
 
-/**
- * Cancel a wire information request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param wh the wire information request handle
- */
-void
-TALER_EXCHANGE_wire_cancel (struct TALER_EXCHANGE_WireHandle *wh);
+  /**
+   * Execution date, until which the merchant would like the exchange to
+   * settle the balance (advisory, the exchange cannot be forced to settle in
+   * the past or upon very short notice, but of course a well-behaved exchange
+   * will limit aggregation based on the advice received).
+   */
+  struct GNUNET_TIME_Timestamp wire_deadline;
 
+  /**
+   * Timestamp when the contract was finalized, must match approximately the
+   * current time of the exchange.
+   */
+  struct GNUNET_TIME_Timestamp wallet_timestamp;
 
-/* *********************  /coins/$COIN_PUB/deposit *********************** */
+  /**
+   * The merchant’s account details, in the payto://-format supported by the
+   * exchange.
+   */
+  const char *merchant_payto_uri;
 
+  /**
+   * Policy extension specific details about the deposit relevant to the exchange.
+   */
+  const json_t *policy_details;
 
-/**
- * Sign a deposit permission.  Function for wallets.
- *
- * @param amount the amount to be deposited
- * @param deposit_fee the deposit fee we expect to pay
- * @param h_wire hash of the merchant’s account details
- * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
- * @param h_extensions hash over the extensions
- * @param h_denom_pub hash of the coin denomination's public key
- * @param coin_priv coin’s private key
- * @param age_commitment age commitment that went into the making of the coin, might be NULL
- * @param wallet_timestamp timestamp when the contract was finalized, must not be too far in the future
- * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
- * @param refund_deadline date until which the merchant can issue a refund to the customer via the exchange (can be zero if refunds are not allowed); must not be after the @a wire_deadline
- * @param[out] coin_sig set to the signature made with purpose #TALER_SIGNATURE_WALLET_COIN_DEPOSIT
- */
-void
-TALER_EXCHANGE_deposit_permission_sign (
-  const struct TALER_Amount *amount,
-  const struct TALER_Amount *deposit_fee,
-  const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_ExtensionContractHashP *h_extensions,
-  const struct TALER_DenominationHashP *h_denom_pub,
-  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
-  const struct TALER_AgeCommitment *age_commitment,
-  struct GNUNET_TIME_Timestamp wallet_timestamp,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  struct GNUNET_TIME_Timestamp refund_deadline,
-  struct TALER_CoinSpendSignatureP *coin_sig);
+};
 
 
 /**
- * @brief A Deposit Handle
+ * @brief A Batch Deposit Handle
  */
-struct TALER_EXCHANGE_DepositHandle;
+struct TALER_EXCHANGE_BatchDepositHandle;
 
 
 /**
- * Structure with information about a deposit
+ * Structure with information about a batch deposit
  * operation's result.
  */
-struct TALER_EXCHANGE_DepositResult
+struct TALER_EXCHANGE_BatchDepositResult
 {
   /**
    * HTTP response data
@@ -880,12 +1155,12 @@ struct TALER_EXCHANGE_DepositResult
     struct
     {
       /**
-       * Time when the exchange generated the deposit confirmation
+       * Time when the exchange generated the batch deposit confirmation
        */
       struct GNUNET_TIME_Timestamp deposit_timestamp;
 
       /**
-       * signature provided by the exchange
+       * Deposit confirmation signature provided by the exchange
        */
       const struct TALER_ExchangeSignatureP *exchange_sig;
 
@@ -900,7 +1175,7 @@ struct TALER_EXCHANGE_DepositResult
        */
       const char *transaction_base_url;
 
-    } success;
+    } ok;
 
     /**
      * Information returned if the HTTP status is
@@ -908,7 +1183,11 @@ struct TALER_EXCHANGE_DepositResult
      */
     struct
     {
-      /* TODO: returning full details is not implemented */
+      /**
+       * The coin that had a conflict.
+       */
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+
     } conflict;
 
   } details;
@@ -923,65 +1202,46 @@ struct TALER_EXCHANGE_DepositResult
  * @param dr deposit response details
  */
 typedef void
-(*TALER_EXCHANGE_DepositResultCallback) (
+(*TALER_EXCHANGE_BatchDepositResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_DepositResult *dr);
+  const struct TALER_EXCHANGE_BatchDepositResult *dr);
 
 
 /**
- * Submit a deposit permission to the exchange and get the exchange's
- * response.  This API is typically used by a merchant.  Note that
- * while we return the response verbatim to the caller for further
- * processing, we do already verify that the response is well-formed
- * (i.e. that signatures included in the response are all valid).  If
- * the exchange's reply is not well-formed, we return an HTTP status code
- * of zero to @a cb.
+ * Submit a batch of deposit permissions to the exchange and get the
+ * exchange's response.  This API is typically used by a merchant.  Note that
+ * while we return the response verbatim to the caller for further processing,
+ * we do already verify that the response is well-formed (i.e. that signatures
+ * included in the response are all valid).  If the exchange's reply is not
+ * well-formed, we return an HTTP status code of zero to @a cb.
  *
- * We also verify that the @a coin_sig is valid for this deposit
- * request, and that the @a ub_sig is a valid signature for @a
+ * We also verify that the @a cdds.coin_sig are valid for this deposit
+ * request, and that the @a cdds.ub_sig are a valid signatures for @a
  * coin_pub.  Also, the @a exchange must be ready to operate (i.e.  have
  * finished processing the /keys reply).  If either check fails, we do
  * NOT initiate the transaction with the exchange and instead return NULL.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param amount the amount to be deposited
- * @param wire_deadline execution date, until which the merchant would like the exchange to settle the balance (advisory, the exchange cannot be
- *        forced to settle in the past or upon very short notice, but of course a well-behaved exchange will limit aggregation based on the advice received)
- * @param merchant_payto_uri the merchant’s account details, in the payto://-format supported by the exchange
- * @param wire_salt salt used to hash the @a merchant_payto_uri
- * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
- * @param extension_details extension-specific details about the deposit relevant to the exchange
- * @param coin_pub coin’s public key
- * @param denom_pub denomination key with which the coin is signed
- * @param denom_sig exchange’s unblinded signature of the coin
- * @param timestamp timestamp when the contract was finalized, must match approximately the current time of the exchange
- * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
- * @param refund_deadline date until which the merchant can issue a refund to the customer via the exchange (can be zero if refunds are not allowed); must not be after the @a wire_deadline
- * @param coin_sig the signature made with purpose #TALER_SIGNATURE_WALLET_COIN_DEPOSIT made by the customer with the coin’s private key.
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
+ * @param dcd details about the contract the deposit is for
+ * @param num_cdds length of the @a cdds array
+ * @param cdds array with details about the coins to be deposited
  * @param cb the callback to call when a reply for this request is available
  * @param cb_cls closure for the above callback
  * @param[out] ec if NULL is returned, set to the error code explaining why the operation failed
  * @return a handle for this request; NULL if the inputs are invalid (i.e.
  *         signatures fail to verify).  In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_DepositHandle *
-TALER_EXCHANGE_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const struct TALER_Amount *amount,
-  struct GNUNET_TIME_Timestamp wire_deadline,
-  const char *merchant_payto_uri,
-  const struct TALER_WireSaltP *wire_salt,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_AgeCommitmentHash *h_age_commitment,
-  const json_t *extension_details,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_DenominationSignature *denom_sig,
-  const struct TALER_DenominationPublicKey *denom_pub,
-  struct GNUNET_TIME_Timestamp timestamp,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_CoinSpendSignatureP *coin_sig,
-  TALER_EXCHANGE_DepositResultCallback cb,
+struct TALER_EXCHANGE_BatchDepositHandle *
+TALER_EXCHANGE_batch_deposit (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DepositContractDetail *dcd,
+  unsigned int num_cdds,
+  const struct TALER_EXCHANGE_CoinDepositDetail cdds[static num_cdds],
+  TALER_EXCHANGE_BatchDepositResultCallback cb,
   void *cb_cls,
   enum TALER_ErrorCode *ec);
 
@@ -990,20 +1250,22 @@ TALER_EXCHANGE_deposit (
  * Change the chance that our deposit confirmation will be given to the
  * auditor to 100%.
  *
- * @param deposit the deposit permission request handle
+ * @param[in,out] deposit the batch deposit permission request handle
  */
 void
-TALER_EXCHANGE_deposit_force_dc (struct TALER_EXCHANGE_DepositHandle *deposit);
+TALER_EXCHANGE_batch_deposit_force_dc (
+  struct TALER_EXCHANGE_BatchDepositHandle *deposit);
 
 
 /**
- * Cancel a deposit permission request.  This function cannot be used
+ * Cancel a batch deposit permission request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param deposit the deposit permission request handle
+ * @param[in] deposit the deposit permission request handle
  */
 void
-TALER_EXCHANGE_deposit_cancel (struct TALER_EXCHANGE_DepositHandle *deposit);
+TALER_EXCHANGE_batch_deposit_cancel (
+  struct TALER_EXCHANGE_BatchDepositHandle *deposit);
 
 
 /* *********************  /coins/$COIN_PUB/refund *********************** */
@@ -1013,23 +1275,51 @@ TALER_EXCHANGE_deposit_cancel (struct TALER_EXCHANGE_DepositHandle *deposit);
  */
 struct TALER_EXCHANGE_RefundHandle;
 
+/**
+ * Response from the /refund API.
+ */
+struct TALER_EXCHANGE_RefundResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status code.
+   */
+  union
+  {
+    /**
+     * Details on #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * Exchange key used to sign.
+       */
+      struct TALER_ExchangePublicKeyP exchange_pub;
+
+      /**
+       * The actual signature
+       */
+      struct TALER_ExchangeSignatureP exchange_sig;
+    } ok;
+  } details;
+};
+
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
  * refund request to an exchange.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param sign_key exchange key used to sign @a obj, or NULL
- * @param signature the actual signature, or NULL on error
+ * @param rr refund response
  */
 typedef void
 (*TALER_EXCHANGE_RefundCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_ExchangePublicKeyP *sign_key,
-  const struct TALER_ExchangeSignatureP *signature);
-
+  const struct TALER_EXCHANGE_RefundResponse *rr);
 
 /**
  * Submit a refund request to the exchange and get the exchange's response.
@@ -1043,7 +1333,9 @@ typedef void
  * finished processing the /keys reply).  If this check fails, we do
  * NOT initiate the transaction with the exchange and instead return NULL.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param amount the amount to be refunded; must be larger than the refund fee
  *        (as that fee is still being subtracted), and smaller than the amount
  *        (with deposit fee) of the original deposit contribution of this coin
@@ -1060,15 +1352,17 @@ typedef void
  *         signatures fail to verify).  In this case, the callback is not called.
  */
 struct TALER_EXCHANGE_RefundHandle *
-TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange,
-                       const struct TALER_Amount *amount,
-                       const struct
-                       TALER_PrivateContractHashP *h_contract_terms,
-                       const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                       uint64_t rtransaction_id,
-                       const struct TALER_MerchantPrivateKeyP *merchant_priv,
-                       TALER_EXCHANGE_RefundCallback cb,
-                       void *cb_cls);
+TALER_EXCHANGE_refund (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *amount,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  uint64_t rtransaction_id,
+  const struct TALER_MerchantPrivateKeyP *merchant_priv,
+  TALER_EXCHANGE_RefundCallback cb,
+  void *cb_cls);
 
 
 /**
@@ -1122,14 +1416,14 @@ struct TALER_EXCHANGE_CsRMeltResponse
        * respective coin's withdraw operation.
        */
       const struct TALER_ExchangeWithdrawValues *alg_values;
-    } success;
+    } ok;
 
     /**
      * Details if the status is #MHD_HTTP_GONE.
      */
     struct
     {
-      /* TODO: returning full details is not implemented */
+      /* FIXME: returning full details is not implemented */
     } gone;
 
   } details;
@@ -1170,7 +1464,9 @@ struct TALER_EXCHANGE_NonceKey
 /**
  * Get a set of CS R values using a /csr-melt request.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param rms master key used for the derivation of the CS values
  * @param nks_len length of the @a nks array
  * @param nks array of denominations and nonces
  * @param res_cb the callback to call when the final result for this request is available
@@ -1180,12 +1476,14 @@ struct TALER_EXCHANGE_NonceKey
  *         In this case, the callback is not called.
  */
 struct TALER_EXCHANGE_CsRMeltHandle *
-TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
-                         const struct TALER_RefreshMasterSecretP *rms,
-                         unsigned int nks_len,
-                         struct TALER_EXCHANGE_NonceKey *nks,
-                         TALER_EXCHANGE_CsRMeltCallback res_cb,
-                         void *res_cb_cls);
+TALER_EXCHANGE_csr_melt (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_RefreshMasterSecretP *rms,
+  unsigned int nks_len,
+  struct TALER_EXCHANGE_NonceKey nks[static nks_len],
+  TALER_EXCHANGE_CsRMeltCallback res_cb,
+  void *res_cb_cls);
 
 
 /**
@@ -1233,7 +1531,8 @@ struct TALER_EXCHANGE_CsRWithdrawResponse
        * respective coin's withdraw operation.
        */
       struct TALER_ExchangeWithdrawValues alg_values;
-    } success;
+
+    } ok;
 
     /**
      * Details if the status is #MHD_HTTP_GONE.
@@ -1263,8 +1562,9 @@ typedef void
 /**
  * Get a CS R using a /csr-withdraw request.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param dk Which denomination key is the /csr request for
+ * @param curl_ctx The curl context to use for the requests
+ * @param exchange_url Base-URL to the excnange
+ * @param pk Which denomination key is the /csr request for
  * @param nonce client nonce for the request
  * @param res_cb the callback to call when the final result for this request is available
  * @param res_cb_cls closure for the above callback
@@ -1273,11 +1573,13 @@ typedef void
  *         In this case, the callback is not called.
  */
 struct TALER_EXCHANGE_CsRWithdrawHandle *
-TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange,
-                             const struct TALER_EXCHANGE_DenomPublicKey *pk,
-                             const struct TALER_CsNonce *nonce,
-                             TALER_EXCHANGE_CsRWithdrawCallback res_cb,
-                             void *res_cb_cls);
+TALER_EXCHANGE_csr_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
+  TALER_EXCHANGE_CsRWithdrawCallback res_cb,
+  void *res_cb_cls);
 
 
 /**
@@ -1292,6 +1594,329 @@ TALER_EXCHANGE_csr_withdraw_cancel (
   struct TALER_EXCHANGE_CsRWithdrawHandle *csrh);
 
 
+/* ********************* GET /coins/$COIN_PUB *********************** */
+
+/**
+ * Ways how a coin's balance may change.
+ */
+enum TALER_EXCHANGE_CoinTransactionType
+{
+
+  /**
+   * Reserved for uninitialized / none.
+   */
+  TALER_EXCHANGE_CTT_NONE,
+
+  /**
+   * Deposit into a contract.
+   */
+  TALER_EXCHANGE_CTT_DEPOSIT,
+
+  /**
+   * Spent on melt.
+   */
+  TALER_EXCHANGE_CTT_MELT,
+
+  /**
+   * Refunded by merchant.
+   */
+  TALER_EXCHANGE_CTT_REFUND,
+
+  /**
+   * Debited in recoup (to reserve) operation.
+   */
+  TALER_EXCHANGE_CTT_RECOUP,
+
+  /**
+   * Debited in recoup-and-refresh operation.
+   */
+  TALER_EXCHANGE_CTT_RECOUP_REFRESH,
+
+  /**
+   * Credited in recoup-refresh.
+   */
+  TALER_EXCHANGE_CTT_OLD_COIN_RECOUP,
+
+  /**
+   * Deposited into purse.
+   */
+  TALER_EXCHANGE_CTT_PURSE_DEPOSIT,
+
+  /**
+   * Refund from purse.
+   */
+  TALER_EXCHANGE_CTT_PURSE_REFUND,
+
+  /**
+   * Reserve open payment operation.
+   */
+  TALER_EXCHANGE_CTT_RESERVE_OPEN_DEPOSIT
+
+};
+
+
+/**
+ * @brief Entry in the coin's transaction history.
+ */
+struct TALER_EXCHANGE_CoinHistoryEntry
+{
+
+  /**
+   * Type of the transaction.
+   */
+  enum TALER_EXCHANGE_CoinTransactionType type;
+
+  /**
+   * Amount transferred (in or out).
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Details depending on @e type.
+   */
+  union
+  {
+
+    struct
+    {
+      struct TALER_MerchantWireHashP h_wire;
+      struct TALER_PrivateContractHashP h_contract_terms;
+      struct TALER_ExtensionPolicyHashP h_policy;
+      bool no_h_policy;
+      struct GNUNET_HashCode wallet_data_hash;
+      bool no_wallet_data_hash;
+      struct GNUNET_TIME_Timestamp wallet_timestamp;
+      struct TALER_MerchantPublicKeyP merchant_pub;
+      struct GNUNET_TIME_Timestamp refund_deadline;
+      struct TALER_CoinSpendSignatureP sig;
+      struct TALER_AgeCommitmentHash hac;
+      bool no_hac;
+      struct TALER_Amount deposit_fee;
+    } deposit;
+
+    struct
+    {
+      struct TALER_CoinSpendSignatureP sig;
+      struct TALER_RefreshCommitmentP rc;
+      struct TALER_AgeCommitmentHash h_age_commitment;
+      bool no_hac;
+      struct TALER_Amount melt_fee;
+    } melt;
+
+    struct
+    {
+      struct TALER_PrivateContractHashP h_contract_terms;
+      struct TALER_MerchantPublicKeyP merchant_pub;
+      struct TALER_MerchantSignatureP sig;
+      struct TALER_Amount refund_fee;
+      struct TALER_Amount sig_amount;
+      uint64_t rtransaction_id;
+    } refund;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct GNUNET_TIME_Timestamp timestamp;
+      union GNUNET_CRYPTO_BlindingSecretP coin_bks;
+      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_CoinSpendSignatureP coin_sig;
+    } recoup;
+
+    struct
+    {
+      struct TALER_CoinSpendPublicKeyP old_coin_pub;
+      union GNUNET_CRYPTO_BlindingSecretP coin_bks;
+      struct GNUNET_TIME_Timestamp timestamp;
+      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_CoinSpendSignatureP coin_sig;
+    } recoup_refresh;
+
+    struct
+    {
+      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangeSignatureP exchange_sig;
+      struct TALER_CoinSpendPublicKeyP new_coin_pub;
+      struct GNUNET_TIME_Timestamp timestamp;
+    } old_coin_recoup;
+
+    struct
+    {
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_CoinSpendSignatureP coin_sig;
+      const char *exchange_base_url;
+      bool refunded;
+      struct TALER_AgeCommitmentHash phac;
+    } purse_deposit;
+
+    struct
+    {
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_Amount refund_fee;
+      struct TALER_ExchangePublicKeyP exchange_pub;
+      struct TALER_ExchangeSignatureP exchange_sig;
+    } purse_refund;
+
+    struct
+    {
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_CoinSpendSignatureP coin_sig;
+    } reserve_open_deposit;
+
+  } details;
+
+};
+
+
+/**
+ * @brief A /coins/$RID/history Handle
+ */
+struct TALER_EXCHANGE_CoinsHistoryHandle;
+
+
+/**
+ * Parses and verifies a coin's transaction history as
+ * returned by the exchange.  Note that in case of
+ * incremental histories, the client must first combine
+ * the incremental histories into one complete history.
+ *
+ * @param keys /keys data of the exchange
+ * @param dk denomination key of the coin
+ * @param history JSON array with the coin's history
+ * @param coin_pub public key of the coin
+ * @param[out] total_in set to total amount credited to the coin in @a history
+ * @param[out] total_out set to total amount debited to the coin in @a history
+ * @param rlen length of the @a rhistory array
+ * @param[out] rhistory array where to write the parsed @a history
+ * @return #GNUNET_OK if @a history is valid,
+ *         #GNUNET_SYSERR if not
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_parse_coin_history (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DenomPublicKey *dk,
+  const json_t *history,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_Amount *total_in,
+  struct TALER_Amount *total_out,
+  unsigned int rlen,
+  struct TALER_EXCHANGE_CoinHistoryEntry rhistory[static rlen]);
+
+
+/**
+ * Verify that @a coin_sig does NOT appear in the @a history of a coin's
+ * transactions and thus whatever transaction is authorized by @a coin_sig is
+ * a conflict with @a proof.
+ *
+ * @param history coin history to check
+ * @param coin_sig signature that must not be in @a history
+ * @return #GNUNET_OK if @a coin_sig is not in @a history
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_coin_signature_conflict (
+  const json_t *history,
+  const struct TALER_CoinSpendSignatureP *coin_sig);
+
+
+/**
+ * Response to a GET /coins/$COIN_PUB/history request.
+ */
+struct TALER_EXCHANGE_CoinHistory
+{
+  /**
+   * High-level HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on @e hr.http_status.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success, if
+     * @e hr.http_status is #MHD_HTTP_OK
+     */
+    struct
+    {
+
+      /**
+       * Coin transaction history (possibly partial).
+       * Not yet validated, combine with other already
+       * known history data for this coin and then use
+       * #TALER_EXCHANGE_parse_coin_history() to validate
+       * the complete history and obtain it in binary
+       * format.
+       */
+      const json_t *history;
+
+      /**
+       * The hash of the coin denomination's public key
+       */
+      struct TALER_DenominationHashP h_denom_pub;
+
+      /**
+       * Coin balance.
+       */
+      struct TALER_Amount balance;
+
+    } ok;
+
+  } details;
+
+};
+
+
+/**
+ * Signature of functions called with the result of
+ * a coin transaction history request.
+ *
+ * @param cls closure
+ * @param ch transaction history for the coin
+ */
+typedef void
+(*TALER_EXCHANGE_CoinsHistoryCallback)(
+  void *cls,
+  const struct TALER_EXCHANGE_CoinHistory *ch);
+
+
+/**
+ * Parses and verifies a coin's transaction history as
+ * returned by the exchange. Note that a client may
+ * have to combine multiple partial coin histories
+ * into one coherent history before calling this function.
+ *
+ * @param ctx context for managing request
+ * @param url base URL of the exchange
+ * @param coin_priv private key of the coin
+ * @param start_off offset from which on to request history
+ * @param cb function to call with results
+ * @param cb_cls closure for @a cb
+ * @return #GNUNET_OK if @a history is valid,
+ *         #GNUNET_SYSERR if not
+ */
+struct TALER_EXCHANGE_CoinsHistoryHandle *
+TALER_EXCHANGE_coins_history (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  uint64_t start_off,
+  TALER_EXCHANGE_CoinsHistoryCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_coins_history() operation.
+ *
+ * @param[in] rsh operation to cancel
+ */
+void
+TALER_EXCHANGE_coins_history_cancel (
+  struct TALER_EXCHANGE_CoinsHistoryHandle *rsh);
+
+
 /* ********************* GET /reserves/$RESERVE_PUB *********************** */
 
 /**
@@ -1311,6 +1936,11 @@ enum TALER_EXCHANGE_ReserveTransactionType
   TALER_EXCHANGE_RTT_WITHDRAWAL,
 
   /**
+   * Age-Withdrawal from the reserve.
+   */
+  TALER_EXCHANGE_RTT_AGEWITHDRAWAL,
+
+  /**
    * /recoup operation.
    */
   TALER_EXCHANGE_RTT_RECOUP,
@@ -1318,6 +1948,21 @@ enum TALER_EXCHANGE_ReserveTransactionType
   /**
    * Reserve closed operation.
    */
+  TALER_EXCHANGE_RTT_CLOSING,
+
+  /**
+   * Reserve purse merge operation.
+   */
+  TALER_EXCHANGE_RTT_MERGE,
+
+  /**
+   * Reserve open request operation.
+   */
+  TALER_EXCHANGE_RTT_OPEN,
+
+  /**
+   * Reserve close request operation.
+   */
   TALER_EXCHANGE_RTT_CLOSE
 
 };
@@ -1386,6 +2031,28 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
     } withdraw;
 
     /**
+     * Information about withdraw operation.
+     * @e type is #TALER_EXCHANGE_RTT_AGEWITHDRAWAL.
+     */
+    struct
+    {
+      /**
+       * Signature authorizing the withdrawal for outgoing transaction.
+       */
+      json_t *out_authorization_sig;
+
+      /**
+       * Maximum age committed
+       */
+      uint8_t max_age;
+
+      /**
+       * Fee that was charged for the withdrawal.
+       */
+      struct TALER_Amount fee;
+    } age_withdraw;
+
+    /**
      * Information provided if the reserve was filled via /recoup.
      * @e type is #TALER_EXCHANGE_RTT_RECOUP.
      */
@@ -1422,7 +2089,7 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
     struct
     {
       /**
-       * Receiver account information for the outgoing wire transfer.
+       * Receiver account information for the outgoing wire transfer as a payto://-URI.
        */
       const char *receiver_account_details;
 
@@ -1454,6 +2121,131 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
 
     } close_details;
 
+    /**
+     * Information about a merge operation on the reserve.
+     * @e type is #TALER_EXCHANGE_RTT_MERGE.
+     */
+    struct
+    {
+
+      /**
+       * Fee paid for the purse.
+       */
+      struct TALER_Amount purse_fee;
+
+      /**
+       * Hash over the contract.
+       */
+      struct TALER_PrivateContractHashP h_contract_terms;
+
+      /**
+       * Merge capability key.
+       */
+      struct TALER_PurseMergePublicKeyP merge_pub;
+
+      /**
+       * Purse public key.
+       */
+      struct TALER_PurseContractPublicKeyP purse_pub;
+
+      /**
+       * Signature by the reserve approving the merge.
+       */
+      struct TALER_ReserveSignatureP reserve_sig;
+
+      /**
+       * When was the merge made.
+       */
+      struct GNUNET_TIME_Timestamp merge_timestamp;
+
+      /**
+       * When was the purse set to expire.
+       */
+      struct GNUNET_TIME_Timestamp purse_expiration;
+
+      /**
+       * Minimum age required for depositing into the purse.
+       */
+      uint32_t min_age;
+
+      /**
+       * Flags of the purse.
+       */
+      enum TALER_WalletAccountMergeFlags flags;
+
+      /**
+       * True if the purse was actually merged, false
+       * if only the @e purse_fee was charged.
+       */
+      bool merged;
+
+    } merge_details;
+
+    /**
+     * Information about an open request operation on the reserve.
+     * @e type is #TALER_EXCHANGE_RTT_OPEN.
+     */
+    struct
+    {
+
+      /**
+       * Signature by the reserve approving the open.
+       */
+      struct TALER_ReserveSignatureP reserve_sig;
+
+      /**
+       * Amount to be paid from the reserve balance to open
+       * the reserve.
+       */
+      struct TALER_Amount reserve_payment;
+
+      /**
+       * When was the request created.
+       */
+      struct GNUNET_TIME_Timestamp request_timestamp;
+
+      /**
+       * For how long should the reserve be kept open.
+       * (Determines amount to be paid.)
+       */
+      struct GNUNET_TIME_Timestamp reserve_expiration;
+
+      /**
+       * How many open purses should be included with the
+       * open reserve?
+       * (Determines amount to be paid.)
+       */
+      uint32_t purse_limit;
+
+    } open_request;
+
+    /**
+     * Information about an close request operation on the reserve.
+     * @e type is #TALER_EXCHANGE_RTT_CLOSE.
+     */
+    struct
+    {
+
+      /**
+       * Signature by the reserve approving the close.
+       */
+      struct TALER_ReserveSignatureP reserve_sig;
+
+      /**
+       * When was the request created.
+       */
+      struct GNUNET_TIME_Timestamp request_timestamp;
+
+      /**
+       * Hash of the payto://-URI of the target account
+       * for the closure, or all zeros for the reserve
+       * origin account.
+       */
+      struct TALER_PaytoHashP target_account_h_payto;
+
+    } close_request;
+
+
   } details;
 
 };
@@ -1523,7 +2315,8 @@ typedef void
  * reply is not well-formed, we return an HTTP status code of zero to
  * @a cb.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
  * @param reserve_pub public key of the reserve to inspect
  * @param timeout how long to wait for an affirmative reply
  *        (enables long polling if the reserve does not yet exist)
@@ -1534,7 +2327,8 @@ typedef void
  */
 struct TALER_EXCHANGE_ReservesGetHandle *
 TALER_EXCHANGE_reserves_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   struct GNUNET_TIME_Relative timeout,
   TALER_EXCHANGE_ReservesGetCallback cb,
@@ -1553,15 +2347,15 @@ TALER_EXCHANGE_reserves_get_cancel (
 
 
 /**
- * @brief A /reserves/$RID/status Handle
+ * @brief A /reserves/$RID/history Handle
  */
-struct TALER_EXCHANGE_ReservesStatusHandle;
+struct TALER_EXCHANGE_ReservesHistoryHandle;
 
 
 /**
- * @brief Reserve status details.
+ * @brief Reserve history details.
  */
-struct TALER_EXCHANGE_ReserveStatus
+struct TALER_EXCHANGE_ReserveHistory
 {
 
   /**
@@ -1570,14 +2364,14 @@ struct TALER_EXCHANGE_ReserveStatus
   struct TALER_EXCHANGE_HttpResponse hr;
 
   /**
-   * Details depending on @e hr.http_status.
+   * Details depending on @e hr.http_history.
    */
   union
   {
 
     /**
      * Information returned on success, if
-     * @e hr.http_status is #MHD_HTTP_OK
+     * @e hr.http_history is #MHD_HTTP_OK
      */
     struct
     {
@@ -1599,6 +2393,13 @@ struct TALER_EXCHANGE_ReserveStatus
       struct TALER_Amount total_out;
 
       /**
+       * Current etag / last entry in the history.
+       * Useful to filter requests by starting offset.
+       * Offsets are not necessarily contiguous.
+       */
+      uint64_t etag;
+
+      /**
        * Reserve history.
        */
       const struct TALER_EXCHANGE_ReserveHistoryEntry *history;
@@ -1608,16 +2409,6 @@ struct TALER_EXCHANGE_ReserveStatus
        */
       unsigned int history_len;
 
-      /**
-       * KYC passed?
-       */
-      bool kyc_ok;
-
-      /**
-       * KYC required to withdraw?
-       */
-      bool kyc_required;
-
     } ok;
 
   } details;
@@ -1627,176 +2418,483 @@ struct TALER_EXCHANGE_ReserveStatus
 
 /**
  * Callbacks of this type are used to serve the result of submitting a
- * reserve status request to a exchange.
+ * reserve history request to a exchange.
  *
  * @param cls closure
  * @param rs HTTP response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesStatusCallback) (
+(*TALER_EXCHANGE_ReservesHistoryCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveStatus *rs);
+  const struct TALER_EXCHANGE_ReserveHistory *rs);
 
 
 /**
- * Submit a request to obtain the reserve status.
+ * Submit a request to obtain the reserve history.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param reserve_priv private key of the reserve to inspect
+ * @param start_off offset of the oldest history entry to exclude from the response
  * @param cb the callback to call when a reply for this request is available
  * @param cb_cls closure for the above callback
  * @return a handle for this request; NULL if the inputs are invalid (i.e.
  *         signatures fail to verify).  In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReservesStatusHandle *
-TALER_EXCHANGE_reserves_status (
-  struct TALER_EXCHANGE_Handle *exchange,
+struct TALER_EXCHANGE_ReservesHistoryHandle *
+TALER_EXCHANGE_reserves_history (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_ReservesStatusCallback cb,
+  uint64_t start_off,
+  TALER_EXCHANGE_ReservesHistoryCallback cb,
   void *cb_cls);
 
 
 /**
- * Cancel a reserve status request.  This function cannot be used
+ * Cancel a reserve history request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
  * @param rsh the reserve request handle
  */
 void
-TALER_EXCHANGE_reserves_status_cancel (
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh);
+TALER_EXCHANGE_reserves_history_cancel (
+  struct TALER_EXCHANGE_ReservesHistoryHandle *rsh);
 
 
 /**
- * @brief A /reserves/$RID/history Handle
+ * Information input into the withdraw process per coin.
  */
-struct TALER_EXCHANGE_ReservesHistoryHandle;
+struct TALER_EXCHANGE_WithdrawCoinInput
+{
+  /**
+   * Denomination of the coin.
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *pk;
+
+  /**
+   * Master key material for the coin.
+   */
+  const struct TALER_PlanchetMasterSecretP *ps;
+
+  /**
+   * Age commitment for the coin.
+   */
+  const struct TALER_AgeCommitmentHash *ach;
+
+};
 
 
 /**
- * @brief Reserve history details.
+ * All the details about a coin that are generated during withdrawal and that
+ * may be needed for future operations on the coin.
  */
-struct TALER_EXCHANGE_ReserveHistory
+struct TALER_EXCHANGE_PrivateCoinDetails
 {
+  /**
+   * Private key of the coin.
+   */
+  struct TALER_CoinSpendPrivateKeyP coin_priv;
 
   /**
-   * High-level HTTP response details.
+   * Value used to blind the key for the signature.
+   * Needed for recoup operations.
+   */
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+
+  /**
+   * Signature over the coin.
+   */
+  struct TALER_DenominationSignature sig;
+
+  /**
+   * Values contributed from the exchange during the
+   * withdraw protocol.
+   */
+  struct TALER_ExchangeWithdrawValues exchange_vals;
+};
+
+
+/**
+ * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle
+ */
+struct TALER_EXCHANGE_BatchWithdrawHandle;
+
+
+/**
+ * Details about a response for a batch withdraw request.
+ */
+struct TALER_EXCHANGE_BatchWithdrawResponse
+{
+  /**
+   * HTTP response data.
    */
   struct TALER_EXCHANGE_HttpResponse hr;
 
   /**
-   * Details depending on @e hr.http_status.
+   * Details about the response.
    */
   union
   {
-
     /**
-     * Information returned on success, if
-     * @e hr.http_status is #MHD_HTTP_OK
+     * Details if the status is #MHD_HTTP_OK.
      */
     struct
     {
 
       /**
-       * Reserve balance. May not be the difference between
-       * @e total_in and @e total_out because the @e may be truncated
-       * due to expiration.
+       * Array of coins returned by the batch withdraw operation.
        */
-      struct TALER_Amount balance;
+      struct TALER_EXCHANGE_PrivateCoinDetails *coins;
 
       /**
-       * Total of all inbound transactions in @e history.
+       * Length of the @e coins array.
        */
-      struct TALER_Amount total_in;
+      unsigned int num_coins;
+    } ok;
+
+    /**
+     * Details if the status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+     */
+    struct
+    {
 
       /**
-       * Total of all outbound transactions in @e history.
+       * Hash of the payto-URI of the account to KYC;
        */
-      struct TALER_Amount total_out;
+      struct TALER_PaytoHashP h_payto;
 
       /**
-       * Reserve history.
+       * Legitimization requirement that the merchant should use
+       * to check for its KYC status, 0 if not known.
        */
-      const struct TALER_EXCHANGE_ReserveHistoryEntry *history;
+      uint64_t requirement_row;
+    } unavailable_for_legal_reasons;
 
+    /**
+     * Details if the status is #MHD_HTTP_CONFLICT.
+     */
+    struct
+    {
+      /* TODO: returning full details is not implemented */
+    } conflict;
+
+    /**
+     * Details if the status is #MHD_HTTP_GONE.
+     */
+    struct
+    {
+      /* TODO: returning full details is not implemented */
+    } gone;
+
+  } details;
+};
+
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * batch withdraw request to a exchange.
+ *
+ * @param cls closure
+ * @param wr response details
+ */
+typedef void
+(*TALER_EXCHANGE_BatchWithdrawCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_BatchWithdrawResponse *wr);
+
+
+/**
+ * Withdraw multiple coins from the exchange using a /reserves/$RESERVE_PUB/batch-withdraw
+ * request.  This API is typically used by a wallet to withdraw many coins from a
+ * reserve.  The blind signatures are unblinded and verified before being returned
+ * to the caller at @a res_cb.
+ *
+ * Note that to ensure that no money is lost in case of hardware
+ * failures, the caller must have committed (most of) the arguments to
+ * disk before calling, and be ready to repeat the request with the
+ * same arguments in case of failures.
+ *
+ * @param curl_ctx The curl context to use
+ * @param exchange_url The base-URL of the exchange
+ * @param keys The /keys material from the exchange
+ * @param reserve_priv private key of the reserve to withdraw from
+ * @param wci_length number of entries in @a wcis
+ * @param wcis inputs that determine the planchets
+ * @param res_cb the callback to call when the final result for this request is available
+ * @param res_cb_cls closure for @a res_cb
+ * @return NULL
+ *         if the inputs are invalid (i.e. denomination key not with this exchange).
+ *         In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_BatchWithdrawHandle *
+TALER_EXCHANGE_batch_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  unsigned int wci_length,
+  const struct TALER_EXCHANGE_WithdrawCoinInput wcis[static wci_length],
+  TALER_EXCHANGE_BatchWithdrawCallback res_cb,
+  void *res_cb_cls);
+
+
+/**
+ * Cancel a batch withdraw status request.  This function cannot be used on a
+ * request handle if a response is already served for it.
+ *
+ * @param wh the batch withdraw handle
+ */
+void
+TALER_EXCHANGE_batch_withdraw_cancel (
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh);
+
+
+/**
+ * Response from a withdraw2 request.
+ */
+struct TALER_EXCHANGE_Withdraw2Response
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Details if HTTP status is #MHD_HTTP_OK.
+     */
+    struct
+    {
       /**
-       * Length of the @e history array.
+       * blind signature over the coin
        */
-      unsigned int history_len;
+      struct TALER_BlindedDenominationSignature blind_sig;
+    } ok;
+  } details;
+
+};
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * withdraw request to a exchange without the (un)blinding factor.
+ *
+ * @param cls closure
+ * @param w2r response data
+ */
+typedef void
+(*TALER_EXCHANGE_Withdraw2Callback) (
+  void *cls,
+  const struct TALER_EXCHANGE_Withdraw2Response *w2r);
+
+
+/**
+ * @brief A /reserves/$RESERVE_PUB/withdraw Handle, 2nd variant.
+ * This variant does not do the blinding/unblinding and only
+ * fetches the blind signature on the already blinded planchet.
+ * Used internally by the `struct TALER_EXCHANGE_WithdrawHandle`
+ * implementation as well as for the tipping logic of merchants.
+ */
+struct TALER_EXCHANGE_Withdraw2Handle;
+
+
+/**
+ * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/withdraw
+ * request.  This API is typically used by a merchant to withdraw a tip
+ * where the blinding factor is unknown to the merchant.  Note that unlike
+ * the #TALER_EXCHANGE_batch_withdraw() API, this API neither unblinds the signatures
+ * nor can it verify that the exchange signatures are valid, so these tasks
+ * are left to the caller. Wallets probably should use #TALER_EXCHANGE_batch_withdraw()
+ * which integrates these steps.
+ *
+ * Note that to ensure that no money is lost in case of hardware
+ * failures, the caller must have committed (most of) the arguments to
+ * disk before calling, and be ready to repeat the request with the
+ * same arguments in case of failures.
+ *
+ * @param curl_ctx The curl-context to use
+ * @param exchange_url The base-URL of the exchange
+ * @param keys The /keys material from the exchange
+ * @param pd planchet details of the planchet to withdraw
+ * @param reserve_priv private key of the reserve to withdraw from
+ * @param res_cb the callback to call when the final result for this request is available
+ * @param res_cb_cls closure for @a res_cb
+ * @return NULL
+ *         if the inputs are invalid (i.e. denomination key not with this exchange).
+ *         In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_Withdraw2Handle *
+TALER_EXCHANGE_withdraw2 (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_PlanchetDetail *pd,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  TALER_EXCHANGE_Withdraw2Callback res_cb,
+  void *res_cb_cls);
+
+
+/**
+ * Cancel a withdraw status request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param wh the withdraw handle
+ */
+void
+TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh);
+
+
+/**
+ * Response from a batch-withdraw request (2nd variant).
+ */
+struct TALER_EXCHANGE_BatchWithdraw2Response
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
 
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Details if HTTP status is #MHD_HTTP_OK.
+     */
+    struct
+    {
       /**
-       * KYC passed?
+       * array of blind signatures over the coins.
        */
-      bool kyc_ok;
+      const struct TALER_BlindedDenominationSignature *blind_sigs;
 
       /**
-       * KYC required to withdraw?
+       * length of @e blind_sigs
        */
-      bool kyc_required;
+      unsigned int blind_sigs_length;
 
     } ok;
 
+    struct
+    {
+      /**
+       * Hash of the payto-URI of the account to KYC;
+       */
+      struct TALER_PaytoHashP h_payto;
+
+      /**
+       * ID identifying the KYC requirement to withdraw.
+       */
+      uint64_t kyc_requirement_id;
+
+    } unavailable_for_legal_reasons;
+
   } details;
 
 };
 
 
 /**
- * Callbacks of this type are used to serve the result of submitting a
- * reserve history request to a exchange.
+ * Callbacks of this type are used to serve the result of submitting a batch
+ * withdraw request to a exchange without the (un)blinding factor.
  *
  * @param cls closure
- * @param rs HTTP response data
+ * @param bw2r response data
  */
 typedef void
-(*TALER_EXCHANGE_ReservesHistoryCallback) (
+(*TALER_EXCHANGE_BatchWithdraw2Callback) (
   void *cls,
-  const struct TALER_EXCHANGE_ReserveHistory *rs);
+  const struct TALER_EXCHANGE_BatchWithdraw2Response *bw2r);
 
 
 /**
- * Submit a request to obtain the reserve history.
+ * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle, 2nd variant.
+ * This variant does not do the blinding/unblinding and only
+ * fetches the blind signatures on the already blinded planchets.
+ * Used internally by the `struct TALER_EXCHANGE_BatchWithdrawHandle`
+ * implementation as well as for the tipping logic of merchants.
+ */
+struct TALER_EXCHANGE_BatchWithdraw2Handle;
+
+
+/**
+ * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/batch-withdraw
+ * request.  This API is typically used by a merchant to withdraw a tip
+ * where the blinding factor is unknown to the merchant.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param reserve_priv private key of the reserve to inspect
- * @param cb the callback to call when a reply for this request is available
- * @param cb_cls closure for the above callback
- * @return a handle for this request; NULL if the inputs are invalid (i.e.
- *         signatures fail to verify).  In this case, the callback is not called.
+ * Note that to ensure that no money is lost in case of hardware
+ * failures, the caller must have committed (most of) the arguments to
+ * disk before calling, and be ready to repeat the request with the
+ * same arguments in case of failures.
+ *
+ * @param curl_ctx The curl context to use
+ * @param exchange_url The base-URL of the exchange
+ * @param keys The /keys material from the exchange
+ * @param pds array of planchet details of the planchet to withdraw
+ * @param pds_length number of entries in the @a pds array
+ * @param reserve_priv private key of the reserve to withdraw from
+ * @param res_cb the callback to call when the final result for this request is available
+ * @param res_cb_cls closure for @a res_cb
+ * @return NULL
+ *         if the inputs are invalid (i.e. denomination key not with this exchange).
+ *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_ReservesHistoryHandle *
-TALER_EXCHANGE_reserves_history (
-  struct TALER_EXCHANGE_Handle *exchange,
+struct TALER_EXCHANGE_BatchWithdraw2Handle *
+TALER_EXCHANGE_batch_withdraw2 (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_ReservesHistoryCallback cb,
-  void *cb_cls);
+  unsigned int pds_length,
+  const struct TALER_PlanchetDetail pds[static pds_length],
+  TALER_EXCHANGE_BatchWithdraw2Callback res_cb,
+  void *res_cb_cls);
 
 
 /**
- * Cancel a reserve history request.  This function cannot be used
+ * Cancel a batch withdraw request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param rsh the reserve request handle
+ * @param wh the withdraw handle
  */
 void
-TALER_EXCHANGE_reserves_history_cancel (
-  struct TALER_EXCHANGE_ReservesHistoryHandle *rsh);
+TALER_EXCHANGE_batch_withdraw2_cancel (
+  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh);
 
 
-/* ********************* POST /reserves/$RESERVE_PUB/withdraw *********************** */
-
+/* ********************* /reserve/$RESERVE_PUB/age-withdraw *************** */
 
 /**
- * @brief A /reserves/$RESERVE_PUB/withdraw Handle
+ * @brief Information needed to withdraw (and reveal) age restricted coins.
  */
-struct TALER_EXCHANGE_WithdrawHandle;
+struct TALER_EXCHANGE_AgeWithdrawCoinInput
+{
+  /**
+   * The master secret from which we derive all other relevant values for
+   * the coin: private key, nonces (if applicable) and age restriction
+   */
+  struct TALER_PlanchetMasterSecretP secrets[TALER_CNC_KAPPA];
+
+  /**
+   * The denomination of the coin.  Must support age restriction, i.e
+   * its .keys.age_mask MUST not be 0
+   */
+  struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+};
 
 
 /**
- * All the details about a coin that are generated during withdrawal and that
- * may be needed for future operations on the coin.
+ * All the details about a coin that are generated during age-withdrawal and
+ * that may be needed for future operations on the coin.
  */
-struct TALER_EXCHANGE_PrivateCoinDetails
+struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails
 {
   /**
    * Private key of the coin.
@@ -1804,28 +2902,48 @@ struct TALER_EXCHANGE_PrivateCoinDetails
   struct TALER_CoinSpendPrivateKeyP coin_priv;
 
   /**
+   * Hash of the public key of the coin.
+   */
+  struct TALER_CoinPubHashP h_coin_pub;
+
+  /**
    * Value used to blind the key for the signature.
    * Needed for recoup operations.
    */
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP blinding_key;
 
   /**
-   * Signature over the coin.
+   * The age commitment, proof for the coin, derived from the
+   * Master secret and maximum age in the originating request
    */
-  struct TALER_DenominationSignature sig;
+  struct TALER_AgeCommitmentProof age_commitment_proof;
+
+  /**
+   * The hash of the age commitment
+   */
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
    * Values contributed from the exchange during the
    * withdraw protocol.
    */
-  struct TALER_ExchangeWithdrawValues exchange_vals;
+  struct TALER_ExchangeWithdrawValues alg_values;
+
+  /**
+   * The planchet constructed
+   */
+  struct TALER_PlanchetDetail planchet;
 };
 
+/**
+ * @brief A handle to a /reserves/$RESERVE_PUB/age-withdraw request
+ */
+struct TALER_EXCHANGE_AgeWithdrawHandle;
 
 /**
- * Details about a response for a withdraw request.
+ * @brief Details about the response for a age withdraw request.
  */
-struct TALER_EXCHANGE_WithdrawResponse
+struct TALER_EXCHANGE_AgeWithdrawResponse
 {
   /**
    * HTTP response data.
@@ -1833,163 +2951,333 @@ struct TALER_EXCHANGE_WithdrawResponse
   struct TALER_EXCHANGE_HttpResponse hr;
 
   /**
-   * Details about the response.
+   * Details about the response
    */
   union
   {
     /**
      * Details if the status is #MHD_HTTP_OK.
      */
-    struct TALER_EXCHANGE_PrivateCoinDetails success;
-
-    /**
-     * Details if the status is #MHD_HTTP_ACCEPTED.
-     */
     struct
     {
       /**
-       * Payment target that the merchant should use
-       * to check for its KYC status.
+       * Index that should not be revealed during the age-withdraw reveal
+       * phase.
        */
-      uint64_t payment_target_uuid;
-    } accepted;
+      uint8_t noreveal_index;
 
-    /**
-     * Details if the status is #MHD_HTTP_CONFLICT.
-     */
-    struct
-    {
-      /* TODO: returning full details is not implemented */
-    } conflict;
+      /**
+       * The commitment of the age-withdraw request, needed for the
+       * subsequent call to /age-withdraw/$ACH/reveal
+       */
+      struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+      /**
+       * The number of elements in @e coins, each referring to
+       * TALER_CNC_KAPPA elements
+       */
+      size_t num_coins;
+
+      /**
+       * The computed details of the non-revealed @e num_coins coins to keep.
+       */
+      const struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails *coin_details;
+
+      /**
+       * The array of blinded hashes of the non-revealed
+       * @e num_coins coins, needed for the reveal step;
+       */
+      const struct TALER_BlindedCoinHashP *blinded_coin_hs;
+
+      /**
+       * Key used by the exchange to sign the response.
+       */
+      struct TALER_ExchangePublicKeyP exchange_pub;
+    } ok;
+  } details;
+};
+
+
+typedef void
+(*TALER_EXCHANGE_AgeWithdrawCallback)(
+  void *cls,
+  const struct TALER_EXCHANGE_AgeWithdrawResponse *awr);
+
+/**
+ * Submit an age-withdraw request to the exchange and get the exchange's
+ * response.
+ *
+ * This API is typically used by a wallet.  Note that to ensure that
+ * no money is lost in case of hardware failures, the provided
+ * argument @a rd should be committed to persistent storage
+ * prior to calling this function.
+ *
+ * @param curl_ctx The curl context
+ * @param exchange_url The base url of the exchange
+ * @param keys The denomination keys from the exchange
+ * @param reserve_priv The private key to the reserve
+ * @param num_coins The number of elements in @e coin_inputs
+ * @param coin_inputs The input for the coins to withdraw
+ * @param max_age The maximum age we commit to.
+ * @param res_cb A callback for the result, maybe NULL
+ * @param res_cb_cls A closure for @e res_cb, maybe NULL
+ * @return a handle for this request; NULL if the argument was invalid.
+ *         In this case, the callback will not be called.
+ */
+struct TALER_EXCHANGE_AgeWithdrawHandle *
+TALER_EXCHANGE_age_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  struct TALER_EXCHANGE_Keys *keys,
+  const char *exchange_url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[static
+                                                               num_coins],
+  uint8_t max_age,
+  TALER_EXCHANGE_AgeWithdrawCallback res_cb,
+  void *res_cb_cls);
+
+/**
+ * Cancel a age-withdraw request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param awh the age-withdraw handle
+ */
+void
+TALER_EXCHANGE_age_withdraw_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh);
+
+
+/**++++++ age-withdraw with pre-blinded planchets ***************************/
 
+/**
+ * @brief Information needed to withdraw (and reveal) age restricted coins.
+ */
+struct TALER_EXCHANGE_AgeWithdrawBlindedInput
+{
+  /**
+   * The denomination of the coin.  Must support age restriction, i.e
+   * its .keys.age_mask MUST not be 0
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+
+  /**
+   * Blinded Planchets
+   */
+  struct TALER_PlanchetDetail planchet_details[TALER_CNC_KAPPA];
+};
+
+/**
+ * Response from an age-withdraw request with pre-blinded planchets
+ */
+struct TALER_EXCHANGE_AgeWithdrawBlindedResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
     /**
-     * Details if the status is #MHD_HTTP_GONE.
+     * Details if HTTP status is #MHD_HTTP_OK.
      */
     struct
     {
-      /* TODO: returning full details is not implemented */
-    } gone;
+      /**
+       * Index that should not be revealed during the age-withdraw reveal phase.
+       * The struct TALER_PlanchetMasterSecretP * from the request
+       * with this index are the ones to keep.
+       */
+      uint8_t noreveal_index;
 
+      /**
+       * The commitment of the call to age-withdraw, needed for the subsequent
+       * call to /age-withdraw/$ACH/reveal.
+       */
+      struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+      /**
+       * Key used by the exchange to sign the response.
+       */
+      struct TALER_ExchangePublicKeyP exchange_pub;
+
+    } ok;
   } details;
+
 };
 
 
 /**
- * Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a exchange.
+ * Callbacks of this type are used to serve the result of submitting an
+ * age-withdraw request to a exchange with pre-blinded planchets
+ * without the (un)blinding factor.
  *
  * @param cls closure
- * @param wr response details
+ * @param awbr response data
  */
 typedef void
-(*TALER_EXCHANGE_WithdrawCallback) (
+(*TALER_EXCHANGE_AgeWithdrawBlindedCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_WithdrawResponse *wr);
+  const struct TALER_EXCHANGE_AgeWithdrawBlindedResponse *awbr);
 
 
 /**
- * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/withdraw
- * request.  This API is typically used by a wallet to withdraw from a
- * reserve.
+ * @brief A /reserves/$RESERVE_PUB/age-withdraw Handle, 2nd variant with
+ * pre-blinded planchets.
+ *
+ * This variant does not do the blinding/unblinding and only
+ * fetches the blind signatures on the already blinded planchets.
+ * Used internally by the `struct TALER_EXCHANGE_BatchWithdrawHandle`
+ * implementation as well as for the reward logic of merchants.
+ */
+struct TALER_EXCHANGE_AgeWithdrawBlindedHandle;
+
+/**
+ * Withdraw age-restricted coins from the exchange using a
+ * /reserves/$RESERVE_PUB/age-withdraw request.  This API is typically used
+ * by a merchant to withdraw a reward where the planchets are pre-blinded and
+ * the blinding factor is unknown to the merchant.
  *
  * Note that to ensure that no money is lost in case of hardware
  * failures, the caller must have committed (most of) the arguments to
  * disk before calling, and be ready to repeat the request with the
  * same arguments in case of failures.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param pk kind of coin to create
+ * @param curl_ctx The curl context to use
+ * @param exchange_url The base-URL of the exchange
+ * @param keys The /keys material from the exchange
+ * @param max_age The maximum age that the coins are committed to.
+ * @param num_input number of entries in the @a blinded_input array
+ * @param blinded_input array of planchet details of the planchet to withdraw
  * @param reserve_priv private key of the reserve to withdraw from
- * @param ps secrets of the planchet
- *        caller must have committed this value to disk before the call (with @a pk)
- * @param ach hash of the age commitment that should be bound to this coin. Maybe NULL.
  * @param res_cb the callback to call when the final result for this request is available
  * @param res_cb_cls closure for @a res_cb
  * @return NULL
  *         if the inputs are invalid (i.e. denomination key not with this exchange).
  *         In this case, the callback is not called.
  */
-struct TALER_EXCHANGE_WithdrawHandle *
-TALER_EXCHANGE_withdraw (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *
+TALER_EXCHANGE_age_withdraw_blinded (
+  struct GNUNET_CURL_Context *curl_ctx,
+  struct TALER_EXCHANGE_Keys *keys,
+  const char *exchange_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_PlanchetMasterSecretP *ps,
-  const struct TALER_AgeCommitmentHash *ach,
-  TALER_EXCHANGE_WithdrawCallback res_cb,
+  uint8_t max_age,
+  unsigned int num_input,
+  const struct TALER_EXCHANGE_AgeWithdrawBlindedInput blinded_input[static
+                                                                    num_input],
+  TALER_EXCHANGE_AgeWithdrawBlindedCallback res_cb,
   void *res_cb_cls);
 
 
 /**
- * Cancel a withdraw status request.  This function cannot be used
+ * Cancel an age-withdraw request.  This function cannot be used
  * on a request handle if a response is already served for it.
  *
- * @param wh the withdraw handle
+ * @param awbh the age-withdraw handle
  */
 void
-TALER_EXCHANGE_withdraw_cancel (struct TALER_EXCHANGE_WithdrawHandle *wh);
+TALER_EXCHANGE_age_withdraw_blinded_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh);
+
 
+/* ********************* /age-withdraw/$ACH/reveal ************************ */
 
 /**
- * Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a exchange without the (un)blinding factor.
- *
- * @param cls closure
- * @param hr HTTP response data
- * @param blind_sig blind signature over the coin, NULL on error
+ * @brief A handle to a /age-withdraw/$ACH/reveal request
  */
-typedef void
-(*TALER_EXCHANGE_Withdraw2Callback) (
-  void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_BlindedDenominationSignature *blind_sig);
-
+struct TALER_EXCHANGE_AgeWithdrawRevealHandle;
 
 /**
- * @brief A /reserves/$RESERVE_PUB/withdraw Handle, 2nd variant.
- * This variant does not do the blinding/unblinding and only
- * fetches the blind signature on the already blinded planchet.
- * Used internally by the `struct TALER_EXCHANGE_WithdrawHandle`
- * implementation as well as for the tipping logic of merchants.
+ * The response from a /age-withdraw/$ACH/reveal request
  */
-struct TALER_EXCHANGE_Withdraw2Handle;
+struct TALER_EXCHANGE_AgeWithdrawRevealResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details about the response
+   */
+  union
+  {
+    /**
+     * Details if the status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * Number of signatures returned.
+       */
+      unsigned int num_sigs;
 
+      /**
+       * Array of @e num_coins blinded denomination signatures, giving each
+       * coin its value and validity. The array give these coins in the same
+       * order (and should have the same length) in which the original
+       * age-withdraw request specified the respective denomination keys.
+       */
+      const struct TALER_BlindedDenominationSignature *blinded_denom_sigs;
+
+    } ok;
+  } details;
+
+};
+
+typedef void
+(*TALER_EXCHANGE_AgeWithdrawRevealCallback)(
+  void *cls,
+  const struct TALER_EXCHANGE_AgeWithdrawRevealResponse *awr);
 
 /**
- * Withdraw a coin from the exchange using a /reserves/$RESERVE_PUB/withdraw
- * request.  This API is typically used by a merchant to withdraw a tip
- * where the blinding factor is unknown to the merchant.
+ * Submit an age-withdraw-reveal request to the exchange and get the exchange's
+ * response.
  *
- * Note that to ensure that no money is lost in case of hardware
- * failures, the caller must have committed (most of) the arguments to
- * disk before calling, and be ready to repeat the request with the
- * same arguments in case of failures.
+ * This API is typically used by a wallet.  Note that to ensure that
+ * no money is lost in case of hardware failures, the provided
+ * argument @a rd should be committed to persistent storage
+ * prior to calling this function.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param pd planchet details of the planchet to withdraw
- * @param reserve_priv private key of the reserve to withdraw from
- * @param res_cb the callback to call when the final result for this request is available
- * @param res_cb_cls closure for @a res_cb
- * @return NULL
- *         if the inputs are invalid (i.e. denomination key not with this exchange).
- *         In this case, the callback is not called.
- */
-struct TALER_EXCHANGE_Withdraw2Handle *
-TALER_EXCHANGE_withdraw2 (struct TALER_EXCHANGE_Handle *exchange,
-                          const struct TALER_PlanchetDetail *pd,
-                          const struct TALER_ReservePrivateKeyP *reserve_priv,
-                          TALER_EXCHANGE_Withdraw2Callback res_cb,
-                          void *res_cb_cls);
+ * @param curl_ctx The curl context
+ * @param exchange_url The base url of the exchange
+ * @param num_coins The number of elements in @e coin_inputs and @e alg_values
+ * @param coin_inputs The input for the coins to withdraw, same as in the previous call to /age-withdraw
+ * @param noreveal_index The index into each of the kappa coin candidates, that should not be revealed to the exchange
+ * @param h_commitment The commmitment from the previous call to /age-withdraw
+ * @param reserve_pub The public key of the reserve the original call to /age-withdraw was made to
+ * @param res_cb A callback for the result, maybe NULL
+ * @param res_cb_cls A closure for @e res_cb, maybe NULL
+ * @return a handle for this request; NULL if the argument was invalid.
+ *         In this case, the callback will not be called.
+ */
+struct TALER_EXCHANGE_AgeWithdrawRevealHandle *
+TALER_EXCHANGE_age_withdraw_reveal (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[static
+                                                               num_coins],
+  uint8_t noreveal_index,
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  TALER_EXCHANGE_AgeWithdrawRevealCallback res_cb,
+  void *res_cb_cls);
 
 
 /**
- * Cancel a withdraw status request.  This function cannot be used
- * on a request handle if a response is already served for it.
+ * @brief Cancel an age-withdraw-reveal request
  *
- * @param wh the withdraw handle
+ * @param awrh Handle to an age-withdraw-reqveal request
  */
 void
-TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh);
+TALER_EXCHANGE_age_withdraw_reveal_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh);
 
 
 /* ********************* /refresh/melt+reveal ***************************** */
@@ -1998,7 +3286,8 @@ TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh);
 /**
  * Information needed to melt (partially spent) coins to obtain fresh coins
  * that are unlinkable to the original coin(s).  Note that melting more than
- * one coin in a single request will make those coins linkable, so we only melt one coin at a time.
+ * one coin in a single request will make those coins linkable, so we only melt
+ * one coin at a time.
  */
 struct TALER_EXCHANGE_RefreshData
 {
@@ -2007,11 +3296,16 @@ struct TALER_EXCHANGE_RefreshData
    */
   struct TALER_CoinSpendPrivateKeyP melt_priv;
 
-  /*
-   * age commitment and proof and its hash that went into the original coin,
+  /**
+   * age commitment and proof that went into the original coin,
    * might be NULL.
    */
   const struct TALER_AgeCommitmentProof *melt_age_commitment_proof;
+
+  /**
+   * Hash of age commitment and proof that went into the original coin,
+   * might be NULL.
+   */
   const struct TALER_AgeCommitmentHash *melt_h_age_commitment;
 
   /**
@@ -2082,7 +3376,7 @@ struct TALER_EXCHANGE_MeltResponse
   union
   {
     /**
-     * Results for status #MHD_HTTP_SUCCESS.
+     * Results for status #MHD_HTTP_OK.
      */
     struct
     {
@@ -2107,7 +3401,7 @@ struct TALER_EXCHANGE_MeltResponse
        * Gamma value chosen by the exchange.
        */
       uint32_t noreveal_index;
-    } success;
+    } ok;
 
   } details;
 };
@@ -2137,7 +3431,9 @@ typedef void
  * argument @a rd should be committed to persistent storage
  * prior to calling this function.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param rms the fresh secret that defines the refresh operation
  * @param rd the refresh data specifying the characteristics of the operation
  * @param melt_cb the callback to call with the result
@@ -2146,11 +3442,14 @@ typedef void
  *         In this case, neither callback will be called.
  */
 struct TALER_EXCHANGE_MeltHandle *
-TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange,
-                     const struct TALER_RefreshMasterSecretP *rms,
-                     const struct TALER_EXCHANGE_RefreshData *rd,
-                     TALER_EXCHANGE_MeltCallback melt_cb,
-                     void *melt_cb_cls);
+TALER_EXCHANGE_melt (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_RefreshMasterSecretP *rms,
+  const struct TALER_EXCHANGE_RefreshData *rd,
+  TALER_EXCHANGE_MeltCallback melt_cb,
+  void *melt_cb_cls);
 
 
 /**
@@ -2185,12 +3484,12 @@ struct TALER_EXCHANGE_RevealedCoinInfo
    * Age commitment and its hash of the coin, might be NULL.
    */
   struct TALER_AgeCommitmentProof *age_commitment_proof;
-  struct TALER_AgeCommitmentHash *h_age_commitment;
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
    * Blinding keys used to blind the fresh coin.
    */
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
 
   /**
    * Signature affirming the validity of the coin.
@@ -2217,7 +3516,7 @@ struct TALER_EXCHANGE_RevealResult
   union
   {
     /**
-     * Results for status #MHD_HTTP_SUCCESS.
+     * Results for status #MHD_HTTP_OK.
      */
     struct
     {
@@ -2233,7 +3532,7 @@ struct TALER_EXCHANGE_RevealResult
        * Number of coins returned.
        */
       unsigned int num_coins;
-    } success;
+    } ok;
 
   } details;
 
@@ -2270,7 +3569,8 @@ struct TALER_EXCHANGE_RefreshesRevealHandle;
  * arguments should have been committed to persistent storage
  * prior to calling this function.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
  * @param rms the fresh secret that defines the refresh operation
  * @param rd the refresh data that characterizes the refresh operation
  * @param num_coins number of fresh coins to be created, length of the @a exchange_vals array, must match value in @a rd
@@ -2285,11 +3585,12 @@ struct TALER_EXCHANGE_RefreshesRevealHandle;
  */
 struct TALER_EXCHANGE_RefreshesRevealHandle *
 TALER_EXCHANGE_refreshes_reveal (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
   const struct TALER_EXCHANGE_RefreshData *rd,
   unsigned int num_coins,
-  const struct TALER_ExchangeWithdrawValues *alg_values,
+  const struct TALER_ExchangeWithdrawValues alg_values[static num_coins],
   uint32_t noreveal_index,
   TALER_EXCHANGE_RefreshesRevealCallback reveal_cb,
   void *reveal_cb_cls);
@@ -2326,10 +3627,11 @@ struct TALER_EXCHANGE_LinkedCoinInfo
   struct TALER_CoinSpendPrivateKeyP coin_priv;
 
   /**
-   * Age commitment and its hash, if applicable.  Might be NULL.
+   * Age commitment and its hash, if applicable.
    */
-  struct TALER_AgeCommitmentProof *age_commitment_proof;
-  struct TALER_AgeCommitmentHash *h_age_commitment;
+  bool has_age_commitment;
+  struct TALER_AgeCommitmentProof age_commitment_proof;
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
    * Master secret of this coin.
@@ -2365,7 +3667,7 @@ struct TALER_EXCHANGE_LinkResult
   union
   {
     /**
-     * Results for status #MHD_HTTP_SUCCESS.
+     * Results for status #MHD_HTTP_OK.
      */
     struct
     {
@@ -2379,7 +3681,7 @@ struct TALER_EXCHANGE_LinkResult
        * Number of coins returned.
        */
       unsigned int num_coins;
-    } success;
+    } ok;
 
   } details;
 
@@ -2407,9 +3709,10 @@ typedef void
  * This API is typically not used by anyone, it is more a threat against those
  * trying to receive a funds transfer by abusing the refresh protocol.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx CURL context
+ * @param url exchange base URL
  * @param coin_priv private key to request link data for
- * @param age_commitment age commitment to the corresponding coin, might be NULL
+ * @param age_commitment_proof age commitment to the corresponding coin, might be NULL
  * @param link_cb the callback to call with the useful result of the
  *        refresh operation the @a coin_priv was involved in (if any)
  * @param link_cb_cls closure for @a link_cb
@@ -2417,7 +3720,8 @@ typedef void
  */
 struct TALER_EXCHANGE_LinkHandle *
 TALER_EXCHANGE_link (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   const struct TALER_AgeCommitmentProof *age_commitment_proof,
   TALER_EXCHANGE_LinkCallback link_cb,
@@ -2492,25 +3796,52 @@ struct TALER_EXCHANGE_TransferData
 
 
 /**
+ * Response for a GET /transfers request.
+ */
+struct TALER_EXCHANGE_TransfersGetResponse
+{
+  /**
+   * HTTP response.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on HTTP status code.
+   */
+  union
+  {
+    /**
+     * Details if status code is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      struct TALER_EXCHANGE_TransferData td;
+    } ok;
+
+  } details;
+};
+
+
+/**
  * Function called with detailed wire transfer data, including all
  * of the coin transactions that were combined into the wire transfer.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param ta transfer data, (set only if @a http_status is #MHD_HTTP_OK, otherwise NULL)
+ * @param tgr response data
  */
 typedef void
 (*TALER_EXCHANGE_TransfersGetCallback)(
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_EXCHANGE_TransferData *ta);
+  const struct TALER_EXCHANGE_TransfersGetResponse *tgr);
 
 
 /**
  * Query the exchange about which transactions were combined
  * to create a wire transfer.
  *
- * @param exchange exchange to query
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param wtid raw wire transfer identifier to get information about
  * @param cb callback to call
  * @param cb_cls closure for @a cb
@@ -2518,7 +3849,9 @@ typedef void
  */
 struct TALER_EXCHANGE_TransfersGetHandle *
 TALER_EXCHANGE_transfers_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_WireTransferIdentifierRawP *wtid,
   TALER_EXCHANGE_TransfersGetCallback cb,
   void *cb_cls);
@@ -2595,12 +3928,7 @@ struct TALER_EXCHANGE_GetDepositResponse
        */
       struct TALER_Amount coin_contribution;
 
-      /**
-       * Payment target that the merchant should use
-       * to check for its KYC status.
-       */
-      uint64_t payment_target_uuid;
-    } success;
+    } ok;
 
     /**
      * Response if the status was #MHD_HTTP_ACCEPTED
@@ -2614,10 +3942,16 @@ struct TALER_EXCHANGE_GetDepositResponse
       struct GNUNET_TIME_Timestamp execution_time;
 
       /**
-       * Payment target that the merchant should use
-       * to check for its KYC status.
+       * KYC legitimization requirement that the merchant should use to check
+       * for its KYC status.
+       */
+      uint64_t requirement_row;
+
+      /**
+       * Current AML state for the account. May explain why transfers are
+       * not happening.
        */
-      uint64_t payment_target_uuid;
+      enum TALER_AmlDecisionState aml_decision;
 
       /**
        * Set to 'true' if the KYC check is already finished and
@@ -2647,22 +3981,28 @@ typedef void
  * which aggregate wire transfer the deposit operation identified by @a coin_pub,
  * @a merchant_priv and @a h_contract_terms contributed to.
  *
- * @param exchange the exchange to query
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param merchant_priv the merchant's private key
  * @param h_wire hash of merchant's wire transfer details
  * @param h_contract_terms hash of the proposal data
  * @param coin_pub public key of the coin
+ * @param timeout timeout to use for long-polling, 0 for no long polling
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return handle to abort request
  */
 struct TALER_EXCHANGE_DepositGetHandle *
 TALER_EXCHANGE_deposits_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct GNUNET_TIME_Relative timeout,
   TALER_EXCHANGE_DepositGetCallback cb,
   void *cb_cls);
 
@@ -2678,76 +4018,44 @@ TALER_EXCHANGE_deposits_get_cancel (
   struct TALER_EXCHANGE_DepositGetHandle *dwh);
 
 
-/**
- * Convenience function.  Verifies a coin's transaction history as
- * returned by the exchange.
- *
- * @param dk fee structure for the coin, NULL to skip verifying fees
- * @param currency expected currency for the coin
- * @param coin_pub public key of the coin
- * @param history history of the coin in json encoding
- * @param[out] h_denom_pub set to the hash of the coin's denomination (if available)
- * @param[out] total how much of the coin has been spent according to @a history
- * @return #GNUNET_OK if @a history is valid, #GNUNET_SYSERR if not
- */
-enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_verify_coin_history (
-  const struct TALER_EXCHANGE_DenomPublicKey *dk,
-  const char *currency,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  json_t *history,
-  struct TALER_DenominationHashP *h_denom_pub,
-  struct TALER_Amount *total);
+/* ********************* /recoup *********************** */
 
 
 /**
- * Parse history given in JSON format and return it in binary
- * format.
- *
- * @param exchange connection to the exchange we can use
- * @param history JSON array with the history
- * @param reserve_pub public key of the reserve to inspect
- * @param currency currency we expect the balance to be in
- * @param[out] total_in set to value of credits to reserve
- * @param[out] total_out set to value of debits from reserve
- * @param history_length number of entries in @a history
- * @param[out] rhistory array of length @a history_length, set to the
- *             parsed history entries
- * @return #GNUNET_OK if history was valid and @a rhistory and @a balance
- *         were set,
- *         #GNUNET_SYSERR if there was a protocol violation in @a history
+ * @brief A /recoup Handle
  */
-enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_reserve_history (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const json_t *history,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const char *currency,
-  struct TALER_Amount *total_in,
-  struct TALER_Amount *total_out,
-  unsigned int history_length,
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory);
+struct TALER_EXCHANGE_RecoupHandle;
 
 
 /**
- * Free memory (potentially) allocated by #TALER_EXCHANGE_parse_reserve_history().
- *
- * @param rhistory result to free
- * @param len number of entries in @a rhistory
+ * Response from a recoup request.
  */
-void
-TALER_EXCHANGE_free_reserve_history (
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory,
-  unsigned int len);
-
+struct TALER_EXCHANGE_RecoupResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
 
-/* ********************* /recoup *********************** */
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Details if HTTP status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * public key of the reserve receiving the recoup
+       */
+      struct TALER_ReservePublicKeyP reserve_pub;
 
+    } ok;
+  } details;
 
-/**
- * @brief A /recoup Handle
- */
-struct TALER_EXCHANGE_RecoupHandle;
+};
 
 
 /**
@@ -2757,14 +4065,12 @@ struct TALER_EXCHANGE_RecoupHandle;
  * reserve that was credited.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param reserve_pub public key of the reserve receiving the recoup
+ * @param rr response data
  */
 typedef void
 (*TALER_EXCHANGE_RecoupResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_ReservePublicKeyP *reserve_pub);
+  const struct TALER_EXCHANGE_RecoupResponse *rr);
 
 
 /**
@@ -2772,7 +4078,9 @@ typedef void
  * the emergency recoup protocol for a given denomination.  The value
  * of the coin will be refunded to the original customer (without fees).
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param pk kind of coin to pay back
  * @param denom_sig signature over the coin by the exchange using @a pk
  * @param exchange_vals contribution from the exchange on the withdraw
@@ -2784,13 +4092,16 @@ typedef void
  *         In this case, the callback is not called.
  */
 struct TALER_EXCHANGE_RecoupHandle *
-TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
-                       const struct TALER_EXCHANGE_DenomPublicKey *pk,
-                       const struct TALER_DenominationSignature *denom_sig,
-                       const struct TALER_ExchangeWithdrawValues *exchange_vals,
-                       const struct TALER_PlanchetMasterSecretP *ps,
-                       TALER_EXCHANGE_RecoupResultCallback recoup_cb,
-                       void *recoup_cb_cls);
+TALER_EXCHANGE_recoup (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  const struct TALER_DenominationSignature *denom_sig,
+  const struct TALER_ExchangeWithdrawValues *exchange_vals,
+  const struct TALER_PlanchetMasterSecretP *ps,
+  TALER_EXCHANGE_RecoupResultCallback recoup_cb,
+  void *recoup_cb_cls);
 
 
 /**
@@ -2813,18 +4124,47 @@ struct TALER_EXCHANGE_RecoupRefreshHandle;
 
 
 /**
+ * Response from a /recoup-refresh request.
+ */
+struct TALER_EXCHANGE_RecoupRefreshResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Details if HTTP status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * public key of the dirty coin that was credited
+       */
+      struct TALER_CoinSpendPublicKeyP old_coin_pub;
+
+    } ok;
+  } details;
+
+};
+
+
+/**
  * Callbacks of this type are used to return the final result of
  * submitting a recoup-refresh request to a exchange.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param old_coin_pub public key of the dirty coin that was credited
+ * @param rrr response data
  */
 typedef void
 (*TALER_EXCHANGE_RecoupRefreshResultCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_CoinSpendPublicKeyP *old_coin_pub);
+  const struct TALER_EXCHANGE_RecoupRefreshResponse *rrr);
 
 
 /**
@@ -2834,7 +4174,9 @@ typedef void
  * revoked coin was refreshed from. The original coin is then
  * considered a zombie.
  *
- * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param pk kind of coin to pay back
  * @param denom_sig signature over the coin by the exchange using @a pk
  * @param exchange_vals contribution from the exchange on the withdraw
@@ -2849,7 +4191,9 @@ typedef void
  */
 struct TALER_EXCHANGE_RecoupRefreshHandle *
 TALER_EXCHANGE_recoup_refresh (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_EXCHANGE_DenomPublicKey *pk,
   const struct TALER_DenominationSignature *denom_sig,
   const struct TALER_ExchangeWithdrawValues *exchange_vals,
@@ -2904,6 +4248,11 @@ struct TALER_EXCHANGE_KycStatus
     {
 
       /**
+       * Details about which KYC check(s) were passed.
+       */
+      const json_t *kyc_details;
+
+      /**
        * Time of the affirmation.
        */
       struct GNUNET_TIME_Timestamp timestamp;
@@ -2920,14 +4269,45 @@ struct TALER_EXCHANGE_KycStatus
        */
       struct TALER_ExchangeSignatureP exchange_sig;
 
-    } kyc_ok;
+      /**
+       * AML status for the account.
+       */
+      enum TALER_AmlDecisionState aml_status;
+
+    } ok;
+
+    /**
+     * KYC is required.
+     */
+    struct
+    {
+
+      /**
+       * URL the user should open in a browser if
+       * the KYC process is to be run. Returned if
+       * @e http_status is #MHD_HTTP_ACCEPTED.
+       */
+      const char *kyc_url;
+
+      /**
+       * AML status for the account.
+       */
+      enum TALER_AmlDecisionState aml_status;
+
+    } accepted;
 
     /**
-     * URL the user should open in a browser if
-     * the KYC process is to be run. Returned if
-     * @e http_status is #MHD_HTTP_ACCEPTED.
+     * KYC is OK, but account needs positive AML decision.
      */
-    const char *kyc_url;
+    struct
+    {
+
+      /**
+       * AML status for the account.
+       */
+      enum TALER_AmlDecisionState aml_status;
+
+    } unavailable_for_legal_reasons;
 
   } details;
 
@@ -2949,21 +4329,28 @@ typedef void
  * Run interaction with exchange to check KYC status
  * of a merchant.
  *
- * @param eh exchange handle to use
- * @param payment_target number identifying the target
+ * @param ctx CURL context
+ * @param url exchange base URL
+ * @param keys keys of the exchange
+ * @param requirement_row number identifying the KYC requirement
  * @param h_payto hash of the payto:// URI at @a payment_target
+ * @param ut type of the entity performing the KYC check
  * @param timeout how long to wait for a positive KYC status
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return NULL on error
  */
 struct TALER_EXCHANGE_KycCheckHandle *
-TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *eh,
-                          uint64_t payment_target,
-                          const struct TALER_PaytoHashP *h_payto,
-                          struct GNUNET_TIME_Relative timeout,
-                          TALER_EXCHANGE_KycStatusCallback cb,
-                          void *cb_cls);
+TALER_EXCHANGE_kyc_check (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  uint64_t requirement_row,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_KYCLOGIC_KycUserType ut,
+  struct GNUNET_TIME_Relative timeout,
+  TALER_EXCHANGE_KycStatusCallback cb,
+  void *cb_cls);
 
 
 /**
@@ -3026,21 +4413,25 @@ struct TALER_EXCHANGE_KycProofHandle;
 /**
  * Run interaction with exchange to provide proof of KYC status.
  *
- * @param eh exchange handle to use
+ * @param ctx CURL context
+ * @param url exchange base URL
  * @param h_payto hash of payto URI identifying the target account
- * @param code OAuth 2.0 code argument
- * @param state OAuth 2.0 state argument
+ * @param logic name of the KYC logic to run
+ * @param args additional args to pass, can be NULL
+ *        or a string to append to the URL. Must then begin with '&'.
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return NULL on error
  */
 struct TALER_EXCHANGE_KycProofHandle *
-TALER_EXCHANGE_kyc_proof (struct TALER_EXCHANGE_Handle *eh,
-                          const struct TALER_PaytoHashP *h_payto,
-                          const char *code,
-                          const char *state,
-                          TALER_EXCHANGE_KycProofCallback cb,
-                          void *cb_cls);
+TALER_EXCHANGE_kyc_proof (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *logic,
+  const char *args,
+  TALER_EXCHANGE_KycProofCallback cb,
+  void *cb_cls);
 
 
 /**
@@ -3075,10 +4466,29 @@ struct TALER_EXCHANGE_WalletKycResponse
   enum TALER_ErrorCode ec;
 
   /**
-   * Wallet's payment target UUID. Only valid if
-   * @e http_status is #MHD_HTTP_OK
+   * Variants depending on @e http_status.
    */
-  uint64_t payment_target_uuid;
+  union
+  {
+
+    /**
+     * In case @e http_status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+     */
+    struct
+    {
+      /**
+       * Wallet's KYC requirement row.
+       */
+      uint64_t requirement_row;
+
+      /**
+       * Hash of the payto-URI identifying the wallet to KYC.
+       */
+      struct TALER_PaytoHashP h_payto;
+
+    } unavailable_for_legal_reasons;
+
+  } details;
 
 };
 
@@ -3099,17 +4509,22 @@ typedef void
  * Run interaction with exchange to find out the wallet's KYC
  * identifier.
  *
- * @param eh exchange handle to use
+ * @param ctx CURL context
+ * @param url exchange base URL
  * @param reserve_priv wallet private key to check
+ * @param balance balance (or balance threshold) crossed by the wallet
  * @param cb function to call with the result
  * @param cb_cls closure for @a cb
  * @return NULL on error
  */
 struct TALER_EXCHANGE_KycWalletHandle *
-TALER_EXCHANGE_kyc_wallet (struct TALER_EXCHANGE_Handle *eh,
-                           const struct TALER_ReservePrivateKeyP *reserve_priv,
-                           TALER_EXCHANGE_KycWalletCallback cb,
-                           void *cb_cls);
+TALER_EXCHANGE_kyc_wallet (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *balance,
+  TALER_EXCHANGE_KycWalletCallback cb,
+  void *cb_cls);
 
 
 /**
@@ -3274,18 +4689,47 @@ struct TALER_EXCHANGE_FutureKeys
 
 
 /**
+ * Response from a /management/keys request.
+ */
+struct TALER_EXCHANGE_ManagementGetKeysResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Response details depending on the HTTP status.
+   */
+  union
+  {
+    /**
+     * Details if HTTP status is #MHD_HTTP_OK.
+     */
+    struct
+    {
+      /**
+       * information about the various keys used
+       * by the exchange
+       */
+      struct TALER_EXCHANGE_FutureKeys keys;
+
+    } ok;
+  } details;
+
+};
+
+
+/**
  * Function called with information about future keys.
  *
  * @param cls closure
- * @param hr HTTP response data
- * @param keys information about the various keys used
- *        by the exchange, NULL if /management/keys failed
+ * @param mgr HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementGetKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_EXCHANGE_FutureKeys *keys);
+  const struct TALER_EXCHANGE_ManagementGetKeysResponse *mgr);
 
 
 /**
@@ -3305,10 +4749,11 @@ struct TALER_EXCHANGE_ManagementGetKeysHandle;
  * @return the request handle; NULL upon error
  */
 struct TALER_EXCHANGE_ManagementGetKeysHandle *
-TALER_EXCHANGE_get_management_keys (struct GNUNET_CURL_Context *ctx,
-                                    const char *url,
-                                    TALER_EXCHANGE_ManagementGetKeysCallback cb,
-                                    void *cb_cls);
+TALER_EXCHANGE_get_management_keys (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  TALER_EXCHANGE_ManagementGetKeysCallback cb,
+  void *cb_cls);
 
 
 /**
@@ -3388,15 +4833,28 @@ struct TALER_EXCHANGE_ManagementPostKeysData
 
 
 /**
+ * Response from a POST /management/keys request.
+ */
+struct TALER_EXCHANGE_ManagementPostKeysResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+
+/**
  * Function called with information about the post keys operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param mr response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementPostKeysCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementPostKeysResponse *mr);
 
 
 /**
@@ -3442,10 +4900,24 @@ TALER_EXCHANGE_post_management_keys_cancel (
  */
 struct TALER_EXCHANGE_ManagementPostExtensionsData
 {
-  json_t *extensions;
+  const json_t *extensions;
   struct TALER_MasterSignatureP extensions_sig;
 };
 
+
+/**
+ * Response from a POST /management/extensions request.
+ */
+struct TALER_EXCHANGE_ManagementPostExtensionsResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+
 /**
  * Function called with information about the post extensions operation result.
  *
@@ -3455,7 +4927,7 @@ struct TALER_EXCHANGE_ManagementPostExtensionsData
 typedef void
 (*TALER_EXCHANGE_ManagementPostExtensionsCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementPostExtensionsResponse *hr);
 
 /**
  * @brief Handle for a POST /management/extensions request.
@@ -3478,21 +4950,105 @@ struct TALER_EXCHANGE_ManagementPostExtensionsHandle *
 TALER_EXCHANGE_management_post_extensions (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_ManagementPostExtensionsData *ped,
+  const struct TALER_EXCHANGE_ManagementPostExtensionsData *ped,
   TALER_EXCHANGE_ManagementPostExtensionsCallback cb,
   void *cb_cls);
 
+
 /**
- * Cancel #TALER_EXCHANGE_post_management_extensions() operation.
+ * Cancel #TALER_EXCHANGE_management_post_extensions() operation.
  *
  * @param ph handle of the operation to cancel
  */
 void
-TALER_EXCHANGE_post_management_extensions_cancel (
+TALER_EXCHANGE_management_post_extensions_cancel (
   struct TALER_EXCHANGE_ManagementPostExtensionsHandle *ph);
 
 
 /**
+ * Response from a POST /management/drain request.
+ */
+struct TALER_EXCHANGE_ManagementDrainResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+
+/**
+ * Function called with information about the drain profits result.
+ *
+ * @param cls closure
+ * @param hr HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_ManagementDrainProfitsCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementDrainResponse *hr);
+
+
+/**
+ * @brief Handle for a POST /management/drain request.
+ */
+struct TALER_EXCHANGE_ManagementDrainProfitsHandle;
+
+
+/**
+ * Uploads the drain profits request.
+ *
+ * @param ctx the context
+ * @param url HTTP base URL for the exchange
+ * @param wtid wire transfer identifier to use
+ * @param amount total to transfer
+ * @param date when was the request created
+ * @param account_section configuration section identifying account to debit
+ * @param payto_uri RFC 8905 URI of the account to credit
+ * @param master_sig signature affirming the operation
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_ManagementDrainProfitsHandle *
+TALER_EXCHANGE_management_drain_profits (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_Amount *amount,
+  struct GNUNET_TIME_Timestamp date,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementDrainProfitsCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_management_drain_profits() operation.
+ *
+ * @param dp handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_management_drain_profits_cancel (
+  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *dp);
+
+
+/**
+ * Response from a POST /management/denominations/$DENOM/revoke request.
+ */
+struct TALER_EXCHANGE_ManagementRevokeDenominationResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+
+/**
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure
@@ -3501,7 +5057,7 @@ TALER_EXCHANGE_post_management_extensions_cancel (
 typedef void
 (*TALER_EXCHANGE_ManagementRevokeDenominationKeyCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementRevokeDenominationResponse *hr);
 
 
 /**
@@ -3542,6 +5098,18 @@ TALER_EXCHANGE_management_revoke_denomination_key_cancel (
 
 
 /**
+ * Response from a POST /management/signkeys/$SK/revoke request.
+ */
+struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+/**
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure
@@ -3550,7 +5118,7 @@ TALER_EXCHANGE_management_revoke_denomination_key_cancel (
 typedef void
 (*TALER_EXCHANGE_ManagementRevokeSigningKeyCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse *hr);
 
 
 /**
@@ -3591,15 +5159,515 @@ TALER_EXCHANGE_management_revoke_signing_key_cancel (
 
 
 /**
- * Function called with information about the auditor setup operation result.
+ * Response from a POST /management/aml-officers request.
+ */
+struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse
+{
+  /**
+   * HTTP response data
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+};
+
+/**
+ * Function called with information about the change to
+ * an AML officer status.
  *
  * @param cls closure
  * @param hr HTTP response data
  */
 typedef void
+(*TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse *hr);
+
+
+/**
+ * @brief Handle for a POST /management/aml-officers/$OFFICER_PUB request.
+ */
+struct TALER_EXCHANGE_ManagementUpdateAmlOfficer;
+
+
+/**
+ * Inform the exchange that the status of an AML officer has changed.
+ *
+ * @param ctx the context
+ * @param url HTTP base URL for the exchange
+ * @param officer_pub the public signing key of the officer
+ * @param officer_name name of the officer
+ * @param change_date when to affect the status change
+ * @param is_active true to enable the officer
+ * @param read_only true to only allow read-only access
+ * @param master_sig signature affirming the change
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *
+TALER_EXCHANGE_management_update_aml_officer (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_management_update_aml_officer() operation.
+ *
+ * @param rh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_management_update_aml_officer_cancel (
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *rh);
+
+
+/**
+ * Summary data about an AML decision.
+ */
+struct TALER_EXCHANGE_AmlDecisionSummary
+{
+  /**
+   * What is the current monthly threshold.
+   */
+  struct TALER_Amount threshold;
+
+  /**
+   * Account the decision was made for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * RowID of this decision.
+   */
+  uint64_t rowid;
+
+  /**
+   * Current decision state.
+   */
+  enum TALER_AmlDecisionState current_state;
+};
+
+
+/**
+ * Information about AML decisions returned by the exchange.
+ */
+struct TALER_EXCHANGE_AmlDecisionsResponse
+{
+  /**
+   * HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on the HTTP response code.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success (#MHD_HTTP_OK).
+     */
+    struct
+    {
+
+      /**
+       * Array of AML decision summaries returned by the exchange.
+       */
+      const struct TALER_EXCHANGE_AmlDecisionSummary *decisions;
+
+      /**
+       * Length of the @e decisions array.
+       */
+      unsigned int decisions_length;
+
+    } ok;
+
+  } details;
+};
+
+
+/**
+ * Function called with summary information about
+ * AML decisions.
+ *
+ * @param cls closure
+ * @param adr response data
+ */
+typedef void
+(*TALER_EXCHANGE_LookupAmlDecisionsCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_AmlDecisionsResponse *adr);
+
+
+/**
+ * @brief Handle for a POST /aml/$OFFICER_PUB/decisions/$STATUS request.
+ */
+struct TALER_EXCHANGE_LookupAmlDecisions;
+
+
+/**
+ * Inform the exchange that an AML decision has been taken.
+ *
+ * @param ctx the context
+ * @param exchange_url HTTP base URL for the exchange
+ * @param start row number starting point (exclusive rowid)
+ * @param delta number of records to return, negative for descending, positive for ascending from start
+ * @param state type of AML decisions to return
+ * @param officer_priv private key of the deciding AML officer
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_LookupAmlDecisions *
+TALER_EXCHANGE_lookup_aml_decisions (
+  struct GNUNET_CURL_Context *ctx,
+  const char *exchange_url,
+  uint64_t start,
+  int delta,
+  enum TALER_AmlDecisionState state,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  TALER_EXCHANGE_LookupAmlDecisionsCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_lookup_aml_decisions() operation.
+ *
+ * @param lh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_lookup_aml_decisions_cancel (
+  struct TALER_EXCHANGE_LookupAmlDecisions *lh);
+
+
+/**
+ * Detailed data about an AML decision.
+ */
+struct TALER_EXCHANGE_AmlDecisionDetail
+{
+  /**
+   * When was the decision made.
+   */
+  struct GNUNET_TIME_Timestamp decision_time;
+
+  /**
+   * New threshold set by this decision.
+   */
+  struct TALER_Amount new_threshold;
+
+  /**
+   * Who made the decision?
+   */
+  struct TALER_AmlOfficerPublicKeyP decider_pub;
+
+  /**
+   * Justification given for the decision.
+   */
+  const char *justification;
+
+  /**
+   * New decision state.
+   */
+  enum TALER_AmlDecisionState new_state;
+};
+
+
+/**
+ * Detailed data collected during a KYC process for the account.
+ */
+struct TALER_EXCHANGE_KycHistoryDetail
+{
+  /**
+   * Configuration section name of the KYC provider that contributed the data.
+   */
+  const char *provider_section;
+
+  /**
+   * The collected KYC data.
+   */
+  const json_t *attributes;
+
+  /**
+   * When was the data collection made.
+   */
+  struct GNUNET_TIME_Timestamp collection_time;
+
+};
+
+
+/**
+ * Information about AML decision details returned by the exchange.
+ */
+struct TALER_EXCHANGE_AmlDecisionResponse
+{
+  /**
+   * HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on the HTTP response code.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success (#MHD_HTTP_OK).
+     */
+    struct
+    {
+
+      /**
+       * Array of AML decision details returned by the exchange.
+       */
+      const struct TALER_EXCHANGE_AmlDecisionDetail *aml_history;
+
+      /**
+       * Length of the @e aml_history array.
+       */
+      unsigned int aml_history_length;
+
+      /**
+       * Array of KYC data collections returned by the exchange.
+       */
+      const struct TALER_EXCHANGE_KycHistoryDetail *kyc_attributes;
+
+      /**
+       * Length of the @e kyc_attributes array.
+       */
+      unsigned int kyc_attributes_length;
+
+    } ok;
+
+  } details;
+};
+
+
+/**
+ * Function called with summary information about
+ * AML decisions.
+ *
+ * @param cls closure
+ * @param adr response data
+ */
+typedef void
+(*TALER_EXCHANGE_LookupAmlDecisionCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_AmlDecisionResponse *adr);
+
+
+/**
+ * @brief Handle for a POST /aml/$OFFICER_PUB/decision/$H_PAYTO request.
+ */
+struct TALER_EXCHANGE_LookupAmlDecision;
+
+
+/**
+ * Inform the exchange that an AML decision has been taken.
+ *
+ * @param ctx the context
+ * @param exchange_url HTTP base URL for the exchange
+ * @param h_payto which account to return the decision history for
+ * @param officer_priv private key of the deciding AML officer
+ * @param history true to return the full history, otherwise only the last decision
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_LookupAmlDecision *
+TALER_EXCHANGE_lookup_aml_decision (
+  struct GNUNET_CURL_Context *ctx,
+  const char *exchange_url,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  bool history,
+  TALER_EXCHANGE_LookupAmlDecisionCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_lookup_aml_decision() operation.
+ *
+ * @param rh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_lookup_aml_decision_cancel (
+  struct TALER_EXCHANGE_LookupAmlDecision *rh);
+
+
+/**
+ * @brief Handle for a POST /aml-decision/$OFFICER_PUB request.
+ */
+struct TALER_EXCHANGE_AddAmlDecision;
+
+
+/**
+ * Response when making an AML decision.
+ */
+struct TALER_EXCHANGE_AddAmlDecisionResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+
+/**
+ * Function called with information about storing an
+ * an AML decision.
+ *
+ * @param cls closure
+ * @param adr response data
+ */
+typedef void
+(*TALER_EXCHANGE_AddAmlDecisionCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_AddAmlDecisionResponse *adr);
+
+/**
+ * Inform the exchange that an AML decision has been taken.
+ *
+ * @param ctx the context
+ * @param url HTTP base URL for the exchange
+ * @param justification human-readable justification
+ * @param decision_time when was the decision made
+ * @param new_threshold at what monthly amount threshold
+ *                      should a revision be triggered
+ * @param h_payto payto URI hash of the account the
+ *                      decision is about
+ * @param new_state updated AML state
+ * @param kyc_requirements JSON array of KYC requirements being imposed, NULL for none
+ * @param officer_priv private key of the deciding AML officer
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_AddAmlDecision *
+TALER_EXCHANGE_add_aml_decision (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  TALER_EXCHANGE_AddAmlDecisionCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_add_aml_decision() operation.
+ *
+ * @param rh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_add_aml_decision_cancel (
+  struct TALER_EXCHANGE_AddAmlDecision *rh);
+
+
+/**
+ * Response when adding a partner exchange.
+ */
+struct TALER_EXCHANGE_ManagementAddPartnerResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+/**
+ * Function called with information about the change to
+ * an AML officer status.
+ *
+ * @param cls closure
+ * @param apr response data
+ */
+typedef void
+(*TALER_EXCHANGE_ManagementAddPartnerCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementAddPartnerResponse *apr);
+
+
+/**
+ * @brief Handle for a POST /management/partners/$PARTNER_PUB request.
+ */
+struct TALER_EXCHANGE_ManagementAddPartner;
+
+
+/**
+ * Inform the exchange that the status of a partnering
+ * exchange was defined.
+ *
+ * @param ctx the context
+ * @param url HTTP base URL for the exchange
+ * @param partner_pub the offline signing key of the partner
+ * @param start_date validity period start
+ * @param end_date validity period end
+ * @param wad_frequency how often will we do wad transfers to this partner
+ * @param wad_fee what is the wad fee to this partner
+ * @param partner_base_url what is the base URL of the @a partner_pub exchange
+ * @param master_sig the signature the signature
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_ManagementAddPartner *
+TALER_EXCHANGE_management_add_partner (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_MasterPublicKeyP *partner_pub,
+  struct GNUNET_TIME_Timestamp start_date,
+  struct GNUNET_TIME_Timestamp end_date,
+  struct GNUNET_TIME_Relative wad_frequency,
+  const struct TALER_Amount *wad_fee,
+  const char *partner_base_url,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementAddPartnerCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_management_add_partner() operation.
+ *
+ * @param rh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_management_add_partner_cancel (
+  struct TALER_EXCHANGE_ManagementAddPartner *rh);
+
+
+/**
+ * Response when enabling an auditor.
+ */
+struct TALER_EXCHANGE_ManagementAuditorEnableResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+/**
+ * Function called with information about the auditor setup operation result.
+ *
+ * @param cls closure
+ * @param aer response data
+ */
+typedef void
 (*TALER_EXCHANGE_ManagementAuditorEnableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementAuditorEnableResponse *aer);
 
 
 /**
@@ -3644,17 +5712,27 @@ void
 TALER_EXCHANGE_management_enable_auditor_cancel (
   struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah);
 
+/**
+ * Response when disabling an auditor.
+ */
+struct TALER_EXCHANGE_ManagementAuditorDisableResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
 
 /**
  * Function called with information about the auditor disable operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param adr HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementAuditorDisableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementAuditorDisableResponse *adr);
 
 
 /**
@@ -3697,15 +5775,27 @@ TALER_EXCHANGE_management_disable_auditor_cancel (
 
 
 /**
+ * Response from an exchange account/enable operation.
+ */
+struct TALER_EXCHANGE_ManagementWireEnableResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+
+/**
  * Function called with information about the wire enable operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param wer HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementWireEnableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementWireEnableResponse *wer);
 
 
 /**
@@ -3720,11 +5810,16 @@ struct TALER_EXCHANGE_ManagementWireEnableHandle;
  * @param ctx the context
  * @param url HTTP base URL for the exchange
  * @param payto_uri RFC 8905 URI of the exchange's bank account
+ * @param conversion_url URL of the conversion service, or NULL if none
+ * @param debit_restrictions JSON encoding of debit restrictions on the account; see AccountRestriction in the spec
+ * @param credit_restrictions JSON encoding of credit restrictions on the account; see AccountRestriction in the spec
  * @param validity_start when was this decided?
  * @param master_sig1 signature affirming the wire addition
  *        of purpose #TALER_SIGNATURE_MASTER_ADD_WIRE
  * @param master_sig2 signature affirming the validity of the account for clients;
  *        of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS.
+ * @param bank_label label to use when showing the account, can be NULL
+ * @param priority priority for ordering the bank accounts
  * @param cb function to call with the exchange's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
@@ -3734,9 +5829,14 @@ TALER_EXCHANGE_management_enable_wire (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp validity_start,
   const struct TALER_MasterSignatureP *master_sig1,
   const struct TALER_MasterSignatureP *master_sig2,
+  const char *bank_label,
+  int64_t priority,
   TALER_EXCHANGE_ManagementWireEnableCallback cb,
   void *cb_cls);
 
@@ -3752,15 +5852,26 @@ TALER_EXCHANGE_management_enable_wire_cancel (
 
 
 /**
+ * Response from an exchange account/disable operation.
+ */
+struct TALER_EXCHANGE_ManagementWireDisableResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+/**
  * Function called with information about the wire disable operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param wdr response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementWireDisableCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementWireDisableResponse *wdr);
 
 
 /**
@@ -3804,15 +5915,26 @@ TALER_EXCHANGE_management_disable_wire_cancel (
 
 
 /**
+ * Response when setting wire fees.
+ */
+struct TALER_EXCHANGE_ManagementSetWireFeeResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+/**
  * Function called with information about the wire enable operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param wfr response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementSetWireFeeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementSetWireFeeResponse *wfr);
 
 
 /**
@@ -3860,15 +5982,27 @@ TALER_EXCHANGE_management_set_wire_fees_cancel (
 
 
 /**
+ * Response when setting global fees.
+ */
+struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+
+/**
  * Function called with information about the global fee setting operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param gfr HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_ManagementSetGlobalFeeCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse *gfr);
 
 
 /**
@@ -3886,7 +6020,6 @@ struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle;
  * @param validity_end end date for the provided wire fees
  * @param fees the wire fees for this time period
  * @param purse_timeout when do purses time out
- * @param kyc_timeout when do reserves without KYC time out
  * @param history_expiration how long are account histories preserved
  * @param purse_account_limit how many purses are free per account
  * @param master_sig signature affirming the wire fees;
@@ -3903,7 +6036,6 @@ TALER_EXCHANGE_management_set_global_fees (
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterSignatureP *master_sig,
@@ -3914,7 +6046,7 @@ TALER_EXCHANGE_management_set_global_fees (
 /**
  * Cancel #TALER_EXCHANGE_management_enable_wire() operation.
  *
- * @param swfh handle of the operation to cancel
+ * @param sgfh handle of the operation to cancel
  */
 void
 TALER_EXCHANGE_management_set_global_fees_cancel (
@@ -3922,16 +6054,28 @@ TALER_EXCHANGE_management_set_global_fees_cancel (
 
 
 /**
+ * Response when adding denomination signature by auditor.
+ */
+struct TALER_EXCHANGE_AuditorAddDenominationResponse
+{
+  /**
+   * HTTP response data.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+
+/**
  * Function called with information about the POST
  * /auditor/$AUDITOR_PUB/$H_DENOM_PUB operation result.
  *
  * @param cls closure
- * @param hr HTTP response data
+ * @param adr HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_AuditorAddDenominationCallback) (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr);
+  const struct TALER_EXCHANGE_AuditorAddDenominationResponse *adr);
 
 
 /**
@@ -4013,7 +6157,7 @@ struct TALER_EXCHANGE_ContractGetResponse
        */
       size_t econtract_size;
 
-    } success;
+    } ok;
 
   } details;
 
@@ -4040,7 +6184,8 @@ struct TALER_EXCHANGE_ContractsGetHandle;
 /**
  * Request information about a contract from the exchange.
  *
- * @param exchange exchange handle
+ * @param ctx CURL context
+ * @param url exchange base URL
  * @param contract_priv private key of the contract
  * @param cb function to call with the exchange's result
  * @param cb_cls closure for @a cb
@@ -4048,7 +6193,8 @@ struct TALER_EXCHANGE_ContractsGetHandle;
  */
 struct TALER_EXCHANGE_ContractsGetHandle *
 TALER_EXCHANGE_contract_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   TALER_EXCHANGE_ContractGetCallback cb,
   void *cb_cls);
@@ -4084,6 +6230,7 @@ struct TALER_EXCHANGE_PurseGetResponse
      */
     struct
     {
+
       /**
        * Time when the purse was merged (or zero if it
        * was not merged).
@@ -4103,7 +6250,12 @@ struct TALER_EXCHANGE_PurseGetResponse
        */
       struct TALER_Amount balance;
 
-    } success;
+      /**
+       * Time when the purse will expire.
+       */
+      struct GNUNET_TIME_Timestamp purse_expiration;
+
+    } ok;
 
   } details;
 
@@ -4131,7 +6283,9 @@ struct TALER_EXCHANGE_PurseGetHandle;
 /**
  * Request information about a purse from the exchange.
  *
- * @param exchange exchange handle
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param purse_pub public key of the purse
  * @param timeout how long to wait for a change to happen
  * @param wait_for_merge true to wait for a merge event, otherwise wait for a deposit event
@@ -4141,7 +6295,9 @@ struct TALER_EXCHANGE_PurseGetHandle;
  */
 struct TALER_EXCHANGE_PurseGetHandle *
 TALER_EXCHANGE_purse_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   struct GNUNET_TIME_Relative timeout,
   bool wait_for_merge,
@@ -4150,7 +6306,7 @@ TALER_EXCHANGE_purse_get (
 
 
 /**
- * Cancel #TALER_EXCHANGE_purse_deposit() operation.
+ * Cancel #TALER_EXCHANGE_purse_get() operation.
  *
  * @param pgh handle of the operation to cancel
  */
@@ -4193,7 +6349,7 @@ struct TALER_EXCHANGE_PurseCreateDepositResponse
       struct TALER_ExchangeSignatureP exchange_sig;
 
 
-    } success;
+    } ok;
 
   } details;
 
@@ -4219,16 +6375,14 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle;
 
 
 /**
- * Information about a coin to be deposited into a purse.
+ * Information about a coin to be deposited into a purse or reserve.
  */
 struct TALER_EXCHANGE_PurseDeposit
 {
-#if FIXME_OEC
   /**
-   * Age commitment data.
+   * Age commitment data, might be NULL.
    */
-  struct TALER_AgeCommitment age_commitment;
-#endif
+  const struct TALER_AgeCommitmentProof *age_commitment_proof;
 
   /**
    * Private key of the coin.
@@ -4257,7 +6411,9 @@ struct TALER_EXCHANGE_PurseDeposit
  * Inform the exchange that a purse should be created
  * and coins deposited into it.
  *
- * @param exchange the exchange to interact with
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param purse_priv private key of the purse
  * @param merge_priv the merge credential
  * @param contract_priv key needed to obtain and decrypt the contract
@@ -4273,13 +6429,15 @@ struct TALER_EXCHANGE_PurseDeposit
  */
 struct TALER_EXCHANGE_PurseCreateDepositHandle *
 TALER_EXCHANGE_purse_create_with_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   const json_t *contract_terms,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   bool upload_contract,
   TALER_EXCHANGE_PurseCreateDepositCallback cb,
   void *cb_cls);
@@ -4296,6 +6454,67 @@ TALER_EXCHANGE_purse_create_with_deposit_cancel (
 
 
 /**
+ * Response generated for a purse deletion request.
+ */
+struct TALER_EXCHANGE_PurseDeleteResponse
+{
+  /**
+   * Full HTTP response.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+};
+
+
+/**
+ * Function called with information about the deletion
+ * of a purse.
+ *
+ * @param cls closure
+ * @param pdr HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_PurseDeleteCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_PurseDeleteResponse *pdr);
+
+
+/**
+ * @brief Handle for a DELETE /purses/$PID request.
+ */
+struct TALER_EXCHANGE_PurseDeleteHandle;
+
+
+/**
+ * Asks the exchange to delete a purse. Will only succeed if
+ * the purse was not yet merged and did not yet time out.
+ *
+ * @param ctx CURL context
+ * @param url exchange base URL
+ * @param purse_priv private key of the purse
+ * @param cb function to call with the exchange's result
+ * @param cb_cls closure for @a cb
+ * @return the request handle; NULL upon error
+ */
+struct TALER_EXCHANGE_PurseDeleteHandle *
+TALER_EXCHANGE_purse_delete (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_PurseContractPrivateKeyP *purse_priv,
+  TALER_EXCHANGE_PurseDeleteCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel #TALER_EXCHANGE_purse_delete() operation.
+ *
+ * @param pdh handle of the operation to cancel
+ */
+void
+TALER_EXCHANGE_purse_delete_cancel (
+  struct TALER_EXCHANGE_PurseDeleteHandle *pdh);
+
+
+/**
  * Response generated for an account merge request.
  */
 struct TALER_EXCHANGE_AccountMergeResponse
@@ -4306,6 +6525,11 @@ struct TALER_EXCHANGE_AccountMergeResponse
   struct TALER_EXCHANGE_HttpResponse hr;
 
   /**
+   * Reserve signature affirming the merge.
+   */
+  const struct TALER_ReserveSignatureP *reserve_sig;
+
+  /**
    * Details depending on the HTTP status.
    */
   union
@@ -4315,8 +6539,34 @@ struct TALER_EXCHANGE_AccountMergeResponse
      */
     struct
     {
+      /**
+       * Signature by the exchange affirming the merge.
+       */
+      struct TALER_ExchangeSignatureP exchange_sig;
+
+      /**
+       * Online signing key used by the exchange.
+       */
+      struct TALER_ExchangePublicKeyP exchange_pub;
+
+      /**
+       * Timestamp of the exchange for @e exchange_sig.
+       */
+      struct GNUNET_TIME_Timestamp etime;
+
+    } ok;
 
-    } success;
+    /**
+     * Details if the status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+     */
+    struct
+    {
+      /**
+       * Requirement row target that the merchant should use
+       * to check for its KYC status.
+       */
+      uint64_t requirement_row;
+    } unavailable_for_legal_reasons;
 
   } details;
 
@@ -4327,7 +6577,7 @@ struct TALER_EXCHANGE_AccountMergeResponse
  * operation.
  *
  * @param cls closure
- * @param pcr HTTP response data
+ * @param amr HTTP response data
  */
 typedef void
 (*TALER_EXCHANGE_AccountMergeCallback) (
@@ -4345,7 +6595,9 @@ struct TALER_EXCHANGE_AccountMergeHandle;
  * Inform the exchange that a purse should be merged
  * with a reserve.
  *
- * @param exchange the exchange hosting the purse
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param reserve_exchange_url base URL of the exchange with the reserve
  * @param reserve_priv private key of the reserve to merge into
  * @param purse_pub public key of the purse to merge
@@ -4353,7 +6605,7 @@ struct TALER_EXCHANGE_AccountMergeHandle;
  * @param h_contract_terms hash of the purses' contract
  * @param min_age minimum age of deposits into the purse
  * @param purse_value_after_fees amount that should be in the purse
- * @paran purse_expiration when will the purse expire
+ * @param purse_expiration when will the purse expire
  * @param merge_timestamp when is the merge happening (current time)
  * @param cb function to call with the exchange's result
  * @param cb_cls closure for @a cb
@@ -4361,7 +6613,9 @@ struct TALER_EXCHANGE_AccountMergeHandle;
  */
 struct TALER_EXCHANGE_AccountMergeHandle *
 TALER_EXCHANGE_account_merge (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const char *reserve_exchange_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
@@ -4396,17 +6650,36 @@ struct TALER_EXCHANGE_PurseCreateMergeResponse
   struct TALER_EXCHANGE_HttpResponse hr;
 
   /**
+   * Reserve signature generated for the request
+   * (client-side).
+   */
+  const struct TALER_ReserveSignatureP *reserve_sig;
+
+  /**
    * Details depending on the HTTP status.
    */
   union
   {
     /**
-     * Detailed returned on #MHD_HTTP_OK.
+     * Details returned on #MHD_HTTP_OK.
      */
     struct
     {
 
-    } success;
+    } ok;
+
+    /**
+   * Details if the status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+   */
+    struct
+    {
+      /**
+       * Requirement row that the merchant should use
+       * to check for its KYC status.
+       */
+      uint64_t requirement_row;
+    } unavailable_for_legal_reasons;
+
   } details;
 
 };
@@ -4434,7 +6707,9 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle;
  * Inform the exchange that a purse should be created
  * and merged with a reserve.
  *
- * @param exchange the exchange hosting the reserve
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param reserve_priv private key of the reserve
  * @param purse_priv private key of the purse
  * @param merge_priv private key of the merge capability
@@ -4442,14 +6717,16 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle;
  * @param contract_terms contract the purse is about
  * @param upload_contract true to upload the contract
  * @param pay_for_purse true to pay for purse creation
- * @paran merge_timestamp when should the merge happen (use current time)
+ * @param merge_timestamp when should the merge happen (use current time)
  * @param cb function to call with the exchange's result
  * @param cb_cls closure for @a cb
  * @return the request handle; NULL upon error
  */
 struct TALER_EXCHANGE_PurseCreateMergeHandle *
 TALER_EXCHANGE_purse_create_with_merge (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -4513,12 +6790,7 @@ struct TALER_EXCHANGE_PurseDepositResponse
        */
       struct TALER_PrivateContractHashP h_contract_terms;
 
-      /**
-       * Key with the merge capability (needed to verify signature).
-       */
-      struct TALER_PurseMergePublicKeyP merge_pub;
-
-    } success;
+    } ok;
   } details;
 
 };
@@ -4546,7 +6818,9 @@ struct TALER_EXCHANGE_PurseDepositHandle;
  * Inform the exchange that a deposit should be made into
  * a purse.
  *
- * @param exchange the exchange that issued the coins
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
  * @param purse_exchange_url base URL of the exchange hosting the purse
  * @param purse_pub public key of the purse to merge
  * @param min_age minimum age we need to prove for the purse
@@ -4558,12 +6832,14 @@ struct TALER_EXCHANGE_PurseDepositHandle;
  */
 struct TALER_EXCHANGE_PurseDepositHandle *
 TALER_EXCHANGE_purse_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const char *purse_exchange_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   uint8_t min_age,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   TALER_EXCHANGE_PurseDepositCallback cb,
   void *cb_cls);
 
@@ -4578,4 +6854,474 @@ TALER_EXCHANGE_purse_deposit_cancel (
   struct TALER_EXCHANGE_PurseDepositHandle *amh);
 
 
+/* *********************  /reserves/$RID/open *********************** */
+
+
+/**
+ * @brief A /reserves/$RID/open Handle
+ */
+struct TALER_EXCHANGE_ReservesOpenHandle;
+
+
+/**
+ * @brief Reserve open result details.
+ */
+struct TALER_EXCHANGE_ReserveOpenResult
+{
+
+  /**
+   * High-level HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on @e hr.http_status.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success, if
+     * @e hr.http_status is #MHD_HTTP_OK
+     */
+    struct
+    {
+      /**
+       * New expiration time
+       */
+      struct GNUNET_TIME_Timestamp expiration_time;
+
+      /**
+       * Actual cost of the open operation.
+       */
+      struct TALER_Amount open_cost;
+
+    } ok;
+
+
+    /**
+     * Information returned if the payment provided is insufficient, if
+     * @e hr.http_status is #MHD_HTTP_PAYMENT_REQUIRED
+     */
+    struct
+    {
+      /**
+       * Current expiration time of the reserve.
+       */
+      struct GNUNET_TIME_Timestamp expiration_time;
+
+      /**
+       * Actual cost of the open operation that should have been paid.
+       */
+      struct TALER_Amount open_cost;
+
+    } payment_required;
+
+    /**
+     * Information returned if status is
+     * #MHD_HTTP_CONFLICT.
+     */
+    struct
+    {
+      /**
+       * Public key of the coin that caused the conflict.
+       */
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+
+    } conflict;
+
+    /**
+     * Information returned if KYC is required to proceed, set if
+     * @e hr.http_status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+     */
+    struct
+    {
+      /**
+       * Requirement row that the merchant should use
+       * to check for its KYC status.
+       */
+      uint64_t requirement_row;
+
+      /**
+       * Hash of the payto-URI of the account to KYC;
+       */
+      struct TALER_PaytoHashP h_payto;
+
+    } unavailable_for_legal_reasons;
+
+  } details;
+
+};
+
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * reserve open request to a exchange.
+ *
+ * @param cls closure
+ * @param ror HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_ReservesOpenCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ReserveOpenResult *ror);
+
+
+/**
+ * Submit a request to open a reserve.
+ *
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param keys exchange keys
+ * @param reserve_priv private key of the reserve to open
+ * @param reserve_contribution amount to pay from the reserve's balance for the operation
+ * @param coin_payments_length length of the @a coin_payments array
+ * @param coin_payments array of coin payments to use for opening the reserve
+ * @param expiration_time desired new expiration time for the reserve
+ * @param min_purses minimum number of purses to allow being concurrently opened per reserve
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ *         signatures fail to verify).  In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_ReservesOpenHandle *
+TALER_EXCHANGE_reserves_open (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *reserve_contribution,
+  unsigned int coin_payments_length,
+  const struct TALER_EXCHANGE_PurseDeposit coin_payments[
+    static coin_payments_length],
+  struct GNUNET_TIME_Timestamp expiration_time,
+  uint32_t min_purses,
+  TALER_EXCHANGE_ReservesOpenCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel a reserve status request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param[in] roh the reserve open request handle
+ */
+void
+TALER_EXCHANGE_reserves_open_cancel (
+  struct TALER_EXCHANGE_ReservesOpenHandle *roh);
+
+
+/* *********************  /reserves/$RID/attest *********************** */
+
+
+/**
+ * @brief A Get /reserves/$RID/attest Handle
+ */
+struct TALER_EXCHANGE_ReservesGetAttestHandle;
+
+
+/**
+ * @brief Reserve GET attest result details.
+ */
+struct TALER_EXCHANGE_ReserveGetAttestResult
+{
+
+  /**
+   * High-level HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on @e hr.http_status.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success, if
+     * @e hr.http_status is #MHD_HTTP_OK
+     */
+    struct
+    {
+
+      /**
+       * Length of the @e attributes array.
+       */
+      unsigned int attributes_length;
+
+      /**
+       * Array of attributes available about the user.
+       */
+      const char **attributes;
+
+    } ok;
+
+  } details;
+
+};
+
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * reserve attest request to a exchange.
+ *
+ * @param cls closure
+ * @param ror HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_ReservesGetAttestCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ReserveGetAttestResult *ror);
+
+
+/**
+ * Submit a request to get the list of attestable attributes for a reserve.
+ *
+ * @param ctx CURL context
+ * @param url exchange base URL
+ * @param reserve_pub public key of the reserve to get available attributes for
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ *         signatures fail to verify).  In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_ReservesGetAttestHandle *
+TALER_EXCHANGE_reserves_get_attestable (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  TALER_EXCHANGE_ReservesGetAttestCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel a request to get attestable attributes.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param rgah the reserve get attestable request handle
+ */
+void
+TALER_EXCHANGE_reserves_get_attestable_cancel (
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah);
+
+
+/**
+ * @brief A POST /reserves/$RID/attest Handle
+ */
+struct TALER_EXCHANGE_ReservesPostAttestHandle;
+
+
+/**
+ * @brief Reserve attest result details.
+ */
+struct TALER_EXCHANGE_ReservePostAttestResult
+{
+
+  /**
+   * High-level HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on @e hr.http_status.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success, if
+     * @e hr.http_status is #MHD_HTTP_OK
+     */
+    struct
+    {
+      /**
+       * Time when the exchange made the signature.
+       */
+      struct GNUNET_TIME_Timestamp exchange_time;
+
+      /**
+       * Expiration time of the attested attributes.
+       */
+      struct GNUNET_TIME_Timestamp expiration_time;
+
+      /**
+       * Signature by the exchange affirming the attributes.
+       */
+      struct TALER_ExchangeSignatureP exchange_sig;
+
+      /**
+       * Online signing key used by the exchange.
+       */
+      struct TALER_ExchangePublicKeyP exchange_pub;
+
+      /**
+       * Attributes being confirmed by the exchange.
+       */
+      const json_t *attributes;
+
+    } ok;
+
+  } details;
+
+};
+
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * reserve attest request to a exchange.
+ *
+ * @param cls closure
+ * @param ror HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_ReservesPostAttestCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ReservePostAttestResult *ror);
+
+
+/**
+ * Submit a request to attest attributes about the owner of a reserve.
+ *
+ * @param ctx CURL context
+ * @param url exchange base URL
+ * @param keys exchange key data
+ * @param reserve_priv private key of the reserve to attest
+ * @param attributes_length length of the @a attributes array
+ * @param attributes array of names of attributes to get attestations for
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ *         signatures fail to verify).  In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_ReservesAttestHandle *
+TALER_EXCHANGE_reserves_attest (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  unsigned int attributes_length,
+  const char *attributes[const static attributes_length],
+  TALER_EXCHANGE_ReservesPostAttestCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel a reserve attestation request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param rah the reserve attest request handle
+ */
+void
+TALER_EXCHANGE_reserves_attest_cancel (
+  struct TALER_EXCHANGE_ReservesAttestHandle *rah);
+
+
+/* *********************  /reserves/$RID/close *********************** */
+
+
+/**
+ * @brief A /reserves/$RID/close Handle
+ */
+struct TALER_EXCHANGE_ReservesCloseHandle;
+
+
+/**
+ * @brief Reserve close result details.
+ */
+struct TALER_EXCHANGE_ReserveCloseResult
+{
+
+  /**
+   * High-level HTTP response details.
+   */
+  struct TALER_EXCHANGE_HttpResponse hr;
+
+  /**
+   * Details depending on @e hr.http_status.
+   */
+  union
+  {
+
+    /**
+     * Information returned on success, if
+     * @e hr.http_status is #MHD_HTTP_OK
+     */
+    struct
+    {
+
+      /**
+       * Amount wired to the target account.
+       */
+      struct TALER_Amount wire_amount;
+    } ok;
+
+    /**
+     * Information returned if KYC is required to proceed, set if
+     * @e hr.http_status is #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS.
+     */
+    struct
+    {
+      /**
+       * Requirement row that the merchant should use
+       * to check for its KYC status.
+       */
+      uint64_t requirement_row;
+
+      /**
+       * Hash of the payto-URI of the account to KYC;
+       */
+      struct TALER_PaytoHashP h_payto;
+
+    } unavailable_for_legal_reasons;
+
+  } details;
+
+};
+
+
+/**
+ * Callbacks of this type are used to serve the result of submitting a
+ * reserve close request to a exchange.
+ *
+ * @param cls closure
+ * @param ror HTTP response data
+ */
+typedef void
+(*TALER_EXCHANGE_ReservesCloseCallback) (
+  void *cls,
+  const struct TALER_EXCHANGE_ReserveCloseResult *ror);
+
+
+/**
+ * Submit a request to close a reserve.
+ *
+ * @param ctx curl context
+ * @param url exchange base URL
+ * @param reserve_priv private key of the reserve to close
+ * @param target_payto_uri where to send the payment, NULL to send to reserve origin
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ *         signatures fail to verify).  In this case, the callback is not called.
+ */
+struct TALER_EXCHANGE_ReservesCloseHandle *
+TALER_EXCHANGE_reserves_close (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const char *target_payto_uri,
+  TALER_EXCHANGE_ReservesCloseCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Cancel a reserve status request.  This function cannot be used
+ * on a request handle if a response is already served for it.
+ *
+ * @param rch the reserve request handle
+ */
+void
+TALER_EXCHANGE_reserves_close_cancel (
+  struct TALER_EXCHANGE_ReservesCloseHandle *rch);
+
 #endif  /* _TALER_EXCHANGE_SERVICE_H */
diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h
index 7f466728a..d93cf9d6c 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_exchangedb_lib.h
@@ -46,7 +46,6 @@ TALER_EXCHANGEDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg);
 void
 TALER_EXCHANGEDB_plugin_unload (struct TALER_EXCHANGEDB_Plugin *plugin);
 
-
 /**
  * Information about an account from the configuration.
  */
@@ -70,13 +69,13 @@ struct TALER_EXCHANGEDB_AccountInfo
   const char *method;
 
   /**
-   * true if this account is enabed to be debited
+   * true if this account is enabled to be debited
    * by the taler-exchange-aggregator.
    */
   bool debit_enabled;
 
   /**
-   * true if this account is enabed to be credited by wallets
+   * true if this account is enabled to be credited by wallets
    * and needs to be watched by the taler-exchange-wirewatch.
    * Also, the account will only be included in /wire if credit
    * is enabled.
@@ -95,7 +94,7 @@ struct TALER_EXCHANGEDB_AccountInfo
  * @param[out] ret where the resulting total is to be stored
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
  */
-int
+enum GNUNET_GenericReturnValue
 TALER_EXCHANGEDB_calculate_transaction_list_totals (
   struct TALER_EXCHANGEDB_TransactionList *tl,
   const struct TALER_Amount *off,
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 213fe114d..2d5857677 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -18,13 +18,83 @@
  * @brief Low-level (statement-level) database access for the exchange
  * @author Florian Dold
  * @author Christian Grothoff
+ * @author Özgür Kesim
  */
 #ifndef TALER_EXCHANGEDB_PLUGIN_H
 #define TALER_EXCHANGEDB_PLUGIN_H
 #include <jansson.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_db_lib.h>
+#include "taler_json_lib.h"
 #include "taler_signatures.h"
+#include "taler_extensions_policy.h"
+
+/**
+ * The conflict that can occur for the age restriction
+ */
+enum TALER_EXCHANGEDB_AgeCommitmentHash_Conflict
+{
+  /**
+   * Value OK, no conflict
+   */
+  TALER_AgeCommitmentHash_NoConflict    = 0,
+
+  /**
+   * Given hash had a value, but NULL (or zero) was expected
+   */
+  TALER_AgeCommitmentHash_NullExpected  = 1,
+
+  /**
+   * Given hash was NULL, but value was expected
+   */
+  TALER_AgeCommitmentHash_ValueExpected = 2,
+
+  /**
+   * Given hash differs from value in the known coin
+   */
+  TALER_AgeCommitmentHash_ValueDiffers  = 3,
+};
+
+/**
+ * Per-coin information returned when doing a batch insert.
+ */
+struct TALER_EXCHANGEDB_CoinInfo
+{
+  /**
+   * Row of the coin in the known_coins table.
+   */
+  uint64_t known_coin_id;
+
+  /**
+   * Hash of the denomination, relevant on @e denom_conflict.
+   */
+  struct TALER_DenominationHashP denom_hash;
+
+  /**
+   * Hash of the age commitment, relevant on @e age_conflict.
+   */
+  struct TALER_AgeCommitmentHash h_age_commitment;
+
+  /**
+   * True if the coin was known previously.
+   */
+  bool existed;
+
+  /**
+   * True if the known coin has a different denomination;
+   * application will find denomination of the already
+   * known coin in @e denom_hash.
+   */
+  bool denom_conflict;
+
+  /**
+   * Indicates if and what kind of conflict with the age
+   * restriction of the known coin was present;
+   * application will find age commitment of the already
+   * known coin in @e h_age_commitment.
+   */
+  enum TALER_EXCHANGEDB_AgeCommitmentHash_Conflict age_conflict;
+};
 
 
 /**
@@ -105,7 +175,25 @@ struct TALER_EXCHANGEDB_DenominationKeyInformation
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * Signature of events signalling a reserve got funding.
+ * Events signalling that a coin deposit status
+ * changed.
+ */
+struct TALER_CoinDepositEventP
+{
+  /**
+   * Of type #TALER_DBEVENT_EXCHANGE_DEPOSIT_STATUS_CHANGED.
+   */
+  struct GNUNET_DB_EventHeaderP header;
+
+  /**
+   * Public key of the merchant.
+   */
+  struct TALER_MerchantPublicKeyP merchant_pub;
+
+};
+
+/**
+ * Events signalling a reserve got funding.
  */
 struct TALER_ReserveEventP
 {
@@ -191,12 +279,17 @@ struct TALER_EXCHANGEDB_SignkeyMetaData
  */
 enum TALER_EXCHANGEDB_ReplicatedTable
 {
+  /* From exchange-0002.sql: */
   TALER_EXCHANGEDB_RT_DENOMINATIONS,
   TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS,
   TALER_EXCHANGEDB_RT_WIRE_TARGETS,
+  TALER_EXCHANGEDB_RT_LEGITIMIZATION_PROCESSES,
+  TALER_EXCHANGEDB_RT_LEGITIMIZATION_REQUIREMENTS,
   TALER_EXCHANGEDB_RT_RESERVES,
   TALER_EXCHANGEDB_RT_RESERVES_IN,
   TALER_EXCHANGEDB_RT_RESERVES_CLOSE,
+  TALER_EXCHANGEDB_RT_RESERVES_OPEN_REQUESTS,
+  TALER_EXCHANGEDB_RT_RESERVES_OPEN_DEPOSITS,
   TALER_EXCHANGEDB_RT_RESERVES_OUT,
   TALER_EXCHANGEDB_RT_AUDITORS,
   TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS,
@@ -206,7 +299,8 @@ enum TALER_EXCHANGEDB_ReplicatedTable
   TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS,
   TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS,
   TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS,
-  TALER_EXCHANGEDB_RT_DEPOSITS,
+  TALER_EXCHANGEDB_RT_BATCH_DEPOSITS,
+  TALER_EXCHANGEDB_RT_COIN_DEPOSITS,
   TALER_EXCHANGEDB_RT_REFUNDS,
   TALER_EXCHANGEDB_RT_WIRE_OUT,
   TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING,
@@ -215,7 +309,26 @@ enum TALER_EXCHANGEDB_ReplicatedTable
   TALER_EXCHANGEDB_RT_RECOUP,
   TALER_EXCHANGEDB_RT_RECOUP_REFRESH,
   TALER_EXCHANGEDB_RT_EXTENSIONS,
-  TALER_EXCHANGEDB_RT_EXTENSION_DETAILS,
+  TALER_EXCHANGEDB_RT_POLICY_DETAILS,
+  TALER_EXCHANGEDB_RT_POLICY_FULFILLMENTS,
+  TALER_EXCHANGEDB_RT_PURSE_REQUESTS,
+  TALER_EXCHANGEDB_RT_PURSE_DECISION,
+  TALER_EXCHANGEDB_RT_PURSE_MERGES,
+  TALER_EXCHANGEDB_RT_PURSE_DEPOSITS,
+  TALER_EXCHANGEDB_RT_ACCOUNT_MERGES,
+  TALER_EXCHANGEDB_RT_HISTORY_REQUESTS,
+  TALER_EXCHANGEDB_RT_CLOSE_REQUESTS,
+  TALER_EXCHANGEDB_RT_WADS_OUT,
+  TALER_EXCHANGEDB_RT_WADS_OUT_ENTRIES,
+  TALER_EXCHANGEDB_RT_WADS_IN,
+  TALER_EXCHANGEDB_RT_WADS_IN_ENTRIES,
+  TALER_EXCHANGEDB_RT_PROFIT_DRAINS,
+  /* From exchange-0003.sql: */
+  TALER_EXCHANGEDB_RT_AML_STAFF,
+  TALER_EXCHANGEDB_RT_AML_HISTORY,
+  TALER_EXCHANGEDB_RT_KYC_ATTRIBUTES,
+  TALER_EXCHANGEDB_RT_PURSE_DELETION,
+  TALER_EXCHANGEDB_RT_AGE_WITHDRAW,
 };
 
 
@@ -266,17 +379,28 @@ struct TALER_EXCHANGEDB_TableData
     struct
     {
       char *payto_uri;
-      bool kyc_ok;
-      char *external_id;
     } wire_targets;
 
     struct
     {
+      struct TALER_PaytoHashP h_payto;
+      struct GNUNET_TIME_Timestamp expiration_time;
+      char *provider_section;
+      char *provider_user_id;
+      char *provider_legitimization_id;
+    } legitimization_processes;
+
+    struct
+    {
+      struct TALER_PaytoHashP h_payto;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      bool no_reserve_pub;
+      char *required_checks;
+    } legitimization_requirements;
+
+    struct
+    {
       struct TALER_ReservePublicKeyP reserve_pub;
-      /**
-       * Note: not useful for auditor, because not UPDATEd!
-       */
-      struct TALER_Amount current_balance;
       struct GNUNET_TIME_Timestamp expiration_date;
       struct GNUNET_TIME_Timestamp gc_date;
     } reserves;
@@ -294,6 +418,25 @@ struct TALER_EXCHANGEDB_TableData
     struct
     {
       struct TALER_ReservePublicKeyP reserve_pub;
+      struct GNUNET_TIME_Timestamp request_timestamp;
+      struct GNUNET_TIME_Timestamp expiration_date;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_Amount reserve_payment;
+      uint32_t requested_purse_limit;
+    } reserves_open_requests;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+      struct TALER_CoinSpendSignatureP coin_sig;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_Amount contribution;
+    } reserves_open_deposits;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
       struct GNUNET_TIME_Timestamp execution_date;
       struct TALER_WireTransferIdentifierRawP wtid;
       struct TALER_PaytoHashP sender_account_h_payto;
@@ -347,7 +490,6 @@ struct TALER_EXCHANGEDB_TableData
       struct TALER_AgeCommitmentHash age_hash;
       uint64_t denominations_serial;
       struct TALER_DenominationSignature denom_sig;
-      struct TALER_Amount remaining;
     } known_coins;
 
     struct
@@ -382,27 +524,33 @@ struct TALER_EXCHANGEDB_TableData
     struct
     {
       uint64_t shard;
-      uint64_t known_coin_id;
-      struct TALER_CoinSpendPublicKeyP coin_pub;
-      struct TALER_Amount amount_with_fee;
+      struct TALER_MerchantPublicKeyP merchant_pub;
       struct GNUNET_TIME_Timestamp wallet_timestamp;
       struct GNUNET_TIME_Timestamp exchange_timestamp;
       struct GNUNET_TIME_Timestamp refund_deadline;
       struct GNUNET_TIME_Timestamp wire_deadline;
-      struct TALER_MerchantPublicKeyP merchant_pub;
       struct TALER_PrivateContractHashP h_contract_terms;
-      struct TALER_CoinSpendSignatureP coin_sig;
+      struct GNUNET_HashCode wallet_data_hash;
+      bool no_wallet_data_hash;
       struct TALER_WireSaltP wire_salt;
       struct TALER_PaytoHashP wire_target_h_payto;
-      bool done;
-      bool extension_blocked;
-      uint64_t extension_details_serial_id;
-    } deposits;
+      bool policy_blocked;
+      uint64_t policy_details_serial_id;
+      bool no_policy_details;
+    } batch_deposits;
 
     struct
     {
+      uint64_t batch_deposit_serial_id;
       struct TALER_CoinSpendPublicKeyP coin_pub;
-      uint64_t deposit_serial_id;
+      struct TALER_CoinSpendSignatureP coin_sig;
+      struct TALER_Amount amount_with_fee;
+    } coin_deposits;
+
+    struct
+    {
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+      uint64_t batch_deposit_serial_id;
       struct TALER_MerchantSignatureP merchant_sig;
       uint64_t rtransaction_id;
       struct TALER_Amount amount_with_fee;
@@ -419,7 +567,7 @@ struct TALER_EXCHANGEDB_TableData
 
     struct
     {
-      uint64_t deposit_serial_id;
+      uint64_t batch_deposit_serial_id;
       struct TALER_WireTransferIdentifierRawP wtid_raw;
     } aggregation_tracking;
 
@@ -438,7 +586,6 @@ struct TALER_EXCHANGEDB_TableData
       struct GNUNET_TIME_Timestamp end_date;
       struct TALER_GlobalFeeSet fees;
       struct GNUNET_TIME_Relative purse_timeout;
-      struct GNUNET_TIME_Relative kyc_timeout;
       struct GNUNET_TIME_Relative history_expiration;
       uint32_t purse_account_limit;
       struct TALER_MasterSignatureP master_sig;
@@ -448,7 +595,7 @@ struct TALER_EXCHANGEDB_TableData
     {
       struct TALER_CoinSpendPublicKeyP coin_pub;
       struct TALER_CoinSpendSignatureP coin_sig;
-      union TALER_DenominationBlindingKeyP coin_blind;
+      union GNUNET_CRYPTO_BlindingSecretP coin_blind;
       struct TALER_Amount amount;
       struct GNUNET_TIME_Timestamp timestamp;
       uint64_t reserve_out_serial_id;
@@ -459,7 +606,7 @@ struct TALER_EXCHANGEDB_TableData
       uint64_t known_coin_id;
       struct TALER_CoinSpendPublicKeyP coin_pub;
       struct TALER_CoinSpendSignatureP coin_sig;
-      union TALER_DenominationBlindingKeyP coin_blind;
+      union GNUNET_CRYPTO_BlindingSecretP coin_blind;
       struct TALER_Amount amount;
       struct GNUNET_TIME_Timestamp timestamp;
       uint64_t rrc_serial;
@@ -468,13 +615,207 @@ struct TALER_EXCHANGEDB_TableData
     struct
     {
       char *name;
-      char *config;
+      char *manifest;
     } extensions;
 
     struct
     {
-      char *extension_options;
-    } extension_details;
+      struct GNUNET_HashCode hash_code;
+      json_t *policy_json;
+      bool no_policy_json;
+      struct GNUNET_TIME_Timestamp deadline;
+      struct TALER_Amount commitment;
+      struct TALER_Amount accumulated_total;
+      struct TALER_Amount fee;
+      struct TALER_Amount transferable;
+      uint16_t fulfillment_state; /* will also be recomputed */
+      uint64_t fulfillment_id;
+      bool no_fulfillment_id;
+    } policy_details;
+
+    struct
+    {
+      struct GNUNET_TIME_Timestamp fulfillment_timestamp;
+      char *fulfillment_proof;
+      struct GNUNET_HashCode h_fulfillment_proof;
+      struct GNUNET_HashCode *policy_hash_codes;
+      size_t policy_hash_codes_count;
+    } policy_fulfillments;
+
+    struct
+    {
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PurseMergePublicKeyP merge_pub;
+      struct GNUNET_TIME_Timestamp purse_creation;
+      struct GNUNET_TIME_Timestamp purse_expiration;
+      struct TALER_PrivateContractHashP h_contract_terms;
+      uint32_t age_limit;
+      uint32_t flags;
+      struct TALER_Amount amount_with_fee;
+      struct TALER_Amount purse_fee;
+      struct TALER_PurseContractSignatureP purse_sig;
+    } purse_requests;
+
+    struct
+    {
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct GNUNET_TIME_Timestamp action_timestamp;
+      bool refunded;
+    } purse_decision;
+
+    struct
+    {
+      uint64_t partner_serial_id;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PurseMergeSignatureP merge_sig;
+      struct GNUNET_TIME_Timestamp merge_timestamp;
+    } purse_merges;
+
+    struct
+    {
+      uint64_t partner_serial_id;
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+      struct TALER_Amount amount_with_fee;
+      struct TALER_CoinSpendSignatureP coin_sig;
+    } purse_deposits;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PaytoHashP wallet_h_payto;
+    } account_merges;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct GNUNET_TIME_Timestamp request_timestamp;
+      struct TALER_Amount history_fee;
+    } history_requests;
+
+    struct
+    {
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct GNUNET_TIME_Timestamp close_timestamp;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_Amount close;
+      struct TALER_Amount close_fee;
+      char *payto_uri;
+    } close_requests;
+
+    struct
+    {
+      struct TALER_WadIdentifierP wad_id;
+      uint64_t partner_serial_id;
+      struct TALER_Amount amount;
+      struct GNUNET_TIME_Timestamp execution_time;
+    } wads_out;
+
+    struct
+    {
+      uint64_t wad_out_serial_id;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PrivateContractHashP h_contract;
+      struct GNUNET_TIME_Timestamp purse_expiration;
+      struct GNUNET_TIME_Timestamp merge_timestamp;
+      struct TALER_Amount amount_with_fee;
+      struct TALER_Amount wad_fee;
+      struct TALER_Amount deposit_fees;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_PurseContractSignatureP purse_sig;
+    } wads_out_entries;
+
+    struct
+    {
+      struct TALER_WadIdentifierP wad_id;
+      char *origin_exchange_url;
+      struct TALER_Amount amount;
+      struct GNUNET_TIME_Timestamp arrival_time;
+    } wads_in;
+
+    struct
+    {
+      uint64_t wad_in_serial_id;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PrivateContractHashP h_contract;
+      struct GNUNET_TIME_Timestamp purse_expiration;
+      struct GNUNET_TIME_Timestamp merge_timestamp;
+      struct TALER_Amount amount_with_fee;
+      struct TALER_Amount wad_fee;
+      struct TALER_Amount deposit_fees;
+      struct TALER_ReserveSignatureP reserve_sig;
+      struct TALER_PurseContractSignatureP purse_sig;
+    } wads_in_entries;
+
+    struct
+    {
+      struct TALER_WireTransferIdentifierRawP wtid;
+      char *account_section;
+      char *payto_uri;
+      struct GNUNET_TIME_Timestamp trigger_date;
+      struct TALER_Amount amount;
+      struct TALER_MasterSignatureP master_sig;
+    } profit_drains;
+
+    struct
+    {
+      struct TALER_AmlOfficerPublicKeyP decider_pub;
+      struct TALER_MasterSignatureP master_sig;
+      char *decider_name;
+      bool is_active;
+      bool read_only;
+      struct GNUNET_TIME_Timestamp last_change;
+    } aml_staff;
+
+    struct
+    {
+      struct TALER_PaytoHashP h_payto;
+      struct TALER_Amount new_threshold;
+      enum TALER_AmlDecisionState new_status;
+      struct GNUNET_TIME_Timestamp decision_time;
+      char *justification;
+      char *kyc_requirements; /* NULL allowed! */
+      uint64_t kyc_req_row;
+      struct TALER_AmlOfficerPublicKeyP decider_pub;
+      struct TALER_AmlOfficerSignatureP decider_sig;
+    } aml_history;
+
+    struct
+    {
+      struct TALER_PaytoHashP h_payto;
+      struct GNUNET_ShortHashCode kyc_prox;
+      char *provider;
+      struct GNUNET_TIME_Timestamp collection_time;
+      struct GNUNET_TIME_Timestamp expiration_time;
+      void *encrypted_attributes;
+      size_t encrypted_attributes_size;
+    } kyc_attributes;
+
+    struct
+    {
+      struct TALER_PurseContractPublicKeyP purse_pub;
+      struct TALER_PurseContractSignatureP purse_sig;
+    } purse_deletion;
+
+    struct
+    {
+      struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+      struct TALER_Amount amount_with_fee;
+      uint16_t max_age;
+      uint32_t noreveal_index;
+      struct TALER_ReservePublicKeyP reserve_pub;
+      struct TALER_ReserveSignatureP reserve_sig;
+      uint64_t num_coins;
+      uint64_t *denominations_serials;
+      void *h_blind_evs;
+      struct TALER_BlindedDenominationSignature denom_sigs;
+    } age_withdraw;
 
   } details;
 
@@ -635,6 +976,13 @@ struct TALER_EXCHANGEDB_Reserve
 struct TALER_EXCHANGEDB_DenominationKeyMetaData
 {
   /**
+   * Serial of the denomination key as in the DB.
+   * Can be used in calls to stored procedures in order to spare
+   * additional lookups.
+   */
+  uint64_t serial;
+
+  /**
    * Start time of the validity period for this key.
    */
   struct GNUNET_TIME_Timestamp start;
@@ -743,6 +1091,39 @@ typedef void
 
 
 /**
+ * Function called on all KYC process names that the given
+ * account has already passed.
+ *
+ * @param cls closure
+ * @param kyc_provider_section_name configuration section
+ *        of the respective KYC process
+ */
+typedef void
+(*TALER_EXCHANGEDB_SatisfiedProviderCallback)(
+  void *cls,
+  const char *kyc_provider_section_name);
+
+
+/**
+ * Function called on all legitimization operations
+ * we have performed for the given account so far
+ * (and that have not yet expired).
+ *
+ * @param cls closure
+ * @param kyc_provider_section_name configuration section
+ *        of the respective KYC process
+ * @param provider_user_id UID at a provider (can be NULL)
+ * @param legi_id legitimization process ID (can be NULL)
+ */
+typedef void
+(*TALER_EXCHANGEDB_LegitimizationProcessCallback)(
+  void *cls,
+  const char *kyc_provider_section_name,
+  const char *provider_user_id,
+  const char *legi_id);
+
+
+/**
  * Function called with information about the exchange's auditors.
  *
  * @param cls closure with a `struct TEH_KeyStateHandle *`
@@ -835,6 +1216,79 @@ struct TALER_EXCHANGEDB_CollectableBlindcoin
 
 
 /**
+ * @brief Information we keep for an age-withdraw request
+ * to reproduce the /age-withdraw operation if needed, and to have proof
+ * that a reserve was drained by this amount.
+ */
+struct TALER_EXCHANGEDB_AgeWithdraw
+{
+  /**
+   * Total amount (with fee) committed to withdraw
+   */
+  struct TALER_Amount amount_with_fee;
+
+  /**
+   * Maximum age (in years) that the coins are restricted to.
+   */
+  uint16_t max_age;
+
+  /**
+   * The hash of the commitment of all n*kappa coins
+   */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+  /**
+   * Index (smaller #TALER_CNC_KAPPA) which the exchange has chosen to not have
+   * revealed during cut and choose.  This value applies to all n coins in the
+   * commitment.
+   */
+  uint16_t noreveal_index;
+
+  /**
+   * Public key of the reserve that was drained.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Signature confirming the age withdrawal commitment, matching @e
+   * reserve_pub, @e max_age and @e h_commitment and @e amount_with_fee.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Number of coins to be withdrawn.
+   */
+  size_t num_coins;
+
+  /**
+   * Array of @a num_coins blinded coins.  These are the chosen coins
+   * (according to @a noreveal_index) from the request, which contained
+   * kappa*num_coins blinded coins.
+   */
+  struct TALER_BlindedCoinHashP *h_coin_evs;
+
+  /**
+   * Array of @a num_coins denomination signatures of the blinded coins @a
+   * h_coin_evs.
+   */
+  struct TALER_BlindedDenominationSignature *denom_sigs;
+
+  /**
+   * Array of @a num_coins serial id's of the denominations, corresponding to
+   * the coins in @a h_coin_evs.
+   */
+  uint64_t *denom_serials;
+
+  /**
+   * [out]-Array of @a num_coins hashes of the public keys of the denominations
+   * identified by @e denom_serials.  This field is set when calling
+   * get_age_withdraw
+   */
+  struct TALER_DenominationHashP *denom_pub_hashes;
+};
+
+
+/**
  * Information the exchange records about a recoup request
  * in a reserve history.
  */
@@ -850,7 +1304,7 @@ struct TALER_EXCHANGEDB_Recoup
    * Blinding factor supplied to prove to the exchange that
    * the coin came from this reserve.
    */
-  union TALER_DenominationBlindingKeyP coin_blind;
+  union GNUNET_CRYPTO_BlindingSecretP coin_blind;
 
   /**
    * Signature of the coin of type
@@ -904,7 +1358,7 @@ struct TALER_EXCHANGEDB_RecoupListEntry
    * Blinding factor supplied to prove to the exchange that
    * the coin came from this reserve.
    */
-  union TALER_DenominationBlindingKeyP coin_blind;
+  union GNUNET_CRYPTO_BlindingSecretP coin_blind;
 
   /**
    * Signature of the coin of type
@@ -952,7 +1406,7 @@ struct TALER_EXCHANGEDB_RecoupRefreshListEntry
    * Blinding factor supplied to prove to the exchange that
    * the coin came from this @e old_coin_pub.
    */
-  union TALER_DenominationBlindingKeyP coin_blind;
+  union GNUNET_CRYPTO_BlindingSecretP coin_blind;
 
   /**
    * Signature of the coin of type
@@ -979,6 +1433,173 @@ struct TALER_EXCHANGEDB_RecoupRefreshListEntry
 
 
 /**
+ * Details about a purse merge operation.
+ */
+struct TALER_EXCHANGEDB_PurseMerge
+{
+
+  /**
+   * Public key of the reserve the coin was merged into.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Amount in the purse, with fees.
+   */
+  struct TALER_Amount amount_with_fee;
+
+  /**
+   * Fee paid for the purse.
+   */
+  struct TALER_Amount purse_fee;
+
+  /**
+   * Hash over the contract.
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * Merge capability key.
+   */
+  struct TALER_PurseMergePublicKeyP merge_pub;
+
+  /**
+   * Purse public key.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Signature by the reserve approving the merge.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * When was the merge made.
+   */
+  struct GNUNET_TIME_Timestamp merge_timestamp;
+
+  /**
+   * When was the purse set to expire.
+   */
+  struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Minimum age required for depositing into the purse.
+   */
+  uint32_t min_age;
+
+  /**
+   * Flags of the purse.
+   */
+  enum TALER_WalletAccountMergeFlags flags;
+
+  /**
+   * true if the purse was actually successfully merged,
+   * false if the @e purse_fee was charged but the
+   * @e amount was not credited to the reserve.
+   */
+  bool merged;
+};
+
+
+/**
+ * Details about a (paid for) reserve history request.
+ */
+struct TALER_EXCHANGEDB_HistoryRequest
+{
+  /**
+   * Public key of the reserve the history request was for.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Fee paid for the request.
+   */
+  struct TALER_Amount history_fee;
+
+  /**
+   * When was the request made.
+   */
+  struct GNUNET_TIME_Timestamp request_timestamp;
+
+  /**
+   * Signature by the reserve approving the history request.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+};
+
+
+/**
+ * Details about a (paid for) reserve open request.
+ */
+struct TALER_EXCHANGEDB_OpenRequest
+{
+  /**
+   * Public key of the reserve the open request was for.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Fee paid for the request from the reserve.
+   */
+  struct TALER_Amount open_fee;
+
+  /**
+   * When was the request made.
+   */
+  struct GNUNET_TIME_Timestamp request_timestamp;
+
+  /**
+   * How long was the reserve supposed to be open.
+   */
+  struct GNUNET_TIME_Timestamp reserve_expiration;
+
+  /**
+   * Signature by the reserve approving the open request,
+   * with purpose #TALER_SIGNATURE_WALLET_RESERVE_OPEN.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * How many open purses should be included with the
+   * open reserve?
+   */
+  uint32_t purse_limit;
+
+};
+
+
+/**
+ * Details about an (explicit) reserve close request.
+ */
+struct TALER_EXCHANGEDB_CloseRequest
+{
+  /**
+   * Public key of the reserve the history request was for.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * When was the request made.
+   */
+  struct GNUNET_TIME_Timestamp request_timestamp;
+
+  /**
+   * Hash of the payto://-URI of the target account
+   * for the closure, or all zeros for the reserve
+   * origin account.
+   */
+  struct TALER_PaytoHashP target_account_h_payto;
+
+  /**
+   * Signature by the reserve approving the history request.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+};
+
+
+/**
  * @brief Types of operations on a reserve.
  */
 enum TALER_EXCHANGEDB_ReserveOperation
@@ -1004,7 +1625,27 @@ enum TALER_EXCHANGEDB_ReserveOperation
    * customer's bank account.  This happens when the exchange
    * closes a reserve with a non-zero amount left in it.
    */
-  TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK = 3
+  TALER_EXCHANGEDB_RO_EXCHANGE_TO_BANK = 3,
+
+  /**
+   * Event where a purse was merged into a reserve.
+   */
+  TALER_EXCHANGEDB_RO_PURSE_MERGE = 4,
+
+  /**
+   * Event where a wallet paid for a full reserve history.
+   */
+  TALER_EXCHANGEDB_RO_HISTORY_REQUEST = 5,
+
+  /**
+   * Event where a wallet paid to open a reserve for longer.
+   */
+  TALER_EXCHANGEDB_RO_OPEN_REQUEST = 6,
+
+  /**
+   * Event where a wallet requested a reserve to be closed.
+   */
+  TALER_EXCHANGEDB_RO_CLOSE_REQUEST = 7
 };
 
 
@@ -1055,12 +1696,156 @@ struct TALER_EXCHANGEDB_ReserveHistory
      */
     struct TALER_EXCHANGEDB_ClosingTransfer *closing;
 
+    /**
+     * Details about a purse merge operation.
+     */
+    struct TALER_EXCHANGEDB_PurseMerge *merge;
+
+    /**
+     * Details about a (paid for) reserve history request.
+     */
+    struct TALER_EXCHANGEDB_HistoryRequest *history;
+
+    /**
+     * Details about a (paid for) open reserve request.
+     */
+    struct TALER_EXCHANGEDB_OpenRequest *open_request;
+
+    /**
+     * Details about an (explicit) reserve close request.
+     */
+    struct TALER_EXCHANGEDB_CloseRequest *close_request;
+
   } details;
 
 };
 
 
 /**
+ * @brief Data about a coin for a deposit operation.
+ */
+struct TALER_EXCHANGEDB_CoinDepositInformation
+{
+  /**
+   * Information about the coin that is being deposited.
+   */
+  struct TALER_CoinPublicInfo coin;
+
+  /**
+   * ECDSA signature affirming that the customer intends
+   * this coin to be deposited at the merchant identified
+   * by @e h_wire in relation to the proposal data identified
+   * by @e h_contract_terms.
+   */
+  struct TALER_CoinSpendSignatureP csig;
+
+  /**
+   * Fraction of the coin's remaining value to be deposited, including
+   * depositing fee (if any).  The coin is identified by @e coin_pub.
+   */
+  struct TALER_Amount amount_with_fee;
+
+};
+
+
+/**
+ * @brief Data from a batch deposit operation.
+ */
+struct TALER_EXCHANGEDB_BatchDeposit
+{
+
+  /**
+   * Public key of the merchant.  Enables later identification
+   * of the merchant in case of a need to rollback transactions.
+   */
+  struct TALER_MerchantPublicKeyP merchant_pub;
+
+  /**
+   * Hash over the proposal data between merchant and customer
+   * (remains unknown to the Exchange).
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * Hash over additional inputs by the wallet.
+   */
+  struct GNUNET_HashCode wallet_data_hash;
+
+  /**
+   * Unsalted hash over @e receiver_wire_account.
+   */
+  struct TALER_PaytoHashP wire_target_h_payto;
+
+  /**
+   * Salt used by the merchant to compute "h_wire".
+   */
+  struct TALER_WireSaltP wire_salt;
+
+  /**
+   * Time when this request was generated.  Used, for example, to
+   * assess when (roughly) the income was achieved for tax purposes.
+   * Note that the Exchange will only check that the timestamp is not "too
+   * far" into the future (i.e. several days).  The fact that the
+   * timestamp falls within the validity period of the coin's
+   * denomination key is irrelevant for the validity of the deposit
+   * request, as obviously the customer and merchant could conspire to
+   * set any timestamp.  Also, the Exchange must accept very old deposit
+   * requests, as the merchant might have been unable to transmit the
+   * deposit request in a timely fashion (so back-dating is not
+   * prevented).
+   */
+  struct GNUNET_TIME_Timestamp wallet_timestamp;
+
+  /**
+   * How much time does the merchant have to issue a refund request?
+   * Zero if refunds are not allowed.  After this time, the coin
+   * cannot be refunded.
+   */
+  struct GNUNET_TIME_Timestamp refund_deadline;
+
+  /**
+   * How much time does the merchant have to execute the wire transfer?
+   * This time is advisory for aggregating transactions, not a hard
+   * constraint (as the merchant can theoretically pick any time,
+   * including one in the past).
+   */
+  struct GNUNET_TIME_Timestamp wire_deadline;
+
+  /**
+   * Row ID of the policy details; 0 if no policy applies.
+   */
+  uint64_t policy_details_serial_id;
+
+  /**
+   * Information about the receiver for executing the transaction.  URI in
+   * payto://-format.
+   */
+  const char *receiver_wire_account;
+
+  /**
+   * Array about the coins that are being deposited.
+   */
+  const struct TALER_EXCHANGEDB_CoinDepositInformation *cdis;
+
+  /**
+   * Length of the @e cdis array.
+   */
+  unsigned int num_cdis;
+
+  /**
+   * False if @e wallet_data_hash was provided
+   */
+  bool no_wallet_data_hash;
+
+  /**
+   * True if further processing is blocked by policy.
+   */
+  bool policy_blocked;
+
+};
+
+
+/**
  * @brief Data from a deposit operation.  The combination of
  * the coin's public key, the merchant's public key and the
  * transaction ID must be unique.  While a coin can (theoretically) be
@@ -1103,16 +1888,15 @@ struct TALER_EXCHANGEDB_Deposit
   struct TALER_WireSaltP wire_salt;
 
   /**
-   * Information about the receiver for executing the transaction.  URI in
-   * payto://-format.
+   * Hash over inputs from the wallet to customize the contract.
    */
-  char *receiver_wire_account;
+  struct GNUNET_HashCode wallet_data_hash;
 
   /**
-   * Additional details for extensions relevant for this
-   * deposit operation, possibly NULL!
+   * Hash over the policy data for this deposit (remains unknown to the
+   * Exchange).  Needed for the verification of the deposit's signature
    */
-  json_t *extension_details;
+  struct TALER_ExtensionPolicyHashP h_policy;
 
   /**
    * Time when this request was generated.  Used, for example, to
@@ -1155,6 +1939,22 @@ struct TALER_EXCHANGEDB_Deposit
    */
   struct TALER_Amount deposit_fee;
 
+  /**
+   * Information about the receiver for executing the transaction.  URI in
+   * payto://-format.
+   */
+  char *receiver_wire_account;
+
+  /**
+   * True if @e policy_json was provided
+   */
+  bool has_policy;
+
+  /**
+   * True if @e wallet_data_hash is not in use.
+   */
+  bool no_wallet_data_hash;
+
 };
 
 
@@ -1186,31 +1986,42 @@ struct TALER_EXCHANGEDB_DepositListEntry
   struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
+   * Hash over inputs from the wallet to customize the contract.
+   */
+  struct GNUNET_HashCode wallet_data_hash;
+
+  /**
    * Hash of the public denomination key used to sign the coin.
    */
   struct TALER_DenominationHashP h_denom_pub;
 
   /**
-   * Age commitment hash, if applicable ot the denomination.  Should be all
+   * Age commitment hash, if applicable to the denomination.  Should be all
    * zeroes if age commitment is not applicable to the denonimation.
    */
   struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
-   * true, if age commitment is not applicable
+   * Salt used to compute h_wire from the @e receiver_wire_account.
    */
-  bool no_age_commitment;
+  struct TALER_WireSaltP wire_salt;
 
   /**
-   * Detailed information about the receiver for executing the transaction.
-   * URL in payto://-format.
+   * Hash over the policy data for this deposit (remains unknown to the
+   * Exchange).  Needed for the verification of the deposit's signature
    */
-  char *receiver_wire_account;
+  struct TALER_ExtensionPolicyHashP h_policy;
 
   /**
-   * Salt used to compute h_wire from the @e receiver_wire_account.
+   * Fraction of the coin's remaining value to be deposited, including
+   * depositing fee (if any).  The coin is identified by @e coin_pub.
    */
-  struct TALER_WireSaltP wire_salt;
+  struct TALER_Amount amount_with_fee;
+
+  /**
+   * Depositing fee.
+   */
+  struct TALER_Amount deposit_fee;
 
   /**
    * Time when this request was generated.  Used, for example, to
@@ -1243,15 +2054,25 @@ struct TALER_EXCHANGEDB_DepositListEntry
   struct GNUNET_TIME_Timestamp wire_deadline;
 
   /**
-   * Fraction of the coin's remaining value to be deposited, including
-   * depositing fee (if any).  The coin is identified by @e coin_pub.
+   * Detailed information about the receiver for executing the transaction.
+   * URL in payto://-format.
    */
-  struct TALER_Amount amount_with_fee;
+  char *receiver_wire_account;
 
   /**
-   * Depositing fee.
+   * true, if age commitment is not applicable
    */
-  struct TALER_Amount deposit_fee;
+  bool no_age_commitment;
+
+  /**
+   * true, if wallet data hash is not present
+   */
+  bool no_wallet_data_hash;
+
+  /**
+   * True if a policy was provided with the deposit request
+   */
+  bool has_policy;
 
   /**
    * Has the deposit been wired?
@@ -1426,6 +2247,158 @@ struct TALER_EXCHANGEDB_MeltListEntry
 
 
 /**
+ * Information about a /purses/$PID/deposit operation in a coin transaction history.
+ */
+struct TALER_EXCHANGEDB_PurseDepositListEntry
+{
+
+  /**
+   * Exchange hosting the purse, NULL for this exchange.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Contribution of the coin to the purse, including
+   * deposit fee.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Depositing fee.
+   */
+  struct TALER_Amount deposit_fee;
+
+  /**
+   * Signature by the coin affirming the deposit.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * Hash of the age commitment used to sign the coin, if age restriction was
+   * applicable to the denomination.
+   */
+  struct TALER_AgeCommitmentHash h_age_commitment;
+
+  /**
+   * Set to true if the coin was refunded.
+   */
+  bool refunded;
+
+  /**
+   * Set to true if there was no age commitment.
+   */
+  bool no_age_commitment;
+
+};
+
+
+/**
+ * @brief Specification for a purse refund operation in a coin's transaction list.
+ */
+struct TALER_EXCHANGEDB_PurseRefundListEntry
+{
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Fraction of the original deposit's value to be refunded, including
+   * refund fee (if any).  The coin is identified by @e coin_pub.
+   */
+  struct TALER_Amount refund_amount;
+
+  /**
+   * Refund fee to be covered by the customer.
+   */
+  struct TALER_Amount refund_fee;
+
+};
+
+
+/**
+ * Information about a /reserves/$RID/open operation in a coin transaction history.
+ */
+struct TALER_EXCHANGEDB_ReserveOpenListEntry
+{
+
+  /**
+   * Signature of the reserve.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Contribution of the coin to the open fee, including
+   * deposit fee.
+   */
+  struct TALER_Amount coin_contribution;
+
+  /**
+   * Signature by the coin affirming the open deposit.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+};
+
+
+/**
+ * Information about a /purses/$PID/deposit operation.
+ */
+struct TALER_EXCHANGEDB_PurseDeposit
+{
+
+  /**
+   * Exchange hosting the purse, NULL for this exchange.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Contribution of the coin to the purse, including
+   * deposit fee.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Depositing fee.
+   */
+  struct TALER_Amount deposit_fee;
+
+  /**
+   * Signature by the coin affirming the deposit.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * Public key of the coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Hash of the age commitment used to sign the coin, if age restriction was
+   * applicable to the denomination.  May be all zeroes if no age restriction
+   * applies.
+   */
+  struct TALER_AgeCommitmentHash h_age_commitment;
+
+  /**
+   * Set to true if @e h_age_commitment is not available.
+   */
+  bool no_age_commitment;
+
+};
+
+/**
  * Information about a melt operation.
  */
 struct TALER_EXCHANGEDB_Melt
@@ -1476,9 +2449,9 @@ struct TALER_EXCHANGEDB_LinkList
   struct TALER_CoinSpendSignatureP orig_coin_link_sig;
 
   /**
-   * CS nonce, if cipher is CS.
+   * Session nonce, if cipher has one.
    */
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
 
   /**
    * Offset that generated this coin in the refresh
@@ -1528,7 +2501,22 @@ enum TALER_EXCHANGEDB_TransactionType
   /**
    * Recoup-refresh operation (on the new coin, eliminating its value)
    */
-  TALER_EXCHANGEDB_TT_RECOUP_REFRESH = 5
+  TALER_EXCHANGEDB_TT_RECOUP_REFRESH = 5,
+
+  /**
+   * Purse deposit operation.
+   */
+  TALER_EXCHANGEDB_TT_PURSE_DEPOSIT = 6,
+
+  /**
+   * Purse deposit operation.
+   */
+  TALER_EXCHANGEDB_TT_PURSE_REFUND = 7,
+
+  /**
+   * Reserve open deposit operation.
+   */
+  TALER_EXCHANGEDB_TT_RESERVE_OPEN = 8
 
 };
 
@@ -1598,6 +2586,24 @@ struct TALER_EXCHANGEDB_TransactionList
      */
     struct TALER_EXCHANGEDB_RecoupRefreshListEntry *recoup_refresh;
 
+    /**
+     * Coin was deposited into a purse.
+     * (#TALER_EXCHANGEDB_TT_PURSE_DEPOSIT)
+     */
+    struct TALER_EXCHANGEDB_PurseDepositListEntry *purse_deposit;
+
+    /**
+     * Coin was refunded upon purse expiration
+     * (#TALER_EXCHANGEDB_TT_PURSE_REFUND)
+     */
+    struct TALER_EXCHANGEDB_PurseRefundListEntry *purse_refund;
+
+    /**
+     * Coin was used to pay to open a reserve.
+     * (#TALER_EXCHANGEDB_TT_RESERVE_OPEN)
+     */
+    struct TALER_EXCHANGEDB_ReserveOpenListEntry *reserve_open;
+
   } details;
 
 };
@@ -1621,6 +2627,28 @@ typedef void
 
 
 /**
+ * Callback with KYC attributes about a particular user.
+ *
+ * @param cls closure
+ * @param h_payto account for which the attribute data is stored
+ * @param provider_section provider that must be checked
+ * @param collection_time when was the data collected
+ * @param expiration_time when does the data expire
+ * @param enc_attributes_size number of bytes in @a enc_attributes
+ * @param enc_attributes encrypted attribute data
+ */
+typedef void
+(*TALER_EXCHANGEDB_AttributeCallback)(
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *provider_section,
+  struct GNUNET_TIME_Timestamp collection_time,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  size_t enc_attributes_size,
+  const void *enc_attributes);
+
+
+/**
  * Function called with details about deposits that have been made,
  * with the goal of auditing the deposit's execution.
  *
@@ -1643,6 +2671,159 @@ typedef enum GNUNET_GenericReturnValue
 
 
 /**
+ * Function called with details about purse deposits that have been made, with
+ * the goal of auditing the deposit's execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param deposit deposit details
+ * @param reserve_pub which reserve is the purse merged into, NULL if unknown
+ * @param flags purse flags
+ * @param auditor_balance purse balance (according to the
+ *          auditor during auditing)
+ * @param purse_total target amount the purse should reach
+ * @param denom_pub denomination public key of @a coin_pub
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_PurseDepositCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_EXCHANGEDB_PurseDeposit *deposit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *auditor_balance,
+  const struct TALER_Amount *purse_total,
+  const struct TALER_DenominationPublicKey *denom_pub);
+
+
+/**
+ * Function called with details about
+ * account merge requests that have been made, with
+ * the goal of auditing the account merge execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param reserve_pub reserve affected by the merge
+ * @param purse_pub purse being merged
+ * @param h_contract_terms hash over contract of the purse
+ * @param purse_expiration when would the purse expire
+ * @param amount total amount in the purse
+ * @param min_age minimum age of all coins deposited into the purse
+ * @param flags how was the purse created
+ * @param purse_fee if a purse fee was paid, how high is it
+ * @param merge_timestamp when was the merge approved
+ * @param reserve_sig signature by reserve approving the merge
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_AccountMergeCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_Amount *amount,
+  uint32_t min_age,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_Amount *purse_fee,
+  struct GNUNET_TIME_Timestamp merge_timestamp,
+  const struct TALER_ReserveSignatureP *reserve_sig);
+
+
+/**
+ * Function called with details about purse
+ * merges that have been made, with
+ * the goal of auditing the purse merge execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param partner_base_url where is the reserve, NULL for this exchange
+ * @param amount total amount expected in the purse
+ * @param balance current balance in the purse (according to the auditor)
+ * @param flags purse flags
+ * @param merge_pub merge capability key
+ * @param reserve_pub reserve the merge affects
+ * @param merge_sig signature affirming the merge
+ * @param purse_pub purse key
+ * @param merge_timestamp when did the merge happen
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_PurseMergeCallback)(
+  void *cls,
+  uint64_t rowid,
+  const char *partner_base_url,
+  const struct TALER_Amount *amount,
+  const struct TALER_Amount *balance,
+  enum TALER_WalletAccountMergeFlags flags,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_PurseMergeSignatureP *merge_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct GNUNET_TIME_Timestamp merge_timestamp);
+
+
+/**
+ * Function called with details about purse decisions that have been made, with
+ * the goal of auditing the purse's execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param purse_pub public key of the purse
+ * @param reserve_pub public key of the target reserve, NULL if not known / refunded
+ * @param purse_value what is the (target) value of the purse
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_PurseDecisionCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *purse_value);
+
+
+/**
+ * Function called with details about purse decisions that have been made, with
+ * the goal of auditing the purse's execution.
+ *
+ * @param cls closure
+ * @param rowid unique serial ID for the deposit in our DB
+ * @param purse_pub public key of the purse
+ * @param refunded true if decision was to refund
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_AllPurseDecisionCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  bool refunded);
+
+
+/**
+ * Function called with details about purse refunds that have been made, with
+ * the goal of auditing the purse refund's execution.
+ *
+ * @param cls closure
+ * @param rowid row of the refund event
+ * @param amount_with_fee amount of the deposit into the purse
+ * @param coin_pub coin that is to be refunded the @a given amount_with_fee
+ * @param denom_pub denomination of @a coin_pub
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_PurseRefundCoinCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_DenominationPublicKey *denom_pub);
+
+
+/**
  * Function called with details about coins that were melted,
  * with the goal of auditing the refresh's execution.
  *
@@ -1753,70 +2934,52 @@ struct TALER_EXCHANGEDB_CsRevealFreshCoinData
 
 
 /**
- * Types of operations that require KYC checks.
+ * Generic KYC status for some operation.
  */
-enum TALER_EXCHANGEDB_KycType
+struct TALER_EXCHANGEDB_KycStatus
 {
-
   /**
-   * It is unclear for which type of KYC operation
-   * this information is.
+   * Number that identifies the KYC requirement the operation
+   * was about.
    */
-  TALER_EXCHANGEDB_KYC_UNKNOWN = 0,
+  uint64_t requirement_row;
 
   /**
-   * KYC to be applied for simple withdraws without
-   * the involvement of wallet-to-wallet payments.
-   * Tied to the payto:// of the debited account.
+   * True if the KYC status is "satisfied".
    */
-  TALER_EXCHANGEDB_KYC_WITHDRAW = 1,
+  bool ok;
 
-  /**
-   * KYC to be applied for simple deposits to a
-   * merchant's bank account.  Tied to the payto://
-   * of the credited account.
-   */
-  TALER_EXCHANGEDB_KYC_DEPOSIT = 2,
+};
 
-  /**
-   * KYC that is self-applied by a wallet that is exceeding the amount
-   * threshold.  Tied to the reserve-account public key that identifies the
-   * funds-holding wallet.
-   */
-  TALER_EXCHANGEDB_KYC_BALANCE = 3,
 
-  /**
-   * KYC that is triggered upon wallet-to-wallet
-   * payments for the recipient of funds. Tied to the
-   * reserve public key that identifies the receiving
-   * wallet.
-   */
-  TALER_EXCHANGEDB_KYC_W2W = 4
+struct TALER_EXCHANGEDB_ReserveInInfo
+{
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+  const struct TALER_Amount *balance;
+  struct GNUNET_TIME_Timestamp execution_time;
+  const char *sender_account_details;
+  const char *exchange_account_name;
+  uint64_t wire_reference;
 };
 
 
 /**
- * Generic KYC status for some operation.
+ * Function called on each @a amount that was found to
+ * be relevant for a KYC check.
+ *
+ * @param cls closure to allow the KYC module to
+ *        total up amounts and evaluate rules
+ * @param amount encountered transaction amount
+ * @param date when was the amount encountered
+ * @return #GNUNET_OK to continue to iterate,
+ *         #GNUNET_NO to abort iteration
+ *         #GNUNET_SYSERR on internal error (also abort itaration)
  */
-struct TALER_EXCHANGEDB_KycStatus
-{
-  /**
-   * Number that identifies the KYC target the operation
-   * was about.
-   */
-  uint64_t payment_target_uuid;
-
-  /**
-   * What kind of KYC operation is this?
-   */
-  enum TALER_EXCHANGEDB_KycType type;
-
-  /**
-   * True if the KYC status is "satisfied".
-   */
-  bool ok;
-
-};
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_KycAmountCallback)(
+  void *cls,
+  const struct TALER_Amount *amount,
+  struct GNUNET_TIME_Absolute date);
 
 
 /**
@@ -1845,6 +3008,7 @@ typedef void
  * @param merchant_sig signature of the merchant
  * @param h_contract_terms hash of the proposal data known to merchant and customer
  * @param rtransaction_id refund transaction ID chosen by the merchant
+ * @param full_refund true if the refunds total up to the entire value of the deposit
  * @param amount_with_fee amount that was deposited including fee
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
@@ -1858,6 +3022,7 @@ typedef enum GNUNET_GenericReturnValue
   const struct TALER_MerchantSignatureP *merchant_sig,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   uint64_t rtransaction_id,
+  bool full_refund,
   const struct TALER_Amount *amount_with_fee);
 
 
@@ -1889,14 +3054,24 @@ typedef enum GNUNET_GenericReturnValue
  *
  * @param cls closure
  * @param payto_uri the exchange bank account URI
+ * @param conversion_url URL of a conversion service, NULL if there is no conversion
+ * @param debit_restrictions JSON array with debit restrictions on the account
+ * @param credit_restrictions JSON array with credit restrictions on the account
  * @param master_sig master key signature affirming that this is a bank
  *                   account of the exchange (of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS)
+ * @param bank_label label the wallet should use to display the account, can be NULL
+ * @param priority priority for ordering bank account labels
  */
 typedef void
 (*TALER_EXCHANGEDB_WireAccountCallback)(
   void *cls,
   const char *payto_uri,
-  const struct TALER_MasterSignatureP *master_sig);
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
+  const struct TALER_MasterSignatureP *master_sig,
+  const char *bank_label,
+  int64_t priority);
 
 
 /**
@@ -1924,7 +3099,6 @@ typedef void
  * @param cls closure
  * @param fees the global fees we charge
  * @param purse_timeout when do purses time out
- * @param kyc_timeout when do reserves without KYC time out
  * @param history_expiration how long are account histories preserved
  * @param purse_account_limit how many purses are free per account
  * @param start_date from when are these fees valid (start date)
@@ -1937,7 +3111,6 @@ typedef void
   void *cls,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   struct GNUNET_TIME_Timestamp start_date,
@@ -2039,6 +3212,26 @@ typedef enum GNUNET_GenericReturnValue
 
 
 /**
+ * Function called on transient aggregations matching
+ * a particular hash of a payto URI.
+ *
+ * @param cls
+ * @param payto_uri corresponding payto URI
+ * @param wtid wire transfer identifier of transient aggregation
+ * @param merchant_pub public key of the merchant
+ * @param total amount aggregated so far
+ * @return true to continue iterating
+ */
+typedef bool
+(*TALER_EXCHANGEDB_TransientAggregationCallback)(
+  void *cls,
+  const char *payto_uri,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_Amount *total);
+
+
+/**
  * Callback with data about a prepared wire transfer.
  *
  * @param cls closure
@@ -2082,7 +3275,7 @@ typedef enum GNUNET_GenericReturnValue
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_DenominationPublicKey *denom_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig,
-  const union TALER_DenominationBlindingKeyP *coin_blind);
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_blind);
 
 
 /**
@@ -2112,7 +3305,34 @@ typedef enum GNUNET_GenericReturnValue
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_DenominationPublicKey *denom_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig,
-  const union TALER_DenominationBlindingKeyP *coin_blind);
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_blind);
+
+
+/**
+ * Function called about reserve opening operations.
+ *
+ * @param cls closure
+ * @param rowid row identifier used to uniquely identify the reserve closing operation
+ * @param reserve_payment how much to pay from the
+ *        reserve's own balance for opening the reserve
+ * @param request_timestamp when was the request created
+ * @param reserve_expiration desired expiration time for the reserve
+ * @param purse_limit minimum number of purses the client
+ *       wants to have concurrently open for this reserve
+ * @param reserve_pub public key of the reserve
+ * @param reserve_sig signature affirming the operation
+ * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_ReserveOpenCallback)(
+  void *cls,
+  uint64_t rowid,
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig);
 
 
 /**
@@ -2127,6 +3347,8 @@ typedef enum GNUNET_GenericReturnValue
  * @param reserve_pub public key of the reserve
  * @param receiver_account where did we send the funds, in payto://-format
  * @param wtid identifier used for the wire transfer
+ * @param close_request_row row with the responsible close
+ *            request, 0 if regular expiration triggered close
  * @return #GNUNET_OK to continue to iterate, #GNUNET_SYSERR to stop
  */
 typedef enum GNUNET_GenericReturnValue
@@ -2138,7 +3360,8 @@ typedef enum GNUNET_GenericReturnValue
   const struct TALER_Amount *closing_fee,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const char *receiver_account,
-  const struct TALER_WireTransferIdentifierRawP *wtid);
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  uint64_t close_request_row);
 
 
 /**
@@ -2161,15 +3384,20 @@ typedef void
  * @param left amount left in the reserve
  * @param account_details information about the reserve's bank account, in payto://-format
  * @param expiration_date when did the reserve expire
- * @return transaction status code to pass on
+ * @param close_request_row row that caused the reserve
+ *        to be closed, 0 if it expired without request
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO to retry
+ *         #GNUNET_SYSERR on hard failures (exit)
  */
-typedef enum GNUNET_DB_QueryStatus
+typedef enum GNUNET_GenericReturnValue
 (*TALER_EXCHANGEDB_ReserveExpiredCallback)(
   void *cls,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_Amount *left,
   const char *account_details,
-  struct GNUNET_TIME_Timestamp expiration_date);
+  struct GNUNET_TIME_Timestamp expiration_date,
+  uint64_t close_request_row);
 
 
 /**
@@ -2190,32 +3418,72 @@ typedef void
   uint64_t rowid,
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_CoinSpendSignatureP *coin_sig,
-  const union TALER_DenominationBlindingKeyP *coin_blind,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_blind,
   const struct TALER_BlindedCoinHashP *h_blinded_ev,
   const struct TALER_Amount *amount);
 
 
 /**
- * Function called on deposits that are past their due date
- * and have not yet seen a wire transfer.
+ * Function called on (batch) deposits will need a wire
+ * transfer.
  *
  * @param cls closure
- * @param rowid deposit table row of the coin's deposit
- * @param coin_pub public key of the coin
- * @param amount value of the deposit, including fee
- * @param payto_uri where should the funds be wired; URI in payto://-format
- * @param deadline what was the requested wire transfer deadline
- * @param done did the exchange claim that it made a transfer?
+ * @param batch_deposit_serial_id where in the table are we
+ * @param total_amount value of all missing deposits, including fees
+ * @param wire_target_h_payto hash of the recipient account's payto URI
+ * @param deadline what was the earliest requested wire transfer deadline
  */
 typedef void
 (*TALER_EXCHANGEDB_WireMissingCallback)(
   void *cls,
+  uint64_t batch_deposit_serial_id,
+  const struct TALER_Amount *total_amount,
+  const struct TALER_PaytoHashP *wire_target_h_payto,
+  struct GNUNET_TIME_Timestamp deadline);
+
+
+/**
+ * Function called on aggregations that were done for
+ * a (batch) deposit.
+ *
+ * @param cls closure
+ * @param tracking_serial_id where in the table are we
+ * @param batch_deposit_serial_id which batch deposit was aggregated
+ */
+typedef void
+(*TALER_EXCHANGEDB_AggregationCallback)(
+  void *cls,
+  uint64_t tracking_serial_id,
+  uint64_t batch_deposit_serial_id);
+
+
+/**
+ * Function called on purse requests.
+ *
+ * @param cls closure
+ * @param rowid purse request table row of the purse
+ * @param purse_pub public key of the purse
+ * @param merge_pub public key representing the merge capability
+ * @param purse_creation when was the purse created?
+ * @param purse_expiration when would an unmerged purse expire
+ * @param h_contract_terms contract associated with the purse
+ * @param age_limit the age limit for deposits into the purse
+ * @param target_amount amount to be put into the purse
+ * @param purse_sig signature of the purse over the initialization data
+ * @return #GNUNET_OK to continue to iterate
+   */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_EXCHANGEDB_PurseRequestCallback)(
+  void *cls,
   uint64_t rowid,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_Amount *amount,
-  const char *payto_uri,
-  struct GNUNET_TIME_Timestamp deadline,
-  bool done);
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  struct GNUNET_TIME_Timestamp purse_creation,
+  struct GNUNET_TIME_Timestamp purse_expiration,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  uint32_t age_limit,
+  const struct TALER_Amount *target_amount,
+  const struct TALER_PurseContractSignatureP *purse_sig);
 
 
 /**
@@ -2235,6 +3503,46 @@ typedef void
 
 
 /**
+ * Return AML status.
+ *
+ * @param cls closure
+ * @param row_id current row in AML status table
+ * @param h_payto account for which the attribute data is stored
+ * @param threshold currently monthly threshold that would trigger an AML check
+ * @param status what is the current AML decision
+ */
+typedef void
+(*TALER_EXCHANGEDB_AmlStatusCallback)(
+  void *cls,
+  uint64_t row_id,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_Amount *threshold,
+  enum TALER_AmlDecisionState status);
+
+
+/**
+ * Return historic AML decision.
+ *
+ * @param cls closure
+ * @param new_threshold new monthly threshold that would trigger an AML check
+ * @param new_status AML decision status
+ * @param decision_time when was the decision made
+ * @param justification human-readable text justifying the decision
+ * @param decider_pub public key of the staff member
+ * @param decider_sig signature of the staff member
+ */
+typedef void
+(*TALER_EXCHANGEDB_AmlHistoryCallback)(
+  void *cls,
+  const struct TALER_Amount *new_threshold,
+  enum TALER_AmlDecisionState new_status,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const char *justification,
+  const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+  const struct TALER_AmlOfficerSignatureP *decider_sig);
+
+
+/**
  * @brief The plugin API, returned from the plugin's "init" function.
  * The argument given to "init" is simply a configuration handle.
  */
@@ -2263,63 +3571,20 @@ struct TALER_EXCHANGEDB_Plugin
   (*drop_tables)(void *cls);
 
   /**
-   * Drop the Taler tables on a shard.  This should only be used in testcases.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param old_idx the index which was used then the database was initialized.
-   * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
-   */
-  enum GNUNET_GenericReturnValue
-  (*drop_shard_tables)(void *cls,
-                       uint32_t old_idx);
-
-  /**
    * Create the necessary tables if they are not present
    *
    * @param cls the @e cls of this struct with the plugin-specific state
+   * @param support_partitions true to enable partitioning support (disables foreign key constraints)
+   * @param num_partitions number of partitions to create,
+   *     (0 to not actually use partitions, 1 to only
+   *      setup a default partition, >1 for real partitions)
    * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
    */
   enum GNUNET_GenericReturnValue
-  (*create_tables)(void *cls);
-
-  /**
-   * Initialize the database of a shard node
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param idx the current shard index, will be appended to tables as suffix
-   * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
-   */
-  enum GNUNET_GenericReturnValue
-  (*create_shard_tables)(void *cls,
-                         uint32_t idx);
-
-  /**
-   * Change already present tables of the database to num partitions
-   * Only has an effect if there are default partitions only
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param num the number of partitions to create for each partitioned table
-   * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
-   */
-  enum GNUNET_GenericReturnValue
-  (*setup_partitions)(void *cls,
-                      uint32_t num);
+  (*create_tables)(void *cls,
+                   bool support_partitions,
+                   uint32_t num_partitions);
 
-  /**
-   * Change already present tables of the database to num foreign tables on
-   * num foreign servers (shards).
-   * Only has an effect if there are default partitions only
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param num the number of shard servers to create. The shard servers
-   *            must follow the numbering of 1-N, have the same user as
-   *            the master and have tables named <table>_n where n is the same
-   *            as the servers index of N.
-   * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
-   */
-  enum GNUNET_GenericReturnValue
-  (*setup_foreign_servers)(void *cls,
-                           uint32_t num);
 
   /**
    * Start a transaction.
@@ -2346,6 +3611,18 @@ struct TALER_EXCHANGEDB_Plugin
   (*start_read_committed)(void *cls,
                           const char *name);
 
+  /**
+   * Start a READ ONLY serializable transaction.
+   *
+   * @param cls the `struct PostgresClosure` with the plugin-specific state
+   * @param name unique name identifying the transaction (for debugging)
+   *             must point to a constant
+   * @return #GNUNET_OK on success
+   */
+  enum GNUNET_GenericReturnValue
+  (*start_read_only)(void *cls,
+                     const char *name);
+
 
   /**
    * Commit a transaction.
@@ -2543,79 +3820,58 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[in,out] reserve the reserve data.  The public key of the reserve should be set
    *          in this structure; it is used to query the database.  The balance
    *          and expiration are then filled accordingly.
-   * @param[out] kyc set to the KYC status of the reserve
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
   (*reserves_get)(void *cls,
-                  struct TALER_EXCHANGEDB_Reserve *reserve,
-                  struct TALER_EXCHANGEDB_KycStatus *kyc);
+                  struct TALER_EXCHANGEDB_Reserve *reserve);
 
 
   /**
-   * Set the KYC status to "OK" for a bank account.
+   * Get the origin of funds of a reserve.
    *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param h_payto which account has been checked
-   * @param id ID data to persist
-   * @return transaction status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*set_kyc_ok)(void *cls,
-                const struct TALER_PaytoHashP *h_payto,
-                const char *id);
-
-
-  /**
-   * Get the @a kyc status and @a h_payto by UUID.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param h_payto set to the hash of the account's payto URI (unsalted)
-   * @param[out] kyc set to the KYC status of the account
+   * @param cls the `struct PostgresClosure` with the plugin-specific state
+   * @param reserve_pub public key of the reserve
+   * @param[out] h_payto set to hash of the wire source payto://-URI
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_kyc_status)(void *cls,
-                       const struct TALER_PaytoHashP *h_payto,
-                       struct TALER_EXCHANGEDB_KycStatus *kyc);
+  (*reserves_get_origin)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    struct TALER_PaytoHashP *h_payto);
 
 
   /**
-   * Get the KYC status for a wallet. If the status is unknown,
-   * inserts a new status record (hence INsertSELECT).
+   * Extract next KYC alert.  Deletes the alert.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param reserve_pub public key of the wallet
-   * @param[out] kyc set to the KYC status of the wallet
+   * @param trigger_type which type of alert to drain
+   * @param[out] h_payto set to hash of payto-URI where KYC status changed
    * @return transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*inselect_wallet_kyc_status)(
-    void *cls,
-    const struct TALER_ReservePublicKeyP *reserve_pub,
-    struct TALER_EXCHANGEDB_KycStatus *kyc);
+  (*drain_kyc_alert)(void *cls,
+                     uint32_t trigger_type,
+                     struct TALER_PaytoHashP *h_payto);
 
 
   /**
-   * Insert a incoming transaction into reserves.  New reserves are
+   * Insert a batch of incoming transaction into reserves.  New reserves are
    * also created through this function.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param reserve_pub public key of the reserve
-   * @param balance the amount that has to be added to the reserve
-   * @param execution_time when was the amount added
-   * @param sender_account_details information about the sender's bank account, in payto://-format
-   * @param wire_reference unique reference identifying the wire transfer
-   * @return transaction status code
+   * @param reserves
+   * @param reserves_length length of the @a reserves array
+   * @param[out] results array of transaction status codes of length @a reserves_length,
+   *             set to the status of the
    */
   enum GNUNET_DB_QueryStatus
-  (*reserves_in_insert)(void *cls,
-                        const struct TALER_ReservePublicKeyP *reserve_pub,
-                        const struct TALER_Amount *balance,
-                        struct GNUNET_TIME_Timestamp execution_time,
-                        const char *sender_account_details,
-                        const char *exchange_account_name,
-                        uint64_t wire_reference);
+  (*reserves_in_insert)(
+    void *cls,
+    const struct TALER_EXCHANGEDB_ReserveInInfo *reserves,
+    unsigned int reserves_length,
+    enum GNUNET_DB_QueryStatus *results);
 
 
   /**
@@ -2629,7 +3885,7 @@ struct TALER_EXCHANGEDB_Plugin
    */
   enum GNUNET_DB_QueryStatus
   (*lock_nonce)(void *cls,
-                const struct TALER_CsNonce *nonce,
+                const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
                 const struct TALER_DenominationHashP *denom_pub_hash,
                 const union TALER_EXCHANGEDB_NonceLockTargetP *target);
 
@@ -2648,34 +3904,18 @@ struct TALER_EXCHANGEDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*get_withdraw_info)(void *cls,
                        const struct TALER_BlindedCoinHashP *bch,
-                       struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable);
+                       struct TALER_EXCHANGEDB_CollectableBlindcoin *
+                       collectable);
 
 
   /**
-   * Perform withdraw operation, checking for sufficient balance
-   * and possibly persisting the withdrawal details.
-   *
-   * @param cls the `struct PostgresClosure` with the plugin-specific state
-   * @param nonce client-contributed input for CS denominations that must be checked for idempotency, or NULL for non-CS withdrawals
-   * @param collectable corresponding collectable coin (blind signature)
-   * @param now current time (rounded)
-   * @param[out] found set to true if the reserve was found
-   * @param[out] balance_ok set to true if the balance was sufficient
-   * @param[out] kyc set to the KYC status of the reserve
-   * @param[out] ruuid set to the reserve's UUID (reserves table row)
-   * @return query execution status
+   * FIXME: merge do_batch_withdraw and do_batch_withdraw_insert into one API,
+   * which takes as input (among others)
+   *   - denom_serial[]
+   *   - blinded_coin_evs[]
+   *   - denom_sigs[]
+   * The implementation should persist the data as _arrays_ in the DB.
    */
-  enum GNUNET_DB_QueryStatus
-  (*do_withdraw)(
-    void *cls,
-    const struct TALER_CsNonce *nonce,
-    const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
-    struct GNUNET_TIME_Timestamp now,
-    bool *found,
-    bool *balance_ok,
-    struct TALER_EXCHANGEDB_KycStatus *kyc_ok,
-    uint64_t *ruuid);
-
 
   /**
    * Perform reserve update as part of a batch withdraw operation, checking
@@ -2686,9 +3926,12 @@ struct TALER_EXCHANGEDB_Plugin
    * @param now current time (rounded)
    * @param reserve_pub public key of the reserve to debit
    * @param amount total amount to withdraw
+   * @param do_age_check if set, the batch-withdrawal can only succeed when the reserve has no age restriction (birthday) set.
    * @param[out] found set to true if the reserve was found
    * @param[out] balance_ok set to true if the balance was sufficient
-   * @param[out] kyc set to the KYC status of the reserve
+   * @param[out] reserve_balance set to original balance of the reserve
+   * @param[out] age_ok set to true if no age requirements were defined on the reserve or @e do_age_check was false
+   * @param[out] allowed_maximum_age when @e age_ok is false, set to the allowed maximum age for withdrawal from the reserve.  The client MUST then use the age-withdraw endpoint
    * @param[out] ruuid set to the reserve's UUID (reserves table row)
    * @return query execution status
    */
@@ -2698,9 +3941,12 @@ struct TALER_EXCHANGEDB_Plugin
     struct GNUNET_TIME_Timestamp now,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     const struct TALER_Amount *amount,
+    bool do_age_check,
     bool *found,
     bool *balance_ok,
-    struct TALER_EXCHANGEDB_KycStatus *kyc_ok,
+    struct TALER_Amount *reserve_balance,
+    bool *age_ok,
+    uint16_t *allowed_maximum_age,
     uint64_t *ruuid);
 
 
@@ -2721,7 +3967,7 @@ struct TALER_EXCHANGEDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*do_batch_withdraw_insert)(
     void *cls,
-    const struct TALER_CsNonce *nonce,
+    const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
     const struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable,
     struct GNUNET_TIME_Timestamp now,
     uint64_t ruuid,
@@ -2729,25 +3975,85 @@ struct TALER_EXCHANGEDB_Plugin
     bool *conflict,
     bool *nonce_reuse);
 
+  /**
+   * Locate the response for a age-withdraw request under a hash of the
+   * commitment and reserve_pub that uniquely identifies the age-withdraw
+   * operation.  Used to ensure idempotency of the request.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param reserve_pub public key of the reserve for which the age-withdraw request is made
+   * @param ach hash that uniquely identifies the age-withdraw operation
+   * @param[out] aw corresponding details of the previous age-withdraw request if an entry was found
+   * @return statement execution status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_age_withdraw)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    const struct TALER_AgeWithdrawCommitmentHashP *ach,
+    struct TALER_EXCHANGEDB_AgeWithdraw *aw);
 
   /**
-   * Check that reserve remains below threshold for KYC
-   * checks after withdraw operation.
+   * Perform an age-withdraw operation, checking for sufficient balance and
+   * fulfillment of age requirements and possibly persisting the withdrawal
+   * details.
    *
    * @param cls the `struct PostgresClosure` with the plugin-specific state
-   * @param ruuid identifies the reserve to check
-   * @param withdraw_start starting point to accumulate from
-   * @param upper_limit maximum amount allowed
-   * @param[out] below_limit set to true if the limit was not exceeded
+   * @param commitment corresponding commitment for the age-withdraw
+   * @param[out] found set to true if the reserve was found
+   * @param[out] balance_ok set to true if the balance was sufficient
+   * @param[out] reserve_balance set to original balance of the reserve
+   * @param[out] age_ok set to true if age requirements were met
+   * @param[out] allowed_maximum_age if @e age_ok is FALSE, this is set to the allowed maximum age
+   * @param[out] reserve_birthday if @e age_ok is FALSE, this is set to the reserve's birthday
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
-  (*do_withdraw_limit_check)(
+  (*do_age_withdraw)(
     void *cls,
-    uint64_t ruuid,
-    struct GNUNET_TIME_Absolute withdraw_start,
-    const struct TALER_Amount *upper_limit,
-    bool *below_limit);
+    const struct TALER_EXCHANGEDB_AgeWithdraw *commitment,
+    struct GNUNET_TIME_Timestamp now,
+    bool *found,
+    bool *balance_ok,
+    struct TALER_Amount *reserve_balance,
+    bool *age_ok,
+    uint16_t *allowed_maximum_age,
+    uint32_t *reserve_birthday,
+    bool *conflict);
+
+  /**
+   * Retrieve the details to a policy given by its hash_code
+   *
+   * @param cls the `struct PostgresClosure` with the plugin-specific state
+   * @param hc Hash code that identifies the policy
+   * @param[out] detail retrieved policy details
+   * @return query execution status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_policy_details)(
+    void *cls,
+    const struct GNUNET_HashCode *hc,
+    struct TALER_PolicyDetails *detail);
+
+  /**
+   * Persist the policy details that extends a deposit.  The particular policy
+   * - referenced by details->hash_code - might already exist in the table, in
+   * which case the call will update the contents of the record with @e details
+   *
+   * @param cls the `struct PostgresClosure` with the plugin-specific state
+   * @param details The parsed `struct TALER_PolicyDetails` according to the responsible policy extension.
+   * @param[out] policy_details_serial_id The ID of the entry in the policy_details table
+   * @param[out] accumulated_total The total amount accumulated in that policy
+   * @param[out] fulfillment_state The state of policy.  If the state was Insufficient prior to the call and the provided deposit raises the accumulated_total above the commitment, it will be set to Ready.
+   * @return query execution status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*persist_policy_details)(
+    void *cls,
+    const struct TALER_PolicyDetails *details,
+    uint64_t *policy_details_serial_id,
+    struct TALER_Amount *accumulated_total,
+    enum TALER_PolicyFulfillmentState *fulfillment_state);
 
 
   /**
@@ -2755,25 +4061,22 @@ struct TALER_EXCHANGEDB_Plugin
    * of the coin and possibly persisting the deposit details.
    *
    * @param cls the `struct PostgresClosure` with the plugin-specific state
-   * @param deposit deposit operation details
-   * @param known_coin_id row of the coin in the known_coins table
-   * @param h_payto hash of the merchant's payto URI
-   * @param extension_blocked true if an extension is blocking the wire transfer
+   * @param bd batch deposit operation details
    * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated)
    * @param[out] balance_ok set to true if the balance was sufficient
-   * @param[out] in_conflict set to true if the deposit conflicted
+   * @param[out] bad_balance_index set to the first index of a coin for which the balance was insufficient,
+   *             only used if @a balance_ok is set to false.
+   * @param[out] ctr_conflict set to true if the same contract terms hash was previously submitted with other meta data (deadlines, wallet_data_hash, wire data etc.)
    * @return query execution status
    */
   enum GNUNET_DB_QueryStatus
   (*do_deposit)(
     void *cls,
-    const struct TALER_EXCHANGEDB_Deposit *deposit,
-    uint64_t known_coin_id,
-    const struct TALER_PaytoHashP *h_payto,
-    bool extension_blocked,
+    const struct TALER_EXCHANGEDB_BatchDeposit *bd,
     struct GNUNET_TIME_Timestamp *exchange_timestamp,
     bool *balance_ok,
-    bool *in_conflict);
+    uint32_t *bad_balance_index,
+    bool *ctr_conflict);
 
 
   /**
@@ -2800,6 +4103,19 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
+   * Add a proof of fulfillment of an policy
+   *
+   * @param cls the plugin-specific state
+   * @param[in,out] fulfillment The proof of fulfillment and serial_ids of the policy_details along with their new state and potential new amounts.
+   * @return query execution status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*add_policy_fulfillment_proof)(
+    void *cls,
+    struct TALER_PolicyFulfillmentTransactionData *fulfillment);
+
+
+  /**
    * Check if the given @a nonce was properly locked to the given @a old_coin_pub. If so, check if we already
    * created CS signatures for the given @a nonce and @a new_denom_pub_hashes,
    * and if so, return them in @a s_scalars.  Otherwise, persist the
@@ -2815,7 +4131,7 @@ struct TALER_EXCHANGEDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*cs_refreshes_reveal)(
     void *cls,
-    const struct TALER_CsNonce *nonce,
+    const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
     const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
     unsigned int num_fresh_coins,
     struct TALER_EXCHANGEDB_CsRevealFreshCoinData *crfcds);
@@ -2868,7 +4184,7 @@ struct TALER_EXCHANGEDB_Plugin
     void *cls,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     uint64_t reserve_out_serial_id,
-    const union TALER_DenominationBlindingKeyP *coin_bks,
+    const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     uint64_t known_coin_id,
     const struct TALER_CoinSpendSignatureP *coin_sig,
@@ -2898,7 +4214,7 @@ struct TALER_EXCHANGEDB_Plugin
     void *cls,
     const struct TALER_CoinSpendPublicKeyP *old_coin_pub,
     uint64_t rrc_serial,
-    const union TALER_DenominationBlindingKeyP *coin_bks,
+    const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     uint64_t known_coin_id,
     const struct TALER_CoinSpendSignatureP *coin_sig,
@@ -2908,11 +4224,18 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
-   * Get all of the transaction history associated with the specified
-   * reserve.
+   * Compile a list of (historic) transactions performed with the given reserve
+   * (withdraw, incoming wire, open, close operations).  Should return 0 if the @a
+   * reserve_pub is unknown, otherwise determine @a etag_out and if it is past @a
+   * etag_in return the history after @a start_off. @a etag_out should be set
+   * to the last row ID of the given @a reserve_pub in the reserve history table.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param reserve_pub public key of the reserve
+   * @param start_off maximum starting offset in history to exclude from returning
+   * @param etag_in up to this offset the client already has a response, do not
+   *                   return anything unless @a etag_out will be larger
+   * @param[out] etag_out set to the latest history offset known for this @a coin_pub
    * @param[out] balance set to the reserve balance
    * @param[out] rhp set to known transaction history (NULL if reserve is unknown)
    * @return transaction status
@@ -2920,28 +4243,14 @@ struct TALER_EXCHANGEDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*get_reserve_history)(void *cls,
                          const struct TALER_ReservePublicKeyP *reserve_pub,
+                         uint64_t start_off,
+                         uint64_t etag_in,
+                         uint64_t *etag_out,
                          struct TALER_Amount *balance,
                          struct TALER_EXCHANGEDB_ReserveHistory **rhp);
 
 
   /**
-   * Get truncated transaction history associated with the specified
-   * reserve.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param reserve_pub public key of the reserve
-   * @param[out] balance set to the reserve balance
-   * @param[out] rhp set to known transaction history (NULL if reserve is unknown)
-   * @return transaction status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*get_reserve_status)(void *cls,
-                        const struct TALER_ReservePublicKeyP *reserve_pub,
-                        struct TALER_Amount *balance,
-                        struct TALER_EXCHANGEDB_ReserveHistory **rhp);
-
-
-  /**
    * The current reserve balance of the specified reserve.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
@@ -3016,9 +4325,20 @@ struct TALER_EXCHANGEDB_Plugin
     TALER_EXCHANGEDB_CKS_DENOM_CONFLICT = -3,
 
     /**
+     * Conflicting coin (expected NULL age hash) already in database.
+     */
+    TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NULL = -4,
+
+    /**
+     * Conflicting coin (unexpected NULL age hash) already in database.
+     */
+    TALER_EXCHANGEDB_CKS_AGE_CONFLICT_EXPECTED_NON_NULL = -5,
+
+    /**
      * Conflicting coin (different age hash) already in database.
      */
-    TALER_EXCHANGEDB_CKS_AGE_CONFLICT = -4,
+    TALER_EXCHANGEDB_CKS_AGE_CONFLICT_VALUE_DIFFERS = -6,
+
   }
   (*ensure_coin_known)(void *cls,
                        const struct TALER_CoinPublicInfo *coin,
@@ -3028,10 +4348,30 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
+   * Make sure the array of given @a coin is known to the database.
+   *
+   * @param cls database connection plugin state
+   * @param coin array of coins that must be made known
+   * @param[out] result array where to store information about each coin
+   * @param coin_length length of the @a coin and @a result arraysf
+   * @param batch_size desired (maximum) batch size
+   * @return database transaction status, non-negative on success
+   */
+  enum GNUNET_DB_QueryStatus
+  (*batch_ensure_coin_known)(
+    void *cls,
+    const struct TALER_CoinPublicInfo *coin,
+    struct TALER_EXCHANGEDB_CoinInfo *result,
+    unsigned int coin_length,
+    unsigned int batch_size);
+
+
+  /**
    * Retrieve information about the given @a coin from the database.
    *
    * @param cls database connection plugin state
-   * @param coin the coin that must be made known
+   * @param coin_pub the coin that must be made known
+   * @param[out] coin_info detailed information about the coin
    * @return database transaction status, non-negative on success
    */
   enum GNUNET_DB_QueryStatus
@@ -3039,6 +4379,21 @@ struct TALER_EXCHANGEDB_Plugin
                     const struct TALER_CoinSpendPublicKeyP *coin_pub,
                     struct TALER_CoinPublicInfo *coin_info);
 
+  /**
+   * Retrieve the signature and corresponding denomination for a given @a coin
+   * from the database
+   *
+   * @param cls database connection plugin state
+   * @param coin_pub the public key of the coin we search for
+   * @param[out] denom_pub the public key of the denomination that the coin was signed with
+   * @param[out] denom_sig the signature with the denomination's private key over the coin_pub
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_signature_for_known_coin)(
+    void *cls,
+    const struct TALER_CoinSpendPublicKeyP *coin_pub,
+    struct TALER_DenominationPublicKey *denom_pub,
+    struct TALER_DenominationSignature *denom_sig);
 
   /**
    * Retrieve the denomination of a known coin.
@@ -3057,6 +4412,25 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
+   * Try to retrieve the salted hash of the merchant's bank account to a
+   * deposit contract. Used in case of conflicts for a given (merchant_pub,
+   * h_contract_terms) to provide the client the necessary input to retrieve
+   * more details about the conflict.
+   *
+   * @param cls the plugin closure
+   * @param merchant_pub public key of the merchant
+   * @param h_contract_terms contract to check for
+   * @param[out] h_wire hash of the wire details
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_wire_hash_for_contract)(
+    void *cls,
+    const struct TALER_MerchantPublicKeyP *merchant_pub,
+    const struct TALER_PrivateContractHashP *h_contract_terms,
+    struct TALER_MerchantWireHashP *h_wire);
+
+
+  /**
    * Check if we have the specified deposit already in the database.
    *
    * @param cls the `struct PostgresClosure` with the plugin-specific state
@@ -3085,21 +4459,6 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
-   * Insert information about deposited coin into the database.
-   * Used in tests and for benchmarking.
-   *
-   * @param cls the @e cls of this struct with the plugin-specific state
-   * @param exchange_timestamp time the exchange received the deposit request
-   * @param deposit deposit information to store
-   * @return query result status
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_deposit)(void *cls,
-                    struct GNUNET_TIME_Timestamp exchange_timestamp,
-                    const struct TALER_EXCHANGEDB_Deposit *deposit);
-
-
-  /**
    * Insert information about refunded coin into the database.
    * Used in tests and for benchmarking.
    *
@@ -3124,12 +4483,13 @@ struct TALER_EXCHANGEDB_Plugin
    * @return query result status
    */
   enum GNUNET_DB_QueryStatus
-  (*select_refunds_by_coin)(void *cls,
-                            const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                            const struct TALER_MerchantPublicKeyP *merchant_pub,
-                            const struct TALER_PrivateContractHashP *h_contract,
-                            TALER_EXCHANGEDB_RefundCoinCallback cb,
-                            void *cb_cls);
+  (*select_refunds_by_coin)(
+    void *cls,
+    const struct TALER_CoinSpendPublicKeyP *coin_pub,
+    const struct TALER_MerchantPublicKeyP *merchant_pub,
+    const struct TALER_PrivateContractHashP *h_contract,
+    TALER_EXCHANGEDB_RefundCoinCallback cb,
+    void *cb_cls);
 
 
   /**
@@ -3141,8 +4501,6 @@ struct TALER_EXCHANGEDB_Plugin
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param start_shard_row minimum shard row to select
    * @param end_shard_row maximum shard row to select (inclusive)
-   * @param kyc_off true if we should not check the KYC status because
-   *                this exchange does not need/support KYC checks.
    * @param[out] merchant_pub set to the public key of a merchant with a ready deposit
    * @param[out] payto_uri set to the account of the merchant, to be freed by caller
    * @return transaction status code
@@ -3151,18 +4509,10 @@ struct TALER_EXCHANGEDB_Plugin
   (*get_ready_deposit)(void *cls,
                        uint64_t start_shard_row,
                        uint64_t end_shard_row,
-                       bool kyc_off,
                        struct TALER_MerchantPublicKeyP *merchant_pub,
                        char **payto_uri);
 
 
-/**
- * Maximum number of results we return from iterate_matching_deposits().
- *
- * Limit on the number of transactions we aggregate at once.
- */
-#define TALER_EXCHANGEDB_MATCHING_DEPOSITS_LIMIT 10000
-
   /**
    * Aggregate all matching deposits for @a h_payto and
    * @a merchant_pub, returning the total amounts.
@@ -3189,7 +4539,9 @@ struct TALER_EXCHANGEDB_Plugin
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param h_payto destination of the wire transfer
    * @param exchange_account_section exchange account to use
+   * @param merchant_pub public key of the merchant
    * @param wtid the raw wire transfer identifier to be used
+   * @param kyc_requirement_row row in legitimization_requirements that need to be satisfied to continue, or 0 for none
    * @param total amount to be wired in the future
    * @return transaction status
    */
@@ -3198,15 +4550,18 @@ struct TALER_EXCHANGEDB_Plugin
     void *cls,
     const struct TALER_PaytoHashP *h_payto,
     const char *exchange_account_section,
+    const struct TALER_MerchantPublicKeyP *merchant_pub,
     const struct TALER_WireTransferIdentifierRawP *wtid,
+    uint64_t kyc_requirement_row,
     const struct TALER_Amount *total);
 
 
   /**
-   * Find existing entry in the transient aggregation table.
+   * Select existing entry in the transient aggregation table.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param h_payto destination of the wire transfer
+   * @param merchant_pub public key of the merchant
    * @param exchange_account_section exchange account to use
    * @param[out] wtid set to the raw wire transfer identifier to be used
    * @param[out] total existing amount to be wired in the future
@@ -3216,18 +4571,37 @@ struct TALER_EXCHANGEDB_Plugin
   (*select_aggregation_transient)(
     void *cls,
     const struct TALER_PaytoHashP *h_payto,
+    const struct TALER_MerchantPublicKeyP *merchant_pub,
     const char *exchange_account_section,
     struct TALER_WireTransferIdentifierRawP *wtid,
     struct TALER_Amount *total);
 
 
   /**
+   * Find existing entry in the transient aggregation table.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param h_payto destination of the wire transfer
+   * @param cb function to call on each matching entry
+   * @param cb_cls closure for @a cb
+   * @return transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*find_aggregation_transient)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    TALER_EXCHANGEDB_TransientAggregationCallback cb,
+    void *cb_cls);
+
+
+  /**
    * Update existing entry in the transient aggregation table.
    * @a h_payto is only needed for query performance.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param h_payto destination of the wire transfer
    * @param wtid the raw wire transfer identifier to update
+   * @param kyc_requirement_row row in legitimization_requirements that need to be satisfied to continue, or 0 for none
    * @param total new total amount to be wired in the future
    * @return transaction status
    */
@@ -3236,6 +4610,7 @@ struct TALER_EXCHANGEDB_Plugin
     void *cls,
     const struct TALER_PaytoHashP *h_payto,
     const struct TALER_WireTransferIdentifierRawP *wtid,
+    uint64_t kyc_requirement_row,
     const struct TALER_Amount *total);
 
 
@@ -3335,20 +4710,35 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
-   * Compile a list of all (historic) transactions performed
-   * with the given coin (melt, refund, recoup and deposit operations).
+   * Compile a list of (historic) transactions performed with the given coin
+   * (melt, refund, recoup and deposit operations).  Should return 0 if the @a
+   * coin_pub is unknown, otherwise determine @a etag_out and if it is past @a
+   * etag_in return the history after @a start_off. @a etag_out should be set
+   * to the last row ID of the given @a coin_pub in the coin history table.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param coin_pub coin to investigate
-   * @param include_recoup include recoup transactions of the coin?
-   * @param[out] tlp set to list of transactions, NULL if coin is fresh
+   * @param start_off starting offset from which on to return entries
+   * @param etag_in up to this offset the client already has a response, do not
+   *                   return anything unless @a etag_out will be larger
+   * @param[out] etag_out set to the latest history offset known for this @a coin_pub
+   * @param[out] balance set to current balance of the coin
+   * @param[out] h_denom_pub set to denomination public key of the coin
+   * @param[out] tlp set to list of transactions, set to NULL if coin has no
+   *             transaction history past @a start_off or if @a etag_in is equal
+   *             to the value written to @a etag_out.
    * @return database transaction status
    */
   enum GNUNET_DB_QueryStatus
-  (*get_coin_transactions)(void *cls,
-                           const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                           int include_recoup,
-                           struct TALER_EXCHANGEDB_TransactionList **tlp);
+  (*get_coin_transactions)(
+    void *cls,
+    const struct TALER_CoinSpendPublicKeyP *coin_pub,
+    uint64_t start_off,
+    uint64_t etag_in,
+    uint64_t *etag_out,
+    struct TALER_Amount *balance,
+    struct TALER_DenominationHashP *h_denom_pub,
+    struct TALER_EXCHANGEDB_TransactionList **tlp);
 
 
   /**
@@ -3397,6 +4787,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] execution_time when was the transaction done, or
    *         when we expect it to be done (if @a pending is false)
    * @param[out] kyc set to the kyc status of the receiver (if @a pending)
+   * @param[out] aml_decision set to the current AML status for the target account
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
@@ -3411,22 +4802,8 @@ struct TALER_EXCHANGEDB_Plugin
     struct GNUNET_TIME_Timestamp *exec_time,
     struct TALER_Amount *amount_with_fee,
     struct TALER_Amount *deposit_fee,
-    struct TALER_EXCHANGEDB_KycStatus *kyc);
-
-
-  /**
-   * Function called to insert aggregation information into the DB.
-   *
-   * @param cls closure
-   * @param wtid the raw wire transfer identifier we used
-   * @param deposit_serial_id row in the deposits table for which this is aggregation data
-   * @return transaction status code
-   */
-  enum GNUNET_DB_QueryStatus
-  (*insert_aggregation_tracking)(
-    void *cls,
-    const struct TALER_WireTransferIdentifierRawP *wtid,
-    unsigned long long deposit_serial_id);
+    struct TALER_EXCHANGEDB_KycStatus *kyc,
+    enum TALER_AmlDecisionState *aml_decision);
 
 
   /**
@@ -3453,11 +4830,10 @@ struct TALER_EXCHANGEDB_Plugin
    * Insert global fee set into database.
    *
    * @param cls closure
-   * @param start_date when does the fee go into effect
-   * @param end_date when does the fee end being valid
+   * @param start_date when does the fees go into effect
+   * @param end_date when does the fees end being valid
    * @param fees how high is are the global fees
    * @param purse_timeout when do purses time out
-   * @param kyc_timeout when do reserves without KYC time out
    * @param history_expiration how long are account histories preserved
    * @param purse_account_limit how many purses are free per account
    * @param master_sig signature over the above by the exchange master key
@@ -3469,7 +4845,6 @@ struct TALER_EXCHANGEDB_Plugin
                        struct GNUNET_TIME_Timestamp end_date,
                        const struct TALER_GlobalFeeSet *fees,
                        struct GNUNET_TIME_Relative purse_timeout,
-                       struct GNUNET_TIME_Relative kyc_timeout,
                        struct GNUNET_TIME_Relative history_expiration,
                        uint32_t purse_account_limit,
 
@@ -3507,7 +4882,6 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] end_date when does the fee end being valid
    * @param[out] fees how high are the global fees
    * @param[out] purse_timeout when do purses time out
-   * @param[out] kyc_timeout when do reserves without KYC time out
    * @param[out] history_expiration how long are account histories preserved
    * @param[out] purse_account_limit how many purses are free per account
    * @param[out] master_sig signature over the above by the exchange master key
@@ -3520,7 +4894,6 @@ struct TALER_EXCHANGEDB_Plugin
                     struct GNUNET_TIME_Timestamp *end_date,
                     struct TALER_GlobalFeeSet *fees,
                     struct GNUNET_TIME_Relative *purse_timeout,
-                    struct GNUNET_TIME_Relative *kyc_timeout,
                     struct GNUNET_TIME_Relative *history_expiration,
                     uint32_t *purse_account_limit,
                     struct TALER_MasterSignatureP *master_sig);
@@ -3544,6 +4917,152 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
+   * Obtain information about force-closed reserves
+   * where the close was not yet done (and their remaining
+   * balances).  Updates the returned reserve's close
+   * status to "done".
+   *
+   * @param cls closure of the plugin
+   * @param rec function to call on (to be) closed reserves
+   * @param rec_cls closure for @a rec
+   * @return transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_unfinished_close_requests)(
+    void *cls,
+    TALER_EXCHANGEDB_ReserveExpiredCallback rec,
+    void *rec_cls);
+
+
+  /**
+   * Insert reserve open coin deposit data into database.
+   * Subtracts the @a coin_total from the coin's balance.
+   *
+   * @param cls closure
+   * @param cpi public information about the coin
+   * @param coin_sig signature with @e coin_pub of type #TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT
+   * @param known_coin_id ID of the coin in the known_coins table
+   * @param coin_total amount to be spent of the coin (including deposit fee)
+   * @param reserve_sig signature by the reserve affirming the open operation
+   * @param reserve_pub public key of the reserve being opened
+   * @param[out] insufficient_funds set to true if the coin's balance is insufficient, otherwise to false
+   * @return transaction status code, 0 if operation is already in the DB
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_reserve_open_deposit)(
+    void *cls,
+    const struct TALER_CoinPublicInfo *cpi,
+    const struct TALER_CoinSpendSignatureP *coin_sig,
+    uint64_t known_coin_id,
+    const struct TALER_Amount *coin_total,
+    const struct TALER_ReserveSignatureP *reserve_sig,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    bool *insufficient_funds);
+
+
+  /**
+   * Insert reserve close operation into database.
+   *
+   * @param cls closure
+   * @param reserve_pub which reserve is this about?
+   * @param total_paid total amount paid (coins and reserve)
+   * @param reserve_payment amount to be paid from the reserve
+   * @param min_purse_limit minimum number of purses we should be able to open
+   * @param reserve_sig signature by the reserve for the operation
+   * @param desired_expiration when should the reserve expire (earliest time)
+   * @param now when did we the client initiate the action
+   * @param open_fee annual fee to be charged for the open operation by the exchange
+   * @param[out] no_funds set to true if reserve balance is insufficient
+   * @param[out] reserve_balance set to original balance of the reserve
+   * @param[out] open_cost set to the actual cost
+   * @param[out] final_expiration when will the reserve expire now
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*do_reserve_open)(void *cls,
+                     const struct TALER_ReservePublicKeyP *reserve_pub,
+                     const struct TALER_Amount *total_paid,
+                     const struct TALER_Amount *reserve_payment,
+                     uint32_t min_purse_limit,
+                     const struct TALER_ReserveSignatureP *reserve_sig,
+                     struct GNUNET_TIME_Timestamp desired_expiration,
+                     struct GNUNET_TIME_Timestamp now,
+                     const struct TALER_Amount *open_fee,
+                     bool *no_funds,
+                     struct TALER_Amount *reserve_balance,
+                     struct TALER_Amount *open_cost,
+                     struct GNUNET_TIME_Timestamp *final_expiration);
+
+
+  /**
+   * Select information needed to see if we can close
+   * a reserve.
+   *
+   * @param cls closure
+   * @param reserve_pub which reserve is this about?
+   * @param[out] balance current reserve balance
+   * @param[out] payto_uri set to URL of account that
+   *             originally funded the reserve;
+   *             could be set to NULL if not known
+   * @return transaction status code, 0 if reserve unknown
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_reserve_close_info)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    struct TALER_Amount *balance,
+    char **payto_uri);
+
+
+  /**
+   * Select information about reserve close requests.
+   *
+   * @param cls closure
+   * @param reserve_pub which reserve is this about?
+   * @param rowid row ID of the close request
+   * @param[out] reserve_sig reserve signature affirming
+   * @param[out] request_timestamp when was the request made
+   * @param[out] close_balance reserve balance at close time
+   * @param[out] close_fee closing fee to be charged
+   * @param[out] payto_uri set to URL of account that
+   *             should receive the money;
+   *             could be set to NULL for origin
+   * @return transaction status code, 0 if reserve unknown
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_reserve_close_request_info)(
+    void *cls,
+    const struct TALER_ReservePublicKeyP *reserve_pub,
+    uint64_t rowid,
+    struct TALER_ReserveSignatureP *reserve_sig,
+    struct GNUNET_TIME_Timestamp *request_timestamp,
+    struct TALER_Amount *close_balance,
+    struct TALER_Amount *close_fee,
+    char **payto_uri);
+
+
+  /**
+   * Select information needed for KYC checks on reserve close: historic
+   * reserve closures going to the same account.
+   *
+   * @param cls closure
+   * @param h_payto which target account is this about?
+   * @param h_payto account identifier
+   * @param time_limit oldest transaction that could be relevant
+   * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+   * @param kac_cls closure for @a kac
+   * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+   */
+  enum GNUNET_DB_QueryStatus
+  (*iterate_reserve_close_info)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    struct GNUNET_TIME_Absolute time_limit,
+    TALER_EXCHANGEDB_KycAmountCallback kac,
+    void *kac_cls);
+
+
+  /**
    * Insert reserve close operation into database.
    *
    * @param cls closure
@@ -3553,6 +5072,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param wtid identifier for the wire transfer
    * @param amount_with_fee amount we charged to the reserve
    * @param closing_fee how high is the closing fee
+   * @param close_request_row identifies explicit close request, 0 for none
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
@@ -3560,9 +5080,11 @@ struct TALER_EXCHANGEDB_Plugin
                            const struct TALER_ReservePublicKeyP *reserve_pub,
                            struct GNUNET_TIME_Timestamp execution_date,
                            const char *receiver_account,
-                           const struct TALER_WireTransferIdentifierRawP *wtid,
+                           const struct
+                           TALER_WireTransferIdentifierRawP *wtid,
                            const struct TALER_Amount *amount_with_fee,
-                           const struct TALER_Amount *closing_fee);
+                           const struct TALER_Amount *closing_fee,
+                           uint64_t close_request_row);
 
 
   /**
@@ -3682,10 +5204,138 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_deposits_above_serial_id)(void *cls,
-                                     uint64_t serial_id,
-                                     TALER_EXCHANGEDB_DepositCallback cb,
-                                     void *cb_cls);
+  (*select_coin_deposits_above_serial_id)(void *cls,
+                                          uint64_t serial_id,
+                                          TALER_EXCHANGEDB_DepositCallback cb,
+                                          void *cb_cls);
+
+
+  /**
+   * Function called to return meta data about a purses
+   * above a certain serial ID.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param serial_id number to select requests by
+   * @param cb function to call on each request
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_purse_requests_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_PurseRequestCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select purse deposits above @a serial_id in monotonically increasing
+   * order.
+   *
+   * @param cls closure
+   * @param serial_id highest serial ID to exclude (select strictly larger)
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_purse_deposits_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_PurseDepositCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select account merges above @a serial_id in monotonically increasing
+   * order.
+   *
+   * @param cls closure
+   * @param serial_id highest serial ID to exclude (select strictly larger)
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_account_merges_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_AccountMergeCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select purse merges deposits above @a serial_id in monotonically increasing
+   * order.
+   *
+   * @param cls closure
+   * @param serial_id highest serial ID to exclude (select strictly larger)
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_purse_merges_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_PurseMergeCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select purse refunds above @a serial_id in monotonically increasing
+   * order.
+   *
+   * @param cls closure
+   * @param serial_id highest serial ID to exclude (select strictly larger)
+   * @param refunded which refund status to select for
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_purse_decisions_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    bool refunded,
+    TALER_EXCHANGEDB_PurseDecisionCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select all purse refunds above @a serial_id in monotonically increasing
+   * order.
+   *
+   * @param cls closure
+   * @param serial_id highest serial ID to exclude (select strictly larger)
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_all_purse_decisions_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_AllPurseDecisionCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select coins deposited into a purse.
+   *
+   * @param cls closure
+   * @param purse_pub public key of the purse
+   * @param cb function to call on each result
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_purse_deposits_by_purse)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    TALER_EXCHANGEDB_PurseRefundCoinCallback cb,
+    void *cb_cls);
+
 
   /**
    * Select refresh sessions above @a serial_id in monotonically increasing
@@ -3790,7 +5440,8 @@ struct TALER_EXCHANGEDB_Plugin
   enum GNUNET_DB_QueryStatus
   (*select_wire_out_above_serial_id)(void *cls,
                                      uint64_t serial_id,
-                                     TALER_EXCHANGEDB_WireTransferOutCallback cb,
+                                     TALER_EXCHANGEDB_WireTransferOutCallback
+                                     cb,
                                      void *cb_cls);
 
   /**
@@ -3849,8 +5500,8 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
-   * Function called to select reserve close operations the aggregator
-   * triggered, ordered by serial ID (monotonically increasing).
+   * Function called to select reserve open operations, ordered by serial ID
+   * (monotonically increasing).
    *
    * @param cls closure
    * @param serial_id lowest serial ID to include (select larger or equal)
@@ -3859,6 +5510,24 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
+  (*select_reserve_open_above_serial_id)(
+    void *cls,
+    uint64_t serial_id,
+    TALER_EXCHANGEDB_ReserveOpenCallback cb,
+    void *cb_cls);
+
+
+  /**
+ * Function called to select reserve close operations the aggregator
+ * triggered, ordered by serial ID (monotonically increasing).
+ *
+ * @param cls closure
+ * @param serial_id lowest serial ID to include (select larger or equal)
+ * @param cb function to call
+ * @param cb_cls closure for @a cb
+ * @return transaction status code
+ */
+  enum GNUNET_DB_QueryStatus
   (*select_reserve_closed_above_serial_id)(
     void *cls,
     uint64_t serial_id,
@@ -3877,10 +5546,11 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_reserve_by_h_blind)(void *cls,
-                            const struct TALER_BlindedCoinHashP *bch,
-                            struct TALER_ReservePublicKeyP *reserve_pub,
-                            uint64_t *reserve_out_serial_id);
+  (*get_reserve_by_h_blind)(
+    void *cls,
+    const struct TALER_BlindedCoinHashP *bch,
+    struct TALER_ReservePublicKeyP *reserve_pub,
+    uint64_t *reserve_out_serial_id);
 
 
   /**
@@ -3894,10 +5564,11 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_old_coin_by_h_blind)(void *cls,
-                             const struct TALER_BlindedCoinHashP *h_blind_ev,
-                             struct TALER_CoinSpendPublicKeyP *old_coin_pub,
-                             uint64_t *rrc_serial);
+  (*get_old_coin_by_h_blind)(
+    void *cls,
+    const struct TALER_BlindedCoinHashP *h_blind_ev,
+    struct TALER_CoinSpendPublicKeyP *old_coin_pub,
+    uint64_t *rrc_serial);
 
 
   /**
@@ -3935,23 +5606,63 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
-   * Select all of those deposits in the database for which we do
-   * not have a wire transfer (or a refund) and which should have
-   * been deposited between @a start_date and @a end_date.
+   * Select all (batch) deposits in the database
+   * above a given @a min_batch_deposit_serial_id.
    *
    * @param cls closure
-   * @param start_date lower bound on the requested wire execution date
-   * @param end_date upper bound on the requested wire execution date
+   * @param min_batch_deposit_serial_id only return entries strictly above this row (and in order)
    * @param cb function to call on all such deposits
    * @param cb_cls closure for @a cb
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_deposits_missing_wire)(void *cls,
-                                  struct GNUNET_TIME_Timestamp start_date,
-                                  struct GNUNET_TIME_Timestamp end_date,
-                                  TALER_EXCHANGEDB_WireMissingCallback cb,
-                                  void *cb_cls);
+  (*select_batch_deposits_missing_wire)(
+    void *cls,
+    uint64_t min_batch_deposit_serial_id,
+    TALER_EXCHANGEDB_WireMissingCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Select all aggregation tracking IDs in the database
+   * above a given @a min_tracking_serial_id.
+   *
+   * @param cls closure
+   * @param min_tracking_serial_id only return entries strictly above this row (and in order)
+   * @param cb function to call on all such aggregations
+   * @param cb_cls closure for @a cb
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_aggregations_above_serial)(
+    void *cls,
+    uint64_t min_tracking_serial_id,
+    TALER_EXCHANGEDB_AggregationCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Return any applicable justification as to why
+   * a wire transfer might have been held.  Used
+   * by the auditor to determine if a wire transfer
+   * is legitimately stalled.
+   *
+   * @param cls closure
+   * @param wire_target_h_payto effected target account
+   * @param[out] payto_uri target account URI, set to NULL if unknown
+   * @param[out] kyc_pending set to string describing missing KYC data
+   * @param[out] status set to AML status
+   * @param[out] aml_limit set to AML limit, or invalid amount for none
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_justification_for_missing_wire)(
+    void *cls,
+    const struct TALER_PaytoHashP *wire_target_h_payto,
+    char **payto_uri,
+    char **kyc_pending,
+    enum TALER_AmlDecisionState *status,
+    struct TALER_Amount *aml_limit);
 
 
   /**
@@ -3963,9 +5674,10 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_auditor_timestamp)(void *cls,
-                              const struct TALER_AuditorPublicKeyP *auditor_pub,
-                              struct GNUNET_TIME_Timestamp *last_date);
+  (*lookup_auditor_timestamp)(
+    void *cls,
+    const struct TALER_AuditorPublicKeyP *auditor_pub,
+    struct GNUNET_TIME_Timestamp *last_date);
 
 
   /**
@@ -3979,10 +5691,11 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*lookup_auditor_status)(void *cls,
-                           const struct TALER_AuditorPublicKeyP *auditor_pub,
-                           char **auditor_url,
-                           bool *enabled);
+  (*lookup_auditor_status)(
+    void *cls,
+    const struct TALER_AuditorPublicKeyP *auditor_pub,
+    char **auditor_url,
+    bool *enabled);
 
 
   /**
@@ -3997,11 +5710,12 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_auditor)(void *cls,
-                    const struct TALER_AuditorPublicKeyP *auditor_pub,
-                    const char *auditor_url,
-                    const char *auditor_name,
-                    struct GNUNET_TIME_Timestamp start_date);
+  (*insert_auditor)(
+    void *cls,
+    const struct TALER_AuditorPublicKeyP *auditor_pub,
+    const char *auditor_url,
+    const char *auditor_name,
+    struct GNUNET_TIME_Timestamp start_date);
 
 
   /**
@@ -4017,12 +5731,13 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*update_auditor)(void *cls,
-                    const struct TALER_AuditorPublicKeyP *auditor_pub,
-                    const char *auditor_url,
-                    const char *auditor_name,
-                    struct GNUNET_TIME_Timestamp change_date,
-                    bool enabled);
+  (*update_auditor)(
+    void *cls,
+    const struct TALER_AuditorPublicKeyP *auditor_pub,
+    const char *auditor_url,
+    const char *auditor_name,
+    struct GNUNET_TIME_Timestamp change_date,
+    bool enabled);
 
 
   /**
@@ -4044,17 +5759,27 @@ struct TALER_EXCHANGEDB_Plugin
    *
    * @param cls closure
    * @param payto_uri wire account of the exchange
+   * @param conversion_url URL of a conversion service, NULL if there is no conversion
+   * @param debit_restrictions JSON array with debit restrictions on the account
+   * @param credit_restrictions JSON array with credit restrictions on the account
    * @param start_date date when the account was added by the offline system
    *                      (only to be used for replay detection)
    * @param master_sig public signature affirming the existence of the account,
    *         must be of purpose #TALER_SIGNATURE_MASTER_WIRE_DETAILS
+   * @param bank_label label to show this entry under in the UI, can be NULL
+   * @param priority determines order in which entries are shown in the UI
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
   (*insert_wire)(void *cls,
                  const char *payto_uri,
+                 const char *conversion_url,
+                 const json_t *debit_restrictions,
+                 const json_t *credit_restrictions,
                  struct GNUNET_TIME_Timestamp start_date,
-                 const struct TALER_MasterSignatureP *master_sig);
+                 const struct TALER_MasterSignatureP *master_sig,
+                 const char *bank_label,
+                 int64_t priority);
 
 
   /**
@@ -4062,15 +5787,27 @@ struct TALER_EXCHANGEDB_Plugin
    *
    * @param cls closure
    * @param payto_uri account the update is about
+   * @param conversion_url URL of a conversion service, NULL if there is no conversion
+   * @param debit_restrictions JSON array with debit restrictions on the account; NULL allowed if not @a enabled
+   * @param credit_restrictions JSON array with credit restrictions on the account; NULL allowed if not @a enabled
    * @param change_date date when the account status was last changed
    *                      (only to be used for replay detection)
+   * @param master_sig master signature to store, can be NULL (if @a enabled is false)
+   * @param bank_label label to show this entry under in the UI, can be NULL
+   * @param priority determines order in which entries are shown in the UI
    * @param enabled true to enable, false to disable (the actual change)
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
   (*update_wire)(void *cls,
                  const char *payto_uri,
+                 const char *conversion_url,
+                 const json_t *debit_restrictions,
+                 const json_t *credit_restrictions,
                  struct GNUNET_TIME_Timestamp change_date,
+                 const struct TALER_MasterSignatureP *master_sig,
+                 const char *bank_label,
+                 int64_t priority,
                  bool enabled);
 
 
@@ -4281,7 +6018,6 @@ struct TALER_EXCHANGEDB_Plugin
    *             different global fee exists within this time
    *             period, an 'invalid' amount is returned.
    * @param[out] purse_timeout set to when unmerged purses expire
-   * @param[out] kyc_timeout set to when reserves without kyc expire
    * @param[out] history_expiration set to when we expire reserve histories
    * @param[out] purse_account_limit set to number of free purses
    * @return transaction status code
@@ -4293,7 +6029,6 @@ struct TALER_EXCHANGEDB_Plugin
     struct GNUNET_TIME_Timestamp end_time,
     struct TALER_GlobalFeeSet *fees,
     struct GNUNET_TIME_Relative *purse_timeout,
-    struct GNUNET_TIME_Relative *kyc_timeout,
     struct GNUNET_TIME_Relative *history_expiration,
     uint32_t *purse_account_limit);
 
@@ -4337,6 +6072,7 @@ struct TALER_EXCHANGEDB_Plugin
    * Insert record set into @a table.  Used in exchange-auditor database
    * replication.
    *
+  memset (&awc, 0, sizeof (awc));
    * @param cls closure
    * @param tb table data to insert
    * @return transaction status code, #GNUNET_DB_STATUS_HARD_ERROR if
@@ -4442,40 +6178,41 @@ struct TALER_EXCHANGEDB_Plugin
    * changed.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @return transaction status code
+   * @return #GNUNET_OK on success
+   *         #GNUNET_SYSERR on failure
    */
-  enum GNUNET_DB_QueryStatus
+  enum GNUNET_GenericReturnValue
   (*delete_shard_locks)(void *cls);
 
 
   /**
-   * Function called to save the configuration of an extension
-   * (age-restriction, peer2peer, ...)
+   * Function called to save the manifest of an extension
+   * (age-restriction, policy-extension, ...)
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param extension_name the name of the extension
-   * @param config JSON object of the configuration as string, maybe NULL (== disabled extension)
+   * @param manifest JSON object of the Manifest as string, maybe NULL (== disabled extension)
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*set_extension_config)(void *cls,
-                          const char *extension_name,
-                          const char *config);
+  (*set_extension_manifest)(void *cls,
+                            const char *extension_name,
+                            const char *manifest);
 
 
   /**
-   * Function called to retrieve the configuration of an extension
-   * (age-restriction, peer2peer, ...)
+   * Function called to retrieve the manifest of an extension
+   * (age-restriction, policy-extension, ...)
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param extension_name the name of the extension
-   * @param[out] config JSON object of the configuration as string, maybe NULL (== disabled extension)
+   * @param[out] manifest Manifest of the extension in JSON encoding, maybe NULL (== disabled extension)
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*get_extension_config)(void *cls,
-                          const char *extension_name,
-                          char **config);
+  (*get_extension_manifest)(void *cls,
+                            const char *extension_name,
+                            char **manifest);
 
 
   /**
@@ -4507,24 +6244,18 @@ struct TALER_EXCHANGEDB_Plugin
    * Function called to persist an encrypted contract associated with a reserve.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param purse_pub the purse the contract is associated with (must exist)
-   * @param pub_ckey ephemeral key for DH used to encrypt the contract
-   * @param econtract_size number of bytes in @a econtract
    * @param econtract the encrypted contract
    * @param[out] econtract_sig set to the signature over the encrypted contract
    * @param[out] in_conflict set to true if @a econtract
    *             conflicts with an existing contract;
    *             in this case, the return value will be
-   *             #GNUNET_DB_STATUS_SUCCESS_ONE despite the failure
+   *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
   (*insert_contract)(void *cls,
                      const struct TALER_PurseContractPublicKeyP *purse_pub,
-                     const struct TALER_ContractDiffiePublicP *pub_ckey,
-                     size_t econtract_size,
-                     const void *econtract,
-                     const struct TALER_PurseContractSignatureP *econtract_sig,
+                     const struct TALER_EncryptedContract *econtract,
                      bool *in_conflict);
 
 
@@ -4548,14 +6279,12 @@ struct TALER_EXCHANGEDB_Plugin
     size_t *econtract_size,
     void **econtract);
 
+
   /**
    * Function called to retrieve an encrypted contract.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param purse_pub key to lookup the contract by
-   * @param[out] pub_ckey set to the ephemeral DH used to encrypt the contract
-   * @param[out] econtract_sig set to the signature over the encrypted contract
-   * @param[out] econtract_size set to the number of bytes in @a econtract
    * @param[out] econtract set to the encrypted contract on success, to be freed by the caller
    * @return transaction status code
    */
@@ -4563,10 +6292,7 @@ struct TALER_EXCHANGEDB_Plugin
   (*select_contract_by_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
-    struct TALER_ContractDiffiePublicP *pub_ckey,
-    struct TALER_PurseContractSignatureP *econtract_sig,
-    size_t *econtract_size,
-    void **econtract);
+    struct TALER_EncryptedContract *econtract);
 
 
   /**
@@ -4585,7 +6311,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] in_conflict set to true if the meta data
    *             conflicts with an existing purse;
    *             in this case, the return value will be
-   *             #GNUNET_DB_STATUS_SUCCESS_ONE despite the failure
+   *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
@@ -4623,26 +6349,32 @@ struct TALER_EXCHANGEDB_Plugin
    *
    * @param cls the @e cls of this struct with the plugin-specific state
    * @param purse_pub public key of the new purse
+   * @param[out] purse_creation set to time when the purse was created
    * @param[out] purse_expiration set to time when the purse will expire
    * @param[out] amount set to target amount (with fees) to be put into the purse
    * @param[out] deposited set to actual amount put into the purse so far
    * @param[out] h_contract_terms set to hash of the contract for the purse
    * @param[out] merge_timestamp set to time when the purse was merged, or NEVER if not
+   * @param[out] purse_deleted set to true if purse was deleted
+   * @param[out] purse_refunded set to true if purse was refunded (after expiration)
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
   (*select_purse)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
+    struct GNUNET_TIME_Timestamp *purse_creation,
     struct GNUNET_TIME_Timestamp *purse_expiration,
     struct TALER_Amount *amount,
     struct TALER_Amount *deposited,
     struct TALER_PrivateContractHashP *h_contract_terms,
-    struct GNUNET_TIME_Timestamp *merge_timestamp);
+    struct GNUNET_TIME_Timestamp *merge_timestamp,
+    bool *purse_deleted,
+    bool *purse_refunded);
 
 
   /**
-   * Function called to reutrn meta data about a purse by the
+   * Function called to return meta data about a purse by the
    * purse public key.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
@@ -4657,7 +6389,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*select_purse_request)(
+  (*get_purse_request)(
     void *cls,
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     struct TALER_PurseMergePublicKeyP *merge_pub,
@@ -4714,7 +6446,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] balance_ok set to false if the coin's
    *        remaining balance is below @a amount;
    *             in this case, the return value will be
-   *             #GNUNET_DB_STATUS_SUCCESS_ONE despite the failure
+   *             #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT despite the failure
+   * @param[out] too_late it is too late to deposit into this purse
    * @param[out] conflict the same coin was deposited into
    *        this purse with a different amount already
    * @return transaction status code
@@ -4728,10 +6461,49 @@ struct TALER_EXCHANGEDB_Plugin
     const struct TALER_CoinSpendSignatureP *coin_sig,
     const struct TALER_Amount *amount_minus_fee,
     bool *balance_ok,
+    bool *too_late,
     bool *conflict);
 
 
   /**
+   * Function called to explicitly delete a purse.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param purse_pub purse to delete
+   * @param purse_sig signature affirming the deletion
+   * @param[out] decided set to true if the purse was
+   *        already decided and thus could not be deleted
+   * @param[out] found set to true if the purse was found
+   *        (if false, purse could not be deleted)
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*do_purse_delete)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    const struct TALER_PurseContractSignatureP *purse_sig,
+    bool *decided,
+    bool *found);
+
+
+  /**
+   * Set the current @a balance in the purse
+   * identified by @a purse_pub. Used by the auditor
+   * to update the balance as calculated by the auditor.
+   *
+   * @param cls closure
+   * @param purse_pub public key of a purse
+   * @param balance new balance to store under the purse
+   * @return transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*set_purse_balance)(
+    void *cls,
+    const struct TALER_PurseContractPublicKeyP *purse_pub,
+    const struct TALER_Amount *balance);
+
+
+  /**
    * Function called to obtain a coin deposit data from
    * depositing the coin into a purse.
    *
@@ -4739,6 +6511,8 @@ struct TALER_EXCHANGEDB_Plugin
    * @param purse_pub purse to credit
    * @param coin_pub coin to deposit (debit)
    * @param[out] amount set fraction of the coin's value that was deposited (with fee)
+   * @param[out] h_denom_pub set to hash of denomination of the coin
+   * @param[out] phac set to hash of age restriction on the coin
    * @param[out] coin_sig set to signature affirming the operation
    * @param[out] partner_url set to the URL of the partner exchange, or NULL for ourselves, must be freed by caller
    * @return transaction status code
@@ -4749,6 +6523,8 @@ struct TALER_EXCHANGEDB_Plugin
     const struct TALER_PurseContractPublicKeyP *purse_pub,
     const struct TALER_CoinSpendPublicKeyP *coin_pub,
     struct TALER_Amount *amount,
+    struct TALER_DenominationHashP *h_denom_pub,
+    struct TALER_AgeCommitmentHash *phac,
     struct TALER_CoinSpendSignatureP *coin_sig,
     char **partner_url);
 
@@ -4767,6 +6543,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param reserve_pub public key of the reserve to credit
    * @param[out] no_partner set to true if @a partner_url is unknown
    * @param[out] no_balance set to true if the @a purse_pub is not paid up yet
+   * @param[out] no_reserve set to true if the @a reserve_pub is not known
    * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
    * @return transaction status code
    */
@@ -4797,6 +6574,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param purse_fee amount to charge the reserve for the purse creation, NULL to use the quota
    * @param reserve_pub public key of the reserve to credit
    * @param[out] in_conflict set to true if @a purse_pub was merged into a different reserve already
+   * @param[out] no_reserve set to true if @a reserve_pub is not a known reserve
    * @param[out] insufficient_funds set to true if @a reserve_pub has insufficient capacity to create another purse
    * @return transaction status code
    */
@@ -4810,6 +6588,7 @@ struct TALER_EXCHANGEDB_Plugin
     const struct TALER_Amount *purse_fee,
     const struct TALER_ReservePublicKeyP *reserve_pub,
     bool *in_conflict,
+    bool *no_reserve,
     bool *insufficient_funds);
 
 
@@ -4823,6 +6602,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param[out] merge_timestamp set to the time of the merge
    * @param[out] partner_url set to the URL of the target exchange, or NULL if the target exchange is us. To be freed by the caller.
    * @param[out] reserve_pub set to the public key of the reserve/account being credited
+   * @param[out] refunded set to true if purse was refunded
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
@@ -4832,64 +6612,632 @@ struct TALER_EXCHANGEDB_Plugin
     struct TALER_PurseMergeSignatureP *merge_sig,
     struct GNUNET_TIME_Timestamp *merge_timestamp,
     char **partner_url,
-    struct TALER_ReservePublicKeyP *reserve_pub);
+    struct TALER_ReservePublicKeyP *reserve_pub,
+    bool *refunded);
 
 
   /**
-   * Function called to approve merging of a purse with
-   * an account, made by the receiving account.
+   * Function called to initiate closure of an account.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param reserve_pub public key of the account to close
+   * @param payto_uri where to wire the funds
+   * @param reserve_sig signature affiming that the account is to be closed
+   * @param request_timestamp timestamp of the close request
+   * @param balance balance at the time of closing
+   * @param closing_fee closing fee to charge
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_close_request)(void *cls,
+                          const struct TALER_ReservePublicKeyP *reserve_pub,
+                          const char *payto_uri,
+                          const struct TALER_ReserveSignatureP *reserve_sig,
+                          struct GNUNET_TIME_Timestamp request_timestamp,
+                          const struct TALER_Amount *balance,
+                          const struct TALER_Amount *closing_fee);
+
+
+  /**
+   * Function called to persist a request to drain profits.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param purse_pub public key of the purse being merged
-   * @param reserve_pub public key of the account being credited
-   * @param reserve_sig signature of the account holder affirming the merge
+   * @param wtid wire transfer ID to use
+   * @param account_section account to drain
+   * @param payto_uri account to wire funds to
+   * @param request_timestamp time of the signature
+   * @param amount amount to wire
+   * @param master_sig signature affirming the operation
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*do_account_merge)(
+  (*insert_drain_profit)(void *cls,
+                         const struct TALER_WireTransferIdentifierRawP *wtid,
+                         const char *account_section,
+                         const char *payto_uri,
+                         struct GNUNET_TIME_Timestamp request_timestamp,
+                         const struct TALER_Amount *amount,
+                         const struct TALER_MasterSignatureP *master_sig);
+
+
+  /**
+   * Function called to get information about a profit drain event.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param wtid wire transfer ID to look up drain event for
+   * @param[out] serial set to serial ID of the entry
+   * @param[out] account_section set to account to drain
+   * @param[out] payto_uri set to account to wire funds to
+   * @param[out] request_timestamp set to time of the signature
+   * @param[out] amount set to amount to wire
+   * @param[out] master_sig set to signature affirming the operation
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_drain_profit)(void *cls,
+                      const struct TALER_WireTransferIdentifierRawP *wtid,
+                      uint64_t *serial,
+                      char **account_section,
+                      char **payto_uri,
+                      struct GNUNET_TIME_Timestamp *request_timestamp,
+                      struct TALER_Amount *amount,
+                      struct TALER_MasterSignatureP *master_sig);
+
+
+  /**
+   * Get profit drain operation ready to execute.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param[out] serial set to serial ID of the entry
+   * @param[out] wtid set set to wire transfer ID to use
+   * @param[out] account_section set to  account to drain
+   * @param[out] payto_uri set to account to wire funds to
+   * @param[out] request_timestamp set to time of the signature
+   * @param[out] amount set to amount to wire
+   * @param[out] master_sig set to signature affirming the operation
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*profit_drains_get_pending)(
     void *cls,
-    const struct TALER_PurseContractPublicKeyP *purse_pub,
-    const struct TALER_ReservePublicKeyP *reserve_pub,
-    const struct TALER_ReserveSignatureP *reserve_sig);
+    uint64_t *serial,
+    struct TALER_WireTransferIdentifierRawP *wtid,
+    char **account_section,
+    char **payto_uri,
+    struct GNUNET_TIME_Timestamp *request_timestamp,
+    struct TALER_Amount *amount,
+    struct TALER_MasterSignatureP *master_sig);
 
 
   /**
-   * Function called to persist a signature that
-   * prove that the client requested an
-   * account history.  Debits the @a history_fee from
-   * the reserve (if possible).
+   * Set profit drain operation to finished.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param reserve_pub account that the history was requested for
-   * @param reserve_sig signature affirming the request
-   * @param request_timestamp when was the request made
-   * @param history_fee how much should the @a reserve_pub be charged for the request
+   * @param serial serial ID of the entry to mark finished
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_history_request)(
+  (*profit_drains_set_finished)(
+    void *cls,
+    uint64_t serial);
+
+
+  /**
+   * Insert KYC requirement for @a h_payto account into table.
+   *
+   * @param cls closure
+   * @param requirements requirements that must be checked
+   * @param h_payto account that must be KYC'ed
+   * @param reserve_pub if account is a reserve, its public key, NULL otherwise
+   * @param[out] requirement_row set to legitimization requirement row for this check
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_kyc_requirement_for_account)(
     void *cls,
+    const char *requirements,
+    const struct TALER_PaytoHashP *h_payto,
     const struct TALER_ReservePublicKeyP *reserve_pub,
-    const struct TALER_ReserveSignatureP *reserve_sig,
-    struct GNUNET_TIME_Absolute request_timestamp,
-    const struct TALER_Amount *history_fee);
+    uint64_t *requirement_row);
 
 
   /**
-   * Function called to initiate closure of an account.
+   * Begin KYC requirement process.
+   *
+   * @param cls closure
+   * @param h_payto account that must be KYC'ed
+   * @param provider_section provider that must be checked
+   * @param provider_account_id provider account ID
+   * @param provider_legitimization_id provider legitimization ID
+   * @param[out] process_row row the process is stored under
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_kyc_requirement_process)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    const char *provider_section,
+    const char *provider_account_id,
+    const char *provider_legitimization_id,
+    uint64_t *process_row);
+
+
+  /**
+   * Fetch information about pending KYC requirement process.
+   *
+   * @param cls closure
+   * @param h_payto account that must be KYC'ed
+   * @param provider_section provider that must be checked
+   * @param[out] redirect_url set to redirect URL for the process
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_pending_kyc_requirement_process)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    const char *provider_section,
+    char **redirect_url);
+
+
+  /**
+   * Update KYC process with updated provider-linkage and/or
+   * expiration data.
+   *
+   * @param cls closure
+   * @param process_row row to select by
+   * @param provider_section provider that must be checked (technically redundant)
+   * @param h_payto account that must be KYC'ed (helps access by shard, otherwise also redundant)
+   * @param provider_account_id provider account ID
+   * @param provider_legitimization_id provider legitimization ID
+   * @param redirect_url where the user should be redirected to start the KYC process
+   * @param expiration how long is this KYC check set to be valid (in the past if invalid)
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*update_kyc_process_by_row)(
+    void *cls,
+    uint64_t process_row,
+    const char *provider_section,
+    const struct TALER_PaytoHashP *h_payto,
+    const char *provider_account_id,
+    const char *provider_legitimization_id,
+    const char *redirect_url,
+    struct GNUNET_TIME_Absolute expiration);
+
+
+  /**
+   * Lookup KYC requirement.
+   *
+   * @param cls closure
+   * @param legi_row identifies requirement to look up
+   * @param[out] requirements space-separated list of requirements
+   * @param[out] aml_status set to the AML status of the account
+   * @param[out] h_payto account that must be KYC'ed
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*lookup_kyc_requirement_by_row)(
+    void *cls,
+    uint64_t requirement_row,
+    char **requirements,
+    enum TALER_AmlDecisionState *aml_status,
+    struct TALER_PaytoHashP *h_payto);
+
+
+  /**
+   * Lookup KYC process meta data.
+   *
+   * @param cls closure
+   * @param provider_section provider that must be checked
+   * @param h_payto account that must be KYC'ed
+   * @param[out] process_row set to row with the legitimization data
+   * @param[out] expiration how long is this KYC check set to be valid (in the past if invalid)
+   * @param[out] provider_account_id provider account ID
+   * @param[out] provider_legitimization_id provider legitimization ID
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*lookup_kyc_process_by_account)(
+    void *cls,
+    const char *provider_section,
+    const struct TALER_PaytoHashP *h_payto,
+    uint64_t *process_row,
+    struct GNUNET_TIME_Absolute *expiration,
+    char **provider_account_id,
+    char **provider_legitimization_id);
+
+
+  /**
+   * Lookup an
+   * @a h_payto by @a provider_legitimization_id.
+   *
+   * @param cls closure
+   * @param provider_section
+   * @param provider_legitimization_id legi to look up
+   * @param[out] h_payto where to write the result
+   * @param[out] process_row identifies the legitimization process on our end
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*kyc_provider_account_lookup)(
+    void *cls,
+    const char *provider_section,
+    const char *provider_legitimization_id,
+    struct TALER_PaytoHashP *h_payto,
+    uint64_t *process_row);
+
+
+  /**
+   * Call us on KYC processes satisfied for the given
+   * account.
    *
    * @param cls the @e cls of this struct with the plugin-specific state
-   * @param reserve_pub public key of the account to close
-   * @param reserve_sig signature affiming that the account is to be closed
-   * @param[out] final_balance set to the final balance in the account that will be wired back to the origin account
+   * @param h_payto account identifier
+   * @param spc function to call for each satisfied KYC process
+   * @param spc_cls closure for @a spc
    * @return transaction status code
    */
   enum GNUNET_DB_QueryStatus
-  (*insert_close_request)(void *cls,
-                          const struct TALER_ReservePublicKeyP *reserve_pub,
-                          const struct TALER_ReserveSignatureP *reserve_sig,
-                          struct TALER_Amount *final_balance);
+  (*select_satisfied_kyc_processes)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    TALER_EXCHANGEDB_SatisfiedProviderCallback spc,
+    void *spc_cls);
+
+
+  /**
+   * Call us on KYC legitimization processes satisfied and not expired for the
+   * given account.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param h_payto account identifier
+   * @param lpc function to call for each satisfied KYC legitimization process
+   * @param lpc_cls closure for @a lpc
+   * @return transaction status code
+   */
+  enum GNUNET_DB_QueryStatus
+  (*iterate_kyc_reference)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    TALER_EXCHANGEDB_LegitimizationProcessCallback lpc,
+    void *lpc_cls);
+
+
+  /**
+   * Call @a kac on withdrawn amounts after @a time_limit which are relevant
+   * for a KYC trigger for a the (debited) account identified by @a h_payto.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param h_payto account identifier
+   * @param time_limit oldest transaction that could be relevant
+   * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+   * @param kac_cls closure for @a kac
+   * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_withdraw_amounts_for_kyc_check)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    struct GNUNET_TIME_Absolute time_limit,
+    TALER_EXCHANGEDB_KycAmountCallback kac,
+    void *kac_cls);
+
+
+  /**
+   * Call @a kac on aggregated amounts after @a time_limit which are relevant for a
+   * KYC trigger for a the (credited) account identified by @a h_payto.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param h_payto account identifier
+   * @param time_limit oldest transaction that could be relevant
+   * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+   * @param kac_cls closure for @a kac
+   * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_aggregation_amounts_for_kyc_check)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    struct GNUNET_TIME_Absolute time_limit,
+    TALER_EXCHANGEDB_KycAmountCallback kac,
+    void *kac_cls);
+
+
+  /**
+   * Call @a kac on merged reserve amounts after @a time_limit which are relevant for a
+   * KYC trigger for a the wallet identified by @a h_payto.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param h_payto account identifier
+   * @param time_limit oldest transaction that could be relevant
+   * @param kac function to call for each applicable amount, in reverse chronological order (or until @a kac aborts by returning anything except #GNUNET_OK).
+   * @param kac_cls closure for @a kac
+   * @return transaction status code, @a kac aborting with #GNUNET_NO is not an error
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_merge_amounts_for_kyc_check)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    struct GNUNET_TIME_Absolute time_limit,
+    TALER_EXCHANGEDB_KycAmountCallback kac,
+    void *kac_cls);
+
+
+  /**
+   * Store KYC attribute data, update KYC process status and
+   * AML status for the given account.
+   *
+   * @param cls closure
+   * @param process_row KYC process row to update
+   * @param h_payto account for which the attribute data is stored
+   * @param kyc_prox key for similarity search
+   * @param provider_section provider that must be checked
+   * @param num_checks how many checks do these attributes satisfy
+   * @param satisfied_checks array of checks satisfied by these attributes
+   * @param provider_account_id provider account ID
+   * @param provider_legitimization_id provider legitimization ID
+   * @param birthday birthdate of user, in days after 1990, or 0 if unknown or definitively adult
+   * @param collection_time when was the data collected
+   * @param expiration_time when does the data expire
+   * @param enc_attributes_size number of bytes in @a enc_attributes
+   * @param enc_attributes encrypted attribute data
+   * @param require_aml true to trigger AML
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_kyc_attributes)(
+    void *cls,
+    uint64_t process_row,
+    const struct TALER_PaytoHashP *h_payto,
+    const struct GNUNET_ShortHashCode *kyc_prox,
+    const char *provider_section,
+    unsigned int num_checks,
+    const char *satisfied_checks[static num_checks],
+    uint32_t birthday,
+    struct GNUNET_TIME_Timestamp collection_time,
+    const char *provider_account_id,
+    const char *provider_legitimization_id,
+    struct GNUNET_TIME_Absolute expiration_time,
+    size_t enc_attributes_size,
+    const void *enc_attributes,
+    bool require_aml);
+
+
+  /**
+   * Lookup similar KYC attribute data.
+   *
+   * @param cls closure
+   * @param kyc_prox key for similarity search
+   * @param cb callback to invoke on each match
+   * @param cb_cls closure for @a cb
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_similar_kyc_attributes)(
+    void *cls,
+    const struct GNUNET_ShortHashCode *kyc_prox,
+    TALER_EXCHANGEDB_AttributeCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Lookup KYC attribute data for a specific account.
+   *
+   * @param cls closure
+   * @param h_payto account for which the attribute data is stored
+   * @param cb callback to invoke on each match
+   * @param cb_cls closure for @a cb
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_kyc_attributes)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    TALER_EXCHANGEDB_AttributeCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Insert AML staff record.
+   *
+   * @param cls closure
+   * @param decider_pub public key of the staff member
+   * @param master_sig offline signature affirming the AML officer
+   * @param decider_name full name of the staff member
+   * @param is_active true to enable, false to set as inactive
+   * @param read_only true to set read-only access
+   * @param last_change when was the change made effective
+   * @param[out] previous_change when was the previous change made
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_aml_officer)(
+    void *cls,
+    const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+    const struct TALER_MasterSignatureP *master_sig,
+    const char *decider_name,
+    bool is_active,
+    bool read_only,
+    struct GNUNET_TIME_Timestamp last_change,
+    struct GNUNET_TIME_Timestamp *previous_change);
+
+
+  /**
+   * Test if the given AML staff member is active
+   * (at least read-only).
+   *
+   * @param cls closure
+   * @param decider_pub public key of the staff member
+   * @return database transaction status, if member is unknown or not active, 1 if member is active
+   */
+  enum GNUNET_DB_QueryStatus
+  (*test_aml_officer)(
+    void *cls,
+    const struct TALER_AmlOfficerPublicKeyP *decider_pub);
+
+
+  /**
+   * Fetch AML staff record.
+   *
+   * @param cls closure
+   * @param decider_pub public key of the staff member
+   * @param[out] master_sig offline signature affirming the AML officer
+   * @param[out] decider_name full name of the staff member
+   * @param[out] is_active true to enable, false to set as inactive
+   * @param[out] read_only true to set read-only access
+   * @param[out] last_change when was the change made effective
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*lookup_aml_officer)(
+    void *cls,
+    const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+    struct TALER_MasterSignatureP *master_sig,
+    char **decider_name,
+    bool *is_active,
+    bool *read_only,
+    struct GNUNET_TIME_Absolute *last_change);
+
+
+  /**
+   * Obtain the current AML threshold set for an account.
+   *
+   * @param cls closure
+   * @param h_payto account for which the AML threshold is stored
+   * @param[out] decision set to current AML decision
+   * @param[out] threshold set to the existing threshold
+   * @return database transaction status, 0 if no threshold was set
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_aml_threshold)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    enum TALER_AmlDecisionState *decision,
+    struct TALER_EXCHANGEDB_KycStatus *kyc,
+    struct TALER_Amount *threshold);
+
+
+  /**
+   * Trigger AML process, an account has crossed the threshold. Inserts or
+   * updates the AML status.
+   *
+   * @param cls closure
+   * @param h_payto account for which the attribute data is stored
+   * @param threshold_crossed existing threshold that was crossed
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*trigger_aml_process)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    const struct TALER_Amount *threshold_crossed);
+
 
+  /**
+   * Lookup AML decisions that have a particular state.
+   *
+   * @param cls closure
+   * @param decision which decision states to filter by
+   * @param row_off offset to start from
+   * @param forward true to go forward in time, false to go backwards
+   * @param cb callback to invoke on each match
+   * @param cb_cls closure for @a cb
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_aml_process)(
+    void *cls,
+    enum TALER_AmlDecisionState decision,
+    uint64_t row_off,
+    uint64_t limit,
+    bool forward,
+    TALER_EXCHANGEDB_AmlStatusCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Lookup AML decision history for a particular account.
+   *
+   * @param cls closure
+   * @param h_payto which account should we return the AML decision history for
+   * @param cb callback to invoke on each match
+   * @param cb_cls closure for @a cb
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*select_aml_history)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    TALER_EXCHANGEDB_AmlHistoryCallback cb,
+    void *cb_cls);
+
+
+  /**
+   * Insert an AML decision. Inserts into AML history and insert or updates AML
+   * status.
+   *
+   * @param cls closure
+   * @param h_payto account for which the attribute data is stored
+   * @param new_threshold new monthly threshold that would trigger an AML check
+   * @param new_status AML decision status
+   * @param decision_time when was the decision made
+   * @param justification human-readable text justifying the decision
+   * @param kyc_requirements specific KYC requirements being imposed
+   * @param requirements_row row in the KYC table for this process, 0 for none
+   * @param decider_pub public key of the staff member
+   * @param decider_sig signature of the staff member
+   * @param[out] invalid_officer set to TRUE if @a decider_pub is not allowed to make decisions right now
+   * @param[out] last_date set to the previous decision time;
+   *   the INSERT is not performed if @a last_date is not before @a decision_time
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_aml_decision)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    const struct TALER_Amount *new_threshold,
+    enum TALER_AmlDecisionState new_status,
+    struct GNUNET_TIME_Timestamp decision_time,
+    const char *justification,
+    const json_t *kyc_requirements,
+    uint64_t requirements_row,
+    const struct TALER_AmlOfficerPublicKeyP *decider_pub,
+    const struct TALER_AmlOfficerSignatureP *decider_sig,
+    bool *invalid_officer,
+    struct GNUNET_TIME_Timestamp *last_date);
+
+
+  /**
+   * Update KYC process status to finished (and failed).
+   *
+   * @param cls closure
+   * @param process_row KYC process row to update
+   * @param h_payto account for which the attribute data is stored
+   * @param provider_section provider that must be checked
+   * @param provider_account_id provider account ID
+   * @param provider_legitimization_id provider legitimization ID
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*insert_kyc_failure)(
+    void *cls,
+    uint64_t process_row,
+    const struct TALER_PaytoHashP *h_payto,
+    const char *provider_section,
+    const char *provider_account_id,
+    const char *provider_legitimization_id);
+
+  /**
+   * Function called to inject auditor triggers into the
+   * database, triggering the real-time auditor upon
+   * relevant INSERTs.
+   *
+   * @param cls closure
+   * @return #GNUNET_OK on success,
+   *         #GNUNET_SYSERR on DB errors
+   */
+  enum GNUNET_GenericReturnValue
+  (*inject_auditor_triggers)(void *cls);
 
 };
 
diff --git a/src/include/taler_extensions.h b/src/include/taler_extensions.h
index 32821e500..1eb567f72 100644
--- a/src/include/taler_extensions.h
+++ b/src/include/taler_extensions.h
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2014-2021 Taler Systems SA
+   Copyright (C) 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
@@ -22,113 +22,257 @@
 #define TALER_EXTENSIONS_H
 
 #include <gnunet/gnunet_util_lib.h>
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+#include "taler_extensions_policy.h"
 
 
 #define TALER_EXTENSION_SECTION_PREFIX "exchange-extension-"
 
 enum TALER_Extension_Type
 {
-  TALER_Extension_AgeRestriction = 0,
-  TALER_Extension_MaxPredefined = 1 // Must be last of the predefined
+  TALER_Extension_PolicyNull                 = 0,
+
+  TALER_Extension_AgeRestriction             = 1,
+  TALER_Extension_PolicyMerchantRefund       = 2,
+  TALER_Extension_PolicyBrandtVickeryAuction = 3,
+  TALER_Extension_PolicyEscrowedPayment      = 4,
+
+  TALER_Extension_MaxPredefined              = 5 // Must be last of the predefined
 };
 
+
+/* Forward declarations */
+enum TALER_PolicyFulfillmentState;
+struct TALER_PolicyFulfillmentOutcome;
+
 /*
- * Represents the implementation of an extension.
- * TODO: add documentation
+ * @brief Represents the implementation of an extension.
+ *
+ * An "Extension" is an optional feature for the Exchange.
+ * There are only two types of extensions:
+ *
+ * a) Age restriction:  This is a special feature that directly interacts with
+ * denominations and coins, but is not define policies during deposits, see b).
+ * The implementation of this extension doesn't have to implement any of the
+ * http- or depost-handlers in the struct.
+ *
+ * b) Policies for deposits:  These are extensions that define policies (such
+ * as refund, escrow or auctions) for deposit requests.  These extensions have
+ * to implement at least the deposit- and post-http-handler in the struct to be
+ * functional.
+ *
+ * In addition to the handlers defined in this struct, an extension must also
+ * be a plugin in the GNUNET_Plugin sense.  That is, it must implement the
+ * functions
+ *    1: (void *ext)libtaler_extension_<name>_init(void *cfg)
+ * and
+ *    2: (void *)libtaler_extension_<name>_done(void *)
+ *
+ * In 1:, the input will be the GNUNET_CONFIGURATION_Handle to the TALER
+ * configuration and the output must be the struct TALER_Extension * on
+ * success, NULL otherwise.
+ *
+ * In 2:, no arguments are passed and NULL is expected to be returned.
  */
 struct TALER_Extension
 {
-  /* simple linked list */
-  struct TALER_Extension *next;
-
+  /**
+   * Type of the extension.  Only one extension of a type can be loaded
+   * at any time.
+   */
   enum TALER_Extension_Type type;
+
+  /**
+   * The name of the extension, must be unique among all loaded extensions.  It
+   * is used in URLs for /extension/$NAME as well.
+   */
   char *name;
+
+  /**
+   * Criticality of the extension.  It has the same semantics as "critical" has
+   * for extensions in X.509:
+   * - if "true", the client must "understand" the extension before proceeding,
+   * - if "false", clients can safely skip extensions they do not understand.
+   * (see https://datatracker.ietf.org/doc/html/rfc5280#section-4.2)
+   */
   bool critical;
+
+  /**
+   * Version of the extension must be provided in Taler's protocol version ranges notation, see
+   * https://docs.taler.net/core/api-common.html#protocol-version-ranges
+   */
   char *version;
+
+  /**
+   * If the extension is marked as enabled, it will be listed in the
+   * "extensions" field in the "/keys" response.
+   */
+  bool enabled;
+
+  /**
+   * Opaque (public) configuration object, set by the extension.
+   */
   void *config;
-  json_t *config_json;
 
-  void (*disable)(struct TALER_Extension *this);
 
-  enum GNUNET_GenericReturnValue (*test_json_config)(
-    const json_t *config);
+  /**
+   * @brief Handler to to disable the extension.
+   *
+   * @param ext The current extension object
+   */
+  void (*disable)(struct TALER_Extension *ext);
+
+  /**
+   * @brief Handler to read an extension-specific configuration in JSON
+   * encoding and enable the extension.  Must be implemented by the extension.
+   *
+   * @param[in] ext The extension object. If NULL, the configuration will only be checked.
+   * @param[in,out] config A JSON blob
+   * @return GNUNET_OK if the json was a valid configuration for the extension.
+   */
+  enum GNUNET_GenericReturnValue (*load_config)(
+    const json_t *config,
+    struct TALER_Extension *ext);
+
+  /**
+   * @brief Handler to return the manifest of the extension in JSON encoding.
+   *
+   * See
+   * https://docs.taler.net/design-documents/006-extensions.html#tsref-type-Extension
+   * for the definition.
+   *
+   * @param ext The extension object
+   * @return The JSON encoding of the extension, if enabled, NULL otherwise.
+   */
+  json_t *(*manifest)(
+    const struct TALER_Extension *ext);
+
+  /* =========================
+   *  Policy related handlers
+   * =========================
+   */
+
+  /**
+   * @brief Handler to check an incoming policy and create a
+   * TALER_PolicyDetails. Can be NULL;
+   *
+   * When a deposit request refers to this extension in its policy
+   * (see https://docs.taler.net/core/api-exchange.html#deposit), this handler
+   * will be called before the deposit transaction.
+   *
+   * @param[in]  currency Currency used in the exchange
+   * @param[in]  policy_json Details about the policy, provided by the client
+   *             during a deposit request.
+   * @param[out] details On success, will contain the details to the policy,
+   *             evaluated by the corresponding policy handler.
+   * @param[out] error_hint On error, will contain a hint
+   * @return     GNUNET_OK if the data was accepted by the extension.
+   */
+  enum GNUNET_GenericReturnValue (*create_policy_details)(
+    const char *currency,
+    const json_t *policy_json,
+    struct TALER_PolicyDetails *details,
+    const char **error_hint);
+
+  /**
+   * @brief Handler for POST-requests to the /extensions/$name endpoint. Can be NULL.
+   *
+   * @param[in] root The JSON body from the request
+   * @param[in] args Additional query parameters of the request.
+   * @param[in,out] details List of policy details related to the incoming fulfillment proof
+   * @param[in] details_len Size of the list @e details
+   * @param[out] output JSON output to return to the client
+   * @return GNUNET_OK on success.
+   */
+  enum GNUNET_GenericReturnValue (*policy_post_handler)(
+    const json_t *root,
+    const char *const args[],
+    struct TALER_PolicyDetails *details,
+    size_t details_len,
+    json_t **output);
+
+  /**
+   * @brief Handler for GET-requests to the /extensions/$name endpoint.  Can be NULL.
+   *
+   * @param connection The current connection
+   * @param root The JSON body from the request
+   * @param args Additional query parameters of the request.
+   * @return MDH result
+   */
+  MHD_RESULT (*policy_get_handler)(
+    struct MHD_Connection *connection,
+    const char *const args[]);
+};
 
-  enum GNUNET_GenericReturnValue (*load_json_config)(
-    struct TALER_Extension *this,
-    json_t *config);
 
-  json_t *(*config_to_json)(
-    const struct TALER_Extension *this);
+/*
+ * @brief simply linked list of extensions
+ */
 
-  enum GNUNET_GenericReturnValue (*load_taler_config)(
-    struct TALER_Extension *this,
-    const struct GNUNET_CONFIGURATION_Handle *cfg);
+struct TALER_Extensions
+{
+  struct TALER_Extensions *next;
+  const struct TALER_Extension *extension;
 };
 
 /**
  * Generic functions for extensions
  */
 
-/*
- * Sets the configuration of the extensions from the given TALER configuration
+/**
+ * @brief Loads the extensions as shared libraries, as specified in the given
+ * TALER configuration.
  *
  * @param cfg Handle to the TALER configuration
- * @return GNUNET_OK on success, GNUNET_SYSERR if unknown extensions were found
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if unknown extensions were found
  *         or any particular configuration couldn't be parsed.
  */
 enum GNUNET_GenericReturnValue
-TALER_extensions_load_taler_config (
+TALER_extensions_init (
   const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 /*
- * Check the given obj to be a valid extension object and fill the fields
- * accordingly.
+ * @brief Parses a given JSON object as an extension manifest.
+ *
+ * @param[in] obj JSON object to parse as an extension manifest
+ * @param{out] critical will be set to 1 if the extension is critical according to obj
+ * @param[out] version will be set to the version of the extension according to obj
+ * @param[out] config will be set to the configuration of the extension according to obj
+ * @return OK on success, Error otherwise
  */
 enum GNUNET_GenericReturnValue
-TALER_extensions_is_json_config (
+TALER_extensions_parse_manifest (
   json_t *obj,
   int *critical,
   const char **version,
   json_t **config);
 
 /*
- * Sets the configuration of the extensions from a given JSON object.
+ * @brief Loads extensions according to the manifests.
  *
- * he JSON object must be of type ExchangeKeysResponse as described in
- * https://docs.taler.net/design-documents/006-extensions.html#exchange
+ * The JSON object must be of type ExtensionsManifestsResponse as described
+ * in https://docs.taler.net/design-documents/006-extensions.html#exchange
  *
- * @param cfg JSON object containting the configuration for all extensions
- * @return GNUNET_OK on success, GNUNET_SYSERR if unknown extensions were found
- *         or any particular configuration couldn't be parsed.
+ * @param cfg JSON object containing the manifests for all extensions
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if unknown extensions were
+ *  found or any particular configuration couldn't be parsed.
  */
 enum GNUNET_GenericReturnValue
-TALER_extensions_load_json_config (
-  json_t *cfg);
+TALER_extensions_load_manifests (
+  const json_t *manifests);
 
 /*
- * Returns the head of the linked list of extensions
+ * @brief Returns the head of the linked list of extensions.
  */
-const struct TALER_Extension *
-TALER_extensions_get_head ();
-
-/*
- * Adds an extension to the linked list of extensions
- *
- * @param new_extension the new extension to be added
- * @return GNUNET_OK on success, GNUNET_SYSERR if the extension is invalid
- * (missing fields), GNUNET_NO if there is already an extension with that name
- * or type.
- */
-enum GNUNET_GenericReturnValue
-TALER_extensions_add (
-  const struct TALER_Extension *new_extension);
+const struct TALER_Extensions *
+TALER_extensions_get_head (void);
 
 /**
- * Finds and returns a supported extension by a given type.
+ * @brief Finds and returns a supported extension by a given type.
  *
- * @param type type of the extension to lookup
+ * @param type of the extension to lookup
  * @return extension found, or NULL (should not happen!)
  */
 const struct TALER_Extension *
@@ -137,7 +281,7 @@ TALER_extensions_get_by_type (
 
 
 /**
- * Finds and returns a supported extension by a given name.
+ * @brief Finds and returns a supported extension by a given name.
  *
  * @param name name of the extension to lookup
  * @return the extension, if found, NULL otherwise
@@ -146,10 +290,8 @@ const struct TALER_Extension *
 TALER_extensions_get_by_name (
   const char *name);
 
-#define TALER_extensions_is_enabled(ext) (NULL != (ext)->config)
-
 /**
- * Check if a given type of an extension is enabled
+ * @brief Check if a given type of an extension is enabled
  *
  * @param type type of to check
  * @return true enabled, false if not enabled, will assert if type is not found.
@@ -158,12 +300,21 @@ bool
 TALER_extensions_is_enabled_type (
   enum TALER_Extension_Type type);
 
+/**
+ * @brief Check if an extension is enabled
+ *
+ * @param extension The extension handler.
+ * @return true enabled, false if not enabled, will assert if type is not found.
+ */
+bool
+TALER_extensions_is_enabled (
+  const struct TALER_Extension *extension);
 
 /*
  * Verify the signature of a given JSON object for extensions with the master
  * key of the exchange.
  *
- * The JSON object must be of type ExchangeKeysResponse as described in
+ * The JSON object must be of type ExtensionsManifestsResponse as described in
  * https://docs.taler.net/design-documents/006-extensions.html#exchange
  *
  * @param extensions JSON object with the extension configuration
@@ -173,14 +324,19 @@ TALER_extensions_is_enabled_type (
  * and GNUNET_NO if the signature couldn't be verified.
  */
 enum GNUNET_GenericReturnValue
-TALER_extensions_verify_json_config_signature (
-  json_t *extensions,
+TALER_extensions_verify_manifests_signature (
+  const json_t *manifests,
   struct TALER_MasterSignatureP *extensions_sig,
   struct TALER_MasterPublicKeyP *master_pub);
 
 
 /*
  * TALER Age Restriction Extension
+ *
+ * This extension is special insofar as it directly interacts with coins and
+ * denominations.
+ *
+ * At the same time, it doesn't implement and http- or deposit-handlers.
  */
 
 #define TALER_EXTENSION_SECTION_AGE_RESTRICTION (TALER_EXTENSION_SECTION_PREFIX  \
@@ -190,93 +346,41 @@ TALER_extensions_verify_json_config_signature (
  * The default age mask represents the age groups
  * 0-7, 8-9, 10-11, 12-13, 14-15, 16-17, 18-20, 21-...
  */
-#define TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_MASK (1 | 1 << 8 | 1 << 10 \
-                                                          | 1 << 12 | 1 << 14 \
-                                                          | 1 << 16 | 1 << 18 \
-                                                          | 1 << 21)
 #define TALER_EXTENSION_AGE_RESTRICTION_DEFAULT_AGE_GROUPS "8:10:12:14:16:18:21"
 
-/**
- * @brief Registers the extension for age restriction to the list extensions
- */
-enum GNUNET_GenericReturnValue
-TALER_extension_age_restriction_register ();
 
-/**
- * @brief Parses a string as a list of age groups.
- *
- * The string must consist of a colon-separated list of increasing integers
- * between 0 and 31.  Each entry represents the beginning of a new age group.
- * F.e. the string "8:10:12:14:16:18:21" parses into the following list of age
- * groups
- *   0-7, 8-9, 10-11, 12-13, 14-15, 16-17, 18-20, 21-...
- * which then is represented as bit mask with the corresponding bits set:
- *   31     24        16        8         0
- *   |      |         |         |         |
- *   oooooooo  oo1oo1o1  o1o1o1o1  ooooooo1
- *
- * @param groups String representation of age groups
- * @param[out] mask Mask representation for age restriction.
- * @return Error, if age groups were invalid, OK otherwise.
+/*
+ * @brief Configuration for Age Restriction
  */
-enum GNUNET_GenericReturnValue
-TALER_parse_age_group_string (
-  const char *groups,
-  struct TALER_AgeMask *mask);
+struct TALER_AgeRestrictionConfig
+{
+  struct TALER_AgeMask mask;
+  uint8_t num_groups;
+};
 
-/**
- * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
- *
- * @param mask Age mask
- * @return String representation of the age mask, allocated by GNUNET_malloc.
- *         Can be used as value in the TALER config.
- */
-char *
-TALER_age_mask_to_string (
-  const struct TALER_AgeMask *mask);
 
 /**
- * Returns true when age restriction is configured and enabled.
+ * @brief Retrieve the age restriction configuration
+ *
+ * @return age restriction configuration if present, otherwise NULL.
  */
-bool
-TALER_extensions_age_restriction_is_enabled ();
+const struct TALER_AgeRestrictionConfig *
+TALER_extensions_get_age_restriction_config (void);
 
 /**
- * Returns true when age restriction is configured (might not be _enabled_,
- * though).
+ * @brief Check if age restriction is enabled
+ *
+ * @return true, if age restriction is loaded, configured and enabled; otherwise false.
  */
 bool
-TALER_extensions_age_restriction_is_configured ();
+TALER_extensions_is_age_restriction_enabled (void);
 
 /**
- * Returns the currently set age mask.  Note that even if age restriction is
- * not enabled, the age mask might be have a non-zero value.
- */
-struct TALER_AgeMask
-TALER_extensions_age_restriction_ageMask ();
-
-
-/**
- * Returns the amount of age groups defined.  0 means no age restriction
- * enabled.
- */
-size_t
-TALER_extensions_age_restriction_num_groups ();
-
-/**
- * Parses a JSON object { "age_groups": "a:b:...y:z" }.
+ * @brief Return the age mask for age restriction
  *
- * @param root is the json object
- * @param[out] mask on succes, will contain the age mask
- * @return #GNUNET_OK on success and #GNUNET_SYSERR on failure.
- */
-enum GNUNET_GenericReturnValue
-TALER_JSON_parse_age_groups (const json_t *root,
-                             struct TALER_AgeMask *mask);
-
-
-/*
- * TODO: Add Peer2Peer Extension
+ * @return configured age mask, if age restriction is loaded, configured and enabled; otherwise zero mask.
  */
+struct TALER_AgeMask
+TALER_extensions_get_age_restriction_mask (void);
 
 #endif
diff --git a/src/include/taler_extensions_policy.h b/src/include/taler_extensions_policy.h
new file mode 100644
index 000000000..b10c0d8a2
--- /dev/null
+++ b/src/include/taler_extensions_policy.h
@@ -0,0 +1,205 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file include/taler_extensions_policy.h
+ * @brief Interface for policy extensions
+ * @author Özgür Kesim
+ */
+#ifndef TALER_EXTENSIONS_POLICY_H
+#define TALER_EXTENSIONS_POLICY_H
+
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_util.h"
+#include "taler_json_lib.h"
+#include "taler_mhd_lib.h"
+
+/*
+ * @brief Describes the states of fulfillment of a policy bound to a deposit
+ * NOTE: These values must be in sync with their use in stored procedures, f.e.
+ * exchange_do_insert_or_update_policy_details.
+ */
+enum TALER_PolicyFulfillmentState
+{
+  /* Initial state of an fulfillment, before any other state. */
+  TALER_PolicyFulfillmentInitial = 0,
+
+  /* General error state of an fulfillment. */
+  TALER_PolicyFulfillmentFailure = 1,
+
+  /* The policy is not yet ready due to insufficient funding. More deposits are
+   * necessary for it to become ready . */
+  TALER_PolicyFulfillmentInsufficient = 2,
+
+  /* The policy is funded and ready, pending */
+  TALER_PolicyFulfillmentReady = 3,
+
+  /* Policy is provably fulfilled. */
+  TALER_PolicyFulfillmentSuccess = 4,
+
+  /* Policy fulfillment has timed out */
+  TALER_PolicyFulfillmentTimeout = 5,
+
+  TALER_PolicyFulfillmentStateCount = TALER_PolicyFulfillmentTimeout + 1
+};
+
+
+/*
+ * @brief Returns a string representation of the state of a policy fulfillment
+ */
+const char *
+TALER_policy_fulfillment_state_str (enum TALER_PolicyFulfillmentState state);
+
+
+/* @brief Details of a policy for a deposit request */
+struct TALER_PolicyDetails
+{
+  /* Hash code that should be used for the .policy_hash_code field when
+   * this policy is saved in the policy_details table. */
+  struct GNUNET_HashCode hash_code;
+
+  /* Content of the policy in its original JSON form */
+  json_t *policy_json;
+
+  /* When the deadline is met and the policy is still in "Ready" state,
+   * a timeout-handler will transfer the amount
+   *    (total_amount - policy_fee - refreshable_amount)
+   * to the payto-URI from the corresponding deposit.  The value
+   * amount_refreshable will be refreshable by the owner of the
+   * associated deposits's coins */
+  struct GNUNET_TIME_Timestamp deadline;
+
+  /* The amount to which this policy commits to. It must be at least as
+   * large as @e policy_fee. */
+  struct TALER_Amount commitment;
+
+  /* The total sum of contributions from coins so far to fund this
+   * policy.  It must be at least as large as @commitment in order to be
+   * sufficiently funded. */
+  struct TALER_Amount accumulated_total;
+
+  /* The fee from the exchange for handling the policy. It is due when
+   * the state changes to Timeout or Success. */
+  struct TALER_Amount policy_fee;
+
+  /* The amount that will be transferred to the payto-URIs from the
+   * corresponding deposits when the fulfillment state changes to Timeout
+   * or Success.  Note that a fulfillment handler can alter this upon
+   * arrival of a proof of fulfillment. The remaining amount
+   * (accumulated_amount - policy_amount - transferable_amount) */
+  struct TALER_Amount transferable_amount;
+
+  /* The state of fulfillment of a policy.
+   * - If the state is Insufficient, the client is required to call
+   *   /deposit -maybe multiple times- with enough coins and the same
+   *   policy details in order to reach the required amount. The state is
+   *   then changed to Ready.
+   * - If the state changes to Timeout or Success, a handler will transfer
+   *   the amount (total_amount - policy_fee - refreshable_amount) to the
+   *   payto-URI from the corresponding deposit.  The value
+   *   amount_refreshable will be refreshable by the owner of the
+   *   associated deposits's coins.  */
+  enum TALER_PolicyFulfillmentState fulfillment_state;
+
+  /* If there is a proof of fulfillment, the row ID from the
+   * policy_fulfillment table */
+  uint64_t policy_fulfillment_id;
+  bool no_policy_fulfillment_id;
+};
+
+/*
+ * @brief All information required for the database transaction when handling a
+ * proof of fulfillment request.
+ */
+struct TALER_PolicyFulfillmentTransactionData
+{
+  /* The incoming proof, provided by a client */
+  const json_t *proof;
+
+  /* The Hash of the proof */
+  struct GNUNET_HashCode h_proof;
+
+  /* The timestamp of retrieval of the proof */
+  struct GNUNET_TIME_Timestamp timestamp;
+
+  /* The ID of the proof in the policy_fulfillment table.  Will be set
+   * during the transaction.  Needed to fill the table
+   * policy_details_fulfillments. */
+  uint64_t fulfillment_id;
+
+  /* The list of policy details.  Will be updated by the policy handler */
+  struct TALER_PolicyDetails *details;
+  size_t details_count;
+};
+
+
+/*
+ * @brief Extracts policy details from the deposit's policy options and the policy extensions
+ *
+ * @param[in]  currency Currency used in the exchange
+ * @param[in]  policy_options JSON of the policy options from a deposit request
+ * @param[out] details On GNUNET_OK, the parsed details
+ * @param[out] error_hint On GNUNET_SYSERR, will contain a hint for the reason why it failed
+ * @return GNUNET_OK on success, GNUNET_NO, when no extension was found. GNUNET_SYSERR when the JSON was
+ * invalid, with *error_hint maybe non-NULL.
+ */
+enum GNUNET_GenericReturnValue
+TALER_extensions_create_policy_details (
+  const char *currency,
+  const json_t *policy_options,
+  struct TALER_PolicyDetails *details,
+  const char **error_hint);
+
+
+/*
+ * ================================
+ * Merchant refund policy
+ * ================================
+ */
+struct TALER_ExtensionPolicyMerchantRefundPolicyConfig
+{
+  struct GNUNET_TIME_Relative max_timeout;
+};
+
+/*
+ * ================================
+ * Brandt-Vickrey Auctions policy
+ * ================================
+ */
+/*
+ * @brief Configuration for Brandt-Vickrey auctions policy
+ */
+struct TALER_ExtensionPolicyBrandtVickreyAuctionConfig
+{
+  uint16_t max_bidders;
+  uint16_t max_prices;
+  struct TALER_Amount auction_fee;
+};
+
+
+/*
+ * ================================
+ * Escrowed Payments policy
+ * ================================
+ */
+/*
+ * @brief Configuration for escrowed payments policy
+ */
+struct TALER_ExtensionPolicyEscrowedPaymentsConfig
+{
+  struct GNUNET_TIME_Relative max_timeout;
+};
+
+#endif
diff --git a/src/include/taler_fakebank_lib.h b/src/include/taler_fakebank_lib.h
index 16135a4d7..6b34f4730 100644
--- a/src/include/taler_fakebank_lib.h
+++ b/src/include/taler_fakebank_lib.h
@@ -76,6 +76,35 @@ TALER_FAKEBANK_start2 (uint16_t port,
 
 
 /**
+ * Start the fake bank.  The fake bank will, like the normal bank, listen for
+ * requests for /admin/add/incoming and /transfer. However, instead of
+ * executing or storing those requests, it will simply allow querying whether
+ * such a request has been made via #TALER_FAKEBANK_check_debit() and
+ * #TALER_FAKEBANK_check_credit() as well as the history API.
+ *
+ * This is useful for writing testcases to check whether the exchange
+ * would have issued the correct wire transfer orders.
+ *
+ * @param hostname hostname to use in URLs and URIs.
+ * @param port port to listen to
+ * @param exchange_url suggested exchange base URL
+ * @param currency which currency should the bank offer
+ * @param ram_limit how much memory do we use at most
+ * @param num_threads size of the thread pool, 0 to use the GNUnet scheduler
+ * @param signup_bonus how much to credit new users
+ * @return NULL on error
+ */
+struct TALER_FAKEBANK_Handle *
+TALER_FAKEBANK_start3 (const char *hostname,
+                       uint16_t port,
+                       const char *exchange_url,
+                       const char *currency,
+                       uint64_t ram_limit,
+                       unsigned int num_threads,
+                       const struct TALER_Amount *signup_bonus);
+
+
+/**
  * Check that no wire transfers were ordered (or at least none
  * that have not been taken care of via #TALER_FAKEBANK_check_debit()
  * or #TALER_FAKEBANK_check_credit()).
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index b4f999001..98e565f0c 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015, 2016, 2021, 2022 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -29,6 +29,40 @@
 #include "taler_error_codes.h"
 
 /**
+ * Version of this API, for compatibility tests.
+ */
+#define TALER_JSON_LIB_VERSION 0x00020000
+
+/**
+ * Details about an encrypted contract.
+ */
+struct TALER_EncryptedContract
+{
+
+  /**
+   * Signature of the client affiming this encrypted contract.
+   */
+  struct TALER_PurseContractSignatureP econtract_sig;
+
+  /**
+   * Contract decryption key for the purse.
+   */
+  struct TALER_ContractDiffiePublicP contract_pub;
+
+  /**
+   * Encrypted contract, can be NULL.
+   */
+  void *econtract;
+
+  /**
+   * Number of bytes in @e econtract.
+   */
+  size_t econtract_size;
+
+};
+
+
+/**
  * Print JSON parsing related error information
  * @deprecated
  */
@@ -61,18 +95,6 @@ TALER_JSON_pack_time_abs_human (const char *name,
   GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec)), \
   GNUNET_JSON_pack_uint64 ("code", ec)
 
-/**
- * Generate packer instruction for a JSON field of type
- * absolute time creating a human-readable timestamp.
- *
- * @param name name of the field to add to the object
- * @param at absolute time to pack
- * @return json pack specification
- */
-struct GNUNET_JSON_PackSpec
-TALER_JSON_pack_time_abs_nbo_human (const char *name,
-                                    struct GNUNET_TIME_AbsoluteNBO at);
-
 
 /**
  * Generate packer instruction for a JSON field of type
@@ -160,25 +182,28 @@ TALER_JSON_pack_amount (const char *name,
 
 /**
  * Generate packer instruction for a JSON field of type
- * amount.
+ * encrypted contract.
  *
  * @param name name of the field to add to the object
- * @param amount valid amount to pack
+ * @param econtract the encrypted contract
  * @return json pack specification
  */
 struct GNUNET_JSON_PackSpec
-TALER_JSON_pack_amount_nbo (const char *name,
-                            const struct TALER_AmountNBO *amount);
-
+TALER_JSON_pack_econtract (
+  const char *name,
+  const struct TALER_EncryptedContract *econtract);
 
 /**
- * Convert a TALER amount to a JSON object.
+ * Generate packer instruction for a JSON field of type age_commitment
  *
- * @param amount the amount
- * @return a json object describing the amount
+ * @param name name of the field to add to the object
+ * @param age_commitment age commitment to add
+ * @return json pack specification
  */
-json_t *
-TALER_JSON_from_amount (const struct TALER_Amount *amount);
+struct GNUNET_JSON_PackSpec
+TALER_JSON_pack_age_commitment (
+  const char *name,
+  const struct TALER_AgeCommitment *age_commitment);
 
 
 /**
@@ -188,7 +213,7 @@ TALER_JSON_from_amount (const struct TALER_Amount *amount);
  * @return a json object describing the amount
  */
 json_t *
-TALER_JSON_from_amount_nbo (const struct TALER_AmountNBO *amount);
+TALER_JSON_from_amount (const struct TALER_Amount *amount);
 
 
 /**
@@ -208,20 +233,19 @@ TALER_JSON_spec_amount (const char *name,
 
 
 /**
- * Provide specification to parse given JSON object to an amount
- * in network byte order.
- * The @a currency must be a valid pointer while the
- * parsing is done, a copy is not made.
+ * Provide specification to parse given JSON object to
+ * a currency specification.
  *
  * @param name name of the amount field in the JSON
- * @param currency the currency the amount must be in
- * @param[out] r_amount where the amount has to be written
+ * @param currency_code currency code to parse
+ * @param[out] r_cspec where the currency spec has to be written
  * @return spec for parsing an amount
  */
 struct GNUNET_JSON_Specification
-TALER_JSON_spec_amount_nbo (const char *name,
-                            const char *currency,
-                            struct TALER_AmountNBO *r_amount);
+TALER_JSON_spec_currency_specification (
+  const char *name,
+  const char *currency_code,
+  struct TALER_CurrencySpecification *r_cspec);
 
 
 /**
@@ -238,16 +262,55 @@ TALER_JSON_spec_amount_any (const char *name,
 
 
 /**
- * Provide specification to parse given JSON object to an amount
- * in any currency in network byte order.
+ * Provide specification to parse given JSON object to an encrypted contract.
  *
  * @param name name of the amount field in the JSON
- * @param[out] r_amount where the amount has to be written
+ * @param[out] econtract where to store the encrypted contract
  * @return spec for parsing an amount
  */
 struct GNUNET_JSON_Specification
-TALER_JSON_spec_amount_any_nbo (const char *name,
-                                struct TALER_AmountNBO *r_amount);
+TALER_JSON_spec_econtract (const char *name,
+                           struct TALER_EncryptedContract *econtract);
+
+
+/**
+ * Provide specification to parse a given JSON object to an age commitment.
+ *
+ * @param name name of the age commitment field in the JSON
+ * @param[out] age_commitment where to store the age commitment
+ * @return spec for parsing an age commitment
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_age_commitment (const char *name,
+                                struct TALER_AgeCommitment *age_commitment);
+
+
+/**
+ * Provide specification to parse an OTP key.
+ * An OTP key must be an RFC 3548 base32-encoded
+ * value (so NOT our usual Crockford-base32 encoding!).
+ *
+ * @param name name of the OTP key field in the JSON
+ * @param[out] otp_key where to store the OTP key
+ * @return spec for parsing an age commitment
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_otp_key (const char *name,
+                         const char **otp_key);
+
+
+/**
+ * Provide specification to parse an OTP method type.
+ * The value could be provided as an integer or
+ * as a descriptive string.
+ *
+ * @param name name of the OTP method type in the JSON
+ * @param[out] mca where to store the method type
+ * @return spec for parsing an age commitment
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_otp_type (const char *name,
+                          enum TALER_MerchantConfirmationAlgorithm *mca);
 
 
 /**
@@ -286,7 +349,6 @@ TALER_JSON_spec_amount_any_nbo (const char *name,
  * @param[out] gfs a `struct TALER_GlobalFeeSet` to initialize
  */
 #define TALER_JSON_SPEC_GLOBAL_FEES(currency,gfs) \
-  TALER_JSON_spec_amount ("kyc_fee", (currency), &(gfs)->kyc), \
   TALER_JSON_spec_amount ("history_fee", (currency), &(gfs)->history),   \
   TALER_JSON_spec_amount ("account_fee", (currency), &(gfs)->account),   \
   TALER_JSON_spec_amount ("purse_fee", (currency), &(gfs)->purse)
@@ -297,13 +359,25 @@ TALER_JSON_spec_amount_any_nbo (const char *name,
  * @param gfs a `struct TALER_GlobalFeeSet` to pack
  */
 #define TALER_JSON_PACK_GLOBAL_FEES(gfs) \
-  TALER_JSON_pack_amount ("kyc_fee", &(gfs)->kyc),   \
   TALER_JSON_pack_amount ("history_fee", &(gfs)->history),     \
   TALER_JSON_pack_amount ("account_fee", &(gfs)->account),     \
   TALER_JSON_pack_amount ("purse_fee", &(gfs)->purse)
 
 
 /**
+ * Generate a parser for a group of denominations.
+ *
+ * @param[in] field name of the field, maybe NULL
+ * @param[in] currency name of the currency
+ * @param[out] group denomination group information
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_denomination_group (const char *field,
+                                    const char *currency,
+                                    struct TALER_DenominationGroup *group);
+
+/**
  * Generate line in parser specification for denomination public key.
  *
  * @param field name of the field
@@ -316,6 +390,112 @@ TALER_JSON_spec_denom_pub (const char *field,
 
 
 /**
+ * Generate line in parser specification for error codes.
+ *
+ * @param field name of the field
+ * @param[out] ec error code to initialize
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_ec (const char *field,
+                    enum TALER_ErrorCode *ec);
+
+
+/**
+ * Generate line in parser specification for
+ * HTTP/HTTPS URLs.
+ *
+ * @param field name of the field
+ * @param[out] url web URL to initialize
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_web_url (const char *field,
+                         const char **url);
+
+
+/**
+ * Generate line in parser specification for
+ * "payto://" URIs.
+ *
+ * @param field name of the field
+ * @param[out] payto_uri RFC 8905 URI to initialize
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_payto_uri (const char *field,
+                           const char **payto_uri);
+
+
+/**
+ * Generate line in parser specification for AML decision states.
+ *
+ * @param field name of the field
+ * @param[out] aml_state AML state to initialize
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_aml_decision (const char *field,
+                              enum TALER_AmlDecisionState *aml_state);
+
+
+/**
+ * Representation of a protocol version.
+ */
+struct TALER_JSON_ProtocolVersion
+{
+  /**
+   * Current version of the protocol.
+   */
+  unsigned int current;
+
+  /**
+   * Implementation revision for the @e current
+   * version.
+   */
+  unsigned int revision;
+
+  /**
+   * Number of protocol versions this @e revision is
+   * backwards-compatible with.  Subtract this number
+   * from @e current to get the minimum protocol version
+   * required from the client.
+   */
+  unsigned int age;
+};
+
+
+/**
+ * Generate line in parser specification for protocol
+ * versions (``/config``). The field must be a string
+ * encoding the version as "$CURRENT:$REVISION:$AGE".
+ *
+ * @param field name of the field (usually "version")
+ * @param[out] ver protocol versions to initialize
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_version (const char *field,
+                         struct TALER_JSON_ProtocolVersion *ver);
+
+
+/**
+ * Generate a parser specification for a denomination public key of a given
+ * cipher.
+ *
+ * @param field name of the field
+ * @param cipher which cipher type to parse for
+ * @param[out] pk key to fill
+ * @return corresponding field spec
+ */
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_denom_pub_cipher (
+  const char *field,
+  enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher,
+  struct TALER_DenominationPublicKey *pk);
+
+
+/**
  * Generate line in parser specification for denomination signature.
  *
  * @param field name of the field
@@ -428,16 +608,18 @@ TALER_JSON_contract_hash (const json_t *json,
 
 
 /**
- * Take a given contract with "forgettable" fields marked
- * but with 'True' instead of a real salt. Replaces all
- * 'True' values with proper random salts.  Fails if any
- * forgettable markers are neither 'True' nor valid salts.
+ * Take a given @a contract with "forgettable" fields marked in the @a spec
+ * with 'True' instead of a real salt. Replaces all 'True' values with proper
+ * random salts in the actual @a contract.  Fails if any forgettable markers
+ * are neither 'True' nor valid salts.
  *
- * @param[in,out] json JSON to transform
+ * @param spec specification with forgettable fields
+ * @param[in,out] contract JSON contract to transform
  * @return #GNUNET_OK on success
  */
 enum GNUNET_GenericReturnValue
-TALER_JSON_contract_seed_forgettable (json_t *json);
+TALER_JSON_contract_seed_forgettable (const json_t *spec,
+                                      json_t *contract);
 
 
 /**
@@ -550,33 +732,6 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
 
 
 /**
- * Check the signature in @a wire_s.  Also performs rudimentary
- * checks on the account data *if* supported.
- *
- * @param wire_s signed wire information of an exchange
- * @param master_pub master public key of the exchange
- * @return #GNUNET_OK if signature is valid
- */
-enum GNUNET_GenericReturnValue
-TALER_JSON_exchange_wire_signature_check (
-  const json_t *wire_s,
-  const struct TALER_MasterPublicKeyP *master_pub);
-
-
-/**
- * Create a signed wire statement for the given account.
- *
- * @param payto_uri account specification
- * @param master_priv private key to sign with
- * @return NULL if @a payto_uri is malformed
- */
-json_t *
-TALER_JSON_exchange_wire_signature_make (
-  const char *payto_uri,
-  const struct TALER_MasterPrivateKeyP *master_priv);
-
-
-/**
  * Extract a string from @a object under the field @a field, but respecting
  * the Taler i18n rules and the language preferences expressed in @a
  * language_pattern.
@@ -640,25 +795,25 @@ TALER_JSON_wire_to_payto (const json_t *wire_s);
 
 
 /**
- * Hash @a extensions in deposits.
+ * Hash @a policy extensions in deposits.
  *
- * @param extensions contract extensions to hash
- * @param[out] ech where to write the extension hash
+ * @param policy contract policy extension to hash
+ * @param[out] ech where to write the policy hash
  */
 void
-TALER_deposit_extension_hash (const json_t *extensions,
-                              struct TALER_ExtensionContractHashP *ech);
+TALER_deposit_policy_hash (const json_t *policy,
+                           struct TALER_ExtensionPolicyHashP *ech);
 
 /**
- * Hash the @a config of an extension, given as JSON
+ * Hash the @a manifests of extensions, given as JSON
  *
- * @param config configuration of the extension
- * @param[out] eh where to write the extension hash
+ * @param manifests Manifests of the extensions
+ * @param[out] eh where to write the hash
  * @return GNUNET_OK on success, GNUNET_SYSERR on failure
  */
 enum GNUNET_GenericReturnValue
-TALER_JSON_extensions_config_hash (const json_t *config,
-                                   struct TALER_ExtensionConfigHashP *eh);
+TALER_JSON_extensions_manifests_hash (const json_t *manifests,
+                                      struct TALER_ExtensionManifestsHashP *eh);
 
 /**
  * Canonicalize a JSON input to a string according to RFC 8785.
diff --git a/src/include/taler_kyclogic_lib.h b/src/include/taler_kyclogic_lib.h
new file mode 100644
index 000000000..4d0c18fa4
--- /dev/null
+++ b/src/include/taler_kyclogic_lib.h
@@ -0,0 +1,374 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file taler_kyclogic_lib.h
+ * @brief server-side KYC API
+ * @author Christian Grothoff
+ */
+#ifndef TALER_KYCLOGIC_LIB_H
+#define TALER_KYCLOGIC_LIB_H
+
+#include <microhttpd.h>
+#include "taler_exchangedb_plugin.h"
+#include "taler_kyclogic_plugin.h"
+
+
+/**
+ * Enumeration for our KYC user types.
+ */
+enum TALER_KYCLOGIC_KycUserType
+{
+  /**
+   * KYC rule is for an individual.
+   */
+  TALER_KYCLOGIC_KYC_UT_INDIVIDUAL = 0,
+
+  /**
+   * KYC rule is for a business.
+   */
+  TALER_KYCLOGIC_KYC_UT_BUSINESS = 1
+};
+
+
+/**
+ * Enumeration of possible events that may trigger
+ * KYC requirements.
+ */
+enum TALER_KYCLOGIC_KycTriggerEvent
+{
+
+  /**
+   * Customer withdraws coins.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW = 0,
+
+  /**
+   * Merchant deposits coins.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT = 1,
+
+  /**
+   * Wallet receives P2P payment.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE = 2,
+
+  /**
+   * Wallet balance exceeds threshold.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE = 3,
+
+  /**
+   * Reserve is being closed by force.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE = 4,
+
+  /**
+   * Customer withdraws coins via age-withdraw.
+   */
+  TALER_KYCLOGIC_KYC_TRIGGER_AGE_WITHDRAW = 5,
+};
+
+
+/**
+ * Parse KYC trigger string value from a string
+ * into enumeration value.
+ *
+ * @param trigger_s string to parse
+ * @param[out] trigger set to the value found
+ * @return #GNUNET_OK on success, #GNUNET_NO if option
+ *         does not exist, #GNUNET_SYSERR if option is
+ *         malformed
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_trigger_from_string (
+  const char *trigger_s,
+  enum TALER_KYCLOGIC_KycTriggerEvent *trigger);
+
+
+/**
+ * Convert KYC trigger value to human-readable string.
+ *
+ * @param trigger value to convert
+ * @return human-readable representation of the @a trigger
+ */
+const char *
+TALER_KYCLOGIC_kyc_trigger2s (enum TALER_KYCLOGIC_KycTriggerEvent trigger);
+
+
+/**
+ * Parse user type string into enumeration value.
+ *
+ * @param ut_s string to parse
+ * @param[out] ut set to the value found
+ * @return #GNUNET_OK on success, #GNUNET_NO if option
+ *         does not exist, #GNUNET_SYSERR if option is
+ *         malformed
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_user_type_from_string (const char *ut_s,
+                                          enum TALER_KYCLOGIC_KycUserType *ut);
+
+
+/**
+ * Convert KYC user type to human-readable string.
+ *
+ * @param ut value to convert
+ * @return human-readable representation of the @a ut
+ */
+const char *
+TALER_KYCLOGIC_kyc_user_type2s (enum TALER_KYCLOGIC_KycUserType ut);
+
+
+/**
+ * Initialize KYC subsystem. Loads the KYC configuration.
+ *
+ * @param cfg configuration to parse
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+
+/**
+ * Shut down the KYC subsystem.
+ */
+void
+TALER_KYCLOGIC_kyc_done (void);
+
+
+/**
+ * Function called to iterate over KYC-relevant
+ * transaction amounts for a particular time range.
+ * Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param cls closure, identifies the event type and
+ *        account to iterate over events for
+ * @param limit maximum time-range for which events
+ *        should be fetched (timestamp in the past)
+ * @param cb function to call on each event found,
+ *        events must be returned in reverse chronological
+ *        order
+ * @param cb_cls closure for @a cb
+ */
+typedef void
+(*TALER_KYCLOGIC_KycAmountIterator)(void *cls,
+                                    struct GNUNET_TIME_Absolute limit,
+                                    TALER_EXCHANGEDB_KycAmountCallback cb,
+                                    void *cb_cls);
+
+
+/**
+ * Function called to iterate over KYC-relevant
+ * transaction thresholds amounts.
+ *
+ * @param cls closure, identifies the event type and
+ *        account to iterate over events for
+ * @param threshold a relevant threshold amount
+ */
+typedef void
+(*TALER_KYCLOGIC_KycThresholdIterator)(void *cls,
+                                       const struct TALER_Amount *threshold);
+
+
+/**
+ * Call us on KYC processes satisfied for the given
+ * account. Must match the ``select_satisfied_kyc_processes`` of the exchange database plugin.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param h_payto account identifier
+ * @param spc function to call for each satisfied KYC process
+ * @param spc_cls closure for @a spc
+ * @return transaction status code
+ */
+typedef enum GNUNET_DB_QueryStatus
+(*TALER_KYCLOGIC_KycSatisfiedIterator)(
+  void *cls,
+  const struct TALER_PaytoHashP *h_payto,
+  TALER_EXCHANGEDB_SatisfiedProviderCallback spc,
+  void *spc_cls);
+
+
+/**
+ * Check if KYC is provided for a particular operation. Returns the set of checks that still need to be satisfied.
+ *
+ * Called within a database transaction, so must
+ * not start a new one.
+ *
+ * @param event what type of operation is triggering the
+ *         test if KYC is required
+ * @param h_payto account the event is about
+ * @param ki callback that returns list of already
+ *    satisfied KYC checks, implemented by ``select_satisfied_kyc_processes`` of the exchangedb
+ * @param ki_cls closure for @a ki
+ * @param ai callback offered to inquire about historic
+ *         amounts involved in this type of operation
+ *         at the given account
+ * @param ai_cls closure for @a ai
+ * @param[out] required set to NULL if no check is needed,
+ *   otherwise space-separated list of required checks
+ * @return transaction status
+ */
+enum GNUNET_DB_QueryStatus
+TALER_KYCLOGIC_kyc_test_required (enum TALER_KYCLOGIC_KycTriggerEvent event,
+                                  const struct TALER_PaytoHashP *h_payto,
+                                  TALER_KYCLOGIC_KycSatisfiedIterator ki,
+                                  void *ki_cls,
+                                  TALER_KYCLOGIC_KycAmountIterator ai,
+                                  void *ai_cls,
+                                  char **required);
+
+
+/**
+ * Check if the @a requirements are now satsified for
+ * @a h_payto account.
+ *
+ * @param[in,out] requirements space-spearated list of requirements,
+ *       already satisfied requirements are removed from the list
+ * @param h_payto hash over the account
+ * @param[out] kyc_details if satisfied, set to what kind of
+ *             KYC information was collected
+ * @param ki iterator over satisfied providers
+ * @param ki_cls closure for @a ki
+ * @param[out] satisfied set to true if the KYC check was satisfied
+ * @return transaction status (from @a ki)
+ */
+enum GNUNET_DB_QueryStatus
+TALER_KYCLOGIC_check_satisfied (char **requirements,
+                                const struct TALER_PaytoHashP *h_payto,
+                                json_t **kyc_details,
+                                TALER_KYCLOGIC_KycSatisfiedIterator ki,
+                                void *ki_cls,
+                                bool *satisfied);
+
+
+/**
+ * Iterate over all thresholds that are applicable
+ * to a particular type of @a event
+ *
+ * @param event thresholds to look up
+ * @param it function to call on each
+ * @param it_cls closure for @a it
+ */
+void
+TALER_KYCLOGIC_kyc_iterate_thresholds (
+  enum TALER_KYCLOGIC_KycTriggerEvent event,
+  TALER_KYCLOGIC_KycThresholdIterator it,
+  void *it_cls);
+
+
+/**
+ * Function called with the provider details and
+ * associated plugin closures for matching logics.
+ *
+ * @param cls closure
+ * @param pd provider details of a matching logic
+ * @param plugin_cls closure of the plugin
+ * @return #GNUNET_OK to continue to iterate
+ */
+typedef enum GNUNET_GenericReturnValue
+(*TALER_KYCLOGIC_DetailsCallback)(
+  void *cls,
+  const struct TALER_KYCLOGIC_ProviderDetails *pd,
+  void *plugin_cls);
+
+
+/**
+ * Call @a cb for all logics with name @a logic_name,
+ * providing the plugin closure and the @a pd configurations.
+ *
+ * @param logic_name name of the logic to match
+ * @param cb function to call on matching results
+ * @param cb_cls closure for @a cb
+ */
+void
+TALER_KYCLOGIC_kyc_get_details (
+  const char *logic_name,
+  TALER_KYCLOGIC_DetailsCallback cb,
+  void *cb_cls);
+
+
+/**
+ * Check if a given @a check_name is a legal name (properly
+ * configured) and can be satisfied in principle.
+ *
+ * @param check_name name of the check to see if it is configured
+ * @return #GNUNET_OK if the check can be satisfied,
+ *         #GNUNET_NO if the check can never be satisfied,
+ *         #GNUNET_SYSERR if the type of the check is unknown
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_check_satisfiable (
+  const char *check_name);
+
+
+/**
+ * Return list of all KYC checks that are possible.
+ *
+ * @return JSON array of strings with the allowed KYC checks
+ */
+json_t *
+TALER_KYCLOGIC_get_satisfiable (void);
+
+
+/**
+ * Obtain the provider logic for a given set of @a requirements.
+ *
+ * @param requirements space-separated list of required checks
+ * @param ut type of the entity performing the check
+ * @param[out] plugin set to the KYC logic API
+ * @param[out] pd set to the specific operation context
+ * @param[out] configuration_section set to the name of the KYC logic configuration section * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_requirements_to_logic (const char *requirements,
+                                      enum TALER_KYCLOGIC_KycUserType ut,
+                                      struct TALER_KYCLOGIC_Plugin **plugin,
+                                      struct TALER_KYCLOGIC_ProviderDetails **pd,
+                                      const char **configuration_section);
+
+
+/**
+ * Obtain the provider logic for a given @a name.
+ *
+ * @param name name of the logic or provider section
+ * @param[out] plugin set to the KYC logic API
+ * @param[out] pd set to the specific operation context
+ * @param[out] configuration_section set to the name of the KYC logic configuration section
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_lookup_logic (const char *name,
+                             struct TALER_KYCLOGIC_Plugin **plugin,
+                             struct TALER_KYCLOGIC_ProviderDetails **pd,
+                             const char **configuration_section);
+
+
+/**
+ * Obtain array of KYC checks provided by the provider
+ * configured in @a section_name.
+ *
+ * @param section_name configuration section name
+ * @param[out] num_checks set to the length of the array
+ * @param[out] provided_checks set to an array with the
+ *   names of the checks provided by this KYC provider
+ */
+void
+TALER_KYCLOGIC_lookup_checks (const char *section_name,
+                              unsigned int *num_checks,
+                              char ***provided_checks);
+
+#endif
diff --git a/src/include/taler_kyclogic_plugin.h b/src/include/taler_kyclogic_plugin.h
new file mode 100644
index 000000000..a9a4dd97a
--- /dev/null
+++ b/src/include/taler_kyclogic_plugin.h
@@ -0,0 +1,384 @@
+/*
+  This file is part of TALER
+  Copyright (C) 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/>
+*/
+/**
+ * @file include/taler_kyclogic_plugin.h
+ * @brief KYC API specific logic C interface
+ * @author Christian Grothoff
+ */
+#ifndef TALER_KYCLOGIC_PLUGIN_H
+#define TALER_KYCLOGIC_PLUGIN_H
+
+#include <jansson.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_db_lib.h>
+#include "taler_util.h"
+
+
+/**
+ * Possible states of a KYC check.
+ */
+enum TALER_KYCLOGIC_KycStatus
+{
+
+  /**
+   * The provider has passed the customer.
+   */
+  TALER_KYCLOGIC_STATUS_SUCCESS = 0,
+
+  /**
+   * Something to do with the user (bit!).
+   */
+  TALER_KYCLOGIC_STATUS_USER = 1,
+
+  /**
+   * Something to do with the provider (bit!).
+   */
+  TALER_KYCLOGIC_STATUS_PROVIDER = 2,
+
+  /**
+   * The interaction ended in definitive failure.
+   * (kind of with both parties).
+   */
+  TALER_KYCLOGIC_STATUS_FAILED
+    = TALER_KYCLOGIC_STATUS_USER
+      | TALER_KYCLOGIC_STATUS_PROVIDER,
+
+  /**
+   * The interaction is still ongoing.
+   */
+  TALER_KYCLOGIC_STATUS_PENDING = 4,
+
+  /**
+   * One of the parties hat a temporary failure.
+   */
+  TALER_KYCLOGIC_STATUS_ABORTED = 8,
+
+  /**
+   * The interaction with the user is ongoing.
+   */
+  TALER_KYCLOGIC_STATUS_USER_PENDING
+    = TALER_KYCLOGIC_STATUS_USER
+      | TALER_KYCLOGIC_STATUS_PENDING,
+
+  /**
+   * The provider is still checking.
+   */
+  TALER_KYCLOGIC_STATUS_PROVIDER_PENDING
+    = TALER_KYCLOGIC_STATUS_PROVIDER
+      | TALER_KYCLOGIC_STATUS_PENDING,
+
+  /**
+   * The user aborted the check (possibly recoverable)
+   * or made some other type of (recoverable) mistake.
+   */
+  TALER_KYCLOGIC_STATUS_USER_ABORTED
+    = TALER_KYCLOGIC_STATUS_USER
+      | TALER_KYCLOGIC_STATUS_ABORTED,
+
+  /**
+   * The provider had an (internal) failure.
+   */
+  TALER_KYCLOGIC_STATUS_PROVIDER_FAILED
+    = TALER_KYCLOGIC_STATUS_PROVIDER
+      | TALER_KYCLOGIC_STATUS_ABORTED,
+
+  /**
+   * Return code set to not update the KYC status
+   * at all.
+   */
+  TALER_KYCLOGIC_STATUS_KEEP = 16,
+
+  /**
+   * We had an internal logic failure.
+   */
+  TALER_KYCLOGIC_STATUS_INTERNAL_ERROR = 32
+
+};
+
+
+/**
+ * Plugin-internal specification of the configuration
+ * of the plugin for a given KYC provider.
+ */
+struct TALER_KYCLOGIC_ProviderDetails;
+
+/**
+ * Handle for an initiation operation.
+ */
+struct TALER_KYCLOGIC_InitiateHandle;
+
+/**
+ * Handle for an KYC proof operation.
+ */
+struct TALER_KYCLOGIC_ProofHandle;
+
+/**
+ * Handle for an KYC Web hook operation.
+ */
+struct TALER_KYCLOGIC_WebhookHandle;
+
+
+/**
+ * Function called with the result of a KYC initiation
+ * operation.
+ *
+ * @param cls closure
+ * @param ec #TALER_EC_NONE on success
+ * @param redirect_url set to where to redirect the user on success, NULL on failure
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param error_msg_hint set to additional details to return to user, NULL on success
+ */
+typedef void
+(*TALER_KYCLOGIC_InitiateCallback)(
+  void *cls,
+  enum TALER_ErrorCode ec,
+  const char *redirect_url,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  const char *error_msg_hint);
+
+
+/**
+ * Function called with the result of a proof check operation.
+ *
+ * Note that the "decref" for the @a response
+ * will be done by the callee and MUST NOT be done by the plugin.
+ *
+ * @param cls closure
+ * @param status KYC status
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param attributes user attributes returned by the provider
+ * @param expiration until when is the KYC check valid
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ */
+typedef void
+(*TALER_KYCLOGIC_ProofCallback)(
+  void *cls,
+  enum TALER_KYCLOGIC_KycStatus status,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response);
+
+
+/**
+ * Function called with the result of a webhook operation.
+ *
+ * Note that the "decref" for the @a response will be done by the callee and
+ * MUST NOT be done by the plugin!
+ *
+ * @param cls closure
+ * @param process_row legitimization process the webhook was about
+ * @param account_id account the webhook was about
+ * @param provider_section name of the configuration section of the logic that was run
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param status KYC status
+ * @param expiration until when is the KYC check valid
+ * @param attributes user attributes returned by the provider
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ */
+typedef void
+(*TALER_KYCLOGIC_WebhookCallback)(
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *account_id,
+  const char *provider_section,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  enum TALER_KYCLOGIC_KycStatus status,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response);
+
+
+/**
+ * Function the plugin can use to lookup an @a h_payto by @a
+ * provider_legitimization_id.  Must match the `kyc_provider_account_lookup`
+ * of the exchange's database plugin.
+ *
+ * @param cls closure
+ * @param provider_section
+ * @param provider_legitimization_id legi to look up
+ * @param[out] h_payto where to write the result
+ * @param[out] process_row where to write the row of the entry
+ * @return database transaction status
+ */
+typedef enum GNUNET_DB_QueryStatus
+(*TALER_KYCLOGIC_ProviderLookupCallback)(
+  void *cls,
+  const char *provider_section,
+  const char *provider_legitimization_id,
+  struct TALER_PaytoHashP *h_payto,
+  uint64_t *process_row);
+
+
+/**
+ * @brief The plugin API, returned from the plugin's "init" function.
+ * The argument given to "init" is simply a configuration handle.
+ */
+struct TALER_KYCLOGIC_Plugin
+{
+
+  /**
+   * Closure for all callbacks.
+   */
+  void *cls;
+
+  /**
+   * Name of the library which generated this plugin.  Set by the
+   * plugin loader.
+   */
+  char *library_name;
+
+  /**
+   * Name of the logic, for webhook matching. Set by the
+   * plugin loader.
+   */
+  char *name;
+
+  /**
+   * Load the configuration of the KYC provider.
+   *
+   * @param cls closure
+   * @param provider_section_name configuration section to parse
+   * @return NULL if configuration is invalid
+   */
+  struct TALER_KYCLOGIC_ProviderDetails *
+  (*load_configuration)(void *cls,
+                        const char *provider_section_name);
+
+  /**
+   * Release configuration resources previously loaded
+   *
+   * @param[in] pd configuration to release
+   */
+  void
+  (*unload_configuration)(struct TALER_KYCLOGIC_ProviderDetails *pd);
+
+
+  /**
+   * Initiate KYC check.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param pd provider configuration details
+   * @param account_id which account to trigger process for
+   * @param process_row unique ID for the legitimization process
+   * @param cb function to call with the result
+   * @param cb_cls closure for @a cb
+   * @return handle to cancel operation early
+   */
+  struct TALER_KYCLOGIC_InitiateHandle *
+  (*initiate)(void *cls,
+              const struct TALER_KYCLOGIC_ProviderDetails *pd,
+              const struct TALER_PaytoHashP *account_id,
+              uint64_t process_row,
+              TALER_KYCLOGIC_InitiateCallback cb,
+              void *cb_cls);
+
+
+  /**
+   * Cancel KYC check initiation.
+   *
+   * @param[in] ih handle of operation to cancel
+   */
+  void
+  (*initiate_cancel) (struct TALER_KYCLOGIC_InitiateHandle *ih);
+
+
+  /**
+   * Check KYC status and return status to human.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param pd provider configuration details
+   * @param connection MHD connection object (for HTTP headers)
+   * @param account_id which account to trigger process for
+   * @param process_row row in the legitimization processes table the legitimization is for
+   * @param provider_user_id user ID (or NULL) the proof is for
+   * @param provider_legitimization_id legitimization ID the proof is for
+   * @param cb function to call with the result
+   * @param cb_cls closure for @a cb
+   * @return handle to cancel operation early
+  */
+  struct TALER_KYCLOGIC_ProofHandle *
+  (*proof)(void *cls,
+           const struct TALER_KYCLOGIC_ProviderDetails *pd,
+           struct MHD_Connection *connection,
+           const struct TALER_PaytoHashP *account_id,
+           uint64_t process_row,
+           const char *provider_user_id,
+           const char *provider_legitimization_id,
+           TALER_KYCLOGIC_ProofCallback cb,
+           void *cb_cls);
+
+
+  /**
+   * Cancel KYC proof.
+   *
+   * @param[in] ph handle of operation to cancel
+   */
+  void
+  (*proof_cancel) (struct TALER_KYCLOGIC_ProofHandle *ph);
+
+
+  /**
+   * Check KYC status and return result for Webhook.
+   *
+   * @param cls the @e cls of this struct with the plugin-specific state
+   * @param pd provider configuration details
+   * @param plc callback to lookup accounts with
+   * @param plc_cls closure for @a plc
+   * @param http_method HTTP method used for the webhook
+   * @param url_path rest of the URL after `/kyc-webhook/$LOGIC/`
+   * @param connection MHD connection object (for HTTP headers)
+   * @param body_size number of bytes in @a body
+   * @param body HTTP request body
+   * @param cb function to call with the result
+   * @param cb_cls closure for @a cb
+   * @return handle to cancel operation early
+   */
+  struct TALER_KYCLOGIC_WebhookHandle *
+  (*webhook)(void *cls,
+             const struct TALER_KYCLOGIC_ProviderDetails *pd,
+             TALER_KYCLOGIC_ProviderLookupCallback plc,
+             void *plc_cls,
+             const char *http_method,
+             const char *const url_path[],
+             struct MHD_Connection *connection,
+             const json_t *upload,
+             TALER_KYCLOGIC_WebhookCallback cb,
+             void *cb_cls);
+
+
+  /**
+   * Cancel KYC webhook execution.
+   *
+   * @param[in] wh handle of operation to cancel
+   */
+  void
+  (*webhook_cancel) (struct TALER_KYCLOGIC_WebhookHandle *wh);
+
+};
+
+
+#endif /* _TALER_KYCLOGIC_PLUGIN_H */
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h
index b64231352..57d041758 100644
--- a/src/include/taler_mhd_lib.h
+++ b/src/include/taler_mhd_lib.h
@@ -27,6 +27,7 @@
 #include <jansson.h>
 #include <microhttpd.h>
 #include "taler_error_codes.h"
+#include "taler_util.h"
 #include <gnunet/gnunet_mhd_compat.h>
 
 
@@ -172,8 +173,8 @@ TALER_MHD_reply_json_pack (struct MHD_Connection *connection,
  * @return MHD result code
  */
 #define TALER_MHD_REPLY_JSON_PACK(connection,response_code,...) \
-  TALER_MHD_reply_json_steal (connection, GNUNET_JSON_PACK (__VA_ARGS__), \
-                              response_code)
+        TALER_MHD_reply_json_steal (connection, GNUNET_JSON_PACK (__VA_ARGS__), \
+                                    response_code)
 
 
 /**
@@ -258,7 +259,7 @@ TALER_MHD_make_json_pack (const char *fmt,
  * @return MHD response object
  */
 #define TALER_MHD_MAKE_JSON_PACK(...) \
-  TALER_MHD_make_json_steal (GNUNET_JSON_PACK (__VA_ARGS__))
+        TALER_MHD_make_json_steal (GNUNET_JSON_PACK (__VA_ARGS__))
 
 
 /**
@@ -269,8 +270,8 @@ TALER_MHD_make_json_pack (const char *fmt,
  * @return packer array entries (two!)
  */
 #define TALER_MHD_PACK_EC(ec) \
-  GNUNET_JSON_pack_uint64 ("code", ec), \
-  GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec))
+        GNUNET_JSON_pack_uint64 ("code", ec), \
+        GNUNET_JSON_pack_string ("hint", TALER_ErrorCode_get_hint (ec))
 
 /**
  * Create a response indicating an internal error.
@@ -437,7 +438,201 @@ TALER_MHD_parse_json_array (struct MHD_Connection *connection,
 
 
 /**
- * Extract fixed-size base32crockford encoded data from request.
+ * Extract optional "timeout_ms" argument from request.
+ *
+ * @param connection the MHD connection
+ * @param[out] expiration set to #GNUNET_TIME_UNIT_ZERO_ABS if there was no timeout,
+ *         the current time plus the value given under "timeout_ms" otherwise
+ * @return #GNUNET_OK on success, #GNUNET_NO if an
+ *     error was returned on @a connection (caller should return #MHD_YES) and
+ *     #GNUNET_SYSERR if we failed to return an error (caller should return #MHD_NO)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_timeout (struct MHD_Connection *connection,
+                                     struct GNUNET_TIME_Absolute *expiration);
+
+
+/**
+ * Extract optional "timeout_ms" argument from request.
+ * Macro that *returns* #MHD_YES/#MHD_NO if the "timeout_ms"
+ * argument existed but failed to parse.
+ *
+ * @param connection the MHD connection
+ * @param[out] expiration set to #GNUNET_TIME_UNIT_ZERO_ABS if there was no timeout,
+ *         the current time plus the value given under "timeout_ms" otherwise
+ */
+#define TALER_MHD_parse_request_timeout(connection,expiration) \
+        do {                                                         \
+          switch (TALER_MHD_parse_request_arg_timeout (connection,   \
+                                                       expiration))  \
+          {                      \
+          case GNUNET_SYSERR:    \
+            GNUNET_break (0);    \
+            return MHD_NO;       \
+          case GNUNET_NO:        \
+            GNUNET_break_op (0); \
+          case GNUNET_OK:        \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Extract optional numeric limit argument from request.
+ *
+ * @param connection the MHD connection
+ * @param name name of the query parameter
+ * @param[out] off set to the offset, unchanged if the
+ *             option was not given
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO if an error was returned on @a connection (caller should return #MHD_YES) and
+ *     #GNUNET_SYSERR if we failed to return an error (caller should return #MHD_NO)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_number (struct MHD_Connection *connection,
+                                    const char *name,
+                                    uint64_t *off);
+
+
+/**
+ * Extract optional numeric argument from request.
+ * Macro that *returns* #MHD_YES/#MHD_NO if the
+ * requested argument existed but failed to parse.
+ *
+ * @param connection the MHD connection
+ * @param name name of the argument to parse
+ * @param[out] off set to the given numeric value,
+ *    unchanged if value was not specified
+ */
+#define TALER_MHD_parse_request_number(connection,name,off)  \
+        do {                                                         \
+          switch (TALER_MHD_parse_request_arg_number (connection,   \
+                                                      name, \
+                                                      off))  \
+          {                      \
+          case GNUNET_SYSERR:    \
+            GNUNET_break (0);    \
+            return MHD_NO;       \
+          case GNUNET_NO:        \
+            GNUNET_break_op (0); \
+          case GNUNET_OK:        \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Extract optional signed numeric limit argument from request.
+ *
+ * @param connection the MHD connection
+ * @param name name of the query parameter
+ * @param[out] val set to the signed value, unchanged if the
+ *             option was not given
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO if an error was returned on @a connection (caller should return #MHD_YES) and
+ *     #GNUNET_SYSERR if we failed to return an error (caller should return #MHD_NO)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_snumber (struct MHD_Connection *connection,
+                                     const char *name,
+                                     int64_t *val);
+
+
+/**
+ * Extract optional numeric argument from request.
+ * Macro that *returns* #MHD_YES/#MHD_NO if the
+ * requested argument existed but failed to parse.
+ *
+ * @param connection the MHD connection
+ * @param name name of the argument to parse
+ * @param[out] val set to the given numeric value,
+ *    unchanged if value was not specified
+ */
+#define TALER_MHD_parse_request_snumber(connection,name,val)  \
+        do {                                                         \
+          switch (TALER_MHD_parse_request_arg_snumber (connection,   \
+                                                       name, \
+                                                       val))  \
+          {                      \
+          case GNUNET_SYSERR:    \
+            GNUNET_break (0);    \
+            return MHD_NO;       \
+          case GNUNET_NO:        \
+            GNUNET_break_op (0); \
+          case GNUNET_OK:        \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Extract optional amount argument from request.
+ *
+ * @param connection the MHD connection
+ * @param name name of the query parameter
+ * @param[out] val set to the amount, unchanged if the
+ *             option was not given
+ * @return #GNUNET_OK on success,
+ *         #GNUNET_NO if an error was returned on @a connection (caller should return #MHD_YES) and
+ *     #GNUNET_SYSERR if we failed to return an error (caller should return #MHD_NO)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_amount (struct MHD_Connection *connection,
+                                    const char *name,
+                                    struct TALER_Amount *val);
+
+
+/**
+ * Extract optional amount argument from request.
+ * Macro that *returns* #MHD_YES/#MHD_NO if the
+ * requested argument existed but failed to parse.
+ *
+ * @param connection the MHD connection
+ * @param name name of the argument to parse
+ * @param[out] val set to the given amount,
+ *    unchanged if value was not specified
+ */
+#define TALER_MHD_parse_request_amount(connection,name,val)  \
+        do {                                                         \
+          switch (TALER_MHD_parse_request_arg_amount (connection,   \
+                                                      name, \
+                                                      val))  \
+          {                      \
+          case GNUNET_SYSERR:    \
+            GNUNET_break (0);    \
+            return MHD_NO;       \
+          case GNUNET_NO:        \
+            GNUNET_break_op (0); \
+          case GNUNET_OK:        \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Determines which of the given choices is preferred
+ * by the client. Parses an HTTP header such as
+ * "Accept:" or "Language:" to find entries matching
+ * the list of strings given in the variadic argument
+ * list. Returns the index of the preferred choice.
+ *
+ * @param connection HTTP request handle
+ * @param header type of HTTP header to evaluate
+ * @param ... NULL-terminated list of choices to
+ *        check for in the header
+ * @return -1 if none of the given choices is in
+ *         the header, -2 if the header is missing,
+ *         otherwise index of preferred choice in
+ *         the varargs list
+ */
+int
+TALER_MHD_check_accept (struct MHD_Connection *connection,
+                        const char *header,
+                        ...);
+
+
+/**
+ * Extract fixed-size base32crockford encoded data from request argument.
  *
  * Queues an error response to the connection if the parameter is missing or
  * invalid.
@@ -446,16 +641,195 @@ TALER_MHD_parse_json_array (struct MHD_Connection *connection,
  * @param param_name the name of the parameter with the key
  * @param[out] out_data pointer to store the result
  * @param out_size expected size of @a out_data
+ * @param[out] present set to true if argument was found
  * @return
  *   #GNUNET_YES if the the argument is present
- *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_NO if the argument is malformed
  *   #GNUNET_SYSERR on internal error (error response could not be sent)
  */
 enum GNUNET_GenericReturnValue
 TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
                                   const char *param_name,
                                   void *out_data,
-                                  size_t out_size);
+                                  size_t out_size,
+                                  bool *present);
+
+
+/**
+ * Extract fixed-size base32crockford encoded data from request header.
+ *
+ * Queues an error response to the connection if the parameter is missing or
+ * invalid.
+ *
+ * @param connection the MHD connection
+ * @param header_name the name of the HTTP header with the value
+ * @param[out] out_data pointer to store the result
+ * @param out_size expected size of @a out_data
+ * @param[out] present set to true if argument was found
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_header_data (struct MHD_Connection *connection,
+                                     const char *header_name,
+                                     void *out_data,
+                                     size_t out_size,
+                                     bool *present);
+
+/**
+ * Extract fixed-size base32crockford encoded data from request.
+ *
+ * @param connection the MHD connection
+ * @param name the name of the parameter with the key
+ * @param[out] val pointer to store the result, type must determine size
+ * @param[in,out] required pass true to require presence of this argument; if 'false'
+ *                         set to true if the argument was found
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+#define TALER_MHD_parse_request_arg_auto(connection,name,val,required) \
+        do {                                                                 \
+          bool p;                                                            \
+          switch (TALER_MHD_parse_request_arg_data (connection, name,        \
+                                                    val, sizeof (*val), &p)) \
+          {                      \
+          case GNUNET_SYSERR:    \
+            GNUNET_break (0);    \
+            return MHD_NO;       \
+          case GNUNET_NO:        \
+            GNUNET_break_op (0); \
+            return MHD_YES;      \
+          case GNUNET_OK:        \
+            if (required & (! p)) \
+            return TALER_MHD_reply_with_error (   \
+              connection,                         \
+              MHD_HTTP_BAD_REQUEST,               \
+              TALER_EC_GENERIC_PARAMETER_MISSING, \
+              name);                              \
+            required = p;                         \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Extract required fixed-size base32crockford encoded data from request.
+ *
+ * @param connection the MHD connection
+ * @param name the name of the parameter with the key
+ * @param[out] val pointer to store the result, type must determine size
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+#define TALER_MHD_parse_request_arg_auto_t(connection,name,val) \
+        do {                                                          \
+          bool b = true;                                              \
+          TALER_MHD_parse_request_arg_auto (connection,name,val,b);   \
+        } while (0)
+
+/**
+ * Extract fixed-size base32crockford encoded data from request.
+ *
+ * @param connection the MHD connection
+ * @param name the name of the header with the key
+ * @param[out] val pointer to store the result, type must determine size
+ * @param[in,out] required pass true to require presence of this argument; if 'false'
+ *                         set to true if the argument was found
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+#define TALER_MHD_parse_request_header_auto(connection,name,val,required) \
+        do {                                                                    \
+          bool p;                                                               \
+          switch (TALER_MHD_parse_request_header_data (connection, name,        \
+                                                       val, sizeof (*val), &p)) \
+          {                       \
+          case GNUNET_SYSERR:     \
+            GNUNET_break (0);     \
+            return MHD_NO;        \
+          case GNUNET_NO:         \
+            GNUNET_break_op (0);  \
+            return MHD_YES;       \
+          case GNUNET_OK:         \
+            if (required & (! p)) \
+            return TALER_MHD_reply_with_error (   \
+              connection,                         \
+              MHD_HTTP_BAD_REQUEST,               \
+              TALER_EC_GENERIC_PARAMETER_MISSING, \
+              name);                              \
+            required = p;                         \
+            break;               \
+          }                      \
+        } while (0)
+
+
+/**
+ * Extract required fixed-size base32crockford encoded data from request.
+ *
+ * @param connection the MHD connection
+ * @param name the name of the header with the key
+ * @param[out] val pointer to store the result, type must determine size
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+#define TALER_MHD_parse_request_header_auto_t(connection,name,val) \
+        do {                                                             \
+          bool b = true;                                                 \
+          TALER_MHD_parse_request_header_auto (connection,name,val,b);   \
+        } while (0)
+
+
+/**
+ * Check that the 'Content-Length' header is giving
+ * a length below @a max_len. If not, return an
+ * appropriate error response and return the
+ * correct #MHD_YES/#MHD_NO value from this function.
+ *
+ * @param connection the MHD connection
+ * @param max_len maximum allowed content length
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+enum GNUNET_GenericReturnValue
+TALER_MHD_check_content_length_ (struct MHD_Connection *connection,
+                                 unsigned long long max_len);
+
+
+/**
+ * Check that the 'Content-Length' header is giving
+ * a length below @a max_len. If not, return an
+ * appropriate error response and return the
+ * correct #MHD_YES/#MHD_NO value from this function.
+ *
+ * @param connection the MHD connection
+ * @param max_len maximum allowed content length
+ */
+#define TALER_MHD_check_content_length(connection,max_len)         \
+        do {                                                             \
+          switch (TALER_MHD_check_content_length_ (connection, max_len)) \
+          {                       \
+          case GNUNET_SYSERR:     \
+            GNUNET_break (0);     \
+            return MHD_NO;        \
+          case GNUNET_NO:         \
+            GNUNET_break_op (0);  \
+            return MHD_YES;       \
+          case GNUNET_OK:         \
+            break;                \
+          }                       \
+        } while (0)
 
 
 /**
diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h
index fdc17ca55..f45de61d9 100644
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@ -19,37 +19,50 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Florian Dold
  * @author Christian Grothoff
+ * @author Özgür Kesim
  */
 #ifndef TALER_PQ_LIB_H_
 #define TALER_PQ_LIB_H_
 
 #include <libpq-fe.h>
 #include <jansson.h>
+#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_pq_lib.h>
 #include "taler_util.h"
 
 /**
- * Generate query parameter for a currency, consisting of the three
- * components "value", "fraction" and "currency" in this order. The
- * types must be a 64-bit integer, 32-bit integer and a
- * #TALER_CURRENCY_LEN-sized BLOB/VARCHAR respectively.
+ * API version. Bump on every change.
+ */
+#define TALER_PQ_VERSION 0x09040000
+
+/**
+ * Generate query parameter (as record tuple) for an amount, consisting
+ * of the two components "value" and "fraction" in this order. The
+ * types must be a 64-bit integer and a 32-bit integer
+ * respectively. The currency is dropped.
  *
- * @param x pointer to the query parameter to pass
+ * @param db The database context for OID lookup
+ * @param amount pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x);
+TALER_PQ_query_param_amount (
+  const struct GNUNET_PQ_Context *db,
+  const struct TALER_Amount *amount);
 
 
 /**
- * Generate query parameter for an amount, consisting of the two
- * components "value" and "fraction" in this order. The
- * types must be a 64-bit integer and a 32-bit integer
- * respectively. The currency is dropped.
+ * Generate query parameter (as record tuple) for an amount, consisting of the
+ * three components "value", "fraction" and "currency" in this order. The
+ * types must be a 64-bit integer, a 32-bit integer and a TEXT field of 12
+ * characters respectively.
  *
- * @param x pointer to the query parameter to pass
+ * @param db The database context for OID lookup
+ * @param amount pointer to the query parameter to pass
  */
 struct GNUNET_PQ_QueryParam
-TALER_PQ_query_param_amount (const struct TALER_Amount *x);
+TALER_PQ_query_param_amount_with_currency (
+  const struct GNUNET_PQ_Context *db,
+  const struct TALER_Amount *amount);
 
 
 /**
@@ -127,21 +140,115 @@ TALER_PQ_query_param_json (const json_t *x);
 
 
 /**
- * Currency amount expected.
+ * Generate query parameter for an array of blinded denomination signatures
+ *
+ * @param num number of elements in @e denom_sigs
+ * @param denom_sigs array of blinded denomination signatures
+ * @param db context for the db-connection
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_blinded_denom_sig (
+  size_t num,
+  const struct TALER_BlindedDenominationSignature *denom_sigs,
+  struct GNUNET_PQ_Context *db
+  );
+
+
+/**
+ * Generate query parameter for an array of blinded hashes of coin envelopes
+ *
+ * @param num number of elements in @e denom_sigs
+ * @param coin_evs array of blinded hashes of coin envelopes
+ * @param db context for the db-connection
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_blinded_coin_hash (
+  size_t num,
+  const struct TALER_BlindedCoinHashP *coin_evs,
+  struct GNUNET_PQ_Context *db);
+
+
+/**
+ * Generate query parameter for an array of GNUNET_HashCode
+ *
+ * @param num number of elements in @e hash_codes
+ * @param hashes array of GNUNET_HashCode
+ * @param db context for the db-connection
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_hash_code (
+  size_t num,
+  const struct GNUNET_HashCode *hashes,
+  struct GNUNET_PQ_Context *db);
+
+
+/**
+ * Generate query parameter for an array of amounts
+ *
+ * @param num of elements in @e amounts
+ * @param amounts continuous array of amounts
+ * @param db context for db-connection, needed for OID-lookup
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_amount (
+  size_t num,
+  const struct TALER_Amount *amounts,
+  struct GNUNET_PQ_Context *db);
+
+
+/**
+ * Generate query parameter for an array of amounts
+ *
+ * @param num of elements in @e amounts
+ * @param amounts continuous array of amounts
+ * @param db context for db-connection, needed for OID-lookup
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_amount_with_currency (
+  size_t num,
+  const struct TALER_Amount *amounts,
+  struct GNUNET_PQ_Context *db);
+
+
+/**
+ * Generate query parameter for a blind sign public key of variable size.
+ *
+ * @param public_key pointer to the query parameter to pass
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_blind_sign_pub (
+  const struct GNUNET_CRYPTO_BlindSignPublicKey *public_key);
+
+
+/**
+ * Generate query parameter for a blind sign private key of variable size.
+ *
+ * @param private_key pointer to the query parameter to pass
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_blind_sign_priv (
+  const struct GNUNET_CRYPTO_BlindSignPrivateKey *private_key);
+
+
+/**
+ * Currency amount expected, from a record-field of (DB)
+ * taler_amount_with_currency type. The currency must be stored in the
+ * database when using this function.
  *
  * @param name name of the field in the table
- * @param currency currency to use for @a amount
  * @param[out] amount where to store the result
  * @return array entry for the result specification to use
  */
 struct GNUNET_PQ_ResultSpec
-TALER_PQ_result_spec_amount_nbo (const char *name,
-                                 const char *currency,
-                                 struct TALER_AmountNBO *amount);
+TALER_PQ_result_spec_amount_with_currency (
+  const char *name,
+  struct TALER_Amount *amount);
 
 
 /**
- * Currency amount expected.
+ * Currency amount expected, from a record-field of (DB) taler_amount type.
+ * The currency is NOT stored in the database when using this function, but
+ * instead passed as the @a currency argument.
  *
  * @param name name of the field in the table
  * @param currency currency to use for @a amount
@@ -229,6 +336,92 @@ TALER_PQ_result_spec_json (const char *name,
                            json_t **jp);
 
 
+/**
+ * Array of blinded denomination signature expected
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param[out] num number of elements in @e denom_sigs
+ * @param[out] denom_sigs where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_blinded_denom_sig (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_BlindedDenominationSignature **denom_sigs);
+
+
+/**
+ * Array of blinded hashes of coin envelopes
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param[out] num number of elements in @e denom_sigs
+ * @param[out] h_coin_evs where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_blinded_coin_hash (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_BlindedCoinHashP **h_coin_evs);
+
+
+/**
+ * Array of hashes of denominations
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param[out] num number of elements in @e denom_sigs
+ * @param[out] denom_hs where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_denom_hash (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_DenominationHashP **denom_hs);
+
+
+/**
+ * Array of GNUNET_HashCode
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param[out] num number of elements in @e denom_sigs
+ * @param[out] hashes where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_hash_code (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct GNUNET_HashCode **hashes);
+
+/**
+ * Array of amounts
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param currency The currency
+ * @param[out] num number of elements in @e amounts
+ * @param[out] amounts where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_amount (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  const char *currency,
+  size_t *num,
+  struct TALER_Amount **amounts);
+
+
 #endif  /* TALER_PQ_LIB_H_ */
 
 /* end of include/taler_pq_lib.h */
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
deleted file mode 100644
index 5455103bc..000000000
--- a/src/include/taler_signatures.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-  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/>
-*/
-/**
- * @file taler_signatures.h
- * @brief message formats and signature constants used to define
- *        the binary formats of signatures in Taler
- * @author Florian Dold
- * @author Benedikt Mueller
- *
- * This file should define the constants and C structs that one needs
- * to know to implement Taler clients (wallets or merchants or
- * auditor) that need to produce or verify Taler signatures.
- */
-#ifndef TALER_SIGNATURES_H
-#define TALER_SIGNATURES_H
-
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_amount_lib.h"
-#include "taler_crypto_lib.h"
-
-/*********************************************/
-/* Exchange offline signatures (with master key) */
-/*********************************************/
-
-/**
- * The given revocation key was revoked and must no longer be used.
- */
-#define TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED 1020
-
-/**
- * Add payto URI to the list of our wire methods.
- */
-#define TALER_SIGNATURE_MASTER_ADD_WIRE 1021
-
-/**
- * Signature over global set of fees charged by the
- * exchange.
- */
-#define TALER_SIGNATURE_MASTER_GLOBAL_FEES 1022
-
-/**
- * Remove payto URI from the list of our wire methods.
- */
-#define TALER_SIGNATURE_MASTER_DEL_WIRE 1023
-
-/**
- * Purpose for signing public keys signed by the exchange master key.
- */
-#define TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY 1024
-
-/**
- * Purpose for denomination keys signed by the exchange master key.
- */
-#define TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY 1025
-
-/**
- * Add an auditor to the list of our auditors.
- */
-#define TALER_SIGNATURE_MASTER_ADD_AUDITOR 1026
-
-/**
- * Remove an auditor from the list of our auditors.
- */
-#define TALER_SIGNATURE_MASTER_DEL_AUDITOR 1027
-
-/**
- * Fees charged per (aggregate) wire transfer to the merchant.
- */
-#define TALER_SIGNATURE_MASTER_WIRE_FEES 1028
-
-/**
- * The given revocation key was revoked and must no longer be used.
- */
-#define TALER_SIGNATURE_MASTER_DENOMINATION_KEY_REVOKED 1029
-
-/**
- * Signature where the Exchange confirms its IBAN details in
- * the /wire response.
- */
-#define TALER_SIGNATURE_MASTER_WIRE_DETAILS 1030
-
-/**
- * Set the configuration of an extension (age-restriction or peer2peer)
- */
-#define TALER_SIGNATURE_MASTER_EXTENSION 1031
-
-/**
- * Signature affirming a partner configuration for wads.
- */
-#define TALER_SIGNATURE_MASTER_PARTNER_DETAILS 1048
-
-/*********************************************/
-/* Exchange online signatures (with signing key) */
-/*********************************************/
-
-/**
- * Purpose for the state of a reserve, signed by the exchange's signing
- * key.
- */
-#define TALER_SIGNATURE_EXCHANGE_RESERVE_STATUS 1032
-
-/**
- * Signature where the Exchange confirms a deposit request.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT 1033
-
-/**
- * Signature where the exchange (current signing key) confirms the
- * no-reveal index for cut-and-choose and the validity of the melted
- * coins.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_MELT 1034
-
-/**
- * Signature where the Exchange confirms the full /keys response set.
- */
-#define TALER_SIGNATURE_EXCHANGE_KEY_SET 1035
-
-/**
- * Signature where the Exchange confirms the /track/transaction response.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE 1036
-
-/**
- * Signature where the Exchange confirms the /wire/deposit response.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT 1037
-
-/**
- * Signature where the Exchange confirms a refund request.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND 1038
-
-/**
- * Signature where the Exchange confirms a recoup.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP 1039
-
-/**
- * Signature where the Exchange confirms it closed a reserve.
- */
-#define TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED 1040
-
-/**
- * Signature where the Exchange confirms a recoup-refresh operation.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH 1041
-
-/**
- * Signature where the Exchange confirms that it does not know a denomination (hash).
- */
-#define TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_UNKNOWN 1042
-
-/**
- * Signature where the Exchange confirms that it does not consider a denomination valid for the given operation
- * at this time.
- */
-#define TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_EXPIRED 1043
-
-/**
- * Signature by which an exchange affirms that an account
- * successfully passed the KYC checks.
- */
-#define TALER_SIGNATURE_EXCHANGE_ACCOUNT_SETUP_SUCCESS 1044
-
-/**
- * Signature by which the exchange affirms that a purse
- * was created with a certain amount deposited into it.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_CREATION 1045
-
-
-/**
- * Signature by which the exchange affirms that a purse
- * was merged into a reserve with a certain amount in it.
- */
-#define TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_MERGED 1046
-
-/**
- * Purpose for the state of a purse, signed by the exchange's signing
- * key.
- */
-#define TALER_SIGNATURE_EXCHANGE_PURSE_STATUS 1047
-
-
-/**********************/
-/* Auditor signatures */
-/**********************/
-
-/**
- * Signature where the auditor confirms that he is
- * aware of certain denomination keys from the exchange.
- */
-#define TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS 1064
-
-
-/***********************/
-/* Merchant signatures */
-/***********************/
-
-/**
- * Signature where the merchant confirms a contract (to the customer).
- */
-#define TALER_SIGNATURE_MERCHANT_CONTRACT 1101
-
-/**
- * Signature where the merchant confirms a refund (of a coin).
- */
-#define TALER_SIGNATURE_MERCHANT_REFUND 1102
-
-/**
- * Signature where the merchant confirms that he needs the wire
- * transfer identifier for a deposit operation.
- */
-#define TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION 1103
-
-/**
- * Signature where the merchant confirms that the payment was
- * successful
- */
-#define TALER_SIGNATURE_MERCHANT_PAYMENT_OK 1104
-
-/**
- * Signature where the merchant confirms its own (salted)
- * wire details (not yet really used).
- */
-#define TALER_SIGNATURE_MERCHANT_WIRE_DETAILS 1107
-
-
-/*********************/
-/* Wallet signatures */
-/*********************/
-
-/**
- * Signature where the reserve key confirms a withdraw request.
- */
-#define TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW 1200
-
-/**
- * Signature made by the wallet of a user to confirm a deposit of a coin.
- */
-#define TALER_SIGNATURE_WALLET_COIN_DEPOSIT 1201
-
-/**
- * Signature using a coin key confirming the melting of a coin.
- */
-#define TALER_SIGNATURE_WALLET_COIN_MELT 1202
-
-/**
- * Signature using a coin key requesting recoup.
- */
-#define TALER_SIGNATURE_WALLET_COIN_RECOUP 1203
-
-/**
- * Signature using a coin key authenticating link data.
- */
-#define TALER_SIGNATURE_WALLET_COIN_LINK 1204
-
-/**
- * Signature using a reserve key by which a wallet
- * requests a payment target UUID for itself.
- * Signs over just a purpose (no body), as the
- * signature only serves to demonstrate that the request
- * comes from the wallet controlling the private key,
- * and not some third party.
- */
-#define TALER_SIGNATURE_WALLET_ACCOUNT_SETUP 1205
-
-/**
- * Signature using a coin key requesting recoup-refresh.
- */
-#define TALER_SIGNATURE_WALLET_COIN_RECOUP_REFRESH 1206
-
-/**
- * Signature using a age restriction key for attestation of a particular
- * age/age-group.
- */
-#define TALER_SIGNATURE_WALLET_AGE_ATTESTATION 1207
-
-/**
- * Request full reserve history and pay for it.
- */
-#define TALER_SIGNATURE_WALLET_RESERVE_HISTORY 1208
-
-/**
- * Request detailed account status (for free).
- */
-#define TALER_SIGNATURE_WALLET_RESERVE_STATUS 1209
-
-/**
- * Request purse creation (without reserve).
- */
-#define TALER_SIGNATURE_WALLET_PURSE_CREATE 1210
-
-/**
- * Request coin to be deposited into a purse.
- */
-#define TALER_SIGNATURE_WALLET_PURSE_DEPOSIT 1211
-
-/**
- * Request purse status.
- */
-#define TALER_SIGNATURE_WALLET_PURSE_STATUS 1212
-
-/**
- * Request purse to be merged with a reserve (by purse).
- */
-#define TALER_SIGNATURE_WALLET_PURSE_MERGE 1213
-
-/**
- * Request purse to be merged with a reserve (by account).
- */
-#define TALER_SIGNATURE_WALLET_ACCOUNT_MERGE 1214
-
-/**
- * Request account to be closed.
- */
-#define TALER_SIGNATURE_WALLET_RESERVE_CLOSE 1215
-
-/**
- * Associates encrypted contract with a purse.
- */
-#define TALER_SIGNATURE_WALLET_PURSE_ECONTRACT 1216
-
-/******************************/
-/* Security module signatures */
-/******************************/
-
-/**
- * Signature on a denomination key announcement.
- */
-#define TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY 1250
-
-/**
- * Signature on an exchange message signing key announcement.
- */
-#define TALER_SIGNATURE_SM_SIGNING_KEY 1251
-
-/**
- * Signature on a denomination key announcement.
- */
-#define TALER_SIGNATURE_SM_CS_DENOMINATION_KEY 1252
-
-/*******************/
-/* Test signatures */
-/*******************/
-
-/**
- * EdDSA test signature.
- */
-#define TALER_SIGNATURE_CLIENT_TEST_EDDSA 1302
-
-/**
- * EdDSA test signature.
- */
-#define TALER_SIGNATURE_EXCHANGE_TEST_EDDSA 1303
-
-
-/************************/
-/* Anastasis signatures */
-/************************/
-
-/**
- * EdDSA signature for a policy upload.
- */
-#define TALER_SIGNATURE_ANASTASIS_POLICY_UPLOAD 1400
-
-
-/*******************/
-/* Sync signatures */
-/*******************/
-
-
-/**
- * EdDSA signature for a backup upload.
- */
-#define TALER_SIGNATURE_SYNC_BACKUP_UPLOAD 1450
-
-
-#endif
diff --git a/src/include/taler_templating_lib.h b/src/include/taler_templating_lib.h
new file mode 100644
index 000000000..6af6db715
--- /dev/null
+++ b/src/include/taler_templating_lib.h
@@ -0,0 +1,130 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020, 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/>
+*/
+/**
+ * @file taler_templating_lib.h
+ * @brief logic to load and complete HTML templates
+ * @author Christian Grothoff
+ */
+#ifndef TALER_TEMPLATING_LIB_H
+#define TALER_TEMPLATING_LIB_H
+
+#include <microhttpd.h>
+#include "taler_mhd_lib.h"
+
+/**
+ * Fill in Mustach template @a tmpl using the data from @a root
+ * and return the result in @a result.
+ *
+ * @param tmpl 0-terminated string with Mustach template
+ * @param root JSON data to fill into the template
+ * @param[out] result where to write the result
+ * @param[out] result_size where to write the length of the result
+ * @return 0 on success, otherwise Mustach-specific error code
+ */
+int
+TALER_TEMPLATING_fill (const char *tmpl,
+                       const json_t *root,
+                       void **result,
+                       size_t *result_size);
+
+
+/**
+ * Load a @a template and substitute using @a root, returning the result in a
+ * @a reply encoded suitable for the @a connection with the given @a
+ * http_status code.  On errors, the @a http_status code
+ * is updated to reflect the type of error encoded in the
+ * @a reply.
+ *
+ * @param connection the connection we act upon
+ * @param[in,out] http_status code to use on success,
+ *           set to alternative code on failure
+ * @param template basename of the template to load
+ * @param instance_id instance ID, used to compute static files URL
+ * @param taler_uri value for "Taler:" header to set, or NULL
+ * @param root JSON object to pass as the root context
+ * @param[out] reply where to write the response object
+ * @return #GNUNET_OK on success (reply queued), #GNUNET_NO if an error was queued,
+ *         #GNUNET_SYSERR on failure (to queue an error)
+ */
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_build (struct MHD_Connection *connection,
+                        unsigned int *http_status,
+                        const char *template,
+                        const char *instance_id,
+                        const char *taler_uri,
+                        const json_t *root,
+                        struct MHD_Response **reply);
+
+
+/**
+ * Load a @a template and substitute using @a root, returning
+ * the result to the @a connection with the given
+ * @a http_status code.
+ *
+ * @param connection the connection we act upon
+ * @param http_status code to use on success
+ * @param template basename of the template to load
+ * @param instance_id instance ID, used to compute static files URL
+ * @param taler_uri value for "Taler:" header to set, or NULL
+ * @param root JSON object to pass as the root context
+ * @return #GNUNET_OK on success (reply queued), #GNUNET_NO if an error was queued,
+ *         #GNUNET_SYSERR on failure (to queue an error)
+ */
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_reply (struct MHD_Connection *connection,
+                        unsigned int http_status,
+                        const char *template,
+                        const char *instance_id,
+                        const char *taler_uri,
+                        const json_t *root);
+
+
+/**
+ * Load a @a template and substitute an error message based on @a ec and @a
+ * detail, returning the result to the @a connection with the given @a
+ * http_status code.
+ *
+ * @param connection the connection we act upon
+ * @param template_basename basename of the template to load
+ * @param http_status code to use on success
+ * @param ec error code to return
+ * @param detail optional text to add to the template
+ * @return #MHD_YES on success, #MHD_NO to just close the connection
+ */
+MHD_RESULT
+TALER_TEMPLATING_reply_error (struct MHD_Connection *connection,
+                              const char *template_basename,
+                              unsigned int http_status,
+                              enum TALER_ErrorCode ec,
+                              const char *detail);
+
+/**
+ * Preload templates.
+ *
+ * @param subsystem name of the subsystem, "merchant" or "exchange"
+ * @return #GNUNET_OK on success
+ */
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_init (const char *subsystem);
+
+
+/**
+ * Nicely shut down templating subsystem.
+ */
+void
+TALER_TEMPLATING_done (void);
+
+#endif
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index b0dee023f..f07d9be20 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2018-2022 Taler Systems SA
+  (C) 2018-2023 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
@@ -20,6 +20,8 @@
 /**
  * @file include/taler_testing_lib.h
  * @brief API for writing an interpreter to test Taler components
+ *        This library is not thread-safe, all APIs must only be used from a single thread.
+ *        This library calls abort() if it runs out of memory. Be aware of these limitations.
  * @author Christian Grothoff <christian@grothoff.org>
  * @author Marcello Stanisci
  */
@@ -27,11 +29,13 @@
 #define TALER_TESTING_LIB_H
 
 #include "taler_util.h"
-#include "taler_exchange_service.h"
+#include <microhttpd.h>
 #include <gnunet/gnunet_json_lib.h>
 #include "taler_json_lib.h"
+#include "taler_auditor_service.h"
 #include "taler_bank_service.h"
-#include <microhttpd.h>
+#include "taler_exchange_service.h"
+#include "taler_fakebank_lib.h"
 
 
 /* ********************* Helper functions ********************* */
@@ -50,157 +54,156 @@
 
 
 /**
- * Allocate and return a piece of wire-details.  Combines
- * a @a payto -URL and adds some salt to create the JSON.
+ * Log an error message about us receiving an unexpected HTTP
+ * status code at the current command and fail the test.
  *
- * @param payto payto://-URL to encapsulate
- * @return JSON describing the account, including the
- *         payto://-URL of the account, must be manually decref'd
+ * @param is interpreter to fail
+ * @param status unexpected HTTP status code received
+ * @param expected expected HTTP status code
  */
-json_t *
-TALER_TESTING_make_wire_details (const char *payto);
+#define TALER_TESTING_unexpected_status(is,status,expected)             \
+  do {                                                                  \
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
+                "Unexpected response code %u (expected: %u) to command %s in %s:%u\n", \
+                status,                                                 \
+                expected,                                               \
+                TALER_TESTING_interpreter_get_current_label (is),       \
+                __FILE__,                                               \
+                __LINE__);                                              \
+    TALER_TESTING_interpreter_fail (is);                                \
+  } while (0)
+
+/**
+ * Log an error message about us receiving an unexpected HTTP
+ * status code at the current command and fail the test and print the response
+ * body (expected as json).
+ *
+ * @param is interpreter to fail
+ * @param status unexpected HTTP status code received
+ * @param expected expected HTTP status code
+ * @param body received JSON-reply
+ */
+#define TALER_TESTING_unexpected_status_with_body(is,status,expected,body) \
+  do {                                                                  \
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
+                "Unexpected response code %u (expected: %u) to "        \
+                "command %s in %s:%u\nwith body:\n>>%s<<\n",            \
+                status,                                                 \
+                expected,                                               \
+                TALER_TESTING_interpreter_get_current_label (is),       \
+                __FILE__,                                               \
+                __LINE__,                                               \
+                json_dumps (body, JSON_INDENT (2)));                    \
+    TALER_TESTING_interpreter_fail (is);                                \
+  } while (0)
 
 
 /**
- * Find denomination key matching the given amount.
+ * Log an error message about a command not having
+ * run to completion.
  *
- * @param keys array of keys to search
- * @param amount coin value to look for
- * @param age_restricted must the denomination be age restricted?
- * @return NULL if no matching key was found
+ * @param is interpreter
+ * @param label command label of the incomplete command
  */
-const struct TALER_EXCHANGE_DenomPublicKey *
-TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys,
-                       const struct TALER_Amount *amount,
-                       bool age_restricted);
+#define TALER_TESTING_command_incomplete(is,label)                      \
+  do {                                                                  \
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                                \
+                "Command %s (%s:%u) did not complete (at %s)\n",        \
+                label,                                                  \
+                __FILE__,                                               \
+                __LINE__,                                               \
+                TALER_TESTING_interpreter_get_current_label (is));      \
+  } while (0)
 
 
 /**
- * Configuration data for an exchange.
+ * Common credentials used in a test.
  */
-struct TALER_TESTING_ExchangeConfiguration
+struct TALER_TESTING_Credentials
 {
   /**
-   * Exchange base URL as it appears in the configuration.  Note
-   * that it might differ from the one where the exchange actually
-   * listens from.
+   * Bank authentication details for the exchange bank
+   * account.
    */
-  char *exchange_url;
+  struct TALER_BANK_AuthenticationData ba;
 
   /**
-   * Auditor base URL as it appears in the configuration.  Note
-   * that it might differ from the one where the auditor actually
-   * listens from.
+   * Bank authentication details for the admin bank
+   * account.
    */
-  char *auditor_url;
+  struct TALER_BANK_AuthenticationData ba_admin;
 
-};
+  /**
+   * Configuration file data.
+   */
+  struct GNUNET_CONFIGURATION_Handle *cfg;
 
-/**
- * Connection to the database: aggregates
- * plugin and session handles.
- */
-struct TALER_TESTING_DatabaseConnection
-{
   /**
-   * Database plugin.
+   * Base URL of the exchange.
    */
-  struct TALER_EXCHANGEDB_Plugin *plugin;
+  char *exchange_url;
 
-};
+  /**
+   * Base URL of the auditor.
+   */
+  char *auditor_url;
 
-struct TALER_TESTING_LibeufinServices
-{
   /**
-   * Nexus
+   * RFC 8905 URI of the exchange.
    */
-  struct GNUNET_OS_Process *nexus;
+  char *exchange_payto;
 
   /**
-   * Sandbox
+   * RFC 8905 URI of a user.
    */
-  struct GNUNET_OS_Process *sandbox;
+  char *user42_payto;
 
+  /**
+   * RFC 8905 URI of a user.
+   */
+  char *user43_payto;
 };
 
-/**
- * Prepare launching an exchange.  Checks that the configured
- * port is available, runs taler-exchange-keyup,
- * taler-auditor-sign and taler-exchange-dbinit.  Does not
- * launch the exchange process itself.
- *
- * @param config_filename configuration file to use
- * @param reset_db should we reset the database
- * @param[out] ec will be set to the exchange configuration data
- * @return #GNUNET_OK on success, #GNUNET_NO if test should be
- *         skipped, #GNUNET_SYSERR on test failure
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_exchange (const char *config_filename,
-                                int reset_db,
-                                struct TALER_TESTING_ExchangeConfiguration *ec);
-
 
 /**
- * "Canonical" cert_cb used when we are connecting to the
- * Exchange.
- *
- * @param cls closure, typically, the "run" method containing
- *        all the commands to be run, and a closure for it.
- * @param hr http response details
- * @param keys the exchange's keys.
- * @param compat protocol compatibility information.
+ * What type of bank are we using?
  */
-void
-TALER_TESTING_cert_cb (void *cls,
-                       const struct TALER_EXCHANGE_HttpResponse *hr,
-                       const struct TALER_EXCHANGE_Keys *keys,
-                       enum TALER_EXCHANGE_VersionCompatibility compat);
-
-
-/**
- * Wait for the exchange to have started. Waits for at
- * most 10s, after that returns 77 to indicate an error.
- *
- * @param base_url what URL should we expect the exchange
- *        to be running at
- * @return 0 on success
- */
-int
-TALER_TESTING_wait_exchange_ready (const char *base_url);
-
-
-/**
- * Wait for an HTTPD service to have started. Waits for at
- * most 10s, after that returns 77 to indicate an error.
- *
- * @param base_url what URL should we expect the exchange
- *        to be running at
- * @return 0 on success
- */
-int
-TALER_TESTING_wait_httpd_ready (const char *base_url);
+enum TALER_TESTING_BankSystem
+{
+  TALER_TESTING_BS_FAKEBANK = 1,
+  TALER_TESTING_BS_IBAN = 2
+};
 
 
 /**
- * Wait for the auditor to have started. Waits for at
- * most 10s, after that returns 77 to indicate an error.
+ * Obtain bank credentials for a given @a cfg_file using
+ * @a exchange_account_section as the basis for the
+ * exchange account.
  *
- * @param base_url what URL should we expect the auditor
- *        to be running at
- * @return 0 on success
+ * @param cfg_file name of configuration to parse
+ * @param exchange_account_section configuration section name for the exchange account to use
+ * @param bs type of bank to use
+ * @param[out] ua where to write user account details
+ *         and other credentials
  */
-int
-TALER_TESTING_wait_auditor_ready (const char *base_url);
+enum GNUNET_GenericReturnValue
+TALER_TESTING_get_credentials (
+  const char *cfg_file,
+  const char *exchange_account_section,
+  enum TALER_TESTING_BankSystem bs,
+  struct TALER_TESTING_Credentials *ua);
 
 
 /**
- * Remove files from previous runs
+ * Allocate and return a piece of wire-details.  Combines
+ * a @a payto -URL and adds some salt to create the JSON.
  *
- * @param config_name configuration file to use+
+ * @param payto payto://-URL to encapsulate
+ * @return JSON describing the account, including the
+ *         payto://-URL of the account, must be manually decref'd
  */
-void
-TALER_TESTING_cleanup_files (const char *config_name);
+json_t *
+TALER_TESTING_make_wire_details (const char *payto);
 
 
 /**
@@ -216,65 +219,17 @@ TALER_TESTING_cleanup_files_cfg (void *cls,
 
 
 /**
- * Run `taler-exchange-offline`.
- *
- * @param config_filename configuration file to use
- * @param payto_uri bank account to enable, can be NULL
- * @param auditor_pub public key of auditor to enable, can be NULL
- * @param auditor_url URL of auditor to enable, can be NULL
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_run_exchange_offline (const char *config_filename,
-                                    const char *payto_uri,
-                                    const char *auditor_pub,
-                                    const char *auditor_url);
-
-
-/**
- * Run `taler-auditor-dbinit -r` (reset auditor database).
- *
- * @param config_filename configuration file to use
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_auditor_db_reset (const char *config_filename);
-
-
-/**
- * Run `taler-exchange-dbinit -r` (reset exchange database).
- *
- * @param config_filename configuration file to use
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_exchange_db_reset (const char *config_filename);
-
-
-/**
- * Run `taler-auditor-offline` tool.
- *
- * @param config_filename configuration file to use
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_run_auditor_offline (const char *config_filename);
-
-
-/**
- * Run `taler-auditor-exchange`.
+ * Find denomination key matching the given amount.
  *
- * @param config_filename configuration file to use
- * @param exchange_master_pub master public key of the exchange
- * @param exchange_base_url what is the base URL of the exchange
- * @param do_remove #GNUNET_NO to add exchange, #GNUNET_YES to remove
- * @return #GNUNET_OK on success
+ * @param keys array of keys to search
+ * @param amount coin value to look for
+ * @param age_restricted must the denomination be age restricted?
+ * @return NULL if no matching key was found
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_run_auditor_exchange (const char *config_filename,
-                                    const char *exchange_master_pub,
-                                    const char *exchange_base_url,
-                                    int do_remove);
+const struct TALER_EXCHANGE_DenomPublicKey *
+TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys,
+                       const struct TALER_Amount *amount,
+                       bool age_restricted);
 
 
 /**
@@ -287,194 +242,13 @@ enum GNUNET_GenericReturnValue
 TALER_TESTING_url_port_free (const char *url);
 
 
-/**
- * Configuration data for a bank.
- */
-struct TALER_TESTING_BankConfiguration
-{
-
-  /**
-   * Authentication data for the exchange user at the bank.
-   */
-  struct TALER_BANK_AuthenticationData exchange_auth;
-
-  /**
-   * Payto URL of the exchange's account ("2")
-   */
-  char *exchange_payto;
-
-  /**
-   * Payto URL of a user account ("42")
-   */
-  char *user42_payto;
-
-  /**
-   * Payto URL of another user's account ("43")
-   */
-  char *user43_payto;
-
-};
-
-/**
- * Prepare launching a fakebank.  Check that the configuration
- * file has the right option, and that the port is available.
- * If everything is OK, return the configuration data of the fakebank.
- *
- * @param config_filename configuration file to use
- * @param config_section which account to use
- *                       (must match x-taler-bank)
- * @param[out] bc set to the bank's configuration data
- * @return #GNUNET_OK on success
- */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_fakebank (const char *config_filename,
-                                const char *config_section,
-                                struct TALER_TESTING_BankConfiguration *bc);
-
-
 /* ******************* Generic interpreter logic ************ */
 
 /**
  * Global state of the interpreter, used by a command
  * to access information about other commands.
  */
-struct TALER_TESTING_Interpreter
-{
-
-  /**
-   * Commands the interpreter will run.
-   */
-  struct TALER_TESTING_Command *commands;
-
-  /**
-   * Interpreter task (if one is scheduled).
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * ID of task called whenever we get a SIGCHILD.
-   * Used for #TALER_TESTING_wait_for_sigchld().
-   */
-  struct GNUNET_SCHEDULER_Task *child_death_task;
-
-  /**
-   * Main execution context for the main loop.
-   */
-  struct GNUNET_CURL_Context *ctx;
-
-  /**
-   * Our configuration.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Context for running the CURL event loop.
-   */
-  struct GNUNET_CURL_RescheduleContext *rc;
-
-  /**
-   * Handle to our fakebank, if #TALER_TESTING_run_with_fakebank()
-   * was used.  Otherwise NULL.
-   */
-  struct TALER_FAKEBANK_Handle *fakebank;
-
-  /**
-   * Task run on timeout.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Function to call for cleanup at the end. Can be NULL.
-   */
-  GNUNET_SCHEDULER_TaskCallback final_cleanup_cb;
-
-  /**
-   * Closure for #final_cleanup_cb().
-   */
-  void *final_cleanup_cb_cls;
-
-  /**
-   * Instruction pointer.  Tells #interpreter_run() which instruction to run
-   * next.  Need (signed) int because it gets -1 when rewinding the
-   * interpreter to the first CMD.
-   */
-  int ip;
-
-  /**
-   * Result of the testcases, #GNUNET_OK on success
-   */
-  int result;
-
-  /**
-   * Handle to the exchange.
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
-   * Handle to the auditor.  NULL unless specifically initialized
-   * as part of #TALER_TESTING_auditor_setup().
-   */
-  struct TALER_AUDITOR_Handle *auditor;
-
-  /**
-   * Handle to exchange process; some commands need it
-   * to send signals.  E.g. to trigger the key state reload.
-   */
-  struct GNUNET_OS_Process *exchanged;
-
-  /**
-   * Public key of the auditor.
-   */
-  struct TALER_AuditorPublicKeyP auditor_pub;
-
-  /**
-   * Private key of the auditor.
-   */
-  struct TALER_AuditorPrivateKeyP auditor_priv;
-
-  /**
-   * Private offline signing key.
-   */
-  struct TALER_MasterPrivateKeyP master_priv;
-
-  /**
-   * Public offline signing key.
-   */
-  struct TALER_MasterPublicKeyP master_pub;
-
-  /**
-   * URL of the auditor (as per configuration).
-   */
-  char *auditor_url;
-
-  /**
-   * URL of the exchange (as per configuration).
-   */
-  char *exchange_url;
-
-  /**
-   * Is the interpreter running (#GNUNET_YES) or waiting
-   * for /keys (#GNUNET_NO)?
-   */
-  int working;
-
-  /**
-   * Is the auditor running (#GNUNET_YES) or waiting
-   * for /version (#GNUNET_NO)?
-   */
-  int auditor_working;
-
-  /**
-   * How often have we gotten a /keys response so far?
-   */
-  unsigned int key_generation;
-
-  /**
-   * Exchange keys from last download.
-   */
-  const struct TALER_EXCHANGE_Keys *keys;
-
-};
+struct TALER_TESTING_Interpreter;
 
 
 /**
@@ -495,6 +269,11 @@ struct TALER_TESTING_Command
   const char *label;
 
   /**
+   * Variable name for the command, NULL for none.
+   */
+  const char *name;
+
+  /**
    * Runs the command.  Note that upon return, the interpreter
    * will not automatically run the next command, as the command
    * may continue asynchronously in other scheduler tasks.  Thus,
@@ -504,12 +283,12 @@ struct TALER_TESTING_Command
    *
    * @param cls closure
    * @param cmd command being run
-   * @param i interpreter state
+   * @param is interpreter state
    */
   void
   (*run)(void *cls,
          const struct TALER_TESTING_Command *cmd,
-         struct TALER_TESTING_Interpreter *i);
+         struct TALER_TESTING_Interpreter *is);
 
 
   /**
@@ -578,7 +357,41 @@ TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
 
 
 /**
- * Obtain main execution context for the main loop.
+ * Get command from hash map by variable name.
+ *
+ * @param is interpreter state.
+ * @param name name of the variable to get command by
+ * @return the command, if it is found, or NULL.
+ */
+const struct TALER_TESTING_Command *
+TALER_TESTING_interpreter_get_command (struct TALER_TESTING_Interpreter *is,
+                                       const char *name);
+
+
+/**
+ * Update the last request time of the current command
+ * to the current time.
+ *
+ * @param[in,out] is interpreter state where to show
+ *       that we are doing something
+ */
+void
+TALER_TESTING_touch_cmd (struct TALER_TESTING_Interpreter *is);
+
+
+/**
+ * Increment the 'num_tries' counter for the current
+ * command.
+ *
+ * @param[in,out] is interpreter state where to
+ *   increment the counter
+ */
+void
+TALER_TESTING_inc_tries (struct TALER_TESTING_Interpreter *is);
+
+
+/**
+ * Obtain CURL context for the main loop.
  *
  * @param is interpreter state.
  * @return CURL execution context.
@@ -599,15 +412,6 @@ TALER_TESTING_interpreter_get_current_label (
 
 
 /**
- * Get connection handle to the fakebank.
- *
- * @param is interpreter state.
- * @return the handle.
- */
-struct TALER_FAKEBANK_Handle *
-TALER_TESTING_interpreter_get_fakebank (struct TALER_TESTING_Interpreter *is);
-
-/**
  * Current command is done, run the next one.
  *
  * @param is interpreter state.
@@ -623,14 +427,6 @@ TALER_TESTING_interpreter_next (struct TALER_TESTING_Interpreter *is);
 void
 TALER_TESTING_interpreter_fail (struct TALER_TESTING_Interpreter *is);
 
-/**
- * Create command array terminator.
- *
- * @return a end-command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_end (void);
-
 
 /**
  * Make the instruction pointer point to @a target_label
@@ -687,20 +483,6 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is,
 
 
 /**
- * First launch the fakebank, then schedule the first CMD
- * in the array of all the CMDs to execute.
- *
- * @param is interpreter state.
- * @param commands array of all the commands to execute.
- * @param bank_url base URL of the fake bank.
- */
-void
-TALER_TESTING_run_with_fakebank (struct TALER_TESTING_Interpreter *is,
-                                 struct TALER_TESTING_Command *commands,
-                                 const char *bank_url);
-
-
-/**
  * The function that contains the array of all the CMDs to run,
  * which is then on charge to call some fashion of
  * TALER_TESTING_run*.  In all the test cases, this function is
@@ -715,248 +497,197 @@ typedef void
 
 
 /**
- * Install signal handlers plus schedules the main wrapper
- * around the "run" method.
+ * Run Taler testing loop.  Starts the GNUnet SCHEDULER (event loop).
  *
- * @param main_cb the "run" method which coontains all the
- *        commands.
- * @param main_cb_cls a closure for "run", typically NULL.
- * @param cfg configuration to use
- * @param exchanged exchange process handle: will be put in the
- *        state as some commands - e.g. revoke - need to send
- *        signal to it, for example to let it know to reload the
- *        key state. If NULL, the interpreter will run without
- *        trying to connect to the exchange first.
- * @param exchange_connect #GNUNET_YES if the test should connect
- *        to the exchange, #GNUNET_NO otherwise
- * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
- *         non-#GNUNET_OK codes are #GNUNET_SYSERR most of the
- *         times.
+ * @param main_cb main function to run
+ * @param main_cb_cls closure for @a main_cb
  */
 enum GNUNET_GenericReturnValue
-TALER_TESTING_setup (TALER_TESTING_Main main_cb,
-                     void *main_cb_cls,
-                     const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     struct GNUNET_OS_Process *exchanged,
-                     int exchange_connect);
+TALER_TESTING_loop (TALER_TESTING_Main main_cb,
+                    void *main_cb_cls);
 
 
 /**
- * Install signal handlers plus schedules the main wrapper
- * around the "run" method.
+ * Convenience function to run a test.
  *
- * @param main_cb the "run" method which contains all the
- *        commands.
- * @param main_cb_cls a closure for "run", typically NULL.
- * @param config_filename configuration filename.
- * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
- *         non-GNUNET_OK codes are #GNUNET_SYSERR most of the
- *         times.
+ * @param argv command-line arguments given
+ * @param loglevel log level to use
+ * @param cfg_file configuration file to use
+ * @param exchange_account_section configuration section
+ *   with exchange bank account to use
+ * @param bs bank system to use
+ * @param[in,out] cred global credentials to initialize
+ * @param main_cb main test function to run
+ * @param main_cb_cls closure for @a main_cb
+ * @return 0 on success, 77 on setup trouble, non-zero process status code otherwise
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_auditor_setup (TALER_TESTING_Main main_cb,
-                             void *main_cb_cls,
-                             const char *config_filename);
+int
+TALER_TESTING_main (char *const *argv,
+                    const char *loglevel,
+                    const char *cfg_file,
+                    const char *exchange_account_section,
+                    enum TALER_TESTING_BankSystem bs,
+                    struct TALER_TESTING_Credentials *cred,
+                    TALER_TESTING_Main main_cb,
+                    void *main_cb_cls);
 
 
 /**
- * Closure for #TALER_TESTING_setup_with_exchange_cfg().
+ * Callback over commands of an interpreter.
+ *
+ * @param cls closure
+ * @param cmd a command to process
  */
-struct TALER_TESTING_SetupContext
-{
-  /**
-   * Main function of the test to run.
-   */
-  TALER_TESTING_Main main_cb;
-
-  /**
-   * Closure for @e main_cb.
-   */
-  void *main_cb_cls;
-
-  /**
-   * Name of the configuration file.
-   */
-  const char *config_filename;
-};
+typedef void
+(*TALER_TESTING_CommandIterator)(
+  void *cls,
+  const struct TALER_TESTING_Command *cmd);
 
 
 /**
- * Initialize scheduler loop and curl context for the test case
- * including starting and stopping the exchange using the given
- * configuration file.
+ * Iterates over all of the top-level commands of an
+ * interpreter.
  *
- * @param cls must be a `struct TALER_TESTING_SetupContext *`
- * @param cfg configuration to use.
- * @return #GNUNET_OK if no errors occurred.
+ * @param[in] is interpreter to iterate over
+ * @param asc true in execution order, false for reverse execution order
+ * @param cb function to call on each command
+ * @param cb_cls closure for cb
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_exchange_cfg (
-  void *cls,
-  const struct GNUNET_CONFIGURATION_Handle *cfg);
+void
+TALER_TESTING_iterate (struct TALER_TESTING_Interpreter *is,
+                       bool asc,
+                       TALER_TESTING_CommandIterator cb,
+                       void *cb_cls);
 
 
 /**
- * Initialize scheduler loop and curl context for the test case
- * including starting and stopping the exchange using the given
- * configuration file.
+ * Look for substring in a programs' name.
  *
- * @param main_cb main method.
- * @param main_cb_cls main method closure.
- * @param config_file configuration file name.  Is is used
- *        by both this function and the exchange itself.  In the
- *        first case it gives out the exchange port number and
- *        the exchange base URL so as to check whether the port
- *        is available and the exchange responds when requested
- *        at its base URL.
- * @return #GNUNET_OK if no errors occurred.
+ * @param prog program's name to look into
+ * @param marker chunk to find in @a prog
+ * @return true if @a marker is in @a prog
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
-                                   void *main_cb_cls,
-                                   const char *config_file);
+bool
+TALER_TESTING_has_in_name (const char *prog,
+                           const char *marker);
 
 
 /**
- * Initialize scheduler loop and curl context for the test case
- * including starting and stopping the auditor and exchange using
- * the given configuration file.
+ * Wait for an HTTPD service to have started. Waits for at
+ * most 10s, after that returns 77 to indicate an error.
  *
- * @param cls must be a `struct TALER_TESTING_SetupContext *`
- * @param cfg configuration to use.
- * @return #GNUNET_OK if no errors occurred.
+ * @param base_url what URL should we expect the exchange
+ *        to be running at
+ * @return 0 on success
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_auditor_and_exchange_cfg (
-  void *cls,
-  const struct GNUNET_CONFIGURATION_Handle *cfg);
+int
+TALER_TESTING_wait_httpd_ready (const char *base_url);
 
 
 /**
- * Initialize scheduler loop and curl context for the test case
- * including starting and stopping the auditor and exchange using
- * the given configuration file.
+ * Parse reference to a coin.
  *
- * @param main_cb main method.
- * @param main_cb_cls main method closure.
- * @param config_file configuration file name.  Is is used
- *        by both this function and the exchange itself.  In the
- *        first case it gives out the exchange port number and
- *        the exchange base URL so as to check whether the port
- *        is available and the exchange responds when requested
- *        at its base URL.
- * @return #GNUNET_OK if no errors occurred.
+ * @param coin_reference of format $LABEL['#' $INDEX]?
+ * @param[out] cref where we return a copy of $LABEL
+ * @param[out] idx where we set $INDEX
+ * @return #GNUNET_SYSERR if $INDEX is present but not numeric
  */
 enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_auditor_and_exchange (TALER_TESTING_Main main_cb,
-                                               void *main_cb_cls,
-                                               const char *config_file);
+TALER_TESTING_parse_coin_reference (
+  const char *coin_reference,
+  char **cref,
+  unsigned int *idx);
 
 
-/**
- * Start the (Python) bank process.  Assume the port
- * is available and the database is clean.  Use the "prepare
- * bank" function to do such tasks.
- *
- * @param config_filename configuration filename.
- * @param bank_url base URL of the bank, used by `wget' to check
- *        that the bank was started right.
- * @return the process, or NULL if the process could not
- *         be started.
- */
-struct GNUNET_OS_Process *
-TALER_TESTING_run_bank (const char *config_filename,
-                        const char *bank_url);
+/* ************** Specific interpreter commands ************ */
+
 
 /**
- * Start the (nexus) bank process.  Assume the port
- * is available and the database is clean.  Use the "prepare
- * bank" function to do such tasks.  This function is also
- * responsible to create the exchange EBICS subscriber at
- * the nexus.
+ * Create command array terminator.
  *
- * @param bc bank configuration of the bank
- * @return the process, or NULL if the process could not
- *         be started.
+ * @return a end-command.
  */
-struct TALER_TESTING_LibeufinServices
-TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc);
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_end (void);
 
 
 /**
- * Runs the Fakebank by guessing / extracting the portnumber
- * from the base URL.
+ * Set variable to command as side-effect of
+ * running a command.
  *
- * @param bank_url bank's base URL.
- * @param currency currency the bank uses
- * @return the fakebank process handle, or NULL if any
- *         error occurs.
+ * @param name name of the variable to set
+ * @param cmd command to set to variable when run
+ * @return modified command
  */
-struct TALER_FAKEBANK_Handle *
-TALER_TESTING_run_fakebank (const char *bank_url,
-                            const char *currency);
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_set_var (const char *name,
+                           struct TALER_TESTING_Command cmd);
 
 
 /**
- * Prepare the bank execution.  Check if the port is available
- * and reset database.
+ * Launch GNU Taler setup.
  *
- * @param config_filename configuration file name.
- * @param reset_db should we reset the bank's database
- * @param config_section which configuration section should be used
- * @param[out] bc set to the bank's configuration data
- * @return #GNUNET_OK on success
+ * @param label command label.
+ * @param config_file configuration file to use
+ * @param ... NULL-terminated (const char *) arguments to pass to taler-benchmark-setup.sh
+ * @return the command.
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_bank (const char *config_filename,
-                            int reset_db,
-                            const char *config_section,
-                            struct TALER_TESTING_BankConfiguration *bc);
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_system_start (
+  const char *label,
+  const char *config_file,
+  ...);
+
 
 /**
- * Prepare the Nexus execution.  Check if the port is available
- * and delete old database.
+ * Connects to the exchange.
  *
- * @param config_filename configuration file name.
- * @param reset_db should we reset the bank's database
- * @param config_section section of the configuration with the exchange's account
- * @param[out] bc set to the bank's configuration data
- * @return the base url, or NULL upon errors.  Must be freed
- *         by the caller.
+ * @param label command label
+ * @param cfg configuration to use
+ * @param last_keys_ref reference to command with prior /keys response, NULL for none
+ * @param wait_for_keys block until we got /keys
+ * @param load_private_key obtain private key from file indicated in @a cfg
+ * @return the command.
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_nexus (const char *config_filename,
-                             int reset_db,
-                             const char *config_section,
-                             struct TALER_TESTING_BankConfiguration *bc);
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_get_exchange (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *last_keys_ref,
+  bool wait_for_keys,
+  bool load_private_key);
+
 
 /**
- * Look for substring in a programs' name.
+ * Connects to the auditor.
  *
- * @param prog program's name to look into
- * @param marker chunk to find in @a prog
+ * @param label command label
+ * @param cfg configuration to use
+ * @param load_auditor_keys obtain auditor keys from file indicated in @a cfg
+ * @return the command.
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_has_in_name (const char *prog,
-                           const char *marker);
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_get_auditor (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  bool load_auditor_keys);
 
 
 /**
- * Parse reference to a coin.
+ * Runs the Fakebank in-process by guessing / extracting the portnumber
+ * from the base URL.
  *
- * @param coin_reference of format $LABEL['#' $INDEX]?
- * @param[out] cref where we return a copy of $LABEL
- * @param[out] idx where we set $INDEX
- * @return #GNUNET_SYSERR if $INDEX is present but not numeric
+ * @param label command label
+ * @param cfg configuration to use
+ * @param exchange_account_section configuration section
+ *   to use to determine bank account of the exchange
+ * @return the command.
  */
-enum GNUNET_GenericReturnValue
-TALER_TESTING_parse_coin_reference (
-  const char *coin_reference,
-  char **cref,
-  unsigned int *idx);
-
-
-/* ************** Specific interpreter commands ************ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_run_fakebank (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *exchange_account_section);
 
 
 /**
@@ -1073,24 +804,20 @@ TALER_TESTING_cmd_exec_auditor_dbinit (const char *label,
  * Create a "deposit-confirmation" command.
  *
  * @param label command label.
- * @param auditor auditor connection.
  * @param deposit_reference reference to any operation that can
  *        provide a coin.
- * @param coin_index if @a deposit_reference offers an array of
- *        coins, this parameter selects which one in that array.
- *        This value is currently ignored, as only one-coin
- *        deposits are implemented.
+ * @param num_coins number of coins expected in the batch deposit
  * @param amount_without_fee deposited amount without the fee
  * @param expected_response_code expected HTTP response code.
  * @return the command.
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_deposit_confirmation (const char *label,
-                                        struct TALER_AUDITOR_Handle *auditor,
-                                        const char *deposit_reference,
-                                        unsigned int coin_index,
-                                        const char *amount_without_fee,
-                                        unsigned int expected_response_code);
+TALER_TESTING_cmd_deposit_confirmation (
+  const char *label,
+  const char *deposit_reference,
+  unsigned int num_coins,
+  const char *amount_without_fee,
+  unsigned int expected_response_code);
 
 
 /**
@@ -1106,46 +833,6 @@ TALER_TESTING_cmd_deposit_confirmation_with_retry (
 
 
 /**
- * Create a "list exchanges" command.
- *
- * @param label command label.
- * @param auditor auditor connection.
- * @param expected_response_code expected HTTP response code.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges (const char *label,
-                             struct TALER_AUDITOR_Handle *auditor,
-                             unsigned int expected_response_code);
-
-
-/**
- * Create a "list exchanges" command and check whether
- * a particular exchange belongs to the returned bundle.
- *
- * @param label command label.
- * @param expected_response_code expected HTTP response code.
- * @param exchange_url URL of the exchange supposed to
- *  be included in the response.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges_with_url (const char *label,
-                                      unsigned int expected_response_code,
-                                      const char *exchange_url);
-
-/**
- * Modify an exchanges command to enable retries when we get
- * transient errors from the auditor.
- *
- * @param cmd a deposit confirmation command
- * @return the command with retries enabled
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges_with_retry (struct TALER_TESTING_Command cmd);
-
-
-/**
  * Create /admin/add-incoming command.
  *
  * @param label command label.
@@ -1212,6 +899,32 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label,
 
 
 /**
+ * Make a "wirewatch" CMD.
+ *
+ * @param label command label.
+ * @param config_filename configuration filename.
+ * @param account_section section to run wirewatch against
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_wirewatch2 (const char *label,
+                                   const char *config_filename,
+                                   const char *account_section);
+
+
+/**
+ * Request URL via "wget".
+ *
+ * @param label command label.
+ * @param url URL to fetch
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_wget (const char *label,
+                             const char *url);
+
+
+/**
  * Make a "expire" CMD.
  *
  * @param label command label.
@@ -1332,6 +1045,102 @@ TALER_TESTING_cmd_withdraw_amount (const char *label,
 
 
 /**
+ * Create a batch withdraw command, letting the caller specify the type of
+ * conflict between the coins and the desired amounts as string.
+ *
+ * Takes a variable, non-empty list of the denomination amounts via VARARGS,
+ * similar to #TALER_TESTING_cmd_withdraw_amount(), just using a batch
+ * withdraw.
+ *
+ * @param label command label.
+ * @param reserve_reference command providing us with a reserve to withdraw from
+ * @param conflict if true, enforce a conflict (same priv key, different denom and age commiment)
+ * @param age if > 0, age restriction applies (same for all coins)
+ * @param expected_response_code which HTTP response code
+ *        we expect from the exchange.
+ * @param amount how much we withdraw for the first coin
+ * @param ... NULL-terminated list of additional amounts to withdraw (one per coin)
+ * @return the withdraw command to be executed by the interpreter.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_batch_withdraw_with_conflict (
+  const char *label,
+  const char *reserve_reference,
+  bool conflict,
+  uint8_t age,
+  unsigned int expected_response_code,
+  const char *amount,
+  ...);
+
+/**
+ * Create a batch withdraw command, letting the caller specify
+ * the desired amounts as string.  Takes a variable, non-empty
+ * list of the denomination amounts via VARARGS, similar to
+ * #TALER_TESTING_cmd_withdraw_amount(), just using a batch withdraw.
+ * The coins are generated without a conflict (different private keys).
+ *
+ * @param label command label.
+ * @param reserve_reference command providing us with a reserve to withdraw from
+ * @param age if > 0, age restriction applies (same for all coins)
+ * @param expected_response_code which HTTP response code
+ *        we expect from the exchange.
+ * @param amount how much we withdraw for the first coin
+ * @param ... NULL-terminated list of additional amounts to withdraw (one per coin)
+ * @return the withdraw command to be executed by the interpreter.
+ */
+#define TALER_TESTING_cmd_batch_withdraw(label, \
+                                         reserve_reference, \
+                                         age, \
+                                         expected_response_code, \
+                                         amount, \
+                                         ...) \
+  TALER_TESTING_cmd_batch_withdraw_with_conflict ( \
+    (label), \
+    (reserve_reference), \
+    false, \
+    (age), \
+    (expected_response_code), \
+    (amount), \
+    __VA_ARGS__)
+
+/**
+ * Create an age-withdraw command, letting the caller specify
+ * the maximum agend and desired amounts as string.  Takes a variable,
+ * non-empty list of the denomination amounts via VARARGS, similar to
+ * #TALER_TESTING_cmd_withdraw_amount(), just using a batch withdraw.
+ *
+ * @param label command label.
+ * @param reserve_reference command providing us with a reserve to withdraw from
+ * @param max_age maximum allowed age, same for each coin
+ * @param expected_response_code which HTTP response code
+ *        we expect from the exchange.
+ * @param amount how much we withdraw for the first coin
+ * @param ... NULL-terminated list of additional amounts to withdraw (one per coin)
+ * @return the withdraw command to be executed by the interpreter.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_age_withdraw (const char *label,
+                                const char *reserve_reference,
+                                uint8_t max_age,
+                                unsigned int expected_response_code,
+                                const char *amount,
+                                ...);
+
+/**
+ * Create a "age-withdraw reveal" command.
+ *
+ * @param label command label.
+ * @param age_withdraw_reference reference to a "age-withdraw" command.
+ * @param expected_response_code expected HTTP response code.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_age_withdraw_reveal (
+  const char *label,
+  const char *age_withdraw_reference,
+  unsigned int expected_response_code);
+
+/**
  * Create a withdraw command, letting the caller specify
  * the desired amount as string and also re-using an existing
  * coin private key in the process (violating the specification,
@@ -1342,7 +1151,7 @@ TALER_TESTING_cmd_withdraw_amount (const char *label,
  * @param amount how much we withdraw.
  * @param age if > 0, age restriction applies.
  * @param coin_ref reference to (withdraw/reveal) command of a coin
- *        from which we should re-use the private key
+ *        from which we should reuse the private key
  * @param expected_response_code which HTTP response code
  *        we expect from the exchange.
  * @return the withdraw command to be executed by the interpreter.
@@ -1389,24 +1198,6 @@ TALER_TESTING_cmd_withdraw_with_retry (struct TALER_TESTING_Command cmd);
 
 
 /**
- * Create a "wire" command.
- *
- * @param label the command label.
- * @param expected_method which wire-transfer method is expected
- *        to be offered by the exchange.
- * @param expected_fee the fee the exchange should charge.
- * @param expected_response_code the HTTP response the exchange
- *        should return.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_wire (const char *label,
-                        const char *expected_method,
-                        const char *expected_fee,
-                        unsigned int expected_response_code);
-
-
-/**
  * Create a GET "reserves" command.
  *
  * @param label the command label.
@@ -1456,7 +1247,7 @@ TALER_TESTING_cmd_reserve_poll_finish (const char *label,
 
 
 /**
- * Create a POST "/reserves/$RID/history" command.
+ * Create a GET "/reserves/$RID/history" command.
  *
  * @param label the command label.
  * @param reserve_reference reference to the reserve to check.
@@ -1472,19 +1263,89 @@ TALER_TESTING_cmd_reserve_history (const char *label,
 
 
 /**
- * Create a POST "/reserves/$RID/status" command.
+ * Create a GET "/coins/$COIN_PUB/history" command.
  *
  * @param label the command label.
- * @param reserve_reference reference to the reserve to check.
- * @param expected_balance expected balance for the reserve.
+ * @param coin_reference reference to the coin to check.
+ * @param expected_balance expected balance for the coin.
  * @param expected_response_code expected HTTP response code.
  * @return the command.
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_reserve_status (const char *label,
+TALER_TESTING_cmd_coin_history (const char *label,
+                                const char *coin_reference,
+                                const char *expected_balance,
+                                unsigned int expected_response_code);
+
+
+/**
+ * Create a POST "/reserves/$RID/open" command.
+ *
+ * @param label the command label.
+ * @param reserve_reference reference to the reserve to open.
+ * @param reserve_pay amount to pay from the reserve balance
+ * @param expiration_time how long into the future should the reserve remain open
+ * @param min_purses minimum number of purses to allow
+ * @param expected_response_code expected HTTP response code.
+ * @param ... NULL terminated list of pairs of coin references and amounts
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_open (const char *label,
+                                const char *reserve_reference,
+                                const char *reserve_pay,
+                                struct GNUNET_TIME_Relative expiration_time,
+                                uint32_t min_purses,
+                                unsigned int expected_response_code,
+                                ...);
+
+
+/**
+ * Create a GET "/reserves/$RID/attest" command.
+ *
+ * @param label the command label.
+ * @param reserve_reference reference to the reserve to get attestable attributes of.
+ * @param expected_response_code expected HTTP response code.
+ * @param ... NULL-terminated list of attributes expected
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_get_attestable (const char *label,
+                                          const char *reserve_reference,
+                                          unsigned int expected_response_code,
+                                          ...);
+
+
+/**
+ * Create a POST "/reserves/$RID/attest" command.
+ *
+ * @param label the command label.
+ * @param reserve_reference reference to the reserve to get attests for
+ * @param expected_response_code expected HTTP response code.
+ * @param ... NULL-terminated list of attributes that should be attested
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_attest (const char *label,
                                   const char *reserve_reference,
-                                  const char *expected_balance,
-                                  unsigned int expected_response_code);
+                                  unsigned int expected_response_code,
+                                  ...);
+
+
+/**
+ * Create a POST "/reserves/$RID/close" command.
+ *
+ * @param label the command label.
+ * @param reserve_reference reference to the reserve to close.
+ * @param target_account where to wire funds remaining, can be NULL
+ * @param expected_response_code expected HTTP response code.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_close (const char *label,
+                                 const char *reserve_reference,
+                                 const char *target_account,
+                                 unsigned int expected_response_code);
 
 
 /**
@@ -1578,6 +1439,31 @@ TALER_TESTING_cmd_deposit_replay (const char *label,
 
 
 /**
+ * Create a "batch deposit" command.
+ *
+ * @param label command label.
+ * @param target_account_payto target account for the "deposit"
+ *        request.
+ * @param contract_terms contract terms to be signed over by the
+ *        coin.
+ * @param refund_deadline refund deadline, zero means 'no refunds'.
+ * @param expected_response_code expected HTTP response code.
+ * @param ... NULL-terminated list with an even number of
+ *            strings that alternate referring to coins
+ *            (possibly with index using label#index notation)
+ *            and the amount of that coin to deposit
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_batch_deposit (const char *label,
+                                 const char *target_account_payto,
+                                 const char *contract_terms,
+                                 struct GNUNET_TIME_Relative refund_deadline,
+                                 unsigned int expected_response_code,
+                                 ...);
+
+
+/**
  * Create a "refresh melt" command.
  *
  * @param label command label.
@@ -1933,60 +1819,6 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_wait_service (const char *label,
                                 const char *url);
 
-
-/**
- * Make a "check keys" command.
- *
- * @param label command label
- * @param generation how many /keys responses are expected to
- *        have been returned when this CMD will be run.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys (const char *label,
-                              unsigned int generation);
-
-
-/**
- * Make a "check keys" command that forcedly does NOT cherry pick;
- * just redownload the whole /keys.
- *
- * @param label command label
- * @param generation when this command is run, exactly @a
- *        generation /keys downloads took place.  If the number
- *        of downloads is less than @a generation, the logic will
- *        first make sure that @a generation downloads are done,
- *        and _then_ execute the rest of the command.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys_pull_all_keys (const char *label,
-                                            unsigned int generation);
-
-
-/**
- * Make a "check keys" command.  It lets the user set a last denom issue date to be
- * used in the request for /keys.
- *
- * @param label command label
- * @param generation when this command is run, exactly @a
- *        generation /keys downloads took place.  If the number
- *        of downloads is less than @a generation, the logic will
- *        first make sure that @a generation downloads are done,
- *        and _then_ execute the rest of the command.
- * @param last_denom_date_ref previous /keys command to use to
- *        obtain the "last_denom_date" value from; "zero" can be used
- *        as a special value to force an absolute time of zero to be
- *        given to as an argument
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys_with_last_denom (
-  const char *label,
-  unsigned int generation,
-  const char *last_denom_date_ref);
-
-
 /**
  * Create a "batch" command.  Such command takes a
  * end_CMD-terminated array of CMDs and executed them.
@@ -2012,13 +1844,18 @@ TALER_TESTING_cmd_batch (const char *label,
 bool
 TALER_TESTING_cmd_is_batch (const struct TALER_TESTING_Command *cmd);
 
+
 /**
  * Advance internal pointer to next command.
  *
  * @param is interpreter state.
+ * @param[in,out] cls closure of the batch
+ * @return true to advance IP in parent
  */
-void
-TALER_TESTING_cmd_batch_next (struct TALER_TESTING_Interpreter *is);
+bool
+TALER_TESTING_cmd_batch_next (struct TALER_TESTING_Interpreter *is,
+                              void *cls);
+
 
 /**
  * Obtain what command the batch is at.
@@ -2041,34 +1878,10 @@ TALER_TESTING_cmd_batch_set_current (const struct TALER_TESTING_Command *cmd,
 
 
 /**
- * Make a serialize-keys CMD.
- *
- * @param label CMD label
- * @return the CMD.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_serialize_keys (const char *label);
-
-
-/**
- * Make a connect-with-state CMD.  This command
- * will use a serialized key state to reconnect
- * to the exchange.
- *
- * @param label command label
- * @param state_reference label of a CMD offering
- *        a serialized key state.
- * @return the CMD.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_connect_with_state (const char *label,
-                                      const char *state_reference);
-
-/**
  * Make the "insert-deposit" CMD.
  *
  * @param label command label.
- * @param dbc collects plugin and session handles
+ * @param db_cfg configuration to talk to the DB
  * @param merchant_name Human-readable name of the merchant.
  * @param merchant_account merchant's account name (NOT a payto:// URI)
  * @param exchange_timestamp when did the exchange receive the deposit
@@ -2081,7 +1894,7 @@ TALER_TESTING_cmd_connect_with_state (const char *label,
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_insert_deposit (
   const char *label,
-  const struct TALER_TESTING_DatabaseConnection *dbc,
+  const struct GNUNET_CONFIGURATION_Handle *db_cfg,
   const char *merchant_name,
   const char *merchant_account,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
@@ -2106,7 +1919,7 @@ struct TALER_TESTING_Timer
   struct GNUNET_TIME_Relative total_duration;
 
   /**
-   * Total time spend waiting for the *successful* exeuction
+   * Total time spend waiting for the *successful* execution
    * in all commands of this type.
    */
   struct GNUNET_TIME_Relative success_latency;
@@ -2201,7 +2014,6 @@ TALER_TESTING_cmd_set_wire_fee (const char *label,
                                 const char *wire_method,
                                 const char *wire_fee,
                                 const char *closing_fee,
-                                const char *wad_fee,
                                 unsigned int expected_http_status,
                                 bool bad_sig);
 
@@ -2275,15 +2087,13 @@ TALER_TESTING_cmd_exec_offline_sign_keys (const char *label,
  * @param config_filename configuration filename.
  * @param wire_fee the wire fee to affirm (for the current year)
  * @param closing_fee the closing fee to affirm (for the current year)
- * @param wad_fee the wad fee to affirm
  * @return the command
  */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_exec_offline_sign_fees (const char *label,
                                           const char *config_filename,
                                           const char *wire_fee,
-                                          const char *closing_fee,
-                                          const char *wad_fee);
+                                          const char *closing_fee);
 
 
 /**
@@ -2292,11 +2102,9 @@ TALER_TESTING_cmd_exec_offline_sign_fees (const char *label,
  * @param label command label.
  * @param config_filename configuration filename.
  * @param history_fee the history fee to charge (for the current year)
- * @param kyc_fee the KYC fee to charge (for the current year)
  * @param account_fee the account fee to charge (for the current year)
  * @param purse_fee the purse fee to charge (for the current year)
  * @param purse_timeout when do purses time out
- * @param kyc_timeout when does the KYC time out
  * @param history_expiration when does an account history expire
  * @param num_purses number of (free) active purses per account
  * @return the command
@@ -2306,11 +2114,9 @@ TALER_TESTING_cmd_exec_offline_sign_global_fees (
   const char *label,
   const char *config_filename,
   const char *history_fee,
-  const char *kyc_fee,
   const char *account_fee,
   const char *purse_fee,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   unsigned int num_purses);
 
@@ -2358,12 +2164,14 @@ TALER_TESTING_cmd_revoke_sign_key (
  *
  * @param label command label.
  * @param reserve_reference command with reserve private key to use (or NULL to create a fresh reserve key).
+ * @param threshold_balance balance amount to pass to the exchange
  * @param expected_response_code expected HTTP status
  * @return the command
  */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_wallet_kyc_get (const char *label,
                                   const char *reserve_reference,
+                                  const char *threshold_balance,
                                   unsigned int expected_response_code);
 
 
@@ -2382,33 +2190,48 @@ TALER_TESTING_cmd_check_kyc_get (const char *label,
 
 
 /**
- * Create a KYC proof request.
+ * Create a KYC proof request. Only useful in conjunction with the OAuth2.0
+ * logic, as it generates an OAuth2.0-specific request.
  *
  * @param label command label.
  * @param payment_target_reference command with a payment target to query
+ * @param logic_section name of the KYC provider section
+ *         in the exchange configuration for this proof
  * @param code OAuth 2.0 code to use
- * @param state OAuth 2.0 state to use
  * @param expected_response_code expected HTTP status
  * @return the command
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_proof_kyc (const char *label,
-                             const char *payment_target_reference,
-                             const char *code,
-                             const char *state,
-                             unsigned int expected_response_code);
+TALER_TESTING_cmd_proof_kyc_oauth2 (
+  const char *label,
+  const char *payment_target_reference,
+  const char *logic_section,
+  const char *code,
+  unsigned int expected_response_code);
 
 
 /**
  * Starts a fake OAuth 2.0 service on @a port for testing
- * KYC processes.
+ * KYC processes which also provides a @a birthdate in a response
  *
  * @param label command label
+ * @param birthdate fixed birthdate, such as "2022-03-04", "2022-03-00", "2022-00-00"
  * @param port the TCP port to listen on
  */
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_oauth (const char *label,
-                         uint16_t port);
+TALER_TESTING_cmd_oauth_with_birthdate (const char *label,
+                                        const char *birthdate,
+                                        uint16_t port);
+
+/**
+ * Starts a fake OAuth 2.0 service on @a port for testing
+ * KYC processes.
+ *
+ * @param label command label
+ * @param port the TCP port to listen on
+ */
+#define TALER_TESTING_cmd_oauth(label, port) \
+  TALER_TESTING_cmd_oauth_with_birthdate ((label), NULL, (port))
 
 
 /* ****************** P2P payment commands ****************** */
@@ -2436,6 +2259,21 @@ TALER_TESTING_cmd_purse_create_with_deposit (
 
 
 /**
+ * Deletes a purse.
+ *
+ * @param label command label
+ * @param expected_http_status what HTTP status do we expect to get returned from the exchange
+ * @param purse_cmd command that created the purse
+ * @return the command
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_purse_delete (
+  const char *label,
+  unsigned int expected_http_status,
+  const char *purse_cmd);
+
+
+/**
  * Retrieve contract (also checks that the contract matches
  * the upload command).
  *
@@ -2512,6 +2350,7 @@ TALER_TESTING_cmd_purse_poll_finish (const char *label,
  * @param expected_http_status what HTTP status do we expect to get returned from the exchange
  * @param contract_terms contract, JSON string
  * @param upload_contract should we upload the contract
+ * @param pay_purse_fee should we pay a fee to create the purse
  * @param expiration when should the purse expire
  * @param reserve_ref reference to reserve key, or NULL to create a new reserve
  * @return the command
@@ -2522,6 +2361,7 @@ TALER_TESTING_cmd_purse_create_with_reserve (
   unsigned int expected_http_status,
   const char *contract_terms,
   bool upload_contract,
+  bool pay_purse_fee,
   struct GNUNET_TIME_Relative expiration,
   const char *reserve_ref);
 
@@ -2545,6 +2385,114 @@ TALER_TESTING_cmd_purse_deposit_coins (
   ...);
 
 
+/**
+ * Setup AML officer.
+ *
+ * @param label command label
+ * @param ref_cmd command that previously created the
+ *       officer, NULL to create one this time
+ * @param name full legal name of the officer to use
+ * @param is_active true to set the officer to active
+ * @param read_only true to restrict the officer to read-only
+ * @return the command
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_set_officer (
+  const char *label,
+  const char *ref_cmd,
+  const char *name,
+  bool is_active,
+  bool read_only);
+
+
+/**
+ * Make AML decision.
+ *
+ * @param label command label
+ * @param ref_officer command that previously created an
+ *       officer
+ * @param ref_operation command that previously created an
+ *       h_payto which to make an AML decision about
+ * @param new_threshold new threshold to set
+ * @param justification justification given for the decision
+ * @param new_state new AML state for the account
+ * @param kyc_requirement KYC requirement to impose
+ * @param expected_response expected HTTP return status
+ * @return the command
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_take_aml_decision (
+  const char *label,
+  const char *ref_officer,
+  const char *ref_operation,
+  const char *new_threshold,
+  const char *justification,
+  enum TALER_AmlDecisionState new_state,
+  const char *kyc_requirement,
+  unsigned int expected_response);
+
+
+/**
+ * Fetch AML decision.
+ *
+ * @param label command label
+ * @param ref_officer command that previously created an
+ *       officer
+ * @param ref_operation command that previously created an
+ *       h_payto which to make an AML decision about
+ * @param expected_http_status expected HTTP response status
+ * @return the command
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_check_aml_decision (
+  const char *label,
+  const char *ref_officer,
+  const char *ref_operation,
+  unsigned int expected_http_status);
+
+
+/**
+ * Fetch AML decisions.
+ *
+ * @param label command label
+ * @param ref_officer command that previously created an
+ *       officer
+ * @param filter AML state to filter by
+ * @param expected_http_status expected HTTP response status
+ * @return the command
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_check_aml_decisions (
+  const char *label,
+  const char *ref_officer,
+  enum TALER_AmlDecisionState filter,
+  unsigned int expected_http_status);
+
+
+/* ****************** convenience functions ************** */
+
+/**
+ * Get exchange URL from interpreter. Convenience function.
+ *
+ * @param is interpreter state.
+ * @return the exchange URL, or NULL on error
+ */
+const char *
+TALER_TESTING_get_exchange_url (
+  struct TALER_TESTING_Interpreter *is);
+
+
+/**
+ * Get exchange keys from interpreter. Convenience function.
+ *
+ * @param is interpreter state.
+ * @return the exchange keys, or NULL on error
+ */
+struct TALER_EXCHANGE_Keys *
+TALER_TESTING_get_keys (
+  struct TALER_TESTING_Interpreter *is);
+
+
 /* *** Generic trait logic for implementing traits ********* */
 
 
@@ -2701,12 +2649,22 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
  */
 #define TALER_TESTING_SIMPLE_TRAITS(op) \
   op (bank_row, const uint64_t)                                    \
+  op (officer_pub, const struct TALER_AmlOfficerPublicKeyP)        \
+  op (officer_priv, const struct TALER_AmlOfficerPrivateKeyP)      \
+  op (officer_name, const char)                                    \
+  op (aml_decision, enum TALER_AmlDecisionState)                   \
+  op (aml_justification, const char)                               \
+  op (auditor_priv, const struct TALER_AuditorPrivateKeyP)         \
+  op (auditor_pub, const struct TALER_AuditorPublicKeyP)           \
+  op (master_priv, const struct TALER_MasterPrivateKeyP)           \
+  op (master_pub, const struct TALER_MasterPublicKeyP)             \
   op (purse_priv, const struct TALER_PurseContractPrivateKeyP)     \
   op (purse_pub, const struct TALER_PurseContractPublicKeyP)       \
   op (merge_priv, const struct TALER_PurseMergePrivateKeyP)        \
   op (merge_pub, const struct TALER_PurseMergePublicKeyP)          \
   op (contract_priv, const struct TALER_ContractDiffiePrivateP)    \
   op (reserve_priv, const struct TALER_ReservePrivateKeyP)         \
+  op (reserve_sig, const struct TALER_ReserveSignatureP)           \
   op (h_payto, const struct TALER_PaytoHashP)                      \
   op (planchet_secret, const struct TALER_PlanchetMasterSecretP)   \
   op (refresh_secret, const struct TALER_RefreshMasterSecretP)     \
@@ -2715,55 +2673,61 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
   op (merchant_pub, const struct TALER_MerchantPublicKeyP)         \
   op (merchant_sig, const struct TALER_MerchantSignatureP)         \
   op (wtid, const struct TALER_WireTransferIdentifierRawP)         \
+  op (bank_auth_data, const struct TALER_BANK_AuthenticationData)  \
   op (contract_terms, const json_t)                                \
   op (wire_details, const json_t)                                  \
-  op (exchange_keys, const json_t)                                 \
-  op (reserve_history, const struct TALER_EXCHANGE_ReserveHistoryEntry) \
-  op (exchange_url, const char *)                                  \
-  op (exchange_bank_account_url, const char *)                     \
-  op (taler_uri, const char *)                                     \
-  op (payto_uri, const char *)                                     \
-  op (kyc_url, const char *)                                       \
-  op (web_url, const char *)                                       \
+  op (exchange_url, const char)                                    \
+  op (auditor_url, const char)                                     \
+  op (exchange_bank_account_url, const char)                       \
+  op (taler_uri, const char)                                       \
+  op (payto_uri, const char)                                       \
+  op (kyc_url, const char)                                         \
+  op (web_url, const char)                                         \
   op (row, const uint64_t)                                         \
-  op (payment_target_uuid, const uint64_t)                         \
+  op (legi_requirement_row, const uint64_t)                        \
   op (array_length, const unsigned int)                            \
-  op (credit_payto_uri, const char *)                              \
-  op (debit_payto_uri, const char *)                               \
-  op (order_id, const char *)                                      \
+  op (credit_payto_uri, const char)                                \
+  op (debit_payto_uri, const char)                                 \
+  op (order_id, const char)                                        \
   op (amount, const struct TALER_Amount)                           \
   op (amount_with_fee, const struct TALER_Amount)                  \
-  op (deposit_amount, const struct TALER_Amount)                   \
-  op (deposit_fee_amount, const struct TALER_Amount)               \
-  op (batch_cmds, struct TALER_TESTING_Command *)                  \
+  op (batch_cmds, struct TALER_TESTING_Command)                    \
   op (uuid, const struct GNUNET_Uuid)                              \
   op (fresh_coins, const struct TALER_TESTING_FreshCoinData *)     \
   op (claim_token, const struct TALER_ClaimTokenP)                 \
   op (relative_time, const struct GNUNET_TIME_Relative)            \
+  op (fakebank, struct TALER_FAKEBANK_Handle)                      \
+  op (keys, struct TALER_EXCHANGE_Keys)                            \
   op (process, struct GNUNET_OS_Process *)
 
 
 /**
  * Call #op on all indexed traits.
  */
-#define TALER_TESTING_INDEXED_TRAITS(op)                               \
-  op (denom_pub, const struct TALER_EXCHANGE_DenomPublicKey)           \
-  op (denom_sig, const struct TALER_DenominationSignature)             \
-  op (age_commitment, const struct TALER_AgeCommitment)                \
-  op (age_commitment_proof, const struct TALER_AgeCommitmentProof)     \
-  op (h_age_commitment, const struct TALER_AgeCommitmentHash)          \
-  op (planchet_secrets, const struct TALER_PlanchetMasterSecretP)      \
-  op (exchange_wd_value, const struct TALER_ExchangeWithdrawValues)    \
-  op (coin_priv, const struct TALER_CoinSpendPrivateKeyP)              \
-  op (coin_pub, const struct TALER_CoinSpendPublicKeyP)                \
-  op (absolute_time, const struct GNUNET_TIME_Absolute)                \
-  op (timestamp, const struct GNUNET_TIME_Timestamp)                   \
-  op (wire_deadline, const struct GNUNET_TIME_Timestamp)               \
-  op (refund_deadline, const struct GNUNET_TIME_Timestamp)             \
-  op (exchange_pub, const struct TALER_ExchangePublicKeyP)             \
-  op (exchange_sig, const struct TALER_ExchangeSignatureP)             \
-  op (blinding_key, const union TALER_DenominationBlindingKeyP)
-
+#define TALER_TESTING_INDEXED_TRAITS(op)                                \
+  op (denom_pub, const struct TALER_EXCHANGE_DenomPublicKey)            \
+  op (denom_sig, const struct TALER_DenominationSignature)              \
+  op (amounts, const struct TALER_Amount)                               \
+  op (deposit_amount, const struct TALER_Amount)                        \
+  op (deposit_fee_amount, const struct TALER_Amount)                    \
+  op (age_commitment, const struct TALER_AgeCommitment)                 \
+  op (age_commitment_proof, const struct TALER_AgeCommitmentProof)      \
+  op (h_age_commitment, const struct TALER_AgeCommitmentHash)           \
+  op (reserve_history, const struct TALER_EXCHANGE_ReserveHistoryEntry) \
+  op (coin_history, const struct TALER_EXCHANGE_CoinHistoryEntry) \
+  op (planchet_secrets, const struct TALER_PlanchetMasterSecretP)       \
+  op (exchange_wd_value, const struct TALER_ExchangeWithdrawValues)     \
+  op (coin_priv, const struct TALER_CoinSpendPrivateKeyP)               \
+  op (coin_pub, const struct TALER_CoinSpendPublicKeyP)                 \
+  op (coin_sig, const struct TALER_CoinSpendSignatureP)                 \
+  op (absolute_time, const struct GNUNET_TIME_Absolute)                 \
+  op (timestamp, const struct GNUNET_TIME_Timestamp)                    \
+  op (wire_deadline, const struct GNUNET_TIME_Timestamp)                \
+  op (refund_deadline, const struct GNUNET_TIME_Timestamp)              \
+  op (exchange_pub, const struct TALER_ExchangePublicKeyP)              \
+  op (exchange_sig, const struct TALER_ExchangeSignatureP)              \
+  op (blinding_key, const union GNUNET_CRYPTO_BlindingSecretP)         \
+  op (h_blinded_coin, const struct TALER_BlindedCoinHashP)
 
 TALER_TESTING_SIMPLE_TRAITS (TALER_TESTING_MAKE_DECL_SIMPLE_TRAIT)
 
diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index ee17557a4..8feb8451c 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2024 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
@@ -16,11 +16,17 @@
 /**
  * @file include/taler_util.h
  * @brief Interface for common utility functions
+ *        This library is not thread-safe, all APIs must only be used from a single thread.
+ *        This library calls abort() if it runs out of memory. Be aware of these limitations.
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @author Christian Grothoff
  */
 #ifndef TALER_UTIL_H
 #define TALER_UTIL_H
 
+#include <gnunet/gnunet_common.h>
+#define __TALER_UTIL_LIB_H_INSIDE__
+
 #include <gnunet/gnunet_util_lib.h>
 #include <microhttpd.h>
 #include "taler_amount_lib.h"
@@ -30,7 +36,7 @@
  * Version of the Taler API, in hex.
  * Thus 0.8.4-1 = 0x00080401.
  */
-#define TALER_API_VERSION 0x00080401
+#define TALER_API_VERSION 0x00090401
 
 /**
  * Stringify operator.
@@ -79,6 +85,22 @@
 
 
 /**
+ * HTTP header with an AML officer signature to approve the inquiry.
+ * Used only in GET Requests.
+ */
+#define TALER_AML_OFFICER_SIGNATURE_HEADER "Taler-AML-Officer-Signature"
+
+/**
+ * Header with signature for reserve history requests.
+ */
+#define TALER_RESERVE_HISTORY_SIGNATURE_HEADER "Taler-Reserve-History-Signature"
+
+/**
+ * Header with signature for coin history requests.
+ */
+#define TALER_COIN_HISTORY_SIGNATURE_HEADER "Taler-Coin-History-Signature"
+
+/**
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
  * by gcry_strerror(rc).
@@ -191,6 +213,101 @@ TALER_config_get_currency (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
 
 /**
+ * Details about how to render a currency.
+ */
+struct TALER_CurrencySpecification
+{
+  /**
+   * Currency code of the currency.
+   */
+  char currency[TALER_CURRENCY_LEN];
+
+  /**
+   * Human-readable long name of the currency, e.g.
+   * "Japanese Yen".
+   */
+  char *name;
+
+  /**
+   * how many digits the user may enter at most after the @e decimal_separator
+   */
+  unsigned int num_fractional_input_digits;
+
+  /**
+   * how many digits we render in normal scale after the @e decimal_separator
+   */
+  unsigned int num_fractional_normal_digits;
+
+  /**
+   * how many digits we render in after the @e decimal_separator even if all
+   * remaining digits are zero.
+   */
+  unsigned int num_fractional_trailing_zero_digits;
+
+  /**
+   * Mapping of powers of 10 to alternative currency names or symbols.
+   * Keys are the decimal powers, values the currency symbol to use.
+   * Map MUST contain an entry for "0" to the default currency symbol.
+   */
+  json_t *map_alt_unit_names;
+
+};
+
+
+/**
+ * Parse information about supported currencies from
+ * our configuration.
+ *
+ * @param cfg configuration to parse
+ * @param[out] num_currencies set to number of enabled currencies, length of @e cspecs
+ * @param[out] cspecs set to currency specification array
+ * @return #GNUNET_OK on success, #GNUNET_NO if zero
+ *  currency specifications were enabled,
+ *  #GNUNET_SYSERR if the configuration was malformed
+ */
+enum GNUNET_GenericReturnValue
+TALER_CONFIG_parse_currencies (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               unsigned int *num_currencies,
+                               struct TALER_CurrencySpecification **cspecs);
+
+
+/**
+ * Free @a cspecs array.
+ *
+ * @param num_currencies length of @a cspecs array
+ * @param[in] cspecs array to free
+ */
+void
+TALER_CONFIG_free_currencies (
+  unsigned int num_currencies,
+  struct TALER_CurrencySpecification cspecs[static num_currencies]);
+
+
+/**
+ * Convert a currency specification to the
+ * respective JSON object.
+ *
+ * @param cspec currency specification
+ * @return JSON object encoding @a cspec for `/config`.
+ */
+json_t *
+TALER_CONFIG_currency_specs_to_json (
+  const struct TALER_CurrencySpecification *cspec);
+
+
+/**
+ * Check that @a map contains a valid currency scale
+ * map that maps integers from [-12,24] to currency
+ * symbols given as strings.
+ *
+ * @param map map to check
+ * @return #GNUNET_OK if @a map is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_check_currency_scale_map (const json_t *map);
+
+
+/**
  * Allow user to specify an amount on the command line.
  *
  * @param shortName short name of the option
@@ -222,6 +339,16 @@ TALER_OS_init (void);
 
 
 /**
+ * Re-encode string at @a inp to match RFC 8785 (section 3.2.2.2).
+ *
+ * @param[in,out] inp pointer to string to re-encode
+ * @return number of bytes in resulting @a inp
+ */
+size_t
+TALER_rfc8785encode (char **inp);
+
+
+/**
  * URL-encode a string according to rfc3986.
  *
  * @param s string to encode
@@ -243,6 +370,17 @@ TALER_url_valid_charset (const char *url);
 
 
 /**
+ * Test if the URL is a valid "http" (or "https")
+ * URL (includes test for #TALER_url_valid_charset()).
+ *
+ * @param url a string to test if it could be a valid URL
+ * @return true if @a url is well-formed
+ */
+bool
+TALER_is_web_url (const char *url);
+
+
+/**
  * Check if @a lang matches the @a language_pattern, and if so with
  * which preference.
  * See also: https://tools.ietf.org/html/rfc7231#section-5.3.1
@@ -278,8 +416,9 @@ TALER_mhd_is_https (struct MHD_Connection *connection);
  * that a NULL value does not terminate the list, only a NULL key signals the
  * end of the list of arguments.
  *
- * @param base_url absolute base URL to use
- * @param path path of the url
+ * @param base_url absolute base URL to use, must either
+ *          end with '/' *or* @a path must be the empty string
+ * @param path path of the url to append to the @a base_url
  * @param ... NULL-terminated key-value pairs (char *) for query parameters,
  *        only the value will be url-encoded
  * @returns the URL, must be freed with #GNUNET_free
@@ -362,16 +501,17 @@ TALER_payto_get_method (const char *payto_uri);
 
 
 /**
- * Construct a payto://-URI from a Taler @a reserve_pub at
- * @a exchange_base_url
+ * Normalize payto://-URI to make "strcmp()" sufficient
+ * to check if two payto-URIs refer to the same bank
+ * account. Removes optional arguments (everything after
+ * "?") and applies method-specific normalizations to
+ * the main part of the URI.
  *
- * @param exchange_base_url the URL of the exchange
- * @param reserve_pub public key of the reserve
- * @return payto:// URI encoding the reserve's address
+ * @param input a payto://-URI
+ * @return normalized URI, or NULL if @a input was not well-formed
  */
 char *
-TALER_payto_from_reserve (const char *exchange_base_url,
-                          const struct TALER_ReservePublicKeyP *reserve_pub);
+TALER_payto_normalize (const char *input);
 
 
 /**
@@ -386,6 +526,16 @@ TALER_xtalerbank_account_from_payto (const char *payto);
 
 
 /**
+ * Obtain the receiver name from a payto URL.
+ *
+ * @param payto an x-taler-bank payto URL
+ * @return only the receiver name from the @a payto URL, NULL if not an x-taler-bank payto URL
+ */
+char *
+TALER_payto_get_receiver_name (const char *payto);
+
+
+/**
  * Extract the subject value from the URI parameters.
  *
  * @param payto_uri the URL to parse
@@ -408,6 +558,19 @@ TALER_payto_validate (const char *payto_uri);
 
 
 /**
+ * Create payto://-URI for a given exchange base URL
+ * and a @a reserve_pub.
+ *
+ * @param exchange_url the base URL of the exchange
+ * @param reserve_pub the public key of the reserve
+ * @return payto://-URI for the reserve (without receiver-name!)
+ */
+char *
+TALER_reserve_make_payto (const char *exchange_url,
+                          const struct TALER_ReservePublicKeyP *reserve_pub);
+
+
+/**
  * Check that an IBAN number is well-formed.
  *
  * Validates given IBAN according to the European Banking Standards.  See:
@@ -471,16 +634,196 @@ TALER_yna_to_string (enum TALER_EXCHANGE_YesNoAll yna);
 
 #ifdef __APPLE__
 /**
- * Returns the first occurence of `c` in `s`, or returns the null-byte
+ * Returns the first occurrence of `c` in `s`, or returns the null-byte
  * terminating the string if it does not occur.
  *
  * @param s the string to search in
  * @param c the character to search for
- * @return char* the first occurence of `c` in `s`
+ * @return char* the first occurrence of `c` in `s`
  */
 char *strchrnul (const char *s, int c);
 
 #endif
 
+/**
+ * @brief Parses a date information into days after 1970-01-01 (or 0)
+ *
+ * The input MUST be of the form
+ *
+ *   1) YYYY-MM-DD, representing a valid date
+ *   2) YYYY-MM-00, representing a valid month in a particular year
+ *   3) YYYY-00-00, representing a valid year.
+ *
+ * In the cases 2) and 3) the out parameter is set to the beginning of the
+ * time, f.e. 1950-00-00 == 1950-01-01 and 1888-03-00 == 1888-03-01
+ *
+ * The output will set to the number of days after 1970-01-01 or 0, if the input
+ * represents a date belonging to the largest allowed age group.
+ *
+ * @param in Input string representation of the date
+ * @param mask Age mask
+ * @param[out] out Where to write the result
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
+ */
+enum GNUNET_GenericReturnValue
+TALER_parse_coarse_date (
+  const char *in,
+  const struct TALER_AgeMask *mask,
+  uint32_t *out);
+
+
+/**
+ * @brief Parses a string as a list of age groups.
+ *
+ * The string must consist of a colon-separated list of increasing integers
+ * between 0 and 31.  Each entry represents the beginning of a new age group.
+ * F.e. the string
+ *
+ *  "8:10:12:14:16:18:21"
+ *
+ * represents the following list of eight age groups:
+ *
+ * | Group |    Ages       |
+ * | -----:|:------------- |
+ * |    0  |  0, 1, ..., 7 |
+ * |    1  |  8, 9         |
+ * |    2  | 10, 11        |
+ * |    3  | 12, 13        |
+ * |    4  | 14, 15        |
+ * |    5  | 16, 17        |
+ * |    6  | 18, 19, 20    |
+ * |    7  | 21, ...       |
+ *
+ * which is then encoded as a bit mask with the corresponding bits set:
+ *
+ *  31     24        16        8         0
+ *  |      |         |         |         |
+ *  oooooooo  oo1oo1o1  o1o1o1o1  ooooooo1
+ *
+ * @param groups String representation of age groups
+ * @param[out] mask Mask representation for age restriction.
+ * @return Error, if age groups were invalid, OK otherwise.
+ */
+enum GNUNET_GenericReturnValue
+TALER_parse_age_group_string (
+  const char *groups,
+  struct TALER_AgeMask *mask);
+
+
+/**
+ * @brief Encodes the age mask into a string, like "8:10:12:14:16:18:21"
+ *
+ * NOTE: This function uses a static buffer.  It is not safe to call this
+ * function concurrently.
+ *
+ * @param mask Age mask
+ * @return String representation of the age mask.
+ *         Can be used as value in the TALER config.
+ */
+const char *
+TALER_age_mask_to_string (
+  const struct TALER_AgeMask *mask);
+
+
+/**
+ * @brief returns the age group of a given age for a given age mask
+ *
+ * @param mask Age mask
+ * @param age The given age
+ * @return age group
+ */
+uint8_t
+TALER_get_age_group (
+  const struct TALER_AgeMask *mask,
+  uint8_t age);
+
+
+/**
+ * @brief Parses a JSON object { "age_groups": "a:b:...y:z" }.
+ *
+ * @param root is the json object
+ * @param[out] mask on success, will contain the age mask
+ * @return #GNUNET_OK on success and #GNUNET_SYSERR on failure.
+ */
+enum GNUNET_GenericReturnValue
+TALER_JSON_parse_age_groups (const json_t *root,
+                             struct TALER_AgeMask *mask);
+
+
+/**
+ * @brief Return the lowest age in the corresponding group for a given age
+ * according the given age mask.
+ *
+ * @param mask age mask
+ * @param age age to check
+ * @return lowest age in corresponding age group
+ */
+uint8_t
+TALER_get_lowest_age (
+  const struct TALER_AgeMask *mask,
+  uint8_t age);
+
+
+/**
+ * @brief Get the lowest age for the largest age group
+ *
+ * @param mask the age mask
+ * @return lowest age for the largest age group
+ */
+#define TALER_adult_age(mask) \
+  sizeof((mask)->bits) * 8 - __builtin_clz ((mask)->bits) - 1
+
+/**
+ * Handle to an external process that will assist
+ * with some JSON-to-JSON conversion.
+ */
+struct TALER_JSON_ExternalConversion;
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure
+ * @param status_type how did the process die
+ * @param code termination status code from the process
+ * @param result some JSON result, NULL if we failed to get an JSON output
+ */
+typedef void
+(*TALER_JSON_JsonCallback) (void *cls,
+                            enum GNUNET_OS_ProcessStatusType status_type,
+                            unsigned long code,
+                            const json_t *result);
+
+
+/**
+ * Launch some external helper @a binary to convert some @a input
+ * and eventually call @a cb with the result.
+ *
+ * @param input JSON to serialize and pass to the helper process
+ * @param cb function to call on the result
+ * @param cb_cls closure for @a cb
+ * @param binary name of the binary to execute
+ * @param ... NULL-terminated list of arguments for the @a binary,
+ *        usually starting with again the name of the binary
+ * @return handle to cancel the operation (and kill the helper)
+ */
+struct TALER_JSON_ExternalConversion *
+TALER_JSON_external_conversion_start (const json_t *input,
+                                      TALER_JSON_JsonCallback cb,
+                                      void *cb_cls,
+                                      const char *binary,
+                                      ...);
+
+/**
+ * Abort external conversion, killing the process and preventing
+ * the callback from being called. Must not be called after the
+ * callback was invoked.
+ *
+ * @param[in] ec external conversion handle to cancel
+ */
+void
+TALER_JSON_external_conversion_stop (
+  struct TALER_JSON_ExternalConversion *ec);
+
+#undef __TALER_UTIL_LIB_H_INSIDE__
 
 #endif
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 2f5ec3f17..ce863cb7e 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -16,7 +16,7 @@ libtalerjson_la_SOURCES = \
   json_pack.c \
   json_wire.c
 libtalerjson_la_LDFLAGS = \
-  -version-info 1:0:1 \
+  -version-info 3:0:1 \
   -no-undefined
 libtalerjson_la_LIBADD = \
   $(top_builddir)/src/util/libtalerutil.la \
@@ -28,12 +28,10 @@ libtalerjson_la_LIBADD = \
   $(XLIB)
 
 TESTS = \
-  test_json \
-  test_json_wire
+  test_json
 
 check_PROGRAMS= \
-  test_json \
-  test_json_wire
+  test_json
 
 test_json_SOURCES = \
   test_json.c
@@ -43,13 +41,3 @@ test_json_LDADD = \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetutil \
   -ljansson
-
-
-test_json_wire_SOURCES = \
-  test_json_wire.c
-test_json_wire_LDADD = \
-  $(top_builddir)/src/json/libtalerjson.la \
-  -lgnunetjson \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunetutil \
-  -ljansson
diff --git a/src/json/json.c b/src/json/json.c
index d4ac37489..639bd530c 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -62,170 +62,6 @@ contains_real (const json_t *json)
 
 
 /**
- * Dump character in the low range into @a buf
- * following RFC 8785.
- *
- * @param[in,out] buf buffer to modify
- * @param val value to dump
- */
-static void
-lowdump (struct GNUNET_Buffer *buf,
-         unsigned char val)
-{
-  char scratch[7];
-
-  switch (val)
-  {
-  case 0x8:
-    GNUNET_buffer_write (buf,
-                         "\\b",
-                         2);
-    break;
-  case 0x9:
-    GNUNET_buffer_write (buf,
-                         "\\t",
-                         2);
-    break;
-  case 0xA:
-    GNUNET_buffer_write (buf,
-                         "\\n",
-                         2);
-    break;
-  case 0xC:
-    GNUNET_buffer_write (buf,
-                         "\\f",
-                         2);
-    break;
-  case 0xD:
-    GNUNET_buffer_write (buf,
-                         "\\r",
-                         2);
-    break;
-  default:
-    GNUNET_snprintf (scratch,
-                     sizeof (scratch),
-                     "\\u%04x",
-                     (unsigned int) val);
-    GNUNET_buffer_write (buf,
-                         scratch,
-                         6);
-    break;
-  }
-}
-
-
-/**
- * Re-encode string at @a inp to match RFC 8785 (section 3.2.2.2).
- *
- * @param[in,out] inp pointer to string to re-encode
- * @return number of bytes in resulting @a inp
- */
-static size_t
-rfc8785encode (char **inp)
-{
-  struct GNUNET_Buffer buf = { 0 };
-  size_t left = strlen (*inp) + 1;
-  size_t olen;
-  char *in = *inp;
-  const char *pos = in;
-
-  GNUNET_buffer_prealloc (&buf,
-                          left + 40);
-  buf.warn_grow = 0; /* disable, + 40 is just a wild guess */
-  while (1)
-  {
-    int mbl = u8_mblen ((unsigned char *) pos,
-                        left);
-    unsigned char val;
-
-    if (0 == mbl)
-      break;
-    val = (unsigned char) *pos;
-    if ( (1 == mbl) &&
-         (val <= 0x1F) )
-    {
-      /* Should not happen, as input is produced by
-       * JSON stringification */
-      GNUNET_break (0);
-      lowdump (&buf,
-               val);
-    }
-    else if ( (1 == mbl) && ('\\' == *pos) )
-    {
-      switch (*(pos + 1))
-      {
-      case '\\':
-        mbl = 2;
-        GNUNET_buffer_write (&buf,
-                             pos,
-                             mbl);
-        break;
-      case 'u':
-        {
-          unsigned int num;
-          uint32_t n32;
-          unsigned char res[8];
-          size_t rlen;
-
-          GNUNET_assert ( (1 ==
-                           sscanf (pos + 2,
-                                   "%4x",
-                                   &num)) ||
-                          (1 ==
-                           sscanf (pos + 2,
-                                   "%4X",
-                                   &num)) );
-          mbl = 6;
-          n32 = (uint32_t) num;
-          rlen = sizeof (res);
-          u32_to_u8 (&n32,
-                     1,
-                     res,
-                     &rlen);
-          if ( (1 == rlen) &&
-               (res[0] <= 0x1F) )
-          {
-            lowdump (&buf,
-                     res[0]);
-          }
-          else
-          {
-            GNUNET_buffer_write (&buf,
-                                 (const char *) res,
-                                 rlen);
-          }
-        }
-        break;
-      default:
-        mbl = 2;
-        GNUNET_buffer_write (&buf,
-                             pos,
-                             mbl);
-        break;
-      }
-    }
-    else
-    {
-      GNUNET_buffer_write (&buf,
-                           pos,
-                           mbl);
-    }
-    left -= mbl;
-    pos += mbl;
-  }
-
-  /* 0-terminate buffer */
-  GNUNET_buffer_write (&buf,
-                       "",
-                       1);
-  GNUNET_free (in);
-  *inp = GNUNET_buffer_reap (&buf,
-                             &olen);
-  return olen;
-}
-
-
-/**
  * Dump the @a json to a string and hash it.
  *
  * @param json value to hash
@@ -262,7 +98,7 @@ dump_and_hash (const json_t *json,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  len = rfc8785encode (&wire_enc);
+  len = TALER_rfc8785encode (&wire_enc);
   if (NULL == salt)
   {
     GNUNET_CRYPTO_hash (wire_enc,
@@ -697,7 +533,7 @@ TALER_JSON_contract_part_forget (json_t *json,
 
 
 /**
- * Look over all of the values of a '$forgettable' object.  Replace 'True'
+ * Loop over all of the values of a '$forgettable' object.  Replace 'True'
  * values with proper random salts.  Fails if any forgettable values are
  * neither 'True' nor valid salts (strings).
  *
@@ -742,51 +578,64 @@ seed_forgettable (json_t *f)
 }
 
 
-/**
- * Take a given contract with "forgettable" fields marked
- * but with 'True' instead of a real salt. Replaces all
- * 'True' values with proper random salts.  Fails if any
- * forgettable markers are neither 'True' nor valid salts.
- *
- * @param[in,out] json JSON to transform
- * @return #GNUNET_OK on success
- */
 enum GNUNET_GenericReturnValue
-TALER_JSON_contract_seed_forgettable (json_t *json)
+TALER_JSON_contract_seed_forgettable (const json_t *spec,
+                                      json_t *contract)
 {
-  if (json_is_object (json))
+  if (json_is_object (spec))
   {
     const char *key;
     json_t *val;
 
-    json_object_foreach (json,
+    json_object_foreach ((json_t *) spec,
                          key,
                          val)
     {
+      json_t *cval = json_object_get (contract,
+                                      key);
+
       if (0 == strcmp ("$forgettable",
                        key))
       {
+        json_t *xval = json_deep_copy (val);
+
         if (GNUNET_OK !=
-            seed_forgettable (val))
+            seed_forgettable (xval))
+        {
+          json_decref (xval);
           return GNUNET_SYSERR;
+        }
+        GNUNET_assert (0 ==
+                       json_object_set_new (contract,
+                                            "$forgettable",
+                                            xval));
         continue;
       }
+      if (NULL == cval)
+        continue;
       if (GNUNET_OK !=
-          TALER_JSON_contract_seed_forgettable (val))
+          TALER_JSON_contract_seed_forgettable (val,
+                                                cval))
         return GNUNET_SYSERR;
     }
   }
-  if (json_is_array (json))
+  if (json_is_array (spec))
   {
     size_t index;
     json_t *val;
 
-    json_array_foreach (json,
+    json_array_foreach ((json_t *) spec,
                         index,
                         val)
     {
+      json_t *ival = json_array_get (contract,
+                                     index);
+
+      if (NULL == ival)
+        continue;
       if (GNUNET_OK !=
-          TALER_JSON_contract_seed_forgettable (val))
+          TALER_JSON_contract_seed_forgettable (val,
+                                                ival))
         return GNUNET_SYSERR;
     }
   }
@@ -819,6 +668,7 @@ parse_path (json_t *obj,
   json_t *next_obj = NULL;
   char *next_dot;
 
+  GNUNET_assert (NULL != id); /* make stupid compiler happy */
   if (NULL == next_id)
   {
     cb (cb_cls,
@@ -1008,12 +858,12 @@ TALER_JSON_get_error_code2 (const void *data,
 
 
 void
-TALER_deposit_extension_hash (const json_t *extensions,
-                              struct TALER_ExtensionContractHashP *ech)
+TALER_deposit_policy_hash (const json_t *policy,
+                           struct TALER_ExtensionPolicyHashP *ech)
 {
   GNUNET_assert (GNUNET_OK ==
-                 dump_and_hash (extensions,
-                                "taler-contract-extensions",
+                 dump_and_hash (policy,
+                                "taler-extensions-policy",
                                 &ech->hash));
 }
 
@@ -1031,17 +881,17 @@ TALER_JSON_canonicalize (const json_t *input)
     GNUNET_break (0);
     return NULL;
   }
-  rfc8785encode (&wire_enc);
+  TALER_rfc8785encode (&wire_enc);
   return wire_enc;
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_JSON_extensions_config_hash (const json_t *config,
-                                   struct TALER_ExtensionConfigHashP *ech)
+TALER_JSON_extensions_manifests_hash (const json_t *manifests,
+                                      struct TALER_ExtensionManifestsHashP *ech)
 {
-  return dump_and_hash (config,
-                        "taler-extension-configuration",
+  return dump_and_hash (manifests,
+                        "taler-extensions-manifests",
                         &ech->hash);
 }
 
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 4896fb598..0a533610b 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -32,16 +32,20 @@
  * @param cipher_s input string
  * @return numeric cipher value
  */
-static enum TALER_DenominationCipher
+static enum GNUNET_CRYPTO_BlindSignatureAlgorithm
 string_to_cipher (const char *cipher_s)
 {
-  if (0 == strcasecmp (cipher_s,
-                       "RSA"))
-    return TALER_DENOMINATION_RSA;
-  if (0 == strcasecmp (cipher_s,
-                       "CS"))
-    return TALER_DENOMINATION_CS;
-  return TALER_DENOMINATION_INVALID;
+  if ((0 == strcasecmp (cipher_s,
+                        "RSA")) ||
+      (0 == strcasecmp (cipher_s,
+                        "RSA+age_restricted")))
+    return GNUNET_CRYPTO_BSA_RSA;
+  if ((0 == strcasecmp (cipher_s,
+                        "CS")) ||
+      (0 == strcasecmp (cipher_s,
+                        "CS+age_restricted")))
+    return GNUNET_CRYPTO_BSA_CS;
+  return GNUNET_CRYPTO_BSA_INVALID;
 }
 
 
@@ -60,17 +64,6 @@ TALER_JSON_from_amount (const struct TALER_Amount *amount)
 }
 
 
-json_t *
-TALER_JSON_from_amount_nbo (const struct TALER_AmountNBO *amount)
-{
-  struct TALER_Amount a;
-
-  TALER_amount_ntoh (&a,
-                     amount);
-  return TALER_JSON_from_amount (&a);
-}
-
-
 /**
  * Parse given JSON object to Amount
  *
@@ -106,6 +99,11 @@ parse_amount (void *cls,
                     r_amount->currency)) )
   {
     GNUNET_break_op (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Expected currency `%s', but amount used currency `%s' in field `%s'\n",
+                currency,
+                r_amount->currency,
+                spec->field);
     return GNUNET_SYSERR;
   }
   return GNUNET_OK;
@@ -151,7 +149,7 @@ TALER_JSON_spec_amount_any (const char *name,
 
 
 /**
- * Parse given JSON object to Amount in NBO.
+ * Parse given JSON object to currency spec.
  *
  * @param cls closure, NULL
  * @param root the json object representing data
@@ -159,75 +157,375 @@ TALER_JSON_spec_amount_any (const char *name,
  * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
  */
 static enum GNUNET_GenericReturnValue
-parse_amount_nbo (void *cls,
-                  json_t *root,
-                  struct GNUNET_JSON_Specification *spec)
+parse_cspec (void *cls,
+             json_t *root,
+             struct GNUNET_JSON_Specification *spec)
 {
-  const char *currency = cls;
-  struct TALER_AmountNBO *r_amount = spec->ptr;
-  const char *sv;
+  struct TALER_CurrencySpecification *r_cspec = spec->ptr;
+  const char *currency = spec->cls;
+  const char *name;
+  uint32_t fid;
+  uint32_t fnd;
+  uint32_t ftzd;
+  const json_t *map;
+  struct GNUNET_JSON_Specification gspec[] = {
+    GNUNET_JSON_spec_string ("name",
+                             &name),
+    GNUNET_JSON_spec_uint32 ("num_fractional_input_digits",
+                             &fid),
+    GNUNET_JSON_spec_uint32 ("num_fractional_normal_digits",
+                             &fnd),
+    GNUNET_JSON_spec_uint32 ("num_fractional_trailing_zero_digits",
+                             &ftzd),
+    GNUNET_JSON_spec_object_const ("alt_unit_names",
+                                   &map),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
 
-  (void) cls;
-  if (! json_is_string (root))
+  memset (r_cspec->currency,
+          0,
+          sizeof (r_cspec->currency));
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         gspec,
+                         &emsg,
+                         &eline))
   {
-    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to parse %s at %u: %s\n",
+                spec[eline].field,
+                eline,
+                emsg);
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (strlen (currency) >= TALER_CURRENCY_LEN)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ( (fid > TALER_AMOUNT_FRAC_LEN) ||
+       (fnd > TALER_AMOUNT_FRAC_LEN) ||
+       (ftzd > TALER_AMOUNT_FRAC_LEN) )
+  {
+    GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  sv = json_string_value (root);
   if (GNUNET_OK !=
-      TALER_string_to_amount_nbo (sv,
-                                  r_amount))
+      TALER_check_currency (currency))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "`%s' is not a valid amount\n",
-                sv);
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if ( (NULL != currency) &&
-       (0 !=
-        strcasecmp (currency,
-                    r_amount->currency)) )
+  strcpy (r_cspec->currency,
+          currency);
+  if (GNUNET_OK !=
+      TALER_check_currency_scale_map (map))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
+  r_cspec->name = GNUNET_strdup (name);
+  r_cspec->map_alt_unit_names = json_incref ((json_t *) map);
   return GNUNET_OK;
 }
 
 
+/**
+ * Cleanup data left from parsing encrypted contract.
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_cspec (void *cls,
+             struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_CurrencySpecification *cspec = spec->ptr;
+
+  (void) cls;
+  GNUNET_free (cspec->name);
+  json_decref (cspec->map_alt_unit_names);
+}
+
+
 struct GNUNET_JSON_Specification
-TALER_JSON_spec_amount_nbo (const char *name,
-                            const char *currency,
-                            struct TALER_AmountNBO *r_amount)
+TALER_JSON_spec_currency_specification (
+  const char *name,
+  const char *currency,
+  struct TALER_CurrencySpecification *r_cspec)
 {
   struct GNUNET_JSON_Specification ret = {
-    .parser = &parse_amount_nbo,
-    .cleaner = NULL,
+    .parser = &parse_cspec,
+    .cleaner = &clean_cspec,
     .cls = (void *) currency,
     .field = name,
-    .ptr = r_amount,
-    .ptr_size = 0,
+    .ptr = r_cspec,
+    .ptr_size = sizeof (*r_cspec),
     .size_ptr = NULL
   };
 
-  GNUNET_assert (NULL != currency);
+  memset (r_cspec,
+          0,
+          sizeof (*r_cspec));
   return ret;
 }
 
 
+static enum GNUNET_GenericReturnValue
+parse_denomination_group (void *cls,
+                          json_t *root,
+                          struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_DenominationGroup *group = spec->ptr;
+  const char *cipher;
+  const char *currency = cls;
+  bool age_mask_missing = false;
+  bool has_age_restricted_suffix = false;
+  struct GNUNET_JSON_Specification gspec[] = {
+    GNUNET_JSON_spec_string ("cipher",
+                             &cipher),
+    TALER_JSON_spec_amount ("value",
+                            currency,
+                            &group->value),
+    TALER_JSON_SPEC_DENOM_FEES ("fee",
+                                currency,
+                                &group->fees),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_uint32 ("age_mask",
+                               &group->age_mask.bits),
+      &age_mask_missing),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         gspec,
+                         &emsg,
+                         &eline))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to parse %s at %u: %s\n",
+                spec[eline].field,
+                eline,
+                emsg);
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  group->cipher = string_to_cipher (cipher);
+  if (GNUNET_CRYPTO_BSA_INVALID == group->cipher)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  /* age_mask and suffix must be consistent */
+  has_age_restricted_suffix =
+    (NULL != strstr (cipher, "+age_restricted"));
+  if (has_age_restricted_suffix && age_mask_missing)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  if (age_mask_missing)
+    group->age_mask.bits = 0;
+
+  return GNUNET_OK;
+}
+
+
 struct GNUNET_JSON_Specification
-TALER_JSON_spec_amount_any_nbo (const char *name,
-                                struct TALER_AmountNBO *r_amount)
+TALER_JSON_spec_denomination_group (const char *name,
+                                    const char *currency,
+                                    struct TALER_DenominationGroup *group)
 {
   struct GNUNET_JSON_Specification ret = {
-    .parser = &parse_amount_nbo,
-    .cleaner = NULL,
-    .cls = NULL,
+    .cls = (void *) currency,
+    .parser = &parse_denomination_group,
     .field = name,
-    .ptr = r_amount,
-    .ptr_size = 0,
-    .size_ptr = NULL
+    .ptr = group,
+    .ptr_size = sizeof(*group)
+  };
+
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to an encrypted contract.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_econtract (void *cls,
+                 json_t *root,
+                 struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_EncryptedContract *econtract = spec->ptr;
+  struct GNUNET_JSON_Specification ispec[] = {
+    GNUNET_JSON_spec_varsize ("econtract",
+                              &econtract->econtract,
+                              &econtract->econtract_size),
+    GNUNET_JSON_spec_fixed_auto ("econtract_sig",
+                                 &econtract->econtract_sig),
+    GNUNET_JSON_spec_fixed_auto ("contract_pub",
+                                 &econtract->contract_pub),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
+
+  (void) cls;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         ispec,
+                         &emsg,
+                         &eline))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Cleanup data left from parsing encrypted contract.
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_econtract (void *cls,
+                 struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_EncryptedContract *econtract = spec->ptr;
+
+  (void) cls;
+  GNUNET_free (econtract->econtract);
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_econtract (const char *name,
+                           struct TALER_EncryptedContract *econtract)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_econtract,
+    .cleaner = &clean_econtract,
+    .field = name,
+    .ptr = econtract
+  };
+
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to an age commitmnet
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_age_commitment (void *cls,
+                      json_t *root,
+                      struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_AgeCommitment *age_commitment = spec->ptr;
+  json_t *pk;
+  unsigned int idx;
+  size_t num;
+
+  (void) cls;
+  if ( (NULL == root) ||
+       (! json_is_array (root)))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  num = json_array_size (root);
+  if (32 <= num || 0 == num)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  age_commitment->num = num;
+  age_commitment->keys =
+    GNUNET_new_array (num,
+                      struct TALER_AgeCommitmentPublicKeyP);
+
+  json_array_foreach (root, idx, pk) {
+    const char *emsg;
+    unsigned int eline;
+    struct GNUNET_JSON_Specification pkspec[] = {
+      GNUNET_JSON_spec_fixed_auto (
+        NULL,
+        &age_commitment->keys[idx].pub),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (pk,
+                           pkspec,
+                           &emsg,
+                           &eline))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (spec);
+      return GNUNET_SYSERR;
+    }
+  };
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Cleanup data left from parsing age commitment
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_age_commitment (void *cls,
+                      struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_AgeCommitment *age_commitment = spec->ptr;
+
+  (void) cls;
+
+  if (NULL == age_commitment ||
+      NULL == age_commitment->keys)
+    return;
+
+  age_commitment->num = 0;
+  GNUNET_free (age_commitment->keys);
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_age_commitment (const char *name,
+                                struct TALER_AgeCommitment *age_commitment)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_age_commitment,
+    .cleaner = &clean_age_commitment,
+    .field = name,
+    .ptr = age_commitment
   };
 
   return ret;
@@ -248,12 +546,16 @@ parse_denom_pub (void *cls,
                  struct GNUNET_JSON_Specification *spec)
 {
   struct TALER_DenominationPublicKey *denom_pub = spec->ptr;
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bsign_pub;
   const char *cipher;
+  bool age_mask_missing = false;
   struct GNUNET_JSON_Specification dspec[] = {
     GNUNET_JSON_spec_string ("cipher",
                              &cipher),
-    GNUNET_JSON_spec_uint32 ("age_mask",
-                             &denom_pub->age_mask.bits),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_uint32 ("age_mask",
+                               &denom_pub->age_mask.bits),
+      &age_mask_missing),
     GNUNET_JSON_spec_end ()
   };
   const char *emsg;
@@ -269,15 +571,22 @@ parse_denom_pub (void *cls,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  denom_pub->cipher = string_to_cipher (cipher);
-  switch (denom_pub->cipher)
+
+  if (age_mask_missing)
+    denom_pub->age_mask.bits = 0;
+  bsign_pub = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+  bsign_pub->rc = 1;
+  bsign_pub->cipher = string_to_cipher (cipher);
+  switch (bsign_pub->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_rsa_public_key (
           "rsa_public_key",
-          &denom_pub->details.rsa_public_key),
+          &bsign_pub->details.rsa_public_key),
         GNUNET_JSON_spec_end ()
       };
 
@@ -288,16 +597,18 @@ parse_denom_pub (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (bsign_pub);
         return GNUNET_SYSERR;
       }
+      denom_pub->bsign_pub_key = bsign_pub;
       return GNUNET_OK;
     }
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_fixed ("cs_public_key",
-                                &denom_pub->details.cs_public_key,
-                                sizeof (denom_pub->details.cs_public_key)),
+                                &bsign_pub->details.cs_public_key,
+                                sizeof (bsign_pub->details.cs_public_key)),
         GNUNET_JSON_spec_end ()
       };
 
@@ -308,14 +619,16 @@ parse_denom_pub (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (bsign_pub);
         return GNUNET_SYSERR;
       }
+      denom_pub->bsign_pub_key = bsign_pub;
       return GNUNET_OK;
     }
-  default:
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
+  GNUNET_break_op (0);
+  GNUNET_free (bsign_pub);
+  return GNUNET_SYSERR;
 }
 
 
@@ -347,6 +660,105 @@ TALER_JSON_spec_denom_pub (const char *field,
     .ptr = pk
   };
 
+  pk->bsign_pub_key = NULL;
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object partially into a denomination public key.
+ *
+ * Depending on the cipher in cls, it parses the corresponding public key type.
+ *
+ * @param cls closure, enum GNUNET_CRYPTO_BlindSignatureAlgorithm
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_denom_pub_cipher (void *cls,
+                        json_t *root,
+                        struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_DenominationPublicKey *denom_pub = spec->ptr;
+  enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher =
+    (enum GNUNET_CRYPTO_BlindSignatureAlgorithm) (long) cls;
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bsign_pub;
+  const char *emsg;
+  unsigned int eline;
+
+  bsign_pub = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+  bsign_pub->cipher = cipher;
+  bsign_pub->rc = 1;
+  switch (cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_rsa_public_key (
+          "rsa_pub",
+          &bsign_pub->details.rsa_public_key),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (bsign_pub);
+        return GNUNET_SYSERR;
+      }
+      denom_pub->bsign_pub_key = bsign_pub;
+      return GNUNET_OK;
+    }
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_fixed ("cs_pub",
+                                &bsign_pub->details.cs_public_key,
+                                sizeof (bsign_pub->details.cs_public_key)),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (bsign_pub);
+        return GNUNET_SYSERR;
+      }
+      denom_pub->bsign_pub_key = bsign_pub;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_break_op (0);
+  GNUNET_free (bsign_pub);
+  return GNUNET_SYSERR;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_denom_pub_cipher (const char *field,
+                                  enum GNUNET_CRYPTO_BlindSignatureAlgorithm
+                                  cipher,
+                                  struct TALER_DenominationPublicKey *pk)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_denom_pub_cipher,
+    .cleaner = &clean_denom_pub,
+    .field = field,
+    .cls = (void *) cipher,
+    .ptr = pk
+  };
+
   return ret;
 }
 
@@ -365,6 +777,7 @@ parse_denom_sig (void *cls,
                  struct GNUNET_JSON_Specification *spec)
 {
   struct TALER_DenominationSignature *denom_sig = spec->ptr;
+  struct GNUNET_CRYPTO_UnblindedSignature *unblinded_sig;
   const char *cipher;
   struct GNUNET_JSON_Specification dspec[] = {
     GNUNET_JSON_spec_string ("cipher",
@@ -384,15 +797,19 @@ parse_denom_sig (void *cls,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  denom_sig->cipher = string_to_cipher (cipher);
-  switch (denom_sig->cipher)
+  unblinded_sig = GNUNET_new (struct GNUNET_CRYPTO_UnblindedSignature);
+  unblinded_sig->cipher = string_to_cipher (cipher);
+  unblinded_sig->rc = 1;
+  switch (unblinded_sig->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_rsa_signature (
           "rsa_signature",
-          &denom_sig->details.rsa_signature),
+          &unblinded_sig->details.rsa_signature),
         GNUNET_JSON_spec_end ()
       };
 
@@ -403,17 +820,21 @@ parse_denom_sig (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (unblinded_sig);
         return GNUNET_SYSERR;
       }
+      denom_sig->unblinded_sig = unblinded_sig;
       return GNUNET_OK;
     }
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_fixed_auto ("cs_signature_r",
-                                     &denom_sig->details.cs_signature.r_point),
+                                     &unblinded_sig->details.cs_signature.
+                                     r_point),
         GNUNET_JSON_spec_fixed_auto ("cs_signature_s",
-                                     &denom_sig->details.cs_signature.s_scalar),
+                                     &unblinded_sig->details.cs_signature.
+                                     s_scalar),
         GNUNET_JSON_spec_end ()
       };
 
@@ -424,14 +845,16 @@ parse_denom_sig (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (unblinded_sig);
         return GNUNET_SYSERR;
       }
+      denom_sig->unblinded_sig = unblinded_sig;
       return GNUNET_OK;
     }
-  default:
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
+  GNUNET_break_op (0);
+  GNUNET_free (unblinded_sig);
+  return GNUNET_SYSERR;
 }
 
 
@@ -463,6 +886,7 @@ TALER_JSON_spec_denom_sig (const char *field,
     .ptr = sig
   };
 
+  sig->unblinded_sig = NULL;
   return ret;
 }
 
@@ -481,6 +905,7 @@ parse_blinded_denom_sig (void *cls,
                          struct GNUNET_JSON_Specification *spec)
 {
   struct TALER_BlindedDenominationSignature *denom_sig = spec->ptr;
+  struct GNUNET_CRYPTO_BlindedSignature *blinded_sig;
   const char *cipher;
   struct GNUNET_JSON_Specification dspec[] = {
     GNUNET_JSON_spec_string ("cipher",
@@ -500,15 +925,19 @@ parse_blinded_denom_sig (void *cls,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  denom_sig->cipher = string_to_cipher (cipher);
-  switch (denom_sig->cipher)
+  blinded_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+  blinded_sig->cipher = string_to_cipher (cipher);
+  blinded_sig->rc = 1;
+  switch (blinded_sig->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_rsa_signature (
           "blinded_rsa_signature",
-          &denom_sig->details.blinded_rsa_signature),
+          &blinded_sig->details.blinded_rsa_signature),
         GNUNET_JSON_spec_end ()
       };
 
@@ -519,17 +948,19 @@ parse_blinded_denom_sig (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (blinded_sig);
         return GNUNET_SYSERR;
       }
+      denom_sig->blinded_sig = blinded_sig;
       return GNUNET_OK;
     }
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_uint32 ("b",
-                                 &denom_sig->details.blinded_cs_answer.b),
+                                 &blinded_sig->details.blinded_cs_answer.b),
         GNUNET_JSON_spec_fixed_auto ("s",
-                                     &denom_sig->details.blinded_cs_answer.
+                                     &blinded_sig->details.blinded_cs_answer.
                                      s_scalar),
         GNUNET_JSON_spec_end ()
       };
@@ -541,15 +972,16 @@ parse_blinded_denom_sig (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (blinded_sig);
         return GNUNET_SYSERR;
       }
+      denom_sig->blinded_sig = blinded_sig;
       return GNUNET_OK;
     }
-    break;
-  default:
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
+  GNUNET_break_op (0);
+  GNUNET_free (blinded_sig);
+  return GNUNET_SYSERR;
 }
 
 
@@ -582,6 +1014,7 @@ TALER_JSON_spec_blinded_denom_sig (
     .ptr = sig
   };
 
+  sig->blinded_sig = NULL;
   return ret;
 }
 
@@ -600,6 +1033,7 @@ parse_blinded_planchet (void *cls,
                         struct GNUNET_JSON_Specification *spec)
 {
   struct TALER_BlindedPlanchet *blinded_planchet = spec->ptr;
+  struct GNUNET_CRYPTO_BlindedMessage *blinded_message;
   const char *cipher;
   struct GNUNET_JSON_Specification dspec[] = {
     GNUNET_JSON_spec_string ("cipher",
@@ -619,16 +1053,20 @@ parse_blinded_planchet (void *cls,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  blinded_planchet->cipher = string_to_cipher (cipher);
-  switch (blinded_planchet->cipher)
+  blinded_message = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+  blinded_message->rc = 1;
+  blinded_message->cipher = string_to_cipher (cipher);
+  switch (blinded_message->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_varsize (
           "rsa_blinded_planchet",
-          &blinded_planchet->details.rsa_blinded_planchet.blinded_msg,
-          &blinded_planchet->details.rsa_blinded_planchet.blinded_msg_size),
+          &blinded_message->details.rsa_blinded_message.blinded_msg,
+          &blinded_message->details.rsa_blinded_message.blinded_msg_size),
         GNUNET_JSON_spec_end ()
       };
 
@@ -639,22 +1077,24 @@ parse_blinded_planchet (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (blinded_message);
         return GNUNET_SYSERR;
       }
+      blinded_planchet->blinded_message = blinded_message;
       return GNUNET_OK;
     }
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_fixed_auto (
           "cs_nonce",
-          &blinded_planchet->details.cs_blinded_planchet.nonce),
+          &blinded_message->details.cs_blinded_message.nonce),
         GNUNET_JSON_spec_fixed_auto (
           "cs_blinded_c0",
-          &blinded_planchet->details.cs_blinded_planchet.c[0]),
+          &blinded_message->details.cs_blinded_message.c[0]),
         GNUNET_JSON_spec_fixed_auto (
           "cs_blinded_c1",
-          &blinded_planchet->details.cs_blinded_planchet.c[1]),
+          &blinded_message->details.cs_blinded_message.c[1]),
         GNUNET_JSON_spec_end ()
       };
 
@@ -665,15 +1105,16 @@ parse_blinded_planchet (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (blinded_message);
         return GNUNET_SYSERR;
       }
+      blinded_planchet->blinded_message = blinded_message;
       return GNUNET_OK;
     }
-    break;
-  default:
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
+  GNUNET_break_op (0);
+  GNUNET_free (blinded_message);
+  return GNUNET_SYSERR;
 }
 
 
@@ -705,6 +1146,7 @@ TALER_JSON_spec_blinded_planchet (const char *field,
     .ptr = blinded_planchet
   };
 
+  blinded_planchet->blinded_message = NULL;
   return ret;
 }
 
@@ -723,6 +1165,7 @@ parse_exchange_withdraw_values (void *cls,
                                 struct GNUNET_JSON_Specification *spec)
 {
   struct TALER_ExchangeWithdrawValues *ewv = spec->ptr;
+  struct GNUNET_CRYPTO_BlindingInputValues *bi;
   const char *cipher;
   struct GNUNET_JSON_Specification dspec[] = {
     GNUNET_JSON_spec_string ("cipher",
@@ -731,6 +1174,7 @@ parse_exchange_withdraw_values (void *cls,
   };
   const char *emsg;
   unsigned int eline;
+  enum GNUNET_CRYPTO_BlindSignatureAlgorithm ci;
 
   (void) cls;
   if (GNUNET_OK !=
@@ -742,21 +1186,27 @@ parse_exchange_withdraw_values (void *cls,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  ewv->cipher = string_to_cipher (cipher);
-  switch (ewv->cipher)
+  ci = string_to_cipher (cipher);
+  switch (ci)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    ewv->blinding_inputs = TALER_denom_ewv_rsa_singleton ()->blinding_inputs;
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
+    bi = GNUNET_new (struct GNUNET_CRYPTO_BlindingInputValues);
+    bi->cipher = GNUNET_CRYPTO_BSA_CS;
+    bi->rc = 1;
     {
       struct GNUNET_JSON_Specification ispec[] = {
         GNUNET_JSON_spec_fixed (
           "r_pub_0",
-          &ewv->details.cs_values.r_pub[0],
+          &bi->details.cs_values.r_pub[0],
           sizeof (struct GNUNET_CRYPTO_CsRPublic)),
         GNUNET_JSON_spec_fixed (
           "r_pub_1",
-          &ewv->details.cs_values.r_pub[1],
+          &bi->details.cs_values.r_pub[1],
           sizeof (struct GNUNET_CRYPTO_CsRPublic)),
         GNUNET_JSON_spec_end ()
       };
@@ -768,28 +1218,49 @@ parse_exchange_withdraw_values (void *cls,
                              &eline))
       {
         GNUNET_break_op (0);
+        GNUNET_free (bi);
         return GNUNET_SYSERR;
       }
+      ewv->blinding_inputs = bi;
       return GNUNET_OK;
     }
-  default:
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
   }
+  GNUNET_break_op (0);
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Cleanup data left from parsing withdraw values
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_exchange_withdraw_values (
+  void *cls,
+  struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_ExchangeWithdrawValues *ewv = spec->ptr;
+
+  (void) cls;
+  TALER_denom_ewv_free (ewv);
 }
 
 
 struct GNUNET_JSON_Specification
-TALER_JSON_spec_exchange_withdraw_values (const char *field,
-                                          struct TALER_ExchangeWithdrawValues *
-                                          ewv)
+TALER_JSON_spec_exchange_withdraw_values (
+  const char *field,
+  struct TALER_ExchangeWithdrawValues *ewv)
 {
   struct GNUNET_JSON_Specification ret = {
     .parser = &parse_exchange_withdraw_values,
+    .cleaner = &clean_exchange_withdraw_values,
     .field = field,
     .ptr = ewv
   };
 
+  ewv->blinding_inputs = NULL;
   return ret;
 }
 
@@ -866,11 +1337,6 @@ parse_i18n_string (void *cls,
     const char *str;
 
     str = json_string_value (val);
-    if (NULL == str)
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
     *(const char **) spec->ptr = str;
   }
   return GNUNET_OK;
@@ -890,8 +1356,11 @@ i18n_cleaner (void *cls,
   struct I18nContext *ctx = cls;
 
   (void) spec;
-  GNUNET_free (ctx->lp);
-  GNUNET_free (ctx);
+  if (NULL != ctx)
+  {
+    GNUNET_free (ctx->lp);
+    GNUNET_free (ctx);
+  }
 }
 
 
@@ -911,8 +1380,9 @@ TALER_JSON_spec_i18n_string (const char *name,
     .size_ptr = NULL
   };
 
-  ctx->lp = (NULL != language_pattern) ? GNUNET_strdup (language_pattern) :
-            NULL;
+  ctx->lp = (NULL != language_pattern)
+    ? GNUNET_strdup (language_pattern)
+    : NULL;
   ctx->field = name;
   *strptr = NULL;
   return ret;
@@ -950,4 +1420,400 @@ TALER_JSON_spec_i18n_str (const char *name,
 }
 
 
+/**
+ * Parse given JSON object with Taler error code.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_ec (void *cls,
+          json_t *root,
+          struct GNUNET_JSON_Specification *spec)
+{
+  enum TALER_ErrorCode *ec = spec->ptr;
+  json_int_t num;
+
+  (void) cls;
+  if (! json_is_integer (root))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  num = json_integer_value (root);
+  if (num < 0)
+  {
+    GNUNET_break_op (0);
+    *ec = TALER_EC_INVALID;
+    return GNUNET_SYSERR;
+  }
+  *ec = (enum TALER_ErrorCode) num;
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_ec (const char *field,
+                    enum TALER_ErrorCode *ec)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_ec,
+    .field = field,
+    .ptr = ec
+  };
+
+  *ec = TALER_EC_NONE;
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object with AML decision.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_aml_decision (void *cls,
+                    json_t *root,
+                    struct GNUNET_JSON_Specification *spec)
+{
+  enum TALER_AmlDecisionState *aml = spec->ptr;
+  json_int_t num;
+
+  (void) cls;
+  if (! json_is_integer (root))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  num = json_integer_value (root);
+  if ( (num > TALER_AML_MAX) ||
+       (num < 0) )
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  *aml = (enum TALER_AmlDecisionState) num;
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_aml_decision (const char *field,
+                              enum TALER_AmlDecisionState *aml_state)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_aml_decision,
+    .field = field,
+    .ptr = aml_state
+  };
+
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to web URL.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_web_url (void *cls,
+               json_t *root,
+               struct GNUNET_JSON_Specification *spec)
+{
+  const char *str;
+
+  (void) cls;
+  str = json_string_value (root);
+  if (NULL == str)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (! TALER_is_web_url (str))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  *(const char **) spec->ptr = str;
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_web_url (const char *field,
+                         const char **url)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_web_url,
+    .field = field,
+    .ptr = url
+  };
+
+  *url = NULL;
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to payto:// URI.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_payto_uri (void *cls,
+                 json_t *root,
+                 struct GNUNET_JSON_Specification *spec)
+{
+  const char *str;
+  char *err;
+
+  (void) cls;
+  str = json_string_value (root);
+  if (NULL == str)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  err = TALER_payto_validate (str);
+  if (NULL != err)
+  {
+    GNUNET_break_op (0);
+    GNUNET_free (err);
+    return GNUNET_SYSERR;
+  }
+  *(const char **) spec->ptr = str;
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_payto_uri (const char *field,
+                           const char **payto_uri)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_payto_uri,
+    .field = field,
+    .ptr = payto_uri
+  };
+
+  *payto_uri = NULL;
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object with protocol version.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_protocol_version (void *cls,
+                        json_t *root,
+                        struct GNUNET_JSON_Specification *spec)
+{
+  struct TALER_JSON_ProtocolVersion *pv = spec->ptr;
+  const char *ver;
+  char dummy;
+
+  (void) cls;
+  if (! json_is_string (root))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  ver = json_string_value (root);
+  if (3 != sscanf (ver,
+                   "%u:%u:%u%c",
+                   &pv->current,
+                   &pv->revision,
+                   &pv->age,
+                   &dummy))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_version (const char *field,
+                         struct TALER_JSON_ProtocolVersion *ver)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_protocol_version,
+    .field = field,
+    .ptr = ver
+  };
+
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to an OTP key.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_otp_key (void *cls,
+               json_t *root,
+               struct GNUNET_JSON_Specification *spec)
+{
+  const char *pos_key;
+
+  (void) cls;
+  pos_key = json_string_value (root);
+  if (NULL == pos_key)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  {
+    size_t pos_key_length = strlen (pos_key);
+    void *key; /* pos_key in binary */
+    size_t key_len; /* length of the key */
+    int dret;
+
+    key_len = pos_key_length * 5 / 8;
+    key = GNUNET_malloc (key_len);
+    dret = TALER_rfc3548_base32decode (pos_key,
+                                       pos_key_length,
+                                       key,
+                                       key_len);
+    if (-1 == dret)
+    {
+      GNUNET_free (key);
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (key);
+  }
+  *(const char **) spec->ptr = pos_key;
+  return GNUNET_OK;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_otp_key (const char *name,
+                         const char **otp_key)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_otp_key,
+    .field = name,
+    .ptr = otp_key
+  };
+
+  *otp_key = NULL;
+  return ret;
+}
+
+
+/**
+ * Parse given JSON object to `enum TALER_MerchantConfirmationAlgorithm`
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_otp_type (void *cls,
+                json_t *root,
+                struct GNUNET_JSON_Specification *spec)
+{
+  static const struct Entry
+  {
+    const char *name;
+    enum TALER_MerchantConfirmationAlgorithm val;
+  } lt [] = {
+    { .name = "NONE",
+      .val = TALER_MCA_NONE },
+    { .name = "TOTP_WITHOUT_PRICE",
+      .val = TALER_MCA_WITHOUT_PRICE },
+    { .name = "TOTP_WITH_PRICE",
+      .val = TALER_MCA_WITH_PRICE },
+    { .name = NULL,
+      .val = TALER_MCA_NONE },
+  };
+  enum TALER_MerchantConfirmationAlgorithm *res
+    = (enum TALER_MerchantConfirmationAlgorithm *) spec->ptr;
+
+  (void) cls;
+  if (json_is_string (root))
+  {
+    const char *str;
+
+    str = json_string_value (root);
+    if (NULL == str)
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    for (unsigned int i = 0; NULL != lt[i].name; i++)
+    {
+      if (0 == strcasecmp (str,
+                           lt[i].name))
+      {
+        *res = lt[i].val;
+        return GNUNET_OK;
+      }
+    }
+    GNUNET_break_op (0);
+  }
+  if (json_is_integer (root))
+  {
+    json_int_t val;
+
+    val = json_integer_value (root);
+    for (unsigned int i = 0; NULL != lt[i].name; i++)
+    {
+      if (val == lt[i].val)
+      {
+        *res = lt[i].val;
+        return GNUNET_OK;
+      }
+    }
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_break_op (0);
+  return GNUNET_SYSERR;
+}
+
+
+struct GNUNET_JSON_Specification
+TALER_JSON_spec_otp_type (const char *name,
+                          enum TALER_MerchantConfirmationAlgorithm *mca)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_otp_type,
+    .field = name,
+    .ptr = mca
+  };
+
+  *mca = TALER_MCA_NONE;
+  return ret;
+}
+
+
 /* end of json/json_helper.c */
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index ad41eb955..71c8db9d2 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -39,11 +39,60 @@ TALER_JSON_pack_time_abs_human (const char *name,
 
 
 struct GNUNET_JSON_PackSpec
-TALER_JSON_pack_time_abs_nbo_human (const char *name,
-                                    struct GNUNET_TIME_AbsoluteNBO at)
+TALER_JSON_pack_econtract (
+  const char *name,
+  const struct TALER_EncryptedContract *econtract)
 {
-  return TALER_JSON_pack_time_abs_human (name,
-                                         GNUNET_TIME_absolute_ntoh (at));
+  struct GNUNET_JSON_PackSpec ps = {
+    .field_name = name,
+  };
+
+  if (NULL == econtract)
+    return ps;
+  ps.object
+    = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_varsize ("econtract",
+                                       econtract->econtract,
+                                       econtract->econtract_size),
+        GNUNET_JSON_pack_data_auto ("econtract_sig",
+                                    &econtract->econtract_sig),
+        GNUNET_JSON_pack_data_auto ("contract_pub",
+                                    &econtract->contract_pub));
+  return ps;
+}
+
+
+struct GNUNET_JSON_PackSpec
+TALER_JSON_pack_age_commitment (
+  const char *name,
+  const struct TALER_AgeCommitment *age_commitment)
+{
+  struct GNUNET_JSON_PackSpec ps = {
+    .field_name = name,
+  };
+  json_t *keys;
+
+  if (NULL == age_commitment ||
+      0 == age_commitment->num)
+    return ps;
+
+  GNUNET_assert (NULL !=
+                 (keys = json_array ()));
+
+  for (size_t i = 0;
+       i < age_commitment->num;
+       i++)
+  {
+    json_t *val;
+    val = GNUNET_JSON_from_data (&age_commitment->keys[i],
+                                 sizeof(age_commitment->keys[i]));
+    GNUNET_assert (NULL != val);
+    GNUNET_assert (0 ==
+                   json_array_append_new (keys, val));
+  }
+
+  ps.object = keys;
+  return ps;
 }
 
 
@@ -52,13 +101,19 @@ TALER_JSON_pack_denom_pub (
   const char *name,
   const struct TALER_DenominationPublicKey *pk)
 {
+  const struct GNUNET_CRYPTO_BlindSignPublicKey *bsp;
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
 
-  switch (pk->cipher)
+  if (NULL == pk)
+    return ps;
+  bsp = pk->bsign_pub_key;
+  switch (bsp->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     ps.object
       = GNUNET_JSON_PACK (
           GNUNET_JSON_pack_string ("cipher",
@@ -66,9 +121,9 @@ TALER_JSON_pack_denom_pub (
           GNUNET_JSON_pack_uint64 ("age_mask",
                                    pk->age_mask.bits),
           GNUNET_JSON_pack_rsa_public_key ("rsa_public_key",
-                                           pk->details.rsa_public_key));
-    break;
-  case TALER_DENOMINATION_CS:
+                                           bsp->details.rsa_public_key));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
     ps.object
       = GNUNET_JSON_PACK (
           GNUNET_JSON_pack_string ("cipher",
@@ -76,12 +131,11 @@ TALER_JSON_pack_denom_pub (
           GNUNET_JSON_pack_uint64 ("age_mask",
                                    pk->age_mask.bits),
           GNUNET_JSON_pack_data_varsize ("cs_public_key",
-                                         &pk->details.cs_public_key,
-                                         sizeof (pk->details.cs_public_key)));
-    break;
-  default:
-    GNUNET_assert (0);
+                                         &bsp->details.cs_public_key,
+                                         sizeof (bsp->details.cs_public_key)));
+    return ps;
   }
+  GNUNET_assert (0);
   return ps;
 }
 
@@ -91,31 +145,36 @@ TALER_JSON_pack_denom_sig (
   const char *name,
   const struct TALER_DenominationSignature *sig)
 {
+  const struct GNUNET_CRYPTO_UnblindedSignature *bs;
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
 
-  switch (sig->cipher)
+  if (NULL == sig)
+    return ps;
+  bs = sig->unblinded_sig;
+  switch (bs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "RSA"),
       GNUNET_JSON_pack_rsa_signature ("rsa_signature",
-                                      sig->details.rsa_signature));
-    break;
-  case TALER_DENOMINATION_CS:
+                                      bs->details.rsa_signature));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "CS"),
       GNUNET_JSON_pack_data_auto ("cs_signature_r",
-                                  &sig->details.cs_signature.r_point),
+                                  &bs->details.cs_signature.r_point),
       GNUNET_JSON_pack_data_auto ("cs_signature_s",
-                                  &sig->details.cs_signature.s_scalar));
-    break;
-  default:
-    GNUNET_assert (0);
+                                  &bs->details.cs_signature.s_scalar));
+    return ps;
   }
+  GNUNET_assert (0);
   return ps;
 }
 
@@ -125,34 +184,39 @@ TALER_JSON_pack_exchange_withdraw_values (
   const char *name,
   const struct TALER_ExchangeWithdrawValues *ewv)
 {
+  const struct GNUNET_CRYPTO_BlindingInputValues *biv;
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
 
-  switch (ewv->cipher)
+  if (NULL == ewv)
+    return ps;
+  biv = ewv->blinding_inputs;
+  switch (biv->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "RSA"));
-    break;
-  case TALER_DENOMINATION_CS:
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "CS"),
       GNUNET_JSON_pack_data_varsize (
         "r_pub_0",
-        &ewv->details.cs_values.r_pub[0],
+        &biv->details.cs_values.r_pub[0],
         sizeof(struct GNUNET_CRYPTO_CsRPublic)),
       GNUNET_JSON_pack_data_varsize (
         "r_pub_1",
-        &ewv->details.cs_values.r_pub[1],
+        &biv->details.cs_values.r_pub[1],
         sizeof(struct GNUNET_CRYPTO_CsRPublic))
       );
-    break;
-  default:
-    GNUNET_assert (0);
+    return ps;
   }
+  GNUNET_assert (0);
   return ps;
 }
 
@@ -162,31 +226,36 @@ TALER_JSON_pack_blinded_denom_sig (
   const char *name,
   const struct TALER_BlindedDenominationSignature *sig)
 {
+  const struct GNUNET_CRYPTO_BlindedSignature *bs;
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
 
-  switch (sig->cipher)
+  if (NULL == sig)
+    return ps;
+  bs = sig->blinded_sig;
+  switch (bs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "RSA"),
       GNUNET_JSON_pack_rsa_signature ("blinded_rsa_signature",
-                                      sig->details.blinded_rsa_signature));
-    break;
-  case TALER_DENOMINATION_CS:
+                                      bs->details.blinded_rsa_signature));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "CS"),
       GNUNET_JSON_pack_uint64 ("b",
-                               sig->details.blinded_cs_answer.b),
+                               bs->details.blinded_cs_answer.b),
       GNUNET_JSON_pack_data_auto ("s",
-                                  &sig->details.blinded_cs_answer.s_scalar));
-    break;
-  default:
-    GNUNET_assert (0);
+                                  &bs->details.blinded_cs_answer.s_scalar));
+    return ps;
   }
+  GNUNET_assert (0);
   return ps;
 }
 
@@ -196,38 +265,43 @@ TALER_JSON_pack_blinded_planchet (
   const char *name,
   const struct TALER_BlindedPlanchet *blinded_planchet)
 {
+  const struct GNUNET_CRYPTO_BlindedMessage *bm;
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
 
-  switch (blinded_planchet->cipher)
+  if (NULL == blinded_planchet)
+    return ps;
+  bm = blinded_planchet->blinded_message;
+  switch (bm->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "RSA"),
       GNUNET_JSON_pack_data_varsize (
         "rsa_blinded_planchet",
-        blinded_planchet->details.rsa_blinded_planchet.blinded_msg,
-        blinded_planchet->details.rsa_blinded_planchet.blinded_msg_size));
-    break;
-  case TALER_DENOMINATION_CS:
+        bm->details.rsa_blinded_message.blinded_msg,
+        bm->details.rsa_blinded_message.blinded_msg_size));
+    return ps;
+  case GNUNET_CRYPTO_BSA_CS:
     ps.object = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string ("cipher",
                                "CS"),
       GNUNET_JSON_pack_data_auto (
         "cs_nonce",
-        &blinded_planchet->details.cs_blinded_planchet.nonce),
+        &bm->details.cs_blinded_message.nonce),
       GNUNET_JSON_pack_data_auto (
         "cs_blinded_c0",
-        &blinded_planchet->details.cs_blinded_planchet.c[0]),
+        &bm->details.cs_blinded_message.c[0]),
       GNUNET_JSON_pack_data_auto (
         "cs_blinded_c1",
-        &blinded_planchet->details.cs_blinded_planchet.c[1]));
-    break;
-  default:
-    GNUNET_assert (0);
+        &bm->details.cs_blinded_message.c[1]));
+    return ps;
   }
+  GNUNET_assert (0);
   return ps;
 }
 
@@ -247,19 +321,4 @@ TALER_JSON_pack_amount (const char *name,
 }
 
 
-struct GNUNET_JSON_PackSpec
-TALER_JSON_pack_amount_nbo (const char *name,
-                            const struct TALER_AmountNBO *amount)
-{
-  struct GNUNET_JSON_PackSpec ps = {
-    .field_name = name,
-    .object = (NULL != amount)
-              ? TALER_JSON_from_amount_nbo (amount)
-              : NULL
-  };
-
-  return ps;
-}
-
-
 /* End of json/json_pack.c */
diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index 544b56453..9d22d28ea 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -70,80 +70,6 @@ TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
 }
 
 
-enum GNUNET_GenericReturnValue
-TALER_JSON_exchange_wire_signature_check (
-  const json_t *wire_s,
-  const struct TALER_MasterPublicKeyP *master_pub)
-{
-  const char *payto_uri;
-  struct TALER_MasterSignatureP master_sig;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("payto_uri",
-                             &payto_uri),
-    GNUNET_JSON_spec_fixed_auto ("master_sig",
-                                 &master_sig),
-    GNUNET_JSON_spec_end ()
-  };
-
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (wire_s,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  {
-    char *err;
-
-    err = TALER_payto_validate (payto_uri);
-    if (NULL != err)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "URI `%s' ill-formed: %s\n",
-                  payto_uri,
-                  err);
-      GNUNET_free (err);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  return TALER_exchange_wire_signature_check (payto_uri,
-                                              master_pub,
-                                              &master_sig);
-}
-
-
-json_t *
-TALER_JSON_exchange_wire_signature_make (
-  const char *payto_uri,
-  const struct TALER_MasterPrivateKeyP *master_priv)
-{
-  struct TALER_MasterSignatureP master_sig;
-  char *err;
-
-  if (NULL !=
-      (err = TALER_payto_validate (payto_uri)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Invalid payto URI `%s': %s\n",
-                payto_uri,
-                err);
-    GNUNET_free (err);
-    return NULL;
-  }
-  TALER_exchange_wire_signature_make (payto_uri,
-                                      master_priv,
-                                      &master_sig);
-  return GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_string ("payto_uri",
-                             payto_uri),
-    GNUNET_JSON_pack_data_auto ("master_sig",
-                                &master_sig));
-}
-
-
 char *
 TALER_JSON_wire_to_payto (const json_t *wire_s)
 {
diff --git a/src/json/test_json.c b/src/json/test_json.c
index d37f66eaf..fba72f84b 100644
--- a/src/json/test_json.c
+++ b/src/json/test_json.c
@@ -103,7 +103,8 @@ test_contract (void)
                   "k2", "n1", "n2",
                   /***/ "$forgettable", "n1", true);
   GNUNET_assert (GNUNET_OK ==
-                 TALER_JSON_contract_seed_forgettable (c1));
+                 TALER_JSON_contract_seed_forgettable (c1,
+                                                       c1));
   GNUNET_assert (GNUNET_OK ==
                  TALER_JSON_contract_hash (c1,
                                            &h1));
diff --git a/src/json/test_json_wire.c b/src/json/test_json_wire.c
deleted file mode 100644
index b417b25fe..000000000
--- a/src/json/test_json_wire.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-  This file is part of TALER
-  (C) 2015, 2016 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/>
-*/
-
-/**
- * @file json/test_json_wire.c
- * @brief Tests for Taler-specific crypto logic
- * @author Christian Grothoff <christian@grothoff.org>
- */
-#include "platform.h"
-#include "taler_util.h"
-#include "taler_json_lib.h"
-
-
-int
-main (int argc,
-      const char *const argv[])
-{
-  struct TALER_MasterPublicKeyP master_pub;
-  struct TALER_MasterPrivateKeyP master_priv;
-  json_t *wire_xtalerbank;
-  json_t *wire_iban;
-  const char *payto_xtalerbank = "payto://x-taler-bank/42";
-  const char *payto_iban =
-    "payto://iban/BIC-TO-BE-SKIPPED/DE89370400440532013000?receiver-name=Test";
-  char *p_xtalerbank;
-  char *p_iban;
-
-  (void) argc;
-  (void) argv;
-  GNUNET_log_setup ("test-json-wire",
-                    "WARNING",
-                    NULL);
-  GNUNET_CRYPTO_eddsa_key_create (&master_priv.eddsa_priv);
-  GNUNET_CRYPTO_eddsa_key_get_public (&master_priv.eddsa_priv,
-                                      &master_pub.eddsa_pub);
-  wire_xtalerbank = TALER_JSON_exchange_wire_signature_make (payto_xtalerbank,
-                                                             &master_priv);
-  wire_iban = TALER_JSON_exchange_wire_signature_make (payto_iban,
-                                                       &master_priv);
-  if (NULL == wire_iban)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not parse payto/IBAN (%s) into 'wire object'\n",
-                payto_iban);
-    return 1;
-  }
-  p_xtalerbank = TALER_JSON_wire_to_payto (wire_xtalerbank);
-  p_iban = TALER_JSON_wire_to_payto (wire_iban);
-  GNUNET_assert (0 == strcmp (p_xtalerbank, payto_xtalerbank));
-  GNUNET_assert (0 == strcmp (p_iban, payto_iban));
-  GNUNET_free (p_xtalerbank);
-  GNUNET_free (p_iban);
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_JSON_exchange_wire_signature_check (wire_xtalerbank,
-                                                           &master_pub));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_JSON_exchange_wire_signature_check (wire_iban,
-                                                           &master_pub));
-  json_decref (wire_xtalerbank);
-  json_decref (wire_iban);
-
-  return 0;
-}
-
-
-/* end of test_json_wire.c */
diff --git a/src/kyclogic/Makefile.am b/src/kyclogic/Makefile.am
new file mode 100644
index 000000000..0281553fc
--- /dev/null
+++ b/src/kyclogic/Makefile.am
@@ -0,0 +1,144 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir = $(prefix)/share/taler/config.d/
+
+pkgcfg_DATA = \
+  kyclogic.conf \
+  kyclogic-kycaid.conf \
+  kyclogic-oauth2.conf \
+  kyclogic-persona.conf
+
+bin_SCRIPTS = \
+  taler-exchange-kyc-kycaid-converter.sh \
+  taler-exchange-kyc-persona-converter.sh \
+  taler-exchange-kyc-oauth2-test-converter.sh \
+  taler-exchange-kyc-oauth2-challenger.sh \
+  taler-exchange-kyc-oauth2-nda.sh
+
+EXTRA_DIST = \
+  $(pkgcfg_DATA) \
+  $(bin_SCRIPTS) \
+  sample.conf
+
+lib_LTLIBRARIES = \
+  libtalerkyclogic.la
+
+libtalerkyclogic_la_SOURCES = \
+  kyclogic_api.c
+libtalerkyclogic_la_LIBADD = \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -ljansson \
+  -lgnunetutil \
+  $(XLIB)
+libtalerkyclogic_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -no-undefined
+
+
+bin_PROGRAMS = \
+  taler-exchange-kyc-tester
+
+taler_exchange_kyc_tester_SOURCES = \
+  taler-exchange-kyc-tester.c
+taler_exchange_kyc_tester_LDADD = \
+  $(LIBGCRYPT_LIBS) \
+  libtalerkyclogic.la \
+  $(top_builddir)/src/mhd/libtalermhd.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/templating/libtalertemplating.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lmicrohttpd \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -lgnunetjson \
+  -ljansson \
+  -lcurl \
+  -lz \
+  $(XLIB)
+
+
+
+plugindir = $(libdir)/taler
+
+plugin_LTLIBRARIES = \
+  libtaler_plugin_kyclogic_kycaid.la \
+  libtaler_plugin_kyclogic_oauth2.la \
+  libtaler_plugin_kyclogic_persona.la \
+  libtaler_plugin_kyclogic_template.la
+
+libtaler_plugin_kyclogic_template_la_SOURCES = \
+  plugin_kyclogic_template.c
+libtaler_plugin_kyclogic_template_la_LIBADD = \
+  $(LTLIBINTL)
+libtaler_plugin_kyclogic_template_la_LDFLAGS = \
+  $(TALER_PLUGIN_LDFLAGS) \
+  -lgnunetcurl \
+  -lgnunetutil \
+  $(XLIB)
+
+libtaler_plugin_kyclogic_oauth2_la_SOURCES = \
+  plugin_kyclogic_oauth2.c
+libtaler_plugin_kyclogic_oauth2_la_LIBADD = \
+  $(LTLIBINTL)
+libtaler_plugin_kyclogic_oauth2_la_LDFLAGS = \
+  $(TALER_PLUGIN_LDFLAGS) \
+  $(top_builddir)/src/templating/libtalertemplating.la \
+  $(top_builddir)/src/mhd/libtalermhd.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
+  -lcurl \
+  $(XLIB)
+
+libtaler_plugin_kyclogic_kycaid_la_SOURCES = \
+  plugin_kyclogic_kycaid.c
+libtaler_plugin_kyclogic_kycaid_la_LIBADD = \
+  $(LTLIBINTL)
+libtaler_plugin_kyclogic_kycaid_la_LDFLAGS = \
+  $(TALER_PLUGIN_LDFLAGS) \
+  $(top_builddir)/src/templating/libtalertemplating.la \
+  $(top_builddir)/src/mhd/libtalermhd.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/curl/libtalercurl.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
+  -lcurl \
+  $(XLIB)
+
+libtaler_plugin_kyclogic_persona_la_SOURCES = \
+  plugin_kyclogic_persona.c
+libtaler_plugin_kyclogic_persona_la_LIBADD = \
+  $(LTLIBINTL)
+libtaler_plugin_kyclogic_persona_la_DEPENDENCIES = \
+  libtalerkyclogic.la
+libtaler_plugin_kyclogic_persona_la_LDFLAGS = \
+  $(TALER_PLUGIN_LDFLAGS) \
+  libtalerkyclogic.la \
+  $(top_builddir)/src/mhd/libtalermhd.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/curl/libtalercurl.la \
+  $(top_builddir)/src/templating/libtalertemplating.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -lmicrohttpd \
+  -ljansson \
+  -lcurl \
+  $(XLIB)
+
+AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
diff --git a/src/kyclogic/kyclogic-kycaid.conf b/src/kyclogic/kyclogic-kycaid.conf
new file mode 100644
index 000000000..753fb689d
--- /dev/null
+++ b/src/kyclogic/kyclogic-kycaid.conf
@@ -0,0 +1,26 @@
+# This file is in the public domain.
+
+# Example kycaid provider configuration.
+
+[kyc-provider-example-kycaid]
+
+COST = 42
+LOGIC = kycaid
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = EXAMPLE_DO_NOT_USE
+
+# How long is the KYC check valid?
+KYC_KYCAID_VALIDITY = forever
+
+# Program that converts Persona KYC data into the
+# GNU Taler format.
+KYC_KYCAID_CONVERTER_HELPER = taler-exchange-kyc-kycaid-converter.sh
+
+# Authentication token to use.
+KYC_KYCAID_AUTH_TOKEN = XXX
+
+# Form to use.
+KYC_KYCAID_FORM_ID = XXX
+
+# URL to go to after the process is complete.
+KYC_KYCAID_POST_URL = https://example.com/
diff --git a/src/kyclogic/kyclogic-oauth2.conf b/src/kyclogic/kyclogic-oauth2.conf
new file mode 100644
index 000000000..57e1fc13a
--- /dev/null
+++ b/src/kyclogic/kyclogic-oauth2.conf
@@ -0,0 +1,35 @@
+# This file is in the public domain.
+
+# Example Oauth2.0 provider configuration.
+
+[kyc-provider-example-oauth2]
+
+COST = 42
+LOGIC = oauth2
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = EXAMPLE_DO_NOT_USE
+
+# How long is the KYC check valid?
+KYC_OAUTH2_VALIDITY = forever
+
+# URL where we initiate the user's login process
+KYC_OAUTH2_AUTHORIZE_URL = https://kyc.example.com/authorize
+# URL where we send the user's authentication information
+KYC_OAUTH2_TOKEN_URL = https://kyc.example.com/token
+# URL of the user info access point.
+KYC_OAUTH2_INFO_URL = https://kyc.example.com/info
+
+# Where does the client get redirected upon completion?
+KYC_OAUTH2_POST_URL = http://example.com/thank-you
+
+# For authentication to the OAuth2.0 service
+KYC_OAUTH2_CLIENT_ID = testcase
+KYC_OAUTH2_CLIENT_SECRET = password
+
+# Mustach template that converts OAuth2.0 data about the user
+# into GNU Taler standardized attribute data.
+#
+# This is just an example, you need to pick the right converter
+# for the provider!
+#
+KYC_OAUTH2_CONVERTER_HELPER = taler-exchange-kyc-oauth2-converter.sh
diff --git a/src/kyclogic/kyclogic-persona.conf b/src/kyclogic/kyclogic-persona.conf
new file mode 100644
index 000000000..2d52a9ee0
--- /dev/null
+++ b/src/kyclogic/kyclogic-persona.conf
@@ -0,0 +1,44 @@
+# This file is in the public domain.
+
+# FIXME: add to taler.conf man page!
+
+# Example persona provider configuration.
+
+[kyclogic-persona]
+
+# Optional authorization token for the webhook.
+# This must be the same for all uses of the
+# Persona provider, and is thus not in a
+# template-specific section.
+#WEBHOOK_AUTH_TOKEN = wbhsec_698b5a19-c790-47f6-b396-deb572ec82f9
+
+
+[kyc-provider-example-persona]
+
+COST = 42
+LOGIC = persona
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = EXAMPLE_DO_NOT_USE
+
+# How long is the KYC check valid?
+KYC_PERSONA_VALIDITY = forever
+
+# Which subdomain is used for our API?
+KYC_PERSONA_SUBDOMAIN = taler
+
+# Authentication token to use.
+KYC_PERSONA_AUTH_TOKEN = persona_sandbox_42
+
+# Program that converts Persona KYC data into the
+# GNU Taler format.
+KYC_PERSONA_CONVERTER_HELPER = taler-exchange-kyc-persona-converter.sh
+
+# Form to use.
+KYC_PERSONA_TEMPLATE_ID = itempl_Uj6Xxxxx
+
+# Where do we redirect to after KYC finished successfully.
+KYC_PERSONA_POST_URL = https://taler.net/
+
+# Salt to give to requests for idempotency.
+# Optional.
+# KYC_PERSONA_SALT = salt
\ No newline at end of file
diff --git a/src/kyclogic/kyclogic.conf b/src/kyclogic/kyclogic.conf
new file mode 100644
index 000000000..eca3b24c2
--- /dev/null
+++ b/src/kyclogic/kyclogic.conf
@@ -0,0 +1,15 @@
+# This file is in the public domain.
+#
+# Sample legitimization rule set.
+
+#[kyc-legitimization-withdraw-high]
+# KYC hook is this rule is about.
+#OPERATION_TYPE = WITHDRAW
+# Which checks must be done. Give names used by providers.
+#REQUIRED_CHECKS = PHONE GOVID SSN
+# Threshold amount above which the checks are required.
+#THRESHOLD = KUDOS:100
+# Timeframe over which amounts involved in the
+# operation type are accumulated to test against
+# the threshold.
+#TIMEFRAME = 1a
diff --git a/src/kyclogic/kyclogic_api.c b/src/kyclogic/kyclogic_api.c
new file mode 100644
index 000000000..186799dbb
--- /dev/null
+++ b/src/kyclogic/kyclogic_api.c
@@ -0,0 +1,1512 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2022-2023 Taler Systems SA
+
+  TALER 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file kyclogic_api.c
+ * @brief server-side KYC API
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_kyclogic_lib.h"
+
+/**
+ * Name of the KYC check that may never be passed. Useful if some
+ * operations/amounts are categorically forbidden.
+ */
+#define KYC_CHECK_IMPOSSIBLE "impossible"
+
+/**
+ * Information about a KYC provider.
+ */
+struct TALER_KYCLOGIC_KycProvider;
+
+
+/**
+ * Abstract representation of a KYC check.
+ */
+struct TALER_KYCLOGIC_KycCheck
+{
+  /**
+   * Human-readable name given to the KYC check.
+   */
+  char *name;
+
+  /**
+   * Array of @e num_providers providers that offer this type of KYC check.
+   */
+  struct TALER_KYCLOGIC_KycProvider **providers;
+
+  /**
+   * Length of the @e providers array.
+   */
+  unsigned int num_providers;
+
+};
+
+
+struct TALER_KYCLOGIC_KycProvider
+{
+  /**
+   * Name of the provider (configuration section name).
+   */
+  const char *provider_section_name;
+
+  /**
+   * Array of @e num_checks checks performed by this provider.
+   */
+  struct TALER_KYCLOGIC_KycCheck **provided_checks;
+
+  /**
+   * Logic to run for this provider.
+   */
+  struct TALER_KYCLOGIC_Plugin *logic;
+
+  /**
+   * @e provider_section_name specific details to
+   * pass to the @e logic functions.
+   */
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Cost of running this provider's KYC.
+   */
+  unsigned long long cost;
+
+  /**
+   * Length of the @e checks array.
+   */
+  unsigned int num_checks;
+
+  /**
+   * Type of user this provider supports.
+   */
+  enum TALER_KYCLOGIC_KycUserType user_type;
+};
+
+
+/**
+ * Condition that triggers a need to perform KYC.
+ */
+struct TALER_KYCLOGIC_KycTrigger
+{
+
+  /**
+   * Timeframe to consider for computing the amount
+   * to compare against the @e limit.  Zero for the
+   * wallet balance trigger (as not applicable).
+   */
+  struct GNUNET_TIME_Relative timeframe;
+
+  /**
+   * Maximum amount that can be transacted until
+   * the rule triggers.
+   */
+  struct TALER_Amount threshold;
+
+  /**
+   * Array of @e num_checks checks to apply on this trigger.
+   */
+  struct TALER_KYCLOGIC_KycCheck **required_checks;
+
+  /**
+   * Length of the @e checks array.
+   */
+  unsigned int num_checks;
+
+  /**
+   * What event is this trigger for?
+   */
+  enum TALER_KYCLOGIC_KycTriggerEvent trigger;
+
+};
+
+
+/**
+ * Array of @e num_kyc_logics KYC logic plugins we have loaded.
+ */
+static struct TALER_KYCLOGIC_Plugin **kyc_logics;
+
+/**
+ * Length of the #kyc_logics array.
+ */
+static unsigned int num_kyc_logics;
+
+/**
+ * Array of @e num_kyc_checks known types of
+ * KYC checks.
+ */
+static struct TALER_KYCLOGIC_KycCheck **kyc_checks;
+
+/**
+ * Length of the #kyc_checks array.
+ */
+static unsigned int num_kyc_checks;
+
+/**
+ * Array of configured triggers.
+ */
+static struct TALER_KYCLOGIC_KycTrigger **kyc_triggers;
+
+/**
+ * Length of the #kyc_triggers array.
+ */
+static unsigned int num_kyc_triggers;
+
+/**
+ * Array of configured providers.
+ */
+static struct TALER_KYCLOGIC_KycProvider **kyc_providers;
+
+/**
+ * Length of the #kyc_providers array.
+ */
+static unsigned int num_kyc_providers;
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_trigger_from_string (const char *trigger_s,
+                                        enum TALER_KYCLOGIC_KycTriggerEvent *
+                                        trigger)
+{
+  struct
+  {
+    const char *in;
+    enum TALER_KYCLOGIC_KycTriggerEvent out;
+  } map [] = {
+    { "withdraw", TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW },
+    { "age-withdraw", TALER_KYCLOGIC_KYC_TRIGGER_AGE_WITHDRAW },
+    { "deposit", TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT  },
+    { "merge", TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE },
+    { "balance", TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE },
+    { "close", TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE },
+    { NULL, 0 }
+  };
+
+  for (unsigned int i = 0; NULL != map[i].in; i++)
+    if (0 == strcasecmp (map[i].in,
+                         trigger_s))
+    {
+      *trigger = map[i].out;
+      return GNUNET_OK;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Invalid KYC trigger `%s'\n",
+              trigger_s);
+  return GNUNET_SYSERR;
+}
+
+
+const char *
+TALER_KYCLOGIC_kyc_trigger2s (enum TALER_KYCLOGIC_KycTriggerEvent trigger)
+{
+  switch (trigger)
+  {
+  case TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW:
+    return "withdraw";
+  case TALER_KYCLOGIC_KYC_TRIGGER_AGE_WITHDRAW:
+    return "age-withdraw";
+  case TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT:
+    return "deposit";
+  case TALER_KYCLOGIC_KYC_TRIGGER_P2P_RECEIVE:
+    return "merge";
+  case TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE:
+    return "balance";
+  case TALER_KYCLOGIC_KYC_TRIGGER_RESERVE_CLOSE:
+    return "close";
+  }
+  GNUNET_break (0);
+  return NULL;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_user_type_from_string (const char *ut_s,
+                                          enum TALER_KYCLOGIC_KycUserType *ut)
+{
+  struct
+  {
+    const char *in;
+    enum TALER_KYCLOGIC_KycUserType out;
+  } map [] = {
+    { "individual", TALER_KYCLOGIC_KYC_UT_INDIVIDUAL },
+    { "business", TALER_KYCLOGIC_KYC_UT_BUSINESS  },
+    { NULL, 0 }
+  };
+
+  for (unsigned int i = 0; NULL != map[i].in; i++)
+    if (0 == strcasecmp (map[i].in,
+                         ut_s))
+    {
+      *ut = map[i].out;
+      return GNUNET_OK;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Invalid user type `%s'\n",
+              ut_s);
+  return GNUNET_SYSERR;
+}
+
+
+const char *
+TALER_KYCLOGIC_kyc_user_type2s (enum TALER_KYCLOGIC_KycUserType ut)
+{
+  switch (ut)
+  {
+  case TALER_KYCLOGIC_KYC_UT_INDIVIDUAL:
+    return "individual";
+  case TALER_KYCLOGIC_KYC_UT_BUSINESS:
+    return "business";
+  }
+  GNUNET_break (0);
+  return NULL;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_check_satisfiable (
+  const char *check_name)
+{
+  for (unsigned int i = 0; i<num_kyc_checks; i++)
+    if (0 == strcmp (check_name,
+                     kyc_checks[i]->name))
+      return GNUNET_OK;
+  if (0 == strcmp (check_name,
+                   KYC_CHECK_IMPOSSIBLE))
+    return GNUNET_NO;
+  return GNUNET_SYSERR;
+}
+
+
+json_t *
+TALER_KYCLOGIC_get_satisfiable ()
+{
+  json_t *requirements;
+
+  requirements = json_array ();
+  GNUNET_assert (NULL != requirements);
+  for (unsigned int i = 0; i<num_kyc_checks; i++)
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        requirements,
+        json_string (kyc_checks[i]->name)));
+  return requirements;
+}
+
+
+/**
+ * Load KYC logic plugin.
+ *
+ * @param cfg configuration to use
+ * @param name name of the plugin
+ * @return NULL on error
+ */
+static struct TALER_KYCLOGIC_Plugin *
+load_logic (const struct GNUNET_CONFIGURATION_Handle *cfg,
+            const char *name)
+{
+  char *lib_name;
+  struct TALER_KYCLOGIC_Plugin *plugin;
+
+  GNUNET_asprintf (&lib_name,
+                   "libtaler_plugin_kyclogic_%s",
+                   name);
+  for (unsigned int i = 0; i<num_kyc_logics; i++)
+    if (0 == strcmp (lib_name,
+                     kyc_logics[i]->library_name))
+    {
+      GNUNET_free (lib_name);
+      return kyc_logics[i];
+    }
+  plugin = GNUNET_PLUGIN_load (lib_name,
+                               (void *) cfg);
+  if (NULL == plugin)
+  {
+    GNUNET_free (lib_name);
+    return NULL;
+  }
+  plugin->library_name = lib_name;
+  plugin->name = GNUNET_strdup (name);
+  GNUNET_array_append (kyc_logics,
+                       num_kyc_logics,
+                       plugin);
+  return plugin;
+}
+
+
+/**
+ * Add check type to global array of checks.  First checks if the type already
+ * exists, otherwise adds a new one.
+ *
+ * @param check name of the check
+ * @return pointer into the global list
+ */
+static struct TALER_KYCLOGIC_KycCheck *
+add_check (const char *check)
+{
+  struct TALER_KYCLOGIC_KycCheck *kc;
+
+  for (unsigned int i = 0; i<num_kyc_checks; i++)
+    if (0 == strcasecmp (check,
+                         kyc_checks[i]->name))
+      return kyc_checks[i];
+  kc = GNUNET_new (struct TALER_KYCLOGIC_KycCheck);
+  kc->name = GNUNET_strdup (check);
+  GNUNET_array_append (kyc_checks,
+                       num_kyc_checks,
+                       kc);
+  return kc;
+}
+
+
+/**
+ * Parse list of checks from @a checks and build an array of aliases into the
+ * global checks array in @a provided_checks.
+ *
+ * @param[in,out] checks list of checks; clobbered
+ * @param[out] p_checks where to put array of aliases
+ * @param[out] num_p_checks set to length of @a p_checks array
+ */
+static void
+add_checks (char *checks,
+            struct TALER_KYCLOGIC_KycCheck ***p_checks,
+            unsigned int *num_p_checks)
+{
+  char *sptr;
+  struct TALER_KYCLOGIC_KycCheck **rchecks = NULL;
+  unsigned int num_rchecks = 0;
+
+  for (char *tok = strtok_r (checks, " ", &sptr);
+       NULL != tok;
+       tok = strtok_r (NULL, " ", &sptr))
+  {
+    struct TALER_KYCLOGIC_KycCheck *kc;
+
+    kc = add_check (tok);
+    GNUNET_array_append (rchecks,
+                         num_rchecks,
+                         kc);
+  }
+  *p_checks = rchecks;
+  *num_p_checks = num_rchecks;
+}
+
+
+/**
+ * Parse configuration of a KYC provider.
+ *
+ * @param cfg configuration to parse
+ * @param section name of the section to analyze
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+add_provider (const struct GNUNET_CONFIGURATION_Handle *cfg,
+              const char *section)
+{
+  unsigned long long cost;
+  char *logic;
+  char *ut_s;
+  enum TALER_KYCLOGIC_KycUserType ut;
+  char *checks;
+  struct TALER_KYCLOGIC_Plugin *lp;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg,
+                                             section,
+                                             "COST",
+                                             &cost))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "COST",
+                               "number required");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             section,
+                                             "USER_TYPE",
+                                             &ut_s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "USER_TYPE");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_KYCLOGIC_kyc_user_type_from_string (ut_s,
+                                                &ut))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "USER_TYPE",
+                               "valid user type required");
+    GNUNET_free (ut_s);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (ut_s);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             section,
+                                             "LOGIC",
+                                             &logic))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "LOGIC");
+    return GNUNET_SYSERR;
+  }
+  lp = load_logic (cfg,
+                   logic);
+  if (NULL == lp)
+  {
+    GNUNET_free (logic);
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "LOGIC",
+                               "logic plugin could not be loaded");
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (logic);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             section,
+                                             "PROVIDED_CHECKS",
+                                             &checks))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "PROVIDED_CHECKS");
+    return GNUNET_SYSERR;
+  }
+  {
+    struct TALER_KYCLOGIC_KycProvider *kp;
+
+    kp = GNUNET_new (struct TALER_KYCLOGIC_KycProvider);
+    kp->provider_section_name = section;
+    kp->user_type = ut;
+    kp->logic = lp;
+    kp->cost = cost;
+    add_checks (checks,
+                &kp->provided_checks,
+                &kp->num_checks);
+    GNUNET_free (checks);
+    kp->pd = lp->load_configuration (lp->cls,
+                                     section);
+    if (NULL == kp->pd)
+    {
+      GNUNET_free (kp);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_array_append (kyc_providers,
+                         num_kyc_providers,
+                         kp);
+    for (unsigned int i = 0; i<kp->num_checks; i++)
+    {
+      struct TALER_KYCLOGIC_KycCheck *kc = kp->provided_checks[i];
+
+      GNUNET_array_append (kc->providers,
+                           kc->num_providers,
+                           kp);
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse configuration @a cfg in section @a section for
+ * the specification of a KYC trigger.
+ *
+ * @param cfg configuration to parse
+ * @param section configuration section to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+add_trigger (const struct GNUNET_CONFIGURATION_Handle *cfg,
+             const char *section)
+{
+  char *ot_s;
+  struct TALER_Amount threshold;
+  struct GNUNET_TIME_Relative timeframe;
+  char *checks;
+  enum TALER_KYCLOGIC_KycTriggerEvent ot;
+
+  if (GNUNET_OK !=
+      TALER_config_get_amount (cfg,
+                               section,
+                               "THRESHOLD",
+                               &threshold))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "THRESHOLD",
+                               "amount required");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             section,
+                                             "OPERATION_TYPE",
+                                             &ot_s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "OPERATION_TYPE");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_KYCLOGIC_kyc_trigger_from_string (ot_s,
+                                              &ot))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "OPERATION_TYPE",
+                               "valid trigger type required");
+    GNUNET_free (ot_s);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (ot_s);
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                           section,
+                                           "TIMEFRAME",
+                                           &timeframe))
+  {
+    if (TALER_KYCLOGIC_KYC_TRIGGER_WALLET_BALANCE == ot)
+    {
+      timeframe = GNUNET_TIME_UNIT_ZERO;
+    }
+    else
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 section,
+                                 "TIMEFRAME",
+                                 "duration required");
+      return GNUNET_SYSERR;
+    }
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             section,
+                                             "REQUIRED_CHECKS",
+                                             &checks))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "REQUIRED_CHECKS");
+    return GNUNET_SYSERR;
+  }
+
+  {
+    struct TALER_KYCLOGIC_KycTrigger *kt;
+
+    kt = GNUNET_new (struct TALER_KYCLOGIC_KycTrigger);
+    kt->timeframe = timeframe;
+    kt->threshold = threshold;
+    kt->trigger = ot;
+    add_checks (checks,
+                &kt->required_checks,
+                &kt->num_checks);
+    GNUNET_free (checks);
+    GNUNET_array_append (kyc_triggers,
+                         num_kyc_triggers,
+                         kt);
+    for (unsigned int i = 0; i<kt->num_checks; i++)
+    {
+      const struct TALER_KYCLOGIC_KycCheck *ck = kt->required_checks[i];
+
+      if (0 != ck->num_providers)
+        continue;
+      if (0 == strcmp (ck->name,
+                       KYC_CHECK_IMPOSSIBLE))
+        continue;
+      {
+        char *msg;
+
+        GNUNET_asprintf (&msg,
+                         "Required check `%s' cannot be satisfied: not provided by any provider",
+                         ck->name);
+        GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                   section,
+                                   "REQUIRED_CHECKS",
+                                   msg);
+        GNUNET_free (msg);
+      }
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Closure for #handle_section().
+ */
+struct SectionContext
+{
+  /**
+   * Configuration to handle.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Result to return, set to false on failures.
+   */
+  bool result;
+};
+
+
+/**
+ * Function to iterate over configuration sections.
+ *
+ * @param cls a `struct SectionContext *`
+ * @param section name of the section
+ */
+static void
+handle_provider_section (void *cls,
+                         const char *section)
+{
+  struct SectionContext *sc = cls;
+
+  if (0 == strncasecmp (section,
+                        "kyc-provider-",
+                        strlen ("kyc-provider-")))
+  {
+    if (GNUNET_OK !=
+        add_provider (sc->cfg,
+                      section))
+      sc->result = false;
+    return;
+  }
+}
+
+
+/**
+ * Function to iterate over configuration sections.
+ *
+ * @param cls a `struct SectionContext *`
+ * @param section name of the section
+ */
+static void
+handle_trigger_section (void *cls,
+                        const char *section)
+{
+  struct SectionContext *sc = cls;
+
+  if (0 == strncasecmp (section,
+                        "kyc-legitimization-",
+                        strlen ("kyc-legitimization-")))
+  {
+    if (GNUNET_OK !=
+        add_trigger (sc->cfg,
+                     section))
+      sc->result = false;
+    return;
+  }
+}
+
+
+/**
+ * Comparator for qsort. Compares two triggers
+ * by timeframe to sort triggers by time.
+ *
+ * @param p1 first trigger to compare
+ * @param p2 second trigger to compare
+ * @return -1 if p1 < p2, 0 if p1==p2, 1 if p1 > p2.
+ */
+static int
+sort_by_timeframe (const void *p1,
+                   const void *p2)
+{
+  struct TALER_KYCLOGIC_KycTrigger **t1 = (struct
+                                           TALER_KYCLOGIC_KycTrigger **) p1;
+  struct TALER_KYCLOGIC_KycTrigger **t2 = (struct
+                                           TALER_KYCLOGIC_KycTrigger **) p2;
+
+  if (GNUNET_TIME_relative_cmp ((*t1)->timeframe,
+                                <,
+                                (*t2)->timeframe))
+    return -1;
+  if (GNUNET_TIME_relative_cmp ((*t1)->timeframe,
+                                >,
+                                (*t2)->timeframe))
+    return 1;
+  return 0;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_kyc_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct SectionContext sc = {
+    .cfg = cfg,
+    .result = true
+  };
+
+  GNUNET_CONFIGURATION_iterate_sections (cfg,
+                                         &handle_provider_section,
+                                         &sc);
+  GNUNET_CONFIGURATION_iterate_sections (cfg,
+                                         &handle_trigger_section,
+                                         &sc);
+  if (! sc.result)
+  {
+    TALER_KYCLOGIC_kyc_done ();
+    return GNUNET_SYSERR;
+  }
+
+  /* sanity check: ensure at least one provider exists
+     for any trigger and indidivual or business. */
+  for (unsigned int i = 0; i<num_kyc_checks; i++)
+    if (0 == kyc_checks[i]->num_providers)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "No provider available for required KYC check `%s'\n",
+                  kyc_checks[i]->name);
+      TALER_KYCLOGIC_kyc_done ();
+      return GNUNET_SYSERR;
+    }
+  if (0 != num_kyc_triggers)
+    qsort (kyc_triggers,
+           num_kyc_triggers,
+           sizeof (struct TALER_KYCLOGIC_KycTrigger *),
+           &sort_by_timeframe);
+  return GNUNET_OK;
+}
+
+
+void
+TALER_KYCLOGIC_kyc_done (void)
+{
+  for (unsigned int i = 0; i<num_kyc_triggers; i++)
+  {
+    struct TALER_KYCLOGIC_KycTrigger *kt = kyc_triggers[i];
+
+    GNUNET_array_grow (kt->required_checks,
+                       kt->num_checks,
+                       0);
+    GNUNET_free (kt);
+  }
+  GNUNET_array_grow (kyc_triggers,
+                     num_kyc_triggers,
+                     0);
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+
+    kp->logic->unload_configuration (kp->pd);
+    GNUNET_array_grow (kp->provided_checks,
+                       kp->num_checks,
+                       0);
+    GNUNET_free (kp);
+  }
+  GNUNET_array_grow (kyc_providers,
+                     num_kyc_providers,
+                     0);
+  for (unsigned int i = 0; i<num_kyc_logics; i++)
+  {
+    struct TALER_KYCLOGIC_Plugin *lp = kyc_logics[i];
+    char *lib_name = lp->library_name;
+
+    GNUNET_free (lp->name);
+    GNUNET_assert (NULL == GNUNET_PLUGIN_unload (lib_name,
+                                                 lp));
+    GNUNET_free (lib_name);
+  }
+  GNUNET_array_grow (kyc_logics,
+                     num_kyc_logics,
+                     0);
+  for (unsigned int i = 0; i<num_kyc_checks; i++)
+  {
+    struct TALER_KYCLOGIC_KycCheck *kc = kyc_checks[i];
+
+    GNUNET_array_grow (kc->providers,
+                       kc->num_providers,
+                       0);
+    GNUNET_free (kc->name);
+    GNUNET_free (kc);
+  }
+  GNUNET_array_grow (kyc_checks,
+                     num_kyc_checks,
+                     0);
+}
+
+
+/**
+ * Closure for the #eval_trigger().
+ */
+struct ThresholdTestContext
+{
+  /**
+   * Total amount so far.
+   */
+  struct TALER_Amount total;
+
+  /**
+   * Trigger event to evaluate triggers of.
+   */
+  enum TALER_KYCLOGIC_KycTriggerEvent event;
+
+  /**
+   * Offset in the triggers array where we need to start
+   * checking for triggers. All trigges below this
+   * offset were already hit.
+   */
+  unsigned int start;
+
+  /**
+   * Array of checks needed so far.
+   */
+  struct TALER_KYCLOGIC_KycCheck **needed;
+
+  /**
+   * Pointer to number of entries used in @a needed.
+   */
+  unsigned int *needed_cnt;
+
+  /**
+   * Has @e total been initialized yet?
+   */
+  bool have_total;
+};
+
+
+/**
+ * Function called on each @a amount that was found to
+ * be relevant for a KYC check.
+ *
+ * @param cls closure to allow the KYC module to
+ *        total up amounts and evaluate rules
+ * @param amount encountered transaction amount
+ * @param date when was the amount encountered
+ * @return #GNUNET_OK to continue to iterate,
+ *         #GNUNET_NO to abort iteration
+ *         #GNUNET_SYSERR on internal error (also abort itaration)
+ */
+static enum GNUNET_GenericReturnValue
+eval_trigger (void *cls,
+              const struct TALER_Amount *amount,
+              struct GNUNET_TIME_Absolute date)
+{
+  struct ThresholdTestContext *ttc = cls;
+  struct GNUNET_TIME_Relative duration;
+  bool bump = true;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC check with new amount %s\n",
+              TALER_amount2s (amount));
+  duration = GNUNET_TIME_absolute_get_duration (date);
+  if (ttc->have_total)
+  {
+    if (0 >
+        TALER_amount_add (&ttc->total,
+                          &ttc->total,
+                          amount))
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  else
+  {
+    ttc->total = *amount;
+    ttc->have_total = true;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYC check: new total is %s\n",
+              TALER_amount2s (&ttc->total));
+  for (unsigned int i = ttc->start; i<num_kyc_triggers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycTrigger *kt = kyc_triggers[i];
+
+    if (ttc->event != kt->trigger)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "KYC check #%u: trigger type does not match\n",
+                  i);
+      continue;
+    }
+    duration = GNUNET_TIME_relative_max (duration,
+                                         kt->timeframe);
+    if (GNUNET_TIME_relative_cmp (kt->timeframe,
+                                  >,
+                                  duration))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "KYC check #%u: amount is beyond time limit\n",
+                  i);
+      if (bump)
+        ttc->start = i;
+      return GNUNET_OK;
+    }
+    if (-1 ==
+        TALER_amount_cmp (&ttc->total,
+                          &kt->threshold))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "KYC check #%u: amount is below threshold\n",
+                  i);
+      if (bump)
+        ttc->start = i;
+      bump = false;
+      continue; /* amount too low to trigger */
+    }
+    /* add check to list of required checks, unless
+       already present... */
+    for (unsigned int j = 0; j<kt->num_checks; j++)
+    {
+      struct TALER_KYCLOGIC_KycCheck *rc = kt->required_checks[j];
+      bool found = false;
+
+      for (unsigned int k = 0; k<*ttc->needed_cnt; k++)
+        if (ttc->needed[k] == rc)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "KYC rule #%u already listed\n",
+                      j);
+          found = true;
+          break;
+        }
+      if (! found)
+      {
+        ttc->needed[*ttc->needed_cnt] = rc;
+        (*ttc->needed_cnt)++;
+      }
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC check #%u (%s) is applicable, %u checks needed so far\n",
+                i,
+                ttc->needed[(*ttc->needed_cnt) - 1]->name,
+                *ttc->needed_cnt);
+  }
+  if (bump)
+    return GNUNET_NO; /* we hit all possible triggers! */
+  return GNUNET_OK;
+}
+
+
+/**
+ * Closure for the #remove_satisfied().
+ */
+struct RemoveContext
+{
+
+  /**
+   * Array of checks needed so far.
+   */
+  struct TALER_KYCLOGIC_KycCheck **needed;
+
+  /**
+   * Pointer to number of entries used in @a needed.
+   */
+  unsigned int *needed_cnt;
+
+  /**
+   * Object with information about collected KYC data.
+   */
+  json_t *kyc_details;
+};
+
+
+/**
+ * Remove all checks satisfied by @a provider_name from
+ * our list of checks.
+ *
+ * @param cls a `struct RemoveContext`
+ * @param provider_name section name of provider that was already run previously
+ */
+static void
+remove_satisfied (void *cls,
+                  const char *provider_name)
+{
+  struct RemoveContext *rc = cls;
+
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+
+    if (0 != strcasecmp (provider_name,
+                         kp->provider_section_name))
+      continue;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Provider `%s' satisfied\n",
+                provider_name);
+    for (unsigned int j = 0; j<kp->num_checks; j++)
+    {
+      const struct TALER_KYCLOGIC_KycCheck *kc = kp->provided_checks[j];
+
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Provider satisfies check `%s'\n",
+                  kc->name);
+      if (NULL != rc->kyc_details)
+      {
+        GNUNET_assert (0 ==
+                       json_object_set_new (
+                         rc->kyc_details,
+                         kc->name,
+                         json_object ()));
+      }
+      for (unsigned int k = 0; k<*rc->needed_cnt; k++)
+        if (kc == rc->needed[k])
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                      "Removing check `%s' from list\n",
+                      kc->name);
+          rc->needed[k] = rc->needed[*rc->needed_cnt - 1];
+          (*rc->needed_cnt)--;
+          if (0 == *rc->needed_cnt)
+            return; /* for sure finished */
+          break;
+        }
+    }
+    break;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TALER_KYCLOGIC_kyc_test_required (enum TALER_KYCLOGIC_KycTriggerEvent event,
+                                  const struct TALER_PaytoHashP *h_payto,
+                                  TALER_KYCLOGIC_KycSatisfiedIterator ki,
+                                  void *ki_cls,
+                                  TALER_KYCLOGIC_KycAmountIterator ai,
+                                  void *ai_cls,
+                                  char **required)
+{
+  struct TALER_KYCLOGIC_KycCheck *needed[num_kyc_checks];
+  unsigned int needed_cnt = 0;
+  char *ret;
+  struct GNUNET_TIME_Relative timeframe;
+
+  timeframe = GNUNET_TIME_UNIT_ZERO;
+  for (unsigned int i = 0; i<num_kyc_triggers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycTrigger *kt = kyc_triggers[i];
+
+    if (event != kt->trigger)
+      continue;
+    timeframe = GNUNET_TIME_relative_max (timeframe,
+                                          kt->timeframe);
+  }
+  {
+    struct GNUNET_TIME_Absolute now;
+    struct ThresholdTestContext ttc = {
+      .event = event,
+      .needed = needed,
+      .needed_cnt = &needed_cnt
+    };
+
+    now = GNUNET_TIME_absolute_get ();
+    ai (ai_cls,
+        GNUNET_TIME_absolute_subtract (now,
+                                       timeframe),
+        &eval_trigger,
+        &ttc);
+  }
+  if (0 == needed_cnt)
+  {
+    *required = NULL;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  timeframe = GNUNET_TIME_UNIT_ZERO;
+  for (unsigned int i = 0; i<num_kyc_triggers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycTrigger *kt = kyc_triggers[i];
+
+    if (event != kt->trigger)
+      continue;
+    timeframe = GNUNET_TIME_relative_max (timeframe,
+                                          kt->timeframe);
+  }
+  {
+    struct GNUNET_TIME_Absolute now;
+    struct ThresholdTestContext ttc = {
+      .event = event,
+      .needed = needed,
+      .needed_cnt = &needed_cnt
+    };
+
+    now = GNUNET_TIME_absolute_get ();
+    ai (ai_cls,
+        GNUNET_TIME_absolute_subtract (now,
+                                       timeframe),
+        &eval_trigger,
+        &ttc);
+  }
+  if (0 == needed_cnt)
+  {
+    *required = NULL;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  {
+    struct RemoveContext rc = {
+      .needed = needed,
+      .needed_cnt = &needed_cnt
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    /* Check what provider checks are already satisfied for h_payto (with
+       database), remove those from the 'needed' array. */
+    qs = ki (ki_cls,
+             h_payto,
+             &remove_satisfied,
+             &rc);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      return qs;
+    }
+  }
+  if (0 == needed_cnt)
+  {
+    *required = NULL;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  {
+    struct RemoveContext rc = {
+      .needed = needed,
+      .needed_cnt = &needed_cnt
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    /* Check what provider checks are already satisfied for h_payto (with
+       database), remove those from the 'needed' array. */
+    qs = ki (ki_cls,
+             h_payto,
+             &remove_satisfied,
+             &rc);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      return qs;
+    }
+  }
+  if (0 == needed_cnt)
+  {
+    *required = NULL;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  ret = NULL;
+  for (unsigned int k = 0; k<needed_cnt; k++)
+  {
+    const struct TALER_KYCLOGIC_KycCheck *kc = needed[k];
+
+    if (NULL == ret)
+    {
+      ret = GNUNET_strdup (kc->name);
+    }
+    else /* append */
+    {
+      char *tmp = ret;
+
+      GNUNET_asprintf (&ret,
+                       "%s %s",
+                       tmp,
+                       kc->name);
+      GNUNET_free (tmp);
+    }
+  }
+  *required = ret;
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+void
+TALER_KYCLOGIC_kyc_get_details (
+  const char *logic_name,
+  TALER_KYCLOGIC_DetailsCallback cb,
+  void *cb_cls)
+{
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+
+    if (0 !=
+        strcmp (kp->logic->name,
+                logic_name))
+      continue;
+    if (GNUNET_OK !=
+        cb (cb_cls,
+            kp->pd,
+            kp->logic->cls))
+      return;
+  }
+}
+
+
+enum GNUNET_DB_QueryStatus
+TALER_KYCLOGIC_check_satisfied (char **requirements,
+                                const struct TALER_PaytoHashP *h_payto,
+                                json_t **kyc_details,
+                                TALER_KYCLOGIC_KycSatisfiedIterator ki,
+                                void *ki_cls,
+                                bool *satisfied)
+{
+  struct TALER_KYCLOGIC_KycCheck *needed[num_kyc_checks];
+  unsigned int needed_cnt = 0;
+
+  if (NULL == requirements)
+  {
+    *satisfied = true;
+    return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
+  }
+  {
+    char *req = *requirements;
+
+    for (const char *tok = strtok (req, " ");
+         NULL != tok;
+         tok = strtok (NULL, " "))
+      needed[needed_cnt++] = add_check (tok);
+    GNUNET_free (req);
+    *requirements = NULL;
+  }
+
+  {
+    struct RemoveContext rc = {
+      .needed = needed,
+      .needed_cnt = &needed_cnt,
+    };
+    enum GNUNET_DB_QueryStatus qs;
+
+    rc.kyc_details = json_object ();
+    GNUNET_assert (NULL != rc.kyc_details);
+
+    /* Check what provider checks are already satisfied for h_payto (with
+       database), remove those from the 'needed' array. */
+    qs = ki (ki_cls,
+             h_payto,
+             &remove_satisfied,
+             &rc);
+    if (qs < 0)
+    {
+      GNUNET_break (GNUNET_DB_STATUS_SOFT_ERROR == qs);
+      *satisfied = false;
+      return qs;
+    }
+    if (0 != needed_cnt)
+    {
+      json_decref (rc.kyc_details);
+      *kyc_details = NULL;
+    }
+    else
+    {
+      *kyc_details = rc.kyc_details;
+    }
+  }
+  *satisfied = (0 == needed_cnt);
+
+  {
+    char *res = NULL;
+
+    for (unsigned int i = 0; i<needed_cnt; i++)
+    {
+      const struct TALER_KYCLOGIC_KycCheck *need = needed[i];
+
+      if (NULL == res)
+      {
+        res = GNUNET_strdup (need->name);
+      }
+      else
+      {
+        char *tmp;
+
+        GNUNET_asprintf (&tmp,
+                         "%s %s",
+                         res,
+                         need->name);
+        GNUNET_free (res);
+        res = tmp;
+      }
+    }
+    *requirements = res;
+  }
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_requirements_to_logic (const char *requirements,
+                                      enum TALER_KYCLOGIC_KycUserType ut,
+                                      struct TALER_KYCLOGIC_Plugin **plugin,
+                                      struct TALER_KYCLOGIC_ProviderDetails **pd,
+                                      const char **configuration_section)
+{
+  struct TALER_KYCLOGIC_KycCheck *needed[num_kyc_checks];
+  unsigned int needed_cnt = 0;
+  unsigned long long min_cost = ULLONG_MAX;
+  unsigned int max_checks = 0;
+  const struct TALER_KYCLOGIC_KycProvider *kp_best = NULL;
+
+  if (NULL == requirements)
+    return GNUNET_NO;
+  {
+    char *req = GNUNET_strdup (requirements);
+
+    for (const char *tok = strtok (req, " ");
+         NULL != tok;
+         tok = strtok (NULL, " "))
+      needed[needed_cnt++] = add_check (tok);
+    GNUNET_free (req);
+  }
+
+  /* Count maximum number of remaining checks covered by any
+     provider */
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+    unsigned int matched = 0;
+
+    if (kp->user_type != ut)
+      continue;
+    for (unsigned int j = 0; j<kp->num_checks; j++)
+    {
+      const struct TALER_KYCLOGIC_KycCheck *kc = kp->provided_checks[j];
+
+      for (unsigned int k = 0; k<needed_cnt; k++)
+        if (kc == needed[k])
+        {
+          matched++;
+          break;
+        }
+    }
+    max_checks = GNUNET_MAX (max_checks,
+                             matched);
+  }
+  if (0 == max_checks)
+    return GNUNET_SYSERR;
+
+  /* Find min-cost provider covering max_checks. */
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+    unsigned int matched = 0;
+
+    if (kp->user_type != ut)
+      continue;
+    for (unsigned int j = 0; j<kp->num_checks; j++)
+    {
+      const struct TALER_KYCLOGIC_KycCheck *kc = kp->provided_checks[j];
+
+      for (unsigned int k = 0; k<needed_cnt; k++)
+        if (kc == needed[k])
+        {
+          matched++;
+          break;
+        }
+    }
+    if ( (max_checks == matched) &&
+         (kp->cost < min_cost) )
+    {
+      min_cost = kp->cost;
+      kp_best = kp;
+    }
+  }
+  GNUNET_assert (NULL != kp_best);
+  *plugin = kp_best->logic;
+  *pd = kp_best->pd;
+  *configuration_section = kp_best->provider_section_name;
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_KYCLOGIC_lookup_logic (const char *name,
+                             struct TALER_KYCLOGIC_Plugin **plugin,
+                             struct TALER_KYCLOGIC_ProviderDetails **pd,
+                             const char **provider_section)
+{
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+
+    if (0 !=
+        strcasecmp (name,
+                    kp->provider_section_name))
+      continue;
+    *plugin = kp->logic;
+    *pd = kp->pd;
+    *provider_section = kp->provider_section_name;
+    return GNUNET_OK;
+  }
+  for (unsigned int i = 0; i<num_kyc_logics; i++)
+  {
+    struct TALER_KYCLOGIC_Plugin *logic = kyc_logics[i];
+
+    if (0 !=
+        strcasecmp (logic->name,
+                    name))
+      continue;
+    *plugin = logic;
+    *pd = NULL;
+    *provider_section = NULL;
+    return GNUNET_OK;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Provider `%s' unknown\n",
+              name);
+  return GNUNET_SYSERR;
+}
+
+
+void
+TALER_KYCLOGIC_kyc_iterate_thresholds (
+  enum TALER_KYCLOGIC_KycTriggerEvent event,
+  TALER_KYCLOGIC_KycThresholdIterator it,
+  void *it_cls)
+{
+  for (unsigned int i = 0; i<num_kyc_triggers; i++)
+  {
+    const struct TALER_KYCLOGIC_KycTrigger *kt = kyc_triggers[i];
+
+    if (event != kt->trigger)
+      continue;
+    it (it_cls,
+        &kt->threshold);
+  }
+}
+
+
+void
+TALER_KYCLOGIC_lookup_checks (const char *section_name,
+                              unsigned int *num_checks,
+                              char ***provided_checks)
+{
+  *num_checks = 0;
+  *provided_checks = NULL;
+  for (unsigned int i = 0; i<num_kyc_providers; i++)
+  {
+    struct TALER_KYCLOGIC_KycProvider *kp = kyc_providers[i];
+
+    if (0 !=
+        strcasecmp (section_name,
+                    kp->provider_section_name))
+      continue;
+    *num_checks = kp->num_checks;
+    if (0 != kp->num_checks)
+    {
+      char **pc = GNUNET_new_array (kp->num_checks,
+                                    char *);
+      for (unsigned int i = 0; i<kp->num_checks; i++)
+        pc[i] = GNUNET_strdup (kp->provided_checks[i]->name);
+      *provided_checks = pc;
+    }
+    return;
+  }
+}
+
+
+/* end of taler-exchange-httpd_kyc.c */
diff --git a/src/kyclogic/plugin_kyclogic_kycaid.c b/src/kyclogic/plugin_kyclogic_kycaid.c
new file mode 100644
index 000000000..243ff7c34
--- /dev/null
+++ b/src/kyclogic/plugin_kyclogic_kycaid.c
@@ -0,0 +1,1480 @@
+/*
+  This file is part of GNU Taler
+  Copyright (C) 2022--2024 Taler Systems SA
+
+  Taler 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  Taler; see the file COPYING.GPL.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file plugin_kyclogic_kycaid.c
+ * @brief kycaid for an authentication flow logic
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_attributes.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_kyclogic_plugin.h"
+#include "taler_mhd_lib.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+#include "taler_templating_lib.h"
+#include <regex.h>
+#include "taler_util.h"
+
+
+/**
+ * Saves the state of a plugin.
+ */
+struct PluginState
+{
+
+  /**
+   * Our base URL.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Our global configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Context for CURL operations (useful to the event loop)
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * Context for integrating @e curl_ctx with the
+   * GNUnet event loop.
+   */
+  struct GNUNET_CURL_RescheduleContext *curl_rc;
+
+};
+
+
+/**
+ * Keeps the plugin-specific state for
+ * a given configuration section.
+ */
+struct TALER_KYCLOGIC_ProviderDetails
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Configuration section that configured us.
+   */
+  char *section;
+
+  /**
+   * Authorization token to use when talking
+   * to the service.
+   */
+  char *auth_token;
+
+  /**
+   * Form ID for the KYC check to perform.
+   */
+  char *form_id;
+
+  /**
+   * Helper binary to convert attributes returned by
+   * KYCAID into our internal format.
+   */
+  char *conversion_helper;
+
+  /**
+   * Validity time for a successful KYC process.
+   */
+  struct GNUNET_TIME_Relative validity;
+
+  /**
+   * Curl-ready authentication header to use.
+   */
+  struct curl_slist *slist;
+
+};
+
+
+/**
+ * Handle for an initiation operation.
+ */
+struct TALER_KYCLOGIC_InitiateHandle
+{
+
+  /**
+   * Hash of the payto:// URI we are initiating
+   * the KYC for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * UUID being checked.
+   */
+  uint64_t legitimization_uuid;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_InitiateCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * URL of the cURL request.
+   */
+  char *url;
+
+};
+
+
+/**
+ * Handle for an KYC proof operation.
+ */
+struct TALER_KYCLOGIC_ProofHandle
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_ProofCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+};
+
+
+/**
+ * Handle for an KYC Web hook operation.
+ */
+struct TALER_KYCLOGIC_WebhookHandle
+{
+
+  /**
+   * Continuation to call when done.
+   */
+  TALER_KYCLOGIC_WebhookCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Handle to helper process to extract attributes
+   * we care about.
+   */
+  struct TALER_JSON_ExternalConversion *econ;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * JSON response we got back, or NULL for none.
+   */
+  json_t *json_response;
+
+  /**
+   * Verification ID from the service.
+   */
+  char *verification_id;
+
+  /**
+   * Applicant ID from the service.
+   */
+  char *applicant_id;
+
+  /**
+   * URL of the cURL request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Response to return asynchronously.
+   */
+  struct MHD_Response *resp;
+
+  /**
+   * Our account ID.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Row in legitimizations for the given
+   * @e verification_id.
+   */
+  uint64_t process_row;
+
+  /**
+   * HTTP response code we got from KYCAID.
+   */
+  unsigned int kycaid_response_code;
+
+  /**
+   * HTTP response code to return asynchronously.
+   */
+  unsigned int response_code;
+};
+
+
+/**
+ * Release configuration resources previously loaded
+ *
+ * @param[in] pd configuration to release
+ */
+static void
+kycaid_unload_configuration (struct TALER_KYCLOGIC_ProviderDetails *pd)
+{
+  curl_slist_free_all (pd->slist);
+  GNUNET_free (pd->conversion_helper);
+  GNUNET_free (pd->auth_token);
+  GNUNET_free (pd->form_id);
+  GNUNET_free (pd->section);
+  GNUNET_free (pd);
+}
+
+
+/**
+ * Load the configuration of the KYC provider.
+ *
+ * @param cls closure
+ * @param provider_section_name configuration section to parse
+ * @return NULL if configuration is invalid
+ */
+static struct TALER_KYCLOGIC_ProviderDetails *
+kycaid_load_configuration (void *cls,
+                           const char *provider_section_name)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  pd = GNUNET_new (struct TALER_KYCLOGIC_ProviderDetails);
+  pd->ps = ps;
+  pd->section = GNUNET_strdup (provider_section_name);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (ps->cfg,
+                                           provider_section_name,
+                                           "KYC_KYCAID_VALIDITY",
+                                           &pd->validity))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_KYCAID_VALIDITY");
+    kycaid_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_KYCAID_AUTH_TOKEN",
+                                             &pd->auth_token))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_KYCAID_AUTH_TOKEN");
+    kycaid_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_KYCAID_FORM_ID",
+                                             &pd->form_id))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_KYCAID_FORM_ID");
+    kycaid_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_KYCAID_CONVERTER_HELPER",
+                                             &pd->conversion_helper))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_KYCAID_CONVERTER_HELPER");
+    kycaid_unload_configuration (pd);
+    return NULL;
+  }
+  {
+    char *auth;
+
+    GNUNET_asprintf (&auth,
+                     "%s: Token %s",
+                     MHD_HTTP_HEADER_AUTHORIZATION,
+                     pd->auth_token);
+    pd->slist = curl_slist_append (NULL,
+                                   auth);
+    GNUNET_free (auth);
+  }
+  return pd;
+}
+
+
+/**
+ * Cancel KYC check initiation.
+ *
+ * @param[in] ih handle of operation to cancel
+ */
+static void
+kycaid_initiate_cancel (struct TALER_KYCLOGIC_InitiateHandle *ih)
+{
+  if (NULL != ih->job)
+  {
+    GNUNET_CURL_job_cancel (ih->job);
+    ih->job = NULL;
+  }
+  GNUNET_free (ih->url);
+  TALER_curl_easy_post_finished (&ih->ctx);
+  GNUNET_free (ih);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP "/forms/{form_id}/urls" request.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_InitiateHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_initiate_finished (void *cls,
+                          long response_code,
+                          const void *response)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih = cls;
+  const json_t *j = response;
+
+  ih->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_OK:
+    {
+      const char *verification_id;
+      const char *form_url;
+      const char *form_id;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_string ("verification_id",
+                                 &verification_id),
+        GNUNET_JSON_spec_string ("form_url",
+                                 &form_url),
+        GNUNET_JSON_spec_string ("form_id",
+                                 &form_id),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        json_dumpf (j,
+                    stderr,
+                    JSON_INDENT (2));
+        ih->cb (ih->cb_cls,
+                TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+                NULL,
+                NULL,
+                NULL,
+                json_string_value (json_object_get (j,
+                                                    "type")));
+        break;
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Started new verification `%s' using form %s\n",
+                  verification_id,
+                  form_id);
+      ih->cb (ih->cb_cls,
+              TALER_EC_NONE,
+              form_url,
+              NULL, /* no provider_user_id */
+              verification_id,
+              NULL /* no error */);
+      GNUNET_JSON_parse_free (spec);
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYCAID failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_BUG,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+  case MHD_HTTP_PAYMENT_REQUIRED:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_ACCESS_REFUSED,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  case MHD_HTTP_REQUEST_TIMEOUT:
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_TIMEOUT,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  case MHD_HTTP_UNPROCESSABLE_ENTITY: /* validation */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYCAID failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  case MHD_HTTP_TOO_MANY_REQUESTS:
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_RATE_LIMIT_EXCEEDED,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected KYCAID response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+            NULL,
+            NULL,
+            NULL,
+            json_string_value (json_object_get (j,
+                                                "type")));
+    break;
+  }
+  kycaid_initiate_cancel (ih);
+}
+
+
+/**
+ * Initiate KYC check.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param account_id which account to trigger process for
+ * @param legitimization_uuid unique ID for the legitimization process
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_InitiateHandle *
+kycaid_initiate (void *cls,
+                 const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                 const struct TALER_PaytoHashP *account_id,
+                 uint64_t legitimization_uuid,
+                 TALER_KYCLOGIC_InitiateCallback cb,
+                 void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_InitiateHandle *ih;
+  json_t *body;
+  CURL *eh;
+
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  ih = GNUNET_new (struct TALER_KYCLOGIC_InitiateHandle);
+  ih->legitimization_uuid = legitimization_uuid;
+  ih->cb = cb;
+  ih->cb_cls = cb_cls;
+  ih->h_payto = *account_id;
+  ih->pd = pd;
+  GNUNET_asprintf (&ih->url,
+                   "https://api.kycaid.com/forms/%s/urls",
+                   pd->form_id);
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_data64_auto ("external_applicant_id",
+                                  account_id)
+    );
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_VERBOSE,
+                                  0));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   1L));
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_URL,
+                                  ih->url));
+  if (GNUNET_OK !=
+      TALER_curl_easy_post (&ih->ctx,
+                            eh,
+                            body))
+  {
+    GNUNET_break (0);
+    GNUNET_free (ih->url);
+    GNUNET_free (ih);
+    curl_easy_cleanup (eh);
+    json_decref (body);
+    return NULL;
+  }
+  json_decref (body);
+  ih->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  ih->ctx.headers,
+                                  &handle_initiate_finished,
+                                  ih);
+  GNUNET_CURL_extend_headers (ih->job,
+                              pd->slist);
+  return ih;
+}
+
+
+/**
+ * Cancel KYC proof.
+ *
+ * @param[in] ph handle of operation to cancel
+ */
+static void
+kycaid_proof_cancel (struct TALER_KYCLOGIC_ProofHandle *ph)
+{
+  if (NULL != ph->task)
+  {
+    GNUNET_SCHEDULER_cancel (ph->task);
+    ph->task = NULL;
+  }
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Call @a ph callback with HTTP error response.
+ *
+ * @param cls proof handle to generate reply for
+ */
+static void
+proof_reply (void *cls)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  struct MHD_Response *resp;
+  enum GNUNET_GenericReturnValue ret;
+  json_t *body;
+  unsigned int http_status;
+
+  http_status = MHD_HTTP_BAD_REQUEST;
+  body = GNUNET_JSON_PACK (
+    TALER_JSON_pack_ec (TALER_EC_GENERIC_ENDPOINT_UNKNOWN));
+  GNUNET_assert (NULL != body);
+  ret = TALER_TEMPLATING_build (ph->connection,
+                                &http_status,
+                                "kycaid-invalid-request",
+                                NULL,
+                                NULL,
+                                body,
+                                &resp);
+  json_decref (body);
+  GNUNET_break (GNUNET_SYSERR != ret);
+  ph->cb (ph->cb_cls,
+          TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+          NULL, /* user id */
+          NULL, /* provider legi ID */
+          GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+          NULL, /* attributes */
+          http_status,
+          resp);
+}
+
+
+/**
+ * Check KYC status and return status to human. Not
+ * used by KYC AID!
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param connection MHD connection object (for HTTP headers)
+ * @param account_id which account to trigger process for
+ * @param process_row row in the legitimization processes table the legitimization is for
+ * @param provider_user_id user ID (or NULL) the proof is for
+ * @param provider_legitimization_id legitimization ID the proof is for
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_ProofHandle *
+kycaid_proof (void *cls,
+              const struct TALER_KYCLOGIC_ProviderDetails *pd,
+              struct MHD_Connection *connection,
+              const struct TALER_PaytoHashP *account_id,
+              uint64_t process_row,
+              const char *provider_user_id,
+              const char *provider_legitimization_id,
+              TALER_KYCLOGIC_ProofCallback cb,
+              void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProofHandle *ph;
+
+  ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle);
+  ph->ps = ps;
+  ph->pd = pd;
+  ph->cb = cb;
+  ph->cb_cls = cb_cls;
+  ph->connection = connection;
+  ph->task = GNUNET_SCHEDULER_add_now (&proof_reply,
+                                       ph);
+  return ph;
+}
+
+
+/**
+ * Cancel KYC webhook execution.
+ *
+ * @param[in] wh handle of operation to cancel
+ */
+static void
+kycaid_webhook_cancel (struct TALER_KYCLOGIC_WebhookHandle *wh)
+{
+  if (NULL != wh->task)
+  {
+    GNUNET_SCHEDULER_cancel (wh->task);
+    wh->task = NULL;
+  }
+  if (NULL != wh->econ)
+  {
+    TALER_JSON_external_conversion_stop (wh->econ);
+    wh->econ = NULL;
+  }
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  if (NULL != wh->json_response)
+  {
+    json_decref (wh->json_response);
+    wh->json_response = NULL;
+  }
+  GNUNET_free (wh->verification_id);
+  GNUNET_free (wh->applicant_id);
+  GNUNET_free (wh->url);
+  GNUNET_free (wh);
+}
+
+
+/**
+ * Extract KYC failure reasons and log those
+ *
+ * @param verifications JSON object with failure details
+ */
+static void
+log_failure (const json_t *verifications)
+{
+  const json_t *member;
+  const char *name;
+
+  json_object_foreach ((json_t *) verifications, name, member)
+  {
+    bool iverified;
+    const char *comment;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_bool ("verified",
+                             &iverified),
+      GNUNET_JSON_spec_string ("comment",
+                               &comment),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (member,
+                           spec,
+                           NULL, NULL))
+    {
+      GNUNET_break_op (0);
+      json_dumpf (member,
+                  stderr,
+                  JSON_INDENT (2));
+      continue;
+    }
+    if (iverified)
+      continue;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC verification of attribute `%s' failed: %s\n",
+                name,
+                comment);
+  }
+}
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure our `struct TALER_KYCLOGIC_WebhookHandle *`
+ * @param status_type how did the process die
+ * @param code termination status code from the process
+ * @param result converted attribute data, NULL on failure
+ */
+static void
+webhook_conversion_cb (void *cls,
+                       enum GNUNET_OS_ProcessStatusType status_type,
+                       unsigned long code,
+                       const json_t *result)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+  struct GNUNET_TIME_Absolute expiration;
+  struct MHD_Response *resp;
+
+  wh->econ = NULL;
+  if ( (0 == code) &&
+       (NULL == result) )
+  {
+    /* No result, but *our helper* was OK => bad input */
+    GNUNET_break_op (0);
+    json_dumpf (wh->json_response,
+                stderr,
+                JSON_INDENT (2));
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               wh->kycaid_response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) wh->json_response));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_BAD_GATEWAY,
+            resp);
+    kycaid_webhook_cancel (wh);
+    return;
+  }
+  if (NULL == result)
+  {
+    /* Failure in our helper */
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Helper exited with status code %d\n",
+                (int) code);
+    json_dumpf (wh->json_response,
+                stderr,
+                JSON_INDENT (2));
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               wh->kycaid_response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) wh->json_response));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_BAD_GATEWAY,
+            resp);
+    kycaid_webhook_cancel (wh);
+    return;
+  }
+  expiration = GNUNET_TIME_relative_to_absolute (wh->pd->validity);
+  resp = MHD_create_response_from_buffer (0,
+                                          "",
+                                          MHD_RESPMEM_PERSISTENT);
+  wh->cb (wh->cb_cls,
+          wh->process_row,
+          &wh->h_payto,
+          wh->pd->section,
+          wh->applicant_id,
+          wh->verification_id,
+          TALER_KYCLOGIC_STATUS_SUCCESS,
+          expiration,
+          result,
+          MHD_HTTP_NO_CONTENT,
+          resp);
+  kycaid_webhook_cancel (wh);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP "/applicants/{verification_id}" request.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_WebhookHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_webhook_finished (void *cls,
+                         long response_code,
+                         const void *response)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+  const json_t *j = response;
+  struct MHD_Response *resp;
+
+  wh->job = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Webhook returned with HTTP status %u\n",
+              (unsigned int) response_code);
+  wh->kycaid_response_code = response_code;
+  wh->json_response = json_incref ((json_t *) j);
+  switch (response_code)
+  {
+  case MHD_HTTP_OK:
+    {
+      const char *profile_status;
+
+      profile_status = json_string_value (
+        json_object_get (
+          j,
+          "profile_status"));
+      if (0 != strcasecmp ("valid",
+                           profile_status))
+      {
+        enum TALER_KYCLOGIC_KycStatus ks;
+
+        ks = (0 == strcasecmp ("pending",
+                               profile_status))
+          ? TALER_KYCLOGIC_STATUS_PENDING
+          : TALER_KYCLOGIC_STATUS_USER_ABORTED;
+        resp = MHD_create_response_from_buffer (0,
+                                                "",
+                                                MHD_RESPMEM_PERSISTENT);
+        wh->cb (wh->cb_cls,
+                wh->process_row,
+                &wh->h_payto,
+                wh->pd->section,
+                wh->applicant_id,
+                wh->verification_id,
+                ks,
+                GNUNET_TIME_UNIT_ZERO_ABS,
+                NULL,
+                MHD_HTTP_NO_CONTENT,
+                resp);
+        break;
+      }
+      wh->econ
+        = TALER_JSON_external_conversion_start (
+            j,
+            &webhook_conversion_cb,
+            wh,
+            wh->pd->conversion_helper,
+            wh->pd->conversion_helper,
+            "-a",
+            wh->pd->auth_token,
+            NULL);
+      if (NULL == wh->econ)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Failed to start KYCAID conversion helper `%s'\n",
+                    wh->pd->conversion_helper);
+        resp = TALER_MHD_make_error (
+          TALER_EC_EXCHANGE_GENERIC_KYC_CONVERTER_FAILED,
+          NULL);
+        wh->cb (wh->cb_cls,
+                wh->process_row,
+                &wh->h_payto,
+                wh->pd->section,
+                wh->applicant_id,
+                wh->verification_id,
+                TALER_KYCLOGIC_STATUS_INTERNAL_ERROR,
+                GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+                NULL,
+                MHD_HTTP_INTERNAL_SERVER_ERROR,
+                resp);
+        break;
+      }
+      return;
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYCAID failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_INTERNAL_SERVER_ERROR,
+            resp);
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+  case MHD_HTTP_PAYMENT_REQUIRED:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_NETWORK_AUTHENTICATION_REQUIRED,
+            resp);
+    break;
+  case MHD_HTTP_REQUEST_TIMEOUT:
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_GATEWAY_TIMEOUT,
+            resp);
+    break;
+  case MHD_HTTP_UNPROCESSABLE_ENTITY: /* validation */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "KYCAID failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_BAD_GATEWAY,
+            resp);
+    break;
+  case MHD_HTTP_TOO_MANY_REQUESTS:
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_SERVICE_UNAVAILABLE,
+            resp);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_BAD_GATEWAY,
+            resp);
+    break;
+  default:
+    resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("kycaid_http_status",
+                               response_code),
+      GNUNET_JSON_pack_object_incref ("kycaid_body",
+                                      (json_t *) j));
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected KYCAID response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    wh->cb (wh->cb_cls,
+            wh->process_row,
+            &wh->h_payto,
+            wh->pd->section,
+            wh->applicant_id,
+            wh->verification_id,
+            TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+            GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+            NULL,
+            MHD_HTTP_BAD_GATEWAY,
+            resp);
+    break;
+  }
+  kycaid_webhook_cancel (wh);
+}
+
+
+/**
+ * Asynchronously return a reply for the webhook.
+ *
+ * @param cls a `struct TALER_KYCLOGIC_WebhookHandle *`
+ */
+static void
+async_webhook_reply (void *cls)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+
+  wh->task = NULL;
+  wh->cb (wh->cb_cls,
+          wh->process_row,
+          (0 == wh->process_row)
+          ? NULL
+          : &wh->h_payto,
+          wh->pd->section,
+          wh->applicant_id, /* provider user ID */
+          wh->verification_id, /* provider legi ID */
+          TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+          GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+          NULL,
+          wh->response_code,
+          wh->resp);
+  kycaid_webhook_cancel (wh);
+}
+
+
+/**
+ * Check KYC status and return result for Webhook.  We do NOT implement the
+ * authentication check proposed by the KYCAID documentation, as it would
+ * allow an attacker who learns the access token to easily bypass the KYC
+ * checks. Instead, we insist on explicitly requesting the KYC status from the
+ * provider (at least on success).
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param plc callback to lookup accounts with
+ * @param plc_cls closure for @a plc
+ * @param http_method HTTP method used for the webhook
+ * @param url_path rest of the URL after `/kyc-webhook/`
+ * @param connection MHD connection object (for HTTP headers)
+ * @param body HTTP request body
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_WebhookHandle *
+kycaid_webhook (void *cls,
+                const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                TALER_KYCLOGIC_ProviderLookupCallback plc,
+                void *plc_cls,
+                const char *http_method,
+                const char *const url_path[],
+                struct MHD_Connection *connection,
+                const json_t *body,
+                TALER_KYCLOGIC_WebhookCallback cb,
+                void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+  CURL *eh;
+  const char *request_id;
+  const char *type;
+  const char *verification_id; /* = provider_legitimization_id */
+  const char *applicant_id;
+  const char *form_id;
+  const char *status = NULL;
+  bool verified = false;
+  bool no_verified = true;
+  const json_t *verifications = NULL;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("request_id",
+                             &request_id),
+    GNUNET_JSON_spec_string ("type",
+                             &type),
+    GNUNET_JSON_spec_string ("verification_id",
+                             &verification_id),
+    GNUNET_JSON_spec_string ("applicant_id",
+                             &applicant_id),
+    GNUNET_JSON_spec_string ("form_id",
+                             &form_id),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string ("status",
+                               &status),
+      NULL),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_bool ("verified",
+                             &verified),
+      &no_verified),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_object_const ("verifications",
+                                     &verifications),
+      NULL),
+    GNUNET_JSON_spec_end ()
+  };
+  enum GNUNET_DB_QueryStatus qs;
+
+  wh = GNUNET_new (struct TALER_KYCLOGIC_WebhookHandle);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ps = ps;
+  wh->pd = pd;
+  wh->connection = connection;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "KYCAID webhook of `%s' triggered with %s\n",
+              pd->section,
+              http_method);
+#if 1
+  if (NULL != body)
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+#endif
+  if (NULL == pd)
+  {
+    GNUNET_break_op (0);
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+    wh->resp = TALER_MHD_make_error (
+      TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
+      "kycaid");
+    wh->response_code = MHD_HTTP_NOT_FOUND;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (body,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+    wh->resp = TALER_MHD_MAKE_JSON_PACK (
+      GNUNET_JSON_pack_object_incref ("webhook_body",
+                                      (json_t *) body));
+    wh->response_code = MHD_HTTP_BAD_REQUEST;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  qs = plc (plc_cls,
+            pd->section,
+            verification_id,
+            &wh->h_payto,
+            &wh->process_row);
+  if (qs < 0)
+  {
+    wh->resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                     "provider-legitimization-lookup");
+    wh->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received webhook for unknown verification ID `%s' and section `%s'\n",
+                verification_id,
+                pd->section);
+    wh->resp = TALER_MHD_make_error (
+      TALER_EC_EXCHANGE_KYC_PROOF_REQUEST_UNKNOWN,
+      verification_id);
+    wh->response_code = MHD_HTTP_NOT_FOUND;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  wh->verification_id = GNUNET_strdup (verification_id);
+  wh->applicant_id = GNUNET_strdup (applicant_id);
+  if ( (0 != strcasecmp (type,
+                         "VERIFICATION_COMPLETED")) ||
+       (no_verified) ||
+       (! verified) )
+  {
+    /* We don't need to re-confirm the failure by
+       asking the API again. */
+    log_failure (verifications);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Webhook called with non-completion status: %s\n",
+                type);
+    wh->response_code = MHD_HTTP_NO_CONTENT;
+    wh->resp = MHD_create_response_from_buffer (0,
+                                                "",
+                                                MHD_RESPMEM_PERSISTENT);
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    wh->resp = TALER_MHD_make_error (
+      TALER_EC_GENERIC_ALLOCATION_FAILURE,
+      NULL);
+    wh->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  GNUNET_asprintf (&wh->url,
+                   "https://api.kycaid.com/applicants/%s",
+                   applicant_id);
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_VERBOSE,
+                                  0));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   1L));
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_URL,
+                                  wh->url));
+  wh->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  pd->slist,
+                                  &handle_webhook_finished,
+                                  wh);
+  return wh;
+}
+
+
+/**
+ * Initialize kycaid logic plugin
+ *
+ * @param cls a configuration instance
+ * @return NULL on error, otherwise a `struct TALER_KYCLOGIC_Plugin`
+ */
+void *
+libtaler_plugin_kyclogic_kycaid_init (void *cls)
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct TALER_KYCLOGIC_Plugin *plugin;
+  struct PluginState *ps;
+
+  ps = GNUNET_new (struct PluginState);
+  ps->cfg = cfg;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &ps->exchange_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    GNUNET_free (ps);
+    return NULL;
+  }
+
+  ps->curl_ctx
+    = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                        &ps->curl_rc);
+  if (NULL == ps->curl_ctx)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ps->exchange_base_url);
+    GNUNET_free (ps);
+    return NULL;
+  }
+  ps->curl_rc = GNUNET_CURL_gnunet_rc_create (ps->curl_ctx);
+
+  plugin = GNUNET_new (struct TALER_KYCLOGIC_Plugin);
+  plugin->cls = ps;
+  plugin->load_configuration
+    = &kycaid_load_configuration;
+  plugin->unload_configuration
+    = &kycaid_unload_configuration;
+  plugin->initiate
+    = &kycaid_initiate;
+  plugin->initiate_cancel
+    = &kycaid_initiate_cancel;
+  plugin->proof
+    = &kycaid_proof;
+  plugin->proof_cancel
+    = &kycaid_proof_cancel;
+  plugin->webhook
+    = &kycaid_webhook;
+  plugin->webhook_cancel
+    = &kycaid_webhook_cancel;
+  return plugin;
+}
+
+
+/**
+ * Unload authorization plugin
+ *
+ * @param cls a `struct TALER_KYCLOGIC_Plugin`
+ * @return NULL (always)
+ */
+void *
+libtaler_plugin_kyclogic_kycaid_done (void *cls)
+{
+  struct TALER_KYCLOGIC_Plugin *plugin = cls;
+  struct PluginState *ps = plugin->cls;
+
+  if (NULL != ps->curl_ctx)
+  {
+    GNUNET_CURL_fini (ps->curl_ctx);
+    ps->curl_ctx = NULL;
+  }
+  if (NULL != ps->curl_rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (ps->curl_rc);
+    ps->curl_rc = NULL;
+  }
+  GNUNET_free (ps->exchange_base_url);
+  GNUNET_free (ps);
+  GNUNET_free (plugin);
+  return NULL;
+}
diff --git a/src/kyclogic/plugin_kyclogic_oauth2.c b/src/kyclogic/plugin_kyclogic_oauth2.c
new file mode 100644
index 000000000..3a1f50bcf
--- /dev/null
+++ b/src/kyclogic/plugin_kyclogic_oauth2.c
@@ -0,0 +1,1780 @@
+/*
+  This file is part of GNU Taler
+  Copyright (C) 2022-2024 Taler Systems SA
+
+  Taler 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  Taler; see the file COPYING.GPL.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file plugin_kyclogic_oauth2.c
+ * @brief oauth2.0 based authentication flow logic
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_kyclogic_plugin.h"
+#include "taler_mhd_lib.h"
+#include "taler_templating_lib.h"
+#include "taler_json_lib.h"
+#include <regex.h>
+#include "taler_util.h"
+
+
+/**
+ * Saves the state of a plugin.
+ */
+struct PluginState
+{
+
+  /**
+   * Our global configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Our base URL.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Context for CURL operations (useful to the event loop)
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * Context for integrating @e curl_ctx with the
+   * GNUnet event loop.
+   */
+  struct GNUNET_CURL_RescheduleContext *curl_rc;
+
+};
+
+
+/**
+ * Keeps the plugin-specific state for
+ * a given configuration section.
+ */
+struct TALER_KYCLOGIC_ProviderDetails
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Configuration section that configured us.
+   */
+  char *section;
+
+  /**
+   * URL of the Challenger ``/setup`` endpoint for
+   * approving address validations. NULL if not used.
+   */
+  char *setup_url;
+
+  /**
+   * URL of the OAuth2.0 endpoint for KYC checks.
+   */
+  char *authorize_url;
+
+  /**
+   * URL of the OAuth2.0 endpoint for KYC checks.
+   * (token/auth)
+   */
+  char *token_url;
+
+  /**
+   * URL of the user info access endpoint.
+   */
+  char *info_url;
+
+  /**
+   * Our client ID for OAuth2.0.
+   */
+  char *client_id;
+
+  /**
+   * Our client secret for OAuth2.0.
+   */
+  char *client_secret;
+
+  /**
+   * Where to redirect clients after the
+   * Web-based KYC process is done?
+   */
+  char *post_kyc_redirect_url;
+
+  /**
+   * Name of the program we use to convert outputs
+   * from Persona into our JSON inputs.
+   */
+  char *conversion_binary;
+
+  /**
+   * Validity time for a successful KYC process.
+   */
+  struct GNUNET_TIME_Relative validity;
+
+  /**
+   * Set to true if we are operating in DEBUG
+   * mode and may return private details in HTML
+   * responses to make diagnostics easier.
+   */
+  bool debug_mode;
+};
+
+
+/**
+ * Handle for an initiation operation.
+ */
+struct TALER_KYCLOGIC_InitiateHandle
+{
+
+  /**
+   * Hash of the payto:// URI we are initiating
+   * the KYC for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * UUID being checked.
+   */
+  uint64_t legitimization_uuid;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * The task for asynchronous response generation.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Handle for the OAuth 2.0 setup request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_InitiateCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+};
+
+
+/**
+ * Handle for an KYC proof operation.
+ */
+struct TALER_KYCLOGIC_ProofHandle
+{
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * HTTP connection we are processing.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * Handle to an external process that converts the
+   * Persona response to our internal format.
+   */
+  struct TALER_JSON_ExternalConversion *ec;
+
+  /**
+   * Hash of the payto URI that this is about.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_ProofCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Curl request we are running to the OAuth 2.0 service.
+   */
+  CURL *eh;
+
+  /**
+   * Body for the @e eh POST request.
+   */
+  char *post_body;
+
+  /**
+   * KYC attributes returned about the user by the OAuth 2.0 server.
+   */
+  json_t *attributes;
+
+  /**
+   * Response to return.
+   */
+  struct MHD_Response *response;
+
+  /**
+   * The task for asynchronous response generation.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Handle for the OAuth 2.0 CURL request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * User ID to return, the 'id' from OAuth.
+   */
+  char *provider_user_id;
+
+  /**
+   * Legitimization ID to return, the 64-bit row ID
+   * as a string.
+   */
+  char provider_legitimization_id[32];
+
+  /**
+   * KYC status to return.
+   */
+  enum TALER_KYCLOGIC_KycStatus status;
+
+  /**
+   * HTTP status to return.
+   */
+  unsigned int http_status;
+
+
+};
+
+
+/**
+ * Handle for an KYC Web hook operation.
+ */
+struct TALER_KYCLOGIC_WebhookHandle
+{
+
+  /**
+   * Continuation to call when done.
+   */
+  TALER_KYCLOGIC_WebhookCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+};
+
+
+/**
+ * Release configuration resources previously loaded
+ *
+ * @param[in] pd configuration to release
+ */
+static void
+oauth2_unload_configuration (struct TALER_KYCLOGIC_ProviderDetails *pd)
+{
+  GNUNET_free (pd->section);
+  GNUNET_free (pd->token_url);
+  GNUNET_free (pd->setup_url);
+  GNUNET_free (pd->authorize_url);
+  GNUNET_free (pd->info_url);
+  GNUNET_free (pd->client_id);
+  GNUNET_free (pd->client_secret);
+  GNUNET_free (pd->post_kyc_redirect_url);
+  GNUNET_free (pd->conversion_binary);
+  GNUNET_free (pd);
+}
+
+
+/**
+ * Load the configuration of the KYC provider.
+ *
+ * @param cls closure
+ * @param provider_section_name configuration section to parse
+ * @return NULL if configuration is invalid
+ */
+static struct TALER_KYCLOGIC_ProviderDetails *
+oauth2_load_configuration (void *cls,
+                           const char *provider_section_name)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+  char *s;
+
+  pd = GNUNET_new (struct TALER_KYCLOGIC_ProviderDetails);
+  pd->ps = ps;
+  pd->section = GNUNET_strdup (provider_section_name);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (ps->cfg,
+                                           provider_section_name,
+                                           "KYC_OAUTH2_VALIDITY",
+                                           &pd->validity))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_VALIDITY");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_CLIENT_ID",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_CLIENT_ID");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  pd->client_id = s;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_TOKEN_URL",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_TOKEN_URL");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  if ( (! TALER_url_valid_charset (s)) ||
+       ( (0 != strncasecmp (s,
+                            "http://",
+                            strlen ("http://"))) &&
+         (0 != strncasecmp (s,
+                            "https://",
+                            strlen ("https://"))) ) )
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_TOKEN_URL",
+                               "not a valid URL");
+    GNUNET_free (s);
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  pd->token_url = s;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_AUTHORIZE_URL",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_AUTHORIZE_URL");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  if ( (! TALER_url_valid_charset (s)) ||
+       ( (0 != strncasecmp (s,
+                            "http://",
+                            strlen ("http://"))) &&
+         (0 != strncasecmp (s,
+                            "https://",
+                            strlen ("https://"))) ) )
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_AUTHORIZE_URL",
+                               "not a valid URL");
+    oauth2_unload_configuration (pd);
+    GNUNET_free (s);
+    return NULL;
+  }
+  if (NULL != strchr (s, '#'))
+  {
+    const char *extra = strchr (s, '#');
+    const char *slash = strrchr (s, '/');
+
+    if ( (0 != strcmp (extra,
+                       "#setup")) ||
+         (NULL == slash) )
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 provider_section_name,
+                                 "KYC_OAUTH2_AUTHORIZE_URL",
+                                 "not a valid authorze URL (bad fragment)");
+      oauth2_unload_configuration (pd);
+      GNUNET_free (s);
+      return NULL;
+    }
+    pd->authorize_url = GNUNET_strndup (s,
+                                        extra - s);
+    GNUNET_asprintf (&pd->setup_url,
+                     "%.*s/setup/%s",
+                     (int) (slash - s),
+                     s,
+                     pd->client_id);
+    GNUNET_free (s);
+  }
+  else
+  {
+    pd->authorize_url = s;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_INFO_URL",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_INFO_URL");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  if ( (! TALER_url_valid_charset (s)) ||
+       ( (0 != strncasecmp (s,
+                            "http://",
+                            strlen ("http://"))) &&
+         (0 != strncasecmp (s,
+                            "https://",
+                            strlen ("https://"))) ) )
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_INFO_URL",
+                               "not a valid URL");
+    GNUNET_free (s);
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  pd->info_url = s;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_CLIENT_SECRET",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_CLIENT_SECRET");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  pd->client_secret = s;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_POST_URL",
+                                             &s))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_POST_URL");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  pd->post_kyc_redirect_url = s;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_OAUTH2_CONVERTER_HELPER",
+                                             &pd->conversion_binary))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_OAUTH2_CONVERTER_HELPER");
+    oauth2_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_yesno (ps->cfg,
+                                            provider_section_name,
+                                            "KYC_OAUTH2_DEBUG_MODE"))
+    pd->debug_mode = true;
+
+  return pd;
+}
+
+
+/**
+ * Logic to asynchronously return the response for
+ * how to begin the OAuth2.0 checking process to
+ * the client.
+ *
+ * @param ih process to redirect for
+ * @param authorize_url authorization URL to use
+ */
+static void
+initiate_with_url (struct TALER_KYCLOGIC_InitiateHandle *ih,
+                   const char *authorize_url)
+{
+
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ih->pd;
+  struct PluginState *ps = pd->ps;
+  char *hps;
+  char *url;
+  char legi_s[42];
+
+  GNUNET_snprintf (legi_s,
+                   sizeof (legi_s),
+                   "%llu",
+                   (unsigned long long) ih->legitimization_uuid);
+  hps = GNUNET_STRINGS_data_to_string_alloc (&ih->h_payto,
+                                             sizeof (ih->h_payto));
+  {
+    char *redirect_uri_encoded;
+
+    {
+      char *redirect_uri;
+
+      GNUNET_asprintf (&redirect_uri,
+                       "%skyc-proof/%s",
+                       ps->exchange_base_url,
+                       pd->section);
+      redirect_uri_encoded = TALER_urlencode (redirect_uri);
+      GNUNET_free (redirect_uri);
+    }
+    GNUNET_asprintf (&url,
+                     "%s?response_type=code&client_id=%s&redirect_uri=%s&state=%s",
+                     authorize_url,
+                     pd->client_id,
+                     redirect_uri_encoded,
+                     hps);
+    GNUNET_free (redirect_uri_encoded);
+  }
+  ih->cb (ih->cb_cls,
+          TALER_EC_NONE,
+          url,
+          NULL /* unknown user_id here */,
+          legi_s,
+          NULL /* no error */);
+  GNUNET_free (url);
+  GNUNET_free (hps);
+  GNUNET_free (ih);
+}
+
+
+/**
+ * After we are done with the CURL interaction we
+ * need to update our database state with the information
+ * retrieved.
+ *
+ * @param cls a `struct TALER_KYCLOGIC_InitiateHandle *`
+ * @param response_code HTTP response code from server, 0 on hard error
+ * @param response in JSON, NULL if response was not in JSON format
+ */
+static void
+handle_curl_setup_finished (void *cls,
+                            long response_code,
+                            const void *response)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih = cls;
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ih->pd;
+  const json_t *j = response;
+
+  ih->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "/setup URL failed to return HTTP response\n");
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
+            NULL,
+            NULL,
+            NULL,
+            "/setup request to OAuth 2.0 backend returned no response");
+    GNUNET_free (ih);
+    return;
+  case MHD_HTTP_OK:
+    {
+      const char *nonce;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_string ("nonce",
+                                 &nonce),
+        GNUNET_JSON_spec_end ()
+      };
+      enum GNUNET_GenericReturnValue res;
+      const char *emsg;
+      unsigned int line;
+      char *url;
+
+      res = GNUNET_JSON_parse (j,
+                               spec,
+                               &emsg,
+                               &line);
+      if (GNUNET_OK != res)
+      {
+        GNUNET_break_op (0);
+        json_dumpf (j,
+                    stderr,
+                    JSON_INDENT (2));
+        ih->cb (ih->cb_cls,
+                TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
+                NULL,
+                NULL,
+                NULL,
+                "Unexpected response from KYC gateway: setup must return a nonce");
+        GNUNET_free (ih);
+        return;
+      }
+      GNUNET_asprintf (&url,
+                       "%s/%s",
+                       pd->authorize_url,
+                       nonce);
+      initiate_with_url (ih,
+                         url);
+      GNUNET_free (url);
+      return;
+    }
+    break;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "/setup URL returned HTTP status %u\n",
+                (unsigned int) response_code);
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE,
+            NULL,
+            NULL,
+            NULL,
+            "/setup request to OAuth 2.0 backend returned unexpected HTTP status code");
+    GNUNET_free (ih);
+    return;
+  }
+}
+
+
+/**
+ * Logic to asynchronously return the response for how to begin the OAuth2.0
+ * checking process to the client.  May first request a dynamic URL via
+ * ``/setup`` if configured to use a client-authenticated setup process.
+ *
+ * @param cls a `struct TALER_KYCLOGIC_InitiateHandle *`
+ */
+static void
+initiate_task (void *cls)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih = cls;
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ih->pd;
+  struct PluginState *ps = pd->ps;
+  char *hdr;
+  struct curl_slist *slist;
+  CURL *eh;
+
+  ih->task = NULL;
+  if (NULL == pd->setup_url)
+  {
+    initiate_with_url (ih,
+                       pd->authorize_url);
+    return;
+  }
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    ih->cb (ih->cb_cls,
+            TALER_EC_GENERIC_ALLOCATION_FAILURE,
+            NULL,
+            NULL,
+            NULL,
+            "curl_easy_init() failed");
+    GNUNET_free (ih);
+    return;
+  }
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_URL,
+                                   pd->setup_url));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_POST,
+                                   1));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_POSTFIELDS,
+                                   ""));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_FOLLOWLOCATION,
+                                   1L));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   5L));
+  GNUNET_asprintf (&hdr,
+                   "%s: Bearer %s",
+                   MHD_HTTP_HEADER_AUTHORIZATION,
+                   pd->client_secret);
+  slist = curl_slist_append (NULL,
+                             hdr);
+  ih->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  slist,
+                                  &handle_curl_setup_finished,
+                                  ih);
+  curl_slist_free_all (slist);
+  GNUNET_free (hdr);
+}
+
+
+/**
+ * Initiate KYC check.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param account_id which account to trigger process for
+ * @param legitimization_uuid unique ID for the legitimization process
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_InitiateHandle *
+oauth2_initiate (void *cls,
+                 const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                 const struct TALER_PaytoHashP *account_id,
+                 uint64_t legitimization_uuid,
+                 TALER_KYCLOGIC_InitiateCallback cb,
+                 void *cb_cls)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih;
+
+  (void) cls;
+  ih = GNUNET_new (struct TALER_KYCLOGIC_InitiateHandle);
+  ih->legitimization_uuid = legitimization_uuid;
+  ih->cb = cb;
+  ih->cb_cls = cb_cls;
+  ih->h_payto = *account_id;
+  ih->pd = pd;
+  ih->task = GNUNET_SCHEDULER_add_now (&initiate_task,
+                                       ih);
+  return ih;
+}
+
+
+/**
+ * Cancel KYC check initiation.
+ *
+ * @param[in] ih handle of operation to cancel
+ */
+static void
+oauth2_initiate_cancel (struct TALER_KYCLOGIC_InitiateHandle *ih)
+{
+  if (NULL != ih->task)
+  {
+    GNUNET_SCHEDULER_cancel (ih->task);
+    ih->task = NULL;
+  }
+  if (NULL != ih->job)
+  {
+    GNUNET_CURL_job_cancel (ih->job);
+    ih->job = NULL;
+  }
+  GNUNET_free (ih);
+}
+
+
+/**
+ * Cancel KYC proof.
+ *
+ * @param[in] ph handle of operation to cancel
+ */
+static void
+oauth2_proof_cancel (struct TALER_KYCLOGIC_ProofHandle *ph)
+{
+  if (NULL != ph->ec)
+  {
+    TALER_JSON_external_conversion_stop (ph->ec);
+    ph->ec = NULL;
+  }
+  if (NULL != ph->task)
+  {
+    GNUNET_SCHEDULER_cancel (ph->task);
+    ph->task = NULL;
+  }
+  if (NULL != ph->job)
+  {
+    GNUNET_CURL_job_cancel (ph->job);
+    ph->job = NULL;
+  }
+  if (NULL != ph->response)
+  {
+    MHD_destroy_response (ph->response);
+    ph->response = NULL;
+  }
+  GNUNET_free (ph->provider_user_id);
+  if (NULL != ph->attributes)
+    json_decref (ph->attributes);
+  GNUNET_free (ph->post_body);
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Function called to asynchronously return the final
+ * result to the callback.
+ *
+ * @param cls a `struct TALER_KYCLOGIC_ProofHandle`
+ */
+static void
+return_proof_response (void *cls)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+
+  ph->task = NULL;
+  ph->cb (ph->cb_cls,
+          ph->status,
+          ph->provider_user_id,
+          ph->provider_legitimization_id,
+          GNUNET_TIME_relative_to_absolute (ph->pd->validity),
+          ph->attributes,
+          ph->http_status,
+          ph->response);
+  ph->response = NULL; /*Ownership passed to 'ph->cb'!*/
+  oauth2_proof_cancel (ph);
+}
+
+
+/**
+ * The request for @a ph failed. We may have gotten a useful error
+ * message in @a j. Generate a failure response.
+ *
+ * @param[in,out] ph request that failed
+ * @param j reply from the server (or NULL)
+ */
+static void
+handle_proof_error (struct TALER_KYCLOGIC_ProofHandle *ph,
+                    const json_t *j)
+{
+  enum GNUNET_GenericReturnValue res;
+
+  {
+    const char *msg;
+    const char *desc;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_string ("error",
+                               &msg),
+      GNUNET_JSON_spec_string ("error_description",
+                               &desc),
+      GNUNET_JSON_spec_end ()
+    };
+    const char *emsg;
+    unsigned int line;
+
+    res = GNUNET_JSON_parse (j,
+                             spec,
+                             &emsg,
+                             &line);
+  }
+
+  if (GNUNET_OK != res)
+  {
+    json_t *body;
+
+    GNUNET_break_op (0);
+    ph->status = TALER_KYCLOGIC_STATUS_PROVIDER_FAILED;
+    ph->http_status
+      = MHD_HTTP_BAD_GATEWAY;
+    body = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_object_incref ("server_response",
+                                        (json_t *) j)),
+      GNUNET_JSON_pack_bool ("debug",
+                             ph->pd->debug_mode),
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+    GNUNET_assert (NULL != body);
+    GNUNET_break (
+      GNUNET_SYSERR !=
+      TALER_TEMPLATING_build (ph->connection,
+                              &ph->http_status,
+                              "oauth2-authorization-failure-malformed",
+                              NULL,
+                              NULL,
+                              body,
+                              &ph->response));
+    json_decref (body);
+    return;
+  }
+  ph->status = TALER_KYCLOGIC_STATUS_USER_ABORTED;
+  ph->http_status = MHD_HTTP_FORBIDDEN;
+  GNUNET_break (
+    GNUNET_SYSERR !=
+    TALER_TEMPLATING_build (ph->connection,
+                            &ph->http_status,
+                            "oauth2-authorization-failure",
+                            NULL,
+                            NULL,
+                            j,
+                            &ph->response));
+}
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure with a `struct TALER_KYCLOGIC_ProofHandle *`
+ * @param status_type how did the process die
+ * @param code termination status code from the process
+ * @param attr result some JSON result, NULL if we failed to get an JSON output
+ */
+static void
+converted_proof_cb (void *cls,
+                    enum GNUNET_OS_ProcessStatusType status_type,
+                    unsigned long code,
+                    const json_t *attr)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ph->pd;
+
+  ph->ec = NULL;
+  if ( (NULL == attr) ||
+       (0 != code) )
+  {
+    json_t *body;
+    char *msg;
+
+    GNUNET_break_op (0);
+    ph->status = TALER_KYCLOGIC_STATUS_PROVIDER_FAILED;
+    ph->http_status = MHD_HTTP_BAD_GATEWAY;
+    if (0 != code)
+      GNUNET_asprintf (&msg,
+                       "Attribute converter exited with status %ld",
+                       code);
+    else
+      msg = GNUNET_strdup (
+        "Attribute converter response was not in JSON format");
+    body = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("converter",
+                               pd->conversion_binary),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_object_incref ("attributes",
+                                        (json_t *) attr)),
+      GNUNET_JSON_pack_bool ("debug",
+                             ph->pd->debug_mode),
+      GNUNET_JSON_pack_string ("message",
+                               msg),
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+    GNUNET_free (msg);
+    GNUNET_break (
+      GNUNET_SYSERR !=
+      TALER_TEMPLATING_build (ph->connection,
+                              &ph->http_status,
+                              "oauth2-conversion-failure",
+                              NULL,
+                              NULL,
+                              body,
+                              &ph->response));
+    json_decref (body);
+    ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                         ph);
+    return;
+  }
+
+  {
+    const char *id;
+    struct GNUNET_JSON_Specification ispec[] = {
+      GNUNET_JSON_spec_string ("id",
+                               &id),
+      GNUNET_JSON_spec_end ()
+    };
+    enum GNUNET_GenericReturnValue res;
+    const char *emsg;
+    unsigned int line;
+
+    res = GNUNET_JSON_parse (attr,
+                             ispec,
+                             &emsg,
+                             &line);
+    if (GNUNET_OK != res)
+    {
+      json_t *body;
+
+      GNUNET_break_op (0);
+      ph->status = TALER_KYCLOGIC_STATUS_PROVIDER_FAILED;
+      ph->http_status = MHD_HTTP_BAD_GATEWAY;
+      body = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("converter",
+                                 pd->conversion_binary),
+        GNUNET_JSON_pack_string ("message",
+                                 "Unexpected response from KYC attribute converter: returned JSON data must contain 'id' field"),
+        GNUNET_JSON_pack_bool ("debug",
+                               ph->pd->debug_mode),
+        GNUNET_JSON_pack_object_incref ("attributes",
+                                        (json_t *) attr),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+      GNUNET_break (
+        GNUNET_SYSERR !=
+        TALER_TEMPLATING_build (ph->connection,
+                                &ph->http_status,
+                                "oauth2-conversion-failure",
+                                NULL,
+                                NULL,
+                                body,
+                                &ph->response));
+      json_decref (body);
+      ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                           ph);
+      return;
+    }
+    ph->provider_user_id = GNUNET_strdup (id);
+  }
+  ph->status = TALER_KYCLOGIC_STATUS_SUCCESS;
+  ph->response = MHD_create_response_from_buffer (0,
+                                                  "",
+                                                  MHD_RESPMEM_PERSISTENT);
+  GNUNET_assert (NULL != ph->response);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (
+                  ph->response,
+                  MHD_HTTP_HEADER_LOCATION,
+                  ph->pd->post_kyc_redirect_url));
+  ph->http_status = MHD_HTTP_SEE_OTHER;
+  ph->attributes = json_incref ((json_t *) attr);
+  ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                       ph);
+}
+
+
+/**
+ * The request for @a ph succeeded (presumably).
+ * Call continuation with the result.
+ *
+ * @param[in,out] ph request that succeeded
+ * @param j reply from the server
+ */
+static void
+parse_proof_success_reply (struct TALER_KYCLOGIC_ProofHandle *ph,
+                           const json_t *j)
+{
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ph->pd;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Calling converter `%s' with JSON\n",
+              pd->conversion_binary);
+  json_dumpf (j,
+              stderr,
+              JSON_INDENT (2));
+  ph->ec = TALER_JSON_external_conversion_start (
+    j,
+    &converted_proof_cb,
+    ph,
+    pd->conversion_binary,
+    pd->conversion_binary,
+    NULL);
+  if (NULL != ph->ec)
+    return;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Failed to start KYCAID conversion helper `%s'\n",
+              pd->conversion_binary);
+  ph->status = TALER_KYCLOGIC_STATUS_INTERNAL_ERROR;
+  ph->http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+  {
+    json_t *body;
+
+    body = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("converter",
+                               pd->conversion_binary),
+      GNUNET_JSON_pack_bool ("debug",
+                             ph->pd->debug_mode),
+      GNUNET_JSON_pack_string ("message",
+                               "Failed to launch KYC conversion helper process."),
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_GENERIC_KYC_CONVERTER_FAILED));
+    GNUNET_break (
+      GNUNET_SYSERR !=
+      TALER_TEMPLATING_build (ph->connection,
+                              &ph->http_status,
+                              "oauth2-conversion-failure",
+                              NULL,
+                              NULL,
+                              body,
+                              &ph->response));
+    json_decref (body);
+  }
+  ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                       ph);
+}
+
+
+/**
+ * After we are done with the CURL interaction we
+ * need to update our database state with the information
+ * retrieved.
+ *
+ * @param cls our `struct TALER_KYCLOGIC_ProofHandle`
+ * @param response_code HTTP response code from server, 0 on hard error
+ * @param response in JSON, NULL if response was not in JSON format
+ */
+static void
+handle_curl_proof_finished (void *cls,
+                            long response_code,
+                            const void *response)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  const json_t *j = response;
+
+  ph->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    {
+      json_t *body;
+
+      ph->status = TALER_KYCLOGIC_STATUS_PROVIDER_FAILED;
+      ph->http_status = MHD_HTTP_BAD_GATEWAY;
+
+      body = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("message",
+                                 "No response from KYC gateway"),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+      GNUNET_break (
+        GNUNET_SYSERR !=
+        TALER_TEMPLATING_build (ph->connection,
+                                &ph->http_status,
+                                "oauth2-provider-failure",
+                                NULL,
+                                NULL,
+                                body,
+                                &ph->response));
+      json_decref (body);
+    }
+    break;
+  case MHD_HTTP_OK:
+    parse_proof_success_reply (ph,
+                               j);
+    return;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "OAuth2.0 info URL returned HTTP status %u\n",
+                (unsigned int) response_code);
+    handle_proof_error (ph,
+                        j);
+    break;
+  }
+  ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                       ph);
+}
+
+
+/**
+ * After we are done with the CURL interaction we
+ * need to fetch the user's account details.
+ *
+ * @param cls our `struct KycProofContext`
+ * @param response_code HTTP response code from server, 0 on hard error
+ * @param response in JSON, NULL if response was not in JSON format
+ */
+static void
+handle_curl_login_finished (void *cls,
+                            long response_code,
+                            const void *response)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  const json_t *j = response;
+
+  ph->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_OK:
+    {
+      const char *access_token;
+      const char *token_type;
+      uint64_t expires_in_s;
+      const char *refresh_token;
+      bool no_expires;
+      bool no_refresh;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_string ("access_token",
+                                 &access_token),
+        GNUNET_JSON_spec_string ("token_type",
+                                 &token_type),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_uint64 ("expires_in",
+                                   &expires_in_s),
+          &no_expires),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_string ("refresh_token",
+                                   &refresh_token),
+          &no_refresh),
+        GNUNET_JSON_spec_end ()
+      };
+      CURL *eh;
+
+      {
+        enum GNUNET_GenericReturnValue res;
+        const char *emsg;
+        unsigned int line;
+
+        res = GNUNET_JSON_parse (j,
+                                 spec,
+                                 &emsg,
+                                 &line);
+        if (GNUNET_OK != res)
+        {
+          json_t *body;
+
+          GNUNET_break_op (0);
+          ph->http_status
+            = MHD_HTTP_BAD_GATEWAY;
+          body = GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_object_incref ("server_response",
+                                            (json_t *) j),
+            GNUNET_JSON_pack_bool ("debug",
+                                   ph->pd->debug_mode),
+            GNUNET_JSON_pack_string ("message",
+                                     "Unexpected response from KYC gateway: required fields missing or malformed"),
+            TALER_JSON_pack_ec (
+              TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+          GNUNET_break (
+            GNUNET_SYSERR !=
+            TALER_TEMPLATING_build (ph->connection,
+                                    &ph->http_status,
+                                    "oauth2-provider-failure",
+                                    NULL,
+                                    NULL,
+                                    body,
+                                    &ph->response));
+          json_decref (body);
+          break;
+        }
+      }
+      if (0 != strcasecmp (token_type,
+                           "bearer"))
+      {
+        json_t *body;
+
+        GNUNET_break_op (0);
+        ph->http_status = MHD_HTTP_BAD_GATEWAY;
+        body = GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_object_incref ("server_response",
+                                          (json_t *) j),
+          GNUNET_JSON_pack_bool ("debug",
+                                 ph->pd->debug_mode),
+          GNUNET_JSON_pack_string ("message",
+                                   "Unexpected 'token_type' in response from KYC gateway: 'bearer' token required"),
+          TALER_JSON_pack_ec (
+            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+        GNUNET_break (
+          GNUNET_SYSERR !=
+          TALER_TEMPLATING_build (ph->connection,
+                                  &ph->http_status,
+                                  "oauth2-provider-failure",
+                                  NULL,
+                                  NULL,
+                                  body,
+                                  &ph->response));
+        json_decref (body);
+        break;
+      }
+
+      /* We guard against a few characters that could
+         conceivably be abused to mess with the HTTP header */
+      if ( (NULL != strchr (access_token,
+                            '\n')) ||
+           (NULL != strchr (access_token,
+                            '\r')) ||
+           (NULL != strchr (access_token,
+                            ' ')) ||
+           (NULL != strchr (access_token,
+                            ';')) )
+      {
+        json_t *body;
+
+        GNUNET_break_op (0);
+        ph->http_status = MHD_HTTP_BAD_GATEWAY;
+        body = GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_object_incref ("server_response",
+                                          (json_t *) j),
+          GNUNET_JSON_pack_bool ("debug",
+                                 ph->pd->debug_mode),
+          GNUNET_JSON_pack_string ("message",
+                                   "Illegal character in access token"),
+          TALER_JSON_pack_ec (
+            TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_INVALID_RESPONSE));
+        GNUNET_break (
+          GNUNET_SYSERR !=
+          TALER_TEMPLATING_build (ph->connection,
+                                  &ph->http_status,
+                                  "oauth2-provider-failure",
+                                  NULL,
+                                  NULL,
+                                  body,
+                                  &ph->response));
+        json_decref (body);
+        break;
+      }
+
+      eh = curl_easy_init ();
+      GNUNET_assert (NULL != eh);
+      GNUNET_assert (CURLE_OK ==
+                     curl_easy_setopt (eh,
+                                       CURLOPT_URL,
+                                       ph->pd->info_url));
+      {
+        char *hdr;
+        struct curl_slist *slist;
+
+        GNUNET_asprintf (&hdr,
+                         "%s: Bearer %s",
+                         MHD_HTTP_HEADER_AUTHORIZATION,
+                         access_token);
+        slist = curl_slist_append (NULL,
+                                   hdr);
+        ph->job = GNUNET_CURL_job_add2 (ph->pd->ps->curl_ctx,
+                                        eh,
+                                        slist,
+                                        &handle_curl_proof_finished,
+                                        ph);
+        curl_slist_free_all (slist);
+        GNUNET_free (hdr);
+      }
+      return;
+    }
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "OAuth2.0 login URL returned HTTP status %u\n",
+                (unsigned int) response_code);
+    handle_proof_error (ph,
+                        j);
+    break;
+  }
+  return_proof_response (ph);
+}
+
+
+/**
+ * Check KYC status and return status to human.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param connection MHD connection object (for HTTP headers)
+ * @param account_id which account to trigger process for
+ * @param process_row row in the legitimization processes table the legitimization is for
+ * @param provider_user_id user ID (or NULL) the proof is for
+ * @param provider_legitimization_id legitimization ID the proof is for
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_ProofHandle *
+oauth2_proof (void *cls,
+              const struct TALER_KYCLOGIC_ProviderDetails *pd,
+              struct MHD_Connection *connection,
+              const struct TALER_PaytoHashP *account_id,
+              uint64_t process_row,
+              const char *provider_user_id,
+              const char *provider_legitimization_id,
+              TALER_KYCLOGIC_ProofCallback cb,
+              void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProofHandle *ph;
+  const char *code;
+
+  GNUNET_break (NULL == provider_user_id);
+  ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle);
+  GNUNET_snprintf (ph->provider_legitimization_id,
+                   sizeof (ph->provider_legitimization_id),
+                   "%llu",
+                   (unsigned long long) process_row);
+  if ( (NULL != provider_legitimization_id) &&
+       (0 != strcmp (provider_legitimization_id,
+                     ph->provider_legitimization_id)))
+  {
+    GNUNET_break (0);
+    GNUNET_free (ph);
+    return NULL;
+  }
+
+  ph->pd = pd;
+  ph->connection = connection;
+  ph->h_payto = *account_id;
+  ph->cb = cb;
+  ph->cb_cls = cb_cls;
+  code = MHD_lookup_connection_value (connection,
+                                      MHD_GET_ARGUMENT_KIND,
+                                      "code");
+  if (NULL == code)
+  {
+    const char *err;
+    const char *desc;
+    const char *euri;
+    json_t *body;
+
+    err = MHD_lookup_connection_value (connection,
+                                       MHD_GET_ARGUMENT_KIND,
+                                       "error");
+    if (NULL == err)
+    {
+      GNUNET_break_op (0);
+      ph->status = TALER_KYCLOGIC_STATUS_USER_PENDING;
+      ph->http_status = MHD_HTTP_BAD_REQUEST;
+      body = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("message",
+                                 "'code' parameter malformed"),
+        TALER_JSON_pack_ec (
+          TALER_EC_GENERIC_PARAMETER_MALFORMED));
+      GNUNET_break (
+        GNUNET_SYSERR !=
+        TALER_TEMPLATING_build (ph->connection,
+                                &ph->http_status,
+                                "oauth2-bad-request",
+                                NULL,
+                                NULL,
+                                body,
+                                &ph->response));
+      json_decref (body);
+      ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                           ph);
+      return ph;
+    }
+    desc = MHD_lookup_connection_value (connection,
+                                        MHD_GET_ARGUMENT_KIND,
+                                        "error_description");
+    euri = MHD_lookup_connection_value (connection,
+                                        MHD_GET_ARGUMENT_KIND,
+                                        "error_uri");
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "OAuth2 process %llu failed with error `%s'\n",
+                (unsigned long long) process_row,
+                err);
+    if (0 == strcmp (err,
+                     "server_error"))
+      ph->status = TALER_KYCLOGIC_STATUS_PROVIDER_FAILED;
+    else if (0 == strcmp (err,
+                          "unauthorized_client"))
+      ph->status = TALER_KYCLOGIC_STATUS_FAILED;
+    else if (0 == strcmp (err,
+                          "temporarily_unavailable"))
+      ph->status = TALER_KYCLOGIC_STATUS_PENDING;
+    else
+      ph->status = TALER_KYCLOGIC_STATUS_INTERNAL_ERROR;
+    ph->http_status = MHD_HTTP_FORBIDDEN;
+    body = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("error",
+                               err),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("error_details",
+                                 desc)),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("error_uri",
+                                 euri)));
+    GNUNET_break (
+      GNUNET_SYSERR !=
+      TALER_TEMPLATING_build (ph->connection,
+                              &ph->http_status,
+                              "oauth2-authentication-failure",
+                              NULL,
+                              NULL,
+                              body,
+                              &ph->response));
+    json_decref (body);
+    ph->task = GNUNET_SCHEDULER_add_now (&return_proof_response,
+                                         ph);
+    return ph;
+
+  }
+
+  ph->eh = curl_easy_init ();
+  GNUNET_assert (NULL != ph->eh);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Requesting OAuth 2.0 data via HTTP POST `%s'\n",
+              pd->token_url);
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_URL,
+                                   pd->token_url));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_VERBOSE,
+                                   1));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_POST,
+                                   1));
+  {
+    char *client_id;
+    char *client_secret;
+    char *authorization_code;
+    char *redirect_uri_encoded;
+    char *hps;
+
+    hps = GNUNET_STRINGS_data_to_string_alloc (&ph->h_payto,
+                                               sizeof (ph->h_payto));
+    {
+      char *redirect_uri;
+
+      GNUNET_asprintf (&redirect_uri,
+                       "%skyc-proof/%s",
+                       ps->exchange_base_url,
+                       pd->section);
+      redirect_uri_encoded = TALER_urlencode (redirect_uri);
+      GNUNET_free (redirect_uri);
+    }
+    GNUNET_assert (NULL != redirect_uri_encoded);
+    client_id = curl_easy_escape (ph->eh,
+                                  pd->client_id,
+                                  0);
+    GNUNET_assert (NULL != client_id);
+    client_secret = curl_easy_escape (ph->eh,
+                                      pd->client_secret,
+                                      0);
+    GNUNET_assert (NULL != client_secret);
+    authorization_code = curl_easy_escape (ph->eh,
+                                           code,
+                                           0);
+    GNUNET_assert (NULL != authorization_code);
+    GNUNET_asprintf (&ph->post_body,
+                     "client_id=%s&redirect_uri=%s&state=%s&client_secret=%s&code=%s&grant_type=authorization_code",
+                     client_id,
+                     redirect_uri_encoded,
+                     hps,
+                     client_secret,
+                     authorization_code);
+    curl_free (authorization_code);
+    curl_free (client_secret);
+    GNUNET_free (redirect_uri_encoded);
+    GNUNET_free (hps);
+    curl_free (client_id);
+  }
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_POSTFIELDS,
+                                   ph->post_body));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_FOLLOWLOCATION,
+                                   1L));
+  /* limit MAXREDIRS to 5 as a simple security measure against
+     a potential infinite loop caused by a malicious target */
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (ph->eh,
+                                   CURLOPT_MAXREDIRS,
+                                   5L));
+
+  ph->job = GNUNET_CURL_job_add (ps->curl_ctx,
+                                 ph->eh,
+                                 &handle_curl_login_finished,
+                                 ph);
+  return ph;
+}
+
+
+/**
+ * Function to asynchronously return the 404 not found
+ * page for the webhook.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_WebhookHandle *`
+ */
+static void
+wh_return_not_found (void *cls)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+  struct MHD_Response *response;
+
+  wh->task = NULL;
+  response = MHD_create_response_from_buffer (0,
+                                              "",
+                                              MHD_RESPMEM_PERSISTENT);
+  wh->cb (wh->cb_cls,
+          0LLU,
+          NULL,
+          NULL,
+          NULL,
+          NULL,
+          TALER_KYCLOGIC_STATUS_KEEP,
+          GNUNET_TIME_UNIT_ZERO_ABS,
+          NULL,
+          MHD_HTTP_NOT_FOUND,
+          response);
+  GNUNET_free (wh);
+}
+
+
+/**
+ * Check KYC status and return result for Webhook.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param plc callback to lookup accounts with
+ * @param plc_cls closure for @a plc
+ * @param http_method HTTP method used for the webhook
+ * @param url_path rest of the URL after `/kyc-webhook/$LOGIC/`, as NULL-terminated array
+ * @param connection MHD connection object (for HTTP headers)
+ * @param body HTTP request body, or NULL if not available
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_WebhookHandle *
+oauth2_webhook (void *cls,
+                const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                TALER_KYCLOGIC_ProviderLookupCallback plc,
+                void *plc_cls,
+                const char *http_method,
+                const char *const url_path[],
+                struct MHD_Connection *connection,
+                const json_t *body,
+                TALER_KYCLOGIC_WebhookCallback cb,
+                void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+
+  (void) pd;
+  (void) plc;
+  (void) plc_cls;
+  (void) http_method;
+  (void) url_path;
+  (void) connection;
+  (void) body;
+  wh = GNUNET_new (struct TALER_KYCLOGIC_WebhookHandle);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ps = ps;
+  wh->task = GNUNET_SCHEDULER_add_now (&wh_return_not_found,
+                                       wh);
+  return wh;
+}
+
+
+/**
+ * Cancel KYC webhook execution.
+ *
+ * @param[in] wh handle of operation to cancel
+ */
+static void
+oauth2_webhook_cancel (struct TALER_KYCLOGIC_WebhookHandle *wh)
+{
+  GNUNET_SCHEDULER_cancel (wh->task);
+  GNUNET_free (wh);
+}
+
+
+/**
+ * Initialize OAuth2.0 KYC logic plugin
+ *
+ * @param cls a configuration instance
+ * @return NULL on error, otherwise a `struct TALER_KYCLOGIC_Plugin`
+ */
+void *
+libtaler_plugin_kyclogic_oauth2_init (void *cls)
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct TALER_KYCLOGIC_Plugin *plugin;
+  struct PluginState *ps;
+
+  ps = GNUNET_new (struct PluginState);
+  ps->cfg = cfg;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &ps->exchange_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    GNUNET_free (ps);
+    return NULL;
+  }
+  ps->curl_ctx
+    = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                        &ps->curl_rc);
+  if (NULL == ps->curl_ctx)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ps->exchange_base_url);
+    GNUNET_free (ps);
+    return NULL;
+  }
+  ps->curl_rc = GNUNET_CURL_gnunet_rc_create (ps->curl_ctx);
+
+  plugin = GNUNET_new (struct TALER_KYCLOGIC_Plugin);
+  plugin->cls = ps;
+  plugin->load_configuration
+    = &oauth2_load_configuration;
+  plugin->unload_configuration
+    = &oauth2_unload_configuration;
+  plugin->initiate
+    = &oauth2_initiate;
+  plugin->initiate_cancel
+    = &oauth2_initiate_cancel;
+  plugin->proof
+    = &oauth2_proof;
+  plugin->proof_cancel
+    = &oauth2_proof_cancel;
+  plugin->webhook
+    = &oauth2_webhook;
+  plugin->webhook_cancel
+    = &oauth2_webhook_cancel;
+  return plugin;
+}
+
+
+/**
+ * Unload authorization plugin
+ *
+ * @param cls a `struct TALER_KYCLOGIC_Plugin`
+ * @return NULL (always)
+ */
+void *
+libtaler_plugin_kyclogic_oauth2_done (void *cls)
+{
+  struct TALER_KYCLOGIC_Plugin *plugin = cls;
+  struct PluginState *ps = plugin->cls;
+
+  if (NULL != ps->curl_ctx)
+  {
+    GNUNET_CURL_fini (ps->curl_ctx);
+    ps->curl_ctx = NULL;
+  }
+  if (NULL != ps->curl_rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (ps->curl_rc);
+    ps->curl_rc = NULL;
+  }
+  GNUNET_free (ps->exchange_base_url);
+  GNUNET_free (ps);
+  GNUNET_free (plugin);
+  return NULL;
+}
diff --git a/src/kyclogic/plugin_kyclogic_persona.c b/src/kyclogic/plugin_kyclogic_persona.c
new file mode 100644
index 000000000..c68b7f881
--- /dev/null
+++ b/src/kyclogic/plugin_kyclogic_persona.c
@@ -0,0 +1,2268 @@
+/*
+  This file is part of GNU Taler
+  Copyright (C) 2022, 2023 Taler Systems SA
+
+  Taler 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  Taler; see the file COPYING.GPL.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file plugin_kyclogic_persona.c
+ * @brief persona for an authentication flow logic
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_attributes.h"
+#include "taler_kyclogic_plugin.h"
+#include "taler_mhd_lib.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_templating_lib.h"
+#include <regex.h>
+#include "taler_util.h"
+
+
+/**
+ * Which version of the persona API are we implementing?
+ */
+#define PERSONA_VERSION "2021-07-05"
+
+/**
+ * Saves the state of a plugin.
+ */
+struct PluginState
+{
+
+  /**
+   * Our base URL.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Our global configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Context for CURL operations (useful to the event loop)
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * Context for integrating @e curl_ctx with the
+   * GNUnet event loop.
+   */
+  struct GNUNET_CURL_RescheduleContext *curl_rc;
+
+  /**
+   * Authorization token to use when receiving webhooks from the Persona
+   * service.  Optional.  Note that webhooks are *global* and not per
+   * template.
+   */
+  char *webhook_token;
+
+
+};
+
+
+/**
+ * Keeps the plugin-specific state for
+ * a given configuration section.
+ */
+struct TALER_KYCLOGIC_ProviderDetails
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Configuration section that configured us.
+   */
+  char *section;
+
+  /**
+   * Salt to use for idempotency.
+   */
+  char *salt;
+
+  /**
+   * Authorization token to use when talking
+   * to the service.
+   */
+  char *auth_token;
+
+  /**
+   * Template ID for the KYC check to perform.
+   */
+  char *template_id;
+
+  /**
+   * Subdomain to use.
+   */
+  char *subdomain;
+
+  /**
+   * Name of the program we use to convert outputs
+   * from Persona into our JSON inputs.
+   */
+  char *conversion_binary;
+
+  /**
+   * Where to redirect the client upon completion.
+   */
+  char *post_kyc_redirect_url;
+
+  /**
+   * Validity time for a successful KYC process.
+   */
+  struct GNUNET_TIME_Relative validity;
+
+  /**
+   * Curl-ready authentication header to use.
+   */
+  struct curl_slist *slist;
+
+};
+
+
+/**
+ * Handle for an initiation operation.
+ */
+struct TALER_KYCLOGIC_InitiateHandle
+{
+
+  /**
+   * Hash of the payto:// URI we are initiating the KYC for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * UUID being checked.
+   */
+  uint64_t legitimization_uuid;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_InitiateCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * URL of the cURL request.
+   */
+  char *url;
+
+  /**
+   * Request-specific headers to use.
+   */
+  struct curl_slist *slist;
+
+};
+
+
+/**
+ * Handle for an KYC proof operation.
+ */
+struct TALER_KYCLOGIC_ProofHandle
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_ProofCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * URL of the cURL request.
+   */
+  char *url;
+
+  /**
+   * Handle to an external process that converts the
+   * Persona response to our internal format.
+   */
+  struct TALER_JSON_ExternalConversion *ec;
+
+  /**
+   * Hash of the payto:// URI we are checking the KYC for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Row in the legitimization processes of the
+   * legitimization proof that is being checked.
+   */
+  uint64_t process_row;
+
+  /**
+   * Account ID at the provider.
+   */
+  char *provider_user_id;
+
+  /**
+   * Account ID from the service.
+   */
+  char *account_id;
+
+  /**
+   * Inquiry ID at the provider.
+   */
+  char *inquiry_id;
+};
+
+
+/**
+ * Handle for an KYC Web hook operation.
+ */
+struct TALER_KYCLOGIC_WebhookHandle
+{
+
+  /**
+   * Continuation to call when done.
+   */
+  TALER_KYCLOGIC_WebhookCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * Verification ID from the service.
+   */
+  char *inquiry_id;
+
+  /**
+   * Account ID from the service.
+   */
+  char *account_id;
+
+  /**
+   * URL of the cURL request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Response to return asynchronously.
+   */
+  struct MHD_Response *resp;
+
+  /**
+   * ID of the template the webhook is about,
+   * according to the service.
+   */
+  const char *template_id;
+
+  /**
+   * Handle to an external process that converts the
+   * Persona response to our internal format.
+   */
+  struct TALER_JSON_ExternalConversion *ec;
+
+  /**
+   * Our account ID.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * UUID being checked.
+   */
+  uint64_t process_row;
+
+  /**
+   * HTTP response code to return asynchronously.
+   */
+  unsigned int response_code;
+};
+
+
+/**
+ * Release configuration resources previously loaded
+ *
+ * @param[in] pd configuration to release
+ */
+static void
+persona_unload_configuration (struct TALER_KYCLOGIC_ProviderDetails *pd)
+{
+  curl_slist_free_all (pd->slist);
+  GNUNET_free (pd->auth_token);
+  GNUNET_free (pd->template_id);
+  GNUNET_free (pd->subdomain);
+  GNUNET_free (pd->conversion_binary);
+  GNUNET_free (pd->salt);
+  GNUNET_free (pd->section);
+  GNUNET_free (pd->post_kyc_redirect_url);
+  GNUNET_free (pd);
+}
+
+
+/**
+ * Load the configuration of the KYC provider.
+ *
+ * @param cls closure
+ * @param provider_section_name configuration section to parse
+ * @return NULL if configuration is invalid
+ */
+static struct TALER_KYCLOGIC_ProviderDetails *
+persona_load_configuration (void *cls,
+                            const char *provider_section_name)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  pd = GNUNET_new (struct TALER_KYCLOGIC_ProviderDetails);
+  pd->ps = ps;
+  pd->section = GNUNET_strdup (provider_section_name);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (ps->cfg,
+                                           provider_section_name,
+                                           "KYC_PERSONA_VALIDITY",
+                                           &pd->validity))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_VALIDITY");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_AUTH_TOKEN",
+                                             &pd->auth_token))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_AUTH_TOKEN");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_SALT",
+                                             &pd->salt))
+  {
+    uint32_t salt[8];
+
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                                salt,
+                                sizeof (salt));
+    pd->salt = GNUNET_STRINGS_data_to_string_alloc (salt,
+                                                    sizeof (salt));
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_SUBDOMAIN",
+                                             &pd->subdomain))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_SUBDOMAIN");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_CONVERTER_HELPER",
+                                             &pd->conversion_binary))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_CONVERTER_HELPER");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_POST_URL",
+                                             &pd->post_kyc_redirect_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_POST_URL");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             provider_section_name,
+                                             "KYC_PERSONA_TEMPLATE_ID",
+                                             &pd->template_id))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               provider_section_name,
+                               "KYC_PERSONA_TEMPLATE_ID");
+    persona_unload_configuration (pd);
+    return NULL;
+  }
+  {
+    char *auth;
+
+    GNUNET_asprintf (&auth,
+                     "%s: Bearer %s",
+                     MHD_HTTP_HEADER_AUTHORIZATION,
+                     pd->auth_token);
+    pd->slist = curl_slist_append (NULL,
+                                   auth);
+    GNUNET_free (auth);
+    GNUNET_asprintf (&auth,
+                     "%s: %s",
+                     MHD_HTTP_HEADER_ACCEPT,
+                     "application/json");
+    pd->slist = curl_slist_append (pd->slist,
+                                   "Persona-Version: "
+                                   PERSONA_VERSION);
+    GNUNET_free (auth);
+  }
+  return pd;
+}
+
+
+/**
+ * Cancel KYC check initiation.
+ *
+ * @param[in] ih handle of operation to cancel
+ */
+static void
+persona_initiate_cancel (struct TALER_KYCLOGIC_InitiateHandle *ih)
+{
+  if (NULL != ih->job)
+  {
+    GNUNET_CURL_job_cancel (ih->job);
+    ih->job = NULL;
+  }
+  GNUNET_free (ih->url);
+  TALER_curl_easy_post_finished (&ih->ctx);
+  curl_slist_free_all (ih->slist);
+  GNUNET_free (ih);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP POST "/api/v1/inquiries" request.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_InitiateHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_initiate_finished (void *cls,
+                          long response_code,
+                          const void *response)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih = cls;
+  const struct TALER_KYCLOGIC_ProviderDetails *pd = ih->pd;
+  const json_t *j = response;
+  char *url;
+  json_t *data;
+  const char *type;
+  const char *inquiry_id;
+  const char *persona_account_id;
+  const char *ename;
+  unsigned int eline;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("type",
+                             &type),
+    GNUNET_JSON_spec_string ("id",
+                             &inquiry_id),
+    GNUNET_JSON_spec_end ()
+  };
+
+  ih->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_CREATED:
+    /* handled below */
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+  case MHD_HTTP_FORBIDDEN:
+    {
+      const char *msg;
+
+      msg = json_string_value (
+        json_object_get (
+          json_array_get (
+            json_object_get (j,
+                             "errors"),
+            0),
+          "title"));
+
+      ih->cb (ih->cb_cls,
+              TALER_EC_EXCHANGE_KYC_CHECK_AUTHORIZATION_FAILED,
+              NULL,
+              NULL,
+              NULL,
+              msg);
+      persona_initiate_cancel (ih);
+      return;
+    }
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
+    {
+      const char *msg;
+
+      msg = json_string_value (
+        json_object_get (
+          json_array_get (
+            json_object_get (j,
+                             "errors"),
+            0),
+          "title"));
+
+      ih->cb (ih->cb_cls,
+              TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+              NULL,
+              NULL,
+              NULL,
+              msg);
+      persona_initiate_cancel (ih);
+      return;
+    }
+  case MHD_HTTP_BAD_REQUEST:
+  case MHD_HTTP_UNPROCESSABLE_ENTITY:
+    {
+      const char *msg;
+
+      GNUNET_break (0);
+      json_dumpf (j,
+                  stderr,
+                  JSON_INDENT (2));
+      msg = json_string_value (
+        json_object_get (
+          json_array_get (
+            json_object_get (j,
+                             "errors"),
+            0),
+          "title"));
+
+      ih->cb (ih->cb_cls,
+              TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_BUG,
+              NULL,
+              NULL,
+              NULL,
+              msg);
+      persona_initiate_cancel (ih);
+      return;
+    }
+  case MHD_HTTP_TOO_MANY_REQUESTS:
+    {
+      const char *msg;
+
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Rate limiting requested:\n");
+      json_dumpf (j,
+                  stderr,
+                  JSON_INDENT (2));
+      msg = json_string_value (
+        json_object_get (
+          json_array_get (
+            json_object_get (j,
+                             "errors"),
+            0),
+          "title"));
+      ih->cb (ih->cb_cls,
+              TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_RATE_LIMIT_EXCEEDED,
+              NULL,
+              NULL,
+              NULL,
+              msg);
+      persona_initiate_cancel (ih);
+      return;
+    }
+  default:
+    {
+      char *err;
+
+      GNUNET_break_op (0);
+      json_dumpf (j,
+                  stderr,
+                  JSON_INDENT (2));
+      GNUNET_asprintf (&err,
+                       "Unexpected HTTP status %u from Persona\n",
+                       (unsigned int) response_code);
+      ih->cb (ih->cb_cls,
+              TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+              NULL,
+              NULL,
+              NULL,
+              err);
+      GNUNET_free (err);
+      persona_initiate_cancel (ih);
+      return;
+    }
+  }
+  data = json_object_get (j,
+                          "data");
+  if (NULL == data)
+  {
+    GNUNET_break_op (0);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    persona_initiate_cancel (ih);
+    return;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (data,
+                         spec,
+                         &ename,
+                         &eline))
+  {
+    GNUNET_break_op (0);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    ih->cb (ih->cb_cls,
+            TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY,
+            NULL,
+            NULL,
+            NULL,
+            ename);
+    persona_initiate_cancel (ih);
+    return;
+  }
+  persona_account_id
+    = json_string_value (
+        json_object_get (
+          json_object_get (
+            json_object_get (
+              json_object_get (data,
+                               "relationships"),
+              "account"),
+            "data"),
+          "id"));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Starting inquiry %s for Persona account %s\n",
+              inquiry_id,
+              persona_account_id);
+  GNUNET_asprintf (&url,
+                   "https://%s.withpersona.com/verify"
+                   "?inquiry-id=%s",
+                   pd->subdomain,
+                   inquiry_id);
+  ih->cb (ih->cb_cls,
+          TALER_EC_NONE,
+          url,
+          persona_account_id,
+          inquiry_id,
+          NULL);
+  GNUNET_free (url);
+  persona_initiate_cancel (ih);
+}
+
+
+/**
+ * Initiate KYC check.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param account_id which account to trigger process for
+ * @param legitimization_uuid unique ID for the legitimization process
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_InitiateHandle *
+persona_initiate (void *cls,
+                  const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                  const struct TALER_PaytoHashP *account_id,
+                  uint64_t legitimization_uuid,
+                  TALER_KYCLOGIC_InitiateCallback cb,
+                  void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_InitiateHandle *ih;
+  json_t *body;
+  CURL *eh;
+
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  ih = GNUNET_new (struct TALER_KYCLOGIC_InitiateHandle);
+  ih->legitimization_uuid = legitimization_uuid;
+  ih->cb = cb;
+  ih->cb_cls = cb_cls;
+  ih->h_payto = *account_id;
+  ih->pd = pd;
+  GNUNET_asprintf (&ih->url,
+                   "https://withpersona.com/api/v1/inquiries");
+  {
+    char *payto_s;
+    char *proof_url;
+    char ref_s[24];
+
+    GNUNET_snprintf (ref_s,
+                     sizeof (ref_s),
+                     "%llu",
+                     (unsigned long long) ih->legitimization_uuid);
+    payto_s = GNUNET_STRINGS_data_to_string_alloc (&ih->h_payto,
+                                                   sizeof (ih->h_payto));
+    GNUNET_break ('/' ==
+                  pd->ps->exchange_base_url[strlen (
+                                              pd->ps->exchange_base_url) - 1]);
+    GNUNET_asprintf (&proof_url,
+                     "%skyc-proof/%s?state=%s",
+                     pd->ps->exchange_base_url,
+                     pd->section,
+                     payto_s);
+    body = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_object_steal (
+        "data",
+        GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_object_steal (
+            "attributes",
+            GNUNET_JSON_PACK (
+              GNUNET_JSON_pack_string ("inquiry_template_id",
+                                       pd->template_id),
+              GNUNET_JSON_pack_string ("reference_id",
+                                       ref_s),
+              GNUNET_JSON_pack_string ("redirect_uri",
+                                       proof_url)
+              )))));
+    GNUNET_assert (NULL != body);
+    GNUNET_free (payto_s);
+    GNUNET_free (proof_url);
+  }
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_VERBOSE,
+                                  0));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   1L));
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_URL,
+                                  ih->url));
+  ih->ctx.disable_compression = true;
+  if (GNUNET_OK !=
+      TALER_curl_easy_post (&ih->ctx,
+                            eh,
+                            body))
+  {
+    GNUNET_break (0);
+    GNUNET_free (ih->url);
+    GNUNET_free (ih);
+    curl_easy_cleanup (eh);
+    json_decref (body);
+    return NULL;
+  }
+  json_decref (body);
+  ih->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  ih->ctx.headers,
+                                  &handle_initiate_finished,
+                                  ih);
+  GNUNET_CURL_extend_headers (ih->job,
+                              pd->slist);
+  {
+    char *ikh;
+
+    GNUNET_asprintf (&ikh,
+                     "Idempotency-Key: %llu-%s",
+                     (unsigned long long) ih->legitimization_uuid,
+                     pd->salt);
+    ih->slist = curl_slist_append (NULL,
+                                   ikh);
+    GNUNET_free (ikh);
+  }
+  GNUNET_CURL_extend_headers (ih->job,
+                              ih->slist);
+  return ih;
+}
+
+
+/**
+ * Cancel KYC proof.
+ *
+ * @param[in] ph handle of operation to cancel
+ */
+static void
+persona_proof_cancel (struct TALER_KYCLOGIC_ProofHandle *ph)
+{
+  if (NULL != ph->job)
+  {
+    GNUNET_CURL_job_cancel (ph->job);
+    ph->job = NULL;
+  }
+  if (NULL != ph->ec)
+  {
+    TALER_JSON_external_conversion_stop (ph->ec);
+    ph->ec = NULL;
+  }
+  GNUNET_free (ph->url);
+  GNUNET_free (ph->provider_user_id);
+  GNUNET_free (ph->account_id);
+  GNUNET_free (ph->inquiry_id);
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Call @a ph callback with the operation result.
+ *
+ * @param ph proof handle to generate reply for
+ * @param status status to return
+ * @param account_id account to return
+ * @param inquiry_id inquiry ID to supply
+ * @param http_status HTTP status to use
+ * @param template template to instantiate
+ * @param[in] body body for the template to use (reference
+ *         is consumed)
+ */
+static void
+proof_generic_reply (struct TALER_KYCLOGIC_ProofHandle *ph,
+                     enum TALER_KYCLOGIC_KycStatus status,
+                     const char *account_id,
+                     const char *inquiry_id,
+                     unsigned int http_status,
+                     const char *template,
+                     json_t *body)
+{
+  struct MHD_Response *resp;
+  enum GNUNET_GenericReturnValue ret;
+
+  /* This API is not usable for successful replies */
+  GNUNET_assert (TALER_KYCLOGIC_STATUS_SUCCESS != status);
+  ret = TALER_TEMPLATING_build (ph->connection,
+                                &http_status,
+                                template,
+                                NULL,
+                                NULL,
+                                body,
+                                &resp);
+  json_decref (body);
+  if (GNUNET_SYSERR == ret)
+  {
+    GNUNET_break (0);
+    resp = NULL; /* good luck */
+  }
+  ph->cb (ph->cb_cls,
+          status,
+          account_id,
+          inquiry_id,
+          GNUNET_TIME_UNIT_ZERO_ABS,
+          NULL,
+          http_status,
+          resp);
+}
+
+
+/**
+ * Call @a ph callback with HTTP error response.
+ *
+ * @param ph proof handle to generate reply for
+ * @param inquiry_id inquiry ID to supply
+ * @param http_status HTTP status to use
+ * @param template template to instantiate
+ * @param[in] body body for the template to use (reference
+ *         is consumed)
+ */
+static void
+proof_reply_error (struct TALER_KYCLOGIC_ProofHandle *ph,
+                   const char *inquiry_id,
+                   unsigned int http_status,
+                   const char *template,
+                   json_t *body)
+{
+  proof_generic_reply (ph,
+                       TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+                       NULL, /* user id */
+                       inquiry_id,
+                       http_status,
+                       template,
+                       body);
+}
+
+
+/**
+ * Return a response for the @a ph request indicating a
+ * protocol violation by the Persona server.
+ *
+ * @param[in,out] ph request we are processing
+ * @param response_code HTTP status returned by Persona
+ * @param inquiry_id ID of the inquiry this is about
+ * @param detail where the response was wrong
+ * @param data full response data to output
+ */
+static void
+return_invalid_response (struct TALER_KYCLOGIC_ProofHandle *ph,
+                         unsigned int response_code,
+                         const char *inquiry_id,
+                         const char *detail,
+                         const json_t *data)
+{
+  proof_reply_error (
+    ph,
+    inquiry_id,
+    MHD_HTTP_BAD_GATEWAY,
+    "persona-invalid-response",
+    GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_uint64 ("persona_http_status",
+                               response_code),
+      GNUNET_JSON_pack_string ("persona_inquiry_id",
+                               inquiry_id),
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY),
+      GNUNET_JSON_pack_string ("detail",
+                               detail),
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_object_incref ("data",
+                                        (json_t *)
+                                        data))));
+}
+
+
+/**
+ * Start the external conversion helper.
+ *
+ * @param pd configuration details
+ * @param attr attributes to give to the helper
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle for the helper
+ */
+static struct TALER_JSON_ExternalConversion *
+start_conversion (const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                  const json_t *attr,
+                  TALER_JSON_JsonCallback cb,
+                  void *cb_cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Calling converter `%s' with JSON\n",
+              pd->conversion_binary);
+  json_dumpf (attr,
+              stderr,
+              JSON_INDENT (2));
+  return TALER_JSON_external_conversion_start (
+    attr,
+    cb,
+    cb_cls,
+    pd->conversion_binary,
+    pd->conversion_binary,
+    "-a",
+    pd->auth_token,
+    NULL
+    );
+}
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure with a `struct TALER_KYCLOGIC_ProofHandle *`
+ * @param status_type how did the process die
+ * @param code termination status code from the process
+ * @param attr result some JSON result, NULL if we failed to get an JSON output
+ */
+static void
+proof_post_conversion_cb (void *cls,
+                          enum GNUNET_OS_ProcessStatusType status_type,
+                          unsigned long code,
+                          const json_t *attr)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  struct MHD_Response *resp;
+  struct GNUNET_TIME_Absolute expiration;
+
+  ph->ec = NULL;
+  if ( (NULL == attr) ||
+       (0 != code) )
+  {
+    GNUNET_break_op (0);
+    return_invalid_response (ph,
+                             MHD_HTTP_OK,
+                             ph->inquiry_id,
+                             "converter",
+                             NULL);
+    persona_proof_cancel (ph);
+    return;
+  }
+  expiration = GNUNET_TIME_relative_to_absolute (ph->pd->validity);
+  resp = MHD_create_response_from_buffer (0,
+                                          "",
+                                          MHD_RESPMEM_PERSISTENT);
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (resp,
+                                         MHD_HTTP_HEADER_LOCATION,
+                                         ph->pd->post_kyc_redirect_url));
+  TALER_MHD_add_global_headers (resp);
+  ph->cb (ph->cb_cls,
+          TALER_KYCLOGIC_STATUS_SUCCESS,
+          ph->account_id,
+          ph->inquiry_id,
+          expiration,
+          attr,
+          MHD_HTTP_SEE_OTHER,
+          resp);
+  persona_proof_cancel (ph);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP "/api/v1/inquiries/{inquiry-id}" request.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_InitiateHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_proof_finished (void *cls,
+                       long response_code,
+                       const void *response)
+{
+  struct TALER_KYCLOGIC_ProofHandle *ph = cls;
+  const json_t *j = response;
+  const json_t *data = json_object_get (j,
+                                        "data");
+
+  ph->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_OK:
+    {
+      const char *inquiry_id;
+      const char *account_id;
+      const char *type = NULL;
+      const json_t *attributes;
+      const json_t *relationships;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_string ("type",
+                                 &type),
+        GNUNET_JSON_spec_string ("id",
+                                 &inquiry_id),
+        GNUNET_JSON_spec_object_const ("attributes",
+                                       &attributes),
+        GNUNET_JSON_spec_object_const ("relationships",
+                                       &relationships),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if ( (NULL == data) ||
+           (GNUNET_OK !=
+            GNUNET_JSON_parse (data,
+                               spec,
+                               NULL, NULL)) ||
+           (0 != strcmp (type,
+                         "inquiry")) )
+      {
+        GNUNET_break_op (0);
+        return_invalid_response (ph,
+                                 response_code,
+                                 inquiry_id,
+                                 "data",
+                                 data);
+        break;
+      }
+
+      {
+        const char *status; /* "completed", what else? */
+        const char *reference_id; /* or legitimization number */
+        const char *expired_at = NULL; /* often 'null' format: "2022-08-18T10:14:26.000Z" */
+        struct GNUNET_JSON_Specification ispec[] = {
+          GNUNET_JSON_spec_string ("status",
+                                   &status),
+          GNUNET_JSON_spec_string ("reference-id",
+                                   &reference_id),
+          GNUNET_JSON_spec_mark_optional (
+            GNUNET_JSON_spec_string ("expired-at",
+                                     &expired_at),
+            NULL),
+          GNUNET_JSON_spec_end ()
+        };
+
+        if (GNUNET_OK !=
+            GNUNET_JSON_parse (attributes,
+                               ispec,
+                               NULL, NULL))
+        {
+          GNUNET_break_op (0);
+          return_invalid_response (ph,
+                                   response_code,
+                                   inquiry_id,
+                                   "data-attributes",
+                                   data);
+          break;
+        }
+        {
+          unsigned long long idr;
+          char dummy;
+
+          if ( (1 != sscanf (reference_id,
+                             "%llu%c",
+                             &idr,
+                             &dummy)) ||
+               (idr != ph->process_row) )
+          {
+            GNUNET_break_op (0);
+            return_invalid_response (ph,
+                                     response_code,
+                                     inquiry_id,
+                                     "data-attributes-reference_id",
+                                     data);
+            break;
+          }
+        }
+
+        if (0 != strcmp (inquiry_id,
+                         ph->inquiry_id))
+        {
+          GNUNET_break_op (0);
+          return_invalid_response (ph,
+                                   response_code,
+                                   inquiry_id,
+                                   "data-id",
+                                   data);
+          break;
+        }
+
+        account_id = json_string_value (
+          json_object_get (
+            json_object_get (
+              json_object_get (
+                relationships,
+                "account"),
+              "data"),
+            "id"));
+
+        if (0 != strcmp (status,
+                         "completed"))
+        {
+          proof_generic_reply (
+            ph,
+            TALER_KYCLOGIC_STATUS_FAILED,
+            account_id,
+            inquiry_id,
+            MHD_HTTP_OK,
+            "persona-kyc-failed",
+            GNUNET_JSON_PACK (
+              GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                       response_code),
+              GNUNET_JSON_pack_string ("persona_inquiry_id",
+                                       inquiry_id),
+              GNUNET_JSON_pack_allow_null (
+                GNUNET_JSON_pack_object_incref ("data",
+                                                (json_t *)
+                                                data))));
+          break;
+        }
+
+        if (NULL == account_id)
+        {
+          GNUNET_break_op (0);
+          return_invalid_response (ph,
+                                   response_code,
+                                   inquiry_id,
+                                   "data-relationships-account-data-id",
+                                   data);
+          break;
+        }
+        ph->account_id = GNUNET_strdup (account_id);
+        ph->ec = start_conversion (ph->pd,
+                                   j,
+                                   &proof_post_conversion_cb,
+                                   ph);
+        if (NULL == ph->ec)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Failed to start Persona conversion helper\n");
+          proof_reply_error (
+            ph,
+            ph->inquiry_id,
+            MHD_HTTP_BAD_GATEWAY,
+            "persona-logic-failure",
+            GNUNET_JSON_PACK (
+              TALER_JSON_pack_ec (
+                TALER_EC_EXCHANGE_GENERIC_KYC_CONVERTER_FAILED)));
+          break;
+        }
+      }
+      return; /* continued in proof_post_conversion_cb */
+    }
+  case MHD_HTTP_BAD_REQUEST:
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
+  case MHD_HTTP_UNPROCESSABLE_ENTITY:
+    /* These are errors with this code */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_BAD_GATEWAY,
+      "persona-logic-failure",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY),
+
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+    /* These are failures of the exchange operator */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_BAD_GATEWAY,
+      "persona-exchange-unauthorized",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_ACCESS_REFUSED),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  case MHD_HTTP_PAYMENT_REQUIRED:
+    /* These are failures of the exchange operator */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_SERVICE_UNAVAILABLE,
+      "persona-exchange-unpaid",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_ACCESS_REFUSED),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  case MHD_HTTP_REQUEST_TIMEOUT:
+    /* These are networking issues */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_GATEWAY_TIMEOUT,
+      "persona-network-timeout",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_TIMEOUT),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  case MHD_HTTP_TOO_MANY_REQUESTS:
+    /* This is a load issue */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_SERVICE_UNAVAILABLE,
+      "persona-load-failure",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_RATE_LIMIT_EXCEEDED),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* This is an issue with Persona */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_BAD_GATEWAY,
+      "persona-provider-failure",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_PROOF_BACKEND_ERROR),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  default:
+    /* This is an issue with Persona */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    proof_reply_error (
+      ph,
+      ph->inquiry_id,
+      MHD_HTTP_BAD_GATEWAY,
+      "persona-invalid-response",
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_uint64 ("persona_http_status",
+                                 response_code),
+        TALER_JSON_pack_ec (
+          TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_object_incref ("data",
+                                          (json_t *)
+                                          data))));
+    break;
+  }
+  persona_proof_cancel (ph);
+}
+
+
+/**
+ * Check KYC status and return final result to human.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param connection MHD connection object (for HTTP headers)
+ * @param account_id which account to trigger process for
+ * @param process_row row in the legitimization processes table the legitimization is for
+ * @param provider_user_id user ID (or NULL) the proof is for
+ * @param inquiry_id legitimization ID the proof is for
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_ProofHandle *
+persona_proof (void *cls,
+               const struct TALER_KYCLOGIC_ProviderDetails *pd,
+               struct MHD_Connection *connection,
+               const struct TALER_PaytoHashP *account_id,
+               uint64_t process_row,
+               const char *provider_user_id,
+               const char *inquiry_id,
+               TALER_KYCLOGIC_ProofCallback cb,
+               void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProofHandle *ph;
+  CURL *eh;
+
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle);
+  ph->ps = ps;
+  ph->pd = pd;
+  ph->cb = cb;
+  ph->cb_cls = cb_cls;
+  ph->connection = connection;
+  ph->process_row = process_row;
+  ph->h_payto = *account_id;
+  /* Note: we do not expect this to be non-NULL */
+  if (NULL != provider_user_id)
+    ph->provider_user_id = GNUNET_strdup (provider_user_id);
+  if (NULL != inquiry_id)
+    ph->inquiry_id = GNUNET_strdup (inquiry_id);
+  GNUNET_asprintf (&ph->url,
+                   "https://withpersona.com/api/v1/inquiries/%s",
+                   inquiry_id);
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_VERBOSE,
+                                  0));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   1L));
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_URL,
+                                  ph->url));
+  ph->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  pd->slist,
+                                  &handle_proof_finished,
+                                  ph);
+  return ph;
+}
+
+
+/**
+ * Cancel KYC webhook execution.
+ *
+ * @param[in] wh handle of operation to cancel
+ */
+static void
+persona_webhook_cancel (struct TALER_KYCLOGIC_WebhookHandle *wh)
+{
+  if (NULL != wh->task)
+  {
+    GNUNET_SCHEDULER_cancel (wh->task);
+    wh->task = NULL;
+  }
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  if (NULL != wh->ec)
+  {
+    TALER_JSON_external_conversion_stop (wh->ec);
+    wh->ec = NULL;
+  }
+  GNUNET_free (wh->account_id);
+  GNUNET_free (wh->inquiry_id);
+  GNUNET_free (wh->url);
+  GNUNET_free (wh);
+}
+
+
+/**
+ * Call @a wh callback with the operation result.
+ *
+ * @param wh proof handle to generate reply for
+ * @param status status to return
+ * @param account_id account to return
+ * @param inquiry_id inquiry ID to supply
+ * @param attr KYC attribute data for the client
+ * @param http_status HTTP status to use
+ */
+static void
+webhook_generic_reply (struct TALER_KYCLOGIC_WebhookHandle *wh,
+                       enum TALER_KYCLOGIC_KycStatus status,
+                       const char *account_id,
+                       const char *inquiry_id,
+                       const json_t *attr,
+                       unsigned int http_status)
+{
+  struct MHD_Response *resp;
+  struct GNUNET_TIME_Absolute expiration;
+
+  if (TALER_KYCLOGIC_STATUS_SUCCESS == status)
+    expiration = GNUNET_TIME_relative_to_absolute (wh->pd->validity);
+  else
+    expiration = GNUNET_TIME_UNIT_ZERO_ABS;
+  resp = MHD_create_response_from_buffer (0,
+                                          "",
+                                          MHD_RESPMEM_PERSISTENT);
+  TALER_MHD_add_global_headers (resp);
+  wh->cb (wh->cb_cls,
+          wh->process_row,
+          &wh->h_payto,
+          wh->pd->section,
+          account_id,
+          inquiry_id,
+          status,
+          expiration,
+          attr,
+          http_status,
+          resp);
+}
+
+
+/**
+ * Call @a wh callback with HTTP error response.
+ *
+ * @param wh proof handle to generate reply for
+ * @param inquiry_id inquiry ID to supply
+ * @param http_status HTTP status to use
+ */
+static void
+webhook_reply_error (struct TALER_KYCLOGIC_WebhookHandle *wh,
+                     const char *inquiry_id,
+                     unsigned int http_status)
+{
+  webhook_generic_reply (wh,
+                         TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+                         NULL, /* user id */
+                         inquiry_id,
+                         NULL, /* attributes */
+                         http_status);
+}
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure with a `struct TALER_KYCLOGIC_WebhookHandle *`
+ * @param status_type how did the process die
+ * @param code termination status code from the process
+ * @param attr some JSON result, NULL if we failed to get an JSON output
+ */
+static void
+webhook_post_conversion_cb (void *cls,
+                            enum GNUNET_OS_ProcessStatusType status_type,
+                            unsigned long code,
+                            const json_t *attr)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+
+  wh->ec = NULL;
+  webhook_generic_reply (wh,
+                         TALER_KYCLOGIC_STATUS_SUCCESS,
+                         wh->account_id,
+                         wh->inquiry_id,
+                         attr,
+                         MHD_HTTP_OK);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP "/api/v1/inquiries/{inquiry_id}" request.
+ *
+ * @param cls the `struct TALER_KYCLOGIC_WebhookHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_webhook_finished (void *cls,
+                         long response_code,
+                         const void *response)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+  const json_t *j = response;
+  const json_t *data = json_object_get (j,
+                                        "data");
+
+  wh->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_OK:
+    {
+      const char *inquiry_id;
+      const char *account_id;
+      const char *type = NULL;
+      const json_t *attributes;
+      const json_t *relationships;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_string ("type",
+                                 &type),
+        GNUNET_JSON_spec_string ("id",
+                                 &inquiry_id),
+        GNUNET_JSON_spec_object_const ("attributes",
+                                       &attributes),
+        GNUNET_JSON_spec_object_const ("relationships",
+                                       &relationships),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if ( (NULL == data) ||
+           (GNUNET_OK !=
+            GNUNET_JSON_parse (data,
+                               spec,
+                               NULL, NULL)) ||
+           (0 != strcmp (type,
+                         "inquiry")) )
+      {
+        GNUNET_break_op (0);
+        json_dumpf (j,
+                    stderr,
+                    JSON_INDENT (2));
+        webhook_reply_error (wh,
+                             inquiry_id,
+                             MHD_HTTP_BAD_GATEWAY);
+        break;
+      }
+
+      {
+        const char *status; /* "completed", what else? */
+        const char *reference_id; /* or legitimization number */
+        const char *expired_at = NULL; /* often 'null' format: "2022-08-18T10:14:26.000Z" */
+        struct GNUNET_JSON_Specification ispec[] = {
+          GNUNET_JSON_spec_string ("status",
+                                   &status),
+          GNUNET_JSON_spec_string ("reference-id",
+                                   &reference_id),
+          GNUNET_JSON_spec_mark_optional (
+            GNUNET_JSON_spec_string ("expired-at",
+                                     &expired_at),
+            NULL),
+          GNUNET_JSON_spec_end ()
+        };
+
+        if (GNUNET_OK !=
+            GNUNET_JSON_parse (attributes,
+                               ispec,
+                               NULL, NULL))
+        {
+          GNUNET_break_op (0);
+          json_dumpf (j,
+                      stderr,
+                      JSON_INDENT (2));
+          webhook_reply_error (wh,
+                               inquiry_id,
+                               MHD_HTTP_BAD_GATEWAY);
+          break;
+        }
+        {
+          unsigned long long idr;
+          char dummy;
+
+          if ( (1 != sscanf (reference_id,
+                             "%llu%c",
+                             &idr,
+                             &dummy)) ||
+               (idr != wh->process_row) )
+          {
+            GNUNET_break_op (0);
+            webhook_reply_error (wh,
+                                 inquiry_id,
+                                 MHD_HTTP_BAD_GATEWAY);
+            break;
+          }
+        }
+
+        if (0 != strcmp (inquiry_id,
+                         wh->inquiry_id))
+        {
+          GNUNET_break_op (0);
+          webhook_reply_error (wh,
+                               inquiry_id,
+                               MHD_HTTP_BAD_GATEWAY);
+          break;
+        }
+
+        account_id = json_string_value (
+          json_object_get (
+            json_object_get (
+              json_object_get (
+                relationships,
+                "account"),
+              "data"),
+            "id"));
+
+        if (0 != strcmp (status,
+                         "completed"))
+        {
+          webhook_generic_reply (wh,
+                                 TALER_KYCLOGIC_STATUS_FAILED,
+                                 account_id,
+                                 inquiry_id,
+                                 NULL,
+                                 MHD_HTTP_OK);
+          break;
+        }
+
+        if (NULL == account_id)
+        {
+          GNUNET_break_op (0);
+          json_dumpf (data,
+                      stderr,
+                      JSON_INDENT (2));
+          webhook_reply_error (wh,
+                               inquiry_id,
+                               MHD_HTTP_BAD_GATEWAY);
+          break;
+        }
+        wh->account_id = GNUNET_strdup (account_id);
+        wh->ec = start_conversion (wh->pd,
+                                   j,
+                                   &webhook_post_conversion_cb,
+                                   wh);
+        if (NULL == wh->ec)
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Failed to start Persona conversion helper\n");
+          webhook_reply_error (wh,
+                               inquiry_id,
+                               MHD_HTTP_INTERNAL_SERVER_ERROR);
+          break;
+        }
+      }
+      return; /* continued in webhook_post_conversion_cb */
+    }
+  case MHD_HTTP_BAD_REQUEST:
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_CONFLICT:
+  case MHD_HTTP_UNPROCESSABLE_ENTITY:
+    /* These are errors with this code */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_BAD_GATEWAY);
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+    /* These are failures of the exchange operator */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_INTERNAL_SERVER_ERROR);
+    break;
+  case MHD_HTTP_PAYMENT_REQUIRED:
+    /* These are failures of the exchange operator */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Refused access with HTTP status code %u\n",
+                (unsigned int) response_code);
+
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_INTERNAL_SERVER_ERROR);
+    break;
+  case MHD_HTTP_REQUEST_TIMEOUT:
+    /* These are networking issues */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_GATEWAY_TIMEOUT);
+    break;
+  case MHD_HTTP_TOO_MANY_REQUESTS:
+    /* This is a load issue */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_SERVICE_UNAVAILABLE);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* This is an issue with Persona */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_BAD_GATEWAY);
+    break;
+  default:
+    /* This is an issue with Persona */
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "PERSONA failed with response %u:\n",
+                (unsigned int) response_code);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    webhook_reply_error (wh,
+                         wh->inquiry_id,
+                         MHD_HTTP_BAD_GATEWAY);
+    break;
+  }
+
+  persona_webhook_cancel (wh);
+}
+
+
+/**
+ * Asynchronously return a reply for the webhook.
+ *
+ * @param cls a `struct TALER_KYCLOGIC_WebhookHandle *`
+ */
+static void
+async_webhook_reply (void *cls)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+
+  wh->task = NULL;
+  wh->cb (wh->cb_cls,
+          wh->process_row,
+          (0 == wh->process_row)
+          ? NULL
+          : &wh->h_payto,
+          wh->pd->section,
+          NULL,
+          wh->inquiry_id, /* provider legi ID */
+          TALER_KYCLOGIC_STATUS_PROVIDER_FAILED,
+          GNUNET_TIME_UNIT_ZERO_ABS, /* expiration */
+          NULL,
+          wh->response_code,
+          wh->resp);
+  persona_webhook_cancel (wh);
+}
+
+
+/**
+ * Function called with the provider details and
+ * associated plugin closures for matching logics.
+ *
+ * @param cls closure
+ * @param pd provider details of a matching logic
+ * @param plugin_cls closure of the plugin
+ * @return #GNUNET_OK to continue to iterate
+ */
+static enum GNUNET_GenericReturnValue
+locate_details_cb (
+  void *cls,
+  const struct TALER_KYCLOGIC_ProviderDetails *pd,
+  void *plugin_cls)
+{
+  struct TALER_KYCLOGIC_WebhookHandle *wh = cls;
+
+  /* This type-checks 'pd' */
+  GNUNET_assert (plugin_cls == wh->ps);
+  if (0 == strcmp (pd->template_id,
+                   wh->template_id))
+  {
+    wh->pd = pd;
+    return GNUNET_NO;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Check KYC status and return result for Webhook.  We do NOT implement the
+ * authentication check proposed by the PERSONA documentation, as it would
+ * allow an attacker who learns the access token to easily bypass the KYC
+ * checks. Instead, we insist on explicitly requesting the KYC status from the
+ * provider (at least on success).
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param plc callback to lookup accounts with
+ * @param plc_cls closure for @a plc
+ * @param http_method HTTP method used for the webhook
+ * @param url_path rest of the URL after `/kyc-webhook/`
+ * @param connection MHD connection object (for HTTP headers)
+ * @param body HTTP request body
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_WebhookHandle *
+persona_webhook (void *cls,
+                 const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                 TALER_KYCLOGIC_ProviderLookupCallback plc,
+                 void *plc_cls,
+                 const char *http_method,
+                 const char *const url_path[],
+                 struct MHD_Connection *connection,
+                 const json_t *body,
+                 TALER_KYCLOGIC_WebhookCallback cb,
+                 void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+  CURL *eh;
+  enum GNUNET_DB_QueryStatus qs;
+  const char *persona_inquiry_id;
+  const char *auth_header;
+
+  /* Persona webhooks are expected by logic, not by template */
+  GNUNET_break_op (NULL == pd);
+  wh = GNUNET_new (struct TALER_KYCLOGIC_WebhookHandle);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ps = ps;
+  wh->connection = connection;
+  wh->pd = pd;
+  auth_header = MHD_lookup_connection_value (connection,
+                                             MHD_HEADER_KIND,
+                                             MHD_HTTP_HEADER_AUTHORIZATION);
+  if ( (NULL != ps->webhook_token) &&
+       ( (NULL == auth_header) ||
+         (0 != strcmp (ps->webhook_token,
+                       auth_header)) ) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Invalid authorization header `%s' received for Persona webhook\n",
+                auth_header);
+    wh->resp = TALER_MHD_MAKE_JSON_PACK (
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_WEBHOOK_UNAUTHORIZED),
+      GNUNET_JSON_pack_string ("detail",
+                               "unexpected 'Authorization' header"));
+    wh->response_code = MHD_HTTP_UNAUTHORIZED;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  wh->template_id
+    = json_string_value (
+        json_object_get (
+          json_object_get (
+            json_object_get (
+              json_object_get (
+                json_object_get (
+                  json_object_get (
+                    json_object_get (
+                      json_object_get (
+                        body,
+                        "data"),
+                      "attributes"),
+                    "payload"),
+                  "data"),
+                "relationships"),
+              "inquiry-template"),
+            "data"),
+          "id"));
+  if (NULL == wh->template_id)
+  {
+    GNUNET_break_op (0);
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+    wh->resp = TALER_MHD_MAKE_JSON_PACK (
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY),
+      GNUNET_JSON_pack_string ("detail",
+                               "data-attributes-payload-data-id"),
+      GNUNET_JSON_pack_object_incref ("webhook_body",
+                                      (json_t *) body));
+    wh->response_code = MHD_HTTP_BAD_REQUEST;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  TALER_KYCLOGIC_kyc_get_details ("persona",
+                                  &locate_details_cb,
+                                  wh);
+  if (NULL == wh->pd)
+  {
+    GNUNET_break_op (0);
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+    wh->resp = TALER_MHD_MAKE_JSON_PACK (
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN),
+      GNUNET_JSON_pack_string ("detail",
+                               wh->template_id),
+      GNUNET_JSON_pack_object_incref ("webhook_body",
+                                      (json_t *) body));
+    wh->response_code = MHD_HTTP_BAD_REQUEST;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  persona_inquiry_id
+    = json_string_value (
+        json_object_get (
+          json_object_get (
+            json_object_get (
+              json_object_get (
+                json_object_get (
+                  body,
+                  "data"),
+                "attributes"),
+              "payload"),
+            "data"),
+          "id"));
+  if (NULL == persona_inquiry_id)
+  {
+    GNUNET_break_op (0);
+    json_dumpf (body,
+                stderr,
+                JSON_INDENT (2));
+    wh->resp = TALER_MHD_MAKE_JSON_PACK (
+      TALER_JSON_pack_ec (
+        TALER_EC_EXCHANGE_KYC_GENERIC_PROVIDER_UNEXPECTED_REPLY),
+      GNUNET_JSON_pack_string ("detail",
+                               "data-attributes-payload-data-id"),
+      GNUNET_JSON_pack_object_incref ("webhook_body",
+                                      (json_t *) body));
+    wh->response_code = MHD_HTTP_BAD_REQUEST;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  qs = plc (plc_cls,
+            wh->pd->section,
+            persona_inquiry_id,
+            &wh->h_payto,
+            &wh->process_row);
+  if (qs < 0)
+  {
+    wh->resp = TALER_MHD_make_error (TALER_EC_GENERIC_DB_FETCH_FAILED,
+                                     "provider-legitimization-lookup");
+    wh->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received Persona kyc-webhook for unknown verification ID `%s'\n",
+                persona_inquiry_id);
+    wh->resp = TALER_MHD_make_error (
+      TALER_EC_EXCHANGE_KYC_PROOF_REQUEST_UNKNOWN,
+      persona_inquiry_id);
+    wh->response_code = MHD_HTTP_NOT_FOUND;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+  wh->inquiry_id = GNUNET_strdup (persona_inquiry_id);
+
+  eh = curl_easy_init ();
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    wh->resp = TALER_MHD_make_error (
+      TALER_EC_GENERIC_ALLOCATION_FAILURE,
+      NULL);
+    wh->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
+    wh->task = GNUNET_SCHEDULER_add_now (&async_webhook_reply,
+                                         wh);
+    return wh;
+  }
+
+  GNUNET_asprintf (&wh->url,
+                   "https://withpersona.com/api/v1/inquiries/%s",
+                   persona_inquiry_id);
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_VERBOSE,
+                                  0));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_MAXREDIRS,
+                                   1L));
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_URL,
+                                  wh->url));
+  wh->job = GNUNET_CURL_job_add2 (ps->curl_ctx,
+                                  eh,
+                                  wh->pd->slist,
+                                  &handle_webhook_finished,
+                                  wh);
+  return wh;
+}
+
+
+/**
+ * Initialize persona logic plugin
+ *
+ * @param cls a configuration instance
+ * @return NULL on error, otherwise a `struct TALER_KYCLOGIC_Plugin`
+ */
+void *
+libtaler_plugin_kyclogic_persona_init (void *cls)
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct TALER_KYCLOGIC_Plugin *plugin;
+  struct PluginState *ps;
+
+  ps = GNUNET_new (struct PluginState);
+  ps->cfg = cfg;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &ps->exchange_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    GNUNET_free (ps);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ps->cfg,
+                                             "kyclogic-persona",
+                                             "WEBHOOK_AUTH_TOKEN",
+                                             &ps->webhook_token))
+  {
+    /* optional */
+    ps->webhook_token = NULL;
+  }
+
+  ps->curl_ctx
+    = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                        &ps->curl_rc);
+  if (NULL == ps->curl_ctx)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ps->exchange_base_url);
+    GNUNET_free (ps);
+    return NULL;
+  }
+  ps->curl_rc = GNUNET_CURL_gnunet_rc_create (ps->curl_ctx);
+
+  plugin = GNUNET_new (struct TALER_KYCLOGIC_Plugin);
+  plugin->cls = ps;
+  plugin->load_configuration
+    = &persona_load_configuration;
+  plugin->unload_configuration
+    = &persona_unload_configuration;
+  plugin->initiate
+    = &persona_initiate;
+  plugin->initiate_cancel
+    = &persona_initiate_cancel;
+  plugin->proof
+    = &persona_proof;
+  plugin->proof_cancel
+    = &persona_proof_cancel;
+  plugin->webhook
+    = &persona_webhook;
+  plugin->webhook_cancel
+    = &persona_webhook_cancel;
+  return plugin;
+}
+
+
+/**
+ * Unload authorization plugin
+ *
+ * @param cls a `struct TALER_KYCLOGIC_Plugin`
+ * @return NULL (always)
+ */
+void *
+libtaler_plugin_kyclogic_persona_done (void *cls)
+{
+  struct TALER_KYCLOGIC_Plugin *plugin = cls;
+  struct PluginState *ps = plugin->cls;
+
+  if (NULL != ps->curl_ctx)
+  {
+    GNUNET_CURL_fini (ps->curl_ctx);
+    ps->curl_ctx = NULL;
+  }
+  if (NULL != ps->curl_rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (ps->curl_rc);
+    ps->curl_rc = NULL;
+  }
+  GNUNET_free (ps->exchange_base_url);
+  GNUNET_free (ps->webhook_token);
+  GNUNET_free (ps);
+  GNUNET_free (plugin);
+  return NULL;
+}
+
+
+/* end of plugin_kyclogic_persona.c */
diff --git a/src/kyclogic/plugin_kyclogic_template.c b/src/kyclogic/plugin_kyclogic_template.c
new file mode 100644
index 000000000..54f36e6f2
--- /dev/null
+++ b/src/kyclogic/plugin_kyclogic_template.c
@@ -0,0 +1,468 @@
+/*
+  This file is part of GNU Taler
+  Copyright (C) 2022 Taler Systems SA
+
+  Taler 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, 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 Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License along with
+  Taler; see the file COPYING.GPL.  If not, see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file plugin_kyclogic_template.c
+ * @brief template for an authentication flow logic
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_kyclogic_plugin.h"
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include <regex.h>
+#include "taler_util.h"
+
+
+/**
+ * Saves the state of a plugin.
+ */
+struct PluginState
+{
+
+  /**
+   * Our base URL.
+   */
+  char *exchange_base_url;
+
+  /**
+   * Our global configuration.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Context for CURL operations (useful to the event loop)
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * Context for integrating @e curl_ctx with the
+   * GNUnet event loop.
+   */
+  struct GNUNET_CURL_RescheduleContext *curl_rc;
+
+};
+
+
+/**
+ * Keeps the plugin-specific state for
+ * a given configuration section.
+ */
+struct TALER_KYCLOGIC_ProviderDetails
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Configuration section that configured us.
+   */
+  char *section;
+
+};
+
+
+/**
+ * Handle for an initiation operation.
+ */
+struct TALER_KYCLOGIC_InitiateHandle
+{
+
+  /**
+   * Hash of the payto:// URI we are initiating
+   * the KYC for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * UUID being checked.
+   */
+  uint64_t legitimization_uuid;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_InitiateCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+};
+
+
+/**
+ * Handle for an KYC proof operation.
+ */
+struct TALER_KYCLOGIC_ProofHandle
+{
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Continuation to call.
+   */
+  TALER_KYCLOGIC_ProofCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+};
+
+
+/**
+ * Handle for an KYC Web hook operation.
+ */
+struct TALER_KYCLOGIC_WebhookHandle
+{
+
+  /**
+   * Continuation to call when done.
+   */
+  TALER_KYCLOGIC_WebhookCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Task for asynchronous execution.
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Overall plugin state.
+   */
+  struct PluginState *ps;
+
+  /**
+   * Our configuration details.
+   */
+  const struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Connection we are handling.
+   */
+  struct MHD_Connection *connection;
+};
+
+
+/**
+ * Release configuration resources previously loaded
+ *
+ * @param[in] pd configuration to release
+ */
+static void
+template_unload_configuration (struct TALER_KYCLOGIC_ProviderDetails *pd)
+{
+  GNUNET_free (pd);
+}
+
+
+/**
+ * Load the configuration of the KYC provider.
+ *
+ * @param cls closure
+ * @param provider_section_name configuration section to parse
+ * @return NULL if configuration is invalid
+ */
+static struct TALER_KYCLOGIC_ProviderDetails *
+template_load_configuration (void *cls,
+                             const char *provider_section_name)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  pd = GNUNET_new (struct TALER_KYCLOGIC_ProviderDetails);
+  pd->ps = ps;
+  pd->section = GNUNET_strdup (provider_section_name);
+  GNUNET_break (0); // FIXME: parse config here!
+  return pd;
+}
+
+
+/**
+ * Cancel KYC check initiation.
+ *
+ * @param[in] ih handle of operation to cancel
+ */
+static void
+template_initiate_cancel (struct TALER_KYCLOGIC_InitiateHandle *ih)
+{
+  GNUNET_break (0); // FIXME: add cancel logic here
+  GNUNET_free (ih);
+}
+
+
+/**
+ * Initiate KYC check.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param account_id which account to trigger process for
+ * @param legitimization_uuid unique ID for the legitimization process
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_InitiateHandle *
+template_initiate (void *cls,
+                   const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                   const struct TALER_PaytoHashP *account_id,
+                   uint64_t legitimization_uuid,
+                   TALER_KYCLOGIC_InitiateCallback cb,
+                   void *cb_cls)
+{
+  struct TALER_KYCLOGIC_InitiateHandle *ih;
+
+  (void) cls;
+  ih = GNUNET_new (struct TALER_KYCLOGIC_InitiateHandle);
+  ih->legitimization_uuid = legitimization_uuid;
+  ih->cb = cb;
+  ih->cb_cls = cb_cls;
+  ih->h_payto = *account_id;
+  ih->pd = pd;
+  GNUNET_break (0); // FIXME: add actual initiation logic!
+  return ih;
+}
+
+
+/**
+ * Cancel KYC proof.
+ *
+ * @param[in] ph handle of operation to cancel
+ */
+static void
+template_proof_cancel (struct TALER_KYCLOGIC_ProofHandle *ph)
+{
+  GNUNET_break (0); // FIXME: stop activities...
+  GNUNET_free (ph);
+}
+
+
+/**
+ * Check KYC status and return status to human.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param connection MHD connection object (for HTTP headers)
+ * @param account_id which account to trigger process for
+ * @param process_row row in the legitimization processes table the legitimization is for
+ * @param provider_user_id user ID (or NULL) the proof is for
+ * @param provider_legitimization_id legitimization ID the proof is for
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_ProofHandle *
+template_proof (void *cls,
+                const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                struct MHD_Connection *connection,
+                const struct TALER_PaytoHashP *account_id,
+                uint64_t process_row,
+                const char *provider_user_id,
+                const char *provider_legitimization_id,
+                TALER_KYCLOGIC_ProofCallback cb,
+                void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_ProofHandle *ph;
+
+  (void) account_id;
+  (void) process_row;
+  (void) provider_user_id;
+  (void) provider_legitimization_id;
+  ph = GNUNET_new (struct TALER_KYCLOGIC_ProofHandle);
+  ph->ps = ps;
+  ph->pd = pd;
+  ph->cb = cb;
+  ph->cb_cls = cb_cls;
+  ph->connection = connection;
+
+  GNUNET_break (0); // FIXME: start check!
+  return ph;
+}
+
+
+/**
+ * Cancel KYC webhook execution.
+ *
+ * @param[in] wh handle of operation to cancel
+ */
+static void
+template_webhook_cancel (struct TALER_KYCLOGIC_WebhookHandle *wh)
+{
+  GNUNET_break (0); /*  FIXME: stop activity */
+  GNUNET_free (wh);
+}
+
+
+/**
+ * Check KYC status and return result for Webhook.
+ *
+ * @param cls the @e cls of this struct with the plugin-specific state
+ * @param pd provider configuration details
+ * @param plc callback to lookup accounts with
+ * @param plc_cls closure for @a plc
+ * @param http_method HTTP method used for the webhook
+ * @param url_path rest of the URL after `/kyc-webhook/`
+ * @param connection MHD connection object (for HTTP headers)
+ * @param body HTTP request body
+ * @param cb function to call with the result
+ * @param cb_cls closure for @a cb
+ * @return handle to cancel operation early
+ */
+static struct TALER_KYCLOGIC_WebhookHandle *
+template_webhook (void *cls,
+                  const struct TALER_KYCLOGIC_ProviderDetails *pd,
+                  TALER_KYCLOGIC_ProviderLookupCallback plc,
+                  void *plc_cls,
+                  const char *http_method,
+                  const char *const url_path[],
+                  struct MHD_Connection *connection,
+                  const json_t *body,
+                  TALER_KYCLOGIC_WebhookCallback cb,
+                  void *cb_cls)
+{
+  struct PluginState *ps = cls;
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+
+  (void) plc;
+  (void) plc_cls;
+  (void) http_method;
+  (void) url_path;
+  (void) body;
+  wh = GNUNET_new (struct TALER_KYCLOGIC_WebhookHandle);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ps = ps;
+  wh->pd = pd;
+  wh->connection = connection;
+  GNUNET_break (0); /* FIXME: start activity */
+  return wh;
+}
+
+
+/**
+ * Initialize Template.0 KYC logic plugin
+ *
+ * @param cls a configuration instance
+ * @return NULL on error, otherwise a `struct TALER_KYCLOGIC_Plugin`
+ */
+void *
+libtaler_plugin_kyclogic_template_init (void *cls)
+{
+  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct TALER_KYCLOGIC_Plugin *plugin;
+  struct PluginState *ps;
+
+  ps = GNUNET_new (struct PluginState);
+  ps->cfg = cfg;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &ps->exchange_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    GNUNET_free (ps);
+    return NULL;
+  }
+
+  ps->curl_ctx
+    = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                        &ps->curl_rc);
+  if (NULL == ps->curl_ctx)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ps->exchange_base_url);
+    GNUNET_free (ps);
+    return NULL;
+  }
+  ps->curl_rc = GNUNET_CURL_gnunet_rc_create (ps->curl_ctx);
+
+  plugin = GNUNET_new (struct TALER_KYCLOGIC_Plugin);
+  plugin->cls = ps;
+  plugin->load_configuration
+    = &template_load_configuration;
+  plugin->unload_configuration
+    = &template_unload_configuration;
+  plugin->initiate
+    = &template_initiate;
+  plugin->initiate_cancel
+    = &template_initiate_cancel;
+  plugin->proof
+    = &template_proof;
+  plugin->proof_cancel
+    = &template_proof_cancel;
+  plugin->webhook
+    = &template_webhook;
+  plugin->webhook_cancel
+    = &template_webhook_cancel;
+  return plugin;
+}
+
+
+/**
+ * Unload authorization plugin
+ *
+ * @param cls a `struct TALER_KYCLOGIC_Plugin`
+ * @return NULL (always)
+ */
+void *
+libtaler_plugin_kyclogic_template_done (void *cls)
+{
+  struct TALER_KYCLOGIC_Plugin *plugin = cls;
+  struct PluginState *ps = plugin->cls;
+
+  if (NULL != ps->curl_ctx)
+  {
+    GNUNET_CURL_fini (ps->curl_ctx);
+    ps->curl_ctx = NULL;
+  }
+  if (NULL != ps->curl_rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (ps->curl_rc);
+    ps->curl_rc = NULL;
+  }
+  GNUNET_free (ps->exchange_base_url);
+  GNUNET_free (ps);
+  GNUNET_free (plugin);
+  return NULL;
+}
diff --git a/src/kyclogic/sample.conf b/src/kyclogic/sample.conf
new file mode 100644
index 000000000..b9a88c292
--- /dev/null
+++ b/src/kyclogic/sample.conf
@@ -0,0 +1,33 @@
+# This file is in the public domain.
+#
+
+[exchange]
+
+# HTTP port the exchange listens to
+PORT = 8081
+
+# Base URL of the exchange. Must be set to a URL where the
+# exchange (or the twister) is actually listening.
+BASE_URL = "http://localhost:8081/"
+
+[kyc-provider-test-oauth2]
+
+COST = 0
+LOGIC = oauth2
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = DUMMY
+
+KYC_OAUTH2_VALIDITY = forever
+KYC_OAUTH2_AUTH_URL = http://kyc.taler.net/auth
+KYC_OAUTH2_LOGIN_URL = http://kyc.taler.net/login
+KYC_OAUTH2_INFO_URL = http://kyc.taler.net/info
+KYC_OAUTH2_POST_URL = http://kyc.taler.net/thank-you
+KYC_OAUTH2_CLIENT_ID = testcase
+KYC_OAUTH2_CLIENT_SECRET = password
+
+[kyc-legitimization-withdraw-high]
+
+OPERATION_TYPE = WITHDRAW
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = KUDOS:100
+TIMEFRAME = 1a
diff --git a/src/kyclogic/taler-exchange-kyc-kycaid-converter.sh b/src/kyclogic/taler-exchange-kyc-kycaid-converter.sh
new file mode 100755
index 000000000..68a1b6a0d
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-kycaid-converter.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+# This file is in the public domain.
+#
+# This code converts (some of) the JSON output from KYCAID into the GNU Taler
+# specific KYC attribute data (again in JSON format).  We may need to download
+# and inline file data in the process, for authorization pass "-a" with the
+# respective bearer token.
+#
+
+# Die if anything goes wrong.
+set -eu
+
+# Parse command-line options
+while getopts ':a:' OPTION; do
+    case "$OPTION" in
+        a)
+            TOKEN="$OPTARG"
+            ;;
+        ?)
+        echo "Unrecognized command line option"
+        exit 1
+        ;;
+    esac
+done
+
+# First, extract everything from stdin.
+J=$(jq '{"type":.type,"email":.email,"phone":.phone,"first_name":.first_name,"name-middle":.middle_name,"last_name":.last_name,"dob":.dob,"residence_country":.residence_country,"gender":.gender,"pep":.pep,"addresses":.addresses,"documents":.documents,"company_name":.company_name,"business_activity_id":.business_activity_id,"registration_country":.registration_country,"documents":.documents,"decline_reasons":.decline_reasons}')
+
+# TODO:
+# log_failure (json_object_get (j, "decline_reasons"));
+
+TYPE=$(echo "$J" | jq -r '.type')
+
+N=0
+DOCS_RAW=""
+DOCS_JSON=""
+for ID in $(jq -r '.documents[]|select(.status=="valid")|.id')
+do
+    TYPE=$(jq -r ".documents[]|select(.id==\"$ID\")|.type")
+    EXPIRY=$(jq -r ".documents[]|select(.id==\"$ID\")|.expiry_date")
+    DOCUMENT_FILE=$(mktemp -t tmp.XXXXXXXXXX)
+    # Authorization: Token $TOKEN
+    DOCUMENT_URL="https://api.kycaid.com/documents/$ID"
+    if [ -z "${TOKEN:-}" ]
+    then
+        wget -q --output-document=- "$DOCUMENT_URL" \
+            | gnunet-base32 > ${DOCUMENT_FILE}
+    else
+        wget -q --output-document=- "$DOCUMENT_URL" \
+             --header "Authorization: Token $TOKEN" \
+            | gnunet-base32 > ${DOCUMENT_FILE}
+    fi
+    DOCS_RAW="$DOCS_RAW --rawfile photo$N \"${DOCUMENT_FILE}\""
+    if [ "$N" = 0 ]
+    then
+        DOCS_JSON="{\"type\":\"$TYPE\",\"image\":\$photo$N}"
+    else
+        DOCS_JSON="{\"type\":\"$TYPE\",\"image\":\$photo$N},$DOCS_JSON"
+    fi
+    N=$(expr $N + 1)
+done
+
+
+if [ "PERSON" = "${TYPE}" ]
+then
+
+  # Next, combine some fields into larger values.
+  FULLNAME=$(echo "$J" | jq -r '[.first_name,.middle_name,.last_name]|join(" ")')
+#  STREET=$(echo $J | jq -r '[."street-1",."street-2"]|join(" ")')
+#  CITY=$(echo $J | jq -r '[.postcode,.city,."address-subdivision,.cc"]|join(" ")')
+
+  # Combine into final result for individual.
+  echo "$J" \
+      | jq \
+            --arg full_name "${FULLNAME}" \
+            '{$full_name,"birthdate":.dob,"pep":.pep,"phone":.phone,"email":.email,"residences":.residence_country}' \
+      | jq \
+            'del(..|select(.==null))'
+
+else
+  # Combine into final result for business.
+    echo "$J" \
+        | jq \
+              $DOCS_RAW \
+              "{\"company_name\":.company_name,\"phone\":.phone,\"email\":.email,\"registration_country\":.registration_country,\"documents\":[${DOCS_JSON}]}" \
+        | jq \
+              'del(..|select(.==null))'
+fi
+
+exit 0
diff --git a/src/kyclogic/taler-exchange-kyc-oauth2-challenger.sh b/src/kyclogic/taler-exchange-kyc-oauth2-challenger.sh
new file mode 100755
index 000000000..729abc504
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-oauth2-challenger.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+# This file is in the public domain.
+#
+# This code converts (some of) the JSON output from
+# Challenger into the GNU Taler
+# specific KYC attribute data (again in JSON format).
+#
+
+# Die if anything goes wrong.
+set -eu
+
+# First, extract everything from stdin.
+J=$(jq '{"id":.id,"email":.address,"type":.address_type,"expires":.address_expiration}')
+
+ADDRESS_TYPE=$(echo "$J" | jq -r '.type')
+ROWID=$(echo "$J" | jq -r '.id')
+if [ "$ADDRESS_TYPE" != "email" ]
+then
+  return 1
+fi
+
+echo "$J" \
+  | jq \
+   --arg id "${ROWID}" \
+  '{$id,"email":.email,"expires":.expires}'
+
+exit 0
diff --git a/src/kyclogic/taler-exchange-kyc-oauth2-nda.sh b/src/kyclogic/taler-exchange-kyc-oauth2-nda.sh
new file mode 100755
index 000000000..5af785f19
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-oauth2-nda.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# This file is in the public domain.
+#
+# This code converts (some of) the JSON output from NDA into the GNU Taler
+# specific KYC attribute data (again in JSON format).
+#
+
+# Die if anything goes wrong.
+set -eu
+
+# First, extract everything from stdin.
+J=$(jq '{"status":.status,"id":.data.id,"last":.data.last_name,"first":.data.first_name,"phone":.data.phone}')
+
+STATUS=$(echo "$J" | jq -r '.status')
+if [ "$STATUS" != "success" ]
+then
+  return 1
+fi
+
+# Next, combine some fields into larger values.
+FULLNAME=$(echo "$J" | jq -r '[.first_name,.last_name]|join(" ")')
+
+echo "$J" \
+    | jq \
+          --arg full_name "${FULLNAME}" \
+          '{$full_name,"phone":.phone,"id":.id}' \
+    | jq \
+          'del(..|select(.==null))'
+
+exit 0
diff --git a/src/kyclogic/taler-exchange-kyc-oauth2-test-converter.sh b/src/kyclogic/taler-exchange-kyc-oauth2-test-converter.sh
new file mode 100755
index 000000000..76f9f16c4
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-oauth2-test-converter.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# This file is in the public domain.
+#
+# This code converts (some of) the JSON output from
+# Challenger into the GNU Taler
+# specific KYC attribute data (again in JSON format).
+#
+
+# Die if anything goes wrong.
+set -eu
+
+
+# First, extract everything from stdin.
+J=$(jq '{"id":.data.id,"first":.data.first_name,"last":.data.last_name,"birthdate":.data.birthdate,"status":.status}')
+
+# Next, combine some fields into larger values.
+STATUS=$(echo "$J" | jq -r '.status')
+if [ "$STATUS" != "success" ]
+then
+  exit 1
+fi
+
+FULLNAME=$(echo "$J" | jq -r '[.first,.last]|join(" ")')
+
+echo $J \
+    | jq \
+          --arg full_name "${FULLNAME}" \
+          '{$full_name,"birthdate":.birthdate,"id":.id}' \
+    | jq \
+          'del(..|select(.==null))'
+exit 0
diff --git a/src/kyclogic/taler-exchange-kyc-persona-converter.sh b/src/kyclogic/taler-exchange-kyc-persona-converter.sh
new file mode 100755
index 000000000..13142d0e5
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-persona-converter.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# This file is in the public domain.
+#
+# This code converts (some of) the JSON output from Persona into the GNU Taler
+# specific KYC attribute data (again in JSON format).  We may need to download
+# and inline file data in the process, for authorization pass "-a" with the
+# respective bearer token.
+#
+
+# Die if anything goes wrong.
+set -eu
+
+# Parse command-line options
+while getopts ':a:' OPTION; do
+    case "$OPTION" in
+        a)
+            TOKEN="$OPTARG"
+            ;;
+        ?)
+        echo "Unrecognized command line option"
+        exit 1
+        ;;
+    esac
+done
+
+
+# First, extract everything from stdin.
+J=$(jq '{"first":.data.attributes."name-first","middle":.data.attributes."name-middle","last":.data.attributes."name-last","cc":.data.attributes.fields."address-country-code".value,"birthdate":.data.attributes.birthdate,"city":.data.attributes."address-city","postcode":.data.attributes."address-postal-code","street-1":.data.attributes."address-street-1","street-2":.data.attributes."address-street-2","address-subdivision":.data.attributes."address-subdivision","identification-number":.data.attributes."identification-number","photo":.included[]|select(.type=="verification/government-id")|.attributes|select(.status=="passed")|."front-photo-url"}')
+
+
+# Next, combine some fields into larger values.
+FULLNAME=$(echo "$J" | jq -r '[.first,.middle,.last]|join(" ")')
+STREET=$(echo $J | jq -r '[."street-1",."street-2"]|join(" ")')
+CITY=$(echo $J | jq -r '[.postcode,.city,."address-subdivision,.cc"]|join(" ")')
+
+# Download and base32-encode the photo
+PHOTO_URL=$(echo "$J" | jq -r '.photo')
+PHOTO_FILE=$(mktemp -t tmp.XXXXXXXXXX)
+if [ -z "${TOKEN:-}" ]
+then
+    wget -q --output-document=- "$PHOTO_URL" | gnunet-base32 > ${PHOTO_FILE}
+else
+    wget -q --output-document=- --header "Authorization: Bearer $TOKEN" "$PHOTO_URL" | gnunet-base32  > ${PHOTO_FILE}
+fi
+
+# Combine into final result.
+echo "$J" \
+    | jq \
+          --arg full_name "${FULLNAME}" \
+          --arg street "${STREET}" \
+          --arg city "${CITY}" \
+          --rawfile photo "${PHOTO_FILE}" \
+          '{$full_name,$street,$city,"birthdate":.birthdate,"residences":.cc,"identification_number":."identification-number",$photo}' \
+    | jq \
+          'del(..|select(.==null))'
+
+exit 0
diff --git a/src/kyclogic/taler-exchange-kyc-tester.c b/src/kyclogic/taler-exchange-kyc-tester.c
new file mode 100644
index 000000000..c2efafd72
--- /dev/null
+++ b/src/kyclogic/taler-exchange-kyc-tester.c
@@ -0,0 +1,1646 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022 Taler Systems SA
+
+   TALER 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, 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 Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License along with
+   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+/**
+ * @file taler-exchange-kyc-tester.c
+ * @brief tool to test KYC integrations
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <jansson.h>
+#include <microhttpd.h>
+#include <sched.h>
+#include <sys/resource.h>
+#include <limits.h>
+#include "taler_mhd_lib.h"
+#include "taler_json_lib.h"
+#include "taler_templating_lib.h"
+#include "taler_util.h"
+#include "taler_kyclogic_lib.h"
+#include "taler_kyclogic_plugin.h"
+#include <gnunet/gnunet_mhd_compat.h>
+
+
+/**
+ * @brief Context in which the exchange is processing
+ *        all requests
+ */
+struct TEKT_RequestContext
+{
+
+  /**
+   * Opaque parsing context.
+   */
+  void *opaque_post_parsing_context;
+
+  /**
+   * Request handler responsible for this request.
+   */
+  const struct TEKT_RequestHandler *rh;
+
+  /**
+   * Request URL (for logging).
+   */
+  const char *url;
+
+  /**
+   * Connection we are processing.
+   */
+  struct MHD_Connection *connection;
+
+  /**
+   * HTTP response to return (or NULL).
+   */
+  struct MHD_Response *response;
+
+  /**
+   * @e rh-specific cleanup routine. Function called
+   * upon completion of the request that should
+   * clean up @a rh_ctx. Can be NULL.
+   */
+  void
+  (*rh_cleaner)(struct TEKT_RequestContext *rc);
+
+  /**
+   * @e rh-specific context. Place where the request
+   * handler can associate state with this request.
+   * Can be NULL.
+   */
+  void *rh_ctx;
+
+  /**
+   * Uploaded JSON body, if any.
+   */
+  json_t *root;
+
+  /**
+   * HTTP status to return upon resume if @e response
+   * is non-NULL.
+   */
+  unsigned int http_status;
+
+};
+
+
+/**
+ * @brief Struct describing an URL and the handler for it.
+ */
+struct TEKT_RequestHandler
+{
+
+  /**
+   * URL the handler is for (first part only).
+   */
+  const char *url;
+
+  /**
+   * Method the handler is for.
+   */
+  const char *method;
+
+  /**
+   * Callbacks for handling of the request. Which one is used
+   * depends on @e method.
+   */
+  union
+  {
+    /**
+     * Function to call to handle a GET requests (and those
+     * with @e method NULL).
+     *
+     * @param rc context for the request
+     * @param mime_type the @e mime_type for the reply (hint, can be NULL)
+     * @param args array of arguments, needs to be of length @e args_expected
+     * @return MHD result code
+     */
+    MHD_RESULT
+    (*get)(struct TEKT_RequestContext *rc,
+           const char *const args[]);
+
+
+    /**
+     * Function to call to handle a POST request.
+     *
+     * @param rc context for the request
+     * @param json uploaded JSON data
+     * @param args array of arguments, needs to be of length @e args_expected
+     * @return MHD result code
+     */
+    MHD_RESULT
+    (*post)(struct TEKT_RequestContext *rc,
+            const json_t *root,
+            const char *const args[]);
+
+  } handler;
+
+  /**
+   * Number of arguments this handler expects in the @a args array.
+   */
+  unsigned int nargs;
+
+  /**
+   * Is the number of arguments given in @e nargs only an upper bound,
+   * and calling with fewer arguments could be OK?
+   */
+  bool nargs_is_upper_bound;
+
+  /**
+   * Mime type to use in reply (hint, can be NULL).
+   */
+  const char *mime_type;
+
+  /**
+   * Raw data for the @e handler, can be NULL for none provided.
+   */
+  const void *data;
+
+  /**
+   * Number of bytes in @e data, 0 for data is 0-terminated (!).
+   */
+  size_t data_size;
+
+  /**
+   * Default response code. 0 for none provided.
+   */
+  unsigned int response_code;
+};
+
+
+/**
+ * Information we track per ongoing kyc-proof request.
+ */
+struct ProofRequestState
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct ProofRequestState *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct ProofRequestState *prev;
+
+  /**
+   * Handle for operation with the plugin.
+   */
+  struct TALER_KYCLOGIC_ProofHandle *ph;
+
+  /**
+   * Logic plugin we are using.
+   */
+  struct TALER_KYCLOGIC_Plugin *logic;
+
+  /**
+   * HTTP request details.
+   */
+  struct TEKT_RequestContext *rc;
+
+};
+
+/**
+ * Head of DLL.
+ */
+static struct ProofRequestState *rs_head;
+
+/**
+ * Tail of DLL.
+ */
+static struct ProofRequestState *rs_tail;
+
+/**
+ * The exchange's configuration (global)
+ */
+static const struct GNUNET_CONFIGURATION_Handle *TEKT_cfg;
+
+/**
+ * Handle to the HTTP server.
+ */
+static struct MHD_Daemon *mhd;
+
+/**
+ * Our base URL.
+ */
+static char *TEKT_base_url;
+
+/**
+ * Payto set via command-line (or otherwise random).
+ */
+static struct TALER_PaytoHashP cmd_line_h_payto;
+
+/**
+ * Provider user ID to use.
+ */
+static char *cmd_provider_user_id;
+
+/**
+ * Provider legitimization ID to use.
+ */
+static char *cmd_provider_legitimization_id;
+
+/**
+ * Name of the configuration section with the
+ * configuration data of the selected provider.
+ */
+static const char *provider_section_name;
+
+/**
+ * Row ID to use, override with '-r'
+ */
+static unsigned int kyc_row_id = 42;
+
+/**
+ * -P command-line option.
+ */
+static int print_h_payto;
+
+/**
+ * -w command-line option.
+ */
+static int run_webservice;
+
+/**
+ * Value to return from main()
+ */
+static int global_ret;
+
+/**
+ * -r command-line flag.
+ */
+static char *requirements;
+
+/**
+ * -i command-line flag.
+ */
+static char *ut_s = "individual";
+
+/**
+ * Handle for ongoing initiation operation.
+ */
+static struct TALER_KYCLOGIC_InitiateHandle *ih;
+
+/**
+ * KYC logic running for @e ih.
+ */
+static struct TALER_KYCLOGIC_Plugin *ih_logic;
+
+/**
+ * Port to run the daemon on.
+ */
+static uint16_t serve_port;
+
+/**
+ * Context for all CURL operations (useful to the event loop)
+ */
+static struct GNUNET_CURL_Context *TEKT_curl_ctx;
+
+/**
+ * Context for integrating #TEKT_curl_ctx with the
+ * GNUnet event loop.
+ */
+static struct GNUNET_CURL_RescheduleContext *exchange_curl_rc;
+
+
+/**
+ * Context for the webhook.
+ */
+struct KycWebhookContext
+{
+
+  /**
+   * Kept in a DLL while suspended.
+   */
+  struct KycWebhookContext *next;
+
+  /**
+   * Kept in a DLL while suspended.
+   */
+  struct KycWebhookContext *prev;
+
+  /**
+   * Details about the connection we are processing.
+   */
+  struct TEKT_RequestContext *rc;
+
+  /**
+   * Plugin responsible for the webhook.
+   */
+  struct TALER_KYCLOGIC_Plugin *plugin;
+
+  /**
+   * Configuration for the specific action.
+   */
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+
+  /**
+   * Webhook activity.
+   */
+  struct TALER_KYCLOGIC_WebhookHandle *wh;
+
+  /**
+   * HTTP response to return.
+   */
+  struct MHD_Response *response;
+
+  /**
+   * Name of the configuration
+   * section defining the KYC logic.
+   */
+  const char *section_name;
+
+  /**
+   * HTTP response code to return.
+   */
+  unsigned int response_code;
+
+  /**
+   * #GNUNET_YES if we are suspended,
+   * #GNUNET_NO if not.
+   * #GNUNET_SYSERR if we had some error.
+   */
+  enum GNUNET_GenericReturnValue suspended;
+
+};
+
+
+/**
+ * Contexts are kept in a DLL while suspended.
+ */
+static struct KycWebhookContext *kwh_head;
+
+/**
+ * Contexts are kept in a DLL while suspended.
+ */
+static struct KycWebhookContext *kwh_tail;
+
+
+/**
+ * Resume processing the @a kwh request.
+ *
+ * @param kwh request to resume
+ */
+static void
+kwh_resume (struct KycWebhookContext *kwh)
+{
+  GNUNET_assert (GNUNET_YES == kwh->suspended);
+  kwh->suspended = GNUNET_NO;
+  GNUNET_CONTAINER_DLL_remove (kwh_head,
+                               kwh_tail,
+                               kwh);
+  MHD_resume_connection (kwh->rc->connection);
+}
+
+
+static void
+kyc_webhook_cleanup (void)
+{
+  struct KycWebhookContext *kwh;
+
+  while (NULL != (kwh = kwh_head))
+  {
+    if (NULL != kwh->wh)
+    {
+      kwh->plugin->webhook_cancel (kwh->wh);
+      kwh->wh = NULL;
+    }
+    kwh_resume (kwh);
+  }
+}
+
+
+/**
+ * Function called with the result of a webhook
+ * operation.
+ *
+ * Note that the "decref" for the @a response
+ * will be done by the plugin.
+ *
+ * @param cls closure
+ * @param process_row legitimization process request the webhook was about
+ * @param account_id account the webhook was about
+ * @param provider_section configuration section of the logic
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param status KYC status
+ * @param expiration until when is the KYC check valid
+ * @param attributes user attributes returned by the provider
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ */
+static void
+webhook_finished_cb (
+  void *cls,
+  uint64_t process_row,
+  const struct TALER_PaytoHashP *account_id,
+  const char *provider_section,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  enum TALER_KYCLOGIC_KycStatus status,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response)
+{
+  struct KycWebhookContext *kwh = cls;
+
+  (void) expiration;
+  (void) provider_section;
+  kwh->wh = NULL;
+  if ( (NULL != account_id) &&
+       (0 != GNUNET_memcmp (account_id,
+                            &cmd_line_h_payto)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received webhook for unexpected account\n");
+  }
+  if ( (NULL != provider_user_id) &&
+       (NULL != cmd_provider_user_id) &&
+       (0 != strcmp (provider_user_id,
+                     cmd_provider_user_id)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received webhook for unexpected provider user ID (%s)\n",
+                provider_user_id);
+  }
+  if ( (NULL != provider_legitimization_id) &&
+       (NULL != cmd_provider_legitimization_id) &&
+       (0 != strcmp (provider_legitimization_id,
+                     cmd_provider_legitimization_id)) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Received webhook for unexpected provider legitimization ID (%s)\n",
+                provider_legitimization_id);
+  }
+  switch (status)
+  {
+  case TALER_KYCLOGIC_STATUS_SUCCESS:
+    /* _successfully_ resumed case */
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "KYC successful for user `%s' (legi: %s)\n",
+                provider_user_id,
+                provider_legitimization_id);
+    GNUNET_break (NULL != attributes);
+    fprintf (stderr,
+             "Extracted attributes:\n");
+    json_dumpf (attributes,
+                stderr,
+                JSON_INDENT (2));
+    break;
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "KYC status of %s/%s (process #%llu) is %d\n",
+                provider_user_id,
+                provider_legitimization_id,
+                (unsigned long long) process_row,
+                status);
+    break;
+  }
+  kwh->response = response;
+  kwh->response_code = http_status;
+  kwh_resume (kwh);
+  TALER_MHD_daemon_trigger ();
+}
+
+
+/**
+ * Function called to clean up a context.
+ *
+ * @param rc request context
+ */
+static void
+clean_kwh (struct TEKT_RequestContext *rc)
+{
+  struct KycWebhookContext *kwh = rc->rh_ctx;
+
+  if (NULL != kwh->wh)
+  {
+    kwh->plugin->webhook_cancel (kwh->wh);
+    kwh->wh = NULL;
+  }
+  if (NULL != kwh->response)
+  {
+    MHD_destroy_response (kwh->response);
+    kwh->response = NULL;
+  }
+  GNUNET_free (kwh);
+}
+
+
+/**
+ * Function the plugin can use to lookup an
+ * @a h_payto by @a provider_legitimization_id.
+ *
+ * @param cls closure, NULL
+ * @param provider_section
+ * @param provider_legitimization_id legi to look up
+ * @param[out] h_payto where to write the result
+ * @param[out] legi_row where to write the row ID for the legitimization ID
+ * @return database transaction status
+ */
+static enum GNUNET_DB_QueryStatus
+kyc_provider_account_lookup (
+  void *cls,
+  const char *provider_section,
+  const char *provider_legitimization_id,
+  struct TALER_PaytoHashP *h_payto,
+  uint64_t *legi_row)
+{
+  (void) cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Simulated account lookup using `%s/%s'\n",
+              provider_section,
+              provider_legitimization_id);
+  *h_payto = cmd_line_h_payto;
+  *legi_row = kyc_row_id;
+  return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
+}
+
+
+/**
+ * Handle a (GET or POST) "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param method HTTP request method used by the client
+ * @param root uploaded JSON body (can be NULL)
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+static MHD_RESULT
+handler_kyc_webhook_generic (
+  struct TEKT_RequestContext *rc,
+  const char *method,
+  const json_t *root,
+  const char *const args[])
+{
+  struct KycWebhookContext *kwh = rc->rh_ctx;
+
+  if (NULL == kwh)
+  { /* first time */
+    kwh = GNUNET_new (struct KycWebhookContext);
+    kwh->rc = rc;
+    rc->rh_ctx = kwh;
+    rc->rh_cleaner = &clean_kwh;
+
+    if ( (NULL == args[0]) ||
+         (GNUNET_OK !=
+          TALER_KYCLOGIC_lookup_logic (args[0],
+                                       &kwh->plugin,
+                                       &kwh->pd,
+                                       &kwh->section_name)) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "KYC logic `%s' unknown (check KYC provider configuration)\n",
+                  args[0]);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
+                                         args[0]);
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Calling KYC provider specific webhook\n");
+    kwh->wh = kwh->plugin->webhook (kwh->plugin->cls,
+                                    kwh->pd,
+                                    &kyc_provider_account_lookup,
+                                    NULL,
+                                    method,
+                                    &args[1],
+                                    rc->connection,
+                                    root,
+                                    &webhook_finished_cb,
+                                    kwh);
+    if (NULL == kwh->wh)
+    {
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                         TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                                         "failed to run webhook logic");
+    }
+    kwh->suspended = GNUNET_YES;
+    GNUNET_CONTAINER_DLL_insert (kwh_head,
+                                 kwh_tail,
+                                 kwh);
+    MHD_suspend_connection (rc->connection);
+    return MHD_YES;
+  }
+
+  if (NULL != kwh->response)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Returning queued reply for KWH\n");
+    /* handle _failed_ resumed cases */
+    return MHD_queue_response (rc->connection,
+                               kwh->response_code,
+                               kwh->response);
+  }
+
+  /* We resumed, but got no response? This should
+     not happen. */
+  GNUNET_assert (0);
+  return TALER_MHD_reply_with_error (rc->connection,
+                                     MHD_HTTP_INTERNAL_SERVER_ERROR,
+                                     TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+                                     "resumed without response");
+}
+
+
+/**
+ * Handle a GET "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+static MHD_RESULT
+handler_kyc_webhook_get (
+  struct TEKT_RequestContext *rc,
+  const char *const args[])
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Webhook GET triggered\n");
+  return handler_kyc_webhook_generic (rc,
+                                      MHD_HTTP_METHOD_GET,
+                                      NULL,
+                                      args);
+}
+
+
+/**
+ * Handle a POST "/kyc-webhook" request.
+ *
+ * @param rc request to handle
+ * @param root uploaded JSON body (can be NULL)
+ * @param args one argument with the legitimization_uuid
+ * @return MHD result code
+ */
+static MHD_RESULT
+handler_kyc_webhook_post (
+  struct TEKT_RequestContext *rc,
+  const json_t *root,
+  const char *const args[])
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Webhook POST triggered\n");
+  return handler_kyc_webhook_generic (rc,
+                                      MHD_HTTP_METHOD_POST,
+                                      root,
+                                      args);
+}
+
+
+/**
+ * Function called with the result of a proof check operation.
+ *
+ * Note that the "decref" for the @a response
+ * will be done by the callee and MUST NOT be done by the plugin.
+ *
+ * @param cls closure with the `struct ProofRequestState`
+ * @param status KYC status
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param expiration until when is the KYC check valid
+ * @param attributes attributes about the user
+ * @param http_status HTTP status code of @a response
+ * @param[in] response to return to the HTTP client
+ */
+static void
+proof_cb (
+  void *cls,
+  enum TALER_KYCLOGIC_KycStatus status,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  struct GNUNET_TIME_Absolute expiration,
+  const json_t *attributes,
+  unsigned int http_status,
+  struct MHD_Response *response)
+{
+  struct ProofRequestState *rs = cls;
+
+  (void) expiration;
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "KYC legitimization %s completed with status %d (%u) for %s\n",
+              provider_legitimization_id,
+              status,
+              http_status,
+              provider_user_id);
+  if (TALER_KYCLOGIC_STATUS_SUCCESS == status)
+  {
+    GNUNET_break (NULL != attributes);
+    fprintf (stderr,
+             "Extracted attributes:\n");
+    json_dumpf (attributes,
+                stderr,
+                JSON_INDENT (2));
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Returning response %p with status %u\n",
+              response,
+              http_status);
+  rs->rc->response = response;
+  rs->rc->http_status = http_status;
+  GNUNET_CONTAINER_DLL_remove (rs_head,
+                               rs_tail,
+                               rs);
+  MHD_resume_connection (rs->rc->connection);
+  TALER_MHD_daemon_trigger ();
+  GNUNET_free (rs);
+}
+
+
+/**
+ * Function called when we receive a 'GET' to the
+ * '/kyc-proof' endpoint.
+ *
+ * @param rc request context
+ * @param args remaining URL arguments;
+ *        args[0] should be the logic plugin name
+ */
+static MHD_RESULT
+handler_kyc_proof_get (
+  struct TEKT_RequestContext *rc,
+  const char *const args[1])
+{
+  struct TALER_PaytoHashP h_payto;
+  struct TALER_KYCLOGIC_ProviderDetails *pd;
+  struct TALER_KYCLOGIC_Plugin *logic;
+  struct ProofRequestState *rs;
+  const char *section_name;
+  const char *h_paytos;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "GET /kyc-proof triggered\n");
+  if (NULL == args[0])
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                       "'/kyc-proof/$PROVIDER_SECTION?state=$H_PAYTO' required");
+  }
+  h_paytos = MHD_lookup_connection_value (rc->connection,
+                                          MHD_GET_ARGUMENT_KIND,
+                                          "state");
+  if (NULL == h_paytos)
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MISSING,
+                                       "h_payto");
+  }
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_string_to_data (h_paytos,
+                                     strlen (h_paytos),
+                                     &h_payto,
+                                     sizeof (h_payto)))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       "h_payto");
+  }
+  if (0 !=
+      GNUNET_memcmp (&h_payto,
+                     &cmd_line_h_payto))
+  {
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_KYC_PROOF_REQUEST_UNKNOWN,
+                                       "h_payto");
+  }
+
+  if (GNUNET_OK !=
+      TALER_KYCLOGIC_lookup_logic (args[0],
+                                   &logic,
+                                   &pd,
+                                   &section_name))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not initiate KYC with provider `%s' (configuration error?)\n",
+                args[0]);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_EXCHANGE_KYC_GENERIC_LOGIC_UNKNOWN,
+                                       args[0]);
+  }
+  rs = GNUNET_new (struct ProofRequestState);
+  rs->rc = rc;
+  rs->logic = logic;
+  MHD_suspend_connection (rc->connection);
+  GNUNET_CONTAINER_DLL_insert (rs_head,
+                               rs_tail,
+                               rs);
+  rs->ph = logic->proof (logic->cls,
+                         pd,
+                         rc->connection,
+                         &h_payto,
+                         kyc_row_id,
+                         cmd_provider_user_id,
+                         cmd_provider_legitimization_id,
+                         &proof_cb,
+                         rs);
+  GNUNET_assert (NULL != rs->ph);
+  return MHD_YES;
+}
+
+
+/**
+ * Function called whenever MHD is done with a request.  If the
+ * request was a POST, we may have stored a `struct Buffer *` in the
+ * @a con_cls that might still need to be cleaned up.  Call the
+ * respective function to free the memory.
+ *
+ * @param cls client-defined closure
+ * @param connection connection handle
+ * @param con_cls value as set by the last call to
+ *        the #MHD_AccessHandlerCallback
+ * @param toe reason for request termination
+ * @see #MHD_OPTION_NOTIFY_COMPLETED
+ * @ingroup request
+ */
+static void
+handle_mhd_completion_callback (void *cls,
+                                struct MHD_Connection *connection,
+                                void **con_cls,
+                                enum MHD_RequestTerminationCode toe)
+{
+  struct TEKT_RequestContext *rc = *con_cls;
+
+  (void) cls;
+  if (NULL == rc)
+    return;
+  if (NULL != rc->rh_cleaner)
+    rc->rh_cleaner (rc);
+  {
+#if MHD_VERSION >= 0x00097304
+    const union MHD_ConnectionInfo *ci;
+    unsigned int http_status = 0;
+
+    ci = MHD_get_connection_info (connection,
+                                  MHD_CONNECTION_INFO_HTTP_STATUS);
+    if (NULL != ci)
+      http_status = ci->http_status;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Request for `%s' completed with HTTP status %u (%d)\n",
+                rc->url,
+                http_status,
+                toe);
+#else
+    (void) connection;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Request for `%s' completed (%d)\n",
+                rc->url,
+                toe);
+#endif
+  }
+
+  TALER_MHD_parse_post_cleanup_callback (rc->opaque_post_parsing_context);
+  /* Sanity-check that we didn't leave any transactions hanging */
+  if (NULL != rc->root)
+    json_decref (rc->root);
+  GNUNET_free (rc);
+  *con_cls = NULL;
+}
+
+
+/**
+ * We found a request handler responsible for handling a request. Parse the
+ * @a upload_data (if applicable) and the @a url and call the
+ * handler.
+ *
+ * @param rc request context
+ * @param url rest of the URL to parse
+ * @param upload_data upload data to parse (if available)
+ * @param[in,out] upload_data_size number of bytes in @a upload_data
+ * @return MHD result code
+ */
+static MHD_RESULT
+proceed_with_handler (struct TEKT_RequestContext *rc,
+                      const char *url,
+                      const char *upload_data,
+                      size_t *upload_data_size)
+{
+  const struct TEKT_RequestHandler *rh = rc->rh;
+  const char *args[rh->nargs + 2];
+  size_t ulen = strlen (url) + 1;
+  MHD_RESULT ret;
+
+  /* We do check for "ulen" here, because we'll later stack-allocate a buffer
+     of that size and don't want to enable malicious clients to cause us
+     huge stack allocations. */
+  if (ulen > 512)
+  {
+    /* 512 is simply "big enough", as it is bigger than "6 * 54",
+       which is the longest URL format we ever get (for
+       /deposits/).  The value should be adjusted if we ever define protocol
+       endpoints with plausibly longer inputs.  */
+    GNUNET_break_op (0);
+    return TALER_MHD_reply_with_error (rc->connection,
+                                       MHD_HTTP_URI_TOO_LONG,
+                                       TALER_EC_GENERIC_URI_TOO_LONG,
+                                       url);
+  }
+
+  /* All POST endpoints come with a body in JSON format. So we parse
+     the JSON here. */
+  if ( (NULL == rc->root) &&
+       (0 == strcasecmp (rh->method,
+                         MHD_HTTP_METHOD_POST)) )
+  {
+    enum GNUNET_GenericReturnValue res;
+
+    res = TALER_MHD_parse_post_json (rc->connection,
+                                     &rc->opaque_post_parsing_context,
+                                     upload_data,
+                                     upload_data_size,
+                                     &rc->root);
+    if (GNUNET_SYSERR == res)
+    {
+      GNUNET_assert (NULL == rc->root);
+      GNUNET_break (0);
+      return MHD_NO; /* bad upload, could not even generate error */
+    }
+    if ( (GNUNET_NO == res) ||
+         (NULL == rc->root) )
+    {
+      GNUNET_assert (NULL == rc->root);
+      return MHD_YES; /* so far incomplete upload or parser error */
+    }
+  }
+
+  {
+    char d[ulen];
+    unsigned int i;
+    char *sp;
+
+    /* Parse command-line arguments */
+    /* make a copy of 'url' because 'strtok_r()' will modify */
+    GNUNET_memcpy (d,
+                   url,
+                   ulen);
+    i = 0;
+    args[i++] = strtok_r (d, "/", &sp);
+    while ( (NULL != args[i - 1]) &&
+            (i <= rh->nargs + 1) )
+      args[i++] = strtok_r (NULL, "/", &sp);
+    /* make sure above loop ran nicely until completion, and also
+       that there is no excess data in 'd' afterwards */
+    if ( ( (rh->nargs_is_upper_bound) &&
+           (i - 1 > rh->nargs) ) ||
+         ( (! rh->nargs_is_upper_bound) &&
+           (i - 1 != rh->nargs) ) )
+    {
+      char emsg[128 + 512];
+
+      GNUNET_snprintf (emsg,
+                       sizeof (emsg),
+                       "Got %u+/%u segments for `%s' request (`%s')",
+                       i - 1,
+                       rh->nargs,
+                       rh->url,
+                       url);
+      GNUNET_break_op (0);
+      return TALER_MHD_reply_with_error (rc->connection,
+                                         MHD_HTTP_NOT_FOUND,
+                                         TALER_EC_EXCHANGE_GENERIC_WRONG_NUMBER_OF_SEGMENTS,
+                                         emsg);
+    }
+    GNUNET_assert (NULL == args[i - 1]);
+
+    /* Above logic ensures that 'root' is exactly non-NULL for POST operations,
+       so we test for 'root' to decide which handler to invoke. */
+    if (NULL != rc->root)
+      ret = rh->handler.post (rc,
+                              rc->root,
+                              args);
+    else /* We also only have "POST" or "GET" in the API for at this point
+      (OPTIONS/HEAD are taken care of earlier) */
+      ret = rh->handler.get (rc,
+                             args);
+  }
+  return ret;
+}
+
+
+static void
+rh_cleaner_cb (struct TEKT_RequestContext *rc)
+{
+  if (NULL != rc->response)
+  {
+    MHD_destroy_response (rc->response);
+    rc->response = NULL;
+  }
+  if (NULL != rc->root)
+  {
+    json_decref (rc->root);
+    rc->root = NULL;
+  }
+}
+
+
+/**
+ * Handle incoming HTTP request.
+ *
+ * @param cls closure for MHD daemon (unused)
+ * @param connection the connection
+ * @param url the requested url
+ * @param method the method (POST, GET, ...)
+ * @param version HTTP version (ignored)
+ * @param upload_data request data
+ * @param upload_data_size size of @a upload_data in bytes
+ * @param con_cls closure for request (a `struct TEKT_RequestContext *`)
+ * @return MHD result code
+ */
+static MHD_RESULT
+handle_mhd_request (void *cls,
+                    struct MHD_Connection *connection,
+                    const char *url,
+                    const char *method,
+                    const char *version,
+                    const char *upload_data,
+                    size_t *upload_data_size,
+                    void **con_cls)
+{
+  static struct TEKT_RequestHandler handlers[] = {
+    /* simulated KYC endpoints */
+    {
+      .url = "kyc-proof",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &handler_kyc_proof_get,
+      .nargs = 1
+    },
+    {
+      .url = "kyc-webhook",
+      .method = MHD_HTTP_METHOD_POST,
+      .handler.post = &handler_kyc_webhook_post,
+      .nargs = 128,
+      .nargs_is_upper_bound = true
+    },
+    {
+      .url = "kyc-webhook",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler.get = &handler_kyc_webhook_get,
+      .nargs = 128,
+      .nargs_is_upper_bound = true
+    },
+    /* mark end of list */
+    {
+      .url = NULL
+    }
+  };
+  struct TEKT_RequestContext *rc = *con_cls;
+
+  (void) cls;
+  (void) version;
+  if (NULL == rc)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Handling new request\n");
+    /* We're in a new async scope! */
+    rc = *con_cls = GNUNET_new (struct TEKT_RequestContext);
+    rc->url = url;
+    rc->connection = connection;
+    rc->rh_cleaner = &rh_cleaner_cb;
+  }
+  if (NULL != rc->response)
+  {
+    return MHD_queue_response (rc->connection,
+                               rc->http_status,
+                               rc->response);
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Handling request (%s) for URL '%s'\n",
+              method,
+              url);
+  /* on repeated requests, check our cache first */
+  if (NULL != rc->rh)
+  {
+    const char *start;
+
+    if ('\0' == url[0])
+      /* strange, should start with '/', treat as just "/" */
+      url = "/";
+    start = strchr (url + 1, '/');
+    if (NULL == start)
+      start = "";
+    return proceed_with_handler (rc,
+                                 start,
+                                 upload_data,
+                                 upload_data_size);
+  }
+  if (0 == strcasecmp (method,
+                       MHD_HTTP_METHOD_HEAD))
+    method = MHD_HTTP_METHOD_GET; /* treat HEAD as GET here, MHD will do the rest */
+
+  /* parse first part of URL */
+  {
+    bool found = false;
+    size_t tok_size;
+    const char *tok;
+    const char *rest;
+
+    if ('\0' == url[0])
+      /* strange, should start with '/', treat as just "/" */
+      url = "/";
+    tok = url + 1;
+    rest = strchr (tok, '/');
+    if (NULL == rest)
+    {
+      tok_size = strlen (tok);
+    }
+    else
+    {
+      tok_size = rest - tok;
+      rest++; /* skip over '/' */
+    }
+    for (unsigned int i = 0; NULL != handlers[i].url; i++)
+    {
+      struct TEKT_RequestHandler *rh = &handlers[i];
+
+      if ( (0 != strncmp (tok,
+                          rh->url,
+                          tok_size)) ||
+           (tok_size != strlen (rh->url) ) )
+        continue;
+      found = true;
+      /* The URL is a match!  What we now do depends on the method. */
+      if (0 == strcasecmp (method,
+                           MHD_HTTP_METHOD_OPTIONS))
+      {
+        return TALER_MHD_reply_cors_preflight (connection);
+      }
+      GNUNET_assert (NULL != rh->method);
+      if (0 != strcasecmp (method,
+                           rh->method))
+      {
+        found = true;
+        continue;
+      }
+      /* cache to avoid the loop next time */
+      rc->rh = rh;
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Handler found for %s '%s'\n",
+                  method,
+                  url);
+      return MHD_YES;
+    }
+
+    if (found)
+    {
+      /* we found a matching address, but the method is wrong */
+      struct MHD_Response *reply;
+      MHD_RESULT ret;
+      char *allowed = NULL;
+
+      GNUNET_break_op (0);
+      for (unsigned int i = 0; NULL != handlers[i].url; i++)
+      {
+        struct TEKT_RequestHandler *rh = &handlers[i];
+
+        if ( (0 != strncmp (tok,
+                            rh->url,
+                            tok_size)) ||
+             (tok_size != strlen (rh->url) ) )
+          continue;
+        if (NULL == allowed)
+        {
+          allowed = GNUNET_strdup (rh->method);
+        }
+        else
+        {
+          char *tmp;
+
+          GNUNET_asprintf (&tmp,
+                           "%s, %s",
+                           allowed,
+                           rh->method);
+          GNUNET_free (allowed);
+          allowed = tmp;
+        }
+        if (0 == strcasecmp (rh->method,
+                             MHD_HTTP_METHOD_GET))
+        {
+          char *tmp;
+
+          GNUNET_asprintf (&tmp,
+                           "%s, %s",
+                           allowed,
+                           MHD_HTTP_METHOD_HEAD);
+          GNUNET_free (allowed);
+          allowed = tmp;
+        }
+      }
+      reply = TALER_MHD_make_error (TALER_EC_GENERIC_METHOD_INVALID,
+                                    method);
+      GNUNET_break (MHD_YES ==
+                    MHD_add_response_header (reply,
+                                             MHD_HTTP_HEADER_ALLOW,
+                                             allowed));
+      GNUNET_free (allowed);
+      ret = MHD_queue_response (connection,
+                                MHD_HTTP_METHOD_NOT_ALLOWED,
+                                reply);
+      MHD_destroy_response (reply);
+      return ret;
+    }
+  }
+
+  /* No handler matches, generate not found */
+  return TALER_MHD_reply_with_error (connection,
+                                     MHD_HTTP_NOT_FOUND,
+                                     TALER_EC_GENERIC_ENDPOINT_UNKNOWN,
+                                     url);
+}
+
+
+/**
+ * Load configuration parameters for the exchange
+ * server into the corresponding global variables.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+exchange_serve_process_config (void)
+{
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (TEKT_cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &TEKT_base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    return GNUNET_SYSERR;
+  }
+  if (! TALER_url_valid_charset (TEKT_base_url))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL",
+                               "invalid URL");
+    return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function run on shutdown.
+ *
+ * @param cls NULL
+ */
+static void
+do_shutdown (void *cls)
+{
+  struct MHD_Daemon *mhd;
+  struct ProofRequestState *rs;
+
+  (void) cls;
+  while (NULL != (rs = rs_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (rs_head,
+                                 rs_tail,
+                                 rs);
+    rs->logic->proof_cancel (rs->ph);
+    MHD_resume_connection (rs->rc->connection);
+    GNUNET_free (rs);
+  }
+  if (NULL != ih)
+  {
+    ih_logic->initiate_cancel (ih);
+    ih = NULL;
+  }
+  kyc_webhook_cleanup ();
+  TALER_KYCLOGIC_kyc_done ();
+  mhd = TALER_MHD_daemon_stop ();
+  if (NULL != mhd)
+    MHD_stop_daemon (mhd);
+  if (NULL != TEKT_curl_ctx)
+  {
+    GNUNET_CURL_fini (TEKT_curl_ctx);
+    TEKT_curl_ctx = NULL;
+  }
+  if (NULL != exchange_curl_rc)
+  {
+    GNUNET_CURL_gnunet_rc_destroy (exchange_curl_rc);
+    exchange_curl_rc = NULL;
+  }
+  TALER_TEMPLATING_done ();
+}
+
+
+/**
+ * Function called with the result of a KYC initiation
+ * operation.
+ *
+ * @param cls closure
+ * @param ec #TALER_EC_NONE on success
+ * @param redirect_url set to where to redirect the user on success, NULL on failure
+ * @param provider_user_id set to user ID at the provider, or NULL if not supported or unknown
+ * @param provider_legitimization_id set to legitimization process ID at the provider, or NULL if not supported or unknown
+ * @param error_msg_hint set to additional details to return to user, NULL on success
+ */
+static void
+initiate_cb (
+  void *cls,
+  enum TALER_ErrorCode ec,
+  const char *redirect_url,
+  const char *provider_user_id,
+  const char *provider_legitimization_id,
+  const char *error_msg_hint)
+{
+  (void) cls;
+  ih = NULL;
+  if (TALER_EC_NONE != ec)
+  {
+    fprintf (stderr,
+             "Failed to start KYC process: %s (#%d)\n",
+             error_msg_hint,
+             ec);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  {
+    char *s;
+
+    s = GNUNET_STRINGS_data_to_string_alloc (&cmd_line_h_payto,
+                                             sizeof (cmd_line_h_payto));
+    if (NULL != provider_user_id)
+    {
+      fprintf (stdout,
+               "Visit `%s' to begin KYC process.\nAlso use: taler-exchange-kyc-tester -w -u '%s' -U '%s' -p %s\n",
+               redirect_url,
+               provider_user_id,
+               provider_legitimization_id,
+               s);
+    }
+    else
+    {
+      fprintf (stdout,
+               "Visit `%s' to begin KYC process.\nAlso use: taler-exchange-kyc-tester -w -U '%s' -p %s\n",
+               redirect_url,
+               provider_legitimization_id,
+               s);
+    }
+    GNUNET_free (s);
+  }
+  GNUNET_free (cmd_provider_user_id);
+  GNUNET_free (cmd_provider_legitimization_id);
+  if (NULL != provider_user_id)
+    cmd_provider_user_id = GNUNET_strdup (provider_user_id);
+  if (NULL != provider_legitimization_id)
+    cmd_provider_legitimization_id = GNUNET_strdup (provider_legitimization_id);
+  if (! run_webservice)
+    GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be
+ *        NULL!)
+ * @param config configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *config)
+{
+  int fh;
+
+  (void) cls;
+  (void) args;
+  (void ) cfgfile;
+  if (GNUNET_OK !=
+      TALER_TEMPLATING_init ("exchange"))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not load templates. Installation broken.\n");
+    return;
+  }
+  if (print_h_payto)
+  {
+    char *s;
+
+    s = GNUNET_STRINGS_data_to_string_alloc (&cmd_line_h_payto,
+                                             sizeof (cmd_line_h_payto));
+    fprintf (stdout,
+             "%s\n",
+             s);
+    GNUNET_free (s);
+  }
+  TALER_MHD_setup (TALER_MHD_GO_NONE);
+  TEKT_cfg = config;
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+  if (GNUNET_OK !=
+      TALER_KYCLOGIC_kyc_init (config))
+  {
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_OK !=
+      exchange_serve_process_config ())
+  {
+    global_ret = EXIT_NOTCONFIGURED;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  global_ret = EXIT_SUCCESS;
+  if (NULL != requirements)
+  {
+    struct TALER_KYCLOGIC_ProviderDetails *pd;
+    enum TALER_KYCLOGIC_KycUserType ut;
+
+    if (GNUNET_OK !=
+        TALER_KYCLOGIC_kyc_user_type_from_string (ut_s,
+                                                  &ut))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Invalid user type specified ('-i')\n");
+      global_ret = EXIT_INVALIDARGUMENT;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_KYCLOGIC_requirements_to_logic (requirements,
+                                              ut,
+                                              &ih_logic,
+                                              &pd,
+                                              &provider_section_name))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not initiate KYC for requirements `%s' (configuration error?)\n",
+                  requirements);
+      global_ret = EXIT_NOTCONFIGURED;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    ih = ih_logic->initiate (ih_logic->cls,
+                             pd,
+                             &cmd_line_h_payto,
+                             kyc_row_id,
+                             &initiate_cb,
+                             NULL);
+    GNUNET_break (NULL != ih);
+  }
+  if (run_webservice)
+  {
+    TEKT_curl_ctx
+      = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                          &exchange_curl_rc);
+    if (NULL == TEKT_curl_ctx)
+    {
+      GNUNET_break (0);
+      global_ret = EXIT_FAILURE;
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    exchange_curl_rc = GNUNET_CURL_gnunet_rc_create (TEKT_curl_ctx);
+    fh = TALER_MHD_bind (TEKT_cfg,
+                         "exchange",
+                         &serve_port);
+    if ( (0 == serve_port) &&
+         (-1 == fh) )
+    {
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Starting daemon on port %u\n",
+                (unsigned int) serve_port);
+    mhd = MHD_start_daemon (MHD_USE_SUSPEND_RESUME
+                            | MHD_USE_PIPE_FOR_SHUTDOWN
+                            | MHD_USE_DEBUG | MHD_USE_DUAL_STACK
+                            | MHD_USE_TCP_FASTOPEN,
+                            (-1 == fh) ? serve_port : 0,
+                            NULL, NULL,
+                            &handle_mhd_request, NULL,
+                            MHD_OPTION_LISTEN_SOCKET,
+                            fh,
+                            MHD_OPTION_EXTERNAL_LOGGER,
+                            &TALER_MHD_handle_logs,
+                            NULL,
+                            MHD_OPTION_NOTIFY_COMPLETED,
+                            &handle_mhd_completion_callback,
+                            NULL,
+                            MHD_OPTION_END);
+    if (NULL == mhd)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to launch HTTP service. Is the port in use?\n");
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+    TALER_MHD_daemon_start (mhd);
+  }
+}
+
+
+/**
+ * The main function of the taler-exchange-httpd server ("the exchange").
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc,
+      char *const *argv)
+{
+  const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_help (
+      "tool to test KYC provider integrations"),
+    GNUNET_GETOPT_option_flag (
+      'P',
+      "print-payto-hash",
+      "output the hash of the payto://-URI",
+      &print_h_payto),
+    GNUNET_GETOPT_option_uint (
+      'r',
+      "rowid",
+      "NUMBER",
+      "override row ID to use in simulation (default: 42)",
+      &kyc_row_id),
+    GNUNET_GETOPT_option_flag (
+      'w',
+      "run-webservice",
+      "run the integrated HTTP service",
+      &run_webservice),
+    GNUNET_GETOPT_option_string (
+      'R',
+      "requirements",
+      "CHECKS",
+      "initiate KYC check for the given list of (space-separated) checks",
+      &requirements),
+    GNUNET_GETOPT_option_string (
+      'i',
+      "identify",
+      "USERTYPE",
+      "self-identify as USERTYPE 'business' or 'individual' (defaults to 'individual')",
+      &requirements),
+    GNUNET_GETOPT_option_string (
+      'u',
+      "user",
+      "ID",
+      "use the given provider user ID (overridden if -i is also used)",
+      &cmd_provider_user_id),
+    GNUNET_GETOPT_option_string (
+      'U',
+      "legitimization",
+      "ID",
+      "use the given provider legitimization ID (overridden if -i is also used)",
+      &cmd_provider_legitimization_id),
+    GNUNET_GETOPT_option_base32_fixed_size (
+      'p',
+      "payto-hash",
+      "HASH",
+      "base32 encoding of the hash of a payto://-URI to use for the account (otherwise a random value will be used)",
+      &cmd_line_h_payto,
+      sizeof (cmd_line_h_payto)),
+    GNUNET_GETOPT_OPTION_END
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  TALER_OS_init ();
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                              &cmd_line_h_payto,
+                              sizeof (cmd_line_h_payto));
+  ret = GNUNET_PROGRAM_run (argc, argv,
+                            "taler-exchange-kyc-tester",
+                            "tool to test KYC provider integrations",
+                            options,
+                            &run, NULL);
+  if (GNUNET_SYSERR == ret)
+    return EXIT_INVALIDARGUMENT;
+  if (GNUNET_NO == ret)
+    return EXIT_SUCCESS;
+  return global_ret;
+}
+
+
+/* end of taler-exchange-kyc-tester.c */
diff --git a/src/lib/.gitignore b/src/lib/.gitignore
new file mode 100644
index 000000000..6664876f2
--- /dev/null
+++ b/src/lib/.gitignore
@@ -0,0 +1 @@
+test_stefan
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0ed7b1480..63dab7c80 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,24 +18,34 @@ lib_LTLIBRARIES = \
   libtalerexchange.la
 
 libtalerexchange_la_LDFLAGS = \
-  -version-info 5:0:0 \
+  -version-info 7:0:0 \
   -no-undefined
 libtalerexchange_la_SOURCES = \
+  exchange_api_add_aml_decision.c \
+  exchange_api_age_withdraw.c \
+  exchange_api_age_withdraw_reveal.c \
   exchange_api_auditor_add_denomination.c \
+  exchange_api_batch_deposit.c \
+  exchange_api_batch_withdraw.c \
+  exchange_api_batch_withdraw2.c \
   exchange_api_curl_defaults.c exchange_api_curl_defaults.h \
-  exchange_api_common.c \
+  exchange_api_coins_history.c \
+  exchange_api_common.c exchange_api_common.h \
   exchange_api_contracts_get.c \
   exchange_api_csr_melt.c \
   exchange_api_csr_withdraw.c \
   exchange_api_handle.c exchange_api_handle.h \
-  exchange_api_deposit.c \
   exchange_api_deposits_get.c \
   exchange_api_kyc_check.c \
   exchange_api_kyc_proof.c \
   exchange_api_kyc_wallet.c \
   exchange_api_link.c \
+  exchange_api_lookup_aml_decision.c \
+  exchange_api_lookup_aml_decisions.c \
+  exchange_api_management_add_partner.c \
   exchange_api_management_auditor_disable.c \
   exchange_api_management_auditor_enable.c \
+  exchange_api_management_drain_profits.c \
   exchange_api_management_get_keys.c \
   exchange_api_management_post_keys.c \
   exchange_api_management_post_extensions.c \
@@ -43,11 +53,13 @@ libtalerexchange_la_SOURCES = \
   exchange_api_management_revoke_signing_key.c \
   exchange_api_management_set_global_fee.c \
   exchange_api_management_set_wire_fee.c \
+  exchange_api_management_update_aml_officer.c \
   exchange_api_management_wire_disable.c \
   exchange_api_management_wire_enable.c \
   exchange_api_melt.c \
   exchange_api_purse_create_with_deposit.c \
   exchange_api_purse_create_with_merge.c \
+  exchange_api_purse_delete.c \
   exchange_api_purse_deposit.c \
   exchange_api_purse_merge.c \
   exchange_api_purses_get.c \
@@ -56,16 +68,18 @@ libtalerexchange_la_SOURCES = \
   exchange_api_refresh_common.c exchange_api_refresh_common.h \
   exchange_api_refreshes_reveal.c \
   exchange_api_refund.c \
+  exchange_api_reserves_attest.c \
+  exchange_api_reserves_close.c \
   exchange_api_reserves_get.c \
+  exchange_api_reserves_get_attestable.c \
   exchange_api_reserves_history.c \
-  exchange_api_reserves_status.c \
-  exchange_api_transfers_get.c \
-  exchange_api_withdraw.c \
-  exchange_api_withdraw2.c \
-  exchange_api_wire.c
+  exchange_api_reserves_open.c \
+  exchange_api_stefan.c \
+  exchange_api_transfers_get.c
 libtalerexchange_la_LIBADD = \
   libtalerauditor.la \
   $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/kyclogic/libtalerkyclogic.la \
   $(top_builddir)/src/curl/libtalercurl.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
@@ -73,7 +87,8 @@ libtalerexchange_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
+  -lm \
   $(XLIB)
 
 libtalerauditor_la_LDFLAGS = \
@@ -81,9 +96,8 @@ libtalerauditor_la_LDFLAGS = \
   -no-undefined
 libtalerauditor_la_SOURCES = \
   auditor_api_curl_defaults.c auditor_api_curl_defaults.h \
-  auditor_api_handle.c auditor_api_handle.h \
-  auditor_api_deposit_confirmation.c \
-  auditor_api_exchanges.c
+  auditor_api_get_config.c \
+  auditor_api_deposit_confirmation.c
 libtalerauditor_la_LIBADD = \
   $(top_builddir)/src/curl/libtalercurl.la \
   $(top_builddir)/src/json/libtalerjson.la \
@@ -92,5 +106,21 @@ libtalerauditor_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
+  -lm \
   $(XLIB)
+
+
+check_PROGRAMS = \
+ test_stefan
+
+TESTS = \
+ $(check_PROGRAMS)
+
+
+test_stefan_SOURCES = \
+  test_stefan.c
+test_stefan_LDADD = \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetutil
diff --git a/src/lib/auditor_api_curl_defaults.c b/src/lib/auditor_api_curl_defaults.c
index 81fcd7bac..972f28ca6 100644
--- a/src/lib/auditor_api_curl_defaults.c
+++ b/src/lib/auditor_api_curl_defaults.c
@@ -19,6 +19,8 @@
  * @brief curl easy handle defaults
  * @author Florian Dold
  */
+#include "platform.h"
+#include "taler_curl_lib.h"
 #include "auditor_api_curl_defaults.h"
 
 
@@ -37,22 +39,14 @@ TALER_AUDITOR_curl_easy_get_ (const char *url)
                  curl_easy_setopt (eh,
                                    CURLOPT_URL,
                                    url));
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_FOLLOWLOCATION,
-                                   1L));
+  TALER_curl_set_secure_redirect_policy (eh,
+                                         url);
   /* Enable compression (using whatever curl likes), see
      https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html  */
   GNUNET_break (CURLE_OK ==
                 curl_easy_setopt (eh,
                                   CURLOPT_ACCEPT_ENCODING,
                                   ""));
-  /* limit MAXREDIRS to 5 as a simple security measure against
-     a potential infinite loop caused by a malicious target */
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_MAXREDIRS,
-                                   5L));
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
                                    CURLOPT_TCP_FASTOPEN,
diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c
index be981eb90..172a12ece 100644
--- a/src/lib/auditor_api_deposit_confirmation.c
+++ b/src/lib/auditor_api_deposit_confirmation.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -25,9 +25,10 @@
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_json_lib.h>
 #include <gnunet/gnunet_curl_lib.h>
+#include "taler_util.h"
+#include "taler_curl_lib.h"
 #include "taler_json_lib.h"
 #include "taler_auditor_service.h"
-#include "auditor_api_handle.h"
 #include "taler_signatures.h"
 #include "auditor_api_curl_defaults.h"
 
@@ -39,11 +40,6 @@ struct TALER_AUDITOR_DepositConfirmationHandle
 {
 
   /**
-   * The connection to auditor this request handle will use
-   */
-  struct TALER_AUDITOR_Handle *auditor;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -87,64 +83,64 @@ handle_deposit_confirmation_finished (void *cls,
 {
   const json_t *json = djson;
   struct TALER_AUDITOR_DepositConfirmationHandle *dh = cls;
-  struct TALER_AUDITOR_HttpResponse hr = {
-    .reply = json,
-    .http_status = (unsigned int) response_code
+  struct TALER_AUDITOR_DepositConfirmationResponse dcr = {
+    .hr.reply = json,
+    .hr.http_status = (unsigned int) response_code
   };
 
   dh->job = NULL;
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    dcr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
-    hr.ec = TALER_EC_NONE;
+    dcr.hr.ec = TALER_EC_NONE;
     break;
   case MHD_HTTP_BAD_REQUEST:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     /* This should never happen, either us or the auditor is buggy
        (or API version conflict); just pass JSON reply to the application */
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     /* Nothing really to verify, auditor says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
     break;
   case MHD_HTTP_GONE:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     /* Nothing really to verify, auditor says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
     break;
   default:
     /* unexpected response code */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    dcr.hr.ec = TALER_JSON_get_error_code (json);
+    dcr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for auditor deposit confirmation\n",
                 (unsigned int) response_code,
-                hr.ec);
+                dcr.hr.ec);
     break;
   }
   dh->cb (dh->cb_cls,
-          &hr);
+          &dcr);
   TALER_AUDITOR_deposit_confirmation_cancel (dh);
 }
 
@@ -153,12 +149,14 @@ handle_deposit_confirmation_finished (void *cls,
  * Verify signature information about the deposit-confirmation.
  *
  * @param h_wire hash of merchant wire details
- * @param h_extensions hash over the extensions, if any
+ * @param h_policy hash over the policy extension, if any
  * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor)
  * @param exchange_timestamp timestamp when the deposit was received by the wallet
+ * @param wire_deadline by what time must the amount be wired to the merchant
  * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline
  * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant
- * @param coin_pub coin’s public key
+ * @param num_coins number of coins involved
+ * @param coin_sigs array of @a num_coins coin signatures
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
  * @param exchange_sig the signature made with purpose #TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT
  * @param exchange_pub the public key of the exchange that matches @a exchange_sig
@@ -170,33 +168,37 @@ handle_deposit_confirmation_finished (void *cls,
  * @return #GNUNET_OK if signatures are OK, #GNUNET_SYSERR if not
  */
 static enum GNUNET_GenericReturnValue
-verify_signatures (const struct TALER_MerchantWireHashP *h_wire,
-                   const struct TALER_ExtensionContractHashP *h_extensions,
-                   const struct TALER_PrivateContractHashP *h_contract_terms,
-                   struct GNUNET_TIME_Timestamp exchange_timestamp,
-                   struct GNUNET_TIME_Timestamp wire_deadline,
-                   struct GNUNET_TIME_Timestamp refund_deadline,
-                   const struct TALER_Amount *amount_without_fee,
-                   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                   const struct TALER_MerchantPublicKeyP *merchant_pub,
-                   const struct TALER_ExchangePublicKeyP *exchange_pub,
-                   const struct TALER_ExchangeSignatureP *exchange_sig,
-                   const struct TALER_MasterPublicKeyP *master_pub,
-                   struct GNUNET_TIME_Timestamp ep_start,
-                   struct GNUNET_TIME_Timestamp ep_expire,
-                   struct GNUNET_TIME_Timestamp ep_end,
-                   const struct TALER_MasterSignatureP *master_sig)
+verify_signatures (
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
+  struct GNUNET_TIME_Timestamp exchange_timestamp,
+  struct GNUNET_TIME_Timestamp wire_deadline,
+  struct GNUNET_TIME_Timestamp refund_deadline,
+  const struct TALER_Amount *amount_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendSignatureP *coin_sigs[
+    static num_coins],
+  const struct TALER_MerchantPublicKeyP *merchant_pub,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_ExchangeSignatureP *exchange_sig,
+  const struct TALER_MasterPublicKeyP *master_pub,
+  struct GNUNET_TIME_Timestamp ep_start,
+  struct GNUNET_TIME_Timestamp ep_expire,
+  struct GNUNET_TIME_Timestamp ep_end,
+  const struct TALER_MasterSignatureP *master_sig)
 {
   if (GNUNET_OK !=
       TALER_exchange_online_deposit_confirmation_verify (
         h_contract_terms,
         h_wire,
-        h_extensions,
+        h_policy,
         exchange_timestamp,
         wire_deadline,
         refund_deadline,
         amount_without_fee,
-        coin_pub,
+        num_coins,
+        coin_sigs,
         merchant_pub,
         exchange_pub,
         exchange_sig))
@@ -236,15 +238,20 @@ verify_signatures (const struct TALER_MerchantWireHashP *h_wire,
 
 struct TALER_AUDITOR_DepositConfirmationHandle *
 TALER_AUDITOR_deposit_confirmation (
-  struct TALER_AUDITOR_Handle *auditor,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendPublicKeyP *coin_pubs[
+    static num_coins],
+  const struct TALER_CoinSpendSignatureP *coin_sigs[
+    static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_ExchangePublicKeyP *exchange_pub,
   const struct TALER_ExchangeSignatureP *exchange_sig,
@@ -257,21 +264,26 @@ TALER_AUDITOR_deposit_confirmation (
   void *cb_cls)
 {
   struct TALER_AUDITOR_DepositConfirmationHandle *dh;
-  struct GNUNET_CURL_Context *ctx;
   json_t *deposit_confirmation_obj;
   CURL *eh;
+  json_t *jcoin_sigs;
+  json_t *jcoin_pubs;
 
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_AUDITOR_handle_is_ready_ (auditor));
+  if (0 == num_coins)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
   if (GNUNET_OK !=
       verify_signatures (h_wire,
-                         h_extensions,
+                         h_policy,
                          h_contract_terms,
                          exchange_timestamp,
                          wire_deadline,
                          refund_deadline,
-                         amount_without_fee,
-                         coin_pub,
+                         total_without_fee,
+                         num_coins,
+                         coin_sigs,
                          merchant_pub,
                          exchange_pub,
                          exchange_sig,
@@ -284,25 +296,42 @@ TALER_AUDITOR_deposit_confirmation (
     GNUNET_break_op (0);
     return NULL;
   }
-
+  jcoin_sigs = json_array ();
+  GNUNET_assert (NULL != jcoin_sigs);
+  jcoin_pubs = json_array ();
+  GNUNET_assert (NULL != jcoin_pubs);
+  for (unsigned int i = 0; i<num_coins; i++)
+  {
+    GNUNET_assert (0 ==
+                   json_array_append_new (jcoin_sigs,
+                                          GNUNET_JSON_from_data_auto (
+                                            coin_sigs[i])));
+    GNUNET_assert (0 ==
+                   json_array_append_new (jcoin_pubs,
+                                          GNUNET_JSON_from_data_auto (
+                                            coin_pubs[i])));
+  }
   deposit_confirmation_obj
     = GNUNET_JSON_PACK (
         GNUNET_JSON_pack_data_auto ("h_wire",
                                     h_wire),
-        GNUNET_JSON_pack_data_auto ("h_extensions",
-                                    h_extensions),
+        GNUNET_JSON_pack_data_auto ("h_policy",
+                                    h_policy),
         GNUNET_JSON_pack_data_auto ("h_contract_terms",
                                     h_contract_terms),
         GNUNET_JSON_pack_timestamp ("exchange_timestamp",
                                     exchange_timestamp),
-        GNUNET_JSON_pack_timestamp ("refund_deadline",
-                                    refund_deadline),
+        GNUNET_JSON_pack_allow_null (
+          GNUNET_JSON_pack_timestamp ("refund_deadline",
+                                      refund_deadline)),
         GNUNET_JSON_pack_timestamp ("wire_deadline",
                                     wire_deadline),
-        TALER_JSON_pack_amount ("amount_without_fee",
-                                amount_without_fee),
-        GNUNET_JSON_pack_data_auto ("coin_pub",
-                                    coin_pub),
+        TALER_JSON_pack_amount ("total_without_fee",
+                                total_without_fee),
+        GNUNET_JSON_pack_array_steal ("coin_pubs",
+                                      jcoin_pubs),
+        GNUNET_JSON_pack_array_steal ("coin_sigs",
+                                      jcoin_sigs),
         GNUNET_JSON_pack_data_auto ("merchant_pub",
                                     merchant_pub),
         GNUNET_JSON_pack_data_auto ("exchange_sig",
@@ -320,18 +349,17 @@ TALER_AUDITOR_deposit_confirmation (
         GNUNET_JSON_pack_data_auto ("exchange_pub",
                                     exchange_pub));
   dh = GNUNET_new (struct TALER_AUDITOR_DepositConfirmationHandle);
-  dh->auditor = auditor;
   dh->cb = cb;
   dh->cb_cls = cb_cls;
-  dh->url = TALER_AUDITOR_path_to_url_ (auditor,
-                                        "/deposit-confirmation");
+  dh->url = TALER_url_join (url,
+                            "deposit-confirmation",
+                            NULL);
   if (NULL == dh->url)
   {
     GNUNET_free (dh);
     return NULL;
   }
   eh = TALER_AUDITOR_curl_easy_get_ (dh->url);
-
   if ( (NULL == eh) ||
        (CURLE_OK !=
         curl_easy_setopt (eh,
@@ -354,16 +382,21 @@ TALER_AUDITOR_deposit_confirmation (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for deposit-confirmation: `%s'\n",
               dh->url);
-  ctx = TALER_AUDITOR_handle_to_context_ (auditor);
   dh->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   dh->ctx.headers,
                                   &handle_deposit_confirmation_finished,
                                   dh);
-  /* Disable 100 continue processing */
-  GNUNET_CURL_extend_headers (dh->job,
-                              curl_slist_append (NULL,
-                                                 "Expect:"));
+  {
+    /* Disable 100 continue processing */
+    struct curl_slist *x_headers;
+
+    x_headers = curl_slist_append (NULL,
+                                   "Expect:");
+    GNUNET_CURL_extend_headers (dh->job,
+                                x_headers);
+    curl_slist_free_all (x_headers);
+  }
   return dh;
 }
 
diff --git a/src/lib/auditor_api_exchanges.c b/src/lib/auditor_api_exchanges.c
deleted file mode 100644
index 7327f11b2..000000000
--- a/src/lib/auditor_api_exchanges.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2018 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/>
-*/
-/**
- * @file lib/auditor_api_exchanges.c
- * @brief Implementation of the /exchanges request of the auditor's HTTP API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
-#include "taler_auditor_service.h"
-#include "auditor_api_handle.h"
-#include "taler_signatures.h"
-#include "auditor_api_curl_defaults.h"
-
-/**
- * How many exchanges do we allow a single auditor to
- * audit at most?
- */
-#define MAX_EXCHANGES 1024
-
-
-/**
- * @brief A ListExchanges Handle
- */
-struct TALER_AUDITOR_ListExchangesHandle
-{
-
-  /**
-   * The connection to auditor this request handle will use
-   */
-  struct TALER_AUDITOR_Handle *auditor;
-
-  /**
-   * The url for this request.
-   */
-  char *url;
-
-  /**
-   * Handle for the request.
-   */
-  struct GNUNET_CURL_Job *job;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_AUDITOR_ListExchangesResultCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-};
-
-
-/**
- * Function called when we're done processing the
- * HTTP /exchanges request.
- *
- * @param cls the `struct TALER_AUDITOR_ListExchangesHandle`
- * @param response_code HTTP response code, 0 on error
- * @param djson parsed JSON result, NULL on error
- */
-static void
-handle_exchanges_finished (void *cls,
-                           long response_code,
-                           const void *djson)
-{
-  const json_t *json = djson;
-  const json_t *ja;
-  unsigned int ja_len;
-  struct TALER_AUDITOR_ListExchangesHandle *leh = cls;
-  struct TALER_AUDITOR_HttpResponse hr = {
-    .reply = json,
-    .http_status = (unsigned int) response_code
-  };
-
-  leh->job = NULL;
-  switch (response_code)
-  {
-  case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    break;
-  case MHD_HTTP_OK:
-    ja = json_object_get (json,
-                          "exchanges");
-    if ( (NULL == ja) ||
-         (! json_is_array (ja)) )
-    {
-      GNUNET_break (0);
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      hr.http_status = 0;
-      break;
-    }
-
-    ja_len = json_array_size (ja);
-    if (ja_len > MAX_EXCHANGES)
-    {
-      GNUNET_break (0);
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      hr.http_status = 0;
-      break;
-    }
-    {
-      struct TALER_AUDITOR_ExchangeInfo ei[ja_len];
-      bool ok;
-
-      ok = true;
-      for (unsigned int i = 0; i<ja_len; i++)
-      {
-        struct GNUNET_JSON_Specification spec[] = {
-          GNUNET_JSON_spec_fixed_auto ("master_pub", &ei[i].master_pub),
-          GNUNET_JSON_spec_string ("exchange_url", &ei[i].exchange_url),
-          GNUNET_JSON_spec_end ()
-        };
-
-        if (GNUNET_OK !=
-            GNUNET_JSON_parse (json_array_get (ja,
-                                               i),
-                               spec,
-                               NULL, NULL))
-        {
-          GNUNET_break_op (0);
-          ok = false;
-          hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          hr.http_status = 0;
-          break;
-        }
-      }
-      if (! ok)
-        break;
-      leh->cb (leh->cb_cls,
-               &hr,
-               ja_len,
-               ei);
-      TALER_AUDITOR_list_exchanges_cancel (leh);
-      return;
-    }
-  case MHD_HTTP_BAD_REQUEST:
-    /* This should never happen, either us or the auditor is buggy
-       (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    /* Nothing really to verify, this should never
-       happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    break;
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    /* Server had an internal issue; we should retry, but this API
-       leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    break;
-  default:
-    /* unexpected response code */
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for auditor list-exchanges request\n",
-                (unsigned int) response_code,
-                (int) hr.ec);
-    GNUNET_break_op (0);
-    break;
-  }
-  if (NULL != leh->cb)
-    leh->cb (leh->cb_cls,
-             &hr,
-             0,
-             NULL);
-  TALER_AUDITOR_list_exchanges_cancel (leh);
-}
-
-
-struct TALER_AUDITOR_ListExchangesHandle *
-TALER_AUDITOR_list_exchanges (struct TALER_AUDITOR_Handle *auditor,
-                              TALER_AUDITOR_ListExchangesResultCallback cb,
-                              void *cb_cls)
-{
-  struct TALER_AUDITOR_ListExchangesHandle *leh;
-  struct GNUNET_CURL_Context *ctx;
-  CURL *eh;
-
-  GNUNET_assert (GNUNET_YES ==
-                 TALER_AUDITOR_handle_is_ready_ (auditor));
-
-  leh = GNUNET_new (struct TALER_AUDITOR_ListExchangesHandle);
-  leh->auditor = auditor;
-  leh->cb = cb;
-  leh->cb_cls = cb_cls;
-  leh->url = TALER_AUDITOR_path_to_url_ (auditor,
-                                         "/exchanges");
-  if (NULL == leh->url)
-  {
-    GNUNET_free (leh);
-    return NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "URL for list-exchanges: `%s'\n",
-              leh->url);
-  eh = TALER_AUDITOR_curl_easy_get_ (leh->url);
-  if (NULL == eh)
-  {
-    GNUNET_break (0);
-    GNUNET_free (leh->url);
-    GNUNET_free (leh);
-    return NULL;
-  }
-  ctx = TALER_AUDITOR_handle_to_context_ (auditor);
-  leh->job = GNUNET_CURL_job_add (ctx,
-                                  eh,
-                                  &handle_exchanges_finished,
-                                  leh);
-  return leh;
-}
-
-
-void
-TALER_AUDITOR_list_exchanges_cancel (
-  struct TALER_AUDITOR_ListExchangesHandle *leh)
-{
-  if (NULL != leh->job)
-  {
-    GNUNET_CURL_job_cancel (leh->job);
-    leh->job = NULL;
-  }
-  GNUNET_free (leh->url);
-  GNUNET_free (leh);
-}
-
-
-/* end of auditor_api_exchanges.c */
diff --git a/src/lib/auditor_api_get_config.c b/src/lib/auditor_api_get_config.c
new file mode 100644
index 000000000..1e8e0bb30
--- /dev/null
+++ b/src/lib/auditor_api_get_config.c
@@ -0,0 +1,278 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file lib/auditor_api_get_config.c
+ * @brief Implementation of /config for the auditor's HTTP API
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <microhttpd.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_json_lib.h"
+#include "taler_auditor_service.h"
+#include "taler_signatures.h"
+#include "auditor_api_curl_defaults.h"
+
+
+/**
+ * Which revision of the Taler auditor protocol is implemented
+ * by this library?  Used to determine compatibility.
+ */
+#define TALER_PROTOCOL_CURRENT 1
+
+/**
+ * How many revisions back are we compatible to?
+ */
+#define TALER_PROTOCOL_AGE 0
+
+
+/**
+ * Log error related to CURL operations.
+ *
+ * @param type log level
+ * @param function which function failed to run
+ * @param code what was the curl error code
+ */
+#define CURL_STRERROR(type, function, code)      \
+  GNUNET_log (type, "Curl function `%s' has failed at `%s:%d' with error: %s", \
+              function, __FILE__, __LINE__, curl_easy_strerror (code));
+
+
+/**
+ * Handle for the get config request.
+ */
+struct TALER_AUDITOR_GetConfigHandle
+{
+  /**
+   * The context of this handle
+   */
+  struct GNUNET_CURL_Context *ctx;
+
+  /**
+   * Function to call with the auditor's certification data,
+   * NULL if this has already been done.
+   */
+  TALER_AUDITOR_ConfigCallback config_cb;
+
+  /**
+   * Closure to pass to @e config_cb.
+   */
+  void *config_cb_cls;
+
+  /**
+   * Data for the request to get the /config of a auditor,
+   * NULL once we are past stage #MHS_INIT.
+   */
+  struct GNUNET_CURL_Job *vr;
+
+  /**
+   * The url for the @e vr job.
+   */
+  char *vr_url;
+
+};
+
+
+/* ***************** Internal /config fetching ************* */
+
+/**
+ * Decode the JSON in @a resp_obj from the /config response and store the data
+ * in the @a key_data.
+ *
+ * @param[in] resp_obj JSON object to parse
+ * @param[in,out] vi where to store the results we decoded
+ * @param[out] vc where to store config compatibility data
+ * @return #TALER_EC_NONE on success
+ */
+static enum TALER_ErrorCode
+decode_config_json (const json_t *resp_obj,
+                    struct TALER_AUDITOR_ConfigInformation *vi,
+                    enum TALER_AUDITOR_VersionCompatibility *vc)
+{
+  struct TALER_JSON_ProtocolVersion pv;
+  const char *ver;
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_version ("version",
+                             &pv),
+    GNUNET_JSON_spec_string ("version",
+                             &ver),
+    GNUNET_JSON_spec_fixed_auto ("exchange_master_public_key",
+                                 &vi->exchange_master_public_key),
+    GNUNET_JSON_spec_fixed_auto ("auditor_public_key",
+                                 &vi->auditor_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (JSON_OBJECT != json_typeof (resp_obj))
+  {
+    GNUNET_break_op (0);
+    return TALER_EC_GENERIC_JSON_INVALID;
+  }
+  /* check the config */
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (resp_obj,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return TALER_EC_GENERIC_JSON_INVALID;
+  }
+  vi->version = ver;
+  *vc = TALER_AUDITOR_VC_MATCH;
+  if (TALER_PROTOCOL_CURRENT < pv.current)
+  {
+    *vc |= TALER_AUDITOR_VC_NEWER;
+    if (TALER_PROTOCOL_CURRENT < pv.current - pv.age)
+      *vc |= TALER_AUDITOR_VC_INCOMPATIBLE;
+  }
+  if (TALER_PROTOCOL_CURRENT > pv.current)
+  {
+    *vc |= TALER_AUDITOR_VC_OLDER;
+    if (TALER_PROTOCOL_CURRENT - TALER_PROTOCOL_AGE > pv.current)
+      *vc |= TALER_AUDITOR_VC_INCOMPATIBLE;
+  }
+  return TALER_EC_NONE;
+}
+
+
+/**
+ * Callback used when downloading the reply to a /config request
+ * is complete.
+ *
+ * @param cls the `struct TALER_AUDITOR_GetConfigHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param gresp_obj parsed JSON result, NULL on error, must be a `const json_t *`
+ */
+static void
+config_completed_cb (void *cls,
+                     long response_code,
+                     const void *gresp_obj)
+{
+  struct TALER_AUDITOR_GetConfigHandle *auditor = cls;
+  const json_t *resp_obj = gresp_obj;
+  struct TALER_AUDITOR_ConfigResponse vr = {
+    .hr.reply = resp_obj,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  auditor->vr = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received config from URL `%s' with status %ld.\n",
+              auditor->vr_url,
+              response_code);
+  switch (response_code)
+  {
+  case 0:
+    GNUNET_break_op (0);
+    vr.hr.ec = TALER_EC_INVALID;
+    break;
+  case MHD_HTTP_OK:
+    if (NULL == resp_obj)
+    {
+      GNUNET_break_op (0);
+      vr.hr.http_status = 0;
+      vr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      break;
+    }
+    vr.hr.ec = decode_config_json (resp_obj,
+                                   &vr.details.ok.vi,
+                                   &vr.details.ok.compat);
+    if (TALER_EC_NONE != vr.hr.ec)
+    {
+      GNUNET_break_op (0);
+      vr.hr.http_status = 0;
+      break;
+    }
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    vr.hr.ec = TALER_JSON_get_error_code (resp_obj);
+    vr.hr.hint = TALER_JSON_get_error_hint (resp_obj);
+    break;
+  default:
+    vr.hr.ec = TALER_JSON_get_error_code (resp_obj);
+    vr.hr.hint = TALER_JSON_get_error_hint (resp_obj);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d\n",
+                (unsigned int) response_code,
+                (int) vr.hr.ec);
+    break;
+  }
+  auditor->config_cb (auditor->config_cb_cls,
+                      &vr);
+  TALER_AUDITOR_get_config_cancel (auditor);
+}
+
+
+struct TALER_AUDITOR_GetConfigHandle *
+TALER_AUDITOR_get_config (struct GNUNET_CURL_Context *ctx,
+                          const char *url,
+                          TALER_AUDITOR_ConfigCallback config_cb,
+                          void *config_cb_cls)
+{
+  struct TALER_AUDITOR_GetConfigHandle *auditor;
+  CURL *eh;
+
+  auditor = GNUNET_new (struct TALER_AUDITOR_GetConfigHandle);
+  auditor->config_cb = config_cb;
+  auditor->config_cb_cls = config_cb_cls;
+  auditor->ctx = ctx;
+  auditor->vr_url = TALER_url_join (url,
+                                    "config",
+                                    NULL);
+  if (NULL == auditor->vr_url)
+  {
+    GNUNET_break (0);
+    GNUNET_free (auditor);
+    return NULL;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Requesting auditor config with URL `%s'.\n",
+              auditor->vr_url);
+  eh = TALER_AUDITOR_curl_easy_get_ (auditor->vr_url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    TALER_AUDITOR_get_config_cancel (auditor);
+    return NULL;
+  }
+  GNUNET_break (CURLE_OK ==
+                curl_easy_setopt (eh,
+                                  CURLOPT_TIMEOUT,
+                                  (long) 300));
+  auditor->vr = GNUNET_CURL_job_add (auditor->ctx,
+                                     eh,
+                                     &config_completed_cb,
+                                     auditor);
+  return auditor;
+}
+
+
+void
+TALER_AUDITOR_get_config_cancel (struct TALER_AUDITOR_GetConfigHandle *auditor)
+{
+  if (NULL != auditor->vr)
+  {
+    GNUNET_CURL_job_cancel (auditor->vr);
+    auditor->vr = NULL;
+  }
+  GNUNET_free (auditor->vr_url);
+  GNUNET_free (auditor);
+}
+
+
+/* end of auditor_api_get_config.c */
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
deleted file mode 100644
index 9edb1115e..000000000
--- a/src/lib/auditor_api_handle.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
-  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/>
-*/
-/**
- * @file lib/auditor_api_handle.c
- * @brief Implementation of the "handle" component of the auditor's HTTP API
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <microhttpd.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
-#include "taler_auditor_service.h"
-#include "taler_signatures.h"
-#include "auditor_api_handle.h"
-#include "auditor_api_curl_defaults.h"
-#include "backoff.h"
-
-/**
- * Which revision of the Taler auditor protocol is implemented
- * by this library?  Used to determine compatibility.
- */
-#define TALER_PROTOCOL_CURRENT 0
-
-/**
- * How many revisions back are we compatible to?
- */
-#define TALER_PROTOCOL_AGE 0
-
-
-/**
- * Log error related to CURL operations.
- *
- * @param type log level
- * @param function which function failed to run
- * @param code what was the curl error code
- */
-#define CURL_STRERROR(type, function, code)      \
-  GNUNET_log (type, "Curl function `%s' has failed at `%s:%d' with error: %s", \
-              function, __FILE__, __LINE__, curl_easy_strerror (code));
-
-/**
- * Stages of initialization for the `struct TALER_AUDITOR_Handle`
- */
-enum AuditorHandleState
-{
-  /**
-   * Just allocated.
-   */
-  MHS_INIT = 0,
-
-  /**
-   * Obtained the auditor's versioning data and version.
-   */
-  MHS_VERSION = 1,
-
-  /**
-   * Failed to initialize (fatal).
-   */
-  MHS_FAILED = 2
-};
-
-
-/**
- * Handle to the auditor
- */
-struct TALER_AUDITOR_Handle
-{
-  /**
-   * The context of this handle
-   */
-  struct GNUNET_CURL_Context *ctx;
-
-  /**
-   * The URL of the auditor (i.e. "http://auditor.taler.net/")
-   */
-  char *url;
-
-  /**
-   * Function to call with the auditor's certification data,
-   * NULL if this has already been done.
-   */
-  TALER_AUDITOR_VersionCallback version_cb;
-
-  /**
-   * Closure to pass to @e version_cb.
-   */
-  void *version_cb_cls;
-
-  /**
-   * Data for the request to get the /version of a auditor,
-   * NULL once we are past stage #MHS_INIT.
-   */
-  struct GNUNET_CURL_Job *vr;
-
-  /**
-   * The url for the @e vr job.
-   */
-  char *vr_url;
-
-  /**
-   * Task for retrying /version request.
-   */
-  struct GNUNET_SCHEDULER_Task *retry_task;
-
-  /**
-   * /version data of the auditor, only valid if
-   * @e handshake_complete is past stage #MHS_VERSION.
-   */
-  char *version;
-
-  /**
-   * Version information for the callback.
-   */
-  struct TALER_AUDITOR_VersionInformation vi;
-
-  /**
-   * Retry /version frequency.
-   */
-  struct GNUNET_TIME_Relative retry_delay;
-
-  /**
-   * Stage of the auditor's initialization routines.
-   */
-  enum AuditorHandleState state;
-
-};
-
-
-/* ***************** Internal /version fetching ************* */
-
-/**
- * Decode the JSON in @a resp_obj from the /version response and store the data
- * in the @a key_data.
- *
- * @param[in] resp_obj JSON object to parse
- * @param[in,out] auditor where to store the results we decoded
- * @param[out] vc where to store version compatibility data
- * @return #TALER_EC_NONE on success
- */
-static enum TALER_ErrorCode
-decode_version_json (const json_t *resp_obj,
-                     struct TALER_AUDITOR_Handle *auditor,
-                     enum TALER_AUDITOR_VersionCompatibility *vc)
-{
-  struct TALER_AUDITOR_VersionInformation *vi = &auditor->vi;
-  unsigned int age;
-  unsigned int revision;
-  unsigned int current;
-  char dummy;
-  const char *ver;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("version",
-                             &ver),
-    GNUNET_JSON_spec_fixed_auto ("auditor_public_key",
-                                 &vi->auditor_pub),
-    GNUNET_JSON_spec_end ()
-  };
-
-  if (JSON_OBJECT != json_typeof (resp_obj))
-  {
-    GNUNET_break_op (0);
-    return TALER_EC_GENERIC_JSON_INVALID;
-  }
-  /* check the version */
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (resp_obj,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return TALER_EC_GENERIC_JSON_INVALID;
-  }
-  if (3 != sscanf (ver,
-                   "%u:%u:%u%c",
-                   &current,
-                   &revision,
-                   &age,
-                   &dummy))
-  {
-    GNUNET_break_op (0);
-    return TALER_EC_GENERIC_VERSION_MALFORMED;
-  }
-  GNUNET_free (auditor->version);
-  auditor->version = GNUNET_strdup (ver);
-  vi->version = auditor->version;
-  *vc = TALER_AUDITOR_VC_MATCH;
-  if (TALER_PROTOCOL_CURRENT < current)
-  {
-    *vc |= TALER_AUDITOR_VC_NEWER;
-    if (TALER_PROTOCOL_CURRENT < current - age)
-      *vc |= TALER_AUDITOR_VC_INCOMPATIBLE;
-  }
-  if (TALER_PROTOCOL_CURRENT > current)
-  {
-    *vc |= TALER_AUDITOR_VC_OLDER;
-    if (TALER_PROTOCOL_CURRENT - TALER_PROTOCOL_AGE > current)
-      *vc |= TALER_AUDITOR_VC_INCOMPATIBLE;
-  }
-  return TALER_EC_NONE;
-}
-
-
-/**
- * Initiate download of /version from the auditor.
- *
- * @param cls auditor where to download /version from
- */
-static void
-request_version (void *cls);
-
-
-/**
- * Callback used when downloading the reply to a /version request
- * is complete.
- *
- * @param cls the `struct TALER_AUDITOR_Handle`
- * @param response_code HTTP response code, 0 on error
- * @param gresp_obj parsed JSON result, NULL on error, must be a `const json_t *`
- */
-static void
-version_completed_cb (void *cls,
-                      long response_code,
-                      const void *gresp_obj)
-{
-  struct TALER_AUDITOR_Handle *auditor = cls;
-  const json_t *resp_obj = gresp_obj;
-  enum TALER_AUDITOR_VersionCompatibility vc;
-  struct TALER_AUDITOR_HttpResponse hr = {
-    .reply = resp_obj,
-    .http_status = (unsigned int) response_code
-  };
-
-  auditor->vr = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received version from URL `%s' with status %ld.\n",
-              auditor->url,
-              response_code);
-  vc = TALER_AUDITOR_VC_PROTOCOL_ERROR;
-  switch (response_code)
-  {
-  case 0:
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    /* NOTE: this design is debatable. We MAY want to throw this error at the
-       client. We may then still additionally internally re-try. */
-    GNUNET_assert (NULL == auditor->retry_task);
-    auditor->retry_delay = EXCHANGE_LIB_BACKOFF (auditor->retry_delay);
-    auditor->retry_task = GNUNET_SCHEDULER_add_delayed (auditor->retry_delay,
-                                                        &request_version,
-                                                        auditor);
-    return;
-  case MHD_HTTP_OK:
-    if (NULL == resp_obj)
-    {
-      GNUNET_break_op (0);
-      TALER_LOG_WARNING ("NULL body for a 200-OK /version\n");
-      hr.http_status = 0;
-      hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-      break;
-    }
-    hr.ec = decode_version_json (resp_obj,
-                                 auditor,
-                                 &vc);
-    if (TALER_EC_NONE != hr.ec)
-    {
-      GNUNET_break_op (0);
-      hr.http_status = 0;
-      break;
-    }
-    auditor->retry_delay = GNUNET_TIME_UNIT_ZERO; /* restart quickly */
-    break;
-  default:
-    hr.ec = TALER_JSON_get_error_code (resp_obj);
-    hr.hint = TALER_JSON_get_error_hint (resp_obj);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d\n",
-                (unsigned int) response_code,
-                (int) hr.ec);
-    break;
-  }
-  if (MHD_HTTP_OK != response_code)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "/version failed for auditor %s: %u!\n",
-                auditor->url,
-                (unsigned int) response_code);
-    auditor->state = MHS_FAILED;
-    /* notify application that we failed */
-    auditor->version_cb (auditor->version_cb_cls,
-                         &hr,
-                         NULL,
-                         vc);
-    return;
-  }
-  TALER_LOG_DEBUG ("Switching auditor state to 'version'\n");
-  auditor->state = MHS_VERSION;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Auditor %s is now READY!\n",
-              auditor->url);
-  /* notify application about the key information */
-  auditor->version_cb (auditor->version_cb_cls,
-                       &hr,
-                       &auditor->vi,
-                       vc);
-}
-
-
-/**
- * Initiate download of /version from the auditor.
- *
- * @param cls auditor where to download /version from
- */
-static void
-request_version (void *cls)
-{
-  struct TALER_AUDITOR_Handle *auditor = cls;
-  CURL *eh;
-
-  auditor->retry_task = NULL;
-  GNUNET_assert (NULL == auditor->vr);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Requesting auditor version with URL `%s'.\n",
-              auditor->vr_url);
-  eh = TALER_AUDITOR_curl_easy_get_ (auditor->vr_url);
-  if (NULL == eh)
-  {
-    GNUNET_break (0);
-    auditor->retry_delay = EXCHANGE_LIB_BACKOFF (auditor->retry_delay);
-    auditor->retry_task = GNUNET_SCHEDULER_add_delayed (auditor->retry_delay,
-                                                        &request_version,
-                                                        auditor);
-    return;
-  }
-  GNUNET_break (CURLE_OK ==
-                curl_easy_setopt (eh,
-                                  CURLOPT_TIMEOUT,
-                                  (long) 300));
-  auditor->vr = GNUNET_CURL_job_add (auditor->ctx,
-                                     eh,
-                                     &version_completed_cb,
-                                     auditor);
-}
-
-
-/* ********************* library internal API ********* */
-
-
-struct GNUNET_CURL_Context *
-TALER_AUDITOR_handle_to_context_ (struct TALER_AUDITOR_Handle *h)
-{
-  return h->ctx;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_AUDITOR_handle_is_ready_ (struct TALER_AUDITOR_Handle *h)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Checking if auditor at `%s` is now ready: %s\n",
-              h->url,
-              (MHD_VERSION == h->state) ? "yes" : "no");
-  return (MHS_VERSION == h->state) ? GNUNET_YES : GNUNET_NO;
-}
-
-
-char *
-TALER_AUDITOR_path_to_url_ (struct TALER_AUDITOR_Handle *h,
-                            const char *path)
-{
-  GNUNET_assert ('/' == path[0]);
-  return TALER_url_join (h->url,
-                         path + 1,
-                         NULL);
-}
-
-
-/* ********************* public API ******************* */
-
-
-struct TALER_AUDITOR_Handle *
-TALER_AUDITOR_connect (struct GNUNET_CURL_Context *ctx,
-                       const char *url,
-                       TALER_AUDITOR_VersionCallback version_cb,
-                       void *version_cb_cls)
-{
-  struct TALER_AUDITOR_Handle *auditor;
-
-  auditor = GNUNET_new (struct TALER_AUDITOR_Handle);
-  auditor->version_cb = version_cb;
-  auditor->version_cb_cls = version_cb_cls;
-  auditor->retry_delay = GNUNET_TIME_UNIT_SECONDS; /* start slowly */
-  auditor->ctx = ctx;
-  auditor->url = GNUNET_strdup (url);
-  auditor->vr_url = TALER_AUDITOR_path_to_url_ (auditor,
-                                                "/version");
-  if (NULL == auditor->vr_url)
-  {
-    GNUNET_break (0);
-    GNUNET_free (auditor->url);
-    GNUNET_free (auditor);
-    return NULL;
-  }
-  auditor->retry_task = GNUNET_SCHEDULER_add_now (&request_version,
-                                                  auditor);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Connecting to auditor at URL `%s'.\n",
-              url);
-  return auditor;
-}
-
-
-void
-TALER_AUDITOR_disconnect (struct TALER_AUDITOR_Handle *auditor)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Disconnecting from auditor at URL `%s'.\n",
-              auditor->url);
-  if (NULL != auditor->vr)
-  {
-    GNUNET_CURL_job_cancel (auditor->vr);
-    auditor->vr = NULL;
-  }
-  if (NULL != auditor->retry_task)
-  {
-    GNUNET_SCHEDULER_cancel (auditor->retry_task);
-    auditor->retry_task = NULL;
-  }
-  GNUNET_free (auditor->version);
-  GNUNET_free (auditor->vr_url);
-  GNUNET_free (auditor->url);
-  GNUNET_free (auditor);
-}
-
-
-/* end of auditor_api_handle.c */
diff --git a/src/lib/auditor_api_handle.h b/src/lib/auditor_api_handle.h
deleted file mode 100644
index 7ff5bfcdb..000000000
--- a/src/lib/auditor_api_handle.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014, 2015 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/>
-*/
-/**
- * @file lib/auditor_api_handle.h
- * @brief Internal interface to the handle part of the auditor's HTTP API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_auditor_service.h"
-#include "taler_curl_lib.h"
-
-/**
- * Get the context of a auditor.
- *
- * @param h the auditor handle to query
- * @return ctx context to execute jobs in
- */
-struct GNUNET_CURL_Context *
-TALER_AUDITOR_handle_to_context_ (struct TALER_AUDITOR_Handle *h);
-
-
-/**
- * Check if the handle is ready to process requests.
- *
- * @param h the auditor handle to query
- * @return #GNUNET_YES if we are ready, #GNUNET_NO if not
- */
-int
-TALER_AUDITOR_handle_is_ready_ (struct TALER_AUDITOR_Handle *h);
-
-
-/**
- * Obtain the URL to use for an API request.
- *
- * @param h the auditor handle to query
- * @param path Taler API path (i.e. "/deposit-confirmation")
- * @return the full URL to use with cURL
- */
-char *
-TALER_AUDITOR_path_to_url_ (struct TALER_AUDITOR_Handle *h,
-                            const char *path);
-
-
-/* end of auditor_api_handle.h */
diff --git a/src/lib/exchange_api_add_aml_decision.c b/src/lib/exchange_api_add_aml_decision.c
new file mode 100644
index 000000000..342e1e3dc
--- /dev/null
+++ b/src/lib/exchange_api_add_aml_decision.c
@@ -0,0 +1,246 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_add_aml_decision.c
+ * @brief functions to add an AML decision by an AML officer
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "exchange_api_curl_defaults.h"
+#include "taler_signatures.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+
+
+struct TALER_EXCHANGE_AddAmlDecision
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_AddAmlDecisionCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reference to the execution context.
+   */
+  struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP POST /aml/$OFFICER_PUB/decision request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_AddAmlDecision *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
+ */
+static void
+handle_add_aml_decision_finished (void *cls,
+                                  long response_code,
+                                  const void *response)
+{
+  struct TALER_EXCHANGE_AddAmlDecision *wh = cls;
+  const json_t *json = response;
+  struct TALER_EXCHANGE_AddAmlDecisionResponse adr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
+  };
+
+  wh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    /* no reply */
+    adr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    adr.hr.hint = "server offline?";
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_CONFLICT:
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange AML decision\n",
+                (unsigned int) response_code,
+                (int) adr.hr.ec);
+    break;
+  }
+  if (NULL != wh->cb)
+  {
+    wh->cb (wh->cb_cls,
+            &adr);
+    wh->cb = NULL;
+  }
+  TALER_EXCHANGE_add_aml_decision_cancel (wh);
+}
+
+
+struct TALER_EXCHANGE_AddAmlDecision *
+TALER_EXCHANGE_add_aml_decision (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  TALER_EXCHANGE_AddAmlDecisionCallback cb,
+  void *cb_cls)
+{
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  struct TALER_AmlOfficerSignatureP officer_sig;
+  struct TALER_EXCHANGE_AddAmlDecision *wh;
+  CURL *eh;
+  json_t *body;
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&officer_priv->eddsa_priv,
+                                      &officer_pub.eddsa_pub);
+  TALER_officer_aml_decision_sign (justification,
+                                   decision_time,
+                                   new_threshold,
+                                   h_payto,
+                                   new_state,
+                                   kyc_requirements,
+                                   officer_priv,
+                                   &officer_sig);
+  wh = GNUNET_new (struct TALER_EXCHANGE_AddAmlDecision);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ctx = ctx;
+  {
+    char *path;
+    char opus[sizeof (officer_pub) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &officer_pub,
+      sizeof (officer_pub),
+      opus,
+      sizeof (opus));
+    *end = '\0';
+    GNUNET_asprintf (&path,
+                     "aml/%s/decision",
+                     opus);
+    wh->url = TALER_url_join (url,
+                              path,
+                              NULL);
+    GNUNET_free (path);
+  }
+  if (NULL == wh->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (wh);
+    return NULL;
+  }
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("justification",
+                             justification),
+    GNUNET_JSON_pack_data_auto ("officer_sig",
+                                &officer_sig),
+    GNUNET_JSON_pack_data_auto ("h_payto",
+                                h_payto),
+    GNUNET_JSON_pack_uint64 ("new_state",
+                             (uint32_t) new_state),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_array_incref ("kyc_requirements",
+                                     (json_t *) kyc_requirements)),
+    TALER_JSON_pack_amount ("new_threshold",
+                            new_threshold),
+    GNUNET_JSON_pack_timestamp ("decision_time",
+                                decision_time));
+  eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&wh->post_ctx,
+                              eh,
+                              body)) )
+  {
+    GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
+    json_decref (body);
+    GNUNET_free (wh->url);
+    return NULL;
+  }
+  json_decref (body);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting URL '%s'\n",
+              wh->url);
+  wh->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  wh->post_ctx.headers,
+                                  &handle_add_aml_decision_finished,
+                                  wh);
+  if (NULL == wh->job)
+  {
+    TALER_EXCHANGE_add_aml_decision_cancel (wh);
+    return NULL;
+  }
+  return wh;
+}
+
+
+void
+TALER_EXCHANGE_add_aml_decision_cancel (
+  struct TALER_EXCHANGE_AddAmlDecision *wh)
+{
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&wh->post_ctx);
+  GNUNET_free (wh->url);
+  GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_age_withdraw.c b/src/lib/exchange_api_age_withdraw.c
new file mode 100644
index 000000000..ca1a11cb8
--- /dev/null
+++ b/src/lib/exchange_api_age_withdraw.c
@@ -0,0 +1,1125 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_age_withdraw.c
+ * @brief Implementation of /reserves/$RESERVE_PUB/age-withdraw requests
+ * @author Özgür Kesim
+ */
+
+#include "platform.h"
+#include <gnunet/gnunet_common.h>
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include <sys/wait.h>
+#include "taler_curl_lib.h"
+#include "taler_error_codes.h"
+#include "taler_json_lib.h"
+#include "taler_exchange_service.h"
+#include "exchange_api_common.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+#include "taler_util.h"
+
+/**
+ * A CoinCandidate is populated from a master secret
+ */
+struct CoinCandidate
+{
+  /**
+   * Master key material for the coin candidates.
+   */
+  struct TALER_PlanchetMasterSecretP secret;
+
+  /**
+   * The details derived form the master secrets
+   */
+  struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails details;
+
+  /**
+   * Blinded hash of the coin
+   **/
+  struct TALER_BlindedCoinHashP blinded_coin_h;
+
+};
+
+
+/**
+ * Closure for a call to /csr-withdraw, contains data that is needed to process
+ * the result.
+ */
+struct CSRClosure
+{
+  /**
+   * Points to the actual candidate in CoinData.coin_candidates, to continue
+   * to build its contents based on the results from /csr-withdraw
+   */
+  struct CoinCandidate *candidate;
+
+  /**
+   * The planchet to finally generate.  Points to the corresponding candidate
+   * in CoindData.planchet_details
+   */
+  struct TALER_PlanchetDetail *planchet;
+
+  /**
+   * Handler to the originating call to /age-withdraw, needed to either
+   * cancel the running age-withdraw request (on failure of the current call
+   * to /csr-withdraw), or to eventually perform the protocol, once all
+   * csr-withdraw requests have successfully finished.
+   */
+  struct TALER_EXCHANGE_AgeWithdrawHandle *age_withdraw_handle;
+
+  /**
+   * Session nonce.
+   */
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
+
+  /**
+   * Denomination information, needed for CS coins for the
+   * step after /csr-withdraw
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+
+  /**
+   * Handler for the CS R request
+   */
+  struct TALER_EXCHANGE_CsRWithdrawHandle *csr_withdraw_handle;
+};
+
+/**
+ * Data we keep per coin in the batch.
+ */
+struct CoinData
+{
+  /**
+   * The denomination of the coin.  Must support age restriction, i.e
+   * its .keys.age_mask MUST not be 0
+   */
+  struct TALER_EXCHANGE_DenomPublicKey denom_pub;
+
+  /**
+   * The Candidates for the coin
+   */
+  struct CoinCandidate coin_candidates[TALER_CNC_KAPPA];
+
+  /**
+   * Details of the planchet(s).
+   */
+  struct TALER_PlanchetDetail planchet_details[TALER_CNC_KAPPA];
+
+  /**
+   * Closure for each candidate of type CS for the preflight request to
+   * /csr-withdraw
+   */
+  struct CSRClosure csr_cls[TALER_CNC_KAPPA];
+};
+
+/**
+ * A /reserves/$RESERVE_PUB/age-withdraw request-handle for calls with
+ * pre-blinded planchets.  Returned by TALER_EXCHANGE_age_withdraw_blinded.
+ */
+struct TALER_EXCHANGE_AgeWithdrawBlindedHandle
+{
+
+  /**
+   * Reserve private key.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Reserve public key, calculated
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Signature of the reserve for the request, calculated after all
+   * parameters for the coins are collected.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /*
+   * The denomination keys of the exchange
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * The age mask, extracted from the denominations.
+   * MUST be the same for all denominations
+   *
+   */
+  struct TALER_AgeMask age_mask;
+
+  /**
+   * Maximum age to commit to.
+   */
+  uint8_t max_age;
+
+  /**
+   * The commitment calculated as SHA512 hash over all blinded_coin_h
+   */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+  /**
+   * Total amount requested (value plus withdraw fee).
+   */
+  struct TALER_Amount amount_with_fee;
+
+  /**
+   * Length of the @e blinded_input Array
+   */
+  size_t num_input;
+
+  /**
+   * The blinded planchet input for the call to /age-withdraw via
+   * TALER_EXCHANGE_age_withdraw_blinded
+   */
+  const struct TALER_EXCHANGE_AgeWithdrawBlindedInput *blinded_input;
+
+  /**
+   * The url for this request.
+   */
+  char *request_url;
+
+  /**
+   * Context for curl.
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * CURL handle for the request job.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Post Context
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Function to call with age-withdraw response results.
+   */
+  TALER_EXCHANGE_AgeWithdrawBlindedCallback callback;
+
+  /**
+   * Closure for @e blinded_callback
+   */
+  void *callback_cls;
+};
+
+/**
+ * A /reserves/$RESERVE_PUB/age-withdraw request-handle for calls from
+ * a wallet, i. e. when blinding data is available.
+ */
+struct TALER_EXCHANGE_AgeWithdrawHandle
+{
+
+  /**
+   * Length of the @e coin_data Array
+   */
+  size_t num_coins;
+
+  /**
+   * The base-URL of the exchange.
+   */
+  const char *exchange_url;
+
+  /**
+   * Reserve private key.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Reserve public key, calculated
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Signature of the reserve for the request, calculated after all
+   * parameters for the coins are collected.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /*
+   * The denomination keys of the exchange
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * The age mask, extracted from the denominations.
+   * MUST be the same for all denominations
+   *
+   */
+  struct TALER_AgeMask age_mask;
+
+  /**
+   * Maximum age to commit to.
+   */
+  uint8_t max_age;
+
+  /**
+   * Array of per-coin data
+   */
+  struct CoinData *coin_data;
+
+  /**
+   * Context for curl.
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  struct
+  {
+    /**
+     * Number of /csr-withdraw requests still pending.
+     */
+    unsigned int pending;
+
+    /**
+     * CURL handle for the request job.
+     */
+    struct GNUNET_CURL_Job *job;
+  } csr;
+
+
+  /**
+   * Function to call with age-withdraw response results.
+   */
+  TALER_EXCHANGE_AgeWithdrawCallback callback;
+
+  /**
+   * Closure for @e age_withdraw_cb
+   */
+  void *callback_cls;
+
+  /* The Handler for the actual call to the exchange */
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *procotol_handle;
+};
+
+/**
+ * We got a 200 OK response for the /reserves/$RESERVE_PUB/age-withdraw operation.
+ * Extract the noreveal_index and return it to the caller.
+ *
+ * @param awbh operation handle
+ * @param j_response reply from the exchange
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
+ */
+static enum GNUNET_GenericReturnValue
+reserve_age_withdraw_ok (
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh,
+  const json_t *j_response)
+{
+  struct TALER_EXCHANGE_AgeWithdrawBlindedResponse response = {
+    .hr.reply = j_response,
+    .hr.http_status = MHD_HTTP_OK,
+    .details.ok.h_commitment = awbh->h_commitment
+  };
+  struct TALER_ExchangeSignatureP exchange_sig;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_uint8 ("noreveal_index",
+                            &response.details.ok.noreveal_index),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &response.details.ok.exchange_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK!=
+      GNUNET_JSON_parse (j_response,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  if (GNUNET_OK !=
+      TALER_exchange_online_age_withdraw_confirmation_verify (
+        &awbh->h_commitment,
+        response.details.ok.noreveal_index,
+        &response.details.ok.exchange_pub,
+        &exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+
+  }
+
+  awbh->callback (awbh->callback_cls,
+                  &response);
+  /* make sure the callback isn't called again */
+  awbh->callback = NULL;
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /reserves/$RESERVE_PUB/age-withdraw request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_AgeWithdrawHandle`
+ * @param response_code The HTTP response code
+ * @param response response data
+ */
+static void
+handle_reserve_age_withdraw_blinded_finished (
+  void *cls,
+  long response_code,
+  const void *response)
+{
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh = cls;
+  const json_t *j_response = response;
+  struct TALER_EXCHANGE_AgeWithdrawBlindedResponse awbr = {
+    .hr.reply = j_response,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  awbh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    awbr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        reserve_age_withdraw_ok (awbh,
+                                 j_response))
+    {
+      GNUNET_break_op (0);
+      awbr.hr.http_status = 0;
+      awbr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      break;
+    }
+    GNUNET_assert (NULL == awbh->callback);
+    TALER_EXCHANGE_age_withdraw_blinded_cancel (awbh);
+    return;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    GNUNET_break_op (0);
+    /* Nothing really to verify, exchange says one of the signatures is
+       invalid; as we checked them, this should never happen, we
+       should pass the JSON reply to the application */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, the exchange basically just says
+       that it doesn't know this reserve.  Can happen if we
+       query before the wire transfer went through.
+       We should simply pass the JSON reply to the application. */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* The age requirements might not have been met */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_GONE:
+    /* could happen if denomination was revoked */
+    /* Note: one might want to check /keys for revocation
+       signature here, alas tricky in case our /keys
+       is outdated => left to clients */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* only validate reply is well-formed */
+    {
+      uint64_t ptu;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_uint64 ("requirement_row",
+                                 &ptu),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j_response,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        awbr.hr.http_status = 0;
+        awbr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    awbr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awbr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange age-withdraw\n",
+                (unsigned int) response_code,
+                (int) awbr.hr.ec);
+    break;
+  }
+  awbh->callback (awbh->callback_cls,
+                  &awbr);
+  TALER_EXCHANGE_age_withdraw_blinded_cancel (awbh);
+}
+
+
+/**
+ * Runs the actual age-withdraw operation with the blinded planchets.
+ *
+ * @param[in,out] awbh age withdraw handler
+ */
+static void
+perform_protocol (
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh)
+{
+#define FAIL_IF(cond) \
+  do { \
+    if ((cond)) \
+    { \
+      GNUNET_break (! (cond)); \
+      goto ERROR; \
+    } \
+  } while (0)
+
+  struct GNUNET_HashContext *coins_hctx = NULL;
+  json_t *j_denoms = NULL;
+  json_t *j_array_candidates = NULL;
+  json_t *j_request_body = NULL;
+  CURL *curlh = NULL;
+
+  GNUNET_assert (0 < awbh->num_input);
+  awbh->age_mask = awbh->blinded_input[0].denom_pub->key.age_mask;
+
+  FAIL_IF (GNUNET_OK !=
+           TALER_amount_set_zero (awbh->keys->currency,
+                                  &awbh->amount_with_fee));
+  /* Accumulate total value with fees */
+  for (size_t i = 0; i < awbh->num_input; i++)
+  {
+    struct TALER_Amount coin_total;
+    const struct TALER_EXCHANGE_DenomPublicKey *dpub =
+      awbh->blinded_input[i].denom_pub;
+
+    FAIL_IF (0 >
+             TALER_amount_add (&coin_total,
+                               &dpub->fees.withdraw,
+                               &dpub->value));
+    FAIL_IF (0 >
+             TALER_amount_add (&awbh->amount_with_fee,
+                               &awbh->amount_with_fee,
+                               &coin_total));
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Attempting to age-withdraw from reserve %s with maximum age %d\n",
+              TALER_B2S (&awbh->reserve_pub),
+              awbh->max_age);
+
+  coins_hctx = GNUNET_CRYPTO_hash_context_start ();
+  FAIL_IF (NULL == coins_hctx);
+
+
+  j_denoms = json_array ();
+  j_array_candidates = json_array ();
+  FAIL_IF ((NULL == j_denoms) ||
+           (NULL == j_array_candidates));
+
+  for (size_t i  = 0; i< awbh->num_input; i++)
+  {
+    /* Build the denomination array */
+    {
+      const struct TALER_EXCHANGE_DenomPublicKey *denom_pub =
+        awbh->blinded_input[i].denom_pub;
+      const struct TALER_DenominationHashP *denom_h = &denom_pub->h_key;
+      json_t *jdenom;
+
+      /* The mask must be the same for all coins */
+      FAIL_IF (awbh->age_mask.bits != denom_pub->key.age_mask.bits);
+
+      jdenom = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_auto (NULL,
+                                    denom_h));
+      FAIL_IF (NULL == jdenom);
+      FAIL_IF (0 > json_array_append_new (j_denoms,
+                                          jdenom));
+
+      /* Build the candidate array */
+      {
+        json_t *j_can = json_array ();
+        FAIL_IF (NULL == j_can);
+
+        for (size_t k = 0; k < TALER_CNC_KAPPA; k++)
+        {
+          struct TALER_BlindedCoinHashP bch;
+          const struct TALER_PlanchetDetail *planchet =
+            &awbh->blinded_input[i].planchet_details[k];
+          json_t *jc = GNUNET_JSON_PACK (
+            TALER_JSON_pack_blinded_planchet (
+              NULL,
+              &planchet->blinded_planchet));
+
+          FAIL_IF (NULL == jc);
+          FAIL_IF (0 > json_array_append_new (j_can,
+                                              jc));
+
+          TALER_coin_ev_hash (&planchet->blinded_planchet,
+                              &planchet->denom_pub_hash,
+                              &bch);
+
+          GNUNET_CRYPTO_hash_context_read (coins_hctx,
+                                           &bch,
+                                           sizeof(bch));
+        }
+
+        FAIL_IF (0 > json_array_append_new (j_array_candidates,
+                                            j_can));
+      }
+    }
+  }
+
+  /* Build the hash of the commitment */
+  GNUNET_CRYPTO_hash_context_finish (coins_hctx,
+                                     &awbh->h_commitment.hash);
+  coins_hctx = NULL;
+
+  /* Sign the request */
+  TALER_wallet_age_withdraw_sign (&awbh->h_commitment,
+                                  &awbh->amount_with_fee,
+                                  &awbh->age_mask,
+                                  awbh->max_age,
+                                  awbh->reserve_priv,
+                                  &awbh->reserve_sig);
+
+  /* Initiate the POST-request */
+  j_request_body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_array_steal ("denom_hs", j_denoms),
+    GNUNET_JSON_pack_array_steal ("blinded_coin_evs", j_array_candidates),
+    GNUNET_JSON_pack_uint64 ("max_age", awbh->max_age),
+    GNUNET_JSON_pack_data_auto ("reserve_sig", &awbh->reserve_sig));
+  FAIL_IF (NULL == j_request_body);
+
+  curlh = TALER_EXCHANGE_curl_easy_get_ (awbh->request_url);
+  FAIL_IF (NULL == curlh);
+  FAIL_IF (GNUNET_OK !=
+           TALER_curl_easy_post (&awbh->post_ctx,
+                                 curlh,
+                                 j_request_body));
+  json_decref (j_request_body);
+  j_request_body = NULL;
+
+  awbh->job = GNUNET_CURL_job_add2 (
+    awbh->curl_ctx,
+    curlh,
+    awbh->post_ctx.headers,
+    &handle_reserve_age_withdraw_blinded_finished,
+    awbh);
+  FAIL_IF (NULL == awbh->job);
+
+  /* No errors, return */
+  return;
+
+ERROR:
+  if (NULL != j_denoms)
+    json_decref (j_denoms);
+  if (NULL != j_array_candidates)
+    json_decref (j_array_candidates);
+  if (NULL != j_request_body)
+    json_decref (j_request_body);
+  if (NULL != curlh)
+    curl_easy_cleanup (curlh);
+  if (NULL != coins_hctx)
+    GNUNET_CRYPTO_hash_context_abort (coins_hctx);
+  TALER_EXCHANGE_age_withdraw_blinded_cancel (awbh);
+  return;
+#undef FAIL_IF
+}
+
+
+/**
+ * @brief Callback to copy the results from the call to TALER_age_withdraw_blinded
+ * to the result for the originating call from TALER_age_withdraw.
+ *
+ * @param cls struct TALER_AgeWithdrawHandle
+ * @param awbr The response
+ */
+static void
+copy_results (
+  void *cls,
+  const struct TALER_EXCHANGE_AgeWithdrawBlindedResponse *awbr)
+{
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh = cls;
+  uint8_t k =  awbr->details.ok.noreveal_index;
+  struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails details[awh->num_coins];
+  struct TALER_BlindedCoinHashP blinded_coin_hs[awh->num_coins];
+  struct TALER_EXCHANGE_AgeWithdrawResponse resp = {
+    .hr = awbr->hr,
+    .details = {
+      .ok = {
+        .noreveal_index = awbr->details.ok.noreveal_index,
+        .h_commitment = awbr->details.ok.h_commitment,
+        .exchange_pub = awbr->details.ok.exchange_pub,
+        .num_coins = awh->num_coins,
+        .coin_details = details,
+        .blinded_coin_hs = blinded_coin_hs
+      },
+    },
+  };
+
+  for (size_t n = 0; n< awh->num_coins; n++)
+  {
+    details[n] = awh->coin_data[n].coin_candidates[k].details;
+    details[n].planchet = awh->coin_data[n].planchet_details[k];
+    blinded_coin_hs[n] = awh->coin_data[n].coin_candidates[k].blinded_coin_h;
+  }
+  awh->callback (awh->callback_cls,
+                 &resp);
+  awh->callback = NULL;
+}
+
+
+/**
+ * @brief Prepares and executes TALER_EXCHANGE_age_withdraw_blinded.
+ * If there were CS-denominations involved, started once the all calls
+ * to /csr-withdraw are done.
+ */
+static void
+call_age_withdraw_blinded (
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh)
+{
+  struct TALER_EXCHANGE_AgeWithdrawBlindedInput blinded_input[awh->num_coins];
+
+  /* Prepare the blinded planchets as input */
+  for (size_t n = 0; n < awh->num_coins; n++)
+  {
+    blinded_input[n].denom_pub = &awh->coin_data[n].denom_pub;
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+      blinded_input[n].planchet_details[k] =
+        awh->coin_data[n].planchet_details[k];
+  }
+
+  awh->procotol_handle =
+    TALER_EXCHANGE_age_withdraw_blinded (
+      awh->curl_ctx,
+      awh->keys,
+      awh->exchange_url,
+      awh->reserve_priv,
+      awh->max_age,
+      awh->num_coins,
+      blinded_input,
+      copy_results,
+      awh);
+}
+
+
+/**
+ * Prepares the request URL for the age-withdraw request
+ *
+ * @param awbh The handler
+ * @param exchange_url The base-URL to the exchange
+ */
+static
+enum GNUNET_GenericReturnValue
+prepare_url (
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh,
+  const char *exchange_url)
+{
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
+  char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
+  char *end;
+
+  end = GNUNET_STRINGS_data_to_string (
+    &awbh->reserve_pub,
+    sizeof (awbh->reserve_pub),
+    pub_str,
+    sizeof (pub_str));
+  *end = '\0';
+  GNUNET_snprintf (arg_str,
+                   sizeof (arg_str),
+                   "reserves/%s/age-withdraw",
+                   pub_str);
+
+  awbh->request_url = TALER_url_join (exchange_url,
+                                      arg_str,
+                                      NULL);
+  if (NULL == awbh->request_url)
+  {
+    GNUNET_break (0);
+    TALER_EXCHANGE_age_withdraw_blinded_cancel (awbh);
+    return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * @brief Function called when CSR withdraw retrieval is finished
+ *
+ * @param cls the `struct CSRClosure *`
+ * @param csrr replies from the /csr-withdraw request
+ */
+static void
+csr_withdraw_done (
+  void *cls,
+  const struct TALER_EXCHANGE_CsRWithdrawResponse *csrr)
+{
+  struct CSRClosure *csr = cls;
+  struct CoinCandidate *can;
+  struct TALER_PlanchetDetail *planchet;
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh;
+
+  GNUNET_assert (NULL != csr);
+  awh = csr->age_withdraw_handle;
+  planchet = csr->planchet;
+  can = csr->candidate;
+
+  GNUNET_assert (NULL != can);
+  GNUNET_assert (NULL != planchet);
+  GNUNET_assert (NULL != awh);
+
+  csr->csr_withdraw_handle = NULL;
+
+  switch (csrr->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    {
+      bool success = false;
+      /* Complete the initialization of the coin with CS denomination */
+
+      TALER_denom_ewv_copy (&can->details.alg_values,
+                            &csrr->details.ok.alg_values);
+      GNUNET_assert (can->details.alg_values.blinding_inputs->cipher
+                     == GNUNET_CRYPTO_BSA_CS);
+      TALER_planchet_setup_coin_priv (&can->secret,
+                                      &can->details.alg_values,
+                                      &can->details.coin_priv);
+      TALER_planchet_blinding_secret_create (&can->secret,
+                                             &can->details.alg_values,
+                                             &can->details.blinding_key);
+      /* This initializes the 2nd half of the
+         can->planchet_detail.blinded_planchet! */
+      do {
+        if (GNUNET_OK !=
+            TALER_planchet_prepare (&csr->denom_pub->key,
+                                    &can->details.alg_values,
+                                    &can->details.blinding_key,
+                                    &csr->nonce,
+                                    &can->details.coin_priv,
+                                    &can->details.h_age_commitment,
+                                    &can->details.h_coin_pub,
+                                    planchet))
+        {
+          GNUNET_break (0);
+          break;
+        }
+
+        TALER_coin_ev_hash (&planchet->blinded_planchet,
+                            &planchet->denom_pub_hash,
+                            &can->blinded_coin_h);
+        success = true;
+      } while (0);
+
+      awh->csr.pending--;
+
+      /* No more pending requests to /csr-withdraw, we can now perform the
+       * actual age-withdraw operation */
+      if (0 == awh->csr.pending && success)
+        call_age_withdraw_blinded (awh);
+      return;
+    }
+  default:
+    break;
+  }
+  TALER_EXCHANGE_age_withdraw_cancel (awh);
+}
+
+
+/**
+ * @brief Prepare the coins for the call to age-withdraw and calculates
+ * the total amount with fees.
+ *
+ * For denomination with CS as cipher, initiates the preflight to retrieve the
+ * csr-parameter via /csr-withdraw.
+ *
+ * @param awh The handler to the age-withdraw
+ * @param num_coins The number of coins in @e coin_inputs
+ * @param coin_inputs The input for the individual coin(-candidates)
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
+static
+enum GNUNET_GenericReturnValue
+prepare_coins (
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh,
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[
+    static num_coins])
+{
+#define FAIL_IF(cond) \
+  do { \
+    if ((cond)) \
+    { \
+      GNUNET_break (! (cond)); \
+      goto ERROR; \
+    } \
+  } while (0)
+
+  GNUNET_assert (0 < num_coins);
+  awh->age_mask = coin_inputs[0].denom_pub->key.age_mask;
+
+  awh->coin_data = GNUNET_new_array (awh->num_coins,
+                                     struct CoinData);
+
+  for (size_t i = 0; i < num_coins; i++)
+  {
+    struct CoinData *cd = &awh->coin_data[i];
+    const struct TALER_EXCHANGE_AgeWithdrawCoinInput *input = &coin_inputs[i];
+
+    cd->denom_pub = *input->denom_pub;
+    /* The mask must be the same for all coins */
+    FAIL_IF (awh->age_mask.bits != input->denom_pub->key.age_mask.bits);
+    TALER_denom_pub_copy (&cd->denom_pub.key,
+                          &input->denom_pub->key);
+
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+    {
+      struct CoinCandidate *can = &cd->coin_candidates[k];
+      struct TALER_PlanchetDetail *planchet = &cd->planchet_details[k];
+
+      can->secret = input->secrets[k];
+      /* Derive the age restriction from the given secret and
+       * the maximum age */
+      TALER_age_restriction_from_secret (
+        &can->secret,
+        &input->denom_pub->key.age_mask,
+        awh->max_age,
+        &can->details.age_commitment_proof);
+
+      TALER_age_commitment_hash (&can->details.age_commitment_proof.commitment,
+                                 &can->details.h_age_commitment);
+
+      switch (input->denom_pub->key.bsign_pub_key->cipher)
+      {
+      case GNUNET_CRYPTO_BSA_RSA:
+        TALER_denom_ewv_copy (&can->details.alg_values,
+                              TALER_denom_ewv_rsa_singleton ());
+        TALER_planchet_setup_coin_priv (&can->secret,
+                                        &can->details.alg_values,
+                                        &can->details.coin_priv);
+        TALER_planchet_blinding_secret_create (&can->secret,
+                                               &can->details.alg_values,
+                                               &can->details.blinding_key);
+        FAIL_IF (GNUNET_OK !=
+                 TALER_planchet_prepare (&cd->denom_pub.key,
+                                         &can->details.alg_values,
+                                         &can->details.blinding_key,
+                                         NULL,
+                                         &can->details.coin_priv,
+                                         &can->details.h_age_commitment,
+                                         &can->details.h_coin_pub,
+                                         planchet));
+        TALER_coin_ev_hash (&planchet->blinded_planchet,
+                            &planchet->denom_pub_hash,
+                            &can->blinded_coin_h);
+        break;
+      case GNUNET_CRYPTO_BSA_CS:
+        {
+          struct CSRClosure *cls = &cd->csr_cls[k];
+          /**
+           * Save the handler and the denomination for the callback
+           * after the call to csr-withdraw */
+          cls->age_withdraw_handle = awh;
+          cls->candidate = can;
+          cls->planchet = planchet;
+          cls->denom_pub = &cd->denom_pub;
+          TALER_cs_withdraw_nonce_derive (
+            &can->secret,
+            &cls->nonce.cs_nonce);
+          cls->csr_withdraw_handle =
+            TALER_EXCHANGE_csr_withdraw (
+              awh->curl_ctx,
+              awh->exchange_url,
+              &cd->denom_pub,
+              &cls->nonce.cs_nonce,
+              &csr_withdraw_done,
+              cls);
+          FAIL_IF (NULL == cls->csr_withdraw_handle);
+
+          awh->csr.pending++;
+          break;
+        }
+      default:
+        FAIL_IF (1);
+      }
+    }
+  }
+  return GNUNET_OK;
+
+ERROR:
+  TALER_EXCHANGE_age_withdraw_cancel (awh);
+  return GNUNET_SYSERR;
+#undef FAIL_IF
+};
+
+struct TALER_EXCHANGE_AgeWithdrawHandle *
+TALER_EXCHANGE_age_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  struct TALER_EXCHANGE_Keys *keys,
+  const char *exchange_url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coin_inputs[const static
+                                                               num_coins],
+  uint8_t max_age,
+  TALER_EXCHANGE_AgeWithdrawCallback res_cb,
+  void *res_cb_cls)
+{
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh;
+
+  awh = GNUNET_new (struct TALER_EXCHANGE_AgeWithdrawHandle);
+  awh->exchange_url = exchange_url;
+  awh->keys = TALER_EXCHANGE_keys_incref (keys);
+  awh->curl_ctx = curl_ctx;
+  awh->reserve_priv = reserve_priv;
+  awh->callback = res_cb;
+  awh->callback_cls = res_cb_cls;
+  awh->num_coins = num_coins;
+  awh->max_age = max_age;
+
+
+  if (GNUNET_OK != prepare_coins (awh,
+                                  num_coins,
+                                  coin_inputs))
+  {
+    GNUNET_free (awh);
+    return NULL;
+  }
+
+  /* If there were no CS denominations, we can now perform the actual
+   * age-withdraw protocol.  Otherwise, there are calls to /csr-withdraw
+   * in flight and once they finish, the age-withdraw-protocol will be
+   * called from within the csr_withdraw_done-function.
+   */
+  if (0 == awh->csr.pending)
+    call_age_withdraw_blinded (awh);
+
+  return awh;
+}
+
+
+void
+TALER_EXCHANGE_age_withdraw_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawHandle *awh)
+{
+  /* Cleanup coin data */
+  for (unsigned int i = 0; i<awh->num_coins; i++)
+  {
+    struct CoinData *cd = &awh->coin_data[i];
+
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+    {
+      struct TALER_PlanchetDetail *planchet = &cd->planchet_details[k];
+      struct CSRClosure *cls = &cd->csr_cls[k];
+      struct CoinCandidate *can = &cd->coin_candidates[k];
+
+      if (NULL != cls->csr_withdraw_handle)
+      {
+        TALER_EXCHANGE_csr_withdraw_cancel (cls->csr_withdraw_handle);
+        cls->csr_withdraw_handle = NULL;
+      }
+      TALER_blinded_planchet_free (&planchet->blinded_planchet);
+      TALER_denom_ewv_free (&can->details.alg_values);
+    }
+    TALER_denom_pub_free (&cd->denom_pub.key);
+  }
+  GNUNET_free (awh->coin_data);
+  TALER_EXCHANGE_keys_decref (awh->keys);
+  TALER_EXCHANGE_age_withdraw_blinded_cancel (awh->procotol_handle);
+  awh->procotol_handle = NULL;
+  GNUNET_free (awh);
+}
+
+
+struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *
+TALER_EXCHANGE_age_withdraw_blinded (
+  struct GNUNET_CURL_Context *curl_ctx,
+  struct TALER_EXCHANGE_Keys *keys,
+  const char *exchange_url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  uint8_t max_age,
+  unsigned int num_input,
+  const struct TALER_EXCHANGE_AgeWithdrawBlindedInput blinded_input[static
+                                                                    num_input],
+  TALER_EXCHANGE_AgeWithdrawBlindedCallback res_cb,
+  void *res_cb_cls)
+{
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh =
+    GNUNET_new (struct TALER_EXCHANGE_AgeWithdrawBlindedHandle);
+
+  awbh->num_input = num_input;
+  awbh->blinded_input = blinded_input;
+  awbh->keys = TALER_EXCHANGE_keys_incref (keys);
+  awbh->curl_ctx = curl_ctx;
+  awbh->reserve_priv = reserve_priv;
+  awbh->callback = res_cb;
+  awbh->callback_cls = res_cb_cls;
+  awbh->max_age = max_age;
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&awbh->reserve_priv->eddsa_priv,
+                                      &awbh->reserve_pub.eddsa_pub);
+
+  if (GNUNET_OK != prepare_url (awbh,
+                                exchange_url))
+    return NULL;
+
+  perform_protocol (awbh);
+  return awbh;
+}
+
+
+void
+TALER_EXCHANGE_age_withdraw_blinded_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawBlindedHandle *awbh)
+{
+  if (NULL == awbh)
+    return;
+
+  if (NULL != awbh->job)
+  {
+    GNUNET_CURL_job_cancel (awbh->job);
+    awbh->job = NULL;
+  }
+  GNUNET_free (awbh->request_url);
+  TALER_EXCHANGE_keys_decref (awbh->keys);
+  TALER_curl_easy_post_finished (&awbh->post_ctx);
+  GNUNET_free (awbh);
+}
+
+
+/* exchange_api_age_withdraw.c */
diff --git a/src/lib/exchange_api_age_withdraw_reveal.c b/src/lib/exchange_api_age_withdraw_reveal.c
new file mode 100644
index 000000000..cade528d2
--- /dev/null
+++ b/src/lib/exchange_api_age_withdraw_reveal.c
@@ -0,0 +1,477 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_age_withdraw_reveal.c
+ * @brief Implementation of /age-withdraw/$ACH/reveal requests
+ * @author Özgür Kesim
+ */
+
+#include "platform.h"
+#include <gnunet/gnunet_common.h>
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+#include "taler_exchange_service.h"
+#include "exchange_api_common.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+/**
+ * Handler for a running age-withdraw-reveal  request
+ */
+struct TALER_EXCHANGE_AgeWithdrawRevealHandle
+{
+
+  /* The index not to be disclosed */
+  uint8_t noreveal_index;
+
+  /* The age-withdraw commitment */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+  /* The reserve's public key */
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /* Number of coins */
+  size_t num_coins;
+
+  /* The @e num_coins * kappa coin secrets from the age-withdraw commitment */
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput *coins_input;
+
+  /* The url for the reveal request */
+  char *request_url;
+
+  /**
+   * CURL handle for the request job.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Post Context
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /* Callback */
+  TALER_EXCHANGE_AgeWithdrawRevealCallback callback;
+
+  /* Reveal */
+  void *callback_cls;
+};
+
+
+/**
+ * We got a 200 OK response for the /age-withdraw/$ACH/reveal operation.
+ * Extract the signed blindedcoins and return it to the caller.
+ *
+ * @param awrh operation handle
+ * @param j_response reply from the exchange
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
+ */
+static enum GNUNET_GenericReturnValue
+age_withdraw_reveal_ok (
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh,
+  const json_t *j_response)
+{
+  struct TALER_EXCHANGE_AgeWithdrawRevealResponse response = {
+    .hr.reply = j_response,
+    .hr.http_status = MHD_HTTP_OK,
+  };
+  const json_t *j_sigs;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("ev_sigs",
+                                  &j_sigs),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK != GNUNET_JSON_parse (j_response,
+                                      spec,
+                                      NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  if (awrh->num_coins != json_array_size (j_sigs))
+  {
+    /* Number of coins generated does not match our expectation */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  {
+    struct TALER_BlindedDenominationSignature denom_sigs[awrh->num_coins];
+    json_t *j_sig;
+    size_t n;
+
+    /* Reconstruct the coins and unblind the signatures */
+    json_array_foreach (j_sigs, n, j_sig)
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        TALER_JSON_spec_blinded_denom_sig (NULL,
+                                           &denom_sigs[n]),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK != GNUNET_JSON_parse (j_sig,
+                                          spec,
+                                          NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
+
+    }
+
+    response.details.ok.num_sigs = awrh->num_coins;
+    response.details.ok.blinded_denom_sigs = denom_sigs;
+    awrh->callback (awrh->callback_cls,
+                    &response);
+    /* Make sure the callback isn't called again */
+    awrh->callback = NULL;
+    /* Free resources */
+    for (size_t i = 0; i < awrh->num_coins; i++)
+      TALER_blinded_denom_sig_free (&denom_sigs[i]);
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /age-withdraw/$ACH/reveal request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_AgeWithdrawRevealHandle`
+ * @param response_code The HTTP response code
+ * @param response response data
+ */
+static void
+handle_age_withdraw_reveal_finished (
+  void *cls,
+  long response_code,
+  const void *response)
+{
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh = cls;
+  const json_t *j_response = response;
+  struct TALER_EXCHANGE_AgeWithdrawRevealResponse awr = {
+    .hr.reply = j_response,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  awrh->job = NULL;
+  /* FIXME[oec]: Only handle response-codes that are in the spec */
+  switch (response_code)
+  {
+  case 0:
+    awr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    {
+      enum GNUNET_GenericReturnValue ret;
+
+      ret = age_withdraw_reveal_ok (awrh,
+                                    j_response);
+      if (GNUNET_OK != ret)
+      {
+        GNUNET_break_op (0);
+        awr.hr.http_status = 0;
+        awr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      GNUNET_assert (NULL == awrh->callback);
+      TALER_EXCHANGE_age_withdraw_reveal_cancel (awrh);
+      return;
+    }
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* only validate reply is well-formed */
+    {
+      uint64_t ptu;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_uint64 ("legitimization_uuid",
+                                 &ptu),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j_response,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        awr.hr.http_status = 0;
+        awr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    GNUNET_break_op (0);
+    /**
+     * This should never happen, as we don't sent any signatures
+     * to the exchange to verify.  We should simply pass the JSON reply
+     * to the application
+     **/
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, the exchange basically just says
+       that it doesn't know this age-withdraw commitment. */
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* An age commitment for one of the coins did not fulfill
+     * the required maximum age requirement of the corresponding
+     * reserve.
+     * Error code: TALER_EC_EXCHANGE_GENERIC_COIN_AGE_REQUIREMENT_FAILURE.
+     */
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_GONE:
+    /* could happen if denomination was revoked */
+    /* Note: one might want to check /keys for revocation
+       signature here, alas tricky in case our /keys
+       is outdated => left to clients */
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    awr.hr.ec = TALER_JSON_get_error_code (j_response);
+    awr.hr.hint = TALER_JSON_get_error_hint (j_response);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange age-withdraw\n",
+                (unsigned int) response_code,
+                (int) awr.hr.ec);
+    break;
+  }
+  awrh->callback (awrh->callback_cls,
+                  &awr);
+  TALER_EXCHANGE_age_withdraw_reveal_cancel (awrh);
+}
+
+
+/**
+ * Prepares the request URL for the age-withdraw-reveal request
+ *
+ * @param exchange_url The base-URL to the exchange
+ * @param[in,out] awrh The handler
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+static
+enum GNUNET_GenericReturnValue
+prepare_url (
+  const char *exchange_url,
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh)
+{
+  char arg_str[sizeof (struct TALER_AgeWithdrawCommitmentHashP) * 2 + 32];
+  char pub_str[sizeof (struct TALER_AgeWithdrawCommitmentHashP) * 2];
+  char *end;
+
+  end = GNUNET_STRINGS_data_to_string (&awrh->h_commitment,
+                                       sizeof (awrh->h_commitment),
+                                       pub_str,
+                                       sizeof (pub_str));
+  *end = '\0';
+  GNUNET_snprintf (arg_str,
+                   sizeof (arg_str),
+                   "age-withdraw/%s/reveal",
+                   pub_str);
+
+  awrh->request_url = TALER_url_join (exchange_url,
+                                      arg_str,
+                                      NULL);
+  if (NULL == awrh->request_url)
+  {
+    GNUNET_break (0);
+    TALER_EXCHANGE_age_withdraw_reveal_cancel (awrh);
+    return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Call /age-withdraw/$ACH/reveal
+ *
+ * @param curl_ctx The context for CURL
+ * @param awrh The handler
+ */
+static
+void
+perform_protocol (
+  struct GNUNET_CURL_Context *curl_ctx,
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh)
+{
+  CURL *curlh = NULL;
+  json_t *j_request_body = NULL;
+  json_t *j_array_of_secrets = NULL;
+  json_t *j_secrets = NULL;
+  json_t *j_sec = NULL;
+
+#define FAIL_IF(cond) \
+        do { \
+          if ((cond)) \
+          { \
+            GNUNET_break (! (cond)); \
+            goto ERROR; \
+          } \
+        } while (0)
+
+  j_array_of_secrets = json_array ();
+  FAIL_IF (NULL == j_array_of_secrets);
+
+  for (size_t n = 0; n < awrh->num_coins; n++)
+  {
+    const struct TALER_PlanchetMasterSecretP *secrets =
+      awrh->coins_input[n].secrets;
+
+    j_secrets = json_array ();
+    FAIL_IF (NULL == j_secrets);
+
+    for (uint8_t k = 0; k < TALER_CNC_KAPPA; k++)
+    {
+      const struct TALER_PlanchetMasterSecretP *secret = &secrets[k];
+      if (awrh->noreveal_index == k)
+        continue;
+
+      j_sec = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_auto (NULL, secret));
+
+      FAIL_IF (NULL == j_sec);
+      FAIL_IF (0 < json_array_append_new (j_secrets,
+                                          j_sec));
+    }
+
+    FAIL_IF (0 < json_array_append_new (j_array_of_secrets,
+                                        j_secrets));
+  }
+  j_request_body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_data_auto ("reserve_pub",
+                                awrh->reserve_pub),
+    GNUNET_JSON_pack_array_steal ("disclosed_coin_secrets",
+                                  j_array_of_secrets));
+  FAIL_IF (NULL == j_request_body);
+
+  curlh = TALER_EXCHANGE_curl_easy_get_ (awrh->request_url);
+  FAIL_IF (NULL == curlh);
+  FAIL_IF (GNUNET_OK !=
+           TALER_curl_easy_post (&awrh->post_ctx,
+                                 curlh,
+                                 j_request_body));
+  json_decref (j_request_body);
+  j_request_body = NULL;
+
+  awrh->job = GNUNET_CURL_job_add2 (curl_ctx,
+                                    curlh,
+                                    awrh->post_ctx.headers,
+                                    &handle_age_withdraw_reveal_finished,
+                                    awrh);
+  FAIL_IF (NULL == awrh->job);
+
+  /* No error, return */
+  return;
+
+ERROR:
+  if (NULL != j_sec)
+    json_decref (j_sec);
+  if (NULL != j_secrets)
+    json_decref (j_secrets);
+  if (NULL != j_array_of_secrets)
+    json_decref (j_array_of_secrets);
+  if (NULL != j_request_body)
+    json_decref (j_request_body);
+  if (NULL != curlh)
+    curl_easy_cleanup (curlh);
+  TALER_EXCHANGE_age_withdraw_reveal_cancel (awrh);
+  return;
+#undef FAIL_IF
+}
+
+
+struct TALER_EXCHANGE_AgeWithdrawRevealHandle *
+TALER_EXCHANGE_age_withdraw_reveal (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  size_t num_coins,
+  const struct TALER_EXCHANGE_AgeWithdrawCoinInput coins_input[static
+                                                               num_coins],
+  uint8_t noreveal_index,
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  TALER_EXCHANGE_AgeWithdrawRevealCallback reveal_cb,
+  void *reveal_cb_cls)
+{
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh =
+    GNUNET_new (struct TALER_EXCHANGE_AgeWithdrawRevealHandle);
+  awrh->noreveal_index = noreveal_index;
+  awrh->h_commitment = *h_commitment;
+  awrh->num_coins = num_coins;
+  awrh->coins_input = coins_input;
+  awrh->callback = reveal_cb;
+  awrh->callback_cls = reveal_cb_cls;
+  awrh->reserve_pub = reserve_pub;
+
+  if (GNUNET_OK !=
+      prepare_url (exchange_url,
+                   awrh))
+    return NULL;
+
+  perform_protocol (curl_ctx, awrh);
+
+  return awrh;
+}
+
+
+void
+TALER_EXCHANGE_age_withdraw_reveal_cancel (
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *awrh)
+{
+  if (NULL != awrh->job)
+  {
+    GNUNET_CURL_job_cancel (awrh->job);
+    awrh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&awrh->post_ctx);
+
+  if (NULL != awrh->request_url)
+    GNUNET_free (awrh->request_url);
+
+  GNUNET_free (awrh);
+}
+
+
+/* exchange_api_age_withdraw_reveal.c */
diff --git a/src/lib/exchange_api_auditor_add_denomination.c b/src/lib/exchange_api_auditor_add_denomination.c
index d01252a83..89de0d7f1 100644
--- a/src/lib/exchange_api_auditor_add_denomination.c
+++ b/src/lib/exchange_api_auditor_add_denomination.c
@@ -79,9 +79,9 @@ handle_auditor_add_denomination_finished (void *cls,
 {
   struct TALER_EXCHANGE_AuditorAddDenominationHandle *ah = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_AuditorAddDenominationResponse adr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   ah->job = NULL;
@@ -90,37 +90,37 @@ handle_auditor_add_denomination_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_GONE:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_PRECONDITION_FAILED:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     if (NULL != json)
     {
-      hr.ec = TALER_JSON_get_error_code (json);
-      hr.hint = TALER_JSON_get_error_hint (json);
+      adr.hr.ec = TALER_JSON_get_error_code (json);
+      adr.hr.hint = TALER_JSON_get_error_hint (json);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected response code %u/%d for exchange auditor-add-denomination at URL `%s'\n",
                   (unsigned int) response_code,
-                  (int) hr.ec,
+                  (int) adr.hr.ec,
                   ah->url);
     }
     else
     {
-      hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-      hr.hint = NULL;
+      adr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      adr.hr.hint = NULL;
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected HTTP response code %u (no JSON returned) at URL `%s'\n",
                   (unsigned int) response_code,
@@ -131,7 +131,7 @@ handle_auditor_add_denomination_finished (void *cls,
   if (NULL != ah->cb)
   {
     ah->cb (ah->cb_cls,
-            &hr);
+            &adr);
     ah->cb = NULL;
   }
   TALER_EXCHANGE_add_auditor_denomination_cancel (ah);
@@ -192,16 +192,17 @@ TALER_EXCHANGE_add_auditor_denomination (
     GNUNET_JSON_pack_data_auto ("auditor_sig",
                                 auditor_sig));
   eh = TALER_AUDITOR_curl_easy_get_ (ah->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&ah->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&ah->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (ah->url);
-    GNUNET_free (eh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_batch_deposit.c b/src/lib/exchange_api_batch_deposit.c
new file mode 100644
index 000000000..3dab64526
--- /dev/null
+++ b/src/lib/exchange_api_batch_deposit.c
@@ -0,0 +1,726 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2014-2023 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/>
+ */
+/**
+ * @file lib/exchange_api_batch_deposit.c
+ * @brief Implementation of the /batch-deposit request of the exchange's HTTP API
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_json_lib.h"
+#include "taler_auditor_service.h"
+#include "taler_exchange_service.h"
+#include "exchange_api_common.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * 1:#AUDITOR_CHANCE is the probability that we report deposits
+ * to the auditor.
+ *
+ * 20==5% of going to auditor. This is possibly still too high, but set
+ * deliberately this high for testing
+ */
+#define AUDITOR_CHANCE 20
+
+
+/**
+ * Entry in list of ongoing interactions with an auditor.
+ */
+struct TEAH_AuditorInteractionEntry
+{
+  /**
+   * DLL entry.
+   */
+  struct TEAH_AuditorInteractionEntry *next;
+
+  /**
+   * DLL entry.
+   */
+  struct TEAH_AuditorInteractionEntry *prev;
+
+  /**
+   * URL of our auditor. For logging.
+   */
+  const char *auditor_url;
+
+  /**
+   * Interaction state.
+   */
+  struct TALER_AUDITOR_DepositConfirmationHandle *dch;
+
+  /**
+   * Batch deposit this is for.
+   */
+  struct TALER_EXCHANGE_BatchDepositHandle *dh;
+};
+
+
+/**
+ * @brief A Deposit Handle
+ */
+struct TALER_EXCHANGE_BatchDepositHandle
+{
+
+  /**
+   * The keys of the exchange.
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * Context for our curl request(s).
+   */
+  struct GNUNET_CURL_Context *ctx;
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_BatchDepositResultCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Details about the contract.
+   */
+  struct TALER_EXCHANGE_DepositContractDetail dcd;
+
+  /**
+   * Array with details about the coins.
+   */
+  struct TALER_EXCHANGE_CoinDepositDetail *cdds;
+
+  /**
+   * Hash of the merchant's wire details.
+   */
+  struct TALER_MerchantWireHashP h_wire;
+
+  /**
+   * Hash over the extensions, or all zero.
+   */
+  struct TALER_ExtensionPolicyHashP h_policy;
+
+  /**
+   * Time when this confirmation was generated / when the exchange received
+   * the deposit request.
+   */
+  struct GNUNET_TIME_Timestamp exchange_timestamp;
+
+  /**
+   * Exchange signature, set for #auditor_cb.
+   */
+  struct TALER_ExchangeSignatureP exchange_sig;
+
+  /**
+   * Head of DLL of interactions with this auditor.
+   */
+  struct TEAH_AuditorInteractionEntry *ai_head;
+
+  /**
+   * Tail of DLL of interactions with this auditor.
+   */
+  struct TEAH_AuditorInteractionEntry *ai_tail;
+
+  /**
+   * Result to return to the application once @e ai_head is empty.
+   */
+  struct TALER_EXCHANGE_BatchDepositResult dr;
+
+  /**
+   * Exchange signing public key, set for #auditor_cb.
+   */
+  struct TALER_ExchangePublicKeyP exchange_pub;
+
+  /**
+   * Total amount deposited without fees as calculated by us.
+   */
+  struct TALER_Amount total_without_fee;
+
+  /**
+   * Response object to free at the end.
+   */
+  json_t *response;
+
+  /**
+   * Chance that we will inform the auditor about the deposit
+   * is 1:n, where the value of this field is "n".
+   */
+  unsigned int auditor_chance;
+
+  /**
+   * Length of the @e cdds array.
+   */
+  unsigned int num_cdds;
+
+};
+
+
+/**
+ * Finish batch deposit operation by calling the callback.
+ *
+ * @param[in] dh handle to finished batch deposit operation
+ */
+static void
+finish_dh (struct TALER_EXCHANGE_BatchDepositHandle *dh)
+{
+  dh->cb (dh->cb_cls,
+          &dh->dr);
+  TALER_EXCHANGE_batch_deposit_cancel (dh);
+}
+
+
+/**
+ * Function called with the result from our call to the
+ * auditor's /deposit-confirmation handler.
+ *
+ * @param cls closure of type `struct TEAH_AuditorInteractionEntry *`
+ * @param dcr response
+ */
+static void
+acc_confirmation_cb (
+  void *cls,
+  const struct TALER_AUDITOR_DepositConfirmationResponse *dcr)
+{
+  struct TEAH_AuditorInteractionEntry *aie = cls;
+  struct TALER_EXCHANGE_BatchDepositHandle *dh = aie->dh;
+
+  if (MHD_HTTP_OK != dcr->hr.http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to submit deposit confirmation to auditor `%s' with HTTP status %d (EC: %d). This is acceptable if it does not happen often.\n",
+                aie->auditor_url,
+                dcr->hr.http_status,
+                dcr->hr.ec);
+  }
+  GNUNET_CONTAINER_DLL_remove (dh->ai_head,
+                               dh->ai_tail,
+                               aie);
+  GNUNET_free (aie);
+  if (NULL == dh->ai_head)
+    finish_dh (dh);
+}
+
+
+/**
+ * Function called for each auditor to give us a chance to possibly
+ * launch a deposit confirmation interaction.
+ *
+ * @param cls closure
+ * @param auditor_url base URL of the auditor
+ * @param auditor_pub public key of the auditor
+ */
+static void
+auditor_cb (void *cls,
+            const char *auditor_url,
+            const struct TALER_AuditorPublicKeyP *auditor_pub)
+{
+  struct TALER_EXCHANGE_BatchDepositHandle *dh = cls;
+  const struct TALER_EXCHANGE_SigningPublicKey *spk;
+  struct TEAH_AuditorInteractionEntry *aie;
+  const struct TALER_CoinSpendSignatureP *csigs[GNUNET_NZL (
+                                                  dh->num_cdds)];
+  const struct TALER_CoinSpendPublicKeyP *cpubs[GNUNET_NZL (
+                                                  dh->num_cdds)];
+
+  for (unsigned int i = 0; i<dh->num_cdds; i++)
+  {
+    const struct TALER_EXCHANGE_CoinDepositDetail *cdd = &dh->cdds[i];
+
+    csigs[i] = &cdd->coin_sig;
+    cpubs[i] = &cdd->coin_pub;
+  }
+
+  if (0 !=
+      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                dh->auditor_chance))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Not providing deposit confirmation to auditor\n");
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Will provide deposit confirmation to auditor `%s'\n",
+              TALER_B2S (auditor_pub));
+  spk = TALER_EXCHANGE_get_signing_key_info (dh->keys,
+                                             &dh->exchange_pub);
+  if (NULL == spk)
+  {
+    GNUNET_break_op (0);
+    return;
+  }
+  aie = GNUNET_new (struct TEAH_AuditorInteractionEntry);
+  aie->dh = dh;
+  aie->auditor_url = auditor_url;
+  aie->dch = TALER_AUDITOR_deposit_confirmation (
+    dh->ctx,
+    auditor_url,
+    &dh->h_wire,
+    &dh->h_policy,
+    &dh->dcd.h_contract_terms,
+    dh->exchange_timestamp,
+    dh->dcd.wire_deadline,
+    dh->dcd.refund_deadline,
+    &dh->total_without_fee,
+    dh->num_cdds,
+    cpubs,
+    csigs,
+    &dh->dcd.merchant_pub,
+    &dh->exchange_pub,
+    &dh->exchange_sig,
+    &dh->keys->master_pub,
+    spk->valid_from,
+    spk->valid_until,
+    spk->valid_legal,
+    &spk->master_sig,
+    &acc_confirmation_cb,
+    aie);
+  GNUNET_CONTAINER_DLL_insert (dh->ai_head,
+                               dh->ai_tail,
+                               aie);
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /deposit request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_BatchDepositHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_deposit_finished (void *cls,
+                         long response_code,
+                         const void *response)
+{
+  struct TALER_EXCHANGE_BatchDepositHandle *dh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_BatchDepositResult *dr = &dh->dr;
+
+  dh->job = NULL;
+  dh->response = json_incref ((json_t*) j);
+  dr->hr.reply = dh->response;
+  dr->hr.http_status = (unsigned int) response_code;
+  switch (response_code)
+  {
+  case 0:
+    dr->hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                     &dh->exchange_sig),
+        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                     &dh->exchange_pub),
+        GNUNET_JSON_spec_mark_optional (
+          TALER_JSON_spec_web_url ("transaction_base_url",
+                                   &dr->details.ok.transaction_base_url),
+          NULL),
+        GNUNET_JSON_spec_timestamp ("exchange_timestamp",
+                                    &dh->exchange_timestamp),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        dr->hr.http_status = 0;
+        dr->hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      if (GNUNET_OK !=
+          TALER_EXCHANGE_test_signing_key (dh->keys,
+                                           &dh->exchange_pub))
+      {
+        GNUNET_break_op (0);
+        dr->hr.http_status = 0;
+        dr->hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
+        break;
+      }
+      {
+        const struct TALER_CoinSpendSignatureP *csigs[
+          GNUNET_NZL (dh->num_cdds)];
+
+        for (unsigned int i = 0; i<dh->num_cdds; i++)
+          csigs[i] = &dh->cdds[i].coin_sig;
+        if (GNUNET_OK !=
+            TALER_exchange_online_deposit_confirmation_verify (
+              &dh->dcd.h_contract_terms,
+              &dh->h_wire,
+              &dh->h_policy,
+              dh->exchange_timestamp,
+              dh->dcd.wire_deadline,
+              dh->dcd.refund_deadline,
+              &dh->total_without_fee,
+              dh->num_cdds,
+              csigs,
+              &dh->dcd.merchant_pub,
+              &dh->exchange_pub,
+              &dh->exchange_sig))
+        {
+          GNUNET_break_op (0);
+          dr->hr.http_status = 0;
+          dr->hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
+          break;
+        }
+      }
+      TEAH_get_auditors_for_dc (dh->keys,
+                                &auditor_cb,
+                                dh);
+    }
+    dr->details.ok.exchange_sig = &dh->exchange_sig;
+    dr->details.ok.exchange_pub = &dh->exchange_pub;
+    dr->details.ok.deposit_timestamp = dh->exchange_timestamp;
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says one of the signatures is
+       invalid; as we checked them, this should never happen, we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_CONFLICT:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                     &dr->details.conflict.coin_pub),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        dr->hr.http_status = 0;
+        dr->hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      dr->hr.ec = TALER_JSON_get_error_code (j);
+      dr->hr.hint = TALER_JSON_get_error_hint (j);
+    }
+    break;
+  case MHD_HTTP_GONE:
+    /* could happen if denomination was revoked */
+    /* Note: one might want to check /keys for revocation
+       signature here, alas tricky in case our /keys
+       is outdated => left to clients */
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    break;
+  default:
+    /* unexpected response code */
+    dr->hr.ec = TALER_JSON_get_error_code (j);
+    dr->hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange deposit\n",
+                (unsigned int) response_code,
+                dr->hr.ec);
+    GNUNET_break_op (0);
+    break;
+  }
+  if (NULL != dh->ai_head)
+    return;
+  finish_dh (dh);
+}
+
+
+struct TALER_EXCHANGE_BatchDepositHandle *
+TALER_EXCHANGE_batch_deposit (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DepositContractDetail *dcd,
+  unsigned int num_cdds,
+  const struct TALER_EXCHANGE_CoinDepositDetail cdds[static num_cdds],
+  TALER_EXCHANGE_BatchDepositResultCallback cb,
+  void *cb_cls,
+  enum TALER_ErrorCode *ec)
+{
+  struct TALER_EXCHANGE_BatchDepositHandle *dh;
+  json_t *deposit_obj;
+  json_t *deposits;
+  CURL *eh;
+  const struct GNUNET_HashCode *wallet_data_hashp;
+
+  if (0 == num_cdds)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  if (GNUNET_TIME_timestamp_cmp (dcd->refund_deadline,
+                                 >,
+                                 dcd->wire_deadline))
+  {
+    GNUNET_break_op (0);
+    *ec = TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE;
+    return NULL;
+  }
+  dh = GNUNET_new (struct TALER_EXCHANGE_BatchDepositHandle);
+  dh->auditor_chance = AUDITOR_CHANCE;
+  dh->cb = cb;
+  dh->cb_cls = cb_cls;
+  dh->cdds = GNUNET_memdup (cdds,
+                            num_cdds * sizeof (*cdds));
+  dh->num_cdds = num_cdds;
+  dh->dcd = *dcd;
+  if (NULL != dcd->policy_details)
+    TALER_deposit_policy_hash (dcd->policy_details,
+                               &dh->h_policy);
+  TALER_merchant_wire_signature_hash (dcd->merchant_payto_uri,
+                                      &dcd->wire_salt,
+                                      &dh->h_wire);
+  deposits = json_array ();
+  GNUNET_assert (NULL != deposits);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (cdds[0].amount.currency,
+                                        &dh->total_without_fee));
+  for (unsigned int i = 0; i<num_cdds; i++)
+  {
+    const struct TALER_EXCHANGE_CoinDepositDetail *cdd = &cdds[i];
+    const struct TALER_EXCHANGE_DenomPublicKey *dki;
+    const struct TALER_AgeCommitmentHash *h_age_commitmentp;
+    struct TALER_Amount amount_without_fee;
+
+    dki = TALER_EXCHANGE_get_denomination_key_by_hash (keys,
+                                                       &cdd->h_denom_pub);
+    if (NULL == dki)
+    {
+      *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
+      GNUNET_break_op (0);
+      json_decref (deposits);
+      return NULL;
+    }
+    if (0 >
+        TALER_amount_subtract (&amount_without_fee,
+                               &cdd->amount,
+                               &dki->fees.deposit))
+    {
+      *ec = TALER_EC_EXCHANGE_DEPOSIT_FEE_ABOVE_AMOUNT;
+      GNUNET_break_op (0);
+      GNUNET_free (dh->cdds);
+      GNUNET_free (dh);
+      json_decref (deposits);
+      return NULL;
+    }
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&dh->total_without_fee,
+                                     &dh->total_without_fee,
+                                     &amount_without_fee));
+    if (GNUNET_OK !=
+        TALER_EXCHANGE_verify_deposit_signature_ (dcd,
+                                                  &dh->h_policy,
+                                                  &dh->h_wire,
+                                                  cdd,
+                                                  dki))
+    {
+      *ec = TALER_EC_EXCHANGE_DEPOSIT_COIN_SIGNATURE_INVALID;
+      GNUNET_break_op (0);
+      GNUNET_free (dh->cdds);
+      GNUNET_free (dh);
+      json_decref (deposits);
+      return NULL;
+    }
+    if (GNUNET_is_zero (&cdd->h_age_commitment))
+      h_age_commitmentp = NULL;
+    else
+      h_age_commitmentp = &cdd->h_age_commitment;
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        deposits,
+        GNUNET_JSON_PACK (
+          TALER_JSON_pack_amount ("contribution",
+                                  &cdd->amount),
+          GNUNET_JSON_pack_data_auto ("denom_pub_hash",
+                                      &cdd->h_denom_pub),
+          TALER_JSON_pack_denom_sig ("ub_sig",
+                                     &cdd->denom_sig),
+          GNUNET_JSON_pack_data_auto ("coin_pub",
+                                      &cdd->coin_pub),
+          GNUNET_JSON_pack_allow_null (
+            GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                        h_age_commitmentp)),
+          GNUNET_JSON_pack_data_auto ("coin_sig",
+                                      &cdd->coin_sig)
+          )));
+  }
+  dh->url = TALER_url_join (url,
+                            "batch-deposit",
+                            NULL);
+  if (NULL == dh->url)
+  {
+    GNUNET_break (0);
+    *ec = TALER_EC_GENERIC_ALLOCATION_FAILURE;
+    GNUNET_free (dh->url);
+    GNUNET_free (dh->cdds);
+    GNUNET_free (dh);
+    json_decref (deposits);
+    return NULL;
+  }
+
+  if (GNUNET_is_zero (&dcd->wallet_data_hash))
+    wallet_data_hashp = NULL;
+  else
+    wallet_data_hashp = &dcd->wallet_data_hash;
+
+  deposit_obj = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("merchant_payto_uri",
+                             dcd->merchant_payto_uri),
+    GNUNET_JSON_pack_data_auto ("wire_salt",
+                                &dcd->wire_salt),
+    GNUNET_JSON_pack_data_auto ("h_contract_terms",
+                                &dcd->h_contract_terms),
+    GNUNET_JSON_pack_array_steal ("coins",
+                                  deposits),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_data_auto ("wallet_data_hash",
+                                  wallet_data_hashp)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_object_steal ("policy_details",
+                                     (json_t *) dcd->policy_details)),
+    GNUNET_JSON_pack_timestamp ("timestamp",
+                                dcd->wallet_timestamp),
+    GNUNET_JSON_pack_data_auto ("merchant_pub",
+                                &dcd->merchant_pub),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_timestamp ("refund_deadline",
+                                  dcd->refund_deadline)),
+    GNUNET_JSON_pack_timestamp ("wire_transfer_deadline",
+                                dcd->wire_deadline));
+  GNUNET_assert (NULL != deposit_obj);
+  eh = TALER_EXCHANGE_curl_easy_get_ (dh->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&dh->post_ctx,
+                              eh,
+                              deposit_obj)) )
+  {
+    *ec = TALER_EC_GENERIC_CURL_ALLOCATION_FAILURE;
+    GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
+    json_decref (deposit_obj);
+    GNUNET_free (dh->cdds);
+    GNUNET_free (dh->url);
+    GNUNET_free (dh);
+    return NULL;
+  }
+  json_decref (deposit_obj);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "URL for deposit: `%s'\n",
+              dh->url);
+  dh->ctx = ctx;
+  dh->keys = TALER_EXCHANGE_keys_incref (keys);
+  dh->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  dh->post_ctx.headers,
+                                  &handle_deposit_finished,
+                                  dh);
+  return dh;
+}
+
+
+void
+TALER_EXCHANGE_batch_deposit_force_dc (
+  struct TALER_EXCHANGE_BatchDepositHandle *deposit)
+{
+  deposit->auditor_chance = 1;
+}
+
+
+void
+TALER_EXCHANGE_batch_deposit_cancel (
+  struct TALER_EXCHANGE_BatchDepositHandle *deposit)
+{
+  struct TEAH_AuditorInteractionEntry *aie;
+
+  while (NULL != (aie = deposit->ai_head))
+  {
+    GNUNET_assert (aie->dh == deposit);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Not sending deposit confirmation to auditor `%s' due to cancellation\n",
+                aie->auditor_url);
+    TALER_AUDITOR_deposit_confirmation_cancel (aie->dch);
+    GNUNET_CONTAINER_DLL_remove (deposit->ai_head,
+                                 deposit->ai_tail,
+                                 aie);
+    GNUNET_free (aie);
+  }
+  if (NULL != deposit->job)
+  {
+    GNUNET_CURL_job_cancel (deposit->job);
+    deposit->job = NULL;
+  }
+  TALER_EXCHANGE_keys_decref (deposit->keys);
+  GNUNET_free (deposit->url);
+  GNUNET_free (deposit->cdds);
+  TALER_curl_easy_post_finished (&deposit->post_ctx);
+  json_decref (deposit->response);
+  GNUNET_free (deposit);
+}
+
+
+/* end of exchange_api_batch_deposit.c */
diff --git a/src/lib/exchange_api_batch_withdraw.c b/src/lib/exchange_api_batch_withdraw.c
new file mode 100644
index 000000000..a1b21f347
--- /dev/null
+++ b/src/lib/exchange_api_batch_withdraw.c
@@ -0,0 +1,463 @@
+/*
+  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/>
+*/
+/**
+ * @file lib/exchange_api_batch_withdraw.c
+ * @brief Implementation of /reserves/$RESERVE_PUB/batch-withdraw requests with blinding/unblinding
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * Data we keep per coin in the batch.
+ */
+struct CoinData
+{
+
+  /**
+   * Denomination key we are withdrawing.
+   */
+  struct TALER_EXCHANGE_DenomPublicKey pk;
+
+  /**
+   * Master key material for the coin.
+   */
+  struct TALER_PlanchetMasterSecretP ps;
+
+  /**
+   * Age commitment for the coin.
+   */
+  const struct TALER_AgeCommitmentHash *ach;
+
+  /**
+   * blinding secret
+   */
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+
+  /**
+   * Session nonce.
+   */
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
+
+  /**
+   * Private key of the coin we are withdrawing.
+   */
+  struct TALER_CoinSpendPrivateKeyP priv;
+
+  /**
+   * Details of the planchet.
+   */
+  struct TALER_PlanchetDetail pd;
+
+  /**
+   * Values of the cipher selected
+   */
+  struct TALER_ExchangeWithdrawValues alg_values;
+
+  /**
+   * Hash of the public key of the coin we are signing.
+   */
+  struct TALER_CoinPubHashP c_hash;
+
+  /**
+   * Handler for the CS R request (only used for GNUNET_CRYPTO_BSA_CS denominations)
+   */
+  struct TALER_EXCHANGE_CsRWithdrawHandle *csrh;
+
+  /**
+   * Batch withdraw this coin is part of.
+   */
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh;
+};
+
+
+/**
+ * @brief A batch withdraw handle
+ */
+struct TALER_EXCHANGE_BatchWithdrawHandle
+{
+
+  /**
+   * The curl context to use
+   */
+  struct GNUNET_CURL_Context *curl_ctx;
+
+  /**
+   * The base URL to the exchange
+   */
+  const char *exchange_url;
+
+  /**
+   * The /keys information from the exchange
+   */
+  const struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * Handle for the actual (internal) batch withdraw operation.
+   */
+  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh2;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_BatchWithdrawCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reserve private key.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Array of per-coin data.
+   */
+  struct CoinData *coins;
+
+  /**
+   * Length of the @e coins array.
+   */
+  unsigned int num_coins;
+
+  /**
+   * Number of CS requests still pending.
+   */
+  unsigned int cs_pending;
+
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /reserves/$RESERVE_PUB/batch-withdraw request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_BatchWithdrawHandle`
+ * @param bw2r response data
+ */
+static void
+handle_reserve_batch_withdraw_finished (
+  void *cls,
+  const struct TALER_EXCHANGE_BatchWithdraw2Response *bw2r)
+{
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh = cls;
+  struct TALER_EXCHANGE_BatchWithdrawResponse wr = {
+    .hr = bw2r->hr
+  };
+  struct TALER_EXCHANGE_PrivateCoinDetails coins[GNUNET_NZL (wh->num_coins)];
+
+  wh->wh2 = NULL;
+  memset (coins,
+          0,
+          sizeof (coins));
+  switch (bw2r->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    {
+      if (bw2r->details.ok.blind_sigs_length != wh->num_coins)
+      {
+        GNUNET_break_op (0);
+        wr.hr.http_status = 0;
+        wr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      for (unsigned int i = 0; i<wh->num_coins; i++)
+      {
+        struct CoinData *cd = &wh->coins[i];
+        struct TALER_EXCHANGE_PrivateCoinDetails *coin = &coins[i];
+        struct TALER_FreshCoin fc;
+
+        if (GNUNET_OK !=
+            TALER_planchet_to_coin (&cd->pk.key,
+                                    &bw2r->details.ok.blind_sigs[i],
+                                    &cd->bks,
+                                    &cd->priv,
+                                    cd->ach,
+                                    &cd->c_hash,
+                                    &cd->alg_values,
+                                    &fc))
+        {
+          wr.hr.http_status = 0;
+          wr.hr.ec = TALER_EC_EXCHANGE_WITHDRAW_UNBLIND_FAILURE;
+          break;
+        }
+        coin->coin_priv = cd->priv;
+        coin->bks = cd->bks;
+        coin->sig = fc.sig;
+        coin->exchange_vals = cd->alg_values;
+      }
+      wr.details.ok.coins = coins;
+      wr.details.ok.num_coins = wh->num_coins;
+      break;
+    }
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto (
+          "h_payto",
+          &wr.details.unavailable_for_legal_reasons.h_payto),
+        GNUNET_JSON_spec_uint64 (
+          "requirement_row",
+          &wr.details.unavailable_for_legal_reasons.requirement_row),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (bw2r->hr.reply,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        wr.hr.http_status = 0;
+        wr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+    break;
+  default:
+    break;
+  }
+  wh->cb (wh->cb_cls,
+          &wr);
+  for (unsigned int i = 0; i<wh->num_coins; i++)
+    TALER_denom_sig_free (&coins[i].sig);
+  TALER_EXCHANGE_batch_withdraw_cancel (wh);
+}
+
+
+/**
+ * Runs phase two, the actual withdraw operation.
+ * Started once the preparation for CS-denominations is
+ * done.
+ *
+ * @param[in,out] wh batch withdraw to start phase 2 for
+ */
+static void
+phase_two (struct TALER_EXCHANGE_BatchWithdrawHandle *wh)
+{
+  struct TALER_PlanchetDetail pds[wh->num_coins];
+
+  for (unsigned int i = 0; i<wh->num_coins; i++)
+  {
+    struct CoinData *cd = &wh->coins[i];
+
+    pds[i] = cd->pd;
+  }
+  wh->wh2 = TALER_EXCHANGE_batch_withdraw2 (
+    wh->curl_ctx,
+    wh->exchange_url,
+    wh->keys,
+    wh->reserve_priv,
+    wh->num_coins,
+    pds,
+    &handle_reserve_batch_withdraw_finished,
+    wh);
+}
+
+
+/**
+ * Function called when stage 1 of CS withdraw is finished (request r_pub's)
+ *
+ * @param cls the `struct CoinData *`
+ * @param csrr replies from the /csr-withdraw request
+ */
+static void
+withdraw_cs_stage_two_callback (
+  void *cls,
+  const struct TALER_EXCHANGE_CsRWithdrawResponse *csrr)
+{
+  struct CoinData *cd = cls;
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh = cd->wh;
+  struct TALER_EXCHANGE_BatchWithdrawResponse wr = {
+    .hr = csrr->hr
+  };
+
+  cd->csrh = NULL;
+  GNUNET_assert (GNUNET_CRYPTO_BSA_CS ==
+                 cd->pk.key.bsign_pub_key->cipher);
+  switch (csrr->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    GNUNET_assert (NULL ==
+                   cd->alg_values.blinding_inputs);
+    TALER_denom_ewv_copy (&cd->alg_values,
+                          &csrr->details.ok.alg_values);
+    TALER_planchet_setup_coin_priv (&cd->ps,
+                                    &cd->alg_values,
+                                    &cd->priv);
+    TALER_planchet_blinding_secret_create (&cd->ps,
+                                           &cd->alg_values,
+                                           &cd->bks);
+    if (GNUNET_OK !=
+        TALER_planchet_prepare (&cd->pk.key,
+                                &cd->alg_values,
+                                &cd->bks,
+                                &cd->nonce,
+                                &cd->priv,
+                                cd->ach,
+                                &cd->c_hash,
+                                &cd->pd))
+    {
+      GNUNET_break (0);
+      wr.hr.http_status = 0;
+      wr.hr.ec = TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR;
+      wh->cb (wh->cb_cls,
+              &wr);
+      TALER_EXCHANGE_batch_withdraw_cancel (wh);
+      return;
+    }
+    wh->cs_pending--;
+    if (0 == wh->cs_pending)
+      phase_two (wh);
+    return;
+  default:
+    break;
+  }
+  wh->cb (wh->cb_cls,
+          &wr);
+  TALER_EXCHANGE_batch_withdraw_cancel (wh);
+}
+
+
+struct TALER_EXCHANGE_BatchWithdrawHandle *
+TALER_EXCHANGE_batch_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  unsigned int wci_length,
+  const struct TALER_EXCHANGE_WithdrawCoinInput wcis[static wci_length],
+  TALER_EXCHANGE_BatchWithdrawCallback res_cb,
+  void *res_cb_cls)
+{
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh;
+
+  wh = GNUNET_new (struct TALER_EXCHANGE_BatchWithdrawHandle);
+  wh->curl_ctx = curl_ctx;
+  wh->exchange_url = exchange_url;
+  wh->keys = keys;
+  wh->cb = res_cb;
+  wh->cb_cls = res_cb_cls;
+  wh->reserve_priv = reserve_priv;
+  wh->num_coins = wci_length;
+  wh->coins = GNUNET_new_array (wh->num_coins,
+                                struct CoinData);
+  for (unsigned int i = 0; i<wci_length; i++)
+  {
+    struct CoinData *cd = &wh->coins[i];
+    const struct TALER_EXCHANGE_WithdrawCoinInput *wci = &wcis[i];
+
+    cd->wh = wh;
+    cd->ps = *wci->ps;
+    cd->ach = wci->ach;
+    cd->pk = *wci->pk;
+    TALER_denom_pub_copy (&cd->pk.key,
+                          &wci->pk->key);
+    switch (wci->pk->key.bsign_pub_key->cipher)
+    {
+    case GNUNET_CRYPTO_BSA_RSA:
+      TALER_denom_ewv_copy (&cd->alg_values,
+                            TALER_denom_ewv_rsa_singleton ());
+      TALER_planchet_setup_coin_priv (&cd->ps,
+                                      &cd->alg_values,
+                                      &cd->priv);
+      TALER_planchet_blinding_secret_create (&cd->ps,
+                                             &cd->alg_values,
+                                             &cd->bks);
+      if (GNUNET_OK !=
+          TALER_planchet_prepare (&cd->pk.key,
+                                  &cd->alg_values,
+                                  &cd->bks,
+                                  NULL,
+                                  &cd->priv,
+                                  cd->ach,
+                                  &cd->c_hash,
+                                  &cd->pd))
+      {
+        GNUNET_break (0);
+        TALER_EXCHANGE_batch_withdraw_cancel (wh);
+        return NULL;
+      }
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
+      TALER_cs_withdraw_nonce_derive (
+        &cd->ps,
+        &cd->nonce.cs_nonce);
+      cd->csrh = TALER_EXCHANGE_csr_withdraw (
+        curl_ctx,
+        exchange_url,
+        &cd->pk,
+        &cd->nonce.cs_nonce,
+        &withdraw_cs_stage_two_callback,
+        cd);
+      if (NULL == cd->csrh)
+      {
+        GNUNET_break (0);
+        TALER_EXCHANGE_batch_withdraw_cancel (wh);
+        return NULL;
+      }
+      wh->cs_pending++;
+      break;
+    default:
+      GNUNET_break (0);
+      TALER_EXCHANGE_batch_withdraw_cancel (wh);
+      return NULL;
+    }
+  }
+  if (0 == wh->cs_pending)
+    phase_two (wh);
+  return wh;
+}
+
+
+void
+TALER_EXCHANGE_batch_withdraw_cancel (
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wh)
+{
+  for (unsigned int i = 0; i<wh->num_coins; i++)
+  {
+    struct CoinData *cd = &wh->coins[i];
+
+    if (NULL != cd->csrh)
+    {
+      TALER_EXCHANGE_csr_withdraw_cancel (cd->csrh);
+      cd->csrh = NULL;
+    }
+    TALER_denom_ewv_free (&cd->alg_values);
+    TALER_blinded_planchet_free (&cd->pd.blinded_planchet);
+    TALER_denom_pub_free (&cd->pk.key);
+  }
+  GNUNET_free (wh->coins);
+  if (NULL != wh->wh2)
+  {
+    TALER_EXCHANGE_batch_withdraw2_cancel (wh->wh2);
+    wh->wh2 = NULL;
+  }
+  GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_batch_withdraw2.c b/src/lib/exchange_api_batch_withdraw2.c
new file mode 100644
index 000000000..ff1496466
--- /dev/null
+++ b/src/lib/exchange_api_batch_withdraw2.c
@@ -0,0 +1,441 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file lib/exchange_api_batch_withdraw2.c
+ * @brief Implementation of /reserves/$RESERVE_PUB/batch-withdraw requests without blinding/unblinding
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A batch withdraw handle
+ */
+struct TALER_EXCHANGE_BatchWithdraw2Handle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * The /keys material from the exchange
+   */
+  const struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_BatchWithdraw2Callback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Total amount requested (value plus withdraw fee).
+   */
+  struct TALER_Amount requested_amount;
+
+  /**
+   * Public key of the reserve we are withdrawing from.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Number of coins expected.
+   */
+  unsigned int num_coins;
+};
+
+
+/**
+ * We got a 200 OK response for the /reserves/$RESERVE_PUB/batch-withdraw operation.
+ * Extract the coin's signature and return it to the caller.  The signature we
+ * get from the exchange is for the blinded value. As we do not have the
+ * blinding factor, the signature CANNOT be verified.
+ *
+ * If everything checks out, we return the unblinded signature
+ * to the application via the callback.
+ *
+ * @param wh operation handle
+ * @param json reply from the exchange
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
+ */
+static enum GNUNET_GenericReturnValue
+reserve_batch_withdraw_ok (struct TALER_EXCHANGE_BatchWithdraw2Handle *wh,
+                           const json_t *json)
+{
+  struct TALER_BlindedDenominationSignature blind_sigs[GNUNET_NZL (
+                                                         wh->num_coins)];
+  const json_t *ja = json_object_get (json,
+                                      "ev_sigs");
+  const json_t *j;
+  size_t index;
+  struct TALER_EXCHANGE_BatchWithdraw2Response bwr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
+
+  if ( (NULL == ja) ||
+       (! json_is_array (ja)) ||
+       (wh->num_coins != json_array_size (ja)) )
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  json_array_foreach (ja, index, j)
+  {
+    struct GNUNET_JSON_Specification spec[] = {
+      TALER_JSON_spec_blinded_denom_sig ("ev_sig",
+                                         &blind_sigs[index]),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (j,
+                           spec,
+                           NULL, NULL))
+    {
+      GNUNET_break_op (0);
+      for (size_t i = 0; i<index; i++)
+        TALER_blinded_denom_sig_free (&blind_sigs[i]);
+      return GNUNET_SYSERR;
+    }
+  }
+
+  /* signature is valid, return it to the application */
+  bwr.details.ok.blind_sigs = blind_sigs;
+  bwr.details.ok.blind_sigs_length = wh->num_coins;
+  wh->cb (wh->cb_cls,
+          &bwr);
+  /* make sure callback isn't called again after return */
+  wh->cb = NULL;
+  for (unsigned int i = 0; i<wh->num_coins; i++)
+    TALER_blinded_denom_sig_free (&blind_sigs[i]);
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /reserves/$RESERVE_PUB/batch-withdraw request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_BatchWithdraw2Handle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_reserve_batch_withdraw_finished (void *cls,
+                                        long response_code,
+                                        const void *response)
+{
+  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_BatchWithdraw2Response bwr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  wh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    bwr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        reserve_batch_withdraw_ok (wh,
+                                   j))
+    {
+      GNUNET_break_op (0);
+      bwr.hr.http_status = 0;
+      bwr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      break;
+    }
+    GNUNET_assert (NULL == wh->cb);
+    TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+    return;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    GNUNET_break_op (0);
+    /* Nothing really to verify, exchange says one of the signatures is
+       invalid; as we checked them, this should never happen, we
+       should pass the JSON reply to the application */
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, the exchange basically just says
+       that it doesn't know this reserve.  Can happen if we
+       query before the wire transfer went through.
+       We should simply pass the JSON reply to the application. */
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_CONFLICT:
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_GONE:
+    /* could happen if denomination was revoked */
+    /* Note: one might want to check /keys for revocation
+       signature here, alas tricky in case our /keys
+       is outdated => left to clients */
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto (
+          "h_payto",
+          &bwr.details.unavailable_for_legal_reasons.h_payto),
+        GNUNET_JSON_spec_uint64 ("requirement_row",
+                                 &bwr.details.unavailable_for_legal_reasons.
+                                 kyc_requirement_id),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        bwr.hr.http_status = 0;
+        bwr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    bwr.hr.ec = TALER_JSON_get_error_code (j);
+    bwr.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange batch withdraw\n",
+                (unsigned int) response_code,
+                (int) bwr.hr.ec);
+    break;
+  }
+  if (NULL != wh->cb)
+  {
+    wh->cb (wh->cb_cls,
+            &bwr);
+    wh->cb = NULL;
+  }
+  TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+}
+
+
+struct TALER_EXCHANGE_BatchWithdraw2Handle *
+TALER_EXCHANGE_batch_withdraw2 (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  unsigned int pds_length,
+  const struct TALER_PlanchetDetail pds[static pds_length],
+  TALER_EXCHANGE_BatchWithdraw2Callback res_cb,
+  void *res_cb_cls)
+{
+  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh;
+  const struct TALER_EXCHANGE_DenomPublicKey *dk;
+  struct TALER_ReserveSignatureP reserve_sig;
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
+  struct TALER_BlindedCoinHashP bch;
+  json_t *jc;
+
+  GNUNET_assert (NULL != keys);
+  wh = GNUNET_new (struct TALER_EXCHANGE_BatchWithdraw2Handle);
+  wh->keys = keys;
+  wh->cb = res_cb;
+  wh->cb_cls = res_cb_cls;
+  wh->num_coins = pds_length;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (keys->currency,
+                                        &wh->requested_amount));
+  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+                                      &wh->reserve_pub.eddsa_pub);
+  {
+    char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &wh->reserve_pub,
+      sizeof (struct TALER_ReservePublicKeyP),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "reserves/%s/batch-withdraw",
+                     pub_str);
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Attempting to batch-withdraw from reserve %s\n",
+              TALER_B2S (&wh->reserve_pub));
+  wh->url = TALER_url_join (exchange_url,
+                            arg_str,
+                            NULL);
+  if (NULL == wh->url)
+  {
+    GNUNET_break (0);
+    TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+    return NULL;
+  }
+  jc = json_array ();
+  GNUNET_assert (NULL != jc);
+  for (unsigned int i = 0; i<pds_length; i++)
+  {
+    const struct TALER_PlanchetDetail *pd = &pds[i];
+    struct TALER_Amount coin_total;
+    json_t *withdraw_obj;
+
+    dk = TALER_EXCHANGE_get_denomination_key_by_hash (keys,
+                                                      &pd->denom_pub_hash);
+    if (NULL == dk)
+    {
+      TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+      json_decref (jc);
+      GNUNET_break (0);
+      return NULL;
+    }
+    /* Compute how much we expected to charge to the reserve */
+    if (0 >
+        TALER_amount_add (&coin_total,
+                          &dk->fees.withdraw,
+                          &dk->value))
+    {
+      /* Overflow here? Very strange, our CPU must be fried... */
+      GNUNET_break (0);
+      TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+      json_decref (jc);
+      return NULL;
+    }
+    if (0 >
+        TALER_amount_add (&wh->requested_amount,
+                          &wh->requested_amount,
+                          &coin_total))
+    {
+      /* Overflow here? Very strange, our CPU must be fried... */
+      GNUNET_break (0);
+      TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+      json_decref (jc);
+      return NULL;
+    }
+    TALER_coin_ev_hash (&pd->blinded_planchet,
+                        &pd->denom_pub_hash,
+                        &bch);
+    TALER_wallet_withdraw_sign (&pd->denom_pub_hash,
+                                &coin_total,
+                                &bch,
+                                reserve_priv,
+                                &reserve_sig);
+    withdraw_obj = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_data_auto ("denom_pub_hash",
+                                  &pd->denom_pub_hash),
+      TALER_JSON_pack_blinded_planchet ("coin_ev",
+                                        &pd->blinded_planchet),
+      GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                  &reserve_sig));
+    GNUNET_assert (NULL != withdraw_obj);
+    GNUNET_assert (0 ==
+                   json_array_append_new (jc,
+                                          withdraw_obj));
+  }
+  {
+    CURL *eh;
+    json_t *req;
+
+    req = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_array_steal ("planchets",
+                                    jc));
+    eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
+    if ( (NULL == eh) ||
+         (GNUNET_OK !=
+          TALER_curl_easy_post (&wh->post_ctx,
+                                eh,
+                                req)) )
+    {
+      GNUNET_break (0);
+      if (NULL != eh)
+        curl_easy_cleanup (eh);
+      json_decref (req);
+      TALER_EXCHANGE_batch_withdraw2_cancel (wh);
+      return NULL;
+    }
+    json_decref (req);
+    wh->job = GNUNET_CURL_job_add2 (curl_ctx,
+                                    eh,
+                                    wh->post_ctx.headers,
+                                    &handle_reserve_batch_withdraw_finished,
+                                    wh);
+  }
+  return wh;
+}
+
+
+void
+TALER_EXCHANGE_batch_withdraw2_cancel (
+  struct TALER_EXCHANGE_BatchWithdraw2Handle *wh)
+{
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  GNUNET_free (wh->url);
+  TALER_curl_easy_post_finished (&wh->post_ctx);
+  GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_coins_history.c b/src/lib/exchange_api_coins_history.c
new file mode 100644
index 000000000..0999e185e
--- /dev/null
+++ b/src/lib/exchange_api_coins_history.c
@@ -0,0 +1,1230 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file lib/exchange_api_coins_history.c
+ * @brief Implementation of the POST /coins/$COIN_PUB/history requests
+ * @author Christian Grothoff
+ *
+ * NOTE: this is an incomplete draft, never finished!
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP history codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A /coins/$RID/history Handle
+ */
+struct TALER_EXCHANGE_CoinsHistoryHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_CoinsHistoryCallback cb;
+
+  /**
+   * Public key of the coin we are querying.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+};
+
+
+/**
+ * Context for coin helpers.
+ */
+struct CoinHistoryParseContext
+{
+
+  /**
+   * Keys of the exchange.
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * Denomination of the coin.
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *dk;
+
+  /**
+   * Our coin public key.
+   */
+  const struct TALER_CoinSpendPublicKeyP *coin_pub;
+
+  /**
+   * Where to sum up total refunds.
+   */
+  struct TALER_Amount *total_in;
+
+  /**
+   * Total amount encountered.
+   */
+  struct TALER_Amount *total_out;
+
+};
+
+
+/**
+ * Signature of functions that operate on one of
+ * the coin's history entries.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh where to write the history entry
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+typedef enum GNUNET_GenericReturnValue
+(*CoinCheckHelper)(struct CoinHistoryParseContext *pc,
+                   struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                   const struct TALER_Amount *amount,
+                   json_t *transaction);
+
+
+/**
+ * Handle deposit entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_deposit (struct CoinHistoryParseContext *pc,
+              struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+              const struct TALER_Amount *amount,
+              json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.deposit.sig),
+    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
+                                 &rh->details.deposit.h_contract_terms),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("wallet_data_hash",
+                                   &rh->details.deposit.wallet_data_hash),
+      &rh->details.deposit.no_wallet_data_hash),
+    GNUNET_JSON_spec_fixed_auto ("h_wire",
+                                 &rh->details.deposit.h_wire),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
+                                   &rh->details.deposit.hac),
+      &rh->details.deposit.no_hac),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_policy",
+                                   &rh->details.deposit.h_policy),
+      &rh->details.deposit.no_h_policy),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.deposit.wallet_timestamp),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_timestamp ("refund_deadline",
+                                  &rh->details.deposit.refund_deadline),
+      NULL),
+    TALER_JSON_spec_amount_any ("deposit_fee",
+                                &rh->details.deposit.deposit_fee),
+    GNUNET_JSON_spec_fixed_auto ("merchant_pub",
+                                 &rh->details.deposit.merchant_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->details.deposit.refund_deadline = GNUNET_TIME_UNIT_ZERO_TS;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_deposit_verify (
+        amount,
+        &rh->details.deposit.deposit_fee,
+        &rh->details.deposit.h_wire,
+        &rh->details.deposit.h_contract_terms,
+        rh->details.deposit.no_wallet_data_hash
+        ? NULL
+        : &rh->details.deposit.wallet_data_hash,
+        rh->details.deposit.no_hac
+        ? NULL
+        : &rh->details.deposit.hac,
+        rh->details.deposit.no_h_policy
+        ? NULL
+        : &rh->details.deposit.h_policy,
+        &pc->dk->h_key,
+        rh->details.deposit.wallet_timestamp,
+        &rh->details.deposit.merchant_pub,
+        rh->details.deposit.refund_deadline,
+        pc->coin_pub,
+        &rh->details.deposit.sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  /* check that deposit fee matches our expectations from /keys! */
+  if ( (GNUNET_YES !=
+        TALER_amount_cmp_currency (&rh->details.deposit.deposit_fee,
+                                   &pc->dk->fees.deposit)) ||
+       (0 !=
+        TALER_amount_cmp (&rh->details.deposit.deposit_fee,
+                          &pc->dk->fees.deposit)) )
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Handle melt entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_melt (struct CoinHistoryParseContext *pc,
+           struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+           const struct TALER_Amount *amount,
+           json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.melt.sig),
+    GNUNET_JSON_spec_fixed_auto ("rc",
+                                 &rh->details.melt.rc),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
+                                   &rh->details.melt.h_age_commitment),
+      &rh->details.melt.no_hac),
+    TALER_JSON_spec_amount_any ("melt_fee",
+                                &rh->details.melt.melt_fee),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  /* check that melt fee matches our expectations from /keys! */
+  if ( (GNUNET_YES !=
+        TALER_amount_cmp_currency (&rh->details.melt.melt_fee,
+                                   &pc->dk->fees.refresh)) ||
+       (0 !=
+        TALER_amount_cmp (&rh->details.melt.melt_fee,
+                          &pc->dk->fees.refresh)) )
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_melt_verify (
+        amount,
+        &rh->details.melt.melt_fee,
+        &rh->details.melt.rc,
+        &pc->dk->h_key,
+        rh->details.melt.no_hac
+        ? NULL
+        : &rh->details.melt.h_age_commitment,
+        pc->coin_pub,
+        &rh->details.melt.sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Handle refund entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_refund (struct CoinHistoryParseContext *pc,
+             struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+             const struct TALER_Amount *amount,
+             json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("refund_fee",
+                                &rh->details.refund.refund_fee),
+    GNUNET_JSON_spec_fixed_auto ("merchant_sig",
+                                 &rh->details.refund.sig),
+    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
+                                 &rh->details.refund.h_contract_terms),
+    GNUNET_JSON_spec_fixed_auto ("merchant_pub",
+                                 &rh->details.refund.merchant_pub),
+    GNUNET_JSON_spec_uint64 ("rtransaction_id",
+                             &rh->details.refund.rtransaction_id),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 >
+      TALER_amount_add (&rh->details.refund.sig_amount,
+                        &rh->details.refund.refund_fee,
+                        amount))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_merchant_refund_verify (pc->coin_pub,
+                                    &rh->details.refund.h_contract_terms,
+                                    rh->details.refund.rtransaction_id,
+                                    &rh->details.refund.sig_amount,
+                                    &rh->details.refund.merchant_pub,
+                                    &rh->details.refund.sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  /* NOTE: theoretically, we could also check that the given
+     merchant_pub and h_contract_terms appear in the
+     history under deposits.  However, there is really no benefit
+     for the exchange to lie here, so not checking is probably OK
+     (an auditor ought to check, though). Then again, we similarly
+     had no reason to check the merchant's signature (other than a
+     well-formendess check). */
+
+  /* check that refund fee matches our expectations from /keys! */
+  if ( (GNUNET_YES !=
+        TALER_amount_cmp_currency (&rh->details.refund.refund_fee,
+                                   &pc->dk->fees.refund)) ||
+       (0 !=
+        TALER_amount_cmp (&rh->details.refund.refund_fee,
+                          &pc->dk->fees.refund)) )
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_NO;
+}
+
+
+/**
+ * Handle recoup entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_recoup (struct CoinHistoryParseContext *pc,
+             struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+             const struct TALER_Amount *amount,
+             json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.recoup.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.recoup.exchange_pub),
+    GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                 &rh->details.recoup.reserve_pub),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.recoup.coin_sig),
+    GNUNET_JSON_spec_fixed_auto ("coin_blind",
+                                 &rh->details.recoup.coin_bks),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.recoup.timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_confirm_recoup_verify (
+        rh->details.recoup.timestamp,
+        amount,
+        pc->coin_pub,
+        &rh->details.recoup.reserve_pub,
+        &rh->details.recoup.exchange_pub,
+        &rh->details.recoup.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_recoup_verify (&pc->dk->h_key,
+                                  &rh->details.recoup.coin_bks,
+                                  pc->coin_pub,
+                                  &rh->details.recoup.coin_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Handle recoup-refresh entry in the coin's history.
+ * This is the coin that was subjected to a recoup,
+ * the value being credited to the old coin.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_recoup_refresh (struct CoinHistoryParseContext *pc,
+                     struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                     const struct TALER_Amount *amount,
+                     json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.recoup_refresh.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.recoup_refresh.exchange_pub),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.recoup_refresh.coin_sig),
+    GNUNET_JSON_spec_fixed_auto ("old_coin_pub",
+                                 &rh->details.recoup_refresh.old_coin_pub),
+    GNUNET_JSON_spec_fixed_auto ("coin_blind",
+                                 &rh->details.recoup_refresh.coin_bks),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.recoup_refresh.timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_confirm_recoup_refresh_verify (
+        rh->details.recoup_refresh.timestamp,
+        amount,
+        pc->coin_pub,
+        &rh->details.recoup_refresh.old_coin_pub,
+        &rh->details.recoup_refresh.exchange_pub,
+        &rh->details.recoup_refresh.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_recoup_verify (&pc->dk->h_key,
+                                  &rh->details.recoup_refresh.coin_bks,
+                                  pc->coin_pub,
+                                  &rh->details.recoup_refresh.coin_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Handle old coin recoup entry in the coin's history.
+ * This is the coin that was credited in a recoup,
+ * the value being credited to the this coin.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_old_coin_recoup (struct CoinHistoryParseContext *pc,
+                      struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                      const struct TALER_Amount *amount,
+                      json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.old_coin_recoup.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.old_coin_recoup.exchange_pub),
+    GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                 &rh->details.old_coin_recoup.new_coin_pub),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.old_coin_recoup.timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_confirm_recoup_refresh_verify (
+        rh->details.old_coin_recoup.timestamp,
+        amount,
+        &rh->details.old_coin_recoup.new_coin_pub,
+        pc->coin_pub,
+        &rh->details.old_coin_recoup.exchange_pub,
+        &rh->details.old_coin_recoup.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_NO;
+}
+
+
+/**
+ * Handle purse deposit entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_purse_deposit (struct CoinHistoryParseContext *pc,
+                    struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                    const struct TALER_Amount *amount,
+                    json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("purse_pub",
+                                 &rh->details.purse_deposit.purse_pub),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.purse_deposit.coin_sig),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
+                                   &rh->details.purse_deposit.phac),
+      NULL),
+    TALER_JSON_spec_web_url ("exchange_base_url",
+                             &rh->details.purse_deposit.exchange_base_url),
+    GNUNET_JSON_spec_bool ("refunded",
+                           &rh->details.purse_deposit.refunded),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_purse_deposit_verify (
+        rh->details.purse_deposit.exchange_base_url,
+        &rh->details.purse_deposit.purse_pub,
+        amount,
+        &pc->dk->h_key,
+        &rh->details.purse_deposit.phac,
+        pc->coin_pub,
+        &rh->details.purse_deposit.coin_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (rh->details.purse_deposit.refunded)
+  {
+    /* We wave the deposit fee. */
+    if (0 >
+        TALER_amount_add (pc->total_in,
+                          pc->total_in,
+                          &pc->dk->fees.deposit))
+    {
+      /* overflow in refund history? inconceivable! Bad exchange! */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Handle purse refund entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_purse_refund (struct CoinHistoryParseContext *pc,
+                   struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                   const struct TALER_Amount *amount,
+                   json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("refund_fee",
+                                &rh->details.purse_refund.refund_fee),
+    GNUNET_JSON_spec_fixed_auto ("purse_pub",
+                                 &rh->details.purse_refund.purse_pub),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.purse_refund.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.purse_refund.exchange_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_purse_refund_verify (
+        amount,
+        &rh->details.purse_refund.refund_fee,
+        pc->coin_pub,
+        &rh->details.purse_refund.purse_pub,
+        &rh->details.purse_refund.exchange_pub,
+        &rh->details.purse_refund.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ( (GNUNET_YES !=
+        TALER_amount_cmp_currency (&rh->details.purse_refund.refund_fee,
+                                   &pc->dk->fees.refund)) ||
+       (0 !=
+        TALER_amount_cmp (&rh->details.purse_refund.refund_fee,
+                          &pc->dk->fees.refund)) )
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_NO;
+}
+
+
+/**
+ * Handle reserve deposit entry in the coin's history.
+ *
+ * @param[in,out] pc overall context
+ * @param[out] rh history entry to initialize
+ * @param amount main amount of this operation
+ * @param transaction JSON details for the operation
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_OK to add, #GNUNET_NO to subtract
+ */
+static enum GNUNET_GenericReturnValue
+help_reserve_open_deposit (struct CoinHistoryParseContext *pc,
+                           struct TALER_EXCHANGE_CoinHistoryEntry *rh,
+                           const struct TALER_Amount *amount,
+                           json_t *transaction)
+{
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rh->details.reserve_open_deposit.reserve_sig),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 &rh->details.reserve_open_deposit.coin_sig),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_open_deposit_verify (
+        amount,
+        &rh->details.reserve_open_deposit.reserve_sig,
+        pc->coin_pub,
+        &rh->details.reserve_open_deposit.coin_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_YES;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_parse_coin_history (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DenomPublicKey *dk,
+  const json_t *history,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_Amount *total_in,
+  struct TALER_Amount *total_out,
+  unsigned int rlen,
+  struct TALER_EXCHANGE_CoinHistoryEntry rhistory[static rlen])
+{
+  const struct
+  {
+    const char *type;
+    CoinCheckHelper helper;
+    enum TALER_EXCHANGE_CoinTransactionType ctt;
+  } map[] = {
+    { "DEPOSIT",
+      &help_deposit,
+      TALER_EXCHANGE_CTT_DEPOSIT },
+    { "MELT",
+      &help_melt,
+      TALER_EXCHANGE_CTT_MELT },
+    { "REFUND",
+      &help_refund,
+      TALER_EXCHANGE_CTT_REFUND },
+    { "RECOUP",
+      &help_recoup,
+      TALER_EXCHANGE_CTT_RECOUP },
+    { "RECOUP-REFRESH",
+      &help_recoup_refresh,
+      TALER_EXCHANGE_CTT_RECOUP_REFRESH },
+    { "OLD-COIN-RECOUP",
+      &help_old_coin_recoup,
+      TALER_EXCHANGE_CTT_OLD_COIN_RECOUP },
+    { "PURSE-DEPOSIT",
+      &help_purse_deposit,
+      TALER_EXCHANGE_CTT_PURSE_DEPOSIT },
+    { "PURSE-REFUND",
+      &help_purse_refund,
+      TALER_EXCHANGE_CTT_PURSE_REFUND },
+    { "RESERVE-OPEN-DEPOSIT",
+      &help_reserve_open_deposit,
+      TALER_EXCHANGE_CTT_RESERVE_OPEN_DEPOSIT },
+    { NULL, NULL, TALER_EXCHANGE_CTT_NONE }
+  };
+  struct CoinHistoryParseContext pc = {
+    .dk = dk,
+    .coin_pub = coin_pub,
+    .total_out = total_out,
+    .total_in = total_in
+  };
+  size_t len;
+
+  if (NULL == history)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  len = json_array_size (history);
+  if (0 == len)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  *total_in = dk->value;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (total_in->currency,
+                                        total_out));
+  for (size_t off = 0; off<len; off++)
+  {
+    struct TALER_EXCHANGE_CoinHistoryEntry *rh = &rhistory[off];
+    json_t *transaction = json_array_get (history,
+                                          off);
+    enum GNUNET_GenericReturnValue add;
+    const char *type;
+    struct GNUNET_JSON_Specification spec_glob[] = {
+      TALER_JSON_spec_amount_any ("amount",
+                                  &rh->amount),
+      GNUNET_JSON_spec_string ("type",
+                               &type),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (transaction,
+                           spec_glob,
+                           NULL, NULL))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    if (GNUNET_YES !=
+        TALER_amount_cmp_currency (&rh->amount,
+                                   total_in))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Operation of type %s with amount %s\n",
+                type,
+                TALER_amount2s (&rh->amount));
+    add = GNUNET_SYSERR;
+    for (unsigned int i = 0; NULL != map[i].type; i++)
+    {
+      if (0 == strcasecmp (type,
+                           map[i].type))
+      {
+        rh->type = map[i].ctt;
+        add = map[i].helper (&pc,
+                             rh,
+                             &rh->amount,
+                             transaction);
+        break;
+      }
+    }
+    switch (add)
+    {
+    case GNUNET_SYSERR:
+      /* entry type not supported, new version on server? */
+      rh->type = TALER_EXCHANGE_CTT_NONE;
+      GNUNET_break_op (0);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Unexpected type `%s' in response\n",
+                  type);
+      return GNUNET_SYSERR;
+    case GNUNET_YES:
+      /* This amount should be debited from the coin */
+      if (0 >
+          TALER_amount_add (total_out,
+                            total_out,
+                            &rh->amount))
+      {
+        /* overflow in history already!? inconceivable! Bad exchange! */
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
+      break;
+    case GNUNET_NO:
+      /* This amount should be credited to the coin. */
+      if (0 >
+          TALER_amount_add (total_in,
+                            total_in,
+                            &rh->amount))
+      {
+        /* overflow in refund history? inconceivable! Bad exchange! */
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
+      break;
+    } /* end of switch(add) */
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * We received an #MHD_HTTP_OK history code. Handle the JSON
+ * response.
+ *
+ * @param rsh handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_coins_history_ok (struct TALER_EXCHANGE_CoinsHistoryHandle *rsh,
+                         const json_t *j)
+{
+  struct TALER_EXCHANGE_CoinHistory rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_OK
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("balance",
+                                &rs.details.ok.balance),
+    GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
+                                 &rs.details.ok.h_denom_pub),
+    GNUNET_JSON_spec_array_const ("history",
+                                  &rs.details.ok.history),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (NULL != rsh->cb)
+  {
+    rsh->cb (rsh->cb_cls,
+             &rs);
+    rsh->cb = NULL;
+  }
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /coins/$RID/history request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_CoinsHistoryHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_coins_history_finished (void *cls,
+                               long response_code,
+                               const void *response)
+{
+  struct TALER_EXCHANGE_CoinsHistoryHandle *rsh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_CoinHistory rs = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  rsh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    rs.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        handle_coins_history_ok (rsh,
+                                 j))
+    {
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for coins history\n",
+                (unsigned int) response_code,
+                (int) rs.hr.ec);
+    break;
+  }
+  if (NULL != rsh->cb)
+  {
+    rsh->cb (rsh->cb_cls,
+             &rs);
+    rsh->cb = NULL;
+  }
+  TALER_EXCHANGE_coins_history_cancel (rsh);
+}
+
+
+struct TALER_EXCHANGE_CoinsHistoryHandle *
+TALER_EXCHANGE_coins_history (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  uint64_t start_off,
+  TALER_EXCHANGE_CoinsHistoryCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_CoinsHistoryHandle *rsh;
+  CURL *eh;
+  char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 64];
+  struct curl_slist *job_headers;
+
+  rsh = GNUNET_new (struct TALER_EXCHANGE_CoinsHistoryHandle);
+  rsh->cb = cb;
+  rsh->cb_cls = cb_cls;
+  GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                      &rsh->coin_pub.eddsa_pub);
+  {
+    char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &rsh->coin_pub,
+      sizeof (rsh->coin_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    if (0 != start_off)
+      GNUNET_snprintf (arg_str,
+                       sizeof (arg_str),
+                       "coins/%s/history?start=%llu",
+                       pub_str,
+                       (unsigned long long) start_off);
+    else
+      GNUNET_snprintf (arg_str,
+                       sizeof (arg_str),
+                       "coins/%s/history",
+                       pub_str);
+  }
+  rsh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
+  if (NULL == rsh->url)
+  {
+    GNUNET_free (rsh);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (rsh->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (rsh->url);
+    GNUNET_free (rsh);
+    return NULL;
+  }
+
+  {
+    struct TALER_CoinSpendSignatureP coin_sig;
+    char *sig_hdr;
+    char *hdr;
+
+    TALER_wallet_coin_history_sign (start_off,
+                                    coin_priv,
+                                    &coin_sig);
+
+    sig_hdr = GNUNET_STRINGS_data_to_string_alloc (
+      &coin_sig,
+      sizeof (coin_sig));
+    GNUNET_asprintf (&hdr,
+                     "%s: %s",
+                     TALER_COIN_HISTORY_SIGNATURE_HEADER,
+                     sig_hdr);
+    GNUNET_free (sig_hdr);
+    job_headers = curl_slist_append (NULL,
+                                     hdr);
+    GNUNET_free (hdr);
+    if (NULL == job_headers)
+    {
+      GNUNET_break (0);
+      curl_easy_cleanup (eh);
+      return NULL;
+    }
+  }
+
+  rsh->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   job_headers,
+                                   &handle_coins_history_finished,
+                                   rsh);
+  curl_slist_free_all (job_headers);
+  return rsh;
+}
+
+
+void
+TALER_EXCHANGE_coins_history_cancel (
+  struct TALER_EXCHANGE_CoinsHistoryHandle *rsh)
+{
+  if (NULL != rsh->job)
+  {
+    GNUNET_CURL_job_cancel (rsh->job);
+    rsh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&rsh->post_ctx);
+  GNUNET_free (rsh->url);
+  GNUNET_free (rsh);
+}
+
+
+/**
+ * Verify that @a coin_sig does NOT appear in the @a history of a coin's
+ * transactions and thus whatever transaction is authorized by @a coin_sig is
+ * a conflict with @a proof.
+ *
+ * @param history coin history to check
+ * @param coin_sig signature that must not be in @a history
+ * @return #GNUNET_OK if @a coin_sig is not in @a history
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_coin_signature_conflict (
+  const json_t *history,
+  const struct TALER_CoinSpendSignatureP *coin_sig)
+{
+  size_t off;
+  json_t *entry;
+
+  json_array_foreach (history, off, entry)
+  {
+    struct TALER_CoinSpendSignatureP cs;
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                   &cs),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (entry,
+                           spec,
+                           NULL, NULL))
+      continue; /* entry without coin signature */
+    if (0 ==
+        GNUNET_memcmp (&cs,
+                       coin_sig))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+#if FIXME_IMPLEMENT
+/**
+ * FIXME-Oec: we need some specific routines that show
+ * that certain coin operations are indeed in conflict,
+ * for example that the coin is of a different denomination
+ * or different age restrictions.
+ * This relates to unimplemented error handling for
+ * coins in the exchange!
+ *
+ * Check that the provided @a proof indeeds indicates
+ * a conflict for @a coin_pub.
+ *
+ * @param keys exchange keys
+ * @param proof provided conflict proof
+ * @param dk denomination of @a coin_pub that the client
+ *           used
+ * @param coin_pub public key of the coin
+ * @param required balance required on the coin for the operation
+ * @return #GNUNET_OK if @a proof holds
+ */
+// FIXME: should be properly defined and implemented!
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_coin_conflict_ (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const json_t *proof,
+  const struct TALER_EXCHANGE_DenomPublicKey *dk,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *required)
+{
+  enum TALER_ErrorCode ec;
+
+  ec = TALER_JSON_get_error_code (proof);
+  switch (ec)
+  {
+  case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
+    /* Nothing to check anymore here, proof needs to be
+       checked in the GET /coins/$COIN_PUB handler */
+    break;
+  case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
+    // FIXME: write check!
+    break;
+  default:
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+#endif
+
+
+/* end of exchange_api_coins_history.c */
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 04f2a4df8..bd731ad37 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2021 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -22,890 +22,631 @@
 #include "platform.h"
 #include "taler_json_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
+#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 
 
-enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_parse_reserve_history (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const json_t *history,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const char *currency,
-  struct TALER_Amount *total_in,
-  struct TALER_Amount *total_out,
-  unsigned int history_length,
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory)
+const struct TALER_EXCHANGE_SigningPublicKey *
+TALER_EXCHANGE_get_signing_key_info (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ExchangePublicKeyP *exchange_pub)
 {
-  struct GNUNET_HashCode uuid[history_length];
-  unsigned int uuid_off;
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (currency,
-                                        total_in));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (currency,
-                                        total_out));
-  uuid_off = 0;
-  for (unsigned int off = 0; off<history_length; off++)
+  for (unsigned int i = 0; i<keys->num_sign_keys; i++)
   {
-    struct TALER_EXCHANGE_ReserveHistoryEntry *rh = &rhistory[off];
-    json_t *transaction;
-    struct TALER_Amount amount;
-    const char *type;
-    struct GNUNET_JSON_Specification hist_spec[] = {
-      GNUNET_JSON_spec_string ("type",
-                               &type),
-      TALER_JSON_spec_amount_any ("amount",
-                                  &amount),
-      /* 'wire' and 'signature' are optional depending on 'type'! */
-      GNUNET_JSON_spec_end ()
-    };
-
-    transaction = json_array_get (history,
-                                  off);
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (transaction,
-                           hist_spec,
-                           NULL, NULL))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    rhistory[off].amount = amount;
-    if (GNUNET_YES !=
-        TALER_amount_cmp_currency (&amount,
-                                   total_in))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
-    if (0 == strcasecmp (type,
-                         "CREDIT"))
-    {
-      const char *wire_url;
-      uint64_t wire_reference;
-      struct GNUNET_TIME_Timestamp timestamp;
-      struct GNUNET_JSON_Specification withdraw_spec[] = {
-        GNUNET_JSON_spec_uint64 ("wire_reference",
-                                 &wire_reference),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
-        GNUNET_JSON_spec_string ("sender_account_url",
-                                 &wire_url),
-        GNUNET_JSON_spec_end ()
-      };
+    const struct TALER_EXCHANGE_SigningPublicKey *spk
+      = &keys->sign_keys[i];
 
-      rh->type = TALER_EXCHANGE_RTT_CREDIT;
-      if (0 >
-          TALER_amount_add (total_in,
-                            total_in,
-                            &amount))
-      {
-        /* overflow in history already!? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             withdraw_spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      rh->details.in_details.sender_url = GNUNET_strdup (wire_url);
-      rh->details.in_details.wire_reference = wire_reference;
-      rh->details.in_details.timestamp = timestamp;
-      /* end type==DEPOSIT */
-    }
-    else if (0 == strcasecmp (type,
-                              "WITHDRAW"))
-    {
-      struct TALER_ReserveSignatureP sig;
-      struct TALER_DenominationHashP h_denom_pub;
-      struct TALER_BlindedCoinHashP bch;
-      struct TALER_Amount withdraw_fee;
-      struct GNUNET_JSON_Specification withdraw_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("reserve_sig",
-                                     &sig),
-        TALER_JSON_spec_amount_any ("withdraw_fee",
-                                    &withdraw_fee),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     &h_denom_pub),
-        GNUNET_JSON_spec_fixed_auto ("h_coin_envelope",
-                                     &bch),
-        GNUNET_JSON_spec_end ()
-      };
+    if (0 == GNUNET_memcmp (exchange_pub,
+                            &spk->key))
+      return spk;
+  }
+  return NULL;
+}
 
-      rh->type = TALER_EXCHANGE_RTT_WITHDRAWAL;
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             withdraw_spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
 
-      /* Check that the signature is a valid withdraw request */
-      if (GNUNET_OK !=
-          TALER_wallet_withdraw_verify (&h_denom_pub,
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_create_conflict_ (
+  const struct TALER_PurseContractSignatureP *cpurse_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const json_t *proof)
+{
+  struct TALER_Amount amount;
+  uint32_t min_age;
+  struct GNUNET_TIME_Timestamp purse_expiration;
+  struct TALER_PurseContractSignatureP purse_sig;
+  struct TALER_PrivateContractHashP h_contract_terms;
+  struct TALER_PurseMergePublicKeyP merge_pub;
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("amount",
+                                &amount),
+    GNUNET_JSON_spec_uint32 ("min_age",
+                             &min_age),
+    GNUNET_JSON_spec_timestamp ("purse_expiration",
+                                &purse_expiration),
+    GNUNET_JSON_spec_fixed_auto ("purse_sig",
+                                 &purse_sig),
+    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
+                                 &h_contract_terms),
+    GNUNET_JSON_spec_fixed_auto ("merge_pub",
+                                 &merge_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (proof,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_purse_create_verify (purse_expiration,
+                                        &h_contract_terms,
+                                        &merge_pub,
+                                        min_age,
                                         &amount,
-                                        &bch,
-                                        reserve_pub,
-                                        &sig))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (withdraw_spec);
-        return GNUNET_SYSERR;
-      }
-      /* check that withdraw fee matches expectations! */
-      {
-        const struct TALER_EXCHANGE_Keys *key_state;
-        const struct TALER_EXCHANGE_DenomPublicKey *dki;
-
-        key_state = TALER_EXCHANGE_get_keys (exchange);
-        dki = TALER_EXCHANGE_get_denomination_key_by_hash (key_state,
-                                                           &h_denom_pub);
-        if ( (GNUNET_YES !=
-              TALER_amount_cmp_currency (&withdraw_fee,
-                                         &dki->fees.withdraw)) ||
-             (0 !=
-              TALER_amount_cmp (&withdraw_fee,
-                                &dki->fees.withdraw)) )
-        {
-          GNUNET_break_op (0);
-          GNUNET_JSON_parse_free (withdraw_spec);
-          return GNUNET_SYSERR;
-        }
-        rh->details.withdraw.fee = withdraw_fee;
-      }
-      rh->details.withdraw.out_authorization_sig
-        = json_object_get (transaction,
-                           "signature");
-      /* Check check that the same withdraw transaction
-         isn't listed twice by the exchange. We use the
-         "uuid" array to remember the hashes of all
-         signatures, and compare the hashes to find
-         duplicates. */
-      GNUNET_CRYPTO_hash (&sig,
-                          sizeof (sig),
-                          &uuid[uuid_off]);
-      for (unsigned int i = 0; i<uuid_off; i++)
-      {
-        if (0 == GNUNET_memcmp (&uuid[uuid_off],
-                                &uuid[i]))
-        {
-          GNUNET_break_op (0);
-          GNUNET_JSON_parse_free (withdraw_spec);
-          return GNUNET_SYSERR;
-        }
-      }
-      uuid_off++;
+                                        purse_pub,
+                                        &purse_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 ==
+      GNUNET_memcmp (&purse_sig,
+                     cpurse_sig))
+  {
+    /* Must be the SAME data, not a conflict! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
 
-      if (0 >
-          TALER_amount_add (total_out,
-                            total_out,
-                            &amount))
-      {
-        /* overflow in history already!? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (withdraw_spec);
-        return GNUNET_SYSERR;
-      }
-      /* end type==WITHDRAW */
-    }
-    else if (0 == strcasecmp (type,
-                              "RECOUP"))
-    {
-      const struct TALER_EXCHANGE_Keys *key_state;
-      struct GNUNET_JSON_Specification recoup_spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                     &rh->details.recoup_details.coin_pub),
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &rh->details.recoup_details.exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &rh->details.recoup_details.exchange_pub),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &rh->details.recoup_details.timestamp),
-        GNUNET_JSON_spec_end ()
-      };
 
-      rh->type = TALER_EXCHANGE_RTT_RECOUP;
-      rh->amount = amount;
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             recoup_spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      key_state = TALER_EXCHANGE_get_keys (exchange);
-      if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
-                                           &rh->details.
-                                           recoup_details.exchange_pub))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_exchange_online_confirm_recoup_verify (
-            rh->details.recoup_details.timestamp,
-            &amount,
-            &rh->details.recoup_details.coin_pub,
-            reserve_pub,
-            &rh->details.recoup_details.exchange_pub,
-            &rh->details.recoup_details.exchange_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (0 >
-          TALER_amount_add (total_in,
-                            total_in,
-                            &rh->amount))
-      {
-        /* overflow in history already!? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      /* end type==RECOUP */
-    }
-    else if (0 == strcasecmp (type,
-                              "CLOSING"))
-    {
-      const struct TALER_EXCHANGE_Keys *key_state;
-      struct GNUNET_JSON_Specification closing_spec[] = {
-        GNUNET_JSON_spec_string (
-          "receiver_account_details",
-          &rh->details.close_details.receiver_account_details),
-        GNUNET_JSON_spec_fixed_auto ("wtid",
-                                     &rh->details.close_details.wtid),
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &rh->details.close_details.exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &rh->details.close_details.exchange_pub),
-        TALER_JSON_spec_amount_any ("closing_fee",
-                                    &rh->details.close_details.fee),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &rh->details.close_details.timestamp),
-        GNUNET_JSON_spec_end ()
-      };
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_merge_conflict_ (
+  const struct TALER_PurseMergeSignatureP *cmerge_sig,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const char *exchange_url,
+  const json_t *proof)
+{
+  struct TALER_PurseMergeSignatureP merge_sig;
+  struct GNUNET_TIME_Timestamp merge_timestamp;
+  const char *partner_url = NULL;
+  struct TALER_ReservePublicKeyP reserve_pub;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_web_url ("partner_url",
+                               &partner_url),
+      NULL),
+    GNUNET_JSON_spec_timestamp ("merge_timestamp",
+                                &merge_timestamp),
+    GNUNET_JSON_spec_fixed_auto ("merge_sig",
+                                 &merge_sig),
+    GNUNET_JSON_spec_fixed_auto ("reserve_pub",
+                                 &reserve_pub),
+    GNUNET_JSON_spec_end ()
+  };
+  char *payto_uri;
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (proof,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (NULL == partner_url)
+    partner_url = exchange_url;
+  payto_uri = TALER_reserve_make_payto (partner_url,
+                                        &reserve_pub);
+  if (GNUNET_OK !=
+      TALER_wallet_purse_merge_verify (
+        payto_uri,
+        merge_timestamp,
+        purse_pub,
+        merge_pub,
+        &merge_sig))
+  {
+    GNUNET_break_op (0);
+    GNUNET_free (payto_uri);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (payto_uri);
+  if (0 ==
+      GNUNET_memcmp (&merge_sig,
+                     cmerge_sig))
+  {
+    /* Must be the SAME data, not a conflict! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
 
-      rh->type = TALER_EXCHANGE_RTT_CLOSE;
-      rh->amount = amount;
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             closing_spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
 
-      key_state = TALER_EXCHANGE_get_keys (exchange);
-      if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (
-            key_state,
-            &rh->details.close_details.exchange_pub))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_exchange_online_reserve_closed_verify (
-            rh->details.close_details.timestamp,
-            &amount,
-            &rh->details.close_details.fee,
-            rh->details.close_details.receiver_account_details,
-            &rh->details.close_details.wtid,
-            reserve_pub,
-            &rh->details.close_details.exchange_pub,
-            &rh->details.close_details.exchange_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (0 >
-          TALER_amount_add (total_out,
-                            total_out,
-                            &rh->amount))
-      {
-        /* overflow in history already!? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      /* end type==CLOSING */
-    }
-    else
-    {
-      /* unexpected 'type', protocol incompatibility, complain! */
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_coin_conflict_ (
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const char *exchange_url,
+  const json_t *proof,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_AgeCommitmentHash *phac,
+  struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_CoinSpendSignatureP *coin_sig)
+{
+  const char *partner_url = NULL;
+  struct TALER_Amount amount;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
+                                 h_denom_pub),
+    GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
+                                 phac),
+    GNUNET_JSON_spec_fixed_auto ("coin_sig",
+                                 coin_sig),
+    GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                 coin_pub),
+    GNUNET_JSON_spec_mark_optional (
+      TALER_JSON_spec_web_url ("partner_url",
+                               &partner_url),
+      NULL),
+    TALER_JSON_spec_amount_any ("amount",
+                                &amount),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (proof,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (NULL == partner_url)
+    partner_url = exchange_url;
+  if (GNUNET_OK !=
+      TALER_wallet_purse_deposit_verify (
+        partner_url,
+        purse_pub,
+        &amount,
+        h_denom_pub,
+        phac,
+        coin_pub,
+        coin_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
   }
   return GNUNET_OK;
 }
 
 
-void
-TALER_EXCHANGE_free_reserve_history (
-  struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory,
-  unsigned int len)
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_econtract_conflict_ (
+  const struct TALER_PurseContractSignatureP *ccontract_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const json_t *proof)
 {
-  for (unsigned int i = 0; i<len; i++)
+  struct TALER_ContractDiffiePublicP contract_pub;
+  struct TALER_PurseContractSignatureP contract_sig;
+  struct GNUNET_HashCode h_econtract;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("h_econtract",
+                                 &h_econtract),
+    GNUNET_JSON_spec_fixed_auto ("econtract_sig",
+                                 &contract_sig),
+    GNUNET_JSON_spec_fixed_auto ("contract_pub",
+                                 &contract_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (proof,
+                         spec,
+                         NULL, NULL))
   {
-    switch (rhistory[i].type)
-    {
-    case TALER_EXCHANGE_RTT_CREDIT:
-      GNUNET_free (rhistory[i].details.in_details.sender_url);
-      break;
-    case TALER_EXCHANGE_RTT_WITHDRAWAL:
-      break;
-    case TALER_EXCHANGE_RTT_RECOUP:
-      break;
-    case TALER_EXCHANGE_RTT_CLOSE:
-      break;
-    }
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_econtract_upload_verify2 (
+        &h_econtract,
+        &contract_pub,
+        purse_pub,
+        &contract_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
   }
-  GNUNET_free (rhistory);
+  if (0 ==
+      GNUNET_memcmp (&contract_sig,
+                     ccontract_sig))
+  {
+    /* Must be the SAME data, not a conflict! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
 }
 
 
+// FIXME: should be used...
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_verify_coin_history (
-  const struct TALER_EXCHANGE_DenomPublicKey *dk,
-  const char *currency,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  json_t *history,
-  struct TALER_DenominationHashP *h_denom_pub,
-  struct TALER_Amount *total)
+TALER_EXCHANGE_check_coin_denomination_conflict_ (
+  const json_t *proof,
+  const struct TALER_DenominationHashP *ch_denom_pub)
 {
-  size_t len;
-  struct TALER_Amount rtotal;
-  struct TALER_Amount fee;
-
-  if (NULL == history)
+  struct TALER_DenominationHashP h_denom_pub;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
+                                 &h_denom_pub),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (proof,
+                         spec,
+                         NULL, NULL))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  len = json_array_size (history);
-  if (0 == len)
+  if (0 ==
+      GNUNET_memcmp (ch_denom_pub,
+                     &h_denom_pub))
   {
     GNUNET_break_op (0);
-    return GNUNET_SYSERR;
+    return GNUNET_OK;
   }
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (currency,
-                                        total));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_amount_set_zero (currency,
-                                        &rtotal));
-  for (size_t off = 0; off<len; off++)
+  /* indeed, proof with different denomination key provided */
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_get_min_denomination_ (
+  const struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_Amount *min)
+{
+  bool have_min = false;
+  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
   {
-    int add;
-    json_t *transaction;
-    struct TALER_Amount amount;
-    const char *type;
-    struct GNUNET_JSON_Specification spec_glob[] = {
-      TALER_JSON_spec_amount_any ("amount",
-                                  &amount),
-      GNUNET_JSON_spec_string ("type",
-                               &type),
-      GNUNET_JSON_spec_end ()
-    };
+    const struct TALER_EXCHANGE_DenomPublicKey *dk = &keys->denom_keys[i];
 
-    transaction = json_array_get (history,
-                                  off);
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (transaction,
-                           spec_glob,
-                           NULL, NULL))
+    if (! have_min)
     {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
+      *min = dk->value;
+      have_min = true;
+      continue;
     }
+    if (1 != TALER_amount_cmp (min,
+                               &dk->value))
+      continue;
+    *min = dk->value;
+  }
+  if (! have_min)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_verify_deposit_signature_ (
+  const struct TALER_EXCHANGE_DepositContractDetail *dcd,
+  const struct TALER_ExtensionPolicyHashP *ech,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_EXCHANGE_CoinDepositDetail *cdd,
+  const struct TALER_EXCHANGE_DenomPublicKey *dki)
+{
+  if (GNUNET_OK !=
+      TALER_wallet_deposit_verify (&cdd->amount,
+                                   &dki->fees.deposit,
+                                   h_wire,
+                                   &dcd->h_contract_terms,
+                                   &dcd->wallet_data_hash,
+                                   &cdd->h_age_commitment,
+                                   ech,
+                                   &cdd->h_denom_pub,
+                                   dcd->wallet_timestamp,
+                                   &dcd->merchant_pub,
+                                   dcd->refund_deadline,
+                                   &cdd->coin_pub,
+                                   &cdd->coin_sig))
+  {
+    GNUNET_break_op (0);
+    TALER_LOG_WARNING ("Invalid coin signature on /deposit request!\n");
+    TALER_LOG_DEBUG ("... amount_with_fee was %s\n",
+                     TALER_amount2s (&cdd->amount));
+    TALER_LOG_DEBUG ("... deposit_fee was %s\n",
+                     TALER_amount2s (&dki->fees.deposit));
+    return GNUNET_SYSERR;
+  }
+
+  /* check coin signature */
+  {
+    struct TALER_CoinPublicInfo coin_info = {
+      .coin_pub = cdd->coin_pub,
+      .denom_pub_hash = cdd->h_denom_pub,
+      .denom_sig = cdd->denom_sig,
+      .h_age_commitment = cdd->h_age_commitment,
+    };
+
     if (GNUNET_YES !=
-        TALER_amount_cmp_currency (&amount,
-                                   &rtotal))
+        TALER_test_coin_valid (&coin_info,
+                               &dki->key))
     {
       GNUNET_break_op (0);
+      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
       return GNUNET_SYSERR;
     }
-    add = GNUNET_SYSERR;
-    if (0 == strcasecmp (type,
-                         "DEPOSIT"))
-    {
-      struct TALER_MerchantWireHashP h_wire;
-      struct TALER_PrivateContractHashP h_contract_terms;
-      // struct TALER_ExtensionContractHashP h_extensions; // FIXME!
-      struct GNUNET_TIME_Timestamp wallet_timestamp;
-      struct TALER_MerchantPublicKeyP merchant_pub;
-      struct GNUNET_TIME_Timestamp refund_deadline = {0};
-      struct TALER_CoinSpendSignatureP sig;
-      struct TALER_AgeCommitmentHash hac;
-      bool no_hac;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                     &sig),
-        GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                     &h_contract_terms),
-        GNUNET_JSON_spec_fixed_auto ("h_wire",
-                                     &h_wire),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     h_denom_pub),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                       &hac),
-          &no_hac),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &wallet_timestamp),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_timestamp ("refund_deadline",
-                                      &refund_deadline),
-          NULL),
-        TALER_JSON_spec_amount_any ("deposit_fee",
-                                    &fee),
-        GNUNET_JSON_spec_fixed_auto ("merchant_pub",
-                                     &merchant_pub),
-        GNUNET_JSON_spec_end ()
-      };
+  }
 
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_wallet_deposit_verify (
-            &amount,
-            &fee,
-            &h_wire,
-            &h_contract_terms,
-            no_hac ? NULL : &hac,
-            NULL /* h_extensions! */,
-            h_denom_pub,
-            wallet_timestamp,
-            &merchant_pub,
-            refund_deadline,
-            coin_pub,
-            &sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (NULL != dk)
-      {
-        /* check that deposit fee matches our expectations from /keys! */
-        if ( (GNUNET_YES !=
-              TALER_amount_cmp_currency (&fee,
-                                         &dk->fees.deposit)) ||
-             (0 !=
-              TALER_amount_cmp (&fee,
-                                &dk->fees.deposit)) )
-        {
-          GNUNET_break_op (0);
-          return GNUNET_SYSERR;
-        }
-      }
-      add = GNUNET_YES;
-    }
-    else if (0 == strcasecmp (type,
-                              "MELT"))
-    {
-      struct TALER_CoinSpendSignatureP sig;
-      struct TALER_RefreshCommitmentP rc;
-      struct TALER_AgeCommitmentHash h_age_commitment;
-      bool no_hac;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                     &sig),
-        GNUNET_JSON_spec_fixed_auto ("rc",
-                                     &rc),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     h_denom_pub),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                       &h_age_commitment),
-          &no_hac),
-        TALER_JSON_spec_amount_any ("melt_fee",
-                                    &fee),
-        GNUNET_JSON_spec_end ()
-      };
+  /* Check coin does make a contribution */
+  if (0 < TALER_amount_cmp (&dki->fees.deposit,
+                            &cdd->amount))
+  {
+    GNUNET_break_op (0);
+    TALER_LOG_WARNING ("Deposit amount smaller than fee\n");
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
 
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
 
-      if (NULL != dk)
-      {
-        /* check that melt fee matches our expectations from /keys! */
-        if ( (GNUNET_YES !=
-              TALER_amount_cmp_currency (&fee,
-                                         &dk->fees.refresh)) ||
-             (0 !=
-              TALER_amount_cmp (&fee,
-                                &dk->fees.refresh)) )
-        {
-          GNUNET_break_op (0);
-          return GNUNET_SYSERR;
-        }
-      }
+/**
+ * Parse account restriction in @a jrest into @a rest.
+ *
+ * @param jresta array of account restrictions in JSON
+ * @param[out] resta_len set to length of @a resta
+ * @param[out] resta account restriction array to set
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_restrictions (const json_t *jresta,
+                    unsigned int *resta_len,
+                    struct TALER_EXCHANGE_AccountRestriction **resta)
+{
+  size_t alen;
 
+  if (! json_is_array (jresta))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  alen = json_array_size (jresta);
+  if (0 == alen)
+  {
+    /* no restrictions, perfectly OK */
+    *resta = NULL;
+    return GNUNET_OK;
+  }
+  *resta_len = (unsigned int) alen;
+  GNUNET_assert (alen == *resta_len);
+  *resta = GNUNET_new_array (*resta_len,
+                             struct TALER_EXCHANGE_AccountRestriction);
+  for (unsigned int i = 0; i<*resta_len; i++)
+  {
+    const json_t *jr = json_array_get (jresta,
+                                       i);
+    struct TALER_EXCHANGE_AccountRestriction *ar = &(*resta)[i];
+    const char *type = json_string_value (json_object_get (jr,
+                                                           "type"));
 
-      if (GNUNET_OK !=
-          TALER_wallet_melt_verify (
-            &amount,
-            &fee,
-            &rc,
-            h_denom_pub,
-            no_hac
-            ? NULL
-            : &h_age_commitment,
-            coin_pub,
-            &sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      add = GNUNET_YES;
-    }
-    else if (0 == strcasecmp (type,
-                              "REFUND"))
+    if (NULL == type)
     {
-      struct TALER_PrivateContractHashP h_contract_terms;
-      struct TALER_MerchantPublicKeyP merchant_pub;
-      struct TALER_MerchantSignatureP sig;
-      struct TALER_Amount refund_fee;
-      struct TALER_Amount sig_amount;
-      uint64_t rtransaction_id;
-      struct GNUNET_JSON_Specification spec[] = {
-        TALER_JSON_spec_amount_any ("refund_fee",
-                                    &refund_fee),
-        GNUNET_JSON_spec_fixed_auto ("merchant_sig",
-                                     &sig),
-        GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                     &h_contract_terms),
-        GNUNET_JSON_spec_fixed_auto ("merchant_pub",
-                                     &merchant_pub),
-        GNUNET_JSON_spec_uint64 ("rtransaction_id",
-                                 &rtransaction_id),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (0 >
-          TALER_amount_add (&sig_amount,
-                            &refund_fee,
-                            &amount))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_merchant_refund_verify (coin_pub,
-                                        &h_contract_terms,
-                                        rtransaction_id,
-                                        &sig_amount,
-                                        &merchant_pub,
-                                        &sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      /* NOTE: theoretically, we could also check that the given
-         merchant_pub and h_contract_terms appear in the
-         history under deposits.  However, there is really no benefit
-         for the exchange to lie here, so not checking is probably OK
-         (an auditor ought to check, though). Then again, we similarly
-         had no reason to check the merchant's signature (other than a
-         well-formendess check). */
-
-      /* check that refund fee matches our expectations from /keys! */
-      if (NULL != dk)
-      {
-        if ( (GNUNET_YES !=
-              TALER_amount_cmp_currency (&refund_fee,
-                                         &dk->fees.refund)) ||
-             (0 !=
-              TALER_amount_cmp (&refund_fee,
-                                &dk->fees.refund)) )
-        {
-          GNUNET_break_op (0);
-          return GNUNET_SYSERR;
-        }
-      }
-      add = GNUNET_NO;
+      GNUNET_break (0);
+      goto fail;
     }
-    else if (0 == strcasecmp (type,
-                              "RECOUP"))
+    if (0 == strcmp (type,
+                     "deny"))
     {
-      struct TALER_ReservePublicKeyP reserve_pub;
-      struct GNUNET_TIME_Timestamp timestamp;
-      union TALER_DenominationBlindingKeyP coin_bks;
-      struct TALER_ExchangePublicKeyP exchange_pub;
-      struct TALER_ExchangeSignatureP exchange_sig;
-      struct TALER_CoinSpendSignatureP coin_sig;
-      struct GNUNET_JSON_Specification spec[] = {
-        TALER_JSON_spec_amount_any ("amount",
-                                    &amount),
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &exchange_pub),
-        GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                     &reserve_pub),
-        GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                     &coin_sig),
-        GNUNET_JSON_spec_fixed_auto ("coin_blind",
-                                     &coin_bks),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     h_denom_pub),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_exchange_online_confirm_recoup_verify (
-            timestamp,
-            &amount,
-            coin_pub,
-            &reserve_pub,
-            &exchange_pub,
-            &exchange_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_wallet_recoup_verify (h_denom_pub,
-                                      &coin_bks,
-                                      coin_pub,
-                                      &coin_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      add = GNUNET_YES;
+      ar->type = TALER_EXCHANGE_AR_DENY;
+      continue;
     }
-    else if (0 == strcasecmp (type,
-                              "RECOUP-REFRESH"))
+    if (0 == strcmp (type,
+                     "regex"))
     {
-      /* This is the coin that was subjected to a recoup,
-         the value being credited to the old coin. */
-      struct TALER_CoinSpendPublicKeyP old_coin_pub;
-      union TALER_DenominationBlindingKeyP coin_bks;
-      struct TALER_Amount amount;
-      struct GNUNET_TIME_Timestamp timestamp;
-      struct TALER_ExchangePublicKeyP exchange_pub;
-      struct TALER_ExchangeSignatureP exchange_sig;
-      struct TALER_CoinSpendSignatureP coin_sig;
+      const char *regex;
+      const char *hint;
       struct GNUNET_JSON_Specification spec[] = {
-        TALER_JSON_spec_amount_any ("amount",
-                                    &amount),
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &exchange_pub),
-        GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                     &coin_sig),
-        GNUNET_JSON_spec_fixed_auto ("old_coin_pub",
-                                     &old_coin_pub),
-        GNUNET_JSON_spec_fixed_auto ("coin_blind",
-                                     &coin_bks),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     h_denom_pub),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
+        GNUNET_JSON_spec_string (
+          "payto_regex",
+          &regex),
+        GNUNET_JSON_spec_string (
+          "human_hint",
+          &hint),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_json (
+            "human_hint_i18n",
+            &ar->details.regex.human_hint_i18n),
+          NULL),
         GNUNET_JSON_spec_end ()
       };
 
       if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
+          GNUNET_JSON_parse (jr,
                              spec,
                              NULL, NULL))
       {
+        /* bogus reply */
         GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_exchange_online_confirm_recoup_refresh_verify (
-            timestamp,
-            &amount,
-            coin_pub,
-            &old_coin_pub,
-            &exchange_pub,
-            &exchange_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_wallet_recoup_verify (h_denom_pub,
-                                      &coin_bks,
-                                      coin_pub,
-                                      &coin_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
+        goto fail;
       }
-      add = GNUNET_YES;
+      ar->type = TALER_EXCHANGE_AR_REGEX;
+      ar->details.regex.posix_egrep = GNUNET_strdup (regex);
+      ar->details.regex.human_hint = GNUNET_strdup (hint);
+      continue;
     }
-    else if (0 == strcasecmp (type,
-                              "OLD-COIN-RECOUP"))
-    {
-      /* This is the coin that was credited in a recoup,
-         the value being credited to the this coin. */
-      struct TALER_ExchangePublicKeyP exchange_pub;
-      struct TALER_ExchangeSignatureP exchange_sig;
-      struct TALER_CoinSpendPublicKeyP new_coin_pub;
-      struct GNUNET_TIME_Timestamp timestamp;
-      struct GNUNET_JSON_Specification spec[] = {
-        TALER_JSON_spec_amount_any ("amount",
-                                    &amount),
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &exchange_pub),
-        GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                     &new_coin_pub),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &timestamp),
-        GNUNET_JSON_spec_end ()
-      };
+    /* unsupported type */
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+fail:
+  GNUNET_free (*resta);
+  *resta_len = 0;
+  return GNUNET_SYSERR;
+}
 
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_exchange_online_confirm_recoup_refresh_verify (
-            timestamp,
-            &amount,
-            &new_coin_pub,
-            coin_pub,
-            &exchange_pub,
-            &exchange_sig))
-      {
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-      add = GNUNET_NO;
-    }
-    else if (0 == strcasecmp (type,
-                              "LOCK_NONCE"))
-    {
-      GNUNET_break (0); // FIXME: implement!
-    }
-    else
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_parse_accounts (
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const json_t *accounts,
+  unsigned int was_length,
+  struct TALER_EXCHANGE_WireAccount was[static was_length])
+{
+  memset (was,
+          0,
+          sizeof (struct TALER_EXCHANGE_WireAccount) * was_length);
+  GNUNET_assert (was_length ==
+                 json_array_size (accounts));
+  for (unsigned int i = 0;
+       i<was_length;
+       i++)
+  {
+    struct TALER_EXCHANGE_WireAccount *wa = &was[i];
+    const char *payto_uri;
+    const char *conversion_url = NULL;
+    const char *bank_label = NULL;
+    int64_t priority = 0;
+    const json_t *credit_restrictions;
+    const json_t *debit_restrictions;
+    struct GNUNET_JSON_Specification spec_account[] = {
+      TALER_JSON_spec_payto_uri ("payto_uri",
+                                 &payto_uri),
+      GNUNET_JSON_spec_mark_optional (
+        TALER_JSON_spec_web_url ("conversion_url",
+                                 &conversion_url),
+        NULL),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_int64 ("priority",
+                                &priority),
+        NULL),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_string ("bank_label",
+                                 &bank_label),
+        NULL),
+      GNUNET_JSON_spec_array_const ("credit_restrictions",
+                                    &credit_restrictions),
+      GNUNET_JSON_spec_array_const ("debit_restrictions",
+                                    &debit_restrictions),
+      GNUNET_JSON_spec_fixed_auto ("master_sig",
+                                   &wa->master_sig),
+      GNUNET_JSON_spec_end ()
+    };
+    json_t *account;
+
+    account = json_array_get (accounts,
+                              i);
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (account,
+                           spec_account,
+                           NULL, NULL))
     {
-      /* signature not supported, new version on server? */
+      /* bogus reply */
       GNUNET_break_op (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unexpected type `%s' in response\n",
-                  type);
-      GNUNET_assert (GNUNET_SYSERR == add);
       return GNUNET_SYSERR;
     }
-
-    if (GNUNET_YES == add)
+    if ( (NULL != master_pub) &&
+         (GNUNET_OK !=
+          TALER_exchange_wire_signature_check (
+            payto_uri,
+            conversion_url,
+            debit_restrictions,
+            credit_restrictions,
+            master_pub,
+            &wa->master_sig)) )
     {
-      /* This amount should be added to the total */
-      if (0 >
-          TALER_amount_add (total,
-                            total,
-                            &amount))
-      {
-        /* overflow in history already!? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
+      /* bogus reply */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
     }
-    else
+    if ( (GNUNET_OK !=
+          parse_restrictions (credit_restrictions,
+                              &wa->credit_restrictions_length,
+                              &wa->credit_restrictions)) ||
+         (GNUNET_OK !=
+          parse_restrictions (debit_restrictions,
+                              &wa->debit_restrictions_length,
+                              &wa->debit_restrictions)) )
     {
-      /* This amount should be subtracted from the total.
-
-         However, for the implementation, we first *add* up all of
-         these negative amounts, as we might get refunds before
-         deposits from a semi-evil exchange.  Then, at the end, we do
-         the subtraction by calculating "total = total - rtotal" */
-      GNUNET_assert (GNUNET_NO == add);
-      if (0 >
-          TALER_amount_add (&rtotal,
-                            &rtotal,
-                            &amount))
-      {
-        /* overflow in refund history? inconceivable! Bad exchange! */
-        GNUNET_break_op (0);
-        return GNUNET_SYSERR;
-      }
-
+      /* bogus reply */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
     }
-  }
+    wa->payto_uri = GNUNET_strdup (payto_uri);
+    wa->priority = priority;
+    if (NULL != conversion_url)
+      wa->conversion_url = GNUNET_strdup (conversion_url);
+    if (NULL != bank_label)
+      wa->bank_label = GNUNET_strdup (bank_label);
+  }       /* end 'for all accounts */
+  return GNUNET_OK;
+}
 
 
-  /* Finally, subtract 'rtotal' from total to handle the subtractions */
-  if (0 >
-      TALER_amount_subtract (total,
-                             total,
-                             &rtotal))
+/**
+ * Free array of account restrictions.
+ *
+ * @param ar_len length of @a ar
+ * @param[in] ar array to free contents of (but not @a ar itself)
+ */
+static void
+free_restrictions (unsigned int ar_len,
+                   struct TALER_EXCHANGE_AccountRestriction ar[static ar_len])
+{
+  for (unsigned int i = 0; i<ar_len; i++)
   {
-    /* underflow in history? inconceivable! Bad exchange! */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
+    struct TALER_EXCHANGE_AccountRestriction *a = &ar[i];
+    switch (a->type)
+    {
+    case TALER_EXCHANGE_AR_INVALID:
+      GNUNET_break (0);
+      break;
+    case TALER_EXCHANGE_AR_DENY:
+      break;
+    case TALER_EXCHANGE_AR_REGEX:
+      GNUNET_free (ar->details.regex.posix_egrep);
+      GNUNET_free (ar->details.regex.human_hint);
+      json_decref (ar->details.regex.human_hint_i18n);
+      break;
+    }
   }
-
-  return GNUNET_OK;
 }
 
 
-const struct TALER_EXCHANGE_SigningPublicKey *
-TALER_EXCHANGE_get_signing_key_info (
-  const struct TALER_EXCHANGE_Keys *keys,
-  const struct TALER_ExchangePublicKeyP *exchange_pub)
+void
+TALER_EXCHANGE_free_accounts (
+  unsigned int was_len,
+  struct TALER_EXCHANGE_WireAccount was[static was_len])
 {
-  for (unsigned int i = 0; i<keys->num_sign_keys; i++)
+  for (unsigned int i = 0; i<was_len; i++)
   {
-    const struct TALER_EXCHANGE_SigningPublicKey *spk
-      = &keys->sign_keys[i];
-
-    if (0 == GNUNET_memcmp (exchange_pub,
-                            &spk->key))
-      return spk;
+    struct TALER_EXCHANGE_WireAccount *wa = &was[i];
+
+    GNUNET_free (wa->payto_uri);
+    GNUNET_free (wa->conversion_url);
+    GNUNET_free (wa->bank_label);
+    free_restrictions (wa->credit_restrictions_length,
+                       wa->credit_restrictions);
+    GNUNET_array_grow (wa->credit_restrictions,
+                       wa->credit_restrictions_length,
+                       0);
+    free_restrictions (wa->debit_restrictions_length,
+                       wa->debit_restrictions);
+    GNUNET_array_grow (wa->debit_restrictions,
+                       wa->debit_restrictions_length,
+                       0);
   }
-  return NULL;
 }
 
 
diff --git a/src/lib/exchange_api_common.h b/src/lib/exchange_api_common.h
new file mode 100644
index 000000000..f1f0fd7fa
--- /dev/null
+++ b/src/lib/exchange_api_common.h
@@ -0,0 +1,180 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2015-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/>
+*/
+/**
+ * @file lib/exchange_api_common.h
+ * @brief common functions for the exchange API
+ * @author Christian Grothoff
+ */
+#ifndef EXCHANGE_API_COMMON_H
+#define EXCHANGE_API_COMMON_H
+
+#include "taler_json_lib.h"
+#include "taler_exchange_service.h"
+
+
+/**
+ * Check proof of a purse creation conflict.
+ *
+ * @param cpurse_sig conflicting signature (must
+ *        not match the signature from the proof)
+ * @param purse_pub the public key (must match
+ *        the signature from the proof)
+ * @param proof the proof to check
+ * @return #GNUNET_OK if the @a proof is OK for @a purse_pub and conflicts with @a cpurse_sig
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_create_conflict_ (
+  const struct TALER_PurseContractSignatureP *cpurse_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const json_t *proof);
+
+
+/**
+ * Check proof of a purse merge conflict.
+ *
+ * @param cmerge_sig conflicting signature (must
+ *        not match the signature from the proof)
+ * @param merge_pub the public key (must match
+ *        the signature from the proof)
+ * @param purse_pub the public key of the purse
+ * @param exchange_url the base URL of this exchange
+ * @param proof the proof to check
+ * @return #GNUNET_OK if the @a proof is OK for @a purse_pub and @a merge_pub and conflicts with @a cmerge_sig
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_merge_conflict_ (
+  const struct TALER_PurseMergeSignatureP *cmerge_sig,
+  const struct TALER_PurseMergePublicKeyP *merge_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const char *exchange_url,
+  const json_t *proof);
+
+
+/**
+ * Check @a proof that claims this coin was spend
+ * differently on the same purse already. Note that
+ * the caller must still check that @a coin_pub is
+ * in the list of coins that were used, and that
+ * @a coin_sig is different from the signature the
+ * caller used.
+ *
+ * @param purse_pub the public key of the purse
+ * @param exchange_url base URL of our exchange
+ * @param proof the proof to check
+ * @param[out] h_denom_pub hash of the coin's denomination
+ * @param[out] phac age commitment hash of the coin
+ * @param[out] coin_pub set to the conflicting coin
+ * @param[out] coin_sig set to the conflicting signature
+ * @return #GNUNET_OK if the @a proof is OK for @a purse_pub and showing that @a coin_pub was spent using @a coin_sig.
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_coin_conflict_ (
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const char *exchange_url,
+  const json_t *proof,
+  struct TALER_DenominationHashP *h_denom_pub,
+  struct TALER_AgeCommitmentHash *phac,
+  struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_CoinSpendSignatureP *coin_sig);
+
+
+/**
+ * Check proof of a contract conflict.
+ *
+ * @param ccontract_sig conflicting signature (must
+ *        not match the signature from the proof)
+ * @param purse_pub public key of the purse
+ * @param proof the proof to check
+ * @return #GNUNET_OK if the @a proof is OK for @a purse_pub and conflicts with @a ccontract_sig
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_purse_econtract_conflict_ (
+  const struct TALER_PurseContractSignatureP *ccontract_sig,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const json_t *proof);
+
+
+/**
+ * Check proof of a coin spend value conflict.
+ *
+ * @param keys exchange /keys structure
+ * @param proof the proof to check
+ * @param[out] coin_pub set to the public key of the
+ *        coin that is claimed to have an insufficient
+ *        balance
+ * @param[out] remaining set to the remaining balance
+ *        of the coin as provided by the proof
+ * @return #GNUNET_OK if the @a proof is OK for @a purse_pub demonstrating that @a coin_pub has only @a remaining balance.
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_coin_amount_conflict_ (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const json_t *proof,
+  struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct TALER_Amount *remaining);
+
+
+/**
+ * Verify that @a proof contains a coin history that demonstrates that @a
+ * coin_pub was previously used with a denomination key that is different from
+ * @a ch_denom_pub.  Note that the coin history MUST have been checked before
+ * using #TALER_EXCHANGE_check_coin_amount_conflict_().
+ *
+ * @param proof a proof to check
+ * @param ch_denom_pub hash of the conflicting denomination
+ * @return #GNUNET_OK if @a ch_denom_pub differs from the
+ *         denomination hash given by the history of the coin
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_check_coin_denomination_conflict_ (
+  const json_t *proof,
+  const struct TALER_DenominationHashP *ch_denom_pub);
+
+
+/**
+ * Find the smallest denomination amount in @e keys.
+ *
+ * @param keys keys to search
+ * @param[out] min set to the smallest amount
+ * @return #GNUNET_SYSERR if there are no denominations in @a keys
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_get_min_denomination_ (
+  const struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_Amount *min);
+
+
+/**
+ * Verify signature information about the deposit.
+ *
+ * @param dcd contract details
+ * @param ech hashed policy (passed to avoid recomputation)
+ * @param h_wire hashed wire details (passed to avoid recomputation)
+ * @param cdd coin-specific details
+ * @param dki denomination of the coin
+ * @return #GNUNET_OK if signatures are OK, #GNUNET_SYSERR if not
+ */
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_verify_deposit_signature_ (
+  const struct TALER_EXCHANGE_DepositContractDetail *dcd,
+  const struct TALER_ExtensionPolicyHashP *ech,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const struct TALER_EXCHANGE_CoinDepositDetail *cdd,
+  const struct TALER_EXCHANGE_DenomPublicKey *dki);
+
+
+#endif
diff --git a/src/lib/exchange_api_contracts_get.c b/src/lib/exchange_api_contracts_get.c
index 263a0cbe9..aece7733a 100644
--- a/src/lib/exchange_api_contracts_get.c
+++ b/src/lib/exchange_api_contracts_get.c
@@ -39,11 +39,6 @@ struct TALER_EXCHANGE_ContractsGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -109,7 +104,7 @@ handle_contract_get_finished (void *cls,
       struct TALER_PurseContractSignatureP econtract_sig;
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_fixed_auto ("purse_pub",
-                                     &dr.details.success.purse_pub),
+                                     &dr.details.ok.purse_pub),
         GNUNET_JSON_spec_fixed_auto ("econtract_sig",
                                      &econtract_sig),
         GNUNET_JSON_spec_varsize ("econtract",
@@ -133,7 +128,7 @@ handle_contract_get_finished (void *cls,
             econtract,
             econtract_size,
             &cgh->cpub,
-            &dr.details.success.purse_pub,
+            &dr.details.ok.purse_pub,
             &econtract_sig))
       {
         GNUNET_break (0);
@@ -142,8 +137,8 @@ handle_contract_get_finished (void *cls,
         GNUNET_JSON_parse_free (spec);
         break;
       }
-      dr.details.success.econtract = econtract;
-      dr.details.success.econtract_size = econtract_size;
+      dr.details.ok.econtract = econtract;
+      dr.details.ok.econtract_size = econtract_size;
       cgh->cb (cgh->cb_cls,
                &dr);
       GNUNET_JSON_parse_free (spec);
@@ -194,7 +189,8 @@ handle_contract_get_finished (void *cls,
 
 struct TALER_EXCHANGE_ContractsGetHandle *
 TALER_EXCHANGE_contract_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   TALER_EXCHANGE_ContractGetCallback cb,
   void *cb_cls)
@@ -203,14 +199,7 @@ TALER_EXCHANGE_contract_get (
   CURL *eh;
   char arg_str[sizeof (cgh->cpub) * 2 + 48];
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   cgh = GNUNET_new (struct TALER_EXCHANGE_ContractsGetHandle);
-  cgh->exchange = exchange;
   cgh->cb = cb;
   cgh->cb_cls = cb_cls;
   GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
@@ -226,12 +215,13 @@ TALER_EXCHANGE_contract_get (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/contracts/%s",
+                     "contracts/%s",
                      cpub_str);
   }
 
-  cgh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  cgh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == cgh->url)
   {
     GNUNET_free (cgh);
@@ -247,7 +237,7 @@ TALER_EXCHANGE_contract_get (
     GNUNET_free (cgh);
     return NULL;
   }
-  cgh->job = GNUNET_CURL_job_add (TEAH_handle_to_context (exchange),
+  cgh->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   &handle_contract_get_finished,
                                   cgh);
diff --git a/src/lib/exchange_api_csr_melt.c b/src/lib/exchange_api_csr_melt.c
index 9de8cd8d9..bf6f4bfe1 100644
--- a/src/lib/exchange_api_csr_melt.c
+++ b/src/lib/exchange_api_csr_melt.c
@@ -38,10 +38,6 @@
  */
 struct TALER_EXCHANGE_CsRMeltHandle
 {
-  /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
 
   /**
    * Function to call with the result.
@@ -90,15 +86,15 @@ csr_ok (struct TALER_EXCHANGE_CsRMeltHandle *csrh,
         const json_t *arr,
         struct TALER_EXCHANGE_HttpResponse *hr)
 {
-  unsigned int alen = json_array_size (arr);
+  size_t alen = json_array_size (arr);
   struct TALER_ExchangeWithdrawValues alg_values[GNUNET_NZL (alen)];
   struct TALER_EXCHANGE_CsRMeltResponse csrr = {
     .hr = *hr,
-    .details.success.alg_values_len = alen,
-    .details.success.alg_values = alg_values
+    .details.ok.alg_values_len = alen,
+    .details.ok.alg_values = alg_values
   };
 
-  for (unsigned int i = 0; i<alen; i++)
+  for (size_t i = 0; i<alen; i++)
   {
     json_t *av = json_array_get (arr,
                                  i);
@@ -120,6 +116,8 @@ csr_ok (struct TALER_EXCHANGE_CsRMeltHandle *csrh,
   }
   csrh->cb (csrh->cb_cls,
             &csrr);
+  for (size_t i = 0; i<alen; i++)
+    TALER_denom_ewv_free (&alg_values[i]);
   return GNUNET_OK;
 }
 
@@ -220,12 +218,14 @@ handle_csr_finished (void *cls,
 
 
 struct TALER_EXCHANGE_CsRMeltHandle *
-TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
-                         const struct TALER_RefreshMasterSecretP *rms,
-                         unsigned int nks_len,
-                         struct TALER_EXCHANGE_NonceKey *nks,
-                         TALER_EXCHANGE_CsRMeltCallback res_cb,
-                         void *res_cb_cls)
+TALER_EXCHANGE_csr_melt (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_RefreshMasterSecretP *rms,
+  unsigned int nks_len,
+  struct TALER_EXCHANGE_NonceKey nks[static nks_len],
+  TALER_EXCHANGE_CsRMeltCallback res_cb,
+  void *res_cb_cls)
 {
   struct TALER_EXCHANGE_CsRMeltHandle *csrh;
   json_t *csr_arr;
@@ -236,13 +236,13 @@ TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
     return NULL;
   }
   for (unsigned int i = 0; i<nks_len; i++)
-    if (TALER_DENOMINATION_CS != nks[i].pk->key.cipher)
+    if (GNUNET_CRYPTO_BSA_CS !=
+        nks[i].pk->key.bsign_pub_key->cipher)
     {
       GNUNET_break (0);
       return NULL;
     }
   csrh = GNUNET_new (struct TALER_EXCHANGE_CsRMeltHandle);
-  csrh->exchange = exchange;
   csrh->cb = res_cb;
   csrh->cb_cls = res_cb_cls;
   csr_arr = json_array ();
@@ -262,8 +262,9 @@ TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
                    json_array_append_new (csr_arr,
                                           csr_obj));
   }
-  csrh->url = TEAH_path_to_url (exchange,
-                                "/csr-melt");
+  csrh->url = TALER_url_join (url,
+                              "csr-melt",
+                              NULL);
   if (NULL == csrh->url)
   {
     json_decref (csr_arr);
@@ -272,7 +273,6 @@ TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
   }
   {
     CURL *eh;
-    struct GNUNET_CURL_Context *ctx;
     json_t *req;
 
     req = GNUNET_JSON_PACK (
@@ -280,7 +280,6 @@ TALER_EXCHANGE_csr_melt (struct TALER_EXCHANGE_Handle *exchange,
                                   rms),
       GNUNET_JSON_pack_array_steal ("nks",
                                     csr_arr));
-    ctx = TEAH_handle_to_context (exchange);
     eh = TALER_EXCHANGE_curl_easy_get_ (csrh->url);
     if ( (NULL == eh) ||
          (GNUNET_OK !=
diff --git a/src/lib/exchange_api_csr_withdraw.c b/src/lib/exchange_api_csr_withdraw.c
index fa806857d..0fe731cd5 100644
--- a/src/lib/exchange_api_csr_withdraw.c
+++ b/src/lib/exchange_api_csr_withdraw.c
@@ -39,11 +39,6 @@
 struct TALER_EXCHANGE_CsRWithdrawHandle
 {
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * Function to call with the result.
    */
   TALER_EXCHANGE_CsRWithdrawCallback cb;
@@ -96,7 +91,7 @@ csr_ok (struct TALER_EXCHANGE_CsRWithdrawHandle *csrh,
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_exchange_withdraw_values (
       "ewv",
-      &csrr.details.success.alg_values),
+      &csrr.details.ok.alg_values),
     GNUNET_JSON_spec_end ()
   };
 
@@ -110,6 +105,7 @@ csr_ok (struct TALER_EXCHANGE_CsRWithdrawHandle *csrh,
   }
   csrh->cb (csrh->cb_cls,
             &csrr);
+  TALER_denom_ewv_free (&csrr.details.ok.alg_values);
   return GNUNET_OK;
 }
 
@@ -204,25 +200,28 @@ handle_csr_finished (void *cls,
 
 
 struct TALER_EXCHANGE_CsRWithdrawHandle *
-TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange,
-                             const struct TALER_EXCHANGE_DenomPublicKey *pk,
-                             const struct TALER_CsNonce *nonce,
-                             TALER_EXCHANGE_CsRWithdrawCallback res_cb,
-                             void *res_cb_cls)
+TALER_EXCHANGE_csr_withdraw (
+  struct GNUNET_CURL_Context *curl_ctx,
+  const char *exchange_url,
+  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
+  TALER_EXCHANGE_CsRWithdrawCallback res_cb,
+  void *res_cb_cls)
 {
   struct TALER_EXCHANGE_CsRWithdrawHandle *csrh;
 
-  if (TALER_DENOMINATION_CS != pk->key.cipher)
+  if (GNUNET_CRYPTO_BSA_CS !=
+      pk->key.bsign_pub_key->cipher)
   {
     GNUNET_break (0);
     return NULL;
   }
   csrh = GNUNET_new (struct TALER_EXCHANGE_CsRWithdrawHandle);
-  csrh->exchange = exchange;
   csrh->cb = res_cb;
   csrh->cb_cls = res_cb_cls;
-  csrh->url = TEAH_path_to_url (exchange,
-                                "/csr-withdraw");
+  csrh->url = TALER_url_join (exchange_url,
+                              "csr-withdraw",
+                              NULL);
   if (NULL == csrh->url)
   {
     GNUNET_free (csrh);
@@ -231,18 +230,16 @@ TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange,
 
   {
     CURL *eh;
-    struct GNUNET_CURL_Context *ctx;
     json_t *req;
 
     req = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_data_varsize ("nonce",
                                      nonce,
-                                     sizeof(struct TALER_CsNonce)),
+                                     sizeof(*nonce)),
       GNUNET_JSON_pack_data_varsize ("denom_pub_hash",
                                      &pk->h_key,
-                                     sizeof(struct TALER_DenominationHashP)));
+                                     sizeof(pk->h_key)));
     GNUNET_assert (NULL != req);
-    ctx = TEAH_handle_to_context (exchange);
     eh = TALER_EXCHANGE_curl_easy_get_ (csrh->url);
     if ( (NULL == eh) ||
          (GNUNET_OK !=
@@ -259,7 +256,7 @@ TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange,
       return NULL;
     }
     json_decref (req);
-    csrh->job = GNUNET_CURL_job_add2 (ctx,
+    csrh->job = GNUNET_CURL_job_add2 (curl_ctx,
                                       eh,
                                       csrh->post_ctx.headers,
                                       &handle_csr_finished,
@@ -270,8 +267,8 @@ TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange,
 
 
 void
-TALER_EXCHANGE_csr_withdraw_cancel (struct
-                                    TALER_EXCHANGE_CsRWithdrawHandle *csrh)
+TALER_EXCHANGE_csr_withdraw_cancel (
+  struct TALER_EXCHANGE_CsRWithdrawHandle *csrh)
 {
   if (NULL != csrh->job)
   {
diff --git a/src/lib/exchange_api_curl_defaults.c b/src/lib/exchange_api_curl_defaults.c
index 9627db9ff..85a32189b 100644
--- a/src/lib/exchange_api_curl_defaults.c
+++ b/src/lib/exchange_api_curl_defaults.c
@@ -19,7 +19,8 @@
  * @brief curl easy handle defaults
  * @author Florian Dold
  */
-
+#include "platform.h"
+#include "taler_curl_lib.h"
 #include "exchange_api_curl_defaults.h"
 
 
@@ -38,22 +39,14 @@ TALER_EXCHANGE_curl_easy_get_ (const char *url)
                  curl_easy_setopt (eh,
                                    CURLOPT_URL,
                                    url));
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_FOLLOWLOCATION,
-                                   1L));
+  TALER_curl_set_secure_redirect_policy (eh,
+                                         url);
   /* Enable compression (using whatever curl likes), see
      https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html  */
   GNUNET_break (CURLE_OK ==
                 curl_easy_setopt (eh,
                                   CURLOPT_ACCEPT_ENCODING,
                                   ""));
-  /* limit MAXREDIRS to 5 as a simple security measure against
-     a potential infinite loop caused by a malicious target */
-  GNUNET_assert (CURLE_OK ==
-                 curl_easy_setopt (eh,
-                                   CURLOPT_MAXREDIRS,
-                                   5L));
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
                                    CURLOPT_TCP_FASTOPEN,
diff --git a/src/lib/exchange_api_curl_defaults.h b/src/lib/exchange_api_curl_defaults.h
index 009d72ab8..c4ba04fc5 100644
--- a/src/lib/exchange_api_curl_defaults.h
+++ b/src/lib/exchange_api_curl_defaults.h
@@ -25,7 +25,6 @@
 #define _TALER_CURL_DEFAULTS_H
 
 
-#include "platform.h"
 #include <gnunet/gnunet_curl_lib.h>
 
 
diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
deleted file mode 100644
index 67f595bfb..000000000
--- a/src/lib/exchange_api_deposit.c
+++ /dev/null
@@ -1,771 +0,0 @@
-/*
-   This file is part of TALER
-   Copyright (C) 2014-2021 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/>
- */
-/**
- * @file lib/exchange_api_deposit.c
- * @brief Implementation of the /deposit request of the exchange's HTTP API
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_json_lib.h"
-#include "taler_auditor_service.h"
-#include "taler_exchange_service.h"
-#include "exchange_api_handle.h"
-#include "taler_signatures.h"
-#include "exchange_api_curl_defaults.h"
-
-
-/**
- * 1:#AUDITOR_CHANCE is the probability that we report deposits
- * to the auditor.
- *
- * 20==5% of going to auditor. This is possibly still too high, but set
- * deliberately this high for testing
- */
-#define AUDITOR_CHANCE 20
-
-/**
- * @brief A Deposit Handle
- */
-struct TALER_EXCHANGE_DepositHandle
-{
-
-  /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
-   * The url for this request.
-   */
-  char *url;
-
-  /**
-   * Context for #TEH_curl_easy_post(). Keeps the data that must
-   * persist for Curl to make the upload.
-   */
-  struct TALER_CURL_PostContext ctx;
-
-  /**
-   * Handle for the request.
-   */
-  struct GNUNET_CURL_Job *job;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_EXCHANGE_DepositResultCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Hash over the contract for which this deposit is made.
-   */
-  struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED;
-
-  /**
-   * Hash over the wiring information of the merchant.
-   */
-  struct TALER_MerchantWireHashP h_wire GNUNET_PACKED;
-
-  /**
-   * Hash over the extension options of the deposit, 0 if there
-   * were not extension options.
-   */
-  struct TALER_ExtensionContractHashP h_extensions GNUNET_PACKED;
-
-  /**
-   * Time when this confirmation was generated / when the exchange received
-   * the deposit request.
-   */
-  struct GNUNET_TIME_Timestamp exchange_timestamp;
-
-  /**
-   * By when does the exchange expect to pay the merchant
-   * (as per the merchant's request).
-   */
-  struct GNUNET_TIME_Timestamp wire_deadline;
-
-  /**
-   * How much time does the @e merchant have to issue a refund
-   * request?  Zero if refunds are not allowed.  After this time, the
-   * coin cannot be refunded.  Note that the wire transfer will not be
-   * performed by the exchange until the refund deadline.  This value
-   * is taken from the original deposit request.
-   */
-  struct GNUNET_TIME_Timestamp refund_deadline;
-
-  /**
-   * Amount to be deposited, excluding fee.  Calculated from the
-   * amount with fee and the fee from the deposit request.
-   */
-  struct TALER_Amount amount_without_fee;
-
-  /**
-   * The public key of the coin that was deposited.
-   */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
-
-  /**
-   * The Merchant's public key.  Allows the merchant to later refund
-   * the transaction or to inquire about the wire transfer identifier.
-   */
-  struct TALER_MerchantPublicKeyP merchant_pub;
-
-  /**
-   * Exchange signature, set for #auditor_cb.
-   */
-  struct TALER_ExchangeSignatureP exchange_sig;
-
-  /**
-   * Exchange signing public key, set for #auditor_cb.
-   */
-  struct TALER_ExchangePublicKeyP exchange_pub;
-
-  /**
-   * Value of the /deposit transaction, including fee.
-   */
-  struct TALER_Amount amount_with_fee;
-
-  /**
-   * @brief Public information about the coin's denomination key.
-   * Note that the "key" field itself has been zero'ed out.
-   */
-  struct TALER_EXCHANGE_DenomPublicKey dki;
-
-  /**
-   * Chance that we will inform the auditor about the deposit
-   * is 1:n, where the value of this field is "n".
-   */
-  unsigned int auditor_chance;
-
-};
-
-
-/**
- * Function called for each auditor to give us a chance to possibly
- * launch a deposit confirmation interaction.
- *
- * @param cls closure
- * @param ah handle to the auditor
- * @param auditor_pub public key of the auditor
- * @return NULL if no deposit confirmation interaction was launched
- */
-static struct TEAH_AuditorInteractionEntry *
-auditor_cb (void *cls,
-            struct TALER_AUDITOR_Handle *ah,
-            const struct TALER_AuditorPublicKeyP *auditor_pub)
-{
-  struct TALER_EXCHANGE_DepositHandle *dh = cls;
-  const struct TALER_EXCHANGE_Keys *key_state;
-  const struct TALER_EXCHANGE_SigningPublicKey *spk;
-  struct TEAH_AuditorInteractionEntry *aie;
-
-  if (0 != GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                     dh->auditor_chance))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Not providing deposit confirmation to auditor\n");
-    return NULL;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Will provide deposit confirmation to auditor `%s'\n",
-              TALER_B2S (auditor_pub));
-  key_state = TALER_EXCHANGE_get_keys (dh->exchange);
-  spk = TALER_EXCHANGE_get_signing_key_info (key_state,
-                                             &dh->exchange_pub);
-  if (NULL == spk)
-  {
-    GNUNET_break_op (0);
-    return NULL;
-  }
-  aie = GNUNET_new (struct TEAH_AuditorInteractionEntry);
-  aie->dch = TALER_AUDITOR_deposit_confirmation (
-    ah,
-    &dh->h_wire,
-    &dh->h_extensions,
-    &dh->h_contract_terms,
-    dh->exchange_timestamp,
-    dh->wire_deadline,
-    dh->refund_deadline,
-    &dh->amount_without_fee,
-    &dh->coin_pub,
-    &dh->merchant_pub,
-    &dh->exchange_pub,
-    &dh->exchange_sig,
-    &key_state->master_pub,
-    spk->valid_from,
-    spk->valid_until,
-    spk->valid_legal,
-    &spk->master_sig,
-    &TEAH_acc_confirmation_cb,
-    aie);
-  return aie;
-}
-
-
-/**
- * Verify that the signatures on the "403 FORBIDDEN" response from the
- * exchange demonstrating customer double-spending are valid.
- *
- * @param dh deposit handle
- * @param json json reply with the signature(s) and transaction history
- * @return #GNUNET_OK if the signature(s) is valid, #GNUNET_SYSERR if not
- */
-static enum GNUNET_GenericReturnValue
-verify_deposit_signature_conflict (
-  const struct TALER_EXCHANGE_DepositHandle *dh,
-  const json_t *json)
-{
-  json_t *history;
-  struct TALER_Amount total;
-  enum TALER_ErrorCode ec;
-  struct TALER_DenominationHashP h_denom_pub;
-
-  memset (&h_denom_pub,
-          0,
-          sizeof (h_denom_pub));
-  history = json_object_get (json,
-                             "history");
-  if (GNUNET_OK !=
-      TALER_EXCHANGE_verify_coin_history (&dh->dki,
-                                          dh->dki.value.currency,
-                                          &dh->coin_pub,
-                                          history,
-                                          &h_denom_pub,
-                                          &total))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  ec = TALER_JSON_get_error_code (json);
-  switch (ec)
-  {
-  case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-    if (0 >
-        TALER_amount_add (&total,
-                          &total,
-                          &dh->amount_with_fee))
-    {
-      /* clearly not OK if our transaction would have caused
-         the overflow... */
-      return GNUNET_OK;
-    }
-
-    if (0 >= TALER_amount_cmp (&total,
-                               &dh->dki.value))
-    {
-      /* transaction should have still fit */
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    /* everything OK, proof of double-spending was provided */
-    return GNUNET_OK;
-  case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-    if (0 != GNUNET_memcmp (&dh->dki.h_key,
-                            &h_denom_pub))
-      return GNUNET_OK; /* indeed, proof with different denomination key provided */
-    /* invalid proof provided */
-    return GNUNET_SYSERR;
-  default:
-    /* unexpected error code */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Function called when we're done processing the
- * HTTP /deposit request.
- *
- * @param cls the `struct TALER_EXCHANGE_DepositHandle`
- * @param response_code HTTP response code, 0 on error
- * @param response parsed JSON result, NULL on error
- */
-static void
-handle_deposit_finished (void *cls,
-                         long response_code,
-                         const void *response)
-{
-  struct TALER_EXCHANGE_DepositHandle *dh = cls;
-  const json_t *j = response;
-  struct TALER_EXCHANGE_DepositResult dr = {
-    .hr.reply = j,
-    .hr.http_status = (unsigned int) response_code
-  };
-
-  dh->job = NULL;
-  switch (response_code)
-  {
-  case 0:
-    dr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    break;
-  case MHD_HTTP_OK:
-    {
-      const struct TALER_EXCHANGE_Keys *key_state;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &dh->exchange_sig),
-        GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &dh->exchange_pub),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_string ("transaction_base_url",
-                                   &dr.details.success.transaction_base_url),
-          NULL),
-        GNUNET_JSON_spec_timestamp ("exchange_timestamp",
-                                    &dh->exchange_timestamp),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (j,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        dr.hr.http_status = 0;
-        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-      key_state = TALER_EXCHANGE_get_keys (dh->exchange);
-      if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
-                                           &dh->exchange_pub))
-      {
-        GNUNET_break_op (0);
-        dr.hr.http_status = 0;
-        dr.hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
-        break;
-      }
-
-      if (GNUNET_OK !=
-          TALER_exchange_online_deposit_confirmation_verify (
-            &dh->h_contract_terms,
-            &dh->h_wire,
-            &dh->h_extensions,
-            dh->exchange_timestamp,
-            dh->wire_deadline,
-            dh->refund_deadline,
-            &dh->amount_without_fee,
-            &dh->coin_pub,
-            &dh->merchant_pub,
-            &dh->exchange_pub,
-            &dh->exchange_sig))
-      {
-        GNUNET_break_op (0);
-        dr.hr.http_status = 0;
-        dr.hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
-        break;
-      }
-
-      TEAH_get_auditors_for_dc (dh->exchange,
-                                &auditor_cb,
-                                dh);
-    }
-    dr.details.success.exchange_sig = &dh->exchange_sig;
-    dr.details.success.exchange_pub = &dh->exchange_pub;
-    dr.details.success.deposit_timestamp = dh->exchange_timestamp;
-    break;
-  case MHD_HTTP_BAD_REQUEST:
-    /* This should never happen, either us or the exchange is buggy
-       (or API version conflict); just pass JSON reply to the application */
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_FORBIDDEN:
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    /* Nothing really to verify, exchange says one of the signatures is
-       invalid; as we checked them, this should never happen, we
-       should pass the JSON reply to the application */
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    /* Nothing really to verify, this should never
-       happen, we should pass the JSON reply to the application */
-    break;
-  case MHD_HTTP_CONFLICT:
-    /* Double spending; check signatures on transaction history */
-    if (GNUNET_OK !=
-        verify_deposit_signature_conflict (dh,
-                                           j))
-    {
-      GNUNET_break_op (0);
-      dr.hr.http_status = 0;
-      dr.hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
-    }
-    else
-    {
-      dr.hr.ec = TALER_JSON_get_error_code (j);
-      dr.hr.hint = TALER_JSON_get_error_hint (j);
-    }
-    break;
-  case MHD_HTTP_GONE:
-    /* could happen if denomination was revoked */
-    /* Note: one might want to check /keys for revocation
-       signature here, alas tricky in case our /keys
-       is outdated => left to clients */
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    /* Server had an internal issue; we should retry, but this API
-       leaves this to the application */
-    break;
-  default:
-    /* unexpected response code */
-    dr.hr.ec = TALER_JSON_get_error_code (j);
-    dr.hr.hint = TALER_JSON_get_error_hint (j);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for exchange deposit\n",
-                (unsigned int) response_code,
-                dr.hr.ec);
-    GNUNET_break_op (0);
-    break;
-  }
-  dh->cb (dh->cb_cls,
-          &dr);
-  TALER_EXCHANGE_deposit_cancel (dh);
-}
-
-
-/**
- * Verify signature information about the deposit.
- *
- * @param dki public key information
- * @param amount the amount to be deposited
- * @param h_wire hash of the merchant’s account details
- * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the exchange)
- * @param ech hash over contract extensions
- * @param coin_pub coin’s public key
- * @param h_age_commitment coin’s hash of age commitment, might be NULL
- * @param denom_sig exchange’s unblinded signature of the coin
- * @param denom_pub denomination key with which the coin is signed
- * @param denom_pub_hash hash of @a denom_pub
- * @param timestamp timestamp when the deposit was finalized
- * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
- * @param refund_deadline date until which the merchant can issue a refund to the customer via the exchange (can be zero if refunds are not allowed)
- * @param coin_sig the signature made with purpose #TALER_SIGNATURE_WALLET_COIN_DEPOSIT made by the customer with the coin’s private key.
- * @return #GNUNET_OK if signatures are OK, #GNUNET_SYSERR if not
- */
-static enum GNUNET_GenericReturnValue
-verify_signatures (const struct TALER_EXCHANGE_DenomPublicKey *dki,
-                   const struct TALER_Amount *amount,
-                   const struct TALER_MerchantWireHashP *h_wire,
-                   const struct TALER_PrivateContractHashP *h_contract_terms,
-                   const struct TALER_ExtensionContractHashP *ech,
-                   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                   const struct TALER_AgeCommitmentHash *h_age_commitment,
-                   const struct TALER_DenominationSignature *denom_sig,
-                   const struct TALER_DenominationPublicKey *denom_pub,
-                   const struct TALER_DenominationHashP *denom_pub_hash,
-                   struct GNUNET_TIME_Timestamp timestamp,
-                   const struct TALER_MerchantPublicKeyP *merchant_pub,
-                   struct GNUNET_TIME_Timestamp refund_deadline,
-                   const struct TALER_CoinSpendSignatureP *coin_sig)
-{
-  if (GNUNET_OK !=
-      TALER_wallet_deposit_verify (amount,
-                                   &dki->fees.deposit,
-                                   h_wire,
-                                   h_contract_terms,
-                                   h_age_commitment,
-                                   ech,
-                                   denom_pub_hash,
-                                   timestamp,
-                                   merchant_pub,
-                                   refund_deadline,
-                                   coin_pub,
-                                   coin_sig))
-  {
-    GNUNET_break_op (0);
-    TALER_LOG_WARNING ("Invalid coin signature on /deposit request!\n");
-    TALER_LOG_DEBUG ("... amount_with_fee was %s\n",
-                     TALER_amount2s (amount));
-    TALER_LOG_DEBUG ("... deposit_fee was %s\n",
-                     TALER_amount2s (&dki->fees.deposit));
-    return GNUNET_SYSERR;
-  }
-
-  /* check coin signature */
-  {
-    struct TALER_CoinPublicInfo coin_info = {
-      .coin_pub = *coin_pub,
-      .denom_pub_hash = *denom_pub_hash,
-      .denom_sig = *denom_sig,
-      .h_age_commitment = {{{0}}}
-    };
-    if (NULL != h_age_commitment)
-    {
-      coin_info.h_age_commitment = *h_age_commitment;
-    }
-
-    if (GNUNET_YES !=
-        TALER_test_coin_valid (&coin_info,
-                               denom_pub))
-    {
-      GNUNET_break_op (0);
-      TALER_LOG_WARNING ("Invalid coin passed for /deposit\n");
-      return GNUNET_SYSERR;
-    }
-  }
-
-  /* Check coin does make a contribution */
-  if (0 < TALER_amount_cmp (&dki->fees.deposit,
-                            amount))
-  {
-    GNUNET_break_op (0);
-    TALER_LOG_WARNING ("Deposit amount smaller than fee\n");
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-struct TALER_EXCHANGE_DepositHandle *
-TALER_EXCHANGE_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const struct TALER_Amount *amount,
-  struct GNUNET_TIME_Timestamp wire_deadline,
-  const char *merchant_payto_uri,
-  const struct TALER_WireSaltP *wire_salt,
-  const struct TALER_PrivateContractHashP *h_contract_terms,
-  const struct TALER_AgeCommitmentHash *h_age_commitment,
-  const json_t *extension_details,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_DenominationSignature *denom_sig,
-  const struct TALER_DenominationPublicKey *denom_pub,
-  struct GNUNET_TIME_Timestamp timestamp,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
-  struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_CoinSpendSignatureP *coin_sig,
-  TALER_EXCHANGE_DepositResultCallback cb,
-  void *cb_cls,
-  enum TALER_ErrorCode *ec)
-{
-  const struct TALER_EXCHANGE_Keys *key_state;
-  const struct TALER_EXCHANGE_DenomPublicKey *dki;
-  struct TALER_EXCHANGE_DepositHandle *dh;
-  struct GNUNET_CURL_Context *ctx;
-  json_t *deposit_obj;
-  CURL *eh;
-  struct TALER_MerchantWireHashP h_wire;
-  struct TALER_DenominationHashP denom_pub_hash;
-  struct TALER_Amount amount_without_fee;
-  struct TALER_ExtensionContractHashP ech;
-  char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
-
-  if (NULL != extension_details)
-    TALER_deposit_extension_hash (extension_details,
-                                  &ech);
-  {
-    char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2];
-    char *end;
-
-    end = GNUNET_STRINGS_data_to_string (
-      coin_pub,
-      sizeof (struct TALER_CoinSpendPublicKeyP),
-      pub_str,
-      sizeof (pub_str));
-    *end = '\0';
-    GNUNET_snprintf (arg_str,
-                     sizeof (arg_str),
-                     "/coins/%s/deposit",
-                     pub_str);
-  }
-  if (GNUNET_TIME_timestamp_cmp (refund_deadline,
-                                 >,
-                                 wire_deadline))
-  {
-    GNUNET_break_op (0);
-    *ec = TALER_EC_EXCHANGE_DEPOSIT_REFUND_DEADLINE_AFTER_WIRE_DEADLINE;
-    return NULL;
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
-
-  /* initialize h_wire */
-  TALER_merchant_wire_signature_hash (merchant_payto_uri,
-                                      wire_salt,
-                                      &h_wire);
-
-  key_state = TALER_EXCHANGE_get_keys (exchange);
-
-  dki = TALER_EXCHANGE_get_denomination_key (key_state,
-                                             denom_pub);
-  if (NULL == dki)
-  {
-    *ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
-    GNUNET_break_op (0);
-    return NULL;
-  }
-
-  if (0 >
-      TALER_amount_subtract (&amount_without_fee,
-                             amount,
-                             &dki->fees.deposit))
-  {
-    *ec = TALER_EC_EXCHANGE_DEPOSIT_FEE_ABOVE_AMOUNT;
-    GNUNET_break_op (0);
-    return NULL;
-  }
-
-  TALER_denom_pub_hash (denom_pub,
-                        &denom_pub_hash);
-
-  if (GNUNET_OK !=
-      verify_signatures (dki,
-                         amount,
-                         &h_wire,
-                         h_contract_terms,
-                         (NULL != extension_details) ? &ech : NULL,
-                         coin_pub,
-                         h_age_commitment,
-                         denom_sig,
-                         denom_pub,
-                         &denom_pub_hash,
-                         timestamp,
-                         merchant_pub,
-                         refund_deadline,
-                         coin_sig))
-  {
-    *ec = TALER_EC_EXCHANGE_DEPOSIT_COIN_SIGNATURE_INVALID;
-    GNUNET_break_op (0);
-    return NULL;
-  }
-
-  deposit_obj = GNUNET_JSON_PACK (
-    TALER_JSON_pack_amount ("contribution",
-                            amount),
-    GNUNET_JSON_pack_string ("merchant_payto_uri",
-                             merchant_payto_uri),
-    GNUNET_JSON_pack_data_auto ("wire_salt",
-                                wire_salt),
-    GNUNET_JSON_pack_data_auto ("h_contract_terms",
-                                h_contract_terms),
-    GNUNET_JSON_pack_allow_null (
-      GNUNET_JSON_pack_data_auto ("h_age_commitment",
-                                  h_age_commitment)),
-    GNUNET_JSON_pack_data_auto ("denom_pub_hash",
-                                &denom_pub_hash),
-    TALER_JSON_pack_denom_sig ("ub_sig",
-                               denom_sig),
-    GNUNET_JSON_pack_timestamp ("timestamp",
-                                timestamp),
-    GNUNET_JSON_pack_data_auto ("merchant_pub",
-                                merchant_pub),
-    GNUNET_JSON_pack_allow_null (
-      GNUNET_JSON_pack_timestamp ("refund_deadline",
-                                  refund_deadline)),
-    GNUNET_JSON_pack_timestamp ("wire_transfer_deadline",
-                                wire_deadline),
-    GNUNET_JSON_pack_data_auto ("coin_sig",
-                                coin_sig));
-  dh = GNUNET_new (struct TALER_EXCHANGE_DepositHandle);
-  dh->auditor_chance = AUDITOR_CHANCE;
-  dh->exchange = exchange;
-  dh->cb = cb;
-  dh->cb_cls = cb_cls;
-  dh->url = TEAH_path_to_url (exchange,
-                              arg_str);
-  if (NULL == dh->url)
-  {
-    GNUNET_break (0);
-    *ec = TALER_EC_GENERIC_ALLOCATION_FAILURE;
-    GNUNET_free (dh);
-    json_decref (deposit_obj);
-    return NULL;
-  }
-  dh->h_contract_terms = *h_contract_terms;
-  dh->h_wire = h_wire;
-  /* dh->h_extensions = ... */
-  dh->refund_deadline = refund_deadline;
-  dh->wire_deadline = wire_deadline;
-  dh->amount_without_fee = amount_without_fee;
-  dh->coin_pub = *coin_pub;
-  dh->merchant_pub = *merchant_pub;
-  dh->amount_with_fee = *amount;
-  dh->dki = *dki;
-  memset (&dh->dki.key,
-          0,
-          sizeof (dh->dki.key)); /* lifetime not warranted, so better
-                                    not copy the contents! */
-
-  eh = TALER_EXCHANGE_curl_easy_get_ (dh->url);
-  if ( (NULL == eh) ||
-       (GNUNET_OK !=
-        TALER_curl_easy_post (&dh->ctx,
-                              eh,
-                              deposit_obj)) )
-  {
-    *ec = TALER_EC_GENERIC_CURL_ALLOCATION_FAILURE;
-    GNUNET_break (0);
-    if (NULL != eh)
-      curl_easy_cleanup (eh);
-    json_decref (deposit_obj);
-    GNUNET_free (dh->url);
-    GNUNET_free (dh);
-    return NULL;
-  }
-  json_decref (deposit_obj);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "URL for deposit: `%s'\n",
-              dh->url);
-  ctx = TEAH_handle_to_context (exchange);
-  dh->job = GNUNET_CURL_job_add2 (ctx,
-                                  eh,
-                                  dh->ctx.headers,
-                                  &handle_deposit_finished,
-                                  dh);
-  return dh;
-}
-
-
-void
-TALER_EXCHANGE_deposit_force_dc (struct TALER_EXCHANGE_DepositHandle *deposit)
-{
-  deposit->auditor_chance = 1;
-}
-
-
-void
-TALER_EXCHANGE_deposit_cancel (struct TALER_EXCHANGE_DepositHandle *deposit)
-{
-  if (NULL != deposit->job)
-  {
-    GNUNET_CURL_job_cancel (deposit->job);
-    deposit->job = NULL;
-  }
-  GNUNET_free (deposit->url);
-  TALER_curl_easy_post_finished (&deposit->ctx);
-  GNUNET_free (deposit);
-}
-
-
-/* end of exchange_api_deposit.c */
diff --git a/src/lib/exchange_api_deposits_get.c b/src/lib/exchange_api_deposits_get.c
index f7219f12e..20eaea3d3 100644
--- a/src/lib/exchange_api_deposits_get.c
+++ b/src/lib/exchange_api_deposits_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -39,9 +39,9 @@ struct TALER_EXCHANGE_DepositGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -80,77 +80,15 @@ struct TALER_EXCHANGE_DepositGetHandle
   struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
-   * Raw value (binary encoding) of the wire transfer subject.
-   */
-  struct TALER_WireTransferIdentifierRawP wtid;
-
-  /**
    * The coin's public key.  This is the value that must have been
    * signed (blindly) by the Exchange.
    */
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
-  /**
-   * When did the exchange execute this transfer? Note that the
-   * timestamp may not be exactly the same on the wire, i.e.
-   * because the wire has a different timezone or resolution.
-   */
-  struct GNUNET_TIME_Timestamp execution_time;
-
-  /**
-   * The contribution of @e coin_pub to the total transfer volume.
-   * This is the value of the deposit minus the fee.
-   */
-  struct TALER_Amount coin_contribution;
-
 };
 
 
 /**
- * Verify that the signature on the "200 OK" response
- * from the exchange is valid.
- *
- * @param dwh deposit wtid handle
- * @param exchange_pub the exchange's public key
- * @param exchange_sig the exchange's signature
- * @return #GNUNET_OK if the signature is valid, #GNUNET_SYSERR if not
- */
-// FIXME: inline...
-static enum GNUNET_GenericReturnValue
-verify_deposit_wtid_signature_ok (
-  const struct TALER_EXCHANGE_DepositGetHandle *dwh,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  const struct TALER_ExchangeSignatureP *exchange_sig)
-{
-  const struct TALER_EXCHANGE_Keys *key_state;
-
-  key_state = TALER_EXCHANGE_get_keys (dwh->exchange);
-  if (GNUNET_OK !=
-      TALER_EXCHANGE_test_signing_key (key_state,
-                                       exchange_pub))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      TALER_exchange_online_confirm_wire_verify (
-        &dwh->h_wire,
-        &dwh->h_contract_terms,
-        &dwh->wtid,
-        &dwh->coin_pub,
-        dwh->execution_time,
-        &dwh->coin_contribution,
-        exchange_pub,
-        exchange_sig))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
  * Function called when we're done processing the
  * HTTP /track/transaction request.
  *
@@ -180,18 +118,21 @@ handle_deposit_wtid_finished (void *cls,
     {
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_fixed_auto ("wtid",
-                                     &dr.details.success.wtid),
+                                     &dr.details.ok.wtid),
         GNUNET_JSON_spec_timestamp ("execution_time",
-                                    &dr.details.success.execution_time),
+                                    &dr.details.ok.execution_time),
         TALER_JSON_spec_amount_any ("coin_contribution",
-                                    &dr.details.success.coin_contribution),
+                                    &dr.details.ok.coin_contribution),
         GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &dr.details.success.exchange_sig),
+                                     &dr.details.ok.exchange_sig),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &dr.details.success.exchange_pub),
+                                     &dr.details.ok.exchange_pub),
         GNUNET_JSON_spec_end ()
       };
+      const struct TALER_EXCHANGE_Keys *key_state;
 
+      key_state = dwh->keys;
+      GNUNET_assert (NULL != key_state);
       if (GNUNET_OK !=
           GNUNET_JSON_parse (j,
                              spec,
@@ -202,14 +143,25 @@ handle_deposit_wtid_finished (void *cls,
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
-      // FIXME: remove once we inline function below...
-      dwh->execution_time = dr.details.success.execution_time;
-      dwh->wtid = dr.details.success.wtid;
-      dwh->coin_contribution = dr.details.success.coin_contribution;
       if (GNUNET_OK !=
-          verify_deposit_wtid_signature_ok (dwh,
-                                            &dr.details.success.exchange_pub,
-                                            &dr.details.success.exchange_sig))
+          TALER_EXCHANGE_test_signing_key (key_state,
+                                           &dr.details.ok.exchange_pub))
+      {
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_SIGNATURE_BY_EXCHANGE;
+        break;
+      }
+      if (GNUNET_OK !=
+          TALER_exchange_online_confirm_wire_verify (
+            &dwh->h_wire,
+            &dwh->h_contract_terms,
+            &dr.details.ok.wtid,
+            &dwh->coin_pub,
+            dr.details.ok.execution_time,
+            &dr.details.ok.coin_contribution,
+            &dr.details.ok.exchange_pub,
+            &dr.details.ok.exchange_sig))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
@@ -224,11 +176,16 @@ handle_deposit_wtid_finished (void *cls,
   case MHD_HTTP_ACCEPTED:
     {
       /* Transaction known, but not executed yet */
+      bool no_legi = false;
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_timestamp ("execution_time",
                                     &dr.details.accepted.execution_time),
-        GNUNET_JSON_spec_uint64 ("payment_target_uuid",
-                                 &dr.details.accepted.payment_target_uuid),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_uint64 ("requirement_row",
+                                   &dr.details.accepted.requirement_row),
+          &no_legi),
+        TALER_JSON_spec_aml_decision ("aml_decision",
+                                      &dr.details.accepted.aml_decision),
         GNUNET_JSON_spec_bool ("kyc_ok",
                                &dr.details.accepted.kyc_ok),
         GNUNET_JSON_spec_end ()
@@ -244,6 +201,8 @@ handle_deposit_wtid_finished (void *cls,
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
+      if (no_legi)
+        dr.details.accepted.requirement_row = 0;
       dwh->cb (dwh->cb_cls,
                &dr);
       TALER_EXCHANGE_deposits_get_cancel (dwh);
@@ -293,37 +252,35 @@ handle_deposit_wtid_finished (void *cls,
 
 struct TALER_EXCHANGE_DepositGetHandle *
 TALER_EXCHANGE_deposits_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  struct GNUNET_TIME_Relative timeout,
   TALER_EXCHANGE_DepositGetCallback cb,
   void *cb_cls)
 {
   struct TALER_MerchantPublicKeyP merchant;
   struct TALER_MerchantSignatureP merchant_sig;
   struct TALER_EXCHANGE_DepositGetHandle *dwh;
-  struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[(sizeof (struct TALER_CoinSpendPublicKeyP)
                 + sizeof (struct TALER_MerchantWireHashP)
                 + sizeof (struct TALER_MerchantPublicKeyP)
                 + sizeof (struct TALER_PrivateContractHashP)
                 + sizeof (struct TALER_MerchantSignatureP)) * 2 + 48];
+  unsigned int tms
+    = (unsigned int) timeout.rel_value_us
+      / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   GNUNET_CRYPTO_eddsa_key_get_public (&merchant_priv->eddsa_priv,
                                       &merchant.eddsa_pub);
   TALER_merchant_deposit_sign (h_contract_terms,
                                h_wire,
                                coin_pub,
-                               &merchant,
                                merchant_priv,
                                &merchant_sig);
   {
@@ -332,6 +289,7 @@ TALER_EXCHANGE_deposits_get (
     char msig_str[sizeof (struct TALER_MerchantSignatureP) * 2];
     char chash_str[sizeof (struct TALER_PrivateContractHashP) * 2];
     char whash_str[sizeof (struct TALER_MerchantWireHashP) * 2];
+    char timeout_str[24];
     char *end;
 
     end = GNUNET_STRINGS_data_to_string (h_wire,
@@ -359,23 +317,39 @@ TALER_EXCHANGE_deposits_get (
                                          msig_str,
                                          sizeof (msig_str));
     *end = '\0';
+    if (GNUNET_TIME_relative_is_zero (timeout))
+    {
+      timeout_str[0] = '\0';
+    }
+    else
+    {
+      GNUNET_snprintf (
+        timeout_str,
+        sizeof (timeout_str),
+        "%u",
+        tms);
+    }
 
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/deposits/%s/%s/%s/%s?merchant_sig=%s",
+                     "deposits/%s/%s/%s/%s?merchant_sig=%s%s%s",
                      whash_str,
                      mpub_str,
                      chash_str,
                      cpub_str,
-                     msig_str);
+                     msig_str,
+                     0 == tms
+                     ? ""
+                     : "&timeout_ms=",
+                     timeout_str);
   }
 
   dwh = GNUNET_new (struct TALER_EXCHANGE_DepositGetHandle);
-  dwh->exchange = exchange;
   dwh->cb = cb;
   dwh->cb_cls = cb_cls;
-  dwh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  dwh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == dwh->url)
   {
     GNUNET_free (dwh);
@@ -384,7 +358,6 @@ TALER_EXCHANGE_deposits_get (
   dwh->h_wire = *h_wire;
   dwh->h_contract_terms = *h_contract_terms;
   dwh->coin_pub = *coin_pub;
-
   eh = TALER_EXCHANGE_curl_easy_get_ (dwh->url);
   if (NULL == eh)
   {
@@ -393,11 +366,18 @@ TALER_EXCHANGE_deposits_get (
     GNUNET_free (dwh);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
+  if (0 != tms)
+  {
+    GNUNET_break (CURLE_OK ==
+                  curl_easy_setopt (eh,
+                                    CURLOPT_TIMEOUT_MS,
+                                    (long) (tms + 100L)));
+  }
   dwh->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   &handle_deposit_wtid_finished,
                                   dwh);
+  dwh->keys = TALER_EXCHANGE_keys_incref (keys);
   return dwh;
 }
 
@@ -412,6 +392,7 @@ TALER_EXCHANGE_deposits_get_cancel (struct TALER_EXCHANGE_DepositGetHandle *dwh)
   }
   GNUNET_free (dwh->url);
   TALER_curl_easy_post_finished (&dwh->ctx);
+  TALER_EXCHANGE_keys_decref (dwh->keys);
   GNUNET_free (dwh);
 }
 
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 0e76b289d..fdadc8d2a 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -40,12 +40,17 @@
  * Which version of the Taler protocol is implemented
  * by this library?  Used to determine compatibility.
  */
-#define EXCHANGE_PROTOCOL_CURRENT 13
+#define EXCHANGE_PROTOCOL_CURRENT 19
 
 /**
  * How many versions are we backwards compatible with?
  */
-#define EXCHANGE_PROTOCOL_AGE 0
+#define EXCHANGE_PROTOCOL_AGE 2
+
+/**
+ * Set to 1 for extra debug logging.
+ */
+#define DEBUG 0
 
 /**
  * Current version for (local) JSON serialization of persisted
@@ -54,7 +59,7 @@
 #define EXCHANGE_SERIALIZATION_FORMAT_VERSION 0
 
 /**
- * How far off do we allow key liftimes to be?
+ * How far off do we allow key lifetimes to be?
  */
 #define LIFETIME_TOLERANCE GNUNET_TIME_UNIT_HOURS
 
@@ -65,175 +70,311 @@
 #define DEFAULT_EXPIRATION GNUNET_TIME_UNIT_HOURS
 
 /**
- * Set to 1 for extra debug logging.
- */
-#define DEBUG 0
-
-/**
- * Log error related to CURL operations.
- *
- * @param type log level
- * @param function which function failed to run
- * @param code what was the curl error code
- */
-#define CURL_STRERROR(type, function, code)      \
-  GNUNET_log (type, "Curl function `%s' has failed at `%s:%d' with error: %s", \
-              function, __FILE__, __LINE__, curl_easy_strerror (code));
-
-
-/**
- * Data for the request to get the /keys of a exchange.
+ * If the "Expire" cache control header is missing, for
+ * how long do we assume the reply to be valid at least?
  */
-struct KeysRequest;
+#define MINIMUM_EXPIRATION GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MINUTES, 2)
 
 
 /**
- * Entry in DLL of auditors used by an exchange.
+ * Handle for a GET /keys request.
  */
-struct TEAH_AuditorListEntry
+struct TALER_EXCHANGE_GetKeysHandle
 {
-  /**
-   * Next pointer of DLL.
-   */
-  struct TEAH_AuditorListEntry *next;
 
   /**
-   * Prev pointer of DLL.
+   * The exchange base URL (i.e. "https://exchange.demo.taler.net/")
    */
-  struct TEAH_AuditorListEntry *prev;
+  char *exchange_url;
 
   /**
-   * Base URL of the auditor.
+   * The url for the /keys request.
    */
-  char *auditor_url;
+  char *url;
 
   /**
-   * Handle to the auditor.
+   * Previous /keys response, NULL for none.
    */
-  struct TALER_AUDITOR_Handle *ah;
+  struct TALER_EXCHANGE_Keys *prev_keys;
 
   /**
-   * Head of DLL of interactions with this auditor.
+   * Entry for this request with the `struct GNUNET_CURL_Context`.
    */
-  struct TEAH_AuditorInteractionEntry *ai_head;
+  struct GNUNET_CURL_Job *job;
 
   /**
-   * Tail of DLL of interactions with this auditor.
+   * Expiration time according to "Expire:" header.
+   * 0 if not provided by the server.
    */
-  struct TEAH_AuditorInteractionEntry *ai_tail;
+  struct GNUNET_TIME_Timestamp expire;
 
   /**
-   * Public key of the auditor.
+   * Function to call with the exchange's certification data,
+   * NULL if this has already been done.
    */
-  struct TALER_AuditorPublicKeyP auditor_pub;
+  TALER_EXCHANGE_GetKeysCallback cert_cb;
 
   /**
-   * Flag indicating that the auditor is available and that protocol
-   * version compatibility is given.
+   * Closure to pass to @e cert_cb.
    */
-  bool is_up;
+  void *cert_cb_cls;
 
 };
 
 
-/* ***************** Internal /keys fetching ************* */
-
 /**
- * Data for the request to get the /keys of a exchange.
+ * Element in the `struct SignatureContext` array.
  */
-struct KeysRequest
+struct SignatureElement
 {
+
   /**
-   * The connection to exchange this request handle will use
+   * Offset of the denomination in the group array,
+   * for sorting (2nd rank, ascending).
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  unsigned int offset;
 
   /**
-   * The url for this handle
+   * Offset of the group in the denominations array,
+   * for sorting (2nd rank, ascending).
    */
-  char *url;
+  unsigned int group_offset;
 
   /**
-   * Entry for this request with the `struct GNUNET_CURL_Context`.
+   * Pointer to actual master signature to hash over.
    */
-  struct GNUNET_CURL_Job *job;
+  struct TALER_MasterSignatureP master_sig;
+};
 
+/**
+ * Context for collecting the array of master signatures
+ * needed to verify the exchange_sig online signature.
+ */
+struct SignatureContext
+{
   /**
-   * Expiration time according to "Expire:" header.
-   * 0 if not provided by the server.
+   * Array of signatures to hash over.
    */
-  struct GNUNET_TIME_Timestamp expire;
+  struct SignatureElement *elements;
+
+  /**
+   * Write offset in the @e elements array.
+   */
+  unsigned int elements_pos;
 
+  /**
+   * Allocated space for @e elements.
+   */
+  unsigned int elements_size;
 };
 
 
-void
-TEAH_acc_confirmation_cb (void *cls,
-                          const struct TALER_AUDITOR_HttpResponse *hr)
+/**
+ * Determine order to sort two elements by before
+ * we hash the master signatures.  Used for
+ * sorting with qsort().
+ *
+ * @param a pointer to a `struct SignatureElement`
+ * @param b pointer to a `struct SignatureElement`
+ * @return 0 if equal, -1 if a < b, 1 if a > b.
+ */
+static int
+signature_context_sort_cb (const void *a,
+                           const void *b)
 {
-  struct TEAH_AuditorInteractionEntry *aie = cls;
-  struct TEAH_AuditorListEntry *ale = aie->ale;
+  const struct SignatureElement *sa = a;
+  const struct SignatureElement *sb = b;
 
-  if (MHD_HTTP_OK != hr->http_status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Failed to submit deposit confirmation to auditor `%s' with HTTP status %d (EC: %d). This is acceptable if it does not happen often.\n",
-                ale->auditor_url,
-                hr->http_status,
-                hr->ec);
-  }
-  GNUNET_CONTAINER_DLL_remove (ale->ai_head,
-                               ale->ai_tail,
-                               aie);
-  GNUNET_free (aie);
+  if (sa->group_offset < sb->group_offset)
+    return -1;
+  if (sa->group_offset > sb->group_offset)
+    return 1;
+  if (sa->offset < sb->offset)
+    return -1;
+  if (sa->offset > sb->offset)
+    return 1;
+  /* We should never have two disjoint elements
+     with same time and offset */
+  GNUNET_assert (sa == sb);
+  return 0;
 }
 
 
-void
-TEAH_get_auditors_for_dc (struct TALER_EXCHANGE_Handle *h,
-                          TEAH_AuditorCallback ac,
-                          void *ac_cls)
+/**
+ * Append a @a master_sig to the @a sig_ctx using the
+ * given attributes for (later) sorting.
+ *
+ * @param[in,out] sig_ctx signature context to update
+ * @param group_offset offset for the group
+ * @param offset offset for the entry
+ * @param master_sig master signature for the entry
+ */
+static void
+append_signature (struct SignatureContext *sig_ctx,
+                  unsigned int group_offset,
+                  unsigned int offset,
+                  const struct TALER_MasterSignatureP *master_sig)
 {
-  if (NULL == h->auditors_head)
+  struct SignatureElement *element;
+  unsigned int new_size;
+
+  if (sig_ctx->elements_pos == sig_ctx->elements_size)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "No auditor available for exchange `%s'. Not submitting deposit confirmations.\n",
-                h->url);
-    return;
+    if (0 == sig_ctx->elements_size)
+      new_size = 1024;
+    else
+      new_size = sig_ctx->elements_size * 2;
+    GNUNET_array_grow (sig_ctx->elements,
+                       sig_ctx->elements_size,
+                       new_size);
   }
-  for (struct TEAH_AuditorListEntry *ale = h->auditors_head;
-       NULL != ale;
-       ale = ale->next)
+  element = &sig_ctx->elements[sig_ctx->elements_pos++];
+  element->offset = offset;
+  element->group_offset = group_offset;
+  element->master_sig = *master_sig;
+}
+
+
+/**
+ * Frees @a wfm array.
+ *
+ * @param wfm fee array to release
+ * @param wfm_len length of the @a wfm array
+ */
+static void
+free_fees (struct TALER_EXCHANGE_WireFeesByMethod *wfm,
+           unsigned int wfm_len)
+{
+  for (unsigned int i = 0; i<wfm_len; i++)
   {
-    struct TEAH_AuditorInteractionEntry *aie;
+    struct TALER_EXCHANGE_WireFeesByMethod *wfmi = &wfm[i];
 
-    if (! ale->is_up)
-      continue;
-    aie = ac (ac_cls,
-              ale->ah,
-              &ale->auditor_pub);
-    if (NULL != aie)
+    while (NULL != wfmi->fees_head)
     {
-      aie->ale = ale;
-      GNUNET_CONTAINER_DLL_insert (ale->ai_head,
-                                   ale->ai_tail,
-                                   aie);
+      struct TALER_EXCHANGE_WireAggregateFees *fe
+        = wfmi->fees_head;
+
+      wfmi->fees_head = fe->next;
+      GNUNET_free (fe);
     }
+    GNUNET_free (wfmi->method);
   }
+  GNUNET_free (wfm);
 }
 
 
 /**
- * Release memory occupied by a keys request.  Note that this does not
- * cancel the request itself.
+ * Parse wire @a fees and return array.
  *
- * @param kr request to free
+ * @param master_pub master public key to use to check signatures
+ * @param currency currency amounts are expected in
+ * @param fees json AggregateTransferFee to parse
+ * @param[out] fees_len set to length of returned array
+ * @return NULL on error
  */
-static void
-free_keys_request (struct KeysRequest *kr)
+static struct TALER_EXCHANGE_WireFeesByMethod *
+parse_fees (const struct TALER_MasterPublicKeyP *master_pub,
+            const char *currency,
+            const json_t *fees,
+            unsigned int *fees_len)
+{
+  struct TALER_EXCHANGE_WireFeesByMethod *fbm;
+  size_t fbml = json_object_size (fees);
+  unsigned int i = 0;
+  const char *key;
+  const json_t *fee_array;
+
+  if (UINT_MAX < fbml)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  fbm = GNUNET_new_array (fbml,
+                          struct TALER_EXCHANGE_WireFeesByMethod);
+  *fees_len = (unsigned int) fbml;
+  json_object_foreach ((json_t *) fees, key, fee_array) {
+    struct TALER_EXCHANGE_WireFeesByMethod *fe = &fbm[i++];
+    size_t idx;
+    json_t *fee;
+
+    fe->method = GNUNET_strdup (key);
+    fe->fees_head = NULL;
+    json_array_foreach (fee_array, idx, fee)
+    {
+      struct TALER_EXCHANGE_WireAggregateFees *wa
+        = GNUNET_new (struct TALER_EXCHANGE_WireAggregateFees);
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("sig",
+                                     &wa->master_sig),
+        TALER_JSON_spec_amount ("wire_fee",
+                                currency,
+                                &wa->fees.wire),
+        TALER_JSON_spec_amount ("closing_fee",
+                                currency,
+                                &wa->fees.closing),
+        GNUNET_JSON_spec_timestamp ("start_date",
+                                    &wa->start_date),
+        GNUNET_JSON_spec_timestamp ("end_date",
+                                    &wa->end_date),
+        GNUNET_JSON_spec_end ()
+      };
+
+      wa->next = fe->fees_head;
+      fe->fees_head = wa;
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (fee,
+                             spec,
+                             NULL,
+                             NULL))
+      {
+        GNUNET_break_op (0);
+        free_fees (fbm,
+                   i);
+        return NULL;
+      }
+      if (GNUNET_OK !=
+          TALER_exchange_offline_wire_fee_verify (
+            key,
+            wa->start_date,
+            wa->end_date,
+            &wa->fees,
+            master_pub,
+            &wa->master_sig))
+      {
+        GNUNET_break_op (0);
+        free_fees (fbm,
+                   i);
+        return NULL;
+      }
+    } /* for all fees over time */
+  } /* for all methods */
+  GNUNET_assert (i == fbml);
+  return fbm;
+}
+
+
+void
+TEAH_get_auditors_for_dc (
+  struct TALER_EXCHANGE_Keys *keys,
+  TEAH_AuditorCallback ac,
+  void *ac_cls)
 {
-  GNUNET_free (kr->url);
-  GNUNET_free (kr);
+  if (0 == keys->num_auditors)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "No auditor available. Not submitting deposit confirmations.\n");
+    return;
+  }
+  for (unsigned int i = 0; i<keys->num_auditors; i++)
+  {
+    const struct TALER_EXCHANGE_AuditorInformation *auditor
+      = &keys->auditors[i];
+
+    ac (ac_cls,
+        auditor->auditor_url,
+        &auditor->auditor_pub);
+  }
 }
 
 
@@ -248,21 +389,20 @@ free_keys_request (struct KeysRequest *kr)
  *
  * @param[out] sign_key where to return the result
  * @param check_sigs should we check signatures?
- * @param[in] sign_key_obj json to parse
+ * @param sign_key_obj json to parse
  * @param master_key master key to use to verify signature
  * @return #GNUNET_OK if all is fine, #GNUNET_SYSERR if the signature is
- *        invalid or the json malformed.
+ *        invalid or the @a sign_key_obj is malformed.
  */
 static enum GNUNET_GenericReturnValue
 parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key,
                     bool check_sigs,
-                    json_t *sign_key_obj,
+                    const json_t *sign_key_obj,
                     const struct TALER_MasterPublicKeyP *master_key)
 {
-  struct TALER_MasterSignatureP sign_key_issue_sig;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("master_sig",
-                                 &sign_key_issue_sig),
+                                 &sign_key->master_sig),
     GNUNET_JSON_spec_fixed_auto ("key",
                                  &sign_key->key),
     GNUNET_JSON_spec_timestamp ("stamp_start",
@@ -282,7 +422,6 @@ parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-
   if (! check_sigs)
     return GNUNET_OK;
   if (GNUNET_OK !=
@@ -292,35 +431,45 @@ parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key,
         sign_key->valid_until,
         sign_key->valid_legal,
         master_key,
-        &sign_key_issue_sig))
+        &sign_key->master_sig))
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  sign_key->master_sig = sign_key_issue_sig;
   return GNUNET_OK;
 }
 
 
 /**
- * Parse a exchange's denomination key encoded in JSON.
+ * Parse a exchange's denomination key encoded in JSON partially.
+ *
+ * Only the values for master_sig, timestamps and the cipher-specific public
+ * key are parsed.  All other fields (fees, age_mask, value) MUST have been set
+ * prior to calling this function, otherwise the signature verification
+ * performed within this function will fail.
  *
- * @param currency expected currency of all fees
  * @param[out] denom_key where to return the result
+ * @param cipher cipher type to parse
  * @param check_sigs should we check signatures?
- * @param[in] denom_key_obj json to parse
+ * @param denom_key_obj json to parse
  * @param master_key master key to use to verify signature
- * @param hash_context where to accumulate data for signature verification
+ * @param group_offset offset for the group
+ * @param index index of this denomination key in the group
+ * @param sig_ctx where to write details about encountered
+ *        master signatures, NULL if not used
  * @return #GNUNET_OK if all is fine, #GNUNET_SYSERR if the signature is
  *        invalid or the json malformed.
  */
 static enum GNUNET_GenericReturnValue
-parse_json_denomkey (const char *currency,
-                     struct TALER_EXCHANGE_DenomPublicKey *denom_key,
-                     bool check_sigs,
-                     json_t *denom_key_obj,
-                     struct TALER_MasterPublicKeyP *master_key,
-                     struct GNUNET_HashContext *hash_context)
+parse_json_denomkey_partially (
+  struct TALER_EXCHANGE_DenomPublicKey *denom_key,
+  enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher,
+  bool check_sigs,
+  const json_t *denom_key_obj,
+  struct TALER_MasterPublicKeyP *master_key,
+  unsigned int group_offset,
+  unsigned int index,
+  struct SignatureContext *sig_ctx)
 {
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("master_sig",
@@ -333,14 +482,13 @@ parse_json_denomkey (const char *currency,
                                 &denom_key->valid_from),
     GNUNET_JSON_spec_timestamp ("stamp_expire_legal",
                                 &denom_key->expire_legal),
-    TALER_JSON_spec_amount ("value",
-                            currency,
-                            &denom_key->value),
-    TALER_JSON_SPEC_DENOM_FEES ("fee",
-                                currency,
-                                &denom_key->fees),
-    TALER_JSON_spec_denom_pub ("denom_pub",
-                               &denom_key->key),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_bool ("lost",
+                             &denom_key->lost),
+      NULL),
+    TALER_JSON_spec_denom_pub_cipher (NULL,
+                                      cipher,
+                                      &denom_key->key),
     GNUNET_JSON_spec_end ()
   };
 
@@ -354,10 +502,11 @@ parse_json_denomkey (const char *currency,
   }
   TALER_denom_pub_hash (&denom_key->key,
                         &denom_key->h_key);
-  if (NULL != hash_context)
-    GNUNET_CRYPTO_hash_context_read (hash_context,
-                                     &denom_key->h_key,
-                                     sizeof (struct GNUNET_HashCode));
+  if (NULL != sig_ctx)
+    append_signature (sig_ctx,
+                      group_offset,
+                      index,
+                      &denom_key->master_sig);
   if (! check_sigs)
     return GNUNET_OK;
   EXITIF (GNUNET_SYSERR ==
@@ -373,11 +522,11 @@ parse_json_denomkey (const char *currency,
             &denom_key->master_sig));
   return GNUNET_OK;
 EXITIF_exit:
+  GNUNET_JSON_parse_free (spec);
   /* invalidate denom_key, just to be sure */
   memset (denom_key,
           0,
           sizeof (*denom_key));
-  GNUNET_JSON_parse_free (spec);
   return GNUNET_SYSERR;
 }
 
@@ -387,7 +536,7 @@ EXITIF_exit:
  *
  * @param[out] auditor where to return the result
  * @param check_sigs should we check signatures
- * @param[in] auditor_obj json to parse
+ * @param auditor_obj json to parse
  * @param key_data information about denomination keys
  * @return #GNUNET_OK if all is fine, #GNUNET_SYSERR if the signature is
  *        invalid or the json malformed.
@@ -395,22 +544,21 @@ EXITIF_exit:
 static enum GNUNET_GenericReturnValue
 parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
                     bool check_sigs,
-                    json_t *auditor_obj,
+                    const json_t *auditor_obj,
                     const struct TALER_EXCHANGE_Keys *key_data)
 {
-  json_t *keys;
+  const json_t *keys;
   json_t *key;
-  unsigned int len;
-  unsigned int off;
-  unsigned int i;
+  size_t off;
+  size_t pos;
   const char *auditor_url;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("auditor_pub",
                                  &auditor->auditor_pub),
-    GNUNET_JSON_spec_string ("auditor_url",
+    TALER_JSON_spec_web_url ("auditor_url",
                              &auditor_url),
-    GNUNET_JSON_spec_json ("denomination_keys",
-                           &keys),
+    GNUNET_JSON_spec_array_const ("denomination_keys",
+                                  &keys),
     GNUNET_JSON_spec_end ()
   };
 
@@ -428,16 +576,15 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
     return GNUNET_SYSERR;
   }
   auditor->auditor_url = GNUNET_strdup (auditor_url);
-  len = json_array_size (keys);
-  auditor->denom_keys = GNUNET_new_array (len,
-                                          struct
-                                          TALER_EXCHANGE_AuditorDenominationInfo);
-  off = 0;
-  json_array_foreach (keys, i, key) {
+  auditor->denom_keys
+    = GNUNET_new_array (json_array_size (keys),
+                        struct TALER_EXCHANGE_AuditorDenominationInfo);
+  pos = 0;
+  json_array_foreach (keys, off, key) {
     struct TALER_AuditorSignatureP auditor_sig;
     struct TALER_DenominationHashP denom_h;
-    const struct TALER_EXCHANGE_DenomPublicKey *dk;
-    unsigned int dk_off;
+    const struct TALER_EXCHANGE_DenomPublicKey *dk = NULL;
+    unsigned int dk_off = UINT_MAX;
     struct GNUNET_JSON_Specification kspec[] = {
       GNUNET_JSON_spec_fixed_auto ("auditor_sig",
                                    &auditor_sig),
@@ -454,8 +601,6 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
       GNUNET_break_op (0);
       continue;
     }
-    dk = NULL;
-    dk_off = UINT_MAX;
     for (unsigned int j = 0; j<key_data->num_denom_keys; j++)
     {
       if (0 == GNUNET_memcmp (&denom_h,
@@ -490,16 +635,19 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
             &auditor_sig))
       {
         GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
         return GNUNET_SYSERR;
       }
     }
-    auditor->denom_keys[off].denom_key_offset = dk_off;
-    auditor->denom_keys[off].auditor_sig = auditor_sig;
-    off++;
+    auditor->denom_keys[pos].denom_key_offset = dk_off;
+    auditor->denom_keys[pos].auditor_sig = auditor_sig;
+    pos++;
   }
-  auditor->num_denom_keys = off;
-  GNUNET_JSON_parse_free (spec);
+  if (pos > UINT_MAX)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  auditor->num_denom_keys = (unsigned int) pos;
   return GNUNET_OK;
 }
 
@@ -509,7 +657,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
  *
  * @param[out] gf where to return the result
  * @param check_sigs should we check signatures
- * @param[in] fee_obj json to parse
+ * @param fee_obj json to parse
  * @param key_data already parsed information about the exchange
  * @return #GNUNET_OK if all is fine, #GNUNET_SYSERR if the signature is
  *        invalid or the json malformed.
@@ -517,7 +665,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
 static enum GNUNET_GenericReturnValue
 parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf,
                   bool check_sigs,
-                  json_t *fee_obj,
+                  const json_t *fee_obj,
                   const struct TALER_EXCHANGE_Keys *key_data)
 {
   struct GNUNET_JSON_Specification spec[] = {
@@ -527,8 +675,6 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf,
                                 &gf->end_date),
     GNUNET_JSON_spec_relative_time ("purse_timeout",
                                     &gf->purse_timeout),
-    GNUNET_JSON_spec_relative_time ("account_kyc_timeout",
-                                    &gf->kyc_timeout),
     GNUNET_JSON_spec_relative_time ("history_expiration",
                                     &gf->history_expiration),
     GNUNET_JSON_spec_uint32 ("purse_account_limit",
@@ -561,7 +707,6 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf,
           gf->end_date,
           &gf->fees,
           gf->purse_timeout,
-          gf->kyc_timeout,
           gf->history_expiration,
           gf->purse_account_limit,
           &key_data->master_pub,
@@ -578,113 +723,12 @@ parse_global_fee (struct TALER_EXCHANGE_GlobalFee *gf,
 
 
 /**
- * Function called with information about the auditor.  Marks an
- * auditor as 'up'.
- *
- * @param cls closure, a `struct TEAH_AuditorListEntry *`
- * @param hr http response from the auditor
- * @param vi basic information about the auditor
- * @param compat protocol compatibility information
- */
-static void
-auditor_version_cb (
-  void *cls,
-  const struct TALER_AUDITOR_HttpResponse *hr,
-  const struct TALER_AUDITOR_VersionInformation *vi,
-  enum TALER_AUDITOR_VersionCompatibility compat)
-{
-  struct TEAH_AuditorListEntry *ale = cls;
-
-  (void) hr;
-  if (NULL == vi)
-  {
-    /* In this case, we don't mark the auditor as 'up' */
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Auditor `%s' gave unexpected version response.\n",
-                ale->auditor_url);
-    return;
-  }
-
-  if (0 != (TALER_AUDITOR_VC_INCOMPATIBLE & compat))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Auditor `%s' runs incompatible protocol version!\n",
-                ale->auditor_url);
-    if (0 != (TALER_AUDITOR_VC_OLDER & compat))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Auditor `%s' runs outdated protocol version!\n",
-                  ale->auditor_url);
-    }
-    if (0 != (TALER_AUDITOR_VC_NEWER & compat))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Auditor `%s' runs more recent incompatible version. We should upgrade!\n",
-                  ale->auditor_url);
-    }
-    return;
-  }
-  ale->is_up = true;
-}
-
-
-/**
- * Recalculate our auditor list, we got /keys and it may have
- * changed.
- *
- * @param exchange exchange for which to update the list.
- */
-static void
-update_auditors (struct TALER_EXCHANGE_Handle *exchange)
-{
-  struct TALER_EXCHANGE_Keys *kd = &exchange->key_data;
-
-  TALER_LOG_DEBUG ("Updating auditors\n");
-  for (unsigned int i = 0; i<kd->num_auditors; i++)
-  {
-    /* Compare auditor data from /keys with auditor data
-     * from owned exchange structures.  */
-    struct TALER_EXCHANGE_AuditorInformation *auditor = &kd->auditors[i];
-    struct TEAH_AuditorListEntry *ale = NULL;
-
-    for (struct TEAH_AuditorListEntry *a = exchange->auditors_head;
-         NULL != a;
-         a = a->next)
-    {
-      if (0 == GNUNET_memcmp (&auditor->auditor_pub,
-                              &a->auditor_pub))
-      {
-        ale = a;
-        break;
-      }
-    }
-    if (NULL != ale)
-      continue; /* found, no need to add */
-
-    /* new auditor, add */
-    TALER_LOG_DEBUG ("Found new auditor %s!\n",
-                     auditor->auditor_url);
-    ale = GNUNET_new (struct TEAH_AuditorListEntry);
-    ale->auditor_pub = auditor->auditor_pub;
-    ale->auditor_url = GNUNET_strdup (auditor->auditor_url);
-    GNUNET_CONTAINER_DLL_insert (exchange->auditors_head,
-                                 exchange->auditors_tail,
-                                 ale);
-    ale->ah = TALER_AUDITOR_connect (exchange->ctx,
-                                     ale->auditor_url,
-                                     &auditor_version_cb,
-                                     ale);
-  }
-}
-
-
-/**
  * Compare two denomination keys.  Ignores revocation data.
  *
  * @param denom1 first denomination key
  * @param denom2 second denomination key
  * @return 0 if the two keys are equal (not necessarily
- *  the same object), 1 otherwise.
+ *  the same object), non-zero otherwise.
  */
 static unsigned int
 denoms_cmp (const struct TALER_EXCHANGE_DenomPublicKey *denom1,
@@ -729,31 +773,21 @@ decode_keys_json (const json_t *resp_obj,
                   struct TALER_EXCHANGE_Keys *key_data,
                   enum TALER_EXCHANGE_VersionCompatibility *vc)
 {
-  struct TALER_ExchangeSignatureP sig;
-  struct GNUNET_HashContext *hash_context = NULL;
-  struct GNUNET_HashContext *hash_context_restricted = NULL;
-  bool have_age_restricted_denom = false;
-  struct TALER_ExchangePublicKeyP pub;
-  const char *currency;
-  struct GNUNET_JSON_Specification mspec[] = {
-    GNUNET_JSON_spec_fixed_auto ("eddsa_sig",
-                                 &sig),
-    GNUNET_JSON_spec_fixed_auto ("eddsa_pub",
-                                 &pub),
-    GNUNET_JSON_spec_fixed_auto ("master_public_key",
-                                 &key_data->master_pub),
-    GNUNET_JSON_spec_timestamp ("list_issue_date",
-                                &key_data->list_issue_date),
-    GNUNET_JSON_spec_relative_time ("reserve_closing_delay",
-                                    &key_data->reserve_closing_delay),
-    GNUNET_JSON_spec_string ("currency",
-                             &currency),
-    GNUNET_JSON_spec_mark_optional (
-      TALER_JSON_spec_amount_any ("wallet_balance_limit_without_kyc",
-                                  &key_data->wallet_balance_limit_without_kyc),
-      NULL),
-    GNUNET_JSON_spec_end ()
-  };
+  struct TALER_ExchangeSignatureP exchange_sig;
+  struct TALER_ExchangePublicKeyP exchange_pub;
+  const json_t *wblwk = NULL;
+  const json_t *global_fees;
+  const json_t *sign_keys_array;
+  const json_t *denominations_by_group;
+  const json_t *auditors_array;
+  const json_t *recoup_array = NULL;
+  const json_t *manifests = NULL;
+  bool no_extensions = false;
+  bool no_signature = false;
+  const json_t *accounts;
+  const json_t *fees;
+  const json_t *wads;
+  struct SignatureContext sig_ctx = { 0 };
 
   if (JSON_OBJECT != json_typeof (resp_obj))
   {
@@ -767,14 +801,10 @@ decode_keys_json (const json_t *resp_obj,
 #endif
   /* check the version first */
   {
-    const char *ver;
-    unsigned int age;
-    unsigned int revision;
-    unsigned int current;
-    char dummy;
+    struct TALER_JSON_ProtocolVersion pv;
     struct GNUNET_JSON_Specification spec[] = {
-      GNUNET_JSON_spec_string ("version",
-                               &ver),
+      TALER_JSON_spec_version ("version",
+                               &pv),
       GNUNET_JSON_spec_end ()
     };
 
@@ -786,208 +816,331 @@ decode_keys_json (const json_t *resp_obj,
       GNUNET_break_op (0);
       return GNUNET_SYSERR;
     }
-    if (3 != sscanf (ver,
-                     "%u:%u:%u%c",
-                     &current,
-                     &revision,
-                     &age,
-                     &dummy))
-    {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
-    }
     *vc = TALER_EXCHANGE_VC_MATCH;
-    if (EXCHANGE_PROTOCOL_CURRENT < current)
+    if (EXCHANGE_PROTOCOL_CURRENT < pv.current)
     {
       *vc |= TALER_EXCHANGE_VC_NEWER;
-      if (EXCHANGE_PROTOCOL_CURRENT < current - age)
+      if (EXCHANGE_PROTOCOL_CURRENT < pv.current - pv.age)
         *vc |= TALER_EXCHANGE_VC_INCOMPATIBLE;
     }
-    if (EXCHANGE_PROTOCOL_CURRENT > current)
+    if (EXCHANGE_PROTOCOL_CURRENT > pv.current)
     {
       *vc |= TALER_EXCHANGE_VC_OLDER;
-      if (EXCHANGE_PROTOCOL_CURRENT - EXCHANGE_PROTOCOL_AGE > current)
+      if (EXCHANGE_PROTOCOL_CURRENT - EXCHANGE_PROTOCOL_AGE > pv.current)
         *vc |= TALER_EXCHANGE_VC_INCOMPATIBLE;
     }
-    key_data->version = GNUNET_strdup (ver);
   }
 
-  EXITIF (GNUNET_OK !=
-          GNUNET_JSON_parse (resp_obj,
-                             (check_sig) ? mspec : &mspec[2],
-                             NULL, NULL));
-  key_data->currency = GNUNET_strdup (currency);
-
-  if (GNUNET_OK ==
-      TALER_amount_is_valid (&key_data->wallet_balance_limit_without_kyc))
   {
-    if (0 != strcasecmp (currency,
-                         key_data->wallet_balance_limit_without_kyc.currency))
+    const char *ver;
+    const char *currency;
+    const char *asset_type;
+    struct GNUNET_JSON_Specification mspec[] = {
+      GNUNET_JSON_spec_fixed_auto (
+        "exchange_sig",
+        &exchange_sig),
+      GNUNET_JSON_spec_fixed_auto (
+        "exchange_pub",
+        &exchange_pub),
+      GNUNET_JSON_spec_fixed_auto (
+        "master_public_key",
+        &key_data->master_pub),
+      GNUNET_JSON_spec_array_const ("accounts",
+                                    &accounts),
+      GNUNET_JSON_spec_object_const ("wire_fees",
+                                     &fees),
+      GNUNET_JSON_spec_array_const ("wads",
+                                    &wads),
+      GNUNET_JSON_spec_timestamp (
+        "list_issue_date",
+        &key_data->list_issue_date),
+      GNUNET_JSON_spec_relative_time (
+        "reserve_closing_delay",
+        &key_data->reserve_closing_delay),
+      GNUNET_JSON_spec_string (
+        "currency",
+        &currency),
+      GNUNET_JSON_spec_string (
+        "asset_type",
+        &asset_type),
+      GNUNET_JSON_spec_array_const (
+        "global_fees",
+        &global_fees),
+      GNUNET_JSON_spec_array_const (
+        "signkeys",
+        &sign_keys_array),
+      GNUNET_JSON_spec_array_const (
+        "denominations",
+        &denominations_by_group),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_array_const (
+          "recoup",
+          &recoup_array),
+        NULL),
+      GNUNET_JSON_spec_array_const (
+        "auditors",
+        &auditors_array),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_bool (
+          "rewards_allowed",
+          &key_data->rewards_allowed),
+        NULL),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_object_const ("extensions",
+                                       &manifests),
+        &no_extensions),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_fixed_auto (
+          "extensions_sig",
+          &key_data->extensions_sig),
+        &no_signature),
+      GNUNET_JSON_spec_string ("version",
+                               &ver),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_array_const (
+          "wallet_balance_limit_without_kyc",
+          &wblwk),
+        NULL),
+      GNUNET_JSON_spec_end ()
+    };
+    const char *emsg;
+    unsigned int eline;
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (resp_obj,
+                           (check_sig) ? mspec : &mspec[2],
+                           &emsg,
+                           &eline))
     {
-      GNUNET_break_op (0);
-      return GNUNET_SYSERR;
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Parsing /keys failed for `%s' (%u)\n",
+                  emsg,
+                  eline);
+      EXITIF (1);
     }
-  }
+    {
+      struct GNUNET_JSON_Specification sspec[] = {
+        TALER_JSON_spec_currency_specification (
+          "currency_specification",
+          currency,
+          &key_data->cspec),
+        TALER_JSON_spec_amount (
+          "stefan_abs",
+          currency,
+          &key_data->stefan_abs),
+        TALER_JSON_spec_amount (
+          "stefan_log",
+          currency,
+          &key_data->stefan_log),
+        GNUNET_JSON_spec_double (
+          "stefan_lin",
+          &key_data->stefan_lin),
+        GNUNET_JSON_spec_end ()
+      };
 
-  /* parse the master public key and issue date of the response */
-  if (check_sig)
-  {
-    hash_context = GNUNET_CRYPTO_hash_context_start ();
-    hash_context_restricted = GNUNET_CRYPTO_hash_context_start ();
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (resp_obj,
+                             sspec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Parsing /keys failed for `%s' (%u)\n",
+                    emsg,
+                    eline);
+        EXITIF (1);
+      }
+    }
+
+    key_data->currency = GNUNET_strdup (currency);
+    key_data->version = GNUNET_strdup (ver);
+    key_data->asset_type = GNUNET_strdup (asset_type);
+    if (! no_extensions)
+      key_data->extensions = json_incref ((json_t *) manifests);
   }
 
   /* parse the global fees */
+  EXITIF (json_array_size (global_fees) > UINT_MAX);
+  key_data->num_global_fees
+    = (unsigned int) json_array_size (global_fees);
+  if (0 != key_data->num_global_fees)
   {
-    json_t *global_fees;
     json_t *global_fee;
-    unsigned int index;
+    size_t index;
 
-    EXITIF (NULL == (global_fees =
-                       json_object_get (resp_obj,
-                                        "global_fees")));
-    EXITIF (! json_is_array (global_fees));
-    if (0 != (key_data->num_global_fees =
-                json_array_size (global_fees)))
+    key_data->global_fees
+      = GNUNET_new_array (key_data->num_global_fees,
+                          struct TALER_EXCHANGE_GlobalFee);
+    json_array_foreach (global_fees, index, global_fee)
     {
-      key_data->global_fees
-        = GNUNET_new_array (key_data->num_global_fees,
-                            struct TALER_EXCHANGE_GlobalFee);
-      json_array_foreach (global_fees, index, global_fee) {
-        EXITIF (GNUNET_SYSERR ==
-                parse_global_fee (&key_data->global_fees[index],
-                                  check_sig,
-                                  global_fee,
-                                  key_data));
-      }
+      EXITIF (GNUNET_SYSERR ==
+              parse_global_fee (&key_data->global_fees[index],
+                                check_sig,
+                                global_fee,
+                                key_data));
     }
   }
 
   /* parse the signing keys */
+  EXITIF (json_array_size (sign_keys_array) > UINT_MAX);
+  key_data->num_sign_keys
+    = (unsigned int) json_array_size (sign_keys_array);
+  if (0 != key_data->num_sign_keys)
   {
-    json_t *sign_keys_array;
     json_t *sign_key_obj;
-    unsigned int index;
+    size_t index;
 
-    EXITIF (NULL == (sign_keys_array =
-                       json_object_get (resp_obj,
-                                        "signkeys")));
-    EXITIF (! json_is_array (sign_keys_array));
-    if (0 != (key_data->num_sign_keys =
-                json_array_size (sign_keys_array)))
+    key_data->sign_keys
+      = GNUNET_new_array (key_data->num_sign_keys,
+                          struct TALER_EXCHANGE_SigningPublicKey);
+    json_array_foreach (sign_keys_array, index, sign_key_obj) {
+      EXITIF (GNUNET_SYSERR ==
+              parse_json_signkey (&key_data->sign_keys[index],
+                                  check_sig,
+                                  sign_key_obj,
+                                  &key_data->master_pub));
+    }
+  }
+
+  /* Parse balance limits */
+  if (NULL != wblwk)
+  {
+    EXITIF (json_array_size (wblwk) > UINT_MAX);
+    key_data->wblwk_length
+      = (unsigned int) json_array_size (wblwk);
+    key_data->wallet_balance_limit_without_kyc
+      = GNUNET_new_array (key_data->wblwk_length,
+                          struct TALER_Amount);
+    for (unsigned int i = 0; i<key_data->wblwk_length; i++)
     {
-      key_data->sign_keys
-        = GNUNET_new_array (key_data->num_sign_keys,
-                            struct TALER_EXCHANGE_SigningPublicKey);
-      json_array_foreach (sign_keys_array, index, sign_key_obj) {
-        EXITIF (GNUNET_SYSERR ==
-                parse_json_signkey (&key_data->sign_keys[index],
-                                    check_sig,
-                                    sign_key_obj,
-                                    &key_data->master_pub));
-      }
+      struct TALER_Amount *a = &key_data->wallet_balance_limit_without_kyc[i];
+      const json_t *aj = json_array_get (wblwk,
+                                         i);
+      struct GNUNET_JSON_Specification spec[] = {
+        TALER_JSON_spec_amount (NULL,
+                                key_data->currency,
+                                a),
+        GNUNET_JSON_spec_end ()
+      };
+
+      EXITIF (GNUNET_OK !=
+              GNUNET_JSON_parse (aj,
+                                 spec,
+                                 NULL, NULL));
     }
   }
 
+  /* Parse wire accounts */
+  key_data->fees = parse_fees (&key_data->master_pub,
+                               key_data->currency,
+                               fees,
+                               &key_data->fees_len);
+  EXITIF (NULL == key_data->fees);
+  /* parse accounts */
+  EXITIF (json_array_size (accounts) > UINT_MAX);
+  GNUNET_array_grow (key_data->accounts,
+                     key_data->accounts_len,
+                     json_array_size (accounts));
+  EXITIF (GNUNET_OK !=
+          TALER_EXCHANGE_parse_accounts (&key_data->master_pub,
+                                         accounts,
+                                         key_data->accounts_len,
+                                         key_data->accounts));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Parsed %u wire accounts from JSON\n",
+              key_data->accounts_len);
+
+
   /* Parse the supported extension(s): age-restriction. */
   /* TODO: maybe lift all this into a FP in TALER_Extension ? */
+  if (! no_extensions)
   {
-    struct TALER_MasterSignatureP extensions_sig = {0};
-    json_t *extensions = NULL;
-    struct GNUNET_JSON_Specification ext_spec[] = {
-      GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_json ("extensions",
-                               &extensions),
-        NULL),
-      GNUNET_JSON_spec_mark_optional (
-        GNUNET_JSON_spec_fixed_auto (
-          "extensions_sig",
-          &extensions_sig),
-        NULL),
-      GNUNET_JSON_spec_end ()
-    };
-
-    /* 1. Search for extensions in the response to /keys */
-    EXITIF (GNUNET_OK !=
-            GNUNET_JSON_parse (resp_obj,
-                               ext_spec,
-                               NULL, NULL));
-
-    if (NULL != extensions)
+    if (no_signature)
     {
-      /* 2. We have an extensions object. Verify its signature. */
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "found extensions without signature\n");
+    }
+    else
+    {
+      /* We have an extensions object. Verify its signature. */
       EXITIF (GNUNET_OK !=
-              TALER_extensions_verify_json_config_signature (
-                extensions,
-                &extensions_sig,
+              TALER_extensions_verify_manifests_signature (
+                manifests,
+                &key_data->extensions_sig,
                 &key_data->master_pub));
 
-      /* 3. Parse and set the the configuration of the extensions accordingly */
+      /* Parse and set the the configuration of the extensions accordingly */
       EXITIF (GNUNET_OK !=
-              TALER_extensions_load_json_config (extensions));
+              TALER_extensions_load_manifests (manifests));
     }
 
-    /* 4. assuming we might have now a new value for age_mask, set it in key_data */
-    key_data->age_mask = TALER_extensions_age_restriction_ageMask ();
+    /* Assuming we might have now a new value for age_mask, set it in key_data */
+    key_data->age_mask = TALER_extensions_get_age_restriction_mask ();
   }
 
-  /* parse the denomination keys, merging with the
-     possibly EXISTING array as required (/keys cherry picking) */
+  /*
+   * Parse the denomination keys, merging with the
+   * possibly EXISTING array as required (/keys cherry picking).
+   *
+   * The denominations are grouped by common values of
+   *    {cipher, value, fee, age_mask}.
+   */
   {
-    /* The denominations can be in "denoms" and (optionally) in
-     * "age_restricted_denoms"
-     */
-    struct
-    {
-      char *name;
-      struct GNUNET_HashContext *hc;
-      bool is_optional_age_restriction;
-    }
-    hive[2] = {
-      {
-        "denoms",
-        hash_context,
-        false
-      },
-      {
-        "age_restricted_denoms",
-        hash_context_restricted,
-        true
-      }
-    };
+    json_t *group_obj;
+    unsigned int group_idx;
 
-    for (size_t s = 0; s < sizeof(hive) / sizeof(hive[0]); s++)
+    json_array_foreach (denominations_by_group,
+                        group_idx,
+                        group_obj)
     {
-      json_t *denom_keys_array;
+      /* First, parse { cipher, fees, value, age_mask, hash } of the current
+         group. */
+      struct TALER_DenominationGroup group = {0};
+      const json_t *denom_keys_array;
+      struct GNUNET_JSON_Specification group_spec[] = {
+        TALER_JSON_spec_denomination_group (NULL,
+                                            key_data->currency,
+                                            &group),
+        GNUNET_JSON_spec_array_const ("denoms",
+                                      &denom_keys_array),
+        GNUNET_JSON_spec_end ()
+      };
       json_t *denom_key_obj;
       unsigned int index;
 
-      denom_keys_array = json_object_get (resp_obj,
-                                          hive[s].name);
-
-      if (NULL == denom_keys_array)
-        continue;
-
-      EXITIF (JSON_ARRAY != json_typeof (denom_keys_array));
-
-      json_array_foreach (denom_keys_array, index, denom_key_obj) {
-        struct TALER_EXCHANGE_DenomPublicKey dk;
+      EXITIF (GNUNET_SYSERR ==
+              GNUNET_JSON_parse (group_obj,
+                                 group_spec,
+                                 NULL,
+                                 NULL));
+
+      /* Now, parse the individual denominations */
+      json_array_foreach (denom_keys_array,
+                          index,
+                          denom_key_obj)
+      {
+        /* Set the common fields from the group for this particular
+           denomination.  Required to make the validity check inside
+           parse_json_denomkey_partially pass */
+        struct TALER_EXCHANGE_DenomPublicKey dk = {
+          .value = group.value,
+          .fees = group.fees,
+          .key.age_mask = group.age_mask
+        };
         bool found = false;
 
-        /* mark that we have at least one age restricted denomination, needed
-         * for the hash calculation and signature verification below. */
-        have_age_restricted_denom |= hive[s].is_optional_age_restriction;
-
-        memset (&dk,
-                0,
-                sizeof (dk));
         EXITIF (GNUNET_SYSERR ==
-                parse_json_denomkey (key_data->currency,
-                                     &dk,
-                                     check_sig,
-                                     denom_key_obj,
-                                     &key_data->master_pub,
-                                     hive[s].hc));
-
+                parse_json_denomkey_partially (&dk,
+                                               group.cipher,
+                                               check_sig,
+                                               denom_key_obj,
+                                               &key_data->master_pub,
+                                               group_idx,
+                                               index,
+                                               check_sig
+                                               ? &sig_ctx
+                                               : NULL));
         for (unsigned int j = 0;
              j<key_data->num_denom_keys;
              j++)
@@ -999,6 +1152,7 @@ decode_keys_json (const json_t *resp_obj,
             break;
           }
         }
+
         if (found)
         {
           /* 0:0:0 did not support /keys cherry picking */
@@ -1006,10 +1160,14 @@ decode_keys_json (const json_t *resp_obj,
           TALER_denom_pub_free (&dk.key);
           continue;
         }
+
         if (key_data->denom_keys_size == key_data->num_denom_keys)
           GNUNET_array_grow (key_data->denom_keys,
                              key_data->denom_keys_size,
                              key_data->denom_keys_size * 2 + 2);
+        GNUNET_assert (key_data->denom_keys_size >
+                       key_data->num_denom_keys);
+        GNUNET_assert (key_data->num_denom_keys < UINT_MAX);
         key_data->denom_keys[key_data->num_denom_keys++] = dk;
 
         /* Update "last_denom_issue_date" */
@@ -1018,23 +1176,18 @@ decode_keys_json (const json_t *resp_obj,
         key_data->last_denom_issue_date
           = GNUNET_TIME_timestamp_max (key_data->last_denom_issue_date,
                                        dk.valid_from);
-      };
-    }
-  }
+      };   /* end of json_array_foreach over denominations */
+    } /* end of json_array_foreach over groups of denominations */
+  } /* end of scope for group_ojb/group_idx */
 
   /* parse the auditor information */
   {
-    json_t *auditors_array;
     json_t *auditor_info;
     unsigned int index;
 
-    EXITIF (NULL == (auditors_array =
-                       json_object_get (resp_obj,
-                                        "auditors")));
-    EXITIF (JSON_ARRAY != json_typeof (auditors_array));
-
     /* Merge with the existing auditor information we have (/keys cherry picking) */
-    json_array_foreach (auditors_array, index, auditor_info) {
+    json_array_foreach (auditors_array, index, auditor_info)
+    {
       struct TALER_EXCHANGE_AuditorInformation ai;
       bool found = false;
 
@@ -1093,181 +1246,94 @@ decode_keys_json (const json_t *resp_obj,
         GNUNET_array_grow (key_data->auditors,
                            key_data->auditors_size,
                            key_data->auditors_size * 2 + 2);
+      GNUNET_assert (key_data->auditors_size >
+                     key_data->num_auditors);
       GNUNET_assert (NULL != ai.auditor_url);
+      GNUNET_assert (key_data->num_auditors < UINT_MAX);
       key_data->auditors[key_data->num_auditors++] = ai;
     };
   }
 
   /* parse the revocation/recoup information */
+  if (NULL != recoup_array)
   {
-    json_t *recoup_array;
     json_t *recoup_info;
     unsigned int index;
 
-    if (NULL != (recoup_array =
-                   json_object_get (resp_obj,
-                                    "recoup")))
+    json_array_foreach (recoup_array, index, recoup_info)
     {
-      EXITIF (JSON_ARRAY != json_typeof (recoup_array));
-
-      json_array_foreach (recoup_array, index, recoup_info) {
-        struct TALER_DenominationHashP h_denom_pub;
-        struct GNUNET_JSON_Specification spec[] = {
-          GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                       &h_denom_pub),
-          GNUNET_JSON_spec_end ()
-        };
+      struct TALER_DenominationHashP h_denom_pub;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
+                                     &h_denom_pub),
+        GNUNET_JSON_spec_end ()
+      };
 
-        EXITIF (GNUNET_OK !=
-                GNUNET_JSON_parse (recoup_info,
-                                   spec,
-                                   NULL, NULL));
-        for (unsigned int j = 0;
-             j<key_data->num_denom_keys;
-             j++)
+      EXITIF (GNUNET_OK !=
+              GNUNET_JSON_parse (recoup_info,
+                                 spec,
+                                 NULL, NULL));
+      for (unsigned int j = 0;
+           j<key_data->num_denom_keys;
+           j++)
+      {
+        if (0 == GNUNET_memcmp (&h_denom_pub,
+                                &key_data->denom_keys[j].h_key))
         {
-          if (0 == GNUNET_memcmp (&h_denom_pub,
-                                  &key_data->denom_keys[j].h_key))
-          {
-            key_data->denom_keys[j].revoked = GNUNET_YES;
-            break;
-          }
+          key_data->denom_keys[j].revoked = true;
+          break;
         }
-      };
+      }
     }
   }
 
   if (check_sig)
   {
+    struct GNUNET_HashContext *hash_context;
     struct GNUNET_HashCode hc;
 
-    /* If we had any age restricted denominations, add their hash to the end of
-     * the normal denominations. */
-    if (have_age_restricted_denom)
+    hash_context = GNUNET_CRYPTO_hash_context_start ();
+    qsort (sig_ctx.elements,
+           sig_ctx.elements_pos,
+           sizeof (struct SignatureElement),
+           &signature_context_sort_cb);
+    for (unsigned int i = 0; i<sig_ctx.elements_pos; i++)
     {
-      struct GNUNET_HashCode hcr;
+      struct SignatureElement *element = &sig_ctx.elements[i];
 
-      GNUNET_CRYPTO_hash_context_finish (hash_context_restricted,
-                                         &hcr);
-      hash_context_restricted = NULL;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Adding %u,%u,%s\n",
+                  element->group_offset,
+                  element->offset,
+                  TALER_B2S (&element->master_sig));
       GNUNET_CRYPTO_hash_context_read (hash_context,
-                                       &hcr,
-                                       sizeof(struct GNUNET_HashCode));
+                                       &element->master_sig,
+                                       sizeof (element->master_sig));
     }
-    else
-    {
-      GNUNET_CRYPTO_hash_context_abort (hash_context_restricted);
-      hash_context_restricted = NULL;
-    }
-
+    GNUNET_array_grow (sig_ctx.elements,
+                       sig_ctx.elements_size,
+                       0);
     GNUNET_CRYPTO_hash_context_finish (hash_context,
                                        &hc);
-    hash_context = NULL;
     EXITIF (GNUNET_OK !=
             TALER_EXCHANGE_test_signing_key (key_data,
-                                             &pub));
-
+                                             &exchange_pub));
     EXITIF (GNUNET_OK !=
             TALER_exchange_online_key_set_verify (
               key_data->list_issue_date,
               &hc,
-              &pub,
-              &sig));
+              &exchange_pub,
+              &exchange_sig));
   }
   return GNUNET_OK;
-EXITIF_exit:
 
+EXITIF_exit:
   *vc = TALER_EXCHANGE_VC_PROTOCOL_ERROR;
-  if (NULL != hash_context)
-    GNUNET_CRYPTO_hash_context_abort (hash_context);
-  if (NULL != hash_context_restricted)
-    GNUNET_CRYPTO_hash_context_abort (hash_context_restricted);
   return GNUNET_SYSERR;
 }
 
 
 /**
- * Free key data object.
- *
- * @param key_data data to free (pointer itself excluded)
- */
-static void
-free_key_data (struct TALER_EXCHANGE_Keys *key_data)
-{
-  GNUNET_array_grow (key_data->sign_keys,
-                     key_data->num_sign_keys,
-                     0);
-  for (unsigned int i = 0; i<key_data->num_denom_keys; i++)
-    TALER_denom_pub_free (&key_data->denom_keys[i].key);
-
-  GNUNET_array_grow (key_data->denom_keys,
-                     key_data->denom_keys_size,
-                     0);
-  for (unsigned int i = 0; i<key_data->num_auditors; i++)
-  {
-    GNUNET_array_grow (key_data->auditors[i].denom_keys,
-                       key_data->auditors[i].num_denom_keys,
-                       0);
-    GNUNET_free (key_data->auditors[i].auditor_url);
-  }
-  GNUNET_array_grow (key_data->auditors,
-                     key_data->auditors_size,
-                     0);
-  GNUNET_free (key_data->version);
-  GNUNET_free (key_data->currency);
-  GNUNET_free (key_data->global_fees);
-}
-
-
-/**
- * Initiate download of /keys from the exchange.
- *
- * @param cls exchange where to download /keys from
- */
-static void
-request_keys (void *cls);
-
-
-void
-TALER_EXCHANGE_set_last_denom (struct TALER_EXCHANGE_Handle *exchange,
-                               struct GNUNET_TIME_Timestamp last_denom_new)
-{
-  TALER_LOG_DEBUG (
-    "Application explicitly set last denomination validity to %s\n",
-    GNUNET_TIME_timestamp2s (last_denom_new));
-  exchange->key_data.last_denom_issue_date = last_denom_new;
-}
-
-
-struct GNUNET_TIME_Timestamp
-TALER_EXCHANGE_check_keys_current (struct TALER_EXCHANGE_Handle *exchange,
-                                   enum TALER_EXCHANGE_CheckKeysFlags flags)
-{
-  bool force_download = 0 != (flags & TALER_EXCHANGE_CKF_FORCE_DOWNLOAD);
-  bool pull_all_keys = 0 != (flags & TALER_EXCHANGE_CKF_PULL_ALL_KEYS);
-
-  if (NULL != exchange->kr)
-    return GNUNET_TIME_UNIT_ZERO_TS;
-
-  if (pull_all_keys)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Forcing re-download of all exchange keys\n");
-    GNUNET_break (GNUNET_YES == force_download);
-    exchange->state = MHS_INIT;
-  }
-  if ( (! force_download) &&
-       (GNUNET_TIME_absolute_is_future (
-          exchange->key_data_expiration.abs_time)) )
-    return exchange->key_data_expiration;
-  if (NULL == exchange->retry_task)
-    exchange->retry_task = GNUNET_SCHEDULER_add_now (&request_keys,
-                                                     exchange);
-  return GNUNET_TIME_UNIT_ZERO_TS;
-}
-
-
-/**
  * Callback used when downloading the reply to a /keys request
  * is complete.
  *
@@ -1280,132 +1346,122 @@ keys_completed_cb (void *cls,
                    long response_code,
                    const void *resp_obj)
 {
-  struct KeysRequest *kr = cls;
-  struct TALER_EXCHANGE_Handle *exchange = kr->exchange;
-  struct TALER_EXCHANGE_Keys kd;
-  struct TALER_EXCHANGE_Keys kd_old;
-  enum TALER_EXCHANGE_VersionCompatibility vc;
+  struct TALER_EXCHANGE_GetKeysHandle *gkh = cls;
   const json_t *j = resp_obj;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_Keys *kd = NULL;
+  struct TALER_EXCHANGE_KeysResponse kresp = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code,
+    .details.ok.compat = TALER_EXCHANGE_VC_PROTOCOL_ERROR,
   };
 
+  gkh->job = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Received keys from URL `%s' with status %ld and expiration %s.\n",
-              kr->url,
+              gkh->url,
               response_code,
-              GNUNET_TIME_timestamp2s (kr->expire));
-  if (GNUNET_TIME_absolute_is_past (kr->expire.abs_time))
+              GNUNET_TIME_timestamp2s (gkh->expire));
+  if (GNUNET_TIME_absolute_is_past (gkh->expire.abs_time))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Exchange failed to give expiration time, assuming in %s\n",
-                GNUNET_TIME_relative2s (DEFAULT_EXPIRATION,
-                                        true));
-    kr->expire
+    if (MHD_HTTP_OK == response_code)
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Exchange failed to give expiration time, assuming in %s\n",
+                  GNUNET_TIME_relative2s (DEFAULT_EXPIRATION,
+                                          true));
+    gkh->expire
       = GNUNET_TIME_absolute_to_timestamp (
           GNUNET_TIME_relative_to_absolute (DEFAULT_EXPIRATION));
   }
-  kd_old = exchange->key_data;
-  memset (&kd,
-          0,
-          sizeof (struct TALER_EXCHANGE_Keys));
-  vc = TALER_EXCHANGE_VC_PROTOCOL_ERROR;
   switch (response_code)
   {
   case 0:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Failed to receive /keys response from exchange %s\n",
-                exchange->url);
-    free_keys_request (kr);
-    exchange->keys_error_count++;
-    exchange->kr = NULL;
-    GNUNET_assert (NULL == exchange->retry_task);
-    exchange->retry_delay = EXCHANGE_LIB_BACKOFF (exchange->retry_delay);
-    exchange->retry_task = GNUNET_SCHEDULER_add_delayed (exchange->retry_delay,
-                                                         &request_keys,
-                                                         exchange);
-    return;
+                gkh->exchange_url);
+    break;
   case MHD_HTTP_OK:
-    exchange->keys_error_count = 0;
     if (NULL == j)
     {
+      GNUNET_break (0);
       response_code = 0;
       break;
     }
-    /* We keep the denomination keys and auditor signatures from the
-       previous iteration (/keys cherry picking) */
-    kd.num_denom_keys = kd_old.num_denom_keys;
-    kd.last_denom_issue_date = kd_old.last_denom_issue_date;
-    GNUNET_array_grow (kd.denom_keys,
-                       kd.denom_keys_size,
-                       kd.num_denom_keys);
-
-    /* First make a shallow copy, we then need another pass for the RSA key... */
-    memcpy (kd.denom_keys,
-            kd_old.denom_keys,
-            kd_old.num_denom_keys * sizeof (struct
-                                            TALER_EXCHANGE_DenomPublicKey));
-
-    for (unsigned int i = 0; i<kd_old.num_denom_keys; i++)
-      TALER_denom_pub_deep_copy (&kd.denom_keys[i].key,
-                                 &kd_old.denom_keys[i].key);
-
-    kd.num_auditors = kd_old.num_auditors;
-    kd.auditors = GNUNET_new_array (kd.num_auditors,
-                                    struct TALER_EXCHANGE_AuditorInformation);
-    /* Now the necessary deep copy... */
-    for (unsigned int i = 0; i<kd_old.num_auditors; i++)
+    kd = GNUNET_new (struct TALER_EXCHANGE_Keys);
+    kd->exchange_url = GNUNET_strdup (gkh->exchange_url);
+    if (NULL != gkh->prev_keys)
     {
-      const struct TALER_EXCHANGE_AuditorInformation *aold =
-        &kd_old.auditors[i];
-      struct TALER_EXCHANGE_AuditorInformation *anew = &kd.auditors[i];
-
-      anew->auditor_pub = aold->auditor_pub;
-      GNUNET_assert (NULL != aold->auditor_url);
-      anew->auditor_url = GNUNET_strdup (aold->auditor_url);
-      GNUNET_array_grow (anew->denom_keys,
-                         anew->num_denom_keys,
-                         aold->num_denom_keys);
-      memcpy (anew->denom_keys,
-              aold->denom_keys,
-              aold->num_denom_keys
-              * sizeof (struct TALER_EXCHANGE_AuditorDenominationInfo));
-    }
+      const struct TALER_EXCHANGE_Keys *kd_old = gkh->prev_keys;
+
+      /* We keep the denomination keys and auditor signatures from the
+         previous iteration (/keys cherry picking) */
+      kd->num_denom_keys
+        = kd_old->num_denom_keys;
+      kd->last_denom_issue_date
+        = kd_old->last_denom_issue_date;
+      GNUNET_array_grow (kd->denom_keys,
+                         kd->denom_keys_size,
+                         kd->num_denom_keys);
+      /* First make a shallow copy, we then need another pass for the RSA key... */
+      GNUNET_memcpy (kd->denom_keys,
+                     kd_old->denom_keys,
+                     kd_old->num_denom_keys
+                     * sizeof (struct TALER_EXCHANGE_DenomPublicKey));
+      for (unsigned int i = 0; i<kd_old->num_denom_keys; i++)
+        TALER_denom_pub_copy (&kd->denom_keys[i].key,
+                              &kd_old->denom_keys[i].key);
+      kd->num_auditors = kd_old->num_auditors;
+      kd->auditors = GNUNET_new_array (kd->num_auditors,
+                                       struct TALER_EXCHANGE_AuditorInformation);
+      /* Now the necessary deep copy... */
+      for (unsigned int i = 0; i<kd_old->num_auditors; i++)
+      {
+        const struct TALER_EXCHANGE_AuditorInformation *aold =
+          &kd_old->auditors[i];
+        struct TALER_EXCHANGE_AuditorInformation *anew = &kd->auditors[i];
 
-    /* Old auditors got just copied into new ones.  */
+        anew->auditor_pub = aold->auditor_pub;
+        anew->auditor_url = GNUNET_strdup (aold->auditor_url);
+        GNUNET_array_grow (anew->denom_keys,
+                           anew->num_denom_keys,
+                           aold->num_denom_keys);
+        GNUNET_memcpy (
+          anew->denom_keys,
+          aold->denom_keys,
+          aold->num_denom_keys
+          * sizeof (struct TALER_EXCHANGE_AuditorDenominationInfo));
+      }
+    }
+    /* Now decode fresh /keys response */
     if (GNUNET_OK !=
         decode_keys_json (j,
                           true,
-                          &kd,
-                          &vc))
+                          kd,
+                          &kresp.details.ok.compat))
     {
       TALER_LOG_ERROR ("Could not decode /keys response\n");
-      hr.http_status = 0;
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      for (unsigned int i = 0; i<kd.num_auditors; i++)
-      {
-        struct TALER_EXCHANGE_AuditorInformation *anew = &kd.auditors[i];
-
-        GNUNET_array_grow (anew->denom_keys,
-                           anew->num_denom_keys,
-                           0);
-        GNUNET_free (anew->auditor_url);
-      }
-      GNUNET_free (kd.auditors);
-      kd.auditors = NULL;
-      kd.num_auditors = 0;
-      for (unsigned int i = 0; i<kd_old.num_denom_keys; i++)
-        TALER_denom_pub_free (&kd.denom_keys[i].key);
-      GNUNET_array_grow (kd.denom_keys,
-                         kd.denom_keys_size,
-                         0);
-      kd.num_denom_keys = 0;
+      kd->rc = 1;
+      TALER_EXCHANGE_keys_decref (kd);
+      kd = NULL;
+      kresp.hr.http_status = 0;
+      kresp.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
       break;
     }
-    json_decref (exchange->key_data_raw);
-    exchange->key_data_raw = json_deep_copy (j);
-    exchange->retry_delay = GNUNET_TIME_UNIT_ZERO;
+    kd->rc = 1;
+    kd->key_data_expiration = gkh->expire;
+    if (GNUNET_TIME_relative_cmp (
+          GNUNET_TIME_absolute_get_remaining (gkh->expire.abs_time),
+          <,
+          MINIMUM_EXPIRATION))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Exchange returned keys with expiration time below %s. Compensating.\n",
+                  GNUNET_TIME_relative2s (MINIMUM_EXPIRATION,
+                                          true));
+      kd->key_data_expiration
+        = GNUNET_TIME_relative_to_timestamp (MINIMUM_EXPIRATION);
+    }
+
+    kresp.details.ok.keys = kd;
     break;
   case MHD_HTTP_BAD_REQUEST:
   case MHD_HTTP_UNAUTHORIZED:
@@ -1413,108 +1469,36 @@ keys_completed_cb (void *cls,
   case MHD_HTTP_NOT_FOUND:
     if (NULL == j)
     {
-      hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-      hr.hint = TALER_ErrorCode_get_hint (hr.ec);
+      kresp.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      kresp.hr.hint = TALER_ErrorCode_get_hint (kresp.hr.ec);
     }
     else
     {
-      hr.ec = TALER_JSON_get_error_code (j);
-      hr.hint = TALER_JSON_get_error_hint (j);
+      kresp.hr.ec = TALER_JSON_get_error_code (j);
+      kresp.hr.hint = TALER_JSON_get_error_hint (j);
     }
     break;
   default:
-    if (MHD_HTTP_GATEWAY_TIMEOUT == response_code)
-      exchange->keys_error_count++;
     if (NULL == j)
     {
-      hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-      hr.hint = TALER_ErrorCode_get_hint (hr.ec);
+      kresp.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      kresp.hr.hint = TALER_ErrorCode_get_hint (kresp.hr.ec);
     }
     else
     {
-      hr.ec = TALER_JSON_get_error_code (j);
-      hr.hint = TALER_JSON_get_error_hint (j);
+      kresp.hr.ec = TALER_JSON_get_error_code (j);
+      kresp.hr.hint = TALER_JSON_get_error_hint (j);
     }
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) kresp.hr.ec);
     break;
   }
-  exchange->key_data = kd;
-  if (GNUNET_TIME_absolute_is_past (
-        exchange->key_data.last_denom_issue_date.abs_time))
-    TALER_LOG_WARNING ("Last DK issue date from exchange is in the past: %s\n",
-                       GNUNET_TIME_timestamp2s (
-                         exchange->key_data.last_denom_issue_date));
-  else
-    TALER_LOG_DEBUG ("Last DK issue date updated to: %s\n",
-                     GNUNET_TIME_timestamp2s (
-                       exchange->key_data.last_denom_issue_date));
-
-
-  if (MHD_HTTP_OK != response_code)
-  {
-    exchange->kr = NULL;
-    free_keys_request (kr);
-    exchange->state = MHS_FAILED;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Exchange keys download failed\n");
-    if (NULL != exchange->key_data_raw)
-    {
-      json_decref (exchange->key_data_raw);
-      exchange->key_data_raw = NULL;
-    }
-    free_key_data (&kd_old);
-    /* notify application that we failed */
-    exchange->cert_cb (exchange->cert_cb_cls,
-                       &hr,
-                       NULL,
-                       vc);
-    return;
-  }
-
-  exchange->kr = NULL;
-  exchange->key_data_expiration = kr->expire;
-  free_keys_request (kr);
-  exchange->state = MHS_CERT;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Successfully downloaded exchange's keys\n");
-  update_auditors (exchange);
-  /* notify application about the key information */
-  exchange->cert_cb (exchange->cert_cb_cls,
-                     &hr,
-                     &exchange->key_data,
-                     vc);
-  free_key_data (&kd_old);
-}
-
-
-/* ********************* library internal API ********* */
-
-
-struct GNUNET_CURL_Context *
-TEAH_handle_to_context (struct TALER_EXCHANGE_Handle *h)
-{
-  return h->ctx;
-}
-
-
-enum GNUNET_GenericReturnValue
-TEAH_handle_is_ready (struct TALER_EXCHANGE_Handle *h)
-{
-  return (MHS_CERT == h->state) ? GNUNET_YES : GNUNET_NO;
-}
-
-
-char *
-TEAH_path_to_url (struct TALER_EXCHANGE_Handle *h,
-                  const char *path)
-{
-  GNUNET_assert ('/' == path[0]);
-  return TALER_url_join (h->url,
-                         path + 1,
-                         NULL);
+  gkh->cert_cb (gkh->cert_cb_cls,
+                &kresp,
+                kd);
+  TALER_EXCHANGE_get_keys_cancel (gkh);
 }
 
 
@@ -1528,7 +1512,7 @@ TEAH_path_to_url (struct TALER_EXCHANGE_Handle *h,
  * Parse HTTP timestamp.
  *
  * @param dateline header to parse header
- * @param at where to write the result
+ * @param[out] at where to write the result
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
@@ -1628,7 +1612,7 @@ parse_date_string (const char *dateline,
  * @param buffer header data received
  * @param size size of an item in @a buffer
  * @param nitems number of items in @a buffer
- * @param userdata the `struct KeysRequest`
+ * @param userdata the `struct TALER_EXCHANGE_GetKeysHandle`
  * @return `size * nitems` on success (everything else aborts)
  */
 static size_t
@@ -1637,7 +1621,7 @@ header_cb (char *buffer,
            size_t nitems,
            void *userdata)
 {
-  struct KeysRequest *kr = userdata;
+  struct TALER_EXCHANGE_GetKeysHandle *kr = userdata;
   size_t total = size * nitems;
   char *val;
 
@@ -1649,6 +1633,10 @@ header_cb (char *buffer,
     return total;
   val = GNUNET_strndup (&buffer[strlen (MHD_HTTP_HEADER_EXPIRES ": ")],
                         total - strlen (MHD_HTTP_HEADER_EXPIRES ": "));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Found %s header `%s'\n",
+              MHD_HTTP_HEADER_EXPIRES,
+              val);
   if (GNUNET_OK !=
       parse_date_string (val,
                          &kr->expire))
@@ -1664,409 +1652,66 @@ header_cb (char *buffer,
 }
 
 
-/* ********************* public API ******************* */
-
-
-/**
- * Deserialize the key data and use it to bootstrap @a exchange to
- * more efficiently recover the state.  Errors in @a data must be
- * tolerated (i.e. by re-downloading instead).
- *
- * @param exchange which exchange's key and wire data should be deserialized
- * @param data the data to deserialize
- */
-static void
-deserialize_data (struct TALER_EXCHANGE_Handle *exchange,
-                  const json_t *data)
-{
-  enum TALER_EXCHANGE_VersionCompatibility vc;
-  json_t *keys;
-  const char *url;
-  uint32_t version;
-  struct GNUNET_TIME_Timestamp expire;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_uint32 ("version",
-                             &version),
-    GNUNET_JSON_spec_json ("keys",
-                           &keys),
-    GNUNET_JSON_spec_string ("exchange_url",
-                             &url),
-    GNUNET_JSON_spec_timestamp ("expire",
-                                &expire),
-    GNUNET_JSON_spec_end ()
-  };
-  struct TALER_EXCHANGE_Keys key_data;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .ec = TALER_EC_NONE,
-    .http_status = MHD_HTTP_OK,
-    .reply = data
-  };
-
-  if (NULL == data)
-    return;
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (data,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return;
-  }
-  if (0 != version)
-  {
-    GNUNET_JSON_parse_free (spec);
-    return; /* unsupported version */
-  }
-  if (0 != strcmp (url,
-                   exchange->url))
-  {
-    GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
-    return;
-  }
-  memset (&key_data,
-          0,
-          sizeof (struct TALER_EXCHANGE_Keys));
-  if (GNUNET_OK !=
-      decode_keys_json (keys,
-                        false,
-                        &key_data,
-                        &vc))
-  {
-    GNUNET_break (0);
-    GNUNET_JSON_parse_free (spec);
-    return;
-  }
-  /* decode successful, initialize with the result */
-  GNUNET_assert (NULL == exchange->key_data_raw);
-  exchange->key_data_raw = json_deep_copy (keys);
-  exchange->key_data = key_data;
-  exchange->key_data_expiration = expire;
-  exchange->state = MHS_CERT;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Successfully loaded exchange's keys via deserialization\n");
-  update_auditors (exchange);
-  /* notify application about the key information */
-  exchange->cert_cb (exchange->cert_cb_cls,
-                     &hr,
-                     &exchange->key_data,
-                     vc);
-  GNUNET_JSON_parse_free (spec);
-}
-
-
-json_t *
-TALER_EXCHANGE_serialize_data (struct TALER_EXCHANGE_Handle *exchange)
-{
-  const struct TALER_EXCHANGE_Keys *kd = &exchange->key_data;
-  struct GNUNET_TIME_Timestamp now;
-  json_t *keys;
-  json_t *signkeys;
-  json_t *denoms;
-  json_t *auditors;
-
-  now = GNUNET_TIME_timestamp_get ();
-  signkeys = json_array ();
-  if (NULL == signkeys)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  for (unsigned int i = 0; i<kd->num_sign_keys; i++)
-  {
-    const struct TALER_EXCHANGE_SigningPublicKey *sk = &kd->sign_keys[i];
-    json_t *signkey;
-
-    if (GNUNET_TIME_timestamp_cmp (now,
-                                   >,
-                                   sk->valid_until))
-      continue; /* skip keys that have expired */
-    signkey = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_data_auto ("key",
-                                  &sk->key),
-      GNUNET_JSON_pack_data_auto ("master_sig",
-                                  &sk->master_sig),
-      GNUNET_JSON_pack_timestamp ("stamp_start",
-                                  sk->valid_from),
-      GNUNET_JSON_pack_timestamp ("stamp_expire",
-                                  sk->valid_until),
-      GNUNET_JSON_pack_timestamp ("stamp_end",
-                                  sk->valid_legal));
-    if (NULL == signkey)
-    {
-      GNUNET_break (0);
-      continue;
-    }
-    if (0 != json_array_append_new (signkeys,
-                                    signkey))
-    {
-      GNUNET_break (0);
-      json_decref (signkey);
-      json_decref (signkeys);
-      return NULL;
-    }
-  }
-  denoms = json_array ();
-  if (NULL == denoms)
-  {
-    GNUNET_break (0);
-    json_decref (signkeys);
-    return NULL;
-  }
-  for (unsigned int i = 0; i<kd->num_denom_keys; i++)
-  {
-    const struct TALER_EXCHANGE_DenomPublicKey *dk = &kd->denom_keys[i];
-    json_t *denom;
-
-    if (GNUNET_TIME_timestamp_cmp (now,
-                                   >,
-                                   dk->expire_deposit))
-      continue; /* skip keys that have expired */
-    denom = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_timestamp ("stamp_expire_deposit",
-                                  dk->expire_deposit),
-      GNUNET_JSON_pack_timestamp ("stamp_expire_withdraw",
-                                  dk->withdraw_valid_until),
-      GNUNET_JSON_pack_timestamp ("stamp_start",
-                                  dk->valid_from),
-      GNUNET_JSON_pack_timestamp ("stamp_expire_legal",
-                                  dk->expire_legal),
-      TALER_JSON_pack_amount ("value",
-                              &dk->value),
-      TALER_JSON_PACK_DENOM_FEES ("fee",
-                                  &dk->fees),
-      GNUNET_JSON_pack_data_auto ("master_sig",
-                                  &dk->master_sig),
-      TALER_JSON_pack_denom_pub ("denom_pub",
-                                 &dk->key));
-    GNUNET_assert (0 ==
-                   json_array_append_new (denoms,
-                                          denom));
-  }
-  auditors = json_array ();
-  GNUNET_assert (NULL != auditors);
-  for (unsigned int i = 0; i<kd->num_auditors; i++)
-  {
-    const struct TALER_EXCHANGE_AuditorInformation *ai = &kd->auditors[i];
-    json_t *a;
-    json_t *adenoms;
-
-    adenoms = json_array ();
-    if (NULL == adenoms)
-    {
-      GNUNET_break (0);
-      json_decref (denoms);
-      json_decref (signkeys);
-      json_decref (auditors);
-      return NULL;
-    }
-    for (unsigned int j = 0; j<ai->num_denom_keys; j++)
-    {
-      const struct TALER_EXCHANGE_AuditorDenominationInfo *adi =
-        &ai->denom_keys[j];
-      const struct TALER_EXCHANGE_DenomPublicKey *dk =
-        &kd->denom_keys[adi->denom_key_offset];
-      json_t *k;
-
-      if (GNUNET_TIME_timestamp_cmp (now,
-                                     >,
-                                     dk->expire_deposit))
-        continue; /* skip auditor signatures for denomination keys that have expired */
-      GNUNET_assert (adi->denom_key_offset < kd->num_denom_keys);
-      k = GNUNET_JSON_PACK (
-        GNUNET_JSON_pack_data_auto ("denom_pub_h",
-                                    &dk->h_key),
-        GNUNET_JSON_pack_data_auto ("auditor_sig",
-                                    &adi->auditor_sig));
-      GNUNET_assert (0 ==
-                     json_array_append_new (adenoms,
-                                            k));
-    }
-
-    a = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_data_auto ("auditor_pub",
-                                  &ai->auditor_pub),
-      GNUNET_JSON_pack_string ("auditor_url",
-                               ai->auditor_url),
-      GNUNET_JSON_pack_array_steal ("denomination_keys",
-                                    adenoms));
-    GNUNET_assert (0 ==
-                   json_array_append_new (auditors,
-                                          a));
-  }
-  keys = GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_string ("version",
-                             kd->version),
-    GNUNET_JSON_pack_string ("currency",
-                             kd->currency),
-    GNUNET_JSON_pack_data_auto ("master_public_key",
-                                &kd->master_pub),
-    GNUNET_JSON_pack_time_rel ("reserve_closing_delay",
-                               kd->reserve_closing_delay),
-    GNUNET_JSON_pack_timestamp ("list_issue_date",
-                                kd->list_issue_date),
-    GNUNET_JSON_pack_array_steal ("signkeys",
-                                  signkeys),
-    GNUNET_JSON_pack_array_steal ("denoms",
-                                  denoms),
-    GNUNET_JSON_pack_array_steal ("auditors",
-                                  auditors));
-  return GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_uint64 ("version",
-                             EXCHANGE_SERIALIZATION_FORMAT_VERSION),
-    GNUNET_JSON_pack_timestamp ("expire",
-                                exchange->key_data_expiration),
-    GNUNET_JSON_pack_string ("exchange_url",
-                             exchange->url),
-    GNUNET_JSON_pack_object_steal ("keys",
-                                   keys));
-}
-
-
-struct TALER_EXCHANGE_Handle *
-TALER_EXCHANGE_connect (
+struct TALER_EXCHANGE_GetKeysHandle *
+TALER_EXCHANGE_get_keys (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  TALER_EXCHANGE_CertificationCallback cert_cb,
-  void *cert_cb_cls,
-  ...)
+  struct TALER_EXCHANGE_Keys *last_keys,
+  TALER_EXCHANGE_GetKeysCallback cert_cb,
+  void *cert_cb_cls)
 {
-  struct TALER_EXCHANGE_Handle *exchange;
-  va_list ap;
-  enum TALER_EXCHANGE_Option opt;
+  struct TALER_EXCHANGE_GetKeysHandle *gkh;
+  CURL *eh;
+  char last_date[80] = { 0 };
 
   TALER_LOG_DEBUG ("Connecting to the exchange (%s)\n",
                    url);
-  /* Disable 100 continue processing */
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_CURL_append_header (ctx,
-                                           MHD_HTTP_HEADER_EXPECT ":"));
-  exchange = GNUNET_new (struct TALER_EXCHANGE_Handle);
-  exchange->ctx = ctx;
-  exchange->url = GNUNET_strdup (url);
-  exchange->cert_cb = cert_cb;
-  exchange->cert_cb_cls = cert_cb_cls;
-  exchange->retry_task = GNUNET_SCHEDULER_add_now (&request_keys,
-                                                   exchange);
-  va_start (ap, cert_cb_cls);
-  while (TALER_EXCHANGE_OPTION_END !=
-         (opt = va_arg (ap, int)))
-  {
-    switch (opt)
-    {
-    case TALER_EXCHANGE_OPTION_END:
-      GNUNET_assert (0);
-      break;
-    case TALER_EXCHANGE_OPTION_DATA:
-      {
-        const json_t *data = va_arg (ap, const json_t *);
-
-        deserialize_data (exchange,
-                          data);
-        break;
-      }
-    default:
-      GNUNET_assert (0);
-      break;
-    }
-  }
-  va_end (ap);
-  return exchange;
-}
-
-
-/**
- * Compute the network timeout for the next request to /keys.
- *
- * @param exchange the exchange handle
- * @returns the timeout in seconds (for use by CURL)
- */
-static long
-get_keys_timeout_seconds (struct TALER_EXCHANGE_Handle *exchange)
-{
-  unsigned int kec;
-
-  /* if retry counter >= 8, do not bother to go further, we
-     stop the exponential back-off at 128 anyway. */
-  kec = GNUNET_MIN (7,
-                    exchange->keys_error_count);
-  return GNUNET_MIN (120,
-                     5 + (1L << kec));
-}
-
-
-/**
- * Initiate download of /keys from the exchange.
- *
- * @param cls exchange where to download /keys from
- */
-static void
-request_keys (void *cls)
-{
-  struct TALER_EXCHANGE_Handle *exchange = cls;
-  struct KeysRequest *kr;
-  CURL *eh;
-  char url[200] = "/keys?";
-
-  exchange->retry_task = NULL;
-  GNUNET_assert (NULL == exchange->kr);
-  kr = GNUNET_new (struct KeysRequest);
-  kr->exchange = exchange;
-
-  if (GNUNET_YES == TEAH_handle_is_ready (exchange))
+  gkh = GNUNET_new (struct TALER_EXCHANGE_GetKeysHandle);
+  gkh->exchange_url = GNUNET_strdup (url);
+  gkh->cert_cb = cert_cb;
+  gkh->cert_cb_cls = cert_cb_cls;
+  if (NULL != last_keys)
   {
+    gkh->prev_keys = TALER_EXCHANGE_keys_incref (last_keys);
     TALER_LOG_DEBUG ("Last DK issue date (before GETting /keys): %s\n",
                      GNUNET_TIME_timestamp2s (
-                       exchange->key_data.last_denom_issue_date));
-    sprintf (&url[strlen (url)],
-             "last_issue_date=%llu&",
-             (unsigned long long)
-             exchange->key_data.last_denom_issue_date.abs_time.abs_value_us
-             / 1000000LLU);
+                       last_keys->last_denom_issue_date));
+    GNUNET_snprintf (last_date,
+                     sizeof (last_date),
+                     "%llu",
+                     (unsigned long long)
+                     last_keys->last_denom_issue_date.abs_time.abs_value_us
+                     / 1000000LLU);
   }
-
-  /* Clean the last '&'/'?' sign that we optimistically put.  */
-  url[strlen (url) - 1] = '\0';
-  kr->url = TEAH_path_to_url (exchange,
-                              url);
-  if (NULL == kr->url)
-  {
-    struct TALER_EXCHANGE_HttpResponse hr = {
-      .ec = TALER_EC_GENERIC_CONFIGURATION_INVALID
-    };
-
-    GNUNET_free (kr);
-    exchange->keys_error_count++;
-    exchange->state = MHS_FAILED;
-    exchange->cert_cb (exchange->cert_cb_cls,
-                       &hr,
-                       NULL,
-                       TALER_EXCHANGE_VC_PROTOCOL_ERROR);
-    return;
-  }
-
+  gkh->url = TALER_url_join (url,
+                             "keys",
+                             (NULL != last_keys)
+                             ? "last_issue_date"
+                             : NULL,
+                             (NULL != last_keys)
+                             ? last_date
+                             : NULL,
+                             NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Requesting keys with URL `%s'.\n",
-              kr->url);
-  eh = TALER_EXCHANGE_curl_easy_get_ (kr->url);
+              gkh->url);
+  eh = TALER_EXCHANGE_curl_easy_get_ (gkh->url);
   if (NULL == eh)
   {
-    GNUNET_free (kr->url);
-    GNUNET_free (kr);
-    exchange->retry_delay = EXCHANGE_LIB_BACKOFF (exchange->retry_delay);
-    exchange->retry_task = GNUNET_SCHEDULER_add_delayed (exchange->retry_delay,
-                                                         &request_keys,
-                                                         exchange);
-    return;
+    GNUNET_break (0);
+    GNUNET_free (gkh->exchange_url);
+    GNUNET_free (gkh->url);
+    GNUNET_free (gkh);
+    return NULL;
   }
   GNUNET_break (CURLE_OK ==
                 curl_easy_setopt (eh,
                                   CURLOPT_VERBOSE,
-                                  0));
+                                  1));
   GNUNET_break (CURLE_OK ==
                 curl_easy_setopt (eh,
                                   CURLOPT_TIMEOUT,
-                                  get_keys_timeout_seconds (exchange)));
+                                  120 /* seconds */));
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
                                    CURLOPT_HEADERFUNCTION,
@@ -2074,70 +1719,35 @@ request_keys (void *cls)
   GNUNET_assert (CURLE_OK ==
                  curl_easy_setopt (eh,
                                    CURLOPT_HEADERDATA,
-                                   kr));
-  kr->job = GNUNET_CURL_job_add_with_ct_json (exchange->ctx,
-                                              eh,
-                                              &keys_completed_cb,
-                                              kr);
-  exchange->kr = kr;
+                                   gkh));
+  gkh->job = GNUNET_CURL_job_add_with_ct_json (ctx,
+                                               eh,
+                                               &keys_completed_cb,
+                                               gkh);
+  return gkh;
 }
 
 
 void
-TALER_EXCHANGE_disconnect (struct TALER_EXCHANGE_Handle *exchange)
+TALER_EXCHANGE_get_keys_cancel (
+  struct TALER_EXCHANGE_GetKeysHandle *gkh)
 {
-  struct TEAH_AuditorListEntry *ale;
-
-  while (NULL != (ale = exchange->auditors_head))
+  if (NULL != gkh->job)
   {
-    struct TEAH_AuditorInteractionEntry *aie;
-
-    while (NULL != (aie = ale->ai_head))
-    {
-      GNUNET_assert (aie->ale == ale);
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Not sending deposit confirmation to auditor `%s' due to exchange disconnect\n",
-                  ale->auditor_url);
-      TALER_AUDITOR_deposit_confirmation_cancel (aie->dch);
-      GNUNET_CONTAINER_DLL_remove (ale->ai_head,
-                                   ale->ai_tail,
-                                   aie);
-      GNUNET_free (aie);
-    }
-    GNUNET_CONTAINER_DLL_remove (exchange->auditors_head,
-                                 exchange->auditors_tail,
-                                 ale);
-    TALER_LOG_DEBUG ("Disconnecting the auditor `%s'\n",
-                     ale->auditor_url);
-    TALER_AUDITOR_disconnect (ale->ah);
-    GNUNET_free (ale->auditor_url);
-    GNUNET_free (ale);
+    GNUNET_CURL_job_cancel (gkh->job);
+    gkh->job = NULL;
   }
-  if (NULL != exchange->kr)
-  {
-    GNUNET_CURL_job_cancel (exchange->kr->job);
-    free_keys_request (exchange->kr);
-    exchange->kr = NULL;
-  }
-  free_key_data (&exchange->key_data);
-  if (NULL != exchange->key_data_raw)
-  {
-    json_decref (exchange->key_data_raw);
-    exchange->key_data_raw = NULL;
-  }
-  if (NULL != exchange->retry_task)
-  {
-    GNUNET_SCHEDULER_cancel (exchange->retry_task);
-    exchange->retry_task = NULL;
-  }
-  GNUNET_free (exchange->url);
-  GNUNET_free (exchange);
+  TALER_EXCHANGE_keys_decref (gkh->prev_keys);
+  GNUNET_free (gkh->exchange_url);
+  GNUNET_free (gkh->url);
+  GNUNET_free (gkh);
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_EXCHANGE_test_signing_key (const struct TALER_EXCHANGE_Keys *keys,
-                                 const struct TALER_ExchangePublicKeyP *pub)
+TALER_EXCHANGE_test_signing_key (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ExchangePublicKeyP *pub)
 {
   struct GNUNET_TIME_Absolute now;
 
@@ -2164,13 +1774,6 @@ TALER_EXCHANGE_test_signing_key (const struct TALER_EXCHANGE_Keys *keys,
 }
 
 
-const char *
-TALER_EXCHANGE_get_base_url (const struct TALER_EXCHANGE_Handle *exchange)
-{
-  return exchange->url;
-}
-
-
 const struct TALER_EXCHANGE_DenomPublicKey *
 TALER_EXCHANGE_get_denomination_key (
   const struct TALER_EXCHANGE_Keys *keys,
@@ -2214,8 +1817,8 @@ TALER_EXCHANGE_copy_denomination_key (
 
   copy = GNUNET_new (struct TALER_EXCHANGE_DenomPublicKey);
   *copy = *key;
-  TALER_denom_pub_deep_copy (&copy->key,
-                             &key->key);
+  TALER_denom_pub_copy (&copy->key,
+                        &key->key);
   return copy;
 }
 
@@ -2242,21 +1845,627 @@ TALER_EXCHANGE_get_denomination_key_by_hash (
 }
 
 
-const struct TALER_EXCHANGE_Keys *
-TALER_EXCHANGE_get_keys (struct TALER_EXCHANGE_Handle *exchange)
+struct TALER_EXCHANGE_Keys *
+TALER_EXCHANGE_keys_incref (struct TALER_EXCHANGE_Keys *keys)
+{
+  GNUNET_assert (keys->rc < UINT_MAX);
+  keys->rc++;
+  return keys;
+}
+
+
+void
+TALER_EXCHANGE_keys_decref (struct TALER_EXCHANGE_Keys *keys)
+{
+  if (NULL == keys)
+    return;
+  GNUNET_assert (0 < keys->rc);
+  keys->rc--;
+  if (0 != keys->rc)
+    return;
+  GNUNET_array_grow (keys->sign_keys,
+                     keys->num_sign_keys,
+                     0);
+  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
+    TALER_denom_pub_free (&keys->denom_keys[i].key);
+
+  GNUNET_array_grow (keys->denom_keys,
+                     keys->denom_keys_size,
+                     0);
+  for (unsigned int i = 0; i<keys->num_auditors; i++)
+  {
+    GNUNET_array_grow (keys->auditors[i].denom_keys,
+                       keys->auditors[i].num_denom_keys,
+                       0);
+    GNUNET_free (keys->auditors[i].auditor_url);
+  }
+  GNUNET_array_grow (keys->auditors,
+                     keys->auditors_size,
+                     0);
+  TALER_EXCHANGE_free_accounts (keys->accounts_len,
+                                keys->accounts);
+  GNUNET_array_grow (keys->accounts,
+                     keys->accounts_len,
+                     0);
+  free_fees (keys->fees,
+             keys->fees_len);
+  json_decref (keys->extensions);
+  GNUNET_free (keys->cspec.name);
+  json_decref (keys->cspec.map_alt_unit_names);
+  GNUNET_free (keys->wallet_balance_limit_without_kyc);
+  GNUNET_free (keys->version);
+  GNUNET_free (keys->currency);
+  GNUNET_free (keys->asset_type);
+  GNUNET_free (keys->global_fees);
+  GNUNET_free (keys->exchange_url);
+  GNUNET_free (keys);
+}
+
+
+struct TALER_EXCHANGE_Keys *
+TALER_EXCHANGE_keys_from_json (const json_t *j)
+{
+  const json_t *jkeys;
+  const char *url;
+  uint32_t version;
+  struct GNUNET_TIME_Timestamp expire
+    = GNUNET_TIME_UNIT_ZERO_TS;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_uint32 ("version",
+                             &version),
+    GNUNET_JSON_spec_object_const ("keys",
+                                   &jkeys),
+    TALER_JSON_spec_web_url ("exchange_url",
+                             &url),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_timestamp ("expire",
+                                  &expire),
+      NULL),
+    GNUNET_JSON_spec_end ()
+  };
+  struct TALER_EXCHANGE_Keys *keys;
+  enum TALER_EXCHANGE_VersionCompatibility compat;
+
+  if (NULL == j)
+    return NULL;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return NULL;
+  }
+  if (0 != version)
+  {
+    return NULL; /* unsupported version */
+  }
+  keys = GNUNET_new (struct TALER_EXCHANGE_Keys);
+  if (GNUNET_OK !=
+      decode_keys_json (jkeys,
+                        false,
+                        keys,
+                        &compat))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  keys->rc = 1;
+  keys->key_data_expiration = expire;
+  keys->exchange_url = GNUNET_strdup (url);
+  return keys;
+}
+
+
+/**
+ * Data we track per denomination group.
+ */
+struct GroupData
+{
+  /**
+   * The json blob with the group meta-data and list of denominations
+   */
+  json_t *json;
+
+  /**
+   * Meta data for this group.
+   */
+  struct TALER_DenominationGroup meta;
+};
+
+
+/**
+ * Add denomination group represented by @a value
+ * to list of denominations in @a cls. Also frees
+ * the @a value.
+ *
+ * @param[in,out] cls a `json_t *` with an array to build
+ * @param key unused
+ * @param value a `struct GroupData *`
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static enum GNUNET_GenericReturnValue
+add_grp (void *cls,
+         const struct GNUNET_HashCode *key,
+         void *value)
+{
+  json_t *denominations_by_group = cls;
+  struct GroupData *gd = value;
+  const char *cipher;
+  json_t *ge;
+  bool age_restricted = gd->meta.age_mask.bits != 0;
+
+  (void) key;
+  switch (gd->meta.cipher)
+  {
+  case GNUNET_CRYPTO_BSA_RSA:
+    cipher = age_restricted ? "RSA+age_restricted" : "RSA";
+    break;
+  case GNUNET_CRYPTO_BSA_CS:
+    cipher = age_restricted ? "CS+age_restricted" : "CS";
+    break;
+  default:
+    GNUNET_assert (false);
+  }
+
+  ge = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("cipher",
+                             cipher),
+    GNUNET_JSON_pack_array_steal ("denoms",
+                                  gd->json),
+    TALER_JSON_PACK_DENOM_FEES ("fee",
+                                &gd->meta.fees),
+    GNUNET_JSON_pack_allow_null (
+      age_restricted
+          ? GNUNET_JSON_pack_uint64 ("age_mask",
+                                     gd->meta.age_mask.bits)
+          : GNUNET_JSON_pack_string ("dummy",
+                                     NULL)),
+    TALER_JSON_pack_amount ("value",
+                            &gd->meta.value));
+  GNUNET_assert (0 ==
+                 json_array_append_new (denominations_by_group,
+                                        ge));
+  GNUNET_free (gd);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Convert array of account restrictions @a ars to JSON.
+ *
+ * @param ar_len length of @a ars
+ * @param ars account restrictions to convert
+ * @return JSON representation
+ */
+static json_t *
+ar_to_json (unsigned int ar_len,
+            const struct TALER_EXCHANGE_AccountRestriction ars[static ar_len])
 {
-  (void) TALER_EXCHANGE_check_keys_current (exchange,
-                                            TALER_EXCHANGE_CKF_NONE);
-  return &exchange->key_data;
+  json_t *rval;
+
+  rval = json_array ();
+  GNUNET_assert (NULL != rval);
+  for (unsigned int i = 0; i<ar_len; i++)
+  {
+    const struct TALER_EXCHANGE_AccountRestriction *ar = &ars[i];
+
+    switch (ar->type)
+    {
+    case TALER_EXCHANGE_AR_INVALID:
+      GNUNET_break (0);
+      json_decref (rval);
+      return NULL;
+    case TALER_EXCHANGE_AR_DENY:
+      GNUNET_assert (
+        0 ==
+        json_array_append_new (
+          rval,
+          GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_string ("type",
+                                     "deny"))));
+      break;
+    case TALER_EXCHANGE_AR_REGEX:
+      GNUNET_assert (
+        0 ==
+        json_array_append_new (
+          rval,
+          GNUNET_JSON_PACK (
+            GNUNET_JSON_pack_string (
+              "type",
+              "regex"),
+            GNUNET_JSON_pack_string (
+              "payto_regex",
+              ar->details.regex.posix_egrep),
+            GNUNET_JSON_pack_string (
+              "human_hint",
+              ar->details.regex.human_hint),
+            GNUNET_JSON_pack_object_incref (
+              "human_hint_i18n",
+              (json_t *) ar->details.regex.human_hint_i18n)
+            )));
+      break;
+    }
+  }
+  return rval;
 }
 
 
 json_t *
-TALER_EXCHANGE_get_keys_raw (struct TALER_EXCHANGE_Handle *exchange)
+TALER_EXCHANGE_keys_to_json (const struct TALER_EXCHANGE_Keys *kd)
 {
-  (void) TALER_EXCHANGE_check_keys_current (exchange,
-                                            TALER_EXCHANGE_CKF_NONE);
-  return json_deep_copy (exchange->key_data_raw);
+  struct GNUNET_TIME_Timestamp now;
+  json_t *keys;
+  json_t *signkeys;
+  json_t *denominations_by_group;
+  json_t *auditors;
+  json_t *recoup;
+  json_t *wire_fees;
+  json_t *accounts;
+  json_t *global_fees;
+  json_t *wblwk = NULL;
+
+  now = GNUNET_TIME_timestamp_get ();
+  signkeys = json_array ();
+  GNUNET_assert (NULL != signkeys);
+  for (unsigned int i = 0; i<kd->num_sign_keys; i++)
+  {
+    const struct TALER_EXCHANGE_SigningPublicKey *sk = &kd->sign_keys[i];
+    json_t *signkey;
+
+    if (GNUNET_TIME_timestamp_cmp (now,
+                                   >,
+                                   sk->valid_until))
+      continue; /* skip keys that have expired */
+    signkey = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_data_auto ("key",
+                                  &sk->key),
+      GNUNET_JSON_pack_data_auto ("master_sig",
+                                  &sk->master_sig),
+      GNUNET_JSON_pack_timestamp ("stamp_start",
+                                  sk->valid_from),
+      GNUNET_JSON_pack_timestamp ("stamp_expire",
+                                  sk->valid_until),
+      GNUNET_JSON_pack_timestamp ("stamp_end",
+                                  sk->valid_legal));
+    GNUNET_assert (NULL != signkey);
+    GNUNET_assert (0 ==
+                   json_array_append_new (signkeys,
+                                          signkey));
+  }
+
+  denominations_by_group = json_array ();
+  GNUNET_assert (NULL != denominations_by_group);
+  {
+    struct GNUNET_CONTAINER_MultiHashMap *dbg;
+
+    dbg = GNUNET_CONTAINER_multihashmap_create (128,
+                                                false);
+    for (unsigned int i = 0; i<kd->num_denom_keys; i++)
+    {
+      const struct TALER_EXCHANGE_DenomPublicKey *dk = &kd->denom_keys[i];
+      struct TALER_DenominationGroup meta = {
+        .cipher = dk->key.bsign_pub_key->cipher,
+        .value = dk->value,
+        .fees = dk->fees,
+        .age_mask = dk->key.age_mask
+      };
+      struct GNUNET_HashCode key;
+      struct GroupData *gd;
+      json_t *denom;
+      struct GNUNET_JSON_PackSpec key_spec;
+
+      if (GNUNET_TIME_timestamp_cmp (now,
+                                     >,
+                                     dk->expire_deposit))
+        continue; /* skip keys that have expired */
+      TALER_denomination_group_get_key (&meta,
+                                        &key);
+      gd = GNUNET_CONTAINER_multihashmap_get (dbg,
+                                              &key);
+      if (NULL == gd)
+      {
+        gd = GNUNET_new (struct GroupData);
+        gd->meta = meta;
+        gd->json = json_array ();
+        GNUNET_assert (NULL != gd->json);
+        GNUNET_assert (
+          GNUNET_OK ==
+          GNUNET_CONTAINER_multihashmap_put (dbg,
+                                             &key,
+                                             gd,
+                                             GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+
+      }
+      switch (meta.cipher)
+      {
+      case GNUNET_CRYPTO_BSA_RSA:
+        key_spec =
+          GNUNET_JSON_pack_rsa_public_key (
+            "rsa_pub",
+            dk->key.bsign_pub_key->details.rsa_public_key);
+        break;
+      case GNUNET_CRYPTO_BSA_CS:
+        key_spec =
+          GNUNET_JSON_pack_data_varsize (
+            "cs_pub",
+            &dk->key.bsign_pub_key->details.cs_public_key,
+            sizeof (dk->key.bsign_pub_key->details.cs_public_key));
+        break;
+      default:
+        GNUNET_assert (false);
+      }
+      denom = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_timestamp ("stamp_expire_deposit",
+                                    dk->expire_deposit),
+        GNUNET_JSON_pack_timestamp ("stamp_expire_withdraw",
+                                    dk->withdraw_valid_until),
+        GNUNET_JSON_pack_timestamp ("stamp_start",
+                                    dk->valid_from),
+        GNUNET_JSON_pack_timestamp ("stamp_expire_legal",
+                                    dk->expire_legal),
+        GNUNET_JSON_pack_data_auto ("master_sig",
+                                    &dk->master_sig),
+        key_spec
+        );
+      GNUNET_assert (0 ==
+                     json_array_append_new (gd->json,
+                                            denom));
+    }
+    GNUNET_CONTAINER_multihashmap_iterate (dbg,
+                                           &add_grp,
+                                           denominations_by_group);
+    GNUNET_CONTAINER_multihashmap_destroy (dbg);
+  }
+
+  auditors = json_array ();
+  GNUNET_assert (NULL != auditors);
+  for (unsigned int i = 0; i<kd->num_auditors; i++)
+  {
+    const struct TALER_EXCHANGE_AuditorInformation *ai = &kd->auditors[i];
+    json_t *a;
+    json_t *adenoms;
+
+    adenoms = json_array ();
+    GNUNET_assert (NULL != adenoms);
+    for (unsigned int j = 0; j<ai->num_denom_keys; j++)
+    {
+      const struct TALER_EXCHANGE_AuditorDenominationInfo *adi =
+        &ai->denom_keys[j];
+      const struct TALER_EXCHANGE_DenomPublicKey *dk =
+        &kd->denom_keys[adi->denom_key_offset];
+      json_t *k;
+
+      GNUNET_assert (adi->denom_key_offset < kd->num_denom_keys);
+      if (GNUNET_TIME_timestamp_cmp (now,
+                                     >,
+                                     dk->expire_deposit))
+        continue; /* skip auditor signatures for denomination keys that have expired */
+      GNUNET_assert (adi->denom_key_offset < kd->num_denom_keys);
+      k = GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_data_auto ("denom_pub_h",
+                                    &dk->h_key),
+        GNUNET_JSON_pack_data_auto ("auditor_sig",
+                                    &adi->auditor_sig));
+      GNUNET_assert (0 ==
+                     json_array_append_new (adenoms,
+                                            k));
+    }
+
+    a = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_data_auto ("auditor_pub",
+                                  &ai->auditor_pub),
+      GNUNET_JSON_pack_string ("auditor_url",
+                               ai->auditor_url),
+      GNUNET_JSON_pack_array_steal ("denomination_keys",
+                                    adenoms));
+    GNUNET_assert (0 ==
+                   json_array_append_new (auditors,
+                                          a));
+  }
+
+  global_fees = json_array ();
+  GNUNET_assert (NULL != global_fees);
+  for (unsigned int i = 0; i<kd->num_global_fees; i++)
+  {
+    const struct TALER_EXCHANGE_GlobalFee *gf
+      = &kd->global_fees[i];
+
+    if (GNUNET_TIME_absolute_is_past (gf->end_date.abs_time))
+      continue;
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        global_fees,
+        GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_timestamp ("start_date",
+                                      gf->start_date),
+          GNUNET_JSON_pack_timestamp ("end_date",
+                                      gf->end_date),
+          TALER_JSON_PACK_GLOBAL_FEES (&gf->fees),
+          GNUNET_JSON_pack_time_rel ("history_expiration",
+                                     gf->history_expiration),
+          GNUNET_JSON_pack_time_rel ("purse_timeout",
+                                     gf->purse_timeout),
+          GNUNET_JSON_pack_uint64 ("purse_account_limit",
+                                   gf->purse_account_limit),
+          GNUNET_JSON_pack_data_auto ("master_sig",
+                                      &gf->master_sig))));
+  }
+
+  accounts = json_array ();
+  GNUNET_assert (NULL != accounts);
+  for (unsigned int i = 0; i<kd->accounts_len; i++)
+  {
+    const struct TALER_EXCHANGE_WireAccount *acc
+      = &kd->accounts[i];
+    json_t *credit_restrictions;
+    json_t *debit_restrictions;
+
+    credit_restrictions
+      = ar_to_json (acc->credit_restrictions_length,
+                    acc->credit_restrictions);
+    GNUNET_assert (NULL != credit_restrictions);
+    debit_restrictions
+      = ar_to_json (acc->debit_restrictions_length,
+                    acc->debit_restrictions);
+    GNUNET_assert (NULL != debit_restrictions);
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        accounts,
+        GNUNET_JSON_PACK (
+          GNUNET_JSON_pack_string ("payto_uri",
+                                   acc->payto_uri),
+          GNUNET_JSON_pack_allow_null (
+            GNUNET_JSON_pack_string ("conversion_url",
+                                     acc->conversion_url)),
+          GNUNET_JSON_pack_int64 ("priority",
+                                  acc->priority),
+          GNUNET_JSON_pack_allow_null (
+            GNUNET_JSON_pack_string ("bank_label",
+                                     acc->bank_label)),
+          GNUNET_JSON_pack_array_steal ("debit_restrictions",
+                                        debit_restrictions),
+          GNUNET_JSON_pack_array_steal ("credit_restrictions",
+                                        credit_restrictions),
+          GNUNET_JSON_pack_data_auto ("master_sig",
+                                      &acc->master_sig))));
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Serialized %u/%u wire accounts to JSON\n",
+              (unsigned int) json_array_size (accounts),
+              kd->accounts_len);
+
+  wire_fees = json_object ();
+  GNUNET_assert (NULL != wire_fees);
+  for (unsigned int i = 0; i<kd->fees_len; i++)
+  {
+    const struct TALER_EXCHANGE_WireFeesByMethod *fbw
+      = &kd->fees[i];
+    json_t *wf;
+
+    wf = json_array ();
+    GNUNET_assert (NULL != wf);
+    for (struct TALER_EXCHANGE_WireAggregateFees *p = fbw->fees_head;
+         NULL != p;
+         p = p->next)
+    {
+      GNUNET_assert (
+        0 ==
+        json_array_append_new (
+          wf,
+          GNUNET_JSON_PACK (
+            TALER_JSON_pack_amount ("wire_fee",
+                                    &p->fees.wire),
+            TALER_JSON_pack_amount ("closing_fee",
+                                    &p->fees.closing),
+            GNUNET_JSON_pack_timestamp ("start_date",
+                                        p->start_date),
+            GNUNET_JSON_pack_timestamp ("end_date",
+                                        p->end_date),
+            GNUNET_JSON_pack_data_auto ("sig",
+                                        &p->master_sig))));
+    }
+    GNUNET_assert (0 ==
+                   json_object_set_new (wire_fees,
+                                        fbw->method,
+                                        wf));
+  }
+
+  recoup = json_array ();
+  GNUNET_assert (NULL != recoup);
+  for (unsigned int i = 0; i<kd->num_denom_keys; i++)
+  {
+    const struct TALER_EXCHANGE_DenomPublicKey *dk
+      = &kd->denom_keys[i];
+    if (! dk->revoked)
+      continue;
+    GNUNET_assert (0 ==
+                   json_array_append_new (
+                     recoup,
+                     GNUNET_JSON_PACK (
+                       GNUNET_JSON_pack_data_auto ("h_denom_pub",
+                                                   &dk->h_key))));
+  }
+
+  wblwk = json_array ();
+  GNUNET_assert (NULL != wblwk);
+  for (unsigned int i = 0; i<kd->wblwk_length; i++)
+  {
+    const struct TALER_Amount *a = &kd->wallet_balance_limit_without_kyc[i];
+
+    GNUNET_assert (0 ==
+                   json_array_append_new (
+                     wblwk,
+                     TALER_JSON_from_amount (a)));
+  }
+
+  keys = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("version",
+                             kd->version),
+    GNUNET_JSON_pack_string ("currency",
+                             kd->currency),
+    GNUNET_JSON_pack_object_steal ("currency_specification",
+                                   TALER_CONFIG_currency_specs_to_json (
+                                     &kd->cspec)),
+    TALER_JSON_pack_amount ("stefan_abs",
+                            &kd->stefan_abs),
+    TALER_JSON_pack_amount ("stefan_log",
+                            &kd->stefan_log),
+    GNUNET_JSON_pack_double ("stefan_lin",
+                             kd->stefan_lin),
+    GNUNET_JSON_pack_string ("asset_type",
+                             kd->asset_type),
+    GNUNET_JSON_pack_data_auto ("master_public_key",
+                                &kd->master_pub),
+    GNUNET_JSON_pack_time_rel ("reserve_closing_delay",
+                               kd->reserve_closing_delay),
+    GNUNET_JSON_pack_timestamp ("list_issue_date",
+                                kd->list_issue_date),
+    GNUNET_JSON_pack_array_steal ("global_fees",
+                                  global_fees),
+    GNUNET_JSON_pack_array_steal ("signkeys",
+                                  signkeys),
+    GNUNET_JSON_pack_object_steal ("wire_fees",
+                                   wire_fees),
+    GNUNET_JSON_pack_array_steal ("accounts",
+                                  accounts),
+    GNUNET_JSON_pack_array_steal ("wads",
+                                  json_array ()),
+    GNUNET_JSON_pack_array_steal ("denominations",
+                                  denominations_by_group),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_array_steal ("recoup",
+                                    recoup)),
+    GNUNET_JSON_pack_array_steal ("auditors",
+                                  auditors),
+    GNUNET_JSON_pack_bool ("rewards_allowed",
+                           kd->rewards_allowed),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_object_incref ("extensions",
+                                      kd->extensions)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_is_zero (&kd->extensions_sig)
+      ? GNUNET_JSON_pack_string ("dummy",
+                                 NULL)
+      : GNUNET_JSON_pack_data_auto ("extensions_sig",
+                                    &kd->extensions_sig)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_array_steal ("wallet_balance_limit_without_kyc",
+                                    wblwk))
+
+    );
+  return GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_uint64 ("version",
+                             EXCHANGE_SERIALIZATION_FORMAT_VERSION),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_timestamp ("expire",
+                                  kd->key_data_expiration)),
+    GNUNET_JSON_pack_string ("exchange_url",
+                             kd->exchange_url),
+    GNUNET_JSON_pack_object_steal ("keys",
+                                   keys));
 }
 
 
diff --git a/src/lib/exchange_api_handle.h b/src/lib/exchange_api_handle.h
index 569c723c4..7c01b9a9f 100644
--- a/src/lib/exchange_api_handle.h
+++ b/src/lib/exchange_api_handle.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015 Taler Systems SA
+  Copyright (C) 2014, 2015, 2023 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
@@ -19,183 +19,29 @@
  * @brief Internal interface to the handle part of the exchange's HTTP API
  * @author Christian Grothoff
  */
-#include "platform.h"
+#ifndef EXCHANGE_API_HANDLE_H
+#define EXCHANGE_API_HANDLE_H
+
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_auditor_service.h"
 #include "taler_exchange_service.h"
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_curl_lib.h"
 
-/**
- * Entry in DLL of auditors used by an exchange.
- */
-struct TEAH_AuditorListEntry;
-
-
-/**
- * Entry in list of ongoing interactions with an auditor.
- */
-struct TEAH_AuditorInteractionEntry
-{
-  /**
-   * DLL entry.
-   */
-  struct TEAH_AuditorInteractionEntry *next;
-
-  /**
-   * DLL entry.
-   */
-  struct TEAH_AuditorInteractionEntry *prev;
-
-  /**
-   * Which auditor is this action associated with?
-   */
-  struct TEAH_AuditorListEntry *ale;
-
-  /**
-   * Interaction state.
-   */
-  struct TALER_AUDITOR_DepositConfirmationHandle *dch;
-};
-
-/**
- * Stages of initialization for the `struct TALER_EXCHANGE_Handle`
- */
-enum ExchangeHandleState
-{
-  /**
-   * Just allocated.
-   */
-  MHS_INIT = 0,
-
-  /**
-   * Obtained the exchange's certification data and keys.
-   */
-  MHS_CERT = 1,
-
-  /**
-   * Failed to initialize (fatal).
-   */
-  MHS_FAILED = 2
-};
-
-
-/**
- * Handle to the exchange
- */
-struct TALER_EXCHANGE_Handle
-{
-  /**
-   * The context of this handle
-   */
-  struct GNUNET_CURL_Context *ctx;
-
-  /**
-   * The URL of the exchange (i.e. "http://exchange.taler.net/")
-   */
-  char *url;
-
-  /**
-   * Function to call with the exchange's certification data,
-   * NULL if this has already been done.
-   */
-  TALER_EXCHANGE_CertificationCallback cert_cb;
-
-  /**
-   * Closure to pass to @e cert_cb.
-   */
-  void *cert_cb_cls;
-
-  /**
-   * Data for the request to get the /keys of a exchange,
-   * NULL once we are past stage #MHS_INIT.
-   */
-  struct KeysRequest *kr;
-
-  /**
-   * Task for retrying /keys request.
-   */
-  struct GNUNET_SCHEDULER_Task *retry_task;
-
-  /**
-   * Raw key data of the exchange, only valid if
-   * @e handshake_complete is past stage #MHS_CERT.
-   */
-  json_t *key_data_raw;
-
-  /**
-   * Head of DLL of auditors of this exchange.
-   */
-  struct TEAH_AuditorListEntry *auditors_head;
-
-  /**
-   * Tail of DLL of auditors of this exchange.
-   */
-  struct TEAH_AuditorListEntry *auditors_tail;
-
-  /**
-   * Key data of the exchange, only valid if
-   * @e handshake_complete is past stage #MHS_CERT.
-   */
-  struct TALER_EXCHANGE_Keys key_data;
-
-  /**
-   * Retry /keys frequency.
-   */
-  struct GNUNET_TIME_Relative retry_delay;
-
-  /**
-   * When does @e key_data expire?
-   */
-  struct GNUNET_TIME_Timestamp key_data_expiration;
-
-  /**
-   * Number of subsequent failed requests to /keys.
-   *
-   * Used to compute the CURL timeout for the request.
-   */
-  unsigned int keys_error_count;
-
-  /**
-   * Number of subsequent failed requests to /wire.
-   *
-   * Used to compute the CURL timeout for the request.
-   */
-  unsigned int wire_error_count;
-
-  /**
-   * Stage of the exchange's initialization routines.
-   */
-  enum ExchangeHandleState state;
-
-};
-
 
 /**
  * Function called for each auditor to give us a chance to possibly
  * launch a deposit confirmation interaction.
  *
  * @param cls closure
- * @param ah handle to the auditor
+ * @param auditor_url base URL of the auditor
  * @param auditor_pub public key of the auditor
- * @return NULL if no deposit confirmation interaction was launched
  */
-typedef struct TEAH_AuditorInteractionEntry *
-(*TEAH_AuditorCallback)(void *cls,
-                        struct TALER_AUDITOR_Handle *ah,
-                        const struct TALER_AuditorPublicKeyP *auditor_pub);
-
-
-/**
- * Signature of functions called with the result from our call to the
- * auditor's /deposit-confirmation handler.
- *
- * @param cls closure of type `struct TEAH_AuditorInteractionEntry *`
- * @param hr HTTP response
- */
-void
-TEAH_acc_confirmation_cb (void *cls,
-                          const struct TALER_AUDITOR_HttpResponse *hr);
+typedef void
+(*TEAH_AuditorCallback)(
+  void *cls,
+  const char *auditor_url,
+  const struct TALER_AuditorPublicKeyP *auditor_pub);
 
 
 /**
@@ -203,54 +49,16 @@ TEAH_acc_confirmation_cb (void *cls,
  * @a ac and giving it a chance to start a deposit
  * confirmation interaction.
  *
- * @param h exchange to go over auditors for
+ * @param keys the keys to go over auditors for
  * @param ac function to call per auditor
  * @param ac_cls closure for @a ac
  */
 void
-TEAH_get_auditors_for_dc (struct TALER_EXCHANGE_Handle *h,
-                          TEAH_AuditorCallback ac,
-                          void *ac_cls);
-
+TEAH_get_auditors_for_dc (
+  struct TALER_EXCHANGE_Keys *keys,
+  TEAH_AuditorCallback ac,
+  void *ac_cls);
 
-/**
- * Get the context of a exchange.
- *
- * @param h the exchange handle to query
- * @return ctx context to execute jobs in
- */
-struct GNUNET_CURL_Context *
-TEAH_handle_to_context (struct TALER_EXCHANGE_Handle *h);
-
-
-/**
- * Check if the handle is ready to process requests.
- *
- * @param h the exchange handle to query
- * @return #GNUNET_YES if we are ready, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-TEAH_handle_is_ready (struct TALER_EXCHANGE_Handle *h);
-
-/**
- * Check if the handle is ready to process requests.
- *
- * @param h the exchange handle to query
- * @return #GNUNET_YES if we are ready, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-TEAH_handle_is_ready (struct TALER_EXCHANGE_Handle *h);
-
-
-/**
- * Obtain the URL to use for an API request.
- *
- * @param h the exchange handle to query
- * @param path Taler API path (i.e. "/reserve/withdraw")
- * @return the full URL to use with cURL
- */
-char *
-TEAH_path_to_url (struct TALER_EXCHANGE_Handle *h,
-                  const char *path);
 
 /* end of exchange_api_handle.h */
+#endif
diff --git a/src/lib/exchange_api_kyc_check.c b/src/lib/exchange_api_kyc_check.c
index 62a1db582..5d3b3792b 100644
--- a/src/lib/exchange_api_kyc_check.c
+++ b/src/lib/exchange_api_kyc_check.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021-2023 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
@@ -37,14 +37,14 @@ struct TALER_EXCHANGE_KycCheckHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The url for this request.
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  char *url;
 
   /**
-   * The url for this request.
+   * Keys of the exchange.
    */
-  char *url;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * Handle for the request.
@@ -65,6 +65,7 @@ struct TALER_EXCHANGE_KycCheckHandle
    * Hash of the payto:// URL that is being KYC'ed.
    */
   struct TALER_PaytoHashP h_payto;
+
 };
 
 
@@ -95,16 +96,20 @@ handle_kyc_check_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     {
+      const json_t *kyc_details;
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &ks.details.kyc_ok.exchange_sig),
+                                     &ks.details.ok.exchange_sig),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &ks.details.kyc_ok.exchange_pub),
+                                     &ks.details.ok.exchange_pub),
         GNUNET_JSON_spec_timestamp ("now",
-                                    &ks.details.kyc_ok.timestamp),
+                                    &ks.details.ok.timestamp),
+        GNUNET_JSON_spec_object_const ("kyc_details",
+                                       &kyc_details),
+        TALER_JSON_spec_aml_decision ("aml_status",
+                                      &ks.details.ok.aml_status),
         GNUNET_JSON_spec_end ()
       };
-      const struct TALER_EXCHANGE_Keys *key_state;
 
       if (GNUNET_OK !=
           GNUNET_JSON_parse (j,
@@ -116,10 +121,10 @@ handle_kyc_check_finished (void *cls,
         ks.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
         break;
       }
-      key_state = TALER_EXCHANGE_get_keys (kch->exchange);
+      ks.details.ok.kyc_details = kyc_details;
       if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
-                                           &ks.details.kyc_ok.exchange_pub))
+          TALER_EXCHANGE_test_signing_key (kch->keys,
+                                           &ks.details.ok.exchange_pub))
       {
         GNUNET_break_op (0);
         ks.http_status = 0;
@@ -131,9 +136,10 @@ handle_kyc_check_finished (void *cls,
       if (GNUNET_OK !=
           TALER_exchange_online_account_setup_success_verify (
             &kch->h_payto,
-            ks.details.kyc_ok.timestamp,
-            &ks.details.kyc_ok.exchange_pub,
-            &ks.details.kyc_ok.exchange_sig))
+            ks.details.ok.kyc_details,
+            ks.details.ok.timestamp,
+            &ks.details.ok.exchange_pub,
+            &ks.details.ok.exchange_sig))
       {
         GNUNET_break_op (0);
         ks.http_status = 0;
@@ -150,8 +156,10 @@ handle_kyc_check_finished (void *cls,
   case MHD_HTTP_ACCEPTED:
     {
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_string ("kyc_url",
-                                 &ks.details.kyc_url),
+        TALER_JSON_spec_web_url ("kyc_url",
+                                 &ks.details.accepted.kyc_url),
+        TALER_JSON_spec_aml_decision ("aml_status",
+                                      &ks.details.accepted.aml_status),
         GNUNET_JSON_spec_end ()
       };
 
@@ -184,6 +192,31 @@ handle_kyc_check_finished (void *cls,
   case MHD_HTTP_NOT_FOUND:
     ks.ec = TALER_JSON_get_error_code (j);
     break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        TALER_JSON_spec_aml_decision (
+          "aml_status",
+          &ks.details.unavailable_for_legal_reasons.aml_status),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        ks.http_status = 0;
+        ks.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+        break;
+      }
+      kch->cb (kch->cb_cls,
+               &ks);
+      GNUNET_JSON_parse_free (spec);
+      TALER_EXCHANGE_kyc_check_cancel (kch);
+      return;
+    }
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     ks.ec = TALER_JSON_get_error_code (j);
     /* Server had an internal issue; we should retry, but this API
@@ -206,24 +239,21 @@ handle_kyc_check_finished (void *cls,
 
 
 struct TALER_EXCHANGE_KycCheckHandle *
-TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *exchange,
-                          uint64_t payment_target,
-                          const struct TALER_PaytoHashP *h_payto,
-                          struct GNUNET_TIME_Relative timeout,
-                          TALER_EXCHANGE_KycStatusCallback cb,
-                          void *cb_cls)
+TALER_EXCHANGE_kyc_check (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  uint64_t requirement_row,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_KYCLOGIC_KycUserType ut,
+  struct GNUNET_TIME_Relative timeout,
+  TALER_EXCHANGE_KycStatusCallback cb,
+  void *cb_cls)
 {
   struct TALER_EXCHANGE_KycCheckHandle *kch;
   CURL *eh;
-  struct GNUNET_CURL_Context *ctx;
   char *arg_str;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   {
     char payto_str[sizeof (*h_payto) * 2];
     char *end;
@@ -238,18 +268,19 @@ TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *exchange,
     timeout_ms = timeout.rel_value_us
                  / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
     GNUNET_asprintf (&arg_str,
-                     "/kyc-check/%llu?h_payto=%s&timeout_ms=%llu",
-                     (unsigned long long) payment_target,
+                     "kyc-check/%llu/%s/%s?timeout_ms=%llu",
+                     (unsigned long long) requirement_row,
                      payto_str,
+                     TALER_KYCLOGIC_kyc_user_type2s (ut),
                      timeout_ms);
   }
   kch = GNUNET_new (struct TALER_EXCHANGE_KycCheckHandle);
-  kch->exchange = exchange;
   kch->h_payto = *h_payto;
   kch->cb = cb;
   kch->cb_cls = cb_cls;
-  kch->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  kch->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   GNUNET_free (arg_str);
   if (NULL == kch->url)
   {
@@ -264,7 +295,7 @@ TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *exchange,
     GNUNET_free (kch);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
+  kch->keys = TALER_EXCHANGE_keys_incref (keys);
   kch->job = GNUNET_CURL_job_add_with_ct_json (ctx,
                                                eh,
                                                &handle_kyc_check_finished,
@@ -281,6 +312,7 @@ TALER_EXCHANGE_kyc_check_cancel (struct TALER_EXCHANGE_KycCheckHandle *kch)
     GNUNET_CURL_job_cancel (kch->job);
     kch->job = NULL;
   }
+  TALER_EXCHANGE_keys_decref (kch->keys);
   GNUNET_free (kch->url);
   GNUNET_free (kch);
 }
diff --git a/src/lib/exchange_api_kyc_proof.c b/src/lib/exchange_api_kyc_proof.c
index d3debbdb9..e7cc9c4cf 100644
--- a/src/lib/exchange_api_kyc_proof.c
+++ b/src/lib/exchange_api_kyc_proof.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021, 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
@@ -37,11 +37,6 @@ struct TALER_EXCHANGE_KycProofHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -140,24 +135,22 @@ handle_kyc_proof_finished (void *cls,
 
 
 struct TALER_EXCHANGE_KycProofHandle *
-TALER_EXCHANGE_kyc_proof (struct TALER_EXCHANGE_Handle *exchange,
-                          const struct TALER_PaytoHashP *h_payto,
-                          const char *code,
-                          const char *state,
-                          TALER_EXCHANGE_KycProofCallback cb,
-                          void *cb_cls)
+TALER_EXCHANGE_kyc_proof (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_PaytoHashP *h_payto,
+  const char *logic,
+  const char *args,
+  TALER_EXCHANGE_KycProofCallback cb,
+  void *cb_cls)
 {
   struct TALER_EXCHANGE_KycProofHandle *kph;
-  struct GNUNET_CURL_Context *ctx;
   char *arg_str;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  /* TODO: any escaping of code/state needed??? */
+  if (NULL == args)
+    args = "";
+  else
+    GNUNET_assert (args[0] == '&');
   {
     char hstr[sizeof (struct TALER_PaytoHashP) * 2];
     char *end;
@@ -168,17 +161,17 @@ TALER_EXCHANGE_kyc_proof (struct TALER_EXCHANGE_Handle *exchange,
                                          sizeof (hstr));
     *end = '\0';
     GNUNET_asprintf (&arg_str,
-                     "/kyc-proof/%s?code=%s&state=%s",
+                     "kyc-proof/%s?state=%s%s",
+                     logic,
                      hstr,
-                     code,
-                     state);
+                     args);
   }
   kph = GNUNET_new (struct TALER_EXCHANGE_KycProofHandle);
-  kph->exchange = exchange;
   kph->cb = cb;
   kph->cb_cls = cb_cls;
-  kph->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  kph->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   GNUNET_free (arg_str);
   if (NULL == kph->url)
   {
@@ -199,7 +192,6 @@ TALER_EXCHANGE_kyc_proof (struct TALER_EXCHANGE_Handle *exchange,
                  curl_easy_setopt (kph->eh,
                                    CURLOPT_FOLLOWLOCATION,
                                    0L));
-  ctx = TEAH_handle_to_context (exchange);
   kph->job = GNUNET_CURL_job_add_raw (ctx,
                                       kph->eh,
                                       NULL,
diff --git a/src/lib/exchange_api_kyc_wallet.c b/src/lib/exchange_api_kyc_wallet.c
index fe5e6b702..7197694ae 100644
--- a/src/lib/exchange_api_kyc_wallet.c
+++ b/src/lib/exchange_api_kyc_wallet.c
@@ -43,11 +43,6 @@ struct TALER_EXCHANGE_KycWalletHandle
   struct TALER_CURL_PostContext ctx;
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -95,11 +90,28 @@ handle_kyc_wallet_finished (void *cls,
   case 0:
     ks.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
-  case MHD_HTTP_OK:
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    ks.ec = TALER_JSON_get_error_code (j);
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    ks.ec = TALER_JSON_get_error_code (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    ks.ec = TALER_JSON_get_error_code (j);
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
     {
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_uint64 ("payment_target_uuid",
-                                 &ks.payment_target_uuid),
+        GNUNET_JSON_spec_fixed_auto (
+          "h_payto",
+          &ks.details.unavailable_for_legal_reasons.h_payto),
+        GNUNET_JSON_spec_uint64 (
+          "requirement_row",
+          &ks.details.unavailable_for_legal_reasons.requirement_row),
         GNUNET_JSON_spec_end ()
       };
 
@@ -115,19 +127,6 @@ handle_kyc_wallet_finished (void *cls,
       }
       break;
     }
-  case MHD_HTTP_NO_CONTENT:
-    break;
-  case MHD_HTTP_BAD_REQUEST:
-    ks.ec = TALER_JSON_get_error_code (j);
-    /* This should never happen, either us or the exchange is buggy
-       (or API version conflict); just pass JSON reply to the application */
-    break;
-  case MHD_HTTP_FORBIDDEN:
-    ks.ec = TALER_JSON_get_error_code (j);
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    ks.ec = TALER_JSON_get_error_code (j);
-    break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     ks.ec = TALER_JSON_get_error_code (j);
     /* Server had an internal issue; we should retry, but this API
@@ -150,41 +149,45 @@ handle_kyc_wallet_finished (void *cls,
 
 
 struct TALER_EXCHANGE_KycWalletHandle *
-TALER_EXCHANGE_kyc_wallet (struct TALER_EXCHANGE_Handle *exchange,
-                           const struct TALER_ReservePrivateKeyP *reserve_priv,
-                           TALER_EXCHANGE_KycWalletCallback cb,
-                           void *cb_cls)
+TALER_EXCHANGE_kyc_wallet (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *balance,
+  TALER_EXCHANGE_KycWalletCallback cb,
+  void *cb_cls)
 {
   struct TALER_EXCHANGE_KycWalletHandle *kwh;
   CURL *eh;
   json_t *req;
-  struct GNUNET_CURL_Context *ctx;
   struct TALER_ReservePublicKeyP reserve_pub;
   struct TALER_ReserveSignatureP reserve_sig;
 
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                       &reserve_pub.eddsa_pub);
   TALER_wallet_account_setup_sign (reserve_priv,
+                                   balance,
                                    &reserve_sig);
   req = GNUNET_JSON_PACK (
+    TALER_JSON_pack_amount ("balance",
+                            balance),
     GNUNET_JSON_pack_data_auto ("reserve_pub",
                                 &reserve_pub),
     GNUNET_JSON_pack_data_auto ("reserve_sig",
                                 &reserve_sig));
   GNUNET_assert (NULL != req);
   kwh = GNUNET_new (struct TALER_EXCHANGE_KycWalletHandle);
-  kwh->exchange = exchange;
   kwh->cb = cb;
   kwh->cb_cls = cb_cls;
-  kwh->url = TEAH_path_to_url (exchange,
-                               "/kyc-wallet");
+  kwh->url = TALER_url_join (url,
+                             "kyc-wallet",
+                             NULL);
   if (NULL == kwh->url)
   {
     json_decref (req);
     GNUNET_free (kwh);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
   eh = TALER_EXCHANGE_curl_easy_get_ (kwh->url);
   if ( (NULL == eh) ||
        (GNUNET_OK !=
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c
index 9e8625ed5..4b1adc723 100644
--- a/src/lib/exchange_api_link.c
+++ b/src/lib/exchange_api_link.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2021 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -37,11 +37,6 @@ struct TALER_EXCHANGE_LinkHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -94,9 +89,9 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
   struct TALER_BlindedDenominationSignature bsig;
   struct TALER_DenominationPublicKey rpub;
   struct TALER_CoinSpendSignatureP link_sig;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
   struct TALER_ExchangeWithdrawValues alg_values;
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
   bool no_nonce;
   uint32_t coin_idx;
   struct GNUNET_JSON_Specification spec[] = {
@@ -119,6 +114,7 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
   struct TALER_TransferSecretP secret;
   struct TALER_PlanchetDetail pd;
   struct TALER_CoinPubHashP c_hash;
+  struct TALER_AgeCommitmentHash *pah = NULL;
 
   /* parse reply */
   if (GNUNET_OK !=
@@ -142,49 +138,43 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
                                          &alg_values,
                                          &bks);
 
-  lci->age_commitment_proof = NULL;
-  lci->h_age_commitment = NULL;
+  lci->has_age_commitment = false;
 
   /* Derive the age commitment and calculate the hash */
   if (NULL != lh->age_commitment_proof)
   {
-    lci->age_commitment_proof = GNUNET_new (struct TALER_AgeCommitmentProof);
-    lci->h_age_commitment = GNUNET_new (struct TALER_AgeCommitmentHash);
 
     GNUNET_assert (GNUNET_OK ==
                    TALER_age_commitment_derive (
                      lh->age_commitment_proof,
                      &secret.key,
-                     lci->age_commitment_proof));
+                     &lci->age_commitment_proof));
 
     TALER_age_commitment_hash (
-      &(lci->age_commitment_proof->commitment),
-      lci->h_age_commitment);
+      &lci->age_commitment_proof.commitment,
+      &lci->h_age_commitment);
+
+    lci->has_age_commitment = true;
+    pah = &lci->h_age_commitment;
   }
 
   if (GNUNET_OK !=
-      TALER_planchet_prepare (&rpub,
-                              &alg_values,
-                              &bks,
-                              &lci->coin_priv,
-                              lci->h_age_commitment,
-                              &c_hash,
-                              &pd))
+      TALER_planchet_prepare (
+        &rpub,
+        &alg_values,
+        &bks,
+        no_nonce
+        ? NULL
+        : &nonce,
+        &lci->coin_priv,
+        pah,
+        &c_hash,
+        &pd))
   {
     GNUNET_break (0);
     GNUNET_JSON_parse_free (spec);
     return GNUNET_SYSERR;
   }
-  if (TALER_DENOMINATION_CS == alg_values.cipher)
-  {
-    if (no_nonce)
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
-    pd.blinded_planchet.details.cs_blinded_planchet.nonce = nonce;
-  }
   /* extract coin and signature */
   if (GNUNET_OK !=
       TALER_denom_sig_unblind (&lci->sig,
@@ -224,8 +214,8 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
   }
 
   /* clean up */
-  TALER_denom_pub_deep_copy (&lci->pub,
-                             &rpub);
+  TALER_denom_pub_copy (&lci->pub,
+                        &rpub);
   GNUNET_JSON_parse_free (spec);
   return GNUNET_OK;
 }
@@ -270,9 +260,10 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
      whilst 'i' and 'session' track the 2d array. *///
   for (session = 0; session<json_array_size (json); session++)
   {
-    json_t *jsona;
+    const json_t *jsona;
     struct GNUNET_JSON_Specification spec[] = {
-      GNUNET_JSON_spec_json ("new_coins", &jsona),
+      GNUNET_JSON_spec_array_const ("new_coins",
+                                    &jsona),
       GNUNET_JSON_spec_end ()
     };
 
@@ -285,16 +276,8 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
       GNUNET_break_op (0);
       return GNUNET_SYSERR;
     }
-    if (! json_is_array (jsona))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
-
     /* count all coins over all sessions */
     num_coins += json_array_size (jsona);
-    GNUNET_JSON_parse_free (spec);
   }
   /* Now that we know how big the 1d array is, allocate
      and fill it. */
@@ -307,11 +290,11 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
     off_coin = 0;
     for (session = 0; session<json_array_size (json); session++)
     {
-      json_t *jsona;
+      const json_t *jsona;
       struct TALER_TransferPublicKeyP trans_pub;
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_json ("new_coins",
-                               &jsona),
+        GNUNET_JSON_spec_array_const ("new_coins",
+                                      &jsona),
         GNUNET_JSON_spec_fixed_auto ("transfer_pub",
                                      &trans_pub),
         GNUNET_JSON_spec_end ()
@@ -326,12 +309,6 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
         GNUNET_break_op (0);
         return GNUNET_SYSERR;
       }
-      if (! json_is_array (jsona))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
 
       /* decode all coins */
       for (i = 0; i<json_array_size (jsona); i++)
@@ -357,16 +334,14 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
       {
         GNUNET_break_op (0);
         ret = GNUNET_SYSERR;
-        GNUNET_JSON_parse_free (spec);
         break;
       }
-      GNUNET_JSON_parse_free (spec);
     } /* end of for (session) */
 
     if (off_coin == num_coins)
     {
-      lr.details.success.num_coins = num_coins;
-      lr.details.success.coins = lcis;
+      lr.details.ok.num_coins = num_coins;
+      lr.details.ok.coins = lcis;
       lh->link_cb (lh->link_cb_cls,
                    &lr);
       lh->link_cb = NULL;
@@ -384,6 +359,8 @@ parse_link_ok (struct TALER_EXCHANGE_LinkHandle *lh,
     {
       TALER_denom_sig_free (&lcis[i].sig);
       TALER_denom_pub_free (&lcis[i].pub);
+      if (lcis[i].has_age_commitment)
+        TALER_age_commitment_proof_free (&lcis[i].age_commitment_proof);
     }
   }
   return ret;
@@ -466,26 +443,19 @@ handle_link_finished (void *cls,
 
 
 struct TALER_EXCHANGE_LinkHandle *
-TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange,
-                     const struct TALER_CoinSpendPrivateKeyP *coin_priv,
-                     const struct
-                     TALER_AgeCommitmentProof *age_commitment_proof,
-                     TALER_EXCHANGE_LinkCallback link_cb,
-                     void *link_cb_cls)
+TALER_EXCHANGE_link (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  const struct TALER_AgeCommitmentProof *age_commitment_proof,
+  TALER_EXCHANGE_LinkCallback link_cb,
+  void *link_cb_cls)
 {
   struct TALER_EXCHANGE_LinkHandle *lh;
   CURL *eh;
-  struct GNUNET_CURL_Context *ctx;
   struct TALER_CoinSpendPublicKeyP coin_pub;
   char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
                                       &coin_pub.eddsa_pub);
   {
@@ -500,17 +470,17 @@ TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange,
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/coins/%s/link",
+                     "coins/%s/link",
                      pub_str);
   }
   lh = GNUNET_new (struct TALER_EXCHANGE_LinkHandle);
-  lh->exchange = exchange;
   lh->link_cb = link_cb;
   lh->link_cb_cls = link_cb_cls;
   lh->coin_priv = *coin_priv;
   lh->age_commitment_proof = age_commitment_proof;
-  lh->url = TEAH_path_to_url (exchange,
-                              arg_str);
+  lh->url = TALER_url_join (url,
+                            arg_str,
+                            NULL);
   if (NULL == lh->url)
   {
     GNUNET_free (lh);
@@ -524,7 +494,6 @@ TALER_EXCHANGE_link (struct TALER_EXCHANGE_Handle *exchange,
     GNUNET_free (lh);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
   lh->job = GNUNET_CURL_job_add_with_ct_json (ctx,
                                               eh,
                                               &handle_link_finished,
@@ -541,6 +510,7 @@ TALER_EXCHANGE_link_cancel (struct TALER_EXCHANGE_LinkHandle *lh)
     GNUNET_CURL_job_cancel (lh->job);
     lh->job = NULL;
   }
+
   GNUNET_free (lh->url);
   GNUNET_free (lh);
 }
diff --git a/src/lib/exchange_api_lookup_aml_decision.c b/src/lib/exchange_api_lookup_aml_decision.c
new file mode 100644
index 000000000..501b9d185
--- /dev/null
+++ b/src/lib/exchange_api_lookup_aml_decision.c
@@ -0,0 +1,417 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_lookup_aml_decision.c
+ * @brief Implementation of the /aml/$OFFICER_PUB/decision request
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A /coins/$COIN_PUB/link Handle
+ */
+struct TALER_EXCHANGE_LookupAmlDecision
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_LookupAmlDecisionCallback decision_cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *decision_cb_cls;
+
+  /**
+   * HTTP headers for the job.
+   */
+  struct curl_slist *job_headers;
+};
+
+
+/**
+ * Parse AML decision history.
+ *
+ * @param aml_history JSON array with AML history
+ * @param[out] aml_history_ar where to write the result
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_aml_history (const json_t *aml_history,
+                   struct TALER_EXCHANGE_AmlDecisionDetail *aml_history_ar)
+{
+  json_t *obj;
+  size_t idx;
+
+  json_array_foreach (aml_history, idx, obj)
+  {
+    struct TALER_EXCHANGE_AmlDecisionDetail *aml = &aml_history_ar[idx];
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_timestamp ("decision_time",
+                                  &aml->decision_time),
+      GNUNET_JSON_spec_string ("justification",
+                               &aml->justification),
+      TALER_JSON_spec_amount_any ("new_threshold",
+                                  &aml->new_threshold),
+      TALER_JSON_spec_aml_decision ("new_state",
+                                    &aml->new_state),
+      GNUNET_JSON_spec_fixed_auto ("decider_pub",
+                                   &aml->decider_pub),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (obj,
+                           spec,
+                           NULL,
+                           NULL))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse KYC response array.
+ *
+ * @param kyc_attributes JSON array with KYC details
+ * @param[out] kyc_attributes_ar where to write the result
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_kyc_attributes (const json_t *kyc_attributes,
+                      struct TALER_EXCHANGE_KycHistoryDetail *kyc_attributes_ar)
+{
+  json_t *obj;
+  size_t idx;
+
+  json_array_foreach (kyc_attributes, idx, obj)
+  {
+    struct TALER_EXCHANGE_KycHistoryDetail *kyc = &kyc_attributes_ar[idx];
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_timestamp ("collection_time",
+                                  &kyc->collection_time),
+      GNUNET_JSON_spec_mark_optional (
+        GNUNET_JSON_spec_object_const ("attributes",
+                                       &kyc->attributes),
+        NULL),
+      GNUNET_JSON_spec_string ("provider_section",
+                               &kyc->provider_section),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (obj,
+                           spec,
+                           NULL,
+                           NULL))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse the provided decision data from the "200 OK" response.
+ *
+ * @param[in,out] lh handle (callback may be zero'ed out)
+ * @param json json reply with the data for one coin
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static enum GNUNET_GenericReturnValue
+parse_decision_ok (struct TALER_EXCHANGE_LookupAmlDecision *lh,
+                   const json_t *json)
+{
+  struct TALER_EXCHANGE_AmlDecisionResponse lr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
+  const json_t *aml_history;
+  const json_t *kyc_attributes;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("aml_history",
+                                  &aml_history),
+    GNUNET_JSON_spec_array_const ("kyc_attributes",
+                                  &kyc_attributes),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (json,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  lr.details.ok.aml_history_length = json_array_size (aml_history);
+  lr.details.ok.kyc_attributes_length = json_array_size (kyc_attributes);
+  {
+    struct TALER_EXCHANGE_AmlDecisionDetail aml_history_ar[
+      GNUNET_NZL (lr.details.ok.aml_history_length)];
+    struct TALER_EXCHANGE_KycHistoryDetail kyc_attributes_ar[
+      GNUNET_NZL (lr.details.ok.kyc_attributes_length)];
+    enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+
+    memset (aml_history_ar,
+            0,
+            sizeof (aml_history_ar));
+    memset (kyc_attributes_ar,
+            0,
+            sizeof (kyc_attributes_ar));
+    lr.details.ok.aml_history = aml_history_ar;
+    lr.details.ok.kyc_attributes = kyc_attributes_ar;
+    ret = parse_aml_history (aml_history,
+                             aml_history_ar);
+    if (GNUNET_OK == ret)
+      ret = parse_kyc_attributes (kyc_attributes,
+                                  kyc_attributes_ar);
+    if (GNUNET_OK == ret)
+    {
+      lh->decision_cb (lh->decision_cb_cls,
+                       &lr);
+      lh->decision_cb = NULL;
+    }
+    return ret;
+  }
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /aml/$OFFICER_PUB/decision request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_LookupAmlDecision`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_lookup_finished (void *cls,
+                        long response_code,
+                        const void *response)
+{
+  struct TALER_EXCHANGE_LookupAmlDecision *lh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_AmlDecisionResponse lr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  lh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    lr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        parse_decision_ok (lh,
+                           j))
+    {
+      GNUNET_break_op (0);
+      lr.hr.http_status = 0;
+      lr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      break;
+    }
+    GNUNET_assert (NULL == lh->decision_cb);
+    TALER_EXCHANGE_lookup_aml_decision_cancel (lh);
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says this coin was not melted; we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says this coin was not melted; we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange lookup AML decision\n",
+                (unsigned int) response_code,
+                (int) lr.hr.ec);
+    break;
+  }
+  if (NULL != lh->decision_cb)
+    lh->decision_cb (lh->decision_cb_cls,
+                     &lr);
+  TALER_EXCHANGE_lookup_aml_decision_cancel (lh);
+}
+
+
+struct TALER_EXCHANGE_LookupAmlDecision *
+TALER_EXCHANGE_lookup_aml_decision (
+  struct GNUNET_CURL_Context *ctx,
+  const char *exchange_url,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  bool history,
+  TALER_EXCHANGE_LookupAmlDecisionCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_LookupAmlDecision *lh;
+  CURL *eh;
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  struct TALER_AmlOfficerSignatureP officer_sig;
+  char arg_str[sizeof (officer_pub) * 2
+               + sizeof (*h_payto) * 2 + 32];
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&officer_priv->eddsa_priv,
+                                      &officer_pub.eddsa_pub);
+  TALER_officer_aml_query_sign (officer_priv,
+                                &officer_sig);
+  {
+    char pub_str[sizeof (officer_pub) * 2];
+    char pt_str[sizeof (*h_payto) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &officer_pub,
+      sizeof (officer_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    end = GNUNET_STRINGS_data_to_string (
+      h_payto,
+      sizeof (*h_payto),
+      pt_str,
+      sizeof (pt_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "aml/%s/decision/%s",
+                     pub_str,
+                     pt_str);
+  }
+  lh = GNUNET_new (struct TALER_EXCHANGE_LookupAmlDecision);
+  lh->decision_cb = cb;
+  lh->decision_cb_cls = cb_cls;
+  lh->url = TALER_url_join (exchange_url,
+                            arg_str,
+                            "history",
+                            history
+                            ? "true"
+                            : NULL,
+                            NULL);
+  if (NULL == lh->url)
+  {
+    GNUNET_free (lh);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (lh->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (lh->url);
+    GNUNET_free (lh);
+    return NULL;
+  }
+  {
+    char *hdr;
+    char sig_str[sizeof (officer_sig) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &officer_sig,
+      sizeof (officer_sig),
+      sig_str,
+      sizeof (sig_str));
+    *end = '\0';
+
+    GNUNET_asprintf (&hdr,
+                     "%s: %s",
+                     TALER_AML_OFFICER_SIGNATURE_HEADER,
+                     sig_str);
+    lh->job_headers = curl_slist_append (NULL,
+                                         hdr);
+    GNUNET_free (hdr);
+    lh->job_headers = curl_slist_append (lh->job_headers,
+                                         "Content-type: application/json");
+    lh->job = GNUNET_CURL_job_add2 (ctx,
+                                    eh,
+                                    lh->job_headers,
+                                    &handle_lookup_finished,
+                                    lh);
+  }
+  return lh;
+}
+
+
+void
+TALER_EXCHANGE_lookup_aml_decision_cancel (
+  struct TALER_EXCHANGE_LookupAmlDecision *lh)
+{
+  if (NULL != lh->job)
+  {
+    GNUNET_CURL_job_cancel (lh->job);
+    lh->job = NULL;
+  }
+  curl_slist_free_all (lh->job_headers);
+  GNUNET_free (lh->url);
+  GNUNET_free (lh);
+}
+
+
+/* end of exchange_api_lookup_aml_decision.c */
diff --git a/src/lib/exchange_api_lookup_aml_decisions.c b/src/lib/exchange_api_lookup_aml_decisions.c
new file mode 100644
index 000000000..bb3c18b68
--- /dev/null
+++ b/src/lib/exchange_api_lookup_aml_decisions.c
@@ -0,0 +1,376 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_lookup_aml_decisions.c
+ * @brief Implementation of the /aml/$OFFICER_PUB/decisions request
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A /coins/$COIN_PUB/link Handle
+ */
+struct TALER_EXCHANGE_LookupAmlDecisions
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_LookupAmlDecisionsCallback decisions_cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *decisions_cb_cls;
+
+  /**
+   * HTTP headers for the job.
+   */
+  struct curl_slist *job_headers;
+};
+
+
+/**
+ * Parse AML decision summary array.
+ *
+ * @param decisions JSON array with AML decision summaries
+ * @param[out] decision_ar where to write the result
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_aml_decisions (const json_t *decisions,
+                     struct TALER_EXCHANGE_AmlDecisionSummary *decision_ar)
+{
+  json_t *obj;
+  size_t idx;
+
+  json_array_foreach (decisions, idx, obj)
+  {
+    struct TALER_EXCHANGE_AmlDecisionSummary *decision = &decision_ar[idx];
+    struct GNUNET_JSON_Specification spec[] = {
+      GNUNET_JSON_spec_fixed_auto ("h_payto",
+                                   &decision->h_payto),
+      TALER_JSON_spec_aml_decision ("current_state",
+                                    &decision->current_state),
+      TALER_JSON_spec_amount_any ("threshold",
+                                  &decision->threshold),
+      GNUNET_JSON_spec_uint64 ("rowid",
+                               &decision->rowid),
+      GNUNET_JSON_spec_end ()
+    };
+
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (obj,
+                           spec,
+                           NULL,
+                           NULL))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse the provided decision data from the "200 OK" response.
+ *
+ * @param[in,out] lh handle (callback may be zero'ed out)
+ * @param json json reply with the data for one coin
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static enum GNUNET_GenericReturnValue
+parse_decisions_ok (struct TALER_EXCHANGE_LookupAmlDecisions *lh,
+                    const json_t *json)
+{
+  struct TALER_EXCHANGE_AmlDecisionsResponse lr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
+  const json_t *records;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("records",
+                                  &records),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (json,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  lr.details.ok.decisions_length = json_array_size (records);
+  {
+    struct TALER_EXCHANGE_AmlDecisionSummary decisions[
+      GNUNET_NZL (lr.details.ok.decisions_length)];
+    enum GNUNET_GenericReturnValue ret = GNUNET_SYSERR;
+
+    lr.details.ok.decisions = decisions;
+    ret = parse_aml_decisions (records,
+                               decisions);
+    if (GNUNET_OK == ret)
+    {
+      lh->decisions_cb (lh->decisions_cb_cls,
+                        &lr);
+      lh->decisions_cb = NULL;
+    }
+    return ret;
+  }
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /aml/$OFFICER_PUB/decisions request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_LookupAmlDecisions`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_lookup_finished (void *cls,
+                        long response_code,
+                        const void *response)
+{
+  struct TALER_EXCHANGE_LookupAmlDecisions *lh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_AmlDecisionsResponse lr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  lh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    lr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        parse_decisions_ok (lh,
+                            j))
+    {
+      GNUNET_break_op (0);
+      lr.hr.http_status = 0;
+      lr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      break;
+    }
+    GNUNET_assert (NULL == lh->decisions_cb);
+    TALER_EXCHANGE_lookup_aml_decisions_cancel (lh);
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says this coin was not melted; we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says this coin was not melted; we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    lr.hr.ec = TALER_JSON_get_error_code (j);
+    lr.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for lookup AML decisions\n",
+                (unsigned int) response_code,
+                (int) lr.hr.ec);
+    break;
+  }
+  if (NULL != lh->decisions_cb)
+    lh->decisions_cb (lh->decisions_cb_cls,
+                      &lr);
+  TALER_EXCHANGE_lookup_aml_decisions_cancel (lh);
+}
+
+
+struct TALER_EXCHANGE_LookupAmlDecisions *
+TALER_EXCHANGE_lookup_aml_decisions (
+  struct GNUNET_CURL_Context *ctx,
+  const char *exchange_url,
+  uint64_t start,
+  int delta,
+  enum TALER_AmlDecisionState state,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  TALER_EXCHANGE_LookupAmlDecisionsCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_LookupAmlDecisions *lh;
+  CURL *eh;
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+  struct TALER_AmlOfficerSignatureP officer_sig;
+  char arg_str[sizeof (struct TALER_AmlOfficerPublicKeyP) * 2 + 32];
+  const char *state_str = NULL;
+
+  switch (state)
+  {
+  case TALER_AML_NORMAL:
+    state_str = "normal";
+    break;
+  case TALER_AML_PENDING:
+    state_str = "pending";
+    break;
+  case TALER_AML_FROZEN:
+    state_str = "frozen";
+    break;
+  }
+  GNUNET_assert (NULL != state_str);
+  GNUNET_CRYPTO_eddsa_key_get_public (&officer_priv->eddsa_priv,
+                                      &officer_pub.eddsa_pub);
+  TALER_officer_aml_query_sign (officer_priv,
+                                &officer_sig);
+  {
+    char pub_str[sizeof (officer_pub) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &officer_pub,
+      sizeof (officer_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "aml/%s/decisions/%s",
+                     pub_str,
+                     state_str);
+  }
+  lh = GNUNET_new (struct TALER_EXCHANGE_LookupAmlDecisions);
+  lh->decisions_cb = cb;
+  lh->decisions_cb_cls = cb_cls;
+  {
+    char delta_s[24];
+    char start_s[24];
+
+    GNUNET_snprintf (delta_s,
+                     sizeof (delta_s),
+                     "%d",
+                     delta);
+    GNUNET_snprintf (start_s,
+                     sizeof (start_s),
+                     "%llu",
+                     (unsigned long long) start);
+    lh->url = TALER_url_join (exchange_url,
+                              arg_str,
+                              "delta",
+                              delta_s,
+                              "start",
+                              start_s,
+                              NULL);
+  }
+  if (NULL == lh->url)
+  {
+    GNUNET_free (lh);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (lh->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (lh->url);
+    GNUNET_free (lh);
+    return NULL;
+  }
+  {
+    char *hdr;
+    char sig_str[sizeof (officer_sig) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &officer_sig,
+      sizeof (officer_sig),
+      sig_str,
+      sizeof (sig_str));
+    *end = '\0';
+
+    GNUNET_asprintf (&hdr,
+                     "%s: %s",
+                     TALER_AML_OFFICER_SIGNATURE_HEADER,
+                     sig_str);
+    lh->job_headers = curl_slist_append (NULL,
+                                         hdr);
+    GNUNET_free (hdr);
+    lh->job_headers = curl_slist_append (lh->job_headers,
+                                         "Content-type: application/json");
+    lh->job = GNUNET_CURL_job_add2 (ctx,
+                                    eh,
+                                    lh->job_headers,
+                                    &handle_lookup_finished,
+                                    lh);
+  }
+  return lh;
+}
+
+
+void
+TALER_EXCHANGE_lookup_aml_decisions_cancel (
+  struct TALER_EXCHANGE_LookupAmlDecisions *lh)
+{
+  if (NULL != lh->job)
+  {
+    GNUNET_CURL_job_cancel (lh->job);
+    lh->job = NULL;
+  }
+  curl_slist_free_all (lh->job_headers);
+  GNUNET_free (lh->url);
+  GNUNET_free (lh);
+}
+
+
+/* end of exchange_api_lookup_aml_decisions.c */
diff --git a/src/lib/exchange_api_management_add_partner.c b/src/lib/exchange_api_management_add_partner.c
new file mode 100644
index 000000000..fec66c567
--- /dev/null
+++ b/src/lib/exchange_api_management_add_partner.c
@@ -0,0 +1,218 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_management_add_partner.c
+ * @brief functions to add an partner by an AML officer
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "exchange_api_curl_defaults.h"
+#include "taler_signatures.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+
+
+struct TALER_EXCHANGE_ManagementAddPartner
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ManagementAddPartnerCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reference to the execution context.
+   */
+  struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP POST /management/partners request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ManagementAddPartner *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
+ */
+static void
+handle_add_partner_finished (void *cls,
+                             long response_code,
+                             const void *response)
+{
+  struct TALER_EXCHANGE_ManagementAddPartner *wh = cls;
+  const json_t *json = response;
+  struct TALER_EXCHANGE_ManagementAddPartnerResponse apr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
+  };
+
+  wh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    /* no reply */
+    apr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    apr.hr.hint = "server offline?";
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    apr.hr.ec = TALER_JSON_get_error_code (json);
+    apr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_CONFLICT:
+    apr.hr.ec = TALER_JSON_get_error_code (json);
+    apr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    apr.hr.ec = TALER_JSON_get_error_code (json);
+    apr.hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for adding exchange partner\n",
+                (unsigned int) response_code,
+                (int) apr.hr.ec);
+    break;
+  }
+  if (NULL != wh->cb)
+  {
+    wh->cb (wh->cb_cls,
+            &apr);
+    wh->cb = NULL;
+  }
+  TALER_EXCHANGE_management_add_partner_cancel (wh);
+}
+
+
+struct TALER_EXCHANGE_ManagementAddPartner *
+TALER_EXCHANGE_management_add_partner (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_MasterPublicKeyP *partner_pub,
+  struct GNUNET_TIME_Timestamp start_date,
+  struct GNUNET_TIME_Timestamp end_date,
+  struct GNUNET_TIME_Relative wad_frequency,
+  const struct TALER_Amount *wad_fee,
+  const char *partner_base_url,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementAddPartnerCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ManagementAddPartner *wh;
+  CURL *eh;
+  json_t *body;
+
+  wh = GNUNET_new (struct TALER_EXCHANGE_ManagementAddPartner);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ctx = ctx;
+  wh->url = TALER_url_join (url,
+                            "management/partners",
+                            NULL);
+  if (NULL == wh->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (wh);
+    return NULL;
+  }
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("partner_base_url",
+                             partner_base_url),
+    GNUNET_JSON_pack_timestamp ("start_date",
+                                start_date),
+    GNUNET_JSON_pack_timestamp ("end_date",
+                                end_date),
+    GNUNET_JSON_pack_time_rel ("wad_frequency",
+                               wad_frequency),
+    GNUNET_JSON_pack_data_auto ("partner_pub",
+                                &partner_pub),
+    GNUNET_JSON_pack_data_auto ("master_sig",
+                                &master_sig),
+    TALER_JSON_pack_amount ("wad_fee",
+                            wad_fee)
+    );
+  eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&wh->post_ctx,
+                              eh,
+                              body)) )
+  {
+    GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
+    json_decref (body);
+    GNUNET_free (wh->url);
+    return NULL;
+  }
+  json_decref (body);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting URL '%s'\n",
+              wh->url);
+  wh->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  wh->post_ctx.headers,
+                                  &handle_add_partner_finished,
+                                  wh);
+  if (NULL == wh->job)
+  {
+    TALER_EXCHANGE_management_add_partner_cancel (wh);
+    return NULL;
+  }
+  return wh;
+}
+
+
+void
+TALER_EXCHANGE_management_add_partner_cancel (
+  struct TALER_EXCHANGE_ManagementAddPartner *wh)
+{
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&wh->post_ctx);
+  GNUNET_free (wh->url);
+  GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_management_auditor_disable.c b/src/lib/exchange_api_management_auditor_disable.c
index bfe60ee79..8bce7f74f 100644
--- a/src/lib/exchange_api_management_auditor_disable.c
+++ b/src/lib/exchange_api_management_auditor_disable.c
@@ -81,9 +81,9 @@ handle_auditor_disable_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementAuditorDisableHandle *ah = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementAuditorDisableResponse adr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   ah->job = NULL;
@@ -92,32 +92,32 @@ handle_auditor_disable_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    adr.hr.ec = TALER_JSON_get_error_code (json);
+    adr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management auditor disable\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) adr.hr.ec);
     break;
   }
   if (NULL != ah->cb)
   {
     ah->cb (ah->cb_cls,
-            &hr);
+            &adr);
     ah->cb = NULL;
   }
   TALER_EXCHANGE_management_disable_auditor_cancel (ah);
@@ -173,16 +173,17 @@ TALER_EXCHANGE_management_disable_auditor (
     GNUNET_JSON_pack_timestamp ("validity_end",
                                 validity_end));
   eh = TALER_EXCHANGE_curl_easy_get_ (ah->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&ah->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&ah->post_ctx,
+                              eh,
+                              body)))
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (ah->url);
-    GNUNET_free (eh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_auditor_enable.c b/src/lib/exchange_api_management_auditor_enable.c
index a99449307..41c5049c2 100644
--- a/src/lib/exchange_api_management_auditor_enable.c
+++ b/src/lib/exchange_api_management_auditor_enable.c
@@ -82,9 +82,9 @@ handle_auditor_enable_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementAuditorEnableHandle *ah = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementAuditorEnableResponse aer = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   ah->job = NULL;
@@ -93,28 +93,43 @@ handle_auditor_enable_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    aer.hr.ec = TALER_JSON_get_error_code (json);
+    aer.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                ah->url);
+    if (NULL != json)
+    {
+      aer.hr.ec = TALER_JSON_get_error_code (json);
+      aer.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      aer.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      aer.hr.hint = TALER_ErrorCode_get_hint (aer.hr.ec);
+    }
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    aer.hr.ec = TALER_JSON_get_error_code (json);
+    aer.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    aer.hr.ec = TALER_JSON_get_error_code (json);
+    aer.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management auditor enable\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) aer.hr.ec);
     break;
   }
   if (NULL != ah->cb)
   {
     ah->cb (ah->cb_cls,
-            &hr);
+            &aer);
     ah->cb = NULL;
   }
   TALER_EXCHANGE_management_enable_auditor_cancel (ah);
@@ -163,16 +178,17 @@ TALER_EXCHANGE_management_enable_auditor (
     GNUNET_JSON_pack_timestamp ("validity_start",
                                 validity_start));
   eh = TALER_EXCHANGE_curl_easy_get_ (ah->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&ah->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&ah->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
     json_decref (body);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     GNUNET_free (ah->url);
-    GNUNET_free (eh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_drain_profits.c b/src/lib/exchange_api_management_drain_profits.c
new file mode 100644
index 000000000..bc7232b87
--- /dev/null
+++ b/src/lib/exchange_api_management_drain_profits.c
@@ -0,0 +1,213 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020-2023 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/>
+*/
+/**
+ * @file lib/exchange_api_management_drain_profits.c
+ * @brief functions to set wire fees at an exchange
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "exchange_api_curl_defaults.h"
+#include "taler_exchange_service.h"
+#include "taler_signatures.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+
+
+struct TALER_EXCHANGE_ManagementDrainProfitsHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ManagementDrainProfitsCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reference to the execution context.
+   */
+  struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /management/drain request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ManagementDrainProfitsHandle *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
+ */
+static void
+handle_drain_profits_finished (void *cls,
+                               long response_code,
+                               const void *response)
+{
+  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *dp = cls;
+  const json_t *json = response;
+  struct TALER_EXCHANGE_ManagementDrainResponse dr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
+  };
+
+  dp->job = NULL;
+  switch (response_code)
+  {
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    dr.hr.ec = TALER_JSON_get_error_code (json);
+    dr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_CONFLICT:
+    dr.hr.ec = TALER_JSON_get_error_code (json);
+    dr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_PRECONDITION_FAILED:
+    dr.hr.ec = TALER_JSON_get_error_code (json);
+    dr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    dr.hr.ec = TALER_JSON_get_error_code (json);
+    dr.hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange management drain profits\n",
+                (unsigned int) response_code,
+                (int) dr.hr.ec);
+    break;
+  }
+  if (NULL != dp->cb)
+  {
+    dp->cb (dp->cb_cls,
+            &dr);
+    dp->cb = NULL;
+  }
+  TALER_EXCHANGE_management_drain_profits_cancel (dp);
+}
+
+
+struct TALER_EXCHANGE_ManagementDrainProfitsHandle *
+TALER_EXCHANGE_management_drain_profits (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  const struct TALER_Amount *amount,
+  struct GNUNET_TIME_Timestamp date,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementDrainProfitsCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *dp;
+  CURL *eh;
+  json_t *body;
+
+  dp = GNUNET_new (struct TALER_EXCHANGE_ManagementDrainProfitsHandle);
+  dp->cb = cb;
+  dp->cb_cls = cb_cls;
+  dp->ctx = ctx;
+  dp->url = TALER_url_join (url,
+                            "management/drain",
+                            NULL);
+  if (NULL == dp->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (dp);
+    return NULL;
+  }
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("debit_account_section",
+                             account_section),
+    GNUNET_JSON_pack_string ("credit_payto_uri",
+                             payto_uri),
+    GNUNET_JSON_pack_data_auto ("wtid",
+                                wtid),
+    GNUNET_JSON_pack_data_auto ("master_sig",
+                                master_sig),
+    GNUNET_JSON_pack_timestamp ("date",
+                                date),
+    TALER_JSON_pack_amount ("amount",
+                            amount));
+  eh = TALER_EXCHANGE_curl_easy_get_ (dp->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&dp->post_ctx,
+                              eh,
+                              body)) )
+  {
+    GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
+    json_decref (body);
+    GNUNET_free (dp->url);
+    return NULL;
+  }
+  json_decref (body);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting URL '%s'\n",
+              dp->url);
+  dp->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  dp->post_ctx.headers,
+                                  &handle_drain_profits_finished,
+                                  dp);
+  if (NULL == dp->job)
+  {
+    TALER_EXCHANGE_management_drain_profits_cancel (dp);
+    return NULL;
+  }
+  return dp;
+}
+
+
+void
+TALER_EXCHANGE_management_drain_profits_cancel (
+  struct TALER_EXCHANGE_ManagementDrainProfitsHandle *dp)
+{
+  if (NULL != dp->job)
+  {
+    GNUNET_CURL_job_cancel (dp->job);
+    dp->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&dp->post_ctx);
+  GNUNET_free (dp->url);
+  GNUNET_free (dp);
+}
diff --git a/src/lib/exchange_api_management_get_keys.c b/src/lib/exchange_api_management_get_keys.c
index 8a279d1ef..b88ddc205 100644
--- a/src/lib/exchange_api_management_get_keys.c
+++ b/src/lib/exchange_api_management_get_keys.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2020 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -26,7 +26,7 @@
 #include "exchange_api_curl_defaults.h"
 #include "taler_signatures.h"
 #include "taler_curl_lib.h"
-#include "taler_crypto_lib.h"
+#include "taler_util.h"
 #include "taler_json_lib.h"
 
 /**
@@ -75,27 +75,32 @@ struct TALER_EXCHANGE_ManagementGetKeysHandle
  * @param response the response
  * @return #GNUNET_OK if the response was well-formed
  */
-static int
+static enum GNUNET_GenericReturnValue
 handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
            const json_t *response)
 {
-  struct TALER_EXCHANGE_FutureKeys fk;
-  json_t *sk;
-  json_t *dk;
+  struct TALER_EXCHANGE_ManagementGetKeysResponse gkr = {
+    .hr.http_status = MHD_HTTP_OK,
+    .hr.reply = response,
+  };
+  struct TALER_EXCHANGE_FutureKeys *fk
+    = &gkr.details.ok.keys;
+  const json_t *sk;
+  const json_t *dk;
   bool ok;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("future_denoms",
-                           &dk),
-    GNUNET_JSON_spec_json ("future_signkeys",
-                           &sk),
+    GNUNET_JSON_spec_array_const ("future_denoms",
+                                  &dk),
+    GNUNET_JSON_spec_array_const ("future_signkeys",
+                                  &sk),
     GNUNET_JSON_spec_fixed_auto ("master_pub",
-                                 &fk.master_pub),
+                                 &fk->master_pub),
     GNUNET_JSON_spec_fixed_auto ("denom_secmod_public_key",
-                                 &fk.denom_secmod_public_key),
+                                 &fk->denom_secmod_public_key),
     GNUNET_JSON_spec_fixed_auto ("denom_secmod_cs_public_key",
-                                 &fk.denom_secmod_cs_public_key),
+                                 &fk->denom_secmod_cs_public_key),
     GNUNET_JSON_spec_fixed_auto ("signkey_secmod_public_key",
-                                 &fk.signkey_secmod_public_key),
+                                 &fk->signkey_secmod_public_key),
     GNUNET_JSON_spec_end ()
   };
 
@@ -107,22 +112,22 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  fk.num_sign_keys = json_array_size (sk);
-  fk.num_denom_keys = json_array_size (dk);
-  fk.sign_keys = GNUNET_new_array (
-    fk.num_sign_keys,
+  fk->num_sign_keys = json_array_size (sk);
+  fk->num_denom_keys = json_array_size (dk);
+  fk->sign_keys = GNUNET_new_array (
+    fk->num_sign_keys,
     struct TALER_EXCHANGE_FutureSigningPublicKey);
-  fk.denom_keys = GNUNET_new_array (
-    fk.num_denom_keys,
+  fk->denom_keys = GNUNET_new_array (
+    fk->num_denom_keys,
     struct TALER_EXCHANGE_FutureDenomPublicKey);
   ok = true;
-  for (unsigned int i = 0; i<fk.num_sign_keys; i++)
+  for (unsigned int i = 0; i<fk->num_sign_keys; i++)
   {
     json_t *j = json_array_get (sk,
                                 i);
     struct TALER_EXCHANGE_FutureSigningPublicKey *sign_key
-      = &fk.sign_keys[i];
-    struct GNUNET_JSON_Specification spec[] = {
+      = &fk->sign_keys[i];
+    struct GNUNET_JSON_Specification ispec[] = {
       GNUNET_JSON_spec_fixed_auto ("key",
                                    &sign_key->key),
       GNUNET_JSON_spec_fixed_auto ("signkey_secmod_sig",
@@ -138,7 +143,7 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
 
     if (GNUNET_OK !=
         GNUNET_JSON_parse (j,
-                           spec,
+                           ispec,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
@@ -155,7 +160,7 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
             &sign_key->key,
             sign_key->valid_from,
             duration,
-            &fk.signkey_secmod_public_key,
+            &fk->signkey_secmod_public_key,
             &sign_key->signkey_secmod_sig))
       {
         GNUNET_break_op (0);
@@ -164,12 +169,12 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
       }
     }
   }
-  for (unsigned int i = 0; i<fk.num_denom_keys; i++)
+  for (unsigned int i = 0; i<fk->num_denom_keys; i++)
   {
     json_t *j = json_array_get (dk,
                                 i);
     struct TALER_EXCHANGE_FutureDenomPublicKey *denom_key
-      = &fk.denom_keys[i];
+      = &fk->denom_keys[i];
     const char *section_name;
     struct GNUNET_JSON_Specification spec[] = {
       TALER_JSON_spec_amount_any ("value",
@@ -223,20 +228,21 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
 
       TALER_denom_pub_hash (&denom_key->key,
                             &h_denom_pub);
-      switch (denom_key->key.cipher)
+      switch (denom_key->key.bsign_pub_key->cipher)
       {
-      case TALER_DENOMINATION_RSA:
+      case GNUNET_CRYPTO_BSA_RSA:
         {
           struct TALER_RsaPubHashP h_rsa;
 
-          TALER_rsa_pub_hash (denom_key->key.details.rsa_public_key,
-                              &h_rsa);
+          TALER_rsa_pub_hash (
+            denom_key->key.bsign_pub_key->details.rsa_public_key,
+            &h_rsa);
           if (GNUNET_OK !=
               TALER_exchange_secmod_rsa_verify (&h_rsa,
                                                 section_name,
                                                 denom_key->valid_from,
                                                 duration,
-                                                &fk.denom_secmod_public_key,
+                                                &fk->denom_secmod_public_key,
                                                 &denom_key->denom_secmod_sig))
           {
             GNUNET_break_op (0);
@@ -245,18 +251,19 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
           }
         }
         break;
-      case TALER_DENOMINATION_CS:
+      case GNUNET_CRYPTO_BSA_CS:
         {
           struct TALER_CsPubHashP h_cs;
 
-          TALER_cs_pub_hash (&denom_key->key.details.cs_public_key,
-                             &h_cs);
+          TALER_cs_pub_hash (
+            &denom_key->key.bsign_pub_key->details.cs_public_key,
+            &h_cs);
           if (GNUNET_OK !=
               TALER_exchange_secmod_cs_verify (&h_cs,
                                                section_name,
                                                denom_key->valid_from,
                                                duration,
-                                               &fk.denom_secmod_cs_public_key,
+                                               &fk->denom_secmod_cs_public_key,
                                                &denom_key->denom_secmod_sig))
           {
             GNUNET_break_op (0);
@@ -271,26 +278,18 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh,
         break;
       }
     }
-    GNUNET_JSON_parse_free (spec);
     if (! ok)
       break;
   }
   if (ok)
   {
-    struct TALER_EXCHANGE_HttpResponse hr = {
-      .http_status = MHD_HTTP_OK,
-      .reply = response
-    };
-
     gh->cb (gh->cb_cls,
-            &hr,
-            &fk);
+            &gkr);
   }
-  for (unsigned int i = 0; i<fk.num_denom_keys; i++)
-    TALER_denom_pub_free (&fk.denom_keys[i].key);
-  GNUNET_free (fk.sign_keys);
-  GNUNET_free (fk.denom_keys);
-  GNUNET_JSON_parse_free (spec);
+  for (unsigned int i = 0; i<fk->num_denom_keys; i++)
+    TALER_denom_pub_free (&fk->denom_keys[i].key);
+  GNUNET_free (fk->sign_keys);
+  GNUNET_free (fk->denom_keys);
   return (ok) ? GNUNET_OK : GNUNET_SYSERR;
 }
 
@@ -310,9 +309,9 @@ handle_get_keys_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementGetKeysHandle *gh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementGetKeysResponse gkr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   gh->job = NULL;
@@ -330,29 +329,43 @@ handle_get_keys_finished (void *cls,
       response_code = 0;
     }
     break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                gh->url);
+    if (NULL != json)
+    {
+      gkr.hr.ec = TALER_JSON_get_error_code (json);
+      gkr.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      gkr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      gkr.hr.hint = TALER_ErrorCode_get_hint (gkr.hr.ec);
+    }
+    break;
   default:
     /* unexpected response code */
     if (NULL != json)
     {
-      hr.ec = TALER_JSON_get_error_code (json);
-      hr.hint = TALER_JSON_get_error_hint (json);
+      gkr.hr.ec = TALER_JSON_get_error_code (json);
+      gkr.hr.hint = TALER_JSON_get_error_hint (json);
     }
     else
     {
-      hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-      hr.hint = TALER_ErrorCode_get_hint (hr.ec);
+      gkr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      gkr.hr.hint = TALER_ErrorCode_get_hint (gkr.hr.ec);
     }
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management get keys\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) gkr.hr.ec);
     break;
   }
   if (NULL != gh->cb)
   {
     gh->cb (gh->cb_cls,
-            &hr,
-            NULL);
+            &gkr);
     gh->cb = NULL;
   }
   TALER_EXCHANGE_get_management_keys_cancel (gh);
diff --git a/src/lib/exchange_api_management_post_extensions.c b/src/lib/exchange_api_management_post_extensions.c
index 87b0e0be8..00d1c5e3f 100644
--- a/src/lib/exchange_api_management_post_extensions.c
+++ b/src/lib/exchange_api_management_post_extensions.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2015-2021 Taler Systems SA
+   Copyright (C) 2015-2023 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
@@ -23,6 +23,7 @@
 #include "taler_json_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_extensions.h"
+#include "exchange_api_curl_defaults.h"
 #include "taler_exchange_service.h"
 #include "taler_signatures.h"
 #include "taler_curl_lib.h"
@@ -82,9 +83,9 @@ handle_post_extensions_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementPostExtensionsHandle *ph = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementPostExtensionsResponse per = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   ph->job = NULL;
@@ -93,31 +94,42 @@ handle_post_extensions_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    per.hr.ec = TALER_JSON_get_error_code (json);
+    per.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                ph->url);
+    if (NULL != json)
+    {
+      per.hr.ec = TALER_JSON_get_error_code (json);
+      per.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      per.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      per.hr.hint = TALER_ErrorCode_get_hint (per.hr.ec);
+    }
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    per.hr.ec = TALER_JSON_get_error_code (json);
+    per.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management post extensions\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) per.hr.ec);
     break;
   }
   if (NULL != ph->cb)
   {
     ph->cb (ph->cb_cls,
-            &hr);
+            &per);
     ph->cb = NULL;
   }
-  TALER_EXCHANGE_post_management_extensions_cancel (ph);
+  TALER_EXCHANGE_management_post_extensions_cancel (ph);
 }
 
 
@@ -125,7 +137,7 @@ struct TALER_EXCHANGE_ManagementPostExtensionsHandle *
 TALER_EXCHANGE_management_post_extensions (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
-  struct TALER_EXCHANGE_ManagementPostExtensionsData *ped,
+  const struct TALER_EXCHANGE_ManagementPostExtensionsData *ped,
   TALER_EXCHANGE_ManagementPostExtensionsCallback cb,
   void *cb_cls)
 {
@@ -150,30 +162,28 @@ TALER_EXCHANGE_management_post_extensions (
 
   body = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_object_steal ("extensions",
-                                   ped->extensions),
+                                   (json_t *) ped->extensions),
     GNUNET_JSON_pack_data_auto ("extensions_sig",
                                 &ped->extensions_sig));
 
-  eh = curl_easy_init ();
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&ph->post_ctx,
-                            eh,
-                            body))
+  eh = TALER_EXCHANGE_curl_easy_get_ (ph->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&ph->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (ph->url);
-    GNUNET_free (eh);
     return NULL;
   }
   json_decref (body);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Requesting URL '%s'\n",
               ph->url);
-  GNUNET_assert (CURLE_OK == curl_easy_setopt (eh,
-                                               CURLOPT_URL,
-                                               ph->url));
   ph->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   ph->post_ctx.headers,
@@ -181,7 +191,7 @@ TALER_EXCHANGE_management_post_extensions (
                                   ph);
   if (NULL == ph->job)
   {
-    TALER_EXCHANGE_post_management_extensions_cancel (ph);
+    TALER_EXCHANGE_management_post_extensions_cancel (ph);
     return NULL;
   }
   return ph;
@@ -189,7 +199,7 @@ TALER_EXCHANGE_management_post_extensions (
 
 
 void
-TALER_EXCHANGE_post_management_extensions_cancel (
+TALER_EXCHANGE_management_post_extensions_cancel (
   struct TALER_EXCHANGE_ManagementPostExtensionsHandle *ph)
 {
   if (NULL != ph->job)
diff --git a/src/lib/exchange_api_management_post_keys.c b/src/lib/exchange_api_management_post_keys.c
index d7790599a..a46124d90 100644
--- a/src/lib/exchange_api_management_post_keys.c
+++ b/src/lib/exchange_api_management_post_keys.c
@@ -82,9 +82,9 @@ handle_post_keys_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementPostKeysHandle *ph = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementPostKeysResponse pkr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   ph->job = NULL;
@@ -93,32 +93,32 @@ handle_post_keys_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    pkr.hr.ec = TALER_JSON_get_error_code (json);
+    pkr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    pkr.hr.ec = TALER_JSON_get_error_code (json);
+    pkr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_REQUEST_ENTITY_TOO_LARGE:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    pkr.hr.ec = TALER_JSON_get_error_code (json);
+    pkr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    pkr.hr.ec = TALER_JSON_get_error_code (json);
+    pkr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management post keys\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) pkr.hr.ec);
     break;
   }
   if (NULL != ph->cb)
   {
     ph->cb (ph->cb_cls,
-            &hr);
+            &pkr);
     ph->cb = NULL;
   }
   TALER_EXCHANGE_post_management_keys_cancel (ph);
@@ -191,16 +191,17 @@ TALER_EXCHANGE_post_management_keys (
     GNUNET_JSON_pack_array_steal ("signkey_sigs",
                                   signkey_sigs));
   eh = TALER_EXCHANGE_curl_easy_get_ (ph->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&ph->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&ph->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (ph->url);
-    GNUNET_free (eh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_revoke_denomination_key.c b/src/lib/exchange_api_management_revoke_denomination_key.c
index f7ddeaed2..a57704776 100644
--- a/src/lib/exchange_api_management_revoke_denomination_key.c
+++ b/src/lib/exchange_api_management_revoke_denomination_key.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2020 Taler Systems SA
+  Copyright (C) 2015-2024 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
@@ -82,9 +82,9 @@ handle_revoke_denomination_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle *rh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementRevokeDenominationResponse rdr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   rh->job = NULL;
@@ -92,30 +92,30 @@ handle_revoke_denomination_finished (void *cls,
   {
   case 0:
     /* no reply */
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    hr.hint = "server offline?";
+    rdr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rdr.hr.hint = "server offline?";
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rdr.hr.ec = TALER_JSON_get_error_code (json);
+    rdr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rdr.hr.ec = TALER_JSON_get_error_code (json);
+    rdr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management revoke denomination\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rdr.hr.ec);
     break;
   }
   if (NULL != rh->cb)
   {
     rh->cb (rh->cb_cls,
-            &hr);
+            &rdr);
     rh->cb = NULL;
   }
   TALER_EXCHANGE_management_revoke_denomination_key_cancel (rh);
@@ -175,15 +175,18 @@ TALER_EXCHANGE_management_revoke_denomination_key (
     return NULL;
   }
   eh = TALER_EXCHANGE_curl_easy_get_ (rh->url);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&rh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&rh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (rh->url);
-    GNUNET_free (eh);
+    GNUNET_free (rh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_revoke_signing_key.c b/src/lib/exchange_api_management_revoke_signing_key.c
index 046d18729..d2fa78264 100644
--- a/src/lib/exchange_api_management_revoke_signing_key.c
+++ b/src/lib/exchange_api_management_revoke_signing_key.c
@@ -79,9 +79,9 @@ handle_revoke_signing_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementRevokeSigningKeyHandle *rh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse rsr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   rh->job = NULL;
@@ -89,30 +89,30 @@ handle_revoke_signing_finished (void *cls,
   {
   case 0:
     /* no reply */
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    hr.hint = "server offline?";
+    rsr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rsr.hr.hint = "server offline?";
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rsr.hr.ec = TALER_JSON_get_error_code (json);
+    rsr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    rsr.hr.ec = TALER_JSON_get_error_code (json);
+    rsr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management revoke signkey\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rsr.hr.ec);
     break;
   }
   if (NULL != rh->cb)
   {
     rh->cb (rh->cb_cls,
-            &hr);
+            &rsr);
     rh->cb = NULL;
   }
   TALER_EXCHANGE_management_revoke_signing_key_cancel (rh);
@@ -165,16 +165,18 @@ TALER_EXCHANGE_management_revoke_signing_key (
     GNUNET_JSON_pack_data_auto ("master_sig",
                                 master_sig));
   eh = TALER_EXCHANGE_curl_easy_get_ (rh->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&rh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&rh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (rh->url);
-    GNUNET_free (eh);
+    GNUNET_free (rh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_set_global_fee.c b/src/lib/exchange_api_management_set_global_fee.c
index a79dddc9d..f6282a812 100644
--- a/src/lib/exchange_api_management_set_global_fee.c
+++ b/src/lib/exchange_api_management_set_global_fee.c
@@ -79,9 +79,9 @@ handle_set_global_fee_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementSetGlobalFeeHandle *sgfh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementSetGlobalFeeResponse sfr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   sgfh->job = NULL;
@@ -90,32 +90,47 @@ handle_set_global_fee_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    sfr.hr.ec = TALER_JSON_get_error_code (json);
+    sfr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                sgfh->url);
+    if (NULL != json)
+    {
+      sfr.hr.ec = TALER_JSON_get_error_code (json);
+      sfr.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      sfr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      sfr.hr.hint = TALER_ErrorCode_get_hint (sfr.hr.ec);
+    }
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    sfr.hr.ec = TALER_JSON_get_error_code (json);
+    sfr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_PRECONDITION_FAILED:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    sfr.hr.ec = TALER_JSON_get_error_code (json);
+    sfr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    sfr.hr.ec = TALER_JSON_get_error_code (json);
+    sfr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management set global fee\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) sfr.hr.ec);
     break;
   }
   if (NULL != sgfh->cb)
   {
     sgfh->cb (sgfh->cb_cls,
-              &hr);
+              &sfr);
     sgfh->cb = NULL;
   }
   TALER_EXCHANGE_management_set_global_fees_cancel (sgfh);
@@ -130,7 +145,6 @@ TALER_EXCHANGE_management_set_global_fees (
   struct GNUNET_TIME_Timestamp validity_end,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterSignatureP *master_sig,
@@ -164,31 +178,29 @@ TALER_EXCHANGE_management_set_global_fees (
                                 validity_end),
     TALER_JSON_pack_amount ("history_fee",
                             &fees->history),
-    TALER_JSON_pack_amount ("kyc_fee",
-                            &fees->kyc),
     TALER_JSON_pack_amount ("account_fee",
                             &fees->account),
     TALER_JSON_pack_amount ("purse_fee",
                             &fees->purse),
     GNUNET_JSON_pack_time_rel ("purse_timeout",
                                purse_timeout),
-    GNUNET_JSON_pack_time_rel ("kyc_timeout",
-                               kyc_timeout),
     GNUNET_JSON_pack_time_rel ("history_expiration",
                                history_expiration),
     GNUNET_JSON_pack_uint64 ("purse_account_limit",
                              purse_account_limit));
   eh = TALER_EXCHANGE_curl_easy_get_ (sgfh->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&sgfh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&sgfh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (sgfh->url);
-    GNUNET_free (eh);
+    GNUNET_free (sgfh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_set_wire_fee.c b/src/lib/exchange_api_management_set_wire_fee.c
index 84c6fe909..aaeae21f4 100644
--- a/src/lib/exchange_api_management_set_wire_fee.c
+++ b/src/lib/exchange_api_management_set_wire_fee.c
@@ -79,9 +79,9 @@ handle_set_wire_fee_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementSetWireFeeHandle *swfh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementSetWireFeeResponse swr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   swfh->job = NULL;
@@ -90,32 +90,47 @@ handle_set_wire_fee_finished (void *cls,
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    swr.hr.ec = TALER_JSON_get_error_code (json);
+    swr.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                swfh->url);
+    if (NULL != json)
+    {
+      swr.hr.ec = TALER_JSON_get_error_code (json);
+      swr.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      swr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      swr.hr.hint = TALER_ErrorCode_get_hint (swr.hr.ec);
+    }
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    swr.hr.ec = TALER_JSON_get_error_code (json);
+    swr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_PRECONDITION_FAILED:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    swr.hr.ec = TALER_JSON_get_error_code (json);
+    swr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    swr.hr.ec = TALER_JSON_get_error_code (json);
+    swr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management set wire fee\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) swr.hr.ec);
     break;
   }
   if (NULL != swfh->cb)
   {
     swfh->cb (swfh->cb_cls,
-              &hr);
+              &swr);
     swfh->cb = NULL;
   }
   TALER_EXCHANGE_management_set_wire_fees_cancel (swfh);
@@ -163,21 +178,21 @@ TALER_EXCHANGE_management_set_wire_fees (
                                 validity_end),
     TALER_JSON_pack_amount ("closing_fee",
                             &fees->closing),
-    TALER_JSON_pack_amount ("wad_fee",
-                            &fees->wad),
     TALER_JSON_pack_amount ("wire_fee",
                             &fees->wire));
   eh = TALER_EXCHANGE_curl_easy_get_ (swfh->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&swfh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&swfh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (swfh->url);
-    GNUNET_free (eh);
+    GNUNET_free (swfh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_update_aml_officer.c b/src/lib/exchange_api_management_update_aml_officer.c
new file mode 100644
index 000000000..af0169b02
--- /dev/null
+++ b/src/lib/exchange_api_management_update_aml_officer.c
@@ -0,0 +1,230 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_management_update_aml_officer.c
+ * @brief functions to update AML officer status
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "exchange_api_curl_defaults.h"
+#include "taler_signatures.h"
+#include "taler_curl_lib.h"
+#include "taler_json_lib.h"
+
+
+struct TALER_EXCHANGE_ManagementUpdateAmlOfficer
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Minor context that holds body and headers.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Reference to the execution context.
+   */
+  struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /management/wire request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ManagementAuditorEnableHandle *`
+ * @param response_code HTTP response code, 0 on error
+ * @param response response body, NULL if not in JSON
+ */
+static void
+handle_update_aml_officer_finished (void *cls,
+                                    long response_code,
+                                    const void *response)
+{
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *wh = cls;
+  const json_t *json = response;
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse uar = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
+  };
+
+  wh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    /* no reply */
+    uar.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    uar.hr.hint = "server offline?";
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    uar.hr.ec = TALER_JSON_get_error_code (json);
+    uar.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                wh->url);
+    if (NULL != json)
+    {
+      uar.hr.ec = TALER_JSON_get_error_code (json);
+      uar.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      uar.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      uar.hr.hint = TALER_ErrorCode_get_hint (uar.hr.ec);
+    }
+    break;
+  case MHD_HTTP_CONFLICT:
+    uar.hr.ec = TALER_JSON_get_error_code (json);
+    uar.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    uar.hr.ec = TALER_JSON_get_error_code (json);
+    uar.hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange management update AML officer\n",
+                (unsigned int) response_code,
+                (int) uar.hr.ec);
+    break;
+  }
+  if (NULL != wh->cb)
+  {
+    wh->cb (wh->cb_cls,
+            &uar);
+    wh->cb = NULL;
+  }
+  TALER_EXCHANGE_management_update_aml_officer_cancel (wh);
+}
+
+
+struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *
+TALER_EXCHANGE_management_update_aml_officer (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterSignatureP *master_sig,
+  TALER_EXCHANGE_ManagementUpdateAmlOfficerCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *wh;
+  CURL *eh;
+  json_t *body;
+
+  wh = GNUNET_new (struct TALER_EXCHANGE_ManagementUpdateAmlOfficer);
+  wh->cb = cb;
+  wh->cb_cls = cb_cls;
+  wh->ctx = ctx;
+  wh->url = TALER_url_join (url,
+                            "management/aml-officers",
+                            NULL);
+  if (NULL == wh->url)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not construct request URL.\n");
+    GNUNET_free (wh);
+    return NULL;
+  }
+  body = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("officer_name",
+                             officer_name),
+    GNUNET_JSON_pack_data_auto ("officer_pub",
+                                officer_pub),
+    GNUNET_JSON_pack_data_auto ("master_sig",
+                                master_sig),
+    GNUNET_JSON_pack_bool ("is_active",
+                           is_active),
+    GNUNET_JSON_pack_bool ("read_only",
+                           read_only),
+    GNUNET_JSON_pack_timestamp ("change_date",
+                                change_date));
+  eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&wh->post_ctx,
+                              eh,
+                              body)) )
+  {
+    GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
+    json_decref (body);
+    GNUNET_free (wh->url);
+    GNUNET_free (wh);
+    return NULL;
+  }
+  json_decref (body);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting URL '%s'\n",
+              wh->url);
+  wh->job = GNUNET_CURL_job_add2 (ctx,
+                                  eh,
+                                  wh->post_ctx.headers,
+                                  &handle_update_aml_officer_finished,
+                                  wh);
+  if (NULL == wh->job)
+  {
+    TALER_EXCHANGE_management_update_aml_officer_cancel (wh);
+    return NULL;
+  }
+  return wh;
+}
+
+
+void
+TALER_EXCHANGE_management_update_aml_officer_cancel (
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *wh)
+{
+  if (NULL != wh->job)
+  {
+    GNUNET_CURL_job_cancel (wh->job);
+    wh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&wh->post_ctx);
+  GNUNET_free (wh->url);
+  GNUNET_free (wh);
+}
diff --git a/src/lib/exchange_api_management_wire_disable.c b/src/lib/exchange_api_management_wire_disable.c
index 3bae8e3ab..23b10c58c 100644
--- a/src/lib/exchange_api_management_wire_disable.c
+++ b/src/lib/exchange_api_management_wire_disable.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2021 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -79,9 +79,9 @@ handle_auditor_disable_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementWireDisableHandle *wh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementWireDisableResponse wdr = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   wh->job = NULL;
@@ -89,38 +89,49 @@ handle_auditor_disable_finished (void *cls,
   {
   case 0:
     /* no reply */
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    hr.hint = "server offline?";
+    wdr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    wdr.hr.hint = "server offline?";
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wdr.hr.ec = TALER_JSON_get_error_code (json);
+    wdr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   case MHD_HTTP_NOT_FOUND:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                wh->url);
+    if (NULL != json)
+    {
+      wdr.hr.ec = TALER_JSON_get_error_code (json);
+      wdr.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      wdr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      wdr.hr.hint = TALER_ErrorCode_get_hint (wdr.hr.ec);
+    }
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wdr.hr.ec = TALER_JSON_get_error_code (json);
+    wdr.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wdr.hr.ec = TALER_JSON_get_error_code (json);
+    wdr.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d exchange management disable wire\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) wdr.hr.ec);
     break;
   }
   if (NULL != wh->cb)
   {
     wh->cb (wh->cb_cls,
-            &hr);
+            &wdr);
     wh->cb = NULL;
   }
   TALER_EXCHANGE_management_disable_wire_cancel (wh);
@@ -163,16 +174,18 @@ TALER_EXCHANGE_management_disable_wire (
     GNUNET_JSON_pack_timestamp ("validity_end",
                                 validity_end));
   eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&wh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&wh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (wh->url);
-    GNUNET_free (eh);
+    GNUNET_free (wh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_management_wire_enable.c b/src/lib/exchange_api_management_wire_enable.c
index 6e3dbad19..9a163b558 100644
--- a/src/lib/exchange_api_management_wire_enable.c
+++ b/src/lib/exchange_api_management_wire_enable.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2021 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -79,9 +79,9 @@ handle_auditor_enable_finished (void *cls,
 {
   struct TALER_EXCHANGE_ManagementWireEnableHandle *wh = cls;
   const json_t *json = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .http_status = (unsigned int) response_code,
-    .reply = json
+  struct TALER_EXCHANGE_ManagementWireEnableResponse wer = {
+    .hr.http_status = (unsigned int) response_code,
+    .hr.reply = json
   };
 
   wh->job = NULL;
@@ -89,34 +89,49 @@ handle_auditor_enable_finished (void *cls,
   {
   case 0:
     /* no reply */
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    hr.hint = "server offline?";
+    wer.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    wer.hr.hint = "server offline?";
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wer.hr.ec = TALER_JSON_get_error_code (json);
+    wer.hr.hint = TALER_JSON_get_error_hint (json);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Server did not find handler at `%s'. Did you configure the correct exchange base URL?\n",
+                wh->url);
+    if (NULL != json)
+    {
+      wer.hr.ec = TALER_JSON_get_error_code (json);
+      wer.hr.hint = TALER_JSON_get_error_hint (json);
+    }
+    else
+    {
+      wer.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+      wer.hr.hint = TALER_ErrorCode_get_hint (wer.hr.ec);
+    }
     break;
   case MHD_HTTP_CONFLICT:
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wer.hr.ec = TALER_JSON_get_error_code (json);
+    wer.hr.hint = TALER_JSON_get_error_hint (json);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (json);
-    hr.hint = TALER_JSON_get_error_hint (json);
+    wer.hr.ec = TALER_JSON_get_error_code (json);
+    wer.hr.hint = TALER_JSON_get_error_hint (json);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange management enable wire\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) wer.hr.ec);
     break;
   }
   if (NULL != wh->cb)
   {
     wh->cb (wh->cb_cls,
-            &hr);
+            &wer);
     wh->cb = NULL;
   }
   TALER_EXCHANGE_management_enable_wire_cancel (wh);
@@ -128,9 +143,14 @@ TALER_EXCHANGE_management_enable_wire (
   struct GNUNET_CURL_Context *ctx,
   const char *url,
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp validity_start,
   const struct TALER_MasterSignatureP *master_sig1,
   const struct TALER_MasterSignatureP *master_sig2,
+  const char *bank_label,
+  int64_t priority,
   TALER_EXCHANGE_ManagementWireEnableCallback cb,
   void *cb_cls)
 {
@@ -167,6 +187,18 @@ TALER_EXCHANGE_management_enable_wire (
   body = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_string ("payto_uri",
                              payto_uri),
+    GNUNET_JSON_pack_array_incref ("debit_restrictions",
+                                   (json_t *) debit_restrictions),
+    GNUNET_JSON_pack_array_incref ("credit_restrictions",
+                                   (json_t *) credit_restrictions),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("conversion_url",
+                               conversion_url)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("bank_label",
+                               bank_label)),
+    GNUNET_JSON_pack_int64 ("priority",
+                            priority),
     GNUNET_JSON_pack_data_auto ("master_sig_add",
                                 master_sig1),
     GNUNET_JSON_pack_data_auto ("master_sig_wire",
@@ -174,16 +206,18 @@ TALER_EXCHANGE_management_enable_wire (
     GNUNET_JSON_pack_timestamp ("validity_start",
                                 validity_start));
   eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
-  GNUNET_assert (NULL != eh);
-  if (GNUNET_OK !=
-      TALER_curl_easy_post (&wh->post_ctx,
-                            eh,
-                            body))
+  if ( (NULL == eh) ||
+       (GNUNET_OK !=
+        TALER_curl_easy_post (&wh->post_ctx,
+                              eh,
+                              body)) )
   {
     GNUNET_break (0);
+    if (NULL != eh)
+      curl_easy_cleanup (eh);
     json_decref (body);
     GNUNET_free (wh->url);
-    GNUNET_free (eh);
+    GNUNET_free (wh);
     return NULL;
   }
   json_decref (body);
diff --git a/src/lib/exchange_api_melt.c b/src/lib/exchange_api_melt.c
index 80c759704..c2f8cefb7 100644
--- a/src/lib/exchange_api_melt.c
+++ b/src/lib/exchange_api_melt.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2022 Taler Systems SA
+  Copyright (C) 2015-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
+#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
@@ -40,9 +41,9 @@ struct TALER_EXCHANGE_MeltHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -50,6 +51,16 @@ struct TALER_EXCHANGE_MeltHandle
   char *url;
 
   /**
+   * The exchange base url.
+   */
+  char *exchange_url;
+
+  /**
+   * Curl context.
+   */
+  struct GNUNET_CURL_Context *cctx;
+
+  /**
    * Context for #TEH_curl_easy_post(). Keeps the data that must
    * persist for Curl to make the upload.
    */
@@ -102,6 +113,11 @@ struct TALER_EXCHANGE_MeltHandle
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
   /**
+   * Signature affirming the melt.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
    * @brief Public information about the coin's denomination key
    */
   const struct TALER_EXCHANGE_DenomPublicKey *dki;
@@ -153,7 +169,7 @@ verify_melt_signature_ok (struct TALER_EXCHANGE_MeltHandle *mh,
     return GNUNET_SYSERR;
   }
   /* check that exchange signing key is permitted */
-  key_state = TALER_EXCHANGE_get_keys (mh->exchange);
+  key_state = mh->keys;
   if (GNUNET_OK !=
       TALER_EXCHANGE_test_signing_key (key_state,
                                        exchange_pub))
@@ -184,143 +200,6 @@ verify_melt_signature_ok (struct TALER_EXCHANGE_MeltHandle *mh,
 
 
 /**
- * Verify that the signatures on the "409 CONFLICT" response from the
- * exchange demonstrating customer denomination key differences
- * resulting from coin private key reuse are valid.
- *
- * @param mh melt handle
- * @param json json reply with the signature(s) and transaction history
- * @return #GNUNET_OK if the signature(s) is valid, #GNUNET_SYSERR if not
- */
-static enum GNUNET_GenericReturnValue
-verify_melt_signature_denom_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
-                                      const json_t *json)
-
-{
-  json_t *history;
-  struct TALER_Amount total;
-  struct TALER_DenominationHashP h_denom_pub;
-
-  memset (&h_denom_pub,
-          0,
-          sizeof (h_denom_pub));
-  history = json_object_get (json,
-                             "history");
-  if (GNUNET_OK !=
-      TALER_EXCHANGE_verify_coin_history (mh->dki,
-                                          mh->dki->value.currency,
-                                          &mh->coin_pub,
-                                          history,
-                                          &h_denom_pub,
-                                          &total))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  if (0 != GNUNET_memcmp (&mh->dki->h_key,
-                          &h_denom_pub))
-    return GNUNET_OK; /* indeed, proof with different denomination key provided */
-  /* invalid proof provided */
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Verify that the signatures on the "409 CONFLICT" response from the
- * exchange demonstrating customer double-spending are valid.
- *
- * @param mh melt handle
- * @param json json reply with the signature(s) and transaction history
- * @return #GNUNET_OK if the signature(s) is valid, #GNUNET_SYSERR if not
- */
-static enum GNUNET_GenericReturnValue
-verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
-                                      const json_t *json)
-{
-  json_t *history;
-  struct TALER_Amount total;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("history",
-                           &history),
-    GNUNET_JSON_spec_end ()
-  };
-  const struct MeltedCoin *mc;
-  enum TALER_ErrorCode ec;
-  struct TALER_DenominationHashP h_denom_pub;
-
-  /* parse JSON reply */
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (json,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  /* Find out which coin was deemed problematic by the exchange */
-  mc = &mh->md.melted_coin;
-  /* verify coin history */
-  memset (&h_denom_pub,
-          0,
-          sizeof (h_denom_pub));
-  history = json_object_get (json,
-                             "history");
-  if (GNUNET_OK !=
-      TALER_EXCHANGE_verify_coin_history (mh->dki,
-                                          mc->original_value.currency,
-                                          &mh->coin_pub,
-                                          history,
-                                          &h_denom_pub,
-                                          &total))
-  {
-    GNUNET_break_op (0);
-    json_decref (history);
-    return GNUNET_SYSERR;
-  }
-  json_decref (history);
-
-  ec = TALER_JSON_get_error_code (json);
-  switch (ec)
-  {
-  case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-    /* check if melt operation was really too expensive given history */
-    if (0 >
-        TALER_amount_add (&total,
-                          &total,
-                          &mc->melt_amount_with_fee))
-    {
-      /* clearly not OK if our transaction would have caused
-         the overflow... */
-      return GNUNET_OK;
-    }
-
-    if (0 >= TALER_amount_cmp (&total,
-                               &mc->original_value))
-    {
-      /* transaction should have still fit */
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-
-    /* everything OK, valid proof of double-spending was provided */
-    return GNUNET_OK;
-  case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-    if (0 != GNUNET_memcmp (&mh->dki->h_key,
-                            &h_denom_pub))
-      return GNUNET_OK; /* indeed, proof with different denomination key provided */
-    /* invalid proof provided */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  default:
-    /* unexpected error code */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
  * Function called when we're done processing the
  * HTTP /coins/$COIN_PUB/melt request.
  *
@@ -350,16 +229,16 @@ handle_melt_finished (void *cls,
     if (GNUNET_OK !=
         verify_melt_signature_ok (mh,
                                   j,
-                                  &mr.details.success.sign_key))
+                                  &mr.details.ok.sign_key))
     {
       GNUNET_break_op (0);
       mr.hr.http_status = 0;
       mr.hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
       break;
     }
-    mr.details.success.noreveal_index = mh->noreveal_index;
-    mr.details.success.num_mbds = mh->rd->fresh_pks_len;
-    mr.details.success.mbds = mh->mbds;
+    mr.details.ok.noreveal_index = mh->noreveal_index;
+    mr.details.ok.num_mbds = mh->rd->fresh_pks_len;
+    mr.details.ok.mbds = mh->mbds;
     mh->melt_cb (mh->melt_cb_cls,
                  &mr);
     mh->melt_cb = NULL;
@@ -372,38 +251,7 @@ handle_melt_finished (void *cls,
     break;
   case MHD_HTTP_CONFLICT:
     mr.hr.ec = TALER_JSON_get_error_code (j);
-    switch (mr.hr.ec)
-    {
-    case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-      /* Double spending; check signatures on transaction history */
-      if (GNUNET_OK !=
-          verify_melt_signature_spend_conflict (mh,
-                                                j))
-      {
-        GNUNET_break_op (0);
-        mr.hr.http_status = 0;
-        mr.hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
-        mr.hr.hint = TALER_JSON_get_error_hint (j);
-      }
-      break;
-    case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-      if (GNUNET_OK !=
-          verify_melt_signature_denom_conflict (mh,
-                                                j))
-      {
-        GNUNET_break_op (0);
-        mr.hr.http_status = 0;
-        mr.hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
-        mr.hr.hint = TALER_JSON_get_error_hint (j);
-      }
-      break;
-    default:
-      GNUNET_break_op (0);
-      mr.hr.http_status = 0;
-      mr.hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
-      mr.hr.hint = TALER_JSON_get_error_hint (j);
-      break;
-    }
+    mr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
@@ -455,14 +303,18 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
   const struct TALER_EXCHANGE_Keys *key_state;
   json_t *melt_obj;
   CURL *eh;
-  struct GNUNET_CURL_Context *ctx;
-  struct TALER_CoinSpendSignatureP confirm_sig;
   char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
   struct TALER_DenominationHashP h_denom_pub;
   struct TALER_ExchangeWithdrawValues alg_values[mh->rd->fresh_pks_len];
 
   for (unsigned int i = 0; i<mh->rd->fresh_pks_len; i++)
-    alg_values[i] = mh->mbds[i].alg_value;
+  {
+    if (GNUNET_CRYPTO_BSA_RSA ==
+        mh->rd->fresh_pks[i].key.bsign_pub_key->cipher)
+      alg_values[i] = *TALER_denom_ewv_rsa_singleton ();
+    else
+      alg_values[i] = mh->mbds[i].alg_value;
+  }
   if (GNUNET_OK !=
       TALER_EXCHANGE_get_melt_data_ (&mh->rms,
                                      mh->rd,
@@ -474,13 +326,14 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
   }
   TALER_denom_pub_hash (&mh->md.melted_coin.pub_key,
                         &h_denom_pub);
-  TALER_wallet_melt_sign (&mh->md.melted_coin.melt_amount_with_fee,
-                          &mh->md.melted_coin.fee_melt,
-                          &mh->md.rc,
-                          &h_denom_pub,
-                          mh->md.melted_coin.h_age_commitment,
-                          &mh->md.melted_coin.coin_priv,
-                          &confirm_sig);
+  TALER_wallet_melt_sign (
+    &mh->md.melted_coin.melt_amount_with_fee,
+    &mh->md.melted_coin.fee_melt,
+    &mh->md.rc,
+    &h_denom_pub,
+    mh->md.melted_coin.h_age_commitment,
+    &mh->md.melted_coin.coin_priv,
+    &mh->coin_sig);
   GNUNET_CRYPTO_eddsa_key_get_public (&mh->md.melted_coin.coin_priv.eddsa_priv,
                                       &mh->coin_pub.eddsa_pub);
   melt_obj = GNUNET_JSON_PACK (
@@ -489,13 +342,13 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
     TALER_JSON_pack_denom_sig ("denom_sig",
                                &mh->md.melted_coin.sig),
     GNUNET_JSON_pack_data_auto ("confirm_sig",
-                                &confirm_sig),
+                                &mh->coin_sig),
     TALER_JSON_pack_amount ("value_with_fee",
                             &mh->md.melted_coin.melt_amount_with_fee),
     GNUNET_JSON_pack_data_auto ("rc",
                                 &mh->md.rc),
     GNUNET_JSON_pack_allow_null (
-      mh->md.melted_coin.h_age_commitment
+      (NULL != mh->md.melted_coin.h_age_commitment)
       ? GNUNET_JSON_pack_data_auto ("age_commitment_hash",
                                     mh->md.melted_coin.h_age_commitment)
       : GNUNET_JSON_pack_string ("age_commitment_hash",
@@ -518,19 +371,19 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/coins/%s/melt",
+                     "coins/%s/melt",
                      pub_str);
   }
 
-  ctx = TEAH_handle_to_context (mh->exchange);
-  key_state = TALER_EXCHANGE_get_keys (mh->exchange);
+  key_state = mh->keys;
   mh->dki = TALER_EXCHANGE_get_denomination_key (key_state,
                                                  &mh->md.melted_coin.pub_key);
 
   /* and now we can at last begin the actual request handling */
 
-  mh->url = TEAH_path_to_url (mh->exchange,
-                              arg_str);
+  mh->url = TALER_url_join (mh->exchange_url,
+                            arg_str,
+                            NULL);
   if (NULL == mh->url)
   {
     json_decref (melt_obj);
@@ -550,7 +403,7 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
     return GNUNET_SYSERR;
   }
   json_decref (melt_obj);
-  mh->job = GNUNET_CURL_job_add2 (ctx,
+  mh->job = GNUNET_CURL_job_add2 (mh->cctx,
                                   eh,
                                   mh->ctx.headers,
                                   &handle_melt_finished,
@@ -564,6 +417,7 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh)
  * the application and cancel the operation.
  *
  * @param[in] mh melt request that failed
+ * @param ec error code to fail with
  */
 static void
 fail_mh (struct TALER_EXCHANGE_MeltHandle *mh,
@@ -612,19 +466,18 @@ csr_cb (void *cls,
       &mh->rd->fresh_pks[i];
     struct TALER_ExchangeWithdrawValues *wv = &mh->mbds[i].alg_value;
 
-    switch (fresh_pk->key.cipher)
+    switch (fresh_pk->key.bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_INVALID:
+    case GNUNET_CRYPTO_BSA_INVALID:
       GNUNET_break (0);
       fail_mh (mh,
                TALER_EC_GENERIC_CLIENT_INTERNAL_ERROR);
       return;
-    case TALER_DENOMINATION_RSA:
-      GNUNET_assert (TALER_DENOMINATION_RSA == wv->cipher);
+    case GNUNET_CRYPTO_BSA_RSA:
       break;
-    case TALER_DENOMINATION_CS:
-      GNUNET_assert (TALER_DENOMINATION_CS == wv->cipher);
-      *wv = csrr->details.success.alg_values[nks_off];
+    case GNUNET_CRYPTO_BSA_CS:
+      TALER_denom_ewv_copy (wv,
+                            &csrr->details.ok.alg_values[nks_off]);
       nks_off++;
       break;
     }
@@ -642,11 +495,14 @@ csr_cb (void *cls,
 
 
 struct TALER_EXCHANGE_MeltHandle *
-TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange,
-                     const struct TALER_RefreshMasterSecretP *rms,
-                     const struct TALER_EXCHANGE_RefreshData *rd,
-                     TALER_EXCHANGE_MeltCallback melt_cb,
-                     void *melt_cb_cls)
+TALER_EXCHANGE_melt (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_RefreshMasterSecretP *rms,
+  const struct TALER_EXCHANGE_RefreshData *rd,
+  TALER_EXCHANGE_MeltCallback melt_cb,
+  void *melt_cb_cls)
 {
   struct TALER_EXCHANGE_NonceKey nks[GNUNET_NZL (rd->fresh_pks_len)];
   unsigned int nks_off = 0;
@@ -657,11 +513,10 @@ TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange,
     GNUNET_break (0);
     return NULL;
   }
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   mh = GNUNET_new (struct TALER_EXCHANGE_MeltHandle);
   mh->noreveal_index = TALER_CNC_KAPPA; /* invalid value */
-  mh->exchange = exchange;
+  mh->cctx = ctx;
+  mh->exchange_url = GNUNET_strdup (url);
   mh->rd = rd;
   mh->rms = *rms;
   mh->melt_cb = melt_cb;
@@ -671,29 +526,30 @@ TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange,
   for (unsigned int i = 0; i<rd->fresh_pks_len; i++)
   {
     const struct TALER_EXCHANGE_DenomPublicKey *fresh_pk = &rd->fresh_pks[i];
-    struct TALER_ExchangeWithdrawValues *wv = &mh->mbds[i].alg_value;
 
-    switch (fresh_pk->key.cipher)
+    switch (fresh_pk->key.bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_INVALID:
+    case GNUNET_CRYPTO_BSA_INVALID:
       GNUNET_break (0);
       GNUNET_free (mh->mbds);
       GNUNET_free (mh);
       return NULL;
-    case TALER_DENOMINATION_RSA:
-      wv->cipher = TALER_DENOMINATION_RSA;
+    case GNUNET_CRYPTO_BSA_RSA:
+      TALER_denom_ewv_copy (&mh->mbds[i].alg_value,
+                            TALER_denom_ewv_rsa_singleton ());
       break;
-    case TALER_DENOMINATION_CS:
-      wv->cipher = TALER_DENOMINATION_CS;
+    case GNUNET_CRYPTO_BSA_CS:
       nks[nks_off].pk = fresh_pk;
       nks[nks_off].cnc_num = nks_off;
       nks_off++;
       break;
     }
   }
+  mh->keys = TALER_EXCHANGE_keys_incref (keys);
   if (0 != nks_off)
   {
-    mh->csr = TALER_EXCHANGE_csr_melt (exchange,
+    mh->csr = TALER_EXCHANGE_csr_melt (ctx,
+                                       url,
                                        rms,
                                        nks_off,
                                        nks,
@@ -721,6 +577,8 @@ TALER_EXCHANGE_melt (struct TALER_EXCHANGE_Handle *exchange,
 void
 TALER_EXCHANGE_melt_cancel (struct TALER_EXCHANGE_MeltHandle *mh)
 {
+  for (unsigned int i = 0; i<mh->rd->fresh_pks_len; i++)
+    TALER_denom_ewv_free (&mh->mbds[i].alg_value);
   if (NULL != mh->job)
   {
     GNUNET_CURL_job_cancel (mh->job);
@@ -734,7 +592,9 @@ TALER_EXCHANGE_melt_cancel (struct TALER_EXCHANGE_MeltHandle *mh)
   TALER_EXCHANGE_free_melt_data_ (&mh->md); /* does not free 'md' itself */
   GNUNET_free (mh->mbds);
   GNUNET_free (mh->url);
+  GNUNET_free (mh->exchange_url);
   TALER_curl_easy_post_finished (&mh->ctx);
+  TALER_EXCHANGE_keys_decref (mh->keys);
   GNUNET_free (mh);
 }
 
diff --git a/src/lib/exchange_api_purse_create_with_deposit.c b/src/lib/exchange_api_purse_create_with_deposit.c
index 60f0f7361..fff898e57 100644
--- a/src/lib/exchange_api_purse_create_with_deposit.c
+++ b/src/lib/exchange_api_purse_create_with_deposit.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2022-2023 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
@@ -29,20 +29,53 @@
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
+#include "exchange_api_common.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
 
 
 /**
+ * Information we track per deposited coin.
+ */
+struct Deposit
+{
+  /**
+   * Coin's public key.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Signature made with the coin.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * Coin's denomination.
+   */
+  struct TALER_DenominationHashP h_denom_pub;
+
+  /**
+   * Age restriction hash for the coin.
+   */
+  struct TALER_AgeCommitmentHash ahac;
+
+  /**
+   * How much did we say the coin contributed.
+   */
+  struct TALER_Amount contribution;
+};
+
+
+/**
  * @brief A purse create with deposit handle
  */
 struct TALER_EXCHANGE_PurseCreateDepositHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -50,6 +83,11 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle
   char *url;
 
   /**
+   * The base URL of the exchange.
+   */
+  char *exchange_url;
+
+  /**
    * Context for #TEH_curl_easy_post(). Keeps the data that must
    * persist for Curl to make the upload.
    */
@@ -76,6 +114,11 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle
   struct TALER_Amount purse_value_after_fees;
 
   /**
+   * Our encrypted contract (if we had any).
+   */
+  struct TALER_EncryptedContract econtract;
+
+  /**
    * Public key of the merge capability.
    */
   struct TALER_PurseMergePublicKeyP merge_pub;
@@ -86,7 +129,12 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle
   struct TALER_PurseContractPublicKeyP purse_pub;
 
   /**
-   * Hash over the purse's contrac terms.
+   * Signature with the purse key on the request.
+   */
+  struct TALER_PurseContractSignatureP purse_sig;
+
+  /**
+   * Hash over the purse's contract terms.
    */
   struct TALER_PrivateContractHashP h_contract_terms;
 
@@ -94,6 +142,17 @@ struct TALER_EXCHANGE_PurseCreateDepositHandle
    * When does the purse expire.
    */
   struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Array of @e num_deposit deposits.
+   */
+  struct Deposit *deposits;
+
+  /**
+   * How many deposits did we make?
+   */
+  unsigned int num_deposits;
+
 };
 
 
@@ -116,6 +175,7 @@ handle_purse_create_deposit_finished (void *cls,
     .hr.reply = j,
     .hr.http_status = (unsigned int) response_code
   };
+  const struct TALER_EXCHANGE_Keys *keys = pch->keys;
 
   pch->job = NULL;
   switch (response_code)
@@ -125,7 +185,6 @@ handle_purse_create_deposit_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     {
-      const struct TALER_EXCHANGE_Keys *key_state;
       struct GNUNET_TIME_Timestamp etime;
       struct TALER_Amount total_deposited;
       struct TALER_ExchangeSignatureP exchange_sig;
@@ -153,9 +212,8 @@ handle_purse_create_deposit_finished (void *cls,
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
-      key_state = TALER_EXCHANGE_get_keys (pch->exchange);
       if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
+          TALER_EXCHANGE_test_signing_key (keys,
                                            &exchange_pub))
       {
         GNUNET_break_op (0);
@@ -170,7 +228,6 @@ handle_purse_create_deposit_finished (void *cls,
             &pch->purse_value_after_fees,
             &total_deposited,
             &pch->purse_pub,
-            &pch->merge_pub,
             &pch->h_contract_terms,
             &exchange_pub,
             &exchange_sig))
@@ -202,7 +259,116 @@ handle_purse_create_deposit_finished (void *cls,
        happen, we should pass the JSON reply to the application */
     break;
   case MHD_HTTP_CONFLICT:
-    // FIXME: check reply!
+    {
+      dr.hr.ec = TALER_JSON_get_error_code (j);
+      switch (dr.hr.ec)
+      {
+      case TALER_EC_EXCHANGE_PURSE_CREATE_CONFLICTING_META_DATA:
+        if (GNUNET_OK !=
+            TALER_EXCHANGE_check_purse_create_conflict_ (
+              &pch->purse_sig,
+              &pch->purse_pub,
+              j))
+        {
+          GNUNET_break_op (0);
+          dr.hr.http_status = 0;
+          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+          break;
+        }
+        break;
+      case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
+        /* Nothing to check anymore here, proof needs to be
+           checked in the GET /coins/$COIN_PUB handler */
+        break;
+      case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
+        // FIXME #7267: write check (add to exchange_api_common! */
+        break;
+      case TALER_EC_EXCHANGE_PURSE_DEPOSIT_CONFLICTING_META_DATA:
+        {
+          struct TALER_CoinSpendPublicKeyP coin_pub;
+          struct TALER_CoinSpendSignatureP coin_sig;
+          struct TALER_DenominationHashP h_denom_pub;
+          struct TALER_AgeCommitmentHash phac;
+          bool found = false;
+
+          if (GNUNET_OK !=
+              TALER_EXCHANGE_check_purse_coin_conflict_ (
+                &pch->purse_pub,
+                pch->exchange_url,
+                j,
+                &h_denom_pub,
+                &phac,
+                &coin_pub,
+                &coin_sig))
+          {
+            GNUNET_break_op (0);
+            dr.hr.http_status = 0;
+            dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+            break;
+          }
+          for (unsigned int i = 0; i<pch->num_deposits; i++)
+          {
+            struct Deposit *deposit = &pch->deposits[i];
+
+            if (0 !=
+                GNUNET_memcmp (&coin_pub,
+                               &deposit->coin_pub))
+              continue;
+            if (0 !=
+                GNUNET_memcmp (&deposit->h_denom_pub,
+                               &h_denom_pub))
+            {
+              found = true;
+              break;
+            }
+            if (0 !=
+                GNUNET_memcmp (&deposit->ahac,
+                               &phac))
+            {
+              found = true;
+              break;
+            }
+            if (0 ==
+                GNUNET_memcmp (&coin_sig,
+                               &deposit->coin_sig))
+            {
+              GNUNET_break_op (0);
+              continue;
+            }
+            found = true;
+            break;
+          }
+          if (! found)
+          {
+            /* conflict is for a different coin! */
+            GNUNET_break_op (0);
+            dr.hr.http_status = 0;
+            dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+            break;
+          }
+        }
+      case TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA:
+        if (GNUNET_OK !=
+            TALER_EXCHANGE_check_purse_econtract_conflict_ (
+              &pch->econtract.econtract_sig,
+              &pch->purse_pub,
+              j))
+        {
+          GNUNET_break_op (0);
+          dr.hr.http_status = 0;
+          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+          break;
+        }
+        break;
+      default:
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Unexpected error code %d for conflcting deposit\n",
+                    dr.hr.ec);
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      }
+    }
     break;
   case MHD_HTTP_GONE:
     /* could happen if denomination was revoked */
@@ -237,31 +403,27 @@ handle_purse_create_deposit_finished (void *cls,
 
 struct TALER_EXCHANGE_PurseCreateDepositHandle *
 TALER_EXCHANGE_purse_create_with_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
   const struct TALER_ContractDiffiePrivateP *contract_priv,
   const json_t *contract_terms,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   bool upload_contract,
   TALER_EXCHANGE_PurseCreateDepositCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_PurseCreateDepositHandle *pch;
-  struct GNUNET_CURL_Context *ctx;
   json_t *create_obj;
   json_t *deposit_arr;
   CURL *eh;
-  struct TALER_PurseContractSignatureP purse_sig;
-  struct TALER_PurseContractSignatureP econtract_sig;
-  struct TALER_ContractDiffiePublicP contract_pub;
   char arg_str[sizeof (pch->purse_pub) * 2 + 32];
-  char *url;
   uint32_t min_age = 0;
 
   pch = GNUNET_new (struct TALER_EXCHANGE_PurseCreateDepositHandle);
-  pch->exchange = exchange;
   pch->cb = cb;
   pch->cb_cls = cb_cls;
   {
@@ -286,8 +448,6 @@ TALER_EXCHANGE_purse_create_with_deposit (
       return NULL;
     }
   }
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   if (GNUNET_OK !=
       TALER_JSON_contract_hash (contract_terms,
                                 &pch->h_contract_terms))
@@ -309,71 +469,77 @@ TALER_EXCHANGE_purse_create_with_deposit (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/purses/%s/create",
+                     "purses/%s/create",
                      pub_str);
   }
-  GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
-                                      &contract_pub.ecdhe_pub);
   GNUNET_CRYPTO_eddsa_key_get_public (&merge_priv->eddsa_priv,
                                       &pch->merge_pub.eddsa_pub);
-  pch->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  pch->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == pch->url)
   {
     GNUNET_break (0);
     GNUNET_free (pch);
     return NULL;
   }
+  pch->num_deposits = num_deposits;
+  pch->deposits = GNUNET_new_array (num_deposits,
+                                    struct Deposit);
   deposit_arr = json_array ();
   GNUNET_assert (NULL != deposit_arr);
-  url = TEAH_path_to_url (exchange,
-                          "/");
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Signing with URL `%s'\n",
               url);
   for (unsigned int i = 0; i<num_deposits; i++)
   {
     const struct TALER_EXCHANGE_PurseDeposit *deposit = &deposits[i];
+    const struct TALER_AgeCommitmentProof *acp = deposit->age_commitment_proof;
+    struct Deposit *d = &pch->deposits[i];
     json_t *jdeposit;
-    struct TALER_CoinSpendSignatureP coin_sig;
-    struct TALER_CoinSpendPublicKeyP coin_pub;
-#if FIXME_OEC
-    struct TALER_AgeCommitmentHash agh;
     struct TALER_AgeCommitmentHash *aghp = NULL;
     struct TALER_AgeAttestation attest;
+    struct TALER_AgeAttestation *attestp = NULL;
 
-    TALER_age_commitment_hash (&deposit->age_commitment,
-                               &agh);
-    aghp = &agh;
-    if (GNUNET_OK !=
-        TALER_age_commitment_attest (&deposit->age_proof,
-                                     min_age,
-                                     &attest))
+    if (NULL != acp)
     {
-      GNUNET_break (0);
-      json_decref (deposit_arr);
-      GNUNET_free (url);
-      GNUNET_free (pch);
-      return NULL;
+      TALER_age_commitment_hash (&acp->commitment,
+                                 &d->ahac);
+      aghp = &d->ahac;
+      if (GNUNET_OK !=
+          TALER_age_commitment_attest (acp,
+                                       min_age,
+                                       &attest))
+      {
+        GNUNET_break (0);
+        GNUNET_array_grow (pch->deposits,
+                           pch->num_deposits,
+                           0);
+        GNUNET_free (pch->url);
+        json_decref (deposit_arr);
+        GNUNET_free (pch);
+        return NULL;
+      }
     }
-#endif
+    d->contribution = deposit->amount;
+    d->h_denom_pub = deposit->h_denom_pub;
     GNUNET_CRYPTO_eddsa_key_get_public (&deposit->coin_priv.eddsa_priv,
-                                        &coin_pub.eddsa_pub);
+                                        &d->coin_pub.eddsa_pub);
     TALER_wallet_purse_deposit_sign (
       url,
       &pch->purse_pub,
       &deposit->amount,
+      &d->h_denom_pub,
+      &d->ahac,
       &deposit->coin_priv,
-      &coin_sig);
+      &d->coin_sig);
     jdeposit = GNUNET_JSON_PACK (
-#if FIXME_OEC
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_data_auto ("h_age_commitment",
                                     aghp)),
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_data_auto ("age_attestation",
-                                    &attest)),
-#endif
+                                    attestp)),
       TALER_JSON_pack_amount ("amount",
                               &deposit->amount),
       GNUNET_JSON_pack_data_auto ("denom_pub_hash",
@@ -381,72 +547,56 @@ TALER_EXCHANGE_purse_create_with_deposit (
       TALER_JSON_pack_denom_sig ("ub_sig",
                                  &deposit->denom_sig),
       GNUNET_JSON_pack_data_auto ("coin_sig",
-                                  &coin_sig),
+                                  &d->coin_sig),
       GNUNET_JSON_pack_data_auto ("coin_pub",
-                                  &coin_pub));
+                                  &d->coin_pub));
     GNUNET_assert (0 ==
                    json_array_append_new (deposit_arr,
                                           jdeposit));
   }
-  GNUNET_free (url);
   TALER_wallet_purse_create_sign (pch->purse_expiration,
                                   &pch->h_contract_terms,
                                   &pch->merge_pub,
                                   min_age,
                                   &pch->purse_value_after_fees,
                                   purse_priv,
-                                  &purse_sig);
+                                  &pch->purse_sig);
+  if (upload_contract)
   {
-    void *econtract = NULL;
-    size_t econtract_size = 0;
-
-    if (upload_contract)
-    {
-      TALER_CRYPTO_contract_encrypt_for_merge (&pch->purse_pub,
-                                               contract_priv,
-                                               merge_priv,
-                                               contract_terms,
-                                               &econtract,
-                                               &econtract_size);
-      TALER_wallet_econtract_upload_sign (econtract,
-                                          econtract_size,
-                                          &contract_pub,
-                                          purse_priv,
-                                          &econtract_sig);
-    }
-    create_obj = GNUNET_JSON_PACK (
-      TALER_JSON_pack_amount ("amount",
-                              &pch->purse_value_after_fees),
-      GNUNET_JSON_pack_uint64 ("min_age",
-                               min_age),
-      GNUNET_JSON_pack_allow_null (
-        GNUNET_JSON_pack_data_varsize ("econtract",
-                                       econtract,
-                                       econtract_size)),
-      GNUNET_JSON_pack_allow_null (
-        (upload_contract)
-        ? GNUNET_JSON_pack_data_auto ("contract_pub",
-                                      &contract_pub)
-        : GNUNET_JSON_pack_string ("dummy",
-                                   NULL)),
-      GNUNET_JSON_pack_allow_null (
-        (upload_contract)
-        ? GNUNET_JSON_pack_data_auto ("econtract_sig",
-                                      &econtract_sig)
-        : GNUNET_JSON_pack_string ("dummy2",
-                                   NULL)),
-      GNUNET_JSON_pack_data_auto ("purse_sig",
-                                  &purse_sig),
-      GNUNET_JSON_pack_data_auto ("merge_pub",
-                                  &pch->merge_pub),
-      GNUNET_JSON_pack_data_auto ("h_contract_terms",
-                                  &pch->h_contract_terms),
-      GNUNET_JSON_pack_timestamp ("purse_expiration",
-                                  pch->purse_expiration),
-      GNUNET_JSON_pack_array_steal ("deposits",
-                                    deposit_arr));
-    GNUNET_free (econtract);
+    TALER_CRYPTO_contract_encrypt_for_merge (&pch->purse_pub,
+                                             contract_priv,
+                                             merge_priv,
+                                             contract_terms,
+                                             &pch->econtract.econtract,
+                                             &pch->econtract.econtract_size);
+    GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
+                                        &pch->econtract.contract_pub.ecdhe_pub);
+    TALER_wallet_econtract_upload_sign (pch->econtract.econtract,
+                                        pch->econtract.econtract_size,
+                                        &pch->econtract.contract_pub,
+                                        purse_priv,
+                                        &pch->econtract.econtract_sig);
   }
+  create_obj = GNUNET_JSON_PACK (
+    TALER_JSON_pack_amount ("amount",
+                            &pch->purse_value_after_fees),
+    GNUNET_JSON_pack_uint64 ("min_age",
+                             min_age),
+    GNUNET_JSON_pack_allow_null (
+      TALER_JSON_pack_econtract ("econtract",
+                                 upload_contract
+                                 ? &pch->econtract
+                                 : NULL)),
+    GNUNET_JSON_pack_data_auto ("purse_sig",
+                                &pch->purse_sig),
+    GNUNET_JSON_pack_data_auto ("merge_pub",
+                                &pch->merge_pub),
+    GNUNET_JSON_pack_data_auto ("h_contract_terms",
+                                &pch->h_contract_terms),
+    GNUNET_JSON_pack_timestamp ("purse_expiration",
+                                pch->purse_expiration),
+    GNUNET_JSON_pack_array_steal ("deposits",
+                                  deposit_arr));
   GNUNET_assert (NULL != create_obj);
   eh = TALER_EXCHANGE_curl_easy_get_ (pch->url);
   if ( (NULL == eh) ||
@@ -459,6 +609,10 @@ TALER_EXCHANGE_purse_create_with_deposit (
     if (NULL != eh)
       curl_easy_cleanup (eh);
     json_decref (create_obj);
+    GNUNET_free (pch->econtract.econtract);
+    GNUNET_array_grow (pch->deposits,
+                       pch->num_deposits,
+                       0);
     GNUNET_free (pch->url);
     GNUNET_free (pch);
     return NULL;
@@ -467,7 +621,8 @@ TALER_EXCHANGE_purse_create_with_deposit (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for purse create with deposit: `%s'\n",
               pch->url);
-  ctx = TEAH_handle_to_context (exchange);
+  pch->keys = TALER_EXCHANGE_keys_incref (keys);
+  pch->exchange_url = GNUNET_strdup (url);
   pch->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    pch->ctx.headers,
@@ -486,7 +641,13 @@ TALER_EXCHANGE_purse_create_with_deposit_cancel (
     GNUNET_CURL_job_cancel (pch->job);
     pch->job = NULL;
   }
+  GNUNET_free (pch->econtract.econtract);
+  GNUNET_free (pch->exchange_url);
   GNUNET_free (pch->url);
+  GNUNET_array_grow (pch->deposits,
+                     pch->num_deposits,
+                     0);
+  TALER_EXCHANGE_keys_decref (pch->keys);
   TALER_curl_easy_post_finished (&pch->ctx);
   GNUNET_free (pch);
 }
diff --git a/src/lib/exchange_api_purse_create_with_merge.c b/src/lib/exchange_api_purse_create_with_merge.c
index 35d52b915..0c8878342 100644
--- a/src/lib/exchange_api_purse_create_with_merge.c
+++ b/src/lib/exchange_api_purse_create_with_merge.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2022-2023 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
@@ -29,6 +29,7 @@
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
+#include "exchange_api_common.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
 
@@ -40,9 +41,9 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -50,6 +51,11 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle
   char *url;
 
   /**
+   * The exchange base URL.
+   */
+  char *exchange_url;
+
+  /**
    * Context for #TEH_curl_easy_post(). Keeps the data that must
    * persist for Curl to make the upload.
    */
@@ -71,6 +77,11 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle
   void *cb_cls;
 
   /**
+   * The encrypted contract (if any).
+   */
+  struct TALER_EncryptedContract econtract;
+
+  /**
    * Expected value in the purse after fees.
    */
   struct TALER_Amount purse_value_after_fees;
@@ -81,11 +92,31 @@ struct TALER_EXCHANGE_PurseCreateMergeHandle
   struct TALER_ReservePublicKeyP reserve_pub;
 
   /**
+   * Reserve signature affirming our merge.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Merge capability key.
+   */
+  struct TALER_PurseMergePublicKeyP merge_pub;
+
+  /**
+   * Our merge signature (if any).
+   */
+  struct TALER_PurseMergeSignatureP merge_sig;
+
+  /**
    * Public key of the purse.
    */
   struct TALER_PurseContractPublicKeyP purse_pub;
 
   /**
+   * Request data we signed over.
+   */
+  struct TALER_PurseContractSignatureP purse_sig;
+
+  /**
    * Hash over the purse's contrac terms.
    */
   struct TALER_PrivateContractHashP h_contract_terms;
@@ -119,7 +150,8 @@ handle_purse_create_with_merge_finished (void *cls,
   const json_t *j = response;
   struct TALER_EXCHANGE_PurseCreateMergeResponse dr = {
     .hr.reply = j,
-    .hr.http_status = (unsigned int) response_code
+    .hr.http_status = (unsigned int) response_code,
+    .reserve_sig = &pcm->reserve_sig
   };
 
   pcm->job = NULL;
@@ -130,13 +162,13 @@ handle_purse_create_with_merge_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     {
-#if FIXME
-      const struct TALER_EXCHANGE_Keys *key_state;
       struct GNUNET_TIME_Timestamp etime;
       struct TALER_Amount total_deposited;
       struct TALER_ExchangeSignatureP exchange_sig;
       struct TALER_ExchangePublicKeyP exchange_pub;
       struct GNUNET_JSON_Specification spec[] = {
+        TALER_JSON_spec_amount_any ("total_deposited",
+                                    &total_deposited),
         GNUNET_JSON_spec_fixed_auto ("exchange_sig",
                                      &exchange_sig),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
@@ -156,36 +188,31 @@ handle_purse_create_with_merge_finished (void *cls,
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
-      key_state = TALER_EXCHANGE_get_keys (pcm->exchange);
       if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
+          TALER_EXCHANGE_test_signing_key (pcm->keys,
                                            &exchange_pub))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
-        dr.hr.ec =
-          TALER_EC_EXCHANGE_PURSE_CREATE_WITH_MERGE_EXCHANGE_SIGNATURE_INVALID;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
       if (GNUNET_OK !=
-          TALER_exchange_online_purse_create_with_merged_verify (
+          TALER_exchange_online_purse_created_verify (
             etime,
             pcm->purse_expiration,
             &pcm->purse_value_after_fees,
+            &total_deposited,
             &pcm->purse_pub,
             &pcm->h_contract_terms,
-            &pcm->reserve_pub,
-            pcm->provider_url,
             &exchange_pub,
             &exchange_sig))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
-        dr.hr.ec =
-          TALER_EC_EXCHANGE_PURSE_CREATE_WITH_MERGE_EXCHANGE_SIGNATURE_INVALID;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
-#endif
     }
     break;
   case MHD_HTTP_BAD_REQUEST:
@@ -208,7 +235,59 @@ handle_purse_create_with_merge_finished (void *cls,
        happen, we should pass the JSON reply to the application */
     break;
   case MHD_HTTP_CONFLICT:
-    // FIXME: check reply!
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    switch (dr.hr.ec)
+    {
+    case TALER_EC_EXCHANGE_RESERVES_PURSE_CREATE_CONFLICTING_META_DATA:
+      if (GNUNET_OK !=
+          TALER_EXCHANGE_check_purse_create_conflict_ (
+            &pcm->purse_sig,
+            &pcm->purse_pub,
+            j))
+      {
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      break;
+    case TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_CONFLICTING_META_DATA:
+      if (GNUNET_OK !=
+          TALER_EXCHANGE_check_purse_merge_conflict_ (
+            &pcm->merge_sig,
+            &pcm->merge_pub,
+            &pcm->purse_pub,
+            pcm->exchange_url,
+            j))
+      {
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      break;
+    case TALER_EC_EXCHANGE_RESERVES_PURSE_CREATE_INSUFFICIENT_FUNDS:
+      /* nothing to verify */
+      break;
+    case TALER_EC_EXCHANGE_PURSE_ECONTRACT_CONFLICTING_META_DATA:
+      if (GNUNET_OK !=
+          TALER_EXCHANGE_check_purse_econtract_conflict_ (
+            &pcm->econtract.econtract_sig,
+            &pcm->purse_pub,
+            j))
+      {
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      break;
+    default:
+      /* unexpected EC! */
+      GNUNET_break_op (0);
+      dr.hr.http_status = 0;
+      dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      break;
+    } /* end inner (EC) switch */
     break;
   case MHD_HTTP_GONE:
     /* could happen if denomination was revoked */
@@ -218,6 +297,27 @@ handle_purse_create_with_merge_finished (void *cls,
     dr.hr.ec = TALER_JSON_get_error_code (j);
     dr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_uint64 (
+          "requirement_row",
+          &dr.details.unavailable_for_legal_reasons.requirement_row),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+    break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     dr.hr.ec = TALER_JSON_get_error_code (j);
     dr.hr.hint = TALER_JSON_get_error_hint (j);
@@ -243,7 +343,9 @@ handle_purse_create_with_merge_finished (void *cls,
 
 struct TALER_EXCHANGE_PurseCreateMergeHandle *
 TALER_EXCHANGE_purse_create_with_merge (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -256,24 +358,14 @@ TALER_EXCHANGE_purse_create_with_merge (
   void *cb_cls)
 {
   struct TALER_EXCHANGE_PurseCreateMergeHandle *pcm;
-  struct GNUNET_CURL_Context *ctx;
   json_t *create_with_merge_obj;
   CURL *eh;
-  struct TALER_ReserveSignatureP reserve_sig;
   char arg_str[sizeof (pcm->reserve_pub) * 2 + 32];
   uint32_t min_age = 0;
-  struct TALER_PurseMergePublicKeyP merge_pub;
-  struct TALER_PurseMergeSignatureP merge_sig;
-  struct TALER_ContractDiffiePublicP contract_pub;
-  struct TALER_PurseContractSignatureP contract_sig;
-  struct TALER_PurseContractSignatureP purse_sig;
-  void *econtract = NULL;
-  size_t econtract_size = 0;
   struct TALER_Amount purse_fee;
   enum TALER_WalletAccountMergeFlags flags;
 
   pcm = GNUNET_new (struct TALER_EXCHANGE_PurseCreateMergeHandle);
-  pcm->exchange = exchange;
   pcm->cb = cb;
   pcm->cb_cls = cb_cls;
   if (GNUNET_OK !=
@@ -284,16 +376,13 @@ TALER_EXCHANGE_purse_create_with_merge (
     GNUNET_free (pcm);
     return NULL;
   }
-  pcm->h_contract_terms = pcm->h_contract_terms;
   pcm->merge_timestamp = merge_timestamp;
   GNUNET_CRYPTO_eddsa_key_get_public (&purse_priv->eddsa_priv,
                                       &pcm->purse_pub.eddsa_pub);
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                       &pcm->reserve_pub.eddsa_pub);
   GNUNET_CRYPTO_eddsa_key_get_public (&merge_priv->eddsa_priv,
-                                      &merge_pub.eddsa_pub);
-  GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
-                                      &contract_pub.ecdhe_pub);
+                                      &pcm->merge_pub.eddsa_pub);
 
   {
     struct GNUNET_JSON_Specification spec[] = {
@@ -323,20 +412,19 @@ TALER_EXCHANGE_purse_create_with_merge (
     const struct TALER_EXCHANGE_GlobalFee *gf;
 
     gf = TALER_EXCHANGE_get_global_fee (
-      TALER_EXCHANGE_get_keys (exchange),
+      keys,
       GNUNET_TIME_timestamp_get ());
     purse_fee = gf->fees.purse;
     flags = TALER_WAMF_MODE_CREATE_WITH_PURSE_FEE;
   }
   else
   {
-    TALER_amount_set_zero (pcm->purse_value_after_fees.currency,
-                           &purse_fee);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (pcm->purse_value_after_fees.currency,
+                                          &purse_fee));
     flags = TALER_WAMF_MODE_CREATE_FROM_PURSE_QUOTA;
   }
 
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   {
     char pub_str[sizeof (pcm->reserve_pub) * 2];
     char *end;
@@ -349,11 +437,12 @@ TALER_EXCHANGE_purse_create_with_merge (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/reserves/%s/purse",
+                     "reserves/%s/purse",
                      pub_str);
   }
-  pcm->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  pcm->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == pcm->url)
   {
     GNUNET_break (0);
@@ -362,16 +451,23 @@ TALER_EXCHANGE_purse_create_with_merge (
   }
   TALER_wallet_purse_create_sign (pcm->purse_expiration,
                                   &pcm->h_contract_terms,
-                                  &merge_pub,
+                                  &pcm->merge_pub,
                                   min_age,
                                   &pcm->purse_value_after_fees,
                                   purse_priv,
-                                  &purse_sig);
-  TALER_wallet_purse_merge_sign (exchange->url,
-                                 merge_timestamp,
-                                 &pcm->purse_pub,
-                                 merge_priv,
-                                 &merge_sig);
+                                  &pcm->purse_sig);
+  {
+    char *payto_uri;
+
+    payto_uri = TALER_reserve_make_payto (url,
+                                          &pcm->reserve_pub);
+    TALER_wallet_purse_merge_sign (payto_uri,
+                                   merge_timestamp,
+                                   &pcm->purse_pub,
+                                   merge_priv,
+                                   &pcm->merge_sig);
+    GNUNET_free (payto_uri);
+  }
   TALER_wallet_account_merge_sign (merge_timestamp,
                                    &pcm->purse_pub,
                                    pcm->purse_expiration,
@@ -381,21 +477,23 @@ TALER_EXCHANGE_purse_create_with_merge (
                                    min_age,
                                    flags,
                                    reserve_priv,
-                                   &reserve_sig);
+                                   &pcm->reserve_sig);
   if (upload_contract)
   {
     TALER_CRYPTO_contract_encrypt_for_deposit (
       &pcm->purse_pub,
       contract_priv,
       contract_terms,
-      &econtract,
-      &econtract_size);
+      &pcm->econtract.econtract,
+      &pcm->econtract.econtract_size);
+    GNUNET_CRYPTO_ecdhe_key_get_public (&contract_priv->ecdhe_priv,
+                                        &pcm->econtract.contract_pub.ecdhe_pub);
     TALER_wallet_econtract_upload_sign (
-      econtract,
-      econtract_size,
-      &contract_pub,
+      pcm->econtract.econtract,
+      pcm->econtract.econtract_size,
+      &pcm->econtract.contract_pub,
       purse_priv,
-      &contract_sig);
+      &pcm->econtract.econtract_sig);
   }
   create_with_merge_obj = GNUNET_JSON_PACK (
     TALER_JSON_pack_amount ("purse_value",
@@ -403,21 +501,10 @@ TALER_EXCHANGE_purse_create_with_merge (
     GNUNET_JSON_pack_uint64 ("min_age",
                              min_age),
     GNUNET_JSON_pack_allow_null (
-      GNUNET_JSON_pack_data_varsize ("econtract",
-                                     econtract,
-                                     econtract_size)),
-    GNUNET_JSON_pack_allow_null (
-      upload_contract
-      ? GNUNET_JSON_pack_data_auto ("econtract_sig",
-                                    &contract_sig)
-      : GNUNET_JSON_pack_string ("dummy",
-                                 NULL)),
-    GNUNET_JSON_pack_allow_null (
-      upload_contract
-      ? GNUNET_JSON_pack_data_auto ("contract_pub",
-                                    &contract_pub)
-      : GNUNET_JSON_pack_string ("dummy",
-                                 NULL)),
+      TALER_JSON_pack_econtract ("econtract",
+                                 upload_contract
+                                 ? &pcm->econtract
+                                 : NULL)),
     GNUNET_JSON_pack_allow_null (
       pay_for_purse
       ? TALER_JSON_pack_amount ("purse_fee",
@@ -425,15 +512,15 @@ TALER_EXCHANGE_purse_create_with_merge (
       : GNUNET_JSON_pack_string ("dummy2",
                                  NULL)),
     GNUNET_JSON_pack_data_auto ("merge_pub",
-                                &merge_pub),
+                                &pcm->merge_pub),
     GNUNET_JSON_pack_data_auto ("merge_sig",
-                                &merge_sig),
+                                &pcm->merge_sig),
     GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                &reserve_sig),
+                                &pcm->reserve_sig),
     GNUNET_JSON_pack_data_auto ("purse_pub",
                                 &pcm->purse_pub),
     GNUNET_JSON_pack_data_auto ("purse_sig",
-                                &purse_sig),
+                                &pcm->purse_sig),
     GNUNET_JSON_pack_data_auto ("h_contract_terms",
                                 &pcm->h_contract_terms),
     GNUNET_JSON_pack_timestamp ("merge_timestamp",
@@ -441,7 +528,6 @@ TALER_EXCHANGE_purse_create_with_merge (
     GNUNET_JSON_pack_timestamp ("purse_expiration",
                                 pcm->purse_expiration));
   GNUNET_assert (NULL != create_with_merge_obj);
-  GNUNET_free (econtract);
   eh = TALER_EXCHANGE_curl_easy_get_ (pcm->url);
   if ( (NULL == eh) ||
        (GNUNET_OK !=
@@ -453,6 +539,7 @@ TALER_EXCHANGE_purse_create_with_merge (
     if (NULL != eh)
       curl_easy_cleanup (eh);
     json_decref (create_with_merge_obj);
+    GNUNET_free (pcm->econtract.econtract);
     GNUNET_free (pcm->url);
     GNUNET_free (pcm);
     return NULL;
@@ -461,7 +548,8 @@ TALER_EXCHANGE_purse_create_with_merge (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for purse create_with_merge: `%s'\n",
               pcm->url);
-  ctx = TEAH_handle_to_context (exchange);
+  pcm->keys = TALER_EXCHANGE_keys_incref (keys);
+  pcm->exchange_url = GNUNET_strdup (url);
   pcm->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    pcm->ctx.headers,
@@ -481,7 +569,10 @@ TALER_EXCHANGE_purse_create_with_merge_cancel (
     pcm->job = NULL;
   }
   GNUNET_free (pcm->url);
+  GNUNET_free (pcm->exchange_url);
   TALER_curl_easy_post_finished (&pcm->ctx);
+  TALER_EXCHANGE_keys_decref (pcm->keys);
+  GNUNET_free (pcm->econtract.econtract);
   GNUNET_free (pcm);
 }
 
diff --git a/src/lib/exchange_api_purse_delete.c b/src/lib/exchange_api_purse_delete.c
new file mode 100644
index 000000000..6f8ecc381
--- /dev/null
+++ b/src/lib/exchange_api_purse_delete.c
@@ -0,0 +1,243 @@
+/*
+   This file is part of TALER
+   Copyright (C) 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/>
+ */
+/**
+ * @file lib/exchange_api_purse_delete.c
+ * @brief Implementation of the client to delete a purse
+ *        into an account
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_json_lib.h"
+#include "taler_exchange_service.h"
+#include "exchange_api_handle.h"
+#include "exchange_api_common.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A purse delete with deposit handle
+ */
+struct TALER_EXCHANGE_PurseDeleteHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_PurseDeleteCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Header with the purse_sig.
+   */
+  struct curl_slist *xhdr;
+};
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP DELETE /purse/$PID request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_PurseDeleteHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_purse_delete_finished (void *cls,
+                              long response_code,
+                              const void *response)
+{
+  struct TALER_EXCHANGE_PurseDeleteHandle *pdh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_PurseDeleteResponse dr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  pdh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    dr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, exchange says one of the signatures is
+       invalid; as we checked them, this should never happen, we
+       should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    break;
+  case MHD_HTTP_CONFLICT:
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    break;
+  default:
+    /* unexpected response code */
+    dr.hr.ec = TALER_JSON_get_error_code (j);
+    dr.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for exchange deposit\n",
+                (unsigned int) response_code,
+                dr.hr.ec);
+    GNUNET_break_op (0);
+    break;
+  }
+  pdh->cb (pdh->cb_cls,
+           &dr);
+  TALER_EXCHANGE_purse_delete_cancel (pdh);
+}
+
+
+struct TALER_EXCHANGE_PurseDeleteHandle *
+TALER_EXCHANGE_purse_delete (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_PurseContractPrivateKeyP *purse_priv,
+  TALER_EXCHANGE_PurseDeleteCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_PurseDeleteHandle *pdh;
+  CURL *eh;
+  struct TALER_PurseContractPublicKeyP purse_pub;
+  struct TALER_PurseContractSignatureP purse_sig;
+  char arg_str[sizeof (purse_pub) * 2 + 32];
+
+  pdh = GNUNET_new (struct TALER_EXCHANGE_PurseDeleteHandle);
+  pdh->cb = cb;
+  pdh->cb_cls = cb_cls;
+  GNUNET_CRYPTO_eddsa_key_get_public (&purse_priv->eddsa_priv,
+                                      &purse_pub.eddsa_pub);
+  {
+    char pub_str[sizeof (purse_pub) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (&purse_pub,
+                                         sizeof (purse_pub),
+                                         pub_str,
+                                         sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "purses/%s",
+                     pub_str);
+  }
+  pdh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
+  if (NULL == pdh->url)
+  {
+    GNUNET_break (0);
+    GNUNET_free (pdh);
+    return NULL;
+  }
+  TALER_wallet_purse_delete_sign (purse_priv,
+                                  &purse_sig);
+  {
+    char *delete_str;
+    char *xhdr;
+
+    delete_str =
+      GNUNET_STRINGS_data_to_string_alloc (&purse_sig,
+                                           sizeof (purse_sig));
+    GNUNET_asprintf (&xhdr,
+                     "Taler-Purse-Signature: %s",
+                     delete_str);
+    GNUNET_free (delete_str);
+    pdh->xhdr = curl_slist_append (NULL,
+                                   xhdr);
+    GNUNET_free (xhdr);
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (pdh->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    curl_slist_free_all (pdh->xhdr);
+    GNUNET_free (pdh->url);
+    GNUNET_free (pdh);
+    return NULL;
+  }
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_CUSTOMREQUEST,
+                                   MHD_HTTP_METHOD_DELETE));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "URL for purse delete: `%s'\n",
+              pdh->url);
+  pdh->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   pdh->xhdr,
+                                   &handle_purse_delete_finished,
+                                   pdh);
+  return pdh;
+}
+
+
+void
+TALER_EXCHANGE_purse_delete_cancel (
+  struct TALER_EXCHANGE_PurseDeleteHandle *pdh)
+{
+  if (NULL != pdh->job)
+  {
+    GNUNET_CURL_job_cancel (pdh->job);
+    pdh->job = NULL;
+  }
+  curl_slist_free_all (pdh->xhdr);
+  GNUNET_free (pdh->url);
+  GNUNET_free (pdh);
+}
+
+
+/* end of exchange_api_purse_delete.c */
diff --git a/src/lib/exchange_api_purse_deposit.c b/src/lib/exchange_api_purse_deposit.c
index 67f5355d9..9c5fa4e78 100644
--- a/src/lib/exchange_api_purse_deposit.c
+++ b/src/lib/exchange_api_purse_deposit.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2022-2023 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
@@ -28,6 +28,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
+#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
@@ -44,11 +45,21 @@ struct Coin
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
   /**
+   * Signature made with the coin.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
    * Coin's denomination.
    */
   struct TALER_DenominationHashP h_denom_pub;
 
   /**
+   * Age restriction hash for the coin.
+   */
+  struct TALER_AgeCommitmentHash ahac;
+
+  /**
    * How much did we say the coin contributed.
    */
   struct TALER_Amount contribution;
@@ -62,9 +73,9 @@ struct TALER_EXCHANGE_PurseDepositHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -133,10 +144,9 @@ handle_purse_deposit_finished (void *cls,
     .hr.reply = j,
     .hr.http_status = (unsigned int) response_code
   };
-  const struct TALER_EXCHANGE_Keys *keys;
+  const struct TALER_EXCHANGE_Keys *keys = pch->keys;
 
   pch->job = NULL;
-  keys = TALER_EXCHANGE_get_keys (pch->exchange);
   switch (response_code)
   {
   case 0:
@@ -152,20 +162,18 @@ handle_purse_deposit_finished (void *cls,
                                      &exchange_sig),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
                                      &exchange_pub),
-        GNUNET_JSON_spec_fixed_auto ("merge_pub",
-                                     &dr.details.success.merge_pub),
         GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                     &dr.details.success.h_contract_terms),
+                                     &dr.details.ok.h_contract_terms),
         GNUNET_JSON_spec_timestamp ("exchange_timestamp",
                                     &etime),
         GNUNET_JSON_spec_timestamp ("purse_expiration",
-                                    &dr.details.success.purse_expiration),
+                                    &dr.details.ok.purse_expiration),
         TALER_JSON_spec_amount ("total_deposited",
                                 keys->currency,
-                                &dr.details.success.total_deposited),
+                                &dr.details.ok.total_deposited),
         TALER_JSON_spec_amount ("purse_value_after_fees",
                                 keys->currency,
-                                &dr.details.success.purse_value_after_fees),
+                                &dr.details.ok.purse_value_after_fees),
         GNUNET_JSON_spec_end ()
       };
 
@@ -191,12 +199,11 @@ handle_purse_deposit_finished (void *cls,
       if (GNUNET_OK !=
           TALER_exchange_online_purse_created_verify (
             etime,
-            dr.details.success.purse_expiration,
-            &dr.details.success.purse_value_after_fees,
-            &dr.details.success.total_deposited,
+            dr.details.ok.purse_expiration,
+            &dr.details.ok.purse_value_after_fees,
+            &dr.details.ok.total_deposited,
             &pch->purse_pub,
-            &dr.details.success.merge_pub,
-            &dr.details.success.h_contract_terms,
+            &dr.details.ok.h_contract_terms,
             &exchange_pub,
             &exchange_sig))
       {
@@ -229,58 +236,19 @@ handle_purse_deposit_finished (void *cls,
     {
     case TALER_EC_EXCHANGE_PURSE_DEPOSIT_CONFLICTING_META_DATA:
       {
-        const char *partner_url = NULL;
         struct TALER_CoinSpendPublicKeyP coin_pub;
         struct TALER_CoinSpendSignatureP coin_sig;
-        struct TALER_Amount amount;
-        struct GNUNET_JSON_Specification spec[] = {
-          GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                       &coin_sig),
-          GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                       &coin_pub),
-          GNUNET_JSON_spec_mark_optional (
-            GNUNET_JSON_spec_string ("partner_url",
-                                     &partner_url),
-            NULL),
-          TALER_JSON_spec_amount ("amount",
-                                  keys->currency,
-                                  &amount),
-          GNUNET_JSON_spec_end ()
-        };
+        struct TALER_DenominationHashP h_denom_pub;
+        struct TALER_AgeCommitmentHash phac;
         bool found = false;
 
         if (GNUNET_OK !=
-            GNUNET_JSON_parse (j,
-                               spec,
-                               NULL, NULL))
-        {
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        for (unsigned int i = 0; i<pch->num_deposits; i++)
-          if (0 == GNUNET_memcmp (&coin_pub,
-                                  &pch->coins[i].coin_pub))
-          {
-            found = true;
-            break;
-          }
-        if (! found)
-        {
-          /* proof is about a coin we did not even deposit */
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        if (NULL == partner_url)
-          partner_url = pch->base_url;
-        if (GNUNET_OK !=
-            TALER_wallet_purse_deposit_verify (
-              partner_url,
+            TALER_EXCHANGE_check_purse_coin_conflict_ (
               &pch->purse_pub,
-              &amount,
+              pch->base_url,
+              j,
+              &h_denom_pub,
+              &phac,
               &coin_pub,
               &coin_sig))
         {
@@ -289,176 +257,51 @@ handle_purse_deposit_finished (void *cls,
           dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
           break;
         }
-        /* meta data conflict is real! */
-        break;
-      }
-    case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-      {
-        json_t *history;
-        struct TALER_Amount total;
-        struct TALER_DenominationHashP h_denom_pub;
-        const struct TALER_EXCHANGE_DenomPublicKey *dki;
-        struct TALER_CoinSpendPublicKeyP coin_pub;
-        struct GNUNET_JSON_Specification spec[] = {
-          GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                       &coin_pub),
-          GNUNET_JSON_spec_json ("history",
-                                 &history),
-          GNUNET_JSON_spec_end ()
-        };
-        bool found = false;
-        const struct Coin *my_coin;
-
-        if (GNUNET_OK !=
-            GNUNET_JSON_parse (j,
-                               spec,
-                               NULL, NULL))
-        {
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
         for (unsigned int i = 0; i<pch->num_deposits; i++)
         {
-          if (0 == GNUNET_memcmp (&coin_pub,
-                                  &pch->coins[i].coin_pub))
+          struct Coin *coin = &pch->coins[i];
+          if (0 != GNUNET_memcmp (&coin_pub,
+                                  &coin->coin_pub))
+            continue;
+          if (0 !=
+              GNUNET_memcmp (&coin->h_denom_pub,
+                             &h_denom_pub))
           {
             found = true;
-            my_coin = &pch->coins[i];
             break;
           }
-        }
-        if (! found)
-        {
-          /* proof is about a coin we did not even deposit */
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        dki = TALER_EXCHANGE_get_denomination_key_by_hash (
-          keys,
-          &my_coin->h_denom_pub);
-        if (NULL == dki)
-        {
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
-          GNUNET_break_op (0);
-          break;
-        }
-        if (GNUNET_OK !=
-            TALER_EXCHANGE_verify_coin_history (dki,
-                                                dki->value.currency,
-                                                &coin_pub,
-                                                history,
-                                                &h_denom_pub,
-                                                &total))
-        {
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          json_decref (history);
-          break;
-        }
-        json_decref (history);
-        if (0 >
-            TALER_amount_add (&total,
-                              &total,
-                              &my_coin->contribution))
-        {
-          /* clearly not OK if our transaction would have caused
-             the overflow... */
-          break;
-        }
-        if (0 >= TALER_amount_cmp (&total,
-                                   &dki->value))
-        {
-          /* transaction should have still fit */
-          GNUNET_break (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        /* everything OK, proof of double-spending was provided */
-      }
-    case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-      {
-        json_t *history;
-        struct TALER_Amount total;
-        struct TALER_DenominationHashP h_denom_pub;
-        const struct Coin *my_coin;
-        const struct TALER_EXCHANGE_DenomPublicKey *dki;
-        struct TALER_CoinSpendPublicKeyP coin_pub;
-        struct GNUNET_JSON_Specification spec[] = {
-          GNUNET_JSON_spec_fixed_auto ("coin_pub",
-                                       &coin_pub),
-          GNUNET_JSON_spec_json ("history",
-                                 &history),
-          GNUNET_JSON_spec_end ()
-        };
-        bool found = false;
-
-        if (GNUNET_OK !=
-            GNUNET_JSON_parse (j,
-                               spec,
-                               NULL, NULL))
-        {
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        for (unsigned int i = 0; i<pch->num_deposits; i++)
-        {
-          if (0 == GNUNET_memcmp (&coin_pub,
-                                  &pch->coins[i].coin_pub))
+          if (0 !=
+              GNUNET_memcmp (&coin->ahac,
+                             &phac))
           {
             found = true;
-            my_coin = &pch->coins[i];
             break;
           }
-        }
-        if (! found)
-        {
-          /* proof is about a coin we did not even deposit */
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        dki = TALER_EXCHANGE_get_denomination_key_by_hash (
-          keys,
-          &my_coin->h_denom_pub);
-        memset (&h_denom_pub,
-                0,
-                sizeof (h_denom_pub));
-        if (GNUNET_OK !=
-            TALER_EXCHANGE_verify_coin_history (dki,
-                                                dki->value.currency,
-                                                &coin_pub,
-                                                history,
-                                                &h_denom_pub,
-                                                &total))
-        {
-          GNUNET_break_op (0);
-          dr.hr.http_status = 0;
-          dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          json_decref (history);
+          if (0 == GNUNET_memcmp (&coin_sig,
+                                  &coin->coin_sig))
+          {
+            /* identical signature => not a conflict */
+            continue;
+          }
+          found = true;
           break;
         }
-        json_decref (history);
-        if (0 == GNUNET_memcmp (&dki->h_key,
-                                &h_denom_pub))
+        if (! found)
         {
-          /* sorry, this proves nothing */
           GNUNET_break_op (0);
           dr.hr.http_status = 0;
           dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
           break;
         }
-        /* everything OK, proof of conflicting denomination was provided */
+        /* meta data conflict is real! */
+        break;
       }
+    case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
+      /* Nothing to check anymore here, proof needs to be
+         checked in the GET /coins/$COIN_PUB handler */
+      break;
+    case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
+      break;
     default:
       GNUNET_break_op (0);
       dr.hr.http_status = 0;
@@ -467,7 +310,7 @@ handle_purse_deposit_finished (void *cls,
     } /* ec switch */
     break;
   case MHD_HTTP_GONE:
-    /* could happen if denomination was revoked */
+    /* could happen if denomination was revoked or purse expired */
     /* Note: one might want to check /keys for revocation
        signature here, alas tricky in case our /keys
        is outdated => left to clients */
@@ -500,32 +343,32 @@ handle_purse_deposit_finished (void *cls,
 
 struct TALER_EXCHANGE_PurseDepositHandle *
 TALER_EXCHANGE_purse_deposit (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const char *purse_exchange_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   uint8_t min_age,
   unsigned int num_deposits,
-  const struct TALER_EXCHANGE_PurseDeposit *deposits,
+  const struct TALER_EXCHANGE_PurseDeposit deposits[static num_deposits],
   TALER_EXCHANGE_PurseDepositCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_PurseDepositHandle *pch;
-  struct GNUNET_CURL_Context *ctx;
   json_t *create_obj;
   json_t *deposit_arr;
   CURL *eh;
   char arg_str[sizeof (pch->purse_pub) * 2 + 32];
 
+  // FIXME: use purse_exchange_url for wad transfers (#7271)
+  (void) purse_exchange_url;
   if (0 == num_deposits)
   {
     GNUNET_break (0);
     return NULL;
   }
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   pch = GNUNET_new (struct TALER_EXCHANGE_PurseDepositHandle);
   pch->purse_pub = *purse_pub;
-  pch->exchange = exchange;
   pch->cb = cb;
   pch->cb_cls = cb_cls;
   {
@@ -540,11 +383,12 @@ TALER_EXCHANGE_purse_deposit (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/purses/%s/deposit",
+                     "purses/%s/deposit",
                      pub_str);
   }
-  pch->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  pch->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == pch->url)
   {
     GNUNET_break (0);
@@ -553,38 +397,40 @@ TALER_EXCHANGE_purse_deposit (
   }
   deposit_arr = json_array ();
   GNUNET_assert (NULL != deposit_arr);
-  pch->base_url = TEAH_path_to_url (exchange,
-                                    "/");
+  pch->base_url = GNUNET_strdup (url);
   pch->num_deposits = num_deposits;
   pch->coins = GNUNET_new_array (num_deposits,
                                  struct Coin);
   for (unsigned int i = 0; i<num_deposits; i++)
   {
     const struct TALER_EXCHANGE_PurseDeposit *deposit = &deposits[i];
+    const struct TALER_AgeCommitmentProof *acp = deposit->age_commitment_proof;
     struct Coin *coin = &pch->coins[i];
     json_t *jdeposit;
-    struct TALER_CoinSpendSignatureP coin_sig;
-#if FIXME_OEC
-    struct TALER_AgeCommitmentHash agh;
-    struct TALER_AgeCommitmentHash *aghp = NULL;
+    struct TALER_AgeCommitmentHash *achp = NULL;
     struct TALER_AgeAttestation attest;
+    struct TALER_AgeAttestation *attestp = NULL;
 
-    TALER_age_commitment_hash (&deposit->age_commitment,
-                               &agh);
-    aghp = &agh;
-    if (GNUNET_OK !=
-        TALER_age_commitment_attest (&deposit->age_proof,
-                                     min_age,
-                                     &attest))
+    if (NULL != acp)
     {
-      GNUNET_break (0);
-      json_decref (deposit_arr);
-      GNUNET_free (pch->base_url);
-      GNUNET_free (pch->coins);
-      GNUNET_free (pch);
-      return NULL;
+      TALER_age_commitment_hash (&acp->commitment,
+                                 &coin->ahac);
+      achp = &coin->ahac;
+      if (GNUNET_OK !=
+          TALER_age_commitment_attest (acp,
+                                       min_age,
+                                       &attest))
+      {
+        GNUNET_break (0);
+        json_decref (deposit_arr);
+        GNUNET_free (pch->base_url);
+        GNUNET_free (pch->coins);
+        GNUNET_free (pch->url);
+        GNUNET_free (pch);
+        return NULL;
+      }
+      attestp = &attest;
     }
-#endif
     GNUNET_CRYPTO_eddsa_key_get_public (&deposit->coin_priv.eddsa_priv,
                                         &coin->coin_pub.eddsa_pub);
     coin->h_denom_pub = deposit->h_denom_pub;
@@ -593,17 +439,17 @@ TALER_EXCHANGE_purse_deposit (
       pch->base_url,
       &pch->purse_pub,
       &deposit->amount,
+      &coin->h_denom_pub,
+      &coin->ahac,
       &deposit->coin_priv,
-      &coin_sig);
+      &coin->coin_sig);
     jdeposit = GNUNET_JSON_PACK (
-#if FIXME_OEC
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_data_auto ("h_age_commitment",
-                                    aghp)),
+                                    achp)),
       GNUNET_JSON_pack_allow_null (
         GNUNET_JSON_pack_data_auto ("age_attestation",
-                                    &attest)),
-#endif
+                                    attestp)),
       TALER_JSON_pack_amount ("amount",
                               &deposit->amount),
       GNUNET_JSON_pack_data_auto ("denom_pub_hash",
@@ -613,7 +459,7 @@ TALER_EXCHANGE_purse_deposit (
       GNUNET_JSON_pack_data_auto ("coin_pub",
                                   &coin->coin_pub),
       GNUNET_JSON_pack_data_auto ("coin_sig",
-                                  &coin_sig));
+                                  &coin->coin_sig));
     GNUNET_assert (0 ==
                    json_array_append_new (deposit_arr,
                                           jdeposit));
@@ -643,7 +489,7 @@ TALER_EXCHANGE_purse_deposit (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for purse deposit: `%s'\n",
               pch->url);
-  ctx = TEAH_handle_to_context (exchange);
+  pch->keys = TALER_EXCHANGE_keys_incref (keys);
   pch->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    pch->ctx.headers,
@@ -665,6 +511,7 @@ TALER_EXCHANGE_purse_deposit_cancel (
   GNUNET_free (pch->base_url);
   GNUNET_free (pch->url);
   GNUNET_free (pch->coins);
+  TALER_EXCHANGE_keys_decref (pch->keys);
   TALER_curl_easy_post_finished (&pch->ctx);
   GNUNET_free (pch);
 }
diff --git a/src/lib/exchange_api_purse_merge.c b/src/lib/exchange_api_purse_merge.c
index a32b44d48..c013b29d2 100644
--- a/src/lib/exchange_api_purse_merge.c
+++ b/src/lib/exchange_api_purse_merge.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2022-2023 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
@@ -29,6 +29,7 @@
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
 #include "exchange_api_handle.h"
+#include "exchange_api_common.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
 
@@ -40,9 +41,9 @@ struct TALER_EXCHANGE_AccountMergeHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -76,6 +77,11 @@ struct TALER_EXCHANGE_AccountMergeHandle
   char *provider_url;
 
   /**
+   * Signature for our operation.
+   */
+  struct TALER_PurseMergeSignatureP merge_sig;
+
+  /**
    * Expected value in the purse after fees.
    */
   struct TALER_Amount purse_value_after_fees;
@@ -104,51 +110,13 @@ struct TALER_EXCHANGE_AccountMergeHandle
    * Our merge key.
    */
   struct TALER_PurseMergePrivateKeyP merge_priv;
-};
-
 
-static char *
-make_payto (const char *exchange_url,
-            const struct TALER_ReservePublicKeyP *reserve_pub)
-{
-  char pub_str[sizeof (*reserve_pub) * 2];
-  char *end;
-  bool is_http;
-  char *reserve_url;
+  /**
+   * Reserve signature affirming the merge.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
 
-  end = GNUNET_STRINGS_data_to_string (
-    reserve_pub,
-    sizeof (*reserve_pub),
-    pub_str,
-    sizeof (pub_str));
-  *end = '\0';
-  if (0 == strncmp (exchange_url,
-                    "http://",
-                    strlen ("http://")))
-  {
-    is_http = true;
-    exchange_url = &exchange_url[strlen ("http://")];
-  }
-  else if (0 == strncmp (exchange_url,
-                         "https://",
-                         strlen ("https://")))
-  {
-    is_http = false;
-    exchange_url = &exchange_url[strlen ("https://")];
-  }
-  else
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  /* exchange_url includes trailing '/' */
-  GNUNET_asprintf (&reserve_url,
-                   "payto://%s/%s%s",
-                   is_http ? "taler+http" : "taler",
-                   exchange_url,
-                   pub_str);
-  return reserve_url;
-}
+};
 
 
 /**
@@ -168,7 +136,8 @@ handle_purse_merge_finished (void *cls,
   const json_t *j = response;
   struct TALER_EXCHANGE_AccountMergeResponse dr = {
     .hr.reply = j,
-    .hr.http_status = (unsigned int) response_code
+    .hr.http_status = (unsigned int) response_code,
+    .reserve_sig = &pch->reserve_sig
   };
 
   pch->job = NULL;
@@ -179,18 +148,14 @@ handle_purse_merge_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     {
-      const struct TALER_EXCHANGE_Keys *key_state;
-      struct GNUNET_TIME_Timestamp etime;
       struct TALER_Amount total_deposited;
-      struct TALER_ExchangeSignatureP exchange_sig;
-      struct TALER_ExchangePublicKeyP exchange_pub;
       struct GNUNET_JSON_Specification spec[] = {
         GNUNET_JSON_spec_fixed_auto ("exchange_sig",
-                                     &exchange_sig),
+                                     &dr.details.ok.exchange_sig),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
-                                     &exchange_pub),
+                                     &dr.details.ok.exchange_pub),
         GNUNET_JSON_spec_timestamp ("exchange_timestamp",
-                                    &etime),
+                                    &dr.details.ok.etime),
         TALER_JSON_spec_amount ("merge_amount",
                                 pch->purse_value_after_fees.currency,
                                 &total_deposited),
@@ -207,10 +172,9 @@ handle_purse_merge_finished (void *cls,
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
         break;
       }
-      key_state = TALER_EXCHANGE_get_keys (pch->exchange);
       if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
-                                           &exchange_pub))
+          TALER_EXCHANGE_test_signing_key (pch->keys,
+                                           &dr.details.ok.exchange_pub))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
@@ -219,15 +183,15 @@ handle_purse_merge_finished (void *cls,
       }
       if (GNUNET_OK !=
           TALER_exchange_online_purse_merged_verify (
-            etime,
+            dr.details.ok.etime,
             pch->purse_expiration,
             &pch->purse_value_after_fees,
             &pch->purse_pub,
             &pch->h_contract_terms,
             &pch->reserve_pub,
             pch->provider_url,
-            &exchange_pub,
-            &exchange_sig))
+            &dr.details.ok.exchange_pub,
+            &dr.details.ok.exchange_sig))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
@@ -262,58 +226,24 @@ handle_purse_merge_finished (void *cls,
     break;
   case MHD_HTTP_CONFLICT:
     {
-      struct TALER_PurseMergeSignatureP merge_sig;
-      struct GNUNET_TIME_Timestamp merge_timestamp;
-      const char *partner_url = NULL;
-      struct TALER_ReservePublicKeyP reserve_pub;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                     &reserve_pub),
-        GNUNET_JSON_spec_fixed_auto ("merge_sig",
-                                     &merge_sig),
-        GNUNET_JSON_spec_timestamp ("merge_timestamp",
-                                    &merge_timestamp),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_string ("partner_base_url",
-                                   &partner_url),
-          NULL),
-        GNUNET_JSON_spec_end ()
-      };
       struct TALER_PurseMergePublicKeyP merge_pub;
-      char *payto_uri;
 
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (j,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        dr.hr.http_status = 0;
-        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
       GNUNET_CRYPTO_eddsa_key_get_public (&pch->merge_priv.eddsa_priv,
                                           &merge_pub.eddsa_pub);
-      if (NULL == partner_url)
-        partner_url = pch->provider_url;
-      payto_uri = make_payto (partner_url,
-                              &reserve_pub);
       if (GNUNET_OK !=
-          TALER_wallet_purse_merge_verify (
-            payto_uri,
-            merge_timestamp,
-            &pch->purse_pub,
+          TALER_EXCHANGE_check_purse_merge_conflict_ (
+            &pch->merge_sig,
             &merge_pub,
-            &merge_sig))
+            &pch->purse_pub,
+            pch->provider_url,
+            j))
       {
         GNUNET_break_op (0);
         dr.hr.http_status = 0;
         dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        GNUNET_free (payto_uri);
         break;
       }
-      GNUNET_free (payto_uri);
-      /* conflict is real */
+      break;
     }
     break;
   case MHD_HTTP_GONE:
@@ -324,6 +254,27 @@ handle_purse_merge_finished (void *cls,
     dr.hr.ec = TALER_JSON_get_error_code (j);
     dr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    {
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_uint64 (
+          "requirement_row",
+          &dr.details.unavailable_for_legal_reasons.requirement_row),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL, NULL))
+      {
+        GNUNET_break_op (0);
+        dr.hr.http_status = 0;
+        dr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+    }
+    break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     dr.hr.ec = TALER_JSON_get_error_code (j);
     dr.hr.hint = TALER_JSON_get_error_hint (j);
@@ -349,7 +300,9 @@ handle_purse_merge_finished (void *cls,
 
 struct TALER_EXCHANGE_AccountMergeHandle *
 TALER_EXCHANGE_account_merge (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const char *reserve_exchange_url,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
@@ -363,16 +316,12 @@ TALER_EXCHANGE_account_merge (
   void *cb_cls)
 {
   struct TALER_EXCHANGE_AccountMergeHandle *pch;
-  struct GNUNET_CURL_Context *ctx;
   json_t *merge_obj;
   CURL *eh;
-  struct TALER_PurseMergeSignatureP merge_sig;
-  struct TALER_ReserveSignatureP reserve_sig;
   char arg_str[sizeof (pch->purse_pub) * 2 + 32];
   char *reserve_url;
 
   pch = GNUNET_new (struct TALER_EXCHANGE_AccountMergeHandle);
-  pch->exchange = exchange;
   pch->merge_priv = *merge_priv;
   pch->cb = cb;
   pch->cb_cls = cb_cls;
@@ -381,14 +330,12 @@ TALER_EXCHANGE_account_merge (
   pch->purse_expiration = purse_expiration;
   pch->purse_value_after_fees = *purse_value_after_fees;
   if (NULL == reserve_exchange_url)
-    pch->provider_url = GNUNET_strdup (exchange->url);
+    pch->provider_url = GNUNET_strdup (url);
   else
     pch->provider_url = GNUNET_strdup (reserve_exchange_url);
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                       &pch->reserve_pub.eddsa_pub);
 
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   {
     char pub_str[sizeof (*purse_pub) * 2];
     char *end;
@@ -401,11 +348,11 @@ TALER_EXCHANGE_account_merge (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/purses/%s/merge",
+                     "purses/%s/merge",
                      pub_str);
   }
-  reserve_url = make_payto (pch->provider_url,
-                            &pch->reserve_pub);
+  reserve_url = TALER_reserve_make_payto (pch->provider_url,
+                                          &pch->reserve_pub);
   if (NULL == reserve_url)
   {
     GNUNET_break (0);
@@ -413,8 +360,9 @@ TALER_EXCHANGE_account_merge (
     GNUNET_free (pch);
     return NULL;
   }
-  pch->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  pch->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == pch->url)
   {
     GNUNET_break (0);
@@ -427,12 +375,13 @@ TALER_EXCHANGE_account_merge (
                                  merge_timestamp,
                                  purse_pub,
                                  merge_priv,
-                                 &merge_sig);
+                                 &pch->merge_sig);
   {
     struct TALER_Amount zero_purse_fee;
 
-    TALER_amount_set_zero (purse_value_after_fees->currency,
-                           &zero_purse_fee);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (purse_value_after_fees->currency,
+                                          &zero_purse_fee));
     TALER_wallet_account_merge_sign (merge_timestamp,
                                      purse_pub,
                                      purse_expiration,
@@ -442,18 +391,19 @@ TALER_EXCHANGE_account_merge (
                                      min_age,
                                      TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE,
                                      reserve_priv,
-                                     &reserve_sig);
+                                     &pch->reserve_sig);
   }
   merge_obj = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_string ("payto_uri",
                              reserve_url),
     GNUNET_JSON_pack_data_auto ("merge_sig",
-                                &merge_sig),
+                                &pch->merge_sig),
     GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                &reserve_sig),
+                                &pch->reserve_sig),
     GNUNET_JSON_pack_timestamp ("merge_timestamp",
                                 merge_timestamp));
   GNUNET_assert (NULL != merge_obj);
+  GNUNET_free (reserve_url);
   eh = TALER_EXCHANGE_curl_easy_get_ (pch->url);
   if ( (NULL == eh) ||
        (GNUNET_OK !=
@@ -474,7 +424,7 @@ TALER_EXCHANGE_account_merge (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for purse merge: `%s'\n",
               pch->url);
-  ctx = TEAH_handle_to_context (exchange);
+  pch->keys = TALER_EXCHANGE_keys_incref (keys);
   pch->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    pch->ctx.headers,
@@ -496,6 +446,7 @@ TALER_EXCHANGE_account_merge_cancel (
   GNUNET_free (pch->url);
   GNUNET_free (pch->provider_url);
   TALER_curl_easy_post_finished (&pch->ctx);
+  TALER_EXCHANGE_keys_decref (pch->keys);
   GNUNET_free (pch);
 }
 
diff --git a/src/lib/exchange_api_purses_get.c b/src/lib/exchange_api_purses_get.c
index 021954c2d..dc22c75ad 100644
--- a/src/lib/exchange_api_purses_get.c
+++ b/src/lib/exchange_api_purses_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2022 Taler Systems SA
+  Copyright (C) 2022-2023 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
@@ -39,9 +39,9 @@ struct TALER_EXCHANGE_PurseGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -94,22 +94,29 @@ handle_purse_get_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     {
+      bool no_merge = false;
+      bool no_deposit = false;
       struct TALER_ExchangePublicKeyP exchange_pub;
       struct TALER_ExchangeSignatureP exchange_sig;
       struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_timestamp ("merge_timestamp",
-                                    &dr.details.success.merge_timestamp),
-        GNUNET_JSON_spec_timestamp ("deposit_timestamp",
-                                    &dr.details.success.deposit_timestamp),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_timestamp ("merge_timestamp",
+                                      &dr.details.ok.merge_timestamp),
+          &no_merge),
+        GNUNET_JSON_spec_mark_optional (
+          GNUNET_JSON_spec_timestamp ("deposit_timestamp",
+                                      &dr.details.ok.deposit_timestamp),
+          &no_deposit),
         TALER_JSON_spec_amount_any ("balance",
-                                    &dr.details.success.balance),
+                                    &dr.details.ok.balance),
+        GNUNET_JSON_spec_timestamp ("purse_expiration",
+                                    &dr.details.ok.purse_expiration),
         GNUNET_JSON_spec_fixed_auto ("exchange_pub",
                                      &exchange_pub),
         GNUNET_JSON_spec_fixed_auto ("exchange_sig",
                                      &exchange_sig),
         GNUNET_JSON_spec_end ()
       };
-      const struct TALER_EXCHANGE_Keys *key_state;
 
       if (GNUNET_OK !=
           GNUNET_JSON_parse (j,
@@ -122,9 +129,8 @@ handle_purse_get_finished (void *cls,
         break;
       }
 
-      key_state = TALER_EXCHANGE_get_keys (pgh->exchange);
       if (GNUNET_OK !=
-          TALER_EXCHANGE_test_signing_key (key_state,
+          TALER_EXCHANGE_test_signing_key (pgh->keys,
                                            &exchange_pub))
       {
         GNUNET_break_op (0);
@@ -134,9 +140,9 @@ handle_purse_get_finished (void *cls,
       }
       if (GNUNET_OK !=
           TALER_exchange_online_purse_status_verify (
-            dr.details.success.merge_timestamp,
-            dr.details.success.deposit_timestamp,
-            &dr.details.success.balance,
+            dr.details.ok.merge_timestamp,
+            dr.details.ok.deposit_timestamp,
+            &dr.details.ok.balance,
             &exchange_pub,
             &exchange_sig))
       {
@@ -199,7 +205,9 @@ handle_purse_get_finished (void *cls,
 
 struct TALER_EXCHANGE_PurseGetHandle *
 TALER_EXCHANGE_purse_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   struct GNUNET_TIME_Relative timeout,
   bool wait_for_merge,
@@ -209,15 +217,11 @@ TALER_EXCHANGE_purse_get (
   struct TALER_EXCHANGE_PurseGetHandle *pgh;
   CURL *eh;
   char arg_str[sizeof (*purse_pub) * 2 + 64];
+  unsigned int tms
+    = (unsigned int) timeout.rel_value_us
+      / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   pgh = GNUNET_new (struct TALER_EXCHANGE_PurseGetHandle);
-  pgh->exchange = exchange;
   pgh->cb = cb;
   pgh->cb_cls = cb_cls;
   {
@@ -232,26 +236,25 @@ TALER_EXCHANGE_purse_get (
     *end = '\0';
     GNUNET_snprintf (timeout_str,
                      sizeof (timeout_str),
-                     "%llu",
-                     (unsigned long long)
-                     (timeout.rel_value_us
-                      / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us));
-    if (GNUNET_TIME_relative_is_zero (timeout))
+                     "%u",
+                     tms);
+    if (0 == tms)
       GNUNET_snprintf (arg_str,
                        sizeof (arg_str),
-                       "/purses/%s/%s",
+                       "purses/%s/%s",
                        cpub_str,
                        wait_for_merge ? "merge" : "deposit");
     else
       GNUNET_snprintf (arg_str,
                        sizeof (arg_str),
-                       "/purses/%s/%s?timeout_ms=%s",
+                       "purses/%s/%s?timeout_ms=%s",
                        cpub_str,
                        wait_for_merge ? "merge" : "deposit",
                        timeout_str);
   }
-  pgh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  pgh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == pgh->url)
   {
     GNUNET_free (pgh);
@@ -265,10 +268,18 @@ TALER_EXCHANGE_purse_get (
     GNUNET_free (pgh);
     return NULL;
   }
-  pgh->job = GNUNET_CURL_job_add (TEAH_handle_to_context (exchange),
+  if (0 != tms)
+  {
+    GNUNET_break (CURLE_OK ==
+                  curl_easy_setopt (eh,
+                                    CURLOPT_TIMEOUT_MS,
+                                    (long) (tms + 100L)));
+  }
+  pgh->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   &handle_purse_get_finished,
                                   pgh);
+  pgh->keys = TALER_EXCHANGE_keys_incref (keys);
   return pgh;
 }
 
@@ -283,6 +294,7 @@ TALER_EXCHANGE_purse_get_cancel (
     pgh->job = NULL;
   }
   GNUNET_free (pgh->url);
+  TALER_EXCHANGE_keys_decref (pgh->keys);
   GNUNET_free (pgh);
 }
 
diff --git a/src/lib/exchange_api_recoup.c b/src/lib/exchange_api_recoup.c
index 5c197e2f6..56499f381 100644
--- a/src/lib/exchange_api_recoup.c
+++ b/src/lib/exchange_api_recoup.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2021 Taler Systems SA
+  Copyright (C) 2017-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
+#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
@@ -39,9 +40,9 @@ struct TALER_EXCHANGE_RecoupHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -60,6 +61,11 @@ struct TALER_EXCHANGE_RecoupHandle
   struct TALER_EXCHANGE_DenomPublicKey pk;
 
   /**
+   * Our signature requesting the recoup.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
    * Handle for the request.
    */
   struct GNUNET_CURL_Job *job;
@@ -94,16 +100,15 @@ static enum GNUNET_GenericReturnValue
 process_recoup_response (const struct TALER_EXCHANGE_RecoupHandle *ph,
                          const json_t *json)
 {
-  struct TALER_ReservePublicKeyP reserve_pub;
+  struct TALER_EXCHANGE_RecoupResponse rr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
   struct GNUNET_JSON_Specification spec_withdraw[] = {
     GNUNET_JSON_spec_fixed_auto ("reserve_pub",
-                                 &reserve_pub),
+                                 &rr.details.ok.reserve_pub),
     GNUNET_JSON_spec_end ()
   };
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = json,
-    .http_status = MHD_HTTP_OK
-  };
 
   if (GNUNET_OK !=
       GNUNET_JSON_parse (json,
@@ -114,8 +119,7 @@ process_recoup_response (const struct TALER_EXCHANGE_RecoupHandle *ph,
     return GNUNET_SYSERR;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          &reserve_pub);
+          &rr);
   return GNUNET_OK;
 }
 
@@ -135,16 +139,16 @@ handle_recoup_finished (void *cls,
 {
   struct TALER_EXCHANGE_RecoupHandle *ph = cls;
   const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_RecoupResponse rr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
   };
 
   ph->job = NULL;
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
@@ -152,8 +156,8 @@ handle_recoup_finished (void *cls,
                                  j))
     {
       GNUNET_break_op (0);
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      hr.http_status = 0;
+      rr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      rr.hr.http_status = 0;
       break;
     }
     TALER_EXCHANGE_recoup_cancel (ph);
@@ -161,148 +165,89 @@ handle_recoup_finished (void *cls,
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the exchange is buggy
        (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_CONFLICT:
     {
-      /* Insufficient funds, proof attached */
-      json_t *history;
-      struct TALER_Amount total;
-      struct TALER_DenominationHashP h_denom_pub;
-      const struct TALER_EXCHANGE_DenomPublicKey *dki;
-      enum TALER_ErrorCode ec;
-
-      dki = &ph->pk;
-      history = json_object_get (j,
-                                 "history");
+      struct TALER_Amount min_key;
+
+      rr.hr.ec = TALER_JSON_get_error_code (j);
+      rr.hr.hint = TALER_JSON_get_error_hint (j);
       if (GNUNET_OK !=
-          TALER_EXCHANGE_verify_coin_history (dki,
-                                              dki->fees.deposit.currency,
-                                              &ph->coin_pub,
-                                              history,
-                                              &h_denom_pub,
-                                              &total))
+          TALER_EXCHANGE_get_min_denomination_ (ph->keys,
+                                                &min_key))
       {
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      }
-      else
-      {
-        hr.ec = TALER_JSON_get_error_code (j);
-        hr.hint = TALER_JSON_get_error_hint (j);
-      }
-      ec = TALER_JSON_get_error_code (j);
-      switch (ec)
-      {
-      case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-        if (0 > TALER_amount_cmp (&total,
-                                  &dki->value))
-        {
-          /* recoup MAY have still been possible */
-          /* FIXME: This code may falsely complain, as we do not
-             know that the smallest denomination offered by the
-             exchange is here. We should look at the key
-             structure of ph->exchange, and find the smallest
-             _currently withdrawable_ denomination and check
-             if the value remaining would suffice... */
-          GNUNET_break_op (0);
-          hr.http_status = 0;
-          hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        break;
-      case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-        if (0 == GNUNET_memcmp (&ph->pk.h_key,
-                                &h_denom_pub))
-        {
-          /* invalid proof provided */
-          GNUNET_break_op (0);
-          hr.http_status = 0;
-          hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        /* valid error from exchange */
-        break;
-      default:
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        GNUNET_break (0);
+        rr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        rr.hr.http_status = 0;
         break;
       }
-      ph->cb (ph->cb_cls,
-              &hr,
-              NULL);
-      TALER_EXCHANGE_recoup_cancel (ph);
-      return;
+      break;
     }
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_GONE:
     /* Kind of normal: the money was already sent to the merchant
        (it was too late for the refund). */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   default:
     /* unexpected response code */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange recoup\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rr.hr.ec);
     GNUNET_break (0);
     break;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          NULL);
+          &rr);
   TALER_EXCHANGE_recoup_cancel (ph);
 }
 
 
 struct TALER_EXCHANGE_RecoupHandle *
-TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
-                       const struct TALER_EXCHANGE_DenomPublicKey *pk,
-                       const struct TALER_DenominationSignature *denom_sig,
-                       const struct TALER_ExchangeWithdrawValues *exchange_vals,
-                       const struct TALER_PlanchetMasterSecretP *ps,
-                       TALER_EXCHANGE_RecoupResultCallback recoup_cb,
-                       void *recoup_cb_cls)
+TALER_EXCHANGE_recoup (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_EXCHANGE_DenomPublicKey *pk,
+  const struct TALER_DenominationSignature *denom_sig,
+  const struct TALER_ExchangeWithdrawValues *exchange_vals,
+  const struct TALER_PlanchetMasterSecretP *ps,
+  TALER_EXCHANGE_RecoupResultCallback recoup_cb,
+  void *recoup_cb_cls)
 {
   struct TALER_EXCHANGE_RecoupHandle *ph;
-  struct GNUNET_CURL_Context *ctx;
-  struct TALER_CoinSpendSignatureP coin_sig;
-  struct TALER_CoinSpendPublicKeyP coin_pub;
   struct TALER_DenominationHashP h_denom_pub;
   json_t *recoup_obj;
   CURL *eh;
   char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
-
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
+  union GNUNET_CRYPTO_BlindingSecretP bks;
 
+  ph = GNUNET_new (struct TALER_EXCHANGE_RecoupHandle);
   TALER_planchet_setup_coin_priv (ps,
                                   exchange_vals,
                                   &coin_priv);
@@ -310,13 +255,13 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
                                          exchange_vals,
                                          &bks);
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
-                                      &coin_pub.eddsa_pub);
+                                      &ph->coin_pub.eddsa_pub);
   TALER_denom_pub_hash (&pk->key,
                         &h_denom_pub);
   TALER_wallet_recoup_sign (&h_denom_pub,
                             &bks,
                             &coin_priv,
-                            &coin_sig);
+                            &ph->coin_sig);
   recoup_obj = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_data_auto ("denom_pub_hash",
                                 &h_denom_pub),
@@ -325,26 +270,35 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
     TALER_JSON_pack_exchange_withdraw_values ("ewv",
                                               exchange_vals),
     GNUNET_JSON_pack_data_auto ("coin_sig",
-                                &coin_sig),
+                                &ph->coin_sig),
     GNUNET_JSON_pack_data_auto ("coin_blind_key_secret",
                                 &bks));
-  if (TALER_DENOMINATION_CS == denom_sig->cipher)
+  switch (denom_sig->unblinded_sig->cipher)
   {
-    struct TALER_CsNonce nonce;
-
-    // FIXME: add this to the spec!
-    /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash()
-       it is not strictly clear that the nonce is needed. Best case would be
-       to find a way to include it more 'naturally' somehow, for example with
-       the variant union version of bks! */
-    TALER_cs_withdraw_nonce_derive (ps,
-                                    &nonce);
-    GNUNET_assert (
-      0 ==
-      json_object_set_new (recoup_obj,
-                           "cs_nonce",
-                           GNUNET_JSON_from_data_auto (
-                             &nonce)));
+  case GNUNET_CRYPTO_BSA_INVALID:
+    json_decref (recoup_obj);
+    GNUNET_break (0);
+    GNUNET_free (ph);
+    return NULL;
+  case GNUNET_CRYPTO_BSA_RSA:
+    break;
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      union GNUNET_CRYPTO_BlindSessionNonce nonce;
+
+      /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash()
+         it is not strictly clear that the nonce is needed. Best case would be
+         to find a way to include it more 'naturally' somehow, for example with
+         the variant union version of bks! */
+      TALER_cs_withdraw_nonce_derive (ps,
+                                      &nonce.cs_nonce);
+      GNUNET_assert (
+        0 ==
+        json_object_set_new (recoup_obj,
+                             "cs_nonce",
+                             GNUNET_JSON_from_data_auto (
+                               &nonce)));
+    }
   }
 
   {
@@ -352,28 +306,26 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
     char *end;
 
     end = GNUNET_STRINGS_data_to_string (
-      &coin_pub,
+      &ph->coin_pub,
       sizeof (struct TALER_CoinSpendPublicKeyP),
       pub_str,
       sizeof (pub_str));
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/coins/%s/recoup",
+                     "coins/%s/recoup",
                      pub_str);
   }
 
-  ph = GNUNET_new (struct TALER_EXCHANGE_RecoupHandle);
-  ph->coin_pub = coin_pub;
-  ph->exchange = exchange;
   ph->pk = *pk;
   memset (&ph->pk.key,
           0,
           sizeof (ph->pk.key)); /* zero out, as lifetime cannot be warranted */
   ph->cb = recoup_cb;
   ph->cb_cls = recoup_cb_cls;
-  ph->url = TEAH_path_to_url (exchange,
-                              arg_str);
+  ph->url = TALER_url_join (url,
+                            arg_str,
+                            NULL);
   if (NULL == ph->url)
   {
     json_decref (recoup_obj);
@@ -399,7 +351,7 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for recoup: `%s'\n",
               ph->url);
-  ctx = TEAH_handle_to_context (exchange);
+  ph->keys = TALER_EXCHANGE_keys_incref (keys);
   ph->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   ph->ctx.headers,
@@ -419,6 +371,7 @@ TALER_EXCHANGE_recoup_cancel (struct TALER_EXCHANGE_RecoupHandle *ph)
   }
   GNUNET_free (ph->url);
   TALER_curl_easy_post_finished (&ph->ctx);
+  TALER_EXCHANGE_keys_decref (ph->keys);
   GNUNET_free (ph);
 }
 
diff --git a/src/lib/exchange_api_recoup_refresh.c b/src/lib/exchange_api_recoup_refresh.c
index 8ae8f9764..0c2e21cbf 100644
--- a/src/lib/exchange_api_recoup_refresh.c
+++ b/src/lib/exchange_api_recoup_refresh.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2022 Taler Systems SA
+  Copyright (C) 2017-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,7 @@
 #include <gnunet/gnunet_curl_lib.h>
 #include "taler_json_lib.h"
 #include "taler_exchange_service.h"
+#include "exchange_api_common.h"
 #include "exchange_api_handle.h"
 #include "taler_signatures.h"
 #include "exchange_api_curl_defaults.h"
@@ -39,9 +40,9 @@ struct TALER_EXCHANGE_RecoupRefreshHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -79,6 +80,11 @@ struct TALER_EXCHANGE_RecoupRefreshHandle
    */
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
+  /**
+   * Signature affirming the recoup-refresh operation.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
 };
 
 
@@ -95,16 +101,15 @@ process_recoup_response (
   const struct TALER_EXCHANGE_RecoupRefreshHandle *ph,
   const json_t *json)
 {
-  struct TALER_CoinSpendPublicKeyP old_coin_pub;
+  struct TALER_EXCHANGE_RecoupRefreshResponse rrr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
   struct GNUNET_JSON_Specification spec_refresh[] = {
     GNUNET_JSON_spec_fixed_auto ("old_coin_pub",
-                                 &old_coin_pub),
+                                 &rrr.details.ok.old_coin_pub),
     GNUNET_JSON_spec_end ()
   };
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = json,
-    .http_status = MHD_HTTP_OK
-  };
 
   if (GNUNET_OK !=
       GNUNET_JSON_parse (json,
@@ -115,8 +120,7 @@ process_recoup_response (
     return GNUNET_SYSERR;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          &old_coin_pub);
+          &rrr);
   return GNUNET_OK;
 }
 
@@ -136,16 +140,16 @@ handle_recoup_refresh_finished (void *cls,
 {
   struct TALER_EXCHANGE_RecoupRefreshHandle *ph = cls;
   const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_RecoupRefreshResponse rrr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
   };
 
   ph->job = NULL;
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rrr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
@@ -153,8 +157,8 @@ handle_recoup_refresh_finished (void *cls,
                                  j))
     {
       GNUNET_break_op (0);
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      hr.http_status = 0;
+      rrr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+      rrr.hr.http_status = 0;
       break;
     }
     TALER_EXCHANGE_recoup_refresh_cancel (ph);
@@ -162,128 +166,60 @@ handle_recoup_refresh_finished (void *cls,
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the exchange is buggy
        (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_CONFLICT:
-    {
-      /* Insufficient funds, proof attached */
-      json_t *history;
-      struct TALER_Amount total;
-      struct TALER_DenominationHashP h_denom_pub;
-      const struct TALER_EXCHANGE_DenomPublicKey *dki;
-      enum TALER_ErrorCode ec;
-
-      dki = &ph->pk;
-      history = json_object_get (j,
-                                 "history");
-      if (GNUNET_OK !=
-          TALER_EXCHANGE_verify_coin_history (dki,
-                                              dki->fees.deposit.currency,
-                                              &ph->coin_pub,
-                                              history,
-                                              &h_denom_pub,
-                                              &total))
-      {
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      }
-      else
-      {
-        hr.ec = TALER_JSON_get_error_code (j);
-        hr.hint = TALER_JSON_get_error_hint (j);
-      }
-      ec = TALER_JSON_get_error_code (j);
-      switch (ec)
-      {
-      case TALER_EC_EXCHANGE_GENERIC_INSUFFICIENT_FUNDS:
-        if (0 > TALER_amount_cmp (&total,
-                                  &dki->value))
-        {
-          /* recoup MAY have still been possible */
-          /* FIXME: This code may falsely complain, as we do not
-             know that the smallest denomination offered by the
-             exchange is here. We should look at the key
-             structure of ph->exchange, and find the smallest
-             _currently withdrawable_ denomination and check
-             if the value remaining would suffice... */
-          GNUNET_break_op (0);
-          hr.http_status = 0;
-          hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        break;
-      case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
-        if (0 == GNUNET_memcmp (&ph->pk.h_key,
-                                &h_denom_pub))
-        {
-          /* invalid proof provided */
-          GNUNET_break_op (0);
-          hr.http_status = 0;
-          hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-          break;
-        }
-        /* valid error from exchange */
-        break;
-      default:
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-      ph->cb (ph->cb_cls,
-              &hr,
-              NULL);
-      TALER_EXCHANGE_recoup_refresh_cancel (ph);
-      return;
-    }
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
   case MHD_HTTP_GONE:
     /* Kind of normal: the money was already sent to the merchant
        (it was too late for the refund). */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   default:
     /* unexpected response code */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rrr.hr.ec = TALER_JSON_get_error_code (j);
+    rrr.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange recoup\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) rrr.hr.ec);
     GNUNET_break (0);
     break;
   }
   ph->cb (ph->cb_cls,
-          &hr,
-          NULL);
+          &rrr);
   TALER_EXCHANGE_recoup_refresh_cancel (ph);
 }
 
 
 struct TALER_EXCHANGE_RecoupRefreshHandle *
 TALER_EXCHANGE_recoup_refresh (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_EXCHANGE_DenomPublicKey *pk,
   const struct TALER_DenominationSignature *denom_sig,
   const struct TALER_ExchangeWithdrawValues *exchange_vals,
@@ -294,19 +230,21 @@ TALER_EXCHANGE_recoup_refresh (
   void *recoup_cb_cls)
 {
   struct TALER_EXCHANGE_RecoupRefreshHandle *ph;
-  struct GNUNET_CURL_Context *ctx;
-  struct TALER_CoinSpendSignatureP coin_sig;
-  struct TALER_CoinSpendPublicKeyP coin_pub;
   struct TALER_DenominationHashP h_denom_pub;
   json_t *recoup_obj;
   CURL *eh;
   char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
 
   GNUNET_assert (NULL != recoup_cb);
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
+  ph = GNUNET_new (struct TALER_EXCHANGE_RecoupRefreshHandle);
+  ph->pk = *pk;
+  memset (&ph->pk.key,
+          0,
+          sizeof (ph->pk.key)); /* zero out, as lifetime cannot be warranted */
+  ph->cb = recoup_cb;
+  ph->cb_cls = recoup_cb_cls;
   TALER_planchet_setup_coin_priv (ps,
                                   exchange_vals,
                                   &coin_priv);
@@ -314,13 +252,13 @@ TALER_EXCHANGE_recoup_refresh (
                                          exchange_vals,
                                          &bks);
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
-                                      &coin_pub.eddsa_pub);
+                                      &ph->coin_pub.eddsa_pub);
   TALER_denom_pub_hash (&pk->key,
                         &h_denom_pub);
   TALER_wallet_recoup_refresh_sign (&h_denom_pub,
                                     &bks,
                                     &coin_priv,
-                                    &coin_sig);
+                                    &ph->coin_sig);
   recoup_obj = GNUNET_JSON_PACK (
     GNUNET_JSON_pack_data_auto ("denom_pub_hash",
                                 &h_denom_pub),
@@ -329,28 +267,38 @@ TALER_EXCHANGE_recoup_refresh (
     TALER_JSON_pack_exchange_withdraw_values ("ewv",
                                               exchange_vals),
     GNUNET_JSON_pack_data_auto ("coin_sig",
-                                &coin_sig),
+                                &ph->coin_sig),
     GNUNET_JSON_pack_data_auto ("coin_blind_key_secret",
                                 &bks));
 
-  if (TALER_DENOMINATION_CS == denom_sig->cipher)
+  switch (denom_sig->unblinded_sig->cipher)
   {
-    struct TALER_CsNonce nonce;
-
-    // FIXME: add this to the spec!
-    /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash()
-       it is not strictly clear that the nonce is needed. Best case would be
-       to find a way to include it more 'naturally' somehow, for example with
-       the variant union version of bks! */
-    TALER_cs_refresh_nonce_derive (rms,
-                                   idx,
-                                   &nonce);
-    GNUNET_assert (
-      0 ==
-      json_object_set_new (recoup_obj,
-                           "cs_nonce",
-                           GNUNET_JSON_from_data_auto (
-                             &nonce)));
+  case GNUNET_CRYPTO_BSA_INVALID:
+    json_decref (recoup_obj);
+    GNUNET_break (0);
+    GNUNET_free (ph);
+    return NULL;
+  case GNUNET_CRYPTO_BSA_RSA:
+    break;
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      union GNUNET_CRYPTO_BlindSessionNonce nonce;
+
+      /* NOTE: this is not elegant, and as per the note in TALER_coin_ev_hash()
+         it is not strictly clear that the nonce is needed. Best case would be
+         to find a way to include it more 'naturally' somehow, for example with
+         the variant union version of bks! */
+      TALER_cs_refresh_nonce_derive (rms,
+                                     idx,
+                                     &nonce.cs_nonce);
+      GNUNET_assert (
+        0 ==
+        json_object_set_new (recoup_obj,
+                             "cs_nonce",
+                             GNUNET_JSON_from_data_auto (
+                               &nonce)));
+    }
+    break;
   }
 
   {
@@ -358,28 +306,20 @@ TALER_EXCHANGE_recoup_refresh (
     char *end;
 
     end = GNUNET_STRINGS_data_to_string (
-      &coin_pub,
+      &ph->coin_pub,
       sizeof (struct TALER_CoinSpendPublicKeyP),
       pub_str,
       sizeof (pub_str));
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/coins/%s/recoup-refresh",
+                     "coins/%s/recoup-refresh",
                      pub_str);
   }
 
-  ph = GNUNET_new (struct TALER_EXCHANGE_RecoupRefreshHandle);
-  ph->coin_pub = coin_pub;
-  ph->exchange = exchange;
-  ph->pk = *pk;
-  memset (&ph->pk.key,
-          0,
-          sizeof (ph->pk.key)); /* zero out, as lifetime cannot be warranted */
-  ph->cb = recoup_cb;
-  ph->cb_cls = recoup_cb_cls;
-  ph->url = TEAH_path_to_url (exchange,
-                              arg_str);
+  ph->url = TALER_url_join (url,
+                            arg_str,
+                            NULL);
   if (NULL == ph->url)
   {
     json_decref (recoup_obj);
@@ -405,7 +345,7 @@ TALER_EXCHANGE_recoup_refresh (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for recoup-refresh: `%s'\n",
               ph->url);
-  ctx = TEAH_handle_to_context (exchange);
+  ph->keys = TALER_EXCHANGE_keys_incref (keys);
   ph->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   ph->ctx.headers,
@@ -426,6 +366,7 @@ TALER_EXCHANGE_recoup_refresh_cancel (
   }
   GNUNET_free (ph->url);
   TALER_curl_easy_post_finished (&ph->ctx);
+  TALER_EXCHANGE_keys_decref (ph->keys);
   GNUNET_free (ph);
 }
 
diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c
index 581e21152..4369367e4 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -45,6 +45,11 @@ TALER_EXCHANGE_free_melt_data_ (struct MeltData *md)
       struct FreshCoinData *fcd = &md->fcds[j];
 
       TALER_denom_pub_free (&fcd->fresh_pk);
+      for (size_t i = 0; i < TALER_CNC_KAPPA; i++)
+      {
+        TALER_age_commitment_proof_free (fcd->age_commitment_proofs[i]);
+        GNUNET_free (fcd->age_commitment_proofs[i]);
+      }
     }
     GNUNET_free (md->fcds);
   }
@@ -63,7 +68,7 @@ TALER_EXCHANGE_get_melt_data_ (
 {
   struct TALER_Amount total;
   struct TALER_CoinSpendPublicKeyP coin_pub;
-  struct TALER_CsNonce nonces[rd->fresh_pks_len];
+  union GNUNET_CRYPTO_BlindSessionNonce nonces[rd->fresh_pks_len];
   bool uses_cs = false;
 
   GNUNET_CRYPTO_eddsa_key_get_public (&rd->melt_priv.eddsa_priv,
@@ -84,32 +89,41 @@ TALER_EXCHANGE_get_melt_data_ (
   GNUNET_assert (GNUNET_OK ==
                  TALER_amount_set_zero (rd->melt_amount.currency,
                                         &total));
-  TALER_denom_pub_deep_copy (&md->melted_coin.pub_key,
-                             &rd->melt_pk.key);
-  TALER_denom_sig_deep_copy (&md->melted_coin.sig,
-                             &rd->melt_sig);
+  TALER_denom_pub_copy (&md->melted_coin.pub_key,
+                        &rd->melt_pk.key);
+  TALER_denom_sig_copy (&md->melted_coin.sig,
+                        &rd->melt_sig);
   md->fcds = GNUNET_new_array (md->num_fresh_coins,
                                struct FreshCoinData);
   for (unsigned int j = 0; j<rd->fresh_pks_len; j++)
   {
     struct FreshCoinData *fcd = &md->fcds[j];
 
-    if (alg_values[j].cipher != rd->fresh_pks[j].key.cipher)
+    TALER_denom_pub_copy (&fcd->fresh_pk,
+                          &rd->fresh_pks[j].key);
+    GNUNET_assert (NULL != fcd->fresh_pk.bsign_pub_key);
+    if (alg_values[j].blinding_inputs->cipher !=
+        fcd->fresh_pk.bsign_pub_key->cipher)
     {
       GNUNET_break (0);
       TALER_EXCHANGE_free_melt_data_ (md);
       return GNUNET_SYSERR;
     }
-    if (TALER_DENOMINATION_CS == alg_values[j].cipher)
+    switch (fcd->fresh_pk.bsign_pub_key->cipher)
     {
+    case GNUNET_CRYPTO_BSA_INVALID:
+      GNUNET_break (0);
+      TALER_EXCHANGE_free_melt_data_ (md);
+      return GNUNET_SYSERR;
+    case GNUNET_CRYPTO_BSA_RSA:
+      break;
+    case GNUNET_CRYPTO_BSA_CS:
       uses_cs = true;
-      TALER_cs_refresh_nonce_derive (
-        rms,
-        j,
-        &nonces[j]);
+      TALER_cs_refresh_nonce_derive (rms,
+                                     j,
+                                     &nonces[j].cs_nonce);
+      break;
     }
-    TALER_denom_pub_deep_copy (&fcd->fresh_pk,
-                               &rd->fresh_pks[j].key);
     if ( (0 >
           TALER_amount_add (&total,
                             &total,
@@ -165,10 +179,11 @@ TALER_EXCHANGE_get_melt_data_ (
       struct TALER_CoinSpendPrivateKeyP *coin_priv = &fcd->coin_priv;
       struct TALER_PlanchetMasterSecretP *ps = &fcd->ps[i];
       struct TALER_RefreshCoinData *rcd = &md->rcd[i][j];
-      union TALER_DenominationBlindingKeyP *bks = &fcd->bks[i];
+      union GNUNET_CRYPTO_BlindingSecretP *bks = &fcd->bks[i];
       struct TALER_PlanchetDetail pd;
       struct TALER_CoinPubHashP c_hash;
-      struct TALER_AgeCommitmentHash *ach = NULL;
+      struct TALER_AgeCommitmentHash ach;
+      struct TALER_AgeCommitmentHash *pah = NULL;
 
       TALER_transfer_secret_to_planchet_secret (&trans_sec,
                                                 j,
@@ -182,33 +197,30 @@ TALER_EXCHANGE_get_melt_data_ (
                                              &alg_values[j],
                                              bks);
 
-      /* Handle age commitment, if present */
-      if (NULL != md->melted_coin.age_commitment_proof)
+      if (NULL != rd->melt_age_commitment_proof)
       {
-        fcd->age_commitment_proof[i] = GNUNET_new (struct
-                                                   TALER_AgeCommitmentProof);
-        ach = GNUNET_new (struct TALER_AgeCommitmentHash);
+        fcd->age_commitment_proofs[i] = GNUNET_new (struct
+                                                    TALER_AgeCommitmentProof);
 
         GNUNET_assert (GNUNET_OK ==
                        TALER_age_commitment_derive (
                          md->melted_coin.age_commitment_proof,
                          &trans_sec.key,
-                         fcd->age_commitment_proof[i]));
+                         fcd->age_commitment_proofs[i]));
 
         TALER_age_commitment_hash (
-          &fcd->age_commitment_proof[i]->commitment,
-          ach);
+          &fcd->age_commitment_proofs[i]->commitment,
+          &ach);
+        pah = &ach;
       }
 
-      if (TALER_DENOMINATION_CS == alg_values[j].cipher)
-        pd.blinded_planchet.details.cs_blinded_planchet.nonce = nonces[j];
-
       if (GNUNET_OK !=
           TALER_planchet_prepare (&fcd->fresh_pk,
                                   &alg_values[j],
                                   bks,
+                                  &nonces[j],
                                   coin_priv,
-                                  ach,
+                                  pah,
                                   &c_hash,
                                   &pd))
       {
diff --git a/src/lib/exchange_api_refresh_common.h b/src/lib/exchange_api_refresh_common.h
index c06824fec..f596e1e90 100644
--- a/src/lib/exchange_api_refresh_common.h
+++ b/src/lib/exchange_api_refresh_common.h
@@ -101,16 +101,15 @@ struct FreshCoinData
 
   /**
    * Arrays of age commitments and proofs to be created, one for each
-   * cut-and-choose dimension.  The entries in each list might be NULL and
-   * indicate no age commitment/restriction on the particular coin.
+   * cut-and-choose dimension.  NULL if age restriction is not applicable.
    */
-  struct TALER_AgeCommitmentProof *age_commitment_proof[TALER_CNC_KAPPA];
+  struct TALER_AgeCommitmentProof *age_commitment_proofs[TALER_CNC_KAPPA];
 
   /**
    * Blinding key secrets for the coins, depending on the
    * cut-and-choose.
    */
-  union TALER_DenominationBlindingKeyP bks[TALER_CNC_KAPPA];
+  union GNUNET_CRYPTO_BlindingSecretP bks[TALER_CNC_KAPPA];
 
 };
 
diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c
index cd2a1d1f4..69c53a6c9 100644
--- a/src/lib/exchange_api_refreshes_reveal.c
+++ b/src/lib/exchange_api_refreshes_reveal.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2015-2022 Taler Systems SA
+  Copyright (C) 2015-2023 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
@@ -40,11 +40,6 @@ struct TALER_EXCHANGE_RefreshesRevealHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -107,10 +102,10 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
                    const json_t *json,
                    struct TALER_EXCHANGE_RevealedCoinInfo *rcis)
 {
-  json_t *jsona;
+  const json_t *jsona;
   struct GNUNET_JSON_Specification outer_spec[] = {
-    GNUNET_JSON_spec_json ("ev_sigs",
-                           &jsona),
+    GNUNET_JSON_spec_array_const ("ev_sigs",
+                                  &jsona),
     GNUNET_JSON_spec_end ()
   };
 
@@ -122,24 +117,15 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if (! json_is_array (jsona))
-  {
-    /* We expected an array of coins */
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (outer_spec);
-    return GNUNET_SYSERR;
-  }
   if (rrh->md.num_fresh_coins != json_array_size (jsona))
   {
     /* Number of coins generated does not match our expectation */
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (outer_spec);
     return GNUNET_SYSERR;
   }
   for (unsigned int i = 0; i<rrh->md.num_fresh_coins; i++)
   {
-    struct TALER_EXCHANGE_RevealedCoinInfo *rci =
-      &rcis[i];
+    struct TALER_EXCHANGE_RevealedCoinInfo *rci = &rcis[i];
     const struct FreshCoinData *fcd = &rrh->md.fcds[i];
     const struct TALER_DenominationPublicKey *pk;
     json_t *jsonai;
@@ -152,26 +138,22 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
       GNUNET_JSON_spec_end ()
     };
     struct TALER_FreshCoin coin;
-    union TALER_DenominationBlindingKeyP bks;
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    const struct TALER_AgeCommitmentHash *pah = NULL;
 
     rci->ps = fcd->ps[rrh->noreveal_index];
     rci->bks = fcd->bks[rrh->noreveal_index];
-    rci->age_commitment_proof = fcd->age_commitment_proof[rrh->noreveal_index];
-    rci->h_age_commitment = NULL;
+    rci->age_commitment_proof = NULL;
     pk = &fcd->fresh_pk;
     jsonai = json_array_get (jsona, i);
-
     GNUNET_assert (NULL != jsonai);
-    GNUNET_assert (
-      (NULL != rrh->md.melted_coin.age_commitment_proof) ==
-      (NULL != rci->age_commitment_proof));
-
-    if (NULL != rci->age_commitment_proof)
+    if (NULL != rrh->md.melted_coin.age_commitment_proof)
     {
-      rci->h_age_commitment = GNUNET_new (struct TALER_AgeCommitmentHash);
-      TALER_age_commitment_hash (
-        &rci->age_commitment_proof->commitment,
-        rci->h_age_commitment);
+      rci->age_commitment_proof
+        = fcd->age_commitment_proofs[rrh->noreveal_index];
+      TALER_age_commitment_hash (&rci->age_commitment_proof->commitment,
+                                 &rci->h_age_commitment);
+      pah = &rci->h_age_commitment;
     }
 
     if (GNUNET_OK !=
@@ -180,7 +162,6 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (outer_spec);
       return GNUNET_SYSERR;
     }
 
@@ -194,28 +175,28 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh,
        hence recomputing it here... */
     GNUNET_CRYPTO_eddsa_key_get_public (&rci->coin_priv.eddsa_priv,
                                         &coin_pub.eddsa_pub);
-    TALER_coin_pub_hash (&coin_pub,
-                         rci->h_age_commitment,
-                         &coin_hash);
+    TALER_coin_pub_hash (
+      &coin_pub,
+      pah,
+      &coin_hash);
     if (GNUNET_OK !=
-        TALER_planchet_to_coin (pk,
-                                &blind_sig,
-                                &bks,
-                                &rci->coin_priv,
-                                rci->h_age_commitment,
-                                &coin_hash,
-                                &rrh->alg_values[i],
-                                &coin))
+        TALER_planchet_to_coin (
+          pk,
+          &blind_sig,
+          &bks,
+          &rci->coin_priv,
+          pah,
+          &coin_hash,
+          &rrh->alg_values[i],
+          &coin))
     {
       GNUNET_break_op (0);
       GNUNET_JSON_parse_free (spec);
-      GNUNET_JSON_parse_free (outer_spec);
       return GNUNET_SYSERR;
     }
     GNUNET_JSON_parse_free (spec);
     rci->sig = coin.sig;
   }
-  GNUNET_JSON_parse_free (outer_spec);
   return GNUNET_OK;
 }
 
@@ -266,14 +247,17 @@ handle_refresh_reveal_finished (void *cls,
       else
       {
         GNUNET_assert (rrh->noreveal_index < TALER_CNC_KAPPA);
-        rr.details.success.num_coins = rrh->md.num_fresh_coins;
-        rr.details.success.coins = rcis;
+        rr.details.ok.num_coins = rrh->md.num_fresh_coins;
+        rr.details.ok.coins = rcis;
         rrh->reveal_cb (rrh->reveal_cb_cls,
                         &rr);
         rrh->reveal_cb = NULL;
       }
       for (unsigned int i = 0; i<rrh->md.num_fresh_coins; i++)
+      {
         TALER_denom_sig_free (&rcis[i].sig);
+        TALER_age_commitment_proof_free (rcis[i].age_commitment_proof);
+      }
       TALER_EXCHANGE_refreshes_reveal_cancel (rrh);
       return;
     }
@@ -321,11 +305,12 @@ handle_refresh_reveal_finished (void *cls,
 
 struct TALER_EXCHANGE_RefreshesRevealHandle *
 TALER_EXCHANGE_refreshes_reveal (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_RefreshMasterSecretP *rms,
   const struct TALER_EXCHANGE_RefreshData *rd,
   unsigned int num_coins,
-  const struct TALER_ExchangeWithdrawValues *alg_values,
+  const struct TALER_ExchangeWithdrawValues alg_values[static num_coins],
   uint32_t noreveal_index,
   TALER_EXCHANGE_RefreshesRevealCallback reveal_cb,
   void *reveal_cb_cls)
@@ -338,7 +323,6 @@ TALER_EXCHANGE_refreshes_reveal (
   json_t *link_sigs;
   json_t *old_age_commitment = NULL;
   CURL *eh;
-  struct GNUNET_CURL_Context *ctx;
   struct MeltData md;
   char arg_str[sizeof (struct TALER_RefreshCommitmentP) * 2 + 32];
   bool send_rms = false;
@@ -353,12 +337,6 @@ TALER_EXCHANGE_refreshes_reveal (
     GNUNET_break (0);
     return NULL;
   }
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   if (GNUNET_OK !=
       TALER_EXCHANGE_get_melt_data_ (rms,
                                      rd,
@@ -378,7 +356,8 @@ TALER_EXCHANGE_refreshes_reveal (
     const struct TALER_RefreshCoinData *rcd = &md.rcd[noreveal_index][i];
     struct TALER_DenominationHashP denom_hash;
 
-    if (TALER_DENOMINATION_CS == md.fcds[i].fresh_pk.cipher)
+    if (GNUNET_CRYPTO_BSA_CS ==
+        md.fcds[i].fresh_pk.bsign_pub_key->cipher)
       send_rms = true;
     TALER_denom_pub_hash (&md.fcds[i].fresh_pk,
                           &denom_hash);
@@ -429,20 +408,20 @@ TALER_EXCHANGE_refreshes_reveal (
   }
 
   /* build array of old age commitment, if applicable */
-  GNUNET_assert ((NULL == rd->melt_age_commitment_proof) ==
-                 (NULL == rd->melt_h_age_commitment));
   if (NULL != rd->melt_age_commitment_proof)
   {
+    GNUNET_assert (NULL != rd->melt_h_age_commitment);
     GNUNET_assert (NULL != (old_age_commitment = json_array ()));
 
     for (size_t i = 0; i < rd->melt_age_commitment_proof->commitment.num; i++)
     {
-      GNUNET_assert (0 ==
-                     json_array_append_new (
-                       old_age_commitment,
-                       GNUNET_JSON_from_data_auto (
-                         &rd->melt_age_commitment_proof->
-                         commitment.keys[i])));
+      enum GNUNET_GenericReturnValue ret;
+
+      ret = json_array_append_new (
+        old_age_commitment,
+        GNUNET_JSON_from_data_auto (
+          &rd->melt_age_commitment_proof->commitment.keys[i]));
+      GNUNET_assert (0 == ret);
     }
   }
 
@@ -478,22 +457,24 @@ TALER_EXCHANGE_refreshes_reveal (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/refreshes/%s/reveal",
+                     "refreshes/%s/reveal",
                      pub_str);
   }
   /* finally, we can actually issue the request */
   rrh = GNUNET_new (struct TALER_EXCHANGE_RefreshesRevealHandle);
-  rrh->exchange = exchange;
   rrh->noreveal_index = noreveal_index;
   rrh->reveal_cb = reveal_cb;
   rrh->reveal_cb_cls = reveal_cb_cls;
   rrh->md = md;
-  rrh->alg_values = GNUNET_memdup (alg_values,
-                                   md.num_fresh_coins
-                                   * sizeof (struct
-                                             TALER_ExchangeWithdrawValues));
-  rrh->url = TEAH_path_to_url (rrh->exchange,
-                               arg_str);
+  rrh->alg_values
+    = GNUNET_new_array (md.num_fresh_coins,
+                        struct TALER_ExchangeWithdrawValues);
+  for (unsigned int i = 0; i<md.num_fresh_coins; i++)
+    TALER_denom_ewv_copy (&rrh->alg_values[i],
+                          &alg_values[i]);
+  rrh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == rrh->url)
   {
     json_decref (reveal_obj);
@@ -521,7 +502,6 @@ TALER_EXCHANGE_refreshes_reveal (
     return NULL;
   }
   json_decref (reveal_obj);
-  ctx = TEAH_handle_to_context (rrh->exchange);
   rrh->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    rrh->ctx.headers,
@@ -540,6 +520,8 @@ TALER_EXCHANGE_refreshes_reveal_cancel (
     GNUNET_CURL_job_cancel (rrh->job);
     rrh->job = NULL;
   }
+  for (unsigned int i = 0; i<rrh->md.num_fresh_coins; i++)
+    TALER_denom_ewv_free (&rrh->alg_values[i]);
   GNUNET_free (rrh->alg_values);
   GNUNET_free (rrh->url);
   TALER_curl_easy_post_finished (&rrh->ctx);
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 004661b00..9159b55f2 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -39,9 +39,9 @@ struct TALER_EXCHANGE_RefundHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -117,7 +117,6 @@ verify_refund_signature_ok (struct TALER_EXCHANGE_RefundHandle *rh,
                             struct TALER_ExchangePublicKeyP *exchange_pub,
                             struct TALER_ExchangeSignatureP *exchange_sig)
 {
-  const struct TALER_EXCHANGE_Keys *key_state;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("exchange_sig",
                                  exchange_sig),
@@ -134,9 +133,8 @@ verify_refund_signature_ok (struct TALER_EXCHANGE_RefundHandle *rh,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  key_state = TALER_EXCHANGE_get_keys (rh->exchange);
   if (GNUNET_OK !=
-      TALER_EXCHANGE_test_signing_key (key_state,
+      TALER_EXCHANGE_test_signing_key (rh->keys,
                                        exchange_pub))
   {
     GNUNET_break_op (0);
@@ -160,308 +158,6 @@ verify_refund_signature_ok (struct TALER_EXCHANGE_RefundHandle *rh,
 
 
 /**
- * Verify that the information in the "409 Conflict" response
- * from the exchange is valid and indeed shows that the refund
- * amount requested is too high.
- *
- * @param[in,out] rh refund handle (refund fee added)
- * @param json json reply with the coin transaction history
- * @return #GNUNET_OK if the signature is valid, #GNUNET_SYSERR if not
- */
-static enum GNUNET_GenericReturnValue
-verify_conflict_history_ok (struct TALER_EXCHANGE_RefundHandle *rh,
-                            const json_t *json)
-{
-  json_t *history;
-  struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("history",
-                           &history),
-    GNUNET_JSON_spec_end ()
-  };
-  size_t len;
-  struct TALER_Amount dtotal;
-  bool have_deposit;
-  struct TALER_Amount rtotal;
-  bool have_refund;
-
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (json,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  len = json_array_size (history);
-  if (0 == len)
-  {
-    GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
-    return GNUNET_SYSERR;
-  }
-  have_deposit = false;
-  have_refund = false;
-  for (size_t off = 0; off<len; off++)
-  {
-    json_t *transaction;
-    struct TALER_Amount amount;
-    const char *type;
-    struct GNUNET_JSON_Specification spec_glob[] = {
-      TALER_JSON_spec_amount_any ("amount",
-                                  &amount),
-      GNUNET_JSON_spec_string ("type",
-                               &type),
-      GNUNET_JSON_spec_end ()
-    };
-
-    transaction = json_array_get (history,
-                                  off);
-    if (GNUNET_OK !=
-        GNUNET_JSON_parse (transaction,
-                           spec_glob,
-                           NULL, NULL))
-    {
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
-    if (0 == strcasecmp (type,
-                         "DEPOSIT"))
-    {
-      struct TALER_Amount deposit_fee;
-      struct TALER_MerchantWireHashP h_wire;
-      struct TALER_PrivateContractHashP h_contract_terms;
-      struct TALER_AgeCommitmentHash h_age_commitment;
-      bool no_hac;
-      // struct TALER_ExtensionContractHashP h_extensions; // FIXME!
-      struct TALER_DenominationHashP h_denom_pub;
-      struct GNUNET_TIME_Timestamp wallet_timestamp;
-      struct TALER_MerchantPublicKeyP merchant_pub;
-      struct GNUNET_TIME_Timestamp refund_deadline;
-      struct TALER_CoinSpendSignatureP sig;
-      struct GNUNET_JSON_Specification ispec[] = {
-        GNUNET_JSON_spec_fixed_auto ("coin_sig",
-                                     &sig),
-        GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                     &h_contract_terms),
-        GNUNET_JSON_spec_fixed_auto ("h_wire",
-                                     &h_wire),
-        GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
-                                     &h_denom_pub),
-        GNUNET_JSON_spec_mark_optional (
-          GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
-                                       &h_age_commitment),
-          &no_hac),
-        GNUNET_JSON_spec_timestamp ("timestamp",
-                                    &wallet_timestamp),
-        GNUNET_JSON_spec_timestamp ("refund_deadline",
-                                    &refund_deadline),
-        TALER_JSON_spec_amount_any ("deposit_fee",
-                                    &deposit_fee),
-        GNUNET_JSON_spec_fixed_auto ("merchant_pub",
-                                     &merchant_pub),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             ispec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_wallet_deposit_verify (&amount,
-                                       &deposit_fee,
-                                       &h_wire,
-                                       &h_contract_terms,
-                                       no_hac
-                                       ? NULL
-                                       : &h_age_commitment,
-                                       NULL /* FIXME-OEC: h_extensions! */,
-                                       &h_denom_pub,
-                                       wallet_timestamp,
-                                       &merchant_pub,
-                                       refund_deadline,
-                                       &rh->coin_pub,
-                                       &sig))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if ( (0 != GNUNET_memcmp (&rh->h_contract_terms,
-                                &h_contract_terms)) ||
-           (0 != GNUNET_memcmp (&rh->merchant,
-                                &merchant_pub)) )
-      {
-        /* deposit information is about a different merchant/contract */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if (have_deposit)
-      {
-        /* this cannot really happen, but we conservatively support it anyway */
-        if (GNUNET_YES !=
-            TALER_amount_cmp_currency (&amount,
-                                       &dtotal))
-        {
-          GNUNET_break_op (0);
-          GNUNET_JSON_parse_free (spec);
-          return GNUNET_SYSERR;
-        }
-        GNUNET_break (0 <=
-                      TALER_amount_add (&dtotal,
-                                        &dtotal,
-                                        &amount));
-      }
-      else
-      {
-        dtotal = amount;
-        have_deposit = true;
-      }
-    }
-    else if (0 == strcasecmp (type,
-                              "REFUND"))
-    {
-      struct TALER_MerchantSignatureP sig;
-      struct TALER_Amount refund_fee;
-      struct TALER_Amount sig_amount;
-      struct TALER_PrivateContractHashP h_contract_terms;
-      uint64_t rtransaction_id;
-      struct TALER_MerchantPublicKeyP merchant_pub;
-      struct GNUNET_JSON_Specification ispec[] = {
-        TALER_JSON_spec_amount_any ("refund_fee",
-                                    &refund_fee),
-        GNUNET_JSON_spec_fixed_auto ("merchant_sig",
-                                     &sig),
-        GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
-                                     &h_contract_terms),
-        GNUNET_JSON_spec_fixed_auto ("merchant_pub",
-                                     &merchant_pub),
-        GNUNET_JSON_spec_uint64 ("rtransaction_id",
-                                 &rtransaction_id),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (transaction,
-                             ispec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if (0 >
-          TALER_amount_add (&sig_amount,
-                            &refund_fee,
-                            &amount))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if (GNUNET_OK !=
-          TALER_merchant_refund_verify (&rh->coin_pub,
-                                        &h_contract_terms,
-                                        rtransaction_id,
-                                        &sig_amount,
-                                        &merchant_pub,
-                                        &sig))
-      {
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if ( (0 != GNUNET_memcmp (&rh->h_contract_terms,
-                                &h_contract_terms)) ||
-           (0 != GNUNET_memcmp (&rh->merchant,
-                                &merchant_pub)) )
-      {
-        /* refund is about a different merchant/contract */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-      if (rtransaction_id == rh->rtransaction_id)
-      {
-        /* Eh, this shows either a dependency failure or idempotency,
-           but must not happen in a conflict reply. Fail! */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-
-      if (have_refund)
-      {
-        if (GNUNET_YES !=
-            TALER_amount_cmp_currency (&amount,
-                                       &rtotal))
-        {
-          GNUNET_break_op (0);
-          GNUNET_JSON_parse_free (spec);
-          return GNUNET_SYSERR;
-        }
-        GNUNET_break (0 <=
-                      TALER_amount_add (&rtotal,
-                                        &rtotal,
-                                        &amount));
-      }
-      else
-      {
-        rtotal = amount;
-        have_refund = true;
-      }
-    }
-    else
-    {
-      /* unexpected type, new version on server? */
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unexpected type `%s' in response for exchange refund\n",
-                  type);
-      GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  {
-    if (have_refund)
-    {
-      if (0 >
-          TALER_amount_add (&rtotal,
-                            &rtotal,
-                            &rh->refund_amount))
-      {
-        GNUNET_break (0);
-        GNUNET_JSON_parse_free (spec);
-        return GNUNET_SYSERR;
-      }
-    }
-    else
-    {
-      rtotal = rh->refund_amount;
-    }
-  }
-  if (-1 == TALER_amount_cmp (&dtotal,
-                              &rtotal))
-  {
-    /* dtotal < rtotal: good! */
-    GNUNET_JSON_parse_free (spec);
-    return GNUNET_OK;
-  }
-  /* this fails to prove a conflict */
-  GNUNET_break_op (0);
-  GNUNET_JSON_parse_free (spec);
-  return GNUNET_SYSERR;
-}
-
-
-/**
  * Verify that the information on the "412 Dependency Failed" response
  * from the exchange is valid and indeed shows that there is a refund
  * transaction ID reuse going on.
@@ -474,11 +170,11 @@ static enum GNUNET_GenericReturnValue
 verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh,
                              const json_t *json)
 {
-  json_t *h;
+  const json_t *h;
   json_t *e;
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_json ("history",
-                           &h),
+    GNUNET_JSON_spec_array_const ("history",
+                                  &h),
     GNUNET_JSON_spec_end ()
   };
 
@@ -490,11 +186,9 @@ verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  if ( (! json_is_array (h)) ||
-       (1 != json_array_size (h) ) )
+  if (1 != json_array_size (h))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return GNUNET_SYSERR;
   }
   e = json_array_get (h, 0);
@@ -530,7 +224,6 @@ verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh,
                            NULL, NULL))
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
     if (GNUNET_OK !=
@@ -542,7 +235,6 @@ verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh,
                                       &sig))
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
     if ( (rtransaction_id != rh->rtransaction_id) ||
@@ -554,11 +246,9 @@ verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh,
                                  &amount)) )
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
   }
-  GNUNET_JSON_parse_free (spec);
   return GNUNET_OK;
 }
 
@@ -577,37 +267,28 @@ handle_refund_finished (void *cls,
                         const void *response)
 {
   struct TALER_EXCHANGE_RefundHandle *rh = cls;
-  struct TALER_ExchangePublicKeyP exchange_pub;
-  struct TALER_ExchangeSignatureP exchange_sig;
-  struct TALER_ExchangePublicKeyP *ep = NULL;
-  struct TALER_ExchangeSignatureP *es = NULL;
   const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_RefundResponse rr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
   };
 
   rh->job = NULL;
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    rr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
         verify_refund_signature_ok (rh,
                                     j,
-                                    &exchange_pub,
-                                    &exchange_sig))
+                                    &rr.details.ok.exchange_pub,
+                                    &rr.details.ok.exchange_sig))
     {
       GNUNET_break_op (0);
-      hr.http_status = 0;
-      hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_SIGNATURE_BY_EXCHANGE;
-    }
-    else
-    {
-      ep = &exchange_pub;
-      es = &exchange_sig;
+      rr.hr.http_status = 0;
+      rr.hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_SIGNATURE_BY_EXCHANGE;
     }
     break;
   case MHD_HTTP_BAD_REQUEST:
@@ -615,42 +296,36 @@ handle_refund_finished (void *cls,
        (or API version conflict); also can happen if the currency
        differs (which we should obviously never support).
        Just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_CONFLICT:
     /* Requested total refunds exceed deposited amount */
-    if (GNUNET_OK !=
-        verify_conflict_history_ok (rh,
-                                    j))
-    {
-      GNUNET_break (0);
-      hr.http_status = 0;
-      hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
-      hr.hint = "conflict information provided by exchange is invalid";
-      break;
-    }
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_GONE:
     /* Kind of normal: the money was already sent to the merchant
        (it was too late for the refund). */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FAILED_DEPENDENCY:
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_PRECONDITION_FAILED:
     if (GNUNET_OK !=
@@ -658,44 +333,44 @@ handle_refund_finished (void *cls,
                                      j))
     {
       GNUNET_break (0);
-      hr.http_status = 0;
-      hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
-      hr.hint = "failed precondition proof returned by exchange is invalid";
+      rr.hr.http_status = 0;
+      rr.hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
+      rr.hr.hint = "failed precondition proof returned by exchange is invalid";
       break;
     }
     /* Two different refund requests were made about the same deposit, but
        carrying identical refund transaction ids.  */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    rr.hr.ec = TALER_JSON_get_error_code (j);
+    rr.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for exchange refund\n",
                 (unsigned int) response_code,
-                hr.ec);
+                rr.hr.ec);
     break;
   }
   rh->cb (rh->cb_cls,
-          &hr,
-          ep,
-          es);
+          &rr);
   TALER_EXCHANGE_refund_cancel (rh);
 }
 
 
 struct TALER_EXCHANGE_RefundHandle *
 TALER_EXCHANGE_refund (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_Amount *amount,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -707,13 +382,10 @@ TALER_EXCHANGE_refund (
   struct TALER_MerchantPublicKeyP merchant_pub;
   struct TALER_MerchantSignatureP merchant_sig;
   struct TALER_EXCHANGE_RefundHandle *rh;
-  struct GNUNET_CURL_Context *ctx;
   json_t *refund_obj;
   CURL *eh;
   char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
 
-  GNUNET_assert (GNUNET_YES ==
-                 TEAH_handle_is_ready (exchange));
   GNUNET_CRYPTO_eddsa_key_get_public (&merchant_priv->eddsa_priv,
                                       &merchant_pub.eddsa_pub);
   TALER_merchant_refund_sign (coin_pub,
@@ -734,7 +406,7 @@ TALER_EXCHANGE_refund (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/coins/%s/refund",
+                     "coins/%s/refund",
                      pub_str);
   }
   refund_obj = GNUNET_JSON_PACK (
@@ -749,11 +421,11 @@ TALER_EXCHANGE_refund (
     GNUNET_JSON_pack_data_auto ("merchant_sig",
                                 &merchant_sig));
   rh = GNUNET_new (struct TALER_EXCHANGE_RefundHandle);
-  rh->exchange = exchange;
   rh->cb = cb;
   rh->cb_cls = cb_cls;
-  rh->url = TEAH_path_to_url (exchange,
-                              arg_str);
+  rh->url = TALER_url_join (url,
+                            arg_str,
+                            NULL);
   if (NULL == rh->url)
   {
     json_decref (refund_obj);
@@ -784,7 +456,7 @@ TALER_EXCHANGE_refund (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "URL for refund: `%s'\n",
               rh->url);
-  ctx = TEAH_handle_to_context (exchange);
+  rh->keys = TALER_EXCHANGE_keys_incref (keys);
   rh->job = GNUNET_CURL_job_add2 (ctx,
                                   eh,
                                   rh->ctx.headers,
@@ -804,6 +476,7 @@ TALER_EXCHANGE_refund_cancel (struct TALER_EXCHANGE_RefundHandle *refund)
   }
   GNUNET_free (refund->url);
   TALER_curl_easy_post_finished (&refund->ctx);
+  TALER_EXCHANGE_keys_decref (refund->keys);
   GNUNET_free (refund);
 }
 
diff --git a/src/lib/exchange_api_reserves_status.c b/src/lib/exchange_api_reserves_attest.c
index f1221c2ba..d5a867114 100644
--- a/src/lib/exchange_api_reserves_status.c
+++ b/src/lib/exchange_api_reserves_attest.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -15,13 +15,13 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file lib/exchange_api_reserves_status.c
- * @brief Implementation of the POST /reserves/$RESERVE_PUB/status requests
+ * @file lib/exchange_api_reserves_attest.c
+ * @brief Implementation of the POST /reserves-attest/$RESERVE_PUB requests
  * @author Christian Grothoff
  */
 #include "platform.h"
 #include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
+#include <microhttpd.h> /* just for HTTP attest codes */
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_json_lib.h>
 #include <gnunet/gnunet_curl_lib.h>
@@ -33,15 +33,15 @@
 
 
 /**
- * @brief A /reserves/$RID/status Handle
+ * @brief A /reserves-attest/$RID Handle
  */
-struct TALER_EXCHANGE_ReservesStatusHandle
+struct TALER_EXCHANGE_ReservesAttestHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -62,7 +62,7 @@ struct TALER_EXCHANGE_ReservesStatusHandle
   /**
    * Function to call with the result.
    */
-  TALER_EXCHANGE_ReservesStatusCallback cb;
+  TALER_EXCHANGE_ReservesPostAttestCallback cb;
 
   /**
    * Public key of the reserve we are querying.
@@ -78,7 +78,7 @@ struct TALER_EXCHANGE_ReservesStatusHandle
 
 
 /**
- * We received an #MHD_HTTP_OK status code. Handle the JSON
+ * We received an #MHD_HTTP_OK attest code. Handle the JSON
  * response.
  *
  * @param rsh handle of the request
@@ -86,24 +86,25 @@ struct TALER_EXCHANGE_ReservesStatusHandle
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
-handle_reserves_status_ok (struct TALER_EXCHANGE_ReservesStatusHandle *rsh,
+handle_reserves_attest_ok (struct TALER_EXCHANGE_ReservesAttestHandle *rsh,
                            const json_t *j)
 {
-  json_t *history;
-  unsigned int len;
-  struct TALER_EXCHANGE_ReserveStatus rs = {
+  struct TALER_EXCHANGE_ReservePostAttestResult rs = {
     .hr.reply = j,
     .hr.http_status = MHD_HTTP_OK
   };
+  const json_t *attributes;
   struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_amount_any ("balance",
-                                &rs.details.ok.balance),
-    GNUNET_JSON_spec_bool ("kyc_passed",
-                           &rs.details.ok.kyc_ok),
-    GNUNET_JSON_spec_bool ("kyc_required",
-                           &rs.details.ok.kyc_required),
-    GNUNET_JSON_spec_json ("history",
-                           &history),
+    GNUNET_JSON_spec_timestamp ("exchange_timestamp",
+                                &rs.details.ok.exchange_time),
+    GNUNET_JSON_spec_timestamp ("expiration_time",
+                                &rs.details.ok.expiration_time),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rs.details.ok.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rs.details.ok.exchange_pub),
+    GNUNET_JSON_spec_object_const ("attributes",
+                                   &attributes),
     GNUNET_JSON_spec_end ()
   };
 
@@ -116,39 +117,36 @@ handle_reserves_status_ok (struct TALER_EXCHANGE_ReservesStatusHandle *rsh,
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  len = json_array_size (history);
+  if (GNUNET_OK !=
+      TALER_EXCHANGE_test_signing_key (rsh->keys,
+                                       &rs.details.ok.exchange_pub))
   {
-    struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory;
-
-    rhistory = GNUNET_new_array (len,
-                                 struct TALER_EXCHANGE_ReserveHistoryEntry);
-    if (GNUNET_OK !=
-        TALER_EXCHANGE_parse_reserve_history (rsh->exchange,
-                                              history,
-                                              &rsh->reserve_pub,
-                                              rs.details.ok.balance.currency,
-                                              &rs.details.ok.total_in,
-                                              &rs.details.ok.total_out,
-                                              len,
-                                              rhistory))
-    {
-      GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
-    if (NULL != rsh->cb)
-    {
-      rs.details.ok.history = rhistory;
-      rs.details.ok.history_len = len;
-      rsh->cb (rsh->cb_cls,
-               &rs);
-      rsh->cb = NULL;
-    }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    GNUNET_break_op (0);
+    rs.hr.http_status = 0;
+    rs.hr.ec = TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_SIGNATURE_BY_EXCHANGE;
+    rsh->cb (rsh->cb_cls,
+             &rs);
+    rsh->cb = NULL;
+    GNUNET_JSON_parse_free (spec);
+    return GNUNET_SYSERR;
   }
+  rs.details.ok.attributes = attributes;
+  if (GNUNET_OK !=
+      TALER_exchange_online_reserve_attest_details_verify (
+        rs.details.ok.exchange_time,
+        rs.details.ok.expiration_time,
+        &rsh->reserve_pub,
+        attributes,
+        &rs.details.ok.exchange_pub,
+        &rs.details.ok.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (spec);
+    return GNUNET_SYSERR;
+  }
+  rsh->cb (rsh->cb_cls,
+           &rs);
+  rsh->cb = NULL;
   GNUNET_JSON_parse_free (spec);
   return GNUNET_OK;
 }
@@ -156,20 +154,20 @@ handle_reserves_status_ok (struct TALER_EXCHANGE_ReservesStatusHandle *rsh,
 
 /**
  * Function called when we're done processing the
- * HTTP /reserves/$RID/status request.
+ * HTTP /reserves-attest/$RID request.
  *
- * @param cls the `struct TALER_EXCHANGE_ReservesStatusHandle`
+ * @param cls the `struct TALER_EXCHANGE_ReservesAttestHandle`
  * @param response_code HTTP response code, 0 on error
  * @param response parsed JSON result, NULL on error
  */
 static void
-handle_reserves_status_finished (void *cls,
+handle_reserves_attest_finished (void *cls,
                                  long response_code,
                                  const void *response)
 {
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh = cls;
+  struct TALER_EXCHANGE_ReservesAttestHandle *rsh = cls;
   const json_t *j = response;
-  struct TALER_EXCHANGE_ReserveStatus rs = {
+  struct TALER_EXCHANGE_ReservePostAttestResult rs = {
     .hr.reply = j,
     .hr.http_status = (unsigned int) response_code
   };
@@ -182,7 +180,7 @@ handle_reserves_status_finished (void *cls,
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK !=
-        handle_reserves_status_ok (rsh,
+        handle_reserves_attest_ok (rsh,
                                    j))
     {
       rs.hr.http_status = 0;
@@ -209,6 +207,11 @@ handle_reserves_status_finished (void *cls,
     rs.hr.ec = TALER_JSON_get_error_code (j);
     rs.hr.hint = TALER_JSON_get_error_hint (j);
     break;
+  case MHD_HTTP_CONFLICT:
+    /* Server doesn't have the requested attributes */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
@@ -221,7 +224,7 @@ handle_reserves_status_finished (void *cls,
     rs.hr.ec = TALER_JSON_get_error_code (j);
     rs.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for reserves status\n",
+                "Unexpected response code %u/%d for reserves attest\n",
                 (unsigned int) response_code,
                 (int) rs.hr.ec);
     break;
@@ -232,33 +235,42 @@ handle_reserves_status_finished (void *cls,
              &rs);
     rsh->cb = NULL;
   }
-  TALER_EXCHANGE_reserves_status_cancel (rsh);
+  TALER_EXCHANGE_reserves_attest_cancel (rsh);
 }
 
 
-struct TALER_EXCHANGE_ReservesStatusHandle *
-TALER_EXCHANGE_reserves_status (
-  struct TALER_EXCHANGE_Handle *exchange,
+struct TALER_EXCHANGE_ReservesAttestHandle *
+TALER_EXCHANGE_reserves_attest (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_ReservesStatusCallback cb,
+  unsigned int attributes_length,
+  const char *attributes[const static attributes_length],
+  TALER_EXCHANGE_ReservesPostAttestCallback cb,
   void *cb_cls)
 {
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh;
-  struct GNUNET_CURL_Context *ctx;
+  struct TALER_EXCHANGE_ReservesAttestHandle *rsh;
   CURL *eh;
   char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
   struct TALER_ReserveSignatureP reserve_sig;
-  struct GNUNET_TIME_Timestamp ts
-    = GNUNET_TIME_timestamp_get ();
+  json_t *details;
+  struct GNUNET_TIME_Timestamp ts;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
+  if (0 == attributes_length)
   {
     GNUNET_break (0);
     return NULL;
   }
-  rsh = GNUNET_new (struct TALER_EXCHANGE_ReservesStatusHandle);
-  rsh->exchange = exchange;
+  details = json_array ();
+  GNUNET_assert (NULL != details);
+  for (unsigned int i = 0; i<attributes_length; i++)
+  {
+    GNUNET_assert (0 ==
+                   json_array_append_new (details,
+                                          json_string (attributes[i])));
+  }
+  rsh = GNUNET_new (struct TALER_EXCHANGE_ReservesAttestHandle);
   rsh->cb = cb;
   rsh->cb_cls = cb_cls;
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
@@ -275,13 +287,15 @@ TALER_EXCHANGE_reserves_status (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/reserves/%s/status",
+                     "reserves-attest/%s",
                      pub_str);
   }
-  rsh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  rsh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == rsh->url)
   {
+    json_decref (details);
     GNUNET_free (rsh);
     return NULL;
   }
@@ -289,47 +303,52 @@ TALER_EXCHANGE_reserves_status (
   if (NULL == eh)
   {
     GNUNET_break (0);
+    json_decref (details);
     GNUNET_free (rsh->url);
     GNUNET_free (rsh);
     return NULL;
   }
-  TALER_wallet_reserve_status_sign (ts,
-                                    reserve_priv,
-                                    &reserve_sig);
+  ts = GNUNET_TIME_timestamp_get ();
+  TALER_wallet_reserve_attest_request_sign (ts,
+                                            details,
+                                            reserve_priv,
+                                            &reserve_sig);
   {
-    json_t *status_obj = GNUNET_JSON_PACK (
+    json_t *attest_obj = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                  &reserve_sig),
       GNUNET_JSON_pack_timestamp ("request_timestamp",
                                   ts),
-      GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                  &reserve_sig));
+      GNUNET_JSON_pack_array_steal ("details",
+                                    details));
 
     if (GNUNET_OK !=
         TALER_curl_easy_post (&rsh->post_ctx,
                               eh,
-                              status_obj))
+                              attest_obj))
     {
       GNUNET_break (0);
       curl_easy_cleanup (eh);
-      json_decref (status_obj);
+      json_decref (attest_obj);
       GNUNET_free (rsh->url);
       GNUNET_free (rsh);
       return NULL;
     }
-    json_decref (status_obj);
+    json_decref (attest_obj);
   }
-  ctx = TEAH_handle_to_context (exchange);
   rsh->job = GNUNET_CURL_job_add2 (ctx,
                                    eh,
                                    rsh->post_ctx.headers,
-                                   &handle_reserves_status_finished,
+                                   &handle_reserves_attest_finished,
                                    rsh);
+  rsh->keys = TALER_EXCHANGE_keys_incref (keys);
   return rsh;
 }
 
 
 void
-TALER_EXCHANGE_reserves_status_cancel (
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh)
+TALER_EXCHANGE_reserves_attest_cancel (
+  struct TALER_EXCHANGE_ReservesAttestHandle *rsh)
 {
   if (NULL != rsh->job)
   {
@@ -337,9 +356,10 @@ TALER_EXCHANGE_reserves_status_cancel (
     rsh->job = NULL;
   }
   TALER_curl_easy_post_finished (&rsh->post_ctx);
+  TALER_EXCHANGE_keys_decref (rsh->keys);
   GNUNET_free (rsh->url);
   GNUNET_free (rsh);
 }
 
 
-/* end of exchange_api_reserves_status.c */
+/* end of exchange_api_reserves_attest.c */
diff --git a/src/lib/exchange_api_reserves_close.c b/src/lib/exchange_api_reserves_close.c
new file mode 100644
index 000000000..a3769a22f
--- /dev/null
+++ b/src/lib/exchange_api_reserves_close.c
@@ -0,0 +1,373 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file lib/exchange_api_reserves_close.c
+ * @brief Implementation of the POST /reserves/$RESERVE_PUB/close requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP close codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A /reserves/$RID/close Handle
+ */
+struct TALER_EXCHANGE_ReservesCloseHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ReservesCloseCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Public key of the reserve we are querying.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Our signature.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * When did we make the request.
+   */
+  struct GNUNET_TIME_Timestamp ts;
+
+};
+
+
+/**
+ * We received an #MHD_HTTP_OK close code. Handle the JSON
+ * response.
+ *
+ * @param rch handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_close_ok (struct TALER_EXCHANGE_ReservesCloseHandle *rch,
+                          const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveCloseResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_OK,
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("wire_amount",
+                                &rs.details.ok.wire_amount),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  rch->cb (rch->cb_cls,
+           &rs);
+  rch->cb = NULL;
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * We received an #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS close code. Handle the JSON
+ * response.
+ *
+ * @param rch handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_close_kyc (struct TALER_EXCHANGE_ReservesCloseHandle *rch,
+                           const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveCloseResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto (
+      "h_payto",
+      &rs.details.unavailable_for_legal_reasons.h_payto),
+    GNUNET_JSON_spec_uint64 (
+      "requirement_row",
+      &rs.details.unavailable_for_legal_reasons.requirement_row),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  rch->cb (rch->cb_cls,
+           &rs);
+  rch->cb = NULL;
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /reserves/$RID/close request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ReservesCloseHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_reserves_close_finished (void *cls,
+                                long response_code,
+                                const void *response)
+{
+  struct TALER_EXCHANGE_ReservesCloseHandle *rch = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_ReserveCloseResult rs = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  rch->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    rs.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        handle_reserves_close_ok (rch,
+                                  j))
+    {
+      GNUNET_break_op (0);
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* Insufficient balance to inquire for reserve close */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    if (GNUNET_OK !=
+        handle_reserves_close_kyc (rch,
+                                   j))
+    {
+      GNUNET_break_op (0);
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for reserves close\n",
+                (unsigned int) response_code,
+                (int) rs.hr.ec);
+    break;
+  }
+  if (NULL != rch->cb)
+  {
+    rch->cb (rch->cb_cls,
+             &rs);
+    rch->cb = NULL;
+  }
+  TALER_EXCHANGE_reserves_close_cancel (rch);
+}
+
+
+struct TALER_EXCHANGE_ReservesCloseHandle *
+TALER_EXCHANGE_reserves_close (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const char *target_payto_uri,
+  TALER_EXCHANGE_ReservesCloseCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ReservesCloseHandle *rch;
+  CURL *eh;
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
+  struct TALER_PaytoHashP h_payto;
+
+  rch = GNUNET_new (struct TALER_EXCHANGE_ReservesCloseHandle);
+  rch->cb = cb;
+  rch->cb_cls = cb_cls;
+  rch->ts = GNUNET_TIME_timestamp_get ();
+  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+                                      &rch->reserve_pub.eddsa_pub);
+  {
+    char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &rch->reserve_pub,
+      sizeof (rch->reserve_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "reserves/%s/close",
+                     pub_str);
+  }
+  rch->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
+  if (NULL == rch->url)
+  {
+    GNUNET_free (rch);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (rch->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (rch->url);
+    GNUNET_free (rch);
+    return NULL;
+  }
+  if (NULL != target_payto_uri)
+    TALER_payto_hash (target_payto_uri,
+                      &h_payto);
+  TALER_wallet_reserve_close_sign (rch->ts,
+                                   (NULL != target_payto_uri)
+                                   ? &h_payto
+                                   : NULL,
+                                   reserve_priv,
+                                   &rch->reserve_sig);
+  {
+    json_t *close_obj = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_string ("payto_uri",
+                                 target_payto_uri)),
+      GNUNET_JSON_pack_timestamp ("request_timestamp",
+                                  rch->ts),
+      GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                  &rch->reserve_sig));
+
+    if (GNUNET_OK !=
+        TALER_curl_easy_post (&rch->post_ctx,
+                              eh,
+                              close_obj))
+    {
+      GNUNET_break (0);
+      curl_easy_cleanup (eh);
+      json_decref (close_obj);
+      GNUNET_free (rch->url);
+      GNUNET_free (rch);
+      return NULL;
+    }
+    json_decref (close_obj);
+  }
+  rch->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   rch->post_ctx.headers,
+                                   &handle_reserves_close_finished,
+                                   rch);
+  return rch;
+}
+
+
+void
+TALER_EXCHANGE_reserves_close_cancel (
+  struct TALER_EXCHANGE_ReservesCloseHandle *rch)
+{
+  if (NULL != rch->job)
+  {
+    GNUNET_CURL_job_cancel (rch->job);
+    rch->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&rch->post_ctx);
+  GNUNET_free (rch->url);
+  GNUNET_free (rch);
+}
+
+
+/* end of exchange_api_reserves_close.c */
diff --git a/src/lib/exchange_api_reserves_get.c b/src/lib/exchange_api_reserves_get.c
index 4c2886e0b..b6980dd1d 100644
--- a/src/lib/exchange_api_reserves_get.c
+++ b/src/lib/exchange_api_reserves_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  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
@@ -39,11 +39,6 @@ struct TALER_EXCHANGE_ReservesGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
    * The url for this request.
    */
   char *url;
@@ -168,9 +163,10 @@ handle_reserves_get_finished (void *cls,
     rs.hr.ec = TALER_JSON_get_error_code (j);
     rs.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for reserves get\n",
+                "Unexpected response code %u/%d for GET %s\n",
                 (unsigned int) response_code,
-                (int) rs.hr.ec);
+                (int) rs.hr.ec,
+                rgh->url);
     break;
   }
   if (NULL != rgh->cb)
@@ -185,23 +181,20 @@ handle_reserves_get_finished (void *cls,
 
 struct TALER_EXCHANGE_ReservesGetHandle *
 TALER_EXCHANGE_reserves_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   struct GNUNET_TIME_Relative timeout,
   TALER_EXCHANGE_ReservesGetCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_ReservesGetHandle *rgh;
-  struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 16 + 32];
+  unsigned int tms
+    = (unsigned int) timeout.rel_value_us
+      / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   {
     char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
     char *end;
@@ -215,29 +208,27 @@ TALER_EXCHANGE_reserves_get (
     *end = '\0';
     GNUNET_snprintf (timeout_str,
                      sizeof (timeout_str),
-                     "%llu",
-                     (unsigned long long)
-                     (timeout.rel_value_us
-                      / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us));
-    if (GNUNET_TIME_relative_is_zero (timeout))
+                     "%u",
+                     tms);
+    if (0 == tms)
       GNUNET_snprintf (arg_str,
                        sizeof (arg_str),
-                       "/reserves/%s",
+                       "reserves/%s",
                        pub_str);
     else
       GNUNET_snprintf (arg_str,
                        sizeof (arg_str),
-                       "/reserves/%s?timeout_ms=%s",
+                       "reserves/%s?timeout_ms=%s",
                        pub_str,
                        timeout_str);
   }
   rgh = GNUNET_new (struct TALER_EXCHANGE_ReservesGetHandle);
-  rgh->exchange = exchange;
   rgh->cb = cb;
   rgh->cb_cls = cb_cls;
   rgh->reserve_pub = *reserve_pub;
-  rgh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  rgh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == rgh->url)
   {
     GNUNET_free (rgh);
@@ -251,7 +242,13 @@ TALER_EXCHANGE_reserves_get (
     GNUNET_free (rgh);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
+  if (0 != tms)
+  {
+    GNUNET_break (CURLE_OK ==
+                  curl_easy_setopt (eh,
+                                    CURLOPT_TIMEOUT_MS,
+                                    (long) (tms + 100L)));
+  }
   rgh->job = GNUNET_CURL_job_add (ctx,
                                   eh,
                                   &handle_reserves_get_finished,
diff --git a/src/lib/exchange_api_reserves_get_attestable.c b/src/lib/exchange_api_reserves_get_attestable.c
new file mode 100644
index 000000000..f58e0592e
--- /dev/null
+++ b/src/lib/exchange_api_reserves_get_attestable.c
@@ -0,0 +1,276 @@
+/*
+  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/>
+*/
+/**
+ * @file lib/exchange_api_reserves_get_attestable.c
+ * @brief Implementation of the GET_ATTESTABLE /reserves/$RESERVE_PUB requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP status codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * @brief A /reserves/ GET_ATTESTABLE Handle
+ */
+struct TALER_EXCHANGE_ReservesGetAttestHandle
+{
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ReservesGetAttestCallback cb;
+
+  /**
+   * Public key of the reserve we are querying.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+};
+
+
+/**
+ * We received an #MHD_HTTP_OK status code. Handle the JSON
+ * response.
+ *
+ * @param rgah handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_get_attestable_ok (
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah,
+  const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveGetAttestResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_OK
+  };
+  const json_t *details;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_array_const ("details",
+                                  &details),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  {
+    unsigned int dlen = json_array_size (details);
+    const char *attributes[GNUNET_NZL (dlen)];
+
+    for (unsigned int i = 0; i<dlen; i++)
+    {
+      json_t *detail = json_array_get (details,
+                                       i);
+      attributes[i] = json_string_value (detail);
+      if (NULL == attributes[i])
+      {
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
+    }
+    rs.details.ok.attributes_length = dlen;
+    rs.details.ok.attributes = attributes;
+    rgah->cb (rgah->cb_cls,
+              &rs);
+    rgah->cb = NULL;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP GET /reserves-attest/$RID request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ReservesGetAttestableHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_reserves_get_attestable_finished (void *cls,
+                                         long response_code,
+                                         const void *response)
+{
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_ReserveGetAttestResult rs = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  rgah->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    rs.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        handle_reserves_get_attestable_ok (rgah,
+                                           j))
+    {
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for reserves get_attestable\n",
+                (unsigned int) response_code,
+                (int) rs.hr.ec);
+    break;
+  }
+  if (NULL != rgah->cb)
+  {
+    rgah->cb (rgah->cb_cls,
+              &rs);
+    rgah->cb = NULL;
+  }
+  TALER_EXCHANGE_reserves_get_attestable_cancel (rgah);
+}
+
+
+struct TALER_EXCHANGE_ReservesGetAttestHandle *
+TALER_EXCHANGE_reserves_get_attestable (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  TALER_EXCHANGE_ReservesGetAttestCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah;
+  CURL *eh;
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
+
+  {
+    char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      reserve_pub,
+      sizeof (*reserve_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "reserves-attest/%s",
+                     pub_str);
+  }
+  rgah = GNUNET_new (struct TALER_EXCHANGE_ReservesGetAttestHandle);
+  rgah->cb = cb;
+  rgah->cb_cls = cb_cls;
+  rgah->reserve_pub = *reserve_pub;
+  rgah->url = TALER_url_join (url,
+                              arg_str,
+                              NULL);
+  if (NULL == rgah->url)
+  {
+    GNUNET_free (rgah);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (rgah->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (rgah->url);
+    GNUNET_free (rgah);
+    return NULL;
+  }
+  rgah->job = GNUNET_CURL_job_add (ctx,
+                                   eh,
+                                   &handle_reserves_get_attestable_finished,
+                                   rgah);
+  return rgah;
+}
+
+
+void
+TALER_EXCHANGE_reserves_get_attestable_cancel (
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah)
+{
+  if (NULL != rgah->job)
+  {
+    GNUNET_CURL_job_cancel (rgah->job);
+    rgah->job = NULL;
+  }
+  GNUNET_free (rgah->url);
+  GNUNET_free (rgah);
+}
+
+
+/* end of exchange_api_reserves_get_attestable.c */
diff --git a/src/lib/exchange_api_reserves_history.c b/src/lib/exchange_api_reserves_history.c
index d9c42d691..0654ad837 100644
--- a/src/lib/exchange_api_reserves_history.c
+++ b/src/lib/exchange_api_reserves_history.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -39,9 +39,9 @@ struct TALER_EXCHANGE_ReservesHistoryHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -74,10 +74,799 @@ struct TALER_EXCHANGE_ReservesHistoryHandle
    */
   void *cb_cls;
 
+  /**
+   * Where to store the etag (if any).
+   */
+  uint64_t etag;
+
 };
 
 
 /**
+ * Context for history entry helpers.
+ */
+struct HistoryParseContext
+{
+
+  /**
+   * Keys of the exchange we use.
+   */
+  const struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * Our reserve public key.
+   */
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /**
+   * Array of UUIDs.
+   */
+  struct GNUNET_HashCode *uuids;
+
+  /**
+   * Where to sum up total inbound amounts.
+   */
+  struct TALER_Amount *total_in;
+
+  /**
+   * Where to sum up total outbound amounts.
+   */
+  struct TALER_Amount *total_out;
+
+  /**
+   * Number of entries already used in @e uuids.
+   */
+  unsigned int uuid_off;
+};
+
+
+/**
+ * Type of a function called to parse a reserve history
+ * entry @a rh.
+ *
+ * @param[in,out] rh where to write the result
+ * @param[in,out] uc UUID context for duplicate detection
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+typedef enum GNUNET_GenericReturnValue
+(*ParseHelper)(struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+               struct HistoryParseContext *uc,
+               const json_t *transaction);
+
+
+/**
+ * Parse "credit" reserve history entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_credit (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+              struct HistoryParseContext *uc,
+              const json_t *transaction)
+{
+  const char *wire_uri;
+  uint64_t wire_reference;
+  struct GNUNET_TIME_Timestamp timestamp;
+  struct GNUNET_JSON_Specification withdraw_spec[] = {
+    GNUNET_JSON_spec_uint64 ("wire_reference",
+                             &wire_reference),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &timestamp),
+    TALER_JSON_spec_payto_uri ("sender_account_url",
+                               &wire_uri),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_CREDIT;
+  if (0 >
+      TALER_amount_add (uc->total_in,
+                        uc->total_in,
+                        &rh->amount))
+  {
+    /* overflow in history already!? inconceivable! Bad exchange! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         withdraw_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  rh->details.in_details.sender_url = GNUNET_strdup (wire_uri);
+  rh->details.in_details.wire_reference = wire_reference;
+  rh->details.in_details.timestamp = timestamp;
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "credit" reserve history entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_withdraw (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+                struct HistoryParseContext *uc,
+                const json_t *transaction)
+{
+  struct TALER_ReserveSignatureP sig;
+  struct TALER_DenominationHashP h_denom_pub;
+  struct TALER_BlindedCoinHashP bch;
+  struct TALER_Amount withdraw_fee;
+  struct GNUNET_JSON_Specification withdraw_spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &sig),
+    TALER_JSON_spec_amount_any ("withdraw_fee",
+                                &withdraw_fee),
+    GNUNET_JSON_spec_fixed_auto ("h_denom_pub",
+                                 &h_denom_pub),
+    GNUNET_JSON_spec_fixed_auto ("h_coin_envelope",
+                                 &bch),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_WITHDRAWAL;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         withdraw_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+
+  /* Check that the signature is a valid withdraw request */
+  if (GNUNET_OK !=
+      TALER_wallet_withdraw_verify (&h_denom_pub,
+                                    &rh->amount,
+                                    &bch,
+                                    uc->reserve_pub,
+                                    &sig))
+  {
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (withdraw_spec);
+    return GNUNET_SYSERR;
+  }
+  /* check that withdraw fee matches expectations! */
+  {
+    const struct TALER_EXCHANGE_Keys *key_state;
+    const struct TALER_EXCHANGE_DenomPublicKey *dki;
+
+    key_state = uc->keys;
+    dki = TALER_EXCHANGE_get_denomination_key_by_hash (key_state,
+                                                       &h_denom_pub);
+    if ( (GNUNET_YES !=
+          TALER_amount_cmp_currency (&withdraw_fee,
+                                     &dki->fees.withdraw)) ||
+         (0 !=
+          TALER_amount_cmp (&withdraw_fee,
+                            &dki->fees.withdraw)) )
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (withdraw_spec);
+      return GNUNET_SYSERR;
+    }
+    rh->details.withdraw.fee = withdraw_fee;
+  }
+  rh->details.withdraw.out_authorization_sig
+    = json_object_get (transaction,
+                       "signature");
+  /* Check check that the same withdraw transaction
+       isn't listed twice by the exchange. We use the
+       "uuid" array to remember the hashes of all
+       signatures, and compare the hashes to find
+       duplicates. */
+  GNUNET_CRYPTO_hash (&sig,
+                      sizeof (sig),
+                      &uc->uuids[uc->uuid_off]);
+  for (unsigned int i = 0; i<uc->uuid_off; i++)
+  {
+    if (0 == GNUNET_memcmp (&uc->uuids[uc->uuid_off],
+                            &uc->uuids[i]))
+    {
+      GNUNET_break_op (0);
+      GNUNET_JSON_parse_free (withdraw_spec);
+      return GNUNET_SYSERR;
+    }
+  }
+  uc->uuid_off++;
+
+  if (0 >
+      TALER_amount_add (uc->total_out,
+                        uc->total_out,
+                        &rh->amount))
+  {
+    /* overflow in history already!? inconceivable! Bad exchange! */
+    GNUNET_break_op (0);
+    GNUNET_JSON_parse_free (withdraw_spec);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "recoup" reserve history entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_recoup (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+              struct HistoryParseContext *uc,
+              const json_t *transaction)
+{
+  const struct TALER_EXCHANGE_Keys *key_state;
+  struct GNUNET_JSON_Specification recoup_spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                 &rh->details.recoup_details.coin_pub),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.recoup_details.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.recoup_details.exchange_pub),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.recoup_details.timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_RECOUP;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         recoup_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  key_state = uc->keys;
+  if (GNUNET_OK !=
+      TALER_EXCHANGE_test_signing_key (key_state,
+                                       &rh->details.
+                                       recoup_details.exchange_pub))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_confirm_recoup_verify (
+        rh->details.recoup_details.timestamp,
+        &rh->amount,
+        &rh->details.recoup_details.coin_pub,
+        uc->reserve_pub,
+        &rh->details.recoup_details.exchange_pub,
+        &rh->details.recoup_details.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 >
+      TALER_amount_add (uc->total_in,
+                        uc->total_in,
+                        &rh->amount))
+  {
+    /* overflow in history already!? inconceivable! Bad exchange! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "closing" reserve history entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_closing (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+               struct HistoryParseContext *uc,
+               const json_t *transaction)
+{
+  const struct TALER_EXCHANGE_Keys *key_state;
+  struct GNUNET_JSON_Specification closing_spec[] = {
+    TALER_JSON_spec_payto_uri (
+      "receiver_account_details",
+      &rh->details.close_details.receiver_account_details),
+    GNUNET_JSON_spec_fixed_auto ("wtid",
+                                 &rh->details.close_details.wtid),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &rh->details.close_details.exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &rh->details.close_details.exchange_pub),
+    TALER_JSON_spec_amount_any ("closing_fee",
+                                &rh->details.close_details.fee),
+    GNUNET_JSON_spec_timestamp ("timestamp",
+                                &rh->details.close_details.timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_CLOSING;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         closing_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  key_state = uc->keys;
+  if (GNUNET_OK !=
+      TALER_EXCHANGE_test_signing_key (
+        key_state,
+        &rh->details.close_details.exchange_pub))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_exchange_online_reserve_closed_verify (
+        rh->details.close_details.timestamp,
+        &rh->amount,
+        &rh->details.close_details.fee,
+        rh->details.close_details.receiver_account_details,
+        &rh->details.close_details.wtid,
+        uc->reserve_pub,
+        &rh->details.close_details.exchange_pub,
+        &rh->details.close_details.exchange_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 >
+      TALER_amount_add (uc->total_out,
+                        uc->total_out,
+                        &rh->amount))
+  {
+    /* overflow in history already!? inconceivable! Bad exchange! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "merge" reserve history entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_merge (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+             struct HistoryParseContext *uc,
+             const json_t *transaction)
+{
+  uint32_t flags32;
+  struct GNUNET_JSON_Specification merge_spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
+                                 &rh->details.merge_details.h_contract_terms),
+    GNUNET_JSON_spec_fixed_auto ("merge_pub",
+                                 &rh->details.merge_details.merge_pub),
+    GNUNET_JSON_spec_fixed_auto ("purse_pub",
+                                 &rh->details.merge_details.purse_pub),
+    GNUNET_JSON_spec_uint32 ("min_age",
+                             &rh->details.merge_details.min_age),
+    GNUNET_JSON_spec_uint32 ("flags",
+                             &flags32),
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rh->details.merge_details.reserve_sig),
+    TALER_JSON_spec_amount_any ("purse_fee",
+                                &rh->details.merge_details.purse_fee),
+    GNUNET_JSON_spec_timestamp ("merge_timestamp",
+                                &rh->details.merge_details.merge_timestamp),
+    GNUNET_JSON_spec_timestamp ("purse_expiration",
+                                &rh->details.merge_details.purse_expiration),
+    GNUNET_JSON_spec_bool ("merged",
+                           &rh->details.merge_details.merged),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_MERGE;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         merge_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  rh->details.merge_details.flags =
+    (enum TALER_WalletAccountMergeFlags) flags32;
+  if (GNUNET_OK !=
+      TALER_wallet_account_merge_verify (
+        rh->details.merge_details.merge_timestamp,
+        &rh->details.merge_details.purse_pub,
+        rh->details.merge_details.purse_expiration,
+        &rh->details.merge_details.h_contract_terms,
+        &rh->amount,
+        &rh->details.merge_details.purse_fee,
+        rh->details.merge_details.min_age,
+        rh->details.merge_details.flags,
+        uc->reserve_pub,
+        &rh->details.merge_details.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (rh->details.merge_details.merged)
+  {
+    if (0 >
+        TALER_amount_add (uc->total_in,
+                          uc->total_in,
+                          &rh->amount))
+    {
+      /* overflow in history already!? inconceivable! Bad exchange! */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  else
+  {
+    if (0 >
+        TALER_amount_add (uc->total_out,
+                          uc->total_out,
+                          &rh->details.merge_details.purse_fee))
+    {
+      /* overflow in history already!? inconceivable! Bad exchange! */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "open" reserve open entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_open (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+            struct HistoryParseContext *uc,
+            const json_t *transaction)
+{
+  struct GNUNET_JSON_Specification open_spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rh->details.open_request.reserve_sig),
+    TALER_JSON_spec_amount_any ("open_payment",
+                                &rh->details.open_request.reserve_payment),
+    GNUNET_JSON_spec_uint32 ("requested_min_purses",
+                             &rh->details.open_request.purse_limit),
+    GNUNET_JSON_spec_timestamp ("request_timestamp",
+                                &rh->details.open_request.request_timestamp),
+    GNUNET_JSON_spec_timestamp ("requested_expiration",
+                                &rh->details.open_request.reserve_expiration),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_OPEN;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         open_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_open_verify (
+        &rh->amount,
+        rh->details.open_request.request_timestamp,
+        rh->details.open_request.reserve_expiration,
+        rh->details.open_request.purse_limit,
+        uc->reserve_pub,
+        &rh->details.open_request.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (0 >
+      TALER_amount_add (uc->total_out,
+                        uc->total_out,
+                        &rh->amount))
+  {
+    /* overflow in history already!? inconceivable! Bad exchange! */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Parse "close" reserve close entry.
+ *
+ * @param[in,out] rh entry to parse
+ * @param uc our context
+ * @param transaction the transaction to parse
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+parse_close (struct TALER_EXCHANGE_ReserveHistoryEntry *rh,
+             struct HistoryParseContext *uc,
+             const json_t *transaction)
+{
+  struct GNUNET_JSON_Specification close_spec[] = {
+    GNUNET_JSON_spec_fixed_auto ("reserve_sig",
+                                 &rh->details.close_request.reserve_sig),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_fixed_auto ("h_payto",
+                                   &rh->details.close_request.
+                                   target_account_h_payto),
+      NULL),
+    GNUNET_JSON_spec_timestamp ("request_timestamp",
+                                &rh->details.close_request.request_timestamp),
+    GNUNET_JSON_spec_end ()
+  };
+
+  rh->type = TALER_EXCHANGE_RTT_CLOSE;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (transaction,
+                         close_spec,
+                         NULL, NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  /* force amount to invalid */
+  memset (&rh->amount,
+          0,
+          sizeof (rh->amount));
+  if (GNUNET_OK !=
+      TALER_wallet_reserve_close_verify (
+        rh->details.close_request.request_timestamp,
+        &rh->details.close_request.target_account_h_payto,
+        uc->reserve_pub,
+        &rh->details.close_request.reserve_sig))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+static void
+free_reserve_history (
+  unsigned int len,
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static len])
+{
+  for (unsigned int i = 0; i<len; i++)
+  {
+    switch (rhistory[i].type)
+    {
+    case TALER_EXCHANGE_RTT_CREDIT:
+      GNUNET_free (rhistory[i].details.in_details.sender_url);
+      break;
+    case TALER_EXCHANGE_RTT_WITHDRAWAL:
+      break;
+    case TALER_EXCHANGE_RTT_AGEWITHDRAWAL:
+      break;
+    case TALER_EXCHANGE_RTT_RECOUP:
+      break;
+    case TALER_EXCHANGE_RTT_CLOSING:
+      break;
+    case TALER_EXCHANGE_RTT_MERGE:
+      break;
+    case TALER_EXCHANGE_RTT_OPEN:
+      break;
+    case TALER_EXCHANGE_RTT_CLOSE:
+      break;
+    }
+  }
+  GNUNET_free (rhistory);
+}
+
+
+/**
+ * Parse history given in JSON format and return it in binary
+ * format.
+ *
+ * @param keys exchange keys
+ * @param history JSON array with the history
+ * @param reserve_pub public key of the reserve to inspect
+ * @param currency currency we expect the balance to be in
+ * @param[out] total_in set to value of credits to reserve
+ * @param[out] total_out set to value of debits from reserve
+ * @param history_length number of entries in @a history
+ * @param[out] rhistory array of length @a history_length, set to the
+ *             parsed history entries
+ * @return #GNUNET_OK if history was valid and @a rhistory and @a balance
+ *         were set,
+ *         #GNUNET_SYSERR if there was a protocol violation in @a history
+ */
+static enum GNUNET_GenericReturnValue
+parse_reserve_history (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const json_t *history,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const char *currency,
+  struct TALER_Amount *total_in,
+  struct TALER_Amount *total_out,
+  unsigned int history_length,
+  struct TALER_EXCHANGE_ReserveHistoryEntry rhistory[static history_length])
+{
+  const struct
+  {
+    const char *type;
+    ParseHelper helper;
+  } map[] = {
+    { "CREDIT", &parse_credit },
+    { "WITHDRAW", &parse_withdraw },
+    { "RECOUP", &parse_recoup },
+    { "MERGE", &parse_merge },
+    { "CLOSING", &parse_closing },
+    { "OPEN", &parse_open },
+    { "CLOSE", &parse_close },
+    { NULL, NULL }
+  };
+  struct GNUNET_HashCode uuid[history_length];
+  struct HistoryParseContext uc = {
+    .keys = keys,
+    .reserve_pub = reserve_pub,
+    .uuids = uuid,
+    .total_in = total_in,
+    .total_out = total_out
+  };
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        total_in));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        total_out));
+  for (unsigned int off = 0; off<history_length; off++)
+  {
+    struct TALER_EXCHANGE_ReserveHistoryEntry *rh = &rhistory[off];
+    json_t *transaction;
+    struct TALER_Amount amount;
+    const char *type;
+    struct GNUNET_JSON_Specification hist_spec[] = {
+      GNUNET_JSON_spec_string ("type",
+                               &type),
+      TALER_JSON_spec_amount_any ("amount",
+                                  &amount),
+      /* 'wire' and 'signature' are optional depending on 'type'! */
+      GNUNET_JSON_spec_end ()
+    };
+    bool found = false;
+
+    transaction = json_array_get (history,
+                                  off);
+    if (GNUNET_OK !=
+        GNUNET_JSON_parse (transaction,
+                           hist_spec,
+                           NULL, NULL))
+    {
+      GNUNET_break_op (0);
+      json_dumpf (transaction,
+                  stderr,
+                  JSON_INDENT (2));
+      return GNUNET_SYSERR;
+    }
+    rh->amount = amount;
+    if (GNUNET_YES !=
+        TALER_amount_cmp_currency (&amount,
+                                   total_in))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    for (unsigned int i = 0; NULL != map[i].type; i++)
+    {
+      if (0 == strcasecmp (map[i].type,
+                           type))
+      {
+        found = true;
+        if (GNUNET_OK !=
+            map[i].helper (rh,
+                           &uc,
+                           transaction))
+        {
+          GNUNET_break_op (0);
+          return GNUNET_SYSERR;
+        }
+        break;
+      }
+    }
+    if (! found)
+    {
+      /* unexpected 'type', protocol incompatibility, complain! */
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handle HTTP header received by curl.
+ *
+ * @param buffer one line of HTTP header data
+ * @param size size of an item
+ * @param nitems number of items passed
+ * @param userdata our `struct TALER_EXCHANGE_ReservesHistoryHandle *`
+ * @return `size * nitems`
+ */
+static size_t
+handle_header (char *buffer,
+               size_t size,
+               size_t nitems,
+               void *userdata)
+{
+  struct TALER_EXCHANGE_ReservesHistoryHandle *rhh = userdata;
+  size_t total = size * nitems;
+  char *ndup;
+  const char *hdr_type;
+  char *hdr_val;
+  char *sp;
+
+  ndup = GNUNET_strndup (buffer,
+                         total);
+  hdr_type = strtok_r (ndup,
+                       ":",
+                       &sp);
+  if (NULL == hdr_type)
+  {
+    GNUNET_free (ndup);
+    return total;
+  }
+  hdr_val = strtok_r (NULL,
+                      "\n\r",
+                      &sp);
+  if (NULL == hdr_val)
+  {
+    GNUNET_free (ndup);
+    return total;
+  }
+  if (' ' == *hdr_val)
+    hdr_val++;
+  if (0 == strcasecmp (hdr_type,
+                       MHD_HTTP_HEADER_ETAG))
+  {
+    unsigned long long tval;
+    char dummy;
+
+    if (1 !=
+        sscanf (hdr_val,
+                "\"%llu\"%c",
+                &tval,
+                &dummy))
+    {
+      GNUNET_break_op (0);
+      GNUNET_free (ndup);
+      return 0;
+    }
+    rhh->etag = (uint64_t) tval;
+  }
+  GNUNET_free (ndup);
+  return total;
+}
+
+
+/**
  * We received an #MHD_HTTP_OK history code. Handle the JSON
  * response.
  *
@@ -89,21 +878,18 @@ static enum GNUNET_GenericReturnValue
 handle_reserves_history_ok (struct TALER_EXCHANGE_ReservesHistoryHandle *rsh,
                             const json_t *j)
 {
-  json_t *history;
+  const json_t *history;
   unsigned int len;
   struct TALER_EXCHANGE_ReserveHistory rs = {
     .hr.reply = j,
-    .hr.http_status = MHD_HTTP_OK
+    .hr.http_status = MHD_HTTP_OK,
+    .details.ok.etag = rsh->etag
   };
   struct GNUNET_JSON_Specification spec[] = {
     TALER_JSON_spec_amount_any ("balance",
                                 &rs.details.ok.balance),
-    GNUNET_JSON_spec_bool ("kyc_passed",
-                           &rs.details.ok.kyc_ok),
-    GNUNET_JSON_spec_bool ("kyc_required",
-                           &rs.details.ok.kyc_required),
-    GNUNET_JSON_spec_json ("history",
-                           &history),
+    GNUNET_JSON_spec_array_const ("history",
+                                  &history),
     GNUNET_JSON_spec_end ()
   };
 
@@ -123,18 +909,18 @@ handle_reserves_history_ok (struct TALER_EXCHANGE_ReservesHistoryHandle *rsh,
     rhistory = GNUNET_new_array (len,
                                  struct TALER_EXCHANGE_ReserveHistoryEntry);
     if (GNUNET_OK !=
-        TALER_EXCHANGE_parse_reserve_history (rsh->exchange,
-                                              history,
-                                              &rsh->reserve_pub,
-                                              rs.details.ok.balance.currency,
-                                              &rs.details.ok.total_in,
-                                              &rs.details.ok.total_out,
-                                              len,
-                                              rhistory))
+        parse_reserve_history (rsh->keys,
+                               history,
+                               &rsh->reserve_pub,
+                               rs.details.ok.balance.currency,
+                               &rs.details.ok.total_in,
+                               &rs.details.ok.total_out,
+                               len,
+                               rhistory))
     {
       GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
+      free_reserve_history (len,
+                            rhistory);
       GNUNET_JSON_parse_free (spec);
       return GNUNET_SYSERR;
     }
@@ -146,10 +932,9 @@ handle_reserves_history_ok (struct TALER_EXCHANGE_ReservesHistoryHandle *rsh,
                &rs);
       rsh->cb = NULL;
     }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
+    free_reserve_history (len,
+                          rhistory);
   }
-  GNUNET_JSON_parse_free (spec);
   return GNUNET_OK;
 }
 
@@ -238,27 +1023,20 @@ handle_reserves_history_finished (void *cls,
 
 struct TALER_EXCHANGE_ReservesHistoryHandle *
 TALER_EXCHANGE_reserves_history (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
+  uint64_t start_off,
   TALER_EXCHANGE_ReservesHistoryCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_ReservesHistoryHandle *rsh;
-  struct GNUNET_CURL_Context *ctx;
   CURL *eh;
-  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
-  struct TALER_ReserveSignatureP reserve_sig;
-  struct GNUNET_TIME_Timestamp ts
-    = GNUNET_TIME_timestamp_get ();
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 64];
+  struct curl_slist *job_headers;
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
   rsh = GNUNET_new (struct TALER_EXCHANGE_ReservesHistoryHandle);
-  rsh->exchange = exchange;
   rsh->cb = cb;
   rsh->cb_cls = cb_cls;
   GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
@@ -273,13 +1051,21 @@ TALER_EXCHANGE_reserves_history (
       pub_str,
       sizeof (pub_str));
     *end = '\0';
-    GNUNET_snprintf (arg_str,
-                     sizeof (arg_str),
-                     "/reserves/%s/history",
-                     pub_str);
+    if (0 != start_off)
+      GNUNET_snprintf (arg_str,
+                       sizeof (arg_str),
+                       "reserves/%s/history?start=%llu",
+                       pub_str,
+                       (unsigned long long) start_off);
+    else
+      GNUNET_snprintf (arg_str,
+                       sizeof (arg_str),
+                       "reserves/%s/history",
+                       pub_str);
   }
-  rsh->url = TEAH_path_to_url (exchange,
-                               arg_str);
+  rsh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == rsh->url)
   {
     GNUNET_free (rsh);
@@ -293,36 +1079,49 @@ TALER_EXCHANGE_reserves_history (
     GNUNET_free (rsh);
     return NULL;
   }
-  TALER_wallet_reserve_history_sign (ts,
-                                     NULL, /* FIXME: fee! */
-                                     reserve_priv,
-                                     &reserve_sig);
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_HEADERFUNCTION,
+                                   &handle_header));
+  GNUNET_assert (CURLE_OK ==
+                 curl_easy_setopt (eh,
+                                   CURLOPT_HEADERDATA,
+                                   rsh));
   {
-    json_t *history_obj = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_timestamp ("request_timestamp",
-                                  ts),
-      GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                  &reserve_sig));
+    struct TALER_ReserveSignatureP reserve_sig;
+    char *sig_hdr;
+    char *hdr;
 
-    if (GNUNET_OK !=
-        TALER_curl_easy_post (&rsh->post_ctx,
-                              eh,
-                              history_obj))
+    TALER_wallet_reserve_history_sign (start_off,
+                                       reserve_priv,
+                                       &reserve_sig);
+
+    sig_hdr = GNUNET_STRINGS_data_to_string_alloc (
+      &reserve_sig,
+      sizeof (reserve_sig));
+    GNUNET_asprintf (&hdr,
+                     "%s: %s",
+                     TALER_RESERVE_HISTORY_SIGNATURE_HEADER,
+                     sig_hdr);
+    GNUNET_free (sig_hdr);
+    job_headers = curl_slist_append (NULL,
+                                     hdr);
+    GNUNET_free (hdr);
+    if (NULL == job_headers)
     {
       GNUNET_break (0);
       curl_easy_cleanup (eh);
-      json_decref (history_obj);
-      GNUNET_free (rsh->url);
-      GNUNET_free (rsh);
       return NULL;
     }
-    json_decref (history_obj);
   }
-  ctx = TEAH_handle_to_context (exchange);
-  rsh->job = GNUNET_CURL_job_add (ctx,
-                                  eh,
-                                  &handle_reserves_history_finished,
-                                  rsh);
+
+  rsh->keys = TALER_EXCHANGE_keys_incref (keys);
+  rsh->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   job_headers,
+                                   &handle_reserves_history_finished,
+                                   rsh);
+  curl_slist_free_all (job_headers);
   return rsh;
 }
 
@@ -338,6 +1137,7 @@ TALER_EXCHANGE_reserves_history_cancel (
   }
   TALER_curl_easy_post_finished (&rsh->post_ctx);
   GNUNET_free (rsh->url);
+  TALER_EXCHANGE_keys_decref (rsh->keys);
   GNUNET_free (rsh);
 }
 
diff --git a/src/lib/exchange_api_reserves_open.c b/src/lib/exchange_api_reserves_open.c
new file mode 100644
index 000000000..36e435685
--- /dev/null
+++ b/src/lib/exchange_api_reserves_open.c
@@ -0,0 +1,567 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2023 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/>
+*/
+/**
+ * @file lib/exchange_api_reserves_open.c
+ * @brief Implementation of the POST /reserves/$RESERVE_PUB/open requests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <jansson.h>
+#include <microhttpd.h> /* just for HTTP open codes */
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_json_lib.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include "exchange_api_common.h"
+#include "exchange_api_handle.h"
+#include "taler_signatures.h"
+#include "exchange_api_curl_defaults.h"
+
+
+/**
+ * Information we keep per coin to validate the reply.
+ */
+struct CoinData
+{
+  /**
+   * Public key of the coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Signature by the coin.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * The hash of the denomination's public key
+   */
+  struct TALER_DenominationHashP h_denom_pub;
+
+  /**
+   * How much did this coin contribute.
+   */
+  struct TALER_Amount contribution;
+};
+
+
+/**
+ * @brief A /reserves/$RID/open Handle
+ */
+struct TALER_EXCHANGE_ReservesOpenHandle
+{
+
+  /**
+   * The keys of the exchange this request handle will use
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * The url for this request.
+   */
+  char *url;
+
+  /**
+   * Handle for the request.
+   */
+  struct GNUNET_CURL_Job *job;
+
+  /**
+   * Context for #TEH_curl_easy_post(). Keeps the data that must
+   * persist for Curl to make the upload.
+   */
+  struct TALER_CURL_PostContext post_ctx;
+
+  /**
+   * Function to call with the result.
+   */
+  TALER_EXCHANGE_ReservesOpenCallback cb;
+
+  /**
+   * Closure for @a cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Information we keep per coin to validate the reply.
+   */
+  struct CoinData *coins;
+
+  /**
+   * Length of the @e coins array.
+   */
+  unsigned int num_coins;
+
+  /**
+   * Public key of the reserve we are querying.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Our signature.
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * When did we make the request.
+   */
+  struct GNUNET_TIME_Timestamp ts;
+
+};
+
+
+/**
+ * We received an #MHD_HTTP_OK open code. Handle the JSON
+ * response.
+ *
+ * @param roh handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_open_ok (struct TALER_EXCHANGE_ReservesOpenHandle *roh,
+                         const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveOpenResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_OK,
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("open_cost",
+                                &rs.details.ok.open_cost),
+    GNUNET_JSON_spec_timestamp ("reserve_expiration",
+                                &rs.details.ok.expiration_time),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  roh->cb (roh->cb_cls,
+           &rs);
+  roh->cb = NULL;
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * We received an #MHD_HTTP_PAYMENT_REQUIRED open code. Handle the JSON
+ * response.
+ *
+ * @param roh handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_open_pr (struct TALER_EXCHANGE_ReservesOpenHandle *roh,
+                         const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveOpenResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_PAYMENT_REQUIRED,
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    TALER_JSON_spec_amount_any ("open_cost",
+                                &rs.details.payment_required.open_cost),
+    GNUNET_JSON_spec_timestamp ("reserve_expiration",
+                                &rs.details.payment_required.expiration_time),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  roh->cb (roh->cb_cls,
+           &rs);
+  roh->cb = NULL;
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * We received an #MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS open code. Handle the JSON
+ * response.
+ *
+ * @param roh handle of the request
+ * @param j JSON response
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_reserves_open_kyc (struct TALER_EXCHANGE_ReservesOpenHandle *roh,
+                          const json_t *j)
+{
+  struct TALER_EXCHANGE_ReserveOpenResult rs = {
+    .hr.reply = j,
+    .hr.http_status = MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+  };
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_fixed_auto (
+      "h_payto",
+      &rs.details.unavailable_for_legal_reasons.h_payto),
+    GNUNET_JSON_spec_uint64 (
+      "requirement_row",
+      &rs.details.unavailable_for_legal_reasons.requirement_row),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (j,
+                         spec,
+                         NULL,
+                         NULL))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  roh->cb (roh->cb_cls,
+           &rs);
+  roh->cb = NULL;
+  GNUNET_JSON_parse_free (spec);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Function called when we're done processing the
+ * HTTP /reserves/$RID/open request.
+ *
+ * @param cls the `struct TALER_EXCHANGE_ReservesOpenHandle`
+ * @param response_code HTTP response code, 0 on error
+ * @param response parsed JSON result, NULL on error
+ */
+static void
+handle_reserves_open_finished (void *cls,
+                               long response_code,
+                               const void *response)
+{
+  struct TALER_EXCHANGE_ReservesOpenHandle *roh = cls;
+  const json_t *j = response;
+  struct TALER_EXCHANGE_ReserveOpenResult rs = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
+  };
+
+  roh->job = NULL;
+  switch (response_code)
+  {
+  case 0:
+    rs.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    break;
+  case MHD_HTTP_OK:
+    if (GNUNET_OK !=
+        handle_reserves_open_ok (roh,
+                                 j))
+    {
+      GNUNET_break_op (0);
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_BAD_REQUEST:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    json_dumpf (j,
+                stderr,
+                JSON_INDENT (2));
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_PAYMENT_REQUIRED:
+    if (GNUNET_OK !=
+        handle_reserves_open_pr (roh,
+                                 j))
+    {
+      GNUNET_break_op (0);
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    /* This should never happen, either us or the exchange is buggy
+       (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* Nothing really to verify, this should never
+       happen, we should pass the JSON reply to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  case MHD_HTTP_CONFLICT:
+    {
+      const struct CoinData *cd = NULL;
+      struct GNUNET_JSON_Specification spec[] = {
+        GNUNET_JSON_spec_fixed_auto ("coin_pub",
+                                     &rs.details.conflict.coin_pub),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (j,
+                             spec,
+                             NULL,
+                             NULL))
+      {
+        GNUNET_break_op (0);
+        rs.hr.http_status = 0;
+        rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      for (unsigned int i = 0; i<roh->num_coins; i++)
+      {
+        const struct CoinData *cdi = &roh->coins[i];
+
+        if (0 == GNUNET_memcmp (&rs.details.conflict.coin_pub,
+                                &cdi->coin_pub))
+        {
+          cd = cdi;
+          break;
+        }
+      }
+      if (NULL == cd)
+      {
+        GNUNET_break_op (0);
+        rs.hr.http_status = 0;
+        rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+        break;
+      }
+      rs.hr.ec = TALER_JSON_get_error_code (j);
+      rs.hr.hint = TALER_JSON_get_error_hint (j);
+      break;
+    }
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    if (GNUNET_OK !=
+        handle_reserves_open_kyc (roh,
+                                  j))
+    {
+      GNUNET_break_op (0);
+      rs.hr.http_status = 0;
+      rs.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    }
+    break;
+  case MHD_HTTP_INTERNAL_SERVER_ERROR:
+    /* Server had an internal issue; we should retry, but this API
+       leaves this to the application */
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    break;
+  default:
+    /* unexpected response code */
+    GNUNET_break_op (0);
+    rs.hr.ec = TALER_JSON_get_error_code (j);
+    rs.hr.hint = TALER_JSON_get_error_hint (j);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected response code %u/%d for reserves open\n",
+                (unsigned int) response_code,
+                (int) rs.hr.ec);
+    break;
+  }
+  if (NULL != roh->cb)
+  {
+    roh->cb (roh->cb_cls,
+             &rs);
+    roh->cb = NULL;
+  }
+  TALER_EXCHANGE_reserves_open_cancel (roh);
+}
+
+
+struct TALER_EXCHANGE_ReservesOpenHandle *
+TALER_EXCHANGE_reserves_open (
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *reserve_contribution,
+  unsigned int coin_payments_length,
+  const struct TALER_EXCHANGE_PurseDeposit coin_payments[
+    static coin_payments_length],
+  struct GNUNET_TIME_Timestamp expiration_time,
+  uint32_t min_purses,
+  TALER_EXCHANGE_ReservesOpenCallback cb,
+  void *cb_cls)
+{
+  struct TALER_EXCHANGE_ReservesOpenHandle *roh;
+  CURL *eh;
+  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
+  json_t *cpa;
+
+  roh = GNUNET_new (struct TALER_EXCHANGE_ReservesOpenHandle);
+  roh->cb = cb;
+  roh->cb_cls = cb_cls;
+  roh->ts = GNUNET_TIME_timestamp_get ();
+  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+                                      &roh->reserve_pub.eddsa_pub);
+  {
+    char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
+    char *end;
+
+    end = GNUNET_STRINGS_data_to_string (
+      &roh->reserve_pub,
+      sizeof (roh->reserve_pub),
+      pub_str,
+      sizeof (pub_str));
+    *end = '\0';
+    GNUNET_snprintf (arg_str,
+                     sizeof (arg_str),
+                     "reserves/%s/open",
+                     pub_str);
+  }
+  roh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
+  if (NULL == roh->url)
+  {
+    GNUNET_free (roh);
+    return NULL;
+  }
+  eh = TALER_EXCHANGE_curl_easy_get_ (roh->url);
+  if (NULL == eh)
+  {
+    GNUNET_break (0);
+    GNUNET_free (roh->url);
+    GNUNET_free (roh);
+    return NULL;
+  }
+  TALER_wallet_reserve_open_sign (reserve_contribution,
+                                  roh->ts,
+                                  expiration_time,
+                                  min_purses,
+                                  reserve_priv,
+                                  &roh->reserve_sig);
+  roh->coins = GNUNET_new_array (coin_payments_length,
+                                 struct CoinData);
+  cpa = json_array ();
+  GNUNET_assert (NULL != cpa);
+  for (unsigned int i = 0; i<coin_payments_length; i++)
+  {
+    const struct TALER_EXCHANGE_PurseDeposit *pd = &coin_payments[i];
+    const struct TALER_AgeCommitmentProof *acp = pd->age_commitment_proof;
+    struct TALER_AgeCommitmentHash ahac;
+    struct TALER_AgeCommitmentHash *achp = NULL;
+    struct CoinData *cd = &roh->coins[i];
+    json_t *cp;
+
+    cd->contribution = pd->amount;
+    cd->h_denom_pub = pd->h_denom_pub;
+    if (NULL != acp)
+    {
+      TALER_age_commitment_hash (&acp->commitment,
+                                 &ahac);
+      achp = &ahac;
+    }
+    TALER_wallet_reserve_open_deposit_sign (&pd->amount,
+                                            &roh->reserve_sig,
+                                            &pd->coin_priv,
+                                            &cd->coin_sig);
+    GNUNET_CRYPTO_eddsa_key_get_public (&pd->coin_priv.eddsa_priv,
+                                        &cd->coin_pub.eddsa_pub);
+
+    cp = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_allow_null (
+        GNUNET_JSON_pack_data_auto ("h_age_commitment",
+                                    achp)),
+      TALER_JSON_pack_amount ("amount",
+                              &pd->amount),
+      GNUNET_JSON_pack_data_auto ("denom_pub_hash",
+                                  &pd->h_denom_pub),
+      TALER_JSON_pack_denom_sig ("ub_sig",
+                                 &pd->denom_sig),
+      GNUNET_JSON_pack_data_auto ("coin_pub",
+                                  &cd->coin_pub),
+      GNUNET_JSON_pack_data_auto ("coin_sig",
+                                  &cd->coin_sig));
+    GNUNET_assert (0 ==
+                   json_array_append_new (cpa,
+                                          cp));
+  }
+  {
+    json_t *open_obj = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_timestamp ("request_timestamp",
+                                  roh->ts),
+      GNUNET_JSON_pack_timestamp ("reserve_expiration",
+                                  expiration_time),
+      GNUNET_JSON_pack_array_steal ("payments",
+                                    cpa),
+      TALER_JSON_pack_amount ("reserve_payment",
+                              reserve_contribution),
+      GNUNET_JSON_pack_uint64 ("purse_limit",
+                               min_purses),
+      GNUNET_JSON_pack_data_auto ("reserve_sig",
+                                  &roh->reserve_sig));
+
+    if (GNUNET_OK !=
+        TALER_curl_easy_post (&roh->post_ctx,
+                              eh,
+                              open_obj))
+    {
+      GNUNET_break (0);
+      curl_easy_cleanup (eh);
+      json_decref (open_obj);
+      GNUNET_free (roh->coins);
+      GNUNET_free (roh->url);
+      GNUNET_free (roh);
+      return NULL;
+    }
+    json_decref (open_obj);
+  }
+  roh->keys = TALER_EXCHANGE_keys_incref (keys);
+  roh->job = GNUNET_CURL_job_add2 (ctx,
+                                   eh,
+                                   roh->post_ctx.headers,
+                                   &handle_reserves_open_finished,
+                                   roh);
+  return roh;
+}
+
+
+void
+TALER_EXCHANGE_reserves_open_cancel (
+  struct TALER_EXCHANGE_ReservesOpenHandle *roh)
+{
+  if (NULL != roh->job)
+  {
+    GNUNET_CURL_job_cancel (roh->job);
+    roh->job = NULL;
+  }
+  TALER_curl_easy_post_finished (&roh->post_ctx);
+  GNUNET_free (roh->coins);
+  GNUNET_free (roh->url);
+  TALER_EXCHANGE_keys_decref (roh->keys);
+  GNUNET_free (roh);
+}
+
+
+/* end of exchange_api_reserves_open.c */
diff --git a/src/lib/exchange_api_stefan.c b/src/lib/exchange_api_stefan.c
new file mode 100644
index 000000000..226bca82f
--- /dev/null
+++ b/src/lib/exchange_api_stefan.c
@@ -0,0 +1,328 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/exchange_api_stefan.c
+ * @brief calculations on the STEFAN curve
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "exchange_api_handle.h"
+#include <math.h>
+
+
+/**
+ * Determine smallest denomination in @a keys.
+ *
+ * @param keys exchange response to evaluate
+ * @return NULL on error (no denominations)
+ */
+static const struct TALER_Amount *
+get_unit (const struct TALER_EXCHANGE_Keys *keys)
+{
+  const struct TALER_Amount *min = NULL;
+
+  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
+  {
+    const struct TALER_EXCHANGE_DenomPublicKey *dk
+      = &keys->denom_keys[i];
+
+    if ( (NULL == min) ||
+         (1 == TALER_amount_cmp (min,
+                                 /* > */
+                                 &dk->value)) )
+      min = &dk->value;
+  }
+  GNUNET_break (NULL != min);
+  return min;
+}
+
+
+/**
+ * Convert amount to double for STEFAN curve evaluation.
+ *
+ * @param a input amount
+ * @return (rounded) amount as a double
+ */
+static double
+amount_to_double (const struct TALER_Amount *a)
+{
+  double d = (double) a->value;
+
+  d += a->fraction / ((double) TALER_AMOUNT_FRAC_BASE);
+  return d;
+}
+
+
+/**
+ * Convert double to amount for STEFAN curve evaluation.
+ *
+ * @param dv input amount
+ * @param currency deisred currency
+ * @param[out] rval (rounded) amount as a double
+ */
+static void
+double_to_amount (double dv,
+                  const char *currency,
+                  struct TALER_Amount *rval)
+{
+  double rem;
+
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_amount_set_zero (currency,
+                                        rval));
+  rval->value = floorl (dv);
+  rem = dv - ((double) rval->value);
+  if (rem < 0.0)
+    rem = 0.0;
+  rem *= TALER_AMOUNT_FRAC_BASE;
+  rval->fraction = floorl (rem);
+  if (rval->fraction >= TALER_AMOUNT_FRAC_BASE)
+  {
+    /* Strange, multiplication overflowed our range,
+       round up value instead */
+    rval->fraction = 0;
+    rval->value += 1;
+  }
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_keys_stefan_b2n (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *brut,
+  struct TALER_Amount *net)
+{
+  const struct TALER_Amount *min;
+  double log_d = amount_to_double (&keys->stefan_log);
+  double lin_d = keys->stefan_lin;
+  double abs_d = amount_to_double (&keys->stefan_abs);
+  double bru_d = amount_to_double (brut);
+  double min_d;
+  double fee_d;
+  double net_d;
+
+  if (TALER_amount_is_zero (brut))
+  {
+    *net = *brut;
+    return GNUNET_NO;
+  }
+  min = get_unit (keys);
+  if (NULL == min)
+    return GNUNET_SYSERR;
+  if (1.0f <= keys->stefan_lin)
+  {
+    /* This cannot work, linear STEFAN fee estimate always
+       exceed any gross amount. */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  min_d = amount_to_double (min);
+  fee_d = abs_d
+          + log_d * log2 (bru_d / min_d)
+          + lin_d * bru_d;
+  if (fee_d > bru_d)
+  {
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (brut->currency,
+                                          net));
+    return GNUNET_NO;
+  }
+  net_d = bru_d - fee_d;
+  double_to_amount (net_d,
+                    brut->currency,
+                    net);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Our function
+ * f(x) := ne + ab + lo * log2(x/mi) + li * x - x
+ * for #newton().
+ */
+static double
+eval_f (double mi,
+        double ab,
+        double lo,
+        double li,
+        double ne,
+        double x)
+{
+  return ne + ab + lo * log2 (x / mi) + li * x - x;
+}
+
+
+/**
+ * Our function
+ * f'(x) := lo / log(2) / x + li - 1
+ * for #newton().
+ */
+static double
+eval_fp (double mi,
+         double lo,
+         double li,
+         double ne,
+         double x)
+{
+  return lo / log (2) / x + li - 1;
+}
+
+
+/**
+ * Use Newton's method to find x where f(x)=0.
+ *
+ * @return x where "eval_f(x)==0".
+ */
+static double
+newton (double mi,
+        double ab,
+        double lo,
+        double li,
+        double ne)
+{
+  const double eps = 0.00000001; /* max error allowed */
+  double min_ab = ne + ab; /* result cannot be smaller than this! */
+  /* compute lower bounds by various heuristics */
+  double min_ab_li = min_ab + min_ab * li;
+  double min_ab_li_lo = min_ab_li + log2 (min_ab_li / mi) * lo;
+  double min_ab_lo = min_ab + log2 (min_ab / mi) * lo;
+  double min_ab_lo_li = min_ab_lo + min_ab_lo * li;
+  /* take global lower bound */
+  double x_min = GNUNET_MAX (min_ab_lo_li,
+                             min_ab_li_lo);
+  double x = x_min; /* use lower bound as starting point */
+
+  /* Objective: invert
+     ne := br - ab - lo * log2 (br/mi) - li * br
+     to find 'br'.
+     Method: use Newton's method to find root of:
+     f(x) := ne + ab + lo * log2 (x/mi) + li * x - x
+     using also
+     f'(x) := lo / log(2) / x  + li - 1
+  */
+  /* Loop to abort in case of divergence;
+     100 is already very high, 2-4 is normal! */
+  for (unsigned int i = 0; i<100; i++)
+  {
+    double fx = eval_f (mi, ab, lo, li, ne, x);
+    double fxp = eval_fp (mi, lo, li, ne, x);
+    double x_new = x - fx / fxp;
+
+    if (fabs (x - x_new) <= eps)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Needed %u rounds from %f to result BRUT %f => NET: %f\n",
+                  i,
+                  x_min,
+                  x_new,
+                  x_new - ab - li * x_new - lo * log2 (x / mi));
+      return x_new;
+    }
+    if (x_new < x_min)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Divergence, obtained very bad estimate %f after %u rounds!\n",
+                  x_new,
+                  i);
+      return x_min;
+    }
+    x = x_new;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Slow convergence, returning bad estimate %f!\n",
+              x);
+  return x;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_EXCHANGE_keys_stefan_n2b (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *net,
+  struct TALER_Amount *brut)
+{
+  const struct TALER_Amount *min;
+  double lin_d = keys->stefan_lin;
+  double log_d = amount_to_double (&keys->stefan_log);
+  double abs_d = amount_to_double (&keys->stefan_abs);
+  double net_d = amount_to_double (net);
+  double min_d;
+  double brut_d;
+
+  if (TALER_amount_is_zero (net))
+  {
+    *brut = *net;
+    return GNUNET_NO;
+  }
+  min = get_unit (keys);
+  if (NULL == min)
+    return GNUNET_SYSERR;
+  if (1.0f <= keys->stefan_lin)
+  {
+    /* This cannot work, linear STEFAN fee estimate always
+       exceed any gross amount. */
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  min_d = amount_to_double (min);
+  brut_d = newton (min_d,
+                   abs_d,
+                   log_d,
+                   lin_d,
+                   net_d);
+  double_to_amount (brut_d,
+                    net->currency,
+                    brut);
+  return GNUNET_OK;
+}
+
+
+void
+TALER_EXCHANGE_keys_stefan_round (
+  const struct TALER_EXCHANGE_Keys *keys,
+  struct TALER_Amount *val)
+{
+  const struct TALER_Amount *min;
+  uint32_t mod;
+  uint32_t frac;
+  uint32_t lim;
+
+  if (0 == val->fraction)
+  {
+    /* rounding of non-fractions not supported */
+    return;
+  }
+  min = get_unit (keys);
+  if (NULL == min)
+    return;
+  if (0 == min->fraction)
+  {
+    frac = TALER_AMOUNT_FRAC_BASE;
+  }
+  else
+  {
+    frac = min->fraction;
+  }
+  lim = frac / 2;
+  mod = val->fraction % frac;
+  if (mod < lim)
+    val->fraction -= mod; /* round down */
+  else
+    val->fraction += frac - mod; /* round up */
+}
diff --git a/src/lib/exchange_api_transfers_get.c b/src/lib/exchange_api_transfers_get.c
index 06465618c..c558fb42e 100644
--- a/src/lib/exchange_api_transfers_get.c
+++ b/src/lib/exchange_api_transfers_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -38,9 +38,9 @@ struct TALER_EXCHANGE_TransfersGetHandle
 {
 
   /**
-   * The connection to exchange this request handle will use
+   * The keys of the exchange this request handle will use
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_Keys *keys;
 
   /**
    * The url for this request.
@@ -84,25 +84,34 @@ check_transfers_get_response_ok (
   struct TALER_EXCHANGE_TransfersGetHandle *wdh,
   const json_t *json)
 {
-  json_t *details_j;
-  struct TALER_EXCHANGE_TransferData td;
+  const json_t *details_j;
   struct TALER_Amount total_expected;
   struct TALER_MerchantPublicKeyP merchant_pub;
+  struct TALER_EXCHANGE_TransfersGetResponse tgr = {
+    .hr.reply = json,
+    .hr.http_status = MHD_HTTP_OK
+  };
+  struct TALER_EXCHANGE_TransferData *td
+    = &tgr.details.ok.td;
   struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_amount_any ("total", &td.total_amount),
-    TALER_JSON_spec_amount_any ("wire_fee", &td.wire_fee),
-    GNUNET_JSON_spec_fixed_auto ("merchant_pub", &merchant_pub),
-    GNUNET_JSON_spec_fixed_auto ("h_payto", &td.h_payto),
-    GNUNET_JSON_spec_timestamp ("execution_time", &td.execution_time),
-    GNUNET_JSON_spec_json ("deposits", &details_j),
-    GNUNET_JSON_spec_fixed_auto ("exchange_sig", &td.exchange_sig),
-    GNUNET_JSON_spec_fixed_auto ("exchange_pub", &td.exchange_pub),
+    TALER_JSON_spec_amount_any ("total",
+                                &td->total_amount),
+    TALER_JSON_spec_amount_any ("wire_fee",
+                                &td->wire_fee),
+    GNUNET_JSON_spec_fixed_auto ("merchant_pub",
+                                 &merchant_pub),
+    GNUNET_JSON_spec_fixed_auto ("h_payto",
+                                 &td->h_payto),
+    GNUNET_JSON_spec_timestamp ("execution_time",
+                                &td->execution_time),
+    GNUNET_JSON_spec_array_const ("deposits",
+                                  &details_j),
+    GNUNET_JSON_spec_fixed_auto ("exchange_sig",
+                                 &td->exchange_sig),
+    GNUNET_JSON_spec_fixed_auto ("exchange_pub",
+                                 &td->exchange_pub),
     GNUNET_JSON_spec_end ()
   };
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = json,
-    .http_status = MHD_HTTP_OK
-  };
 
   if (GNUNET_OK !=
       GNUNET_JSON_parse (json,
@@ -113,32 +122,30 @@ check_transfers_get_response_ok (
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
-      TALER_amount_set_zero (td.total_amount.currency,
+      TALER_amount_set_zero (td->total_amount.currency,
                              &total_expected))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
       TALER_EXCHANGE_test_signing_key (
-        TALER_EXCHANGE_get_keys (wdh->exchange),
-        &td.exchange_pub))
+        wdh->keys,
+        &td->exchange_pub))
   {
     GNUNET_break_op (0);
-    GNUNET_JSON_parse_free (spec);
     return GNUNET_SYSERR;
   }
-  td.details_length = json_array_size (details_j);
+  td->details_length = json_array_size (details_j);
   {
     struct GNUNET_HashContext *hash_context;
     struct TALER_TrackTransferDetails *details;
 
-    details = GNUNET_new_array (td.details_length,
+    details = GNUNET_new_array (td->details_length,
                                 struct TALER_TrackTransferDetails);
-    td.details = details;
+    td->details = details;
     hash_context = GNUNET_CRYPTO_hash_context_start ();
-    for (unsigned int i = 0; i<td.details_length; i++)
+    for (unsigned int i = 0; i<td->details_length; i++)
     {
       struct TALER_TrackTransferDetails *detail = &details[i];
       struct json_t *detail_j = json_array_get (details_j, i);
@@ -146,21 +153,27 @@ check_transfers_get_response_ok (
         GNUNET_JSON_spec_fixed_auto ("h_contract_terms",
                                      &detail->h_contract_terms),
         GNUNET_JSON_spec_fixed_auto ("coin_pub", &detail->coin_pub),
-        TALER_JSON_spec_amount_any ("deposit_value", &detail->coin_value),
-        TALER_JSON_spec_amount_any ("deposit_fee", &detail->coin_fee),
+        TALER_JSON_spec_amount ("deposit_value",
+                                total_expected.currency,
+                                &detail->coin_value),
+        TALER_JSON_spec_amount ("deposit_fee",
+                                total_expected.currency,
+                                &detail->coin_fee),
+        GNUNET_JSON_spec_mark_optional (
+          TALER_JSON_spec_amount ("refund_total",
+                                  total_expected.currency,
+                                  &detail->refund_total),
+          NULL),
         GNUNET_JSON_spec_end ()
       };
 
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_amount_set_zero (td->total_amount.currency,
+                                            &detail->refund_total));
       if ( (GNUNET_OK !=
             GNUNET_JSON_parse (detail_j,
                                spec_detail,
                                NULL, NULL)) ||
-           (GNUNET_OK !=
-            TALER_amount_cmp_currency (&total_expected,
-                                       &detail->coin_value)) ||
-           (GNUNET_OK !=
-            TALER_amount_cmp_currency (&total_expected,
-                                       &detail->coin_fee)) ||
            (0 >
             TALER_amount_add (&total_expected,
                               &total_expected,
@@ -172,7 +185,6 @@ check_transfers_get_response_ok (
       {
         GNUNET_break_op (0);
         GNUNET_CRYPTO_hash_context_abort (hash_context);
-        GNUNET_JSON_parse_free (spec);
         GNUNET_free (details);
         return GNUNET_SYSERR;
       }
@@ -180,7 +192,7 @@ check_transfers_get_response_ok (
       TALER_exchange_online_wire_deposit_append (
         hash_context,
         &detail->h_contract_terms,
-        td.execution_time,
+        td->execution_time,
         &detail->coin_pub,
         &detail->coin_value,
         &detail->coin_fee);
@@ -193,16 +205,15 @@ check_transfers_get_response_ok (
                                          &h_details);
       if (GNUNET_OK !=
           TALER_exchange_online_wire_deposit_verify (
-            &td.total_amount,
-            &td.wire_fee,
+            &td->total_amount,
+            &td->wire_fee,
             &merchant_pub,
-            &td.h_payto,
+            &td->h_payto,
             &h_details,
-            &td.exchange_pub,
-            &td.exchange_sig))
+            &td->exchange_pub,
+            &td->exchange_sig))
       {
         GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
         GNUNET_free (details);
         return GNUNET_SYSERR;
       }
@@ -211,29 +222,24 @@ check_transfers_get_response_ok (
     if (0 >
         TALER_amount_subtract (&total_expected,
                                &total_expected,
-                               &td.wire_fee))
+                               &td->wire_fee))
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
       GNUNET_free (details);
       return GNUNET_SYSERR;
     }
     if (0 !=
         TALER_amount_cmp (&total_expected,
-                          &td.total_amount))
+                          &td->total_amount))
     {
       GNUNET_break_op (0);
-      GNUNET_JSON_parse_free (spec);
       GNUNET_free (details);
       return GNUNET_SYSERR;
     }
     wdh->cb (wdh->cb_cls,
-             &hr,
-             &td);
+             &tgr);
     GNUNET_free (details);
   }
-  GNUNET_JSON_parse_free (spec);
-  TALER_EXCHANGE_transfers_get_cancel (wdh);
   return GNUNET_OK;
 }
 
@@ -253,90 +259,85 @@ handle_transfers_get_finished (void *cls,
 {
   struct TALER_EXCHANGE_TransfersGetHandle *wdh = cls;
   const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
+  struct TALER_EXCHANGE_TransfersGetResponse tgr = {
+    .hr.reply = j,
+    .hr.http_status = (unsigned int) response_code
   };
 
   wdh->job = NULL;
   switch (response_code)
   {
   case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
+    tgr.hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
     break;
   case MHD_HTTP_OK:
     if (GNUNET_OK ==
         check_transfers_get_response_ok (wdh,
                                          j))
+    {
+      TALER_EXCHANGE_transfers_get_cancel (wdh);
       return;
+    }
     GNUNET_break_op (0);
-    hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-    hr.http_status = 0;
+    tgr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
+    tgr.hr.http_status = 0;
     break;
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the exchange is buggy
        (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    tgr.hr.ec = TALER_JSON_get_error_code (j);
+    tgr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_FORBIDDEN:
     /* Nothing really to verify, exchange says one of the signatures is
        invalid; as we checked them, this should never happen, we
        should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    tgr.hr.ec = TALER_JSON_get_error_code (j);
+    tgr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Exchange does not know about transaction;
        we should pass the reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    tgr.hr.ec = TALER_JSON_get_error_code (j);
+    tgr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
        leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    tgr.hr.ec = TALER_JSON_get_error_code (j);
+    tgr.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   default:
     /* unexpected response code */
     GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
+    tgr.hr.ec = TALER_JSON_get_error_code (j);
+    tgr.hr.hint = TALER_JSON_get_error_hint (j);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected response code %u/%d for transfers get\n",
                 (unsigned int) response_code,
-                (int) hr.ec);
+                (int) tgr.hr.ec);
     break;
   }
   wdh->cb (wdh->cb_cls,
-           &hr,
-           NULL);
+           &tgr);
   TALER_EXCHANGE_transfers_get_cancel (wdh);
 }
 
 
 struct TALER_EXCHANGE_TransfersGetHandle *
 TALER_EXCHANGE_transfers_get (
-  struct TALER_EXCHANGE_Handle *exchange,
+  struct GNUNET_CURL_Context *ctx,
+  const char *url,
+  struct TALER_EXCHANGE_Keys *keys,
   const struct TALER_WireTransferIdentifierRawP *wtid,
   TALER_EXCHANGE_TransfersGetCallback cb,
   void *cb_cls)
 {
   struct TALER_EXCHANGE_TransfersGetHandle *wdh;
-  struct GNUNET_CURL_Context *ctx;
   CURL *eh;
   char arg_str[sizeof (struct TALER_WireTransferIdentifierRawP) * 2 + 32];
 
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-
   wdh = GNUNET_new (struct TALER_EXCHANGE_TransfersGetHandle);
-  wdh->exchange = exchange;
   wdh->cb = cb;
   wdh->cb_cls = cb_cls;
 
@@ -352,11 +353,12 @@ TALER_EXCHANGE_transfers_get (
     *end = '\0';
     GNUNET_snprintf (arg_str,
                      sizeof (arg_str),
-                     "/transfers/%s",
+                     "transfers/%s",
                      wtid_str);
   }
-  wdh->url = TEAH_path_to_url (wdh->exchange,
-                               arg_str);
+  wdh->url = TALER_url_join (url,
+                             arg_str,
+                             NULL);
   if (NULL == wdh->url)
   {
     GNUNET_free (wdh);
@@ -370,7 +372,7 @@ TALER_EXCHANGE_transfers_get (
     GNUNET_free (wdh);
     return NULL;
   }
-  ctx = TEAH_handle_to_context (exchange);
+  wdh->keys = TALER_EXCHANGE_keys_incref (keys);
   wdh->job = GNUNET_CURL_job_add_with_ct_json (ctx,
                                                eh,
                                                &handle_transfers_get_finished,
@@ -395,6 +397,7 @@ TALER_EXCHANGE_transfers_get_cancel (
     wdh->job = NULL;
   }
   GNUNET_free (wdh->url);
+  TALER_EXCHANGE_keys_decref (wdh->keys);
   GNUNET_free (wdh);
 }
 
diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c
deleted file mode 100644
index 0390623fa..000000000
--- a/src/lib/exchange_api_wire.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
-  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/>
-*/
-/**
- * @file lib/exchange_api_wire.c
- * @brief Implementation of the /wire request of the exchange's HTTP API
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_exchange_service.h"
-#include "taler_json_lib.h"
-#include "taler_signatures.h"
-#include "exchange_api_handle.h"
-#include "exchange_api_curl_defaults.h"
-
-
-/**
- * @brief A Wire Handle
- */
-struct TALER_EXCHANGE_WireHandle
-{
-
-  /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
-   * The url for this request.
-   */
-  char *url;
-
-  /**
-   * Handle for the request.
-   */
-  struct GNUNET_CURL_Job *job;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_EXCHANGE_WireCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-};
-
-
-/**
- * List of wire fees by method.
- */
-struct FeeMap
-{
-  /**
-   * Next entry in list.
-   */
-  struct FeeMap *next;
-
-  /**
-   * Wire method this fee structure is for.
-   */
-  char *method;
-
-  /**
-   * Array of wire fees, also linked list, but allocated
-   * only once.
-   */
-  struct TALER_EXCHANGE_WireAggregateFees *fee_list;
-};
-
-
-/**
- * Frees @a fm.
- *
- * @param fm memory to release
- */
-static void
-free_fees (struct FeeMap *fm)
-{
-  while (NULL != fm)
-  {
-    struct FeeMap *fe = fm->next;
-
-    GNUNET_free (fm->fee_list);
-    GNUNET_free (fm->method);
-    GNUNET_free (fm);
-    fm = fe;
-  }
-}
-
-
-/**
- * Parse wire @a fees and return map.
- *
- * @param fees json AggregateTransferFee to parse
- * @return NULL on error
- */
-static struct FeeMap *
-parse_fees (json_t *fees)
-{
-  struct FeeMap *fm = NULL;
-  const char *key;
-  json_t *fee_array;
-
-  json_object_foreach (fees, key, fee_array) {
-    struct FeeMap *fe = GNUNET_new (struct FeeMap);
-    unsigned int len;
-    unsigned int idx;
-    json_t *fee;
-
-    if (0 == (len = json_array_size (fee_array)))
-    {
-      GNUNET_free (fe);
-      continue; /* skip */
-    }
-    fe->method = GNUNET_strdup (key);
-    fe->next = fm;
-    fe->fee_list = GNUNET_new_array (len,
-                                     struct TALER_EXCHANGE_WireAggregateFees);
-    fm = fe;
-    json_array_foreach (fee_array, idx, fee)
-    {
-      struct TALER_EXCHANGE_WireAggregateFees *wa = &fe->fee_list[idx];
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_fixed_auto ("sig",
-                                     &wa->master_sig),
-        TALER_JSON_spec_amount_any ("wire_fee",
-                                    &wa->fees.wire),
-        TALER_JSON_spec_amount_any ("wad_fee",
-                                    &wa->fees.wad),
-        TALER_JSON_spec_amount_any ("closing_fee",
-                                    &wa->fees.closing),
-        GNUNET_JSON_spec_timestamp ("start_date",
-                                    &wa->start_date),
-        GNUNET_JSON_spec_timestamp ("end_date",
-                                    &wa->end_date),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (fee,
-                             spec,
-                             NULL,
-                             NULL))
-      {
-        GNUNET_break_op (0);
-        free_fees (fm);
-        return NULL;
-      }
-      if (idx + 1 < len)
-        wa->next = &fe->fee_list[idx + 1];
-      else
-        wa->next = NULL;
-    }
-  }
-  return fm;
-}
-
-
-/**
- * Find fee by @a method.
- *
- * @param fm map to look in
- * @param method key to look for
- * @return NULL if fee is not specified in @a fm
- */
-static const struct TALER_EXCHANGE_WireAggregateFees *
-lookup_fee (const struct FeeMap *fm,
-            const char *method)
-{
-  for (; NULL != fm; fm = fm->next)
-    if (0 == strcasecmp (fm->method,
-                         method))
-      return fm->fee_list;
-  return NULL;
-}
-
-
-/**
- * Function called when we're done processing the
- * HTTP /wire request.
- *
- * @param cls the `struct TALER_EXCHANGE_WireHandle`
- * @param response_code HTTP response code, 0 on error
- * @param response parsed JSON result, NULL on error
- */
-static void
-handle_wire_finished (void *cls,
-                      long response_code,
-                      const void *response)
-{
-  struct TALER_EXCHANGE_WireHandle *wh = cls;
-  const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
-  };
-
-  TALER_LOG_DEBUG ("Checking raw /wire response\n");
-  wh->job = NULL;
-  switch (response_code)
-  {
-  case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    /* FIXME:  Maybe we should only increment when we know it's a timeout? */
-    wh->exchange->wire_error_count++;
-    break;
-  case MHD_HTTP_OK:
-    {
-      json_t *accounts;
-      json_t *fees;
-      unsigned int num_accounts;
-      struct FeeMap *fm;
-      const struct TALER_EXCHANGE_Keys *key_state;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_json ("accounts",
-                               &accounts),
-        GNUNET_JSON_spec_json ("fees",
-                               &fees),
-        GNUNET_JSON_spec_end ()
-      };
-
-      wh->exchange->wire_error_count = 0;
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (j,
-                             spec,
-                             NULL, NULL))
-      {
-        /* bogus reply */
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-      if (0 == (num_accounts = json_array_size (accounts)))
-      {
-        /* bogus reply */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-      if (NULL == (fm = parse_fees (fees)))
-      {
-        /* bogus reply */
-        GNUNET_break_op (0);
-        GNUNET_JSON_parse_free (spec);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-
-      key_state = TALER_EXCHANGE_get_keys (wh->exchange);
-      /* parse accounts */
-      {
-        struct TALER_EXCHANGE_WireAccount was[num_accounts];
-
-        for (unsigned int i = 0; i<num_accounts; i++)
-        {
-          struct TALER_EXCHANGE_WireAccount *wa = &was[i];
-          json_t *account;
-          struct GNUNET_JSON_Specification spec_account[] = {
-            GNUNET_JSON_spec_string ("payto_uri",
-                                     &wa->payto_uri),
-            GNUNET_JSON_spec_fixed_auto ("master_sig",
-                                         &wa->master_sig),
-            GNUNET_JSON_spec_end ()
-          };
-          char *method;
-
-          account = json_array_get (accounts,
-                                    i);
-          if (GNUNET_OK !=
-              TALER_JSON_exchange_wire_signature_check (account,
-                                                        &key_state->master_pub))
-          {
-            /* bogus reply */
-            GNUNET_break_op (0);
-            hr.http_status = 0;
-            hr.ec = TALER_EC_EXCHANGE_WIRE_SIGNATURE_INVALID;
-            break;
-          }
-          if (GNUNET_OK !=
-              GNUNET_JSON_parse (account,
-                                 spec_account,
-                                 NULL, NULL))
-          {
-            /* bogus reply */
-            GNUNET_break_op (0);
-            hr.http_status = 0;
-            hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-            break;
-          }
-          if (NULL == (method = TALER_payto_get_method (wa->payto_uri)))
-          {
-            /* bogus reply */
-            GNUNET_break_op (0);
-            hr.http_status = 0;
-            hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-            break;
-          }
-          if (NULL == (wa->fees = lookup_fee (fm,
-                                              method)))
-          {
-            /* bogus reply */
-            GNUNET_break_op (0);
-            hr.http_status = 0;
-            hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-            GNUNET_free (method);
-            break;
-          }
-          GNUNET_free (method);
-        } /* end 'for all accounts */
-        if ( (0 != response_code) &&
-             (NULL != wh->cb) )
-        {
-          wh->cb (wh->cb_cls,
-                  &hr,
-                  num_accounts,
-                  was);
-          wh->cb = NULL;
-        }
-      } /* end of 'parse accounts */
-      free_fees (fm);
-      GNUNET_JSON_parse_free (spec);
-    } /* end of MHD_HTTP_OK */
-    break;
-  case MHD_HTTP_BAD_REQUEST:
-    /* This should never happen, either us or the exchange is buggy
-       (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    /* Nothing really to verify, this should never
-       happen, we should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    /* Server had an internal issue; we should retry, but this API
-       leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  default:
-    /* unexpected response code */
-    if (MHD_HTTP_GATEWAY_TIMEOUT == response_code)
-      wh->exchange->wire_error_count++;
-    GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for exchange wire\n",
-                (unsigned int) response_code,
-                (int) hr.ec);
-    break;
-  }
-  if (NULL != wh->cb)
-    wh->cb (wh->cb_cls,
-            &hr,
-            0,
-            NULL);
-  TALER_EXCHANGE_wire_cancel (wh);
-}
-
-
-/**
- * Compute the network timeout for the next request to /wire.
- *
- * @param exchange the exchange handle
- * @returns the timeout in seconds (for use by CURL)
- */
-static long
-get_wire_timeout_seconds (struct TALER_EXCHANGE_Handle *exchange)
-{
-  return GNUNET_MIN (60,
-                     5 + (1L << exchange->wire_error_count));
-}
-
-
-/**
- * Obtain information about a exchange's wire instructions.
- * A exchange may provide wire instructions for creating
- * a reserve.  The wire instructions also indicate
- * which wire formats merchants may use with the exchange.
- * This API is typically used by a wallet for wiring
- * funds, and possibly by a merchant to determine
- * supported wire formats.
- *
- * Note that while we return the (main) response verbatim to the
- * caller for further processing, we do already verify that the
- * response is well-formed (i.e. that signatures included in the
- * response are all valid).  If the exchange's reply is not well-formed,
- * we return an HTTP status code of zero to @a cb.
- *
- * @param exchange the exchange handle; the exchange must be ready to operate
- * @param wire_cb the callback to call when a reply for this request is available
- * @param wire_cb_cls closure for the above callback
- * @return a handle for this request
- */
-struct TALER_EXCHANGE_WireHandle *
-TALER_EXCHANGE_wire (struct TALER_EXCHANGE_Handle *exchange,
-                     TALER_EXCHANGE_WireCallback wire_cb,
-                     void *wire_cb_cls)
-{
-  struct TALER_EXCHANGE_WireHandle *wh;
-  struct GNUNET_CURL_Context *ctx;
-  CURL *eh;
-
-  if (GNUNET_YES !=
-      TEAH_handle_is_ready (exchange))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  wh = GNUNET_new (struct TALER_EXCHANGE_WireHandle);
-  wh->exchange = exchange;
-  wh->cb = wire_cb;
-  wh->cb_cls = wire_cb_cls;
-  wh->url = TEAH_path_to_url (exchange,
-                              "/wire");
-  if (NULL == wh->url)
-  {
-    GNUNET_free (wh);
-    return NULL;
-  }
-  eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
-  if (NULL == eh)
-  {
-    GNUNET_break (0);
-    GNUNET_free (wh->url);
-    GNUNET_free (wh);
-    return NULL;
-  }
-  GNUNET_break (CURLE_OK ==
-                curl_easy_setopt (eh,
-                                  CURLOPT_TIMEOUT,
-                                  get_wire_timeout_seconds (wh->exchange)));
-  ctx = TEAH_handle_to_context (exchange);
-  wh->job = GNUNET_CURL_job_add_with_ct_json (ctx,
-                                              eh,
-                                              &handle_wire_finished,
-                                              wh);
-  return wh;
-}
-
-
-/**
- * Cancel a wire information request.  This function cannot be used
- * on a request handle if a response is already served for it.
- *
- * @param wh the wire information request handle
- */
-void
-TALER_EXCHANGE_wire_cancel (struct TALER_EXCHANGE_WireHandle *wh)
-{
-  if (NULL != wh->job)
-  {
-    GNUNET_CURL_job_cancel (wh->job);
-    wh->job = NULL;
-  }
-  GNUNET_free (wh->url);
-  GNUNET_free (wh);
-}
-
-
-/* end of exchange_api_wire.c */
diff --git a/src/lib/exchange_api_withdraw.c b/src/lib/exchange_api_withdraw.c
deleted file mode 100644
index f6a60f534..000000000
--- a/src/lib/exchange_api_withdraw.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-  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/>
-*/
-/**
- * @file lib/exchange_api_withdraw.c
- * @brief Implementation of /reserves/$RESERVE_PUB/withdraw requests with blinding/unblinding
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_exchange_service.h"
-#include "taler_json_lib.h"
-#include "exchange_api_handle.h"
-#include "taler_signatures.h"
-#include "exchange_api_curl_defaults.h"
-
-
-/**
- * @brief A Withdraw Handle
- */
-struct TALER_EXCHANGE_WithdrawHandle
-{
-
-  /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
-   * Handle for the actual (internal) withdraw operation.
-   */
-  struct TALER_EXCHANGE_Withdraw2Handle *wh2;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_EXCHANGE_WithdrawCallback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Reserve private key.
-   */
-  const struct TALER_ReservePrivateKeyP *reserve_priv;
-
-  /**
-   * Seed of the planchet.
-   */
-  struct TALER_PlanchetMasterSecretP ps;
-
-  /**
-   *  blinding secret
-   */
-  union TALER_DenominationBlindingKeyP bks;
-
-  /**
-   * Private key of the coin we are withdrawing.
-   */
-  struct TALER_CoinSpendPrivateKeyP priv;
-
-  /**
-   * Details of the planchet.
-   */
-  struct TALER_PlanchetDetail pd;
-
-  /**
-   * Values of the @cipher selected
-   */
-  struct TALER_ExchangeWithdrawValues alg_values;
-
-  /**
-   * Hash of the age commitment for this coin, if applicable. Maybe NULL
-   */
-  const struct TALER_AgeCommitmentHash *ach;
-
-  /**
-   * Denomination key we are withdrawing.
-   */
-  struct TALER_EXCHANGE_DenomPublicKey pk;
-
-  /**
-   * Hash of the public key of the coin we are signing.
-   */
-  struct TALER_CoinPubHashP c_hash;
-
-  /**
-   * Handler for the CS R request (only used for TALER_DENOMINATION_CS denominations)
-   */
-  struct TALER_EXCHANGE_CsRWithdrawHandle *csrh;
-
-};
-
-
-/**
- * Function called when we're done processing the
- * HTTP /reserves/$RESERVE_PUB/withdraw request.
- *
- * @param cls the `struct TALER_EXCHANGE_WithdrawHandle`
- * @param hr HTTP response data
- * @param blind_sig blind signature over the coin, NULL on error
- */
-static void
-handle_reserve_withdraw_finished (
-  void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr,
-  const struct TALER_BlindedDenominationSignature *blind_sig)
-{
-  struct TALER_EXCHANGE_WithdrawHandle *wh = cls;
-  struct TALER_EXCHANGE_WithdrawResponse wr = {
-    .hr = *hr
-  };
-
-  wh->wh2 = NULL;
-  switch (hr->http_status)
-  {
-  case MHD_HTTP_OK:
-    {
-      struct TALER_FreshCoin fc;
-
-      if (GNUNET_OK !=
-          TALER_planchet_to_coin (&wh->pk.key,
-                                  blind_sig,
-                                  &wh->bks,
-                                  &wh->priv,
-                                  wh->ach,
-                                  &wh->c_hash,
-                                  &wh->alg_values,
-                                  &fc))
-      {
-        wr.hr.http_status = 0;
-        wr.hr.ec = TALER_EC_EXCHANGE_WITHDRAW_UNBLIND_FAILURE;
-        break;
-      }
-      wr.details.success.coin_priv = wh->priv;
-      wr.details.success.bks = wh->bks;
-      wr.details.success.sig = fc.sig;
-      wr.details.success.exchange_vals = wh->alg_values;
-      break;
-    }
-  case MHD_HTTP_ACCEPTED:
-    {
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_uint64 ("payment_target_uuid",
-                                 &wr.details.accepted.payment_target_uuid),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (hr->reply,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        wr.hr.http_status = 0;
-        wr.hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-    }
-    break;
-  default:
-    break;
-  }
-  wh->cb (wh->cb_cls,
-          &wr);
-  if (MHD_HTTP_OK == hr->http_status)
-    TALER_denom_sig_free (&wr.details.success.sig);
-  TALER_EXCHANGE_withdraw_cancel (wh);
-}
-
-
-/**
- * Function called when stage 1 of CS withdraw is finished (request r_pub's)
- *
- * @param cls the `struct TALER_EXCHANGE_WithdrawHandle`
- * @param csrr replies from the /csr-withdraw request
- */
-static void
-withdraw_cs_stage_two_callback (
-  void *cls,
-  const struct TALER_EXCHANGE_CsRWithdrawResponse *csrr)
-{
-  struct TALER_EXCHANGE_WithdrawHandle *wh = cls;
-  struct TALER_EXCHANGE_WithdrawResponse wr = {
-    .hr = csrr->hr
-  };
-
-  wh->csrh = NULL;
-  GNUNET_assert (TALER_DENOMINATION_CS == wh->pk.key.cipher);
-  switch (csrr->hr.http_status)
-  {
-  case MHD_HTTP_OK:
-    wh->alg_values = csrr->details.success.alg_values;
-    TALER_planchet_setup_coin_priv (&wh->ps,
-                                    &wh->alg_values,
-                                    &wh->priv);
-    TALER_planchet_blinding_secret_create (&wh->ps,
-                                           &wh->alg_values,
-                                           &wh->bks);
-    /* This initializes the 2nd half of the
-       wh->pd.blinded_planchet! */
-    if (GNUNET_OK !=
-        TALER_planchet_prepare (&wh->pk.key,
-                                &wh->alg_values,
-                                &wh->bks,
-                                &wh->priv,
-                                wh->ach,
-                                &wh->c_hash,
-                                &wh->pd))
-    {
-      GNUNET_break (0);
-      GNUNET_free (wh);
-    }
-    wh->wh2 = TALER_EXCHANGE_withdraw2 (wh->exchange,
-                                        &wh->pd,
-                                        wh->reserve_priv,
-                                        &handle_reserve_withdraw_finished,
-                                        wh);
-    return;
-  default:
-    break;
-  }
-  wh->cb (wh->cb_cls,
-          &wr);
-  TALER_EXCHANGE_withdraw_cancel (wh);
-}
-
-
-struct TALER_EXCHANGE_WithdrawHandle *
-TALER_EXCHANGE_withdraw (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const struct TALER_EXCHANGE_DenomPublicKey *pk,
-  const struct TALER_ReservePrivateKeyP *reserve_priv,
-  const struct TALER_PlanchetMasterSecretP *ps,
-  const struct TALER_AgeCommitmentHash *ach,
-  TALER_EXCHANGE_WithdrawCallback res_cb,
-  void *res_cb_cls)
-{
-  struct TALER_EXCHANGE_WithdrawHandle *wh;
-
-  wh = GNUNET_new (struct TALER_EXCHANGE_WithdrawHandle);
-  wh->exchange = exchange;
-  wh->cb = res_cb;
-  wh->cb_cls = res_cb_cls;
-  wh->reserve_priv = reserve_priv;
-  wh->ps = *ps;
-  wh->ach = ach;
-  wh->pk = *pk;
-  TALER_denom_pub_deep_copy (&wh->pk.key,
-                             &pk->key);
-
-  switch (pk->key.cipher)
-  {
-  case TALER_DENOMINATION_RSA:
-    {
-      wh->alg_values.cipher = TALER_DENOMINATION_RSA;
-      TALER_planchet_setup_coin_priv (ps,
-                                      &wh->alg_values,
-                                      &wh->priv);
-      TALER_planchet_blinding_secret_create (ps,
-                                             &wh->alg_values,
-                                             &wh->bks);
-      if (GNUNET_OK !=
-          TALER_planchet_prepare (&pk->key,
-                                  &wh->alg_values,
-                                  &wh->bks,
-                                  &wh->priv,
-                                  wh->ach,
-                                  &wh->c_hash,
-                                  &wh->pd))
-      {
-        GNUNET_break (0);
-        GNUNET_free (wh);
-        return NULL;
-      }
-      wh->wh2 = TALER_EXCHANGE_withdraw2 (exchange,
-                                          &wh->pd,
-                                          wh->reserve_priv,
-                                          &handle_reserve_withdraw_finished,
-                                          wh);
-      break;
-    }
-  case TALER_DENOMINATION_CS:
-    {
-      TALER_cs_withdraw_nonce_derive (
-        ps,
-        &wh->pd.blinded_planchet.details.cs_blinded_planchet.nonce);
-      /* Note that we only initialize the first half
-         of the blinded_planchet here; the other part
-         will be done after the /csr-withdraw request! */
-      wh->pd.blinded_planchet.cipher = TALER_DENOMINATION_CS;
-      wh->csrh = TALER_EXCHANGE_csr_withdraw (
-        exchange,
-        pk,
-        &wh->pd.blinded_planchet.details.cs_blinded_planchet.nonce,
-        &withdraw_cs_stage_two_callback,
-        wh);
-      break;
-    }
-  default:
-    GNUNET_break (0);
-    GNUNET_free (wh);
-    return NULL;
-  }
-  return wh;
-}
-
-
-void
-TALER_EXCHANGE_withdraw_cancel (struct TALER_EXCHANGE_WithdrawHandle *wh)
-{
-  TALER_blinded_planchet_free (&wh->pd.blinded_planchet);
-  if (NULL != wh->csrh)
-  {
-    TALER_EXCHANGE_csr_withdraw_cancel (wh->csrh);
-    wh->csrh = NULL;
-  }
-  if (NULL != wh->wh2)
-  {
-    TALER_EXCHANGE_withdraw2_cancel (wh->wh2);
-    wh->wh2 = NULL;
-  }
-  TALER_denom_pub_free (&wh->pk.key);
-  GNUNET_free (wh);
-}
diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c
deleted file mode 100644
index a5371442f..000000000
--- a/src/lib/exchange_api_withdraw2.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
-  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/>
-*/
-/**
- * @file lib/exchange_api_withdraw2.c
- * @brief Implementation of /reserves/$RESERVE_PUB/withdraw requests without blinding/unblinding
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <jansson.h>
-#include <microhttpd.h> /* just for HTTP status codes */
-#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_json_lib.h>
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_exchange_service.h"
-#include "taler_json_lib.h"
-#include "exchange_api_handle.h"
-#include "taler_signatures.h"
-#include "exchange_api_curl_defaults.h"
-
-
-/**
- * @brief A Withdraw Handle
- */
-struct TALER_EXCHANGE_Withdraw2Handle
-{
-
-  /**
-   * The connection to exchange this request handle will use
-   */
-  struct TALER_EXCHANGE_Handle *exchange;
-
-  /**
-   * The url for this request.
-   */
-  char *url;
-
-  /**
-   * Handle for the request.
-   */
-  struct GNUNET_CURL_Job *job;
-
-  /**
-   * Function to call with the result.
-   */
-  TALER_EXCHANGE_Withdraw2Callback cb;
-
-  /**
-   * Closure for @a cb.
-   */
-  void *cb_cls;
-
-  /**
-   * Context for #TEH_curl_easy_post(). Keeps the data that must
-   * persist for Curl to make the upload.
-   */
-  struct TALER_CURL_PostContext post_ctx;
-
-  /**
-   * Total amount requested (value plus withdraw fee).
-   */
-  struct TALER_Amount requested_amount;
-
-  /**
-   * Public key of the reserve we are withdrawing from.
-   */
-  struct TALER_ReservePublicKeyP reserve_pub;
-
-};
-
-
-/**
- * We got a 200 OK response for the /reserves/$RESERVE_PUB/withdraw operation.
- * Extract the coin's signature and return it to the caller.  The signature we
- * get from the exchange is for the blinded value.  Thus, we first must
- * unblind it and then should verify its validity against our coin's hash.
- *
- * If everything checks out, we return the unblinded signature
- * to the application via the callback.
- *
- * @param wh operation handle
- * @param json reply from the exchange
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
- */
-static enum GNUNET_GenericReturnValue
-reserve_withdraw_ok (struct TALER_EXCHANGE_Withdraw2Handle *wh,
-                     const json_t *json)
-{
-  struct TALER_BlindedDenominationSignature blind_sig;
-  struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_blinded_denom_sig ("ev_sig",
-                                       &blind_sig),
-    GNUNET_JSON_spec_end ()
-  };
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = json,
-    .http_status = MHD_HTTP_OK
-  };
-
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (json,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  /* signature is valid, return it to the application */
-  wh->cb (wh->cb_cls,
-          &hr,
-          &blind_sig);
-  /* make sure callback isn't called again after return */
-  wh->cb = NULL;
-  GNUNET_JSON_parse_free (spec);
-  return GNUNET_OK;
-}
-
-
-/**
- * We got a 409 CONFLICT response for the /reserves/$RESERVE_PUB/withdraw operation.
- * Check the signatures on the withdraw transactions in the provided
- * history and that the balances add up.  We don't do anything directly
- * with the information, as the JSON will be returned to the application.
- * However, our job is ensuring that the exchange followed the protocol, and
- * this in particular means checking all of the signatures in the history.
- *
- * @param wh operation handle
- * @param json reply from the exchange
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on errors
- */
-static enum GNUNET_GenericReturnValue
-reserve_withdraw_payment_required (
-  struct TALER_EXCHANGE_Withdraw2Handle *wh,
-  const json_t *json)
-{
-  struct TALER_Amount balance;
-  struct TALER_Amount total_in_from_history;
-  struct TALER_Amount total_out_from_history;
-  json_t *history;
-  size_t len;
-  struct GNUNET_JSON_Specification spec[] = {
-    TALER_JSON_spec_amount_any ("balance",
-                                &balance),
-    GNUNET_JSON_spec_end ()
-  };
-
-  if (GNUNET_OK !=
-      GNUNET_JSON_parse (json,
-                         spec,
-                         NULL, NULL))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  history = json_object_get (json,
-                             "history");
-  if (NULL == history)
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-
-  /* go over transaction history and compute
-     total incoming and outgoing amounts */
-  len = json_array_size (history);
-  {
-    struct TALER_EXCHANGE_ReserveHistoryEntry *rhistory;
-
-    /* Use heap allocation as "len" may be very big and thus this may
-       not fit on the stack. Use "GNUNET_malloc_large" as a malicious
-       exchange may theoretically try to crash us by giving a history
-       that does not fit into our memory. */
-    rhistory = GNUNET_malloc_large (
-      sizeof (struct TALER_EXCHANGE_ReserveHistoryEntry)
-      * len);
-    if (NULL == rhistory)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-
-    if (GNUNET_OK !=
-        TALER_EXCHANGE_parse_reserve_history (wh->exchange,
-                                              history,
-                                              &wh->reserve_pub,
-                                              balance.currency,
-                                              &total_in_from_history,
-                                              &total_out_from_history,
-                                              len,
-                                              rhistory))
-    {
-      GNUNET_break_op (0);
-      TALER_EXCHANGE_free_reserve_history (rhistory,
-                                           len);
-      return GNUNET_SYSERR;
-    }
-    TALER_EXCHANGE_free_reserve_history (rhistory,
-                                         len);
-  }
-
-  /* Check that funds were really insufficient */
-  if (0 >= TALER_amount_cmp (&wh->requested_amount,
-                             &balance))
-  {
-    /* Requested amount is smaller or equal to reported balance,
-       so this should not have failed. */
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called when we're done processing the
- * HTTP /reserves/$RESERVE_PUB/withdraw request.
- *
- * @param cls the `struct TALER_EXCHANGE_WithdrawHandle`
- * @param response_code HTTP response code, 0 on error
- * @param response parsed JSON result, NULL on error
- */
-static void
-handle_reserve_withdraw_finished (void *cls,
-                                  long response_code,
-                                  const void *response)
-{
-  struct TALER_EXCHANGE_Withdraw2Handle *wh = cls;
-  const json_t *j = response;
-  struct TALER_EXCHANGE_HttpResponse hr = {
-    .reply = j,
-    .http_status = (unsigned int) response_code
-  };
-
-  wh->job = NULL;
-  switch (response_code)
-  {
-  case 0:
-    hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
-    break;
-  case MHD_HTTP_OK:
-    if (GNUNET_OK !=
-        reserve_withdraw_ok (wh,
-                             j))
-    {
-      GNUNET_break_op (0);
-      hr.http_status = 0;
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-      break;
-    }
-    GNUNET_assert (NULL == wh->cb);
-    TALER_EXCHANGE_withdraw2_cancel (wh);
-    return;
-  case MHD_HTTP_ACCEPTED:
-    /* only validate reply is well-formed */
-    {
-      uint64_t ptu;
-      struct GNUNET_JSON_Specification spec[] = {
-        GNUNET_JSON_spec_uint64 ("payment_target_uuid",
-                                 &ptu),
-        GNUNET_JSON_spec_end ()
-      };
-
-      if (GNUNET_OK !=
-          GNUNET_JSON_parse (j,
-                             spec,
-                             NULL, NULL))
-      {
-        GNUNET_break_op (0);
-        hr.http_status = 0;
-        hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-        break;
-      }
-    }
-    break;
-  case MHD_HTTP_BAD_REQUEST:
-    /* This should never happen, either us or the exchange is buggy
-       (or API version conflict); just pass JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_FORBIDDEN:
-    GNUNET_break_op (0);
-    /* Nothing really to verify, exchange says one of the signatures is
-       invalid; as we checked them, this should never happen, we
-       should pass the JSON reply to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_NOT_FOUND:
-    /* Nothing really to verify, the exchange basically just says
-       that it doesn't know this reserve.  Can happen if we
-       query before the wire transfer went through.
-       We should simply pass the JSON reply to the application. */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_CONFLICT:
-    /* The exchange says that the reserve has insufficient funds;
-       check the signatures in the history... */
-    if (GNUNET_OK !=
-        reserve_withdraw_payment_required (wh,
-                                           j))
-    {
-      GNUNET_break_op (0);
-      hr.http_status = 0;
-      hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
-    }
-    else
-    {
-      hr.ec = TALER_JSON_get_error_code (j);
-      hr.hint = TALER_JSON_get_error_hint (j);
-    }
-    break;
-  case MHD_HTTP_GONE:
-    /* could happen if denomination was revoked */
-    /* Note: one might want to check /keys for revocation
-       signature here, alas tricky in case our /keys
-       is outdated => left to clients */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  case MHD_HTTP_INTERNAL_SERVER_ERROR:
-    /* Server had an internal issue; we should retry, but this API
-       leaves this to the application */
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    break;
-  default:
-    /* unexpected response code */
-    GNUNET_break_op (0);
-    hr.ec = TALER_JSON_get_error_code (j);
-    hr.hint = TALER_JSON_get_error_hint (j);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d for exchange withdraw\n",
-                (unsigned int) response_code,
-                (int) hr.ec);
-    break;
-  }
-  if (NULL != wh->cb)
-  {
-    wh->cb (wh->cb_cls,
-            &hr,
-            NULL);
-    wh->cb = NULL;
-  }
-  TALER_EXCHANGE_withdraw2_cancel (wh);
-}
-
-
-struct TALER_EXCHANGE_Withdraw2Handle *
-TALER_EXCHANGE_withdraw2 (
-  struct TALER_EXCHANGE_Handle *exchange,
-  const struct TALER_PlanchetDetail *pd,
-  const struct TALER_ReservePrivateKeyP *reserve_priv,
-  TALER_EXCHANGE_Withdraw2Callback res_cb,
-  void *res_cb_cls)
-{
-  struct TALER_EXCHANGE_Withdraw2Handle *wh;
-  const struct TALER_EXCHANGE_Keys *keys;
-  const struct TALER_EXCHANGE_DenomPublicKey *dk;
-  struct TALER_ReserveSignatureP reserve_sig;
-  char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32];
-  struct TALER_BlindedCoinHashP bch;
-
-  keys = TALER_EXCHANGE_get_keys (exchange);
-  if (NULL == keys)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  dk = TALER_EXCHANGE_get_denomination_key_by_hash (keys,
-                                                    &pd->denom_pub_hash);
-  if (NULL == dk)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  wh = GNUNET_new (struct TALER_EXCHANGE_Withdraw2Handle);
-  wh->exchange = exchange;
-  wh->cb = res_cb;
-  wh->cb_cls = res_cb_cls;
-  /* Compute how much we expected to charge to the reserve */
-  if (0 >
-      TALER_amount_add (&wh->requested_amount,
-                        &dk->value,
-                        &dk->fees.withdraw))
-  {
-    /* Overflow here? Very strange, our CPU must be fried... */
-    GNUNET_break (0);
-    GNUNET_free (wh);
-    return NULL;
-  }
-
-  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
-                                      &wh->reserve_pub.eddsa_pub);
-
-  {
-    char pub_str[sizeof (struct TALER_ReservePublicKeyP) * 2];
-    char *end;
-
-    end = GNUNET_STRINGS_data_to_string (
-      &wh->reserve_pub,
-      sizeof (struct TALER_ReservePublicKeyP),
-      pub_str,
-      sizeof (pub_str));
-    *end = '\0';
-    GNUNET_snprintf (arg_str,
-                     sizeof (arg_str),
-                     "/reserves/%s/withdraw",
-                     pub_str);
-  }
-
-  if (GNUNET_OK !=
-      TALER_coin_ev_hash (&pd->blinded_planchet,
-                          &pd->denom_pub_hash,
-                          &bch))
-  {
-    GNUNET_break (0);
-    GNUNET_free (wh);
-    return NULL;
-  }
-
-  TALER_wallet_withdraw_sign (&pd->denom_pub_hash,
-                              &wh->requested_amount,
-                              &bch,
-                              reserve_priv,
-                              &reserve_sig);
-  {
-    json_t *withdraw_obj = GNUNET_JSON_PACK (
-      GNUNET_JSON_pack_data_auto ("denom_pub_hash",
-                                  &pd->denom_pub_hash),
-      TALER_JSON_pack_blinded_planchet ("coin_ev",
-                                        &pd->blinded_planchet),
-      GNUNET_JSON_pack_data_auto ("reserve_sig",
-                                  &reserve_sig));
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Attempting to withdraw from reserve %s\n",
-                TALER_B2S (&wh->reserve_pub));
-    wh->url = TEAH_path_to_url (exchange,
-                                arg_str);
-    if (NULL == wh->url)
-    {
-      json_decref (withdraw_obj);
-      GNUNET_free (wh);
-      return NULL;
-    }
-    {
-      CURL *eh;
-      struct GNUNET_CURL_Context *ctx;
-
-      ctx = TEAH_handle_to_context (exchange);
-      eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);
-      if ( (NULL == eh) ||
-           (GNUNET_OK !=
-            TALER_curl_easy_post (&wh->post_ctx,
-                                  eh,
-                                  withdraw_obj)) )
-      {
-        GNUNET_break (0);
-        if (NULL != eh)
-          curl_easy_cleanup (eh);
-        json_decref (withdraw_obj);
-        GNUNET_free (wh->url);
-        GNUNET_free (wh);
-        return NULL;
-      }
-      json_decref (withdraw_obj);
-      wh->job = GNUNET_CURL_job_add2 (ctx,
-                                      eh,
-                                      wh->post_ctx.headers,
-                                      &handle_reserve_withdraw_finished,
-                                      wh);
-    }
-  }
-  return wh;
-}
-
-
-void
-TALER_EXCHANGE_withdraw2_cancel (struct TALER_EXCHANGE_Withdraw2Handle *wh)
-{
-  if (NULL != wh->job)
-  {
-    GNUNET_CURL_job_cancel (wh->job);
-    wh->job = NULL;
-  }
-  GNUNET_free (wh->url);
-  TALER_curl_easy_post_finished (&wh->post_ctx);
-  GNUNET_free (wh);
-}
diff --git a/src/lib/test_stefan.c b/src/lib/test_stefan.c
new file mode 100644
index 000000000..4f7add593
--- /dev/null
+++ b/src/lib/test_stefan.c
@@ -0,0 +1,206 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file lib/test_stefan.c
+ * @brief test calculations on the STEFAN curve
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "exchange_api_handle.h"
+
+
+/**
+ * Check if @a a and @a b are numerically close.
+ *
+ * @param a an amount
+ * @param b an amount
+ * @return true if both values are quite close
+ */
+static bool
+amount_close (const struct TALER_Amount *a,
+              const struct TALER_Amount *b)
+{
+  struct TALER_Amount delta;
+
+  switch (TALER_amount_cmp (a,
+                            b))
+  {
+  case -1: /* a < b */
+    GNUNET_assert (0 <
+                   TALER_amount_subtract (&delta,
+                                          b,
+                                          a));
+    break;
+  case 0:
+    /* perfect */
+    return true;
+  case 1: /* a > b */
+    GNUNET_assert (0 <
+                   TALER_amount_subtract (&delta,
+                                          a,
+                                          b));
+    break;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Rounding error is %s\n",
+              TALER_amount2s (&delta));
+  if (delta.value > 0)
+  {
+    GNUNET_break (0);
+    return false;
+  }
+  if (delta.fraction > 5000)
+  {
+    GNUNET_break (0);
+    return false;
+  }
+  return true; /* let's consider this a rounding error */
+}
+
+
+int
+main (int argc,
+      char **argv)
+{
+  struct TALER_EXCHANGE_DenomPublicKey dk;
+  struct TALER_EXCHANGE_Keys keys = {
+    .denom_keys = &dk,
+    .num_denom_keys = 1
+  };
+  struct TALER_Amount brut;
+  struct TALER_Amount net;
+
+  (void) argc;
+  (void) argv;
+  GNUNET_log_setup ("test-stefan",
+                    "INFO",
+                    NULL);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:0.00001",
+                                         &dk.value));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:1",
+                                         &keys.stefan_abs));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:0.13",
+                                         &keys.stefan_log));
+  keys.stefan_lin = 1.15;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:4",
+                                         &brut));
+  GNUNET_log_skip (1,
+                   GNUNET_NO);
+  GNUNET_assert (GNUNET_SYSERR ==
+                 TALER_EXCHANGE_keys_stefan_b2n (&keys,
+                                                 &brut,
+                                                 &net));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:4",
+                                         &net));
+  GNUNET_log_skip (1,
+                   GNUNET_NO);
+  GNUNET_assert (GNUNET_SYSERR ==
+                 TALER_EXCHANGE_keys_stefan_n2b (&keys,
+                                                 &net,
+                                                 &brut));
+  keys.stefan_lin = 1.0;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:4",
+                                         &brut));
+  GNUNET_log_skip (1,
+                   GNUNET_NO);
+  GNUNET_assert (GNUNET_SYSERR ==
+                 TALER_EXCHANGE_keys_stefan_b2n (&keys,
+                                                 &brut,
+                                                 &net));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("MAGIC:4",
+                                         &net));
+  GNUNET_log_skip (1,
+                   GNUNET_NO);
+  GNUNET_assert (GNUNET_SYSERR ==
+                 TALER_EXCHANGE_keys_stefan_n2b (&keys,
+                                                 &net,
+                                                 &brut));
+  GNUNET_assert (0 == GNUNET_get_log_skip ());
+  keys.stefan_lin = 0.1;
+
+  /* try various values for lin and log STEFAN values */
+  for (unsigned int li = 1; li < 13; li += 1)
+  {
+    keys.stefan_lin = 1.0 * li / 100.0;
+
+    for (unsigned int lx = 1; lx < 100; lx += 1)
+    {
+      keys.stefan_log.fraction = lx * TALER_AMOUNT_FRAC_BASE / 100;
+
+      /* Check brutto-to-netto is stable */
+      for (unsigned int i = 0; i<10; i++)
+      {
+        struct TALER_Amount rval;
+
+        brut.value = i;
+        brut.fraction = i * TALER_AMOUNT_FRAC_BASE / 10;
+        GNUNET_assert (GNUNET_SYSERR !=
+                       TALER_EXCHANGE_keys_stefan_b2n (&keys,
+                                                       &brut,
+                                                       &net));
+        GNUNET_assert (GNUNET_SYSERR !=
+                       TALER_EXCHANGE_keys_stefan_n2b (&keys,
+                                                       &net,
+                                                       &rval));
+        if (TALER_amount_is_zero (&net))
+          GNUNET_assert (TALER_amount_is_zero (&rval));
+        else
+        {
+          GNUNET_assert (amount_close (&brut,
+                                       &rval));
+          TALER_EXCHANGE_keys_stefan_round (&keys,
+                                            &rval);
+          GNUNET_assert (amount_close (&brut,
+                                       &rval));
+        }
+      }
+
+      /* Check netto-to-brutto is stable */
+      for (unsigned int i = 0; i<10; i++)
+      {
+        struct TALER_Amount rval;
+
+        net.value = i;
+        net.fraction = i * TALER_AMOUNT_FRAC_BASE / 10;
+        GNUNET_assert (GNUNET_SYSERR !=
+                       TALER_EXCHANGE_keys_stefan_n2b (&keys,
+                                                       &net,
+                                                       &brut));
+        GNUNET_assert (GNUNET_SYSERR !=
+                       TALER_EXCHANGE_keys_stefan_b2n (&keys,
+                                                       &brut,
+                                                       &rval));
+        GNUNET_assert (amount_close (&net,
+                                     &rval));
+        TALER_EXCHANGE_keys_stefan_round (&keys,
+                                          &rval);
+        GNUNET_assert (amount_close (&net,
+                                     &rval));
+      }
+    }
+  }
+  return 0;
+}
diff --git a/src/mhd/Makefile.am b/src/mhd/Makefile.am
index f7f052d51..cd3fe7701 100644
--- a/src/mhd/Makefile.am
+++ b/src/mhd/Makefile.am
@@ -16,12 +16,12 @@ libtalermhd_la_SOURCES = \
   mhd_responses.c \
   mhd_run.c
 libtalermhd_la_LDFLAGS = \
-  -version-info 0:0:0 \
+  -version-info 3:0:3 \
   -no-undefined
 libtalermhd_la_LIBADD = \
-  -lgnunetjson \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
+  -lgnunetjson \
   -lgnunetutil \
   -lmicrohttpd \
   -ljansson \
diff --git a/src/mhd/mhd_config.c b/src/mhd/mhd_config.c
index 0e9f2e088..31ec3e476 100644
--- a/src/mhd/mhd_config.c
+++ b/src/mhd/mhd_config.c
@@ -78,7 +78,7 @@ TALER_MHD_parse_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_number (cfg,
                                                section,
-                                               "port",
+                                               "PORT",
                                                &port))
     {
       GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/mhd/mhd_legal.c b/src/mhd/mhd_legal.c
index 5082c1811..8353a6901 100644
--- a/src/mhd/mhd_legal.c
+++ b/src/mhd/mhd_legal.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2019, 2020 Taler Systems SA
+  Copyright (C) 2019, 2020, 2022, 2024 Taler Systems SA
 
   TALER 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
@@ -126,10 +126,18 @@ mime_matches (const char *accept_pattern,
 {
   const char *da = strchr (accept_pattern, '/');
   const char *dm = strchr (mime, '/');
+  const char *end;
 
   if ( (NULL == da) ||
        (NULL == dm) )
     return (0 == strcmp ("*", accept_pattern));
+  // FIXME: use TALER_MHD_check_accept() here!
+  /* FIXME: eventually, we might want to parse the "q=$FLOAT"
+     part after the ';' and figure out which one is the
+     best/preferred match instead of returning a boolean... */
+  end = strchr (da, ';');
+  if (NULL == end)
+    end = &da[strlen (da)];
   return
     ( ( (1 == da - accept_pattern) &&
         ('*' == *accept_pattern) ) ||
@@ -138,8 +146,9 @@ mime_matches (const char *accept_pattern,
                            mime,
                            da - accept_pattern)) ) ) &&
     ( (0 == strcmp (da, "/*")) ||
-      (0 == strcasecmp (da,
-                        dm)) );
+      (0 == strncasecmp (da,
+                         dm,
+                         end - da)) );
 }
 
 
@@ -150,9 +159,9 @@ TALER_MHD_xmime_matches (const char *accept_pattern,
   char *ap = GNUNET_strdup (accept_pattern);
   char *sptr;
 
-  for (const char *tok = strtok_r (ap, ";", &sptr);
+  for (const char *tok = strtok_r (ap, ",", &sptr);
        NULL != tok;
-       tok = strtok_r (NULL, ";", &sptr))
+       tok = strtok_r (NULL, ",", &sptr))
   {
     if (mime_matches (tok,
                       mime))
@@ -175,13 +184,21 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
   struct GNUNET_TIME_Absolute a;
   struct GNUNET_TIME_Timestamp m;
   char dat[128];
+  char *langs;
 
   a = GNUNET_TIME_relative_to_absolute (MAX_TERMS_CACHING);
   m = GNUNET_TIME_absolute_to_timestamp (a);
+  /* Round up to next full day to ensure the expiration
+     time does not become a fingerprint! */
+  a = GNUNET_TIME_absolute_round_down (a,
+                                       MAX_TERMS_CACHING);
+  a = GNUNET_TIME_absolute_add (a,
+                                MAX_TERMS_CACHING);
   TALER_MHD_get_date_string (m.abs_time,
                              dat);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Setting 'Expires' header to '%s'\n",
+              "Setting '%s' header to '%s'\n",
+              MHD_HTTP_HEADER_EXPIRES,
               dat);
   if (NULL != legal)
   {
@@ -220,6 +237,7 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
   }
 
   t = NULL;
+  langs = NULL;
   if (NULL != legal)
   {
     const char *mime;
@@ -229,7 +247,7 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
                                         MHD_HEADER_KIND,
                                         MHD_HTTP_HEADER_ACCEPT);
     if (NULL == mime)
-      mime = "text/html";
+      mime = "text/plain";
     lang = MHD_lookup_connection_value (conn,
                                         MHD_HEADER_KIND,
                                         MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
@@ -245,6 +263,21 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
            (TALER_MHD_xmime_matches (mime,
                                      p->mime_type)) )
       {
+        if (NULL == langs)
+        {
+          langs = GNUNET_strdup (p->language);
+        }
+        else if (NULL == strstr (langs,
+                                 p->language))
+        {
+          char *tmp = langs;
+
+          GNUNET_asprintf (&langs,
+                           "%s,%s",
+                           tmp,
+                           p->language);
+          GNUNET_free (tmp);
+        }
         if ( (NULL == t) ||
              (! TALER_MHD_xmime_matches (mime,
                                          t->mime_type)) ||
@@ -306,6 +339,14 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
                 MHD_add_response_header (resp,
                                          MHD_HTTP_HEADER_EXPIRES,
                                          dat));
+  if (NULL != langs)
+  {
+    GNUNET_break (MHD_YES ==
+                  MHD_add_response_header (resp,
+                                           "Avail-Languages",
+                                           langs));
+    GNUNET_free (langs);
+  }
   /* Set cache control headers: our response varies depending on these headers */
   GNUNET_break (MHD_YES ==
                 MHD_add_response_header (resp,
@@ -317,7 +358,7 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
   GNUNET_break (MHD_YES ==
                 MHD_add_response_header (resp,
                                          MHD_HTTP_HEADER_CACHE_CONTROL,
-                                         "public max-age=864000"));
+                                         "public,max-age=864000"));
   if (NULL != legal)
     GNUNET_break (MHD_YES ==
                   MHD_add_response_header (resp,
@@ -327,6 +368,10 @@ TALER_MHD_reply_legal (struct MHD_Connection *conn,
                 MHD_add_response_header (resp,
                                          MHD_HTTP_HEADER_CONTENT_TYPE,
                                          t->mime_type));
+  GNUNET_break (MHD_YES ==
+                MHD_add_response_header (resp,
+                                         MHD_HTTP_HEADER_CONTENT_LANGUAGE,
+                                         t->language));
   {
     MHD_RESULT ret;
 
@@ -360,9 +405,10 @@ load_terms (struct TALER_MHD_Legal *legal,
     const char *mime;
     unsigned int priority;
   } mm[] = {
+    { .ext = ".txt", .mime = "text/plain", .priority = 150 },
     { .ext = ".html", .mime = "text/html", .priority = 100 },
     { .ext = ".htm", .mime = "text/html", .priority = 99 },
-    { .ext = ".txt", .mime = "text/plain", .priority = 50 },
+    { .ext = ".md", .mime = "text/markdown", .priority = 50 },
     { .ext = ".pdf", .mime = "application/pdf", .priority = 25 },
     { .ext = ".jpg", .mime = "image/jpeg" },
     { .ext = ".jpeg", .mime = "image/jpeg" },
@@ -390,7 +436,7 @@ load_terms (struct TALER_MHD_Legal *legal,
                       name,
                       ext - name - 1)) )
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Filename `%s' does not match Etag `%s' in directory `%s/%s'. Ignoring it.\n",
                 name,
                 legal->terms_etag,
@@ -455,6 +501,9 @@ load_terms (struct TALER_MHD_Legal *legal,
       GNUNET_free (fn);
       return;
     }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Loading legal information from file `%s'\n",
+                fn);
     {
       void *buf;
       size_t bsize;
@@ -555,7 +604,10 @@ load_language (struct TALER_MHD_Legal *legal,
 
     if (fn[0] == '.')
       continue;
-    load_terms (legal, path, lang, fn);
+    load_terms (legal,
+                path,
+                lang,
+                fn);
   }
   GNUNET_break (0 == closedir (d));
   GNUNET_free (dname);
@@ -618,7 +670,12 @@ TALER_MHD_legal_load (const struct GNUNET_CONFIGURATION_Handle *cfg,
 
     if (lang[0] == '.')
       continue;
-    load_language (legal, path, lang);
+    if (0 == strcmp (lang,
+                     "locale"))
+      continue;
+    load_language (legal,
+                   path,
+                   lang);
   }
   GNUNET_break (0 == closedir (d));
   GNUNET_free (path);
diff --git a/src/mhd/mhd_parsing.c b/src/mhd/mhd_parsing.c
index bae10e724..771319bd5 100644
--- a/src/mhd/mhd_parsing.c
+++ b/src/mhd/mhd_parsing.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014--2020 Taler Systems SA
+  Copyright (C) 2014--2024 Taler Systems SA
 
   TALER 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
@@ -60,7 +60,7 @@ TALER_MHD_parse_post_json (struct MHD_Connection *connection,
     GNUNET_break (NULL == *json);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Closing connection, upload too large\n");
-    return MHD_NO;
+    return GNUNET_SYSERR;
   case GNUNET_JSON_PR_JSON_INVALID:
     GNUNET_break (NULL == *json);
     return (MHD_YES ==
@@ -86,25 +86,40 @@ TALER_MHD_parse_post_cleanup_callback (void *con_cls)
 }
 
 
-enum GNUNET_GenericReturnValue
-TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
-                                  const char *param_name,
-                                  void *out_data,
-                                  size_t out_size)
+/**
+ * Extract fixed-size base32crockford encoded data from request.
+ *
+ * Queues an error response to the connection if the parameter is missing or
+ * invalid.
+ *
+ * @param connection the MHD connection
+ * @param param_name the name of the HTTP key with the value
+ * @param kind whether to extract from header, argument or footer
+ * @param[out] out_data pointer to store the result
+ * @param out_size expected size of @a out_data
+ * @param[out] present set to true if argument was found
+ * @return
+ *   #GNUNET_YES if the the argument is present
+ *   #GNUNET_NO if the argument is absent or malformed
+ *   #GNUNET_SYSERR on internal error (error response could not be sent)
+ */
+static enum GNUNET_GenericReturnValue
+parse_request_data (struct MHD_Connection *connection,
+                    const char *param_name,
+                    enum MHD_ValueKind kind,
+                    void *out_data,
+                    size_t out_size,
+                    bool *present)
 {
   const char *str;
 
   str = MHD_lookup_connection_value (connection,
-                                     MHD_GET_ARGUMENT_KIND,
+                                     kind,
                                      param_name);
   if (NULL == str)
   {
-    return (MHD_NO ==
-            TALER_MHD_reply_with_error (connection,
-                                        MHD_HTTP_BAD_REQUEST,
-                                        TALER_EC_GENERIC_PARAMETER_MISSING,
-                                        param_name))
-           ? GNUNET_SYSERR : GNUNET_NO;
+    *present = false;
+    return GNUNET_OK;
   }
   if (GNUNET_OK !=
       GNUNET_STRINGS_string_to_data (str,
@@ -117,6 +132,182 @@ TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
                                         TALER_EC_GENERIC_PARAMETER_MALFORMED,
                                         param_name))
            ? GNUNET_SYSERR : GNUNET_NO;
+  *present = true;
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_data (struct MHD_Connection *connection,
+                                  const char *param_name,
+                                  void *out_data,
+                                  size_t out_size,
+                                  bool *present)
+{
+  return parse_request_data (connection,
+                             param_name,
+                             MHD_GET_ARGUMENT_KIND,
+                             out_data,
+                             out_size,
+                             present);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_header_data (struct MHD_Connection *connection,
+                                     const char *header_name,
+                                     void *out_data,
+                                     size_t out_size,
+                                     bool *present)
+{
+  return parse_request_data (connection,
+                             header_name,
+                             MHD_HEADER_KIND,
+                             out_data,
+                             out_size,
+                             present);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_timeout (struct MHD_Connection *connection,
+                                     struct GNUNET_TIME_Absolute *expiration)
+{
+  const char *ts;
+  char dummy;
+  unsigned long long tms;
+
+  ts = MHD_lookup_connection_value (connection,
+                                    MHD_GET_ARGUMENT_KIND,
+                                    "timeout_ms");
+  if (NULL == ts)
+  {
+    *expiration = GNUNET_TIME_UNIT_ZERO_ABS;
+    return GNUNET_OK;
+  }
+  if (1 !=
+      sscanf (ts,
+              "%llu%c",
+              &tms,
+              &dummy))
+  {
+    MHD_RESULT mret;
+
+    GNUNET_break_op (0);
+    mret = TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       "timeout_ms");
+    return (MHD_YES == mret)
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
+  *expiration = GNUNET_TIME_relative_to_absolute (
+    GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+                                   tms));
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_number (struct MHD_Connection *connection,
+                                    const char *name,
+                                    uint64_t *off)
+{
+  const char *ts;
+  char dummy;
+  unsigned long long num;
+
+  ts = MHD_lookup_connection_value (connection,
+                                    MHD_GET_ARGUMENT_KIND,
+                                    name);
+  if (NULL == ts)
+    return GNUNET_OK;
+  if (1 !=
+      sscanf (ts,
+              "%llu%c",
+              &num,
+              &dummy))
+  {
+    MHD_RESULT mret;
+
+    GNUNET_break_op (0);
+    mret = TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       name);
+    return (MHD_YES == mret)
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
+  *off = (uint64_t) num;
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_snumber (struct MHD_Connection *connection,
+                                     const char *name,
+                                     int64_t *val)
+{
+  const char *ts;
+  char dummy;
+  long long num;
+
+  ts = MHD_lookup_connection_value (connection,
+                                    MHD_GET_ARGUMENT_KIND,
+                                    name);
+  if (NULL == ts)
+    return GNUNET_OK;
+  if (1 !=
+      sscanf (ts,
+              "%lld%c",
+              &num,
+              &dummy))
+  {
+    MHD_RESULT mret;
+
+    GNUNET_break_op (0);
+    mret = TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       name);
+    return (MHD_YES == mret)
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
+  *val = (int64_t) num;
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_MHD_parse_request_arg_amount (struct MHD_Connection *connection,
+                                    const char *name,
+                                    struct TALER_Amount *val)
+{
+  const char *ts;
+
+  ts = MHD_lookup_connection_value (connection,
+                                    MHD_GET_ARGUMENT_KIND,
+                                    name);
+  if (NULL == ts)
+    return GNUNET_OK;
+  if (GNUNET_OK !=
+      TALER_string_to_amount (ts,
+                              val))
+  {
+    MHD_RESULT mret;
+
+    GNUNET_break_op (0);
+    mret = TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_BAD_REQUEST,
+                                       TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                       name);
+    return (MHD_YES == mret)
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 }
 
@@ -262,4 +453,121 @@ TALER_MHD_parse_json_array (struct MHD_Connection *connection,
 }
 
 
+enum GNUNET_GenericReturnValue
+TALER_MHD_check_content_length_ (struct MHD_Connection *connection,
+                                 unsigned long long max_len)
+{
+  const char *cl;
+  unsigned long long cv;
+  char dummy;
+
+  /* Maybe check for maximum upload size
+       and refuse requests if they are just too big. */
+  cl = MHD_lookup_connection_value (connection,
+                                    MHD_HEADER_KIND,
+                                    MHD_HTTP_HEADER_CONTENT_LENGTH);
+  if (NULL == cl)
+  {
+    return GNUNET_OK;
+#if 0
+    /* wallet currently doesn't always send content-length! */
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MISSING,
+                                        MHD_HTTP_HEADER_CONTENT_LENGTH))
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+#endif
+  }
+  if (1 != sscanf (cl,
+                   "%llu%c",
+                   &cv,
+                   &dummy))
+  {
+    /* Not valid HTTP request, just close connection. */
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_with_error (connection,
+                                        MHD_HTTP_BAD_REQUEST,
+                                        TALER_EC_GENERIC_PARAMETER_MALFORMED,
+                                        MHD_HTTP_HEADER_CONTENT_LENGTH))
+      ? GNUNET_NO
+      : GNUNET_SYSERR;
+  }
+  if (cv > TALER_MHD_REQUEST_BUFFER_MAX)
+  {
+    GNUNET_break_op (0);
+    return (MHD_YES ==
+            TALER_MHD_reply_request_too_large (connection))
+    ? GNUNET_NO
+    : GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+int
+TALER_MHD_check_accept (struct MHD_Connection *connection,
+                        const char *header,
+                        ...)
+{
+  bool ret = false;
+  const char *accept;
+  char *a;
+  char *saveptr;
+
+  accept = MHD_lookup_connection_value (connection,
+                                        MHD_HEADER_KIND,
+                                        header);
+  if (NULL == accept)
+    return -2; /* no Accept header set */
+
+  a = GNUNET_strdup (accept);
+  for (char *t = strtok_r (a, ",", &saveptr);
+       NULL != t;
+       t = strtok_r (NULL, ",", &saveptr))
+  {
+    char *end;
+
+    /* skip leading whitespace */
+    while (isspace ((unsigned char) t[0]))
+      t++;
+    /* trim of ';q=' parameter and everything after space */
+    /* FIXME: eventually, we might want to parse the "q=$FLOAT"
+       part after the ';' and figure out which one is the
+       best/preferred match instead of returning a boolean... */
+    end = strchr (t, ';');
+    if (NULL != end)
+      *end = '\0';
+    end = strchr (t, ' ');
+    if (NULL != end)
+      *end = '\0';
+    {
+      va_list ap;
+      int off = 0;
+      const char *val;
+
+      va_start (ap,
+                header);
+      while (NULL != (val = va_arg (ap,
+                                    const char *)))
+      {
+        if (0 == strcasecmp (val,
+                             t))
+        {
+          ret = off;
+          break;
+        }
+        off++;
+      }
+      va_end (ap);
+    }
+  }
+  GNUNET_free (a);
+  return ret;
+}
+
+
 /* end of mhd_parsing.c */
diff --git a/src/mhd/mhd_run.c b/src/mhd/mhd_run.c
index 7747358ff..8388fbff6 100644
--- a/src/mhd/mhd_run.c
+++ b/src/mhd/mhd_run.c
@@ -162,8 +162,8 @@ TALER_MHD_daemon_trigger (void)
   if (NULL != mhd_task)
   {
     GNUNET_SCHEDULER_cancel (mhd_task);
-    mhd_task = NULL;
-    run_daemon (NULL);
+    mhd_task = GNUNET_SCHEDULER_add_now (&run_daemon,
+                                         NULL);
   }
   else
   {
diff --git a/src/pq/Makefile.am b/src/pq/Makefile.am
index b0717dfc7..4b192d762 100644
--- a/src/pq/Makefile.am
+++ b/src/pq/Makefile.am
@@ -10,11 +10,13 @@ lib_LTLIBRARIES = \
   libtalerpq.la
 
 libtalerpq_la_SOURCES = \
+  pq_common.h pq_common.c \
   pq_query_helper.c \
   pq_result_helper.c
 libtalerpq_la_LIBADD = \
   $(top_builddir)/src/util/libtalerutil.la  \
   -lgnunetutil -ljansson \
+  -lgnunetpq \
   -lpq \
   $(XLIB)
 libtalerpq_la_LDFLAGS = \
diff --git a/src/pq/pq_common.c b/src/pq/pq_common.c
new file mode 100644
index 000000000..8b6f8f22c
--- /dev/null
+++ b/src/pq/pq_common.c
@@ -0,0 +1,68 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file pq/pq_common.c
+ * @brief common defines for the pq functions
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "pq_common.h"
+
+struct TALER_PQ_AmountP
+TALER_PQ_make_taler_pq_amount_ (
+  const struct TALER_Amount *amount,
+  uint32_t oid_v,
+  uint32_t oid_f)
+{
+  struct TALER_PQ_AmountP rval = {
+    .cnt = htonl (2),
+    .oid_v = htonl (oid_v),
+    .oid_f = htonl (oid_f),
+    .sz_v = htonl (sizeof((amount)->value)),
+    .sz_f = htonl (sizeof((amount)->fraction)),
+    .v = GNUNET_htonll ((amount)->value),
+    .f = htonl ((amount)->fraction)
+  };
+
+  return rval;
+}
+
+
+size_t
+TALER_PQ_make_taler_pq_amount_currency_ (
+  const struct TALER_Amount *amount,
+  uint32_t oid_v,
+  uint32_t oid_f,
+  uint32_t oid_c,
+  struct TALER_PQ_AmountCurrencyP *rval)
+{
+  size_t clen = strlen (amount->currency);
+
+  GNUNET_assert (clen < TALER_CURRENCY_LEN);
+  rval->cnt = htonl (3);
+  rval->oid_v = htonl (oid_v);
+  rval->oid_f = htonl (oid_f);
+  rval->oid_c = htonl (oid_c);
+  rval->sz_v = htonl (sizeof(amount->value));
+  rval->sz_f = htonl (sizeof(amount->fraction));
+  rval->sz_c = htonl (clen);
+  rval->v = GNUNET_htonll (amount->value);
+  rval->f = htonl (amount->fraction);
+  memcpy (rval->c,
+          amount->currency,
+          clen);
+  return sizeof (*rval) - TALER_CURRENCY_LEN + clen;
+}
diff --git a/src/pq/pq_common.h b/src/pq/pq_common.h
new file mode 100644
index 000000000..3248778a0
--- /dev/null
+++ b/src/pq/pq_common.h
@@ -0,0 +1,148 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file pq/pq_common.h
+ * @brief common defines for the pq functions
+ * @author Özgür Kesim
+ */
+#ifndef TALER_PQ_COMMON_H_
+#define TALER_PQ_COMMON_H_
+
+#include "taler_util.h"
+
+/**
+ * Internal types that are supported as TALER-exchange-specific array types.
+ *
+ * To support a new type,
+ *   1. add a new entry into this list,
+ *   2. for query-support, implement the size calculation and memory copying in
+ *      qconv_array() accordingly, in pq_query_helper.c
+ *   3. provide a query-API for arrays of the type, by calling
+ *      query_param_array_generic with the appropriate parameters,
+ *      in pq_query_helper.c
+ *   4. for result-support, implement memory copying by adding another case
+ *      to extract_array_generic, in pq_result_helper.c
+ *   5. provide a result-spec-API for arrays of the type,
+ *      in pq_result_helper.c
+ *   6. expose the API's in taler_pq_lib.h
+ */
+enum TALER_PQ_ArrayType
+{
+  TALER_PQ_array_of_blinded_denom_sig,
+  TALER_PQ_array_of_blinded_coin_hash,
+  TALER_PQ_array_of_denom_hash,
+  TALER_PQ_array_of_hash_code,
+
+  /**
+   * Amounts *without* currency.
+   */
+  TALER_PQ_array_of_amount,
+
+  /**
+   * Amounts *with* currency.
+   */
+  TALER_PQ_array_of_amount_currency,
+  TALER_PQ_array_of_MAX,       /* must be last */
+};
+
+
+/**
+ * Memory representation of an taler amount record for Postgres.
+ *
+ * All values need to be in network-byte-order.
+ */
+struct TALER_PQ_AmountP
+{
+  uint32_t cnt;   /* # elements in the tuple (== 2) */
+  uint32_t oid_v; /* oid of .v  */
+  uint32_t sz_v;  /* size of .v */
+  uint64_t v;     /* value      */
+  uint32_t oid_f; /* oid of .f  */
+  uint32_t sz_f;  /* size of .f */
+  uint32_t f;     /* fraction   */
+} __attribute__((packed));
+
+
+/**
+ * Memory representation of an taler amount record for Postgres.
+ *
+ * All values need to be in network-byte-order.
+ */
+struct TALER_PQ_AmountNullP
+{
+  uint32_t cnt;   /* # elements in the tuple (== 2) */
+  uint32_t oid_v; /* oid of .v  */
+  uint32_t sz_v;  /* size of .v */
+  uint32_t oid_f; /* oid of .f  */
+  uint32_t sz_f;  /* size of .f */
+} __attribute__((packed));
+
+
+/**
+ * Memory representation of an taler amount record with currency for Postgres.
+ *
+ * All values need to be in network-byte-order.
+ */
+struct TALER_PQ_AmountCurrencyP
+{
+  uint32_t cnt;   /* # elements in the tuple (== 3) */
+  uint32_t oid_v; /* oid of .v  */
+  uint32_t sz_v;  /* size of .v */
+  uint64_t v;     /* value      */
+  uint32_t oid_f; /* oid of .f  */
+  uint32_t sz_f;  /* size of .f */
+  uint32_t f;     /* fraction   */
+  uint32_t oid_c; /* oid of .c  */
+  uint32_t sz_c;  /* size of .c */
+  uint8_t c[TALER_CURRENCY_LEN];  /* currency */
+} __attribute__((packed));
+
+
+/**
+ * Create a `struct TALER_PQ_AmountP` for initialization
+ *
+ * @param amount amount of type `struct TALER_Amount *`
+ * @param oid_v OID of the INT8 type in postgres
+ * @param oid_f OID of the INT4 type in postgres
+ */
+struct TALER_PQ_AmountP
+TALER_PQ_make_taler_pq_amount_ (
+  const struct TALER_Amount *amount,
+  uint32_t oid_v,
+  uint32_t oid_f);
+
+
+/**
+ * Create a `struct TALER_PQ_AmountCurrencyP` for initialization
+ *
+ * @param amount amount of type `struct TALER_Amount *`
+ * @param oid_v OID of the INT8 type in postgres
+ * @param oid_f OID of the INT4 type in postgres
+ * @param oid_c OID of the TEXT type in postgres
+ * @param[out] rval set to encoded @a amount
+ * @return actual (useful) size of @a rval for Postgres
+ */
+size_t
+TALER_PQ_make_taler_pq_amount_currency_ (
+  const struct TALER_Amount *amount,
+  uint32_t oid_v,
+  uint32_t oid_f,
+  uint32_t oid_c,
+  struct TALER_PQ_AmountCurrencyP *rval);
+
+
+#endif  /* TALER_PQ_COMMON_H_ */
+/* end of pg/pq_common.h */
diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c
index 1db608edd..b1dfd4cf1 100644
--- a/src/pq/pq_query_helper.c
+++ b/src/pq/pq_query_helper.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015, 2016, 2021, 2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -21,16 +21,18 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include <gnunet/gnunet_common.h>
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_pq_lib.h>
 #include "taler_pq_lib.h"
+#include "pq_common.h"
 
 
 /**
- * Function called to convert input argument into SQL parameters.
+ * Function called to convert input amount into SQL parameter as tuple.
  *
  * @param cls closure
- * @param data pointer to input argument, here a `struct TALER_AmountNBO`
+ * @param data pointer to input argument, here a `struct TALER_Amount`
  * @param data_len number of bytes in @a data (if applicable)
  * @param[out] param_values SQL data to set
  * @param[out] param_lengths SQL length data to set
@@ -41,43 +43,76 @@
  * @return -1 on error, number of offsets used in @a scratch otherwise
  */
 static int
-qconv_amount_nbo (void *cls,
-                  const void *data,
-                  size_t data_len,
-                  void *param_values[],
-                  int param_lengths[],
-                  int param_formats[],
-                  unsigned int param_length,
-                  void *scratch[],
-                  unsigned int scratch_length)
+qconv_amount_currency_tuple (void *cls,
+                             const void *data,
+                             size_t data_len,
+                             void *param_values[],
+                             int param_lengths[],
+                             int param_formats[],
+                             unsigned int param_length,
+                             void *scratch[],
+                             unsigned int scratch_length)
 {
-  const struct TALER_AmountNBO *amount = data;
-  unsigned int off = 0;
+  struct GNUNET_PQ_Context *db = cls;
+  const struct TALER_Amount *amount = data;
+  size_t sz;
 
-  (void) cls;
-  (void) scratch;
-  (void) scratch_length;
-  GNUNET_assert (sizeof (struct TALER_AmountNBO) == data_len);
-  GNUNET_assert (2 == param_length);
-  param_values[off] = (void *) &amount->value;
-  param_lengths[off] = sizeof (amount->value);
-  param_formats[off] = 1;
-  off++;
-  param_values[off] = (void *) &amount->fraction;
-  param_lengths[off] = sizeof (amount->fraction);
-  param_formats[off] = 1;
-  return 0;
+  GNUNET_assert (NULL != db);
+  GNUNET_assert (NULL != amount);
+  GNUNET_assert (1 == param_length);
+  GNUNET_assert (1 <= scratch_length);
+  GNUNET_assert (sizeof (struct TALER_Amount) == data_len);
+  GNUNET_static_assert (sizeof(uint32_t) == sizeof(Oid));
+  {
+    char *out;
+    Oid oid_v;
+    Oid oid_f;
+    Oid oid_c;
+    struct TALER_PQ_AmountCurrencyP d;
+
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_PQ_get_oid_by_name (db,
+                                              "int8",
+                                              &oid_v));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_PQ_get_oid_by_name (db,
+                                              "int4",
+                                              &oid_f));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_PQ_get_oid_by_name (db,
+                                              "varchar",
+                                              &oid_c));
+    sz = TALER_PQ_make_taler_pq_amount_currency_ (amount,
+                                                  oid_v,
+                                                  oid_f,
+                                                  oid_c,
+                                                  &d);
+    out = GNUNET_malloc (sz);
+    memcpy (out,
+            &d,
+            sz);
+    scratch[0] = out;
+  }
+
+  param_values[0] = scratch[0];
+  param_lengths[0] = sz;
+  param_formats[0] = 1;
+
+  return 1;
 }
 
 
 struct GNUNET_PQ_QueryParam
-TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x)
+TALER_PQ_query_param_amount_with_currency (
+  const struct GNUNET_PQ_Context *db,
+  const struct TALER_Amount *amount)
 {
   struct GNUNET_PQ_QueryParam res = {
-    .conv = &qconv_amount_nbo,
-    .data = x,
-    .size = sizeof (*x),
-    .num_params = 2
+    .conv_cls = (void *) db,
+    .conv = &qconv_amount_currency_tuple,
+    .data = amount,
+    .size = sizeof (*amount),
+    .num_params = 1,
   };
 
   return res;
@@ -85,7 +120,7 @@ TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x)
 
 
 /**
- * Function called to convert input argument into SQL parameters.
+ * Function called to convert input amount into SQL parameter as tuple.
  *
  * @param cls closure
  * @param data pointer to input argument, here a `struct TALER_Amount`
@@ -99,49 +134,74 @@ TALER_PQ_query_param_amount_nbo (const struct TALER_AmountNBO *x)
  * @return -1 on error, number of offsets used in @a scratch otherwise
  */
 static int
-qconv_amount (void *cls,
-              const void *data,
-              size_t data_len,
-              void *param_values[],
-              int param_lengths[],
-              int param_formats[],
-              unsigned int param_length,
-              void *scratch[],
-              unsigned int scratch_length)
+qconv_amount_tuple (void *cls,
+                    const void *data,
+                    size_t data_len,
+                    void *param_values[],
+                    int param_lengths[],
+                    int param_formats[],
+                    unsigned int param_length,
+                    void *scratch[],
+                    unsigned int scratch_length)
 {
-  const struct TALER_Amount *amount_hbo = data;
-  struct TALER_AmountNBO *amount;
+  struct GNUNET_PQ_Context *db = cls;
+  const struct TALER_Amount *amount = data;
+  size_t sz;
+
+  GNUNET_assert (NULL != db);
+  GNUNET_assert (NULL != amount);
+  GNUNET_assert (1 == param_length);
+  GNUNET_assert (1 <= scratch_length);
+  GNUNET_assert (sizeof (struct TALER_Amount) == data_len);
+  GNUNET_static_assert (sizeof(uint32_t) == sizeof(Oid));
+  {
+    char *out;
+    Oid oid_v;
+    Oid oid_f;
+
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_PQ_get_oid_by_name (db,
+                                              "int8",
+                                              &oid_v));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_PQ_get_oid_by_name (db,
+                                              "int4",
+                                              &oid_f));
+
+    {
+      struct TALER_PQ_AmountP d
+        = TALER_PQ_make_taler_pq_amount_ (amount,
+                                          oid_v,
+                                          oid_f);
+
+      sz = sizeof(d);
+      out = GNUNET_malloc (sz);
+      scratch[0] = out;
+      GNUNET_memcpy (out,
+                     &d,
+                     sizeof(d));
+    }
+  }
+
+  param_values[0] = scratch[0];
+  param_lengths[0] = sz;
+  param_formats[0] = 1;
 
-  (void) cls;
-  (void) scratch;
-  (void) scratch_length;
-  GNUNET_assert (2 == param_length);
-  GNUNET_assert (sizeof (struct TALER_AmountNBO) == data_len);
-  amount = GNUNET_new (struct TALER_AmountNBO);
-  scratch[0] = amount;
-  TALER_amount_hton (amount,
-                     amount_hbo);
-  qconv_amount_nbo (cls,
-                    amount,
-                    sizeof (struct TALER_AmountNBO),
-                    param_values,
-                    param_lengths,
-                    param_formats,
-                    param_length,
-                    &scratch[1],
-                    scratch_length - 1);
   return 1;
 }
 
 
 struct GNUNET_PQ_QueryParam
-TALER_PQ_query_param_amount (const struct TALER_Amount *x)
+TALER_PQ_query_param_amount (
+  const struct GNUNET_PQ_Context *db,
+  const struct TALER_Amount *amount)
 {
   struct GNUNET_PQ_QueryParam res = {
-    .conv = &qconv_amount,
-    .data = x,
-    .size = sizeof (*x),
-    .num_params = 2
+    .conv_cls = (void *) db,
+    .conv = &qconv_amount_tuple,
+    .data = amount,
+    .size = sizeof (*amount),
+    .num_params = 1,
   };
 
   return res;
@@ -174,6 +234,7 @@ qconv_denom_pub (void *cls,
                  unsigned int scratch_length)
 {
   const struct TALER_DenominationPublicKey *denom_pub = data;
+  const struct GNUNET_CRYPTO_BlindSignPublicKey *bsp = denom_pub->bsign_pub_key;
   size_t tlen;
   size_t len;
   uint32_t be[2];
@@ -185,38 +246,38 @@ qconv_denom_pub (void *cls,
   GNUNET_assert (1 == param_length);
   GNUNET_assert (scratch_length > 0);
   GNUNET_break (NULL == cls);
-  be[0] = htonl ((uint32_t) denom_pub->cipher);
+  be[0] = htonl ((uint32_t) bsp->cipher);
   be[1] = htonl (denom_pub->age_mask.bits);
-  switch (denom_pub->cipher)
+  switch (bsp->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     tlen = GNUNET_CRYPTO_rsa_public_key_encode (
-      denom_pub->details.rsa_public_key,
+      bsp->details.rsa_public_key,
       &tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    tlen = sizeof (denom_pub->details.cs_public_key);
+  case GNUNET_CRYPTO_BSA_CS:
+    tlen = sizeof (bsp->details.cs_public_key);
     break;
   default:
     GNUNET_assert (0);
   }
   len = tlen + sizeof (be);
   buf = GNUNET_malloc (len);
-  memcpy (buf,
-          be,
-          sizeof (be));
-  switch (denom_pub->cipher)
+  GNUNET_memcpy (buf,
+                 be,
+                 sizeof (be));
+  switch (bsp->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    memcpy (&buf[sizeof (be)],
-            tbuf,
-            tlen);
+  case GNUNET_CRYPTO_BSA_RSA:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   tbuf,
+                   tlen);
     GNUNET_free (tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    memcpy (&buf[sizeof (be)],
-            &denom_pub->details.cs_public_key,
-            tlen);
+  case GNUNET_CRYPTO_BSA_CS:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   &bsp->details.cs_public_key,
+                   tlen);
     break;
   default:
     GNUNET_assert (0);
@@ -270,6 +331,7 @@ qconv_denom_sig (void *cls,
                  unsigned int scratch_length)
 {
   const struct TALER_DenominationSignature *denom_sig = data;
+  const struct GNUNET_CRYPTO_UnblindedSignature *ubs = denom_sig->unblinded_sig;
   size_t tlen;
   size_t len;
   uint32_t be[2];
@@ -281,38 +343,38 @@ qconv_denom_sig (void *cls,
   GNUNET_assert (1 == param_length);
   GNUNET_assert (scratch_length > 0);
   GNUNET_break (NULL == cls);
-  be[0] = htonl ((uint32_t) denom_sig->cipher);
+  be[0] = htonl ((uint32_t) ubs->cipher);
   be[1] = htonl (0x00); /* magic marker: unblinded */
-  switch (denom_sig->cipher)
+  switch (ubs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     tlen = GNUNET_CRYPTO_rsa_signature_encode (
-      denom_sig->details.rsa_signature,
+      ubs->details.rsa_signature,
       &tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    tlen = sizeof (denom_sig->details.cs_signature);
+  case GNUNET_CRYPTO_BSA_CS:
+    tlen = sizeof (ubs->details.cs_signature);
     break;
   default:
     GNUNET_assert (0);
   }
   len = tlen + sizeof (be);
   buf = GNUNET_malloc (len);
-  memcpy (buf,
-          &be,
-          sizeof (be));
-  switch (denom_sig->cipher)
+  GNUNET_memcpy (buf,
+                 &be,
+                 sizeof (be));
+  switch (ubs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    memcpy (&buf[sizeof (be)],
-            tbuf,
-            tlen);
+  case GNUNET_CRYPTO_BSA_RSA:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   tbuf,
+                   tlen);
     GNUNET_free (tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    memcpy (&buf[sizeof (be)],
-            &denom_sig->details.cs_signature,
-            tlen);
+  case GNUNET_CRYPTO_BSA_CS:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   &ubs->details.cs_signature,
+                   tlen);
     break;
   default:
     GNUNET_assert (0);
@@ -366,6 +428,7 @@ qconv_blinded_denom_sig (void *cls,
                          unsigned int scratch_length)
 {
   const struct TALER_BlindedDenominationSignature *denom_sig = data;
+  const struct GNUNET_CRYPTO_BlindedSignature *bs = denom_sig->blinded_sig;
   size_t tlen;
   size_t len;
   uint32_t be[2];
@@ -377,38 +440,38 @@ qconv_blinded_denom_sig (void *cls,
   GNUNET_assert (1 == param_length);
   GNUNET_assert (scratch_length > 0);
   GNUNET_break (NULL == cls);
-  be[0] = htonl ((uint32_t) denom_sig->cipher);
+  be[0] = htonl ((uint32_t) bs->cipher);
   be[1] = htonl (0x01); /* magic marker: blinded */
-  switch (denom_sig->cipher)
+  switch (bs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     tlen = GNUNET_CRYPTO_rsa_signature_encode (
-      denom_sig->details.blinded_rsa_signature,
+      bs->details.blinded_rsa_signature,
       &tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    tlen = sizeof (denom_sig->details.blinded_cs_answer);
+  case GNUNET_CRYPTO_BSA_CS:
+    tlen = sizeof (bs->details.blinded_cs_answer);
     break;
   default:
     GNUNET_assert (0);
   }
   len = tlen + sizeof (be);
   buf = GNUNET_malloc (len);
-  memcpy (buf,
-          &be,
-          sizeof (be));
-  switch (denom_sig->cipher)
+  GNUNET_memcpy (buf,
+                 &be,
+                 sizeof (be));
+  switch (bs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    memcpy (&buf[sizeof (be)],
-            tbuf,
-            tlen);
+  case GNUNET_CRYPTO_BSA_RSA:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   tbuf,
+                   tlen);
     GNUNET_free (tbuf);
     break;
-  case TALER_DENOMINATION_CS:
-    memcpy (&buf[sizeof (be)],
-            &denom_sig->details.blinded_cs_answer,
-            tlen);
+  case GNUNET_CRYPTO_BSA_CS:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   &bs->details.blinded_cs_answer,
+                   tlen);
     break;
   default:
     GNUNET_assert (0);
@@ -462,6 +525,7 @@ qconv_blinded_planchet (void *cls,
                         unsigned int scratch_length)
 {
   const struct TALER_BlindedPlanchet *bp = data;
+  const struct GNUNET_CRYPTO_BlindedMessage *bm = bp->blinded_message;
   size_t tlen;
   size_t len;
   uint32_t be[2];
@@ -472,35 +536,35 @@ qconv_blinded_planchet (void *cls,
   GNUNET_assert (1 == param_length);
   GNUNET_assert (scratch_length > 0);
   GNUNET_break (NULL == cls);
-  be[0] = htonl ((uint32_t) bp->cipher);
+  be[0] = htonl ((uint32_t) bm->cipher);
   be[1] = htonl (0x0100); /* magic marker: blinded */
-  switch (bp->cipher)
+  switch (bm->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    tlen = bp->details.rsa_blinded_planchet.blinded_msg_size;
+  case GNUNET_CRYPTO_BSA_RSA:
+    tlen = bm->details.rsa_blinded_message.blinded_msg_size;
     break;
-  case TALER_DENOMINATION_CS:
-    tlen = sizeof (bp->details.cs_blinded_planchet);
+  case GNUNET_CRYPTO_BSA_CS:
+    tlen = sizeof (bm->details.cs_blinded_message);
     break;
   default:
     GNUNET_assert (0);
   }
   len = tlen + sizeof (be);
   buf = GNUNET_malloc (len);
-  memcpy (buf,
-          &be,
-          sizeof (be));
-  switch (bp->cipher)
+  GNUNET_memcpy (buf,
+                 &be,
+                 sizeof (be));
+  switch (bm->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    memcpy (&buf[sizeof (be)],
-            bp->details.rsa_blinded_planchet.blinded_msg,
-            tlen);
+  case GNUNET_CRYPTO_BSA_RSA:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   bm->details.rsa_blinded_message.blinded_msg,
+                   tlen);
     break;
-  case TALER_DENOMINATION_CS:
-    memcpy (&buf[sizeof (be)],
-            &bp->details.cs_blinded_planchet,
-            tlen);
+  case GNUNET_CRYPTO_BSA_CS:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   &bm->details.cs_blinded_message,
+                   tlen);
     break;
   default:
     GNUNET_assert (0);
@@ -553,6 +617,8 @@ qconv_exchange_withdraw_values (void *cls,
                                 unsigned int scratch_length)
 {
   const struct TALER_ExchangeWithdrawValues *alg_values = data;
+  const struct GNUNET_CRYPTO_BlindingInputValues *bi =
+    alg_values->blinding_inputs;
   size_t tlen;
   size_t len;
   uint32_t be[2];
@@ -563,32 +629,32 @@ qconv_exchange_withdraw_values (void *cls,
   GNUNET_assert (1 == param_length);
   GNUNET_assert (scratch_length > 0);
   GNUNET_break (NULL == cls);
-  be[0] = htonl ((uint32_t) alg_values->cipher);
+  be[0] = htonl ((uint32_t) bi->cipher);
   be[1] = htonl (0x010000); /* magic marker: EWV */
-  switch (alg_values->cipher)
+  switch (bi->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     tlen = 0;
     break;
-  case TALER_DENOMINATION_CS:
-    tlen = sizeof (struct TALER_DenominationCSPublicRPairP);
+  case GNUNET_CRYPTO_BSA_CS:
+    tlen = sizeof (struct GNUNET_CRYPTO_CSPublicRPairP);
     break;
   default:
     GNUNET_assert (0);
   }
   len = tlen + sizeof (be);
   buf = GNUNET_malloc (len);
-  memcpy (buf,
-          &be,
-          sizeof (be));
-  switch (alg_values->cipher)
+  GNUNET_memcpy (buf,
+                 &be,
+                 sizeof (be));
+  switch (bi->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     break;
-  case TALER_DENOMINATION_CS:
-    memcpy (&buf[sizeof (be)],
-            &alg_values->details.cs_values,
-            tlen);
+  case GNUNET_CRYPTO_BSA_CS:
+    GNUNET_memcpy (&buf[sizeof (be)],
+                   &bi->details.cs_values,
+                   tlen);
     break;
   default:
     GNUNET_assert (0);
@@ -671,4 +737,603 @@ TALER_PQ_query_param_json (const json_t *x)
 }
 
 
+/** ------------------- Array support  -----------------------------------**/
+
+/**
+ * Closure for the array type handlers.
+ *
+ * May contain sizes information for the data, given (and handled) by the
+ * caller.
+ */
+struct qconv_array_cls
+{
+  /**
+   * If not null, contains the array of sizes (the size of the array is the
+   * .size field in the ambient GNUNET_PQ_QueryParam struct). We do not free
+   * this memory.
+   *
+   * If not null, this value has precedence over @a sizes, which MUST be NULL */
+  const size_t *sizes;
+
+  /**
+   * If @a size and @a c_sizes are NULL, this field defines the same size
+   * for each element in the array.
+   */
+  size_t same_size;
+
+  /**
+   * If true, the array parameter to the data pointer to the qconv_array is a
+   * continuous byte array of data, either with @a same_size each or sizes
+   * provided bytes by @a sizes;
+   */
+  bool continuous;
+
+  /**
+   * Type of the array elements
+   */
+  enum TALER_PQ_ArrayType typ;
+
+  /**
+   * Oid of the array elements
+   */
+  Oid oid;
+
+  /**
+   * db context, needed for OID-lookup of basis-types
+   */
+  struct GNUNET_PQ_Context *db;
+};
+
+/**
+ * Callback to cleanup a qconv_array_cls to be used during
+ * GNUNET_PQ_cleanup_query_params_closures
+ */
+static void
+qconv_array_cls_cleanup (void *cls)
+{
+  GNUNET_free (cls);
+}
+
+
+/**
+ * Function called to convert input argument into SQL parameters for arrays
+ *
+ * Note: the format for the encoding of arrays for libpq is not very well
+ * documented.  We peeked into various sources (postgresql and libpqtypes) for
+ * guidance.
+ *
+ * @param cls Closure of type struct qconv_array_cls*
+ * @param data Pointer to first element in the array
+ * @param data_len Number of _elements_ in array @a data (if applicable)
+ * @param[out] param_values SQL data to set
+ * @param[out] param_lengths SQL length data to set
+ * @param[out] param_formats SQL format data to set
+ * @param param_length number of entries available in the @a param_values, @a param_lengths and @a param_formats arrays
+ * @param[out] scratch buffer for dynamic allocations (to be done via #GNUNET_malloc()
+ * @param scratch_length number of entries left in @a scratch
+ * @return -1 on error, number of offsets used in @a scratch otherwise
+ */
+static int
+qconv_array (
+  void *cls,
+  const void *data,
+  size_t data_len,
+  void *param_values[],
+  int param_lengths[],
+  int param_formats[],
+  unsigned int param_length,
+  void *scratch[],
+  unsigned int scratch_length)
+{
+  struct qconv_array_cls *meta = cls;
+  size_t num = data_len;
+  size_t total_size;
+  const size_t *sizes;
+  bool same_sized;
+  void *elements = NULL;
+  bool noerror = true;
+  /* needed to capture the encoded rsa signatures */
+  void **buffers = NULL;
+  size_t *buffer_lengths = NULL;
+
+  (void) (param_length);
+  (void) (scratch_length);
+
+  GNUNET_assert (NULL != meta);
+  GNUNET_assert (num < INT_MAX);
+
+  sizes = meta->sizes;
+  same_sized = (0 != meta->same_size);
+
+#define RETURN_UNLESS(cond) \
+  do { \
+    if (! (cond)) \
+    { \
+      GNUNET_break ((cond)); \
+      noerror = false; \
+      goto DONE; \
+    } \
+  } while (0)
+
+  /* Calculate sizes and check bounds */
+  {
+    /* num * length-field */
+    size_t x = sizeof(uint32_t);
+    size_t y = x * num;
+    RETURN_UNLESS ((0 == num) || (y / num == x));
+
+    /* size of header */
+    total_size  = x = sizeof(struct GNUNET_PQ_ArrayHeader_P);
+    total_size += y;
+    RETURN_UNLESS (total_size >= x);
+
+    /* sizes of elements */
+    if (same_sized)
+    {
+      x = num * meta->same_size;
+      RETURN_UNLESS ((0 == num) || (x / num == meta->same_size));
+
+      y = total_size;
+      total_size += x;
+      RETURN_UNLESS (total_size >= y);
+    }
+    else  /* sizes are different per element */
+    {
+      switch (meta->typ)
+      {
+      case TALER_PQ_array_of_amount_currency:
+        {
+          const struct TALER_Amount *amounts = data;
+          Oid oid_v;
+          Oid oid_f;
+          Oid oid_c;
+
+          buffer_lengths  = GNUNET_new_array (num, size_t);
+          /* hoist out of loop? */
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int8",
+                                                    &oid_v));
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int4",
+                                                    &oid_f));
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "varchar",
+                                                    &oid_c));
+          for (size_t i = 0; i<num; i++)
+          {
+            struct TALER_PQ_AmountCurrencyP am;
+            size_t len;
+
+            len = TALER_PQ_make_taler_pq_amount_currency_ (
+              &amounts[i],
+              oid_v,
+              oid_f,
+              oid_c,
+              &am);
+            buffer_lengths[i] = len;
+            y = total_size;
+            total_size += len;
+            RETURN_UNLESS (total_size >= y);
+          }
+          sizes = buffer_lengths;
+          break;
+        }
+      case TALER_PQ_array_of_blinded_denom_sig:
+        {
+          const struct TALER_BlindedDenominationSignature *denom_sigs = data;
+          size_t len;
+
+          buffers  = GNUNET_new_array (num, void *);
+          buffer_lengths  = GNUNET_new_array (num, size_t);
+
+          for (size_t i = 0; i<num; i++)
+          {
+            const struct GNUNET_CRYPTO_BlindedSignature *bs =
+              denom_sigs[i].blinded_sig;
+
+            switch (bs->cipher)
+            {
+            case GNUNET_CRYPTO_BSA_RSA:
+              len = GNUNET_CRYPTO_rsa_signature_encode (
+                bs->details.blinded_rsa_signature,
+                &buffers[i]);
+              RETURN_UNLESS (len != 0);
+              break;
+            case GNUNET_CRYPTO_BSA_CS:
+              len = sizeof (bs->details.blinded_cs_answer);
+              break;
+            default:
+              GNUNET_assert (0);
+            }
+
+            /* for the cipher and marker */
+            len += 2 * sizeof(uint32_t);
+            buffer_lengths[i] = len;
+
+            y = total_size;
+            total_size += len;
+            RETURN_UNLESS (total_size >= y);
+          }
+          sizes = buffer_lengths;
+          break;
+        }
+      default:
+        GNUNET_assert (0);
+      }
+    }
+
+    RETURN_UNLESS (INT_MAX > total_size);
+    RETURN_UNLESS (0 != total_size);
+
+    elements = GNUNET_malloc (total_size);
+  }
+
+  /* Write data */
+  {
+    char *out = elements;
+    struct GNUNET_PQ_ArrayHeader_P h = {
+      .ndim = htonl (1),        /* We only support one-dimensional arrays */
+      .has_null = htonl (0),    /* We do not support NULL entries in arrays */
+      .lbound = htonl (1),      /* Default start index value */
+      .dim = htonl (num),
+      .oid = htonl (meta->oid),
+    };
+
+    /* Write header */
+    GNUNET_memcpy (out,
+                   &h,
+                   sizeof(h));
+    out += sizeof(h);
+
+    /* Write elements */
+    for (size_t i = 0; i < num; i++)
+    {
+      size_t sz = same_sized ? meta->same_size : sizes[i];
+
+      *(uint32_t *) out = htonl (sz);
+      out += sizeof(uint32_t);
+      switch (meta->typ)
+      {
+      case TALER_PQ_array_of_amount:
+        {
+          const struct TALER_Amount *amounts = data;
+          Oid oid_v;
+          Oid oid_f;
+
+          /* hoist out of loop? */
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int8",
+                                                    &oid_v));
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int4",
+                                                    &oid_f));
+          {
+            struct TALER_PQ_AmountP am
+              = TALER_PQ_make_taler_pq_amount_ (
+                  &amounts[i],
+                  oid_v,
+                  oid_f);
+
+            GNUNET_memcpy (out,
+                           &am,
+                           sizeof(am));
+          }
+          break;
+        }
+      case TALER_PQ_array_of_amount_currency:
+        {
+          const struct TALER_Amount *amounts = data;
+          Oid oid_v;
+          Oid oid_f;
+          Oid oid_c;
+
+          /* hoist out of loop? */
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int8",
+                                                    &oid_v));
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "int4",
+                                                    &oid_f));
+          GNUNET_assert (GNUNET_OK ==
+                         GNUNET_PQ_get_oid_by_name (meta->db,
+                                                    "varchar",
+                                                    &oid_c));
+          {
+            struct TALER_PQ_AmountCurrencyP am;
+            size_t len;
+
+            len = TALER_PQ_make_taler_pq_amount_currency_ (
+              &amounts[i],
+              oid_v,
+              oid_f,
+              oid_c,
+              &am);
+            GNUNET_memcpy (out,
+                           &am,
+                           len);
+          }
+          break;
+        }
+      case TALER_PQ_array_of_blinded_denom_sig:
+        {
+          const struct TALER_BlindedDenominationSignature *denom_sigs = data;
+          const struct GNUNET_CRYPTO_BlindedSignature *bs =
+            denom_sigs[i].blinded_sig;
+          uint32_t be[2];
+
+          be[0] = htonl ((uint32_t) bs->cipher);
+          be[1] = htonl (0x01);     /* magic margker: blinded */
+          GNUNET_memcpy (out,
+                         &be,
+                         sizeof(be));
+          out += sizeof(be);
+          sz -= sizeof(be);
+
+          switch (bs->cipher)
+          {
+          case GNUNET_CRYPTO_BSA_RSA:
+            /* For RSA, 'same_sized' must have been false */
+            GNUNET_assert (NULL != buffers);
+            GNUNET_memcpy (out,
+                           buffers[i],
+                           sz);
+            break;
+          case GNUNET_CRYPTO_BSA_CS:
+            GNUNET_memcpy (out,
+                           &bs->details.blinded_cs_answer,
+                           sz);
+            break;
+          default:
+            GNUNET_assert (0);
+          }
+          break;
+        }
+      case TALER_PQ_array_of_blinded_coin_hash:
+        {
+          const struct TALER_BlindedCoinHashP *coin_hs = data;
+
+          GNUNET_memcpy (out,
+                         &coin_hs[i],
+                         sizeof(struct TALER_BlindedCoinHashP));
+
+          break;
+        }
+      case TALER_PQ_array_of_denom_hash:
+        {
+          const struct TALER_DenominationHashP *denom_hs = data;
+
+          GNUNET_memcpy (out,
+                         &denom_hs[i],
+                         sizeof(struct TALER_DenominationHashP));
+          break;
+        }
+      case TALER_PQ_array_of_hash_code:
+        {
+          const struct GNUNET_HashCode *hashes = data;
+
+          GNUNET_memcpy (out,
+                         &hashes[i],
+                         sizeof(struct GNUNET_HashCode));
+          break;
+        }
+      default:
+        {
+          GNUNET_assert (0);
+          break;
+        }
+      }
+      out += sz;
+    }
+  }
+  param_values[0] = elements;
+  param_lengths[0] = total_size;
+  param_formats[0] = 1;
+  scratch[0] = elements;
+
+DONE:
+  if (NULL != buffers)
+  {
+    for (size_t i = 0; i<num; i++)
+      GNUNET_free (buffers[i]);
+    GNUNET_free (buffers);
+  }
+  GNUNET_free (buffer_lengths);
+  if (noerror)
+    return 1;
+  return -1;
+}
+
+
+/**
+ * Function to generate a typ specific query parameter and corresponding closure
+ *
+ * @param num Number of elements in @a elements
+ * @param continuous If true, @a elements is an continuous array of data
+ * @param elements Array of @a num elements, either continuous or pointers
+ * @param sizes Array of @a num sizes, one per element, may be NULL
+ * @param same_size If not 0, all elements in @a elements have this size
+ * @param typ Supported internal type of each element in @a elements
+ * @param oid Oid of the type to be used in Postgres
+ * @param[in,out] db our database handle for looking up OIDs
+ * @return Query parameter
+ */
+static struct GNUNET_PQ_QueryParam
+query_param_array_generic (
+  unsigned int num,
+  bool continuous,
+  const void *elements,
+  const size_t *sizes,
+  size_t same_size,
+  enum TALER_PQ_ArrayType typ,
+  Oid oid,
+  struct GNUNET_PQ_Context *db)
+{
+  struct qconv_array_cls *meta = GNUNET_new (struct qconv_array_cls);
+
+  meta->typ = typ;
+  meta->oid = oid;
+  meta->sizes = sizes;
+  meta->same_size = same_size;
+  meta->continuous = continuous;
+  meta->db = db;
+
+  {
+    struct GNUNET_PQ_QueryParam res = {
+      .conv = qconv_array,
+      .conv_cls = meta,
+      .conv_cls_cleanup = qconv_array_cls_cleanup,
+      .data = elements,
+      .size = num,
+      .num_params = 1,
+    };
+
+    return res;
+  }
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_blinded_denom_sig (
+  size_t num,
+  const struct TALER_BlindedDenominationSignature *denom_sigs,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &oid));
+  return query_param_array_generic (num,
+                                    true,
+                                    denom_sigs,
+                                    NULL,
+                                    0,
+                                    TALER_PQ_array_of_blinded_denom_sig,
+                                    oid,
+                                    NULL);
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_blinded_coin_hash (
+  size_t num,
+  const struct TALER_BlindedCoinHashP *coin_hs,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &oid));
+  return query_param_array_generic (num,
+                                    true,
+                                    coin_hs,
+                                    NULL,
+                                    sizeof(struct TALER_BlindedCoinHashP),
+                                    TALER_PQ_array_of_blinded_coin_hash,
+                                    oid,
+                                    NULL);
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_denom_hash (
+  size_t num,
+  const struct TALER_DenominationHashP *denom_hs,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &oid));
+  return query_param_array_generic (num,
+                                    true,
+                                    denom_hs,
+                                    NULL,
+                                    sizeof(struct TALER_DenominationHashP),
+                                    TALER_PQ_array_of_denom_hash,
+                                    oid,
+                                    NULL);
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_hash_code (
+  size_t num,
+  const struct GNUNET_HashCode *hashes,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db, "gnunet_hashcode", &oid));
+  return query_param_array_generic (num,
+                                    true,
+                                    hashes,
+                                    NULL,
+                                    sizeof(struct GNUNET_HashCode),
+                                    TALER_PQ_array_of_hash_code,
+                                    oid,
+                                    NULL);
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_amount (
+  size_t num,
+  const struct TALER_Amount *amounts,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "taler_amount",
+                                            &oid));
+  return query_param_array_generic (
+    num,
+    true,
+    amounts,
+    NULL,
+    sizeof(struct TALER_PQ_AmountP),
+    TALER_PQ_array_of_amount,
+    oid,
+    db);
+}
+
+
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_amount_with_currency (
+  size_t num,
+  const struct TALER_Amount *amounts,
+  struct GNUNET_PQ_Context *db)
+{
+  Oid oid;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "taler_amount_currency",
+                                            &oid));
+  return query_param_array_generic (
+    num,
+    true,
+    amounts,
+    NULL,
+    0, /* currency is technically variable length */
+    TALER_PQ_array_of_amount_currency,
+    oid,
+    db);
+}
+
+
 /* end of pq/pq_query_helper.c */
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 139cf1cbf..384200cfb 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2022 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -20,164 +20,144 @@
  */
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>
+#include "pq_common.h"
 #include "taler_pq_lib.h"
 
 
 /**
- * Extract a currency amount from a query result according to the
- * given specification.
+ * Extract an amount from a tuple including the currency from a Postgres
+ * database @a result at row @a row.
  *
- * @param result the result to extract the amount from
- * @param row which row of the result to extract the amount from (needed as results can have multiple rows)
- * @param currency currency to use for @a r_amount_nbo
- * @param val_name name of the column with the amount's "value", must include the substring "_val".
- * @param frac_name name of the column with the amount's "fractional" value, must include the substring "_frac".
- * @param[out] r_amount_nbo where to store the amount, in network byte order
+ * @param cls closure; not used
+ * @param result where to extract data from
+ * @param row row to extract data from
+ * @param fname name (or prefix) of the fields to extract from
+ * @param[in,out] dst_size where to store size of result, may be NULL
+ * @param[out] dst where to store the result
  * @return
  *   #GNUNET_YES if all results could be extracted
  *   #GNUNET_NO if at least one result was NULL
  *   #GNUNET_SYSERR if a result was invalid (non-existing field)
  */
 static enum GNUNET_GenericReturnValue
-extract_amount_nbo_helper (PGresult *result,
-                           int row,
-                           const char *currency,
-                           const char *val_name,
-                           const char *frac_name,
-                           struct TALER_AmountNBO *r_amount_nbo)
+extract_amount_currency_tuple (void *cls,
+                               PGresult *result,
+                               int row,
+                               const char *fname,
+                               size_t *dst_size,
+                               void *dst)
 {
-  int val_num;
-  int frac_num;
-  int len;
-
-  /* These checks are simply to check that clients obey by our naming
-     conventions, and not for any functional reason */
-  GNUNET_assert (NULL !=
-                 strstr (val_name,
-                         "_val"));
-  GNUNET_assert (NULL !=
-                 strstr (frac_name,
-                         "_frac"));
-  /* Set return value to invalid in case we don't finish */
-  memset (r_amount_nbo,
-          0,
-          sizeof (struct TALER_AmountNBO));
-  val_num = PQfnumber (result,
-                       val_name);
-  frac_num = PQfnumber (result,
-                        frac_name);
-  if (val_num < 0)
+  struct TALER_Amount *r_amount = dst;
+  int col;
+
+  (void) cls;
+  if (sizeof (struct TALER_Amount) != *dst_size)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Field `%s' does not exist in result\n",
-                val_name);
+    GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  if (frac_num < 0)
+
+  /* Set return value to invalid in case we don't finish */
+  memset (r_amount,
+          0,
+          sizeof (struct TALER_Amount));
+  col = PQfnumber (result,
+                   fname);
+  if (col < 0)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Field `%s' does not exist in result\n",
-                frac_name);
+                fname);
     return GNUNET_SYSERR;
   }
-  if ( (PQgetisnull (result,
-                     row,
-                     val_num)) ||
-       (PQgetisnull (result,
-                     row,
-                     frac_num)) )
+  if (PQgetisnull (result,
+                   row,
+                   col))
   {
     return GNUNET_NO;
   }
-  /* Note that Postgres stores value in NBO internally,
-     so no conversion needed in this case */
-  r_amount_nbo->value = *(uint64_t *) PQgetvalue (result,
-                                                  row,
-                                                  val_num);
-  r_amount_nbo->fraction = *(uint32_t *) PQgetvalue (result,
-                                                     row,
-                                                     frac_num);
-  if (GNUNET_ntohll (r_amount_nbo->value) >= TALER_AMOUNT_MAX_VALUE)
+
+  /* Parse the tuple */
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Field `%s' exceeds legal range\n",
-                val_name);
-    return GNUNET_SYSERR;
+    struct TALER_PQ_AmountCurrencyP ap;
+    const char *in;
+    size_t size;
+
+    size = PQgetlength (result,
+                        row,
+                        col);
+    if ( (size >= sizeof (ap)) ||
+         (size <= sizeof (ap) - TALER_CURRENCY_LEN) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Incorrect size of binary field `%s' (got %zu, expected (%zu-%zu))\n",
+                  fname,
+                  size,
+                  sizeof (ap) - TALER_CURRENCY_LEN,
+                  sizeof (ap));
+      return GNUNET_SYSERR;
+    }
+
+    in = PQgetvalue (result,
+                     row,
+                     col);
+    memset (&ap.c,
+            0,
+            TALER_CURRENCY_LEN);
+    memcpy (&ap,
+            in,
+            size);
+    if (3 != ntohl (ap.cnt))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Incorrect number of elements in tuple-field `%s'\n",
+                  fname);
+      return GNUNET_SYSERR;
+    }
+    /* TODO[oec]: OID-checks? */
+
+    r_amount->value = GNUNET_ntohll (ap.v);
+    r_amount->fraction = ntohl (ap.f);
+    memcpy (r_amount->currency,
+            ap.c,
+            TALER_CURRENCY_LEN);
+    if ('\0' != r_amount->currency[TALER_CURRENCY_LEN - 1])
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Invalid currency (not 0-terminated) in tuple field `%s'\n",
+                  fname);
+      /* be sure nobody uses this by accident */
+      memset (r_amount,
+              0,
+              sizeof (struct TALER_Amount));
+      return GNUNET_SYSERR;
+    }
   }
-  if (ntohl (r_amount_nbo->fraction) >= TALER_AMOUNT_FRAC_BASE)
+
+  if (r_amount->value >= TALER_AMOUNT_MAX_VALUE)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Field `%s' exceeds legal range\n",
-                frac_name);
+                "Value in field `%s' exceeds legal range\n",
+                fname);
     return GNUNET_SYSERR;
   }
-  len = GNUNET_MIN (TALER_CURRENCY_LEN - 1,
-                    strlen (currency));
-  memcpy (r_amount_nbo->currency,
-          currency,
-          len);
-  return GNUNET_OK;
-}
-
-
-/**
- * Extract data from a Postgres database @a result at row @a row.
- *
- * @param cls closure, a `const char *` giving the currency
- * @param result where to extract data from
- * @param row row to extract data from
- * @param fname name (or prefix) of the fields to extract from
- * @param[in,out] dst_size where to store size of result, may be NULL
- * @param[out] dst where to store the result
- * @return
- *   #GNUNET_YES if all results could be extracted
- *   #GNUNET_NO if at least one result was NULL
- *   #GNUNET_SYSERR if a result was invalid (non-existing field)
- */
-static enum GNUNET_GenericReturnValue
-extract_amount_nbo (void *cls,
-                    PGresult *result,
-                    int row,
-                    const char *fname,
-                    size_t *dst_size,
-                    void *dst)
-{
-  const char *currency = cls;
-  char *val_name;
-  char *frac_name;
-  enum GNUNET_GenericReturnValue ret;
-
-  if (sizeof (struct TALER_AmountNBO) != *dst_size)
+  if (r_amount->fraction >= TALER_AMOUNT_FRAC_BASE)
   {
-    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Fraction in field `%s' exceeds legal range\n",
+                fname);
     return GNUNET_SYSERR;
   }
-  GNUNET_asprintf (&val_name,
-                   "%s_val",
-                   fname);
-  GNUNET_asprintf (&frac_name,
-                   "%s_frac",
-                   fname);
-  ret = extract_amount_nbo_helper (result,
-                                   row,
-                                   currency,
-                                   val_name,
-                                   frac_name,
-                                   dst);
-  GNUNET_free (val_name);
-  GNUNET_free (frac_name);
-  return ret;
+  return GNUNET_OK;
 }
 
 
 struct GNUNET_PQ_ResultSpec
-TALER_PQ_result_spec_amount_nbo (const char *name,
-                                 const char *currency,
-                                 struct TALER_AmountNBO *amount)
+TALER_PQ_result_spec_amount_with_currency (const char *name,
+                                           struct TALER_Amount *amount)
 {
   struct GNUNET_PQ_ResultSpec res = {
-    .conv = &extract_amount_nbo,
-    .cls = (void *) currency,
+    .conv = &extract_amount_currency_tuple,
     .dst = (void *) amount,
     .dst_size = sizeof (*amount),
     .fname = name
@@ -188,7 +168,7 @@ TALER_PQ_result_spec_amount_nbo (const char *name,
 
 
 /**
- * Extract data from a Postgres database @a result at row @a row.
+ * Extract an amount from a tuple from a Postgres database @a result at row @a row.
  *
  * @param cls closure, a `const char *` giving the currency
  * @param result where to extract data from
@@ -202,47 +182,125 @@ TALER_PQ_result_spec_amount_nbo (const char *name,
  *   #GNUNET_SYSERR if a result was invalid (non-existing field)
  */
 static enum GNUNET_GenericReturnValue
-extract_amount (void *cls,
-                PGresult *result,
-                int row,
-                const char *fname,
-                size_t *dst_size,
-                void *dst)
+extract_amount_tuple (void *cls,
+                      PGresult *result,
+                      int row,
+                      const char *fname,
+                      size_t *dst_size,
+                      void *dst)
 {
-  const char *currency = cls;
   struct TALER_Amount *r_amount = dst;
-  char *val_name;
-  char *frac_name;
-  struct TALER_AmountNBO amount_nbo;
-  enum GNUNET_GenericReturnValue ret;
+  const char *currency = cls;
+  int col;
+  size_t len;
 
-  if (sizeof (struct TALER_AmountNBO) != *dst_size)
+  if (sizeof (struct TALER_Amount) != *dst_size)
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  GNUNET_asprintf (&val_name,
-                   "%s_val",
-                   fname);
-  GNUNET_asprintf (&frac_name,
-                   "%s_frac",
+
+  /* Set return value to invalid in case we don't finish */
+  memset (r_amount,
+          0,
+          sizeof (struct TALER_Amount));
+  col = PQfnumber (result,
                    fname);
-  ret = extract_amount_nbo_helper (result,
-                                   row,
-                                   currency,
-                                   val_name,
-                                   frac_name,
-                                   &amount_nbo);
-  if (GNUNET_OK == ret)
-    TALER_amount_ntoh (r_amount,
-                       &amount_nbo);
-  else
-    memset (r_amount,
-            0,
-            sizeof (struct TALER_Amount));
-  GNUNET_free (val_name);
-  GNUNET_free (frac_name);
-  return ret;
+  if (col < 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Field `%s' does not exist in result\n",
+                fname);
+    return GNUNET_SYSERR;
+  }
+  if (PQgetisnull (result,
+                   row,
+                   col))
+  {
+    return GNUNET_NO;
+  }
+
+  /* Parse the tuple */
+  {
+    struct TALER_PQ_AmountP ap;
+    const char *in;
+    size_t size;
+
+    size = PQgetlength (result,
+                        row,
+                        col);
+    in = PQgetvalue (result,
+                     row,
+                     col);
+    if (sizeof(struct TALER_PQ_AmountNullP) == size)
+    {
+      struct TALER_PQ_AmountNullP apn;
+
+      memcpy (&apn,
+              in,
+              size);
+      if ( (2 == ntohl (apn.cnt)) &&
+           (-1 == (int32_t) ntohl (apn.sz_v)) &&
+           (-1 == (int32_t) ntohl (apn.sz_f)) )
+      {
+        /* is NULL! */
+        return GNUNET_NO;
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Incorrect size of binary field `%s' and not NULL (got %zu, expected %zu)\n",
+                  fname,
+                  size,
+                  sizeof(ap));
+      return GNUNET_SYSERR;
+    }
+    if (sizeof(ap) != size)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Incorrect size of binary field `%s' (got %zu, expected %zu)\n",
+                  fname,
+                  size,
+                  sizeof(ap));
+      return GNUNET_SYSERR;
+    }
+
+    memcpy (&ap,
+            in,
+            size);
+    if (2 != ntohl (ap.cnt))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Incorrect number of elements in tuple-field `%s'\n",
+                  fname);
+      return GNUNET_SYSERR;
+    }
+    /* TODO[oec]: OID-checks? */
+
+    r_amount->value = GNUNET_ntohll (ap.v);
+    r_amount->fraction = ntohl (ap.f);
+  }
+
+  if (r_amount->value >= TALER_AMOUNT_MAX_VALUE)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Value in field `%s' exceeds legal range\n",
+                fname);
+    return GNUNET_SYSERR;
+  }
+  if (r_amount->fraction >= TALER_AMOUNT_FRAC_BASE)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Fraction in field `%s' exceeds legal range\n",
+                fname);
+    return GNUNET_SYSERR;
+  }
+
+  len = GNUNET_MIN (TALER_CURRENCY_LEN - 1,
+                    strlen (currency));
+
+  GNUNET_memcpy (r_amount->currency,
+                 currency,
+                 len);
+  return GNUNET_OK;
 }
 
 
@@ -252,7 +310,7 @@ TALER_PQ_result_spec_amount (const char *name,
                              struct TALER_Amount *amount)
 {
   struct GNUNET_PQ_ResultSpec res = {
-    .conv = &extract_amount,
+    .conv = &extract_amount_tuple,
     .cls = (void *) currency,
     .dst = (void *) amount,
     .dst_size = sizeof (*amount),
@@ -388,6 +446,7 @@ extract_denom_pub (void *cls,
                    void *dst)
 {
   struct TALER_DenominationPublicKey *pk = dst;
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bpk;
   size_t len;
   const char *res;
   int fnum;
@@ -420,38 +479,52 @@ extract_denom_pub (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  memcpy (be,
-          res,
-          sizeof (be));
+  GNUNET_memcpy (be,
+                 res,
+                 sizeof (be));
   res += sizeof (be);
   len -= sizeof (be);
-  pk->cipher = ntohl (be[0]);
+  bpk = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+  bpk->cipher = ntohl (be[0]);
+  bpk->rc = 1;
   pk->age_mask.bits = ntohl (be[1]);
-  switch (pk->cipher)
+  switch (bpk->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    pk->details.rsa_public_key
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    bpk->details.rsa_public_key
       = GNUNET_CRYPTO_rsa_public_key_decode (res,
                                              len);
-    if (NULL == pk->details.rsa_public_key)
+    if (NULL == bpk->details.rsa_public_key)
     {
       GNUNET_break (0);
+      GNUNET_free (bpk);
       return GNUNET_SYSERR;
     }
+    pk->bsign_pub_key = bpk;
+    GNUNET_CRYPTO_hash (res,
+                        len,
+                        &bpk->pub_key_hash);
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    if (sizeof (pk->details.cs_public_key) != len)
+  case GNUNET_CRYPTO_BSA_CS:
+    if (sizeof (bpk->details.cs_public_key) != len)
     {
       GNUNET_break (0);
+      GNUNET_free (bpk);
       return GNUNET_SYSERR;
     }
-    memcpy (&pk->details.cs_public_key,
-            res,
-            len);
+    GNUNET_memcpy (&bpk->details.cs_public_key,
+                   res,
+                   len);
+    pk->bsign_pub_key = bpk;
+    GNUNET_CRYPTO_hash (res,
+                        len,
+                        &bpk->pub_key_hash);
     return GNUNET_OK;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_break (0);
+  GNUNET_free (bpk);
   return GNUNET_SYSERR;
 }
 
@@ -511,6 +584,7 @@ extract_denom_sig (void *cls,
                    void *dst)
 {
   struct TALER_DenominationSignature *sig = dst;
+  struct GNUNET_CRYPTO_UnblindedSignature *ubs;
   size_t len;
   const char *res;
   int fnum;
@@ -543,9 +617,9 @@ extract_denom_sig (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  memcpy (&be,
-          res,
-          sizeof (be));
+  GNUNET_memcpy (&be,
+                 res,
+                 sizeof (be));
   if (0x00 != ntohl (be[1]))
   {
     GNUNET_break (0);
@@ -553,32 +627,40 @@ extract_denom_sig (void *cls,
   }
   res += sizeof (be);
   len -= sizeof (be);
-  sig->cipher = ntohl (be[0]);
-  switch (sig->cipher)
+  ubs = GNUNET_new (struct GNUNET_CRYPTO_UnblindedSignature);
+  ubs->rc = 1;
+  ubs->cipher = ntohl (be[0]);
+  switch (ubs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    sig->details.rsa_signature
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    ubs->details.rsa_signature
       = GNUNET_CRYPTO_rsa_signature_decode (res,
                                             len);
-    if (NULL == sig->details.rsa_signature)
+    if (NULL == ubs->details.rsa_signature)
     {
       GNUNET_break (0);
+      GNUNET_free (ubs);
       return GNUNET_SYSERR;
     }
+    sig->unblinded_sig = ubs;
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    if (sizeof (sig->details.cs_signature) != len)
+  case GNUNET_CRYPTO_BSA_CS:
+    if (sizeof (ubs->details.cs_signature) != len)
     {
       GNUNET_break (0);
+      GNUNET_free (ubs);
       return GNUNET_SYSERR;
     }
-    memcpy (&sig->details.cs_signature,
-            res,
-            len);
+    GNUNET_memcpy (&ubs->details.cs_signature,
+                   res,
+                   len);
+    sig->unblinded_sig = ubs;
     return GNUNET_OK;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_break (0);
+  GNUNET_free (ubs);
   return GNUNET_SYSERR;
 }
 
@@ -638,6 +720,7 @@ extract_blinded_denom_sig (void *cls,
                            void *dst)
 {
   struct TALER_BlindedDenominationSignature *sig = dst;
+  struct GNUNET_CRYPTO_BlindedSignature *bs;
   size_t len;
   const char *res;
   int fnum;
@@ -670,9 +753,9 @@ extract_blinded_denom_sig (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  memcpy (&be,
-          res,
-          sizeof (be));
+  GNUNET_memcpy (&be,
+                 res,
+                 sizeof (be));
   if (0x01 != ntohl (be[1])) /* magic marker: blinded */
   {
     GNUNET_break (0);
@@ -680,32 +763,40 @@ extract_blinded_denom_sig (void *cls,
   }
   res += sizeof (be);
   len -= sizeof (be);
-  sig->cipher = ntohl (be[0]);
-  switch (sig->cipher)
+  bs = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+  bs->rc = 1;
+  bs->cipher = ntohl (be[0]);
+  switch (bs->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    sig->details.blinded_rsa_signature
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    bs->details.blinded_rsa_signature
       = GNUNET_CRYPTO_rsa_signature_decode (res,
                                             len);
-    if (NULL == sig->details.blinded_rsa_signature)
+    if (NULL == bs->details.blinded_rsa_signature)
     {
       GNUNET_break (0);
+      GNUNET_free (bs);
       return GNUNET_SYSERR;
     }
+    sig->blinded_sig = bs;
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    if (sizeof (sig->details.blinded_cs_answer) != len)
+  case GNUNET_CRYPTO_BSA_CS:
+    if (sizeof (bs->details.blinded_cs_answer) != len)
     {
       GNUNET_break (0);
+      GNUNET_free (bs);
       return GNUNET_SYSERR;
     }
-    memcpy (&sig->details.blinded_cs_answer,
-            res,
-            len);
+    GNUNET_memcpy (&bs->details.blinded_cs_answer,
+                   res,
+                   len);
+    sig->blinded_sig = bs;
     return GNUNET_OK;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_break (0);
+  GNUNET_free (bs);
   return GNUNET_SYSERR;
 }
 
@@ -766,6 +857,7 @@ extract_blinded_planchet (void *cls,
                           void *dst)
 {
   struct TALER_BlindedPlanchet *bp = dst;
+  struct GNUNET_CRYPTO_BlindedMessage *bm;
   size_t len;
   const char *res;
   int fnum;
@@ -798,9 +890,9 @@ extract_blinded_planchet (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  memcpy (&be,
-          res,
-          sizeof (be));
+  GNUNET_memcpy (&be,
+                 res,
+                 sizeof (be));
   if (0x0100 != ntohl (be[1])) /* magic marker: blinded */
   {
     GNUNET_break (0);
@@ -808,29 +900,36 @@ extract_blinded_planchet (void *cls,
   }
   res += sizeof (be);
   len -= sizeof (be);
-  bp->cipher = ntohl (be[0]);
-  switch (bp->cipher)
+  bm = GNUNET_new (struct GNUNET_CRYPTO_BlindedMessage);
+  bm->rc = 1;
+  bm->cipher = ntohl (be[0]);
+  switch (bm->cipher)
   {
-  case TALER_DENOMINATION_RSA:
-    bp->details.rsa_blinded_planchet.blinded_msg_size
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    bm->details.rsa_blinded_message.blinded_msg_size
       = len;
-    bp->details.rsa_blinded_planchet.blinded_msg
+    bm->details.rsa_blinded_message.blinded_msg
       = GNUNET_memdup (res,
                        len);
+    bp->blinded_message = bm;
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    if (sizeof (bp->details.cs_blinded_planchet) != len)
+  case GNUNET_CRYPTO_BSA_CS:
+    if (sizeof (bm->details.cs_blinded_message) != len)
     {
       GNUNET_break (0);
+      GNUNET_free (bm);
       return GNUNET_SYSERR;
     }
-    memcpy (&bp->details.cs_blinded_planchet,
-            res,
-            len);
+    GNUNET_memcpy (&bm->details.cs_blinded_message,
+                   res,
+                   len);
+    bp->blinded_message = bm;
     return GNUNET_OK;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_break (0);
+  GNUNET_free (bm);
   return GNUNET_SYSERR;
 }
 
@@ -891,6 +990,7 @@ extract_exchange_withdraw_values (void *cls,
                                   void *dst)
 {
   struct TALER_ExchangeWithdrawValues *alg_values = dst;
+  struct GNUNET_CRYPTO_BlindingInputValues *bi;
   size_t len;
   const char *res;
   int fnum;
@@ -923,9 +1023,9 @@ extract_exchange_withdraw_values (void *cls,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
-  memcpy (&be,
-          res,
-          sizeof (be));
+  GNUNET_memcpy (&be,
+                 res,
+                 sizeof (be));
   if (0x010000 != ntohl (be[1])) /* magic marker: EWV */
   {
     GNUNET_break (0);
@@ -933,29 +1033,37 @@ extract_exchange_withdraw_values (void *cls,
   }
   res += sizeof (be);
   len -= sizeof (be);
-  alg_values->cipher = ntohl (be[0]);
-  switch (alg_values->cipher)
+  bi = GNUNET_new (struct GNUNET_CRYPTO_BlindingInputValues);
+  bi->rc = 1;
+  bi->cipher = ntohl (be[0]);
+  switch (bi->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
     if (0 != len)
     {
       GNUNET_break (0);
+      GNUNET_free (bi);
       return GNUNET_SYSERR;
     }
+    alg_values->blinding_inputs = bi;
     return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    if (sizeof (struct TALER_DenominationCSPublicRPairP) != len)
+  case GNUNET_CRYPTO_BSA_CS:
+    if (sizeof (bi->details.cs_values) != len)
     {
       GNUNET_break (0);
+      GNUNET_free (bi);
       return GNUNET_SYSERR;
     }
-    memcpy (&alg_values->details.cs_values,
-            res,
-            len);
+    GNUNET_memcpy (&bi->details.cs_values,
+                   res,
+                   len);
+    alg_values->blinding_inputs = bi;
     return GNUNET_OK;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_break (0);
+  GNUNET_free (bi);
   return GNUNET_SYSERR;
 }
 
@@ -975,4 +1083,495 @@ TALER_PQ_result_spec_exchange_withdraw_values (
 }
 
 
+/**
+ * Closure for the array result specifications.  Contains type information
+ * for the generic parser extract_array_generic and out-pointers for the results.
+ */
+struct ArrayResultCls
+{
+  /**
+   * Oid of the expected type, must match the oid in the header of the PQResult struct
+   */
+  Oid oid;
+
+  /**
+   * Target type
+   */
+  enum TALER_PQ_ArrayType typ;
+
+  /**
+   * If not 0, defines the expected size of each entry
+   */
+  size_t same_size;
+
+  /**
+   * Out-pointer to write the number of elements in the array
+   */
+  size_t *num;
+
+  /**
+   * Out-pointer. If @a typ is TALER_PQ_array_of_byte and @a same_size is 0,
+   * allocate and put the array of @a num sizes here. NULL otherwise
+   */
+  size_t **sizes;
+
+  /**
+   * DB_connection, needed for OID-lookup for composite types
+   */
+  const struct GNUNET_PQ_Context *db;
+
+  /**
+   * Currency information for amount composites
+   */
+  char currency[TALER_CURRENCY_LEN];
+};
+
+
+/**
+ * Extract data from a Postgres database @a result as array of a specific type
+ * from row @a row.  The type information and optionally additional
+ * out-parameters are given in @a cls which is of type array_result_cls.
+ *
+ * @param cls closure of type array_result_cls
+ * @param result where to extract data from
+ * @param row row to extract data from
+ * @param fname name (or prefix) of the fields to extract from
+ * @param[in,out] dst_size where to store size of result, may be NULL
+ * @param[out] dst where to store the result
+ * @return
+ *   #GNUNET_YES if all results could be extracted
+ *   #GNUNET_SYSERR if a result was invalid (non-existing field or NULL)
+ */
+static enum GNUNET_GenericReturnValue
+extract_array_generic (
+  void *cls,
+  PGresult *result,
+  int row,
+  const char *fname,
+  size_t *dst_size,
+  void *dst)
+{
+  const struct ArrayResultCls *info = cls;
+  int data_sz;
+  char *data;
+  void *out = NULL;
+  struct GNUNET_PQ_ArrayHeader_P header;
+  int col_num;
+
+  GNUNET_assert (NULL != dst);
+  *((void **) dst) = NULL;
+
+  #define FAIL_IF(cond) \
+  do { \
+    if ((cond)) \
+    { \
+      GNUNET_break (! (cond)); \
+      goto FAIL; \
+    } \
+  } while (0)
+
+  col_num = PQfnumber (result, fname);
+  FAIL_IF (0 > col_num);
+
+  data_sz = PQgetlength (result, row, col_num);
+  FAIL_IF (0 > data_sz);
+  FAIL_IF (sizeof(header) > (size_t) data_sz);
+
+  data = PQgetvalue (result, row, col_num);
+  FAIL_IF (NULL == data);
+
+  {
+    struct GNUNET_PQ_ArrayHeader_P *h =
+      (struct GNUNET_PQ_ArrayHeader_P *) data;
+
+    header.ndim = ntohl (h->ndim);
+    header.has_null = ntohl (h->has_null);
+    header.oid = ntohl (h->oid);
+    header.dim = ntohl (h->dim);
+    header.lbound = ntohl (h->lbound);
+
+    FAIL_IF (1 != header.ndim);
+    FAIL_IF (INT_MAX <= header.dim);
+    FAIL_IF (0 != header.has_null);
+    FAIL_IF (1 != header.lbound);
+    FAIL_IF (info->oid != header.oid);
+  }
+
+  if (NULL != info->num)
+    *info->num = header.dim;
+
+  {
+    char *in = data + sizeof(header);
+
+    switch (info->typ)
+    {
+    case TALER_PQ_array_of_amount:
+      {
+        struct TALER_Amount *amounts;
+        if (NULL != dst_size)
+          *dst_size = sizeof(struct TALER_Amount) * (header.dim);
+
+        amounts = GNUNET_new_array (header.dim,
+                                    struct TALER_Amount);
+        *((void **) dst) = amounts;
+
+        for (uint32_t i = 0; i < header.dim; i++)
+        {
+          struct TALER_PQ_AmountP ap;
+          struct TALER_Amount *amount = &amounts[i];
+          uint32_t val;
+          size_t sz;
+
+          GNUNET_memcpy (&val,
+                         in,
+                         sizeof(val));
+          sz =  ntohl (val);
+          in += sizeof(val);
+
+          /* total size for this array-entry */
+          FAIL_IF (sizeof(ap) != sz);
+
+          GNUNET_memcpy (&ap,
+                         in,
+                         sz);
+          FAIL_IF (2 != ntohl (ap.cnt));
+
+          amount->value = GNUNET_ntohll (ap.v);
+          amount->fraction = ntohl (ap.f);
+          GNUNET_memcpy (amount->currency,
+                         info->currency,
+                         TALER_CURRENCY_LEN);
+
+          in += sizeof(struct TALER_PQ_AmountP);
+        }
+        return GNUNET_OK;
+      }
+    case TALER_PQ_array_of_denom_hash:
+      if (NULL != dst_size)
+        *dst_size = sizeof(struct TALER_DenominationHashP) * (header.dim);
+      out = GNUNET_new_array (header.dim,
+                              struct TALER_DenominationHashP);
+      *((void **) dst) = out;
+      for (uint32_t i = 0; i < header.dim; i++)
+      {
+        uint32_t val;
+        size_t sz;
+
+        GNUNET_memcpy (&val,
+                       in,
+                       sizeof(val));
+        sz =  ntohl (val);
+        FAIL_IF (sz != sizeof(struct TALER_DenominationHashP));
+        in += sizeof(uint32_t);
+        *(struct TALER_DenominationHashP *) out =
+          *(struct TALER_DenominationHashP *) in;
+        in += sz;
+        out += sz;
+      }
+      return GNUNET_OK;
+
+    case TALER_PQ_array_of_hash_code:
+      if (NULL != dst_size)
+        *dst_size = sizeof(struct GNUNET_HashCode) * (header.dim);
+      out = GNUNET_new_array (header.dim,
+                              struct GNUNET_HashCode);
+      *((void **) dst) = out;
+      for (uint32_t i = 0; i < header.dim; i++)
+      {
+        uint32_t val;
+        size_t sz;
+
+        GNUNET_memcpy (&val,
+                       in,
+                       sizeof(val));
+        sz =  ntohl (val);
+        FAIL_IF (sz != sizeof(struct GNUNET_HashCode));
+        in += sizeof(uint32_t);
+        *(struct GNUNET_HashCode *) out =
+          *(struct GNUNET_HashCode *) in;
+        in += sz;
+        out += sz;
+      }
+      return GNUNET_OK;
+
+    case TALER_PQ_array_of_blinded_coin_hash:
+      if (NULL != dst_size)
+        *dst_size = sizeof(struct TALER_BlindedCoinHashP) * (header.dim);
+      out = GNUNET_new_array (header.dim,
+                              struct TALER_BlindedCoinHashP);
+      *((void **) dst) = out;
+      for (uint32_t i = 0; i < header.dim; i++)
+      {
+        uint32_t val;
+        size_t sz;
+
+        GNUNET_memcpy (&val,
+                       in,
+                       sizeof(val));
+        sz =  ntohl (val);
+        FAIL_IF (sz != sizeof(struct TALER_BlindedCoinHashP));
+        in += sizeof(uint32_t);
+        *(struct TALER_BlindedCoinHashP *) out =
+          *(struct TALER_BlindedCoinHashP *) in;
+        in += sz;
+        out += sz;
+      }
+      return GNUNET_OK;
+
+    case TALER_PQ_array_of_blinded_denom_sig:
+      {
+        struct TALER_BlindedDenominationSignature *denom_sigs;
+        if (0 == header.dim)
+        {
+          if (NULL != dst_size)
+            *dst_size = 0;
+          break;
+        }
+
+        denom_sigs = GNUNET_new_array (header.dim,
+                                       struct TALER_BlindedDenominationSignature);
+        *((void **) dst) = denom_sigs;
+
+        /* copy data */
+        for (uint32_t i = 0; i < header.dim; i++)
+        {
+          struct TALER_BlindedDenominationSignature *denom_sig = &denom_sigs[i];
+          struct GNUNET_CRYPTO_BlindedSignature *bs;
+          uint32_t be[2];
+          uint32_t val;
+          size_t sz;
+
+          GNUNET_memcpy (&val,
+                         in,
+                         sizeof(val));
+          sz = ntohl (val);
+          FAIL_IF (sizeof(be) > sz);
+
+          in += sizeof(val);
+          GNUNET_memcpy (&be,
+                         in,
+                         sizeof(be));
+          FAIL_IF (0x01 != ntohl (be[1]));  /* magic marker: blinded */
+
+          in += sizeof(be);
+          sz -= sizeof(be);
+          bs = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+          bs->cipher = ntohl (be[0]);
+          bs->rc = 1;
+          switch (bs->cipher)
+          {
+          case GNUNET_CRYPTO_BSA_RSA:
+            bs->details.blinded_rsa_signature
+              = GNUNET_CRYPTO_rsa_signature_decode (in,
+                                                    sz);
+            if (NULL == bs->details.blinded_rsa_signature)
+            {
+              GNUNET_free (bs);
+              FAIL_IF (true);
+            }
+            break;
+          case GNUNET_CRYPTO_BSA_CS:
+            if (sizeof(bs->details.blinded_cs_answer) != sz)
+            {
+              GNUNET_free (bs);
+              FAIL_IF (true);
+            }
+            GNUNET_memcpy (&bs->details.blinded_cs_answer,
+                           in,
+                           sz);
+            break;
+          default:
+            GNUNET_free (bs);
+            FAIL_IF (true);
+          }
+          denom_sig->blinded_sig = bs;
+          in += sz;
+        }
+        return GNUNET_OK;
+      }
+    default:
+      FAIL_IF (true);
+    }
+  }
+FAIL:
+  GNUNET_free (*(void **) dst);
+  return GNUNET_SYSERR;
+#undef FAIL_IF
+}
+
+
+/**
+ * Cleanup of the data and closure of an array spec.
+ */
+static void
+array_cleanup (void *cls,
+               void *rd)
+{
+  struct ArrayResultCls *info = cls;
+  void **dst = rd;
+
+  if ((0 == info->same_size) &&
+      (NULL != info->sizes))
+    GNUNET_free (*(info->sizes));
+
+  /* Clean up signatures, if applicable */
+  if (TALER_PQ_array_of_blinded_denom_sig == info->typ)
+  {
+    struct TALER_BlindedDenominationSignature *denom_sigs = *dst;
+    GNUNET_assert (NULL != info->num);
+    for (size_t i = 0; i < *info->num; i++)
+      GNUNET_free (denom_sigs[i].blinded_sig);
+  }
+
+  GNUNET_free (cls);
+  GNUNET_free (*dst);
+  *dst = NULL;
+}
+
+
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_blinded_denom_sig (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_BlindedDenominationSignature **denom_sigs)
+{
+  struct ArrayResultCls *info = GNUNET_new (struct ArrayResultCls);
+
+  info->num = num;
+  info->typ = TALER_PQ_array_of_blinded_denom_sig;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &info->oid));
+
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = extract_array_generic,
+    .cleaner = array_cleanup,
+    .dst = (void *) denom_sigs,
+    .fname = name,
+    .cls = info
+  };
+  return res;
+
+};
+
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_blinded_coin_hash (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_BlindedCoinHashP **h_coin_evs)
+{
+  struct ArrayResultCls *info = GNUNET_new (struct ArrayResultCls);
+
+  info->num = num;
+  info->typ = TALER_PQ_array_of_blinded_coin_hash;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &info->oid));
+
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = extract_array_generic,
+    .cleaner = array_cleanup,
+    .dst = (void *) h_coin_evs,
+    .fname = name,
+    .cls = info
+  };
+  return res;
+
+};
+
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_denom_hash (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct TALER_DenominationHashP **denom_hs)
+{
+  struct ArrayResultCls *info = GNUNET_new (struct ArrayResultCls);
+
+  info->num = num;
+  info->typ = TALER_PQ_array_of_denom_hash;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "bytea",
+                                            &info->oid));
+
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = extract_array_generic,
+    .cleaner = array_cleanup,
+    .dst = (void *) denom_hs,
+    .fname = name,
+    .cls = info
+  };
+  return res;
+
+};
+
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_amount (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  const char *currency,
+  size_t *num,
+  struct TALER_Amount **amounts)
+{
+  struct ArrayResultCls *info = GNUNET_new (struct ArrayResultCls);
+
+  info->num = num;
+  info->typ = TALER_PQ_array_of_amount;
+  info->db = db;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "taler_amount",
+                                            &info->oid));
+
+  {
+    size_t clen = GNUNET_MIN (TALER_CURRENCY_LEN - 1,
+                              strlen (currency));
+    GNUNET_memcpy (&info->currency,
+                   currency,
+                   clen);
+  }
+
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = extract_array_generic,
+    .cleaner = array_cleanup,
+    .dst = (void *) amounts,
+    .fname = name,
+    .cls = info,
+  };
+  return res;
+}
+
+
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_hash_code (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct GNUNET_HashCode **hashes)
+{
+  struct ArrayResultCls *info = GNUNET_new (struct ArrayResultCls);
+
+  info->num = num;
+  info->typ = TALER_PQ_array_of_hash_code;
+  info->db = db;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_PQ_get_oid_by_name (db,
+                                            "gnunet_hashcode",
+                                            &info->oid));
+
+  struct GNUNET_PQ_ResultSpec res = {
+    .conv = extract_array_generic,
+    .cleaner = array_cleanup,
+    .dst = (void *) hashes,
+    .fname = name,
+    .cls = info,
+  };
+  return res;
+}
+
 /* end of pq_result_helper.c */
diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c
index 52e92b561..0fd2bfddf 100644
--- a/src/pq/test_pq.c
+++ b/src/pq/test_pq.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2015, 2016 Taler Systems SA
+  (C) 2015, 2016, 2023 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
@@ -21,6 +21,7 @@
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_pq_lib.h"
+#include <gnunet/gnunet_pq_lib.h>
 
 
 /**
@@ -29,29 +30,29 @@
  * @param db database handle to initialize
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
-static int
+static enum GNUNET_GenericReturnValue
 postgres_prepare (struct GNUNET_PQ_Context *db)
 {
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("test_insert",
                             "INSERT INTO test_pq ("
-                            " hamount_val"
-                            ",hamount_frac"
-                            ",namount_val"
-                            ",namount_frac"
+                            " tamount"
                             ",json"
+                            ",aamount"
+                            ",tamountc"
+                            ",hash"
+                            ",hashes"
                             ") VALUES "
-                            "($1, $2, $3, $4, $5);",
-                            5),
+                            "($1, $2, $3, $4, $5, $6);"),
     GNUNET_PQ_make_prepare ("test_select",
                             "SELECT"
-                            " hamount_val"
-                            ",hamount_frac"
-                            ",namount_val"
-                            ",namount_frac"
+                            " tamount"
                             ",json"
-                            " FROM test_pq;",
-                            0),
+                            ",aamount"
+                            ",tamountc"
+                            ",hash"
+                            ",hashes"
+                            " FROM test_pq;"),
     GNUNET_PQ_PREPARED_STATEMENT_END
   };
 
@@ -68,33 +69,64 @@ postgres_prepare (struct GNUNET_PQ_Context *db)
 static int
 run_queries (struct GNUNET_PQ_Context *conn)
 {
-  struct TALER_Amount hamount;
-  struct TALER_Amount hamount2;
-  struct TALER_AmountNBO namount;
-  struct TALER_AmountNBO namount2;
-  PGresult *result;
-  int ret;
+  struct TALER_Amount tamount;
+  struct TALER_Amount aamount[3];
+  struct TALER_Amount tamountc;
+  struct GNUNET_HashCode hc =
+  {{0xdeadbeef,0xdeadbeef,0xdeadbeef,0xdeadbeef,
+    0xdeadbeef,0xdeadbeef,0xdeadbeef,0xdeadbeef,
+    0xdeadbeef,0xdeadbeef,0xdeadbeef,0xdeadbeef,
+    0xdeadbeef,0xdeadbeef,0xdeadbeef,0xdeadbeef, }};
+  struct GNUNET_HashCode hcs[2] =
+  {{{0xc0feec0f,0xc0feec0f,0xc0feec0f,0xc0feec0f,
+     0xc0feec0f,0xc0feec0f,0xc0feec0f,0xc0feec0f,
+     0xc0feec0f,0xc0feec0f,0xc0feec0f,0xc0feec0f,
+     0xc0feec0f,0xc0feec0f,0xc0feec0f,0xc0feec0f,}},
+   {{0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,
+     0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,
+     0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,
+     0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,0xdeadbeaf,}}};
   json_t *json;
-  json_t *json2;
 
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount ("EUR:5.5",
-                                         &hamount));
-  TALER_amount_hton (&namount,
-                     &hamount);
+                 TALER_string_to_amount ("EUR:5.3",
+                                         &aamount[0]));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("EUR:6.4",
+                                         &aamount[1]));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("EUR:7.5",
+                                         &aamount[2]));
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount ("EUR:4.4",
-                                         &hamount));
+                 TALER_string_to_amount ("EUR:7.7",
+                                         &tamount));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount ("FOO:8.7",
+                                         &tamountc));
   json = json_object ();
-  json_object_set_new (json, "foo", json_integer (42));
   GNUNET_assert (NULL != json);
+  GNUNET_assert (0 ==
+                 json_object_set_new (json,
+                                      "foo",
+                                      json_integer (42)));
   {
     struct GNUNET_PQ_QueryParam params_insert[] = {
-      TALER_PQ_query_param_amount (&hamount),
-      TALER_PQ_query_param_amount_nbo (&namount),
+      TALER_PQ_query_param_amount (conn,
+                                   &tamount),
       TALER_PQ_query_param_json (json),
+      TALER_PQ_query_param_array_amount (3,
+                                         aamount,
+                                         conn),
+      TALER_PQ_query_param_amount_with_currency (conn,
+                                                 &tamountc),
+      GNUNET_PQ_query_param_fixed_size (&hc,
+                                        sizeof (hc)),
+      TALER_PQ_query_param_array_hash_code (2,
+                                            hcs,
+                                            conn),
       GNUNET_PQ_query_param_end
     };
+    PGresult *result;
 
     result = GNUNET_PQ_exec_prepared (conn,
                                       "test_insert",
@@ -108,55 +140,76 @@ run_queries (struct GNUNET_PQ_Context *conn)
       return 1;
     }
     PQclear (result);
+    json_decref (json);
   }
   {
+    struct TALER_Amount tamount2;
+    struct TALER_Amount tamountc2;
+    struct TALER_Amount *pamount;
+    struct GNUNET_HashCode hc2;
+    struct GNUNET_HashCode *hcs2;
+    size_t npamount;
+    size_t nhcs;
+    json_t *json2;
     struct GNUNET_PQ_QueryParam params_select[] = {
       GNUNET_PQ_query_param_end
     };
+    struct GNUNET_PQ_ResultSpec results_select[] = {
+      TALER_PQ_result_spec_amount ("tamount",
+                                   "EUR",
+                                   &tamount2),
+      TALER_PQ_result_spec_json ("json",
+                                 &json2),
+      TALER_PQ_result_spec_array_amount (conn,
+                                         "aamount",
+                                         "EUR",
+                                         &npamount,
+                                         &pamount),
+      TALER_PQ_result_spec_amount_with_currency ("tamountc",
+                                                 &tamountc2),
+      GNUNET_PQ_result_spec_auto_from_type ("hash",
+                                            &hc2),
+      TALER_PQ_result_spec_array_hash_code (conn,
+                                            "hashes",
+                                            &nhcs,
+                                            &hcs2),
+      GNUNET_PQ_result_spec_end
+    };
 
-    result = GNUNET_PQ_exec_prepared (conn,
-                                      "test_select",
-                                      params_select);
     if (1 !=
-        PQntuples (result))
+        GNUNET_PQ_eval_prepared_singleton_select (conn,
+                                                  "test_select",
+                                                  params_select,
+                                                  results_select))
     {
       GNUNET_break (0);
-      PQclear (result);
       return 1;
     }
-  }
-
-  {
-    struct GNUNET_PQ_ResultSpec results_select[] = {
-      TALER_PQ_result_spec_amount ("hamount", "EUR", &hamount2),
-      TALER_PQ_result_spec_amount_nbo ("namount", "EUR", &namount2),
-      TALER_PQ_result_spec_json ("json", &json2),
-      GNUNET_PQ_result_spec_end
-    };
-
-    ret = GNUNET_PQ_extract_result (result,
-                                    results_select,
-                                    0);
-    GNUNET_break (0 ==
-                  TALER_amount_cmp (&hamount,
-                                    &hamount2));
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_string_to_amount ("EUR:5.5",
-                                           &hamount));
-    TALER_amount_ntoh (&hamount2,
-                       &namount2);
     GNUNET_break (0 ==
-                  TALER_amount_cmp (&hamount,
-                                    &hamount2));
+                  TALER_amount_cmp (&tamount,
+                                    &tamount2));
     GNUNET_break (42 ==
-                  json_integer_value (json_object_get (json2, "foo")));
+                  json_integer_value (json_object_get (json2,
+                                                       "foo")));
+    GNUNET_break (3 == npamount);
+    for (size_t i = 0; i < 3; i++)
+    {
+      GNUNET_break (0 ==
+                    TALER_amount_cmp (&aamount[i],
+                                      &pamount[i]));
+    }
+    GNUNET_break (0 ==
+                  TALER_amount_cmp (&tamountc,
+                                    &tamountc2));
+    GNUNET_break (0 == GNUNET_memcmp (&hc,&hc2));
+    for (size_t i = 0; i < 2; i++)
+    {
+      GNUNET_break (0 ==
+                    GNUNET_memcmp (&hcs[i],
+                                   &hcs2[i]));
+    }
     GNUNET_PQ_cleanup_result (results_select);
-    PQclear (result);
   }
-  json_decref (json);
-  if (GNUNET_OK != ret)
-    return 1;
-
   return 0;
 }
 
@@ -166,12 +219,37 @@ main (int argc,
       const char *const argv[])
 {
   struct GNUNET_PQ_ExecuteStatement es[] = {
+    GNUNET_PQ_make_execute ("DO $$ "
+                            " BEGIN"
+                            " CREATE DOMAIN gnunet_hashcode AS BYTEA"
+                            "   CHECK(length(VALUE)=64);"
+                            " EXCEPTION"
+                            "   WHEN duplicate_object THEN null;"
+                            " END "
+                            "$$;"),
+    GNUNET_PQ_make_execute ("DO $$ "
+                            " BEGIN"
+                            " CREATE TYPE taler_amount AS"
+                            "   (val INT8, frac INT4);"
+                            " EXCEPTION"
+                            "   WHEN duplicate_object THEN null;"
+                            " END "
+                            "$$;"),
+    GNUNET_PQ_make_execute ("DO $$ "
+                            " BEGIN"
+                            " CREATE TYPE taler_amount_currency AS"
+                            "   (val INT8, frac INT4, curr VARCHAR(12));"
+                            " EXCEPTION"
+                            "   WHEN duplicate_object THEN null;"
+                            " END "
+                            "$$;"),
     GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS test_pq ("
-                            " hamount_val INT8 NOT NULL"
-                            ",hamount_frac INT4 NOT NULL"
-                            ",namount_val INT8 NOT NULL"
-                            ",namount_frac INT4 NOT NULL"
+                            " tamount taler_amount NOT NULL"
                             ",json VARCHAR NOT NULL"
+                            ",aamount taler_amount[]"
+                            ",tamountc taler_amount_currency"
+                            ",hash gnunet_hashcode"
+                            ",hashes gnunet_hashcode[]"
                             ")"),
     GNUNET_PQ_EXECUTE_STATEMENT_END
   };
@@ -196,6 +274,7 @@ main (int argc,
     GNUNET_PQ_disconnect (conn);
     return 1;
   }
+
   ret = run_queries (conn);
   {
     struct GNUNET_PQ_ExecuteStatement ds[] = {
diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index d4b2d060d..711e63816 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -150,7 +150,7 @@ qconv_json (void *cls,
   if (SQLITE_OK != sqlite3_bind_text (stmt,
                                       (int) off,
                                       str,
-                                      strlen (str) + 1,
+                                      strlen (str),
                                       SQLITE_TRANSIENT))
     return GNUNET_SYSERR;
   GNUNET_free (str);
diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c
index bacb7743a..9d80837bd 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -23,7 +23,7 @@
 #include <gnunet/gnunet_util_lib.h>
 #include <gnunet/gnunet_sq_lib.h>
 #include "taler_sq_lib.h"
-#include "taler_amount_lib.h"
+#include "taler_util.h"
 
 
 /**
diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c
index 5f715ad6c..8f464faf3 100644
--- a/src/sq/test_sq.c
+++ b/src/sq/test_sq.c
@@ -63,7 +63,11 @@ run_queries (sqlite3 *db)
   TALER_amount_hton (&namount,
                      &hamount);
   json = json_object ();
-  json_object_set_new (json, "foo", json_integer (42));
+  GNUNET_assert (NULL != json);
+  GNUNET_assert (0 ==
+                 json_object_set_new (json,
+                                      "foo",
+                                      json_integer (42)));
   GNUNET_assert (NULL != json);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_SQ_prepare (db,
@@ -152,6 +156,8 @@ main (int argc,
   sqlite3 *db;
   int ret;
 
+  (void) argc;
+  (void) argv;
   GNUNET_log_setup ("test-pq",
                     "WARNING",
                     NULL);
diff --git a/src/templating/.gitignore b/src/templating/.gitignore
new file mode 100644
index 000000000..9ed2f3ff9
--- /dev/null
+++ b/src/templating/.gitignore
@@ -0,0 +1,3 @@
+test_mustach_jansson
+taler-mustach-tool
+mustach
diff --git a/src/templating/AUTHORS b/src/templating/AUTHORS
new file mode 100644
index 000000000..110b36981
--- /dev/null
+++ b/src/templating/AUTHORS
@@ -0,0 +1,38 @@
+Main author:
+ José Bollo <jobol@nonadev.net>
+
+Contributors:
+ Abhishek Mishra
+ Atlas
+ Ben Beasley
+ Christian Grothoff
+ Dominik Kummer
+ Gabriel Zachmann
+ Harold L Marzan
+ Kurt Jung
+ Lailton Fernando Mariano
+ Lucas Ramage
+ Paramtamtam
+ RekGRpth
+ Ryan Fox
+ Sami Kerola
+ Sijmen J. Mulder
+ Steve-Chavez
+ Tomasz Sieprawski
+
+Packagers:
+ pkgsrc: Sijmen J. Mulder
+ alpine linux: Lucas Ramage
+ RPM & DEB: Marcus Hardt
+
+Thanks to issue submitters:
+ Dante Torres
+ @fabbe
+ Felix von Leitner
+ Johann Oskarsson
+ Mark Bucciarelli
+ Nigel Hathaway
+ Paul Wisehart
+ Tarik @tr001
+ Thierry Fournier
+ SASU OKFT
diff --git a/src/templating/CHANGELOG.md b/src/templating/CHANGELOG.md
new file mode 100644
index 000000000..003652ebf
--- /dev/null
+++ b/src/templating/CHANGELOG.md
@@ -0,0 +1,161 @@
+1.2.7 (2024-03-21)
+------------------
+
+New:
+ - fallback to default when mustach_wrap_get_partial
+   returns MUSTACH_ERROR_PARTIAL_NOT_FOUND
+ - remove at compile time the load of files for templates
+   if MUSTACH_LOAD_TEMPLATE is defined as 0
+ - add compile time flag MUSTACH_SAFE for enforcing
+   safety behaviours
+
+Fix:
+ - selection of subitem by index (#47)
+ - get latest iterated key when getting key name (#52)
+ - allow tests without valgrind
+ - avoid recursive template expansion (#55)
+
+1.2.6 (2024-01-08)
+------------------
+
+Fix:
+ - improve naming (#42)
+ - magical spaces in recursive partials (#43)
+ - installation when tool isn't built
+ - correct detection of falsey values (#45)
+
+Minor:
+ - update to newer reference tests
+
+1.2.5 (2023-02-18)
+------------------
+
+Fix:
+ - Don't override CFLAGS in Makefile
+ - Use of $(INSTALL) in Makefile for setting options
+
+Minor:
+ - Orthograf of 'instantiate'
+
+1.2.4 (2023-01-02)
+------------------
+
+Fix:
+ - Latent SIGSEGV using cJSON
+
+1.2.3 (2022-12-21)
+------------------
+
+New:
+ - Flag Mustach_With_ErrorUndefined (and option --strict for the tool)
+   for returning a requested tag is not defined
+ - Test of specifications in separate directory
+
+Fix:
+ - Version printing is now okay
+ - Compiling libraries on Darwin (no soname but install_name)
+ - Compiling test6 with correct flags
+ - Update test from specifications
+ - Better use of valgrind reports
+
+1.2.2 (2021-10-28)
+------------------
+
+Fix:
+ - SONAME of libmustach-json-c.so
+
+1.2.1 (2021-10-19)
+------------------
+
+New:
+ - Add SONAME in libraries.
+ - Flag Mustach_With_PartialDataFirst to switch the
+   policy of resolving partials.
+
+Fix:
+ - Identification of types in cJSON
+
+1.2.0 (2021-08-24)
+------------------
+
+New:
+ - Add hook 'mustach_wrap_get_partial' for handling partials.
+ - Add test of mustache specifications https://github.com/mustache/spec.
+
+Changes:
+ - Mustach_With_SingleDot is always set.
+ - Mustach_With_IncPartial is always set.
+ - Mustach_With_AllExtensions is changed to use currently known extensions.
+ - Output of tests changed.
+ - Makefile improved.
+ - Partials are first searched as file then in current selection.
+ - Improved management of delimiters.
+
+Fixes:
+ - Improved output accordingly to https://github.com/mustache/spec:
+   - escaping of quote "
+   - interpolating null with empty string
+   - removal of empty lines with standalone tag
+   - don't enter section if null
+   - indentation of partials
+ - comment improved for get of mustach_wrap_itf.
+
+1.1.1 (2021-08-19)
+------------------
+Fixes:
+ - Avoid conflicting with getopt.
+ - Remove unexpected build artifact.
+ - Handle correctly a size of 0.
+
+1.1.0 (2021-05-01)
+------------------
+New:
+ - API refactored to take lengths to ease working with partial or 
+   non-NULL-terminated strings. (ABI break)
+
+Fixes:
+ - Use correct int type for jansson (json_int_t instead of int64_t).
+ - JSON output of different backends is now the same.
+
+1.0 (2021-04-28, retracted)
+---------------------------
+Legal:
+ - License changed to ISC.
+
+Fixes:
+ - Possible data leak in memfile_open() by clearing buffers.
+ - Fix build on Solaris-likes by including alloca.h.
+ - Fix Windows build by including malloc.h, using size_t instead of
+   ssize_t, and using the standard ternary operator syntax.
+ - Fix JSON in test3 by using double quote characters.
+ - Fix installation in alternative directories such as
+   /opt/pkg/lib on macOS by setting install_name.
+ - Normalise return values in compare() implementations.
+
+New:
+ - Support for cJSON and jansson libraries.
+ - Version info now embedded at build time and shown with mustach(1) 
+   usage.
+ - Versioned so-names (e.g. libxlsx.so.1.0).
+ - BINDIR, LIBDIR and INCLUDEDIR variables in Makefile.
+ - New mustach-wrap.{c,h} to ease implementation new libraries,
+   extracted and refactored from the existing implementations.
+ - Makefile now supports 3 modes: single libmustach (default), split
+   libmustache-core etc, and both.
+ - Any or all backends (json-c, jansson, etc) can be enabled at compile
+   time. By default, all available libraries are used.
+ - mustach(1) can use any JSON backend instead of only json-c.
+ - MUSTACH_COMPATIBLE_0_99 can be defined for backwards source
+   compatibility.
+ - 'No extensions' can now be set Mustach_With_NoExtensions instead of
+   passing 0.
+ - pkgconfig (.pc) file for library.
+ - Manual page for mustach(1).
+
+Changed:
+ - Many renames.
+ - Maximum tag length increased from 1024 to 4096.
+ - Other headers include json-c.h instead of using forward declarations.
+ - mustach(1) reads from /dev/stdin instead of fd 0.
+ - Several structures are now taken as const.
+ - New/changed Makefile targets.
diff --git a/src/templating/LICENSE.txt b/src/templating/LICENSE.txt
new file mode 100644
index 000000000..495aeefd5
--- /dev/null
+++ b/src/templating/LICENSE.txt
@@ -0,0 +1,14 @@
+
+Copyright (c) 2017-2020 by José Bollo
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT,
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
diff --git a/src/templating/Makefile.am b/src/templating/Makefile.am
new file mode 100644
index 000000000..a79b109d1
--- /dev/null
+++ b/src/templating/Makefile.am
@@ -0,0 +1,132 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LIBGCRYPT_CFLAGS)
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+noinst_PROGRAMS = \
+  taler-mustach-tool
+
+taler_mustach_tool_SOURCES = \
+  mustach-tool.c \
+  mustach-jansson.h
+taler_mustach_tool_LDADD = \
+  libmustach.la \
+  -ljansson
+taler_mustach_tool_CFLAGS = \
+  -DTOOL=MUSTACH_TOOL_JANSSON \
+  -DMUSTACH_SAFE=1 \
+  -DMUSTACH_LOAD_TEMPLATE=0
+
+lib_LTLIBRARIES = \
+  libtalertemplating.la
+
+noinst_LTLIBRARIES = \
+  libmustach.la
+
+libtalertemplating_la_SOURCES = \
+  mustach.c mustach.h \
+  mustach-wrap.c mustach-wrap.h \
+  mustach-jansson.c mustach-jansson.h \
+  templating_api.c
+libtalertemplating_la_LIBADD = \
+  $(top_builddir)/src/mhd/libtalermhd.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  -lmicrohttpd \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+libtalertemplating_la_LDFLAGS = \
+  -version-info 0:0:0 \
+  -no-undefined
+libtalertemplating_la_CFLAGS = \
+  -DMUSTACH_SAFE=1 \
+  -DMUSTACH_LOAD_TEMPLATE=0
+
+libmustach_la_SOURCES = \
+  mustach.c mustach.h \
+  mustach-wrap.c mustach-wrap.h \
+  mustach-jansson.c mustach-jansson.h
+
+test_mustach_jansson_SOURCES = \
+  test_mustach_jansson.c
+test_mustach_jansson_LDADD = \
+  -lgnunetutil \
+  -ljansson \
+  -lmustach \
+  $(XLIB)
+
+check_PROGRAMS = \
+  test_mustach_jansson
+
+TESTS = $(check_PROGRAMS)
+
+EXTRA_DIST = \
+  $(check_SCRIPTS) \
+  mustach-original-Makefile \
+  mustach.1.gz \
+  mustach.1.scd \
+  meson.build \
+  LICENSE.txt \
+  ORIGIN \
+  pkgcfgs \
+  README.md \
+  dotest.sh \
+  AUTHORS \
+  CHANGELOG.md \
+  mustach-json-c.h \
+  mustach-json-c.c \
+  mustach-cjson.h \
+  mustach-cjson.c \
+  test1/json \
+  test1/Makefile \
+  test1/must \
+  test1/resu.ref \
+  test1/vg.ref \
+  test2/json \
+  test2/Makefile \
+  test2/must \
+  test2/resu.ref \
+  test2/vg.ref \
+  test3/json \
+  test3/Makefile \
+  test3/must \
+  test3/resu.ref \
+  test3/vg.ref \
+  test4/json \
+  test4/Makefile \
+  test4/must \
+  test4/resu.ref \
+  test4/vg.ref \
+  test5/json \
+  test5/Makefile \
+  test5/must \
+  test5/must2 \
+  test5/must2.mustache \
+  test5/must3.mustache \
+  test5/resu.ref \
+  test5/vg.ref \
+  test6/json \
+  test6/Makefile \
+  test6/must \
+  test6/resu.ref \
+  test6/test-custom-write.c \
+  test6/vg.ref \
+  test7/base.mustache \
+  test7/json \
+  test7/Makefile \
+  test7/node.mustache \
+  test7/resu.ref \
+  test7/vg.ref \
+  test8/json \
+  test8/Makefile \
+  test8/must \
+  test8/resu.ref \
+  test8/vg.ref \
+  test-specs/test-specs.c \
+  test-specs/test-specs-cjson.ref \
+  test-specs/test-specs-jansson.ref \
+  test-specs/test-specs-json-c.ref
diff --git a/src/templating/ORIGIN b/src/templating/ORIGIN
new file mode 100644
index 000000000..14902983a
--- /dev/null
+++ b/src/templating/ORIGIN
@@ -0,0 +1,11 @@
+Cloned originally from https://gitlab.com/jobol/mustach/
+
+Changes:
+========
+
+Renamed original Makefile to mustach-original-Makefile
+and wrote Makefile.am for us.
+
+Added run-original-tests.sh shell script as a wrapper around
+mustach-original-Makefile to use the original build process for the test
+suite.
diff --git a/src/templating/README.md b/src/templating/README.md
new file mode 100644
index 000000000..6e7a6c956
--- /dev/null
+++ b/src/templating/README.md
@@ -0,0 +1,320 @@
+# Introduction to Mustach 1.2
+
+`mustach` is a C implementation of the [mustache](http://mustache.github.io "main site for mustache")
+template specification.
+
+The main site for `mustach` is on [gitlab](https://gitlab.com/jobol/mustach).
+
+The simplest way to use mustach is to copy the files **mustach.h** and **mustach.c**
+directly into your project and use it.
+
+If you are using one of the JSON libraries listed below, you can get extended feature
+by also including **mustach-wrap.h**, **mustach-wrap.c**, **mustach-XXX.h** and
+**mustach-XXX.c** in your project (see below for **XXX**)
+
+- [json-c](https://github.com/json-c/json-c): use **XXX** = **json-c**
+- [jansson](http://www.digip.org/jansson/): use **XXX** = **jansson**
+- [cJSON](https://github.com/DaveGamble/cJSON): use **XXX** = **cjson**
+
+Alternatively, make and meson files are provided for building `mustach` and
+`libmustach.so` shared library.
+
+Since version 1.0, the makefile allows to compile and install different
+flavours. See below for details.
+
+## Distributions offering mustach package
+
+### Alpine Linux
+
+```sh
+apk add mustach
+apk add mustach-lib
+apk add mustach-dev
+```
+
+### NetBSD
+
+```sh
+cd devel/mustach
+make
+```
+
+See http://pkgsrc.se/devel/mustach
+
+## Known projects using Mustach
+
+This [wiki page](https://gitlab.com/jobol/mustach/-/wikis/projects-using-mustach)
+lists the known project that are using mustach and that kindly told it.
+
+Don't hesitate to tell us if you are interested to be listed there.
+
+## Using Mustach from sources
+
+The file **mustach.h** is the main documentation. Look at it.
+
+The current source files are:
+
+- **mustach.c** core implementation of mustache in C
+- **mustach.h** header file for core definitions
+- **mustach-wrap.c** generic wrapper of mustach for easier integration
+- **mustach-wrap.h** header file for using mustach-wrap
+- **mustach-json-c.c** tiny json wrapper of mustach using [json-c](https://github.com/json-c/json-c)
+- **mustach-json-c.h** header file for using the tiny json-c wrapper
+- **mustach-cjson.c** tiny json wrapper of mustach using [cJSON](https://github.com/DaveGamble/cJSON)
+- **mustach-cjson.h** header file for using the tiny cJSON wrapper
+- **mustach-jansson.c** tiny json wrapper of mustach using [jansson](https://www.digip.org/jansson/)
+- **mustach-jansson.h** header file for using the tiny jansson wrapper
+- **mustach-tool.c** simple tool for applying template files to one JSON file
+
+The file **mustach-json-c.c** is the historical example of use of **mustach** and
+**mustach-wrap** core and it is also a practical implementation that can be used.
+It uses the library json-c. (NOTE for Mac OS: available through homebrew).
+
+Since version 1.0, the project also provide integration of other JSON libraries:
+**cJSON** and **jansson**.
+
+*If you integrate a new library with* **mustach**, *your contribution will be
+welcome here*.
+
+The tool **mustach** is build using `make`,  its usage is:
+
+    mustach json template [template]...
+
+It then outputs the result of applying the templates files to the JSON file.
+
+### Portability
+
+Some system does not provide *open_memstream*. In that case, tell your
+preferred compiler to declare the preprocessor symbol **NO_OPEN_MEMSTREAM**.
+Example:
+
+	CFLAGS=-DNO_OPEN_MEMSTREAM make
+
+### Integration
+
+The files **mustach.h** and **mustach-wrap.h** are the main documentation. Look at it.
+
+The file **mustach-json-c.c** provides a good example of integration.
+
+If you intend to use basic HTML/XML escaping and standard C FILE, the callbacks
+of the interface **mustach_itf** that you have to implement are:
+`enter`, `next`, `leave`, `get`.
+
+If you intend to use specific escaping and/or specific output, the callbacks
+of the interface **mustach_itf** that you have to implement are:
+`enter`, `next`, `leave`, `get` and `emit`.
+
+### Compilation Using Make
+
+Building and installing can be done using make.
+
+Example:
+
+    $ make tool=cjson libs=none PREFIX=/usr/local DESTDIR=/ install
+    $ make tool=jsonc libs=single PREFIX=/ DESTDIR=$HOME/.local install
+
+The makefile knows following switches (\*: default):
+
+     Switch name  | Values  | Description
+    --------------+---------+-----------------------------------------------
+     jsonc        | (unset) | Auto detection of json-c
+                  | no      | Don't compile for json-c
+                  | yes     | Compile for json-c that must exist
+    --------------+---------+-----------------------------------------------
+     cjson        | (unset) | Auto detection of cJSON
+                  | no      | Don't compile for cJSON
+                  | yes     | Compile for cJSON that must exist
+    --------------+---------+-----------------------------------------------
+     jansson      | (unset) | Auto detection of jansson
+                  | no      | Don't compile for jansson
+                  | yes     | Compile for jansson that must exist
+    --------------+---------+-----------------------------------------------
+     tool         | (unset) | Auto detection
+                  | cjson   | Use cjson library
+                  | jsonc   | Use jsonc library
+                  | jansson | Use jansson library
+                  | none    | Don't compile the tool
+    --------------+---------+----------------------------------------------
+     libs         | (unset) | Like 'all'
+                  | all     | Like 'single' AND 'split'
+                  | single  | Only libmustach.so
+                  | split   | All the possible libmustach-XXX.so ...
+                  | none    | No library is produced
+
+The libraries that can be produced are:
+
+     Library name       | Content
+    --------------------+--------------------------------------------------------
+     libmustach-core    | mustach.c mustach-wrap.c
+     libmustach-cjson   | mustach.c mustach-wrap.c mustach-cjson.c
+     libmustach-jsonc   | mustach.c mustach-wrap.c mustach-json-c.c
+     libmustach-jansson | mustach.c mustach-wrap.c mustach-jansson.c
+     libmustach         | mustach.c mustach-wrap.c mustach-{cjson,json-c,jansson}.c
+
+There is no dependencies of a library to an other. This is intended and doesn't
+hurt today because the code is small.
+
+### Testing
+
+The makefile offers the way to execute basic tests. Just type `make test`.
+
+By default, if valgrind is available, tests are using it. It can be disabled
+by typing `make test valgrind=no` or `NOVALGRIND=1 make test`.
+
+## Extensions
+
+The current implementation provides extensions to specifications of **mustache**.
+This extensions can be activated or deactivated using flags.
+
+Here is the summary.
+
+     Flag name                     | Description
+    -------------------------------+------------------------------------------------
+     Mustach_With_Colon            | Explicit tag substitution with colon
+     Mustach_With_EmptyTag         | Empty Tag Allowed
+    -------------------------------+------------------------------------------------
+     Mustach_With_Equal            | Value Testing Equality
+     Mustach_With_Compare          | Value Comparing
+     Mustach_With_JsonPointer      | Interpret JSON Pointers
+     Mustach_With_ObjectIter       | Iteration On Objects
+     Mustach_With_EscFirstCmp      | Escape First Compare
+     Mustach_With_ErrorUndefined   | Error when a requested tag is undefined
+    -------------------------------+------------------------------------------------
+     Mustach_With_AllExtensions    | Activate all known extensions
+     Mustach_With_NoExtensions     | Disable any extension
+
+For the details, see below.
+
+### Explicit Tag Substitution With Colon (Mustach_With_Colon)
+
+In somecases the name of the key used for substitution begins with a
+character reserved for mustach: one of `#`, `^`, `/`, `&`, `{`, `>` and `=`.
+
+This extension introduces the special character `:` to explicitly
+tell mustach to just substitute the value. So `:` becomes a new special
+character.
+
+This is a core extension implemented in file **mustach.c**.
+
+### Empty Tag Allowed (Mustach_With_EmptyTag)
+
+When an empty tag is found, instead of automatically raising the error
+MUSTACH\_ERROR\_EMPTY\_TAG pass it.
+
+This is a core extension implemented in file **mustach.c**.
+
+### Value Testing Equality (Mustach_With_Equal)
+
+This extension allows you to test the value of the selected key.
+It allows to write `key=value` (matching test) or `key=!value`
+(not matching test) in any query.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Value Comparing (Mustach_With_Compare)
+
+These extension extends the extension for testing equality to also
+compare values if greater or lesser.
+Its allows to write `key>value` (greater), `key>=value` (greater or equal),
+`key<value` (lesser) and `key<=value` (lesser or equal).
+
+It the comparator sign appears in the first column it is ignored
+as if it was escaped.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Interpret JSON Pointers (Mustach_With_JsonPointer)
+
+This extension allows to use JSON pointers as defined in IETF RFC 6901.
+If active, any key starting with "/" is a JSON pointer.
+This implies to use the colon to introduce JSON keys.
+
+A special escaping is used for `=`, `<`, `>` signs when
+values comparisons are enabled: `~=` gives `=` in the key.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Iteration On Objects (Mustach_With_ObjectIter)
+
+With this extension, using the pattern `{{#X.*}}...{{/X.*}}`
+allows to iterate on fields of `X`.
+
+Example:
+
+- `{{s.*}} {{*}}:{{.}}{{/s.*}}` applied on `{"s":{"a":1,"b":true}}` produces ` a:1 b:true`
+
+Here the single star `{{*}}` is replaced by the iterated key
+and the single dot `{{.}}` is replaced by its value.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Error when a requested tag is undefined (Mustach_With_ErrorUndefined)
+
+Report the error MUSTACH_ERROR_UNDEFINED_TAG when a requested tag
+is not defined.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Access To Current Value
+
+*this was an extension but is now always enforced*
+
+The value of the current field can be accessed using single dot.
+
+Examples:
+
+- `{{#key}}{{.}}{{/key}}` applied to `{"key":3.14}` produces `3.14`
+- `{{#array}} {{.}}{{/array}}` applied to `{"array":[1,2]}` produces ` 1 2`.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Partial Data First
+
+*this was an extension but is now always enforced*
+
+The default resolution for partial pattern like `{{> name}}`
+is to search for `name` in the current json context and
+as a file named `name` or if not found `name.mustache`.
+
+By default, the order of the search is (1) as a file,
+and if not found, (2) in the current json context.
+
+When this option is set, the order is reverted and content
+of partial is search (1) in the current json context,
+and if not found, (2) as a file.
+
+That option is useful to keep the compatibility with
+versions of *mustach* anteriors to 1.2.0.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+### Escape First Compare
+
+This extension automatically escapes comparisons appears as
+first characters.
+
+This is a wrap extension implemented in file **mustach-wrap.c**.
+
+## Difference with version 0.99 and previous
+
+### Extensions
+
+The extensions can no more be removed at compile time, use
+flags to select your required extension on need.
+
+### Name of functions
+
+Names of functions were improved. Old names remain but are obsolete
+and legacy. Their removal in far future versions is possible.
+
+The table below summarize the changes.
+
+     legacy name      | name since version 1.0.0
+    ------------------+-----------------------
+     fmustach         | mustach_file
+     fdmustach        | mustach_fd
+     mustach          | mustach_mem
+     fmustach_json_c  | mustach_json_c_file
+     fdmustach_json_c | mustach_json_c_fd
+     mustach_json_c   | mustach_json_c_mem
+     mustach_json_c   | mustach_json_c_write
diff --git a/src/templating/dotest.sh b/src/templating/dotest.sh
new file mode 100755
index 000000000..32f575c2e
--- /dev/null
+++ b/src/templating/dotest.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Exit, with error message (hard failure)
+exit_fail() {
+    echo " FAIL: " "$@" >&2
+    exit 1
+}
+
+mustach="${mustach:-../mustach}"
+echo "starting test"
+if ! valgrind --version 2> /dev/null
+then
+	$mustach "$@" > resu.last || exit_fail "ERROR! mustach command failed ($?)!"
+else
+	valgrind $mustach "$@" > resu.last 2> vg.last || exit_fail "ERROR! valgrind + mustach command failed ($?)!"
+	sed -i 's:^==[0-9]*== ::' vg.last
+	awk '/^ *total heap usage: .* allocs, .* frees,.*/{if($$4-$$6)exit(1)}' vg.last || exit_fail "ERROR! Alloc/Free issue"
+fi
+if diff -w resu.ref resu.last
+then
+	echo "result ok"
+else
+	exit_fail "ERROR! Result differs"
+fi
+echo
+exit 0
diff --git a/src/templating/meson.build b/src/templating/meson.build
new file mode 100644
index 000000000..c7ecc8dfc
--- /dev/null
+++ b/src/templating/meson.build
@@ -0,0 +1,12 @@
+project('mustach', 'c',
+    version: '1.0.0'
+)
+
+mustach_inc = include_directories('.')
+mustach_lib = shared_library('mustach',
+    'mustach.c',
+    include_directories: mustach_inc
+)
+
+mustach_dep = declare_dependency(link_with: mustach_lib,
+    include_directories: mustach_inc)
diff --git a/src/templating/mustach-cjson.c b/src/templating/mustach-cjson.c
new file mode 100644
index 000000000..ee65c8038
--- /dev/null
+++ b/src/templating/mustach-cjson.c
@@ -0,0 +1,258 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "mustach.h"
+#include "mustach-wrap.h"
+#include "mustach-cjson.h"
+
+struct expl {
+	cJSON null;
+	cJSON *root;
+	cJSON *selection;
+	int depth;
+	struct {
+		cJSON *cont;
+		cJSON *obj;
+		cJSON *next;
+		int is_objiter;
+	} stack[MUSTACH_MAX_DEPTH];
+};
+
+static int start(void *closure)
+{
+	struct expl *e = closure;
+	e->depth = 0;
+	memset(&e->null, 0, sizeof e->null);
+	e->null.type = cJSON_NULL;
+	e->selection = &e->null;
+	e->stack[0].cont = NULL;
+	e->stack[0].obj = e->root;
+	return MUSTACH_OK;
+}
+
+static int compare(void *closure, const char *value)
+{
+	struct expl *e = closure;
+	cJSON *o = e->selection;
+	double d;
+
+	if (cJSON_IsNumber(o)) {
+		d = o->valuedouble - atof(value);
+		return d < 0 ? -1 : d > 0 ? 1 : 0;
+	} else if (cJSON_IsString(o)) {
+		return strcmp(o->valuestring, value);
+	} else if (cJSON_IsTrue(o)) {
+		return strcmp("true", value);
+	} else if (cJSON_IsFalse(o)) {
+		return strcmp("false", value);
+	} else if (cJSON_IsNull(o)) {
+		return strcmp("null", value);
+	} else {
+		return 1;
+	}
+}
+
+static int sel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	cJSON *o;
+	int i, r;
+
+	if (name == NULL) {
+		o = e->stack[e->depth].obj;
+		r = 1;
+	} else {
+		i = e->depth;
+		while (i >= 0 && !(o = cJSON_GetObjectItemCaseSensitive(e->stack[i].obj, name)))
+			i--;
+		if (i >= 0)
+			r = 1;
+		else {
+			o = &e->null;
+			r = 0;
+		}
+	}
+	e->selection = o;
+	return r;
+}
+
+static int subsel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	cJSON *o = NULL;
+	int r = 0;
+
+	if (cJSON_IsObject(e->selection)) {
+		o = cJSON_GetObjectItemCaseSensitive(e->selection, name);
+		r = o != NULL;
+	}
+	else if (cJSON_IsArray(e->selection) && *name) {
+		char *end;
+		int idx = (int)strtol(name, &end, 10);
+		if (!*end && idx >= 0 && idx < cJSON_GetArraySize(e->selection)) {
+			o = cJSON_GetArrayItem(e->selection, idx);
+			r = 1;
+		}
+	}
+	if (r)
+		e->selection = o;
+	return r;
+}
+
+static int enter(void *closure, int objiter)
+{
+	struct expl *e = closure;
+	cJSON *o;
+
+	if (++e->depth >= MUSTACH_MAX_DEPTH)
+		return MUSTACH_ERROR_TOO_DEEP;
+
+	o = e->selection;
+	e->stack[e->depth].is_objiter = 0;
+	if (objiter) {
+		if (! cJSON_IsObject(o))
+			goto not_entering;
+		if (o->child == NULL)
+			goto not_entering;
+		e->stack[e->depth].obj = o->child;
+		e->stack[e->depth].next = o->child->next;
+		e->stack[e->depth].cont = o;
+		e->stack[e->depth].is_objiter = 1;
+	} else if (cJSON_IsArray(o)) {
+		if (o->child == NULL)
+			goto not_entering;
+		e->stack[e->depth].obj = o->child;
+		e->stack[e->depth].next = o->child->next;
+		e->stack[e->depth].cont = o;
+	} else if ((cJSON_IsObject(o) && o->child != NULL)
+	        || cJSON_IsTrue(o)
+	        || (cJSON_IsString(o) && cJSON_GetStringValue(o)[0] != '\0')
+	        || (cJSON_IsNumber(o) && cJSON_GetNumberValue(o) != 0)) {
+		e->stack[e->depth].obj = o;
+		e->stack[e->depth].cont = NULL;
+		e->stack[e->depth].next = NULL;
+	} else
+		goto not_entering;
+	return 1;
+
+not_entering:
+	e->depth--;
+	return 0;
+}
+
+static int next(void *closure)
+{
+	struct expl *e = closure;
+	cJSON *o;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	o = e->stack[e->depth].next;
+	if (o == NULL)
+		return 0;
+
+	e->stack[e->depth].obj = o;
+	e->stack[e->depth].next = o->next;
+	return 1;
+}
+
+static int leave(void *closure)
+{
+	struct expl *e = closure;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	e->depth--;
+	return 0;
+}
+
+static int get(void *closure, struct mustach_sbuf *sbuf, int key)
+{
+	struct expl *e = closure;
+	const char *s;
+	int d;
+
+	if (key) {
+		s = "";
+		for (d = e->depth ; d >= 0 ; d--)
+			if (e->stack[d].is_objiter) {
+				s = e->stack[d].obj->string;
+				break;
+			}
+	}
+	else if (cJSON_IsString(e->selection))
+		s = e->selection->valuestring;
+	else if (cJSON_IsNull(e->selection))
+		s = "";
+	else {
+		s = cJSON_PrintUnformatted(e->selection);
+		if (s == NULL)
+			return MUSTACH_ERROR_SYSTEM;
+		sbuf->freecb = cJSON_free;
+	}
+	sbuf->value = s;
+	return 1;
+}
+
+const struct mustach_wrap_itf mustach_cJSON_wrap_itf = {
+	.start = start,
+	.stop = NULL,
+	.compare = compare,
+	.sel = sel,
+	.subsel = subsel,
+	.enter = enter,
+	.next = next,
+	.leave = leave,
+	.get = get
+};
+
+int mustach_cJSON_file(const char *template, size_t length, cJSON *root, int flags, FILE *file)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_file(template, length, &mustach_cJSON_wrap_itf, &e, flags, file);
+}
+
+int mustach_cJSON_fd(const char *template, size_t length, cJSON *root, int flags, int fd)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_fd(template, length, &mustach_cJSON_wrap_itf, &e, flags, fd);
+}
+
+int mustach_cJSON_mem(const char *template, size_t length, cJSON *root, int flags, char **result, size_t *size)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_mem(template, length, &mustach_cJSON_wrap_itf, &e, flags, result, size);
+}
+
+int mustach_cJSON_write(const char *template, size_t length, cJSON *root, int flags, mustach_write_cb_t *writecb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_write(template, length, &mustach_cJSON_wrap_itf, &e, flags, writecb, closure);
+}
+
+int mustach_cJSON_emit(const char *template, size_t length, cJSON *root, int flags, mustach_emit_cb_t *emitcb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_emit(template, length, &mustach_cJSON_wrap_itf, &e, flags, emitcb, closure);
+}
+
diff --git a/src/templating/mustach-cjson.h b/src/templating/mustach-cjson.h
new file mode 100644
index 000000000..e049415f8
--- /dev/null
+++ b/src/templating/mustach-cjson.h
@@ -0,0 +1,96 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _mustach_cJSON_h_included_
+#define _mustach_cJSON_h_included_
+
+/*
+ * mustach-cjson is intended to make integration of cJSON
+ * library by providing integrated functions.
+ */
+
+#include <cjson/cJSON.h>
+#include "mustach-wrap.h"
+
+/**
+ * Wrap interface used internally by mustach cJSON functions.
+ * Can be used for overriding behaviour.
+ */
+extern const struct mustach_wrap_itf mustach_cJSON_wrap_itf;
+
+/**
+ * mustach_cJSON_file - Renders the mustache 'template' in 'file' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_cJSON_file(const char *template, size_t length, cJSON *root, int flags, FILE *file);
+
+/**
+ * mustach_cJSON_fd - Renders the mustache 'template' in 'fd' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_cJSON_fd(const char *template, size_t length, cJSON *root, int flags, int fd);
+
+
+/**
+ * mustach_cJSON_mem - Renders the mustache 'template' in 'result' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_cJSON_mem(const char *template, size_t length, cJSON *root, int flags, char **result, size_t *size);
+
+/**
+ * mustach_cJSON_write - Renders the mustache 'template' for 'root' to custom writer 'writecb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @writecb:  the function that write values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_cJSON_write(const char *template, size_t length, cJSON *root, int flags, mustach_write_cb_t *writecb, void *closure);
+
+/**
+ * mustach_cJSON_emit - Renders the mustache 'template' for 'root' to custom emiter 'emitcb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @emitcb:   the function that emit values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_cJSON_emit(const char *template, size_t length, cJSON *root, int flags, mustach_emit_cb_t *emitcb, void *closure);
+
+#endif
+
diff --git a/src/templating/mustach-jansson.c b/src/templating/mustach-jansson.c
new file mode 100644
index 000000000..d9b50b57e
--- /dev/null
+++ b/src/templating/mustach-jansson.c
@@ -0,0 +1,271 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "mustach.h"
+#include "mustach-wrap.h"
+#include "mustach-jansson.h"
+
+struct expl {
+	json_t *root;
+	json_t *selection;
+	int depth;
+	struct {
+		json_t *cont;
+		json_t *obj;
+		void *iter;
+		int is_objiter;
+		size_t index, count;
+	} stack[MUSTACH_MAX_DEPTH];
+};
+
+static int start(void *closure)
+{
+	struct expl *e = closure;
+	e->depth = 0;
+	e->selection = json_null();
+	e->stack[0].cont = NULL;
+	e->stack[0].obj = e->root;
+	e->stack[0].index = 0;
+	e->stack[0].count = 1;
+	return MUSTACH_OK;
+}
+
+static int compare(void *closure, const char *value)
+{
+	struct expl *e = closure;
+	json_t *o = e->selection;
+	double d;
+	json_int_t i;
+
+	switch (json_typeof(o)) {
+	case JSON_REAL:
+		d = json_number_value(o) - atof(value);
+		return d < 0 ? -1 : d > 0 ? 1 : 0;
+	case JSON_INTEGER:
+		i = (json_int_t)json_integer_value(o) - (json_int_t)atoll(value);
+		return i < 0 ? -1 : i > 0 ? 1 : 0;
+	case JSON_STRING:
+		return strcmp(json_string_value(o), value);
+	case JSON_TRUE:
+		return strcmp("true", value);
+	case JSON_FALSE:
+		return strcmp("false", value);
+	case JSON_NULL:
+		return strcmp("null", value);
+	default:
+		return 1;
+	}
+}
+
+static int sel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	json_t *o;
+	int i, r;
+
+	if (name == NULL) {
+		o = e->stack[e->depth].obj;
+		r = 1;
+	} else {
+		i = e->depth;
+		while (i >= 0 && !(o = json_object_get(e->stack[i].obj, name)))
+			i--;
+		if (i >= 0)
+			r = 1;
+		else {
+			o = json_null();
+			r = 0;
+		}
+	}
+	e->selection = o;
+	return r;
+}
+
+static int subsel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	json_t *o = NULL;
+	int r = 0;
+
+	if (json_is_object(e->selection)) {
+		o = json_object_get(e->selection, name);
+		r = o != NULL;
+	}
+	else if (json_is_array(e->selection)) {
+		char *end;
+		size_t idx = (size_t)strtol(name, &end, 10);
+		if (!*end && idx < json_array_size(e->selection)) {
+			o = json_array_get(e->selection, idx);
+			r = 1;
+		}		
+	}
+	if (r)
+		e->selection = o;
+	return r;
+}
+
+static int enter(void *closure, int objiter)
+{
+	struct expl *e = closure;
+	json_t *o;
+
+	if (++e->depth >= MUSTACH_MAX_DEPTH)
+		return MUSTACH_ERROR_TOO_DEEP;
+
+	o = e->selection;
+	e->stack[e->depth].is_objiter = 0;
+	if (objiter) {
+		if (!json_is_object(o))
+			goto not_entering;
+		e->stack[e->depth].iter = json_object_iter(o);
+		if (e->stack[e->depth].iter == NULL)
+			goto not_entering;
+		e->stack[e->depth].obj = json_object_iter_value(e->stack[e->depth].iter);
+		e->stack[e->depth].cont = o;
+		e->stack[e->depth].is_objiter = 1;
+	} else if (json_is_array(o)) {
+		e->stack[e->depth].count = json_array_size(o);
+		if (e->stack[e->depth].count == 0)
+			goto not_entering;
+		e->stack[e->depth].cont = o;
+		e->stack[e->depth].obj = json_array_get(o, 0);
+		e->stack[e->depth].index = 0;
+	} else if ((json_is_object(o) && json_object_size(o))
+                || json_is_true(o)
+	        || (json_is_string(o) && json_string_length(o) > 0)
+	        || (json_is_integer(o) && json_integer_value(o) != 0)
+	        || (json_is_real(o) && json_real_value(o) != 0)) {
+		e->stack[e->depth].count = 1;
+		e->stack[e->depth].cont = NULL;
+		e->stack[e->depth].obj = o;
+		e->stack[e->depth].index = 0;
+	} else
+		goto not_entering;
+	return 1;
+
+not_entering:
+	e->depth--;
+	return 0;
+}
+
+static int next(void *closure)
+{
+	struct expl *e = closure;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	if (e->stack[e->depth].is_objiter) {
+		e->stack[e->depth].iter = json_object_iter_next(e->stack[e->depth].cont, e->stack[e->depth].iter);
+		if (e->stack[e->depth].iter == NULL)
+			return 0;
+		e->stack[e->depth].obj = json_object_iter_value(e->stack[e->depth].iter);
+		return 1;
+	}
+
+	e->stack[e->depth].index++;
+	if (e->stack[e->depth].index >= e->stack[e->depth].count)
+		return 0;
+
+	e->stack[e->depth].obj = json_array_get(e->stack[e->depth].cont, e->stack[e->depth].index);
+	return 1;
+}
+
+static int leave(void *closure)
+{
+	struct expl *e = closure;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	e->depth--;
+	return 0;
+}
+
+static int get(void *closure, struct mustach_sbuf *sbuf, int key)
+{
+	struct expl *e = closure;
+	const char *s;
+	int d;
+
+	if (key) {
+		s = "";
+		for (d = e->depth ; d >= 0 ; d--)
+			if (e->stack[d].is_objiter) {
+				s = json_object_iter_key(e->stack[d].iter);
+				break;
+			}
+	}
+	else if (json_is_string(e->selection))
+		s = json_string_value(e->selection);
+	else if (json_is_null(e->selection))
+		s = "";
+	else {
+		s = json_dumps(e->selection, JSON_ENCODE_ANY | JSON_COMPACT);
+		if (s == NULL)
+			return MUSTACH_ERROR_SYSTEM;
+		sbuf->freecb = free;
+	}
+	sbuf->value = s;
+	return 1;
+}
+
+const struct mustach_wrap_itf mustach_jansson_wrap_itf = {
+	.start = start,
+	.stop = NULL,
+	.compare = compare,
+	.sel = sel,
+	.subsel = subsel,
+	.enter = enter,
+	.next = next,
+	.leave = leave,
+	.get = get
+};
+
+int mustach_jansson_file(const char *template, size_t length, json_t *root, int flags, FILE *file)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_file(template, length, &mustach_jansson_wrap_itf, &e, flags, file);
+}
+
+int mustach_jansson_fd(const char *template, size_t length, json_t *root, int flags, int fd)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_fd(template, length, &mustach_jansson_wrap_itf, &e, flags, fd);
+}
+
+int mustach_jansson_mem(const char *template, size_t length, json_t *root, int flags, char **result, size_t *size)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_mem(template, length, &mustach_jansson_wrap_itf, &e, flags, result, size);
+}
+
+int mustach_jansson_write(const char *template, size_t length, json_t *root, int flags, mustach_write_cb_t *writecb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_write(template, length, &mustach_jansson_wrap_itf, &e, flags, writecb, closure);
+}
+
+int mustach_jansson_emit(const char *template, size_t length, json_t *root, int flags, mustach_emit_cb_t *emitcb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_emit(template, length, &mustach_jansson_wrap_itf, &e, flags, emitcb, closure);
+}
+
diff --git a/src/templating/mustach-jansson.h b/src/templating/mustach-jansson.h
new file mode 100644
index 000000000..8def948e0
--- /dev/null
+++ b/src/templating/mustach-jansson.h
@@ -0,0 +1,96 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _mustach_jansson_h_included_
+#define _mustach_jansson_h_included_
+
+/*
+ * mustach-jansson is intended to make integration of jansson
+ * library by providing integrated functions.
+ */
+
+#include <jansson.h>
+#include "mustach-wrap.h"
+
+/**
+ * Wrap interface used internally by mustach jansson functions.
+ * Can be used for overriding behaviour.
+ */
+extern const struct mustach_wrap_itf mustach_jansson_wrap_itf;
+
+/**
+ * mustach_jansson_file - Renders the mustache 'template' in 'file' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_jansson_file(const char *template, size_t length, json_t *root, int flags, FILE *file);
+
+/**
+ * mustach_jansson_fd - Renders the mustache 'template' in 'fd' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_jansson_fd(const char *template, size_t length, json_t *root, int flags, int fd);
+
+
+/**
+ * mustach_jansson_mem - Renders the mustache 'template' in 'result' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_jansson_mem(const char *template, size_t length, json_t *root, int flags, char **result, size_t *size);
+
+/**
+ * mustach_jansson_write - Renders the mustache 'template' for 'root' to custom writer 'writecb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @writecb:  the function that write values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_jansson_write(const char *template, size_t length, json_t *root, int flags, mustach_write_cb_t *writecb, void *closure);
+
+/**
+ * mustach_jansson_emit - Renders the mustache 'template' for 'root' to custom emiter 'emitcb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @emitcb:   the function that emit values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_jansson_emit(const char *template, size_t length, json_t *root, int flags, mustach_emit_cb_t *emitcb, void *closure);
+
+#endif
+
diff --git a/src/templating/mustach-json-c.c b/src/templating/mustach-json-c.c
new file mode 100644
index 000000000..75251c07e
--- /dev/null
+++ b/src/templating/mustach-json-c.c
@@ -0,0 +1,284 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#include "mustach.h"
+#include "mustach-wrap.h"
+#include "mustach-json-c.h"
+
+struct expl {
+	struct json_object *root;
+	struct json_object *selection;
+	int depth;
+	struct {
+		struct json_object *cont;
+		struct json_object *obj;
+		struct json_object_iterator iter;
+		struct json_object_iterator enditer;
+		int is_objiter;
+		int index, count;
+	} stack[MUSTACH_MAX_DEPTH];
+};
+
+static int start(void *closure)
+{
+	struct expl *e = closure;
+	e->depth = 0;
+	e->selection = NULL;
+	e->stack[0].cont = NULL;
+	e->stack[0].obj = e->root;
+	e->stack[0].index = 0;
+	e->stack[0].count = 1;
+	return MUSTACH_OK;
+}
+
+static int compare(void *closure, const char *value)
+{
+	struct expl *e = closure;
+	struct json_object *o = e->selection;
+	double d;
+	int64_t i;
+
+	switch (json_object_get_type(o)) {
+	case json_type_double:
+		d = json_object_get_double(o) - atof(value);
+		return d < 0 ? -1 : d > 0 ? 1 : 0;
+	case json_type_int:
+		i = json_object_get_int64(o) - (int64_t)atoll(value);
+		return i < 0 ? -1 : i > 0 ? 1 : 0;
+	default:
+		return strcmp(json_object_get_string(o), value);
+	}
+}
+
+static int sel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	struct json_object *o;
+	int i, r;
+
+	if (name == NULL) {
+		o = e->stack[e->depth].obj;
+		r = 1;
+	} else {
+		i = e->depth;
+		while (i >= 0 && !json_object_object_get_ex(e->stack[i].obj, name, &o))
+			i--;
+		if (i >= 0)
+			r = 1;
+		else {
+			o = NULL;
+			r = 0;
+		}
+	}
+	e->selection = o;
+	return r;
+}
+
+static int subsel(void *closure, const char *name)
+{
+	struct expl *e = closure;
+	struct json_object *o = NULL;
+	int r = 0;
+
+	if (json_object_is_type(e->selection, json_type_object))
+		r = json_object_object_get_ex(e->selection, name, &o);
+	else if (json_object_is_type(e->selection, json_type_array)) {
+		char *end;
+		size_t idx = (size_t)strtol(name, &end, 10);
+		if (!*end && idx < json_object_array_length(e->selection)) {
+			o = json_object_array_get_idx(e->selection, idx);
+			r = 1;
+		}
+	}
+	if (r)
+		e->selection = o;
+	return r;
+}
+
+static int enter(void *closure, int objiter)
+{
+	struct expl *e = closure;
+	struct json_object *o;
+
+	if (++e->depth >= MUSTACH_MAX_DEPTH)
+		return MUSTACH_ERROR_TOO_DEEP;
+
+	o = e->selection;
+	e->stack[e->depth].is_objiter = 0;
+	if (objiter) {
+		if (!json_object_is_type(o, json_type_object))
+			goto not_entering;
+
+		e->stack[e->depth].iter = json_object_iter_begin(o);
+		e->stack[e->depth].enditer = json_object_iter_end(o);
+		if (json_object_iter_equal(&e->stack[e->depth].iter, &e->stack[e->depth].enditer))
+			goto not_entering;
+		e->stack[e->depth].obj = json_object_iter_peek_value(&e->stack[e->depth].iter);
+		e->stack[e->depth].cont = o;
+		e->stack[e->depth].is_objiter = 1;
+	} else if (json_object_is_type(o, json_type_array)) {
+		e->stack[e->depth].count = json_object_array_length(o);
+		if (e->stack[e->depth].count == 0)
+			goto not_entering;
+		e->stack[e->depth].cont = o;
+		e->stack[e->depth].obj = json_object_array_get_idx(o, 0);
+		e->stack[e->depth].index = 0;
+	} else if ((json_object_is_type(o, json_type_object) && json_object_object_length(o) > 0)
+		|| json_object_get_boolean(o)) {
+		e->stack[e->depth].count = 1;
+		e->stack[e->depth].cont = NULL;
+		e->stack[e->depth].obj = o;
+		e->stack[e->depth].index = 0;
+	} else
+		goto not_entering;
+	return 1;
+
+not_entering:
+	e->depth--;
+	return 0;
+}
+
+static int next(void *closure)
+{
+	struct expl *e = closure;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	if (e->stack[e->depth].is_objiter) {
+		json_object_iter_next(&e->stack[e->depth].iter);
+		if (json_object_iter_equal(&e->stack[e->depth].iter, &e->stack[e->depth].enditer))
+			return 0;
+		e->stack[e->depth].obj = json_object_iter_peek_value(&e->stack[e->depth].iter);
+		return 1;
+	}
+
+	e->stack[e->depth].index++;
+	if (e->stack[e->depth].index >= e->stack[e->depth].count)
+		return 0;
+
+	e->stack[e->depth].obj = json_object_array_get_idx(e->stack[e->depth].cont, e->stack[e->depth].index);
+	return 1;
+}
+
+static int leave(void *closure)
+{
+	struct expl *e = closure;
+
+	if (e->depth <= 0)
+		return MUSTACH_ERROR_CLOSING;
+
+	e->depth--;
+	return 0;
+}
+
+static int get(void *closure, struct mustach_sbuf *sbuf, int key)
+{
+	struct expl *e = closure;
+	const char *s;
+	int d;
+
+	if (key) {
+		s = "";
+		for (d = e->depth ; d >= 0 ; d--)
+			if (e->stack[d].is_objiter) {
+				s = json_object_iter_peek_name(&e->stack[d].iter);
+				break;
+			}
+	}
+	else
+		switch (json_object_get_type(e->selection)) {
+		case json_type_string:
+			s = json_object_get_string(e->selection);
+			break;
+		case json_type_null:
+			s = "";
+			break;
+		default:
+			s = json_object_to_json_string_ext(e->selection, 0);
+			break;
+		}
+	sbuf->value = s;
+	return 1;
+}
+
+const struct mustach_wrap_itf mustach_json_c_wrap_itf = {
+	.start = start,
+	.stop = NULL,
+	.compare = compare,
+	.sel = sel,
+	.subsel = subsel,
+	.enter = enter,
+	.next = next,
+	.leave = leave,
+	.get = get
+};
+
+int mustach_json_c_file(const char *template, size_t length, struct json_object *root, int flags, FILE *file)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_file(template, length, &mustach_json_c_wrap_itf, &e, flags, file);
+}
+
+int mustach_json_c_fd(const char *template, size_t length, struct json_object *root, int flags, int fd)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_fd(template, length, &mustach_json_c_wrap_itf, &e, flags, fd);
+}
+
+int mustach_json_c_mem(const char *template, size_t length, struct json_object *root, int flags, char **result, size_t *size)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_mem(template, length, &mustach_json_c_wrap_itf, &e, flags, result, size);
+}
+
+int mustach_json_c_write(const char *template, size_t length, struct json_object *root, int flags, mustach_write_cb_t *writecb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_write(template, length, &mustach_json_c_wrap_itf, &e, flags, writecb, closure);
+}
+
+int mustach_json_c_emit(const char *template, size_t length, struct json_object *root, int flags, mustach_emit_cb_t *emitcb, void *closure)
+{
+	struct expl e;
+	e.root = root;
+	return mustach_wrap_emit(template, length, &mustach_json_c_wrap_itf, &e, flags, emitcb, closure);
+}
+
+int fmustach_json_c(const char *template, struct json_object *root, FILE *file)
+{
+	return mustach_json_c_file(template, 0, root, -1, file);
+}
+
+int fdmustach_json_c(const char *template, struct json_object *root, int fd)
+{
+	return mustach_json_c_fd(template, 0, root, -1, fd);
+}
+
+int mustach_json_c(const char *template, struct json_object *root, char **result, size_t *size)
+{
+	return mustach_json_c_mem(template, 0, root, -1, result, size);
+}
+
+int umustach_json_c(const char *template, struct json_object *root, mustach_write_cb_t *writecb, void *closure)
+{
+	return mustach_json_c_write(template, 0, root, -1, writecb, closure);
+}
+
+
diff --git a/src/templating/mustach-json-c.h b/src/templating/mustach-json-c.h
new file mode 100644
index 000000000..50846c6cb
--- /dev/null
+++ b/src/templating/mustach-json-c.h
@@ -0,0 +1,160 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _mustach_json_c_h_included_
+#define _mustach_json_c_h_included_
+
+/*
+ * mustach-json-c is intended to make integration of json-c
+ * library by providing integrated functions.
+ */
+
+#include <json-c/json.h>
+#include "mustach-wrap.h"
+
+/**
+ * Wrap interface used internally by mustach json-c functions.
+ * Can be used for overriding behaviour.
+ */
+extern const struct mustach_wrap_itf mustach_json_c_wrap_itf;
+
+/**
+ * mustach_json_c_file - Renders the mustache 'template' in 'file' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_json_c_file(const char *template, size_t length, struct json_object *root, int flags, FILE *file);
+
+/**
+ * mustach_json_c_fd - Renders the mustache 'template' in 'fd' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_json_c_fd(const char *template, size_t length, struct json_object *root, int flags, int fd);
+
+/**
+ * mustach_json_c_mem - Renders the mustache 'template' in 'result' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_json_c_mem(const char *template, size_t length, struct json_object *root, int flags, char **result, size_t *size);
+
+/**
+ * mustach_json_c_write - Renders the mustache 'template' for 'root' to custom writer 'writecb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @writecb:  the function that write values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_json_c_write(const char *template, size_t length, struct json_object *root, int flags, mustach_write_cb_t *writecb, void *closure);
+
+/**
+ * mustach_json_c_emit - Renders the mustache 'template' for 'root' to custom emiter 'emitcb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @root:     the root json object to render
+ * @emitcb:   the function that emit values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_json_c_emit(const char *template, size_t length, struct json_object *root, int flags, mustach_emit_cb_t *emitcb, void *closure);
+
+/***************************************************************************
+* compatibility with version before 1.0
+*/
+
+/**
+ * OBSOLETE use mustach_json_c_file
+ *
+ * fmustach_json_c - Renders the mustache 'template' in 'file' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @root:     the root json object to render
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+
+DEPRECATED_MUSTACH(extern int fmustach_json_c(const char *template, struct json_object *root, FILE *file));
+
+/**
+ * OBSOLETE use mustach_json_c_fd
+ *
+ * fdmustach_json_c - Renders the mustache 'template' in 'fd' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @root:     the root json object to render
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+
+DEPRECATED_MUSTACH(extern int fdmustach_json_c(const char *template, struct json_object *root, int fd));
+
+/**
+ * OBSOLETE use mustach_json_c_mem
+ *
+ * mustach_json_c - Renders the mustache 'template' in 'result' for 'root'.
+ *
+ * @template: the template string to instantiate
+ * @root:     the root json object to render
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+
+DEPRECATED_MUSTACH(extern int mustach_json_c(const char *template, struct json_object *root, char **result, size_t *size));
+
+/**
+ * OBSOLETE use mustach_json_c_write
+ *
+ * umustach_json_c - Renders the mustache 'template' for 'root' to custom writer 'writecb' with 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @root:     the root json object to render
+ * @writecb:  the function that write values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+typedef mustach_write_cb_t *mustach_json_write_cb;
+DEPRECATED_MUSTACH(extern int umustach_json_c(const char *template, struct json_object *root, mustach_write_cb_t *writecb, void *closure));
+
+#endif
diff --git a/src/templating/mustach-original-Makefile b/src/templating/mustach-original-Makefile
new file mode 100644
index 000000000..aee827583
--- /dev/null
+++ b/src/templating/mustach-original-Makefile
@@ -0,0 +1,305 @@
+# version
+MAJOR := 1
+MINOR := 2
+REVIS := 7
+
+# installation settings
+DESTDIR ?=
+PREFIX  ?= /usr/local
+BINDIR  ?= $(PREFIX)/bin
+LIBDIR  ?= $(PREFIX)/lib
+INCLUDEDIR ?= $(PREFIX)/include
+MANDIR  ?= $(PREFIX)/share/man
+PKGDIR  ?= $(LIBDIR)/pkgconfig
+
+# Tools (sed must be GNU sed)
+SED ?= sed
+INSTALL ?= install
+
+# initial settings
+VERSION := $(MAJOR).$(MINOR).$(REVIS)
+SOVER := .$(MAJOR)
+SOVEREV := .$(MAJOR).$(MINOR)
+
+HEADERS := mustach.h mustach-wrap.h
+SPLITLIB := libmustach-core.so$(SOVEREV)
+SPLITPC := libmustach-core.pc
+COREOBJS := mustach.o mustach-wrap.o
+SINGLEOBJS := $(COREOBJS)
+SINGLEFLAGS :=
+SINGLELIBS :=
+TESTSPECS :=
+ALL := manuals
+
+# availability of CJSON
+ifneq ($(cjson),no)
+ cjson_cflags := $(shell pkg-config --silence-errors --cflags libcjson)
+ cjson_libs := $(shell pkg-config --silence-errors --libs libcjson)
+ ifdef cjson_libs
+  cjson := yes
+  tool ?= cjson
+  HEADERS += mustach-cjson.h
+  SPLITLIB += libmustach-cjson.so$(SOVEREV)
+  SPLITPC += libmustach-cjson.pc
+  SINGLEOBJS += mustach-cjson.o
+  SINGLEFLAGS += ${cjson_cflags}
+  SINGLELIBS += ${cjson_libs}
+  TESTSPECS += test-specs/test-specs-cjson
+ else
+  ifeq ($(cjson),yes)
+   $(error Can't find required library cjson)
+  endif
+  cjson := no
+ endif
+endif
+
+# availability of JSON-C
+ifneq ($(jsonc),no)
+ jsonc_cflags := $(shell pkg-config --silence-errors --cflags json-c)
+ jsonc_libs := $(shell pkg-config --silence-errors --libs json-c)
+ ifdef jsonc_libs
+  jsonc := yes
+  tool ?= jsonc
+  HEADERS += mustach-json-c.h
+  SPLITLIB += libmustach-json-c.so$(SOVEREV)
+  SPLITPC += libmustach-json-c.pc
+  SINGLEOBJS += mustach-json-c.o
+  SINGLEFLAGS += ${jsonc_cflags}
+  SINGLELIBS += ${jsonc_libs}
+  TESTSPECS += test-specs/test-specs-json-c
+ else
+  ifeq ($(jsonc),yes)
+   $(error Can't find required library json-c)
+  endif
+  jsonc := no
+ endif
+endif
+
+# availability of JANSSON
+ifneq ($(jansson),no)
+ jansson_cflags := $(shell pkg-config --silence-errors --cflags jansson)
+ jansson_libs := $(shell pkg-config --silence-errors --libs jansson)
+ ifdef jansson_libs
+  jansson := yes
+  tool ?= jansson
+  HEADERS += mustach-jansson.h
+  SPLITLIB += libmustach-jansson.so$(SOVEREV)
+  SPLITPC += libmustach-jansson.pc
+  SINGLEOBJS += mustach-jansson.o
+  SINGLEFLAGS += ${jansson_cflags}
+  SINGLELIBS += ${jansson_libs}
+  TESTSPECS += test-specs/test-specs-jansson
+ else
+  ifeq ($(jansson),yes)
+   $(error Can't find required library jansson)
+  endif
+  jansson := no
+ endif
+endif
+
+# tool
+TOOLOBJS = mustach-tool.o $(COREOBJS)
+tool ?= none
+ifneq ($(tool),none)
+  ifeq ($(tool),cjson)
+    TOOLOBJS += mustach-cjson.o
+    TOOLFLAGS := ${cjson_cflags} -DTOOL=MUSTACH_TOOL_CJSON
+    TOOLLIBS := ${cjson_libs}
+    TOOLDEP := mustach-cjson.h
+  else ifeq ($(tool),jsonc)
+    TOOLOBJS += mustach-json-c.o
+    TOOLFLAGS := ${jsonc_cflags} -DTOOL=MUSTACH_TOOL_JSON_C
+    TOOLLIBS := ${jsonc_libs}
+    TOOLDEP := mustach-json-c.h
+  else ifeq ($(tool),jansson)
+    TOOLOBJS += mustach-jansson.o
+    TOOLFLAGS := ${jansson_cflags} -DTOOL=MUSTACH_TOOL_JANSSON
+    TOOLLIBS := ${jansson_libs}
+    TOOLDEP := mustach-jansson.h
+  else
+   $(error Unknown library $(tool) for tool)
+  endif
+  ifneq ($($(tool)),yes)
+    $(error No library found for tool $(tool))
+  endif
+  ALL += mustach
+endif
+
+# compute targets
+libs ?= all
+ifeq (${libs},split)
+ ALL += ${SPLITLIB} ${SPLITPC}
+else ifeq (${libs},single)
+ ALL += libmustach.so$(SOVEREV) libmustach.pc
+else ifeq (${libs},all)
+ ALL += libmustach.so$(SOVEREV) libmustach.pc ${SPLITLIB} ${SPLITPC}
+else ifneq (${libs},none)
+ $(error Unknown libs $(libs))
+endif
+
+# display target
+$(info tool    = ${tool})
+$(info libs    = ${libs})
+$(info jsonc   = ${jsonc})
+$(info jansson = ${jansson})
+$(info cjson   = ${cjson})
+
+# settings
+
+EFLAGS = -fPIC -Wall -Wextra -DVERSION=${VERSION}
+
+ifeq ($(shell uname),Darwin)
+ LDFLAGS_single  += -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
+ LDFLAGS_core    += -install_name $(LIBDIR)/libmustach-core.so$(SOVEREV)
+ LDFLAGS_cjson   += -install_name $(LIBDIR)/libmustach-cjson.so$(SOVEREV)
+ LDFLAGS_jsonc   += -install_name $(LIBDIR)/libmustach-json-c.so$(SOVEREV)
+ LDFLAGS_jansson += -install_name $(LIBDIR)/libmustach-jansson.so$(SOVEREV)
+else
+ LDFLAGS_single  += -Wl,-soname,libmustach.so$(SOVER)
+ LDFLAGS_core    += -Wl,-soname,libmustach-core.so$(SOVER)
+ LDFLAGS_cjson   += -Wl,-soname,libmustach-cjson.so$(SOVER)
+ LDFLAGS_jsonc   += -Wl,-soname,libmustach-json-c.so$(SOVER)
+ LDFLAGS_jansson += -Wl,-soname,libmustach-jansson.so$(SOVER)
+endif
+
+# targets
+
+.PHONY: all
+all: ${ALL}
+
+mustach: $(TOOLOBJS)
+	$(CC) $(LDFLAGS) $(TOOLFLAGS) -o mustach $(TOOLOBJS) $(TOOLLIBS)
+
+libmustach.so$(SOVEREV): $(SINGLEOBJS)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_single) -o $@ $^ $(SINGLELIBS)
+
+libmustach-core.so$(SOVEREV): $(COREOBJS)
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_core) -o $@ $(COREOBJS) $(lib_OBJ)
+
+libmustach-cjson.so$(SOVEREV): $(COREOBJS) mustach-cjson.o
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_cjson) -o $@ $^ $(cjson_libs)
+
+libmustach-json-c.so$(SOVEREV): $(COREOBJS) mustach-json-c.o
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_jsonc) -o $@ $^ $(jsonc_libs)
+
+libmustach-jansson.so$(SOVEREV): $(COREOBJS) mustach-jansson.o
+	$(CC) -shared $(LDFLAGS) $(LDFLAGS_jansson) -o $@ $^ $(jansson_libs)
+
+# pkgconfigs
+
+%.pc: pkgcfgs
+	$(SED) -E '/^==.*==$$/{h;d};x;/==$@==/{x;s/VERSION/$(VERSION)/;p;d};x;d' $< > $@
+
+# objects
+
+mustach.o: mustach.c mustach.h
+	$(CC) -c $(EFLAGS) $(CFLAGS) -o $@ $<
+
+mustach-wrap.o: mustach-wrap.c mustach.h mustach-wrap.h
+	$(CC) -c $(EFLAGS) $(CFLAGS) -o $@ $<
+
+mustach-tool.o: mustach-tool.c mustach.h mustach-json-c.h $(TOOLDEP)
+	$(CC) -c $(EFLAGS) $(CFLAGS) $(TOOLFLAGS) -o $@ $<
+
+mustach-cjson.o: mustach-cjson.c mustach.h mustach-wrap.h mustach-cjson.h
+	$(CC) -c $(EFLAGS) $(CFLAGS) $(cjson_cflags) -o $@ $<
+
+mustach-json-c.o: mustach-json-c.c mustach.h mustach-wrap.h mustach-json-c.h
+	$(CC) -c $(EFLAGS) $(CFLAGS) $(jsonc_cflags) -o $@ $<
+
+mustach-jansson.o: mustach-jansson.c mustach.h mustach-wrap.h mustach-jansson.h
+	$(CC) -c $(EFLAGS) $(CFLAGS) $(jansson_cflags) -o $@ $<
+
+# installing
+.PHONY: install
+install: all
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	if test "${tool}" != "none"; then \
+		$(INSTALL) -m0755 mustach $(DESTDIR)$(BINDIR)/; \
+	fi
+	$(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)/mustach
+	$(INSTALL) -m0644 $(HEADERS)    $(DESTDIR)$(INCLUDEDIR)/mustach
+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
+	for x in libmustach*.so$(SOVEREV); do \
+		$(INSTALL) -m0755 $$x $(DESTDIR)$(LIBDIR)/ ;\
+		ln -sf $$x $(DESTDIR)$(LIBDIR)/$${x%.so.*}.so$(SOVER) ;\
+		ln -sf $$x $(DESTDIR)$(LIBDIR)/$${x%.so.*}.so ;\
+	done
+	$(INSTALL) -d $(DESTDIR)/$(PKGDIR)
+	$(INSTALL) -m0644 libmustach*.pc $(DESTDIR)/$(PKGDIR)
+	$(INSTALL) -d $(DESTDIR)/$(MANDIR)/man1
+	$(INSTALL) -m0644 mustach.1.gz $(DESTDIR)/$(MANDIR)/man1
+
+# deinstalling
+.PHONY: uninstall
+uninstall:
+	rm -f $(DESTDIR)$(BINDIR)/mustach
+	rm -f $(DESTDIR)$(LIBDIR)/libmustach*.so*
+	rm -rf $(DESTDIR)$(INCLUDEDIR)/mustach
+
+.PHONY: test test-basic test-specs
+test: basic-tests spec-tests
+
+basic-tests: mustach
+	@$(MAKE) -C test1 test
+	@$(MAKE) -C test2 test
+	@$(MAKE) -C test3 test
+	@$(MAKE) -C test4 test
+	@$(MAKE) -C test5 test
+	@$(MAKE) -C test6 test
+	@$(MAKE) -C test7 test
+	@$(MAKE) -C test8 test
+
+spec-tests: $(TESTSPECS)
+
+test-specs/test-specs-%: test-specs/%-test-specs test-specs/specs
+	./$< test-specs/spec/specs/[a-z]*.json > $@.last || true
+	diff $@.ref $@.last
+
+test-specs/cjson-test-specs.o: test-specs/test-specs.c mustach.h mustach-wrap.h mustach-cjson.h
+	$(CC) -I. -c $(EFLAGS) $(CFLAGS) $(cjson_cflags) -DTEST=TEST_CJSON -o $@ $<
+
+test-specs/cjson-test-specs: test-specs/cjson-test-specs.o mustach-cjson.o $(COREOBJS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(cjson_libs)
+
+test-specs/json-c-test-specs.o: test-specs/test-specs.c mustach.h mustach-wrap.h mustach-json-c.h
+	$(CC) -I. -c $(EFLAGS) $(CFLAGS) $(jsonc_cflags) -DTEST=TEST_JSON_C -o $@ $<
+
+test-specs/json-c-test-specs: test-specs/json-c-test-specs.o mustach-json-c.o $(COREOBJS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(jsonc_libs)
+
+test-specs/jansson-test-specs.o: test-specs/test-specs.c mustach.h mustach-wrap.h mustach-jansson.h
+	$(CC) -I. -c $(EFLAGS) $(CFLAGS) $(jansson_cflags) -DTEST=TEST_JANSSON -o $@ $<
+
+test-specs/jansson-test-specs: test-specs/jansson-test-specs.o mustach-jansson.o $(COREOBJS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(jansson_libs)
+
+.PHONY: test-specs/specs
+test-specs/specs:
+	if test -d test-specs/spec; then \
+		git -C test-specs/spec pull; \
+	else \
+		git -C test-specs clone https://github.com/mustache/spec.git; \
+	fi
+
+#cleaning
+.PHONY: clean
+clean:
+	rm -f mustach libmustach*.so* *.o *.pc
+	rm -f test-specs/*-test-specs test-specs/test-specs-*.last
+	rm -rf *.gcno *.gcda coverage.info gcov-latest
+	@$(MAKE) -C test1 clean
+	@$(MAKE) -C test2 clean
+	@$(MAKE) -C test3 clean
+	@$(MAKE) -C test4 clean
+	@$(MAKE) -C test5 clean
+	@$(MAKE) -C test6 clean
+	@$(MAKE) -C test7 clean
+	@$(MAKE) -C test8 clean
+
+# manpage
+.PHONY: manuals
+manuals: mustach.1.gz
+
+mustach.1.gz: mustach.1.scd
+	if which scdoc >/dev/null 2>&1; then scdoc < mustach.1.scd | gzip > mustach.1.gz; fi
diff --git a/src/templating/mustach-tool.c b/src/templating/mustach-tool.c
new file mode 100644
index 000000000..5f28c1f58
--- /dev/null
+++ b/src/templating/mustach-tool.c
@@ -0,0 +1,258 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <libgen.h>
+
+#include "mustach-wrap.h"
+
+static const size_t BLOCKSIZE = 8192;
+
+static const char *errors[] = {
+	"??? unreferenced ???",
+	"system",
+	"unexpected end",
+	"empty tag",
+	"tag too long",
+	"bad separators",
+	"too depth",
+	"closing",
+	"bad unescape tag",
+	"invalid interface",
+	"item not found",
+	"partial not found",
+	"undefined tag",
+	"too much template nesting"
+};
+
+static const char *errmsg = 0;
+static int flags = 0;
+static FILE *output = 0;
+
+static void help(char *prog)
+{
+	char *name = basename(prog);
+#define STR_INDIR(x) #x
+#define STR(x) STR_INDIR(x)
+	printf("%s version %s\n", name, STR(VERSION));
+#undef STR
+#undef STR_INDIR
+	printf(
+		"\n"
+		"USAGE:\n"
+		"    %s [FLAGS] <json-file> <mustach-templates...>\n"
+		"\n"
+		"FLAGS:\n"
+		"    -h, --help     Prints help information\n"
+		"    -s, --strict   Error when a tag is undefined\n"
+		"\n"
+		"ARGS: (if a file is -, read standard input)\n"
+		"    <json-file>              JSON file with input data\n"
+		"    <mustach-templates...>   Template files to instantiate\n",
+		name);
+	exit(0);
+}
+
+static char *readfile(const char *filename, size_t *length)
+{
+	int f;
+	struct stat s;
+	char *result;
+	size_t size, pos;
+	ssize_t rc;
+
+	result = NULL;
+	if (filename[0] == '-' &&  filename[1] == 0)
+		f = dup(0);
+	else
+		f = open(filename, O_RDONLY);
+	if (f < 0) {
+		fprintf(stderr, "Can't open file: %s\n", filename);
+		exit(1);
+	}
+
+	fstat(f, &s);
+	switch (s.st_mode & S_IFMT) {
+	case S_IFREG:
+		size = s.st_size;
+		break;
+	case S_IFSOCK:
+	case S_IFIFO:
+		size = BLOCKSIZE;
+		break;
+	default:
+		fprintf(stderr, "Bad file: %s\n", filename);
+		exit(1);
+	}
+
+	pos = 0;
+	result = malloc(size + 1);
+	do {
+		if (result == NULL) {
+			fprintf(stderr, "Out of memory\n");
+			exit(1);
+		}
+		rc = read(f, &result[pos], (size - pos) + 1);
+		if (rc < 0) {
+			fprintf(stderr, "Error while reading %s\n", filename);
+			exit(1);
+		}
+		if (rc > 0) {
+			pos += (size_t)rc;
+			if (pos > size) {
+				size = pos + BLOCKSIZE;
+				result = realloc(result, size + 1);
+			}
+		}
+	} while(rc > 0);
+
+	close(f);
+	if (length != NULL)
+		*length = pos;
+	result[pos] = 0;
+	return result;
+}
+
+static int load_json(const char *filename);
+static int process(const char *content, size_t length);
+static void close_json();
+
+int main(int ac, char **av)
+{
+	char *t, *f;
+	char *prog = *av;
+	int s;
+	size_t length;
+
+	(void)ac; /* unused */
+	flags = Mustach_With_AllExtensions;
+	output = stdout;
+
+	for( ++av ; av[0] && av[0][0] == '-' && av[0][1] != 0 ; av++) {
+		if (!strcmp(*av, "-h") || !strcmp(*av, "--help"))
+			help(prog);
+		if (!strcmp(*av, "-s") || !strcmp(*av, "--strict"))
+			flags |= Mustach_With_ErrorUndefined;
+	}
+	if (*av) {
+		f = (av[0][0] == '-' && !av[0][1]) ? "/dev/stdin" : av[0];
+		s = load_json(f);
+		if (s < 0) {
+			fprintf(stderr, "Can't load json file %s\n", av[0]);
+			if(errmsg)
+				fprintf(stderr, "   reason: %s\n", errmsg);
+			exit(1);
+		}
+		while(*++av) {
+			t = readfile(*av, &length);
+			s = process(t, length);
+			free(t);
+			if (s != MUSTACH_OK) {
+				s = -s;
+				if (s < 1 || s >= (int)(sizeof errors / sizeof * errors))
+					s = 0;
+				fprintf(stderr, "Template error %s (file %s)\n", errors[s], *av);
+			}
+		}
+		close_json();
+	}
+	return 0;
+}
+
+#define MUSTACH_TOOL_JSON_C  1
+#define MUSTACH_TOOL_JANSSON 2
+#define MUSTACH_TOOL_CJSON   3
+
+#if TOOL == MUSTACH_TOOL_JSON_C
+
+#include "mustach-json-c.h"
+
+static struct json_object *o;
+static int load_json(const char *filename)
+{
+	o = json_object_from_file(filename);
+#if JSON_C_VERSION_NUM >= 0x000D00
+	errmsg = json_util_get_last_err();
+	if (errmsg != NULL)
+		return -1;
+#endif
+	if (o == NULL) {
+		errmsg = "null json";
+		return -1;
+	}
+	return 0;
+}
+static int process(const char *content, size_t length)
+{
+	return mustach_json_c_file(content, length, o, flags, output);
+}
+static void close_json()
+{
+	json_object_put(o);
+}
+
+#elif TOOL == MUSTACH_TOOL_JANSSON
+
+#include "mustach-jansson.h"
+
+static json_t *o;
+static json_error_t e;
+static int load_json(const char *filename)
+{
+	o = json_load_file(filename, JSON_DECODE_ANY, &e);
+	if (o == NULL) {
+		errmsg = e.text;
+		return -1;
+	}
+	return 0;
+}
+static int process(const char *content, size_t length)
+{
+	return mustach_jansson_file(content, length, o, flags, output);
+}
+static void close_json()
+{
+	json_decref(o);
+}
+
+#elif TOOL == MUSTACH_TOOL_CJSON
+
+#include "mustach-cjson.h"
+
+static cJSON *o;
+static int load_json(const char *filename)
+{
+	char *t;
+	size_t length;
+
+	t = readfile(filename, &length);
+	o = t ? cJSON_ParseWithLength(t, length) : NULL;
+	free(t);
+	return -!o;
+}
+static int process(const char *content, size_t length)
+{
+	return mustach_cJSON_file(content, length, o, flags, output);
+}
+static void close_json()
+{
+	cJSON_Delete(o);
+}
+
+#else
+#error "no defined json library"
+#endif
diff --git a/src/templating/mustach-wrap.c b/src/templating/mustach-wrap.c
new file mode 100644
index 000000000..2cd00db12
--- /dev/null
+++ b/src/templating/mustach-wrap.c
@@ -0,0 +1,482 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <malloc.h>
+#endif
+
+#include "mustach.h"
+#include "mustach-wrap.h"
+
+/*
+* It was stated that allowing to include files
+* through template is not safe when the mustache
+* template is open to any value because it could
+* create leaks (example: {{>/etc/passwd}}).
+*/
+#if MUSTACH_SAFE
+# undef MUSTACH_LOAD_TEMPLATE
+#elif !defined(MUSTACH_LOAD_TEMPLATE)
+# define MUSTACH_LOAD_TEMPLATE 1
+#endif
+
+#if !defined(INCLUDE_PARTIAL_EXTENSION)
+# define INCLUDE_PARTIAL_EXTENSION ".mustache"
+#endif
+
+/* global hook for partials */
+int (*mustach_wrap_get_partial)(const char *name, struct mustach_sbuf *sbuf) = NULL;
+
+/* internal structure for wrapping */
+struct wrap {
+	/* original interface */
+	const struct mustach_wrap_itf *itf;
+
+	/* original closure */
+	void *closure;
+
+	/* flags */
+	int flags;
+
+	/* emiter callback */
+	mustach_emit_cb_t *emitcb;
+
+	/* write callback */
+	mustach_write_cb_t *writecb;
+};
+
+/* length given by masking with 3 */
+enum comp {
+	C_no = 0,
+	C_eq = 1,
+	C_lt = 5,
+	C_le = 6,
+	C_gt = 9,
+	C_ge = 10
+};
+
+enum sel {
+	S_none = 0,
+	S_ok = 1,
+	S_objiter = 2,
+	S_ok_or_objiter = S_ok | S_objiter
+};
+
+static enum comp getcomp(char *head, int sflags)
+{
+	return (head[0] == '=' && (sflags & Mustach_With_Equal)) ? C_eq
+		: (head[0] == '<' && (sflags & Mustach_With_Compare)) ? (head[1] == '=' ? C_le : C_lt)
+		: (head[0] == '>' && (sflags & Mustach_With_Compare)) ? (head[1] == '=' ? C_ge : C_gt)
+		: C_no;
+}
+
+static char *keyval(char *head, int sflags, enum comp *comp)
+{
+	char *w, car, escaped;
+	enum comp k;
+
+	k = C_no;
+	w = head;
+	car = *head;
+	escaped = (sflags & Mustach_With_EscFirstCmp) && (getcomp(head, sflags) != C_no);
+	while (car && (escaped || (k = getcomp(head, sflags)) == C_no)) {
+		if (escaped)
+			escaped = 0;
+		else
+			escaped = ((sflags & Mustach_With_JsonPointer) ? car == '~' : car == '\\')
+			    && (getcomp(head + 1, sflags) != C_no);
+		if (!escaped)
+			*w++ = car;
+		head++;
+		car = *head;
+	}
+	*w = 0;
+	*comp = k;
+	return k == C_no ? NULL : &head[k & 3];
+}
+
+static char *getkey(char **head, int sflags)
+{
+	char *result, *iter, *write, car;
+
+	car = *(iter = *head);
+	if (!car)
+		result = NULL;
+	else {
+		result = write = iter;
+		if (sflags & Mustach_With_JsonPointer)
+		{
+			while (car && car != '/') {
+				if (car == '~')
+					switch (iter[1]) {
+					case '1': car = '/'; /*@fallthrough@*/
+					case '0': iter++;
+					}
+				*write++ = car;
+				car = *++iter;
+			}
+			*write = 0;
+			while (car == '/')
+				car = *++iter;
+		}
+		else
+		{
+			while (car && car != '.') {
+				if (car == '\\' && (iter[1] == '.' || iter[1] == '\\'))
+					car = *++iter;
+				*write++ = car;
+				car = *++iter;
+			}
+			*write = 0;
+			while (car == '.')
+				car = *++iter;
+		}
+		*head = iter;
+	}
+	return result;
+}
+
+static enum sel sel(struct wrap *w, const char *name)
+{
+	enum sel result;
+	int i, j, sflags, scmp;
+	char *key, *value;
+	enum comp k;
+
+	/* make a local writeable copy */
+	size_t lenname = 1 + strlen(name);
+	char buffer[lenname];
+	char *copy = buffer;
+	memcpy(copy, name, lenname);
+
+	/* check if matches json pointer selection */
+	sflags = w->flags;
+	if (sflags & Mustach_With_JsonPointer) {
+		if (copy[0] == '/')
+			copy++;
+		else
+			sflags ^= Mustach_With_JsonPointer;
+	}
+
+	/* extract the value, translate the key and get the comparator */
+	if (sflags & (Mustach_With_Equal | Mustach_With_Compare))
+		value = keyval(copy, sflags, &k);
+	else {
+		k = C_no;
+		value = NULL;
+	}
+
+	/* case of . alone if Mustach_With_SingleDot? */
+	if (copy[0] == '.' && copy[1] == 0 /*&& (sflags & Mustach_With_SingleDot)*/)
+		/* yes, select current */
+		result = w->itf->sel(w->closure, NULL) ? S_ok : S_none;
+	else
+	{
+		/* not the single dot, extract the first key */
+		key = getkey(&copy, sflags);
+		if (key == NULL)
+			return 0;
+
+		/* select the root item */
+		if (w->itf->sel(w->closure, key))
+			result = S_ok;
+		else if (key[0] == '*'
+		      && !key[1]
+		      && !value
+		      && !*copy
+		      && (w->flags & Mustach_With_ObjectIter)
+		      && w->itf->sel(w->closure, NULL))
+			result = S_ok_or_objiter;
+		else
+			result = S_none;
+		if (result == S_ok) {
+			/* iterate the selection of sub items */
+			key = getkey(&copy, sflags);
+			while(result == S_ok && key) {
+				if (w->itf->subsel(w->closure, key))
+					/* nothing */;
+				else if (key[0] == '*'
+				      && !key[1]
+				      && !value
+				      && !*copy
+				      && (w->flags & Mustach_With_ObjectIter))
+					result = S_objiter;
+				else
+					result = S_none;
+				key = getkey(&copy, sflags);
+			}
+		}
+	}
+	/* should it be compared? */
+	if (result == S_ok && value) {
+		if (!w->itf->compare)
+			result = S_none;
+		else {
+			i = value[0] == '!';
+			scmp = w->itf->compare(w->closure, &value[i]);
+			switch (k) {
+			case C_eq: j = scmp == 0; break;
+			case C_lt: j = scmp < 0; break;
+			case C_le: j = scmp <= 0; break;
+			case C_gt: j = scmp > 0; break;
+			case C_ge: j = scmp >= 0; break;
+			default: j = i; break;
+			}
+			if (i == j)
+				result = S_none;
+		}
+	}
+	return result;
+}
+
+static int start_callback(void *closure)
+{
+	struct wrap *w = closure;
+	return w->itf->start ? w->itf->start(w->closure) : MUSTACH_OK;
+}
+
+static void stop_callback(void *closure, int status)
+{
+	struct wrap *w = closure;
+	if (w->itf->stop)
+		w->itf->stop(w->closure, status);
+}
+
+static int emit(struct wrap *w, const char *buffer, size_t size, FILE *file)
+{
+	int r;
+
+	if (w->writecb)
+		r = w->writecb(file, buffer, size);
+	else
+		r = fwrite(buffer, 1, size, file) == size ? MUSTACH_OK : MUSTACH_ERROR_SYSTEM;
+	return r;
+}
+
+static int emit_callback(void *closure, const char *buffer, size_t size, int escape, FILE *file)
+{
+	struct wrap *w = closure;
+	int r;
+	size_t s, i;
+	char car;
+
+	if (w->emitcb)
+		r = w->emitcb(file, buffer, size, escape);
+	else if (!escape)
+		r = emit(w, buffer, size, file);
+	else {
+		i = 0;
+		r = MUSTACH_OK;
+		while(i < size && r == MUSTACH_OK) {
+			s = i;
+			while (i < size && (car = buffer[i]) != '<' && car != '>' && car != '&' && car != '"')
+				i++;
+			if (i != s)
+				r = emit(w, &buffer[s], i - s, file);
+			if (i < size && r == MUSTACH_OK) {
+				switch(car) {
+				case '<': r = emit(w, "&lt;", 4, file); break;
+				case '>': r = emit(w, "&gt;", 4, file); break;
+				case '&': r = emit(w, "&amp;", 5, file); break;
+				case '"': r = emit(w, "&quot;", 6, file); break;
+				}
+				i++;
+			}
+		}
+	}
+	return r;
+}
+
+static int enter_callback(void *closure, const char *name)
+{
+	struct wrap *w = closure;
+	enum sel s = sel(w, name);
+	return s == S_none ? 0 : w->itf->enter(w->closure, s & S_objiter);
+}
+
+static int next_callback(void *closure)
+{
+	struct wrap *w = closure;
+	return w->itf->next(w->closure);
+}
+
+static int leave_callback(void *closure)
+{
+	struct wrap *w = closure;
+	return w->itf->leave(w->closure);
+}
+
+static int getoptional(struct wrap *w, const char *name, struct mustach_sbuf *sbuf)
+{
+	enum sel s = sel(w, name);
+	if (!(s & S_ok))
+		return 0;
+	return w->itf->get(w->closure, sbuf, s & S_objiter);
+}
+
+static int get_callback(void *closure, const char *name, struct mustach_sbuf *sbuf)
+{
+	struct wrap *w = closure;
+	if (getoptional(w, name, sbuf) <= 0) {
+		if (w->flags & Mustach_With_ErrorUndefined)
+			return MUSTACH_ERROR_UNDEFINED_TAG;
+		sbuf->value = "";
+	}
+	return MUSTACH_OK;
+}
+
+#if MUSTACH_LOAD_TEMPLATE
+static int get_partial_from_file(const char *name, struct mustach_sbuf *sbuf)
+{
+	static char extension[] = INCLUDE_PARTIAL_EXTENSION;
+	size_t s;
+	long pos;
+	FILE *file;
+	char *path, *buffer;
+
+	/* allocate path */
+	s = strlen(name);
+	path = malloc(s + sizeof extension);
+	if (path == NULL)
+		return MUSTACH_ERROR_SYSTEM;
+
+	/* try without extension first */
+	memcpy(path, name, s + 1);
+	file = fopen(path, "r");
+	if (file == NULL) {
+		memcpy(&path[s], extension, sizeof extension);
+		file = fopen(path, "r");
+	}
+	free(path);
+
+	/* if file opened */
+	if (file == NULL)
+		return MUSTACH_ERROR_PARTIAL_NOT_FOUND;
+
+	/* compute file size */
+	if (fseek(file, 0, SEEK_END) >= 0
+	 && (pos = ftell(file)) >= 0
+	 && fseek(file, 0, SEEK_SET) >= 0) {
+		/* allocate value */
+		s = (size_t)pos;
+		buffer = malloc(s + 1);
+		if (buffer != NULL) {
+			/* read value */
+			if (1 == fread(buffer, s, 1, file)) {
+				/* force zero at end */
+				sbuf->value = buffer;
+				buffer[s] = 0;
+				sbuf->freecb = free;
+				fclose(file);
+				return MUSTACH_OK;
+			}
+			free(buffer);
+		}
+	}
+	fclose(file);
+	return MUSTACH_ERROR_SYSTEM;
+}
+#endif
+
+static int partial_callback(void *closure, const char *name, struct mustach_sbuf *sbuf)
+{
+	struct wrap *w = closure;
+	int rc;
+	if (mustach_wrap_get_partial != NULL) {
+		rc = mustach_wrap_get_partial(name, sbuf);
+		if (rc != MUSTACH_ERROR_PARTIAL_NOT_FOUND) {
+			if (rc != MUSTACH_OK)
+				sbuf->value = "";
+			return rc;
+		}
+	}
+#if MUSTACH_LOAD_TEMPLATE
+	if (w->flags & Mustach_With_PartialDataFirst) {
+		if (getoptional(w, name, sbuf) > 0)
+			rc = MUSTACH_OK;
+		else
+			rc = get_partial_from_file(name, sbuf);
+	}
+	else {
+		rc = get_partial_from_file(name, sbuf);
+		if (rc != MUSTACH_OK &&  getoptional(w, name, sbuf) > 0)
+			rc = MUSTACH_OK;
+	}
+#else
+	rc = getoptional(w, name, sbuf) > 0 ?  MUSTACH_OK : MUSTACH_ERROR_PARTIAL_NOT_FOUND;
+#endif
+	if (rc != MUSTACH_OK)
+		sbuf->value = "";
+	return MUSTACH_OK;
+}
+
+const struct mustach_itf mustach_wrap_itf = {
+	.start = start_callback,
+	.put = NULL,
+	.enter = enter_callback,
+	.next = next_callback,
+	.leave = leave_callback,
+	.partial = partial_callback,
+	.get = get_callback,
+	.emit = emit_callback,
+	.stop = stop_callback
+};
+
+static void wrap_init(struct wrap *wrap, const struct mustach_wrap_itf *itf, void *closure, int flags, mustach_emit_cb_t *emitcb, mustach_write_cb_t *writecb)
+{
+	if (flags & Mustach_With_Compare)
+		flags |= Mustach_With_Equal;
+	wrap->closure = closure;
+	wrap->itf = itf;
+	wrap->flags = flags;
+	wrap->emitcb = emitcb;
+	wrap->writecb = writecb;
+}
+
+int mustach_wrap_file(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, FILE *file)
+{
+	struct wrap w;
+	wrap_init(&w, itf, closure, flags, NULL, NULL);
+	return mustach_file(template, length, &mustach_wrap_itf, &w, flags, file);
+}
+
+int mustach_wrap_fd(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, int fd)
+{
+	struct wrap w;
+	wrap_init(&w, itf, closure, flags, NULL, NULL);
+	return mustach_fd(template, length, &mustach_wrap_itf, &w, flags, fd);
+}
+
+int mustach_wrap_mem(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, char **result, size_t *size)
+{
+	struct wrap w;
+	wrap_init(&w, itf, closure, flags, NULL, NULL);
+	return mustach_mem(template, length, &mustach_wrap_itf, &w, flags, result, size);
+}
+
+int mustach_wrap_write(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, mustach_write_cb_t *writecb, void *writeclosure)
+{
+	struct wrap w;
+	wrap_init(&w, itf, closure, flags, NULL, writecb);
+	return mustach_file(template, length, &mustach_wrap_itf, &w, flags, writeclosure);
+}
+
+int mustach_wrap_emit(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, mustach_emit_cb_t *emitcb, void *emitclosure)
+{
+	struct wrap w;
+	wrap_init(&w, itf, closure, flags, emitcb, NULL);
+	return mustach_file(template, length, &mustach_wrap_itf, &w, flags, emitclosure);
+}
+
diff --git a/src/templating/mustach-wrap.h b/src/templating/mustach-wrap.h
new file mode 100644
index 000000000..fedcb9191
--- /dev/null
+++ b/src/templating/mustach-wrap.h
@@ -0,0 +1,235 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _mustach_wrap_h_included_
+#define _mustach_wrap_h_included_
+
+/*
+ * mustach-wrap is intended to make integration of JSON
+ * libraries easier by wrapping mustach extensions in a
+ * single place.
+ *
+ * As before, using mustach and only mustach is possible
+ * (by using only mustach.h) but does not implement high
+ * level features coming with extensions implemented by
+ * this high level wrapper.
+ */
+#include "mustach.h"
+/*
+ * Definition of the writing callbacks for mustach functions
+ * producing output to callbacks.
+ *
+ * Two callback types are defined:
+ *
+ * @mustach_write_cb_t:
+ *
+ *    callback receiving the escaped data to be written as 3 parameters:
+ *
+ *    1. the 'closure', the same given to the wmustach_... function
+ *    2. a pointer to a 'buffer' containing the characters to be written
+ *    3. the size in bytes of the data pointed by 'buffer'
+ *
+ * @mustach_emit_cb_t:
+ *
+ *    callback receiving the data to be written and a flag indicating
+ *    if escaping should be done or not as 4 parameters:
+ *
+ *    1. the 'closure', the same given to the emustach_... function
+ *    2. a pointer to a 'buffer' containing the characters to be written
+ *    3. the size in bytes of the data pointed by 'buffer'
+ *    4. a boolean indicating if 'escape' should be done
+ */
+#ifndef _mustach_output_callbacks_defined_
+#define _mustach_output_callbacks_defined_
+typedef int mustach_write_cb_t(void *closure, const char *buffer, size_t size);
+typedef int mustach_emit_cb_t(void *closure, const char *buffer, size_t size, int escape);
+#endif
+
+/**
+ * Flags specific to mustach wrap
+ */
+#define Mustach_With_SingleDot            4     /* obsolete, always set */
+#define Mustach_With_Equal                8
+#define Mustach_With_Compare             16
+#define Mustach_With_JsonPointer         32
+#define Mustach_With_ObjectIter          64
+#define Mustach_With_IncPartial         128     /* obsolete, always set */
+#define Mustach_With_EscFirstCmp        256
+#define Mustach_With_PartialDataFirst   512
+#define Mustach_With_ErrorUndefined    1024
+
+#undef  Mustach_With_AllExtensions
+#define Mustach_With_AllExtensions     1023     /* don't include ErrorUndefined */
+
+/**
+ * mustach_wrap_itf - high level wrap of mustach - interface for callbacks
+ *
+ * The functions sel, subsel, enter and next should return 0 or 1.
+ *
+ * All other functions should normally return MUSTACH_OK (zero).
+ *
+ * If any function returns a negative value, it means an error that
+ * stop the processing and that is reported to the caller. Mustach
+ * also has its own error codes. Using the macros MUSTACH_ERROR_USER
+ * and MUSTACH_IS_ERROR_USER could help to avoid clashes.
+ *
+ * @start: If defined (can be NULL), starts the mustach processing
+ *         of the closure, called at the very beginning before any
+ *         mustach processing occurs.
+ *
+ * @stop: If defined (can be NULL), stops the mustach processing
+ *        of the closure, called at the very end after all mustach
+ *        processing occurered. The status returned by the processing
+ *        is passed to the stop.
+ *
+ * @compare: If defined (can be NULL), compares the value of the
+ *           currently selected item with the given value and returns
+ *           a negative value if current value is lesser, a positive
+ *           value if the current value is greater or zero when
+ *           values are equals.
+ *           If 'compare' is NULL, any comparison in mustach
+ *           is going to fails.
+ *
+ * @sel: Selects the item of the given 'name'. If 'name' is NULL
+ *       Selects the current item. Returns 1 if the selection is
+ *       effective or else 0 if the selection failed.
+ *
+ * @subsel: Selects from the currently selected object the value of
+ *          the field of given name. Returns 1 if the selection is
+ *          effective or else 0 if the selection failed.
+ *
+ * @enter: Enters the section of 'name' if possible.
+ *         Musts return 1 if entered or 0 if not entered.
+ *         When 1 is returned, the function 'leave' will always be called.
+ *         Conversely 'leave' is never called when enter returns 0 or
+ *         a negative value.
+ *         When 1 is returned, the function must activate the first
+ *         item of the section.
+ *
+ * @next: Activates the next item of the section if it exists.
+ *        Musts return 1 when the next item is activated.
+ *        Musts return 0 when there is no item to activate.
+ *
+ * @leave: Leaves the last entered section
+ *
+ * @get: Returns in 'sbuf' the value of the current selection if 'key'
+ *       is zero. Otherwise, when 'key' is not zero, return in 'sbuf'
+ *       the name of key of the current selection, or if no such key
+ *       exists, the empty string. Must return 1 if possible or
+ *       0 when not possible or an error code.
+ */
+struct mustach_wrap_itf {
+	int (*start)(void *closure);
+	void (*stop)(void *closure, int status);
+	int (*compare)(void *closure, const char *value);
+	int (*sel)(void *closure, const char *name);
+	int (*subsel)(void *closure, const char *name);
+	int (*enter)(void *closure, int objiter);
+	int (*next)(void *closure);
+	int (*leave)(void *closure);
+	int (*get)(void *closure, struct mustach_sbuf *sbuf, int key);
+};
+
+/**
+ * Mustach interface used internally by mustach wrapper functions.
+ * Can be used for overriding behaviour.
+ */
+extern const struct mustach_itf mustach_wrap_itf;
+
+/**
+ * Global hook for providing partials. When set to a not NULL value, the pointed
+ * function replaces the default behaviour and is called to provide the partial
+ * of the given 'name' in 'sbuf'.
+ * The function must return MUSTACH_OK when it filled 'sbuf' with value of partial
+ * or must return an error code if it failed. But if MUSTACH_ERROR_PARTIAL_NOT_FOUND
+ * is returned, the default behavior is evaluated.
+ */
+extern int (*mustach_wrap_get_partial)(const char *name, struct mustach_sbuf *sbuf);
+
+/**
+ * mustach_wrap_file - Renders the mustache 'template' in 'file' for an abstract
+ * wrapper of interface 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface of the abstract wrapper
+ * @closure:  the closure of the abstract wrapper
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_wrap_file(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, FILE *file);
+
+/**
+ * mustach_wrap_fd - Renders the mustache 'template' in 'fd' for an abstract
+ * wrapper of interface 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface of the abstract wrapper
+ * @closure:  the closure of the abstract wrapper
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_wrap_fd(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, int fd);
+
+/**
+ * mustach_wrap_mem - Renders the mustache 'template' in 'result' for an abstract
+ * wrapper of interface 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface of the abstract wrapper
+ * @closure:  the closure of the abstract wrapper
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_wrap_mem(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, char **result, size_t *size);
+
+/**
+ * mustach_wrap_write - Renders the mustache 'template' for an abstract
+ * wrapper of interface 'itf' and 'closure' to custom writer
+ * 'writecb' with 'writeclosure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface of the abstract wrapper
+ * @closure:  the closure of the abstract wrapper
+ * @writecb:  the function that write values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_wrap_write(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, mustach_write_cb_t *writecb, void *writeclosure);
+
+/**
+ * mustach_wrap_emit - Renders the mustache 'template' for an abstract
+ * wrapper of interface 'itf' and 'closure' to custom emiter 'emitcb'
+ * with 'emitclosure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface of the abstract wrapper
+ * @closure:  the closure of the abstract wrapper
+ * @emitcb:   the function that emit values
+ * @closure:  the closure for the write function
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_wrap_emit(const char *template, size_t length, const struct mustach_wrap_itf *itf, void *closure, int flags, mustach_emit_cb_t *emitcb, void *emitclosure);
+
+#endif
+
diff --git a/src/templating/mustach.1.gz b/src/templating/mustach.1.gz
new file mode 100644
index 000000000..15b8a9052
--- /dev/null
+++ b/src/templating/mustach.1.gz
diff --git a/src/templating/mustach.1.scd b/src/templating/mustach.1.scd
new file mode 100644
index 000000000..af4f08ef2
--- /dev/null
+++ b/src/templating/mustach.1.scd
@@ -0,0 +1,60 @@
+mustach(1)
+
+# NAME
+
+mustach - Mustache templating command line engine
+
+# SYNOPSIS
+
+*mustach* [-s|--strict] JSON TEMPLATE...
+
+# DESCRIPTION
+
+Instanciate the TEMPLATE files accordingly to the JSON file.
+
+If one of the given files is *-*, the standard input is used.
+
+Option *--strict* make mustach fail if a tag is not found.
+
+# EXAMPLE
+
+A typical Mustache template file: *temp.must*
+
+```
+Hello {{name}}
+You have just won {{value}} dollars!
+{{#in_ca}}
+Well, {{taxed_value}} dollars, after taxes.
+{{/in_ca}}
+```
+
+Given a JSON file: *inst.json*
+
+```
+{
+  "name": "Chris",
+  "value": 10000,
+  "taxed_value": 6000,
+  "in_ca": true
+}
+```
+
+Calling the command *mustach inst.json temp.must*
+will produce the following output:
+
+```
+Hello Chris
+You have just won 10000 dollars!
+Well, 6000.0 dollars, after taxes.
+```
+
+# LINK
+
+Site of *mustach*, the *C* implementation: https://gitlab.com/jobol/mustach
+
+*Mustache format*: http://mustache.github.io/mustache.5.html
+
+Main site for *Mustache*: http://mustache.github.io/
+
+JSON: https://www.json.org/
+
diff --git a/src/templating/mustach.c b/src/templating/mustach.c
new file mode 100644
index 000000000..9f5af131c
--- /dev/null
+++ b/src/templating/mustach.c
@@ -0,0 +1,561 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#ifdef _WIN32
+#include <malloc.h>
+#endif
+
+#include "mustach.h"
+
+struct iwrap {
+	int (*emit)(void *closure, const char *buffer, size_t size, int escape, FILE *file);
+	void *closure; /* closure for: enter, next, leave, emit, get */
+	int (*put)(void *closure, const char *name, int escape, FILE *file);
+	void *closure_put; /* closure for put */
+	int (*enter)(void *closure, const char *name);
+	int (*next)(void *closure);
+	int (*leave)(void *closure);
+	int (*get)(void *closure, const char *name, struct mustach_sbuf *sbuf);
+	int (*partial)(void *closure, const char *name, struct mustach_sbuf *sbuf);
+	void *closure_partial; /* closure for partial */
+	FILE *file;
+	int flags;
+	int nesting;
+};
+
+struct prefix {
+	size_t len;
+	const char *start;
+	struct prefix *prefix;
+};
+
+#if !defined(NO_OPEN_MEMSTREAM)
+static FILE *memfile_open(char **buffer, size_t *size)
+{
+	return open_memstream(buffer, size);
+}
+static void memfile_abort(FILE *file, char **buffer, size_t *size)
+{
+	fclose(file);
+	free(*buffer);
+	*buffer = NULL;
+	*size = 0;
+}
+static int memfile_close(FILE *file, char **buffer, size_t *size)
+{
+	int rc;
+
+	/* adds terminating null */
+	rc = fputc(0, file) ? MUSTACH_ERROR_SYSTEM : 0;
+	fclose(file);
+	if (rc == 0)
+		/* removes terminating null of the length */
+		(*size)--;
+	else {
+		free(*buffer);
+		*buffer = NULL;
+		*size = 0;
+	}
+	return rc;
+}
+#else
+static FILE *memfile_open(char **buffer, size_t *size)
+{
+	/*
+	 * We can't provide *buffer and *size as open_memstream does but
+	 * at least clear them so the caller won't get bad data.
+	 */
+	*buffer = NULL;
+	*size = 0;
+
+	return tmpfile();
+}
+static void memfile_abort(FILE *file, char **buffer, size_t *size)
+{
+	fclose(file);
+	*buffer = NULL;
+	*size = 0;
+}
+static int memfile_close(FILE *file, char **buffer, size_t *size)
+{
+	int rc;
+	size_t s;
+	char *b;
+
+	s = (size_t)ftell(file);
+	b = malloc(s + 1);
+	if (b == NULL) {
+		rc = MUSTACH_ERROR_SYSTEM;
+		errno = ENOMEM;
+		s = 0;
+	} else {
+		rewind(file);
+		if (1 == fread(b, s, 1, file)) {
+			rc = 0;
+			b[s] = 0;
+		} else {
+			rc = MUSTACH_ERROR_SYSTEM;
+			free(b);
+			b = NULL;
+			s = 0;
+		}
+	}
+	*buffer = b;
+	*size = s;
+	return rc;
+}
+#endif
+
+static inline void sbuf_reset(struct mustach_sbuf *sbuf)
+{
+	sbuf->value = NULL;
+	sbuf->freecb = NULL;
+	sbuf->closure = NULL;
+	sbuf->length = 0;
+}
+
+static inline void sbuf_release(struct mustach_sbuf *sbuf)
+{
+	if (sbuf->releasecb)
+		sbuf->releasecb(sbuf->value, sbuf->closure);
+}
+
+static inline size_t sbuf_length(struct mustach_sbuf *sbuf)
+{
+	size_t length = sbuf->length;
+	if (length == 0 && sbuf->value != NULL)
+		length = strlen(sbuf->value);
+	return length;
+}
+
+static int iwrap_emit(void *closure, const char *buffer, size_t size, int escape, FILE *file)
+{
+	size_t i, j, r;
+
+	(void)closure; /* unused */
+
+	if (!escape)
+		return fwrite(buffer, 1, size, file) != size ? MUSTACH_ERROR_SYSTEM : MUSTACH_OK;
+
+	r = i = 0;
+	while (i < size) {
+		j = i;
+		while (j < size && buffer[j] != '<' && buffer[j] != '>' && buffer[j] != '&' && buffer[j] != '"')
+			j++;
+		if (j != i && fwrite(&buffer[i], j - i, 1, file) != 1)
+			return MUSTACH_ERROR_SYSTEM;
+		if (j < size) {
+			switch(buffer[j++]) {
+			case '<':
+				r = fwrite("&lt;", 4, 1, file);
+				break;
+			case '>':
+				r = fwrite("&gt;", 4, 1, file);
+				break;
+			case '&':
+				r = fwrite("&amp;", 5, 1, file);
+				break;
+			case '"':
+				r = fwrite("&quot;", 6, 1, file);
+				break;
+			}
+			if (r != 1)
+				return MUSTACH_ERROR_SYSTEM;
+		}
+		i = j;
+	}
+	return MUSTACH_OK;
+}
+
+static int iwrap_put(void *closure, const char *name, int escape, FILE *file)
+{
+	struct iwrap *iwrap = closure;
+	int rc;
+	struct mustach_sbuf sbuf;
+	size_t length;
+
+	sbuf_reset(&sbuf);
+	rc = iwrap->get(iwrap->closure, name, &sbuf);
+	if (rc >= 0) {
+		length = sbuf_length(&sbuf);
+		if (length)
+			rc = iwrap->emit(iwrap->closure, sbuf.value, length, escape, file);
+		sbuf_release(&sbuf);
+	}
+	return rc;
+}
+
+static int iwrap_partial(void *closure, const char *name, struct mustach_sbuf *sbuf)
+{
+	struct iwrap *iwrap = closure;
+	int rc;
+	FILE *file;
+	size_t size;
+	char *result;
+
+	result = NULL;
+	file = memfile_open(&result, &size);
+	if (file == NULL)
+		rc = MUSTACH_ERROR_SYSTEM;
+	else {
+		rc = iwrap->put(iwrap->closure_put, name, 0, file);
+		if (rc < 0)
+			memfile_abort(file, &result, &size);
+		else {
+			rc = memfile_close(file, &result, &size);
+			if (rc == 0) {
+				sbuf->value = result;
+				sbuf->freecb = free;
+				sbuf->length = size;
+			}
+		}
+	}
+	return rc;
+}
+
+static int emitprefix(struct iwrap *iwrap, struct prefix *prefix)
+{
+	if (prefix->prefix) {
+		int rc = emitprefix(iwrap, prefix->prefix);
+		if (rc < 0)
+			return rc;
+	}
+	return prefix->len ? iwrap->emit(iwrap->closure, prefix->start, prefix->len, 0, iwrap->file) : 0;
+}
+
+static int process(const char *template, size_t length, struct iwrap *iwrap, struct prefix *prefix)
+{
+	struct mustach_sbuf sbuf;
+	char opstr[MUSTACH_MAX_DELIM_LENGTH], clstr[MUSTACH_MAX_DELIM_LENGTH];
+	char name[MUSTACH_MAX_LENGTH + 1], c;
+	const char *beg, *term, *end;
+	struct { const char *name, *again; size_t length; unsigned enabled: 1, entered: 1; } stack[MUSTACH_MAX_DEPTH];
+	size_t oplen, cllen, len, l;
+	int depth, rc, enabled, stdalone;
+	struct prefix pref;
+
+	pref.prefix = prefix;
+	end = template + (length ? length : strlen(template));
+	opstr[0] = opstr[1] = '{';
+	clstr[0] = clstr[1] = '}';
+	oplen = cllen = 2;
+	stdalone = enabled = 1;
+	depth = pref.len = 0;
+	for (;;) {
+		/* search next openning delimiter */
+		for (beg = template ; ; beg++) {
+			c = beg == end ? '\n' : *beg;
+			if (c == '\n') {
+				l = (beg != end) + (size_t)(beg - template);
+				if (stdalone != 2 && enabled) {
+					if (beg != template /* don't prefix empty lines */) {
+						rc = emitprefix(iwrap, &pref);
+						if (rc < 0)
+							return rc;
+					}
+					rc = iwrap->emit(iwrap->closure, template, l, 0, iwrap->file);
+					if (rc < 0)
+						return rc;
+				}
+				if (beg == end) /* no more mustach */
+					return depth ? MUSTACH_ERROR_UNEXPECTED_END : MUSTACH_OK;
+				template += l;
+				stdalone = 1;
+				pref.len = 0;
+				pref.prefix = prefix;
+			}
+			else if (!isspace(c)) {
+				if (stdalone == 2 && enabled) {
+					rc = emitprefix(iwrap, &pref);
+					if (rc < 0)
+						return rc;
+					pref.len = 0;
+					stdalone = 0;
+					pref.prefix = NULL;
+				}
+				if (c == *opstr && end - beg >= (ssize_t)oplen) {
+					for (l = 1 ; l < oplen && beg[l] == opstr[l] ; l++);
+					if (l == oplen)
+						break;
+				}
+				stdalone = 0;
+			}
+		}
+
+		pref.start = template;
+		pref.len = enabled ? (size_t)(beg - template) : 0;
+		beg += oplen;
+
+		/* search next closing delimiter */
+		for (term = beg ; ; term++) {
+			if (term == end)
+				return MUSTACH_ERROR_UNEXPECTED_END;
+			if (*term == *clstr && end - term >= (ssize_t)cllen) {
+				for (l = 1 ; l < cllen && term[l] == clstr[l] ; l++);
+				if (l == cllen)
+					break;
+			}
+		}
+		template = term + cllen;
+		len = (size_t)(term - beg);
+		c = *beg;
+		switch(c) {
+		case ':':
+			stdalone = 0;
+			if (iwrap->flags & Mustach_With_Colon)
+				goto exclude_first;
+			goto get_name;
+		case '!':
+		case '=':
+			break;
+		case '{':
+			for (l = 0 ; l < cllen && clstr[l] == '}' ; l++);
+			if (l < cllen) {
+				if (!len || beg[len-1] != '}')
+					return MUSTACH_ERROR_BAD_UNESCAPE_TAG;
+				len--;
+			} else {
+				if (term[l] != '}')
+					return MUSTACH_ERROR_BAD_UNESCAPE_TAG;
+				template++;
+			}
+			c = '&';
+			/*@fallthrough@*/
+		case '&':
+			stdalone = 0;
+			/*@fallthrough@*/
+		case '^':
+		case '#':
+		case '/':
+		case '>':
+exclude_first:
+			beg++;
+			len--;
+			goto get_name;
+		default:
+			stdalone = 0;
+get_name:
+			while (len && isspace(beg[0])) { beg++; len--; }
+			while (len && isspace(beg[len-1])) len--;
+			if (len == 0 && !(iwrap->flags & Mustach_With_EmptyTag))
+				return MUSTACH_ERROR_EMPTY_TAG;
+			if (len > MUSTACH_MAX_LENGTH)
+				return MUSTACH_ERROR_TAG_TOO_LONG;
+			memcpy(name, beg, len);
+			name[len] = 0;
+			break;
+		}
+		if (stdalone)
+			stdalone = 2;
+		else if (enabled) {
+			rc = emitprefix(iwrap, &pref);
+			if (rc < 0)
+				return rc;
+			pref.len = 0;
+			pref.prefix = NULL;
+		}
+		switch(c) {
+		case '!':
+			/* comment */
+			/* nothing to do */
+			break;
+		case '=':
+			/* defines delimiters */
+			if (len < 5 || beg[len - 1] != '=')
+				return MUSTACH_ERROR_BAD_SEPARATORS;
+			beg++;
+			len -= 2;
+			while (len && isspace(*beg))
+				beg++, len--;
+			while (len && isspace(beg[len - 1]))
+				len--;
+			for (l = 0; l < len && !isspace(beg[l]) ; l++);
+			if (l == len || l > MUSTACH_MAX_DELIM_LENGTH)
+				return MUSTACH_ERROR_BAD_SEPARATORS;
+			oplen = l;
+			memcpy(opstr, beg, l);
+			while (l < len && isspace(beg[l])) l++;
+			if (l == len || len - l > MUSTACH_MAX_DELIM_LENGTH)
+				return MUSTACH_ERROR_BAD_SEPARATORS;
+			cllen = len - l;
+			memcpy(clstr, beg + l, cllen);
+			break;
+		case '^':
+		case '#':
+			/* begin section */
+			if (depth == MUSTACH_MAX_DEPTH)
+				return MUSTACH_ERROR_TOO_DEEP;
+			rc = enabled;
+			if (rc) {
+				rc = iwrap->enter(iwrap->closure, name);
+				if (rc < 0)
+					return rc;
+			}
+			stack[depth].name = beg;
+			stack[depth].again = template;
+			stack[depth].length = len;
+			stack[depth].enabled = enabled != 0;
+			stack[depth].entered = rc != 0;
+			if ((c == '#') == (rc == 0))
+				enabled = 0;
+			depth++;
+			break;
+		case '/':
+			/* end section */
+			if (depth-- == 0 || len != stack[depth].length || memcmp(stack[depth].name, name, len))
+				return MUSTACH_ERROR_CLOSING;
+			rc = enabled && stack[depth].entered ? iwrap->next(iwrap->closure) : 0;
+			if (rc < 0)
+				return rc;
+			if (rc) {
+				template = stack[depth++].again;
+			} else {
+				enabled = stack[depth].enabled;
+				if (enabled && stack[depth].entered)
+					iwrap->leave(iwrap->closure);
+			}
+			break;
+		case '>':
+			/* partials */
+			if (enabled) {
+				if (iwrap->nesting >= MUSTACH_MAX_NESTING)
+					rc = MUSTACH_ERROR_TOO_MUCH_NESTING;
+				else {
+					sbuf_reset(&sbuf);
+					rc = iwrap->partial(iwrap->closure_partial, name, &sbuf);
+					if (rc >= 0) {
+						iwrap->nesting++;
+						rc = process(sbuf.value, sbuf_length(&sbuf), iwrap, &pref);
+						sbuf_release(&sbuf);
+						iwrap->nesting--;
+					}
+				}
+				if (rc < 0)
+					return rc;
+			}
+			break;
+		default:
+			/* replacement */
+			if (enabled) {
+				rc = iwrap->put(iwrap->closure_put, name, c != '&', iwrap->file);
+				if (rc < 0)
+					return rc;
+			}
+			break;
+		}
+	}
+}
+
+int mustach_file(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, FILE *file)
+{
+	int rc;
+	struct iwrap iwrap;
+
+	/* check validity */
+	if (!itf->enter || !itf->next || !itf->leave || (!itf->put && !itf->get))
+		return MUSTACH_ERROR_INVALID_ITF;
+
+	/* init wrap structure */
+	iwrap.closure = closure;
+	if (itf->put) {
+		iwrap.put = itf->put;
+		iwrap.closure_put = closure;
+	} else {
+		iwrap.put = iwrap_put;
+		iwrap.closure_put = &iwrap;
+	}
+	if (itf->partial) {
+		iwrap.partial = itf->partial;
+		iwrap.closure_partial = closure;
+	} else if (itf->get) {
+		iwrap.partial = itf->get;
+		iwrap.closure_partial = closure;
+	} else {
+		iwrap.partial = iwrap_partial;
+		iwrap.closure_partial = &iwrap;
+	}
+	iwrap.emit = itf->emit ? itf->emit : iwrap_emit;
+	iwrap.enter = itf->enter;
+	iwrap.next = itf->next;
+	iwrap.leave = itf->leave;
+	iwrap.get = itf->get;
+	iwrap.file = file;
+	iwrap.flags = flags;
+	iwrap.nesting = 0;
+
+	/* process */
+	rc = itf->start ? itf->start(closure) : 0;
+	if (rc == 0)
+		rc = process(template, length, &iwrap, NULL);
+	if (itf->stop)
+		itf->stop(closure, rc);
+	return rc;
+}
+
+int mustach_fd(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, int fd)
+{
+	int rc;
+	FILE *file;
+
+	file = fdopen(fd, "w");
+	if (file == NULL) {
+		rc = MUSTACH_ERROR_SYSTEM;
+		errno = ENOMEM;
+	} else {
+		rc = mustach_file(template, length, itf, closure, flags, file);
+		fclose(file);
+	}
+	return rc;
+}
+
+int mustach_mem(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, char **result, size_t *size)
+{
+	int rc;
+	FILE *file;
+	size_t s;
+
+	*result = NULL;
+	if (size == NULL)
+		size = &s;
+	file = memfile_open(result, size);
+	if (file == NULL)
+		rc = MUSTACH_ERROR_SYSTEM;
+	else {
+		rc = mustach_file(template, length, itf, closure, flags, file);
+		if (rc < 0)
+			memfile_abort(file, result, size);
+		else
+			rc = memfile_close(file, result, size);
+	}
+	return rc;
+}
+
+int fmustach(const char *template, const struct mustach_itf *itf, void *closure, FILE *file)
+{
+	return mustach_file(template, 0, itf, closure, Mustach_With_AllExtensions, file);
+}
+
+int fdmustach(const char *template, const struct mustach_itf *itf, void *closure, int fd)
+{
+	return mustach_fd(template, 0, itf, closure, Mustach_With_AllExtensions, fd);
+}
+
+int mustach(const char *template, const struct mustach_itf *itf, void *closure, char **result, size_t *size)
+{
+	return mustach_mem(template, 0, itf, closure, Mustach_With_AllExtensions, result, size);
+}
+
diff --git a/src/templating/mustach.h b/src/templating/mustach.h
new file mode 100644
index 000000000..1b44582d5
--- /dev/null
+++ b/src/templating/mustach.h
@@ -0,0 +1,319 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _mustach_h_included_
+#define _mustach_h_included_
+
+struct mustach_sbuf; /* see below */
+
+/**
+ * Current version of mustach and its derivates
+ */
+#define MUSTACH_VERSION 102
+#define MUSTACH_VERSION_MAJOR (MUSTACH_VERSION / 100)
+#define MUSTACH_VERSION_MINOR (MUSTACH_VERSION % 100)
+
+/**
+ * Maximum nested section supported
+ */
+#define MUSTACH_MAX_DEPTH  256
+
+/**
+ * Maximum nested template supported
+ */
+#define MUSTACH_MAX_NESTING  64
+
+/**
+ * Maximum length of tags in mustaches {{...}}
+ */
+#define MUSTACH_MAX_LENGTH 4096
+
+/**
+ * Maximum length of delimitors (2 normally but extended here)
+ */
+#define MUSTACH_MAX_DELIM_LENGTH 8
+
+/**
+ * Flags specific to mustach core
+ */
+#define Mustach_With_NoExtensions   0
+#define Mustach_With_Colon          1
+#define Mustach_With_EmptyTag       2
+#define Mustach_With_AllExtensions  3
+
+/*
+ * Definition of error codes returned by mustach
+ */
+#define MUSTACH_OK                       0
+#define MUSTACH_ERROR_SYSTEM            -1
+#define MUSTACH_ERROR_UNEXPECTED_END    -2
+#define MUSTACH_ERROR_EMPTY_TAG         -3
+#define MUSTACH_ERROR_TAG_TOO_LONG      -4
+#define MUSTACH_ERROR_BAD_SEPARATORS    -5
+#define MUSTACH_ERROR_TOO_DEEP          -6
+#define MUSTACH_ERROR_CLOSING           -7
+#define MUSTACH_ERROR_BAD_UNESCAPE_TAG  -8
+#define MUSTACH_ERROR_INVALID_ITF       -9
+#define MUSTACH_ERROR_ITEM_NOT_FOUND    -10
+#define MUSTACH_ERROR_PARTIAL_NOT_FOUND -11
+#define MUSTACH_ERROR_UNDEFINED_TAG     -12
+#define MUSTACH_ERROR_TOO_MUCH_NESTING  -13
+
+/*
+ * You can use definition below for user specific error
+ *
+ * The macro MUSTACH_ERROR_USER is involutive so for any value
+ *   value = MUSTACH_ERROR_USER(MUSTACH_ERROR_USER(value))
+ */
+#define MUSTACH_ERROR_USER_BASE         -100
+#define MUSTACH_ERROR_USER(x)           (MUSTACH_ERROR_USER_BASE-(x))
+#define MUSTACH_IS_ERROR_USER(x)        (MUSTACH_ERROR_USER(x) >= 0)
+
+/**
+ * mustach_itf - pure abstract mustach - interface for callbacks
+ *
+ * The functions enter and next should return 0 or 1.
+ *
+ * All other functions should normally return MUSTACH_OK (zero).
+ *
+ * If any function returns a negative value, it means an error that
+ * stop the processing and that is reported to the caller. Mustach
+ * also has its own error codes. Using the macros MUSTACH_ERROR_USER
+ * and MUSTACH_IS_ERROR_USER could help to avoid clashes.
+ *
+ * @start: If defined (can be NULL), starts the mustach processing
+ *         of the closure, called at the very beginning before any
+ *         mustach processing occurs.
+ *
+ * @put: If defined (can be NULL), writes the value of 'name'
+ *       to 'file' with 'escape' or not.
+ *       As an extension (see NO_ALLOW_EMPTY_TAG), the 'name' can be
+ *       the empty string. In that later case an implementation can
+ *       return MUSTACH_ERROR_EMPTY_TAG to refuse empty names.
+ *       If NULL and 'get' NULL the error MUSTACH_ERROR_INVALID_ITF
+ *       is returned.
+ *
+ * @enter: Enters the section of 'name' if possible.
+ *         Musts return 1 if entered or 0 if not entered.
+ *         When 1 is returned, the function 'leave' will always be called.
+ *         Conversely 'leave' is never called when enter returns 0 or
+ *         a negative value.
+ *         When 1 is returned, the function must activate the first
+ *         item of the section.
+ *
+ * @next: Activates the next item of the section if it exists.
+ *        Musts return 1 when the next item is activated.
+ *        Musts return 0 when there is no item to activate.
+ *
+ * @leave: Leaves the last entered section
+ *
+ * @partial: If defined (can be NULL), returns in 'sbuf' the content of the
+ *           partial of 'name'. @see mustach_sbuf
+ *           If NULL but 'get' not NULL, 'get' is used instead of partial.
+ *           If NULL and 'get' NULL and 'put' not NULL, 'put' is called with
+ *           a true FILE.
+ *
+ * @emit: If defined (can be NULL), writes the 'buffer' of 'size' with 'escape'.
+ *        If NULL the standard function 'fwrite' is used with a true FILE.
+ *        If not NULL that function is called instead of 'fwrite' to output
+ *        text.
+ *        It implies that if you define either 'partial' or 'get' callback,
+ *        the meaning of 'FILE *file' is abstract for mustach's process and
+ *        then you can use 'FILE*file' pass any kind of pointer (including NULL)
+ *        to the function 'fmustach'. An example of a such behaviour is given by
+ *        the implementation of 'mustach_json_c_write'.
+ *
+ * @get: If defined (can be NULL), returns in 'sbuf' the value of 'name'.
+ *       As an extension (see NO_ALLOW_EMPTY_TAG), the 'name' can be
+ *       the empty string. In that later case an implementation can
+ *       return MUSTACH_ERROR_EMPTY_TAG to refuse empty names.
+ *       If 'get' is NULL and 'put' NULL the error MUSTACH_ERROR_INVALID_ITF
+ *       is returned.
+ *
+ * @stop: If defined (can be NULL), stops the mustach processing
+ *        of the closure, called at the very end after all mustach
+ *        processing occurered. The status returned by the processing
+ *        is passed to the stop.
+ *
+ * The array below summarize status of callbacks:
+ *
+ *    FULLY OPTIONAL:   start partial
+ *    MANDATORY:        enter next leave
+ *    COMBINATORIAL:    put emit get
+ *
+ * Not definig a MANDATORY callback returns error MUSTACH_ERROR_INVALID_ITF.
+ *
+ * For COMBINATORIAL callbacks the array below summarize possible combinations:
+ *
+ *  combination  : put     : emit    : get     : abstract FILE
+ *  -------------+---------+---------+---------+-----------------------
+ *  HISTORIC     : defined : NULL    : NULL    : NO: standard FILE
+ *  MINIMAL      : NULL    : NULL    : defined : NO: standard FILE
+ *  CUSTOM       : NULL    : defined : defined : YES: abstract FILE
+ *  DUCK         : defined : NULL    : defined : NO: standard FILE
+ *  DANGEROUS    : defined : defined : any     : YES or NO, depends on 'partial'
+ *  INVALID      : NULL    : any     : NULL    : -
+ *
+ * The DUCK case runs on one leg. 'get' is not used if 'partial' is defined
+ * but is used for 'partial' if 'partial' is NULL. Thus for clarity, do not use
+ * it that way but define 'partial' and let 'get' be NULL.
+ *
+ * The DANGEROUS case is special: it allows abstract FILE if 'partial' is defined
+ * but forbids abstract FILE when 'partial' is NULL.
+ *
+ * The INVALID case returns error MUSTACH_ERROR_INVALID_ITF.
+ */
+struct mustach_itf {
+	int (*start)(void *closure);
+	int (*put)(void *closure, const char *name, int escape, FILE *file);
+	int (*enter)(void *closure, const char *name);
+	int (*next)(void *closure);
+	int (*leave)(void *closure);
+	int (*partial)(void *closure, const char *name, struct mustach_sbuf *sbuf);
+	int (*emit)(void *closure, const char *buffer, size_t size, int escape, FILE *file);
+	int (*get)(void *closure, const char *name, struct mustach_sbuf *sbuf);
+	void (*stop)(void *closure, int status);
+};
+
+/**
+ * mustach_sbuf - Interface for handling zero terminated strings
+ *
+ * That structure is used for returning zero terminated strings -in 'value'-
+ * to mustach. The callee can provide a function for releasing the returned
+ * 'value'. Three methods for releasing the string are possible.
+ *
+ *  1. no release: set either 'freecb' or 'releasecb' with NULL (done by default)
+ *  2. release without closure: set 'freecb' to its expected value
+ *  3. release with closure: set 'releasecb' and 'closure' to their expected values
+ *
+ * @value: The value of the string. That value is not changed by mustach -const-.
+ *
+ * @freecb: The function to call for freeing the value without closure.
+ *          For convenience, signature of that callback is compatible with 'free'.
+ *          Can be NULL.
+ *
+ * @releasecb: The function to release with closure.
+ *             Can be NULL.
+ *
+ * @closure: The closure to use for 'releasecb'.
+ *
+ * @length: Length of the value or zero if unknown and value null terminated.
+ *          To return the empty string, let it to zero and let value to NULL.
+ */
+struct mustach_sbuf {
+	const char *value;
+	union {
+		void (*freecb)(void*);
+		void (*releasecb)(const char *value, void *closure);
+	};
+	void *closure;
+	size_t length;
+};
+
+/**
+ * mustach_file - Renders the mustache 'template' in 'file' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_file(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, FILE *file);
+
+/**
+ * mustach_fd - Renders the mustache 'template' in 'fd' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_fd(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, int fd);
+
+/**
+ * mustach_mem - Renders the mustache 'template' in 'result' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate
+ * @length:   length of the template or zero if unknown and template null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+extern int mustach_mem(const char *template, size_t length, const struct mustach_itf *itf, void *closure, int flags, char **result, size_t *size);
+
+/***************************************************************************
+* compatibility with version before 1.0
+*/
+#ifdef __GNUC__
+#define DEPRECATED_MUSTACH(func) func __attribute__ ((deprecated))
+#elif defined(_MSC_VER)
+#define DEPRECATED_MUSTACH(func) __declspec(deprecated) func
+#elif !defined(DEPRECATED_MUSTACH)
+#pragma message("WARNING: You need to implement DEPRECATED_MUSTACH for this compiler")
+#define DEPRECATED_MUSTACH(func) func
+#endif
+/**
+ * OBSOLETE use mustach_file
+ *
+ * fmustach - Renders the mustache 'template' in 'file' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate, null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @file:     the file where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+DEPRECATED_MUSTACH(extern int fmustach(const char *template, const struct mustach_itf *itf, void *closure, FILE *file));
+
+/**
+ * OBSOLETE use mustach_fd
+ *
+ * fdmustach - Renders the mustache 'template' in 'fd' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate, null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @fd:       the file descriptor number where to write the result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+DEPRECATED_MUSTACH(extern int fdmustach(const char *template, const struct mustach_itf *itf, void *closure, int fd));
+
+/**
+ * OBSOLETE use mustach_mem
+ *
+ * mustach - Renders the mustache 'template' in 'result' for 'itf' and 'closure'.
+ *
+ * @template: the template string to instantiate, null terminated
+ * @itf:      the interface to the functions that mustach calls
+ * @closure:  the closure to pass to functions called
+ * @result:   the pointer receiving the result when 0 is returned
+ * @size:     the size of the returned result
+ *
+ * Returns 0 in case of success, -1 with errno set in case of system error
+ * a other negative value in case of error.
+ */
+DEPRECATED_MUSTACH(extern int mustach(const char *template, const struct mustach_itf *itf, void *closure, char **result, size_t *size));
+
+#endif
+
diff --git a/src/templating/pkgcfgs b/src/templating/pkgcfgs
new file mode 100644
index 000000000..c3e84dc0e
--- /dev/null
+++ b/src/templating/pkgcfgs
@@ -0,0 +1,35 @@
+==libmustach.pc==
+Name: libmustach
+Version: VERSION
+Description: C Mustach single library
+Cflags: -Imustach
+Libs: -lmustach
+
+==libmustach-core.pc==
+Name: libmustach-core
+Version: VERSION
+Description: C Mustach core library
+Cflags: -Imustach
+Libs: -lmustach-core
+
+==libmustach-cjson.pc==
+Name: libmustach-cjson
+Version: VERSION
+Description: C Mustach library for cJSON
+Cflags: -Imustach
+Libs: -lmustach-cjson
+
+==libmustach-json-c.pc==
+Name: libmustach-json-c
+Version: VERSION
+Description: C Mustach library for json-c
+Cflags: -Imustach
+Libs: -lmustach-json-c
+
+==libmustach-jansson.pc==
+Name: libmustach-jansson
+Version: VERSION
+Description: C Mustach library for jansson
+Cflags: -Imustach
+Libs: -lmustach-jansson
+
diff --git a/src/templating/run-original-tests.sh b/src/templating/run-original-tests.sh
new file mode 100755
index 000000000..21481a286
--- /dev/null
+++ b/src/templating/run-original-tests.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# This file is in the public domain.
+set -eux
+
+export CFLAGS="-g"
+
+echo "Ensuring clean state on entry to upstream tests ..."
+make clean
+
+# The build fails if libjson-c-dev is not installed.
+# That's OK, we don't otherwise need it and don't
+# even bother testing for it in configure.ac.
+# However, in that case, skip the test suite.
+make -f mustach-original-Makefile mustach mustach-json-c.o || exit 77
+make -f mustach-original-Makefile clean || true
+make -f mustach-original-Makefile basic-tests
+make -f mustach-original-Makefile clean || true
+
+exit 0
diff --git a/src/templating/templating_api.c b/src/templating/templating_api.c
new file mode 100644
index 000000000..88a17c682
--- /dev/null
+++ b/src/templating/templating_api.c
@@ -0,0 +1,524 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020, 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/>
+*/
+/**
+ * @file templating_api.c
+ * @brief logic to load and complete HTML templates
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_util.h"
+#include "taler_mhd_lib.h"
+#include "taler_templating_lib.h"
+#include "mustach.h"
+#include "mustach-jansson.h"
+#include <gnunet/gnunet_mhd_compat.h>
+
+
+/**
+ * Entry in a key-value array we use to cache templates.
+ */
+struct TVE
+{
+  /**
+   * A name, used as the key. NULL for the last entry.
+   */
+  char *name;
+
+  /**
+   * Language the template is in.
+   */
+  char *lang;
+
+  /**
+   * 0-terminated (!) file data to return for @e name and @e lang.
+   */
+  char *value;
+
+};
+
+
+/**
+ * Array of templates loaded into RAM.
+ */
+static struct TVE *loaded;
+
+/**
+ * Length of the #loaded array.
+ */
+static unsigned int loaded_length;
+
+
+/**
+ * Load Mustach template into memory.  Note that we intentionally cache
+ * failures, that is if we ever failed to load a template, we will never try
+ * again.
+ *
+ * @param connection the connection we act upon
+ * @param name name of the template file to load
+ *        (MUST be a 'static' string in memory!)
+ * @return NULL on error, otherwise the template
+ */
+static const char *
+lookup_template (struct MHD_Connection *connection,
+                 const char *name)
+{
+  struct TVE *best = NULL;
+  const char *lang;
+
+  lang = MHD_lookup_connection_value (connection,
+                                      MHD_HEADER_KIND,
+                                      MHD_HTTP_HEADER_ACCEPT_LANGUAGE);
+  if (NULL == lang)
+    lang = "en";
+  /* find best match by language */
+  for (unsigned int i = 0; i<loaded_length; i++)
+  {
+    if (0 != strcmp (loaded[i].name,
+                     name))
+      continue; /* does not match by name */
+    if ( (NULL == best) ||
+         (TALER_language_matches (lang,
+                                  loaded[i].lang) >
+          TALER_language_matches (lang,
+                                  best->lang) ) )
+      best = &loaded[i];
+  }
+  if (NULL == best)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No templates found for `%s'\n",
+                name);
+    return NULL;
+  }
+  return best->value;
+}
+
+
+/**
+ * Get the base URL for static resources.
+ *
+ * @param con the MHD connection
+ * @param instance_id the instance ID
+ * @returns the static files base URL, guaranteed
+ *          to have a trailing slash.
+ */
+static char *
+make_static_url (struct MHD_Connection *con,
+                 const char *instance_id)
+{
+  const char *host;
+  const char *forwarded_host;
+  const char *uri_path;
+  struct GNUNET_Buffer buf = { 0 };
+
+  host = MHD_lookup_connection_value (con,
+                                      MHD_HEADER_KIND,
+                                      "Host");
+  forwarded_host = MHD_lookup_connection_value (con,
+                                                MHD_HEADER_KIND,
+                                                "X-Forwarded-Host");
+
+  uri_path = MHD_lookup_connection_value (con,
+                                          MHD_HEADER_KIND,
+                                          "X-Forwarded-Prefix");
+  if (NULL != forwarded_host)
+    host = forwarded_host;
+
+  if (NULL == host)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+
+  GNUNET_assert (NULL != instance_id);
+
+  if (GNUNET_NO == TALER_mhd_is_https (con))
+    GNUNET_buffer_write_str (&buf,
+                             "http://");
+  else
+    GNUNET_buffer_write_str (&buf,
+                             "https://");
+  GNUNET_buffer_write_str (&buf,
+                           host);
+  if (NULL != uri_path)
+    GNUNET_buffer_write_path (&buf,
+                              uri_path);
+  if (0 != strcmp ("default",
+                   instance_id))
+  {
+    GNUNET_buffer_write_path (&buf,
+                              "instances");
+    GNUNET_buffer_write_path (&buf,
+                              instance_id);
+  }
+  GNUNET_buffer_write_path (&buf,
+                            "static/");
+  return GNUNET_buffer_reap_str (&buf);
+}
+
+
+int
+TALER_TEMPLATING_fill (const char *tmpl,
+                       const json_t *root,
+                       void **result,
+                       size_t *result_size)
+{
+  int eno;
+
+  if (0 !=
+      (eno = mustach_jansson_mem (tmpl,
+                                  0, /* length of tmpl */
+                                  (json_t *) root,
+                                  Mustach_With_AllExtensions,
+                                  (char **) result,
+                                  result_size)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "mustach failed on template with error %d\n",
+                eno);
+    *result = NULL;
+    *result_size = 0;
+    return eno;
+  }
+  return eno;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_build (struct MHD_Connection *connection,
+                        unsigned int *http_status,
+                        const char *template,
+                        const char *instance_id,
+                        const char *taler_uri,
+                        const json_t *root,
+                        struct MHD_Response **reply)
+{
+  char *body;
+  size_t body_size;
+
+  {
+    const char *tmpl;
+    int eno;
+
+    tmpl = lookup_template (connection,
+                            template);
+    if (NULL == tmpl)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to load template `%s'\n",
+                  template);
+      *http_status = MHD_HTTP_NOT_ACCEPTABLE;
+      *reply = TALER_MHD_make_error (TALER_EC_GENERIC_FAILED_TO_LOAD_TEMPLATE,
+                                     template);
+      return GNUNET_NO;
+    }
+    /* Add default values to the context */
+    if (NULL != instance_id)
+    {
+      char *static_url = make_static_url (connection,
+                                          instance_id);
+
+      GNUNET_break (0 ==
+                    json_object_set_new ((json_t *) root,
+                                         "static_url",
+                                         json_string (static_url)));
+      GNUNET_free (static_url);
+    }
+    if (0 !=
+        (eno = mustach_jansson_mem (tmpl,
+                                    0,
+                                    (json_t *) root,
+                                    Mustach_With_NoExtensions,
+                                    &body,
+                                    &body_size)))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "mustach failed on template `%s' with error %d\n",
+                  template,
+                  eno);
+      *http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
+      *reply = TALER_MHD_make_error (TALER_EC_GENERIC_FAILED_TO_EXPAND_TEMPLATE,
+                                     template);
+      return GNUNET_NO;
+    }
+  }
+
+  /* try to compress reply if client allows it */
+  {
+    bool compressed = false;
+
+    if (MHD_YES ==
+        TALER_MHD_can_compress (connection))
+    {
+      compressed = TALER_MHD_body_compress ((void **) &body,
+                                            &body_size);
+    }
+    *reply = MHD_create_response_from_buffer (body_size,
+                                              body,
+                                              MHD_RESPMEM_MUST_FREE);
+    if (NULL == *reply)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    if (compressed)
+    {
+      if (MHD_NO ==
+          MHD_add_response_header (*reply,
+                                   MHD_HTTP_HEADER_CONTENT_ENCODING,
+                                   "deflate"))
+      {
+        GNUNET_break (0);
+        MHD_destroy_response (*reply);
+        *reply = NULL;
+        return GNUNET_SYSERR;
+      }
+    }
+  }
+
+  /* Add standard headers */
+  if (NULL != taler_uri)
+    GNUNET_break (MHD_NO !=
+                  MHD_add_response_header (*reply,
+                                           "Taler",
+                                           taler_uri));
+  GNUNET_break (MHD_NO !=
+                MHD_add_response_header (*reply,
+                                         MHD_HTTP_HEADER_CONTENT_TYPE,
+                                         "text/html"));
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_reply (struct MHD_Connection *connection,
+                        unsigned int http_status,
+                        const char *template,
+                        const char *instance_id,
+                        const char *taler_uri,
+                        const json_t *root)
+{
+  enum GNUNET_GenericReturnValue res;
+  struct MHD_Response *reply;
+  MHD_RESULT ret;
+
+  res = TALER_TEMPLATING_build (connection,
+                                &http_status,
+                                template,
+                                instance_id,
+                                taler_uri,
+                                root,
+                                &reply);
+  if (GNUNET_SYSERR == res)
+    return res;
+  ret = MHD_queue_response (connection,
+                            http_status,
+                            reply);
+  MHD_destroy_response (reply);
+  if (MHD_NO == ret)
+    return GNUNET_SYSERR;
+  return (res == GNUNET_OK)
+    ? GNUNET_OK
+    : GNUNET_NO;
+}
+
+
+/**
+ * Function called with a template's filename.
+ *
+ * @param cls closure, NULL
+ * @param filename complete filename (absolute path)
+ * @return #GNUNET_OK to continue to iterate,
+ *  #GNUNET_NO to stop iteration with no error,
+ *  #GNUNET_SYSERR to abort iteration with error!
+ */
+static enum GNUNET_GenericReturnValue
+load_template (void *cls,
+               const char *filename)
+{
+  char *lang;
+  char *end;
+  int fd;
+  struct stat sb;
+  char *map;
+  const char *name;
+
+  (void) cls;
+  if ('.' == filename[0])
+    return GNUNET_OK;
+  name = strrchr (filename,
+                  '/');
+  if (NULL == name)
+    name = filename;
+  else
+    name++;
+  lang = strchr (name,
+                 '.');
+  if (NULL == lang)
+    return GNUNET_OK; /* name must include .$LANG */
+  lang++;
+  end = strchr (lang,
+                '.');
+  if ( (NULL == end) ||
+       (0 != strcmp (end,
+                     ".must")) )
+    return GNUNET_OK; /* name must end with '.must' */
+
+  /* finally open template */
+  fd = open (filename,
+             O_RDONLY);
+  if (-1 == fd)
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "open",
+                              filename);
+
+    return GNUNET_SYSERR;
+  }
+  if (0 !=
+      fstat (fd,
+             &sb))
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "fstat",
+                              filename);
+    GNUNET_break (0 == close (fd));
+    return GNUNET_OK;
+  }
+  map = GNUNET_malloc_large (sb.st_size + 1);
+  if (NULL == map)
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                         "malloc");
+    GNUNET_break (0 == close (fd));
+    return GNUNET_SYSERR;
+  }
+  if (sb.st_size !=
+      read (fd,
+            map,
+            sb.st_size))
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "read",
+                              filename);
+    GNUNET_break (0 == close (fd));
+    return GNUNET_OK;
+  }
+  GNUNET_break (0 == close (fd));
+  GNUNET_array_grow (loaded,
+                     loaded_length,
+                     loaded_length + 1);
+  loaded[loaded_length - 1].name = GNUNET_strndup (name,
+                                                   (lang - 1) - name);
+  loaded[loaded_length - 1].lang = GNUNET_strndup (lang,
+                                                   end - lang);
+  loaded[loaded_length - 1].value = map;
+  return GNUNET_OK;
+}
+
+
+MHD_RESULT
+TALER_TEMPLATING_reply_error (
+  struct MHD_Connection *connection,
+  const char *template_basename,
+  unsigned int http_status,
+  enum TALER_ErrorCode ec,
+  const char *detail)
+{
+  json_t *data;
+  enum GNUNET_GenericReturnValue ret;
+
+  data = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_uint64 ("ec",
+                             ec),
+    GNUNET_JSON_pack_string ("hint",
+                             TALER_ErrorCode_get_hint (ec)),
+    GNUNET_JSON_pack_allow_null (
+      GNUNET_JSON_pack_string ("detail",
+                               detail))
+    );
+  ret = TALER_TEMPLATING_reply (connection,
+                                http_status,
+                                template_basename,
+                                NULL,
+                                NULL,
+                                data);
+  json_decref (data);
+  switch (ret)
+  {
+  case GNUNET_OK:
+    return MHD_YES;
+  case GNUNET_NO:
+    return MHD_YES;
+  case GNUNET_SYSERR:
+    return MHD_NO;
+  }
+  GNUNET_assert (0);
+  return MHD_NO;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TEMPLATING_init (const char *subsystem)
+{
+  char *dn;
+  int ret;
+
+  {
+    char *path;
+
+    path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+    if (NULL == path)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_asprintf (&dn,
+                     "%s/%s/templates/",
+                     path,
+                     subsystem);
+    GNUNET_free (path);
+  }
+  ret = GNUNET_DISK_directory_scan (dn,
+                                    &load_template,
+                                    NULL);
+  GNUNET_free (dn);
+  if (-1 == ret)
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+void
+TALER_TEMPLATING_done (void)
+{
+  for (unsigned int i = 0; i<loaded_length; i++)
+  {
+    GNUNET_free (loaded[i].name);
+    GNUNET_free (loaded[i].lang);
+    GNUNET_free (loaded[i].value);
+  }
+  GNUNET_array_grow (loaded,
+                     loaded_length,
+                     0);
+}
+
+
+/* end of templating_api.c */
diff --git a/src/templating/test-specs/test-specs-cjson.ref b/src/templating/test-specs/test-specs-cjson.ref
new file mode 100644
index 000000000..8897c66cc
--- /dev/null
+++ b/src/templating/test-specs/test-specs-cjson.ref
@@ -0,0 +1,425 @@
+
+loading test-specs/spec/specs/comments.json
+processing file test-specs/spec/specs/comments.json
+[0] Inline
+	Comment blocks should be removed from the template.
+	=> SUCCESS
+[1] Multiline
+	Multiline comments should be permitted.
+	=> SUCCESS
+[2] Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[3] Indented Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[4] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[5] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[6] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[7] Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[8] Indented Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[9] Indented Inline
+	Inline comments should not strip whitespace
+	=> SUCCESS
+[10] Surrounding Whitespace
+	Comment removal should preserve surrounding whitespace.
+	=> SUCCESS
+[11] Variable Name Collision
+	Comments must never render, even if variable with same name exists.
+	=> SUCCESS
+
+loading test-specs/spec/specs/delimiters.json
+processing file test-specs/spec/specs/delimiters.json
+[0] Pair Behavior
+	The equals sign (used on both sides) should permit delimiter changes.
+	=> SUCCESS
+[1] Special Characters
+	Characters with special meaning regexen should be valid delimiters.
+	=> SUCCESS
+[2] Sections
+	Delimiters set outside sections should persist.
+	=> SUCCESS
+[3] Inverted Sections
+	Delimiters set outside inverted sections should persist.
+	=> SUCCESS
+[4] Partial Inheritence
+	Delimiters set in a parent template should not affect a partial.
+	=> SUCCESS
+[5] Post-Partial Behavior
+	Delimiters set in a partial should not affect the parent template.
+	=> SUCCESS
+[6] Surrounding Whitespace
+	Surrounding whitespace should be left untouched.
+	=> SUCCESS
+[7] Outlying Whitespace (Inline)
+	Whitespace should be left untouched.
+	=> SUCCESS
+[8] Standalone Tag
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[9] Indented Standalone Tag
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[10] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[11] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[12] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[13] Pair with Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/interpolation.json
+processing file test-specs/spec/specs/interpolation.json
+[0] No Interpolation
+	Mustache-free templates should render as-is.
+	=> SUCCESS
+[1] Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[2] HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[3] Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[4] Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[5] Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[6] Triple Mustache Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[7] Ampersand Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[8] Basic Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[9] Triple Mustache Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[10] Ampersand Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[11] Basic Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[12] Triple Mustache Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[13] Ampersand Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[14] Basic Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[15] Triple Mustache Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[16] Ampersand Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[17] Dotted Names - Basic Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[18] Dotted Names - Triple Mustache Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[19] Dotted Names - Ampersand Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[20] Dotted Names - Arbitrary Depth
+	Dotted names should be functional to any level of nesting.
+	=> SUCCESS
+[21] Dotted Names - Broken Chains
+	Any falsey value prior to the last part of the name should yield ''.
+	=> SUCCESS
+[22] Dotted Names - Broken Chain Resolution
+	Each part of a dotted name should resolve only against its parent.
+	=> SUCCESS
+[23] Dotted Names - Initial Resolution
+	The first part of a dotted name should resolve as any other name.
+	=> SUCCESS
+[24] Dotted Names - Context Precedence
+	Dotted names should be resolved against former resolutions.
+	=> SUCCESS
+[25] Implicit Iterators - Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[26] Implicit Iterators - HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[27] Implicit Iterators - Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[28] Implicit Iterators - Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[29] Implicit Iterators - Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[30] Interpolation - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[31] Triple Mustache - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[32] Ampersand - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[33] Interpolation - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[34] Triple Mustache - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[35] Ampersand - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[36] Interpolation With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[37] Triple Mustache With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[38] Ampersand With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/inverted.json
+processing file test-specs/spec/specs/inverted.json
+[0] Falsey
+	Falsey sections should have their contents rendered.
+	=> SUCCESS
+[1] Truthy
+	Truthy sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should behave like truthy values.
+	=> SUCCESS
+[4] List
+	Lists should behave like truthy values.
+	=> SUCCESS
+[5] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[6] Doubled
+	Multiple inverted sections per template should be permitted.
+	=> SUCCESS
+[7] Nested (Falsey)
+	Nested falsey sections should have their contents rendered.
+	=> SUCCESS
+[8] Nested (Truthy)
+	Nested truthy sections should be omitted.
+	=> SUCCESS
+[9] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[10] Dotted Names - Truthy
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[11] Dotted Names - Falsey
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[12] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[13] Surrounding Whitespace
+	Inverted sections should not alter surrounding whitespace.
+	=> SUCCESS
+[14] Internal Whitespace
+	Inverted should not alter internal whitespace.
+	=> SUCCESS
+[15] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[16] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[17] Standalone Indented Lines
+	Standalone indented lines should be removed from the template.
+	=> SUCCESS
+[18] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[19] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[20] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[21] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/partials.json
+processing file test-specs/spec/specs/partials.json
+[0] Basic Behavior
+	The greater-than operator should expand to the named partial.
+	=> SUCCESS
+[1] Failed Lookup
+	The empty string should be used when the named partial is not found.
+	=> SUCCESS
+[2] Context
+	The greater-than operator should operate within the current context.
+	=> SUCCESS
+[3] Recursion
+	The greater-than operator should properly recurse.
+	=> SUCCESS
+[4] Nested
+	The greater-than operator should work from within partials.
+	=> SUCCESS
+[5] Surrounding Whitespace
+	The greater-than operator should not alter surrounding whitespace.
+	=> SUCCESS
+[6] Inline Indentation
+	Whitespace should be left untouched.
+	=> SUCCESS
+[7] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[8] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[9] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[10] Standalone Indentation
+	Each line of the partial should be indented before rendering.
+	=> SUCCESS
+[11] Padding Whitespace
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/sections.json
+processing file test-specs/spec/specs/sections.json
+[0] Truthy
+	Truthy sections should have their contents rendered.
+	=> SUCCESS
+[1] Falsey
+	Falsey sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should be pushed onto the context stack.
+	=> SUCCESS
+[4] Parent contexts
+	Names missing in the current context are looked up in the stack.
+	=> SUCCESS
+[5] Variable test
+	Non-false sections have their value at the top of context,
+accessible as {{.}} or through the parent context. This gives
+a simple way to display content conditionally if a variable exists.
+
+	=> SUCCESS
+[6] List Contexts
+	All elements on the context stack should be accessible within lists.
+	=> SUCCESS
+[7] Deeply Nested Contexts
+	All elements on the context stack should be accessible.
+	=> SUCCESS
+[8] List
+	Lists should be iterated; list items should visit the context stack.
+	=> SUCCESS
+[9] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[10] Doubled
+	Multiple sections per template should be permitted.
+	=> SUCCESS
+[11] Nested (Truthy)
+	Nested truthy sections should have their contents rendered.
+	=> SUCCESS
+[12] Nested (Falsey)
+	Nested falsey sections should be omitted.
+	=> SUCCESS
+[13] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[14] Implicit Iterator - String
+	Implicit iterators should directly interpolate strings.
+	=> SUCCESS
+[15] Implicit Iterator - Integer
+	Implicit iterators should cast integers to strings and interpolate.
+	=> SUCCESS
+[16] Implicit Iterator - Decimal
+	Implicit iterators should cast decimals to strings and interpolate.
+	=> SUCCESS
+[17] Implicit Iterator - Array
+	Implicit iterators should allow iterating over nested arrays.
+	=> SUCCESS
+[18] Implicit Iterator - HTML Escaping
+	Implicit iterators with basic interpolation should be HTML escaped.
+	=> SUCCESS
+[19] Implicit Iterator - Triple mustache
+	Implicit iterators in triple mustache should interpolate without HTML escaping.
+	=> SUCCESS
+[20] Implicit Iterator - Ampersand
+	Implicit iterators in an Ampersand tag should interpolate without HTML escaping.
+	=> SUCCESS
+[21] Implicit Iterator - Root-level
+	Implicit iterators should work on root-level lists.
+	=> SUCCESS
+[22] Dotted Names - Truthy
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[23] Dotted Names - Falsey
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[24] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[25] Surrounding Whitespace
+	Sections should not alter surrounding whitespace.
+	=> SUCCESS
+[26] Internal Whitespace
+	Sections should not alter internal whitespace.
+	=> SUCCESS
+[27] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[28] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[29] Indented Standalone Lines
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[30] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[31] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[32] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[33] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+summary:
+  error   0
+  differ  0
+  success 133
diff --git a/src/templating/test-specs/test-specs-jansson.ref b/src/templating/test-specs/test-specs-jansson.ref
new file mode 100644
index 000000000..a1cef19c1
--- /dev/null
+++ b/src/templating/test-specs/test-specs-jansson.ref
@@ -0,0 +1,429 @@
+
+loading test-specs/spec/specs/comments.json
+processing file test-specs/spec/specs/comments.json
+[0] Inline
+	Comment blocks should be removed from the template.
+	=> SUCCESS
+[1] Multiline
+	Multiline comments should be permitted.
+	=> SUCCESS
+[2] Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[3] Indented Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[4] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[5] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[6] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[7] Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[8] Indented Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[9] Indented Inline
+	Inline comments should not strip whitespace
+	=> SUCCESS
+[10] Surrounding Whitespace
+	Comment removal should preserve surrounding whitespace.
+	=> SUCCESS
+[11] Variable Name Collision
+	Comments must never render, even if variable with same name exists.
+	=> SUCCESS
+
+loading test-specs/spec/specs/delimiters.json
+processing file test-specs/spec/specs/delimiters.json
+[0] Pair Behavior
+	The equals sign (used on both sides) should permit delimiter changes.
+	=> SUCCESS
+[1] Special Characters
+	Characters with special meaning regexen should be valid delimiters.
+	=> SUCCESS
+[2] Sections
+	Delimiters set outside sections should persist.
+	=> SUCCESS
+[3] Inverted Sections
+	Delimiters set outside inverted sections should persist.
+	=> SUCCESS
+[4] Partial Inheritence
+	Delimiters set in a parent template should not affect a partial.
+	=> SUCCESS
+[5] Post-Partial Behavior
+	Delimiters set in a partial should not affect the parent template.
+	=> SUCCESS
+[6] Surrounding Whitespace
+	Surrounding whitespace should be left untouched.
+	=> SUCCESS
+[7] Outlying Whitespace (Inline)
+	Whitespace should be left untouched.
+	=> SUCCESS
+[8] Standalone Tag
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[9] Indented Standalone Tag
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[10] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[11] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[12] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[13] Pair with Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/interpolation.json
+processing file test-specs/spec/specs/interpolation.json
+[0] No Interpolation
+	Mustache-free templates should render as-is.
+	=> SUCCESS
+[1] Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[2] HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[3] Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[4] Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[5] Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[6] Triple Mustache Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[7] Ampersand Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[8] Basic Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[9] Triple Mustache Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[10] Ampersand Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[11] Basic Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[12] Triple Mustache Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[13] Ampersand Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[14] Basic Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[15] Triple Mustache Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[16] Ampersand Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[17] Dotted Names - Basic Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[18] Dotted Names - Triple Mustache Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[19] Dotted Names - Ampersand Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[20] Dotted Names - Arbitrary Depth
+	Dotted names should be functional to any level of nesting.
+	=> SUCCESS
+[21] Dotted Names - Broken Chains
+	Any falsey value prior to the last part of the name should yield ''.
+	=> SUCCESS
+[22] Dotted Names - Broken Chain Resolution
+	Each part of a dotted name should resolve only against its parent.
+	=> SUCCESS
+[23] Dotted Names - Initial Resolution
+	The first part of a dotted name should resolve as any other name.
+	=> SUCCESS
+[24] Dotted Names - Context Precedence
+	Dotted names should be resolved against former resolutions.
+	=> SUCCESS
+[25] Implicit Iterators - Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[26] Implicit Iterators - HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[27] Implicit Iterators - Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[28] Implicit Iterators - Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[29] Implicit Iterators - Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[30] Interpolation - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[31] Triple Mustache - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[32] Ampersand - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[33] Interpolation - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[34] Triple Mustache - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[35] Ampersand - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[36] Interpolation With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[37] Triple Mustache With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[38] Ampersand With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/inverted.json
+processing file test-specs/spec/specs/inverted.json
+[0] Falsey
+	Falsey sections should have their contents rendered.
+	=> SUCCESS
+[1] Truthy
+	Truthy sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should behave like truthy values.
+	=> SUCCESS
+[4] List
+	Lists should behave like truthy values.
+	=> SUCCESS
+[5] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[6] Doubled
+	Multiple inverted sections per template should be permitted.
+	=> SUCCESS
+[7] Nested (Falsey)
+	Nested falsey sections should have their contents rendered.
+	=> SUCCESS
+[8] Nested (Truthy)
+	Nested truthy sections should be omitted.
+	=> SUCCESS
+[9] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[10] Dotted Names - Truthy
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[11] Dotted Names - Falsey
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[12] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[13] Surrounding Whitespace
+	Inverted sections should not alter surrounding whitespace.
+	=> SUCCESS
+[14] Internal Whitespace
+	Inverted should not alter internal whitespace.
+	=> SUCCESS
+[15] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[16] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[17] Standalone Indented Lines
+	Standalone indented lines should be removed from the template.
+	=> SUCCESS
+[18] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[19] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[20] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[21] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/partials.json
+processing file test-specs/spec/specs/partials.json
+[0] Basic Behavior
+	The greater-than operator should expand to the named partial.
+	=> SUCCESS
+[1] Failed Lookup
+	The empty string should be used when the named partial is not found.
+	=> SUCCESS
+[2] Context
+	The greater-than operator should operate within the current context.
+	=> SUCCESS
+[3] Recursion
+	The greater-than operator should properly recurse.
+	=> SUCCESS
+[4] Nested
+	The greater-than operator should work from within partials.
+	=> SUCCESS
+[5] Surrounding Whitespace
+	The greater-than operator should not alter surrounding whitespace.
+	=> SUCCESS
+[6] Inline Indentation
+	Whitespace should be left untouched.
+	=> SUCCESS
+[7] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[8] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[9] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[10] Standalone Indentation
+	Each line of the partial should be indented before rendering.
+	=> SUCCESS
+[11] Padding Whitespace
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/sections.json
+processing file test-specs/spec/specs/sections.json
+[0] Truthy
+	Truthy sections should have their contents rendered.
+	=> SUCCESS
+[1] Falsey
+	Falsey sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should be pushed onto the context stack.
+	=> SUCCESS
+[4] Parent contexts
+	Names missing in the current context are looked up in the stack.
+	=> SUCCESS
+[5] Variable test
+	Non-false sections have their value at the top of context,
+accessible as {{.}} or through the parent context. This gives
+a simple way to display content conditionally if a variable exists.
+
+	=> SUCCESS
+[6] List Contexts
+	All elements on the context stack should be accessible within lists.
+	=> SUCCESS
+[7] Deeply Nested Contexts
+	All elements on the context stack should be accessible.
+	=> SUCCESS
+[8] List
+	Lists should be iterated; list items should visit the context stack.
+	=> SUCCESS
+[9] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[10] Doubled
+	Multiple sections per template should be permitted.
+	=> SUCCESS
+[11] Nested (Truthy)
+	Nested truthy sections should have their contents rendered.
+	=> SUCCESS
+[12] Nested (Falsey)
+	Nested falsey sections should be omitted.
+	=> SUCCESS
+[13] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[14] Implicit Iterator - String
+	Implicit iterators should directly interpolate strings.
+	=> SUCCESS
+[15] Implicit Iterator - Integer
+	Implicit iterators should cast integers to strings and interpolate.
+	=> SUCCESS
+[16] Implicit Iterator - Decimal
+	Implicit iterators should cast decimals to strings and interpolate.
+	=> DIFFERS
+	..     DATA[{"list":[1.1000000000000001,2.2000000000000002,3.2999999999999998,4.4000000000000004,5.5]}]
+	.. TEMPLATE["{{#list}}({{.}}){{/list}}"]
+	.. EXPECTED["(1.1)(2.2)(3.3)(4.4)(5.5)"]
+	..      GOT["(1.1000000000000001)(2.2000000000000002)(3.2999999999999998)(4.4000000000000004)(5.5)"]
+[17] Implicit Iterator - Array
+	Implicit iterators should allow iterating over nested arrays.
+	=> SUCCESS
+[18] Implicit Iterator - HTML Escaping
+	Implicit iterators with basic interpolation should be HTML escaped.
+	=> SUCCESS
+[19] Implicit Iterator - Triple mustache
+	Implicit iterators in triple mustache should interpolate without HTML escaping.
+	=> SUCCESS
+[20] Implicit Iterator - Ampersand
+	Implicit iterators in an Ampersand tag should interpolate without HTML escaping.
+	=> SUCCESS
+[21] Implicit Iterator - Root-level
+	Implicit iterators should work on root-level lists.
+	=> SUCCESS
+[22] Dotted Names - Truthy
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[23] Dotted Names - Falsey
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[24] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[25] Surrounding Whitespace
+	Sections should not alter surrounding whitespace.
+	=> SUCCESS
+[26] Internal Whitespace
+	Sections should not alter internal whitespace.
+	=> SUCCESS
+[27] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[28] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[29] Indented Standalone Lines
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[30] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[31] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[32] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[33] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+summary:
+  error   0
+  differ  1
+  success 132
diff --git a/src/templating/test-specs/test-specs-json-c.ref b/src/templating/test-specs/test-specs-json-c.ref
new file mode 100644
index 000000000..8897c66cc
--- /dev/null
+++ b/src/templating/test-specs/test-specs-json-c.ref
@@ -0,0 +1,425 @@
+
+loading test-specs/spec/specs/comments.json
+processing file test-specs/spec/specs/comments.json
+[0] Inline
+	Comment blocks should be removed from the template.
+	=> SUCCESS
+[1] Multiline
+	Multiline comments should be permitted.
+	=> SUCCESS
+[2] Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[3] Indented Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[4] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[5] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[6] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[7] Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[8] Indented Multiline Standalone
+	All standalone comment lines should be removed.
+	=> SUCCESS
+[9] Indented Inline
+	Inline comments should not strip whitespace
+	=> SUCCESS
+[10] Surrounding Whitespace
+	Comment removal should preserve surrounding whitespace.
+	=> SUCCESS
+[11] Variable Name Collision
+	Comments must never render, even if variable with same name exists.
+	=> SUCCESS
+
+loading test-specs/spec/specs/delimiters.json
+processing file test-specs/spec/specs/delimiters.json
+[0] Pair Behavior
+	The equals sign (used on both sides) should permit delimiter changes.
+	=> SUCCESS
+[1] Special Characters
+	Characters with special meaning regexen should be valid delimiters.
+	=> SUCCESS
+[2] Sections
+	Delimiters set outside sections should persist.
+	=> SUCCESS
+[3] Inverted Sections
+	Delimiters set outside inverted sections should persist.
+	=> SUCCESS
+[4] Partial Inheritence
+	Delimiters set in a parent template should not affect a partial.
+	=> SUCCESS
+[5] Post-Partial Behavior
+	Delimiters set in a partial should not affect the parent template.
+	=> SUCCESS
+[6] Surrounding Whitespace
+	Surrounding whitespace should be left untouched.
+	=> SUCCESS
+[7] Outlying Whitespace (Inline)
+	Whitespace should be left untouched.
+	=> SUCCESS
+[8] Standalone Tag
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[9] Indented Standalone Tag
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[10] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[11] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[12] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[13] Pair with Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/interpolation.json
+processing file test-specs/spec/specs/interpolation.json
+[0] No Interpolation
+	Mustache-free templates should render as-is.
+	=> SUCCESS
+[1] Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[2] HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[3] Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[4] Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[5] Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[6] Triple Mustache Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[7] Ampersand Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[8] Basic Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[9] Triple Mustache Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[10] Ampersand Decimal Interpolation
+	Decimals should interpolate seamlessly with proper significance.
+	=> SUCCESS
+[11] Basic Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[12] Triple Mustache Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[13] Ampersand Null Interpolation
+	Nulls should interpolate as the empty string.
+	=> SUCCESS
+[14] Basic Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[15] Triple Mustache Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[16] Ampersand Context Miss Interpolation
+	Failed context lookups should default to empty strings.
+	=> SUCCESS
+[17] Dotted Names - Basic Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[18] Dotted Names - Triple Mustache Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[19] Dotted Names - Ampersand Interpolation
+	Dotted names should be considered a form of shorthand for sections.
+	=> SUCCESS
+[20] Dotted Names - Arbitrary Depth
+	Dotted names should be functional to any level of nesting.
+	=> SUCCESS
+[21] Dotted Names - Broken Chains
+	Any falsey value prior to the last part of the name should yield ''.
+	=> SUCCESS
+[22] Dotted Names - Broken Chain Resolution
+	Each part of a dotted name should resolve only against its parent.
+	=> SUCCESS
+[23] Dotted Names - Initial Resolution
+	The first part of a dotted name should resolve as any other name.
+	=> SUCCESS
+[24] Dotted Names - Context Precedence
+	Dotted names should be resolved against former resolutions.
+	=> SUCCESS
+[25] Implicit Iterators - Basic Interpolation
+	Unadorned tags should interpolate content into the template.
+	=> SUCCESS
+[26] Implicit Iterators - HTML Escaping
+	Basic interpolation should be HTML escaped.
+	=> SUCCESS
+[27] Implicit Iterators - Triple Mustache
+	Triple mustaches should interpolate without HTML escaping.
+	=> SUCCESS
+[28] Implicit Iterators - Ampersand
+	Ampersand should interpolate without HTML escaping.
+	=> SUCCESS
+[29] Implicit Iterators - Basic Integer Interpolation
+	Integers should interpolate seamlessly.
+	=> SUCCESS
+[30] Interpolation - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[31] Triple Mustache - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[32] Ampersand - Surrounding Whitespace
+	Interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[33] Interpolation - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[34] Triple Mustache - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[35] Ampersand - Standalone
+	Standalone interpolation should not alter surrounding whitespace.
+	=> SUCCESS
+[36] Interpolation With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[37] Triple Mustache With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+[38] Ampersand With Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/inverted.json
+processing file test-specs/spec/specs/inverted.json
+[0] Falsey
+	Falsey sections should have their contents rendered.
+	=> SUCCESS
+[1] Truthy
+	Truthy sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should behave like truthy values.
+	=> SUCCESS
+[4] List
+	Lists should behave like truthy values.
+	=> SUCCESS
+[5] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[6] Doubled
+	Multiple inverted sections per template should be permitted.
+	=> SUCCESS
+[7] Nested (Falsey)
+	Nested falsey sections should have their contents rendered.
+	=> SUCCESS
+[8] Nested (Truthy)
+	Nested truthy sections should be omitted.
+	=> SUCCESS
+[9] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[10] Dotted Names - Truthy
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[11] Dotted Names - Falsey
+	Dotted names should be valid for Inverted Section tags.
+	=> SUCCESS
+[12] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[13] Surrounding Whitespace
+	Inverted sections should not alter surrounding whitespace.
+	=> SUCCESS
+[14] Internal Whitespace
+	Inverted should not alter internal whitespace.
+	=> SUCCESS
+[15] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[16] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[17] Standalone Indented Lines
+	Standalone indented lines should be removed from the template.
+	=> SUCCESS
+[18] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[19] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[20] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[21] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/partials.json
+processing file test-specs/spec/specs/partials.json
+[0] Basic Behavior
+	The greater-than operator should expand to the named partial.
+	=> SUCCESS
+[1] Failed Lookup
+	The empty string should be used when the named partial is not found.
+	=> SUCCESS
+[2] Context
+	The greater-than operator should operate within the current context.
+	=> SUCCESS
+[3] Recursion
+	The greater-than operator should properly recurse.
+	=> SUCCESS
+[4] Nested
+	The greater-than operator should work from within partials.
+	=> SUCCESS
+[5] Surrounding Whitespace
+	The greater-than operator should not alter surrounding whitespace.
+	=> SUCCESS
+[6] Inline Indentation
+	Whitespace should be left untouched.
+	=> SUCCESS
+[7] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[8] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[9] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[10] Standalone Indentation
+	Each line of the partial should be indented before rendering.
+	=> SUCCESS
+[11] Padding Whitespace
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+loading test-specs/spec/specs/sections.json
+processing file test-specs/spec/specs/sections.json
+[0] Truthy
+	Truthy sections should have their contents rendered.
+	=> SUCCESS
+[1] Falsey
+	Falsey sections should have their contents omitted.
+	=> SUCCESS
+[2] Null is falsey
+	Null is falsey.
+	=> SUCCESS
+[3] Context
+	Objects and hashes should be pushed onto the context stack.
+	=> SUCCESS
+[4] Parent contexts
+	Names missing in the current context are looked up in the stack.
+	=> SUCCESS
+[5] Variable test
+	Non-false sections have their value at the top of context,
+accessible as {{.}} or through the parent context. This gives
+a simple way to display content conditionally if a variable exists.
+
+	=> SUCCESS
+[6] List Contexts
+	All elements on the context stack should be accessible within lists.
+	=> SUCCESS
+[7] Deeply Nested Contexts
+	All elements on the context stack should be accessible.
+	=> SUCCESS
+[8] List
+	Lists should be iterated; list items should visit the context stack.
+	=> SUCCESS
+[9] Empty List
+	Empty lists should behave like falsey values.
+	=> SUCCESS
+[10] Doubled
+	Multiple sections per template should be permitted.
+	=> SUCCESS
+[11] Nested (Truthy)
+	Nested truthy sections should have their contents rendered.
+	=> SUCCESS
+[12] Nested (Falsey)
+	Nested falsey sections should be omitted.
+	=> SUCCESS
+[13] Context Misses
+	Failed context lookups should be considered falsey.
+	=> SUCCESS
+[14] Implicit Iterator - String
+	Implicit iterators should directly interpolate strings.
+	=> SUCCESS
+[15] Implicit Iterator - Integer
+	Implicit iterators should cast integers to strings and interpolate.
+	=> SUCCESS
+[16] Implicit Iterator - Decimal
+	Implicit iterators should cast decimals to strings and interpolate.
+	=> SUCCESS
+[17] Implicit Iterator - Array
+	Implicit iterators should allow iterating over nested arrays.
+	=> SUCCESS
+[18] Implicit Iterator - HTML Escaping
+	Implicit iterators with basic interpolation should be HTML escaped.
+	=> SUCCESS
+[19] Implicit Iterator - Triple mustache
+	Implicit iterators in triple mustache should interpolate without HTML escaping.
+	=> SUCCESS
+[20] Implicit Iterator - Ampersand
+	Implicit iterators in an Ampersand tag should interpolate without HTML escaping.
+	=> SUCCESS
+[21] Implicit Iterator - Root-level
+	Implicit iterators should work on root-level lists.
+	=> SUCCESS
+[22] Dotted Names - Truthy
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[23] Dotted Names - Falsey
+	Dotted names should be valid for Section tags.
+	=> SUCCESS
+[24] Dotted Names - Broken Chains
+	Dotted names that cannot be resolved should be considered falsey.
+	=> SUCCESS
+[25] Surrounding Whitespace
+	Sections should not alter surrounding whitespace.
+	=> SUCCESS
+[26] Internal Whitespace
+	Sections should not alter internal whitespace.
+	=> SUCCESS
+[27] Indented Inline Sections
+	Single-line sections should not alter surrounding whitespace.
+	=> SUCCESS
+[28] Standalone Lines
+	Standalone lines should be removed from the template.
+	=> SUCCESS
+[29] Indented Standalone Lines
+	Indented standalone lines should be removed from the template.
+	=> SUCCESS
+[30] Standalone Line Endings
+	"\r\n" should be considered a newline for standalone tags.
+	=> SUCCESS
+[31] Standalone Without Previous Line
+	Standalone tags should not require a newline to precede them.
+	=> SUCCESS
+[32] Standalone Without Newline
+	Standalone tags should not require a newline to follow them.
+	=> SUCCESS
+[33] Padding
+	Superfluous in-tag whitespace should be ignored.
+	=> SUCCESS
+
+summary:
+  error   0
+  differ  0
+  success 133
diff --git a/src/templating/test-specs/test-specs.c b/src/templating/test-specs/test-specs.c
new file mode 100644
index 000000000..15c94a80e
--- /dev/null
+++ b/src/templating/test-specs/test-specs.c
@@ -0,0 +1,520 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ SPDX-License-Identifier: ISC
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+#include "mustach-wrap.h"
+
+#define TEST_JSON_C  1
+#define TEST_JANSSON 2
+#define TEST_CJSON   3
+
+static const char *errors[] = {
+	"??? unreferenced ???",
+	"system",
+	"unexpected end",
+	"empty tag",
+	"tag too long",
+	"bad separators",
+	"too depth",
+	"closing",
+	"bad unescape tag",
+	"invalid interface",
+	"item not found",
+	"partial not found"
+};
+
+const char *mustach_error_string(int status)
+{
+	return status >= 0 ? "no error"
+		: errors[status <= -(int)(sizeof errors / sizeof * errors) ? 0 : -status];
+}
+
+static const char *errmsg = 0;
+static int flags = 0;
+static FILE *output = 0;
+
+static void help(char *prog)
+{
+	char *name = basename(prog);
+#define STR(x) #x
+	printf("%s version %s\n", name, STR(VERSION));
+#undef STR
+	printf("usage: %s test-files...\n", name);
+	exit(0);
+}
+
+#if TEST == TEST_CJSON
+
+static const size_t BLOCKSIZE = 8192;
+
+static char *readfile(const char *filename, size_t *length)
+{
+	int f;
+	struct stat s;
+	char *result;
+	size_t size, pos;
+	ssize_t rc;
+
+	result = NULL;
+	if (filename[0] == '-' &&  filename[1] == 0)
+		f = dup(0);
+	else
+		f = open(filename, O_RDONLY);
+	if (f < 0) {
+		fprintf(stderr, "Can't open file: %s\n", filename);
+		exit(1);
+	}
+
+	fstat(f, &s);
+	switch (s.st_mode & S_IFMT) {
+	case S_IFREG:
+		size = s.st_size;
+		break;
+	case S_IFSOCK:
+	case S_IFIFO:
+		size = BLOCKSIZE;
+		break;
+	default:
+		fprintf(stderr, "Bad file: %s\n", filename);
+		exit(1);
+	}
+
+	pos = 0;
+	result = malloc(size + 1);
+	do {
+		if (result == NULL) {
+			fprintf(stderr, "Out of memory\n");
+			exit(1);
+		}
+		rc = read(f, &result[pos], (size - pos) + 1);
+		if (rc < 0) {
+			fprintf(stderr, "Error while reading %s\n", filename);
+			exit(1);
+		}
+		if (rc > 0) {
+			pos += (size_t)rc;
+			if (pos > size) {
+				size = pos + BLOCKSIZE;
+				result = realloc(result, size + 1);
+			}
+		}
+	} while(rc > 0);
+
+	close(f);
+	if (length != NULL)
+		*length = pos;
+	result[pos] = 0;
+	return result;
+}
+#endif
+
+typedef struct {
+	unsigned nerror;
+	unsigned ndiffers;
+	unsigned nsuccess;
+	unsigned ninvalid;
+} counters;
+
+static int load_json(const char *filename);
+static int process(counters *c);
+static void close_json();
+static int get_partial(const char *name, struct mustach_sbuf *sbuf);
+
+int main(int ac, char **av)
+{
+	char *f;
+	char *prog = *av;
+	int s;
+	counters c;
+
+	(void)ac; /* unused */
+	flags = Mustach_With_SingleDot | Mustach_With_IncPartial;
+	output = stdout;
+	mustach_wrap_get_partial = get_partial;
+
+	memset(&c, 0, sizeof c);
+	while (*++av) {
+		if (!strcmp(*av, "-h") || !strcmp(*av, "--help"))
+			help(prog);
+		f = (av[0][0] == '-' && !av[0][1]) ? "/dev/stdin" : av[0];
+		fprintf(output, "\nloading %s\n", f);
+		s = load_json(f);
+		if (s < 0) {
+			fprintf(stderr, "error when loading %s!\n", f);
+			if(errmsg)
+				fprintf(stderr, "   reason: %s\n", errmsg);
+			exit(1);
+		}
+		fprintf(output, "processing file %s\n", f);
+		s = process(&c);
+		if (s < 0) {
+			fprintf(stderr, "error bad test file %s!\n", f);
+			exit(1);
+		}
+		close_json();
+	}
+	fprintf(output, "\nsummary:\n");
+	if (c.ninvalid)
+		fprintf(output, "  invalid %u\n", c.ninvalid);
+	fprintf(output, "  error   %u\n", c.nerror);
+	fprintf(output, "  differ  %u\n", c.ndiffers);
+	fprintf(output, "  success %u\n", c.nsuccess);
+	if (c.nerror)
+		return 2;
+	if (c.ndiffers)
+		return 1;
+	return 0;
+}
+
+void emit(FILE *f, const char *s)
+{
+	for(;;s++) {
+		switch(*s) {
+		case 0: return;
+		case '\\': fprintf(f, "\\\\"); break;
+		case '\t': fprintf(f, "\\t"); break;
+		case '\n': fprintf(f, "\\n"); break;
+		case '\r': fprintf(f, "\\r"); break;
+		default: fprintf(f, "%c", *s); break;
+		}
+	}
+}
+
+#if TEST == TEST_JSON_C
+
+#include "mustach-json-c.h"
+
+static struct json_object *o;
+
+static struct json_object *partials;
+static int get_partial(const char *name, struct mustach_sbuf *sbuf)
+{
+	struct json_object *x;
+	if (partials == NULL || !json_object_object_get_ex(partials, name, &x))
+		return MUSTACH_ERROR_PARTIAL_NOT_FOUND;
+	sbuf->value = json_object_get_string(x);
+	return MUSTACH_OK;
+}
+
+static int load_json(const char *filename)
+{
+	o = json_object_from_file(filename);
+#if JSON_C_VERSION_NUM >= 0x000D00
+	errmsg = json_util_get_last_err();
+	if (errmsg != NULL)
+		return -1;
+#endif
+	if (o == NULL) {
+		errmsg = "null json";
+		return -1;
+	}
+	return 0;
+}
+static int process(counters *c)
+{
+	const char *t, *e;
+	char *got;
+	unsigned i, n;
+	size_t length;
+	int s;
+	json_object *tests, *unit, *name, *desc, *data, *template, *expected;
+
+	if (!json_object_object_get_ex(o, "tests", &tests) || json_object_get_type(tests) != json_type_array)
+		return -1;
+
+	i = 0;
+	n = (unsigned)json_object_array_length(tests);
+	while (i < n) {
+		unit = json_object_array_get_idx(tests, i);
+		if (json_object_get_type(unit) != json_type_object
+		 || !json_object_object_get_ex(unit, "name", &name)
+		 || !json_object_object_get_ex(unit, "desc", &desc)
+		 || !json_object_object_get_ex(unit, "data", &data)
+		 || !json_object_object_get_ex(unit, "template", &template)
+		 || !json_object_object_get_ex(unit, "expected", &expected)
+		 || json_object_get_type(name) != json_type_string
+		 || json_object_get_type(desc) != json_type_string
+		 || json_object_get_type(template) != json_type_string
+		 || json_object_get_type(expected) != json_type_string) {
+			fprintf(stderr, "invalid test %u\n", i);
+			c->ninvalid++;
+		}
+		else {
+			fprintf(output, "[%u] %s\n", i, json_object_get_string(name));
+			fprintf(output, "\t%s\n", json_object_get_string(desc));
+			if (!json_object_object_get_ex(unit, "partials", &partials))
+				partials = NULL;
+			t = json_object_get_string(template);
+			e = json_object_get_string(expected);
+			s = mustach_json_c_mem(t, 0, data, flags, &got, &length);
+			if (s == 0 && strcmp(got, e) == 0) {
+				fprintf(output, "\t=> SUCCESS\n");
+				c->nsuccess++;
+			}
+			else {
+				if (s < 0) {
+					fprintf(output, "\t=> ERROR %s\n", mustach_error_string(s));
+					c->nerror++;
+				}
+				else {
+					fprintf(output, "\t=> DIFFERS\n");
+					c->ndiffers++;
+				}
+				if (partials)
+					fprintf(output, "\t.. PARTIALS[%s]\n", json_object_to_json_string_ext(partials, 0));
+				fprintf(output, "\t..     DATA[%s]\n", json_object_to_json_string_ext(data, 0));
+				fprintf(output, "\t.. TEMPLATE[");
+				emit(output, t);
+				fprintf(output, "]\n");
+				fprintf(output, "\t.. EXPECTED[");
+				emit(output, e);
+				fprintf(output, "]\n");
+				if (s == 0) {
+					fprintf(output, "\t..      GOT[");
+					emit(output, got);
+					fprintf(output, "]\n");
+				}
+			}
+			free(got);
+		}
+		i++;
+	}
+	return 0;
+}
+static void close_json()
+{
+	json_object_put(o);
+}
+
+#elif TEST == TEST_JANSSON
+
+#include "mustach-jansson.h"
+
+static json_t *o;
+static json_error_t e;
+
+static json_t *partials;
+static int get_partial(const char *name, struct mustach_sbuf *sbuf)
+{
+	json_t *x;
+	if (partials == NULL || !(x = json_object_get(partials, name)))
+		return MUSTACH_ERROR_PARTIAL_NOT_FOUND;
+	sbuf->value = json_string_value(x);
+	return MUSTACH_OK;
+}
+
+static int load_json(const char *filename)
+{
+	o = json_load_file(filename, JSON_DECODE_ANY, &e);
+	if (o == NULL) {
+		errmsg = e.text;
+		return -1;
+	}
+	return 0;
+}
+static int process(counters *c)
+{
+	const char *t, *e;
+	char *got, *tmp;
+	int i, n;
+	size_t length;
+	int s;
+	json_t *tests, *unit, *name, *desc, *data, *template, *expected;
+
+	tests = json_object_get(o, "tests");
+	if (!tests || json_typeof(tests) != JSON_ARRAY)
+		return -1;
+
+	i = 0;
+	n = json_array_size(tests);
+	while (i < n) {
+		unit = json_array_get(tests, i);
+		if (!unit || json_typeof(unit) != JSON_OBJECT
+		 || !(name = json_object_get(unit, "name"))
+		 || !(desc = json_object_get(unit, "desc"))
+		 || !(data = json_object_get(unit, "data"))
+		 || !(template = json_object_get(unit, "template"))
+		 || !(expected = json_object_get(unit, "expected"))
+		 || json_typeof(name) != JSON_STRING
+		 || json_typeof(desc) != JSON_STRING
+		 || json_typeof(template) != JSON_STRING
+		 || json_typeof(expected) != JSON_STRING) {
+			fprintf(stderr, "invalid test %u\n", i);
+			c->ninvalid++;
+		}
+		else {
+			fprintf(output, "[%u] %s\n", i, json_string_value(name));
+			fprintf(output, "\t%s\n", json_string_value(desc));
+			partials = json_object_get(unit, "partials");
+			t = json_string_value(template);
+			e = json_string_value(expected);
+			s = mustach_jansson_mem(t, 0, data, flags, &got, &length);
+			if (s == 0 && strcmp(got, e) == 0) {
+				fprintf(output, "\t=> SUCCESS\n");
+				c->nsuccess++;
+			}
+			else {
+				if (s < 0) {
+					fprintf(output, "\t=> ERROR %s\n", mustach_error_string(s));
+					c->nerror++;
+				}
+				else {
+					fprintf(output, "\t=> DIFFERS\n");
+					c->ndiffers++;
+				}
+				if (partials) {
+					tmp = json_dumps(partials, JSON_ENCODE_ANY | JSON_COMPACT);
+					fprintf(output, "\t.. PARTIALS[%s]\n", tmp);
+					free(tmp);
+				}
+				tmp = json_dumps(data, JSON_ENCODE_ANY | JSON_COMPACT);
+				fprintf(output, "\t..     DATA[%s]\n", tmp);
+				free(tmp);
+				fprintf(output, "\t.. TEMPLATE[");
+				emit(output, t);
+				fprintf(output, "]\n");
+				fprintf(output, "\t.. EXPECTED[");
+				emit(output, e);
+				fprintf(output, "]\n");
+				if (s == 0) {
+					fprintf(output, "\t..      GOT[");
+					emit(output, got);
+					fprintf(output, "]\n");
+				}
+			}
+			free(got);
+		}
+		i++;
+	}
+	return 0;
+}
+static void close_json()
+{
+	json_decref(o);
+}
+
+#elif TEST == TEST_CJSON
+
+#include "mustach-cjson.h"
+
+static cJSON *o;
+static cJSON *partials;
+static int get_partial(const char *name, struct mustach_sbuf *sbuf)
+{
+	cJSON *x;
+	if (partials == NULL || !(x = cJSON_GetObjectItemCaseSensitive(partials, name)))
+		return MUSTACH_ERROR_PARTIAL_NOT_FOUND;
+	sbuf->value = x->valuestring;
+	return MUSTACH_OK;
+}
+
+static int load_json(const char *filename)
+{
+	char *t;
+	size_t length;
+
+	t = readfile(filename, &length);
+	o = t ? cJSON_ParseWithLength(t, length) : NULL;
+	free(t);
+	return -!o;
+}
+static int process(counters *c)
+{
+	const char *t, *e;
+	char *got, *tmp;
+	int i, n;
+	size_t length;
+	int s;
+	cJSON *tests, *unit, *name, *desc, *data, *template, *expected;
+
+	tests = cJSON_GetObjectItemCaseSensitive(o, "tests");
+	if (!tests || tests->type != cJSON_Array)
+		return -1;
+
+	i = 0;
+	n = cJSON_GetArraySize(tests);
+	while (i < n) {
+		unit = cJSON_GetArrayItem(tests, i);
+		if (!unit || unit->type != cJSON_Object
+		 || !(name = cJSON_GetObjectItemCaseSensitive(unit, "name"))
+		 || !(desc = cJSON_GetObjectItemCaseSensitive(unit, "desc"))
+		 || !(data = cJSON_GetObjectItemCaseSensitive(unit, "data"))
+		 || !(template = cJSON_GetObjectItemCaseSensitive(unit, "template"))
+		 || !(expected = cJSON_GetObjectItemCaseSensitive(unit, "expected"))
+		 || name->type != cJSON_String
+		 || desc->type != cJSON_String
+		 || template->type != cJSON_String
+		 || expected->type != cJSON_String) {
+			fprintf(stderr, "invalid test %u\n", i);
+			c->ninvalid++;
+		}
+		else {
+			fprintf(output, "[%u] %s\n", i, name->valuestring);
+			fprintf(output, "\t%s\n", desc->valuestring);
+			partials = cJSON_GetObjectItemCaseSensitive(unit, "partials");
+			t = template->valuestring;
+			e = expected->valuestring;
+			s = mustach_cJSON_mem(t, 0, data, flags, &got, &length);
+			if (s == 0 && strcmp(got, e) == 0) {
+				fprintf(output, "\t=> SUCCESS\n");
+				c->nsuccess++;
+			}
+			else {
+				if (s < 0) {
+					fprintf(output, "\t=> ERROR %s\n", mustach_error_string(s));
+					c->nerror++;
+				}
+				else {
+					fprintf(output, "\t=> DIFFERS\n");
+					c->ndiffers++;
+				}
+				if (partials) {
+					tmp = cJSON_PrintUnformatted(partials);
+					fprintf(output, "\t.. PARTIALS[%s]\n", tmp);
+					free(tmp);
+				}
+				tmp = cJSON_PrintUnformatted(data);
+				fprintf(output, "\t..     DATA[%s]\n", tmp);
+				free(tmp);
+				fprintf(output, "\t.. TEMPLATE[");
+				emit(output, t);
+				fprintf(output, "]\n");
+				fprintf(output, "\t.. EXPECTED[");
+				emit(output, e);
+				fprintf(output, "]\n");
+				if (s == 0) {
+					fprintf(output, "\t..      GOT[");
+					emit(output, got);
+					fprintf(output, "]\n");
+				}
+			}
+			free(got);
+		}
+		i++;
+	}
+	return 0;
+}
+static void close_json()
+{
+	cJSON_Delete(o);
+}
+
+#else
+#error "no defined json library"
+#endif
diff --git a/src/templating/test1/.gitignore b/src/templating/test1/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test1/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test1/Makefile b/src/templating/test1/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test1/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test1/json b/src/templating/test1/json
new file mode 100644
index 000000000..6562fb064
--- /dev/null
+++ b/src/templating/test1/json
@@ -0,0 +1,23 @@
+{
+  "name": "Chris",
+  "value": 10000,
+  "taxed_value": 6000,
+  "in_ca": true,
+  "person": false,
+  "repo": [
+    { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] },
+    { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ]  },
+    { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ]  }
+  ],
+  "person?": { "name": "Jon" },
+  "special": "----{{extra}}----\n",
+  "extra": 3.14159,
+  "#sharp": "#",
+  "!bang": "!",
+  "/slash": "/",
+  "^circ": "^",
+  "=equal": "=",
+  ":colon": ":",
+  ">greater": ">",
+  "~tilde": "~"
+}
diff --git a/src/templating/test1/must b/src/templating/test1/must
new file mode 100644
index 000000000..92d30b0b2
--- /dev/null
+++ b/src/templating/test1/must
@@ -0,0 +1,49 @@
+Hello {{name}}
+You have just won {{value}} dollars!
+{{#in_ca}}
+Well, {{taxed_value}} dollars, after taxes.
+{{/in_ca}}
+Shown.
+{{#person}}
+  Never shown!
+{{/person}}
+{{^person}}
+  No person
+{{/person}}
+
+{{#repo}}
+  <b>{{name}}</b> reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}}
+{{/repo}}
+
+{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+
+{{=%(% %)%=}}
+=====================================
+%(%! gros commentaire %)%
+%(%#repo%)%
+  <b>%(%name%)%</b> reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)%
+%(%/repo%)%
+=====================================
+%(%={{ }}=%)%
+ggggggggg
+{{> special}}
+jjjjjjjjj
+end
+
+{{:#sharp}}
+{{:!bang}}
+{{:~tilde}}
+{{:/~0tilde}}
+{{:/~1slash}} see json pointers IETF RFC 6901
+{{:^circ}}
+{{:\=equal}}
+{{::colon}}
+{{:>greater}}
+
+{{#repo}}
+who 0 {{who.0}}
+who 1 {{who.1}}
+who 2 {{who.2}}
+{{/repo}}
diff --git a/src/templating/test1/resu.ref b/src/templating/test1/resu.ref
new file mode 100644
index 000000000..6cd11bb27
--- /dev/null
+++ b/src/templating/test1/resu.ref
@@ -0,0 +1,41 @@
+Hello Chris
+You have just won 10000 dollars!
+Well, 6000 dollars, after taxes.
+Shown.
+  No person
+
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+
+  Hi Jon!
+
+=====================================
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+=====================================
+ggggggggg
+----3.14159----
+jjjjjjjjj
+end
+
+#
+!
+~
+~
+/ see json pointers IETF RFC 6901
+^
+=
+:
+&gt;
+
+who 0 {&quot;commiter&quot;:&quot;joe&quot;}
+who 1 {&quot;reviewer&quot;:&quot;avrel&quot;}
+who 2 {&quot;commiter&quot;:&quot;william&quot;}
+who 0 {&quot;commiter&quot;:&quot;jack&quot;}
+who 1 {&quot;reviewer&quot;:&quot;avrel&quot;}
+who 2 {&quot;commiter&quot;:&quot;greg&quot;}
+who 0 {&quot;reviewer&quot;:&quot;joe&quot;}
+who 1 {&quot;reviewer&quot;:&quot;jack&quot;}
+who 2 {&quot;commiter&quot;:&quot;greg&quot;}
diff --git a/src/templating/test1/vg.ref b/src/templating/test1/vg.ref
new file mode 100644
index 000000000..d086e59c5
--- /dev/null
+++ b/src/templating/test1/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 111 allocs, 111 frees, 9,702 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test2/.gitignore b/src/templating/test2/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test2/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test2/Makefile b/src/templating/test2/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test2/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test2/json b/src/templating/test2/json
new file mode 100644
index 000000000..8c668b3b1
--- /dev/null
+++ b/src/templating/test2/json
@@ -0,0 +1,9 @@
+{
+  "header": "Colors",
+  "items": [
+      {"name": "red", "first": true, "url": "#Red"},
+      {"name": "green", "link": true, "url": "#Green"},
+      {"name": "blue", "link": true, "url": "#Blue"}
+  ],
+  "empty": false
+}
diff --git a/src/templating/test2/must b/src/templating/test2/must
new file mode 100644
index 000000000..aa6da7077
--- /dev/null
+++ b/src/templating/test2/must
@@ -0,0 +1,17 @@
+<h1>{{header}}</h1>
+{{#bug}}
+{{/bug}}
+
+{{#items}}
+  {{#first}}
+    <li><strong>{{name}}</strong></li>
+  {{/first}}
+  {{#link}}
+    <li><a href="{{url}}">{{name}}</a></li>
+  {{/link}}
+{{/items}}
+
+{{#empty}}
+  <p>The list is empty.</p>
+{{/empty}}
+
diff --git a/src/templating/test2/resu.ref b/src/templating/test2/resu.ref
new file mode 100644
index 000000000..5a200a9bf
--- /dev/null
+++ b/src/templating/test2/resu.ref
@@ -0,0 +1,7 @@
+<h1>Colors</h1>
+
+    <li><strong>red</strong></li>
+    <li><a href="#Green">green</a></li>
+    <li><a href="#Blue">blue</a></li>
+
+
diff --git a/src/templating/test2/vg.ref b/src/templating/test2/vg.ref
new file mode 100644
index 000000000..e4b4f6d37
--- /dev/null
+++ b/src/templating/test2/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 38 allocs, 38 frees, 5,712 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test3/.gitignore b/src/templating/test3/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test3/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test3/Makefile b/src/templating/test3/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test3/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test3/json b/src/templating/test3/json
new file mode 100644
index 000000000..792788171
--- /dev/null
+++ b/src/templating/test3/json
@@ -0,0 +1,7 @@
+{
+  "name": "Chris",
+  "company": "<b>GitHub & Co</b>",
+  "names": ["Chris", "Kross"],
+  "skills": ["JavaScript", "PHP", "Java"],
+  "age": 18
+}
diff --git a/src/templating/test3/must b/src/templating/test3/must
new file mode 100644
index 000000000..5c490469b
--- /dev/null
+++ b/src/templating/test3/must
@@ -0,0 +1,15 @@
+* {{name}}
+* {{age}}
+* {{company}}
+* {{&company}}
+* {{{company}}}
+{{=<% %>=}}
+* <%company%>
+* <%&company%>
+* <%{company}%>
+
+<%={{ }}=%>
+* <ul>{{#names}}<li>{{.}}</li>{{/names}}</ul>
+* skills: <ul>{{#skills}}<li>{{.}}</li>{{/skills}}</ul>
+{{#age}}* age: {{.}}{{/age}}
+
diff --git a/src/templating/test3/resu.ref b/src/templating/test3/resu.ref
new file mode 100644
index 000000000..ee6dad3fb
--- /dev/null
+++ b/src/templating/test3/resu.ref
@@ -0,0 +1,13 @@
+* Chris
+* 18
+* &lt;b&gt;GitHub &amp; Co&lt;/b&gt;
+* <b>GitHub & Co</b>
+* <b>GitHub & Co</b>
+* &lt;b&gt;GitHub &amp; Co&lt;/b&gt;
+* <b>GitHub & Co</b>
+* <b>GitHub & Co</b>
+
+* <ul><li>Chris</li><li>Kross</li></ul>
+* skills: <ul><li>JavaScript</li><li>PHP</li><li>Java</li></ul>
+* age: 18
+
diff --git a/src/templating/test3/vg.ref b/src/templating/test3/vg.ref
new file mode 100644
index 000000000..21f7931eb
--- /dev/null
+++ b/src/templating/test3/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 30 allocs, 30 frees, 5,831 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test4/.gitignore b/src/templating/test4/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test4/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test4/Makefile b/src/templating/test4/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test4/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test4/json b/src/templating/test4/json
new file mode 100644
index 000000000..a10836072
--- /dev/null
+++ b/src/templating/test4/json
@@ -0,0 +1,13 @@
+{
+  "person": { "name": "Jon", "age": 25 },
+  "person.name": "Fred",
+  "person.name=Fred": "The other Fred.",
+  "persons": [
+	{ "name": "Jon", "age": 25, "lang": "en" },
+	{ "name": "Henry", "age": 27, "lang": "en" },
+	{ "name": "Amed", "age": 24, "lang": "fr" } ],
+  "fellows": {
+	"Jon": { "age": 25, "lang": "en" },
+	"Henry": { "age": 27, "lang": "en" },
+	"Amed": { "age": 24, "lang": "fr" } }
+}
diff --git a/src/templating/test4/must b/src/templating/test4/must
new file mode 100644
index 000000000..003b93666
--- /dev/null
+++ b/src/templating/test4/must
@@ -0,0 +1,58 @@
+This are extensions!!
+
+{{person.name}}
+{{person.age}}
+
+{{person\.name}}
+{{person\.name\=Fred}}
+
+{{#person.name=Jon}}
+Hello Jon
+{{/person.name=Jon}}
+
+{{^person.name=Jon}}
+No Jon? Hey Jon...
+{{/person.name=Jon}}
+
+{{^person.name=Harry}}
+No Harry? Hey Calahan...
+{{/person.name=Harry}}
+
+{{#person\.name=Fred}}
+Hello Fred
+{{/person\.name=Fred}}
+
+{{^person\.name=Fred}}
+No Fred? Hey Fred...
+{{/person\.name=Fred}}
+
+{{#person\.name\=Fred=The other Fred.}}
+Hello Fred#2
+{{/person\.name\=Fred=The other Fred.}}
+
+{{^person\.name\=Fred=The other Fred.}}
+No Fred#2? Hey Fred#2...
+{{/person\.name\=Fred=The other Fred.}}
+
+{{#persons}}
+{{#lang=!fr}}Hello {{name}}, {{age}} years{{/lang=!fr}}
+{{#lang=fr}}Salut {{name}}, {{age}} ans{{/lang=fr}}
+{{/persons}}
+
+{{#persons}}
+{{name}}: {{age=24}}/{{age}}/{{age=!27}}
+{{/persons}}
+
+{{#fellows.*}}
+{{*}}: {{age=24}}/{{age}}/{{age=!27}}
+{{/fellows.*}}
+
+{{#*}}
+ (1) {{*}}: {{.}}
+   {{#*}}
+     (2) {{*}}: {{.}}
+     {{#*}}
+       (3) {{*}}: {{.}}
+     {{/*}}
+   {{/*}}
+{{/*}}
diff --git a/src/templating/test4/resu.ref b/src/templating/test4/resu.ref
new file mode 100644
index 000000000..8a71c4e82
--- /dev/null
+++ b/src/templating/test4/resu.ref
@@ -0,0 +1,50 @@
+This are extensions!!
+
+Jon
+25
+
+Fred
+The other Fred.
+
+Hello Jon
+
+
+No Harry? Hey Calahan...
+
+Hello Fred
+
+
+Hello Fred#2
+
+
+Hello Jon, 25 years
+
+Hello Henry, 27 years
+
+
+Salut Amed, 24 ans
+
+Jon: /25/25
+Henry: /27/
+Amed: 24/24/24
+
+Jon: /25/25
+Henry: /27/
+Amed: 24/24/24
+
+ (1) person: {&quot;name&quot;:&quot;Jon&quot;,&quot;age&quot;:25}
+     (2) name: Jon
+     (2) age: 25
+ (1) person.name: Fred
+ (1) person.name=Fred: The other Fred.
+ (1) persons: [{&quot;name&quot;:&quot;Jon&quot;,&quot;age&quot;:25,&quot;lang&quot;:&quot;en&quot;},{&quot;name&quot;:&quot;Henry&quot;,&quot;age&quot;:27,&quot;lang&quot;:&quot;en&quot;},{&quot;name&quot;:&quot;Amed&quot;,&quot;age&quot;:24,&quot;lang&quot;:&quot;fr&quot;}]
+ (1) fellows: {&quot;Jon&quot;:{&quot;age&quot;:25,&quot;lang&quot;:&quot;en&quot;},&quot;Henry&quot;:{&quot;age&quot;:27,&quot;lang&quot;:&quot;en&quot;},&quot;Amed&quot;:{&quot;age&quot;:24,&quot;lang&quot;:&quot;fr&quot;}}
+     (2) Jon: {&quot;age&quot;:25,&quot;lang&quot;:&quot;en&quot;}
+       (3) age: 25
+       (3) lang: en
+     (2) Henry: {&quot;age&quot;:27,&quot;lang&quot;:&quot;en&quot;}
+       (3) age: 27
+       (3) lang: en
+     (2) Amed: {&quot;age&quot;:24,&quot;lang&quot;:&quot;fr&quot;}
+       (3) age: 24
+       (3) lang: fr
diff --git a/src/templating/test4/vg.ref b/src/templating/test4/vg.ref
new file mode 100644
index 000000000..922b0676d
--- /dev/null
+++ b/src/templating/test4/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 121 allocs, 121 frees, 14,608 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test5/.gitignore b/src/templating/test5/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test5/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test5/Makefile b/src/templating/test5/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test5/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test5/json b/src/templating/test5/json
new file mode 100644
index 000000000..6562fb064
--- /dev/null
+++ b/src/templating/test5/json
@@ -0,0 +1,23 @@
+{
+  "name": "Chris",
+  "value": 10000,
+  "taxed_value": 6000,
+  "in_ca": true,
+  "person": false,
+  "repo": [
+    { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] },
+    { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ]  },
+    { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ]  }
+  ],
+  "person?": { "name": "Jon" },
+  "special": "----{{extra}}----\n",
+  "extra": 3.14159,
+  "#sharp": "#",
+  "!bang": "!",
+  "/slash": "/",
+  "^circ": "^",
+  "=equal": "=",
+  ":colon": ":",
+  ">greater": ">",
+  "~tilde": "~"
+}
diff --git a/src/templating/test5/must b/src/templating/test5/must
new file mode 100644
index 000000000..44305df24
--- /dev/null
+++ b/src/templating/test5/must
@@ -0,0 +1,23 @@
+=====================================
+from json
+{{> special}}
+=====================================
+not found
+{{> notfound}}
+=====================================
+without extension first
+{{> must2 }}
+=====================================
+last with extension
+{{> must3 }}
+=====================================
+Ensure must3 didn't change specials
+
+{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+
+%(%#person?%)%
+  Hi %(%name%)%!
+%(%/person?%)%
+
diff --git a/src/templating/test5/must2 b/src/templating/test5/must2
new file mode 100644
index 000000000..d4a1d3783
--- /dev/null
+++ b/src/templating/test5/must2
@@ -0,0 +1,14 @@
+must2 == BEGIN
+Hello {{name}}
+You have just won {{value}} dollars!
+{{#in_ca}}
+Well, {{taxed_value}} dollars, after taxes.
+{{/in_ca}}
+Shown.
+{{#person}}
+  Never shown!
+{{/person}}
+{{^person}}
+  No person
+{{/person}}
+must2 == END
diff --git a/src/templating/test5/must2.mustache b/src/templating/test5/must2.mustache
new file mode 100644
index 000000000..33f1ead38
--- /dev/null
+++ b/src/templating/test5/must2.mustache
@@ -0,0 +1 @@
+must2.mustache ==SHOULD NOT BE SEEN==
diff --git a/src/templating/test5/must3.mustache b/src/templating/test5/must3.mustache
new file mode 100644
index 000000000..67eddb1ef
--- /dev/null
+++ b/src/templating/test5/must3.mustache
@@ -0,0 +1,17 @@
+must3.mustache == BEGIN
+{{#repo}}
+  <b>{{name}}</b> reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}}
+{{/repo}}
+
+{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+
+{{=%(% %)%=}}
+=====================================
+%(%! big comment %)%
+%(%#repo%)%
+  <b>%(%name%)%</b> reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)%
+%(%/repo%)%
+=====================================
+must3.mustache == END
diff --git a/src/templating/test5/resu.ref b/src/templating/test5/resu.ref
new file mode 100644
index 000000000..f2a608568
--- /dev/null
+++ b/src/templating/test5/resu.ref
@@ -0,0 +1,38 @@
+=====================================
+from json
+----3.14159----
+=====================================
+not found
+=====================================
+without extension first
+must2 == BEGIN
+Hello Chris
+You have just won 10000 dollars!
+Well, 6000 dollars, after taxes.
+Shown.
+  No person
+must2 == END
+=====================================
+last with extension
+must3.mustache == BEGIN
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+
+  Hi Jon!
+
+=====================================
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+=====================================
+must3.mustache == END
+=====================================
+Ensure must3 didn't change specials
+
+  Hi Jon!
+
+%(%#person?%)%
+  Hi %(%name%)%!
+%(%/person?%)%
+
diff --git a/src/templating/test5/vg.ref b/src/templating/test5/vg.ref
new file mode 100644
index 000000000..89dc21bcb
--- /dev/null
+++ b/src/templating/test5/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 123 allocs, 123 frees, 20,610 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test6/.gitignore b/src/templating/test6/.gitignore
new file mode 100644
index 000000000..15e6dd5a5
--- /dev/null
+++ b/src/templating/test6/.gitignore
@@ -0,0 +1,3 @@
+resu.last
+vg.last
+test-custom-write
diff --git a/src/templating/test6/Makefile b/src/templating/test6/Makefile
new file mode 100644
index 000000000..ea4f86e79
--- /dev/null
+++ b/src/templating/test6/Makefile
@@ -0,0 +1,12 @@
+.PHONY: test clean
+
+test-custom-write: test-custom-write.c ../mustach-json-c.h ../mustach-json-c.c ../mustach-wrap.c ../mustach.h ../mustach.c
+	@echo building test-custom-write
+	$(CC) $(CFLAGS) $(LDFLAGS) -g -o test-custom-write test-custom-write.c  ../mustach.c  ../mustach-json-c.c ../mustach-wrap.c -ljson-c
+
+test: test-custom-write
+	@mustach=./test-custom-write ../dotest.sh json -U must -l must -x must
+
+clean:
+	rm -f resu.last vg.last test-custom-write
+
diff --git a/src/templating/test6/json b/src/templating/test6/json
new file mode 100644
index 000000000..6562fb064
--- /dev/null
+++ b/src/templating/test6/json
@@ -0,0 +1,23 @@
+{
+  "name": "Chris",
+  "value": 10000,
+  "taxed_value": 6000,
+  "in_ca": true,
+  "person": false,
+  "repo": [
+    { "name": "resque", "who": [ { "commiter": "joe" }, { "reviewer": "avrel" }, { "commiter": "william" } ] },
+    { "name": "hub", "who": [ { "commiter": "jack" }, { "reviewer": "avrel" }, { "commiter": "greg" } ]  },
+    { "name": "rip", "who": [ { "reviewer": "joe" }, { "reviewer": "jack" }, { "commiter": "greg" } ]  }
+  ],
+  "person?": { "name": "Jon" },
+  "special": "----{{extra}}----\n",
+  "extra": 3.14159,
+  "#sharp": "#",
+  "!bang": "!",
+  "/slash": "/",
+  "^circ": "^",
+  "=equal": "=",
+  ":colon": ":",
+  ">greater": ">",
+  "~tilde": "~"
+}
diff --git a/src/templating/test6/must b/src/templating/test6/must
new file mode 100644
index 000000000..6df523669
--- /dev/null
+++ b/src/templating/test6/must
@@ -0,0 +1,43 @@
+Hello {{name}}
+You have just won {{value}} dollars!
+{{#in_ca}}
+Well, {{taxed_value}} dollars, after taxes.
+{{/in_ca}}
+Shown.
+{{#person}}
+  Never shown!
+{{/person}}
+{{^person}}
+  No person
+{{/person}}
+
+{{#repo}}
+  <b>{{name}}</b> reviewers:{{#who}} {{reviewer}}{{/who}} commiters:{{#who}} {{commiter}}{{/who}}
+{{/repo}}
+
+{{#person?}}
+  Hi {{name}}!
+{{/person?}}
+
+{{=%(% %)%=}}
+=====================================
+%(%! gros commentaire %)%
+%(%#repo%)%
+  <b>%(%name%)%</b> reviewers:%(%#who%)% %(%reviewer%)%%(%/who%)% commiters:%(%#who%)% %(%commiter%)%%(%/who%)%
+%(%/repo%)%
+=====================================
+%(%={{ }}=%)%
+ggggggggg
+{{> special}}
+jjjjjjjjj
+end
+
+{{:#sharp}}
+{{:!bang}}
+{{:~tilde}}
+{{:/~0tilde}}
+{{:/~1slash}} see json pointers IETF RFC 6901
+{{:^circ}}
+{{:\=equal}}
+{{::colon}}
+{{:>greater}}
diff --git a/src/templating/test6/resu.ref b/src/templating/test6/resu.ref
new file mode 100644
index 000000000..377eb11af
--- /dev/null
+++ b/src/templating/test6/resu.ref
@@ -0,0 +1,93 @@
+HELLO CHRIS
+YOU HAVE JUST WON 10000 DOLLARS!
+WELL, 6000 DOLLARS, AFTER TAXES.
+SHOWN.
+  NO PERSON
+
+  <B>RESQUE</B> REVIEWERS:  AVREL  COMMITERS: JOE  WILLIAM
+  <B>HUB</B> REVIEWERS:  AVREL  COMMITERS: JACK  GREG
+  <B>RIP</B> REVIEWERS: JOE JACK  COMMITERS:   GREG
+
+  HI JON!
+
+=====================================
+  <B>RESQUE</B> REVIEWERS:  AVREL  COMMITERS: JOE  WILLIAM
+  <B>HUB</B> REVIEWERS:  AVREL  COMMITERS: JACK  GREG
+  <B>RIP</B> REVIEWERS: JOE JACK  COMMITERS:   GREG
+=====================================
+GGGGGGGGG
+----3.14159----
+JJJJJJJJJ
+END
+
+#
+!
+~
+~
+/ SEE JSON POINTERS IETF RFC 6901
+^
+=
+:
+&GT;
+hello chris
+you have just won 10000 dollars!
+well, 6000 dollars, after taxes.
+shown.
+  no person
+
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+
+  hi jon!
+
+=====================================
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+=====================================
+ggggggggg
+----3.14159----
+jjjjjjjjj
+end
+
+#
+!
+~
+~
+/ see json pointers ietf rfc 6901
+^
+=
+:
+&gt;
+Hello Chris
+You have just won 10000 dollars!
+Well, 6000 dollars, after taxes.
+Shown.
+  No person
+
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+
+  Hi Jon!
+
+=====================================
+  <b>resque</b> reviewers:  avrel  commiters: joe  william
+  <b>hub</b> reviewers:  avrel  commiters: jack  greg
+  <b>rip</b> reviewers: joe jack  commiters:   greg
+=====================================
+ggggggggg
+----3.14159----
+jjjjjjjjj
+end
+
+#
+!
+~
+~
+/ see json pointers IETF RFC 6901
+^
+=
+:
+&gt;
diff --git a/src/templating/test6/test-custom-write.c b/src/templating/test6/test-custom-write.c
new file mode 100644
index 000000000..20042c1ed
--- /dev/null
+++ b/src/templating/test6/test-custom-write.c
@@ -0,0 +1,149 @@
+/*
+ Author: José Bollo <jobol@nonadev.net>
+
+ https://gitlab.com/jobol/mustach
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <libgen.h>
+
+#include "../mustach-json-c.h"
+
+static const size_t BLOCKSIZE = 8192;
+
+static char *readfile(const char *filename)
+{
+	int f;
+	struct stat s;
+	char *result, *ptr;
+	size_t size, pos;
+	ssize_t rc;
+
+	result = NULL;
+	if (filename[0] == '-' &&  filename[1] == 0)
+		f = dup(0);
+	else
+		f = open(filename, O_RDONLY);
+	if (f < 0) {
+		fprintf(stderr, "Can't open file: %s\n", filename);
+		exit(1);
+	}
+
+	fstat(f, &s);
+	switch (s.st_mode & S_IFMT) {
+	case S_IFREG:
+		size = s.st_size;
+		break;
+	case S_IFSOCK:
+	case S_IFIFO:
+		size = BLOCKSIZE;
+		break;
+	default:
+		fprintf(stderr, "Bad file: %s\n", filename);
+		exit(1);
+	}
+
+	pos = 0;
+	result = malloc(size + 1);
+	do {
+		if (result == NULL) {
+			fprintf(stderr, "Out of memory\n");
+			exit(1);
+		}
+		rc = read(f, &result[pos], (size - pos) + 1);
+		if (rc < 0) {
+			fprintf(stderr, "Error while reading %s\n", filename);
+			exit(1);
+		}
+		if (rc > 0) {
+			pos += (size_t)rc;
+			if (pos > size) {
+				size = pos + BLOCKSIZE;
+				ptr = realloc(result, size + 1);
+				if (!ptr)
+					free(result);
+				result = ptr;
+			}
+		}
+	} while(rc > 0);
+
+	close(f);
+	result[pos] = 0;
+	return result;
+}
+
+enum { None, Upper, Lower } mode = None;
+
+int uwrite(void *closure, const char *buffer, size_t size)
+{
+	switch(mode) {
+	case None:
+		fwrite(buffer, size, 1, stdout);
+		break;
+	case Upper:
+		while(size--)
+			fputc(toupper(*buffer++), stdout);
+		break;
+	case Lower:
+		while(size--)
+			fputc(tolower(*buffer++), stdout);
+		break;
+	}
+	return 0;
+}
+
+int main(int ac, char **av)
+{
+	struct json_object *o;
+	char *t;
+	char *prog = *av;
+	int s;
+
+	if (*++av) {
+		o = json_object_from_file(av[0]);
+		if (o == NULL) {
+			fprintf(stderr, "Aborted: null json (file %s)\n", av[0]);
+			exit(1);
+		}
+		while(*++av) {
+			if (!strcmp(*av, "-U"))
+				mode = Upper;
+			else if  (!strcmp(*av, "-l"))
+				mode = Lower;
+			else if  (!strcmp(*av, "-x"))
+				mode = None;
+			else {
+				t = readfile(*av);
+				s = mustach_json_c_write(t, 0, o, Mustach_With_AllExtensions, uwrite, NULL);
+				if (s != 0)
+					fprintf(stderr, "Template error %d\n", s);
+				free(t);
+			}
+		}
+		json_object_put(o);
+	}
+	return 0;
+}
+
diff --git a/src/templating/test6/vg.ref b/src/templating/test6/vg.ref
new file mode 100644
index 000000000..fb0e31bd8
--- /dev/null
+++ b/src/templating/test6/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ./test-custom-write json -U must -l must -x must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 174 allocs, 174 frees, 24,250 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test7/Makefile b/src/templating/test7/Makefile
new file mode 100644
index 000000000..8e3a3b990
--- /dev/null
+++ b/src/templating/test7/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json base.mustache
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test7/base.mustache b/src/templating/test7/base.mustache
new file mode 100644
index 000000000..f701e0c65
--- /dev/null
+++ b/src/templating/test7/base.mustache
@@ -0,0 +1,2 @@
+family:
+{{> node}}
diff --git a/src/templating/test7/json b/src/templating/test7/json
new file mode 100644
index 000000000..c9ee47150
--- /dev/null
+++ b/src/templating/test7/json
@@ -0,0 +1,8 @@
+{ "data": "grandparent", "children": [
+  { "data": "parent", "children": [
+    { "data": "child", "children": [] }
+  ]},
+  { "data": "parent2", "children": [
+    { "data": "child2", "children": [ { "data": "pet", "children": false } ]}
+  ]}
+]}
diff --git a/src/templating/test7/node.mustache b/src/templating/test7/node.mustache
new file mode 100644
index 000000000..4154b12ba
--- /dev/null
+++ b/src/templating/test7/node.mustache
@@ -0,0 +1,4 @@
+<{{data}}>
+{{#children}}
+    {{> node}}
+{{/children}}
diff --git a/src/templating/test7/resu.ref b/src/templating/test7/resu.ref
new file mode 100644
index 000000000..d02b24e11
--- /dev/null
+++ b/src/templating/test7/resu.ref
@@ -0,0 +1,7 @@
+family:
+<grandparent>
+    <parent>
+        <child>
+    <parent2>
+        <child2>
+            <pet>
diff --git a/src/templating/test7/vg.ref b/src/templating/test7/vg.ref
new file mode 100644
index 000000000..032e6c447
--- /dev/null
+++ b/src/templating/test7/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json base.mustache
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 69 allocs, 69 frees, 36,313 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test8/.gitignore b/src/templating/test8/.gitignore
new file mode 100644
index 000000000..4d897daa0
--- /dev/null
+++ b/src/templating/test8/.gitignore
@@ -0,0 +1,2 @@
+resu.last
+vg.last
diff --git a/src/templating/test8/Makefile b/src/templating/test8/Makefile
new file mode 100644
index 000000000..1a3e57914
--- /dev/null
+++ b/src/templating/test8/Makefile
@@ -0,0 +1,8 @@
+.PHONY: test clean
+
+test:
+	@../dotest.sh json must
+
+clean:
+	rm -f resu.last vg.last
+
diff --git a/src/templating/test8/json b/src/templating/test8/json
new file mode 100644
index 000000000..04a1e4aaa
--- /dev/null
+++ b/src/templating/test8/json
@@ -0,0 +1,8 @@
+{
+"val1": "",
+"val2": 0,
+"val3": false,
+"val4": null,
+"val5": [],
+"val6": 0.0
+}
diff --git a/src/templating/test8/must b/src/templating/test8/must
new file mode 100644
index 000000000..a22374438
--- /dev/null
+++ b/src/templating/test8/must
@@ -0,0 +1,6 @@
+x{{#val1}} {{.}} {{/val1}}x
+x{{#val2}} {{.}} {{/val2}}x
+x{{#val3}} {{.}} {{/val3}}x
+x{{#val4}} {{.}} {{/val4}}x
+x{{#val5}} {{.}} {{/val5}}x
+x{{#val6}} {{.}} {{/val6}}x
diff --git a/src/templating/test8/resu.ref b/src/templating/test8/resu.ref
new file mode 100644
index 000000000..e0c16e49a
--- /dev/null
+++ b/src/templating/test8/resu.ref
@@ -0,0 +1,6 @@
+xx
+xx
+xx
+xx
+xx
+xx
diff --git a/src/templating/test8/vg.ref b/src/templating/test8/vg.ref
new file mode 100644
index 000000000..b5b0235f9
--- /dev/null
+++ b/src/templating/test8/vg.ref
@@ -0,0 +1,14 @@
+Memcheck, a memory error detector
+Copyright (C) 2002-2022, and GNU GPL'd, by Julian Seward et al.
+Using Valgrind-3.19.0 and LibVEX; rerun with -h for copyright info
+Command: ../mustach json must
+
+
+HEAP SUMMARY:
+    in use at exit: 0 bytes in 0 blocks
+  total heap usage: 17 allocs, 17 frees, 4,832 bytes allocated
+
+All heap blocks were freed -- no leaks are possible
+
+For lists of detected and suppressed errors, rerun with: -s
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/src/templating/test_mustach_jansson.c b/src/templating/test_mustach_jansson.c
new file mode 100644
index 000000000..beb155f6d
--- /dev/null
+++ b/src/templating/test_mustach_jansson.c
@@ -0,0 +1,125 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2014-2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software 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/>
+*/
+
+/**
+ * @file test_mustach_jansson.c
+ * @brief testcase to test the mustach/jansson integration
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include "mustach-jansson.h"
+#include <gnunet/gnunet_util_lib.h>
+
+static void
+assert_template (const char *template,
+                 json_t *root,
+                 const char *expected)
+{
+  char *r;
+  size_t sz;
+
+  GNUNET_assert (0 == mustach_jansson_mem (template,
+                                           0,
+                                           root,
+                                           Mustach_With_AllExtensions,
+                                           &r,
+                                           &sz));
+  GNUNET_assert (0 == strcmp (r,
+                              expected));
+  GNUNET_free (r);
+}
+
+
+int
+main (int argc,
+      char *const *argv)
+{
+  json_t *root = json_object ();
+  json_t *arr = json_array ();
+  json_t *obj = json_object ();
+  /* test 1 */
+  const char *t1 = "hello world";
+  const char *x1 = "hello world";
+  /* test 2 */
+  const char *t2 = "hello {{ v1 }}";
+  const char *x2 = "hello world";
+  /* test 3 */
+  const char *t3 = "hello {{ v3.x }}";
+  const char *x3 = "hello baz";
+  /* test 4 */
+  const char *t4 = "hello {{# v2 }}{{ . }}{{/ v2 }}";
+  const char *x4 = "hello foobar";
+  /* test 5 */
+  const char *t5 = "hello {{# v3 }}{{ y }}/{{ x }}{{ z }}{{/ v3 }}";
+  const char *x5 = "hello quux/baz";
+  /* test 8 */
+  const char *t8 = "{{^ v4 }}fallback{{/ v4 }}";
+  const char *x8 = "fallback";
+
+  (void) argc;
+  (void) argv;
+  GNUNET_log_setup ("test-mustach-jansson",
+                    "INFO",
+                    NULL);
+  GNUNET_assert (NULL != root);
+  GNUNET_assert (NULL != arr);
+  GNUNET_assert (NULL != obj);
+  GNUNET_assert (0 ==
+                 json_object_set_new (root,
+                                      "v1",
+                                      json_string ("world")));
+  GNUNET_assert (0 ==
+                 json_object_set_new (root,
+                                      "v4",
+                                      json_array ()));
+  GNUNET_assert (0 ==
+                 json_array_append_new (arr,
+                                        json_string ("foo")));
+  GNUNET_assert (0 ==
+                 json_array_append_new (arr,
+                                        json_string ("bar")));
+  GNUNET_assert (0 ==
+                 json_object_set_new (root,
+                                      "v2",
+                                      arr));
+  GNUNET_assert (0 ==
+                 json_object_set_new (root,
+                                      "v3",
+                                      obj));
+  GNUNET_assert (0 ==
+                 json_object_set_new (root,
+                                      "amt",
+                                      json_string ("EUR:123.00")));
+  GNUNET_assert (0 ==
+                 json_object_set_new (obj,
+                                      "x",
+                                      json_string ("baz")));
+  GNUNET_assert (0 ==
+                 json_object_set_new (obj,
+                                      "y",
+                                      json_string ("quux")));
+  assert_template (t1, root, x1);
+  assert_template (t2, root, x2);
+  assert_template (t3, root, x3);
+  assert_template (t4, root, x4);
+  assert_template (t5, root, x5);
+  assert_template (t8, root, x8);
+  json_decref (root);
+  return 0;
+}
diff --git a/src/testing/.gitignore b/src/testing/.gitignore
index 6a19ba005..e1075ab16 100644
--- a/src/testing/.gitignore
+++ b/src/testing/.gitignore
@@ -8,6 +8,10 @@ test_taler_exchange_aggregator-postgres
 test_taler_exchange_wirewatch-postgres
 test_exchange_api_revocation_cs
 test_exchange_api_revocation_rsa
+test_exchange_api_age_restriction_cs
+test_exchange_api_age_restriction_rsa
+test_exchange_api_conflicts_cs
+test_exchange_api_conflicts_rsa
 report*
 test_exchange_management_api_cs
 test_exchange_management_api_rsa
@@ -46,3 +50,13 @@ test_exchange_api_twisted_cs
 test_exchange_api_twisted_rsa
 test_exchange_p2p_cs
 test_exchange_p2p_rsa
+*.edited
+tmp-last-response.*
+test_exchange_api_home/taler/auditor/
+test_exchange_api_home/taler/exchange-offline/secm_tofus.pub
+test_exchange_api_home/taler/exchange-secmod-cs/
+test_exchange_api_home/taler/exchange-secmod-eddsa/
+test_exchange_api_home/taler/exchange-secmod-rsa/
+test_exchange_api_keys_cherry_picking_home/taler/
+test_taler_exchange_httpd_home/taler/
+libeufin-bank.pid
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 42c4d8d6b..195ab4c55 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -13,6 +13,9 @@ endif
 clean-local:
 	rm -rf report*
 
+bin_SCRIPTS = \
+  taler-unified-setup.sh
+
 # Libraries
 
 lib_LTLIBRARIES = \
@@ -37,11 +40,11 @@ libtalertesting_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
 libtalertesting_la_SOURCES = \
+  testing_api_cmd_age_withdraw.c \
   testing_api_cmd_auditor_add_denom_sig.c \
   testing_api_cmd_auditor_add.c \
   testing_api_cmd_auditor_del.c \
   testing_api_cmd_auditor_deposit_confirmation.c \
-  testing_api_cmd_auditor_exchanges.c \
   testing_api_cmd_auditor_exec_auditor.c \
   testing_api_cmd_auditor_exec_auditor_dbinit.c \
   testing_api_cmd_bank_admin_add_incoming.c \
@@ -52,8 +55,11 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_bank_history_debit.c \
   testing_api_cmd_bank_transfer.c \
   testing_api_cmd_batch.c \
-  testing_api_cmd_change_auth.c \
-  testing_api_cmd_check_keys.c \
+  testing_api_cmd_batch_deposit.c \
+  testing_api_cmd_batch_withdraw.c \
+  testing_api_cmd_check_aml_decision.c \
+  testing_api_cmd_check_aml_decisions.c \
+  testing_api_cmd_coin_history.c \
   testing_api_cmd_common.c \
   testing_api_cmd_contract_get.c \
   testing_api_cmd_deposit.c \
@@ -64,7 +70,10 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_exec_expire.c \
   testing_api_cmd_exec_router.c \
   testing_api_cmd_exec_transfer.c \
+  testing_api_cmd_exec_wget.c \
   testing_api_cmd_exec_wirewatch.c \
+  testing_api_cmd_get_auditor.c \
+  testing_api_cmd_get_exchange.c \
   testing_api_cmd_insert_deposit.c \
   testing_api_cmd_kyc_check_get.c \
   testing_api_cmd_kyc_proof.c \
@@ -75,40 +84,46 @@ libtalertesting_la_SOURCES = \
   testing_api_cmd_offline_sign_keys.c \
   testing_api_cmd_offline_sign_extensions.c \
   testing_api_cmd_purse_create_deposit.c \
+  testing_api_cmd_purse_delete.c \
   testing_api_cmd_purse_deposit.c \
   testing_api_cmd_purse_get.c \
   testing_api_cmd_purse_merge.c \
-  testing_api_cmd_set_wire_fee.c \
   testing_api_cmd_recoup.c \
   testing_api_cmd_recoup_refresh.c \
   testing_api_cmd_refund.c \
   testing_api_cmd_refresh.c \
+  testing_api_cmd_reserve_attest.c \
+  testing_api_cmd_reserve_close.c \
   testing_api_cmd_reserve_get.c \
+  testing_api_cmd_reserve_get_attestable.c \
   testing_api_cmd_reserve_history.c \
+  testing_api_cmd_reserve_open.c \
   testing_api_cmd_reserve_purse.c \
-  testing_api_cmd_reserve_status.c \
   testing_api_cmd_revoke.c \
   testing_api_cmd_revoke_denom_key.c \
   testing_api_cmd_revoke_sign_key.c \
-  testing_api_cmd_rewind.c \
-  testing_api_cmd_serialize_keys.c \
+  testing_api_cmd_run_fakebank.c \
+  testing_api_cmd_set_officer.c \
+  testing_api_cmd_set_wire_fee.c \
   testing_api_cmd_signal.c \
   testing_api_cmd_sleep.c \
   testing_api_cmd_stat.c \
+  testing_api_cmd_system_start.c \
+  testing_api_cmd_take_aml_decision.c \
   testing_api_cmd_transfer_get.c \
   testing_api_cmd_wait.c \
-  testing_api_cmd_wire.c \
   testing_api_cmd_wire_add.c \
   testing_api_cmd_wire_del.c \
   testing_api_cmd_withdraw.c \
-  testing_api_helpers_auditor.c \
-  testing_api_helpers_bank.c \
-  testing_api_helpers_exchange.c \
   testing_api_loop.c \
+  testing_api_misc.c \
   testing_api_traits.c
+
+
 libtalertesting_la_LIBADD = \
   $(top_builddir)/src/lib/libtalerauditor.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
+  $(top_builddir)/src/exchangedb/libtalerexchangedb.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/mhd/libtalermhd.la \
   $(top_builddir)/src/util/libtalerutil.la \
@@ -119,6 +134,7 @@ libtalertesting_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
+  -lmicrohttpd \
   $(XLIB)
 
 
@@ -126,22 +142,17 @@ libtalertesting_la_LIBADD = \
 
 AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
 
-noinst_PROGRAMS = \
-  test_exchange_p2p_cs \
-  test_exchange_p2p_rsa
-
 
-.NOTPARALLEL:
 check_PROGRAMS = \
-  test_auditor_api_cs \
-  test_auditor_api_rsa \
-  test_auditor_api_version_rsa \
-  test_auditor_api_version_cs \
+  test_auditor_api_version \
   test_bank_api_with_fakebank \
-  test_bank_api_with_pybank \
   test_bank_api_with_nexus \
   test_exchange_api_cs \
   test_exchange_api_rsa \
+  test_exchange_api_age_restriction_cs \
+  test_exchange_api_age_restriction_rsa \
+  test_exchange_api_conflicts_cs \
+  test_exchange_api_conflicts_rsa \
   test_exchange_api_keys_cherry_picking_cs \
   test_exchange_api_keys_cherry_picking_rsa \
   test_exchange_api_revocation_cs \
@@ -152,15 +163,19 @@ check_PROGRAMS = \
   test_exchange_management_api_rsa \
   test_kyc_api \
   test_taler_exchange_aggregator-postgres \
-  test_taler_exchange_wirewatch-postgres
+  test_taler_exchange_wirewatch-postgres \
+  test_exchange_p2p_cs \
+  test_exchange_p2p_rsa
 if HAVE_TWISTER
   check_PROGRAMS += \
     test_exchange_api_twisted_cs \
     test_exchange_api_twisted_rsa \
-    test_bank_api_with_fakebank_twisted \
-    test_bank_api_with_pybank_twisted
+    test_bank_api_with_fakebank_twisted
 endif
 
+# Removed for now...
+#  test_auditor_api_cs
+#  test_auditor_api_rsa
 
 
 TESTS = \
@@ -177,7 +192,6 @@ test_auditor_api_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -194,34 +208,19 @@ test_auditor_api_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
   $(XLIB)
 
 
-test_auditor_api_version_cs_SOURCES = \
+test_auditor_api_version_SOURCES = \
   test_auditor_api_version.c
-test_auditor_api_version_cs_LDADD = \
+test_auditor_api_version_LDADD = \
   libtalertesting.la \
   $(top_builddir)/src/lib/libtalerauditor.la \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
-test_auditor_api_version_rsa_SOURCES = \
-  test_auditor_api_version.c
-test_auditor_api_version_rsa_LDADD = \
-  libtalertesting.la \
-  $(top_builddir)/src/lib/libtalerauditor.la \
-  $(LIBGCRYPT_LIBS) \
-  $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -231,7 +230,7 @@ test_bank_api_with_nexus_SOURCES = \
   test_bank_api.c
 test_bank_api_with_nexus_LDADD = \
   libtalertesting.la \
-  -ltalerexchange \
+  $(top_builddir)/src/lib/libtalerexchange.la \
   -lgnunetutil \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(XLIB)
@@ -240,15 +239,6 @@ test_bank_api_with_fakebank_SOURCES = \
   test_bank_api.c
 test_bank_api_with_fakebank_LDADD = \
   libtalertesting.la \
-  -ltalerexchange \
-  -lgnunetutil \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(XLIB)
-
-test_bank_api_with_pybank_SOURCES = \
-  test_bank_api.c
-test_bank_api_with_pybank_LDADD = \
-  libtalertesting.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
   -lgnunetutil \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
@@ -265,7 +255,6 @@ test_exchange_api_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -282,7 +271,70 @@ test_exchange_api_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+test_exchange_api_age_restriction_cs_SOURCES = \
+  test_exchange_api_age_restriction.c
+test_exchange_api_age_restriction_cs_LDADD = \
+  libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/extensions/libtalerextensions.la \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+test_exchange_api_age_restriction_rsa_SOURCES = \
+  test_exchange_api_age_restriction.c
+test_exchange_api_age_restriction_rsa_LDADD = \
+  libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/extensions/libtalerextensions.la \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+test_exchange_api_conflicts_cs_SOURCES = \
+  test_exchange_api_conflicts.c
+test_exchange_api_conflicts_cs_LDADD = \
+  libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/extensions/libtalerextensions.la \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  $(XLIB)
+
+test_exchange_api_conflicts_rsa_SOURCES = \
+  test_exchange_api_conflicts.c
+test_exchange_api_conflicts_rsa_LDADD = \
+  libtalertesting.la \
+  $(top_builddir)/src/lib/libtalerexchange.la \
+  $(LIBGCRYPT_LIBS) \
+  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  $(top_builddir)/src/bank-lib/libtalerbank.la \
+  $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/util/libtalerutil.la \
+  $(top_builddir)/src/extensions/libtalerextensions.la \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -299,7 +351,6 @@ test_exchange_p2p_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -316,7 +367,6 @@ test_exchange_p2p_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -332,7 +382,6 @@ test_exchange_api_keys_cherry_picking_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -347,7 +396,6 @@ test_exchange_api_keys_cherry_picking_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -363,7 +411,6 @@ test_exchange_api_revocation_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -379,7 +426,6 @@ test_exchange_api_revocation_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -395,7 +441,6 @@ test_exchange_api_overlapping_keys_bug_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -410,7 +455,6 @@ test_exchange_api_overlapping_keys_bug_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -422,7 +466,6 @@ test_exchange_management_api_cs_LDADD = \
   libtalertesting.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetutil \
   $(XLIB)
 
@@ -432,7 +475,6 @@ test_exchange_management_api_rsa_LDADD = \
   libtalertesting.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetutil \
   $(XLIB)
 
@@ -481,7 +523,6 @@ test_exchange_api_twisted_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
@@ -499,7 +540,6 @@ test_exchange_api_twisted_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
@@ -515,30 +555,12 @@ test_bank_api_with_fakebank_twisted_LDADD = \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
   libtalertwistertesting.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
   $(XLIB)
 
-test_bank_api_with_pybank_twisted_SOURCES = \
-  test_bank_api_twisted.c
-test_bank_api_with_pybank_twisted_LDADD = \
-  libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/lib/libtalerexchange.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  libtalertwistertesting.la \
-  -lgnunettesting \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson  \
-  $(XLIB)
-
-
 test_kyc_api_SOURCES = \
   test_kyc_api.c
 test_kyc_api_LDADD = \
@@ -558,34 +580,38 @@ test_kyc_api_LDADD = \
 # Distribution
 
 EXTRA_DIST = \
+  $(bin_SCRIPTS) \
+  valgrind.h \
+  coins-cs.conf \
+  coins-rsa.conf \
   test_auditor_api-cs.conf \
   test_auditor_api-rsa.conf \
   test_auditor_api_expire_reserve_now-cs.conf \
   test_auditor_api_expire_reserve_now-rsa.conf \
+  test_bank_api.conf \
   test_bank_api_fakebank.conf \
   test_bank_api_fakebank_twisted.conf \
-  test_bank_api_pybank.conf \
-  test_bank_api_pybank_twisted.conf \
-  test_exchange_api_home/.config/taler/account-2.json \
+  test_bank_api_nexus.conf \
+  test_exchange_api_home/taler/auditor/offline-keys/auditor.priv \
   test_exchange_api_home/.local/share/taler/exchange-offline/master.priv \
-  test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \
-  test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json \
-  test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv \
-  test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \
+  test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv \
+  test_exchange_api.conf \
   test_exchange_api-cs.conf \
   test_exchange_api-rsa.conf \
+  test_exchange_api_age_restriction.conf \
+  test_exchange_api_age_restriction-cs.conf \
+  test_exchange_api_age_restriction-rsa.conf \
+  test_exchange_api_conflicts.conf \
+  test_exchange_api_conflicts-cs.conf \
+  test_exchange_api_conflicts-rsa.conf \
+  test_exchange_api-twisted.conf \
   test_exchange_api_twisted-cs.conf \
   test_exchange_api_twisted-rsa.conf \
+  test_exchange_api_keys_cherry_picking.conf \
   test_exchange_api_keys_cherry_picking-cs.conf \
   test_exchange_api_keys_cherry_picking-rsa.conf \
   test_exchange_api_expire_reserve_now-cs.conf \
   test_exchange_api_expire_reserve_now-rsa.conf \
-  test_taler_exchange_httpd_home/.config/taler/account-1.json \
-  test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv \
-  test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_taler_exchange_httpd_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \
   test-taler-exchange-aggregator-postgres.conf \
   test-taler-exchange-wirewatch-postgres.conf \
   test_kyc_api.conf
diff --git a/src/testing/coins-cs.conf b/src/testing/coins-cs.conf
new file mode 100644
index 000000000..92163baac
--- /dev/null
+++ b/src/testing/coins-cs.conf
@@ -0,0 +1,118 @@
+
+# Sections starting with "coin_" specify which denominations
+# the exchange should support (and their respective fee structure)
+[coin_eur_ct_1]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_ct_10]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_1]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_5]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+[coin_eur_10]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = CS
+
+
+[coin_eur_ct_1_age_restricted]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+age_restricted = YES
+CIPHER = CS
+
+[coin_eur_ct_10_age_restricted]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+age_restricted = YES
+CIPHER = CS
+
+[coin_eur_1_age_restricted]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+age_restricted = YES
+CIPHER = CS
+
+[coin_eur_5_age_restricted]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+age_restricted = YES
+CIPHER = CS
+
+[coin_eur_10_age_restricted]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+age_restricted = YES
+CIPHER = CS
diff --git a/src/testing/coins-rsa.conf b/src/testing/coins-rsa.conf
new file mode 100644
index 000000000..7a21a343b
--- /dev/null
+++ b/src/testing/coins-rsa.conf
@@ -0,0 +1,128 @@
+# This file is in the public domain.
+
+# Sections starting with "coin_" specify which denominations
+# the exchange should support (and their respective fee structure)
+[coin_eur_ct_1]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 1024
+
+[coin_eur_ct_10]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 1024
+
+[coin_eur_1]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 1024
+
+[coin_eur_5]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 1024
+
+[coin_eur_10]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+CIPHER = RSA
+rsa_keysize = 1024
+
+[coin_eur_ct_1_age_restricted]
+value = EUR:0.01
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.00
+fee_deposit = EUR:0.00
+fee_refresh = EUR:0.01
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+age_restricted = YES
+CIPHER = RSA
+
+[coin_eur_ct_10_age_restricted]
+value = EUR:0.10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+age_restricted = YES
+CIPHER = RSA
+
+[coin_eur_1_age_restricted]
+value = EUR:1
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+age_restricted = YES
+CIPHER = RSA
+
+[coin_eur_5_age_restricted]
+value = EUR:5
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+age_restricted = YES
+CIPHER = RSA
+
+[coin_eur_10_age_restricted]
+value = EUR:10
+duration_withdraw = 7 days
+duration_spend = 2 years
+duration_legal = 3 years
+fee_withdraw = EUR:0.01
+fee_deposit = EUR:0.01
+fee_refresh = EUR:0.03
+fee_refund = EUR:0.01
+rsa_keysize = 1024
+age_restricted = YES
+CIPHER = RSA
\ No newline at end of file
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
new file mode 100755
index 000000000..d933cc819
--- /dev/null
+++ b/src/testing/taler-unified-setup.sh
@@ -0,0 +1,934 @@
+#!/bin/bash
+#
+# This file is part of TALER
+# Copyright (C) 2023, 2024 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/>
+#
+# Author: Christian Grothoff
+#
+# This script configures and launches various GNU Taler services.
+# Which ones depend on command-line options. Use "-h" to find out.
+# Prints "<<READY>>" on a separate line once all requested services
+# are running. Close STDIN (or input 'NEWLINE') to stop all started
+# services again.
+#
+# shellcheck disable=SC2317
+
+set -eu
+
+# These break TALER_HOME control via TALER_TEST_HOME...
+unset XDG_DATA_HOME
+unset XDG_CONFIG_HOME
+unset XDG_CACHE_HOME
+
+EXIT_STATUS=2
+
+# Exit, with status code "skip" (no 'real' failure)
+function exit_skip() {
+    echo " SKIP: " "$@" >&2
+    EXIT_STATUS=77
+    exit "$EXIT_STATUS"
+}
+
+# Exit, with error message (hard failure)
+function exit_fail() {
+    echo " FAIL: " "$@" >&2
+    EXIT_STATUS=1
+    exit "$EXIT_STATUS"
+}
+
+# Cleanup to run whenever we exit
+function cleanup()
+{
+    echo "Taler unified setup terminating at $STAGE!" >&2
+
+    for n in $(jobs -p)
+    do
+        kill "$n" 2> /dev/null || true
+    done
+    wait
+    rm -f libeufin-nexus.pid libeufin-sandbox.pid
+    exit "$EXIT_STATUS"
+}
+
+STAGE="boot"
+
+# Install cleanup handler (except for kill -9)
+trap cleanup EXIT
+
+WAIT_FOR_SIGNAL=0
+START_AUDITOR=0
+START_BACKUP=0
+START_EXCHANGE=0
+START_FAKEBANK=0
+START_DONAU=0
+START_CHALLENGER=0
+START_AGGREGATOR=0
+START_MERCHANT=0
+START_NEXUS=0
+START_BANK=0
+START_TRANSFER=0
+START_WIREWATCH=0
+START_DEPOSITCHECK=0
+START_MERCHANT_EXCHANGE=0
+START_MERCHANT_WIREWATCH=0
+USE_ACCOUNT="exchange-account-1"
+USE_VALGRIND=""
+WIRE_DOMAIN="x-taler-bank"
+CONF_ORIG="$HOME/.config/taler.conf"
+LOGLEVEL="DEBUG"
+DEFAULT_SLEEP="0.2"
+
+# Parse command-line options
+while getopts ':abc:d:DeEfghkL:mMnr:stu:vwWz' OPTION; do
+    case "$OPTION" in
+        a)
+            START_AUDITOR="1"
+            ;;
+        b)
+            START_BANK="1"
+            ;;
+        c)
+            CONF_ORIG="$OPTARG"
+            ;;
+        d)
+            WIRE_DOMAIN="$OPTARG"
+            ;;
+        D)
+            START_DONAU="1"
+            ;;
+        e)
+            START_EXCHANGE="1"
+            ;;
+        E)
+            START_MERCHANT_EXCHANGE="1"
+            ;;
+        f)
+            START_FAKEBANK="1"
+            ;;
+        h)
+            echo 'Supported options:'
+            echo '  -a           -- start auditor'
+            echo '  -b           -- start bank'
+            # shellcheck disable=SC2016
+            echo '  -c $CONF     -- set configuration'
+            # shellcheck disable=SC2016
+            echo '  -d $METHOD   -- use wire method (default: x-taler-bank)'
+            echo '  -D           -- start donau'
+            echo '  -e           -- start exchange'
+            echo '  -E           -- start taler-merchant-exchange'
+            echo '  -f           -- start fakebank'
+            echo '  -g           -- start taler-exchange-aggregator'
+            echo '  -h           -- print this help'
+            echo '  -k           -- start challenger (KYC service)'
+            # shellcheck disable=SC2016
+            echo '  -L $LOGLEVEL -- set log level'
+            echo '  -m           -- start taler-merchant'
+            echo '  -M           -- start taler-merchant-depositcheck'
+            echo '  -n           -- start nexus'
+            # shellcheck disable=SC2016
+            echo '  -r $MEX      -- which exchange to use at the merchant (optional)'
+            echo '  -s           -- start backup/sync'
+            echo '  -t           -- start taler-exchange-transfer'
+            # shellcheck disable=SC2016
+            echo '  -u $SECTION  -- exchange account to use'
+            echo '  -v           -- use valgrind'
+            echo '  -w           -- start taler-exchange-wirewatch'
+            echo '  -W           -- wait for signal'
+            echo '  -z           -- start taler-merchant-wirewatch'
+            exit 0
+            ;;
+        g)
+            START_AGGREGATOR="1"
+            ;;
+        k)
+            START_CHALLENGER="1"
+            ;;
+        L)
+            LOGLEVEL="$OPTARG"
+            ;;
+        m)
+            START_MERCHANT="1"
+            ;;
+        M)
+            START_DEPOSITCHECK="1"
+            ;;
+        n)
+            START_NEXUS="1"
+            ;;
+        r)
+            USE_MERCHANT_EXCHANGE="$OPTARG"
+            ;;
+        s)
+            START_BACKUP="1"
+            ;;
+        t)
+            START_TRANSFER="1"
+            ;;
+        u)
+            USE_ACCOUNT="$OPTARG"
+            ;;
+        v)
+            USE_VALGRIND="valgrind --leak-check=yes"
+            DEFAULT_SLEEP="2"
+            ;;
+        w)
+            START_WIREWATCH="1"
+            ;;
+        W)
+            WAIT_FOR_SIGNAL="1"
+            ;;
+        z)
+            START_MERCHANT_WIREWATCH="1"
+            ;;
+        ?)
+        exit_fail "Unrecognized command line option"
+        ;;
+    esac
+done
+
+STAGE="init"
+
+echo "Starting with configuration file at: $CONF_ORIG"
+CONF="$CONF_ORIG.edited"
+cp "${CONF_ORIG}" "${CONF}"
+
+STAGE="checks"
+
+echo -n "Testing for jq"
+jq -h > /dev/null || exit_skip " jq required"
+echo " FOUND"
+
+echo -n "Testing for wget"
+wget --help > /dev/null || exit_skip " wget required"
+echo " FOUND"
+
+if [ "1" = "$START_EXCHANGE" ]
+then
+    echo -n "Testing for Taler exchange"
+    taler-exchange-httpd -h > /dev/null || exit_skip " taler-exchange-httpd required"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_DONAU" ]
+then
+    echo -n "Testing for Donau"
+    donau-httpd -h > /dev/null || exit_skip " donau-httpd required"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_MERCHANT" ]
+then
+    echo -n "Testing for Taler merchant"
+    taler-merchant-httpd -h > /dev/null || exit_skip " taler-merchant-httpd required"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_CHALLENGER" ]
+then
+    echo -n "Testing for Taler challenger"
+    challenger-httpd -h > /dev/null || exit_skip " challenger-httpd required"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_BACKUP" ]
+then
+    echo -n "Testing for sync-httpd"
+    sync-httpd -h > /dev/null || exit_skip " sync-httpd required"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_NEXUS" ]
+then
+    echo -n "Testing for libeufin-cli"
+    libeufin-cli --help >/dev/null </dev/null || exit_skip " MISSING"
+    echo " FOUND"
+fi
+
+if [ "1" = "$START_BANK" ]
+then
+    echo -n "Testing for libeufin-bank"
+    libeufin-bank --help >/dev/null </dev/null || exit_skip " MISSING"
+    echo " FOUND"
+fi
+
+STAGE="config"
+
+
+EXCHANGE_URL=$(taler-config -c "$CONF" -s "EXCHANGE" -o "BASE_URL")
+CURRENCY=$(taler-config -c "$CONF" -s "TALER" -o "CURRENCY")
+
+echo "Setting up for $CURRENCY at $EXCHANGE_URL"
+
+register_bank_account() {
+    wget \
+        --http-user="$AUSER" \
+        --http-password="$APASS" \
+        --method=DELETE \
+        -o /dev/null \
+        -O /dev/null \
+        -a wget-delete-account.log \
+        "http://localhost:${BANK_PORT}/accounts/$1" \
+        || true # deletion may fail, that's OK!
+    if [ "$1" = "exchange" ] || [ "$1" = "Exchange" ]
+    then
+        IS_EXCHANGE="true"
+    else
+        IS_EXCHANGE="false"
+    fi
+    MAYBE_IBAN="${4:-}"
+    if [ -n "$MAYBE_IBAN" ]
+    then
+        # shellcheck disable=SC2001
+        ENAME=$(echo "$3" | sed -e "s/ /+/g")
+        # Note: this assumes that $3 has no spaces. Should probably escape in the future..
+        PAYTO="payto://iban/SANDBOXX/${MAYBE_IBAN}?receiver-name=$ENAME"
+        BODY='{"username":"'"$1"'","password":"'"$2"'","is_taler_exchange":'"$IS_EXCHANGE"',"name":"'"$3"'","payto_uri":"'"$PAYTO"'"}'
+    else
+        BODY='{"username":"'"$1"'","password":"'"$2"'","is_taler_exchange":'"$IS_EXCHANGE"',"name":"'"$3"'"}'
+    fi
+    wget \
+        --http-user="$AUSER" \
+        --http-password="$APASS" \
+        --method=POST \
+        --header='Content-type: application/json' \
+        --body-data="${BODY}" \
+        -o /dev/null \
+        -O /dev/null \
+        -a wget-register-account.log \
+        "http://localhost:${BANK_PORT}/accounts"
+}
+
+register_fakebank_account() {
+    if [ "$1" = "exchange" ] || [ "$1" = "Exchange" ]
+    then
+        IS_EXCHANGE="true"
+    else
+        IS_EXCHANGE="false"
+    fi
+    BODY='{"username":"'"$1"'","password":"'"$2"'","name":"'"$1"'","is_taler_exchange":'"$IS_EXCHANGE"'}'
+    wget \
+        --post-data="$BODY" \
+        --header='Content-type: application/json' \
+        --tries=3 \
+        --waitretry=1 \
+        --timeout=30 \
+        "http://localhost:$BANK_PORT/accounts" \
+        -a wget-register-account.log \
+        -o /dev/null \
+        -O /dev/null \
+        >/dev/null
+}
+
+
+if [[ "1" = "$START_BANK" ]]
+then
+    BANK_PORT=$(taler-config -c "$CONF" -s "libeufin-bank" -o "PORT")
+    BANK_URL="http://localhost:${BANK_PORT}/"
+fi
+
+if [[ "1" = "$START_FAKEBANK" ]]
+then
+    BANK_PORT=$(taler-config -c "$CONF" -s "BANK" -o "HTTP_PORT")
+    BANK_URL="http://localhost:${BANK_PORT}/"
+fi
+
+STAGE="bank"
+
+if [ "1" = "$START_BANK" ]
+then
+    echo -n "Setting up bank database ... "
+    libeufin-bank dbinit \
+        -r \
+        -c "$CONF" \
+        &> libeufin-bank-reset.log
+    echo "DONE"
+    echo -n "Launching bank ... "
+    libeufin-bank serve \
+      -c "$CONF" \
+      > libeufin-bank-stdout.log \
+      2> libeufin-bank-stderr.log &
+    echo $! > libeufin-bank.pid
+    echo "DONE"
+    echo -n "Waiting for Bank ..."
+    OK="0"
+    for n in $(seq 1 100); do
+        echo -n "."
+        sleep "$DEFAULT_SLEEP"
+        wget --timeout=1 \
+             --tries=3 \
+             --waitretry=0 \
+             -a wget-bank-check.log \
+             -o /dev/null \
+             -O /dev/null \
+             "${BANK_URL}config" || continue
+        OK="1"
+        break
+    done
+    if [ "1" != "$OK" ]
+    then
+        exit_skip "Failed to launch services (bank)"
+    fi
+    echo "OK"
+    echo -n "Set admin password..."
+    AUSER="admin"
+    APASS="secret"
+    libeufin-bank \
+      passwd \
+      -c "$CONF" \
+      "$AUSER" "$APASS" \
+      &> libeufin-bank-passwd.log
+    libeufin-bank \
+      edit-account \
+      -c "$CONF" \
+      --debit_threshold="$CURRENCY:1000000" \
+      "$AUSER" \
+      &> libeufin-bank-debit-threshold.log
+    echo " OK"
+fi
+
+if [ "1" = "$START_NEXUS" ]
+then
+    echo "Nexus currently not supported ..."
+fi
+
+if [ "1" = "$START_FAKEBANK" ]
+then
+    echo -n "Setting up fakebank ..."
+    $USE_VALGRIND taler-fakebank-run \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  -n 4 \
+                  2> taler-fakebank-run.log &
+    echo " OK"
+fi
+
+if [[ "1" = "$START_NEXUS" || "1" = "$START_FAKEBANK" ]]
+then
+    echo -n "Waiting for the bank"
+    # Wait for bank to be available (usually the slowest)
+    OK="0"
+    for n in $(seq 1 300)
+    do
+        echo -n "."
+        sleep "$DEFAULT_SLEEP"
+        # bank
+        wget --tries=1 \
+             --waitretry=0 \
+             --timeout=1 \
+             --user admin \
+             --password secret \
+             -a wget-bank-check.log \
+             -o /dev/null \
+             -O /dev/null \
+             "http://localhost:${BANK_PORT}/" || continue
+        OK="1"
+        break
+    done
+    if [ "1" != "$OK" ]
+    then
+        exit_skip "Failed to launch services (bank)"
+    fi
+    echo " OK"
+fi
+
+STAGE="accounts"
+
+if [ "1" = "$START_FAKEBANK" ]
+then
+    echo -n "Register Fakebank users ..."
+    register_fakebank_account fortytwo x
+    register_fakebank_account fortythree x
+    register_fakebank_account exchange x
+    register_fakebank_account tor x
+    register_fakebank_account gnunet x
+    register_fakebank_account tutorial x
+    register_fakebank_account survey x
+    echo " DONE"
+fi
+
+if [ "1" = "$START_BANK" ]
+then
+    echo -n "Register bank users ..."
+    # The specified IBAN and name must match the ones hard-coded into
+    # the C helper for the add-incoming call.  Without this value,
+    # libeufin-bank  won't find the target account to debit along a /add-incoming
+    # call.
+    register_bank_account fortytwo x "User42" FR7630006000011234567890189
+    register_bank_account fortythree x "Forty Three"
+    register_bank_account exchange x "Exchange Company" DE989651
+    register_bank_account tor x "Tor Project"
+    register_bank_account gnunet x "GNUnet"
+    register_bank_account tutorial x "Tutorial"
+    register_bank_account survey x "Survey"
+    echo " DONE"
+fi
+
+STAGE="exchange"
+
+if [ "1" = "$START_EXCHANGE" ]
+then
+    echo -n "Starting exchange ..."
+    EXCHANGE_PORT=$(taler-config -c "$CONF" -s EXCHANGE -o PORT)
+    SERVE=$(taler-config -c "$CONF" -s EXCHANGE -o SERVE)
+    if [ "${SERVE}" = "unix" ]
+    then
+        EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
+    else
+        EXCHANGE_URL="http://localhost:${EXCHANGE_PORT}/"
+    fi
+    MASTER_PRIV_FILE=$(taler-config -f -c "${CONF}" -s "EXCHANGE-OFFLINE" -o "MASTER_PRIV_FILE")
+    MASTER_PRIV_DIR=$(dirname "$MASTER_PRIV_FILE")
+    mkdir -p "${MASTER_PRIV_DIR}"
+    if [ ! -e "$MASTER_PRIV_FILE" ]
+    then
+        gnunet-ecc -g1 "$MASTER_PRIV_FILE" > /dev/null 2> /dev/null
+        echo -n "."
+    fi
+    MASTER_PUB=$(gnunet-ecc -p "${MASTER_PRIV_FILE}")
+    MPUB=$(taler-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY)
+    if [ "$MPUB" != "$MASTER_PUB" ]
+    then
+        echo -n " patching master_pub ($MASTER_PUB)..."
+        taler-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY -V "$MASTER_PUB"
+    fi
+    taler-exchange-dbinit -c "$CONF" --reset
+    $USE_VALGRIND taler-exchange-secmod-eddsa \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> taler-exchange-secmod-eddsa.log &
+    $USE_VALGRIND taler-exchange-secmod-rsa \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> taler-exchange-secmod-rsa.log &
+    $USE_VALGRIND taler-exchange-secmod-cs \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> taler-exchange-secmod-cs.log &
+    $USE_VALGRIND taler-exchange-httpd \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" 2> taler-exchange-httpd.log &
+    echo " DONE"
+fi
+
+STAGE="donau"
+
+if [ "1" = "$START_DONAU" ]
+then
+    echo -n "Starting Donau ..."
+    DONAU_PORT=$(donau-config -c "$CONF" -s DONAU -o PORT)
+    SERVE=$(donau-config -c "$CONF" -s DONAU -o SERVE)
+    if [ "${SERVE}" = "unix" ]
+    then
+        DONAU_URL=$(donau-config -c "$CONF" -s DONAU -o BASE_URL)
+    else
+        DONAU_URL="http://localhost:${DONAU_PORT}/"
+    fi
+    donau-dbinit -c "$CONF" --reset
+    $USE_VALGRIND taler-exchange-secmod-eddsa -c "$CONF" -L "$LOGLEVEL" -s donau 2> donau-secmod-eddsa.log &
+    $USE_VALGRIND taler-exchange-secmod-rsa -c "$CONF" -L "$LOGLEVEL" -s donau 2> donau-secmod-rsa.log &
+    $USE_VALGRIND taler-exchange-secmod-cs -c "$CONF" -L "$LOGLEVEL" -s donau 2> donau-secmod-cs.log &
+    $USE_VALGRIND donau-httpd -c "$CONF" -L "$LOGLEVEL" 2> donau-httpd.log &
+    echo " DONE"
+fi
+
+STAGE="wirewatch"
+
+if [ "1" = "$START_WIREWATCH" ]
+then
+    echo -n "Starting wirewatch ..."
+    $USE_VALGRIND taler-exchange-wirewatch \
+                  --account="$USE_ACCOUNT" \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  --longpoll-timeout="60 s" \
+                  2> taler-exchange-wirewatch.log &
+    echo " DONE"
+fi
+
+STAGE="aggregator"
+
+if [ "1" = "$START_AGGREGATOR" ]
+then
+    echo -n "Starting aggregator ..."
+    $USE_VALGRIND taler-exchange-aggregator \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> taler-exchange-aggregator.log &
+    echo " DONE"
+fi
+
+STAGE="transfer"
+
+if [ "1" = "$START_TRANSFER" ]
+then
+    echo -n "Starting transfer ..."
+    $USE_VALGRIND taler-exchange-transfer \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> taler-exchange-transfer.log &
+    echo " DONE"
+fi
+
+STAGE="merchant"
+
+if [ "1" = "$START_MERCHANT" ]
+then
+    echo -n "Starting merchant ..."
+    if [ -n "${USE_MERCHANT_EXCHANGE+x}" ]
+    then
+        MEPUB=$(taler-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY)
+        MXPUB=${MASTER_PUB:-$(taler-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY)}
+        if [ "$MEPUB" != "$MXPUB" ]
+        then
+            echo -n " patching master_pub ($MXPUB)..."
+            taler-config -c "$CONF" -s "${USE_MERCHANT_EXCHANGE}" -o MASTER_KEY -V "$MXPUB"
+        fi
+    fi
+    MERCHANT_TYPE=$(taler-config -c "$CONF" -s MERCHANT -o SERVE)
+    if [ "unix" = "$MERCHANT_TYPE" ]
+    then
+        MERCHANT_URL="$(taler-config -c "$CONF" -s MERCHANT -o BASE_URL)"
+    else
+        MERCHANT_PORT="$(taler-config -c "$CONF" -s MERCHANT -o PORT)"
+        MERCHANT_URL="http://localhost:${MERCHANT_PORT}/"
+    fi
+    taler-merchant-dbinit \
+        -c "$CONF" \
+        --reset &> taler-merchant-dbinit.log
+    $USE_VALGRIND taler-merchant-httpd \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" 2> taler-merchant-httpd.log &
+    $USE_VALGRIND taler-merchant-webhook \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" 2> taler-merchant-webhook.log &
+    echo " DONE"
+    if [ "1" = "$START_MERCHANT_WIREWATCH" ]
+    then
+       echo -n "Starting taler-merchant-wirewatch ..."
+       $USE_VALGRIND taler-merchant-wirewatch \
+                     -c "$CONF" \
+                     -L "$LOGLEVEL" \
+                     --persist \
+                     2> taler-merchant-wirewatch.log &
+       echo " DONE"
+    fi
+    if [ "1" = "$START_MERCHANT_EXCHANGE" ]
+    then
+        echo -n "Starting taler-merchant-exchange ..."
+        $USE_VALGRIND taler-merchant-exchange \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" 2> taler-merchant-exchange.log &
+        echo " DONE"
+    fi
+    if [ "1" = "$START_DEPOSITCHECK" ]
+    then
+        echo -n "Starting taler-merchant-depositcheck ..."
+        $USE_VALGRIND taler-merchant-depositcheck \
+                      -c "$CONF" \
+                      -L "$LOGLEVEL" 2> taler-merchant-depositcheck.log &
+        echo " DONE"
+    fi
+fi
+
+STAGE="sync"
+
+if [ "1" = "$START_BACKUP" ]
+then
+    echo -n "Starting sync ..."
+    SYNC_PORT=$(taler-config -c "$CONF" -s SYNC -o PORT)
+    SERVE=$(taler-config -c "$CONF" -s SYNC -o SERVE)
+    if [ "${SERVE}" = "unix" ]
+    then
+        SYNC_URL=$(taler-config -c "$CONF" -s SYNC -o BASE_URL)
+    else
+        SYNC_URL="http://localhost:${SYNC_PORT}/"
+    fi
+    sync-dbinit -c "$CONF" --reset
+    $USE_VALGRIND sync-httpd \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> sync-httpd.log &
+    echo " DONE"
+fi
+
+STAGE="challenger"
+
+if [ "1" = "$START_CHALLENGER" ]
+then
+    echo -n "Starting challenger ..."
+    CHALLENGER_PORT=$(challenger-config -c "$CONF" -s CHALLENGER -o PORT)
+    SERVE=$(taler-config -c "$CONF" -s CHALLENGER -o SERVE)
+    if [ "${SERVE}" = "unix" ]
+    then
+        CHALLENGER_URL=$(taler-config -c "$CONF" -s CHALLENGER -o BASE_URL)
+    else
+        CHALLENGER_URL="http://localhost:${CHALLENGER_PORT}/"
+    fi
+    challenger-dbinit \
+        -c "$CONF" \
+        --reset
+    $USE_VALGRIND challenger-httpd \
+                  -c "$CONF" \
+                  -L "$LOGLEVEL" \
+                  2> challenger-httpd.log &
+    echo " DONE"
+    for SECTION in $(taler-config -c "$CONF" -S | grep kyc-provider)
+    do
+        LOGIC=$(taler-config -c "$CONF" -s "$SECTION" -o "LOGIC")
+        if [ "${LOGIC}" = "oauth2" ]
+        then
+            INFO=$(taler-config -c "$CONF" -s "$SECTION" -o "KYC_OAUTH2_INFO_URL")
+            if [ "${CHALLENGER_URL}info" = "$INFO" ]
+            then
+                echo -n "Enabling Challenger client for $SECTION"
+                CLIENT_SECRET=$(taler-config -c "$CONF" -s "$SECTION" -o "KYC_OAUTH2_CLIENT_SECRET")
+                RFC_8959_PREFIX="secret-token:"
+                if ! echo "${CLIENT_SECRET}" | grep ^${RFC_8959_PREFIX} > /dev/null
+                then
+                    exit_fail "Client secret does not begin with '${RFC_8959_PREFIX}'"
+                fi
+                REDIRECT_URI="${EXCHANGE_URL}kyc-proof/kyc-provider-example-challeger"
+                CLIENT_ID=$(challenger-admin --add="${CLIENT_SECRET}" --quiet "${REDIRECT_URI}")
+                taler-config -c "$CONF" -s "$SECTION" -o KYC_OAUTH2_CLIENT_ID -V "$CLIENT_ID"
+                echo " DONE"
+            fi
+        fi
+    done
+fi
+
+STAGE="auditor"
+
+if [ "1" = "$START_AUDITOR" ]
+then
+    echo -n "Starting auditor ..."
+    AUDITOR_URL=$(taler-config -c "$CONF" -s AUDITOR -o BASE_URL)
+    AUDITOR_PRIV_FILE=$(taler-config -f -c "$CONF" -s AUDITOR -o AUDITOR_PRIV_FILE)
+    AUDITOR_PRIV_DIR=$(dirname "$AUDITOR_PRIV_FILE")
+    mkdir -p "$AUDITOR_PRIV_DIR"
+    if [ ! -e "$AUDITOR_PRIV_FILE" ]
+    then
+        gnunet-ecc -g1 "$AUDITOR_PRIV_FILE" > /dev/null 2> /dev/null
+        echo -n "."
+    fi
+    AUDITOR_PUB=$(gnunet-ecc -p "${AUDITOR_PRIV_FILE}")
+    MAPUB=${MASTER_PUB:-$(taler-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY)}
+    taler-auditor-dbinit \
+        -c "$CONF" \
+        --reset
+    $USE_VALGRIND taler-auditor-httpd \
+                  -L "$LOGLEVEL" \
+                  -c "$CONF" 2> taler-auditor-httpd.log &
+#    $USE_VALGRIND taler-helper-auditor-deposits \
+#                  -L "$LOGLEVEL" \
+#                  -c "$CONF" 2> taler-helper-auditor.log &
+    echo " DONE"
+fi
+
+STAGE="wait"
+
+echo -n "Waiting for Taler services ..."
+# Wait for all other taler services to be available
+E_DONE=0
+M_DONE=0
+S_DONE=0
+K_DONE=0
+A_DONE=0
+for n in $(seq 1 20)
+do
+    sleep "$DEFAULT_SLEEP"
+    OK="0"
+    if [ "0" = "$E_DONE" ] && [ "1" = "$START_EXCHANGE" ]
+    then
+        echo -n "E"
+        wget \
+            --tries=1 \
+            --timeout=1 \
+            "${EXCHANGE_URL}config" \
+            -o /dev/null \
+            -O /dev/null >/dev/null || continue
+        E_DONE=1
+    fi
+    if [ "0" = "$M_DONE" ] && [ "1" = "$START_MERCHANT" ]
+    then
+        echo -n "M"
+        wget \
+            --tries=1 \
+            --timeout=1 \
+            "${MERCHANT_URL}config" \
+            -o /dev/null \
+            -O /dev/null >/dev/null || continue
+        M_DONE=1
+    fi
+    if [ "0" = "$S_DONE" ] && [ "1" = "$START_BACKUP" ]
+    then
+        echo -n "S"
+        wget \
+            --tries=1 \
+            --timeout=1 \
+            "${SYNC_URL}config" \
+            -o /dev/null \
+            -O /dev/null >/dev/null || continue
+        S_DONE=1
+    fi
+    if [ "0" = "$K_DONE" ] && [ "1" = "$START_CHALLENGER" ]
+    then
+        echo -n "K"
+        wget \
+            --tries=1 \
+            --timeout=1 \
+            "${CHALLENGER_URL}config" \
+            -o /dev/null \
+            -O /dev/null >/dev/null || continue
+        K_DONE=1
+    fi
+    if [ "0" = "$A_DONE" ] && [ "1" = "$START_AUDITOR" ]
+    then
+        echo -n "A"
+        wget \
+            --tries=1 \
+            --timeout=1 \
+            "${AUDITOR_URL}config" \
+            -o /dev/null \
+            -O /dev/null >/dev/null || continue
+        A_DONE=1
+    fi
+    OK="1"
+    break
+done
+if [ 1 != "$OK" ]
+then
+    exit_skip "Failed to launch (some) Taler services"
+fi
+echo " OK"
+
+if [ "1" = "$START_EXCHANGE" ]
+then
+    echo -n "Wait for exchange /management/keys to be ready "
+    OK="0"
+    LAST_RESPONSE=$(mktemp tmp-last-response.XXXXXXXX)
+    for n in $(seq 1 10)
+    do
+        echo -n "."
+        sleep "$DEFAULT_SLEEP"
+        # exchange
+        wget \
+            --tries=3 \
+            --waitretry=0 \
+            --timeout=30 \
+            "${EXCHANGE_URL}management/keys"\
+            -o /dev/null \
+            -O "$LAST_RESPONSE" \
+            >/dev/null || continue
+        OK="1"
+        break;
+    done
+    if [ "1" != "$OK" ]
+    then
+        cat "$LAST_RESPONSE"
+        exit_fail "Failed to setup exchange keys, check secmod logs"
+    fi
+    rm "$LAST_RESPONSE"
+    echo " OK"
+
+    echo -n "Setting up exchange keys ..."
+    taler-exchange-offline -c "$CONF" \
+      download \
+      sign \
+      wire-fee now "$WIRE_DOMAIN" "$CURRENCY:0.01" "$CURRENCY:0.01" \
+      global-fee now "$CURRENCY:0.01" "$CURRENCY:0.01" "$CURRENCY:0.0" 1h 1year 5 \
+      upload &> taler-exchange-offline.log
+    echo "OK"
+    ENABLED=$(taler-config -c "$CONF" -s "$USE_ACCOUNT" -o "ENABLE_CREDIT")
+    if [ "YES" = "$ENABLED" ]
+    then
+        echo -n "Configuring bank account $USE_ACCOUNT ..."
+        EXCHANGE_PAYTO_URI=$(taler-config -c "$CONF" -s "$USE_ACCOUNT" -o "PAYTO_URI")
+        taler-exchange-offline -c "$CONF" \
+          enable-account "$EXCHANGE_PAYTO_URI" \
+          upload &> "taler-exchange-offline-account.log"
+        echo " OK"
+    else
+        echo "WARNING: Account ${USE_ACCOUNT} not enabled (set to: '$ENABLED')"
+    fi
+    if [ "1" = "$START_AUDITOR" ]
+    then
+        echo -n "Enabling auditor ..."
+        taler-exchange-offline -c "$CONF" \
+          enable-auditor "$AUDITOR_PUB" "$AUDITOR_URL" "$CURRENCY Auditor" \
+          upload &> taler-exchange-offline-auditor.log
+        echo "OK"
+    fi
+
+    echo -n "Checking /keys "
+    OK="0"
+    LAST_RESPONSE=$(mktemp tmp-last-response.XXXXXXXX)
+    for n in $(seq 1 10)
+    do
+        echo -n "."
+        sleep "$DEFAULT_SLEEP"
+        wget \
+            --tries=1 \
+            --timeout=5 \
+            "${EXCHANGE_URL}keys" \
+            -a wget-keys-check.log \
+            -o /dev/null \
+            -O "$LAST_RESPONSE" \
+            >/dev/null || continue
+        OK="1"
+        break
+    done
+    if [ "1" != "$OK" ]
+    then
+        cat "$LAST_RESPONSE"
+        exit_fail " Failed to fetch ${EXCHANGE_URL}keys"
+    fi
+    rm "$LAST_RESPONSE"
+    echo " OK"
+fi
+
+if [ "1" = "$START_AUDITOR" ]
+then
+    echo -n "Setting up auditor signatures ..."
+    timeout 15 taler-auditor-offline -c "$CONF" \
+      download \
+      sign \
+      upload &> taler-auditor-offline.log
+    echo " OK"
+fi
+
+STAGE="ready"
+
+# Signal caller that we are ready.
+echo "<<READY>>"
+
+if [ "1" = "$WAIT_FOR_SIGNAL" ]
+then
+    while true
+    do
+        sleep 0.1
+    done
+else
+    # Wait until caller stops us.
+    # shellcheck disable=SC2162
+    read
+fi
+
+STAGE="exiting"
+
+echo "Taler unified setup terminating!" >&2
+EXIT_STATUS=0
+exit "$EXIT_STATUS"
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index dfa017d0d..8c3ee4ba5 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -1,84 +1,59 @@
+# This file is in the public domain.
+
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_taler_exchange_httpd_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
 
 [taler-exchange-secmod-rsa]
 # Reduce from 1 year to speed up test
 LOOKAHEAD_SIGN = 24 days
 
 [taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
 LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
 DURATION = 14 days
 
 [taler]
-# Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
 
 [exchange]
-# The DB plugin to use
+AML_THRESHOLD = EUR:1000000
 DB = postgres
-
-# HTTP port the exchange listens to
 PORT = 8081
-
-# Master public key used to sign the exchange's various keys
 MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# Expected base URL of the exchange.  Used in wire transfers for
-# the tracking API.
 BASE_URL = "http://localhost:8081/"
 
 [auditor]
 BASE_URL = "http://auditor.example.com/"
+PORT = 8083
 
 [auditordb-postgres]
 CONFIG = "postgres:///talercheck"
 
 [exchangedb]
-# After how long do we close idle reserves?  The exchange
-# and the auditor must agree on this value.  We currently
-# expect it to be globally defined for the whole system,
-# as there is no way for wallets to query this value.  Thus,
-# it is only configurable for testing, and should be treated
-# as constant in production.
 IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
+LEGAL_RESERVE_EXPIRATION_TIME = 7 years
 
 [exchangedb-postgres]
-
-#The connection string the plugin has to use for connecting to the database
 CONFIG = postgres:///talercheck
 
-[exchangedb]
-
-# After how long do we close idle reserves?  The exchange
-# and the auditor must agree on this value.  We currently
-# expect it to be globally defined for the whole system,
-# as there is no way for wallets to query this value.  Thus,
-# it is only configurable for testing, and should be treated
-# as constant in production.
-IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
-
-# After how long do we forget about reserves?  Should be above
-# the legal expiration timeframe of withdrawn coins.
-LEGAL_RESERVE_EXPIRATION_TIME = 7 years
-
 [exchange-account-1]
-
 # What is the account URL?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
 
+[admin-accountcredentials-1]
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
 
 [bank]
 HTTP_PORT = 8082
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index fda1acd77..4f13077ac 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -1,68 +1,55 @@
+# This file is in the public domain.
+
 [PATHS]
 # Persistent data storage for the testcase
 TALER_TEST_HOME = test_taler_exchange_httpd_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
 
 [taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
 LOOKAHEAD_SIGN = 24 days
 
 [taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
 LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
 DURATION = 14 days
 
 [taler]
-# Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
 
 [exchange]
-# The DB plugin to use
+AML_THRESHOLD = EUR:1000000
 DB = postgres
-
-# HTTP port the exchange listens to
 PORT = 8081
-
-# Master public key used to sign the exchange's various keys
 MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# Expected base URL of the exchange.
 BASE_URL = "http://localhost:8081/"
 
 [exchangedb]
-# After how long do we close idle reserves?  The exchange
-# and the auditor must agree on this value.  We currently
-# expect it to be globally defined for the whole system,
-# as there is no way for wallets to query this value.  Thus,
-# it is only configurable for testing, and should be treated
-# as constant in production.
-#
 # This is THE test that requires a short reserve expiration time!
 IDLE_RESERVE_EXPIRATION_TIME = 4 s
 
 [exchangedb-postgres]
-#The connection string the plugin has to use for connecting to the database
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
 CONFIG = "postgres:///talercheck"
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
 PORT = 8083
 
+[auditordb-postgres]
+CONFIG = "postgres:///talercheck"
+
 [exchange-account-1]
 # What is the account URL?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
@@ -70,6 +57,16 @@ PASSWORD = x
 [bank]
 HTTP_PORT = 8082
 
+[libeufin-bank]
+CURRENCY = EUR
+DEFAULT_CUSTOMER_DEBT_LIMIT = EUR:200
+DEFAULT_ADMIN_DEBT_LIMIT = EUR:2000
+REGISTRATION_BONUS_ENABLED = yes
+REGISTRATION_BONUS = EUR:100
+SUGGESTED_WITHDRAWAL_EXCHANGE = http://localhost:8081/
+SERVE = tcp
+PORT = 8082
+
 # Need at least one coin, otherwise Exchange
 # refuses to start.
 [coin_eur_ct_1]
diff --git a/src/testing/test_auditor_api-cs.conf b/src/testing/test_auditor_api-cs.conf
index 3a9092451..b80696fb2 100644
--- a/src/testing/test_auditor_api-cs.conf
+++ b/src/testing/test_auditor_api-cs.conf
@@ -1,140 +1,4 @@
-
 # This file is in the public domain.
 #
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-[taler-exchange-secmod-cs]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-PUBLIC_KEY = XNYZPJJ6YPSQ4C6QPW120ACG9B5E5GBTTSYWXDMDB6G4X74TDBPG
-TINY_AMOUNT = EUR:0.01
-
-[exchange]
-
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-# Sections starting with "exchange-account-" configure the bank accounts
-# of the exchange.  The "URL" specifies the account in
-# payto://-format.
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/42/"
-
-[bank]
-HTTP_PORT = 8082
-
-# ENABLE_CREDIT = YES
-
-[exchange-account-2]
-# What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-# Authentication information for basic authentication
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
-
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
+@INLINE@ coins-cs.conf
+@INLINE@ test_exchange_api.conf
diff --git a/src/testing/test_auditor_api-rsa.conf b/src/testing/test_auditor_api-rsa.conf
index e226abb26..671e81108 100644
--- a/src/testing/test_auditor_api-rsa.conf
+++ b/src/testing/test_auditor_api-rsa.conf
@@ -1,146 +1,4 @@
-
 # This file is in the public domain.
 #
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-PUBLIC_KEY = XNYZPJJ6YPSQ4C6QPW120ACG9B5E5GBTTSYWXDMDB6G4X74TDBPG
-
-TINY_AMOUNT = EUR:0.01
-
-[exchange]
-
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-# Sections starting with "exchange-account-" configure the bank accounts
-# of the exchange.  The "URL" specifies the account in
-# payto://-format.
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/42/"
-
-[bank]
-HTTP_PORT = 8082
-
-# ENABLE_CREDIT = YES
-
-[exchange-account-2]
-# What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-# Authentication information for basic authentication
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
-
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
+@INLINE@ coins-rsa.conf
+@INLINE@ test_exchange_api.conf
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
index e103697e5..3810c601e 100644
--- a/src/testing/test_auditor_api.c
+++ b/src/testing/test_auditor_api.c
@@ -45,14 +45,9 @@ static char *config_file;
 static char *config_file_expire_reserve_now;
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
+static struct TALER_TESTING_Credentials cred;
 
 /**
  * Execute the taler-exchange-wirewatch command with
@@ -61,7 +56,7 @@ static struct TALER_TESTING_BankConfiguration bc;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_WIREWATCH(label) \
-  TALER_TESTING_cmd_exec_wirewatch (label, config_file)
+  TALER_TESTING_cmd_exec_wirewatch2 (label, config_file, "exchange-account-2")
 
 /**
  * Execute the taler-exchange-aggregator, closer and transfer commands with
@@ -83,8 +78,8 @@ static struct TALER_TESTING_BankConfiguration bc;
  */
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_admin_add_incoming (label, amount,           \
-                                        &bc.exchange_auth,       \
-                                        bc.user42_payto)
+                                        &cred.ba,       \
+                                        cred.user42_payto)
 
 /**
  * Run the taler-auditor.
@@ -116,7 +111,7 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer
       ("check-create-reserve-1",
-      "EUR:5.01", bc.user42_payto, bc.exchange_payto,
+      "EUR:5.01", cred.user42_payto, cred.exchange_payto,
       "create-reserve-1"),
     /**
      * Make a reserve exist, according to the previous transfer.
@@ -140,7 +135,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-simple",
                                "withdraw-coin-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -157,7 +152,7 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer
       ("check-refresh-create-reserve-1",
-      "EUR:5.01", bc.user42_payto, bc.exchange_payto,
+      "EUR:5.01", cred.user42_payto, cred.exchange_payto,
       "refresh-create-reserve-1"),
     /**
      * Make previous command effective.
@@ -178,7 +173,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-partial",
                                "refresh-withdraw-coin-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice\",\"value\":\"EUR:1\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -203,7 +198,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-1b",
                                "refresh-reveal-1",
                                3,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.1",
@@ -225,75 +220,75 @@ run (void *cls,
      */
     TALER_TESTING_cmd_check_bank_transfer (
       "check_bank_transfer-499c",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:4.98",
-      bc.exchange_payto,
-      bc.user42_payto),
+      cred.exchange_payto,
+      cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer (
       "check_bank_transfer-99c1",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto,
-      bc.user42_payto),
+      cred.exchange_payto,
+      cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer (
       "check_bank_transfer-99c",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.08",
-      bc.exchange_payto,
-      bc.user43_payto),
+      cred.exchange_payto,
+      cred.user43_payto),
 
     /* The following transactions got originated within
      * the "massive deposit confirms" batch.  */
     TALER_TESTING_cmd_check_bank_transfer (
       "check-massive-transfer-1",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-2",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-3",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-4",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-5",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-6",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-7",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-8",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-9",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer
       ("check-massive-transfer-10",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:0.98",
-      bc.exchange_payto, bc.user43_payto),
+      cred.exchange_payto, cred.user43_payto),
     TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
     TALER_TESTING_cmd_end ()
   };
@@ -311,8 +306,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check_bank_transfer-unaggregated",
       "EUR:5.01",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "create-reserve-unaggregated"),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-unaggregated",
                                        "create-reserve-unaggregated",
@@ -322,7 +317,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-unaggregated",
                                "withdraw-coin-unaggregated",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_relative_multiply
                                  (GNUNET_TIME_UNIT_YEARS,
@@ -359,7 +354,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-1",
                                "withdraw-coin-r1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_MINUTES,
                                "EUR:5",
@@ -376,7 +371,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-2",
                                "withdraw-coin-r1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"more\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:4.99",
@@ -431,8 +426,9 @@ run (void *cls,
      */
     CMD_TRANSFER_TO_EXCHANGE ("short-lived-reserve",
                               "EUR:5.01"),
-    TALER_TESTING_cmd_exec_wirewatch ("short-lived-aggregation",
-                                      config_file_expire_reserve_now),
+    TALER_TESTING_cmd_exec_wirewatch2 ("short-lived-aggregation",
+                                       config_file_expire_reserve_now,
+                                       "exchange-account-2"),
     TALER_TESTING_cmd_exec_aggregator ("close-reserves",
                                        config_file_expire_reserve_now),
     /**
@@ -466,7 +462,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("recoup-deposit-partial",
                                "recoup-withdraw-coin-2a",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.5",
@@ -493,7 +489,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check-massive-transfer",
       "EUR:10.10",
-      bc.user42_payto, bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "massive-reserve"),
     CMD_EXEC_WIREWATCH ("massive-wirewatch"),
     TALER_TESTING_cmd_withdraw_amount ("massive-withdraw-1",
@@ -550,7 +547,7 @@ run (void *cls,
       "massive-deposit-1",
       "massive-withdraw-1",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -559,7 +556,7 @@ run (void *cls,
       ("massive-deposit-2",
       "massive-withdraw-2",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -568,7 +565,7 @@ run (void *cls,
       ("massive-deposit-3",
       "massive-withdraw-3",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -577,7 +574,7 @@ run (void *cls,
       ("massive-deposit-4",
       "massive-withdraw-4",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -586,7 +583,7 @@ run (void *cls,
       ("massive-deposit-5",
       "massive-withdraw-5",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -595,7 +592,7 @@ run (void *cls,
       ("massive-deposit-6",
       "massive-withdraw-6",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -604,7 +601,7 @@ run (void *cls,
       ("massive-deposit-7",
       "massive-withdraw-7",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -613,7 +610,7 @@ run (void *cls,
       ("massive-deposit-8",
       "massive-withdraw-8",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -622,7 +619,7 @@ run (void *cls,
       ("massive-deposit-9",
       "massive-withdraw-9",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
@@ -631,15 +628,14 @@ run (void *cls,
       "massive-deposit-10",
       "massive-withdraw-10",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:1",
       MHD_HTTP_OK),
     TALER_TESTING_cmd_deposit_confirmation ("deposit-confirmation",
-                                            is->auditor,
                                             "massive-deposit-10",
-                                            0,
+                                            1,
                                             "EUR:0.99",
                                             MHD_HTTP_OK),
     CMD_RUN_AUDITOR ("massive-auditor"),
@@ -648,28 +644,25 @@ run (void *cls,
   };
 
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                              config_file,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                2),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-u", "exchange-account-2",
+                                    "-ae",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_auditor ("get-auditor",
+                                   cred.cfg,
+                                   true),
     TALER_TESTING_cmd_exec_auditor_offline ("auditor-offline",
                                             config_file),
     CMD_RUN_AUDITOR ("virgin-auditor"),
-    TALER_TESTING_cmd_exchanges_with_url ("check-exchange",
-                                          MHD_HTTP_OK,
-                                          "http://localhost:8081/"),
     TALER_TESTING_cmd_batch ("massive-deposit-confirms",
                              massive_deposit_confirms),
     TALER_TESTING_cmd_batch ("withdraw",
@@ -691,9 +684,8 @@ run (void *cls,
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   commands,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 
@@ -701,60 +693,28 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "INFO",
-                    NULL);
-
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_auditor_api-%s.conf",
-                   cipher);
-  GNUNET_asprintf (&config_file_expire_reserve_now,
-                   "test_auditor_api_expire_reserve_now-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  /* Check fakebank port is available and get configuration data. */
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 78;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_auditor_setup (&run,
-                                     NULL,
-                                     config_file))
-      return 2;
-    break;
-  default:
-    GNUNET_break (0);
-    return 3;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_auditor_api-%s.conf",
+                     cipher);
+    GNUNET_asprintf (&config_file_expire_reserve_now,
+                     "test_auditor_api_expire_reserve_now-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_auditor_api_version.c b/src/testing/test_auditor_api_version.c
index 1b60b15d1..dcd542ad8 100644
--- a/src/testing/test_auditor_api_version.c
+++ b/src/testing/test_auditor_api_version.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2018 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -39,9 +39,9 @@
  * Configuration file we use.  One (big) configuration is used
  * for the various components for this test.
  */
-#define CONFIG_FILE "test_auditor_api.conf"
+#define CONFIG_FILE "test_auditor_api-rsa.conf"
 
-static struct TALER_AUDITOR_Handle *ah;
+static struct TALER_AUDITOR_GetConfigHandle *ah;
 
 static struct GNUNET_CURL_Context *ctx;
 
@@ -51,6 +51,7 @@ static int global_ret;
 
 static struct GNUNET_SCHEDULER_Task *tt;
 
+
 static void
 do_shutdown (void *cls)
 {
@@ -61,7 +62,11 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (tt);
     tt = NULL;
   }
-  TALER_AUDITOR_disconnect (ah);
+  if (NULL != ah)
+  {
+    TALER_AUDITOR_get_config_cancel (ah);
+    ah = NULL;
+  }
   GNUNET_CURL_fini (ctx);
   GNUNET_CURL_gnunet_rc_destroy (rc);
 }
@@ -81,20 +86,16 @@ do_timeout (void *cls)
  * Function called with information about the auditor.
  *
  * @param cls closure
- * @param hr http response details
- * @param vi basic information about the auditor
- * @param compat protocol compatibility information
+ * @param vr response details
  */
 static void
 version_cb (void *cls,
-            const struct TALER_AUDITOR_HttpResponse *hr,
-            const struct TALER_AUDITOR_VersionInformation *vi,
-            enum TALER_AUDITOR_VersionCompatibility compat)
+            const struct TALER_AUDITOR_ConfigResponse *vr)
 {
   (void) cls;
-  (void) hr;
-  if ( (NULL != vi) &&
-       (TALER_AUDITOR_VC_MATCH == compat) )
+  ah = NULL;
+  if ( (MHD_HTTP_OK == vr->hr.http_status) &&
+       (TALER_AUDITOR_VC_MATCH == vr->details.ok.compat) )
     global_ret = 0;
   else
     global_ret = 2;
@@ -117,10 +118,10 @@ run (void *cls)
   ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
                           &rc);
   rc = GNUNET_CURL_gnunet_rc_create (ctx);
-  ah = TALER_AUDITOR_connect (ctx,
-                              auditor_url,
-                              &version_cb,
-                              NULL);
+  ah = TALER_AUDITOR_get_config (ctx,
+                                 auditor_url,
+                                 &version_cb,
+                                 NULL);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
   tt = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
@@ -148,15 +149,16 @@ main (int argc,
                                   "taler-auditor-httpd",
                                   "taler-auditor-httpd",
                                   "-c", CONFIG_FILE,
+                                  "-L", "INFO",
                                   NULL);
   if (NULL == proc)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to run `taler-auditor-httpd`,"
-                " is your PATH correct?\n");
+                "Failed to run `taler-auditor-httpd`, is your PATH correct?\n");
     return 77;
   }
-  if (0 != TALER_TESTING_wait_auditor_ready ("http://localhost:8083/"))
+  global_ret = TALER_TESTING_wait_httpd_ready ("http://localhost:8083/");
+  if (0 != global_ret)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to launch `taler-auditor-httpd`\n");
@@ -166,7 +168,8 @@ main (int argc,
     GNUNET_SCHEDULER_run (&run,
                           NULL);
   }
-  GNUNET_OS_process_kill (proc, SIGTERM);
+  GNUNET_OS_process_kill (proc,
+                          SIGTERM);
   GNUNET_OS_process_wait (proc);
   GNUNET_OS_process_destroy (proc);
   return global_ret;
diff --git a/src/testing/test_bank_api.c b/src/testing/test_bank_api.c
index d81fbe36e..8cbc86bbd 100644
--- a/src/testing/test_bank_api.c
+++ b/src/testing/test_bank_api.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2016-2020 Taler Systems SA
+  Copyright (C) 2016-2023 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
@@ -34,34 +34,27 @@
 #include "taler_testing_lib.h"
 
 #define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank.conf"
-#define CONFIG_FILE_PYBANK "test_bank_api_pybank.conf"
+
 #define CONFIG_FILE_NEXUS "test_bank_api_nexus.conf"
 
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
 
 /**
- * Handle to the Py-bank daemon.
+ * Configuration file.  It changes based on
+ * whether Nexus or Fakebank are used.
  */
-static struct GNUNET_OS_Process *bankd;
+static const char *cfgfile;
 
 /**
- * Flag indicating whether the test is running against the
- * Fakebank.  Set up at runtime.
+ * Our credentials.
  */
-static int with_fakebank;
+static struct TALER_TESTING_Credentials cred;
 
 /**
- * Handles to the libeufin services.
+ * Which bank is the test running against?
+ * Set up at runtime.
  */
-static struct TALER_TESTING_LibeufinServices libeufin_services;
+static enum TALER_TESTING_BankSystem bs;
 
-/**
- * Needed to shutdown differently.
- */
-static int with_libeufin;
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -74,52 +67,76 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_WireTransferIdentifierRawP wtid;
+  const char *ssoptions;
 
   (void) cls;
-  memset (&wtid, 42, sizeof (wtid));
+  switch (bs)
+  {
+  case TALER_TESTING_BS_FAKEBANK:
+    ssoptions = "-f";
+    break;
+  case TALER_TESTING_BS_IBAN:
+    ssoptions = "-b";
+    break;
+  default:
+    ssoptions = NULL;
+    break;
+  }
+  memset (&wtid,
+          42,
+          sizeof (wtid));
 
   {
     struct TALER_TESTING_Command commands[] = {
+      TALER_TESTING_cmd_system_start ("start-taler",
+                                      cfgfile,
+                                      ssoptions,
+                                      NULL),
       TALER_TESTING_cmd_bank_credits ("history-0",
-                                      &bc.exchange_auth,
+                                      &cred.ba,
                                       NULL,
                                       1),
       TALER_TESTING_cmd_admin_add_incoming ("credit-1",
-                                            "KUDOS:5.01",
-                                            &bc.exchange_auth,
-                                            bc.user42_payto),
+                                            "EUR:5.01",
+                                            &cred.ba_admin,
+                                            cred.user42_payto),
+      /**
+       * This CMD doesn't care about the HTTP response code; that's
+       * because Fakebank and euFin behaves differently when a reserve
+       * pub is duplicate.  Fakebank responds with 409, whereas euFin
+       * with 200 but it bounces the payment back to the customer.
+       */
       TALER_TESTING_cmd_admin_add_incoming_with_ref ("credit-1-fail",
-                                                     "KUDOS:2.01",
-                                                     &bc.exchange_auth,
-                                                     bc.user42_payto,
+                                                     "EUR:2.01",
+                                                     &cred.ba_admin,
+                                                     cred.user42_payto,
                                                      "credit-1",
-                                                     MHD_HTTP_CONFLICT),
-      TALER_TESTING_cmd_sleep ("Waiting 4s for 'credit-1' to settle",
-                               4),
+                                                     -1),
+      /**
+       * Check that the incoming payment with a duplicate
+       * reserve public key didn't make it to the exchange.
+       */
       TALER_TESTING_cmd_bank_credits ("history-1c",
-                                      &bc.exchange_auth,
+                                      &cred.ba,
                                       NULL,
                                       5),
       TALER_TESTING_cmd_bank_debits ("history-1d",
-                                     &bc.exchange_auth,
+                                     &cred.ba,
                                      NULL,
                                      5),
       TALER_TESTING_cmd_admin_add_incoming ("credit-2",
-                                            "KUDOS:3.21",
-                                            &bc.exchange_auth,
-                                            bc.user42_payto),
+                                            "EUR:3.21",
+                                            &cred.ba_admin,
+                                            cred.user42_payto),
       TALER_TESTING_cmd_transfer ("debit-1",
-                                  "KUDOS:3.22",
-                                  &bc.exchange_auth,
-                                  bc.exchange_payto,
-                                  bc.user42_payto,
+                                  "EUR:3.22",
+                                  &cred.ba,
+                                  cred.exchange_payto,
+                                  cred.user42_payto,
                                   &wtid,
                                   "http://exchange.example.com/"),
-
-      TALER_TESTING_cmd_sleep ("Waiting 5s for 'debit-1' to settle",
-                               5),
       TALER_TESTING_cmd_bank_debits ("history-2b",
-                                     &bc.exchange_auth,
+                                     &cred.ba,
                                      NULL,
                                      5),
       TALER_TESTING_cmd_end ()
@@ -127,152 +144,53 @@ run (void *cls,
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Bank serves at `%s'\n",
-                bc.exchange_auth.wire_gateway_url);
-    if (GNUNET_YES == with_fakebank)
-      TALER_TESTING_run_with_fakebank (is,
-                                       commands,
-                                       bc.exchange_auth.wire_gateway_url);
-    else
-      TALER_TESTING_run (is,
-                         commands);
+                cred.ba.wire_gateway_url);
+    TALER_TESTING_run (is,
+                       commands);
   }
 }
 
 
-/**
- * Runs #TALER_TESTING_setup() using the configuration.
- *
- * @param cls unused
- * @param cfg configuration to use
- * @return status code
- */
-static int
-setup_with_cfg (void *cls,
-                const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  (void) cls;
-  return TALER_TESTING_setup (&run,
-                              NULL,
-                              cfg,
-                              NULL,
-                              GNUNET_NO);
-}
-
-
 int
 main (int argc,
       char *const *argv)
 {
-  int rv;
-  const char *cfgfile;
-
   (void) argc;
-  (void) argv;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup ("test-bank-api",
-                    "DEBUG",
-                    NULL);
-
-  with_fakebank = TALER_TESTING_has_in_name (argv[0],
-                                             "_with_fakebank");
-  if (GNUNET_YES == with_fakebank)
+  if (TALER_TESTING_has_in_name (argv[0],
+                                 "_with_fakebank"))
   {
-    TALER_LOG_DEBUG ("Running against the Fakebank.\n");
+    bs = TALER_TESTING_BS_FAKEBANK;
     cfgfile = CONFIG_FILE_FAKEBANK;
-    if (GNUNET_OK !=
-        TALER_TESTING_prepare_fakebank (CONFIG_FILE_FAKEBANK,
-                                        "exchange-account-2",
-                                        &bc))
-    {
-      GNUNET_break (0);
-      return 77;
-    }
   }
-  else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
-                                                    "_with_pybank"))
+  else if (TALER_TESTING_has_in_name (argv[0],
+                                      "_with_nexus"))
   {
-    TALER_LOG_DEBUG ("Running against the Pybank.\n");
-    cfgfile = CONFIG_FILE_PYBANK;
-    if (GNUNET_OK !=
-        TALER_TESTING_prepare_bank (CONFIG_FILE_PYBANK,
-                                    GNUNET_YES,
-                                    "exchange-account-2",
-                                    &bc))
-    {
-      GNUNET_break (0);
-      return 77;
-    }
-
-    if (NULL == (bankd = TALER_TESTING_run_bank (
-                   CONFIG_FILE_PYBANK,
-                   bc.exchange_auth.wire_gateway_url)))
-    {
-      GNUNET_break (0);
-      return 77;
-    }
-  }
-  else if (GNUNET_YES == TALER_TESTING_has_in_name (argv[0],
-                                                    "_with_nexus"))
-  {
-    TALER_LOG_DEBUG ("Running with Nexus.\n");
-    with_libeufin = GNUNET_YES;
+    bs = TALER_TESTING_BS_IBAN;
     cfgfile = CONFIG_FILE_NEXUS;
-    if (GNUNET_OK !=
-        TALER_TESTING_prepare_nexus (CONFIG_FILE_NEXUS,
-                                     GNUNET_YES,
-                                     "exchange-account-2",
-                                     &bc))
+    if (GNUNET_SYSERR ==
+        GNUNET_OS_check_helper_binary ("libeufin-bank",
+                                       false,
+                                       NULL))
     {
-      GNUNET_break (0);
+      fprintf (stderr,
+               "libeufin-bank not found. Skipping test.\n");
       return 77;
     }
-    libeufin_services = TALER_TESTING_run_libeufin (&bc);
-    if ( (NULL == libeufin_services.nexus) ||
-         (NULL == libeufin_services.sandbox) )
-      return 77;
   }
   else
   {
-    /* no bank service was ever invoked.  */
+    /* no bank service was specified.  */
+    GNUNET_break (0);
     return 77;
   }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_parse_and_run (cfgfile,
-                                          &setup_with_cfg,
-                                          NULL))
-    rv = 1;
-  else
-    rv = 0;
-
-  if (GNUNET_NO == with_fakebank)
-  {
-    // -> pybank
-    if (GNUNET_NO == with_libeufin)
-    {
-
-      GNUNET_OS_process_kill (bankd,
-                              SIGKILL);
-      GNUNET_OS_process_wait (bankd);
-      GNUNET_OS_process_destroy (bankd);
-    }
-    else // -> libeufin
-    {
-      GNUNET_OS_process_kill (libeufin_services.nexus,
-                              SIGKILL);
-      GNUNET_OS_process_wait (libeufin_services.nexus);
-      GNUNET_OS_process_destroy (libeufin_services.nexus);
-
-      GNUNET_OS_process_kill (libeufin_services.sandbox,
-                              SIGKILL);
-      GNUNET_OS_process_wait (libeufin_services.sandbox);
-      GNUNET_OS_process_destroy (libeufin_services.sandbox);
-    }
-  }
-
-  return rv;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             cfgfile,
+                             "exchange-account-2",
+                             bs,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_bank_api.conf b/src/testing/test_bank_api.conf
new file mode 100644
index 000000000..c262ae197
--- /dev/null
+++ b/src/testing/test_bank_api.conf
@@ -0,0 +1,23 @@
+# This file is in the public domain
+
+[PATHS]
+TALER_TEST_HOME = test_exchange_api_home/
+
+[taler]
+currency = EUR
+
+[bank]
+SERVE = http
+HTTP_PORT = 8082
+
+[libeufin-bank]
+CURRENCY = EUR
+WIRE_TYPE = iban
+IBAN_PAYTO_BIC = SANDBOXX=
+DEFAULT_CUSTOMER_DEBT_LIMIT = EUR:200
+DEFAULT_ADMIN_DEBT_LIMIT = EUR:2000
+REGISTRATION_BONUS_ENABLED = yes
+REGISTRATION_BONUS = EUR:100
+SUGGESTED_WITHDRAWAL_EXCHANGE = http://localhost:8081/
+SERVE = tcp
+PORT = 8082
diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf
index b97423987..62fa4cd4c 100644
--- a/src/testing/test_bank_api_fakebank.conf
+++ b/src/testing/test_bank_api_fakebank.conf
@@ -1,21 +1,21 @@
 # This file is in the public domain.
+@INLINE@ test_bank_api.conf
 
-[taler]
-currency = KUDOS
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost:8082/1?receiver-name=1"
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost:8082/2?receiver-name=2"
 
 [exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8081/2/"
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
 WIRE_GATEWAY_AUTH_METHOD = basic
 USERNAME = Exchange
 PASSWORD = x
 
-[bank]
-SERVE = http
-HTTP_PORT = 8081
-DATABASE = postgres:///talercheck
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
+[admin-accountcredentials-2]
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+# For now, fakebank still checks against the Exchange account...
+USERNAME = Exchange
+PASSWORD = x
diff --git a/src/testing/test_bank_api_fakebank_twisted.conf b/src/testing/test_bank_api_fakebank_twisted.conf
index 4dab123a7..bc66c0d88 100644
--- a/src/testing/test_bank_api_fakebank_twisted.conf
+++ b/src/testing/test_bank_api_fakebank_twisted.conf
@@ -1,12 +1,15 @@
+# This file is in the public domain.
+
+@INLINE@ test_bank_api_fakebank.conf
 
 [twister]
+
 # HTTP listen port for twister
 HTTP_PORT = 8888
 SERVE = tcp
-
 # HTTP Destination for twister.  The test-Webserver needs
 # to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
+DESTINATION_BASE_URL = "http://localhost:8082"
 
 # Control port for TCP
 # PORT = 8889
@@ -18,20 +21,3 @@ ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/taler-service-twister.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
-
-[taler]
-currency = KUDOS
-
-[bank]
-serve = http
-http_port = 8081
-database = postgres:///talercheck
-
-[exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost:8081/1
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost:8081/2
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
diff --git a/src/testing/test_bank_api_nexus.conf b/src/testing/test_bank_api_nexus.conf
index c514170e1..605c7b00e 100644
--- a/src/testing/test_bank_api_nexus.conf
+++ b/src/testing/test_bank_api_nexus.conf
@@ -1,23 +1,35 @@
 # This file is in the public domain.
-
-[taler]
-currency = KUDOS
+@INLINE@ test_bank_api.conf
 
 [exchange-account-2]
 PAYTO_URI = payto://iban/BIC/ES9121000418450200051332?receiver-name=Exchange
 
 [exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = http://localhost:5001/facades/my-facade/taler/
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/exchange/taler-wire-gateway/
 WIRE_GATEWAY_AUTH_METHOD = basic
-# the exchange authenticates as the 'admin' user,
-# since that makes the test preparation just easier.
-USERNAME = Exchange
+USERNAME = exchange
 PASSWORD = x
 
-[bank]
-# not (!) used by the nexus, only by the helper
-# check to make sure the port is free for the nexus.
-HTTP_PORT = 5001
+[admin-accountcredentials-2]
+WIRE_GATEWAY_URL = http://localhost:8082/accounts/exchange/taler-wire-gateway/
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = admin
+# 'secret' is from taler-unified-setup.sh
+PASSWORD = secret
+
+[libeufin-bankdb-postgres]
+CONFIG="postgresql:///talercheck"
 
-[auditor]
-BASE_URL = "http://localhost:8083/"
+# libeufin doesn't search our config.d/currencies.conf
+# as it has a different resource path. Thus replicated
+# here.
+[currency-euro]
+ENABLED = YES
+name = "Euro"
+code = "EUR"
+decimal_separator = ","
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+is_currency_name_leading = NO
+alt_unit_names = {"0":"€"}
diff --git a/src/testing/test_bank_api_pybank.conf b/src/testing/test_bank_api_pybank.conf
deleted file mode 100644
index 6603ba8a5..000000000
--- a/src/testing/test_bank_api_pybank.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in the public domain.
-
-[taler]
-currency = KUDOS
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/Exchange/"
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
-
-[bank]
-SERVE = http
-HTTP_PORT = 8081
-DATABASE = postgres:///talercheck
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
diff --git a/src/testing/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf
deleted file mode 100644
index d89cf0469..000000000
--- a/src/testing/test_bank_api_pybank_twisted.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-[twister]
-# HTTP listen port for twister
-HTTP_PORT = 8888
-SERVE = tcp
-
-# HTTP Destination for twister.  The test-Webserver needs
-# to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
-
-# Control port for TCP
-# PORT = 8889
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-# Control port for UNIX
-UNIXPATH = /tmp/taler-service-twister.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[taler]
-currency = KUDOS
-
-[bank]
-serve = http
-http_port = 8081
-database = postgres:///talercheck
-
-[exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/1
-
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8888/taler-wire-gateway/Exchange/"
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
diff --git a/src/testing/test_bank_api_twisted.c b/src/testing/test_bank_api_twisted.c
index c550aaeb2..038ec8a1f 100644
--- a/src/testing/test_bank_api_twisted.c
+++ b/src/testing/test_bank_api_twisted.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2018 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file testing/test_bank_api_with_fakebank_twisted.c
+ * @file testing/test_bank_api_twisted.c
  * @author Marcello Stanisci
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
@@ -42,19 +42,20 @@
 #define CONFIG_FILE_FAKEBANK "test_bank_api_fakebank_twisted.conf"
 
 /**
- * Separate config file for running with the pybank.
+ * Configuration file we use.
  */
-#define CONFIG_FILE_PYBANK "test_bank_api_pybank_twisted.conf"
+static const char *cfgfile;
 
 /**
- * True when the test runs against Fakebank.
+ * Our credentials.
  */
-static int with_fakebank;
+static struct TALER_TESTING_Credentials cred;
 
 /**
- * Bank configuration data.
+ * Which bank is the test running against?
+ * Set up at runtime.
  */
-static struct TALER_TESTING_BankConfiguration bc;
+static enum TALER_TESTING_BankSystem bs;
 
 /**
  * (real) Twister URL.  Used at startup time to check if it runs.
@@ -66,11 +67,6 @@ static char *twister_url;
  */
 static struct GNUNET_OS_Process *twisterd;
 
-/**
- * Python bank process handle.
- */
-static struct GNUNET_OS_Process *bankd;
-
 
 /**
  * Main function that will tell
@@ -83,176 +79,118 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_WireTransferIdentifierRawP wtid;
-  /* Route our commands through twister. */
+  /* Authentication data to route our commands through twister. */
   struct TALER_BANK_AuthenticationData exchange_auth_twisted;
+  const char *systype = NULL;
 
   (void) cls;
   memset (&wtid,
           0x5a,
           sizeof (wtid));
-  memcpy (&exchange_auth_twisted,
-          &bc.exchange_auth,
-          sizeof (struct TALER_BANK_AuthenticationData));
-  if (with_fakebank)
-    exchange_auth_twisted.wire_gateway_url =
-      "http://localhost:8888/2/";
-  else
-    exchange_auth_twisted.wire_gateway_url =
-      "http://localhost:8888/taler-wire-gateway/Exchange/";
+  GNUNET_memcpy (&exchange_auth_twisted,
+                 &cred.ba,
+                 sizeof (struct TALER_BANK_AuthenticationData));
+  switch (bs)
+  {
+  case TALER_TESTING_BS_FAKEBANK:
+    exchange_auth_twisted.wire_gateway_url
+      = "http://localhost:8888/accounts/2/taler-wire-gateway/";
+    systype = "-f";
+    break;
+  case TALER_TESTING_BS_IBAN:
+    exchange_auth_twisted.wire_gateway_url
+      = "http://localhost:8888/accounts/Exchange/taler-wire-gateway/";
+    systype = "-b";
+    break;
+  }
+  GNUNET_assert (NULL != systype);
 
-  struct TALER_TESTING_Command commands[] = {
-    /* Test retrying transfer after failure. */
-    TALER_TESTING_cmd_malform_response ("malform-transfer",
-                                        CONFIG_FILE_FAKEBANK),
-    TALER_TESTING_cmd_transfer_retry (
-      TALER_TESTING_cmd_transfer ("debit-1",
-                                  "KUDOS:3.22",
-                                  &exchange_auth_twisted,
-                                  bc.exchange_payto,
-                                  bc.user42_payto,
-                                  &wtid,
-                                  "http://exchange.example.com/")),
-    TALER_TESTING_cmd_end ()
-  };
+  {
+    struct TALER_TESTING_Command commands[] = {
+      TALER_TESTING_cmd_system_start ("start-taler",
+                                      cfgfile,
+                                      systype,
+                                      NULL),
+      /* Test retrying transfer after failure. */
+      TALER_TESTING_cmd_malform_response ("malform-transfer",
+                                          cfgfile),
+      TALER_TESTING_cmd_transfer_retry (
+        TALER_TESTING_cmd_transfer ("debit-1",
+                                    "EUR:3.22",
+                                    &exchange_auth_twisted,
+                                    cred.exchange_payto,
+                                    cred.user42_payto,
+                                    &wtid,
+                                    "http://exchange.example.com/")),
+      TALER_TESTING_cmd_end ()
+    };
 
-  if (GNUNET_YES == with_fakebank)
-    TALER_TESTING_run_with_fakebank (is,
-                                     commands,
-                                     bc.exchange_auth.wire_gateway_url);
-  else
     TALER_TESTING_run (is,
                        commands);
+  }
 }
 
 
 /**
  * Kill, wait, and destroy convenience function.
  *
- * @param process process to purge.
+ * @param[in] process process to purge.
  */
 static void
 purge_process (struct GNUNET_OS_Process *process)
 {
-  GNUNET_OS_process_kill (process, SIGINT);
+  GNUNET_OS_process_kill (process,
+                          SIGINT);
   GNUNET_OS_process_wait (process);
   GNUNET_OS_process_destroy (process);
 }
 
 
-/**
- * Runs #TALER_TESTING_setup() using the configuration.
- *
- * @param cls unused
- * @param cfg configuration to use
- * @return status code
- */
-static int
-setup_with_cfg (void *cls,
-                const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  (void) cls;
-  return TALER_TESTING_setup (&run,
-                              NULL,
-                              cfg,
-                              NULL,
-                              GNUNET_NO);
-}
-
-
 int
 main (int argc,
       char *const *argv)
 {
   int ret;
-  const char *cfgfilename;
 
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup ("test-bank-api-with-(fake)bank-twisted",
-                    "DEBUG",
-                    NULL);
-
-  with_fakebank = TALER_TESTING_has_in_name (argv[0],
-                                             "_with_fakebank");
-
-  if (with_fakebank)
-    cfgfilename = CONFIG_FILE_FAKEBANK;
-  else
-    cfgfilename = CONFIG_FILE_PYBANK;
-
-  if (NULL == (twister_url = TALER_TWISTER_prepare_twister (
-                 cfgfilename)))
+  if (TALER_TESTING_has_in_name (argv[0],
+                                 "_with_fakebank"))
   {
-    GNUNET_break (0);
-    return 77;
+    bs = TALER_TESTING_BS_FAKEBANK;
+    cfgfile = CONFIG_FILE_FAKEBANK;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "twister_url is %s\n",
-              twister_url);
-  if (NULL == (twisterd = TALER_TWISTER_run_twister (cfgfilename)))
+  else if (TALER_TESTING_has_in_name (argv[0],
+                                      "_with_nexus"))
   {
-    GNUNET_break (0);
-    GNUNET_free (twister_url);
-    return 77;
-  }
-  if (GNUNET_YES == with_fakebank)
-  {
-    TALER_LOG_DEBUG ("Running against the Fakebank.\n");
-    if (GNUNET_OK !=
-        TALER_TESTING_prepare_fakebank (cfgfilename,
-                                        "exchange-account-2",
-                                        &bc))
-    {
-      GNUNET_break (0);
-      GNUNET_free (twister_url);
-      return 77;
-    }
+    GNUNET_assert (0); /* FIXME: test with nexus not yet implemented */
+    bs = TALER_TESTING_BS_IBAN;
+    /* cfgfile = CONFIG_FILE_NEXUS; */
   }
   else
   {
-    TALER_LOG_DEBUG ("Running against the Pybank.\n");
-    if (GNUNET_OK !=
-        TALER_TESTING_prepare_bank (cfgfilename,
-                                    GNUNET_YES,
-                                    "exchange-account-2",
-                                    &bc))
-    {
-      GNUNET_break (0);
-      GNUNET_free (twister_url);
-      return 77;
-    }
-
-    if (NULL == (bankd = TALER_TESTING_run_bank (
-                   cfgfilename,
-                   bc.exchange_auth.wire_gateway_url)))
-    {
-      GNUNET_break (0);
-      GNUNET_free (twister_url);
-      return 77;
-    }
+    /* no bank service was specified.  */
+    GNUNET_break (0);
+    return 77;
   }
 
-  sleep (5);
-  ret = GNUNET_CONFIGURATION_parse_and_run (cfgfilename,
-                                            &setup_with_cfg,
-                                            NULL);
+  /* FIXME: introduce commands for twister! */
+  twister_url = TALER_TWISTER_prepare_twister (cfgfile);
+  if (NULL == twister_url)
+    return 77;
+  twisterd = TALER_TWISTER_run_twister (cfgfile);
+  if (NULL == twisterd)
+    return 77;
+  ret = TALER_TESTING_main (argv,
+                            "INFO",
+                            cfgfile,
+                            "exchange-account-2",
+                            bs,
+                            &cred,
+                            &run,
+                            NULL);
   purge_process (twisterd);
-
-  if (GNUNET_NO == with_fakebank)
-  {
-    GNUNET_OS_process_kill (bankd,
-                            SIGKILL);
-    GNUNET_OS_process_wait (bankd);
-    GNUNET_OS_process_destroy (bankd);
-  }
-
   GNUNET_free (twister_url);
-  if (GNUNET_OK == ret)
-    return 0;
-
-  return 1;
+  return ret;
 }
 
 
diff --git a/src/testing/test_exchange_api-cs.conf b/src/testing/test_exchange_api-cs.conf
index 204718120..b80696fb2 100644
--- a/src/testing/test_exchange_api-cs.conf
+++ b/src/testing/test_exchange_api-cs.conf
@@ -1,209 +1,4 @@
 # This file is in the public domain.
 #
-
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-
-[exchange]
-
-TERMS_ETAG = 0
-PRIVACY_ETAG = 0
-
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-# How big is an individual shard to be processed
-# by taler-exchange-expire (in time).  It may take
-# this much time for an expired purse to be really
-# cleaned up and the coins refunded.
-EXPIRE_SHARD_SIZE = 300 ms
-
-EXPIRE_IDLE_SLEEP_INTERVAL = 1 s
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-# Sections starting with "exchange-account-" configure the bank accounts
-# of the exchange.  The "URL" specifies the account in
-# payto://-format.
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-# ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9081/42/"
-
-[exchange-account-2]
-# What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:9081/2/"
-
-[bank]
-HTTP_PORT = 9081
-
-# Enabled extensions
-[exchange-extension-age_restriction]
-ENABLED = YES
-# default age groups:
-#AGE_GROUPS = "8:10:12:14:16:18:21"
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_1_age_restricted]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-age_restricted = YES
-CIPHER = CS
-
-[coin_eur_ct_10_age_restricted]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-age_restricted = YES
-CIPHER = CS
-
-[coin_eur_1_age_restricted]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-age_restricted = YES
-CIPHER = CS
-
-[coin_eur_5_age_restricted]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-age_restricted = YES
-CIPHER = CS
-
-[coin_eur_10_age_restricted]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-age_restricted = YES
-CIPHER = CS
+@INLINE@ coins-cs.conf
+@INLINE@ test_exchange_api.conf
diff --git a/src/testing/test_exchange_api-rsa.conf b/src/testing/test_exchange_api-rsa.conf
index be0e4bade..351c876d9 100644
--- a/src/testing/test_exchange_api-rsa.conf
+++ b/src/testing/test_exchange_api-rsa.conf
@@ -1,220 +1,4 @@
 # This file is in the public domain.
 #
-
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-
-[exchange]
-
-TERMS_ETAG = 0
-PRIVACY_ETAG = 0
-
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-# How big is an individual shard to be processed
-# by taler-exchange-expire (in time).  It may take
-# this much time for an expired purse to be really
-# cleaned up and the coins refunded.
-EXPIRE_SHARD_SIZE = 300 ms
-
-EXPIRE_IDLE_SLEEP_INTERVAL = 1 s
-
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-# Sections starting with "exchange-account-" configure the bank accounts
-# of the exchange.  The "URL" specifies the account in
-# payto://-format.
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-# ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9081/42/"
-
-[exchange-account-2]
-# What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
-WIRE_GATEWAY_URL = "http://localhost:9081/2/"
-
-[bank]
-HTTP_PORT = 9081
-
-# Enabled extensions
-[exchange-extension-age_restriction]
-ENABLED = YES
-# default age groups:
-#AGE_GROUPS = "8:10:12:14:16:18:21"
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_1_age_restricted]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-age_restricted = YES
-CIPHER = RSA
-
-[coin_eur_ct_10_age_restricted]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-age_restricted = YES
-CIPHER = RSA
-
-[coin_eur_1_age_restricted]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-age_restricted = YES
-CIPHER = RSA
-
-[coin_eur_5_age_restricted]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-age_restricted = YES
-CIPHER = RSA
-
-[coin_eur_10_age_restricted]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-age_restricted = YES
-CIPHER = RSA
+@INLINE@ coins-rsa.conf
+@INLINE@ test_exchange_api.conf
\ No newline at end of file
diff --git a/src/testing/test_exchange_api-twisted.conf b/src/testing/test_exchange_api-twisted.conf
new file mode 100644
index 000000000..536d36ee4
--- /dev/null
+++ b/src/testing/test_exchange_api-twisted.conf
@@ -0,0 +1,29 @@
+# This file is in the public domain.
+
+[exchange]
+# Base URL of the exchange ('S PROXY).  This URL is where the
+# twister listens at, so that it will be able to get all the
+# connection addressed to the exchange.  In fact, the presence
+# of the twister is 100% transparent to the test case, as it
+# only seeks the exchange/BASE_URL URL to connect to the exchange.
+BASE_URL = "http://localhost:8888/"
+
+[twister]
+# HTTP listen port for twister
+HTTP_PORT = 8888
+SERVE = tcp
+
+# HTTP Destination for twister.  The test-Webserver needs
+# to listen on the port used here.  Note: no trailing '/'!
+DESTINATION_BASE_URL = "http://localhost:8081"
+
+# Control port for TCP
+# PORT = 8889
+HOSTNAME = localhost
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+
+# Control port for UNIX
+UNIXPATH = /tmp/taler-service-twister.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index da323ca51..caeec1e76 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -49,18 +49,13 @@ static char *config_file;
 static char *config_file_expire_reserve_now;
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
+static struct TALER_TESTING_Credentials cred;
 
 /**
  * Some tests behave differently when using CS as we cannot
- * re-use the coin private key for different denominations
+ * reuse the coin private key for different denominations
  * due to the derivation of it with the /csr values. Hence
  * some tests behave differently in CS mode, hence this
  * flag.
@@ -74,7 +69,7 @@ static bool uses_cs;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_WIREWATCH(label) \
-  TALER_TESTING_cmd_exec_wirewatch (label, config_file)
+  TALER_TESTING_cmd_exec_wirewatch2 (label, config_file, "exchange-account-2")
 
 /**
  * Execute the taler-exchange-aggregator, closer and transfer commands with
@@ -97,8 +92,8 @@ static bool uses_cs;
  */
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_admin_add_incoming (label, amount, \
-                                        &bc.exchange_auth,                \
-                                        bc.user42_payto)
+                                        &cred.ba,                \
+                                        cred.user42_payto)
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -112,21 +107,6 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   /**
-   * Checks made against /wire response.
-   */
-  struct TALER_TESTING_Command wire[] = {
-    /**
-     * Check if 'x-taler-bank' wire method is offered
-     * by the exchange.
-     */
-    TALER_TESTING_cmd_wire ("wire-taler-bank-1",
-                            "x-taler-bank",
-                            NULL,
-                            MHD_HTTP_OK),
-    TALER_TESTING_cmd_end ()
-  };
-
-  /**
    * Test withdrawal plus spending.
    */
   struct TALER_TESTING_Command withdraw[] = {
@@ -142,8 +122,8 @@ run (void *cls,
                                     MHD_HTTP_OK),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1",
                                                  "EUR:6.02",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-1"),
     /**
      * Make a reserve exist, according to the previous
@@ -201,12 +181,17 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-simple",
                                "withdraw-coin-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
                                MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay",
+    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-1",
+                                      "deposit-simple",
+                                      MHD_HTTP_OK),
+    TALER_TESTING_cmd_sleep ("sleep-before-deposit-replay",
+                             1),
+    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-2",
                                       "deposit-simple",
                                       MHD_HTTP_OK),
     /* This creates a conflict, as we have the same coin public key (reuse!),
@@ -219,7 +204,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-reused-coin-key-failure",
                                "withdraw-coin-1x",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -232,7 +217,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-double-1",
                                "withdraw-coin-1",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -246,7 +231,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-double-1",
                                "withdraw-coin-1",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -257,7 +242,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-double-2",
                                "withdraw-coin-1",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":2}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -282,8 +267,8 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("ck-refresh-create-reserve-1",
                                                  "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "refresh-create-reserve-1"),
     /**
      * Make previous command effective.
@@ -304,7 +289,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-partial",
                                "refresh-withdraw-coin-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -341,7 +326,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-1a",
                                "refresh-reveal-1-idempotency",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -352,7 +337,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-1b",
                                "refresh-reveal-1",
                                3,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.1",
@@ -390,8 +375,8 @@ run (void *cls,
                               "EUR:6.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-age",
                                                  "EUR:6.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-age"),
     /**
      * Make a reserve exist, according to the previous
@@ -417,7 +402,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-simple-age",
                                "withdraw-coin-age-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:4.99",
@@ -425,6 +410,14 @@ run (void *cls,
     TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-age",
                                       "deposit-simple-age",
                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-age-1",
+                                      "deposit-simple-age",
+                                      MHD_HTTP_OK),
+    TALER_TESTING_cmd_sleep ("sleep-before-age-deposit-replay",
+                             1),
+    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-age-2",
+                                      "deposit-simple-age",
+                                      MHD_HTTP_OK),
     TALER_TESTING_cmd_end ()
   };
 
@@ -464,53 +457,53 @@ run (void *cls,
      * Check all the transfers took place.
      */
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-499c",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:4.98",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-499c2",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:4.97",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-99c1",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.98",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-99c2",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.98",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-99c3",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.98",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-99c4",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.98",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-08c",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.08",
-                                           bc.exchange_payto,
-                                           bc.user43_payto),
+                                           cred.exchange_payto,
+                                           cred.user43_payto),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-08c2",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.08",
-                                           bc.exchange_payto,
-                                           bc.user43_payto),
+                                           cred.exchange_payto,
+                                           cred.user43_payto),
     /* In case of CS, one transaction above succeeded that
        failed for RSA, hence we need to check for an extra transfer here */
     uses_cs
     ? TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-98c",
-                                             ec.exchange_url,
+                                             cred.exchange_url,
                                              "EUR:0.98",
-                                             bc.exchange_payto,
-                                             bc.user42_payto)
+                                             cred.exchange_payto,
+                                             cred.user42_payto)
     : TALER_TESTING_cmd_sleep ("dummy",
                                0),
     TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
@@ -544,8 +537,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check-create-reserve-unaggregated",
       "EUR:5.01",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "create-reserve-unaggregated"),
     CMD_EXEC_WIREWATCH ("wirewatch-unaggregated"),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-unaggregated",
@@ -556,7 +549,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-unaggregated",
                                "withdraw-coin-unaggregated",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_relative_multiply (
                                  GNUNET_TIME_UNIT_YEARS,
@@ -565,8 +558,8 @@ run (void *cls,
                                MHD_HTTP_OK),
     CMD_EXEC_AGGREGATOR ("aggregation-attempt"),
 
-    TALER_TESTING_cmd_check_bank_empty
-      ("far-future-aggregation-b"),
+    TALER_TESTING_cmd_check_bank_empty (
+      "far-future-aggregation-b"),
 
     TALER_TESTING_cmd_end ()
   };
@@ -578,8 +571,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "ck-refresh-create-reserve-age-1",
       "EUR:6.01",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "refresh-create-reserve-age-1"),
     /**
      * Make previous command effective.
@@ -600,7 +593,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-partial-age",
                                "refresh-withdraw-coin-age-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -637,7 +630,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-age-1a",
                                "refresh-reveal-age-1-idempotency",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -648,7 +641,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-age-1b",
                                "refresh-reveal-age-1",
                                3,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.1",
@@ -665,7 +658,6 @@ run (void *cls,
                             "refresh-reveal-age-1",
                             MHD_HTTP_CONFLICT,
                             NULL),
-
     TALER_TESTING_cmd_end ()
   };
 
@@ -680,8 +672,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check-create-reserve-aggtest",
       "EUR:5.01",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "create-reserve-aggtest"),
     CMD_EXEC_WIREWATCH ("wirewatch-aggtest"),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-aggtest",
@@ -692,7 +684,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-aggtest-1",
                                "withdraw-coin-aggtest",
                                0,
-                               bc.user43_payto,
+                               cred.user43_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:2",
@@ -700,7 +692,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit_with_ref ("deposit-aggtest-2",
                                         "withdraw-coin-aggtest",
                                         0,
-                                        bc.user43_payto,
+                                        cred.user43_payto,
                                         "{\"items\":[{\"name\":\"foo bar\",\"value\":1}]}",
                                         GNUNET_TIME_UNIT_ZERO,
                                         "EUR:2",
@@ -708,10 +700,10 @@ run (void *cls,
                                         "deposit-aggtest-1"),
     CMD_EXEC_AGGREGATOR ("aggregation-aggtest"),
     TALER_TESTING_cmd_check_bank_transfer ("check-bank-transfer-aggtest",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:3.97",
-                                           bc.exchange_payto,
-                                           bc.user43_payto),
+                                           cred.exchange_payto,
+                                           cred.user43_payto),
     TALER_TESTING_cmd_check_bank_empty ("check-bank-empty-aggtest"),
     TALER_TESTING_cmd_end ()
   };
@@ -725,8 +717,8 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-r1",
                                                  "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-r1"),
     /**
      * Run wire-watch to trigger the reserve creation.
@@ -745,7 +737,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-1",
                                "withdraw-coin-r1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_MINUTES,
                                "EUR:5",
@@ -779,7 +771,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-insufficient-refund",
                                "withdraw-coin-r1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:4\"}]}",
                                GNUNET_TIME_UNIT_MINUTES,
                                "EUR:4",
@@ -796,7 +788,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-2",
                                "withdraw-coin-r1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"more ice cream\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:4.99",
@@ -810,10 +802,10 @@ run (void *cls,
      * Check that deposit did run.
      */
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_transfer-pre-refund",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:4.97",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     /**
      * Run failing refund, as past deadline & aggregation.
      */
@@ -830,8 +822,8 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-rb",
                                                  "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-rb"),
     CMD_EXEC_WIREWATCH ("wirewatch-rb"),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-rb",
@@ -842,7 +834,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-refund-1b",
                                "withdraw-coin-rb",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -876,8 +868,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "recoup-create-reserve-1-check",
       "EUR:15.02",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "recoup-create-reserve-1"),
     /**
      * Run wire-watch to trigger the reserve creation.
@@ -1006,11 +998,12 @@ run (void *cls,
                               "EUR:5.01"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-short-lived-reserve",
                                                  "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "short-lived-reserve"),
-    TALER_TESTING_cmd_exec_wirewatch ("short-lived-aggregation",
-                                      config_file_expire_reserve_now),
+    TALER_TESTING_cmd_exec_wirewatch2 ("short-lived-aggregation",
+                                       config_file_expire_reserve_now,
+                                       "exchange-account-2"),
     TALER_TESTING_cmd_exec_closer ("close-reserves",
                                    config_file_expire_reserve_now,
                                    "EUR:5",
@@ -1029,21 +1022,21 @@ run (void *cls,
                                        0, /* age restriction off */
                                        MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_check_bank_transfer ("check_bank_short-lived_reimburse",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:5",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     /* Fill reserve with EUR:2.02, as withdraw fee is 1 ct per
      * config, then withdraw two coin, partially spend one, and
      * then have the rest paid back.  Check deposit of other coin
      * fails.  Do not use EUR:5 here as the EUR:5 coin was
-     * revoked and we did not bother to create a new one... *///
+     * revoked and we did not bother to create a new one... */
     CMD_TRANSFER_TO_EXCHANGE ("recoup-create-reserve-2",
                               "EUR:2.02"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("ck-recoup-create-reserve-2",
                                                  "EUR:2.02",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "recoup-create-reserve-2"),
     /* Make previous command effective. */
     CMD_EXEC_WIREWATCH ("wirewatch-5"),
@@ -1062,7 +1055,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("recoup-deposit-partial",
                                "recoup-withdraw-coin-2a",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.5",
@@ -1090,7 +1083,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("recoup-deposit-revoked",
                                "recoup-withdraw-coin-2b",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -1102,7 +1095,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("recoup-deposit-partial-after-recoup",
                                "recoup-withdraw-coin-2a",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"extra ice cream\",\"value\":1}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:0.5",
@@ -1113,8 +1106,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check-recoup-create-reserve-3",
       "EUR:1.01",
-      bc.user42_payto,
-      bc.exchange_payto,
+      cred.user42_payto,
+      cred.exchange_payto,
       "recoup-create-reserve-3"),
     CMD_EXEC_WIREWATCH ("wirewatch-6"),
     TALER_TESTING_cmd_withdraw_amount ("recoup-withdraw-coin-3-revoked",
@@ -1128,6 +1121,75 @@ run (void *cls,
     TALER_TESTING_cmd_end ()
   };
 
+  /**
+   * Test batch withdrawal plus spending.
+   */
+  struct TALER_TESTING_Command batch_withdraw[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("create-batch-reserve-1",
+                              "EUR:6.03"),
+    TALER_TESTING_cmd_reserve_poll ("poll-batch-reserve-1",
+                                    "create-batch-reserve-1",
+                                    "EUR:6.03",
+                                    GNUNET_TIME_UNIT_MINUTES,
+                                    MHD_HTTP_OK),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-batch-reserve-1",
+                                                 "EUR:6.03",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-batch-reserve-1"),
+    /*
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-batch-1"),
+    TALER_TESTING_cmd_reserve_poll_finish ("finish-poll-batch-reserve-1",
+                                           GNUNET_TIME_UNIT_SECONDS,
+                                           "poll-batch-reserve-1"),
+    /**
+     * Withdraw EUR:5 AND EUR:1.
+     */
+    TALER_TESTING_cmd_batch_withdraw ("batch-withdraw-coin-1",
+                                      "create-batch-reserve-1",
+                                      0,  /* age restriction off */
+                                      MHD_HTTP_OK,
+                                      "EUR:5",
+                                      "EUR:1",
+                                      NULL),
+    /**
+     * Check the reserve is (almost) depleted.
+     */
+    TALER_TESTING_cmd_status ("status-batch-1",
+                              "create-batch-reserve-1",
+                              "EUR:0.01",
+                              MHD_HTTP_OK),
+    TALER_TESTING_cmd_reserve_history ("history-batch-1",
+                                       "create-batch-reserve-1",
+                                       "EUR:0.01",
+                                       MHD_HTTP_OK),
+    /**
+     * Spend the coins.
+     */
+    TALER_TESTING_cmd_batch_deposit ("batch-deposit-1",
+                                     cred.user42_payto,
+                                     "{\"items\":[{\"name\":\"ice cream\",\"value\":5}]}",
+                                     GNUNET_TIME_UNIT_ZERO,
+                                     MHD_HTTP_OK,
+                                     "batch-withdraw-coin-1#0",
+                                     "EUR:5",
+                                     "batch-withdraw-coin-1#1",
+                                     "EUR:1",
+                                     NULL),
+    TALER_TESTING_cmd_coin_history ("coin-history-batch-1",
+                                    "batch-withdraw-coin-1#0",
+                                    "EUR:0.0",
+                                    MHD_HTTP_OK),
+    TALER_TESTING_cmd_end ()
+  };
+
+
 #define RESERVE_OPEN_CLOSE_CHUNK 4
 #define RESERVE_OPEN_CLOSE_ITERATIONS 3
 
@@ -1144,8 +1206,9 @@ run (void *cls,
       = CMD_TRANSFER_TO_EXCHANGE ("reserve-open-close-key",
                                   "EUR:20");
     reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 1]
-      = TALER_TESTING_cmd_exec_wirewatch ("reserve-open-close-wirewatch",
-                                          config_file_expire_reserve_now);
+      = TALER_TESTING_cmd_exec_wirewatch2 ("reserve-open-close-wirewatch",
+                                           config_file_expire_reserve_now,
+                                           "exchange-account-2");
     reserve_open_close[(i * RESERVE_OPEN_CLOSE_CHUNK) + 2]
       = TALER_TESTING_cmd_exec_closer ("reserve-open-close-aggregation",
                                        config_file_expire_reserve_now,
@@ -1163,27 +1226,18 @@ run (void *cls,
 
   {
     struct TALER_TESTING_Command commands[] = {
-      /* setup exchange */
-      TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                     MHD_HTTP_NO_CONTENT,
-                                     false),
-      TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
-                                                      config_file),
-      TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                  "payto://x-taler-bank/localhost/2",
-                                  MHD_HTTP_NO_CONTENT,
-                                  false),
-      TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                                config_file),
-      TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                                config_file,
-                                                "EUR:0.01",
-                                                "EUR:0.01",
-                                                "EUR:0.01"),
-      TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                  1),
-      TALER_TESTING_cmd_batch ("wire",
-                               wire),
+      TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                      cred.cfg,
+                                      "exchange-account-2"),
+      TALER_TESTING_cmd_system_start ("start-taler",
+                                      config_file,
+                                      "-e",
+                                      NULL),
+      TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                      cred.cfg,
+                                      NULL,
+                                      true,
+                                      true),
       TALER_TESTING_cmd_batch ("withdraw",
                                withdraw),
       TALER_TESTING_cmd_batch ("spend",
@@ -1204,6 +1258,8 @@ run (void *cls,
                                aggregation),
       TALER_TESTING_cmd_batch ("refund",
                                refund),
+      TALER_TESTING_cmd_batch ("batch-withdraw",
+                               batch_withdraw),
       TALER_TESTING_cmd_batch ("recoup",
                                recoup),
       TALER_TESTING_cmd_batch ("reserve-open-close",
@@ -1212,9 +1268,8 @@ run (void *cls,
       TALER_TESTING_cmd_end ()
     };
 
-    TALER_TESTING_run_with_fakebank (is,
-                                     commands,
-                                     bc.exchange_auth.wire_gateway_url);
+    TALER_TESTING_run (is,
+                       commands);
   }
 }
 
@@ -1223,65 +1278,30 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "INFO",
-                    NULL);
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_extension_age_restriction_register ());
-
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  uses_cs = (0 == strcmp (cipher, "cs"));
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api-%s.conf",
-                   cipher);
-  GNUNET_asprintf (&config_file_expire_reserve_now,
-                   "test_exchange_api_expire_reserve_now-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-
-  /* Check fakebank port is available and get config */
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 78;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 2;
-    break;
-  default:
-    GNUNET_break (0);
-    return 3;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    uses_cs = (0 == strcmp (cipher,
+                            "cs"));
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api-%s.conf",
+                     cipher);
+    GNUNET_asprintf (&config_file_expire_reserve_now,
+                     "test_exchange_api_expire_reserve_now-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
new file mode 100644
index 000000000..c25f5091a
--- /dev/null
+++ b/src/testing/test_exchange_api.conf
@@ -0,0 +1,118 @@
+# This file is in the public domain.
+#
+
+[PATHS]
+TALER_TEST_HOME = test_exchange_api_home/
+
+[libeufin-bank]
+CURRENCY = EUR
+DEFAULT_CUSTOMER_DEBT_LIMIT = EUR:200
+DEFAULT_ADMIN_DEBT_LIMIT = EUR:2000
+REGISTRATION_BONUS_ENABLED = yes
+REGISTRATION_BONUS = EUR:100
+SUGGESTED_WITHDRAWAL_EXCHANGE = http://localhost:8081/
+WIRE_TYPE = iban
+IBAN_PAYTO_BIC = SANDBOXX
+SERVE = tcp
+PORT = 8082
+
+[libeufin-bankdb-postgres]
+CONFIG = postgresql:///talercheck
+
+
+[taler]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
+
+[auditor]
+BASE_URL = "http://localhost:8083/"
+PORT = 8083
+PUBLIC_KEY = 9QZ7CCC5QFMWE9FVF50MGYWV7JR92SFHY5KHT8A1A2VNHM37VCRG
+TINY_AMOUNT = EUR:0.01
+
+[auditordb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[bank]
+HTTP_PORT = 8082
+
+[exchange]
+TERMS_ETAG = tos
+PRIVACY_ETAG = 0
+AML_THRESHOLD = EUR:1000000
+PORT = 8081
+MASTER_PUBLIC_KEY = QD6H521CBJBW0Z7PRN0JTAGH5JCQ97RDZRPPV5TQZSE78NQRT3KG
+DB = postgres
+BASE_URL = "http://localhost:8081/"
+EXPIRE_SHARD_SIZE ="300 ms"
+EXPIRE_IDLE_SLEEP_INTERVAL ="1 s"
+
+[exchangedb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[taler-exchange-secmod-cs]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-rsa]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-eddsa]
+LOOKAHEAD_SIGN = "24 days"
+DURATION = "14 days"
+
+
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+[exchange-account-2]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+[admin-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+# For now, fakebank still checks against the Exchange account...
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+
+[kyc-provider-test-oauth2]
+COST = 0
+LOGIC = oauth2
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = DUMMY
+KYC_OAUTH2_VALIDITY = forever
+KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
+KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
+KYC_OAUTH2_INFO_URL = http://localhost:6666/api/user/me
+KYC_OAUTH2_CLIENT_ID = taler-exchange
+KYC_OAUTH2_CLIENT_SECRET = exchange-secret
+KYC_OAUTH2_POST_URL = http://example.com/
+KYC_OAUTH2_CONVERTER_HELPER = taler-exchange-kyc-oauth2-test-converter.sh
+
+[kyc-legitimization-close]
+OPERATION_TYPE = CLOSE
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:0
+TIMEFRAME = 1d
+
+[exchange-extension-age_restriction]
+ENABLED = YES
+#AGE_GROUPS = "8:10:12:14:16:18:21"
diff --git a/src/testing/test_exchange_api_age_restriction-cs.conf b/src/testing/test_exchange_api_age_restriction-cs.conf
new file mode 100644
index 000000000..12195f9ba
--- /dev/null
+++ b/src/testing/test_exchange_api_age_restriction-cs.conf
@@ -0,0 +1,4 @@
+# This file is in the public domain.
+#
+@INLINE@ test_exchange_api_age_restriction.conf
+@INLINE@ coins-cs.conf
diff --git a/src/testing/test_exchange_api_age_restriction-rsa.conf b/src/testing/test_exchange_api_age_restriction-rsa.conf
new file mode 100644
index 000000000..30d75090f
--- /dev/null
+++ b/src/testing/test_exchange_api_age_restriction-rsa.conf
@@ -0,0 +1,4 @@
+# This file is in the public domain.
+#
+@INLINE@ test_exchange_api_age_restriction.conf
+@INLINE@ coins-rsa.conf
diff --git a/src/testing/test_exchange_api_age_restriction.c b/src/testing/test_exchange_api_age_restriction.c
new file mode 100644
index 000000000..5ba24a00c
--- /dev/null
+++ b/src/testing/test_exchange_api_age_restriction.c
@@ -0,0 +1,370 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/test_exchange_api_age_restriction.c
+ * @brief testcase to test exchange's age-restrictrition related HTTP API interfaces
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_signatures.h"
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
+#include <microhttpd.h>
+#include "taler_bank_service.h"
+#include "taler_fakebank_lib.h"
+#include "taler_testing_lib.h"
+#include "taler_extensions.h"
+
+/**
+ * Configuration file we use.  One (big) configuration is used
+ * for the various components for this test.
+ */
+static char *config_file;
+
+/**
+ * Our credentials.
+ */
+static struct TALER_TESTING_Credentials cred;
+
+/**
+ * Some tests behave differently when using CS as we cannot
+ * reuse the coin private key for different denominations
+ * due to the derivation of it with the /csr values. Hence
+ * some tests behave differently in CS mode, hence this
+ * flag.
+ */
+static bool uses_cs;
+
+/**
+ * Execute the taler-exchange-wirewatch command with
+ * our configuration file.
+ *
+ * @param label label to use for the command.
+ */
+#define CMD_EXEC_WIREWATCH(label) \
+  TALER_TESTING_cmd_exec_wirewatch2 (label, config_file, "exchange-account-2")
+
+/**
+ * Execute the taler-exchange-aggregator, closer and transfer commands with
+ * our configuration file.
+ *
+ * @param label label to use for the command.
+ */
+#define CMD_EXEC_AGGREGATOR(label) \
+  TALER_TESTING_cmd_sleep ("sleep-before-aggregator", 2), \
+  TALER_TESTING_cmd_exec_aggregator (label "-aggregator", config_file), \
+  TALER_TESTING_cmd_exec_transfer (label "-transfer", config_file)
+
+
+/**
+ * Run wire transfer of funds from some user's account to the
+ * exchange.
+ *
+ * @param label label to use for the command.
+ * @param amount amount to transfer, i.e. "EUR:1"
+ */
+#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
+  TALER_TESTING_cmd_admin_add_incoming (label, amount, \
+                                        &cred.ba,                \
+                                        cred.user42_payto)
+
+/**
+ * Main function that will tell the interpreter what commands to
+ * run.
+ *
+ * @param cls closure
+ * @param is interpreter we use to run commands
+ */
+static void
+run (void *cls,
+     struct TALER_TESTING_Interpreter *is)
+{
+  (void) cls;
+  /**
+   * Test withdrawal with age restriction.  Success is expected (because the
+   * amount is below the kyc threshold ), so it MUST be
+   * called _after_ TALER_TESTING_cmd_exec_offline_sign_extensions is called,
+   * i. e. age restriction is activated in the exchange!
+   *
+   * TODO: create a test that tries to withdraw coins with age restriction but
+   * (expectedly) fails because the exchange doesn't support age restriction
+   * yet.
+   */
+  struct TALER_TESTING_Command withdraw_age[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-age",
+                              "EUR:6.01"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-age",
+                                                 "EUR:6.01",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-reserve-age"),
+    /**
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-age"),
+    /**
+     * Withdraw EUR:5.
+     */
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-age-1",
+                                       "create-reserve-age",
+                                       "EUR:5",
+                                       13,
+                                       MHD_HTTP_OK),
+
+    TALER_TESTING_cmd_end ()
+  };
+
+  struct TALER_TESTING_Command spend_age[] = {
+    /**
+     * Spend the coin.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-simple-age",
+                               "withdraw-coin-age-1",
+                               0,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:4.99",
+                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit_replay ("deposit-simple-replay-age",
+                                      "deposit-simple-age",
+                                      MHD_HTTP_OK),
+    TALER_TESTING_cmd_end ()
+  };
+
+
+  struct TALER_TESTING_Command refresh_age[] = {
+    /* Fill reserve with EUR:5, 1ct is for fees. */
+    CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve-age-1",
+                              "EUR:6.01"),
+    TALER_TESTING_cmd_check_bank_admin_transfer (
+      "ck-refresh-create-reserve-age-1",
+      "EUR:6.01",
+      cred.user42_payto,
+      cred.exchange_payto,
+      "refresh-create-reserve-age-1"),
+    /**
+     * Make previous command effective.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-age-2"),
+    /**
+     * Withdraw EUR:7 with age restriction for age 13.
+     */
+    TALER_TESTING_cmd_withdraw_amount ("refresh-withdraw-coin-age-1",
+                                       "refresh-create-reserve-age-1",
+                                       "EUR:5",
+                                       13,
+                                       MHD_HTTP_OK),
+    /* Try to partially spend (deposit) 1 EUR of the 5 EUR coin
+     * (in full) (merchant would receive EUR:0.99 due to 1 ct
+     * deposit fee)
+     */
+    TALER_TESTING_cmd_deposit ("refresh-deposit-partial-age",
+                               "refresh-withdraw-coin-age-1",
+                               0,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:1",
+                               MHD_HTTP_OK),
+    /**
+     * Melt the rest of the coin's value
+     * (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
+    TALER_TESTING_cmd_melt_double ("refresh-melt-age-1",
+                                   "refresh-withdraw-coin-age-1",
+                                   MHD_HTTP_OK,
+                                   NULL),
+    /**
+     * Complete (successful) melt operation, and
+     * withdraw the coins
+     */
+    TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-age-1",
+                                      "refresh-melt-age-1",
+                                      MHD_HTTP_OK),
+    /**
+     * Do it again to check idempotency
+     */
+    TALER_TESTING_cmd_refresh_reveal ("refresh-reveal-age-1-idempotency",
+                                      "refresh-melt-age-1",
+                                      MHD_HTTP_OK),
+    /**
+     * Test that /refresh/link works
+     */
+    TALER_TESTING_cmd_refresh_link ("refresh-link-age-1",
+                                    "refresh-reveal-age-1",
+                                    MHD_HTTP_OK),
+    /**
+     * Try to spend a refreshed EUR:1 coin
+     */
+    TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-age-1a",
+                               "refresh-reveal-age-1-idempotency",
+                               0,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:1",
+                               MHD_HTTP_OK),
+    /**
+     * Try to spend a refreshed EUR:0.1 coin
+     */
+    TALER_TESTING_cmd_deposit ("refresh-deposit-refreshed-age-1b",
+                               "refresh-reveal-age-1",
+                               3,
+                               cred.user43_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":3}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.1",
+                               MHD_HTTP_OK),
+    /* Test running a failing melt operation (same operation
+     * again must fail) */
+    TALER_TESTING_cmd_melt ("refresh-melt-failing-age",
+                            "refresh-withdraw-coin-age-1",
+                            MHD_HTTP_CONFLICT,
+                            NULL),
+    /* Test running a failing melt operation (on a coin that
+       was itself revealed and subsequently deposited) */
+    TALER_TESTING_cmd_melt ("refresh-melt-failing-age-2",
+                            "refresh-reveal-age-1",
+                            MHD_HTTP_CONFLICT,
+                            NULL),
+    TALER_TESTING_cmd_end ()
+  };
+
+  /**
+   * Test with age-withdraw, after kyc process has set a birthdate
+   */
+  struct TALER_TESTING_Command age_withdraw[] = {
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-kyc-1",
+                              "EUR:30.02"),
+    TALER_TESTING_cmd_check_bank_admin_transfer (
+      "check-create-reserve-kyc-1",
+      "EUR:30.02",
+      cred.user42_payto,
+      cred.exchange_payto,
+      "create-reserve-kyc-1"),
+    CMD_EXEC_WIREWATCH ("wirewatch-age-withdraw-1"),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1-lacking-kyc",
+                                       "create-reserve-kyc-1",
+                                       "EUR:10",
+                                       0, /* age restriction off */
+                                       MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-withdraw",
+                                     "withdraw-coin-1-lacking-kyc",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-kyc",
+                                        "withdraw-coin-1-lacking-kyc",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1-with-kyc",
+                                       "create-reserve-kyc-1",
+                                       "EUR:10",
+                                       0, /* age restriction off */
+                                       MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_age_withdraw ("age-withdraw-coin-1-too-low",
+                                    "create-reserve-kyc-1",
+                                    18, /* Too high */
+                                    MHD_HTTP_CONFLICT,
+                                    "EUR:10",
+                                    NULL),
+    TALER_TESTING_cmd_age_withdraw ("age-withdraw-coins-1",
+                                    "create-reserve-kyc-1",
+                                    8,
+                                    MHD_HTTP_OK,
+                                    "EUR:10",
+                                    "EUR:10",
+                                    "EUR:5",
+                                    NULL),
+    TALER_TESTING_cmd_age_withdraw_reveal ("age-withdraw-coins-reveal-1",
+                                           "age-withdraw-coins-1",
+                                           MHD_HTTP_OK),
+    TALER_TESTING_cmd_end (),
+  };
+
+  {
+    struct TALER_TESTING_Command commands[] = {
+      TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                      cred.cfg,
+                                      "exchange-account-2"),
+      TALER_TESTING_cmd_system_start ("start-taler",
+                                      config_file,
+                                      "-e",
+                                      NULL),
+      TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                      cred.cfg,
+                                      NULL,
+                                      true,
+                                      true),
+      TALER_TESTING_cmd_oauth_with_birthdate ("oauth-service-with-birthdate",
+                                              "2015-00-00", /* enough for a while */
+                                              6666),
+      TALER_TESTING_cmd_batch ("withdraw-age",
+                               withdraw_age),
+      TALER_TESTING_cmd_batch ("spend-age",
+                               spend_age),
+      TALER_TESTING_cmd_batch ("refresh-age",
+                               refresh_age),
+      TALER_TESTING_cmd_batch ("age-withdraw",
+                               age_withdraw),
+      /* End the suite. */
+      TALER_TESTING_cmd_end ()
+    };
+
+    TALER_TESTING_run (is,
+                       commands);
+  }
+}
+
+
+int
+main (int argc,
+      char *const *argv)
+{
+  (void) argc;
+  {
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    uses_cs = (0 == strcmp (cipher,
+                            "cs"));
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api_age_restriction-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
+  }
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
+}
+
+
+/* end of test_exchange_api_age_restriction.c */
diff --git a/src/testing/test_exchange_api_age_restriction.conf b/src/testing/test_exchange_api_age_restriction.conf
new file mode 100644
index 000000000..1345fcb1a
--- /dev/null
+++ b/src/testing/test_exchange_api_age_restriction.conf
@@ -0,0 +1,119 @@
+# This file is in the public domain.
+#
+
+[PATHS]
+TALER_TEST_HOME = test_exchange_api_home/
+
+[taler]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
+
+[auditor]
+BASE_URL = "http://localhost:8083/"
+PORT = 8083
+PUBLIC_KEY = T0XJ9QZ59YDN7QG3RE40SB2HY7W0ASR1EKF4WZDGZ1G159RSQC80
+TINY_AMOUNT = EUR:0.01
+
+[auditordb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[bank]
+HTTP_PORT = 8082
+
+[exchange]
+TERMS_ETAG = tos
+PRIVACY_ETAG = 0
+AML_THRESHOLD = EUR:10
+PORT = 8081
+MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+DB = postgres
+BASE_URL = "http://localhost:8081/"
+EXPIRE_SHARD_SIZE ="300 ms"
+EXPIRE_IDLE_SLEEP_INTERVAL ="1 s"
+
+[exchangedb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[taler-exchange-secmod-cs]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-rsa]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-eddsa]
+LOOKAHEAD_SIGN = "24 days"
+DURATION = "14 days"
+
+
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/42/taler-wire-gateway/"
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/42/taler-wire-gateway/"
+
+[exchange-account-2]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+[admin-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+
+[kyc-provider-test-oauth2]
+COST = 0
+LOGIC = oauth2
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = DUMMY
+KYC_OAUTH2_VALIDITY = forever
+KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
+KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
+KYC_OAUTH2_INFO_URL = http://localhost:6666/api/user/me
+KYC_OAUTH2_CLIENT_ID = taler-exchange
+KYC_OAUTH2_CLIENT_SECRET = exchange-secret
+KYC_OAUTH2_POST_URL = http://example.com/
+KYC_OAUTH2_CONVERTER_HELPER = taler-exchange-kyc-oauth2-test-converter.sh
+
+[kyc-legitimization-balance-high]
+OPERATION_TYPE = BALANCE
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:20
+
+[kyc-legitimization-deposit-any]
+OPERATION_TYPE = DEPOSIT
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:10
+TIMEFRAME = 1d
+
+[kyc-legitimization-withdraw]
+OPERATION_TYPE = WITHDRAW
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:15
+TIMEFRAME = 1d
+
+[kyc-legitimization-merge]
+OPERATION_TYPE = MERGE
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:15
+TIMEFRAME = 1d
+
+
+[exchange-extension-age_restriction]
+ENABLED = YES
+#AGE_GROUPS = "8:10:12:14:16:18:21"
diff --git a/src/testing/test_exchange_api_conflicts-cs.conf b/src/testing/test_exchange_api_conflicts-cs.conf
new file mode 100644
index 000000000..c15d55490
--- /dev/null
+++ b/src/testing/test_exchange_api_conflicts-cs.conf
@@ -0,0 +1,4 @@
+# This file is in the public domain.
+#
+@INLINE@ test_exchange_api_conflicts.conf
+@INLINE@ coins-cs.conf
diff --git a/src/testing/test_exchange_api_conflicts-rsa.conf b/src/testing/test_exchange_api_conflicts-rsa.conf
new file mode 100644
index 000000000..f56111eee
--- /dev/null
+++ b/src/testing/test_exchange_api_conflicts-rsa.conf
@@ -0,0 +1,4 @@
+# This file is in the public domain.
+#
+@INLINE@ test_exchange_api_conflicts.conf
+@INLINE@ coins-rsa.conf
diff --git a/src/testing/test_exchange_api_conflicts.c b/src/testing/test_exchange_api_conflicts.c
new file mode 100644
index 000000000..070809d9d
--- /dev/null
+++ b/src/testing/test_exchange_api_conflicts.c
@@ -0,0 +1,312 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/test_exchange_api_conflicts.c
+ * @brief testcase to test exchange's handling of coin conflicts: same private
+ *        keys but different denominations or age restrictions
+ * @author Özgür Kesim
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_signatures.h"
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_util_lib.h>
+#include <gnunet/gnunet_testing_lib.h>
+#include <microhttpd.h>
+#include "taler_bank_service.h"
+#include "taler_fakebank_lib.h"
+#include "taler_testing_lib.h"
+#include "taler_extensions.h"
+
+/**
+ * Configuration file we use.  One (big) configuration is used
+ * for the various components for this test.
+ */
+static char *config_file;
+
+/**
+ * Our credentials.
+ */
+static struct TALER_TESTING_Credentials cred;
+
+/**
+ * Some tests behave differently when using CS as we cannot
+ * reuse the coin private key for different denominations
+ * due to the derivation of it with the /csr values. Hence
+ * some tests behave differently in CS mode, hence this
+ * flag.
+ */
+static bool uses_cs;
+
+/**
+ * Execute the taler-exchange-wirewatch command with
+ * our configuration file.
+ *
+ * @param label label to use for the command.
+ */
+#define CMD_EXEC_WIREWATCH(label) \
+        TALER_TESTING_cmd_exec_wirewatch2 (label, config_file, \
+                                           "exchange-account-2")
+
+/**
+ * Execute the taler-exchange-aggregator, closer and transfer commands with
+ * our configuration file.
+ *
+ * @param label label to use for the command.
+ */
+#define CMD_EXEC_AGGREGATOR(label) \
+        TALER_TESTING_cmd_sleep ("sleep-before-aggregator", 2), \
+        TALER_TESTING_cmd_exec_aggregator (label "-aggregator", config_file), \
+        TALER_TESTING_cmd_exec_transfer (label "-transfer", config_file)
+
+
+/**
+ * Run wire transfer of funds from some user's account to the
+ * exchange.
+ *
+ * @param label label to use for the command.
+ * @param amount amount to transfer, i.e. "EUR:1"
+ */
+#define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
+        TALER_TESTING_cmd_admin_add_incoming (label, amount, \
+                                              &cred.ba,                \
+                                              cred.user42_payto)
+
+/**
+ * Main function that will tell the interpreter what commands to
+ * run.
+ *
+ * @param cls closure
+ * @param is interpreter we use to run commands
+ */
+static void
+run (void *cls,
+     struct TALER_TESTING_Interpreter *is)
+{
+  (void) cls;
+  /**
+   * Test withdrawal with conflicting coins.
+   */
+  struct TALER_TESTING_Command withdraw_conflict_denom[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-denom",
+                              "EUR:21.14"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-denom",
+                                                 "EUR:21.14",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-reserve-denom"),
+    /**
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-conflict-denom"),
+    /**
+     * Withdraw EUR:0.10, EUR:1, EUR:5, EUR:15, but using the same private key each time.
+     */
+    TALER_TESTING_cmd_batch_withdraw_with_conflict ("withdraw-coin-denom-1",
+                                                    "create-reserve-denom",
+                                                    true,
+                                                    0, /* age */
+                                                    MHD_HTTP_OK,
+                                                    "EUR:1",
+                                                    "EUR:5",
+                                                    "EUR:10",
+                                                    "EUR:0.10",
+                                                    NULL),
+
+    TALER_TESTING_cmd_end ()
+  };
+
+  struct TALER_TESTING_Command spend_conflict_denom[] = {
+    /**
+     * Spend the coin.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-denom",
+                               "withdraw-coin-denom-1",
+                               0,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.99",
+                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit ("deposit-denom-conflict",
+                               "withdraw-coin-denom-1",
+                               1,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:4.99",
+                               /* Note: For CS, even though the master secret is the
+                                * same for each coin, their private keys differ due
+                                * to the random choice of the nonce by the exchange. */
+                               uses_cs ? MHD_HTTP_OK : MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_deposit ("deposit-denom-conflict-2",
+                               "withdraw-coin-denom-1",
+                               2,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:9.99",
+                               /* Note: For CS, even though the master secret is the
+                                * same for each coin, their private keys differ due
+                                * to the random choice of the nonce by the exchange. */
+                               uses_cs ? MHD_HTTP_OK : MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_deposit ("deposit-denom-conflict-3",
+                               "withdraw-coin-denom-1",
+                               3,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.09",
+                               /* Note: For CS, even though the master secret is the
+                                * same for each coin, their private keys differ due
+                                * to the random choice of the nonce by the exchange. */
+                               uses_cs ? MHD_HTTP_OK : MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_end ()
+  };
+
+  struct TALER_TESTING_Command withdraw_conflict_age[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-age",
+                              "EUR:3.03"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-age",
+                                                 "EUR:3.03",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-reserve-age"),
+    /**
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("wirewatch-conflict-age"),
+    /**
+     * Withdraw EUR:1, EUR:5, EUR:15, but using the same private key each time.
+     */
+    TALER_TESTING_cmd_batch_withdraw_with_conflict ("withdraw-coin-age-1",
+                                                    "create-reserve-age",
+                                                    true,
+                                                    10, /* age */
+                                                    MHD_HTTP_OK,
+                                                    "EUR:1",
+                                                    "EUR:1",
+                                                    "EUR:1",
+                                                    NULL),
+
+    TALER_TESTING_cmd_end ()
+  };
+
+  struct TALER_TESTING_Command spend_conflict_age[] = {
+    /**
+     * Spend the coin.
+     */
+    TALER_TESTING_cmd_deposit ("deposit-age",
+                               "withdraw-coin-age-1",
+                               0,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.99",
+                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit ("deposit-age-conflict",
+                               "withdraw-coin-age-1",
+                               1,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.99",
+                               MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_deposit ("deposit-age-conflict-2",
+                               "withdraw-coin-age-1",
+                               2,
+                               cred.user42_payto,
+                               "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.99",
+                               MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_end ()
+  };
+
+
+  {
+    struct TALER_TESTING_Command commands[] = {
+      TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                      cred.cfg,
+                                      "exchange-account-2"),
+      TALER_TESTING_cmd_system_start ("start-taler",
+                                      config_file,
+                                      "-e",
+                                      NULL),
+      TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                      cred.cfg,
+                                      NULL,
+                                      true,
+                                      true),
+      TALER_TESTING_cmd_batch ("withdraw-conflict-denom",
+                               withdraw_conflict_denom),
+      TALER_TESTING_cmd_batch ("spend-conflict-denom",
+                               spend_conflict_denom),
+      TALER_TESTING_cmd_batch ("withdraw-conflict-age",
+                               withdraw_conflict_age),
+      TALER_TESTING_cmd_batch ("spend-conflict-age",
+                               spend_conflict_age),
+      /* End the suite. */
+      TALER_TESTING_cmd_end ()
+    };
+
+    TALER_TESTING_run (is,
+                       commands);
+  }
+}
+
+
+int
+main (int argc,
+      char *const *argv)
+{
+  (void) argc;
+  {
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    uses_cs = (0 == strcmp (cipher,
+                            "cs"));
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api_conflicts-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
+  }
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
+}
+
+
+/* end of test_exchange_api_conflicts.c */
diff --git a/src/testing/test_exchange_api_conflicts.conf b/src/testing/test_exchange_api_conflicts.conf
new file mode 100644
index 000000000..d04379f05
--- /dev/null
+++ b/src/testing/test_exchange_api_conflicts.conf
@@ -0,0 +1,81 @@
+# This file is in the public domain.
+#
+
+[PATHS]
+TALER_TEST_HOME = test_exchange_api_home/
+
+[taler]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
+
+[auditor]
+BASE_URL = "http://localhost:8083/"
+PORT = 8083
+PUBLIC_KEY = T0XJ9QZ59YDN7QG3RE40SB2HY7W0ASR1EKF4WZDGZ1G159RSQC80
+TINY_AMOUNT = EUR:0.01
+
+[auditordb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[bank]
+HTTP_PORT = 8082
+
+[exchange]
+TERMS_ETAG = tos
+PRIVACY_ETAG = 0
+PORT = 8081
+AML_THRESHOLD = "EUR:99999999"
+MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+DB = postgres
+BASE_URL = "http://localhost:8081/"
+EXPIRE_SHARD_SIZE ="300 ms"
+EXPIRE_IDLE_SLEEP_INTERVAL ="1 s"
+
+[exchangedb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[taler-exchange-secmod-cs]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-rsa]
+LOOKAHEAD_SIGN = "24 days"
+
+[taler-exchange-secmod-eddsa]
+LOOKAHEAD_SIGN = "24 days"
+DURATION = "14 days"
+
+
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/42/taler-wire-gateway/"
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_AUTH_METHOD = none
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/42/taler-wire-gateway/"
+
+[exchange-account-2]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+[admin-accountcredentials-2]
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+WIRE_GATEWAY_URL = "http://localhost:8082/accounts/2/taler-wire-gateway/"
+
+
+[exchange-extension-age_restriction]
+ENABLED = YES
+#AGE_GROUPS = "8:10:12:14:16:18:21"
diff --git a/src/testing/test_exchange_api_home/.config/taler/account-2.json b/src/testing/test_exchange_api_home/.config/taler/account-2.json
deleted file mode 100644
index 21a7500b4..000000000
--- a/src/testing/test_exchange_api_home/.config/taler/account-2.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "payto_uri": "payto://x-taler-bank/localhost/2",
-  "master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
-}
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv b/src/testing/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
new file mode 100644
index 000000000..5b1c8fa05
--- /dev/null
+++ b/src/testing/test_exchange_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
diff --git a/src/testing/test_exchange_api_home/.local/share/taler/exchange-offline/master.priv b/src/testing/test_exchange_api_home/.local/share/taler/exchange-offline/master.priv
index 394926938..391b6ea73 100644
--- a/src/testing/test_exchange_api_home/.local/share/taler/exchange-offline/master.priv
+++ b/src/testing/test_exchange_api_home/.local/share/taler/exchange-offline/master.priv
diff --git a/src/testing/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/testing/test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_home/taler/auditor/offline-keys/auditor.priv b/src/testing/test_exchange_api_home/taler/auditor/offline-keys/auditor.priv
new file mode 100644
index 000000000..7e712e483
--- /dev/null
+++ b/src/testing/test_exchange_api_home/taler/auditor/offline-keys/auditor.priv
@@ -0,0 +1 @@
+�G,U���{�~#r�-��H���������
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_keys_cherry_picking-cs.conf b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
index 8967d6c0a..d25ef3c00 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
@@ -1,89 +1,9 @@
 # This file is in the public domain.
 #
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_keys_cherry_picking_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-# Persistent data storage
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
-
-# Configuration files
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
-
-# Cached data, no big deal if lost
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
+@INLINE@ test_exchange_api_keys_cherry_picking.conf
 
 [taler-exchange-secmod-cs]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-
-[exchange]
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/42
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9082/42/"
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:9082/2/"
-
-# Authentication information for basic authentication
-TALER_BANK_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
-[bank]
-HTTP_PORT=8082
-
-[taler-exchange-secmod-cs]
-OVERLAP_DURATION = 1 s
-LOOKAHEAD_SIGN = 20 s
-
-[taler-exchange-secmod-eddsa]
 OVERLAP_DURATION = 1 s
-DURATION = 30 s
 LOOKAHEAD_SIGN = 20 s
 
 [coin_eur_1]
diff --git a/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
index e616738f0..672639b3f 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
@@ -1,89 +1,9 @@
 # This file is in the public domain.
 #
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_keys_cherry_picking_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-# Persistent data storage
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
-
-# Configuration files
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
-
-# Cached data, no big deal if lost
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
+@INLINE@ test_exchange_api_keys_cherry_picking.conf
 
 [taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-
-[exchange]
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/42
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9082/42/"
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:9082/2/"
-
-# Authentication information for basic authentication
-TALER_BANK_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
-[bank]
-HTTP_PORT=8082
-
-[taler-exchange-secmod-rsa]
-OVERLAP_DURATION = 1 s
-LOOKAHEAD_SIGN = 20 s
-
-[taler-exchange-secmod-eddsa]
 OVERLAP_DURATION = 1 s
-DURATION = 30 s
 LOOKAHEAD_SIGN = 20 s
 
 [coin_eur_1]
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c
index 25bdad06d..2919ea8d5 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.c
+++ b/src/testing/test_exchange_api_keys_cherry_picking.c
@@ -43,9 +43,9 @@ lished
 static char *config_file;
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
+static struct TALER_TESTING_Credentials cred;
 
 
 /**
@@ -59,45 +59,27 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                              config_file,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("initial-/keys",
-                                                1),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_sleep ("sleep",
                              6 /* seconds */),
-    TALER_TESTING_cmd_check_keys ("check-keys-1",
-                                  2 /* generation */),
-    TALER_TESTING_cmd_check_keys_with_last_denom ("check-keys-2",
-                                                  3 /* generation */,
-                                                  "check-keys-1"),
-    TALER_TESTING_cmd_serialize_keys ("serialize-keys"),
-    TALER_TESTING_cmd_connect_with_state ("reconnect-with-state",
-                                          "serialize-keys"),
-    /**
-     * Make sure we have the same keys situation as
-     * it was before the serialization.
-     */
-    TALER_TESTING_cmd_check_keys ("check-keys-after-deserialization",
-                                  4),
-    /**
-     * Use one of the deserialized keys.
-     */
-    TALER_TESTING_cmd_wire ("wire-with-serialized-keys",
-                            "x-taler-bank",
-                            NULL,
-                            MHD_HTTP_OK),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-1",
+                                    cred.cfg,
+                                    "get-exchange",
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-2",
+                                    cred.cfg,
+                                    "get-exchange-1",
+                                    true,
+                                    true),
     TALER_TESTING_cmd_end ()
   };
 
@@ -111,50 +93,25 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "DEBUG",
-                    NULL);
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api_keys_cherry_picking-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api_keys_cherry_picking-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
new file mode 100644
index 000000000..142242424
--- /dev/null
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -0,0 +1,58 @@
+# This file is in the public domain.
+#
+[PATHS]
+# Persistent data storage for the testcase
+TALER_TEST_HOME = test_exchange_api_keys_cherry_picking_home/
+
+[taler]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
+
+[taler-exchange-secmod-eddsa]
+OVERLAP_DURATION = 1 s
+DURATION = 30 s
+LOOKAHEAD_SIGN = 20 s
+
+[exchange]
+AML_THRESHOLD = EUR:1000000
+PORT = 8081
+MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+DB = postgres
+BASE_URL = "http://localhost:8081/"
+
+[exchangedb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[auditordb-postgres]
+CONFIG = "postgres:///talercheck"
+
+[exchange-account-1]
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-1]
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/42/taler-wire-gateway/"
+
+[admin-accountcredentials-1]
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/42/taler-wire-gateway/"
+
+[exchange-account-2]
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
+
+[exchange-accountcredentials-2]
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/2/taler-wire-gateway/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+
+[admin-accountcredentials-2]
+WIRE_GATEWAY_URL = "http://localhost:9082/accounts/2/taler-wire-gateway/"
+WIRE_GATEWAY_AUTH_METHOD = basic
+USERNAME = Exchange
+PASSWORD = x
+
+[bank]
+HTTP_PORT=8082
diff --git a/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json b/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json
deleted file mode 100644
index 21a7500b4..000000000
--- a/src/testing/test_exchange_api_keys_cherry_picking_home/.config/taler/x-taler-bank.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "payto_uri": "payto://x-taler-bank/localhost/2",
-  "master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
-}
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv b/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/testing/test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/testing/test_exchange_api_overlapping_keys_bug.c b/src/testing/test_exchange_api_overlapping_keys_bug.c
index 54c552236..33b547a37 100644
--- a/src/testing/test_exchange_api_overlapping_keys_bug.c
+++ b/src/testing/test_exchange_api_overlapping_keys_bug.c
@@ -44,9 +44,9 @@
 static char *config_file;
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
+static struct TALER_TESTING_Credentials cred;
 
 
 /**
@@ -60,23 +60,28 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
-    TALER_TESTING_cmd_check_keys ("first-download",
-                                  1),
-    /* Causes GET /keys?last_denom_issue=0 */
-    TALER_TESTING_cmd_check_keys_with_last_denom ("second-download",
-                                                  1,
-                                                  "zero"),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-1",
+                                    cred.cfg,
+                                    "get-exchange",
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-2",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_end ()
   };
 
@@ -90,50 +95,25 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "DEBUG",
-                    NULL);
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api_keys_cherry_picking-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api_keys_cherry_picking-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_exchange_api_revocation.c b/src/testing/test_exchange_api_revocation.c
index bb3dcc06e..92e36a30a 100644
--- a/src/testing/test_exchange_api_revocation.c
+++ b/src/testing/test_exchange_api_revocation.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014--2020 Taler Systems SA
+  Copyright (C) 2014--2023 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
@@ -42,14 +42,9 @@
 static char *config_file;
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
+static struct TALER_TESTING_Credentials cred;
 
 
 /**
@@ -63,35 +58,37 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command revocation[] = {
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     /**
      * Fill reserve with EUR:10.02, as withdraw fee is 1 ct per
      * config.
      */
     TALER_TESTING_cmd_admin_add_incoming ("create-reserve-1",
                                           "EUR:10.02",
-                                          &bc.exchange_auth,
-                                          bc.user42_payto),
+                                          &cred.ba,
+                                          cred.user42_payto),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1",
                                                  "EUR:10.02",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-1"),
     /**
      * Run wire-watch to trigger the reserve creation.
      */
-    TALER_TESTING_cmd_exec_wirewatch ("wirewatch-4",
-                                      config_file),
+    TALER_TESTING_cmd_exec_wirewatch2 ("wirewatch-4",
+                                       config_file,
+                                       "exchange-account-2"),
     /* Withdraw a 5 EUR coin, at fee of 1 ct */
     TALER_TESTING_cmd_withdraw_amount ("withdraw-revocation-coin-1",
                                        "create-reserve-1",
@@ -109,7 +106,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-partial",
                                "withdraw-revocation-coin-1",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:1",
@@ -118,7 +115,7 @@ run (void *cls,
     TALER_TESTING_cmd_deposit ("deposit-full",
                                "withdraw-revocation-coin-2",
                                0,
-                               bc.user42_payto,
+                               cred.user42_payto,
                                "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
                                GNUNET_TIME_UNIT_ZERO,
                                "EUR:5",
@@ -241,9 +238,8 @@ run (void *cls,
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   revocation,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     revocation);
 }
 
 
@@ -251,56 +247,25 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "INFO",
-                    NULL);
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  /* Check fakebank port is available and get config */
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_exchange_api_twisted-cs.conf b/src/testing/test_exchange_api_twisted-cs.conf
index 7d2afb9cb..ae953e732 100644
--- a/src/testing/test_exchange_api_twisted-cs.conf
+++ b/src/testing/test_exchange_api_twisted-cs.conf
@@ -1,150 +1,4 @@
 # This file is in the public domain.
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
+@INLINE@ test_exchange_api-cs.conf
+@INLINE@ test_exchange_api-twisted.conf
 
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[exchange]
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange ('S PROXY).  This URL is where the
-# twister listens at, so that it will be able to get all the
-# connection addressed to the exchange.  In fact, the presence
-# of the twister is 100% transparent to the test case, as it
-# only seeks the exchange/BASE_URL URL to connect to the exchange.
-BASE_URL = "http://localhost:8888/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-PORT = 8083
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9081/42/"
-WIRE_GATEWAY_AUTH_METHOD = NONE
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-WIRE_GATEWAY_AUTH_METHOD = BASIC
-USERNAME = user
-PASSWORD = pass
-
-[bank]
-HTTP_PORT = 8082
-
-[twister]
-# HTTP listen port for twister
-HTTP_PORT = 8888
-SERVE = tcp
-
-# HTTP Destination for twister.  The test-Webserver needs
-# to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
-
-# Control port for TCP
-# PORT = 8889
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-# Control port for UNIX
-UNIXPATH = /tmp/taler-service-twister.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-# Launching of twister by ARM
-# BINARY = taler-service-twister
-# AUTOSTART = NO
-# FORCESTART = NO
-
-
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
diff --git a/src/testing/test_exchange_api_twisted-rsa.conf b/src/testing/test_exchange_api_twisted-rsa.conf
index 077d49c16..3fd8f4ff1 100644
--- a/src/testing/test_exchange_api_twisted-rsa.conf
+++ b/src/testing/test_exchange_api_twisted-rsa.conf
@@ -1,156 +1,4 @@
 # This file is in the public domain.
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
+@INLINE@ test_exchange_api-rsa.conf
+@INLINE@ test_exchange_api-twisted.conf
 
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[exchange]
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange ('S PROXY).  This URL is where the
-# twister listens at, so that it will be able to get all the
-# connection addressed to the exchange.  In fact, the presence
-# of the twister is 100% transparent to the test case, as it
-# only seeks the exchange/BASE_URL URL to connect to the exchange.
-BASE_URL = "http://localhost:8888/"
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-PORT = 8083
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:9081/42/"
-WIRE_GATEWAY_AUTH_METHOD = NONE
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-WIRE_GATEWAY_AUTH_METHOD = BASIC
-USERNAME = user
-PASSWORD = pass
-
-[bank]
-HTTP_PORT = 8082
-
-[twister]
-# HTTP listen port for twister
-HTTP_PORT = 8888
-SERVE = tcp
-
-# HTTP Destination for twister.  The test-Webserver needs
-# to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
-
-# Control port for TCP
-# PORT = 8889
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-# Control port for UNIX
-UNIXPATH = /tmp/taler-service-twister.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-# Launching of twister by ARM
-# BINARY = taler-service-twister
-# AUTOSTART = NO
-# FORCESTART = NO
-
-
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-CIPHER = RSA
-
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-CIPHER = RSA
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-CIPHER = RSA
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-CIPHER = RSA
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-rsa_keysize = 1024
-CIPHER = RSA
diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c
index f8cfa64b7..75ffe1f15 100644
--- a/src/testing/test_exchange_api_twisted.c
+++ b/src/testing/test_exchange_api_twisted.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -44,19 +44,14 @@
 static char *config_file;
 
 /**
- * (real) Twister URL.  Used at startup time to check if it runs.
+ * Our credentials.
  */
-static char *twister_url;
+static struct TALER_TESTING_Credentials cred;
 
 /**
- * Exchange configuration data.
- */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
+ * (real) Twister URL.  Used at startup time to check if it runs.
  */
-static struct TALER_TESTING_BankConfiguration bc;
+static char *twister_url;
 
 /**
  * Twister process.
@@ -73,8 +68,9 @@ static struct GNUNET_OS_Process *twisterd;
 static struct TALER_TESTING_Command
 CMD_EXEC_WIREWATCH (const char *label)
 {
-  return TALER_TESTING_cmd_exec_wirewatch (label,
-                                           config_file);
+  return TALER_TESTING_cmd_exec_wirewatch2 (label,
+                                            config_file,
+                                            "exchange-account-2");
 }
 
 
@@ -92,8 +88,8 @@ CMD_TRANSFER_TO_EXCHANGE (const char *label,
 {
   return TALER_TESTING_cmd_admin_add_incoming (label,
                                                amount,
-                                               &bc.exchange_auth,
-                                               bc.user42_payto);
+                                               &cred.ba,
+                                               cred.user42_payto);
 }
 
 
@@ -112,8 +108,9 @@ run (void *cls,
    * response from a refresh-reveal operation.
    */
   struct TALER_TESTING_Command refresh_409_conflict[] = {
-    CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve",
-                              "EUR:5.01"),
+    CMD_TRANSFER_TO_EXCHANGE (
+      "refresh-create-reserve",
+      "EUR:5.01"),
     /**
      * Make previous command effective.
      */
@@ -121,34 +118,38 @@ run (void *cls,
     /**
      * Withdraw EUR:5.
      */
-    TALER_TESTING_cmd_withdraw_amount ("refresh-withdraw-coin",
-                                       "refresh-create-reserve",
-                                       "EUR:5",
-                                       0, /* age restriction off */
-                                       MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit ("refresh-deposit-partial",
-                               "refresh-withdraw-coin",
-                               0,
-                               bc.user42_payto,
-                               "{\"items\":[{\"name\":\"ice cream\",\
-                     \"value\":\"EUR:1\"}]}",
-                               GNUNET_TIME_UNIT_ZERO,
-                               "EUR:1",
-                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_withdraw_amount (
+      "refresh-withdraw-coin",
+      "refresh-create-reserve",
+      "EUR:5",
+      0,                                  /* age restriction off */
+      MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit (
+      "refresh-deposit-partial",
+      "refresh-withdraw-coin",
+      0,
+      cred.user42_payto,
+      "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:1\"}]}",
+      GNUNET_TIME_UNIT_ZERO,
+      "EUR:1",
+      MHD_HTTP_OK),
     /**
      * Melt the rest of the coin's value
      * (EUR:4.00 = 3x EUR:1.03 + 7x EUR:0.13) */
-    TALER_TESTING_cmd_melt ("refresh-melt",
-                            "refresh-withdraw-coin",
-                            MHD_HTTP_OK,
-                            NULL),
+    TALER_TESTING_cmd_melt (
+      "refresh-melt",
+      "refresh-withdraw-coin",
+      MHD_HTTP_OK,
+      NULL),
     /* Trigger 409 Conflict.  */
-    TALER_TESTING_cmd_flip_upload ("flip-upload",
-                                   config_file,
-                                   "transfer_privs.0"),
-    TALER_TESTING_cmd_refresh_reveal ("refresh-(flipped-)reveal",
-                                      "refresh-melt",
-                                      MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_flip_upload (
+      "flip-upload",
+      config_file,
+      "transfer_privs.0"),
+    TALER_TESTING_cmd_refresh_reveal (
+      "refresh-(flipped-)reveal",
+      "refresh-melt",
+      MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_end ()
   };
 
@@ -159,23 +160,25 @@ run (void *cls,
    * lib test suite.
    */
   struct TALER_TESTING_Command refund[] = {
-    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r1",
-                              "EUR:5.01"),
+    CMD_TRANSFER_TO_EXCHANGE (
+      "create-reserve-r1",
+      "EUR:5.01"),
     CMD_EXEC_WIREWATCH ("wirewatch-r1"),
-    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r1",
-                                       "create-reserve-r1",
-                                       "EUR:5",
-                                       0, /* age restriction off */
-                                       MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit ("deposit-refund-1",
-                               "withdraw-coin-r1",
-                               0,
-                               bc.user42_payto,
-                               "{\"items\":[{\"name\":\"ice cream\","
-                               "\"value\":\"EUR:5\"}]}",
-                               GNUNET_TIME_UNIT_MINUTES,
-                               "EUR:5",
-                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_withdraw_amount (
+      "withdraw-coin-r1",
+      "create-reserve-r1",
+      "EUR:5",
+      0,                                  /* age restriction off */
+      MHD_HTTP_OK),
+    TALER_TESTING_cmd_deposit (
+      "deposit-refund-1",
+      "withdraw-coin-r1",
+      0,
+      cred.user42_payto,
+      "{\"items\":[{\"name\":\"ice cream\",\"value\":\"EUR:5\"}]}",
+      GNUNET_TIME_UNIT_MINUTES,
+      "EUR:5",
+      MHD_HTTP_OK),
     TALER_TESTING_cmd_refund ("refund-currency-mismatch",
                               MHD_HTTP_BAD_REQUEST,
                               "USD:5",
@@ -190,18 +193,18 @@ run (void *cls,
     /* This next deposit CMD is only used to provide a
      * good merchant signature to the next (failing) refund
      * operations.  */
-    TALER_TESTING_cmd_deposit ("deposit-refund-to-fail",
-                               "withdraw-coin-r1",
-                               0, /* coin index.  */
-                               bc.user42_payto,
-                               /* This parameter will make any comparison about
-                                  h_contract_terms fail, when /refund will be handled.
-                                  So in other words, this is h_contract mismatch.  */
-                               "{\"items\":[{\"name\":\"ice skate\","
-                               "\"value\":\"EUR:5\"}]}",
-                               GNUNET_TIME_UNIT_MINUTES,
-                               "EUR:5",
-                               MHD_HTTP_CONFLICT),
+    TALER_TESTING_cmd_deposit (
+      "deposit-refund-to-fail",
+      "withdraw-coin-r1",
+      0,                          /* coin index.  */
+      cred.user42_payto,
+      /* This parameter will make any comparison about
+         h_contract_terms fail, when /refund will be handled.
+         So in other words, this is h_contract mismatch.  */
+      "{\"items\":[{\"name\":\"ice skate\",\"value\":\"EUR:5\"}]}",
+      GNUNET_TIME_UNIT_MINUTES,
+      "EUR:5",
+      MHD_HTTP_CONFLICT),
     TALER_TESTING_cmd_refund ("refund-deposit-not-found",
                               MHD_HTTP_NOT_FOUND,
                               "EUR:5",
@@ -219,10 +222,11 @@ run (void *cls,
    * are out of date.
    */
   struct TALER_TESTING_Command expired_keys[] = {
-    TALER_TESTING_cmd_modify_header_dl ("modify-expiration",
-                                        config_file,
-                                        MHD_HTTP_HEADER_EXPIRES,
-                                        "Wed, 19 Jan 586524 08:01:49 GMT"),
+    TALER_TESTING_cmd_modify_header_dl (
+      "modify-expiration",
+      config_file,
+      MHD_HTTP_HEADER_EXPIRES,
+      "Wed, 19 Jan 586524 08:01:49 GMT"),
     TALER_TESTING_cmd_check_keys_pull_all_keys (
       "check-keys-expiration-0",
       2),
@@ -232,28 +236,35 @@ run (void *cls,
     CMD_TRANSFER_TO_EXCHANGE ("create-reserve-r2",
                               "EUR:55.01"),
     CMD_EXEC_WIREWATCH ("wirewatch-r2"),
-    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-r2",
-                                       "create-reserve-r2",
-                                       "EUR:5",
-                                       0, /* age restriction off */
-                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_withdraw_amount (
+      "withdraw-coin-r2",
+      "create-reserve-r2",
+      "EUR:5",
+      0,                                  /* age restriction off */
+      MHD_HTTP_OK),
     TALER_TESTING_cmd_end ()
   };
 #endif
 
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
-    TALER_TESTING_cmd_batch ("refresh-reveal-409-conflict",
-                             refresh_409_conflict),
-    TALER_TESTING_cmd_batch ("refund",
-                             refund),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_batch (
+      "refresh-reveal-409-conflict",
+      refresh_409_conflict),
+    TALER_TESTING_cmd_batch (
+      "refund",
+      refund),
 #if 0
     TALER_TESTING_cmd_batch ("expired-keys",
                              expired_keys),
@@ -262,16 +273,15 @@ run (void *cls,
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   commands,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 
 /**
  * Kill, wait, and destroy convenience function.
  *
- * @param process process to purge.
+ * @param[in] process process to purge.
  */
 static void
 purge_process (struct GNUNET_OS_Process *process)
@@ -287,57 +297,37 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
   int ret;
 
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "DEBUG",
-                    NULL);
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api_twisted-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  if (NULL == (twister_url = TALER_TWISTER_prepare_twister
-                               (config_file)))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (NULL == (twisterd = TALER_TWISTER_run_twister (config_file)))
-      return 77;
-    ret = TALER_TESTING_setup_with_exchange (&run,
-                                             NULL,
-                                             config_file);
-    purge_process (twisterd);
-    GNUNET_free (twister_url);
+    char *cipher;
 
-    if (GNUNET_OK != ret)
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api_twisted-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  /* FIXME: introduce commands for twister! */
+  twister_url = TALER_TWISTER_prepare_twister (config_file);
+  if (NULL == twister_url)
+    return 77;
+  twisterd = TALER_TWISTER_run_twister (config_file);
+  if (NULL == twisterd)
+    return 77;
+  ret = TALER_TESTING_main (argv,
+                            "INFO",
+                            config_file,
+                            "exchange-account-2",
+                            TALER_TESTING_BS_FAKEBANK,
+                            &cred,
+                            &run,
+                            NULL);
+  purge_process (twisterd);
+  GNUNET_free (twister_url);
+  return ret;
 }
 
 
diff --git a/src/testing/test_exchange_management_api.c b/src/testing/test_exchange_management_api.c
index 9fe5cf595..7cce61b55 100644
--- a/src/testing/test_exchange_management_api.c
+++ b/src/testing/test_exchange_management_api.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020-2022 Taler Systems SA
+  Copyright (C) 2020-2023 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
@@ -35,16 +35,10 @@
  */
 static char *config_file;
 
-
-/**
- * Exchange configuration data.
- */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
 /**
- * Bank configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_BankConfiguration bc;
+static struct TALER_TESTING_Credentials cred;
 
 
 /**
@@ -58,10 +52,21 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command commands[] = {
-    /* this currently fails, because the
-       auditor is already added by the test setup logic */
-    TALER_TESTING_cmd_auditor_del ("del-auditor-NOT-FOUND",
-                                   MHD_HTTP_NOT_FOUND,
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-u", "exchange-account-2",
+                                    "-ae",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_auditor ("get-auditor",
+                                   cred.cfg,
+                                   true),
+    TALER_TESTING_cmd_auditor_del ("del-auditor-FROM-SETUP",
+                                   MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_auditor_add ("add-auditor-BAD-SIG",
                                    MHD_HTTP_FORBIDDEN,
@@ -85,76 +90,78 @@ run (void *cls,
                                     "foo-method",
                                     "EUR:1",
                                     "EUR:5",
-                                    "EUR:3",
                                     MHD_HTTP_NO_CONTENT,
                                     false),
     TALER_TESTING_cmd_set_wire_fee ("set-fee-conflicting",
                                     "foo-method",
                                     "EUR:1",
                                     "EUR:1",
-                                    "EUR:3",
                                     MHD_HTTP_CONFLICT,
                                     false),
     TALER_TESTING_cmd_set_wire_fee ("set-fee-bad-signature",
                                     "bar-method",
                                     "EUR:1",
                                     "EUR:1",
-                                    "EUR:3",
                                     MHD_HTTP_FORBIDDEN,
                                     true),
     TALER_TESTING_cmd_set_wire_fee ("set-fee-other-method",
                                     "bar-method",
                                     "EUR:1",
                                     "EUR:1",
-                                    "EUR:3",
                                     MHD_HTTP_NO_CONTENT,
                                     false),
     TALER_TESTING_cmd_set_wire_fee ("set-fee-idempotent",
                                     "bar-method",
                                     "EUR:1",
                                     "EUR:1",
-                                    "EUR:3",
                                     MHD_HTTP_NO_CONTENT,
                                     false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/42",
+                                "payto://x-taler-bank/localhost/42?receiver-name=42",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-idempotent",
-                                "payto://x-taler-bank/localhost/42",
+                                "payto://x-taler-bank/localhost/42?receiver-name=42",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-another",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-bad-signature",
-                                "payto://x-taler-bank/localhost/44",
+                                "payto://x-taler-bank/localhost/44?receiver-name=44",
                                 MHD_HTTP_FORBIDDEN,
                                 true),
     TALER_TESTING_cmd_wire_del ("del-wire-account-not-found",
-                                "payto://x-taler-bank/localhost/44",
+                                "payto://x-taler-bank/localhost/44?receiver-name=44",
                                 MHD_HTTP_NOT_FOUND,
                                 false),
     TALER_TESTING_cmd_wire_del ("del-wire-account-bad-signature",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_FORBIDDEN,
                                 true),
     TALER_TESTING_cmd_wire_del ("del-wire-account-ok",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("download-future-keys",
                                               config_file),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-1",
+                                    cred.cfg,
+                                    "get-exchange",
+                                    true,
+                                    true),
+    TALER_TESTING_cmd_get_exchange ("get-exchange-2",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_end ()
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   commands,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 
@@ -162,56 +169,25 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "INFO",
-                    NULL);
-  /* Check fakebank port is available and get config */
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES, /* reset DB? */
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c
index 50422b2c9..093730ff2 100644
--- a/src/testing/test_exchange_p2p.c
+++ b/src/testing/test_exchange_p2p.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014--2022 Taler Systems SA
+  Copyright (C) 2014--2023 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
@@ -20,13 +20,9 @@
  * @file testing/test_exchange_p2p.c
  * @brief testcase to test exchange's P2P payments
  * @author Christian Grothoff
- *
- * TODO:
- * - Test setup with KYC where purse merge is only
- *   allowed for reserves with KYC completed.
- * - Test purse creation with reserve purse quota
  */
 #include "platform.h"
+#include "taler_attributes.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
 #include "taler_exchange_service.h"
@@ -46,18 +42,13 @@
 static char *config_file;
 
 /**
- * Exchange configuration data.
- */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_BankConfiguration bc;
+struct TALER_TESTING_Credentials cred;
 
 /**
  * Some tests behave differently when using CS as we cannot
- * re-use the coin private key for different denominations
+ * reuse the coin private key for different denominations
  * due to the derivation of it with the /csr values. Hence
  * some tests behave differently in CS mode, hence this
  * flag.
@@ -71,7 +62,7 @@ static bool uses_cs;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_WIREWATCH(label) \
-  TALER_TESTING_cmd_exec_wirewatch (label, config_file)
+  TALER_TESTING_cmd_exec_wirewatch2 (label, config_file, "exchange-account-2")
 
 /**
  * Execute the taler-exchange-aggregator, closer and transfer commands with
@@ -94,8 +85,8 @@ static bool uses_cs;
  */
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_admin_add_incoming (label, amount, \
-                                        &bc.exchange_auth,                \
-                                        bc.user42_payto)
+                                        &cred.ba,                \
+                                        cred.user42_payto)
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -116,23 +107,23 @@ run (void *cls,
      * Move money to the exchange's bank account.
      */
     CMD_TRANSFER_TO_EXCHANGE ("create-reserve-1",
-                              "EUR:5.01"),
+                              "EUR:5.04"),
     CMD_TRANSFER_TO_EXCHANGE ("create-reserve-2",
                               "EUR:5.01"),
     TALER_TESTING_cmd_reserve_poll ("poll-reserve-1",
                                     "create-reserve-1",
-                                    "EUR:5.01",
+                                    "EUR:5.04",
                                     GNUNET_TIME_UNIT_MINUTES,
                                     MHD_HTTP_OK),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-1",
-                                                 "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 "EUR:5.04",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-1"),
     TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-2",
                                                  "EUR:5.01",
-                                                 bc.user42_payto,
-                                                 bc.exchange_payto,
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
                                                  "create-reserve-2"),
     /**
      * Make a reserve exist, according to the previous
@@ -155,13 +146,13 @@ run (void *cls,
      */
     TALER_TESTING_cmd_status ("status-1",
                               "create-reserve-1",
-                              "EUR:0",
+                              "EUR:0.03",
                               MHD_HTTP_OK),
     TALER_TESTING_cmd_end ()
   };
   struct TALER_TESTING_Command push[] = {
     TALER_TESTING_cmd_purse_create_with_deposit (
-      "purse-with-deposit",
+      "purse-with-deposit-for-delete",
       MHD_HTTP_OK,
       "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
       true, /* upload contract */
@@ -169,11 +160,24 @@ run (void *cls,
       "withdraw-coin-1",
       "EUR:1.01",
       NULL),
+    TALER_TESTING_cmd_purse_delete (
+      "purse-with-deposit-delete",
+      MHD_HTTP_NO_CONTENT,
+      "purse-with-deposit-for-delete"),
+    TALER_TESTING_cmd_purse_create_with_deposit (
+      "purse-with-deposit",
+      MHD_HTTP_OK,
+      "{\"amount\":\"EUR:0.99\",\"summary\":\"ice cream\"}",
+      true, /* upload contract */
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "withdraw-coin-1",
+      "EUR:1.00",
+      NULL),
     TALER_TESTING_cmd_purse_poll (
       "push-poll-purse-before-merge",
       MHD_HTTP_OK,
       "purse-with-deposit",
-      "EUR:1",
+      "EUR:0.99",
       true,
       GNUNET_TIME_UNIT_MINUTES),
     TALER_TESTING_cmd_contract_get (
@@ -195,16 +199,14 @@ run (void *cls,
     TALER_TESTING_cmd_status (
       "push-check-post-merge-reserve-balance-get",
       "create-reserve-1",
-      "EUR:1",
+      "EUR:1.02",
       MHD_HTTP_OK),
-#if FIXME
     /* POST history doesn't yet support P2P transfers */
-    TALER_TESTING_cmd_reserves_status (
+    TALER_TESTING_cmd_reserve_history (
       "push-check-post-merge-reserve-balance-post",
       "create-reserve-1",
-      "EUR:1",
+      "EUR:1.02",
       MHD_HTTP_OK),
-#endif
     /* Test conflicting merge */
     TALER_TESTING_cmd_purse_merge (
       "purse-merge-into-reserve",
@@ -220,6 +222,7 @@ run (void *cls,
       MHD_HTTP_OK,
       "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
       true /* upload contract */,
+      true /* pay purse fee */,
       GNUNET_TIME_UNIT_MINUTES, /* expiration */
       "create-reserve-1"),
     TALER_TESTING_cmd_contract_get (
@@ -251,25 +254,30 @@ run (void *cls,
     TALER_TESTING_cmd_status (
       "pull-check-post-merge-reserve-balance-get",
       "create-reserve-1",
-      "EUR:2",
+      "EUR:2.02",
       MHD_HTTP_OK),
-#if FIXME
-    /* POST history doesn't yet support P2P transfers */
-    TALER_TESTING_cmd_reserves_status (
+    TALER_TESTING_cmd_reserve_history (
       "push-check-post-merge-reserve-balance-post",
       "create-reserve-1",
-      "EUR:2",
+      "EUR:2.02",
       MHD_HTTP_OK),
-#endif
+    TALER_TESTING_cmd_purse_deposit_coins (
+      "purse-deposit-coins-idempotent",
+      MHD_HTTP_OK,
+      0 /* min age */,
+      "purse-create-with-reserve",
+      "withdraw-coin-1",
+      "EUR:1.01",
+      NULL),
     /* create 2nd purse for a deposit conflict */
     TALER_TESTING_cmd_purse_create_with_reserve (
       "purse-create-with-reserve-2",
       MHD_HTTP_OK,
       "{\"amount\":\"EUR:4\",\"summary\":\"beer\"}",
       true /* upload contract */,
+      true /* pay purse fee */,
       GNUNET_TIME_UNIT_MINUTES, /* expiration */
       "create-reserve-1"),
-#if FIXME_RESERVE_HISTORY
     TALER_TESTING_cmd_purse_deposit_coins (
       "purse-deposit-coins-conflict",
       MHD_HTTP_CONFLICT,
@@ -278,7 +286,6 @@ run (void *cls,
       "withdraw-coin-1",
       "EUR:4.01",
       NULL),
-#endif
     TALER_TESTING_cmd_end ()
   };
 
@@ -288,6 +295,7 @@ run (void *cls,
       MHD_HTTP_OK,
       "{\"amount\":\"EUR:2\",\"summary\":\"ice cream\"}",
       true /* upload contract */,
+      true /* pay purse fee */,
       GNUNET_TIME_relative_multiply (
         GNUNET_TIME_UNIT_SECONDS,
         1), /* expiration */
@@ -362,37 +370,143 @@ run (void *cls,
       NULL),
     TALER_TESTING_cmd_end ()
   };
+  struct TALER_TESTING_Command reserves[] = {
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-100",
+                              "EUR:1.04"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-100",
+                                                 "EUR:1.04",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-reserve-100"),
+    CMD_TRANSFER_TO_EXCHANGE ("create-reserve-101",
+                              "EUR:1.04"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("check-create-reserve-101",
+                                                 "EUR:1.04",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "create-reserve-101"),
+    CMD_EXEC_WIREWATCH ("wirewatch-100"),
+    TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-100",
+                                       "create-reserve-100",
+                                       "EUR:1",
+                                       0, /* age restriction off */
+                                       MHD_HTTP_OK),
+    TALER_TESTING_cmd_reserve_open ("reserve-open-101-fail",
+                                    "create-reserve-101",
+                                    "EUR:0",
+                                    GNUNET_TIME_UNIT_YEARS,
+                                    5, /* min purses */
+                                    MHD_HTTP_PAYMENT_REQUIRED,
+                                    NULL,
+                                    NULL),
+    TALER_TESTING_cmd_reserve_open ("reserve-open-101-ok-a",
+                                    "create-reserve-101",
+                                    "EUR:0.01",
+                                    GNUNET_TIME_UNIT_MONTHS,
+                                    1, /* min purses */
+                                    MHD_HTTP_OK,
+                                    NULL,
+                                    NULL),
+    TALER_TESTING_cmd_status ("status-101-open-paid",
+                              "create-reserve-101",
+                              "EUR:1.03",
+                              MHD_HTTP_OK),
+    TALER_TESTING_cmd_reserve_open ("reserve-open-101-ok-b",
+                                    "create-reserve-101",
+                                    "EUR:0",
+                                    GNUNET_TIME_UNIT_MONTHS,
+                                    2, /* min purses */
+                                    MHD_HTTP_OK,
+                                    "withdraw-coin-100",
+                                    "EUR:0.03", /* 0.02 for the reserve open, 0.01 for deposit fee */
+                                    NULL,
+                                    NULL),
+    /* Use purse creation with purse quota here */
+    TALER_TESTING_cmd_purse_create_with_reserve (
+      "purse-create-with-reserve-101-a",
+      MHD_HTTP_OK,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true /* upload contract */,
+      false /* pay purse fee */,
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "create-reserve-101"),
+    TALER_TESTING_cmd_purse_create_with_reserve (
+      "purse-create-with-reserve-101-b",
+      MHD_HTTP_OK,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true /* upload contract */,
+      false /* pay purse fee */,
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "create-reserve-101"),
+    TALER_TESTING_cmd_purse_create_with_reserve (
+      "purse-create-with-reserve-101-fail",
+      MHD_HTTP_CONFLICT,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true /* upload contract */,
+      false /* pay purse fee */,
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "create-reserve-101"),
+    TALER_TESTING_cmd_reserve_get_attestable ("reserve-101-attestable",
+                                              "create-reserve-101",
+                                              MHD_HTTP_NOT_FOUND,
+                                              NULL),
+    TALER_TESTING_cmd_reserve_get_attestable ("reserve-101-attest",
+                                              "create-reserve-101",
+                                              MHD_HTTP_NOT_FOUND,
+                                              "nx-attribute-name",
+                                              NULL),
+    TALER_TESTING_cmd_oauth ("start-oauth-service",
+                             6666),
+    TALER_TESTING_cmd_reserve_close ("reserve-101-close-kyc",
+                                     "create-reserve-101",
+                                     /* 42b => not to origin */
+                                     "payto://x-taler-bank/localhost/42?receiver-name=42b",
+                                     MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
+
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-close-pending",
+                                     "reserve-101-close-kyc",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-close-kyc",
+                                        "reserve-101-close-kyc",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-close-ok",
+                                     "reserve-101-close-kyc",
+                                     MHD_HTTP_NO_CONTENT),
+    /* Now it should pass */
+    TALER_TESTING_cmd_reserve_close ("reserve-101-close",
+                                     "create-reserve-101",
+                                     /* 42b => not to origin */
+                                     "payto://x-taler-bank/localhost/42?receiver-name=42b",
+                                     MHD_HTTP_OK),
+    TALER_TESTING_cmd_exec_closer ("close-reserves-101",
+                                   config_file,
+                                   "EUR:1.02",
+                                   "EUR:0.01",
+                                   "create-reserve-101"),
+    TALER_TESTING_cmd_exec_transfer ("close-reserves-101-transfer",
+                                     config_file),
+    TALER_TESTING_cmd_status ("reserve-101-closed-status",
+                              "create-reserve-101",
+                              "EUR:0",
+                              MHD_HTTP_OK),
+    TALER_TESTING_cmd_end ()
+  };
 
   struct TALER_TESTING_Command commands[] = {
-    /* setup exchange */
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
-                                                    config_file),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_file),
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-wire-fees",
-                                              config_file,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    TALER_TESTING_cmd_exec_offline_sign_global_fees ("offline-sign-global-fees",
-                                                     config_file,
-                                                     "EUR:0.01",
-                                                     "EUR:0.01",
-                                                     "EUR:0.01",
-                                                     "EUR:0.01",
-                                                     GNUNET_TIME_UNIT_MINUTES,
-                                                     GNUNET_TIME_UNIT_MINUTES,
-                                                     GNUNET_TIME_UNIT_DAYS,
-                                                     1),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_file,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_batch ("withdraw",
                              withdraw),
     TALER_TESTING_cmd_batch ("push",
@@ -401,14 +515,15 @@ run (void *cls,
                              pull),
     TALER_TESTING_cmd_batch ("expire",
                              expire),
+    TALER_TESTING_cmd_batch ("reserves",
+                             reserves),
     /* End the suite. */
     TALER_TESTING_cmd_end ()
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   commands,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 
@@ -416,62 +531,26 @@ int
 main (int argc,
       char *const *argv)
 {
-  char *cipher;
-
   (void) argc;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup (argv[0],
-                    "INFO",
-                    NULL);
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_extension_age_restriction_register ());
-
-  cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
-  GNUNET_assert (NULL != cipher);
-  uses_cs = (0 == strcmp (cipher, "cs"));
-  GNUNET_asprintf (&config_file,
-                   "test_exchange_api-%s.conf",
-                   cipher);
-  GNUNET_free (cipher);
-
-  /* Check fakebank port is available and get config */
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_file,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (config_file);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (config_file,
-                                          GNUNET_YES,
-                                          &ec))
   {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 78;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           config_file))
-      return 2;
-    break;
-  default:
-    GNUNET_break (0);
-    return 3;
+    char *cipher;
+
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
+    GNUNET_assert (NULL != cipher);
+    uses_cs = (0 == strcmp (cipher, "cs"));
+    GNUNET_asprintf (&config_file,
+                     "test_exchange_api-%s.conf",
+                     cipher);
+    GNUNET_free (cipher);
   }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_file,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c
index 669101d88..0844c5818 100644
--- a/src/testing/test_kyc_api.c
+++ b/src/testing/test_kyc_api.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -23,6 +23,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
+#include "taler_attributes.h"
 #include "taler_signatures.h"
 #include "taler_exchange_service.h"
 #include "taler_json_lib.h"
@@ -40,14 +41,10 @@
 #define CONFIG_FILE "test_kyc_api.conf"
 
 /**
- * Exchange configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
+struct TALER_TESTING_Credentials cred;
 
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
 
 /**
  * Execute the taler-exchange-wirewatch command with
@@ -56,7 +53,7 @@ static struct TALER_TESTING_BankConfiguration bc;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_WIREWATCH(label) \
-  TALER_TESTING_cmd_exec_wirewatch (label, CONFIG_FILE)
+  TALER_TESTING_cmd_exec_wirewatch2 (label, CONFIG_FILE, "exchange-account-2")
 
 /**
  * Execute the taler-exchange-aggregator, closer and transfer commands with
@@ -78,8 +75,8 @@ static struct TALER_TESTING_BankConfiguration bc;
  */
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
   TALER_TESTING_cmd_admin_add_incoming (label, amount,           \
-                                        &bc.exchange_auth,       \
-                                        bc.user42_payto)
+                                        &cred.ba,       \
+                                        cred.user42_payto)
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -91,22 +88,21 @@ static void
 run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
-  /**
-   * Test withdraw.
-   */
   struct TALER_TESTING_Command withdraw[] = {
     CMD_TRANSFER_TO_EXCHANGE ("create-reserve-1",
                               "EUR:15.02"),
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "check-create-reserve-1",
-      "EUR:15.02", bc.user42_payto, bc.exchange_payto,
+      "EUR:15.02",
+      cred.user42_payto,
+      cred.exchange_payto,
       "create-reserve-1"),
     CMD_EXEC_WIREWATCH ("wirewatch-1"),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1-no-kyc",
                                        "create-reserve-1",
                                        "EUR:10",
                                        0, /* age restriction off */
-                                       MHD_HTTP_ACCEPTED),
+                                       MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1",
                                        "create-reserve-1",
                                        "EUR:5",
@@ -123,17 +119,26 @@ run (void *cls,
                                        "create-reserve-1",
                                        "EUR:5",
                                        0, /* age restriction off */
-                                       MHD_HTTP_ACCEPTED),
-    TALER_TESTING_cmd_proof_kyc ("proof-kyc",
-                                 "create-reserve-1",
-                                 "pass",
-                                 "state",
-                                 MHD_HTTP_SEE_OTHER),
+                                       MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-withdraw",
+                                     "withdraw-coin-1-lacking-kyc",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-kyc",
+                                        "withdraw-coin-1-lacking-kyc",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
     TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-1-with-kyc",
                                        "create-reserve-1",
                                        "EUR:5",
                                        0, /* age restriction off */
                                        MHD_HTTP_OK),
+    /* Attestations above are bound to the originating *bank* account,
+       not to the reserve (!). Hence, they are NOT found here! */
+    TALER_TESTING_cmd_reserve_get_attestable ("reserve-get-attestable",
+                                              "create-reserve-1",
+                                              MHD_HTTP_NOT_FOUND,
+                                              NULL),
     TALER_TESTING_cmd_end ()
   };
   struct TALER_TESTING_Command spend[] = {
@@ -141,7 +146,7 @@ run (void *cls,
       "deposit-simple",
       "withdraw-coin-1",
       0,
-      bc.user43_payto,
+      cred.user43_payto,
       "{\"items\":[{\"name\":\"ice cream\",\"value\":1}]}",
       GNUNET_TIME_UNIT_ZERO,
       "EUR:5",
@@ -158,71 +163,378 @@ run (void *cls,
   struct TALER_TESTING_Command track[] = {
     CMD_EXEC_AGGREGATOR ("run-aggregator-before-kyc"),
     TALER_TESTING_cmd_check_bank_empty ("check_bank_empty-no-kyc"),
+    TALER_TESTING_cmd_track_transaction (
+      "track-deposit-kyc-ready",
+      "deposit-simple",
+      0,
+      MHD_HTTP_ACCEPTED,
+      NULL),
     TALER_TESTING_cmd_check_kyc_get ("check-kyc-deposit",
-                                     "track-deposit",
+                                     "track-deposit-kyc-ready",
                                      MHD_HTTP_ACCEPTED),
-    TALER_TESTING_cmd_proof_kyc ("proof-kyc-no-service",
-                                 "track-deposit",
-                                 "bad",
-                                 "state",
-                                 MHD_HTTP_BAD_GATEWAY),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-kyc-no-service",
+                                        "track-deposit-kyc-ready",
+                                        "kyc-provider-test-oauth2",
+                                        "bad",
+                                        MHD_HTTP_BAD_GATEWAY),
     TALER_TESTING_cmd_oauth ("start-oauth-service",
                              6666),
-    TALER_TESTING_cmd_proof_kyc ("proof-kyc-fail",
-                                 "track-deposit",
-                                 "bad",
-                                 "state",
-                                 MHD_HTTP_FORBIDDEN),
-    TALER_TESTING_cmd_proof_kyc ("proof-kyc-fail",
-                                 "track-deposit",
-                                 "pass",
-                                 "state",
-                                 MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-kyc-fail",
+                                        "track-deposit-kyc-ready",
+                                        "kyc-provider-test-oauth2",
+                                        "bad",
+                                        MHD_HTTP_FORBIDDEN),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-deposit-again",
+                                     "track-deposit-kyc-ready",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-kyc-pass",
+                                        "track-deposit-kyc-ready",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
     CMD_EXEC_AGGREGATOR ("run-aggregator-after-kyc"),
     TALER_TESTING_cmd_check_bank_transfer (
       "check_bank_transfer-499c",
-      ec.exchange_url,
+      cred.exchange_url,
       "EUR:4.98",
-      bc.exchange_payto,
-      bc.user43_payto),
+      cred.exchange_payto,
+      cred.user43_payto),
     TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
     TALER_TESTING_cmd_end ()
   };
 
   struct TALER_TESTING_Command wallet_kyc[] = {
-    TALER_TESTING_cmd_wallet_kyc_get (
-      "wallet-kyc-fail",
-      NULL,
+    TALER_TESTING_cmd_wallet_kyc_get ("wallet-kyc-fail",
+                                      NULL,
+                                      "EUR:1000000",
+                                      MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-wallet",
+                                     "wallet-kyc-fail",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("proof-wallet-kyc",
+                                        "wallet-kyc-fail",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_check_kyc_get ("wallet-kyc-check",
+                                     "wallet-kyc-fail",
+                                     MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_reserve_get_attestable ("wallet-get-attestable",
+                                              "wallet-kyc-fail",
+                                              MHD_HTTP_OK,
+                                              TALER_ATTRIBUTE_FULL_NAME,
+                                              NULL),
+    TALER_TESTING_cmd_reserve_attest ("wallet-get-attest",
+                                      "wallet-kyc-fail",
+                                      MHD_HTTP_OK,
+                                      TALER_ATTRIBUTE_FULL_NAME,
+                                      NULL),
+    TALER_TESTING_cmd_end ()
+  };
+
+  /**
+   * Test withdrawal for P2P
+   */
+  struct TALER_TESTING_Command p2p_withdraw[] = {
+    /**
+     * Move money to the exchange's bank account.
+     */
+    CMD_TRANSFER_TO_EXCHANGE ("p2p_create-reserve-1",
+                              "EUR:5.04"),
+    CMD_TRANSFER_TO_EXCHANGE ("p2p_create-reserve-2",
+                              "EUR:5.01"),
+    CMD_TRANSFER_TO_EXCHANGE ("p2p_create-reserve-3",
+                              "EUR:0.03"),
+    TALER_TESTING_cmd_reserve_poll ("p2p_poll-reserve-1",
+                                    "p2p_create-reserve-1",
+                                    "EUR:5.04",
+                                    GNUNET_TIME_UNIT_MINUTES,
+                                    MHD_HTTP_OK),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("p2p_check-create-reserve-1",
+                                                 "EUR:5.04",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "p2p_create-reserve-1"),
+    TALER_TESTING_cmd_check_bank_admin_transfer ("p2p_check-create-reserve-2",
+                                                 "EUR:5.01",
+                                                 cred.user42_payto,
+                                                 cred.exchange_payto,
+                                                 "p2p_create-reserve-2"),
+    /**
+     * Make a reserve exist, according to the previous
+     * transfer.
+     */
+    CMD_EXEC_WIREWATCH ("p2p_wirewatch-1"),
+    TALER_TESTING_cmd_reserve_poll_finish ("p2p_finish-poll-reserve-1",
+                                           GNUNET_TIME_UNIT_SECONDS,
+                                           "p2p_poll-reserve-1"),
+    /**
+     * Withdraw EUR:5.
+     */
+    TALER_TESTING_cmd_withdraw_amount ("p2p_withdraw-coin-1",
+                                       "p2p_create-reserve-1",
+                                       "EUR:5",
+                                       0, /* age restriction off */
+                                       MHD_HTTP_OK),
+    /**
+     * Check the reserve is depleted.
+     */
+    TALER_TESTING_cmd_status ("p2p_status-1",
+                              "p2p_create-reserve-1",
+                              "EUR:0.03",
+                              MHD_HTTP_OK),
+    TALER_TESTING_cmd_end ()
+  };
+  struct TALER_TESTING_Command push[] = {
+    TALER_TESTING_cmd_purse_create_with_deposit (
+      "purse-with-deposit",
+      MHD_HTTP_OK,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true, /* upload contract */
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "p2p_withdraw-coin-1",
+      "EUR:1.01",
+      NULL),
+    TALER_TESTING_cmd_coin_history ("coin-history-purse-with-deposit",
+                                    "p2p_withdraw-coin-1#0",
+                                    "EUR:3.99",
+                                    MHD_HTTP_OK),
+    TALER_TESTING_cmd_purse_poll (
+      "push-poll-purse-before-merge",
+      MHD_HTTP_OK,
+      "purse-with-deposit",
+      "EUR:1",
+      true,
+      GNUNET_TIME_UNIT_MINUTES),
+    TALER_TESTING_cmd_contract_get (
+      "push-get-contract",
+      MHD_HTTP_OK,
+      true, /* for merge */
+      "purse-with-deposit"),
+    TALER_TESTING_cmd_purse_merge (
+      "purse-merge-into-reserve",
+      MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+      "push-get-contract",
+      "p2p_create-reserve-1"),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-purse-merge",
+                                     "purse-merge-into-reserve",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("p2p_proof-kyc",
+                                        "purse-merge-into-reserve",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_purse_merge (
+      "purse-merge-into-reserve",
+      MHD_HTTP_OK,
+      "push-get-contract",
+      "p2p_create-reserve-1"),
+    TALER_TESTING_cmd_purse_poll_finish (
+      "push-merge-purse-poll-finish",
+      GNUNET_TIME_relative_multiply (
+        GNUNET_TIME_UNIT_SECONDS,
+        5),
+      "push-poll-purse-before-merge"),
+    TALER_TESTING_cmd_status (
+      "push-check-post-merge-reserve-balance-get",
+      "p2p_create-reserve-1",
+      "EUR:1.03",
+      MHD_HTTP_OK),
+    TALER_TESTING_cmd_reserve_history (
+      "push-check-post-merge-reserve-balance-post",
+      "p2p_create-reserve-1",
+      "EUR:1.03",
+      MHD_HTTP_OK),
+
+    TALER_TESTING_cmd_end ()
+  };
+  struct TALER_TESTING_Command pull[] = {
+    TALER_TESTING_cmd_purse_create_with_reserve (
+      "purse-create-with-reserve",
+      MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true /* upload contract */,
+      true /* pay purse fee */,
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "p2p_create-reserve-3"),
+    TALER_TESTING_cmd_check_kyc_get ("check-kyc-purse-create",
+                                     "purse-create-with-reserve",
+                                     MHD_HTTP_ACCEPTED),
+    TALER_TESTING_cmd_proof_kyc_oauth2 ("p2p_proof-kyc-pull",
+                                        "purse-create-with-reserve",
+                                        "kyc-provider-test-oauth2",
+                                        "pass",
+                                        MHD_HTTP_SEE_OTHER),
+    TALER_TESTING_cmd_purse_create_with_reserve (
+      "purse-create-with-reserve",
+      MHD_HTTP_OK,
+      "{\"amount\":\"EUR:1\",\"summary\":\"ice cream\"}",
+      true /* upload contract */,
+      true /* pay purse fee */,
+      GNUNET_TIME_UNIT_MINUTES, /* expiration */
+      "p2p_create-reserve-3"),
+    TALER_TESTING_cmd_contract_get (
+      "pull-get-contract",
+      MHD_HTTP_OK,
+      false, /* for deposit */
+      "purse-create-with-reserve"),
+    TALER_TESTING_cmd_purse_poll (
+      "pull-poll-purse-before-deposit",
+      MHD_HTTP_OK,
+      "purse-create-with-reserve",
+      "EUR:1",
+      false,
+      GNUNET_TIME_UNIT_MINUTES),
+    TALER_TESTING_cmd_purse_deposit_coins (
+      "purse-deposit-coins",
+      MHD_HTTP_OK,
+      0 /* min age */,
+      "purse-create-with-reserve",
+      "p2p_withdraw-coin-1",
+      "EUR:1.01",
+      NULL),
+    TALER_TESTING_cmd_coin_history ("coin-history-purse-pull-deposit",
+                                    "p2p_withdraw-coin-1#0",
+                                    "EUR:2.98",
+                                    MHD_HTTP_OK),
+    TALER_TESTING_cmd_purse_poll_finish (
+      "pull-deposit-purse-poll-finish",
+      GNUNET_TIME_relative_multiply (
+        GNUNET_TIME_UNIT_SECONDS,
+        5),
+      "pull-poll-purse-before-deposit"),
+    TALER_TESTING_cmd_status (
+      "pull-check-post-merge-reserve-balance-get-2",
+      "p2p_create-reserve-3",
+      "EUR:1.03",
       MHD_HTTP_OK),
-    TALER_TESTING_cmd_proof_kyc ("proof-wallet-kyc",
-                                 "wallet-kyc-fail",
-                                 "pass",
-                                 "state",
-                                 MHD_HTTP_SEE_OTHER),
-    TALER_TESTING_cmd_check_kyc_get (
-      "wallet-kyc-check",
-      "wallet-kyc-fail",
+    TALER_TESTING_cmd_reserve_history (
+      "push-check-post-merge-reserve-balance-post-2",
+      "p2p_create-reserve-3",
+      "EUR:1.03",
       MHD_HTTP_OK),
     TALER_TESTING_cmd_end ()
   };
+  struct TALER_TESTING_Command aml[] = {
+    /* Trigger something upon which an AML officer could act */
+    TALER_TESTING_cmd_wallet_kyc_get ("wallet-trigger-kyc-for-aml",
+                                      NULL,
+                                      "EUR:1000",
+                                      MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS),
+    TALER_TESTING_cmd_set_officer ("create-aml-officer-1",
+                                   NULL,
+                                   "Peter Falk",
+                                   true,
+                                   false),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-none-normal",
+                                           "create-aml-officer-1",
+                                           TALER_AML_NORMAL,
+                                           MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-none-pending",
+                                           "create-aml-officer-1",
+                                           TALER_AML_PENDING,
+                                           MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-none-frozen",
+                                           "create-aml-officer-1",
+                                           TALER_AML_FROZEN,
+                                           MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_sleep ("sleep-1a",
+                             1),
+    TALER_TESTING_cmd_set_officer ("create-aml-officer-1-disable",
+                                   "create-aml-officer-1",
+                                   "Peter Falk",
+                                   true,
+                                   true),
+    /* Test that we are not allowed to take AML decisions as our
+       AML staff account is on read-only */
+    TALER_TESTING_cmd_take_aml_decision ("aml-decide-while-disabled",
+                                         "create-aml-officer-1",
+                                         "wallet-trigger-kyc-for-aml",
+                                         "EUR:10000",
+                                         "party time",
+                                         TALER_AML_NORMAL,
+                                         NULL,
+                                         MHD_HTTP_FORBIDDEN),
+    /* Check that no decision was taken, but that we are allowed
+       to read this information */
+    TALER_TESTING_cmd_check_aml_decision ("check-aml-decision-empty",
+                                          "create-aml-officer-1",
+                                          "aml-decide-while-disabled",
+                                          MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_sleep ("sleep-1b",
+                             1),
+    TALER_TESTING_cmd_set_officer ("create-aml-officer-1-enable",
+                                   "create-aml-officer-1",
+                                   "Peter Falk",
+                                   true,
+                                   false),
+    TALER_TESTING_cmd_take_aml_decision ("aml-decide",
+                                         "create-aml-officer-1",
+                                         "wallet-trigger-kyc-for-aml",
+                                         "EUR:10000",
+                                         "party time",
+                                         TALER_AML_NORMAL,
+                                         NULL,
+                                         MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-one-normal",
+                                           "create-aml-officer-1",
+                                           TALER_AML_NORMAL,
+                                           MHD_HTTP_OK),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-zero-frozen",
+                                           "create-aml-officer-1",
+                                           TALER_AML_FROZEN,
+                                           MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_check_aml_decision ("check-aml-decision",
+                                          "create-aml-officer-1",
+                                          "aml-decide",
+                                          MHD_HTTP_OK),
+    TALER_TESTING_cmd_sleep ("sleep-1c",
+                             1),
+    TALER_TESTING_cmd_take_aml_decision ("aml-decide-freeze",
+                                         "create-aml-officer-1",
+                                         "wallet-trigger-kyc-for-aml",
+                                         "EUR:1000",
+                                         "party over",
+                                         TALER_AML_FROZEN,
+                                         NULL,
+                                         MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-one-frozen",
+                                           "create-aml-officer-1",
+                                           TALER_AML_FROZEN,
+                                           MHD_HTTP_OK),
+    TALER_TESTING_cmd_check_aml_decisions ("check-decisions-zero-normal",
+                                           "create-aml-officer-1",
+                                           TALER_AML_NORMAL,
+                                           MHD_HTTP_NO_CONTENT),
+    TALER_TESTING_cmd_sleep ("sleep-1d",
+                             1),
+    TALER_TESTING_cmd_set_officer ("create-aml-officer-1-disable",
+                                   "create-aml-officer-1",
+                                   "Peter Falk",
+                                   false,
+                                   true),
+    /* Test that we are NOT allowed to read AML decisions now that
+       our AML staff account is disabled */
+    TALER_TESTING_cmd_check_aml_decision ("check-aml-decision-disabled",
+                                          "create-aml-officer-1",
+                                          "aml-decide",
+                                          MHD_HTTP_FORBIDDEN),
+    TALER_TESTING_cmd_end ()
+  };
 
   struct TALER_TESTING_Command commands[] = {
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                              CONFIG_FILE,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              CONFIG_FILE),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                2),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-2"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    CONFIG_FILE,
+                                    "-e",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_batch ("withdraw",
                              withdraw),
     TALER_TESTING_cmd_batch ("spend",
@@ -233,13 +545,20 @@ run (void *cls,
                              withdraw_kyc),
     TALER_TESTING_cmd_batch ("wallet-kyc",
                              wallet_kyc),
+    TALER_TESTING_cmd_batch ("p2p_withdraw",
+                             p2p_withdraw),
+    TALER_TESTING_cmd_batch ("push",
+                             push),
+    TALER_TESTING_cmd_batch ("pull",
+                             pull),
+    TALER_TESTING_cmd_batch ("aml",
+                             aml),
     TALER_TESTING_cmd_end ()
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   commands,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     commands);
 }
 
 
@@ -248,48 +567,14 @@ main (int argc,
       char *const *argv)
 {
   (void) argc;
-  (void) argv;
-  /* These environment variables get in the way... */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup ("test-kyc-api",
-                    "INFO",
-                    NULL);
-  /* Check fakebank port is available and get configuration data. */
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (CONFIG_FILE,
-                                      "exchange-account-2",
-                                      &bc))
-    return 77;
-  TALER_TESTING_cleanup_files (CONFIG_FILE);
-  /* @helpers.  Run keyup, create tables, ... Note: it
-   * fetches the port number from config in order to see
-   * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
-                                          GNUNET_YES,
-                                          &ec))
-  {
-  case GNUNET_SYSERR:
-    GNUNET_break (0);
-    return 1;
-  case GNUNET_NO:
-    return 77;
-  case GNUNET_OK:
-    if (GNUNET_OK !=
-        /* Set up event loop and reschedule context, plus
-         * start/stop the exchange.  It calls TALER_TESTING_setup
-         * which creates the 'is' object.
-         */
-        TALER_TESTING_setup_with_exchange (&run,
-                                           NULL,
-                                           CONFIG_FILE))
-      return 1;
-    break;
-  default:
-    GNUNET_break (0);
-    return 1;
-  }
-  return 0;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             CONFIG_FILE,
+                             "exchange-account-2",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf
index 539c59ec1..b6bfdb055 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -1,218 +1,42 @@
-
 # This file is in the public domain.
 #
-[PATHS]
-# Persistent data storage for the testcase
-TALER_TEST_HOME = test_exchange_api_home/
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/${USER:-}/taler-system-runtime/
-
-[taler-exchange-secmod-rsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-
-[taler-exchange-secmod-eddsa]
-# Reduce from 1 year to speed up test
-LOOKAHEAD_SIGN = 24 days
-# Reduce from 12 weeks to ensure we have multiple
-DURATION = 14 days
-
-
-[taler]
-# Currency supported by the exchange (can only be one)
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-# HTTP port the auditor listens to
-PORT = 8083
-
-TINY_AMOUNT = EUR:0.01
-
-[exchange]
-
-# HTTP port the exchange listens to
-PORT = 8081
-
-# Master public key used to sign the exchange's various keys
-MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
-
-# How to access our database
-DB = postgres
-
-# Base URL of the exchange. Must be set to a URL where the
-# exchange (or the twister) is actually listening.
-BASE_URL = "http://localhost:8081/"
-
-
-KYC_MODE = OAUTH2
-
-KYC_WALLET_BALANCE_LIMIT = EUR:1
-
-KYC_WITHDRAW_PERIOD = "31 days"
-
-KYC_WITHDRAW_LIMIT = EUR:8
-
-[exchange-kyc-oauth2]
-
-KYC_OAUTH2_AUTH_URL = http://localhost:6666/oauth/v2/token
-KYC_OAUTH2_LOGIN_URL = http://localhost:6666/oauth/v2/login
-KYC_INFO_URL = http://localhost:6666/api/user/me
+@INLINE@ coins-rsa.conf
+@INLINE@ test_exchange_api.conf
+
+[kyc-provider-test-oauth2]
+COST = 0
+LOGIC = oauth2
+USER_TYPE = INDIVIDUAL
+PROVIDED_CHECKS = DUMMY
+KYC_OAUTH2_VALIDITY = forever
+KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
+KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
+KYC_OAUTH2_INFO_URL = http://localhost:6666/api/user/me
 KYC_OAUTH2_CLIENT_ID = taler-exchange
 KYC_OAUTH2_CLIENT_SECRET = exchange-secret
 KYC_OAUTH2_POST_URL = http://example.com/
-
-[exchangedb-postgres]
-CONFIG = "postgres:///talercheck"
-
-[auditordb-postgres]
-CONFIG = "postgres:///talercheck"
-
-# Sections starting with "exchange-account-" configure the bank accounts
-# of the exchange.  The "URL" specifies the account in
-# payto://-format.
-[exchange-account-1]
-# What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
-
-[exchange-accountcredentials-1]
-WIRE_GATEWAY_URL = "http://localhost:8082/42/"
-
-[bank]
-HTTP_PORT = 8082
-
-# ENABLE_CREDIT = YES
-
-[exchange-account-2]
-# What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
-ENABLE_DEBIT = YES
-ENABLE_CREDIT = YES
-
-# Authentication information for basic authentication
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8082/2/"
-WIRE_GATEWAY_AUTH_METHOD = "basic"
-USERNAME = user
-PASSWORD = pass
-
-
-
-
-# Sections starting with "coin_" specify which denominations
-# the exchange should support (and their respective fee structure)
-[coin_eur_ct_1]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_2]
-value = EUR:0.01
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.00
-fee_deposit = EUR:0.00
-fee_refresh = EUR:0.01
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_ct_10]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_ct_11]
-value = EUR:0.10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_1]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_2]
-value = EUR:1
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_5]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_6]
-value = EUR:5
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
-
-[coin_eur_10]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = RSA
-rsa_keysize = 1024
-
-[coin_eur_11]
-value = EUR:10
-duration_withdraw = 7 days
-duration_spend = 2 years
-duration_legal = 3 years
-fee_withdraw = EUR:0.01
-fee_deposit = EUR:0.01
-fee_refresh = EUR:0.03
-fee_refund = EUR:0.01
-CIPHER = CS
\ No newline at end of file
+KYC_OAUTH2_CONVERTER_HELPER = taler-exchange-kyc-oauth2-test-converter.sh
+# "{"full_name":"{{last_name}}, {{first_name}}"}"
+
+[kyc-legitimization-balance-high]
+OPERATION_TYPE = BALANCE
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:8
+
+[kyc-legitimization-deposit-any]
+OPERATION_TYPE = DEPOSIT
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:0
+TIMEFRAME = 1d
+
+[kyc-legitimization-withdraw]
+OPERATION_TYPE = WITHDRAW
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:10
+TIMEFRAME = 1d
+
+[kyc-legitimization-merge]
+OPERATION_TYPE = MERGE
+REQUIRED_CHECKS = DUMMY
+THRESHOLD = EUR:0
+TIMEFRAME = 1d
diff --git a/src/testing/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c
index ce0c73404..2d7acc6dc 100644
--- a/src/testing/test_taler_exchange_aggregator.c
+++ b/src/testing/test_taler_exchange_aggregator.c
@@ -31,24 +31,9 @@
 
 
 /**
- * Helper structure to keep exchange configuration values.
+ * Our credentials.
  */
-static struct TALER_TESTING_ExchangeConfiguration ec;
-
-/**
- * Bank configuration data.
- */
-static struct TALER_TESTING_BankConfiguration bc;
-
-/**
- * Contains plugin.
- */
-static struct TALER_TESTING_DatabaseConnection dbc;
-
-/**
- * Return value from main().
- */
-static int result;
+struct TALER_TESTING_Credentials cred;
 
 /**
  * Name of the configuration file to use.
@@ -71,24 +56,6 @@ static char *config_filename;
 
 
 /**
- * Function run on shutdown to unload the DB plugin.
- *
- * @param cls NULL
- */
-static void
-unload_db (void *cls)
-{
-  (void) cls;
-  if (NULL != dbc.plugin)
-  {
-    dbc.plugin->drop_tables (dbc.plugin->cls);
-    TALER_EXCHANGEDB_plugin_unload (dbc.plugin);
-    dbc.plugin = NULL;
-  }
-}
-
-
-/**
  * Collects all the tests.
  */
 static void
@@ -96,12 +63,13 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command all[] = {
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                              config_filename,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    // check no aggregation happens on a empty database
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-1"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_filename,
+                                    "-e",
+                                    NULL),
     CMD_EXEC_AGGREGATOR ("run-aggregator-on-empty-db",
                          config_filename),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-on-start"),
@@ -109,7 +77,7 @@ run (void *cls,
     /* check aggregation happens on the simplest case:
        one deposit into the database. */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-1",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -120,15 +88,15 @@ run (void *cls,
                          config_filename),
 
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-1",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.89",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-after-1"),
 
     /* check aggregation accumulates well. */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-2a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -137,7 +105,7 @@ run (void *cls,
                                       "EUR:0.1"),
 
     TALER_TESTING_cmd_insert_deposit ("do-deposit-2b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -149,15 +117,15 @@ run (void *cls,
                          config_filename),
 
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-2",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:1.79",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-after-2"),
 
     /* check that different merchants stem different aggregations. */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-3a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       "4",
                                       GNUNET_TIME_timestamp_get (),
@@ -165,7 +133,7 @@ run (void *cls,
                                       "EUR:1",
                                       "EUR:0.1"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-3b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       "5",
                                       GNUNET_TIME_timestamp_get (),
@@ -173,7 +141,7 @@ run (void *cls,
                                       "EUR:1",
                                       "EUR:0.1"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-3c",
-                                      &dbc,
+                                      cred.cfg,
                                       "alice",
                                       "4",
                                       GNUNET_TIME_timestamp_get (),
@@ -184,25 +152,25 @@ run (void *cls,
                          config_filename),
 
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3a",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.89",
-                                           bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/4"),
+                                           cred.exchange_payto,
+                                           "payto://x-taler-bank/localhost/4?receiver-name=4"),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3b",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.89",
-                                           bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/4"),
+                                           cred.exchange_payto,
+                                           "payto://x-taler-bank/localhost/4?receiver-name=4"),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3c",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.89",
-                                           bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/5"),
+                                           cred.exchange_payto,
+                                           "payto://x-taler-bank/localhost/5?receiver-name=5"),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-after-3"),
 
     /* checking that aggregator waits for the deadline. */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-4a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -212,7 +180,7 @@ run (void *cls,
                                       "EUR:0.2",
                                       "EUR:0.1"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-4b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -231,14 +199,14 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-4-delayed",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-4",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.19",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
 
     // test picking all deposits at earliest deadline
     TALER_TESTING_cmd_insert_deposit ("do-deposit-5a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -249,7 +217,7 @@ run (void *cls,
                                       "EUR:0.1"),
 
     TALER_TESTING_cmd_insert_deposit ("do-deposit-5b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -268,13 +236,13 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-5-delayed",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-5",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.19",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     /* Test NEVER running 'tiny' unless they make up minimum unit */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-6a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -286,7 +254,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-6a-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-6b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -294,7 +262,7 @@ run (void *cls,
                                       "EUR:0.102",
                                       "EUR:0.1"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-6c",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -306,7 +274,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-6c-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-6d",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -318,7 +286,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-6d-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-6e",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -328,14 +296,14 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-6e",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-6",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.01",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
 
     /* Test profiteering if wire deadline is short */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-7a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -347,7 +315,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-7a-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-7b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -357,14 +325,14 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-7-profit",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-7",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.01",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
 
     /* Now check profit was actually taken */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-7c",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -374,14 +342,14 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-7-loss",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-7",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.01",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
 
     /* Test that aggregation would happen fully if wire deadline is long */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-8a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -395,7 +363,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-8a-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-8b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -411,7 +379,7 @@ run (void *cls,
 
     /* now trigger aggregate with large transaction and short deadline */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-8c",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -421,14 +389,14 @@ run (void *cls,
     CMD_EXEC_AGGREGATOR ("run-aggregator-deposit-8",
                          config_filename),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-8",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.03",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
 
     /* Test aggregation with fees and rounding profits. */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-9a",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -442,7 +410,7 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_empty (
       "expect-empty-transactions-after-9a-tiny"),
     TALER_TESTING_cmd_insert_deposit ("do-deposit-9b",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -458,7 +426,7 @@ run (void *cls,
 
     /* now trigger aggregate with large transaction and short deadline */
     TALER_TESTING_cmd_insert_deposit ("do-deposit-9c",
-                                      &dbc,
+                                      cred.cfg,
                                       "bob",
                                       USER42_ACCOUNT,
                                       GNUNET_TIME_timestamp_get (),
@@ -469,49 +437,15 @@ run (void *cls,
                          config_filename),
     /* 0.009 + 0.009 + 0.022 - 0.001 - 0.002 - 0.008 = 0.029 => 0.02 */
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-9",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:0.01",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_end ()
   };
 
-  TALER_TESTING_run_with_fakebank (is,
-                                   all,
-                                   bc.exchange_auth.wire_gateway_url);
-}
-
-
-/**
- * Prepare database and launch the test.
- *
- * @param cls unused
- * @param is interpreter to use
- */
-static void
-prepare_database (void *cls,
-                  struct TALER_TESTING_Interpreter *is)
-{
-  dbc.plugin = TALER_EXCHANGEDB_plugin_load (is->cfg);
-  if (NULL == dbc.plugin)
-  {
-    GNUNET_break (0);
-    result = 77;
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  if (GNUNET_OK !=
-      dbc.plugin->preflight (dbc.plugin->cls))
-  {
-    GNUNET_break (0);
-    result = 77;
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  GNUNET_SCHEDULER_add_shutdown (&unload_db,
-                                 NULL);
-  run (NULL,
-       is);
+  TALER_TESTING_run (is,
+                     all);
 }
 
 
@@ -520,7 +454,6 @@ main (int argc,
       char *const argv[])
 {
   const char *plugin_name;
-  char *testname;
 
   if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
   {
@@ -528,52 +461,17 @@ main (int argc,
     return -1;
   }
   plugin_name++;
-  (void) GNUNET_asprintf (&testname,
-                          "test-taler-exchange-aggregator-%s",
-                          plugin_name);
   (void) GNUNET_asprintf (&config_filename,
-                          "%s.conf",
-                          testname);
-
-  GNUNET_log_setup ("test_taler_exchange_aggregator",
-                    "DEBUG",
-                    NULL);
-
-  /* these might get in the way */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-
-  TALER_TESTING_cleanup_files (config_filename);
-
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_exchange (config_filename,
-                                      GNUNET_YES,
-                                      &ec))
-  {
-    TALER_LOG_WARNING ("Could not prepare the exchange.\n");
-    return 77;
-  }
-
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_filename,
-                                      "exchange-account-1",
-                                      &bc))
-  {
-    TALER_LOG_WARNING ("Could not prepare the fakebank\n");
-    return 77;
-  }
-  result = GNUNET_OK;
-  if (GNUNET_OK !=
-      TALER_TESTING_setup_with_exchange (&prepare_database,
-                                         NULL,
-                                         config_filename))
-  {
-    TALER_LOG_WARNING ("Could not prepare database for tests.\n");
-    return result;
-  }
-  GNUNET_free (config_filename);
-  GNUNET_free (testname);
-  return GNUNET_OK == result ? 0 : 1;
+                          "test-taler-exchange-aggregator-%s.conf",
+                          plugin_name);
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_filename,
+                             "exchange-account-1",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json b/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json
deleted file mode 100644
index 21a7500b4..000000000
--- a/src/testing/test_taler_exchange_httpd_home/.config/taler/account-1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "payto_uri": "payto://x-taler-bank/localhost/2",
-  "master_sig": "HEWC1XDS0QZ53YQR451VRKD4N968NXWGZXS30HJ59MJ0PESACK1ZYPYCAT15P08WD58C7D7F6EVN26D59JKA75XEBDQCM8VYFETK82R"
-}
\ No newline at end of file
diff --git a/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv b/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index 394926938..000000000
--- a/src/testing/test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-p�^�-�33��X
X�!�\0q�����mU�_��
\ No newline at end of file
diff --git a/src/testing/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c
index ad5151e2d..86b616456 100644
--- a/src/testing/test_taler_exchange_wirewatch.c
+++ b/src/testing/test_taler_exchange_wirewatch.c
@@ -34,14 +34,9 @@
 
 
 /**
- * Bank configuration data.
+ * Our credentials.
  */
-static struct TALER_TESTING_BankConfiguration bc;
-
-/**
- * Helper structure to keep exchange configuration values.
- */
-static struct TALER_TESTING_ExchangeConfiguration ec;
+static struct TALER_TESTING_Credentials cred;
 
 /**
  * Name of the configuration file to use.
@@ -66,8 +61,8 @@ transfer_to_exchange (const char *label,
 {
   return TALER_TESTING_cmd_admin_add_incoming (label,
                                                amount,
-                                               &bc.exchange_auth,
-                                               bc.user42_payto);
+                                               &cred.ba,
+                                               cred.user42_payto);
 }
 
 
@@ -82,22 +77,19 @@ run (void *cls,
      struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command all[] = {
-    TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
-                                              config_filename,
-                                              "EUR:0.01",
-                                              "EUR:0.01",
-                                              "EUR:0.01"),
-    TALER_TESTING_cmd_auditor_add ("add-auditor-OK",
-                                   MHD_HTTP_NO_CONTENT,
-                                   false),
-    TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
-                                MHD_HTTP_NO_CONTENT,
-                                false),
-    TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
-                                              config_filename),
-    TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
-                                                1),
+    TALER_TESTING_cmd_run_fakebank ("run-fakebank",
+                                    cred.cfg,
+                                    "exchange-account-1"),
+    TALER_TESTING_cmd_system_start ("start-taler",
+                                    config_filename,
+                                    "-e",
+                                    "-u", "exchange-account-1",
+                                    NULL),
+    TALER_TESTING_cmd_get_exchange ("get-exchange",
+                                    cred.cfg,
+                                    NULL,
+                                    true,
+                                    true),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-on-start"),
     CMD_EXEC_AGGREGATOR ("run-aggregator-on-empty"),
     TALER_TESTING_cmd_exec_wirewatch ("run-wirewatch-on-empty",
@@ -112,8 +104,8 @@ run (void *cls,
     TALER_TESTING_cmd_check_bank_admin_transfer (
       "clear-good-transfer-to-the-exchange",
       "EUR:5",
-      bc.user42_payto,                                            // debit
-      bc.exchange_payto,                                            // credit
+      cred.user42_payto,                                            // debit
+      cred.exchange_payto,                                            // credit
       "run-transfer-good-to-exchange"),
 
     TALER_TESTING_cmd_exec_closer ("run-closer-non-expired-reserve",
@@ -136,18 +128,17 @@ run (void *cls,
 
     CMD_EXEC_AGGREGATOR ("run-closer-on-expired-reserve"),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-1",
-                                           ec.exchange_url,
+                                           cred.exchange_url,
                                            "EUR:4.99",
-                                           bc.exchange_payto,
-                                           bc.user42_payto),
+                                           cred.exchange_payto,
+                                           cred.user42_payto),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-2"),
     TALER_TESTING_cmd_end ()
   };
 
   (void) cls;
-  TALER_TESTING_run_with_fakebank (is,
-                                   all,
-                                   bc.exchange_auth.wire_gateway_url);
+  TALER_TESTING_run (is,
+                     all);
 }
 
 
@@ -155,69 +146,29 @@ int
 main (int argc,
       char *const argv[])
 {
-  const char *plugin_name;
-
   (void) argc;
-  /* these might get in the way */
-  unsetenv ("XDG_DATA_HOME");
-  unsetenv ("XDG_CONFIG_HOME");
-  GNUNET_log_setup ("test_taler_exchange_wirewatch",
-                    "DEBUG",
-                    NULL);
-
-  if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
   {
-    GNUNET_break (0);
-    return -1;
-  }
-  plugin_name++;
-  {
-    char *testname;
-
-    GNUNET_asprintf (&testname,
-                     "test-taler-exchange-wirewatch-%s",
-                     plugin_name);
+    const char *plugin_name;
+
+    plugin_name = strrchr (argv[0], (int) '-');
+    if (NULL == plugin_name)
+    {
+      GNUNET_break (0);
+      return -1;
+    }
+    plugin_name++;
     GNUNET_asprintf (&config_filename,
-                     "%s.conf",
-                     testname);
-    GNUNET_free (testname);
-  }
-  /* check database is working */
-  {
-    struct GNUNET_PQ_Context *conn;
-    struct GNUNET_PQ_ExecuteStatement es[] = {
-      GNUNET_PQ_EXECUTE_STATEMENT_END
-    };
-
-    conn = GNUNET_PQ_connect ("postgres:///talercheck",
-                              NULL,
-                              es,
-                              NULL);
-    if (NULL == conn)
-      return 77;
-    GNUNET_PQ_disconnect (conn);
-  }
-
-  TALER_TESTING_cleanup_files (config_filename);
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_exchange (config_filename,
-                                      GNUNET_YES,
-                                      &ec))
-  {
-    TALER_LOG_INFO ("Could not prepare the exchange\n");
-    return 77;
+                     "test-taler-exchange-wirewatch-%s.conf",
+                     plugin_name);
   }
-
-  if (GNUNET_OK !=
-      TALER_TESTING_prepare_fakebank (config_filename,
-                                      "exchange-account-1",
-                                      &bc))
-    return 77;
-
-  return (GNUNET_OK ==
-          TALER_TESTING_setup_with_exchange (&run,
-                                             NULL,
-                                             config_filename)) ? 0 : 1;
+  return TALER_TESTING_main (argv,
+                             "INFO",
+                             config_filename,
+                             "exchange-account-1",
+                             TALER_TESTING_BS_FAKEBANK,
+                             &cred,
+                             &run,
+                             NULL);
 }
 
 
diff --git a/src/testing/testing_api_cmd_age_withdraw.c b/src/testing/testing_api_cmd_age_withdraw.c
new file mode 100644
index 000000000..6ad22809e
--- /dev/null
+++ b/src/testing/testing_api_cmd_age_withdraw.c
@@ -0,0 +1,756 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_age_withdraw.c
+ * @brief implements the age-withdraw command
+ * @author Özgür Kesim
+ */
+
+#include "platform.h"
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_common.h>
+#include <microhttpd.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_signatures.h"
+#include "taler_extensions.h"
+#include "taler_testing_lib.h"
+
+/*
+ * The output state of coin
+ */
+struct CoinOutputState
+{
+
+  /**
+   * The calculated details during "age-withdraw", for the selected coin.
+   */
+  struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails details;
+
+  /**
+   * The (wanted) value of the coin, MUST be the same as input.denom_pub.value;
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Reserve history entry that corresponds to this coin.
+   * Will be of type #TALER_EXCHANGE_RTT_AGEWITHDRAWAL.
+   */
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
+};
+
+/**
+ * State for a "age withdraw" CMD:
+ */
+
+struct AgeWithdrawState
+{
+
+  /**
+   * Interpreter state (during command)
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * The age-withdraw handle
+   */
+  struct TALER_EXCHANGE_AgeWithdrawHandle *handle;
+
+  /**
+   * Exchange base URL.  Only used as offered trait.
+   */
+  char *exchange_url;
+
+  /**
+   * URI of the reserve we are withdrawing from.
+   */
+  char *reserve_payto_uri;
+
+  /**
+   * Private key of the reserve we are withdrawing from.
+   */
+  struct TALER_ReservePrivateKeyP reserve_priv;
+
+  /**
+   * Public key of the reserve we are withdrawing from.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Which reserve should we withdraw from?
+   */
+  const char *reserve_reference;
+
+  /**
+   * Expected HTTP response code to the request.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Age mask
+   */
+  struct TALER_AgeMask mask;
+
+  /**
+   * The maximum age we commit to
+   */
+  uint8_t max_age;
+
+  /**
+   * Number of coins to withdraw
+   */
+  size_t num_coins;
+
+  /**
+   * The @e num_coins input that is provided to the
+   * `TALER_EXCHANGE_age_withdraw` API.
+   * Each contains kappa secrets, from which we will have
+   * to disclose kappa-1 in a subsequent age-withdraw-reveal operation.
+   */
+  struct TALER_EXCHANGE_AgeWithdrawCoinInput *coin_inputs;
+
+  /**
+   * The output state of @e num_coins coins, calculated during the
+   * "age-withdraw" operation.
+   */
+  struct CoinOutputState *coin_outputs;
+
+  /**
+   * The index returned by the exchange for the "age-withdraw" operation,
+   * of the kappa coin candidates that we do not disclose and keep.
+   */
+  uint8_t noreveal_index;
+
+  /**
+   * The blinded hashes of the non-revealed (to keep) @e num_coins coins.
+   */
+  const struct TALER_BlindedCoinHashP *blinded_coin_hs;
+
+  /**
+   * The hash of the commitment, needed for the reveal step.
+   */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+  /**
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC.
+   */
+  uint64_t requirement_row;
+
+};
+
+/**
+ * Callback for the "age-withdraw" ooperation;  It checks that the response
+ * code is expected and store the exchange signature in the state.
+ *
+ * @param cls Closure of type `struct AgeWithdrawState *`
+ * @param response Response details
+ */
+static void
+age_withdraw_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_AgeWithdrawResponse *response)
+{
+  struct AgeWithdrawState *aws = cls;
+  struct TALER_TESTING_Interpreter *is = aws->is;
+
+  aws->handle = NULL;
+  if (aws->expected_response_code != response->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status_with_body (is,
+                                               response->hr.http_status,
+                                               aws->expected_response_code,
+                                               response->hr.reply);
+    return;
+  }
+
+  switch (response->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    aws->noreveal_index = response->details.ok.noreveal_index;
+    aws->h_commitment = response->details.ok.h_commitment;
+
+    GNUNET_assert (aws->num_coins == response->details.ok.num_coins);
+    for (size_t n = 0; n < aws->num_coins; n++)
+    {
+      aws->coin_outputs[n].details = response->details.ok.coin_details[n];
+      TALER_age_commitment_proof_deep_copy (
+        &response->details.ok.coin_details[n].age_commitment_proof,
+        &aws->coin_outputs[n].details.age_commitment_proof);
+    }
+    aws->blinded_coin_hs = response->details.ok.blinded_coin_hs;
+    break;
+  case MHD_HTTP_FORBIDDEN:
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_GONE:
+    /* nothing to check */
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* TODO[oec]: Add this to the response-type and handle it here */
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+  default:
+    /* Unsupported status code (by test harness) */
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "test command for age-withdraw not support status code %u, body:\n"
+                ">>%s<<\n",
+                response->hr.http_status,
+                json_dumps (response->hr.reply, JSON_INDENT (2)));
+    GNUNET_break (0);
+    break;
+  }
+
+  /* We are done with this command, pick the next one */
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command for age-withdraw.
+ */
+static void
+age_withdraw_run (
+  void *cls,
+  const struct TALER_TESTING_Command *cmd,
+  struct TALER_TESTING_Interpreter *is)
+{
+  struct AgeWithdrawState *aws = cls;
+  struct TALER_EXCHANGE_Keys *keys = TALER_TESTING_get_keys (is);
+  const struct TALER_ReservePrivateKeyP *rp;
+  const struct TALER_TESTING_Command *create_reserve;
+  const struct TALER_EXCHANGE_DenomPublicKey *dpk;
+
+  aws->is = is;
+
+  /* Prepare the reserve related data */
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (
+        is,
+        aws->reserve_reference);
+
+  if (NULL == create_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+                                            &rp))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (NULL == aws->exchange_url)
+    aws->exchange_url
+      = GNUNET_strdup (TALER_TESTING_get_exchange_url (is));
+  aws->reserve_priv = *rp;
+  GNUNET_CRYPTO_eddsa_key_get_public (&aws->reserve_priv.eddsa_priv,
+                                      &aws->reserve_pub.eddsa_pub);
+  aws->reserve_payto_uri
+    = TALER_reserve_make_payto (aws->exchange_url,
+                                &aws->reserve_pub);
+
+  aws->coin_inputs = GNUNET_new_array (
+    aws->num_coins,
+    struct TALER_EXCHANGE_AgeWithdrawCoinInput);
+
+  for (unsigned int i = 0; i<aws->num_coins; i++)
+  {
+    struct TALER_EXCHANGE_AgeWithdrawCoinInput *input = &aws->coin_inputs[i];
+    struct CoinOutputState *cos = &aws->coin_outputs[i];
+
+    /* randomly create the secrets for the kappa coin-candidates */
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &input->secrets,
+                                sizeof(input->secrets));
+    /* Find denomination */
+    dpk = TALER_TESTING_find_pk (keys,
+                                 &cos->amount,
+                                 true); /* _always_ use denominations with age-striction */
+    if (NULL == dpk)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to determine denomination key for amount at %s\n",
+                  (NULL != cmd) ? cmd->label : "<retried command>");
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    /* We copy the denomination key, as re-querying /keys
+     * would free the old one. */
+    input->denom_pub = TALER_EXCHANGE_copy_denomination_key (dpk);
+    cos->reserve_history.type = TALER_EXCHANGE_RTT_AGEWITHDRAWAL;
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&cos->reserve_history.amount,
+                                     &cos->amount,
+                                     &input->denom_pub->fees.withdraw));
+    cos->reserve_history.details.withdraw.fee = input->denom_pub->fees.withdraw;
+  }
+
+  /* Execute the age-withdraw protocol */
+  aws->handle =
+    TALER_EXCHANGE_age_withdraw (
+      TALER_TESTING_interpreter_get_context (is),
+      keys,
+      TALER_TESTING_get_exchange_url (is),
+      rp,
+      aws->num_coins,
+      aws->coin_inputs,
+      aws->max_age,
+      &age_withdraw_cb,
+      aws);
+
+  if (NULL == aws->handle)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "age withdraw" CMD, and possibly cancel a
+ * pending operation thereof
+ *
+ * @param cls Closure of type `struct AgeWithdrawState`
+ * @param cmd The command being freed.
+ */
+static void
+age_withdraw_cleanup (
+  void *cls,
+  const struct TALER_TESTING_Command *cmd)
+{
+  struct AgeWithdrawState *aws = cls;
+
+  if (NULL != aws->handle)
+  {
+    TALER_TESTING_command_incomplete (aws->is,
+                                      cmd->label);
+    TALER_EXCHANGE_age_withdraw_cancel (aws->handle);
+    aws->handle = NULL;
+  }
+
+  if (NULL != aws->coin_inputs)
+  {
+    for (size_t n = 0; n < aws->num_coins; n++)
+    {
+      struct TALER_EXCHANGE_AgeWithdrawCoinInput *in = &aws->coin_inputs[n];
+      struct CoinOutputState *out = &aws->coin_outputs[n];
+
+      if (NULL != in && NULL != in->denom_pub)
+      {
+        TALER_EXCHANGE_destroy_denomination_key (in->denom_pub);
+        in->denom_pub = NULL;
+      }
+      if (NULL != out)
+        TALER_age_commitment_proof_free (&out->details.age_commitment_proof);
+    }
+    GNUNET_free (aws->coin_inputs);
+  }
+  GNUNET_free (aws->coin_outputs);
+  GNUNET_free (aws->exchange_url);
+  GNUNET_free (aws->reserve_payto_uri);
+  GNUNET_free (aws);
+}
+
+
+/**
+ * Offer internal data of a "age withdraw" CMD state to other commands.
+ *
+ * @param cls Closure of type `struct AgeWithdrawState`
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param idx index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+age_withdraw_traits (
+  void *cls,
+  const void **ret,
+  const char *trait,
+  unsigned int idx)
+{
+  struct AgeWithdrawState *aws = cls;
+  uint8_t k = aws->noreveal_index;
+  struct TALER_EXCHANGE_AgeWithdrawCoinInput *in = &aws->coin_inputs[idx];
+  struct CoinOutputState *out = &aws->coin_outputs[idx];
+  struct TALER_EXCHANGE_AgeWithdrawCoinPrivateDetails *details =
+    &aws->coin_outputs[idx].details;
+  struct TALER_TESTING_Trait traits[] = {
+    /* history entry MUST be first due to response code logic below! */
+    TALER_TESTING_make_trait_reserve_history (idx,
+                                              &out->reserve_history),
+    TALER_TESTING_make_trait_denom_pub (idx,
+                                        in->denom_pub),
+    TALER_TESTING_make_trait_reserve_priv (&aws->reserve_priv),
+    TALER_TESTING_make_trait_reserve_pub (&aws->reserve_pub),
+    TALER_TESTING_make_trait_amounts (idx,
+                                      &out->amount),
+    /* TODO[oec]: add legal requirement to response and handle it here, as well
+    TALER_TESTING_make_trait_legi_requirement_row (&aws->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&aws->h_payto),
+    */
+    TALER_TESTING_make_trait_h_blinded_coin (idx,
+                                             &aws->blinded_coin_hs[idx]),
+    TALER_TESTING_make_trait_payto_uri (aws->reserve_payto_uri),
+    TALER_TESTING_make_trait_exchange_url (aws->exchange_url),
+    TALER_TESTING_make_trait_coin_priv (idx,
+                                        &details->coin_priv),
+    TALER_TESTING_make_trait_planchet_secrets (idx,
+                                               &in->secrets[k]),
+    TALER_TESTING_make_trait_blinding_key (idx,
+                                           &details->blinding_key),
+    TALER_TESTING_make_trait_exchange_wd_value (idx,
+                                                &details->alg_values),
+    TALER_TESTING_make_trait_age_commitment_proof (
+      idx,
+      &details->age_commitment_proof),
+    TALER_TESTING_make_trait_h_age_commitment (
+      idx,
+      &details->h_age_commitment),
+  };
+
+  if (idx >= aws->num_coins)
+    return GNUNET_NO;
+
+  return TALER_TESTING_get_trait ((aws->expected_response_code == MHD_HTTP_OK)
+                                  ? &traits[0] /* we have reserve history */
+                                  : &traits[1], /* skip reserve history */
+                                  ret,
+                                  trait,
+                                  idx);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_age_withdraw (const char *label,
+                                const char *reserve_reference,
+                                uint8_t max_age,
+                                unsigned int expected_response_code,
+                                const char *amount,
+                                ...)
+{
+  struct AgeWithdrawState *aws;
+  unsigned int cnt;
+  va_list ap;
+
+  aws = GNUNET_new (struct AgeWithdrawState);
+  aws->reserve_reference = reserve_reference;
+  aws->expected_response_code = expected_response_code;
+  aws->mask = TALER_extensions_get_age_restriction_mask ();
+  aws->max_age = TALER_get_lowest_age (&aws->mask, max_age);
+
+  cnt = 1;
+  va_start (ap, amount);
+  while (NULL != (va_arg (ap, const char *)))
+    cnt++;
+  aws->num_coins = cnt;
+  aws->coin_outputs = GNUNET_new_array (cnt,
+                                        struct CoinOutputState);
+  va_end (ap);
+  va_start (ap, amount);
+
+  for (unsigned int i = 0; i<aws->num_coins; i++)
+  {
+    struct CoinOutputState *out = &aws->coin_outputs[i];
+    if (GNUNET_OK !=
+        TALER_string_to_amount (amount,
+                                &out->amount))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to parse amount `%s' at %s\n",
+                  amount,
+                  label);
+      GNUNET_assert (0);
+    }
+    /* move on to next vararg! */
+    amount = va_arg (ap, const char *);
+  }
+
+  GNUNET_assert (NULL == amount);
+  va_end (ap);
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = aws,
+      .label = label,
+      .run = &age_withdraw_run,
+      .cleanup = &age_withdraw_cleanup,
+      .traits = &age_withdraw_traits,
+    };
+
+    return cmd;
+  }
+}
+
+
+/**
+ * The state for the age-withdraw-reveal operation
+ */
+struct AgeWithdrawRevealState
+{
+  /**
+   * The reference to the CMD resembling the previous call to age-withdraw
+   */
+  const char *age_withdraw_reference;
+
+  /**
+   * The state to the previous age-withdraw command
+   */
+  const struct AgeWithdrawState *aws;
+
+  /**
+   * The expected response code from the call to the
+   * age-withdraw-reveal operation
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Interpreter state (during command)
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * The handle to the reveal-operation
+   */
+  struct TALER_EXCHANGE_AgeWithdrawRevealHandle *handle;
+
+
+  /**
+   * Number of coins, extracted form the age withdraw command
+   */
+  size_t num_coins;
+
+  /**
+   * The signatures of the @e num_coins coins returned
+   */
+  struct TALER_DenominationSignature *denom_sigs;
+
+};
+
+/*
+ * Callback for the reveal response
+ *
+ * @param cls Closure of type `struct AgeWithdrawRevealState`
+ * @param awr The response
+ */
+static void
+age_withdraw_reveal_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_AgeWithdrawRevealResponse *response)
+{
+  struct AgeWithdrawRevealState *awrs = cls;
+  struct TALER_TESTING_Interpreter *is = awrs->is;
+
+  awrs->handle = NULL;
+  if (awrs->expected_response_code != response->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status_with_body (is,
+                                               response->hr.http_status,
+                                               awrs->expected_response_code,
+                                               response->hr.reply);
+    return;
+  }
+  switch (response->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    {
+      const struct AgeWithdrawState *aws = awrs->aws;
+      GNUNET_assert (awrs->num_coins == response->details.ok.num_sigs);
+      awrs->denom_sigs = GNUNET_new_array (awrs->num_coins,
+                                           struct TALER_DenominationSignature);
+      for (size_t n = 0; n < awrs->num_coins; n++)
+      {
+        GNUNET_assert (GNUNET_OK ==
+                       TALER_denom_sig_unblind (
+                         &awrs->denom_sigs[n],
+                         &response->details.ok.blinded_denom_sigs[n],
+                         &aws->coin_outputs[n].details.blinding_key,
+                         &aws->coin_outputs[n].details.h_coin_pub,
+                         &aws->coin_outputs[n].details.alg_values,
+                         &aws->coin_inputs[n].denom_pub->key));
+        TALER_denom_sig_free (&awrs->denom_sigs[n]);
+      }
+
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "age-withdraw reveal success!\n");
+      GNUNET_free (awrs->denom_sigs);
+    }
+    break;
+  case MHD_HTTP_NOT_FOUND:
+  case MHD_HTTP_FORBIDDEN:
+    /* nothing to check */
+    break;
+  /* TODO[oec]: handle more cases !? */
+  default:
+    /* Unsupported status code (by test harness) */
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Age withdraw reveal test command does not support status code %u\n",
+                response->hr.http_status);
+    GNUNET_break (0);
+    break;
+  }
+
+  /* We are done with this command, pick the next one */
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command for age-withdraw-reveal
+ */
+static void
+age_withdraw_reveal_run (
+  void *cls,
+  const struct TALER_TESTING_Command *cmd,
+  struct TALER_TESTING_Interpreter *is)
+{
+  struct AgeWithdrawRevealState *awrs = cls;
+  const struct TALER_TESTING_Command *age_withdraw_cmd;
+  const struct AgeWithdrawState *aws;
+
+  (void) cmd;
+  awrs->is = is;
+
+  /*
+   * Get the command and state for the previous call to "age witdraw"
+   */
+  age_withdraw_cmd  =
+    TALER_TESTING_interpreter_lookup_command (is,
+                                              awrs->age_withdraw_reference);
+  if (NULL == age_withdraw_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (age_withdraw_cmd->run == age_withdraw_run);
+  aws = age_withdraw_cmd->cls;
+  awrs->aws = aws;
+  awrs->num_coins = aws->num_coins;
+
+  awrs->handle =
+    TALER_EXCHANGE_age_withdraw_reveal (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      aws->num_coins,
+      aws->coin_inputs,
+      aws->noreveal_index,
+      &aws->h_commitment,
+      &aws->reserve_pub,
+      age_withdraw_reveal_cb,
+      awrs);
+}
+
+
+/**
+ * Free the state of a "age-withdraw-reveal" CMD, and possibly
+ * cancel a pending operation thereof
+ *
+ * @param cls Closure of type `struct AgeWithdrawRevealState`
+ * @param cmd The command being freed.
+ */
+static void
+age_withdraw_reveal_cleanup (
+  void *cls,
+  const struct TALER_TESTING_Command *cmd)
+{
+  struct AgeWithdrawRevealState *awrs = cls;
+
+  if (NULL != awrs->handle)
+  {
+    TALER_TESTING_command_incomplete (awrs->is,
+                                      cmd->label);
+    TALER_EXCHANGE_age_withdraw_reveal_cancel (awrs->handle);
+    awrs->handle = NULL;
+  }
+  GNUNET_free (awrs->denom_sigs);
+  awrs->denom_sigs = NULL;
+  GNUNET_free (awrs);
+}
+
+
+/**
+ * Offer internal data of a "age withdraw reveal" CMD state to other commands.
+ *
+ * @param cls Closure of they `struct AgeWithdrawRevealState`
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param idx index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+age_withdraw_reveal_traits (
+  void *cls,
+  const void **ret,
+  const char *trait,
+  unsigned int idx)
+{
+  struct AgeWithdrawRevealState *awrs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_denom_sig (idx,
+                                        &awrs->denom_sigs[idx]),
+    /* FIXME: shall we provide the traits from the previous
+     * call to "age withdraw" as well? */
+  };
+
+  if (idx >= awrs->num_coins)
+    return GNUNET_NO;
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  idx);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_age_withdraw_reveal (
+  const char *label,
+  const char *age_withdraw_reference,
+  unsigned int expected_response_code)
+{
+  struct AgeWithdrawRevealState *awrs =
+    GNUNET_new (struct AgeWithdrawRevealState);
+
+  awrs->age_withdraw_reference = age_withdraw_reference;
+  awrs->expected_response_code = expected_response_code;
+
+  struct TALER_TESTING_Command cmd = {
+    .cls = awrs,
+    .label = label,
+    .run = age_withdraw_reveal_run,
+    .cleanup = age_withdraw_reveal_cleanup,
+    .traits = age_withdraw_reveal_traits,
+  };
+
+  return cmd;
+}
+
+
+/* end of testing_api_cmd_age_withdraw.c */
diff --git a/src/testing/testing_api_cmd_auditor_add.c b/src/testing/testing_api_cmd_auditor_add.c
index 8362b66c9..ac9c2c8fb 100644
--- a/src/testing/testing_api_cmd_auditor_add.c
+++ b/src/testing/testing_api_cmd_auditor_add.c
@@ -18,7 +18,7 @@
 */
 /**
  * @file testing/testing_api_cmd_auditor_add.c
- * @brief command for testing /auditor_add.
+ * @brief command for testing auditor_add
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -62,27 +62,22 @@ struct AuditorAddState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param aer response details
  */
 static void
-auditor_add_cb (void *cls,
-                const struct TALER_EXCHANGE_HttpResponse *hr)
+auditor_add_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementAuditorEnableResponse *aer)
 {
   struct AuditorAddState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &aer->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -104,10 +99,43 @@ auditor_add_run (void *cls,
   struct AuditorAddState *ds = cls;
   struct GNUNET_TIME_Timestamp now;
   struct TALER_MasterSignatureP master_sig;
+  const struct TALER_AuditorPublicKeyP *auditor_pub;
+  const struct TALER_TESTING_Command *auditor_cmd;
+  const struct TALER_TESTING_Command *exchange_cmd;
+  const char *exchange_url;
+  const char *auditor_url;
 
   (void) cmd;
   now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
+
+  auditor_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                       "auditor");
+  if (NULL == auditor_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_auditor_pub (auditor_cmd,
+                                                      &auditor_pub));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_auditor_url (auditor_cmd,
+                                                      &auditor_url));
+  exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                        "exchange");
+  if (NULL == exchange_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                       &exchange_url));
+
+
   if (ds->bad_sig)
   {
     memset (&master_sig,
@@ -116,17 +144,22 @@ auditor_add_run (void *cls,
   }
   else
   {
-    TALER_exchange_offline_auditor_add_sign (&is->auditor_pub,
-                                             is->auditor_url,
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
+    TALER_exchange_offline_auditor_add_sign (auditor_pub,
+                                             auditor_url,
                                              now,
-                                             &is->master_priv,
+                                             master_priv,
                                              &master_sig);
   }
   ds->dh = TALER_EXCHANGE_management_enable_auditor (
-    is->ctx,
-    is->exchange_url,
-    &is->auditor_pub,
-    is->auditor_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    auditor_pub,
+    auditor_url,
     "test-case auditor", /* human-readable auditor name */
     now,
     &master_sig,
@@ -156,10 +189,8 @@ auditor_add_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_enable_auditor_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_auditor_add_denom_sig.c b/src/testing/testing_api_cmd_auditor_add_denom_sig.c
index 3d7ea82f1..6b7776896 100644
--- a/src/testing/testing_api_cmd_auditor_add_denom_sig.c
+++ b/src/testing/testing_api_cmd_auditor_add_denom_sig.c
@@ -67,27 +67,22 @@ struct AuditorAddDenomSigState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param adr response details
  */
 static void
-denom_sig_add_cb (void *cls,
-                  const struct TALER_EXCHANGE_HttpResponse *hr)
+denom_sig_add_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_AuditorAddDenominationResponse *adr)
 {
   struct AuditorAddDenomSigState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &adr->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -110,6 +105,11 @@ auditor_add_run (void *cls,
   struct TALER_AuditorSignatureP auditor_sig;
   struct TALER_DenominationHashP h_denom_pub;
   const struct TALER_EXCHANGE_DenomPublicKey *dk;
+  const struct TALER_AuditorPublicKeyP *auditor_pub;
+  const struct TALER_TESTING_Command *auditor_cmd;
+  const struct TALER_TESTING_Command *exchange_cmd;
+  const char *exchange_url;
+  const char *auditor_url;
 
   (void) cmd;
   /* Get denom pub from trait */
@@ -118,7 +118,6 @@ auditor_add_run (void *cls,
 
     denom_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                           ds->denom_ref);
-
     if (NULL == denom_cmd)
     {
       GNUNET_break (0);
@@ -131,6 +130,31 @@ auditor_add_run (void *cls,
                                                       &dk));
   }
   ds->is = is;
+  auditor_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                       "auditor");
+  if (NULL == auditor_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_auditor_pub (auditor_cmd,
+                                                      &auditor_pub));
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_auditor_url (auditor_cmd,
+                                                      &auditor_url));
+  exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                        "exchange");
+  if (NULL == exchange_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                       &exchange_url));
   if (ds->bad_sig)
   {
     memset (&auditor_sig,
@@ -139,28 +163,33 @@ auditor_add_run (void *cls,
   }
   else
   {
-    struct TALER_MasterPublicKeyP master_pub;
+    const struct TALER_MasterPublicKeyP *master_pub;
+    const struct TALER_AuditorPrivateKeyP *auditor_priv;
 
-    GNUNET_CRYPTO_eddsa_key_get_public (&is->master_priv.eddsa_priv,
-                                        &master_pub.eddsa_pub);
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_pub (exchange_cmd,
+                                                       &master_pub));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_auditor_priv (auditor_cmd,
+                                                         &auditor_priv));
     TALER_auditor_denom_validity_sign (
-      is->auditor_url,
+      auditor_url,
       &dk->h_key,
-      &master_pub,
+      master_pub,
       dk->valid_from,
       dk->withdraw_valid_until,
       dk->expire_deposit,
       dk->expire_legal,
       &dk->value,
       &dk->fees,
-      &is->auditor_priv,
+      auditor_priv,
       &auditor_sig);
   }
   ds->dh = TALER_EXCHANGE_add_auditor_denomination (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     &h_denom_pub,
-    &is->auditor_pub,
+    auditor_pub,
     &auditor_sig,
     &denom_sig_add_cb,
     ds);
@@ -188,10 +217,8 @@ auditor_add_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_add_auditor_denomination_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_auditor_del.c b/src/testing/testing_api_cmd_auditor_del.c
index de03d1632..8256bc1c7 100644
--- a/src/testing/testing_api_cmd_auditor_del.c
+++ b/src/testing/testing_api_cmd_auditor_del.c
@@ -62,27 +62,23 @@ struct AuditorDelState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param adr response details
  */
 static void
-auditor_del_cb (void *cls,
-                const struct TALER_EXCHANGE_HttpResponse *hr)
+auditor_del_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ManagementAuditorDisableResponse *adr)
+
 {
   struct AuditorDelState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &adr->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -104,10 +100,36 @@ auditor_del_run (void *cls,
   struct AuditorDelState *ds = cls;
   struct TALER_MasterSignatureP master_sig;
   struct GNUNET_TIME_Timestamp now;
+  const struct TALER_AuditorPublicKeyP *auditor_pub;
+  const struct TALER_TESTING_Command *auditor_cmd;
+  const struct TALER_TESTING_Command *exchange_cmd;
+  const char *exchange_url;
 
   (void) cmd;
   now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
+  auditor_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                       "auditor");
+  if (NULL == auditor_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_auditor_pub (auditor_cmd,
+                                                      &auditor_pub));
+  exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                        "exchange");
+  if (NULL == exchange_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                       &exchange_url));
   if (ds->bad_sig)
   {
     memset (&master_sig,
@@ -116,15 +138,20 @@ auditor_del_run (void *cls,
   }
   else
   {
-    TALER_exchange_offline_auditor_del_sign (&is->auditor_pub,
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
+    TALER_exchange_offline_auditor_del_sign (auditor_pub,
                                              now,
-                                             &is->master_priv,
+                                             master_priv,
                                              &master_sig);
   }
   ds->dh = TALER_EXCHANGE_management_disable_auditor (
-    is->ctx,
-    is->exchange_url,
-    &is->auditor_pub,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    auditor_pub,
     now,
     &master_sig,
     &auditor_del_cb,
@@ -153,10 +180,8 @@ auditor_del_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_disable_auditor_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
index d99b12937..9477a5d7e 100644
--- a/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
+++ b/src/testing/testing_api_cmd_auditor_deposit_confirmation.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018, 2021 Taler Systems SA
+  Copyright (C) 2018-2023 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
@@ -59,9 +59,9 @@ struct DepositConfirmationState
   const char *amount_without_fee;
 
   /**
-   * Which coin of the @e deposit_reference should we confirm.
+   * How many coins were there in the @e deposit_reference?
    */
-  unsigned int coin_index;
+  unsigned int num_coins;
 
   /**
    * DepositConfirmation handle while operation is running.
@@ -69,11 +69,6 @@ struct DepositConfirmationState
   struct TALER_AUDITOR_DepositConfirmationHandle *dc;
 
   /**
-   * Auditor connection.
-   */
-  struct TALER_AUDITOR_Handle *auditor;
-
-  /**
    * Interpreter state.
    */
   struct TALER_TESTING_Interpreter *is;
@@ -125,8 +120,7 @@ do_retry (void *cls)
   struct DepositConfirmationState *dcs = cls;
 
   dcs->retry_task = NULL;
-  dcs->is->commands[dcs->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (dcs->is);
   deposit_confirmation_run (dcs,
                             NULL,
                             dcs->is);
@@ -138,13 +132,15 @@ do_retry (void *cls)
  * to check if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param dcr response details
  */
 static void
-deposit_confirmation_cb (void *cls,
-                         const struct TALER_AUDITOR_HttpResponse *hr)
+deposit_confirmation_cb (
+  void *cls,
+  const struct TALER_AUDITOR_DepositConfirmationResponse *dcr)
 {
   struct DepositConfirmationState *dcs = cls;
+  const struct TALER_AUDITOR_HttpResponse *hr = &dcr->hr;
 
   dcs->dc = NULL;
   if (dcs->expected_response_code != hr->http_status)
@@ -166,21 +162,16 @@ deposit_confirmation_cb (void *cls,
         else
           dcs->backoff = GNUNET_TIME_randomized_backoff (dcs->backoff,
                                                          MAX_BACKOFF);
-        dcs->is->commands[dcs->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (dcs->is);
         dcs->retry_task = GNUNET_SCHEDULER_add_delayed (dcs->backoff,
                                                         &do_retry,
                                                         dcs);
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                dcs->is->commands[dcs->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply, stderr, 0);
-    TALER_TESTING_interpreter_fail (dcs->is);
+    TALER_TESTING_unexpected_status (dcs->is,
+                                     hr->http_status,
+                                     dcs->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (dcs->is);
@@ -199,7 +190,7 @@ deposit_confirmation_run (void *cls,
                           const struct TALER_TESTING_Command *cmd,
                           struct TALER_TESTING_Interpreter *is)
 {
-  static struct TALER_ExtensionContractHashP no_h_extensions;
+  static struct TALER_ExtensionPolicyHashP no_h_policy;
   struct DepositConfirmationState *dcs = cls;
   const struct TALER_TESTING_Command *deposit_cmd;
   struct TALER_MerchantWireHashP h_wire;
@@ -210,20 +201,43 @@ deposit_confirmation_run (void *cls,
   struct GNUNET_TIME_Timestamp refund_deadline
     = GNUNET_TIME_UNIT_ZERO_TS;
   struct TALER_Amount amount_without_fee;
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  struct TALER_CoinSpendPublicKeyP coin_pubs[dcs->num_coins];
+  const struct TALER_CoinSpendPublicKeyP *coin_pubps[dcs->num_coins];
+  const struct TALER_CoinSpendSignatureP *coin_sigps[dcs->num_coins];
   const struct TALER_MerchantPrivateKeyP *merchant_priv;
   struct TALER_MerchantPublicKeyP merchant_pub;
   const struct TALER_ExchangePublicKeyP *exchange_pub;
   const struct TALER_ExchangeSignatureP *exchange_sig;
   const json_t *wire_details;
   const json_t *contract_terms;
-  const struct TALER_CoinSpendPrivateKeyP *coin_priv;
   const struct TALER_EXCHANGE_Keys *keys;
   const struct TALER_EXCHANGE_SigningPublicKey *spk;
+  const char *auditor_url;
 
   (void) cmd;
   dcs->is = is;
   GNUNET_assert (NULL != dcs->deposit_reference);
+  {
+    const struct TALER_TESTING_Command *auditor_cmd;
+
+    auditor_cmd
+      = TALER_TESTING_interpreter_get_command (is,
+                                               "auditor");
+    if (NULL == auditor_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_auditor_url (auditor_cmd,
+                                             &auditor_url))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+  }
   deposit_cmd
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 dcs->deposit_reference);
@@ -236,22 +250,22 @@ deposit_confirmation_run (void *cls,
 
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_exchange_pub (deposit_cmd,
-                                                       dcs->coin_index,
+                                                       0,
                                                        &exchange_pub));
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_exchange_sig (deposit_cmd,
-                                                       dcs->coin_index,
+                                                       0,
                                                        &exchange_sig));
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_timestamp (deposit_cmd,
-                                                    dcs->coin_index,
+                                                    0,
                                                     &exchange_timestamp));
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_wire_deadline (deposit_cmd,
-                                                        dcs->coin_index,
+                                                        0,
                                                         &wire_deadline));
   GNUNET_assert (NULL != exchange_timestamp);
-  keys = TALER_EXCHANGE_get_keys (dcs->is->exchange);
+  keys = TALER_TESTING_get_keys (is);
   GNUNET_assert (NULL != keys);
   spk = TALER_EXCHANGE_get_signing_key_info (keys,
                                              exchange_pub);
@@ -270,12 +284,23 @@ deposit_confirmation_run (void *cls,
   GNUNET_assert (GNUNET_OK ==
                  TALER_JSON_merchant_wire_signature_hash (wire_details,
                                                           &h_wire));
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_TESTING_get_trait_coin_priv (deposit_cmd,
-                                                    dcs->coin_index,
-                                                    &coin_priv));
-  GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
-                                      &coin_pub.eddsa_pub);
+
+  for (unsigned int i = 0; i<dcs->num_coins; i++)
+  {
+    const struct TALER_CoinSpendPrivateKeyP *coin_priv;
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_coin_priv (deposit_cmd,
+                                                      i,
+                                                      &coin_priv));
+    GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                        &coin_pubs[i].eddsa_pub);
+    coin_pubps[i] = &coin_pubs[i];
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_coin_sig (deposit_cmd,
+                                                     i,
+                                                     &coin_sigps[i]));
+  }
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_merchant_priv (deposit_cmd,
                                                         &merchant_priv));
@@ -308,25 +333,29 @@ deposit_confirmation_run (void *cls,
     if (GNUNET_TIME_absolute_is_zero (refund_deadline.abs_time))
       refund_deadline = timestamp;
   }
-  dcs->dc = TALER_AUDITOR_deposit_confirmation (dcs->auditor,
-                                                &h_wire,
-                                                &no_h_extensions,
-                                                &h_contract_terms,
-                                                *exchange_timestamp,
-                                                *wire_deadline,
-                                                refund_deadline,
-                                                &amount_without_fee,
-                                                &coin_pub,
-                                                &merchant_pub,
-                                                exchange_pub,
-                                                exchange_sig,
-                                                &keys->master_pub,
-                                                spk->valid_from,
-                                                spk->valid_until,
-                                                spk->valid_legal,
-                                                &spk->master_sig,
-                                                &deposit_confirmation_cb,
-                                                dcs);
+  dcs->dc = TALER_AUDITOR_deposit_confirmation (
+    TALER_TESTING_interpreter_get_context (is),
+    auditor_url,
+    &h_wire,
+    &no_h_policy,
+    &h_contract_terms,
+    *exchange_timestamp,
+    *wire_deadline,
+    refund_deadline,
+    &amount_without_fee,
+    dcs->num_coins,
+    coin_pubps,
+    coin_sigps,
+    &merchant_pub,
+    exchange_pub,
+    exchange_sig,
+    &keys->master_pub,
+    spk->valid_from,
+    spk->valid_until,
+    spk->valid_legal,
+    &spk->master_sig,
+    &deposit_confirmation_cb,
+    dcs);
 
   if (NULL == dcs->dc)
   {
@@ -353,10 +382,8 @@ deposit_confirmation_cleanup (void *cls,
 
   if (NULL != dcs->dc)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                dcs->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (dcs->is,
+                                      cmd->label);
     TALER_AUDITOR_deposit_confirmation_cancel (dcs->dc);
     dcs->dc = NULL;
   }
@@ -371,18 +398,16 @@ deposit_confirmation_cleanup (void *cls,
 
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_deposit_confirmation (const char *label,
-                                        struct TALER_AUDITOR_Handle *auditor,
                                         const char *deposit_reference,
-                                        unsigned int coin_index,
+                                        unsigned int num_coins,
                                         const char *amount_without_fee,
                                         unsigned int expected_response_code)
 {
   struct DepositConfirmationState *dcs;
 
   dcs = GNUNET_new (struct DepositConfirmationState);
-  dcs->auditor = auditor;
   dcs->deposit_reference = deposit_reference;
-  dcs->coin_index = coin_index;
+  dcs->num_coins = num_coins;
   dcs->amount_without_fee = amount_without_fee;
   dcs->expected_response_code = expected_response_code;
 
diff --git a/src/testing/testing_api_cmd_auditor_exchanges.c b/src/testing/testing_api_cmd_auditor_exchanges.c
deleted file mode 100644
index 1e412b2d1..000000000
--- a/src/testing/testing_api_cmd_auditor_exchanges.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2018 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/>
-*/
-/**
- * @file testing/testing_api_cmd_auditor_exchanges.c
- * @brief command for testing /exchanges of the auditor
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_auditor_service.h"
-#include "taler_testing_lib.h"
-#include "taler_signatures.h"
-#include "backoff.h"
-
-/**
- * How long do we wait AT MOST when retrying?
- */
-#define MAX_BACKOFF GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_MILLISECONDS, 100)
-
-
-/**
- * How often do we retry before giving up?
- */
-#define NUM_RETRIES 5
-
-
-/**
- * State for a "deposit confirmation" CMD.
- */
-struct ExchangesState
-{
-
-  /**
-   * Exchanges handle while operation is running.
-   */
-  struct TALER_AUDITOR_ListExchangesHandle *leh;
-
-  /**
-   * Auditor connection.
-   */
-  struct TALER_AUDITOR_Handle *auditor;
-
-  /**
-   * Interpreter state.
-   */
-  struct TALER_TESTING_Interpreter *is;
-
-  /**
-   * Task scheduled to try later.
-   */
-  struct GNUNET_SCHEDULER_Task *retry_task;
-
-  /**
-   * How long do we wait until we retry?
-   */
-  struct GNUNET_TIME_Relative backoff;
-
-  /**
-   * Expected HTTP response code.
-   */
-  unsigned int expected_response_code;
-
-  /**
-   * URL of the exchange expected to be included in the response.
-   */
-  const char *exchange_url;
-
-  /**
-   * How often should we retry on (transient) failures?
-   */
-  unsigned int do_retry;
-
-};
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-exchanges_run (void *cls,
-               const struct TALER_TESTING_Command *cmd,
-               struct TALER_TESTING_Interpreter *is);
-
-
-/**
- * Task scheduled to re-try #exchanges_run.
- *
- * @param cls a `struct ExchangesState`
- */
-static void
-do_retry (void *cls)
-{
-  struct ExchangesState *es = cls;
-
-  es->retry_task = NULL;
-  es->is->commands[es->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
-  exchanges_run (es,
-                 NULL,
-                 es->is);
-}
-
-
-/**
- * Callback to analyze the /exchanges response.
- *
- * @param cls closure.
- * @param hr HTTP response details
- * @param num_exchanges length of the @a ei array
- * @param ei array with information about the exchanges
- */
-static void
-exchanges_cb (void *cls,
-              const struct TALER_AUDITOR_HttpResponse *hr,
-              unsigned int num_exchanges,
-              const struct TALER_AUDITOR_ExchangeInfo *ei)
-{
-  struct ExchangesState *es = cls;
-
-  es->leh = NULL;
-  if (es->expected_response_code != hr->http_status)
-  {
-    if (0 != es->do_retry)
-    {
-      es->do_retry--;
-      if ( (0 == hr->http_status) ||
-           (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec) ||
-           (MHD_HTTP_INTERNAL_SERVER_ERROR == hr->http_status) )
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    "Retrying list exchanges failed with %u/%d\n",
-                    hr->http_status,
-                    (int) hr->ec);
-        /* on DB conflicts, do not use backoff */
-        if (TALER_EC_GENERIC_DB_SOFT_FAILURE == hr->ec)
-          es->backoff = GNUNET_TIME_UNIT_ZERO;
-        else
-          es->backoff = GNUNET_TIME_randomized_backoff (es->backoff,
-                                                        MAX_BACKOFF);
-        es->is->commands[es->is->ip].num_tries++;
-        es->retry_task = GNUNET_SCHEDULER_add_delayed (es->backoff,
-                                                       &do_retry,
-                                                       es);
-        return;
-      }
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                es->is->commands[es->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (es->is);
-    return;
-  }
-  if (NULL != es->exchange_url)
-  {
-    unsigned int found = GNUNET_NO;
-
-    for (unsigned int i = 0;
-         i<num_exchanges;
-         i++)
-      if (0 == strcmp (es->exchange_url,
-                       ei[i].exchange_url))
-        found = GNUNET_YES;
-    if (GNUNET_NO == found)
-    {
-      TALER_LOG_ERROR ("Exchange '%s' doesn't exist at this auditor\n",
-                       es->exchange_url);
-      TALER_TESTING_interpreter_fail (es->is);
-      return;
-    }
-
-    TALER_LOG_DEBUG ("Exchange '%s' exists at this auditor!\n",
-                     es->exchange_url);
-  }
-  TALER_TESTING_interpreter_next (es->is);
-}
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-exchanges_run (void *cls,
-               const struct TALER_TESTING_Command *cmd,
-               struct TALER_TESTING_Interpreter *is)
-{
-  struct ExchangesState *es = cls;
-
-  (void) cmd;
-  es->is = is;
-  es->leh = TALER_AUDITOR_list_exchanges
-              (is->auditor,
-              &exchanges_cb,
-              es);
-
-  if (NULL == es->leh)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  return;
-}
-
-
-/**
- * Free the state of a "exchanges" CMD, and possibly cancel a
- * pending operation thereof.
- *
- * @param cls closure, a `struct ExchangesState`
- * @param cmd the command which is being cleaned up.
- */
-static void
-exchanges_cleanup (void *cls,
-                   const struct TALER_TESTING_Command *cmd)
-{
-  struct ExchangesState *es = cls;
-
-  if (NULL != es->leh)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                es->is->ip,
-                cmd->label);
-    TALER_AUDITOR_list_exchanges_cancel (es->leh);
-    es->leh = NULL;
-  }
-  if (NULL != es->retry_task)
-  {
-    GNUNET_SCHEDULER_cancel (es->retry_task);
-    es->retry_task = NULL;
-  }
-  GNUNET_free (es);
-}
-
-
-/**
- * Offer internal data to other commands.
- *
- * @param cls closure.
- * @param[out] ret set to the wanted data.
- * @param trait name of the trait.
- * @param index index number of the traits to be returned.
- * @return #GNUNET_OK on success
- */
-static int
-exchanges_traits (void *cls,
-                  const void **ret,
-                  const char *trait,
-                  unsigned int index)
-{
-  (void) cls;
-  (void) ret;
-  (void) trait;
-  (void) index;
-  /* Must define this function because some callbacks
-   * look for certain traits on _all_ the commands. */
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Create a "list exchanges" command.
- *
- * @param label command label.
- * @param auditor auditor connection.
- * @param expected_response_code expected HTTP response code.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges (const char *label,
-                             struct TALER_AUDITOR_Handle *auditor,
-                             unsigned int expected_response_code)
-{
-  struct ExchangesState *es;
-
-  es = GNUNET_new (struct ExchangesState);
-  es->auditor = auditor;
-  es->expected_response_code = expected_response_code;
-
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = es,
-      .label = label,
-      .run = &exchanges_run,
-      .cleanup = &exchanges_cleanup,
-      .traits = &exchanges_traits
-    };
-
-    return cmd;
-  }
-}
-
-
-/**
- * Create a "list exchanges" command and check whether
- * a particular exchange belongs to the returned bundle.
- *
- * @param label command label.
- * @param expected_response_code expected HTTP response code.
- * @param exchange_url URL of the exchange supposed to
- *  be included in the response.
- * @return the command.
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges_with_url (const char *label,
-                                      unsigned int expected_response_code,
-                                      const char *exchange_url)
-{
-  struct ExchangesState *es;
-
-  es = GNUNET_new (struct ExchangesState);
-  es->expected_response_code = expected_response_code;
-  es->exchange_url = exchange_url;
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = es,
-      .label = label,
-      .run = &exchanges_run,
-      .cleanup = &exchanges_cleanup,
-      .traits = &exchanges_traits
-    };
-
-    return cmd;
-  }
-}
-
-
-/**
- * Modify an exchanges command to enable retries when we get
- * transient errors from the auditor.
- *
- * @param cmd a deposit confirmation command
- * @return the command with retries enabled
- */
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_exchanges_with_retry (struct TALER_TESTING_Command cmd)
-{
-  struct ExchangesState *es;
-
-  GNUNET_assert (&exchanges_run == cmd.run);
-  es = cmd.cls;
-  es->do_retry = NUM_RETRIES;
-  return cmd;
-}
-
-
-/* end of testing_auditor_api_cmd_exchanges.c */
diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor.c b/src/testing/testing_api_cmd_auditor_exec_auditor.c
index 8ec128c01..588be43d8 100644
--- a/src/testing/testing_api_cmd_auditor_exec_auditor.c
+++ b/src/testing/testing_api_cmd_auditor_exec_auditor.c
@@ -68,6 +68,7 @@ auditor_run (void *cls,
                                "taler-auditor",
                                "taler-auditor",
                                "-c", ks->config_filename,
+                               "-I",
                                NULL);
   if (NULL == ks->auditor_proc)
   {
diff --git a/src/testing/testing_api_cmd_bank_admin_add_incoming.c b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
index 07ee4068b..5c031d0b3 100644
--- a/src/testing/testing_api_cmd_bank_admin_add_incoming.c
+++ b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
@@ -180,8 +180,7 @@ do_retry (void *cls)
   struct AdminAddIncomingState *fts = cls;
 
   fts->retry_task = NULL;
-  fts->is->commands[fts->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (fts->is);
   admin_add_incoming_run (fts,
                           NULL,
                           fts->is);
@@ -194,40 +193,54 @@ do_retry (void *cls)
  * acceptable.
  *
  * @param cls closure with the interpreter state
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for
- *        successful status request; 0 if the exchange's reply is
- *        bogus (fails to follow the protocol)
- * @param ec taler-specific error code, #TALER_EC_NONE on success
- * @param serial_id unique ID of the wire transfer
- * @param timestamp time stamp of the transaction made.
- * @param json raw response
+ * @param air response details
  */
 static void
 confirmation_cb (void *cls,
-                 unsigned int http_status,
-                 enum TALER_ErrorCode ec,
-                 uint64_t serial_id,
-                 struct GNUNET_TIME_Timestamp timestamp,
-                 const json_t *json)
+                 const struct TALER_BANK_AdminAddIncomingResponse *air)
 {
   struct AdminAddIncomingState *fts = cls;
   struct TALER_TESTING_Interpreter *is = fts->is;
 
-  (void) json;
-  fts->reserve_history.details.in_details.timestamp = timestamp;
-  fts->reserve_history.details.in_details.wire_reference = serial_id;
   fts->aih = NULL;
-  if (http_status != fts->expected_http_status)
+  /**
+   * Test case not caring about the HTTP status code.
+   * That helps when Fakebank and Libeufin diverge in
+   * the response status code.  An example is the
+   * /admin/add-incoming: libeufin return ALWAYS '200 OK'
+   * (see note below) whereas the Fakebank responds with
+   * '409 Conflict' upon a duplicate reserve public key.
+   *
+   * Note: this decision aims at avoiding to put Taler
+   * logic into the Sandbox; that's because banks DO allow
+   * their customers to wire the same subject multiple
+   * times.  Hence, instead of triggering any error, libeufin
+   * bounces the payment back in the same way it does for
+   * malformed reserve public keys.
+   */
+  if (-1 == (int) fts->expected_http_status)
   {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_interpreter_next (is);
     return;
   }
-  switch (http_status)
+  if (air->http_status != fts->expected_http_status)
+  {
+    TALER_TESTING_unexpected_status (is,
+                                     air->http_status,
+                                     fts->expected_http_status);
+    return;
+  }
+  switch (air->http_status)
   {
   case MHD_HTTP_OK:
-    fts->serial_id = serial_id;
-    fts->timestamp = timestamp;
+    fts->reserve_history.details.in_details.timestamp
+      = air->details.ok.timestamp;
+    fts->reserve_history.details.in_details.wire_reference
+      = air->details.ok.serial_id;
+    fts->serial_id
+      = air->details.ok.serial_id;
+    fts->timestamp
+      = air->details.ok.timestamp;
     TALER_TESTING_interpreter_next (is);
     return;
   case MHD_HTTP_UNAUTHORIZED:
@@ -251,22 +264,22 @@ confirmation_cb (void *cls,
     if (0 != fts->do_retry)
     {
       fts->do_retry--;
-      if ( (0 == http_status) ||
-           (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec) ||
-           (MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) )
+      if ( (0 == air->http_status) ||
+           (TALER_EC_GENERIC_DB_SOFT_FAILURE == air->ec) ||
+           (MHD_HTTP_INTERNAL_SERVER_ERROR == air->http_status) )
       {
         GNUNET_log (
           GNUNET_ERROR_TYPE_INFO,
           "Retrying fakebank transfer failed with %u/%d\n",
-          http_status,
-          (int) ec);
+          air->http_status,
+          (int) air->ec);
         /* on DB conflicts, do not use backoff */
-        if (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec)
+        if (TALER_EC_GENERIC_DB_SOFT_FAILURE == air->ec)
           fts->backoff = GNUNET_TIME_UNIT_ZERO;
         else
           fts->backoff = GNUNET_TIME_randomized_backoff (fts->backoff,
                                                          MAX_BACKOFF);
-        fts->is->commands[fts->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (fts->is);
         fts->retry_task = GNUNET_SCHEDULER_add_delayed (
           fts->backoff,
           &do_retry,
@@ -279,8 +292,8 @@ confirmation_cb (void *cls,
   GNUNET_break (0);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Fakebank returned HTTP status %u/%d\n",
-              http_status,
-              (int) ec);
+              air->http_status,
+              (int) air->ec);
   TALER_TESTING_interpreter_fail (is);
 }
 
@@ -301,6 +314,7 @@ admin_add_incoming_run (void *cls,
   bool have_public = false;
 
   (void) cmd;
+  fts->is = is;
   /* Use reserve public key as subject */
   if (NULL != fts->reserve_reference)
   {
@@ -351,7 +365,6 @@ admin_add_incoming_run (void *cls,
   fts->reserve_history.amount = fts->amount;
   fts->reserve_history.details.in_details.sender_url
     = (char *) fts->payto_debit_account; /* remember to NOT free this one... */
-  fts->is = is;
   fts->aih
     = TALER_BANK_admin_add_incoming (
         TALER_TESTING_interpreter_get_context (is),
@@ -385,9 +398,8 @@ admin_add_incoming_cleanup (void *cls,
 
   if (NULL != fts->aih)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %s did not complete\n",
-                cmd->label);
+    TALER_TESTING_command_incomplete (fts->is,
+                                      cmd->label);
     TALER_BANK_admin_add_incoming_cancel (fts->aih);
     fts->aih = NULL;
   }
@@ -426,17 +438,19 @@ admin_add_incoming_traits (void *cls,
   {
     struct TALER_TESTING_Trait traits[] = {
       TALER_TESTING_make_trait_bank_row (&fts->serial_id),
-      TALER_TESTING_make_trait_debit_payto_uri (&fts->payto_debit_account),
-      TALER_TESTING_make_trait_payto_uri (&fts->payto_debit_account),
+      TALER_TESTING_make_trait_debit_payto_uri (fts->payto_debit_account),
+      TALER_TESTING_make_trait_payto_uri (fts->payto_debit_account),
       /* Used as a marker, content does not matter */
-      TALER_TESTING_make_trait_credit_payto_uri (&void_uri),
+      TALER_TESTING_make_trait_credit_payto_uri (void_uri),
       TALER_TESTING_make_trait_exchange_bank_account_url (
-        &fts->exchange_credit_url),
+        fts->exchange_credit_url),
       TALER_TESTING_make_trait_amount (&fts->amount),
-      TALER_TESTING_make_trait_timestamp (0, &fts->timestamp),
+      TALER_TESTING_make_trait_timestamp (0,
+                                          &fts->timestamp),
       TALER_TESTING_make_trait_reserve_priv (&fts->reserve_priv),
       TALER_TESTING_make_trait_reserve_pub (&fts->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&fts->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &fts->reserve_history),
       TALER_TESTING_trait_end ()
     };
 
@@ -449,15 +463,17 @@ admin_add_incoming_traits (void *cls,
   {
     struct TALER_TESTING_Trait traits[] = {
       TALER_TESTING_make_trait_bank_row (&fts->serial_id),
-      TALER_TESTING_make_trait_debit_payto_uri (&fts->payto_debit_account),
+      TALER_TESTING_make_trait_debit_payto_uri (fts->payto_debit_account),
       /* Used as a marker, content does not matter */
-      TALER_TESTING_make_trait_credit_payto_uri (&void_uri),
+      TALER_TESTING_make_trait_credit_payto_uri (void_uri),
       TALER_TESTING_make_trait_exchange_bank_account_url (
-        &fts->exchange_credit_url),
+        fts->exchange_credit_url),
       TALER_TESTING_make_trait_amount (&fts->amount),
-      TALER_TESTING_make_trait_timestamp (0, &fts->timestamp),
+      TALER_TESTING_make_trait_timestamp (0,
+                                          &fts->timestamp),
       TALER_TESTING_make_trait_reserve_pub (&fts->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&fts->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &fts->reserve_history),
       TALER_TESTING_trait_end ()
     };
 
diff --git a/src/testing/testing_api_cmd_bank_admin_check.c b/src/testing/testing_api_cmd_bank_admin_check.c
index 21a230834..6406fe2c2 100644
--- a/src/testing/testing_api_cmd_bank_admin_check.c
+++ b/src/testing/testing_api_cmd_bank_admin_check.c
@@ -82,8 +82,30 @@ check_bank_admin_transfer_run (void *cls,
   const char *credit_payto;
   const struct TALER_ReservePublicKeyP *reserve_pub;
   const struct TALER_TESTING_Command *cmd_ref;
+  struct TALER_FAKEBANK_Handle *fakebank;
 
   (void) cmd;
+  {
+    const struct TALER_TESTING_Command *fakebank_cmd;
+
+    fakebank_cmd
+      = TALER_TESTING_interpreter_get_command (is,
+                                               "fakebank");
+    if (NULL == fakebank_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_fakebank (fakebank_cmd,
+                                          &fakebank))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+  }
   cmd_ref
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 bcs->reserve_pub_ref);
@@ -102,7 +124,6 @@ check_bank_admin_transfer_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-  TALER_LOG_INFO ("Deposit reference NOT given\n");
   debit_payto = bcs->debit_payto;
   credit_payto = bcs->credit_payto;
   if (GNUNET_OK !=
@@ -110,9 +131,9 @@ check_bank_admin_transfer_run (void *cls,
                               &amount))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to parse amount `%s' at %u\n",
+                "Failed to parse amount `%s' at %s\n",
                 bcs->amount,
-                is->ip);
+                TALER_TESTING_interpreter_get_current_label (is));
     TALER_TESTING_interpreter_fail (is);
     return;
   }
@@ -123,7 +144,7 @@ check_bank_admin_transfer_run (void *cls,
               debit_payto,
               debit_account);
   if (GNUNET_OK !=
-      TALER_FAKEBANK_check_credit (is->fakebank,
+      TALER_FAKEBANK_check_credit (fakebank,
                                    &amount,
                                    debit_account,
                                    credit_account,
diff --git a/src/testing/testing_api_cmd_bank_check.c b/src/testing/testing_api_cmd_bank_check.c
index be4ad3189..77d120e09 100644
--- a/src/testing/testing_api_cmd_bank_check.c
+++ b/src/testing/testing_api_cmd_bank_check.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018-2020 Taler Systems SA
+  Copyright (C) 2018-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
@@ -91,26 +91,48 @@ check_bank_transfer_run (void *cls,
   struct TALER_Amount amount;
   char *debit_account;
   char *credit_account;
-  const char **exchange_base_url;
-  const char **debit_payto;
-  const char **credit_payto;
+  const char *exchange_base_url;
+  const char *debit_payto;
+  const char *credit_payto;
+  struct TALER_FAKEBANK_Handle *fakebank;
 
   (void) cmd;
+  {
+    const struct TALER_TESTING_Command *fakebank_cmd;
+
+    fakebank_cmd
+      = TALER_TESTING_interpreter_get_command (is,
+                                               "fakebank");
+    if (NULL == fakebank_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_fakebank (fakebank_cmd,
+                                          &fakebank))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+  }
   if (NULL == bcs->deposit_reference)
   {
     TALER_LOG_INFO ("Deposit reference NOT given\n");
-    debit_payto = &bcs->debit_payto;
-    credit_payto = &bcs->credit_payto;
-    exchange_base_url = &bcs->exchange_base_url;
+    debit_payto = bcs->debit_payto;
+    credit_payto = bcs->credit_payto;
+    exchange_base_url = bcs->exchange_base_url;
 
     if (GNUNET_OK !=
         TALER_string_to_amount (bcs->amount,
                                 &amount))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to parse amount `%s' at %u\n",
+                  "Failed to parse amount `%s' at %s\n",
                   bcs->amount,
-                  is->ip);
+                  TALER_TESTING_interpreter_get_current_label (is));
       TALER_TESTING_interpreter_fail (is);
       return;
     }
@@ -145,27 +167,22 @@ check_bank_transfer_run (void *cls,
       TALER_TESTING_FAIL (is);
     amount = *amount_ptr;
   }
-
-
-  debit_account = TALER_xtalerbank_account_from_payto (*debit_payto);
-  credit_account = TALER_xtalerbank_account_from_payto (*credit_payto);
-
+  debit_account = TALER_xtalerbank_account_from_payto (debit_payto);
+  credit_account = TALER_xtalerbank_account_from_payto (credit_payto);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "converted debit_payto (%s) to debit_account (%s)\n",
-              *debit_payto,
+              debit_payto,
               debit_account);
-
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "converted credit_payto (%s) to credit_account (%s)\n",
-              *credit_payto,
+              credit_payto,
               credit_account);
-
   if (GNUNET_OK !=
-      TALER_FAKEBANK_check_debit (is->fakebank,
+      TALER_FAKEBANK_check_debit (fakebank,
                                   &amount,
                                   debit_account,
                                   credit_account,
-                                  *exchange_base_url,
+                                  exchange_base_url,
                                   &bcs->wtid))
   {
     GNUNET_break (0);
@@ -217,7 +234,7 @@ check_bank_transfer_traits (void *cls,
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_wtid (wtid_ptr),
     TALER_TESTING_make_trait_exchange_url (
-      &bcs->exchange_base_url),
+      bcs->exchange_base_url),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_bank_check_empty.c b/src/testing/testing_api_cmd_bank_check_empty.c
index 84976b0b5..60f00fbb4 100644
--- a/src/testing/testing_api_cmd_bank_check_empty.c
+++ b/src/testing/testing_api_cmd_bank_check_empty.c
@@ -58,9 +58,33 @@ check_bank_empty_run (void *cls,
                       const struct TALER_TESTING_Command *cmd,
                       struct TALER_TESTING_Interpreter *is)
 {
+  struct TALER_FAKEBANK_Handle *fakebank;
+
   (void) cls;
   (void) cmd;
-  if (GNUNET_OK != TALER_FAKEBANK_check_empty (is->fakebank))
+  {
+    const struct TALER_TESTING_Command *fakebank_cmd;
+
+    fakebank_cmd
+      = TALER_TESTING_interpreter_get_command (is,
+                                               "fakebank");
+    if (NULL == fakebank_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_fakebank (fakebank_cmd,
+                                          &fakebank))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+  }
+  if (GNUNET_OK !=
+      TALER_FAKEBANK_check_empty (fakebank))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c
index a7ad40a43..956e6c857 100644
--- a/src/testing/testing_api_cmd_bank_history_credit.c
+++ b/src/testing/testing_api_cmd_bank_history_credit.c
@@ -83,6 +83,11 @@ struct HistoryState
   struct TALER_BANK_CreditHistoryHandle *hh;
 
   /**
+   * The interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
    * Authentication data for the operation.
    */
   struct TALER_BANK_AuthenticationData auth;
@@ -144,38 +149,161 @@ print_expected (struct History *h,
 
 
 /**
+ * Closure for command_cb().
+ */
+struct IteratorContext
+{
+  /**
+   * Array of history items to return.
+   */
+  struct History *h;
+
+  /**
+   * Set to the row ID from where on we should actually process history items,
+   * or NULL if we should process all of them.
+   */
+  const uint64_t *row_id_start;
+
+  /**
+   * History state we are working on.
+   */
+  struct HistoryState *hs;
+
+  /**
+   * Current length of the @e h array.
+   */
+  unsigned int total;
+
+  /**
+   * Current write position in @e h array.
+   */
+  unsigned int pos;
+
+  /**
+   * Ok equals True whenever a starting row_id was provided AND was found
+   * among the CMDs, OR no starting row was given in the first place.
+   */
+  bool ok;
+
+};
+
+
+/**
+ * Helper function of build_history() that expands
+ * the history for each relevant command encountered.
+ *
+ * @param[in,out] cls our `struct IteratorContext`
+ * @param cmd a command to process
+ */
+static void
+command_cb (void *cls,
+            const struct TALER_TESTING_Command *cmd)
+{
+  struct IteratorContext *ic = cls;
+  struct HistoryState *hs = ic->hs;
+  const uint64_t *row_id;
+  const char *credit_account;
+  const char *debit_account;
+  const struct TALER_Amount *amount;
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+  const char *exchange_credit_url;
+
+  /**
+   * The following command allows us to skip over those CMDs
+   * that do not offer a "row_id" trait.  Such skipped CMDs are
+   * not interesting for building a history.
+   */
+  if ( (GNUNET_OK !=
+        TALER_TESTING_get_trait_bank_row (cmd,
+                                          &row_id)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_credit_payto_uri (cmd,
+                                                  &credit_account)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_debit_payto_uri (cmd,
+                                                 &debit_account)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_amount (cmd,
+                                        &amount)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_reserve_pub (cmd,
+                                             &reserve_pub)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_exchange_bank_account_url (
+          cmd,
+          &exchange_credit_url)) )
+    return;   // Not an interesting event
+
+  /**
+   * Is the interesting event a match with regard to
+   * the row_id value?  If yes, store this condition
+   * to the state and analyze the next CMDs.
+   */
+  if ( (NULL != ic->row_id_start) &&
+       (*(ic->row_id_start) == *row_id) &&
+       (! ic->ok) )
+  {
+    ic->ok = true;
+    return;
+  }
+  /**
+   * The interesting event didn't match the wanted
+   * row_id value, analyze the next CMDs.  Note: this
+   * branch is relevant only when row_id WAS given.
+   */
+  if (! ic->ok)
+    return;
+  if (0 != strcasecmp (hs->account_url,
+                       exchange_credit_url))
+    return;   // Account mismatch
+  if (ic->total >= GNUNET_MAX (hs->num_results,
+                               -hs->num_results) )
+  {
+    TALER_LOG_DEBUG ("Hit history limit\n");
+    return;
+  }
+  TALER_LOG_INFO ("Found history: %s->%s for account %s\n",
+                  debit_account,
+                  credit_account,
+                  hs->account_url);
+  /* found matching record, make sure we have room */
+  if (ic->pos == ic->total)
+    GNUNET_array_grow (ic->h,
+                       ic->total,
+                       ic->pos * 2);
+  ic->h[ic->pos].url = GNUNET_strdup (debit_account);
+  ic->h[ic->pos].details.debit_account_uri = ic->h[ic->pos].url;
+  ic->h[ic->pos].details.amount = *amount;
+  ic->h[ic->pos].row_id = *row_id;
+  ic->h[ic->pos].details.reserve_pub = *reserve_pub;
+  ic->pos++;
+}
+
+
+/**
  * This function constructs the list of history elements that
  * interest the account number of the caller.  It has two main
  * loops: the first to figure out how many history elements have
  * to be allocated, and the second to actually populate every
  * element.
  *
- * @param is interpreter state (supposedly having the
- *        current CMD pointing at a "history" CMD).
+ * @param hs history state
  * @param[out] rh history array to initialize.
  * @return number of entries in @a rh.
  */
 static unsigned int
-build_history (struct TALER_TESTING_Interpreter *is,
+build_history (struct HistoryState *hs,
                struct History **rh)
 {
-  struct HistoryState *hs = is->commands[is->ip].cls;
-  unsigned int total;
-  unsigned int pos;
-  struct History *h;
-  const struct TALER_TESTING_Command *add_incoming_cmd;
-  int inc;
-  unsigned int start;
-  unsigned int end;
-
-  /* @var turns GNUNET_YES whenever either no 'start' value was
-   *      given for the history query, or the given value is found
-   *      in the list of all the CMDs. *///
-  int ok;
-  const uint64_t *row_id_start = NULL;
+  struct TALER_TESTING_Interpreter *is = hs->is;
+  struct IteratorContext ic = {
+    .hs = hs
+  };
 
   if (NULL != hs->start_row_reference)
   {
+    const struct TALER_TESTING_Command *add_incoming_cmd;
+
     TALER_LOG_INFO ("`%s': start row given via reference `%s'\n",
                     TALER_TESTING_interpreter_get_current_label (is),
                     hs->start_row_reference);
@@ -185,118 +313,91 @@ build_history (struct TALER_TESTING_Interpreter *is,
     GNUNET_assert (NULL != add_incoming_cmd);
     GNUNET_assert (GNUNET_OK ==
                    TALER_TESTING_get_trait_row (add_incoming_cmd,
-                                                &row_id_start));
+                                                &ic.row_id_start));
   }
 
+  ic.ok = false;
+  if (NULL == ic.row_id_start)
+    ic.ok = true;
+  GNUNET_array_grow (ic.h,
+                     ic.total,
+                     4);
   GNUNET_assert (0 != hs->num_results);
-  if (0 == is->ip)
-  {
-    TALER_LOG_DEBUG ("Checking history at FIRST transaction (EMPTY)\n");
-    *rh = NULL;
-    return 0;
-  }
+  TALER_TESTING_iterate (is,
+                         hs->num_results > 0,
+                         &command_cb,
+                         &ic);
+  GNUNET_assert (ic.ok);
+  GNUNET_array_grow (ic.h,
+                     ic.total,
+                     ic.pos);
+  if (0 == ic.pos)
+    TALER_LOG_DEBUG ("Empty credit history computed\n");
+  *rh = ic.h;
+  return ic.pos;
+}
+
 
-  if (hs->num_results > 0)
+/**
+ * Normalize IBAN-based payto URI in @a in.
+ *
+ * @param in input payto://-URI to normalize
+ * @return normalized IBAN for the test
+ */
+static char *
+normalize (const char *in)
+{
+  char *npt;
+  const char *q = strchr (in,
+                          '?');
+  const char *mptr;
+  const char *bic;
+  const char *iban;
+
+  if (NULL == q)
+    npt = GNUNET_strdup (in);
+  else
+    npt = GNUNET_strndup (in,
+                          q - in);
+  if (0 != strncasecmp (npt,
+                        "payto://",
+                        strlen ("payto://")))
   {
-    inc = 1;  /* _inc_rement */
-    start = 0;
-    end = is->ip - 1;
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Invalid payto: %s\n",
+                npt);
+    GNUNET_free (npt);
+    return NULL;
   }
-  else
+  mptr = npt + strlen ("payto://");
+  bic = strchr (mptr, '/');
+  if (NULL == bic)
   {
-    inc = -1;
-    start = is->ip - 1;
-    end = 0;
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Invalid payto: %s\n",
+                npt);
+    GNUNET_free (npt);
+    return NULL;
   }
-
-  ok = GNUNET_NO;
-  if (NULL == row_id_start)
-    ok = GNUNET_YES;
-  h = NULL;
-  total = 0;
-  GNUNET_array_grow (h,
-                     total,
-                     4);
-  pos = 0;
-  for (unsigned int off = start; off != end + inc; off += inc)
+  bic++;
+  iban = strchr (bic, '/');
+  if (NULL != iban)
   {
-    const struct TALER_TESTING_Command *cmd = &is->commands[off];
-    const uint64_t *row_id;
-    const char **credit_account;
-    const char **debit_account;
-    const struct TALER_Amount *amount;
-    const struct TALER_ReservePublicKeyP *reserve_pub;
-    const char **exchange_credit_url;
-
-    /* The following command allows us to skip over those CMDs
-     * that do not offer a "row_id" trait.  Such skipped CMDs are
-     * not interesting for building a history. *///
-    if ( (GNUNET_OK !=
-          TALER_TESTING_get_trait_bank_row (cmd,
-                                            &row_id)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_credit_payto_uri (cmd,
-                                                    &credit_account)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_debit_payto_uri (cmd,
-                                                   &debit_account)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount (cmd,
-                                          &amount)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_reserve_pub (cmd,
-                                               &reserve_pub)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_exchange_bank_account_url (
-            cmd,
-            &exchange_credit_url)) )
-      continue; /* not an interesting event */
-    /* Seek "/history/incoming" starting row.  */
-    if ( (NULL != row_id_start) &&
-         (*row_id_start == *row_id) &&
-         (GNUNET_NO == ok) )
-    {
-      /* Until here, nothing counted. */
-      ok = GNUNET_YES;
-      continue;
-    }
-    /* when 'start' was _not_ given, then ok == GNUNET_YES */
-    if (GNUNET_NO == ok)
-      continue; /* skip until we find the marker */
-    if (0 != strcasecmp (hs->account_url,
-                         *exchange_credit_url))
-      continue; /* account mismatch */
-    if (total >= GNUNET_MAX (hs->num_results,
-                             -hs->num_results) )
-    {
-      TALER_LOG_DEBUG ("Hit history limit\n");
-      break;
-    }
-    TALER_LOG_INFO ("Found history: %s->%s for account %s\n",
-                    *debit_account,
-                    *credit_account,
-                    hs->account_url);
-    /* found matching record, make sure we have room */
-    if (pos == total)
-      GNUNET_array_grow (h,
-                         total,
-                         pos * 2);
-    h[pos].url = GNUNET_strdup (*debit_account);
-    h[pos].details.debit_account_uri = h[pos].url;
-    h[pos].details.amount = *amount;
-    h[pos].row_id = *row_id;
-    h[pos].details.reserve_pub = *reserve_pub;
-    h[pos].details.credit_account_uri = *exchange_credit_url;
-    pos++;
+    /* need to remove bic */
+    char *n;
+
+    iban++;
+    GNUNET_asprintf (&n,
+                     "payto://%.*s/%s",
+                     (int) ((bic - mptr) - 1),
+                     mptr,
+                     iban);
+    GNUNET_free (npt);
+    npt = n;
   }
-  GNUNET_assert (GNUNET_YES == ok);
-  GNUNET_array_grow (h,
-                     total,
-                     pos);
-  if (0 == pos)
-    TALER_LOG_DEBUG ("Empty credit history computed\n");
-  *rh = h;
-  return total;
+  return npt;
 }
 
 
@@ -311,12 +412,15 @@ build_history (struct TALER_TESTING_Interpreter *is,
  * @param details the expected transaction details.
  * @return #GNUNET_OK if the transaction is what we expect.
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_result (struct History *h,
               unsigned int total,
               unsigned int off,
               const struct TALER_BANK_CreditDetails *details)
 {
+  char *u1;
+  char *u2;
+
   if (off >= total)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -329,25 +433,42 @@ check_result (struct History *h,
                     off);
     return GNUNET_SYSERR;
   }
+  u1 = normalize (h[off].details.debit_account_uri);
+  if (NULL == u1)
+    return GNUNET_SYSERR;
+  u2 = normalize (details->debit_account_uri);
+  if (NULL == u2)
+  {
+    GNUNET_free (u1);
+    return GNUNET_SYSERR;
+  }
   if ( (0 != GNUNET_memcmp (&h[off].details.reserve_pub,
                             &details->reserve_pub)) ||
        (0 != TALER_amount_cmp (&h[off].details.amount,
                                &details->amount)) ||
-       (0 != strcasecmp (h[off].details.debit_account_uri,
-                         details->debit_account_uri)) )
+       (0 != strcasecmp (u1,
+                         u2)) )
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "expected debit_account_uri: %s\n",
-                details->debit_account_uri);
+                "expected debit_account_uri: %s with %s for %s\n",
+                u1,
+                TALER_amount2s (&h[off].details.amount),
+                TALER_B2S (&h[off].details.reserve_pub));
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "actual debit_account_uri: %s\n",
-                h[off].details.debit_account_uri);
+                "actual debit_account_uri: %s with %s for %s\n",
+                u2,
+                TALER_amount2s (&details->amount),
+                TALER_B2S (&details->reserve_pub));
     print_expected (h,
                     total,
                     off);
+    GNUNET_free (u1);
+    GNUNET_free (u2);
     return GNUNET_SYSERR;
   }
+  GNUNET_free (u1);
+  GNUNET_free (u2);
   return GNUNET_OK;
 }
 
@@ -360,89 +481,86 @@ check_result (struct History *h,
  * finally check it against what the bank returned.
  *
  * @param cls closure.
- * @param http_status HTTP response code, #MHD_HTTP_OK (200)
- *        for successful status request 0 if the bank's reply is
- *        bogus (fails to follow the protocol),
- *        #MHD_HTTP_NO_CONTENT if there are no more results; on
- *        success the last callback is always of this status
- *        (even if `abs(num_results)` were already returned).
- * @param ec taler status code.
- * @param row_id monotonically increasing counter corresponding to
- *        the transaction.
- * @param details details about the wire transfer.
- * @param json detailed response from the HTTPD, or NULL if
- *        reply was not in JSON.
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
+ * @param chr http response details
  */
-static enum GNUNET_GenericReturnValue
+static void
 history_cb (void *cls,
-            unsigned int http_status,
-            enum TALER_ErrorCode ec,
-            uint64_t row_id,
-            const struct TALER_BANK_CreditDetails *details,
-            const json_t *json)
+            const struct TALER_BANK_CreditHistoryResponse *chr)
 {
-  struct TALER_TESTING_Interpreter *is = cls;
-  struct HistoryState *hs = is->commands[is->ip].cls;
+  struct HistoryState *hs = cls;
+  struct TALER_TESTING_Interpreter *is = hs->is;
 
-  (void) row_id;
-  if (NULL == details)
+  hs->hh = NULL;
+  switch (chr->http_status)
   {
-    hs->hh = NULL;
-    if ( (hs->results_obtained != hs->total) ||
-         (hs->failed) ||
-         (MHD_HTTP_NO_CONTENT != http_status) )
+  case 0:
+    GNUNET_break (0);
+    goto error;
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<chr->details.ok.details_length; i++)
     {
-      GNUNET_break (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Expected history of length %u, got %llu;"
-                  " HTTP status code: %u/%d, failed: %d\n",
-                  hs->total,
-                  (unsigned long long) hs->results_obtained,
-                  http_status,
-                  (int) ec,
-                  hs->failed ? 1 : 0);
-      print_expected (hs->h,
-                      hs->total,
-                      UINT_MAX);
-      TALER_TESTING_interpreter_fail (is);
-      return GNUNET_SYSERR;
+      const struct TALER_BANK_CreditDetails *cd =
+        &chr->details.ok.details[i];
+
+      /* check current element */
+      if (GNUNET_OK !=
+          check_result (hs->h,
+                        hs->total,
+                        hs->results_obtained,
+                        cd))
+      {
+        GNUNET_break (0);
+        json_dumpf (chr->response,
+                    stderr,
+                    JSON_COMPACT);
+        hs->failed = true;
+        hs->hh = NULL;
+        TALER_TESTING_interpreter_fail (is);
+        return;
+      }
+      hs->results_obtained++;
     }
     TALER_TESTING_interpreter_next (is);
-    return GNUNET_OK;
-  }
-  if (MHD_HTTP_OK != http_status)
-  {
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    if (0 == hs->total)
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return;
+    }
+    GNUNET_break (0);
+    goto error;
+  case MHD_HTTP_NOT_FOUND:
+    if (0 == hs->total)
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return;
+    }
+    GNUNET_break (0);
+    goto error;
+  default:
     hs->hh = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unwanted response code from /history/incoming: %u\n",
-                http_status);
+                chr->http_status);
     TALER_TESTING_interpreter_fail (is);
-    return GNUNET_SYSERR;
+    return;
   }
-
-  /* check current element */
-  if (GNUNET_OK != check_result (hs->h,
-                                 hs->total,
-                                 hs->results_obtained,
-                                 details))
-  {
-    char *acc;
-
-    GNUNET_break (0);
-    acc = json_dumps (json,
-                      JSON_COMPACT);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Result %u was `%s'\n",
-                (unsigned int) hs->results_obtained++,
-                acc);
-    if (NULL != acc)
-      free (acc);
-    hs->failed = true;
-    return GNUNET_SYSERR;
-  }
-  hs->results_obtained++;
-  return GNUNET_OK;
+error:
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Expected history of length %u, got %llu;"
+              " HTTP status code: %u/%d, failed: %d\n",
+              hs->total,
+              (unsigned long long) hs->results_obtained,
+              chr->http_status,
+              (int) chr->ec,
+              hs->failed ? 1 : 0);
+  print_expected (hs->h,
+                  hs->total,
+                  UINT_MAX);
+  TALER_TESTING_interpreter_fail (is);
 }
 
 
@@ -463,6 +581,7 @@ history_run (void *cls,
   const uint64_t *row_ptr;
 
   (void) cmd;
+  hs->is = is;
   /* Get row_id from trait. */
   if (NULL != hs->start_row_reference)
   {
@@ -483,15 +602,16 @@ history_run (void *cls,
     TALER_LOG_DEBUG ("row id (from trait) is %llu\n",
                      (unsigned long long) row_id);
   }
-  hs->total = build_history (is,
+  hs->total = build_history (hs,
                              &hs->h);
-  hs->hh = TALER_BANK_credit_history (is->ctx,
-                                      &hs->auth,
-                                      row_id,
-                                      hs->num_results,
-                                      GNUNET_TIME_UNIT_ZERO,
-                                      &history_cb,
-                                      is);
+  hs->hh = TALER_BANK_credit_history (
+    TALER_TESTING_interpreter_get_context (is),
+    &hs->auth,
+    row_id,
+    hs->num_results,
+    GNUNET_TIME_UNIT_ZERO,
+    &history_cb,
+    hs);
   GNUNET_assert (NULL != hs->hh);
 }
 
@@ -512,7 +632,8 @@ history_cleanup (void *cls,
   (void) cmd;
   if (NULL != hs->hh)
   {
-    TALER_LOG_WARNING ("/history/incoming did not complete\n");
+    TALER_TESTING_command_incomplete (hs->is,
+                                      cmd->label);
     TALER_BANK_credit_history_cancel (hs->hh);
   }
   GNUNET_free (hs->account_url);
diff --git a/src/testing/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c
index a1dee81e1..1cb7320fa 100644
--- a/src/testing/testing_api_cmd_bank_history_debit.c
+++ b/src/testing/testing_api_cmd_bank_history_debit.c
@@ -92,6 +92,11 @@ struct HistoryState
   struct TALER_BANK_DebitHistoryHandle *hh;
 
   /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
    * Expected number of results (= rows).
    */
   uint64_t results_obtained;
@@ -147,38 +152,155 @@ print_expected (struct History *h,
 
 
 /**
+ * Closure for command_cb().
+ */
+struct IteratorContext
+{
+  /**
+   * Array of history items to return.
+   */
+  struct History *h;
+
+  /**
+   * Set to the row ID from where on we should actually process history items,
+   * or NULL if we should process all of them.
+   */
+  const uint64_t *row_id_start;
+
+  /**
+   * History state we are working on.
+   */
+  struct HistoryState *hs;
+
+  /**
+   * Current length of the @e h array.
+   */
+  unsigned int total;
+
+  /**
+   * Current write position in @e h array.
+   */
+  unsigned int pos;
+
+  /**
+   * Ok equals True whenever a starting row_id was provided AND was found
+   * among the CMDs, OR no starting row was given in the first place.
+   */
+  bool ok;
+
+};
+
+
+/**
+ * Helper function of build_history() that expands
+ * the history for each relevant command encountered.
+ *
+ * @param[in,out] cls our `struct IteratorContext`
+ * @param cmd a command to process
+ */
+static void
+command_cb (void *cls,
+            const struct TALER_TESTING_Command *cmd)
+{
+  struct IteratorContext *ic = cls;
+  struct HistoryState *hs = ic->hs;
+
+  const uint64_t *row_id;
+  const char *debit_account;
+  const char *credit_account;
+  const struct TALER_Amount *amount;
+  const struct TALER_WireTransferIdentifierRawP *wtid;
+  const char *exchange_base_url;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Checking if command %s is relevant for debit history\n",
+              cmd->label);
+  if ( (GNUNET_OK !=
+        TALER_TESTING_get_trait_bank_row (cmd,
+                                          &row_id)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_debit_payto_uri (cmd,
+                                                 &debit_account)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_credit_payto_uri (cmd,
+                                                  &credit_account)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_amount (cmd,
+                                        &amount)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_wtid (cmd,
+                                      &wtid)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_exchange_url (cmd,
+                                              &exchange_base_url)) )
+    return;   /* not an event we care about */
+  /* Seek "/history/outgoing" starting row.  */
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Command %s is relevant for debit history!\n",
+              cmd->label);
+  if ( (NULL != ic->row_id_start) &&
+       (*(ic->row_id_start) == *row_id) &&
+       (! ic->ok) )
+  {
+    /* Until here, nothing counted. */
+    ic->ok = true;
+    return;
+  }
+  /* when 'start' was _not_ given, then ok == GNUNET_YES */
+  if (! ic->ok)
+    return;   /* skip until we find the marker */
+  if (ic->total >= GNUNET_MAX (hs->num_results,
+                               -hs->num_results) )
+  {
+    TALER_LOG_DEBUG ("Hit history limit\n");
+    return;
+  }
+  TALER_LOG_INFO ("Found history: %s->%s for account %s\n",
+                  debit_account,
+                  credit_account,
+                  hs->account_url);
+  /* found matching record, make sure we have room */
+  if (ic->pos == ic->total)
+    GNUNET_array_grow (ic->h,
+                       ic->total,
+                       ic->pos * 2);
+  ic->h[ic->pos].c_url = GNUNET_strdup (credit_account);
+  ic->h[ic->pos].d_url = GNUNET_strdup (debit_account);
+  ic->h[ic->pos].details.credit_account_uri = ic->h[ic->pos].c_url;
+  ic->h[ic->pos].details.amount = *amount;
+  ic->h[ic->pos].row_id = *row_id;
+  ic->h[ic->pos].details.wtid = *wtid;
+  ic->h[ic->pos].details.exchange_base_url = exchange_base_url;
+  ic->pos++;
+}
+
+
+/**
  * This function constructs the list of history elements that
  * interest the account number of the caller.  It has two main
  * loops: the first to figure out how many history elements have
  * to be allocated, and the second to actually populate every
  * element.
  *
- * @param is interpreter state (supposedly having the
- *        current CMD pointing at a "history" CMD).
+ * @param hs history state command context
  * @param[out] rh history array to initialize.
  * @return number of entries in @a rh.
  */
 static unsigned int
-build_history (struct TALER_TESTING_Interpreter *is,
+build_history (struct HistoryState *hs,
                struct History **rh)
 {
-  struct HistoryState *hs = is->commands[is->ip].cls;
-  unsigned int total;
-  unsigned int pos;
-  struct History *h;
-  const struct TALER_TESTING_Command *add_incoming_cmd;
-  int inc;
-  int start;
-  int end;
-  /* #GNUNET_YES whenever either no 'start' value was given for the history
-   * query, or the given value is found in the list of all the CMDs. */
-  int ok;
-  const uint64_t *row_id_start = NULL;
+  struct TALER_TESTING_Interpreter *is = hs->is;
+  struct IteratorContext ic = {
+    .hs = hs
+  };
 
   if (NULL != hs->start_row_reference)
   {
-    TALER_LOG_INFO
-      ("`%s': start row given via reference `%s'\n",
+    const struct TALER_TESTING_Command *add_incoming_cmd;
+
+    TALER_LOG_INFO (
+      "`%s': start row given via reference `%s'\n",
       TALER_TESTING_interpreter_get_current_label  (is),
       hs->start_row_reference);
     add_incoming_cmd = TALER_TESTING_interpreter_lookup_command (
@@ -187,124 +309,91 @@ build_history (struct TALER_TESTING_Interpreter *is,
     GNUNET_assert (NULL != add_incoming_cmd);
     GNUNET_assert (GNUNET_OK ==
                    TALER_TESTING_get_trait_row (add_incoming_cmd,
-                                                &row_id_start));
+                                                &ic.row_id_start));
   }
 
+  ic.ok = false;
+  if (NULL == ic.row_id_start)
+    ic.ok = true;
+  GNUNET_array_grow (ic.h,
+                     ic.total,
+                     4);
   GNUNET_assert (0 != hs->num_results);
-  if (0 == is->ip)
-  {
-    TALER_LOG_DEBUG ("Checking history at first CMD..\n");
-    *rh = NULL;
-    return 0;
-  }
+  TALER_TESTING_iterate (is,
+                         hs->num_results > 0,
+                         &command_cb,
+                         &ic);
+  GNUNET_assert (ic.ok);
+  GNUNET_array_grow (ic.h,
+                     ic.total,
+                     ic.pos);
+  if (0 == ic.pos)
+    TALER_LOG_DEBUG ("Empty credit history computed\n");
+  *rh = ic.h;
+  return ic.pos;
+}
 
-  /* AKA 'delta' */
-  if (hs->num_results > 0)
-  {
-    inc = 1;  /* _inc_rement: go forwards */
-    start = 0;
-    end = is->ip;
-  }
+
+/**
+ * Normalize IBAN-based payto URI in @a in.
+ *
+ * @param in input payto://-URI to normalize
+ * @return normalized IBAN for the test
+ */
+static char *
+normalize (const char *in)
+{
+  char *npt;
+  const char *q = strchr (in,
+                          '?');
+  const char *mptr;
+  const char *bic;
+  const char *iban;
+
+  if (NULL == q)
+    npt = GNUNET_strdup (in);
   else
+    npt = GNUNET_strndup (in,
+                          q - in);
+  if (0 != strncasecmp (npt,
+                        "payto://",
+                        strlen ("payto://")))
   {
-    inc = -1; /* decrement: we go backwards */
-    start = is->ip - 1;
-    end = -1; /* range is exclusive, do look at 0! */
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Invalid payto: %s\n",
+                npt);
+    GNUNET_free (npt);
+    return NULL;
   }
-
-  ok = GNUNET_NO;
-  if (NULL == row_id_start)
-    ok = GNUNET_YES;
-  h = NULL;
-  total = 0;
-  GNUNET_array_grow (h,
-                     total,
-                     4);
-  pos = 0;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Checking commands %u to %u for debit history\n",
-              start,
-              end);
-  for (int off = start; off != end; off += inc)
+  mptr = npt + strlen ("payto://");
+  bic = strchr (mptr, '/');
+  if (NULL == bic)
   {
-    const struct TALER_TESTING_Command *cmd = &is->commands[off];
-    const uint64_t *row_id;
-    const char **debit_account;
-    const char **credit_account;
-    const struct TALER_Amount *amount;
-    const struct TALER_WireTransferIdentifierRawP *wtid;
-    const char **exchange_base_url;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Checking if command %s is relevant for debit history\n",
-                cmd->label);
-    if ( (GNUNET_OK !=
-          TALER_TESTING_get_trait_bank_row (cmd,
-                                            &row_id)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_debit_payto_uri (cmd,
-                                                   &debit_account)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_credit_payto_uri (cmd,
-                                                    &credit_account)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount (cmd,
-                                          &amount)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_wtid (cmd,
-                                        &wtid)) ||
-         (GNUNET_OK !=
-          TALER_TESTING_get_trait_exchange_url (cmd,
-                                                &exchange_base_url)) )
-      continue; /* not an event we care about */
-    /* Seek "/history/outgoing" starting row.  */
+    GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Command %s is relevant for debit history!\n",
-                cmd->label);
-    if ( (NULL != row_id_start) &&
-         (*row_id_start == *row_id) &&
-         (GNUNET_NO == ok) )
-    {
-      /* Until here, nothing counted. */
-      ok = GNUNET_YES;
-      continue;
-    }
-    /* when 'start' was _not_ given, then ok == GNUNET_YES */
-    if (GNUNET_NO == ok)
-      continue; /* skip until we find the marker */
-    if (total >= GNUNET_MAX (hs->num_results,
-                             -hs->num_results) )
-    {
-      TALER_LOG_DEBUG ("Hit history limit\n");
-      break;
-    }
-    TALER_LOG_INFO ("Found history: %s->%s for account %s\n",
-                    *debit_account,
-                    *credit_account,
-                    hs->account_url);
-    /* found matching record, make sure we have room */
-    if (pos == total)
-      GNUNET_array_grow (h,
-                         total,
-                         pos * 2);
-    h[pos].c_url = GNUNET_strdup (*credit_account);
-    h[pos].d_url = GNUNET_strdup (*debit_account);
-    h[pos].details.credit_account_uri = h[pos].c_url;
-    h[pos].details.debit_account_uri = h[pos].d_url;
-    h[pos].details.amount = *amount;
-    h[pos].row_id = *row_id;
-    h[pos].details.wtid = *wtid;
-    h[pos].details.exchange_base_url = *exchange_base_url;
-    pos++;
+                "Invalid payto: %s\n",
+                npt);
+    GNUNET_free (npt);
+    return NULL;
   }
-  GNUNET_assert (GNUNET_YES == ok);
-  GNUNET_array_grow (h,
-                     total,
-                     pos);
-  if (0 == pos)
-    TALER_LOG_DEBUG ("Empty debit history computed\n");
-  *rh = h;
-  return total;
+  bic++;
+  iban = strchr (bic, '/');
+  if (NULL != iban)
+  {
+    /* need to remove bic */
+    char *n;
+
+    iban++;
+    GNUNET_asprintf (&n,
+                     "payto://%.*s/%s",
+                     (int) ((bic - mptr) - 1),
+                     mptr,
+                     iban);
+    GNUNET_free (npt);
+    npt = n;
+  }
+  return npt;
 }
 
 
@@ -325,6 +414,9 @@ check_result (struct History *h,
               unsigned int off,
               const struct TALER_BANK_DebitDetails *details)
 {
+  char *u1;
+  char *u2;
+
   if (off >= total)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -337,14 +429,33 @@ check_result (struct History *h,
                     off);
     return GNUNET_SYSERR;
   }
+  u1 = normalize (h[off].details.credit_account_uri);
+  if (NULL == u1)
+    return GNUNET_SYSERR;
+  u2 = normalize (details->credit_account_uri);
+  if (NULL == u2)
+  {
+    GNUNET_free (u1);
+    return GNUNET_SYSERR;
+  }
   if ( (0 != GNUNET_memcmp (&h[off].details.wtid,
                             &details->wtid)) ||
        (0 != TALER_amount_cmp (&h[off].details.amount,
                                &details->amount)) ||
-       (0 != strcasecmp (h[off].details.credit_account_uri,
-                         details->credit_account_uri)) )
+       (0 != strcasecmp (u1,
+                         u2)) )
   {
     GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "expected debit_account_uri: %s with %s for %s\n",
+                u1,
+                TALER_amount2s (&h[off].details.amount),
+                TALER_B2S (&h[off].details.wtid));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "actual debit_account_uri: %s with %s for %s\n",
+                u2,
+                TALER_amount2s (&details->amount),
+                TALER_B2S (&details->wtid));
     print_expected (h,
                     total,
                     off);
@@ -362,89 +473,86 @@ check_result (struct History *h,
  * finally check it against what the bank returned.
  *
  * @param cls closure.
- * @param http_status HTTP response code, #MHD_HTTP_OK (200)
- *        for successful status request 0 if the bank's reply is
- *        bogus (fails to follow the protocol),
- *        #MHD_HTTP_NO_CONTENT if there are no more results; on
- *        success the last callback is always of this status
- *        (even if `abs(num_results)` were already returned).
- * @param ec taler status code.
- * @param row_id monotonically increasing counter corresponding to
- *        the transaction.
- * @param details details about the wire transfer.
- * @param json detailed response from the HTTPD, or NULL if
- *        reply was not in JSON.
- * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration
+ * @param dhr http response details
  */
-static enum GNUNET_GenericReturnValue
+static void
 history_cb (void *cls,
-            unsigned int http_status,
-            enum TALER_ErrorCode ec,
-            uint64_t row_id,
-            const struct TALER_BANK_DebitDetails *details,
-            const json_t *json)
+            const struct TALER_BANK_DebitHistoryResponse *dhr)
 {
-  struct TALER_TESTING_Interpreter *is = cls;
-  struct HistoryState *hs = is->commands[is->ip].cls;
+  struct HistoryState *hs = cls;
+  struct TALER_TESTING_Interpreter *is = hs->is;
 
-  (void) row_id;
-  if (NULL == details)
+  hs->hh = NULL;
+  switch (dhr->http_status)
   {
-    hs->hh = NULL;
-    if ( (hs->results_obtained != hs->total) ||
-         (GNUNET_YES == hs->failed) ||
-         (MHD_HTTP_NO_CONTENT != http_status) )
+  case 0:
+    GNUNET_break (0);
+    goto error;
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<dhr->details.ok.details_length; i++)
     {
-      GNUNET_break (0);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Expected history of length %u, got %llu;"
-                  " HTTP status code: %u/%d, failed: %d\n",
-                  hs->total,
-                  (unsigned long long) hs->results_obtained,
-                  http_status,
-                  (int) ec,
-                  hs->failed);
-      print_expected (hs->h,
-                      hs->total,
-                      UINT_MAX);
-      TALER_TESTING_interpreter_fail (is);
-      return GNUNET_SYSERR;
+      const struct TALER_BANK_DebitDetails *dd =
+        &dhr->details.ok.details[i];
+
+      /* check current element */
+      if (GNUNET_OK !=
+          check_result (hs->h,
+                        hs->total,
+                        hs->results_obtained,
+                        dd))
+      {
+        GNUNET_break (0);
+        json_dumpf (dhr->response,
+                    stderr,
+                    JSON_COMPACT);
+        hs->failed = true;
+        hs->hh = NULL;
+        TALER_TESTING_interpreter_fail (is);
+        return;
+      }
+      hs->results_obtained++;
     }
     TALER_TESTING_interpreter_next (is);
-    return GNUNET_OK;
-  }
-  if (MHD_HTTP_OK != http_status)
-  {
+    return;
+  case MHD_HTTP_NO_CONTENT:
+    if (0 == hs->total)
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return;
+    }
+    GNUNET_break (0);
+    goto error;
+  case MHD_HTTP_NOT_FOUND:
+    if (0 == hs->total)
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return;
+    }
+    GNUNET_break (0);
+    goto error;
+  default:
     hs->hh = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unwanted response code from /history/outgoing: %u\n",
-                http_status);
+                "Unwanted response code from /history/incoming: %u\n",
+                dhr->http_status);
     TALER_TESTING_interpreter_fail (is);
-    return GNUNET_SYSERR;
+    return;
   }
-
-  /* check current element */
-  if (GNUNET_OK != check_result (hs->h,
-                                 hs->total,
-                                 hs->results_obtained,
-                                 details))
-  {
-    char *acc;
-
-    GNUNET_break (0);
-    acc = json_dumps (json,
-                      JSON_COMPACT);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Result %u was `%s'\n",
-                (unsigned int) hs->results_obtained++,
-                acc);
-    if (NULL != acc)
-      free (acc);
-    hs->failed = GNUNET_YES;
-    return GNUNET_SYSERR;
-  }
-  hs->results_obtained++;
-  return GNUNET_OK;
+error:
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Expected history of length %u, got %llu;"
+              " HTTP status code: %u/%d, failed: %d\n",
+              hs->total,
+              (unsigned long long) hs->results_obtained,
+              dhr->http_status,
+              (int) dhr->ec,
+              hs->failed ? 1 : 0);
+  print_expected (hs->h,
+                  hs->total,
+                  UINT_MAX);
+  TALER_TESTING_interpreter_fail (is);
 }
 
 
@@ -465,6 +573,7 @@ history_run (void *cls,
   const uint64_t *row_ptr;
 
   (void) cmd;
+  hs->is = is;
   /* Get row_id from trait. */
   if (NULL != hs->start_row_reference)
   {
@@ -485,14 +594,16 @@ history_run (void *cls,
     TALER_LOG_DEBUG ("row id (from trait) is %llu\n",
                      (unsigned long long) row_id);
   }
-  hs->total = build_history (is, &hs->h);
-  hs->hh = TALER_BANK_debit_history (is->ctx,
-                                     &hs->auth,
-                                     row_id,
-                                     hs->num_results,
-                                     GNUNET_TIME_UNIT_ZERO,
-                                     &history_cb,
-                                     is);
+  hs->total = build_history (hs,
+                             &hs->h);
+  hs->hh = TALER_BANK_debit_history (
+    TALER_TESTING_interpreter_get_context (is),
+    &hs->auth,
+    row_id,
+    hs->num_results,
+    GNUNET_TIME_UNIT_ZERO,
+    &history_cb,
+    hs);
   GNUNET_assert (NULL != hs->hh);
 }
 
@@ -513,7 +624,8 @@ history_cleanup (void *cls,
   (void) cmd;
   if (NULL != hs->hh)
   {
-    TALER_LOG_WARNING ("/history/outgoing did not complete\n");
+    TALER_TESTING_command_incomplete (hs->is,
+                                      cmd->label);
     TALER_BANK_debit_history_cancel (hs->hh);
   }
   for (unsigned int off = 0; off<hs->total; off++)
diff --git a/src/testing/testing_api_cmd_bank_transfer.c b/src/testing/testing_api_cmd_bank_transfer.c
index 8c14aac19..bfb29e120 100644
--- a/src/testing/testing_api_cmd_bank_transfer.c
+++ b/src/testing/testing_api_cmd_bank_transfer.c
@@ -149,8 +149,7 @@ do_retry (void *cls)
   struct TransferState *fts = cls;
 
   fts->retry_task = NULL;
-  fts->is->commands[fts->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (fts->is);
   transfer_run (fts,
                 NULL,
                 fts->is);
@@ -163,43 +162,35 @@ do_retry (void *cls)
  * acceptable.
  *
  * @param cls closure with the interpreter state
- * @param http_status HTTP response code, #MHD_HTTP_OK (200) for
- *        successful status request; 0 if the exchange's reply is
- *        bogus (fails to follow the protocol)
- * @param ec taler-specific error code, #TALER_EC_NONE on success
- * @param serial_id unique ID of the wire transfer
- * @param timestamp time stamp of the transaction made.
+ * @param tr response details
  */
 static void
 confirmation_cb (void *cls,
-                 unsigned int http_status,
-                 enum TALER_ErrorCode ec,
-                 uint64_t serial_id,
-                 struct GNUNET_TIME_Timestamp timestamp)
+                 const struct TALER_BANK_TransferResponse *tr)
 {
   struct TransferState *fts = cls;
   struct TALER_TESTING_Interpreter *is = fts->is;
 
   fts->weh = NULL;
-  if (MHD_HTTP_OK != http_status)
+  if (MHD_HTTP_OK != tr->http_status)
   {
     if (0 != fts->do_retry)
     {
       fts->do_retry--;
-      if ( (0 == http_status) ||
-           (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec) ||
-           (MHD_HTTP_INTERNAL_SERVER_ERROR == http_status) )
+      if ( (0 == tr->http_status) ||
+           (TALER_EC_GENERIC_DB_SOFT_FAILURE == tr->ec) ||
+           (MHD_HTTP_INTERNAL_SERVER_ERROR == tr->http_status) )
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                     "Retrying transfer failed with %u/%d\n",
-                    http_status,
-                    (int) ec);
+                    tr->http_status,
+                    (int) tr->ec);
         /* on DB conflicts, do not use backoff */
-        if (TALER_EC_GENERIC_DB_SOFT_FAILURE == ec)
+        if (TALER_EC_GENERIC_DB_SOFT_FAILURE == tr->ec)
           fts->backoff = GNUNET_TIME_UNIT_ZERO;
         else
           fts->backoff = EXCHANGE_LIB_BACKOFF (fts->backoff);
-        fts->is->commands[fts->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (fts->is);
         fts->retry_task
           = GNUNET_SCHEDULER_add_delayed (fts->backoff,
                                           &do_retry,
@@ -207,17 +198,14 @@ confirmation_cb (void *cls,
         return;
       }
     }
-    GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Bank returned HTTP status %u/%d\n",
-                http_status,
-                (int) ec);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     tr->http_status,
+                                     MHD_HTTP_OK);
     return;
   }
 
-  fts->serial_id = serial_id;
-  fts->timestamp = timestamp;
+  fts->serial_id = tr->details.ok.row_id;
+  fts->timestamp = tr->details.ok.timestamp;
   TALER_TESTING_interpreter_next (is);
 }
 
@@ -284,9 +272,8 @@ transfer_cleanup (void *cls,
 
   if (NULL != fts->weh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %s did not complete\n",
-                cmd->label);
+    TALER_TESTING_command_incomplete (fts->is,
+                                      cmd->label);
     TALER_BANK_transfer_cancel (fts->weh);
     fts->weh = NULL;
   }
@@ -319,12 +306,12 @@ transfer_traits (void *cls,
   struct TransferState *fts = cls;
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_exchange_url (
-      (const char **) &fts->exchange_base_url),
+      fts->exchange_base_url),
     TALER_TESTING_make_trait_bank_row (&fts->serial_id),
     TALER_TESTING_make_trait_credit_payto_uri (
-      (const char **) &fts->payto_credit_account),
+      fts->payto_credit_account),
     TALER_TESTING_make_trait_debit_payto_uri (
-      (const char **) &fts->payto_debit_account),
+      fts->payto_debit_account),
     TALER_TESTING_make_trait_amount (&fts->amount),
     TALER_TESTING_make_trait_timestamp (0, &fts->timestamp),
     TALER_TESTING_make_trait_wtid (&fts->wtid),
diff --git a/src/testing/testing_api_cmd_batch.c b/src/testing/testing_api_cmd_batch.c
index e8f76ca37..5bb7b974e 100644
--- a/src/testing/testing_api_cmd_batch.c
+++ b/src/testing/testing_api_cmd_batch.c
@@ -38,6 +38,11 @@ struct BatchState
   struct TALER_TESTING_Command *batch;
 
   /**
+   * My command (the batch command).
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Internal command pointer.
    */
   unsigned int batch_ip;
@@ -58,6 +63,7 @@ batch_run (void *cls,
 {
   struct BatchState *bs = cls;
 
+  bs->cmd = cmd;
   if (NULL != bs->batch[bs->batch_ip].label)
     TALER_LOG_INFO ("Running batched command: %s\n",
                     bs->batch[bs->batch_ip].label);
@@ -97,8 +103,9 @@ batch_cleanup (void *cls,
   for (unsigned int i = 0;
        NULL != bs->batch[i].label;
        i++)
-    bs->batch[i].cleanup (bs->batch[i].cls,
-                          &bs->batch[i]);
+    if (NULL != bs->batch[i].cleanup)
+      bs->batch[i].cleanup (bs->batch[i].cls,
+                            &bs->batch[i]);
   GNUNET_free (bs->batch);
   GNUNET_free (bs);
 }
@@ -121,7 +128,7 @@ batch_traits (void *cls,
 {
   struct BatchState *bs = cls;
   struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_batch_cmds (&bs->batch),
+    TALER_TESTING_make_trait_batch_cmds (bs->batch),
     TALER_TESTING_trait_end ()
   };
 
@@ -149,9 +156,9 @@ TALER_TESTING_cmd_batch (const char *label,
 
   bs->batch = GNUNET_new_array (i + 1,
                                 struct TALER_TESTING_Command);
-  memcpy (bs->batch,
-          batch,
-          sizeof (struct TALER_TESTING_Command) * i);
+  GNUNET_memcpy (bs->batch,
+                 batch,
+                 sizeof (struct TALER_TESTING_Command) * i);
   {
     struct TALER_TESTING_Command cmd = {
       .cls = bs,
@@ -166,19 +173,33 @@ TALER_TESTING_cmd_batch (const char *label,
 }
 
 
-void
-TALER_TESTING_cmd_batch_next (struct TALER_TESTING_Interpreter *is)
+bool
+TALER_TESTING_cmd_batch_next (struct TALER_TESTING_Interpreter *is,
+                              void *cls)
 {
-  struct BatchState *bs = is->commands[is->ip].cls;
+  struct BatchState *bs = cls;
+  struct TALER_TESTING_Command *bcmd = &bs->batch[bs->batch_ip];
 
-  if (NULL == bs->batch[bs->batch_ip].label)
+  if (NULL == bcmd->label)
   {
-    is->commands[is->ip].finish_time = GNUNET_TIME_absolute_get ();
-    is->ip++;
-    return;
+    /* This batch is done */
+    return true;
+  }
+  if (TALER_TESTING_cmd_is_batch (bcmd))
+  {
+    if (TALER_TESTING_cmd_batch_next (is,
+                                      bcmd->cls))
+    {
+      /* sub-batch is done */
+      bcmd->finish_time = GNUNET_TIME_absolute_get ();
+      bs->batch_ip++;
+      return false;
+    }
   }
-  bs->batch[bs->batch_ip].finish_time = GNUNET_TIME_absolute_get ();
+  /* Simple command is done */
+  bcmd->finish_time = GNUNET_TIME_absolute_get ();
   bs->batch_ip++;
+  return false;
 }
 
 
diff --git a/src/testing/testing_api_cmd_batch_deposit.c b/src/testing/testing_api_cmd_batch_deposit.c
new file mode 100644
index 000000000..5139d3524
--- /dev/null
+++ b/src/testing/testing_api_cmd_batch_deposit.c
@@ -0,0 +1,656 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2018-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/>
+*/
+/**
+ * @file testing/testing_api_cmd_batch_deposit.c
+ * @brief command for testing /batch-deposit.
+ * @author Marcello Stanisci
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * How often do we retry before giving up?
+ */
+#define NUM_RETRIES 5
+
+/**
+ * How long do we wait AT MOST when retrying?
+ */
+#define MAX_BACKOFF GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_MILLISECONDS, 100)
+
+
+/**
+ * Information per coin in the batch.
+ */
+struct Coin
+{
+
+  /**
+   * Amount to deposit.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * Deposit fee.
+   */
+  struct TALER_Amount deposit_fee;
+
+  /**
+   * Our coin signature.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
+   * Reference to any command that is able to provide a coin,
+   * possibly using $LABEL#$INDEX notation.
+   */
+  char *coin_reference;
+
+  /**
+   * Denomination public key of the coin.
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+
+  /**
+   * The command being referenced.
+   */
+  const struct TALER_TESTING_Command *coin_cmd;
+
+  /**
+   * Expected entry in the coin history created by this
+   * coin.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
+   * Index of the coin at @e coin_cmd.
+   */
+  unsigned int coin_idx;
+};
+
+
+/**
+ * State for a "batch deposit" CMD.
+ */
+struct BatchDepositState
+{
+
+  /**
+   * Refund deadline. Zero for no refunds.
+   */
+  struct GNUNET_TIME_Timestamp refund_deadline;
+
+  /**
+   * Wire deadline.
+   */
+  struct GNUNET_TIME_Timestamp wire_deadline;
+
+  /**
+   * Timestamp of the /deposit operation in the wallet (contract signing time).
+   */
+  struct GNUNET_TIME_Timestamp wallet_timestamp;
+
+  /**
+   * How long do we wait until we retry?
+   */
+  struct GNUNET_TIME_Relative backoff;
+
+  /**
+   * When did the exchange receive the deposit?
+   */
+  struct GNUNET_TIME_Timestamp exchange_timestamp;
+
+  /**
+   * Signing key used by the exchange to sign the
+   * deposit confirmation.
+   */
+  struct TALER_ExchangePublicKeyP exchange_pub;
+
+  /**
+   * Set (by the interpreter) to a fresh private key.  This
+   * key will be used to sign the deposit request.
+   */
+  struct TALER_MerchantPrivateKeyP merchant_priv;
+
+  /**
+   * Deposit handle while operation is running.
+   */
+  struct TALER_EXCHANGE_BatchDepositHandle *dh;
+
+  /**
+   * Array of coins to batch-deposit.
+   */
+  struct Coin *coins;
+
+  /**
+   * Wire details of who is depositing -- this would be merchant
+   * wire details in a normal scenario.
+   */
+  json_t *wire_details;
+
+  /**
+   * JSON string describing what a proposal is about.
+   */
+  json_t *contract_terms;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Task scheduled to try later.
+   */
+  struct GNUNET_SCHEDULER_Task *retry_task;
+
+  /**
+   * Deposit confirmation signature from the exchange.
+   */
+  struct TALER_ExchangeSignatureP exchange_sig;
+
+  /**
+   * Reference to previous deposit operation.
+   * Only present if we're supposed to replay the previous deposit.
+   */
+  const char *deposit_reference;
+
+  /**
+   * If @e coin_reference refers to an operation that generated
+   * an array of coins, this value determines which coin to pick.
+   */
+  unsigned int num_coins;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Set to true if the /deposit succeeded
+   * and we now can provide the resulting traits.
+   */
+  bool deposit_succeeded;
+
+};
+
+
+/**
+ * Callback to analyze the /batch-deposit response, just used to check if the
+ * response code is acceptable.
+ *
+ * @param cls closure.
+ * @param dr deposit response details
+ */
+static void
+batch_deposit_cb (void *cls,
+                  const struct TALER_EXCHANGE_BatchDepositResult *dr)
+{
+  struct BatchDepositState *ds = cls;
+
+  ds->dh = NULL;
+  if (ds->expected_response_code != dr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
+    return;
+  }
+  if (MHD_HTTP_OK == dr->hr.http_status)
+  {
+    ds->deposit_succeeded = GNUNET_YES;
+    ds->exchange_timestamp = dr->details.ok.deposit_timestamp;
+    ds->exchange_pub = *dr->details.ok.exchange_pub;
+    ds->exchange_sig = *dr->details.ok.exchange_sig;
+  }
+  TALER_TESTING_interpreter_next (ds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+batch_deposit_run (void *cls,
+                   const struct TALER_TESTING_Command *cmd,
+                   struct TALER_TESTING_Interpreter *is)
+{
+  struct BatchDepositState *ds = cls;
+  const struct TALER_DenominationSignature *denom_pub_sig;
+  struct TALER_MerchantPublicKeyP merchant_pub;
+  struct TALER_PrivateContractHashP h_contract_terms;
+  enum TALER_ErrorCode ec;
+  struct TALER_WireSaltP wire_salt;
+  struct TALER_MerchantWireHashP h_wire;
+  const char *payto_uri;
+  struct TALER_EXCHANGE_CoinDepositDetail cdds[ds->num_coins];
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("payto_uri",
+                             &payto_uri),
+    GNUNET_JSON_spec_fixed_auto ("salt",
+                                 &wire_salt),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *exchange_url
+    = TALER_TESTING_get_exchange_url (is);
+
+  (void) cmd;
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  memset (cdds,
+          0,
+          sizeof (cdds));
+  ds->is = is;
+  GNUNET_assert (NULL != ds->wire_details);
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (ds->wire_details,
+                         spec,
+                         NULL, NULL))
+  {
+    json_dumpf (ds->wire_details,
+                stderr,
+                JSON_INDENT (2));
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_JSON_contract_hash (ds->contract_terms,
+                                &h_contract_terms))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_JSON_merchant_wire_signature_hash (ds->wire_details,
+                                                          &h_wire));
+  if (! GNUNET_TIME_absolute_is_zero (ds->refund_deadline.abs_time))
+  {
+    struct GNUNET_TIME_Relative refund_deadline;
+
+    refund_deadline
+      = GNUNET_TIME_absolute_get_remaining (ds->refund_deadline.abs_time);
+    ds->wire_deadline
+      =
+        GNUNET_TIME_relative_to_timestamp (
+          GNUNET_TIME_relative_multiply (refund_deadline,
+                                         2));
+  }
+  else
+  {
+    ds->refund_deadline = ds->wallet_timestamp;
+    ds->wire_deadline = GNUNET_TIME_timestamp_get ();
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&ds->merchant_priv.eddsa_priv,
+                                      &merchant_pub.eddsa_pub);
+
+  for (unsigned int i = 0; i<ds->num_coins; i++)
+  {
+    struct Coin *coin = &ds->coins[i];
+    struct TALER_EXCHANGE_CoinDepositDetail *cdd = &cdds[i];
+    const struct TALER_CoinSpendPrivateKeyP *coin_priv;
+    const struct TALER_AgeCommitmentProof *age_commitment_proof = NULL;
+
+    GNUNET_assert (NULL != coin->coin_reference);
+    cdd->amount = coin->amount;
+    coin->coin_cmd = TALER_TESTING_interpreter_lookup_command (
+      is,
+      coin->coin_reference);
+    if (NULL == coin->coin_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+
+    if ( (GNUNET_OK !=
+          TALER_TESTING_get_trait_coin_priv (coin->coin_cmd,
+                                             coin->coin_idx,
+                                             &coin_priv)) ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_age_commitment_proof (coin->coin_cmd,
+                                                        coin->coin_idx,
+                                                        &age_commitment_proof))
+         ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_denom_pub (coin->coin_cmd,
+                                             coin->coin_idx,
+                                             &coin->denom_pub)) ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_denom_sig (coin->coin_cmd,
+                                             coin->coin_idx,
+                                             &denom_pub_sig)) )
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (NULL != age_commitment_proof)
+    {
+      TALER_age_commitment_hash (&age_commitment_proof->commitment,
+                                 &cdd->h_age_commitment);
+    }
+    coin->deposit_fee = coin->denom_pub->fees.deposit;
+    GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                        &cdd->coin_pub.eddsa_pub);
+    cdd->denom_sig = *denom_pub_sig;
+    cdd->h_denom_pub = coin->denom_pub->h_key;
+    TALER_wallet_deposit_sign (&coin->amount,
+                               &coin->denom_pub->fees.deposit,
+                               &h_wire,
+                               &h_contract_terms,
+                               NULL, /* wallet_data_hash */
+                               &cdd->h_age_commitment,
+                               NULL, /* hash of extensions */
+                               &coin->denom_pub->h_key,
+                               ds->wallet_timestamp,
+                               &merchant_pub,
+                               ds->refund_deadline,
+                               coin_priv,
+                               &cdd->coin_sig);
+    coin->coin_sig = cdd->coin_sig;
+    coin->che.type = TALER_EXCHANGE_CTT_DEPOSIT;
+    coin->che.amount = coin->amount;
+    coin->che.details.deposit.h_wire = h_wire;
+    coin->che.details.deposit.h_contract_terms = h_contract_terms;
+    coin->che.details.deposit.no_h_policy = true;
+    coin->che.details.deposit.no_wallet_data_hash = true;
+    coin->che.details.deposit.wallet_timestamp = ds->wallet_timestamp;
+    coin->che.details.deposit.merchant_pub = merchant_pub;
+    coin->che.details.deposit.refund_deadline = ds->refund_deadline;
+    coin->che.details.deposit.sig = cdd->coin_sig;
+    coin->che.details.deposit.no_hac = GNUNET_is_zero (&cdd->h_age_commitment);
+    coin->che.details.deposit.hac = cdd->h_age_commitment;
+    coin->che.details.deposit.deposit_fee = coin->denom_pub->fees.deposit;
+  }
+
+  GNUNET_assert (NULL == ds->dh);
+  {
+    struct TALER_EXCHANGE_DepositContractDetail dcd = {
+      .wire_deadline = ds->wire_deadline,
+      .merchant_payto_uri = payto_uri,
+      .wire_salt = wire_salt,
+      .h_contract_terms = h_contract_terms,
+      .policy_details = NULL /* FIXME #7270-OEC */,
+      .wallet_timestamp = ds->wallet_timestamp,
+      .merchant_pub = merchant_pub,
+      .refund_deadline = ds->refund_deadline
+    };
+
+    ds->dh = TALER_EXCHANGE_batch_deposit (
+      TALER_TESTING_interpreter_get_context (is),
+      exchange_url,
+      TALER_TESTING_get_keys (is),
+      &dcd,
+      ds->num_coins,
+      cdds,
+      &batch_deposit_cb,
+      ds,
+      &ec);
+  }
+  if (NULL == ds->dh)
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not create deposit with EC %d\n",
+                (int) ec);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "batch-deposit" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct BatchDepositState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+batch_deposit_cleanup (void *cls,
+                       const struct TALER_TESTING_Command *cmd)
+{
+  struct BatchDepositState *ds = cls;
+
+  if (NULL != ds->dh)
+  {
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_batch_deposit_cancel (ds->dh);
+    ds->dh = NULL;
+  }
+  if (NULL != ds->retry_task)
+  {
+    GNUNET_SCHEDULER_cancel (ds->retry_task);
+    ds->retry_task = NULL;
+  }
+  for (unsigned int i = 0; i<ds->num_coins; i++)
+    GNUNET_free (ds->coins[i].coin_reference);
+  GNUNET_free (ds->coins);
+  json_decref (ds->wire_details);
+  json_decref (ds->contract_terms);
+  GNUNET_free (ds);
+}
+
+
+/**
+ * Offer internal data from a "batch-deposit" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+batch_deposit_traits (void *cls,
+                      const void **ret,
+                      const char *trait,
+                      unsigned int index)
+{
+  struct BatchDepositState *ds = cls;
+  const struct Coin *coin = &ds->coins[index];
+  /* Will point to coin cmd internals. */
+  const struct TALER_CoinSpendPrivateKeyP *coin_spent_priv;
+  struct TALER_CoinSpendPublicKeyP coin_spent_pub;
+  const struct TALER_AgeCommitmentProof *age_commitment_proof;
+
+  if (index >= ds->num_coins)
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  if (NULL == coin->coin_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (ds->is);
+    return GNUNET_NO;
+  }
+  if ( (GNUNET_OK !=
+        TALER_TESTING_get_trait_coin_priv (coin->coin_cmd,
+                                           coin->coin_idx,
+                                           &coin_spent_priv)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_age_commitment_proof (coin->coin_cmd,
+                                                      coin->coin_idx,
+                                                      &age_commitment_proof)) )
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (ds->is);
+    return GNUNET_NO;
+  }
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&coin_spent_priv->eddsa_priv,
+                                      &coin_spent_pub.eddsa_pub);
+
+  {
+    struct TALER_TESTING_Trait traits[] = {
+      /* First two traits are only available if
+         ds->traits is #GNUNET_YES */
+      TALER_TESTING_make_trait_exchange_pub (0,
+                                             &ds->exchange_pub),
+      TALER_TESTING_make_trait_exchange_sig (0,
+                                             &ds->exchange_sig),
+      /* These traits are always available */
+      TALER_TESTING_make_trait_wire_details (ds->wire_details),
+      TALER_TESTING_make_trait_contract_terms (ds->contract_terms),
+      TALER_TESTING_make_trait_merchant_priv (&ds->merchant_priv),
+      TALER_TESTING_make_trait_age_commitment_proof (index,
+                                                     age_commitment_proof),
+      TALER_TESTING_make_trait_coin_history (index,
+                                             &coin->che),
+      TALER_TESTING_make_trait_coin_pub (index,
+                                         &coin_spent_pub),
+      TALER_TESTING_make_trait_denom_pub (index,
+                                          coin->denom_pub),
+      TALER_TESTING_make_trait_coin_priv (index,
+                                          coin_spent_priv),
+      TALER_TESTING_make_trait_coin_sig (index,
+                                         &coin->coin_sig),
+      TALER_TESTING_make_trait_deposit_amount (index,
+                                               &coin->amount),
+      TALER_TESTING_make_trait_deposit_fee_amount (index,
+                                                   &coin->deposit_fee),
+      TALER_TESTING_make_trait_timestamp (index,
+                                          &ds->exchange_timestamp),
+      TALER_TESTING_make_trait_wire_deadline (index,
+                                              &ds->wire_deadline),
+      TALER_TESTING_make_trait_refund_deadline (index,
+                                                &ds->refund_deadline),
+      TALER_TESTING_trait_end ()
+    };
+
+    return TALER_TESTING_get_trait ((ds->deposit_succeeded)
+                                    ? traits
+                                    : &traits[2],
+                                    ret,
+                                    trait,
+                                    index);
+  }
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_batch_deposit (const char *label,
+                                 const char *target_account_payto,
+                                 const char *contract_terms,
+                                 struct GNUNET_TIME_Relative refund_deadline,
+                                 unsigned int expected_response_code,
+                                 ...)
+{
+  struct BatchDepositState *ds;
+  va_list ap;
+  unsigned int num_coins = 0;
+  const char *ref;
+
+  va_start (ap,
+            expected_response_code);
+  while (NULL != (ref = va_arg (ap,
+                                const char *)))
+  {
+    GNUNET_assert (NULL != va_arg (ap,
+                                   const char *));
+    num_coins++;
+  }
+  va_end (ap);
+
+  ds = GNUNET_new (struct BatchDepositState);
+  ds->num_coins = num_coins;
+  ds->coins = GNUNET_new_array (num_coins,
+                                struct Coin);
+  num_coins = 0;
+  va_start (ap,
+            expected_response_code);
+  while (NULL != (ref = va_arg (ap,
+                                const char *)))
+  {
+    struct Coin *coin = &ds->coins[num_coins++];
+    const char *amount = va_arg (ap,
+                                 const char *);
+
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_parse_coin_reference (ref,
+                                                       &coin->coin_reference,
+                                                       &coin->coin_idx));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (amount,
+                                           &coin->amount));
+  }
+  va_end (ap);
+
+  ds->wire_details = TALER_TESTING_make_wire_details (target_account_payto);
+  GNUNET_assert (NULL != ds->wire_details);
+  ds->contract_terms = json_loads (contract_terms,
+                                   JSON_REJECT_DUPLICATES,
+                                   NULL);
+  GNUNET_CRYPTO_eddsa_key_create (&ds->merchant_priv.eddsa_priv);
+  if (NULL == ds->contract_terms)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to parse contract terms `%s' for CMD `%s'\n",
+                contract_terms,
+                label);
+    GNUNET_assert (0);
+  }
+  ds->wallet_timestamp = GNUNET_TIME_timestamp_get ();
+  GNUNET_assert (0 ==
+                 json_object_set_new (ds->contract_terms,
+                                      "timestamp",
+                                      GNUNET_JSON_from_timestamp (
+                                        ds->wallet_timestamp)));
+  if (! GNUNET_TIME_relative_is_zero (refund_deadline))
+  {
+    ds->refund_deadline = GNUNET_TIME_relative_to_timestamp (refund_deadline);
+    GNUNET_assert (0 ==
+                   json_object_set_new (ds->contract_terms,
+                                        "refund_deadline",
+                                        GNUNET_JSON_from_timestamp (
+                                          ds->refund_deadline)));
+  }
+  ds->expected_response_code = expected_response_code;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &batch_deposit_run,
+      .cleanup = &batch_deposit_cleanup,
+      .traits = &batch_deposit_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_batch_deposit.c */
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c
new file mode 100644
index 000000000..1b056bdbb
--- /dev/null
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -0,0 +1,557 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2018-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/>
+*/
+/**
+ * @file testing/testing_api_cmd_batch_withdraw.c
+ * @brief implements the batch withdraw command
+ * @author Christian Grothoff
+ * @author Marcello Stanisci
+ */
+#include "platform.h"
+#include "taler_exchange_service.h"
+#include "taler_json_lib.h"
+#include <microhttpd.h>
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_signatures.h"
+#include "taler_extensions.h"
+#include "taler_testing_lib.h"
+
+/**
+ * Information we track per withdrawn coin.
+ */
+struct CoinState
+{
+
+  /**
+   * String describing the denomination value we should withdraw.
+   * A corresponding denomination key must exist in the exchange's
+   * offerings.  Can be NULL if @e pk is set instead.
+   */
+  struct TALER_Amount amount;
+
+  /**
+   * If @e amount is NULL, this specifies the denomination key to
+   * use.  Otherwise, this will be set (by the interpreter) to the
+   * denomination PK matching @e amount.
+   */
+  struct TALER_EXCHANGE_DenomPublicKey *pk;
+
+  /**
+   * Private key of the coin.
+   */
+  struct TALER_CoinSpendPrivateKeyP coin_priv;
+
+  /**
+   * Public key of the coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Blinding key used during the operation.
+   */
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+
+  /**
+   * Values contributed from the exchange during the
+   * withdraw protocol.
+   */
+  struct TALER_ExchangeWithdrawValues exchange_vals;
+
+  /**
+   * Set (by the interpreter) to the exchange's signature over the
+   * coin's public key.
+   */
+  struct TALER_DenominationSignature sig;
+
+  /**
+   * Private key material of the coin, set by the interpreter.
+   */
+  struct TALER_PlanchetMasterSecretP ps;
+
+  /**
+   * If age > 0, put here the corresponding age commitment with its proof and
+   * its hash, respectively.
+   */
+  struct TALER_AgeCommitmentProof age_commitment_proof;
+  struct TALER_AgeCommitmentHash h_age_commitment;
+
+  /**
+   * Reserve history entry that corresponds to this coin.
+   * Will be of type #TALER_EXCHANGE_RTT_WITHDRAWAL.
+   */
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
+
+
+};
+
+
+/**
+ * State for a "batch withdraw" CMD.
+ */
+struct BatchWithdrawState
+{
+
+  /**
+   * Which reserve should we withdraw from?
+   */
+  const char *reserve_reference;
+
+  /**
+   * Exchange base URL.  Only used as offered trait.
+   */
+  char *exchange_url;
+
+  /**
+   * URI if the reserve we are withdrawing from.
+   */
+  char *reserve_payto_uri;
+
+  /**
+   * Private key of the reserve we are withdrawing from.
+   */
+  struct TALER_ReservePrivateKeyP reserve_priv;
+
+  /**
+   * Public key of the reserve we are withdrawing from.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Interpreter state (during command).
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Withdraw handle (while operation is running).
+   */
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wsh;
+
+  /**
+   * Array of coin states.
+   */
+  struct CoinState *coins;
+
+  /**
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC.
+   */
+  uint64_t requirement_row;
+
+  /**
+   * Length of the @e coins array.
+   */
+  unsigned int num_coins;
+
+  /**
+   * Expected HTTP response code to the request.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * An age > 0 signifies age restriction is required.
+   * Same for all coins in the batch.
+   */
+  uint8_t age;
+
+  /**
+   * Force a conflict:
+   */
+  bool force_conflict;
+};
+
+
+/**
+ * "batch withdraw" operation callback; checks that the
+ * response code is expected and store the exchange signature
+ * in the state.
+ *
+ * @param cls closure.
+ * @param wr withdraw response details
+ */
+static void
+reserve_batch_withdraw_cb (void *cls,
+                           const struct
+                           TALER_EXCHANGE_BatchWithdrawResponse *wr)
+{
+  struct BatchWithdrawState *ws = cls;
+  struct TALER_TESTING_Interpreter *is = ws->is;
+
+  ws->wsh = NULL;
+  if (ws->expected_response_code != wr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status_with_body (is,
+                                               wr->hr.http_status,
+                                               ws->expected_response_code,
+                                               wr->hr.reply);
+    return;
+  }
+  switch (wr->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    for (unsigned int i = 0; i<ws->num_coins; i++)
+    {
+      struct CoinState *cs = &ws->coins[i];
+      const struct TALER_EXCHANGE_PrivateCoinDetails *pcd
+        = &wr->details.ok.coins[i];
+
+      TALER_denom_sig_copy (&cs->sig,
+                            &pcd->sig);
+      cs->coin_priv = pcd->coin_priv;
+      GNUNET_CRYPTO_eddsa_key_get_public (&cs->coin_priv.eddsa_priv,
+                                          &cs->coin_pub.eddsa_pub);
+
+      cs->bks = pcd->bks;
+      TALER_denom_ewv_copy (&cs->exchange_vals,
+                            &pcd->exchange_vals);
+    }
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    /* nothing to check */
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    /* nothing to check */
+    break;
+  case MHD_HTTP_CONFLICT:
+    /* TODO[oec]: Check if age-requirement is the reason */
+    break;
+  case MHD_HTTP_GONE:
+    /* theoretically could check that the key was actually */
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* nothing to check */
+    ws->requirement_row
+      = wr->details.unavailable_for_legal_reasons.requirement_row;
+    ws->h_payto
+      = wr->details.unavailable_for_legal_reasons.h_payto;
+    break;
+  default:
+    /* Unsupported status code (by test harness) */
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Batch withdraw test command does not support status code %u\n",
+                wr->hr.http_status);
+    GNUNET_break (0);
+    break;
+  }
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ */
+static void
+batch_withdraw_run (void *cls,
+                    const struct TALER_TESTING_Command *cmd,
+                    struct TALER_TESTING_Interpreter *is)
+{
+  struct BatchWithdrawState *ws = cls;
+  const struct TALER_EXCHANGE_Keys *keys =  TALER_TESTING_get_keys (is);
+  const struct TALER_ReservePrivateKeyP *rp;
+  const struct TALER_TESTING_Command *create_reserve;
+  const struct TALER_EXCHANGE_DenomPublicKey *dpk;
+  struct TALER_EXCHANGE_WithdrawCoinInput wcis[ws->num_coins];
+  struct TALER_PlanchetMasterSecretP conflict_ps = {0};
+  struct TALER_AgeMask mask = {0};
+
+  (void) cmd;
+  ws->is = is;
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (
+        is,
+        ws->reserve_reference);
+
+  if (NULL == create_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+                                            &rp))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (NULL == ws->exchange_url)
+    ws->exchange_url
+      = GNUNET_strdup (TALER_TESTING_get_exchange_url (is));
+  ws->reserve_priv = *rp;
+  GNUNET_CRYPTO_eddsa_key_get_public (&ws->reserve_priv.eddsa_priv,
+                                      &ws->reserve_pub.eddsa_pub);
+  ws->reserve_payto_uri
+    = TALER_reserve_make_payto (ws->exchange_url,
+                                &ws->reserve_pub);
+
+  if (0 < ws->age)
+    mask = TALER_extensions_get_age_restriction_mask ();
+
+  if (ws->force_conflict)
+    TALER_planchet_master_setup_random (&conflict_ps);
+
+  for (unsigned int i = 0; i<ws->num_coins; i++)
+  {
+    struct CoinState *cs = &ws->coins[i];
+    struct TALER_EXCHANGE_WithdrawCoinInput *wci = &wcis[i];
+
+    if (ws->force_conflict)
+      cs->ps = conflict_ps;
+    else
+      TALER_planchet_master_setup_random (&cs->ps);
+
+    if (0 < ws->age)
+    {
+      struct GNUNET_HashCode seed = {0};
+      GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                  &seed,
+                                  sizeof(seed));
+      TALER_age_restriction_commit (&mask,
+                                    ws->age,
+                                    &seed,
+                                    &cs->age_commitment_proof);
+      TALER_age_commitment_hash (&cs->age_commitment_proof.commitment,
+                                 &cs->h_age_commitment);
+    }
+
+
+    dpk = TALER_TESTING_find_pk (keys,
+                                 &cs->amount,
+                                 ws->age > 0);
+    if (NULL == dpk)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to determine denomination key at %s\n",
+                  (NULL != cmd) ? cmd->label : "<retried command>");
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    /* We copy the denomination key, as re-querying /keys
+     * would free the old one. */
+    cs->pk = TALER_EXCHANGE_copy_denomination_key (dpk);
+    cs->reserve_history.type = TALER_EXCHANGE_RTT_WITHDRAWAL;
+    GNUNET_assert (0 <=
+                   TALER_amount_add (&cs->reserve_history.amount,
+                                     &cs->amount,
+                                     &cs->pk->fees.withdraw));
+    cs->reserve_history.details.withdraw.fee = cs->pk->fees.withdraw;
+
+    wci->pk = cs->pk;
+    wci->ps = &cs->ps;
+    wci->ach = &cs->h_age_commitment;
+  }
+  ws->wsh = TALER_EXCHANGE_batch_withdraw (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    keys,
+    rp,
+    ws->num_coins,
+    wcis,
+    &reserve_batch_withdraw_cb,
+    ws);
+  if (NULL == ws->wsh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "withdraw" CMD, and possibly cancel
+ * a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command being freed.
+ */
+static void
+batch_withdraw_cleanup (void *cls,
+                        const struct TALER_TESTING_Command *cmd)
+{
+  struct BatchWithdrawState *ws = cls;
+
+  if (NULL != ws->wsh)
+  {
+    TALER_TESTING_command_incomplete (ws->is,
+                                      cmd->label);
+    TALER_EXCHANGE_batch_withdraw_cancel (ws->wsh);
+    ws->wsh = NULL;
+  }
+  for (unsigned int i = 0; i<ws->num_coins; i++)
+  {
+    struct CoinState *cs = &ws->coins[i];
+
+    TALER_denom_ewv_free (&cs->exchange_vals);
+    TALER_denom_sig_free (&cs->sig);
+    if (NULL != cs->pk)
+    {
+      TALER_EXCHANGE_destroy_denomination_key (cs->pk);
+      cs->pk = NULL;
+    }
+    if (0 < ws->age)
+      TALER_age_commitment_proof_free (&cs->age_commitment_proof);
+  }
+  GNUNET_free (ws->coins);
+  GNUNET_free (ws->exchange_url);
+  GNUNET_free (ws->reserve_payto_uri);
+  GNUNET_free (ws);
+}
+
+
+/**
+ * Offer internal data to a "withdraw" CMD state to other
+ * commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+batch_withdraw_traits (void *cls,
+                       const void **ret,
+                       const char *trait,
+                       unsigned int index)
+{
+  struct BatchWithdrawState *ws = cls;
+  struct CoinState *cs = &ws->coins[index];
+  struct TALER_TESTING_Trait traits[] = {
+    /* history entry MUST be first due to response code logic below! */
+    TALER_TESTING_make_trait_reserve_history (index,
+                                              &cs->reserve_history),
+    TALER_TESTING_make_trait_coin_priv (index,
+                                        &cs->coin_priv),
+    TALER_TESTING_make_trait_coin_pub (index,
+                                       &cs->coin_pub),
+    TALER_TESTING_make_trait_planchet_secrets (index,
+                                               &cs->ps),
+    TALER_TESTING_make_trait_blinding_key (index,
+                                           &cs->bks),
+    TALER_TESTING_make_trait_exchange_wd_value (index,
+                                                &cs->exchange_vals),
+    TALER_TESTING_make_trait_denom_pub (index,
+                                        cs->pk),
+    TALER_TESTING_make_trait_denom_sig (index,
+                                        &cs->sig),
+    TALER_TESTING_make_trait_reserve_priv (&ws->reserve_priv),
+    TALER_TESTING_make_trait_reserve_pub (&ws->reserve_pub),
+    TALER_TESTING_make_trait_amounts (index,
+                                      &cs->amount),
+    TALER_TESTING_make_trait_legi_requirement_row (&ws->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&ws->h_payto),
+    TALER_TESTING_make_trait_payto_uri (ws->reserve_payto_uri),
+    TALER_TESTING_make_trait_exchange_url (ws->exchange_url),
+    TALER_TESTING_make_trait_age_commitment_proof (index,
+                                                   ws->age > 0 ?
+                                                   &cs->age_commitment_proof:
+                                                   NULL),
+    TALER_TESTING_make_trait_h_age_commitment (index,
+                                               ws->age > 0 ?
+                                               &cs->h_age_commitment :
+                                               NULL),
+    TALER_TESTING_trait_end ()
+  };
+
+  if (index >= ws->num_coins)
+    return GNUNET_NO;
+  return TALER_TESTING_get_trait ((ws->expected_response_code == MHD_HTTP_OK)
+                                  ? &traits[0]   /* we have reserve history */
+                                  : &traits[1],  /* skip reserve history */
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_batch_withdraw_with_conflict (
+  const char *label,
+  const char *reserve_reference,
+  bool conflict,
+  uint8_t age,
+  unsigned int expected_response_code,
+  const char *amount,
+  ...)
+{
+  struct BatchWithdrawState *ws;
+  unsigned int cnt;
+  va_list ap;
+
+  ws = GNUNET_new (struct BatchWithdrawState);
+  ws->age = age;
+  ws->reserve_reference = reserve_reference;
+  ws->expected_response_code = expected_response_code;
+  ws->force_conflict = conflict;
+
+  cnt = 1;
+  va_start (ap,
+            amount);
+  while (NULL != (va_arg (ap,
+                          const char *)))
+    cnt++;
+  ws->num_coins = cnt;
+  ws->coins = GNUNET_new_array (cnt,
+                                struct CoinState);
+  va_end (ap);
+  va_start (ap,
+            amount);
+  for (unsigned int i = 0; i<ws->num_coins; i++)
+  {
+    struct CoinState *cs = &ws->coins[i];
+
+    if (GNUNET_OK !=
+        TALER_string_to_amount (amount,
+                                &cs->amount))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to parse amount `%s' at %s\n",
+                  amount,
+                  label);
+      GNUNET_assert (0);
+    }
+    /* move on to next vararg! */
+    amount = va_arg (ap,
+                     const char *);
+  }
+  GNUNET_assert (NULL == amount);
+  va_end (ap);
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ws,
+      .label = label,
+      .run = &batch_withdraw_run,
+      .cleanup = &batch_withdraw_cleanup,
+      .traits = &batch_withdraw_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_batch_withdraw.c */
diff --git a/src/testing/testing_api_cmd_change_auth.c b/src/testing/testing_api_cmd_change_auth.c
deleted file mode 100644
index c3a60a1da..000000000
--- a/src/testing/testing_api_cmd_change_auth.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-  This file is part of TALER
-  (C) 2021 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/>
-*/
-/**
- * @file testing/testing_api_cmd_change_auth.c
- * @brief command(s) to change CURL context authorization header
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_testing_lib.h"
-
-
-/**
- * State for a "authchange" CMD.
- */
-struct AuthchangeState
-{
-
-  /**
-   * What is the new authorization token to send?
-   */
-  const char *auth_token;
-
-  /**
-   * Old context, clean up on termination.
-   */
-  struct GNUNET_CURL_Context *old_ctx;
-};
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-authchange_run (void *cls,
-                const struct TALER_TESTING_Command *cmd,
-                struct TALER_TESTING_Interpreter *is)
-{
-  struct AuthchangeState *ss = cls;
-
-  (void) cmd;
-  ss->old_ctx = is->ctx;
-  if (NULL != is->rc)
-  {
-    GNUNET_CURL_gnunet_rc_destroy (is->rc);
-    is->rc = NULL;
-  }
-  is->ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
-                              &is->rc);
-  GNUNET_CURL_enable_async_scope_header (is->ctx,
-                                         "Taler-Correlation-Id");
-  GNUNET_assert (NULL != is->ctx);
-  is->rc = GNUNET_CURL_gnunet_rc_create (is->ctx);
-  if (NULL != ss->auth_token)
-  {
-    char *authorization;
-
-    GNUNET_asprintf (&authorization,
-                     "%s: %s",
-                     MHD_HTTP_HEADER_AUTHORIZATION,
-                     ss->auth_token);
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_CURL_append_header (is->ctx,
-                                              authorization));
-    GNUNET_free (authorization);
-  }
-  TALER_TESTING_interpreter_next (is);
-}
-
-
-/**
- * Call GNUNET_CURL_fini(). Done as a separate task to
- * ensure that all of the command's cleanups have been
- * executed first.  See #7151.
- *
- * @param cls a `struct GNUNET_CURL_Context *` to clean up.
- */
-static void
-deferred_cleanup_cb (void *cls)
-{
-  struct GNUNET_CURL_Context *ctx = cls;
-
-  GNUNET_CURL_fini (ctx);
-}
-
-
-/**
- * Cleanup the state from a "authchange" CMD.
- *
- * @param cls closure.
- * @param cmd the command which is being cleaned up.
- */
-static void
-authchange_cleanup (void *cls,
-                    const struct TALER_TESTING_Command *cmd)
-{
-  struct AuthchangeState *ss = cls;
-
-  (void) cmd;
-  if (NULL != ss->old_ctx)
-  {
-    (void) GNUNET_SCHEDULER_add_now (&deferred_cleanup_cb,
-                                     ss->old_ctx);
-    ss->old_ctx = NULL;
-  }
-  GNUNET_free (ss);
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_set_authorization (const char *label,
-                                     const char *auth_token)
-{
-  struct AuthchangeState *ss;
-
-  ss = GNUNET_new (struct AuthchangeState);
-  ss->auth_token = auth_token;
-
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = ss,
-      .label = label,
-      .run = &authchange_run,
-      .cleanup = &authchange_cleanup
-    };
-
-    return cmd;
-  }
-}
-
-
-/* end of testing_api_cmd_change_auth.c  */
diff --git a/src/testing/testing_api_cmd_check_aml_decision.c b/src/testing/testing_api_cmd_check_aml_decision.c
new file mode 100644
index 000000000..fa0981e0d
--- /dev/null
+++ b/src/testing/testing_api_cmd_check_aml_decision.c
@@ -0,0 +1,270 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_check_aml_decision.c
+ * @brief command for testing /management/XXX
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * State for a "check_aml_decision" CMD.
+ */
+struct AmlCheckState
+{
+
+  /**
+   * Handle while operation is running.
+   */
+  struct TALER_EXCHANGE_LookupAmlDecision *dh;
+
+  /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Reference to command to previous set officer.
+   */
+  const char *ref_officer;
+
+  /**
+   * Reference to command to the previous set AML status operation.
+   */
+  const char *ref_operation;
+
+  /**
+   * Expected HTTP status.
+   */
+  unsigned int expected_http_status;
+
+};
+
+
+/**
+ * Callback to analyze the /aml/$OFFICER_PUB/$decision/$H_PAYTO response, just used to check
+ * if the response code is acceptable.
+ *
+ * @param cls closure.
+ * @param adr response details
+ */
+static void
+check_aml_decision_cb (void *cls,
+                       const struct TALER_EXCHANGE_AmlDecisionResponse *adr)
+{
+  struct AmlCheckState *ds = cls;
+
+  ds->dh = NULL;
+  if (ds->expected_http_status != adr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (ds->is,
+                                     adr->hr.http_status,
+                                     ds->expected_http_status);
+    return;
+  }
+  if (MHD_HTTP_OK == adr->hr.http_status)
+  {
+    const struct TALER_TESTING_Command *ref;
+    const char *justification;
+    enum TALER_AmlDecisionState *new_state;
+    const struct TALER_Amount *amount;
+    const struct TALER_EXCHANGE_AmlDecisionDetail *oldest = NULL;
+
+    ref = TALER_TESTING_interpreter_lookup_command (ds->is,
+                                                    ds->ref_operation);
+    if (NULL == ref)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ds->is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_aml_justification (ref,
+                                                              &justification));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_aml_decision (ref,
+                                                         &new_state));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_amount (ref,
+                                                   &amount));
+    for (unsigned int i = 0; i<adr->details.ok.aml_history_length; i++)
+    {
+      const struct TALER_EXCHANGE_AmlDecisionDetail *aml_history
+        = &adr->details.ok.aml_history[i];
+
+      if ( (NULL == oldest) ||
+           (0 !=
+            TALER_amount_cmp (amount,
+                              &oldest->new_threshold)) ||
+           (GNUNET_TIME_timestamp_cmp (oldest->decision_time,
+                                       >,
+                                       aml_history->decision_time)) )
+        oldest = aml_history;
+    }
+    if (NULL == oldest)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ds->is);
+      return;
+    }
+    if ( (oldest->new_state != *new_state) ||
+         (0 != strcmp (oldest->justification,
+                       justification) ) )
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ds->is);
+      return;
+    }
+  }
+  TALER_TESTING_interpreter_next (ds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+check_aml_decision_run (void *cls,
+                        const struct TALER_TESTING_Command *cmd,
+                        struct TALER_TESTING_Interpreter *is)
+{
+  struct AmlCheckState *ds = cls;
+  const struct TALER_PaytoHashP *h_payto;
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv;
+  const struct TALER_TESTING_Command *ref;
+  const char *exchange_url;
+
+  (void) cmd;
+  ds->is = is;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
+
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ds->ref_operation);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_h_payto (ref,
+                                                  &h_payto));
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ds->ref_officer);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_officer_priv (ref,
+                                                       &officer_priv));
+  ds->dh = TALER_EXCHANGE_lookup_aml_decision (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    h_payto,
+    officer_priv,
+    true, /* history */
+    &check_aml_decision_cb,
+    ds);
+  if (NULL == ds->dh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "check_aml_decision" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct AmlCheckState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+check_aml_decision_cleanup (void *cls,
+                            const struct TALER_TESTING_Command *cmd)
+{
+  struct AmlCheckState *ds = cls;
+
+  if (NULL != ds->dh)
+  {
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_lookup_aml_decision_cancel (ds->dh);
+    ds->dh = NULL;
+  }
+  GNUNET_free (ds);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_check_aml_decision (
+  const char *label,
+  const char *ref_officer,
+  const char *ref_operation,
+  unsigned int expected_http_status)
+{
+  struct AmlCheckState *ds;
+
+  ds = GNUNET_new (struct AmlCheckState);
+  ds->ref_officer = ref_officer;
+  ds->ref_operation = ref_operation;
+  ds->expected_http_status = expected_http_status;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &check_aml_decision_run,
+      .cleanup = &check_aml_decision_cleanup
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_check_aml_decision.c */
diff --git a/src/testing/testing_api_cmd_check_aml_decisions.c b/src/testing/testing_api_cmd_check_aml_decisions.c
new file mode 100644
index 000000000..c8c2ec3f5
--- /dev/null
+++ b/src/testing/testing_api_cmd_check_aml_decisions.c
@@ -0,0 +1,204 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_check_aml_decisions.c
+ * @brief command for testing /aml/$OFFICER/decisions/$FILTER
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * State for a "check_aml_decision" CMD.
+ */
+struct AmlCheckState
+{
+
+  /**
+   * Handle while operation is running.
+   */
+  struct TALER_EXCHANGE_LookupAmlDecisions *dh;
+
+  /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Reference to command to previous set officer.
+   */
+  const char *ref_officer;
+
+  /**
+   * Which states to filter by.
+   */
+  enum TALER_AmlDecisionState filter;
+
+  /**
+   * Expected HTTP status.
+   */
+  unsigned int expected_http_status;
+
+};
+
+
+/**
+ * Callback to analyze the /aml/$OFFICER_PUB/$decisions/$FILTER response, just used to check
+ * if the response code is acceptable.
+ *
+ * @param cls closure.
+ * @param adr response details
+ */
+static void
+check_aml_decisions_cb (void *cls,
+                        const struct TALER_EXCHANGE_AmlDecisionsResponse *adr)
+{
+  struct AmlCheckState *ds = cls;
+
+  ds->dh = NULL;
+  if (ds->expected_http_status != adr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (ds->is,
+                                     adr->hr.http_status,
+                                     ds->expected_http_status);
+    return;
+  }
+  TALER_TESTING_interpreter_next (ds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+check_aml_decisions_run (void *cls,
+                         const struct TALER_TESTING_Command *cmd,
+                         struct TALER_TESTING_Interpreter *is)
+{
+  struct AmlCheckState *ds = cls;
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv;
+  const struct TALER_TESTING_Command *ref;
+  const char *exchange_url;
+
+  (void) cmd;
+  ds->is = is;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ds->ref_officer);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_officer_priv (ref,
+                                                       &officer_priv));
+  ds->dh = TALER_EXCHANGE_lookup_aml_decisions (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    INT64_MAX,
+    -1, /* return last one for testing */
+    ds->filter,
+    officer_priv,
+    &check_aml_decisions_cb,
+    ds);
+  if (NULL == ds->dh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "check_aml_decisions" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct AmlCheckState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+check_aml_decisions_cleanup (void *cls,
+                             const struct TALER_TESTING_Command *cmd)
+{
+  struct AmlCheckState *ds = cls;
+
+  if (NULL != ds->dh)
+  {
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_lookup_aml_decisions_cancel (ds->dh);
+    ds->dh = NULL;
+  }
+  GNUNET_free (ds);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_check_aml_decisions (
+  const char *label,
+  const char *ref_officer,
+  enum TALER_AmlDecisionState filter,
+  unsigned int expected_http_status)
+{
+  struct AmlCheckState *ds;
+
+  ds = GNUNET_new (struct AmlCheckState);
+  ds->ref_officer = ref_officer;
+  ds->filter = filter;
+  ds->expected_http_status = expected_http_status;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &check_aml_decisions_run,
+      .cleanup = &check_aml_decisions_cleanup
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_check_aml_decisions.c */
diff --git a/src/testing/testing_api_cmd_check_keys.c b/src/testing/testing_api_cmd_check_keys.c
deleted file mode 100644
index 0dee8be3a..000000000
--- a/src/testing/testing_api_cmd_check_keys.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-  This file is part of TALER
-  (C) 2018, 2020, 2021 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/>
-*/
-/**
- * @file testing/testing_api_cmd_check_keys.c
- * @brief Implementation of "check keys" test command.
- * @author Marcello Stanisci
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_testing_lib.h"
-
-
-/**
- * State for a "check keys" CMD.
- */
-struct CheckKeysState
-{
-  /**
-   * This number will instruct the CMD interpreter to
-   * make sure that /keys was downloaded `generation` times
-   * _before_ running the very CMD logic.
-   */
-  unsigned int generation;
-
-  /**
-   * If this value is true, then the "cherry
-   * picking" facility is turned off; whole /keys is
-   * downloaded.
-   */
-  bool pull_all_keys;
-
-  /**
-   * Label of a command to use to derive the "last_denom_issue" date to use.
-   */
-  const char *last_denom_date_ref;
-
-  /**
-   * Last denomination date we received when doing this request.
-   */
-  struct GNUNET_TIME_Timestamp my_denom_date;
-};
-
-
-/**
- * Run the "check keys" command.
- *
- * @param cls closure.
- * @param cmd the command currently being executed.
- * @param is the interpreter state.
- */
-static void
-check_keys_run (void *cls,
-                const struct TALER_TESTING_Command *cmd,
-                struct TALER_TESTING_Interpreter *is)
-{
-  struct CheckKeysState *cks = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "cmd `%s' (ip: %u), key generation: %d\n",
-              cmd->label,
-              is->ip,
-              is->key_generation);
-  if (is->key_generation < cks->generation)
-  {
-    struct GNUNET_TIME_Timestamp rdate;
-
-    is->working = GNUNET_NO;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Triggering GET /keys, cmd `%s'\n",
-                cmd->label);
-    if (NULL != cks->last_denom_date_ref)
-    {
-      if (0 == strcmp ("zero",
-                       cks->last_denom_date_ref))
-      {
-        TALER_LOG_DEBUG ("Forcing last_denom_date URL argument set to zero\n");
-        TALER_EXCHANGE_set_last_denom (is->exchange,
-                                       GNUNET_TIME_UNIT_ZERO_TS);
-      }
-      else
-      {
-        const struct GNUNET_TIME_Timestamp *last_denom_date;
-        const struct TALER_TESTING_Command *ref;
-
-        ref = TALER_TESTING_interpreter_lookup_command (is,
-                                                        cks->last_denom_date_ref);
-        if (NULL == ref)
-        {
-          GNUNET_break (0);
-          TALER_TESTING_interpreter_fail (is);
-          return;
-        }
-        if (GNUNET_OK !=
-            TALER_TESTING_get_trait_timestamp (ref,
-                                               0,
-                                               &last_denom_date))
-        {
-          GNUNET_break (0);
-          TALER_TESTING_interpreter_fail (is);
-          return;
-        }
-
-        TALER_LOG_DEBUG ("Forcing last_denom_date URL argument\n");
-        TALER_EXCHANGE_set_last_denom (is->exchange,
-                                       *last_denom_date);
-      }
-    }
-
-    rdate = TALER_EXCHANGE_check_keys_current (
-      is->exchange,
-      cks->pull_all_keys
-      ? TALER_EXCHANGE_CKF_FORCE_ALL_NOW
-      : TALER_EXCHANGE_CKF_FORCE_DOWNLOAD);
-    /* Redownload /keys.  */
-    GNUNET_break (GNUNET_TIME_absolute_is_zero (rdate.abs_time));
-    return;
-  }
-  {
-    const struct TALER_EXCHANGE_Keys *keys;
-
-    keys = TALER_EXCHANGE_get_keys (is->exchange);
-    if (NULL == keys)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    cks->my_denom_date = keys->last_denom_issue_date;
-  }
-  TALER_TESTING_interpreter_next (is);
-}
-
-
-/**
- * Cleanup the state.
- *
- * @param cls closure.
- * @param cmd the command which is being cleaned up.
- */
-static void
-check_keys_cleanup (void *cls,
-                    const struct TALER_TESTING_Command *cmd)
-{
-  struct CheckKeysState *cks = cls;
-
-  (void) cmd;
-  GNUNET_free (cks);
-}
-
-
-/**
- * Offer internal data to a "check_keys" CMD state to other
- * commands.
- *
- * @param cls closure
- * @param[out] ret result (could be anything)
- * @param trait name of the trait
- * @param index index number of the object to offer.
- * @return #GNUNET_OK on success
- */
-static int
-check_keys_traits (void *cls,
-                   const void **ret,
-                   const char *trait,
-                   unsigned int index)
-{
-  struct CheckKeysState *cks = cls;
-  struct TALER_TESTING_Trait traits[] = {
-    /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_timestamp (0,
-                                        &cks->my_denom_date),
-    TALER_TESTING_trait_end ()
-  };
-
-  return TALER_TESTING_get_trait (traits,
-                                  ret,
-                                  trait,
-                                  index);
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys (const char *label,
-                              unsigned int generation)
-{
-  struct CheckKeysState *cks;
-
-  cks = GNUNET_new (struct CheckKeysState);
-  cks->generation = generation;
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = cks,
-      .label = label,
-      .run = &check_keys_run,
-      .cleanup = &check_keys_cleanup,
-      .traits = &check_keys_traits
-    };
-
-    return cmd;
-  }
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys_pull_all_keys (const char *label,
-                                            unsigned int generation)
-{
-  struct TALER_TESTING_Command cmd
-    = TALER_TESTING_cmd_check_keys (label,
-                                    generation);
-  struct CheckKeysState *cks = cmd.cls;
-
-  cks->pull_all_keys = true;
-  return cmd;
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_check_keys_with_last_denom (
-  const char *label,
-  unsigned int generation,
-  const char *last_denom_date_ref)
-{
-  struct TALER_TESTING_Command cmd
-    = TALER_TESTING_cmd_check_keys (label,
-                                    generation);
-  struct CheckKeysState *cks = cmd.cls;
-  cks->last_denom_date_ref = last_denom_date_ref;
-  return cmd;
-}
-
-
-/* end of testing_api_cmd_check_keys.c */
diff --git a/src/testing/testing_api_cmd_coin_history.c b/src/testing/testing_api_cmd_coin_history.c
new file mode 100644
index 000000000..a1345f67f
--- /dev/null
+++ b/src/testing/testing_api_cmd_coin_history.c
@@ -0,0 +1,609 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_coin_history.c
+ * @brief Implement the /coins/$COIN_PUB/history test command.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "history" CMD.
+ */
+struct HistoryState
+{
+
+  /**
+   * Public key of the coin being analyzed.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * Label to the command which created the coin to check,
+   * needed to resort the coin key.
+   */
+  const char *coin_reference;
+
+  /**
+   * Handle to the "coin history" operation.
+   */
+  struct TALER_EXCHANGE_CoinsHistoryHandle *rsh;
+
+  /**
+   * Expected coin balance.
+   */
+  const char *expected_balance;
+
+  /**
+   * Private key of the coin being analyzed.
+   */
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+};
+
+
+/**
+ * Closure for analysis_cb().
+ */
+struct AnalysisContext
+{
+  /**
+   * Coin public key we are looking at.
+   */
+  const struct TALER_CoinSpendPublicKeyP *coin_pub;
+
+  /**
+   * Length of the @e history array.
+   */
+  unsigned int history_length;
+
+  /**
+   * Array of history items to match.
+   */
+  const struct TALER_EXCHANGE_CoinHistoryEntry *history;
+
+  /**
+   * Array of @e history_length of matched entries.
+   */
+  bool *found;
+
+  /**
+   * Set to true if an entry could not be found.
+   */
+  bool failure;
+};
+
+
+/**
+ * Compare @a h1 and @a h2.
+ *
+ * @param h1 a history entry
+ * @param h2 a history entry
+ * @return 0 if @a h1 and @a h2 are equal
+ */
+static int
+history_entry_cmp (
+  const struct TALER_EXCHANGE_CoinHistoryEntry *h1,
+  const struct TALER_EXCHANGE_CoinHistoryEntry *h2)
+{
+  if (h1->type != h2->type)
+    return 1;
+  if (0 != TALER_amount_cmp (&h1->amount,
+                             &h2->amount))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Amount mismatch (%s)\n",
+                TALER_amount2s (&h1->amount));
+    return 1;
+  }
+  switch (h1->type)
+  {
+  case TALER_EXCHANGE_CTT_NONE:
+    GNUNET_break (0);
+    break;
+  case TALER_EXCHANGE_CTT_DEPOSIT:
+    if (0 != GNUNET_memcmp (&h1->details.deposit.h_contract_terms,
+                            &h2->details.deposit.h_contract_terms))
+      return 1;
+    if (0 != GNUNET_memcmp (&h1->details.deposit.merchant_pub,
+                            &h2->details.deposit.merchant_pub))
+      return 1;
+    if (0 != GNUNET_memcmp (&h1->details.deposit.h_wire,
+                            &h2->details.deposit.h_wire))
+      return 1;
+    if (0 != GNUNET_memcmp (&h1->details.deposit.sig,
+                            &h2->details.deposit.sig))
+      return 1;
+    return 0;
+  case TALER_EXCHANGE_CTT_MELT:
+    if (0 != GNUNET_memcmp (&h1->details.melt.h_age_commitment,
+                            &h2->details.melt.h_age_commitment))
+      return 1;
+    /* Note: most other fields are not initialized
+       in the trait as they are hard to extract from
+       the API */
+    return 0;
+  case TALER_EXCHANGE_CTT_REFUND:
+    if (0 != GNUNET_memcmp (&h1->details.refund.sig,
+                            &h2->details.refund.sig))
+      return 1;
+    return 0;
+  case TALER_EXCHANGE_CTT_RECOUP:
+    if (0 != GNUNET_memcmp (&h1->details.recoup.coin_sig,
+                            &h2->details.recoup.coin_sig))
+      return 1;
+    /* Note: exchange_sig, exchange_pub and timestamp are
+       fundamentally not available in the initiating command */
+    return 0;
+  case TALER_EXCHANGE_CTT_RECOUP_REFRESH:
+    if (0 != GNUNET_memcmp (&h1->details.recoup_refresh.coin_sig,
+                            &h2->details.recoup_refresh.coin_sig))
+      return 1;
+    /* Note: exchange_sig, exchange_pub and timestamp are
+       fundamentally not available in the initiating command */
+    return 0;
+  case TALER_EXCHANGE_CTT_OLD_COIN_RECOUP:
+    if (0 != GNUNET_memcmp (&h1->details.old_coin_recoup.new_coin_pub,
+                            &h2->details.old_coin_recoup.new_coin_pub))
+      return 1;
+    /* Note: exchange_sig, exchange_pub and timestamp are
+       fundamentally not available in the initiating command */
+    return 0;
+  case TALER_EXCHANGE_CTT_PURSE_DEPOSIT:
+    /* coin_sig is not initialized */
+    if (0 != GNUNET_memcmp (&h1->details.purse_deposit.purse_pub,
+                            &h2->details.purse_deposit.purse_pub))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Purse public key mismatch\n");
+      return 1;
+    }
+    if (0 != strcmp (h1->details.purse_deposit.exchange_base_url,
+                     h2->details.purse_deposit.exchange_base_url))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Exchange base URL mismatch (%s/%s)\n",
+                  h1->details.purse_deposit.exchange_base_url,
+                  h2->details.purse_deposit.exchange_base_url);
+      GNUNET_break (0);
+      return 1;
+    }
+    return 0;
+  case TALER_EXCHANGE_CTT_PURSE_REFUND:
+    /* NOTE: not supported yet (trait not returned) */
+    return 0;
+  case TALER_EXCHANGE_CTT_RESERVE_OPEN_DEPOSIT:
+    /* NOTE: not supported yet (trait not returned) */
+    if (0 != GNUNET_memcmp (&h1->details.reserve_open_deposit.coin_sig,
+                            &h2->details.reserve_open_deposit.coin_sig))
+      return 1;
+    return 0;
+  }
+  GNUNET_assert (0);
+  return -1;
+}
+
+
+/**
+ * Check if @a cmd changed the coin, if so, find the
+ * entry in our history and set the respective index in found
+ * to true. If the entry is not found, set failure.
+ *
+ * @param cls our `struct AnalysisContext *`
+ * @param cmd command to analyze for impact on history
+ */
+static void
+analyze_command (void *cls,
+                 const struct TALER_TESTING_Command *cmd)
+{
+  struct AnalysisContext *ac = cls;
+  const struct TALER_CoinSpendPublicKeyP *coin_pub = ac->coin_pub;
+  const struct TALER_EXCHANGE_CoinHistoryEntry *history = ac->history;
+  unsigned int history_length = ac->history_length;
+  bool *found = ac->found;
+
+  if (TALER_TESTING_cmd_is_batch (cmd))
+  {
+    struct TALER_TESTING_Command *cur;
+    struct TALER_TESTING_Command *bcmd;
+
+    cur = TALER_TESTING_cmd_batch_get_current (cmd);
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_batch_cmds (cmd,
+                                            &bcmd))
+    {
+      GNUNET_break (0);
+      ac->failure = true;
+      return;
+    }
+    for (unsigned int i = 0; NULL != bcmd[i].label; i++)
+    {
+      struct TALER_TESTING_Command *step = &bcmd[i];
+
+      analyze_command (ac,
+                       step);
+      if (ac->failure)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Entry for batch step `%s' missing in history\n",
+                    step->label);
+        return;
+      }
+      if (step == cur)
+        break; /* if *we* are in a batch, make sure not to analyze commands past 'now' */
+    }
+    return;
+  }
+
+  for (unsigned int j = 0; true; j++)
+  {
+    const struct TALER_CoinSpendPublicKeyP *rp;
+    const struct TALER_EXCHANGE_CoinHistoryEntry *he;
+    bool matched = false;
+
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_coin_pub (cmd,
+                                          j,
+                                          &rp))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Command `%s#%u' has no public key for a coin\n",
+                  cmd->label,
+                  j);
+      break; /* command does nothing for coins */
+    }
+    if (0 !=
+        GNUNET_memcmp (rp,
+                       coin_pub))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Command `%s#%u' is about another coin\n",
+                  cmd->label,
+                  j);
+      continue; /* command affects some _other_ coin */
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_coin_history (cmd,
+                                              j,
+                                              &he))
+    {
+      /* NOTE: only for debugging... */
+      if (0 == j)
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Command `%s' has the coin_pub, but lacks coin history trait\n",
+                    cmd->label);
+      return; /* command does nothing for coins */
+    }
+    for (unsigned int i = 0; i<history_length; i++)
+    {
+      if (found[i])
+        continue; /* already found, skip */
+      if (0 ==
+          history_entry_cmp (he,
+                             &history[i]))
+      {
+        found[i] = true;
+        matched = true;
+        break;
+      }
+    }
+    if (! matched)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Command `%s' coin history entry #%u not found\n",
+                  cmd->label,
+                  j);
+      ac->failure = true;
+      return;
+    }
+  }
+}
+
+
+/**
+ * Check that the coin balance and HTTP response code are
+ * both acceptable.
+ *
+ * @param cls closure.
+ * @param rs HTTP response details
+ */
+static void
+coin_history_cb (void *cls,
+                 const struct TALER_EXCHANGE_CoinHistory *rs)
+{
+  struct HistoryState *ss = cls;
+  struct TALER_TESTING_Interpreter *is = ss->is;
+  struct TALER_Amount eb;
+  unsigned int hlen;
+
+  ss->rsh = NULL;
+  if (ss->expected_response_code != rs->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (ss->is,
+                                     rs->hr.http_status,
+                                     ss->expected_response_code);
+    return;
+  }
+  if (MHD_HTTP_OK != rs->hr.http_status)
+  {
+    TALER_TESTING_interpreter_next (is);
+    return;
+  }
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (ss->expected_balance,
+                                         &eb));
+
+  if (0 != TALER_amount_cmp (&eb,
+                             &rs->details.ok.balance))
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected balance for coin: %s\n",
+                TALER_amount_to_string (&rs->details.ok.balance));
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Expected balance of: %s\n",
+                TALER_amount_to_string (&eb));
+    TALER_TESTING_interpreter_fail (ss->is);
+    return;
+  }
+  hlen = json_array_size (rs->details.ok.history);
+  {
+    bool found[GNUNET_NZL (hlen)];
+    struct TALER_EXCHANGE_CoinHistoryEntry rhist[GNUNET_NZL (hlen)];
+    struct AnalysisContext ac = {
+      .coin_pub = &ss->coin_pub,
+      .history = rhist,
+      .history_length = hlen,
+      .found = found
+    };
+    const struct TALER_EXCHANGE_DenomPublicKey *dk;
+    struct TALER_Amount total_in;
+    struct TALER_Amount total_out;
+    struct TALER_Amount hbal;
+
+    dk = TALER_EXCHANGE_get_denomination_key_by_hash (
+      TALER_TESTING_get_keys (is),
+      &rs->details.ok.h_denom_pub);
+    memset (found,
+            0,
+            sizeof (found));
+    memset (rhist,
+            0,
+            sizeof (rhist));
+    if (GNUNET_OK !=
+        TALER_EXCHANGE_parse_coin_history (
+          TALER_TESTING_get_keys (is),
+          dk,
+          rs->details.ok.history,
+          &ss->coin_pub,
+          &total_in,
+          &total_out,
+          hlen,
+          rhist))
+    {
+      GNUNET_break (0);
+      json_dumpf (rs->hr.reply,
+                  stderr,
+                  JSON_INDENT (2));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
+    if (0 >
+        TALER_amount_subtract (&hbal,
+                               &total_in,
+                               &total_out))
+    {
+      GNUNET_break (0);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Coin credits: %s\n",
+                  TALER_amount2s (&total_in));
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Coin debits: %s\n",
+                  TALER_amount2s (&total_out));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
+    if (0 != TALER_amount_cmp (&hbal,
+                               &rs->details.ok.balance))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
+    (void) ac;
+    TALER_TESTING_iterate (is,
+                           true,
+                           &analyze_command,
+                           &ac);
+    if (ac.failure)
+    {
+      json_dumpf (rs->hr.reply,
+                  stderr,
+                  JSON_INDENT (2));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
+#if 1
+    for (unsigned int i = 0; i<hlen; i++)
+    {
+      if (found[i])
+        continue;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "History entry at index %u of type %d not justified by command history\n",
+                  i,
+                  rs->details.ok.history[i].type);
+      json_dumpf (rs->hr.reply,
+                  stderr,
+                  JSON_INDENT (2));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
+#endif
+  }
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command being executed.
+ * @param is the interpreter state.
+ */
+static void
+history_run (void *cls,
+             const struct TALER_TESTING_Command *cmd,
+             struct TALER_TESTING_Interpreter *is)
+{
+  struct HistoryState *ss = cls;
+  const struct TALER_TESTING_Command *create_coin;
+  char *cref;
+  unsigned int idx;
+
+  ss->is = is;
+  GNUNET_assert (
+    GNUNET_OK ==
+    TALER_TESTING_parse_coin_reference (
+      ss->coin_reference,
+      &cref,
+      &idx));
+  create_coin
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                cref);
+  if (NULL == create_coin)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_coin_priv (create_coin,
+                                         idx,
+                                         &ss->coin_priv))
+  {
+    GNUNET_break (0);
+    TALER_LOG_ERROR ("Failed to find coin_priv for history query\n");
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&ss->coin_priv->eddsa_priv,
+                                      &ss->coin_pub.eddsa_pub);
+  ss->rsh = TALER_EXCHANGE_coins_history (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    ss->coin_priv,
+    0,
+    &coin_history_cb,
+    ss);
+}
+
+
+/**
+ * Offer internal data from a "history" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+history_traits (void *cls,
+                const void **ret,
+                const char *trait,
+                unsigned int index)
+{
+  struct HistoryState *hs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_coin_pub (0,
+                                       &hs->coin_pub),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+/**
+ * Cleanup the state from a "coin history" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+history_cleanup (void *cls,
+                 const struct TALER_TESTING_Command *cmd)
+{
+  struct HistoryState *ss = cls;
+
+  if (NULL != ss->rsh)
+  {
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
+    TALER_EXCHANGE_coins_history_cancel (ss->rsh);
+    ss->rsh = NULL;
+  }
+  GNUNET_free (ss);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_coin_history (const char *label,
+                                const char *coin_reference,
+                                const char *expected_balance,
+                                unsigned int expected_response_code)
+{
+  struct HistoryState *ss;
+
+  GNUNET_assert (NULL != coin_reference);
+  ss = GNUNET_new (struct HistoryState);
+  ss->coin_reference = coin_reference;
+  ss->expected_balance = expected_balance;
+  ss->expected_response_code = expected_response_code;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &history_run,
+      .cleanup = &history_cleanup,
+      .traits = &history_traits
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_contract_get.c b/src/testing/testing_api_cmd_contract_get.c
index 10a43aa3b..fa83d83f7 100644
--- a/src/testing/testing_api_cmd_contract_get.c
+++ b/src/testing/testing_api_cmd_contract_get.c
@@ -101,26 +101,20 @@ get_cb (void *cls,
   ds->dh = NULL;
   if (ds->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
     return;
   }
   ref = TALER_TESTING_interpreter_lookup_command (ds->is,
                                                   ds->contract_ref);
+  GNUNET_assert (NULL != ref);
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
     const struct TALER_PurseMergePrivateKeyP *mp;
     const json_t *ct;
 
-    ds->purse_pub = dr->details.success.purse_pub;
+    ds->purse_pub = dr->details.ok.purse_pub;
     if (ds->merge)
     {
       if (GNUNET_OK !=
@@ -135,8 +129,8 @@ get_cb (void *cls,
         TALER_CRYPTO_contract_decrypt_for_merge (
           &ds->contract_priv,
           &ds->purse_pub,
-          dr->details.success.econtract,
-          dr->details.success.econtract_size,
+          dr->details.ok.econtract,
+          dr->details.ok.econtract_size,
           &ds->merge_priv);
       if (0 !=
           GNUNET_memcmp (mp,
@@ -152,8 +146,8 @@ get_cb (void *cls,
       ds->contract_terms =
         TALER_CRYPTO_contract_decrypt_for_deposit (
           &ds->contract_priv,
-          dr->details.success.econtract,
-          dr->details.success.econtract_size);
+          dr->details.ok.econtract,
+          dr->details.ok.econtract_size);
     }
     if (NULL == ds->contract_terms)
     {
@@ -197,9 +191,16 @@ get_run (void *cls,
   struct ContractGetState *ds = cls;
   const struct TALER_ContractDiffiePrivateP *contract_priv;
   const struct TALER_TESTING_Command *ref;
+  const char *exchange_url;
 
   (void) cmd;
   ds->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   ref = TALER_TESTING_interpreter_lookup_command (ds->is,
                                                   ds->contract_ref);
   GNUNET_assert (NULL != ref);
@@ -213,7 +214,8 @@ get_run (void *cls,
   }
   ds->contract_priv = *contract_priv;
   ds->dh = TALER_EXCHANGE_contract_get (
-    is->exchange,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     contract_priv,
     &get_cb,
     ds);
@@ -243,10 +245,8 @@ get_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_contract_get_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_deposit.c b/src/testing/testing_api_cmd_deposit.c
index 2f55a318c..849c78c70 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018-2021 Taler Systems SA
+  Copyright (C) 2018-2023 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
@@ -69,6 +69,11 @@ struct DepositState
   unsigned int coin_index;
 
   /**
+   * Our coin signature.
+   */
+  struct TALER_CoinSpendSignatureP coin_sig;
+
+  /**
    * Wire details of who is depositing -- this would be merchant
    * wire details in a normal scenario.
    */
@@ -98,7 +103,12 @@ struct DepositState
   /**
    * Deposit handle while operation is running.
    */
-  struct TALER_EXCHANGE_DepositHandle *dh;
+  struct TALER_EXCHANGE_BatchDepositHandle *dh;
+
+  /**
+   * Denomination public key of the deposited coin.
+   */
+  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
 
   /**
    * Timestamp of the /deposit operation in the wallet (contract signing time).
@@ -131,10 +141,16 @@ struct DepositState
   unsigned int do_retry;
 
   /**
-   * Set to #GNUNET_YES if the /deposit succeeded
+   * Set to true if the /deposit succeeded
    * and we now can provide the resulting traits.
    */
-  int deposit_succeeded;
+  bool deposit_succeeded;
+
+  /**
+   * Expected entry in the coin history created by this
+   * operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
 
   /**
    * When did the exchange receive the deposit?
@@ -165,7 +181,7 @@ struct DepositState
    * When we're referencing another deposit operation,
    * this will only be set after the command has been started.
    */
-  int command_initialized;
+  bool command_initialized;
 
   /**
    * Reference to fetch the merchant private key from.
@@ -199,8 +215,7 @@ do_retry (void *cls)
   struct DepositState *ds = cls;
 
   ds->retry_task = NULL;
-  ds->is->commands[ds->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (ds->is);
   deposit_run (ds,
                NULL,
                ds->is);
@@ -216,7 +231,7 @@ do_retry (void *cls)
  */
 static void
 deposit_cb (void *cls,
-            const struct TALER_EXCHANGE_DepositResult *dr)
+            const struct TALER_EXCHANGE_BatchDepositResult *dr)
 {
   struct DepositState *ds = cls;
 
@@ -240,7 +255,7 @@ deposit_cb (void *cls,
         else
           ds->backoff = GNUNET_TIME_randomized_backoff (ds->backoff,
                                                         MAX_BACKOFF);
-        ds->is->commands[ds->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (ds->is);
         GNUNET_assert (NULL == ds->retry_task);
         ds->retry_task
           = GNUNET_SCHEDULER_add_delayed (ds->backoff,
@@ -249,24 +264,20 @@ deposit_cb (void *cls,
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status_with_body (
+      ds->is,
+      dr->hr.http_status,
+      ds->expected_response_code,
+      dr->hr.reply);
+
     return;
   }
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
-    ds->deposit_succeeded = GNUNET_YES;
-    ds->exchange_timestamp = dr->details.success.deposit_timestamp;
-    ds->exchange_pub = *dr->details.success.exchange_pub;
-    ds->exchange_sig = *dr->details.success.exchange_sig;
+    ds->deposit_succeeded = true;
+    ds->exchange_timestamp = dr->details.ok.deposit_timestamp;
+    ds->exchange_pub = *dr->details.ok.exchange_pub;
+    ds->exchange_sig = *dr->details.ok.exchange_sig;
   }
   TALER_TESTING_interpreter_next (ds->is);
 }
@@ -288,11 +299,8 @@ deposit_run (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   const struct TALER_CoinSpendPrivateKeyP *coin_priv;
   struct TALER_CoinSpendPublicKeyP coin_pub;
-  const struct TALER_AgeCommitmentProof *age_commitment_proof = NULL;
-  struct TALER_AgeCommitmentHash h_age_commitment = {0};
-  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+  const struct TALER_AgeCommitmentHash *phac;
   const struct TALER_DenominationSignature *denom_pub_sig;
-  struct TALER_CoinSpendSignatureP coin_sig;
   struct TALER_MerchantPublicKeyP merchant_pub;
   struct TALER_PrivateContractHashP h_contract_terms;
   enum TALER_ErrorCode ec;
@@ -305,9 +313,32 @@ deposit_run (void *cls,
                                  &wire_salt),
     GNUNET_JSON_spec_end ()
   };
+  const char *exchange_url
+    = TALER_TESTING_get_exchange_url (is);
 
   (void) cmd;
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   ds->is = is;
+  if (! GNUNET_TIME_absolute_is_zero (ds->refund_deadline.abs_time))
+  {
+    struct GNUNET_TIME_Relative refund_deadline;
+
+    refund_deadline
+      = GNUNET_TIME_absolute_get_remaining (ds->refund_deadline.abs_time);
+    ds->wire_deadline
+      = GNUNET_TIME_relative_to_timestamp (
+          GNUNET_TIME_relative_multiply (refund_deadline,
+                                         2));
+  }
+  else
+  {
+    ds->refund_deadline = ds->wallet_timestamp;
+    ds->wire_deadline = GNUNET_TIME_timestamp_get ();
+  }
   if (NULL != ds->deposit_reference)
   {
     /* We're copying another deposit operation, initialize here. */
@@ -330,9 +361,10 @@ deposit_run (void *cls,
     ds->contract_terms = json_incref (ods->contract_terms);
     ds->wallet_timestamp = ods->wallet_timestamp;
     ds->refund_deadline = ods->refund_deadline;
+    ds->wire_deadline = ods->wire_deadline;
     ds->amount = ods->amount;
     ds->merchant_priv = ods->merchant_priv;
-    ds->command_initialized = GNUNET_YES;
+    ds->command_initialized = true;
   }
   else if (NULL != ds->merchant_priv_reference)
   {
@@ -386,13 +418,13 @@ deposit_run (void *cls,
                                            ds->coin_index,
                                            &coin_priv)) ||
        (GNUNET_OK !=
-        TALER_TESTING_get_trait_age_commitment_proof (coin_cmd,
-                                                      ds->coin_index,
-                                                      &age_commitment_proof)) ||
+        TALER_TESTING_get_trait_h_age_commitment (coin_cmd,
+                                                  ds->coin_index,
+                                                  &phac)) ||
        (GNUNET_OK !=
         TALER_TESTING_get_trait_denom_pub (coin_cmd,
                                            ds->coin_index,
-                                           &denom_pub)) ||
+                                           &ds->denom_pub)) ||
        (GNUNET_OK !=
         TALER_TESTING_get_trait_denom_sig (coin_cmd,
                                            ds->coin_index,
@@ -406,32 +438,10 @@ deposit_run (void *cls,
     return;
   }
 
-  if (NULL != age_commitment_proof)
-  {
-    TALER_age_commitment_hash (&age_commitment_proof->commitment,
-                               &h_age_commitment);
-  }
-  ds->deposit_fee = denom_pub->fees.deposit;
+  ds->deposit_fee = ds->denom_pub->fees.deposit;
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
                                       &coin_pub.eddsa_pub);
 
-  if (! GNUNET_TIME_absolute_is_zero (ds->refund_deadline.abs_time))
-  {
-    struct GNUNET_TIME_Relative refund_deadline;
-
-    refund_deadline
-      = GNUNET_TIME_absolute_get_remaining (ds->refund_deadline.abs_time);
-    ds->wire_deadline
-      =
-        GNUNET_TIME_relative_to_timestamp (
-          GNUNET_TIME_relative_multiply (refund_deadline,
-                                         2));
-  }
-  else
-  {
-    ds->refund_deadline = ds->wallet_timestamp;
-    ds->wire_deadline = GNUNET_TIME_timestamp_get ();
-  }
   GNUNET_CRYPTO_eddsa_key_get_public (&ds->merchant_priv.eddsa_priv,
                                       &merchant_pub.eddsa_pub);
   {
@@ -441,37 +451,65 @@ deposit_run (void *cls,
                    TALER_JSON_merchant_wire_signature_hash (ds->wire_details,
                                                             &h_wire));
     TALER_wallet_deposit_sign (&ds->amount,
-                               &denom_pub->fees.deposit,
+                               &ds->denom_pub->fees.deposit,
                                &h_wire,
                                &h_contract_terms,
-                               &h_age_commitment,
-                               NULL, /* FIXME: add hash of extensions */
-                               &denom_pub->h_key,
+                               NULL, /* wallet data hash */
+                               phac,
+                               NULL, /* hash of extensions */
+                               &ds->denom_pub->h_key,
                                ds->wallet_timestamp,
                                &merchant_pub,
                                ds->refund_deadline,
                                coin_priv,
-                               &coin_sig);
+                               &ds->coin_sig);
+    ds->che.type = TALER_EXCHANGE_CTT_DEPOSIT;
+    ds->che.amount = ds->amount;
+    ds->che.details.deposit.h_wire = h_wire;
+    ds->che.details.deposit.h_contract_terms = h_contract_terms;
+    ds->che.details.deposit.no_h_policy = true;
+    ds->che.details.deposit.no_wallet_data_hash = true;
+    ds->che.details.deposit.wallet_timestamp = ds->wallet_timestamp;
+    ds->che.details.deposit.merchant_pub = merchant_pub;
+    ds->che.details.deposit.refund_deadline = ds->refund_deadline;
+    ds->che.details.deposit.sig = ds->coin_sig;
+    ds->che.details.deposit.no_hac = true;
+    ds->che.details.deposit.deposit_fee = ds->denom_pub->fees.deposit;
   }
   GNUNET_assert (NULL == ds->dh);
-  ds->dh = TALER_EXCHANGE_deposit (is->exchange,
-                                   &ds->amount,
-                                   ds->wire_deadline,
-                                   payto_uri,
-                                   &wire_salt,
-                                   &h_contract_terms,
-                                   &h_age_commitment,
-                                   NULL, /* FIXME: add hash of extensions */
-                                   &coin_pub,
-                                   denom_pub_sig,
-                                   &denom_pub->key,
-                                   ds->wallet_timestamp,
-                                   &merchant_pub,
-                                   ds->refund_deadline,
-                                   &coin_sig,
-                                   &deposit_cb,
-                                   ds,
-                                   &ec);
+  {
+    struct TALER_EXCHANGE_CoinDepositDetail cdd = {
+      .amount = ds->amount,
+      .coin_pub = coin_pub,
+      .coin_sig = ds->coin_sig,
+      .denom_sig = *denom_pub_sig,
+      .h_denom_pub = ds->denom_pub->h_key,
+      .h_age_commitment = {{{0}}},
+    };
+    struct TALER_EXCHANGE_DepositContractDetail dcd = {
+      .wire_deadline = ds->wire_deadline,
+      .merchant_payto_uri = payto_uri,
+      .wire_salt = wire_salt,
+      .h_contract_terms = h_contract_terms,
+      .wallet_timestamp = ds->wallet_timestamp,
+      .merchant_pub = merchant_pub,
+      .refund_deadline = ds->refund_deadline
+    };
+
+    if (NULL != phac)
+      cdd.h_age_commitment = *phac;
+
+    ds->dh = TALER_EXCHANGE_batch_deposit (
+      TALER_TESTING_interpreter_get_context (is),
+      exchange_url,
+      TALER_TESTING_get_keys (is),
+      &dcd,
+      1,
+      &cdd,
+      &deposit_cb,
+      ds,
+      &ec);
+  }
   if (NULL == ds->dh)
   {
     GNUNET_break (0);
@@ -499,11 +537,9 @@ deposit_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
-    TALER_EXCHANGE_deposit_cancel (ds->dh);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_batch_deposit_cancel (ds->dh);
     ds->dh = NULL;
   }
   if (NULL != ds->retry_task)
@@ -536,9 +572,11 @@ deposit_traits (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   /* Will point to coin cmd internals. */
   const struct TALER_CoinSpendPrivateKeyP *coin_spent_priv;
+  struct TALER_CoinSpendPublicKeyP coin_spent_pub;
   const struct TALER_AgeCommitmentProof *age_commitment_proof;
+  const struct TALER_AgeCommitmentHash *h_age_commitment;
 
-  if (GNUNET_YES != ds->command_initialized)
+  if (! ds->command_initialized)
   {
     /* No access to traits yet. */
     GNUNET_break (0);
@@ -561,33 +599,55 @@ deposit_traits (void *cls,
        (GNUNET_OK !=
         TALER_TESTING_get_trait_age_commitment_proof (coin_cmd,
                                                       ds->coin_index,
-                                                      &age_commitment_proof)) )
+                                                      &age_commitment_proof)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_h_age_commitment (coin_cmd,
+                                                  ds->coin_index,
+                                                  &h_age_commitment)) )
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (ds->is);
     return GNUNET_NO;
   }
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&coin_spent_priv->eddsa_priv,
+                                      &coin_spent_pub.eddsa_pub);
+
   {
     struct TALER_TESTING_Trait traits[] = {
       /* First two traits are only available if
-         ds->traits is #GNUNET_YES */
-      TALER_TESTING_make_trait_exchange_pub (index, &ds->exchange_pub),
-      TALER_TESTING_make_trait_exchange_sig (index, &ds->exchange_sig),
+         ds->traits is true */
+      TALER_TESTING_make_trait_exchange_pub (0,
+                                             &ds->exchange_pub),
+      TALER_TESTING_make_trait_exchange_sig (0,
+                                             &ds->exchange_sig),
       /* These traits are always available */
-      TALER_TESTING_make_trait_coin_priv (index,
+      TALER_TESTING_make_trait_coin_history (0,
+                                             &ds->che),
+      TALER_TESTING_make_trait_coin_priv (0,
                                           coin_spent_priv),
-      TALER_TESTING_make_trait_age_commitment_proof (index,
+      TALER_TESTING_make_trait_coin_pub (0,
+                                         &coin_spent_pub),
+      TALER_TESTING_make_trait_denom_pub (0,
+                                          ds->denom_pub),
+      TALER_TESTING_make_trait_coin_sig (0,
+                                         &ds->coin_sig),
+      TALER_TESTING_make_trait_age_commitment_proof (0,
                                                      age_commitment_proof),
+      TALER_TESTING_make_trait_h_age_commitment (0,
+                                                 h_age_commitment),
       TALER_TESTING_make_trait_wire_details (ds->wire_details),
       TALER_TESTING_make_trait_contract_terms (ds->contract_terms),
       TALER_TESTING_make_trait_merchant_priv (&ds->merchant_priv),
-      TALER_TESTING_make_trait_deposit_amount (&ds->amount),
-      TALER_TESTING_make_trait_deposit_fee_amount (&ds->deposit_fee),
-      TALER_TESTING_make_trait_timestamp (index,
+      TALER_TESTING_make_trait_deposit_amount (0,
+                                               &ds->amount),
+      TALER_TESTING_make_trait_deposit_fee_amount (0,
+                                                   &ds->deposit_fee),
+      TALER_TESTING_make_trait_timestamp (0,
                                           &ds->exchange_timestamp),
-      TALER_TESTING_make_trait_wire_deadline (index,
+      TALER_TESTING_make_trait_wire_deadline (0,
                                               &ds->wire_deadline),
-      TALER_TESTING_make_trait_refund_deadline (index,
+      TALER_TESTING_make_trait_refund_deadline (0,
                                                 &ds->refund_deadline),
       TALER_TESTING_trait_end ()
     };
@@ -603,14 +663,15 @@ deposit_traits (void *cls,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_deposit (const char *label,
-                           const char *coin_reference,
-                           unsigned int coin_index,
-                           const char *target_account_payto,
-                           const char *contract_terms,
-                           struct GNUNET_TIME_Relative refund_deadline,
-                           const char *amount,
-                           unsigned int expected_response_code)
+TALER_TESTING_cmd_deposit (
+  const char *label,
+  const char *coin_reference,
+  unsigned int coin_index,
+  const char *target_account_payto,
+  const char *contract_terms,
+  struct GNUNET_TIME_Relative refund_deadline,
+  const char *amount,
+  unsigned int expected_response_code)
 {
   struct DepositState *ds;
 
@@ -650,7 +711,7 @@ TALER_TESTING_cmd_deposit (const char *label,
                  TALER_string_to_amount (amount,
                                          &ds->amount));
   ds->expected_response_code = expected_response_code;
-  ds->command_initialized = GNUNET_YES;
+  ds->command_initialized = true;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = ds,
@@ -666,15 +727,16 @@ TALER_TESTING_cmd_deposit (const char *label,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_deposit_with_ref (const char *label,
-                                    const char *coin_reference,
-                                    unsigned int coin_index,
-                                    const char *target_account_payto,
-                                    const char *contract_terms,
-                                    struct GNUNET_TIME_Relative refund_deadline,
-                                    const char *amount,
-                                    unsigned int expected_response_code,
-                                    const char *merchant_priv_reference)
+TALER_TESTING_cmd_deposit_with_ref (
+  const char *label,
+  const char *coin_reference,
+  unsigned int coin_index,
+  const char *target_account_payto,
+  const char *contract_terms,
+  struct GNUNET_TIME_Relative refund_deadline,
+  const char *amount,
+  unsigned int expected_response_code,
+  const char *merchant_priv_reference)
 {
   struct DepositState *ds;
 
@@ -696,21 +758,25 @@ TALER_TESTING_cmd_deposit_with_ref (const char *label,
     GNUNET_assert (0);
   }
   ds->wallet_timestamp = GNUNET_TIME_timestamp_get ();
-  json_object_set_new (ds->contract_terms,
-                       "timestamp",
-                       GNUNET_JSON_from_timestamp (ds->wallet_timestamp));
+  GNUNET_assert (0 ==
+                 json_object_set_new (ds->contract_terms,
+                                      "timestamp",
+                                      GNUNET_JSON_from_timestamp (
+                                        ds->wallet_timestamp)));
   if (0 != refund_deadline.rel_value_us)
   {
     ds->refund_deadline = GNUNET_TIME_relative_to_timestamp (refund_deadline);
-    json_object_set_new (ds->contract_terms,
-                         "refund_deadline",
-                         GNUNET_JSON_from_timestamp (ds->refund_deadline));
+    GNUNET_assert (0 ==
+                   json_object_set_new (ds->contract_terms,
+                                        "refund_deadline",
+                                        GNUNET_JSON_from_timestamp (
+                                          ds->refund_deadline)));
   }
   GNUNET_assert (GNUNET_OK ==
                  TALER_string_to_amount (amount,
                                          &ds->amount));
   ds->expected_response_code = expected_response_code;
-  ds->command_initialized = GNUNET_YES;
+  ds->command_initialized = true;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = ds,
@@ -726,9 +792,10 @@ TALER_TESTING_cmd_deposit_with_ref (const char *label,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_deposit_replay (const char *label,
-                                  const char *deposit_reference,
-                                  unsigned int expected_response_code)
+TALER_TESTING_cmd_deposit_replay (
+  const char *label,
+  const char *deposit_reference,
+  unsigned int expected_response_code)
 {
   struct DepositState *ds;
 
diff --git a/src/testing/testing_api_cmd_deposits_get.c b/src/testing/testing_api_cmd_deposits_get.c
index 42dc1cb81..5d4436e2a 100644
--- a/src/testing/testing_api_cmd_deposits_get.c
+++ b/src/testing/testing_api_cmd_deposits_get.c
@@ -40,6 +40,11 @@ struct TrackTransactionState
   const char *bank_transfer_reference;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * The WTID associated by the transaction being tracked.
    */
   struct TALER_WireTransferIdentifierRawP wtid;
@@ -50,10 +55,18 @@ struct TrackTransactionState
   unsigned int expected_response_code;
 
   /**
-   * Set to the KYC UUID *if* the exchange replied with
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC (#MHD_HTTP_ACCEPTED).
+   * Note: set based on our @e merchant_payto_uri, as
+   * the exchange does not respond with the payto hash.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
    * a request for KYC (#MHD_HTTP_ACCEPTED).
    */
-  uint64_t kyc_uuid;
+  uint64_t requirement_row;
 
   /**
    * Reference to any operation that can provide a transaction.
@@ -99,28 +112,19 @@ deposit_wtid_cb (void *cls,
 {
   struct TrackTransactionState *tts = cls;
   struct TALER_TESTING_Interpreter *is = tts->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
   tts->tth = NULL;
   if (tts->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                dr->hr.http_status,
-                (int) dr->hr.ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     dr->hr.http_status,
+                                     tts->expected_response_code);
     return;
   }
   switch (dr->hr.http_status)
   {
   case MHD_HTTP_OK:
-    tts->wtid = dr->details.success.wtid;
+    tts->wtid = dr->details.ok.wtid;
     if (NULL != tts->bank_transfer_reference)
     {
       const struct TALER_TESTING_Command *bank_transfer_cmd;
@@ -147,7 +151,7 @@ deposit_wtid_cb (void *cls,
       }
 
       /* Compare that expected and gotten subjects match.  */
-      if (0 != GNUNET_memcmp (&dr->details.success.wtid,
+      if (0 != GNUNET_memcmp (&dr->details.ok.wtid,
                               wtid_want))
       {
         GNUNET_break (0);
@@ -158,7 +162,10 @@ deposit_wtid_cb (void *cls,
     break;
   case MHD_HTTP_ACCEPTED:
     /* allowed, nothing to check here */
-    tts->kyc_uuid = dr->details.accepted.payment_target_uuid;
+    TALER_payto_hash (tts->merchant_payto_uri,
+                      &tts->h_payto);
+    tts->requirement_row
+      = dr->details.accepted.requirement_row;
     break;
   case MHD_HTTP_NOT_FOUND:
     /* allowed, nothing to check here */
@@ -193,7 +200,7 @@ track_transaction_run (void *cls,
   struct TALER_PrivateContractHashP h_contract_terms;
   const struct TALER_MerchantPrivateKeyP *merchant_priv;
 
-  (void) cmd;
+  tts->cmd = cmd;
   tts->is = is;
   transaction_cmd
     = TALER_TESTING_interpreter_lookup_command (tts->is,
@@ -265,13 +272,17 @@ track_transaction_run (void *cls,
     return;
   }
 
-  tts->tth = TALER_EXCHANGE_deposits_get (is->exchange,
-                                          merchant_priv,
-                                          &h_wire_details,
-                                          &h_contract_terms,
-                                          &coin_pub,
-                                          &deposit_wtid_cb,
-                                          tts);
+  tts->tth = TALER_EXCHANGE_deposits_get (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    merchant_priv,
+    &h_wire_details,
+    &h_contract_terms,
+    &coin_pub,
+    GNUNET_TIME_UNIT_ZERO,
+    &deposit_wtid_cb,
+    tts);
   GNUNET_assert (NULL != tts->tth);
 }
 
@@ -291,10 +302,8 @@ track_transaction_cleanup (void *cls,
 
   if (NULL != tts->tth)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                tts->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (tts->is,
+                                      cmd->label);
     TALER_EXCHANGE_deposits_get_cancel (tts->tth);
     tts->tth = NULL;
   }
@@ -321,9 +330,10 @@ track_transaction_traits (void *cls,
   struct TrackTransactionState *tts = cls;
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_wtid (&tts->wtid),
-    TALER_TESTING_make_trait_payment_target_uuid (&tts->kyc_uuid),
-    TALER_TESTING_make_trait_payto_uri (
-      (const char **) &tts->merchant_payto_uri),
+    TALER_TESTING_make_trait_legi_requirement_row (
+      &tts->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&tts->h_payto),
+    TALER_TESTING_make_trait_payto_uri (tts->merchant_payto_uri),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_exec_aggregator.c b/src/testing/testing_api_cmd_exec_aggregator.c
index 0f3cc1e14..1f05576ff 100644
--- a/src/testing/testing_api_cmd_exec_aggregator.c
+++ b/src/testing/testing_api_cmd_exec_aggregator.c
@@ -72,7 +72,6 @@ aggregator_run (void *cls,
                                "taler-exchange-aggregator",
                                "taler-exchange-aggregator",
                                "-c", as->config_filename,
-                               "-L", "INFO",
                                "-t", /* exit when done */
                                (as->kyc_on)
                                ? NULL
diff --git a/src/testing/testing_api_cmd_exec_closer.c b/src/testing/testing_api_cmd_exec_closer.c
index 57346f333..2501b39a6 100644
--- a/src/testing/testing_api_cmd_exec_closer.c
+++ b/src/testing/testing_api_cmd_exec_closer.c
@@ -91,6 +91,7 @@ closer_run (void *cls,
 
     rcmd = TALER_TESTING_interpreter_lookup_command (is,
                                                      as->reserve_ref);
+    GNUNET_assert (NULL != rcmd);
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_reserve_pub (rcmd,
                                              &reserve_pubp))
@@ -169,7 +170,8 @@ closer_traits (void *cls,
   struct TALER_TESTING_Trait xtraits[] = {
     TALER_TESTING_make_trait_process (&as->closer_proc),
     TALER_TESTING_make_trait_reserve_pub (&as->reserve_pub),
-    TALER_TESTING_make_trait_reserve_history (&as->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &as->reserve_history),
     TALER_TESTING_trait_end ()
   };
 
@@ -220,11 +222,11 @@ TALER_TESTING_cmd_exec_closer (const char *label,
     /* expected amount includes fee, while our argument
        gives the amount _without_ the fee. So add the fee. */
     GNUNET_assert (0 <=
-                   TALER_amount_add (&as->reserve_history.amount,
-                                     &as->reserve_history.amount,
-                                     &as->reserve_history.details.close_details.
-                                     fee));
-    as->reserve_history.type = TALER_EXCHANGE_RTT_CLOSE;
+                   TALER_amount_add (
+                     &as->reserve_history.amount,
+                     &as->reserve_history.amount,
+                     &as->reserve_history.details.close_details.fee));
+    as->reserve_history.type = TALER_EXCHANGE_RTT_CLOSING;
   }
   {
     struct TALER_TESTING_Command cmd = {
diff --git a/src/testing/testing_api_cmd_exec_transfer.c b/src/testing/testing_api_cmd_exec_transfer.c
index f8af443bd..300413b4b 100644
--- a/src/testing/testing_api_cmd_exec_transfer.c
+++ b/src/testing/testing_api_cmd_exec_transfer.c
@@ -67,7 +67,6 @@ transfer_run (void *cls,
                                "taler-exchange-transfer",
                                "taler-exchange-transfer",
                                "-c", as->config_filename,
-                               "-L", "INFO",
                                "-S", "1",
                                "-w", "0",
                                "-t", /* exit when done */
diff --git a/src/testing/testing_api_cmd_exec_wget.c b/src/testing/testing_api_cmd_exec_wget.c
new file mode 100644
index 000000000..67aceca0a
--- /dev/null
+++ b/src/testing/testing_api_cmd_exec_wget.c
@@ -0,0 +1,158 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_exec_wget.c
+ * @brief run a wget command
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_signatures.h"
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "wget" CMD.
+ */
+struct WgetState
+{
+  /**
+   * Process for the wgeter.
+   */
+  struct GNUNET_OS_Process *wget_proc;
+
+  /**
+   * URL to used by the wget.
+   */
+  const char *url;
+};
+
+
+/**
+ * Run the command; use the `wget' program.
+ *
+ * @param cls closure.
+ * @param cmd command currently being executed.
+ * @param is interpreter state.
+ */
+static void
+wget_run (void *cls,
+          const struct TALER_TESTING_Command *cmd,
+          struct TALER_TESTING_Interpreter *is)
+{
+  struct WgetState *ws = cls;
+
+  (void) cmd;
+  ws->wget_proc
+    = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
+                               NULL, NULL, NULL,
+                               "wget",
+                               "wget",
+                               ws->url,
+                               NULL);
+  if (NULL == ws->wget_proc)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  TALER_TESTING_wait_for_sigchld (is);
+}
+
+
+/**
+ * Free the state of a "wget" CMD, and possibly
+ * kills its process if it did not terminate regularly.
+ *
+ * @param cls closure.
+ * @param cmd the command being freed.
+ */
+static void
+wget_cleanup (void *cls,
+              const struct TALER_TESTING_Command *cmd)
+{
+  struct WgetState *ws = cls;
+
+  (void) cmd;
+  if (NULL != ws->wget_proc)
+  {
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (ws->wget_proc,
+                                          SIGKILL));
+    GNUNET_OS_process_wait (ws->wget_proc);
+    GNUNET_OS_process_destroy (ws->wget_proc);
+    ws->wget_proc = NULL;
+  }
+  GNUNET_free (ws);
+}
+
+
+/**
+ * Offer "wget" CMD internal data to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+wget_traits (void *cls,
+             const void **ret,
+             const char *trait,
+             unsigned int index)
+{
+  struct WgetState *ws = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_process (&ws->wget_proc),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_wget (const char *label,
+                             const char *url)
+{
+  struct WgetState *ws;
+
+  ws = GNUNET_new (struct WgetState);
+  ws->url = url;
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ws,
+      .label = label,
+      .run = &wget_run,
+      .cleanup = &wget_cleanup,
+      .traits = &wget_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_exec_wget.c */
diff --git a/src/testing/testing_api_cmd_exec_wirewatch.c b/src/testing/testing_api_cmd_exec_wirewatch.c
index cd31688d5..b6ed4f0f1 100644
--- a/src/testing/testing_api_cmd_exec_wirewatch.c
+++ b/src/testing/testing_api_cmd_exec_wirewatch.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018 Taler Systems SA
+  Copyright (C) 2018, 2023 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
@@ -34,7 +34,6 @@
  */
 struct WirewatchState
 {
-
   /**
    * Process for the wirewatcher.
    */
@@ -44,6 +43,11 @@ struct WirewatchState
    * Configuration file used by the wirewatcher.
    */
   const char *config_filename;
+
+  /**
+   * Account section to be used by the wirewatcher.
+   */
+  const char *account_section;
 };
 
 
@@ -71,6 +75,10 @@ wirewatch_run (void *cls,
                                "-S", "1",
                                "-w", "0",
                                "-t", /* exit when done */
+                               (NULL == ws->account_section)
+                               ? NULL
+                               : "-a",
+                               ws->account_section,
                                NULL);
   if (NULL == ws->wirewatch_proc)
   {
@@ -138,14 +146,15 @@ wirewatch_traits (void *cls,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_exec_wirewatch (const char *label,
-                                  const char *config_filename)
+TALER_TESTING_cmd_exec_wirewatch2 (const char *label,
+                                   const char *config_filename,
+                                   const char *account_section)
 {
   struct WirewatchState *ws;
 
   ws = GNUNET_new (struct WirewatchState);
   ws->config_filename = config_filename;
-
+  ws->account_section = account_section;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = ws,
@@ -160,4 +169,14 @@ TALER_TESTING_cmd_exec_wirewatch (const char *label,
 }
 
 
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_exec_wirewatch (const char *label,
+                                  const char *config_filename)
+{
+  return TALER_TESTING_cmd_exec_wirewatch2 (label,
+                                            config_filename,
+                                            NULL);
+}
+
+
 /* end of testing_api_cmd_exec_wirewatch.c */
diff --git a/src/testing/testing_api_cmd_get_auditor.c b/src/testing/testing_api_cmd_get_auditor.c
new file mode 100644
index 000000000..ab4e32665
--- /dev/null
+++ b/src/testing/testing_api_cmd_get_auditor.c
@@ -0,0 +1,286 @@
+/*
+  This file is part of TALER
+  (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_get_auditor.c
+ * @brief Command to get an auditor handle
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "get auditor" CMD.
+ */
+struct GetAuditorState
+{
+
+  /**
+   * Private key of the auditor.
+   */
+  struct TALER_AuditorPrivateKeyP auditor_priv;
+
+  /**
+   * Public key of the auditor.
+   */
+  struct TALER_AuditorPublicKeyP auditor_pub;
+
+  /**
+   * Our interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Auditor handle used to get the configuration.
+   */
+  struct TALER_AUDITOR_GetConfigHandle *auditor;
+
+  /**
+   * URL of the auditor.
+   */
+  char *auditor_url;
+
+  /**
+   * Filename of the master private key of the auditor.
+   */
+  char *priv_file;
+
+};
+
+
+/**
+ * Function called with information about the auditor.
+ *
+ * @param cls closure
+ * @param vr response data
+ */
+static void
+version_cb (
+  void *cls,
+  const struct TALER_AUDITOR_ConfigResponse *vr)
+{
+  struct GetAuditorState *gas = cls;
+
+  gas->auditor = NULL;
+  if (MHD_HTTP_OK != vr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (gas->is,
+                                     vr->hr.http_status,
+                                     MHD_HTTP_OK);
+    return;
+  }
+  if ( (NULL != gas->priv_file) &&
+       (0 != GNUNET_memcmp (&gas->auditor_pub,
+                            &vr->details.ok.vi.auditor_pub)) )
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (gas->is);
+    return;
+  }
+  TALER_TESTING_interpreter_next (gas->is);
+}
+
+
+/**
+ * Run the "get_auditor" command.
+ *
+ * @param cls closure.
+ * @param cmd the command currently being executed.
+ * @param is the interpreter state.
+ */
+static void
+get_auditor_run (void *cls,
+                 const struct TALER_TESTING_Command *cmd,
+                 struct TALER_TESTING_Interpreter *is)
+{
+  struct GetAuditorState *gas = cls;
+
+  (void) cmd;
+  if (NULL == gas->auditor_url)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (NULL != gas->priv_file)
+  {
+    if (GNUNET_SYSERR ==
+        GNUNET_CRYPTO_eddsa_key_from_file (gas->priv_file,
+                                           GNUNET_YES,
+                                           &gas->auditor_priv.eddsa_priv))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_CRYPTO_eddsa_key_get_public (&gas->auditor_priv.eddsa_priv,
+                                        &gas->auditor_pub.eddsa_pub);
+  }
+  gas->is = is;
+  gas->auditor
+    = TALER_AUDITOR_get_config (TALER_TESTING_interpreter_get_context (is),
+                                gas->auditor_url,
+                                &version_cb,
+                                gas);
+  if (NULL == gas->auditor)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Cleanup the state.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+get_auditor_cleanup (void *cls,
+                     const struct TALER_TESTING_Command *cmd)
+{
+  struct GetAuditorState *gas = cls;
+
+  if (NULL != gas->auditor)
+  {
+    GNUNET_break (0);
+    TALER_AUDITOR_get_config_cancel (gas->auditor);
+    gas->auditor = NULL;
+  }
+  GNUNET_free (gas->priv_file);
+  GNUNET_free (gas->auditor_url);
+  GNUNET_free (gas);
+}
+
+
+/**
+ * Offer internal data to a "get_auditor" CMD state to other commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+get_auditor_traits (void *cls,
+                    const void **ret,
+                    const char *trait,
+                    unsigned int index)
+{
+  struct GetAuditorState *gas = cls;
+  unsigned int off = (NULL == gas->priv_file) ? 2 : 0;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_auditor_priv (&gas->auditor_priv),
+    TALER_TESTING_make_trait_auditor_pub (&gas->auditor_pub),
+    TALER_TESTING_make_trait_auditor_url (gas->auditor_url),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (&traits[off],
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+/**
+ * Get the base URL of the auditor from @a cfg.
+ *
+ * @param cfg configuration to evaluate
+ * @return base URL of the auditor according to @a cfg
+ */
+static char *
+get_auditor_base_url (
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *auditor_url;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "auditor",
+                                             "BASE_URL",
+                                             &auditor_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "auditor",
+                               "BASE_URL");
+    return NULL;
+  }
+  return auditor_url;
+}
+
+
+/**
+ * Get the file name of the master private key file of the auditor from @a
+ * cfg.
+ *
+ * @param cfg configuration to evaluate
+ * @return base URL of the auditor according to @a cfg
+ */
+static char *
+get_auditor_priv_file (
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *fn;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "auditor",
+                                               "AUDITOR_PRIV_FILE",
+                                               &fn))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "auditor",
+                               "AUDITOR_PRIV_FILE");
+    return NULL;
+  }
+  return fn;
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_get_auditor (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  bool load_auditor_keys)
+{
+  struct GetAuditorState *gas;
+
+  gas = GNUNET_new (struct GetAuditorState);
+  gas->auditor_url = get_auditor_base_url (cfg);
+  if (load_auditor_keys)
+    gas->priv_file = get_auditor_priv_file (cfg);
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = gas,
+      .label = label,
+      .run = &get_auditor_run,
+      .cleanup = &get_auditor_cleanup,
+      .traits = &get_auditor_traits,
+      .name = "auditor"
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_get_exchange.c b/src/testing/testing_api_cmd_get_exchange.c
new file mode 100644
index 000000000..69a6e82b0
--- /dev/null
+++ b/src/testing/testing_api_cmd_get_exchange.c
@@ -0,0 +1,411 @@
+/*
+  This file is part of TALER
+  (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_get_exchange.c
+ * @brief Command to get an exchange handle
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "get exchange" CMD.
+ */
+struct GetExchangeState
+{
+
+  /**
+   * Master private key of the exchange.
+   */
+  struct TALER_MasterPrivateKeyP master_priv;
+
+  /**
+   * Our interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Exchange handle we produced.
+   */
+  struct TALER_EXCHANGE_GetKeysHandle *exchange;
+
+  /**
+   * Keys of the exchange.
+   */
+  struct TALER_EXCHANGE_Keys *keys;
+
+  /**
+   * URL of the exchange.
+   */
+  char *exchange_url;
+
+  /**
+   * Filename of the master private key of the exchange.
+   */
+  char *master_priv_file;
+
+  /**
+   * Label of a command to use to obtain existing
+   * keys.
+   */
+  const char *last_keys_ref;
+
+  /**
+   * Last denomination date we received when doing this request.
+   */
+  struct GNUNET_TIME_Timestamp my_denom_date;
+
+  /**
+   * Are we waiting for /keys before continuing?
+   */
+  bool wait_for_keys;
+};
+
+
+/**
+ * Function called with information about who is auditing
+ * a particular exchange and what keys the exchange is using.
+ *
+ * @param cls closure
+ * @param kr response from /keys
+ * @param[in] keys the keys of the exchange
+ */
+static void
+cert_cb (void *cls,
+         const struct TALER_EXCHANGE_KeysResponse *kr,
+         struct TALER_EXCHANGE_Keys *keys)
+{
+  struct GetExchangeState *ges = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &kr->hr;
+  struct TALER_TESTING_Interpreter *is = ges->is;
+
+  ges->exchange = NULL;
+  ges->keys = keys;
+  switch (hr->http_status)
+  {
+  case MHD_HTTP_OK:
+    if (ges->wait_for_keys)
+    {
+      ges->wait_for_keys = false;
+      TALER_TESTING_interpreter_next (is);
+      return;
+    }
+    ges->my_denom_date = kr->details.ok.keys->last_denom_issue_date;
+    return;
+  default:
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "/keys responded with HTTP status %u\n",
+                hr->http_status);
+    if (ges->wait_for_keys)
+    {
+      ges->wait_for_keys = false;
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    return;
+  }
+}
+
+
+/**
+ * Run the "get_exchange" command.
+ *
+ * @param cls closure.
+ * @param cmd the command currently being executed.
+ * @param is the interpreter state.
+ */
+static void
+get_exchange_run (void *cls,
+                  const struct TALER_TESTING_Command *cmd,
+                  struct TALER_TESTING_Interpreter *is)
+{
+  struct GetExchangeState *ges = cls;
+  struct TALER_EXCHANGE_Keys *xkeys = NULL;
+
+  (void) cmd;
+  if (NULL == ges->exchange_url)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (NULL != ges->last_keys_ref)
+  {
+    const struct TALER_TESTING_Command *state_cmd;
+    struct TALER_EXCHANGE_Keys *old_keys;
+    const char *exchange_url;
+    json_t *s_keys;
+
+    state_cmd
+      = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ges->last_keys_ref);
+    if (NULL == state_cmd)
+    {
+      /* Command providing serialized keys not found.  */
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_keys (state_cmd,
+                                      &old_keys))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (NULL == old_keys)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_exchange_url (state_cmd,
+                                              &exchange_url))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if (0 != strcmp (exchange_url,
+                     ges->exchange_url))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    s_keys = TALER_EXCHANGE_keys_to_json (old_keys);
+    if (NULL == s_keys)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    xkeys = TALER_EXCHANGE_keys_from_json (s_keys);
+    if (NULL == xkeys)
+    {
+      GNUNET_break (0);
+      json_dumpf (s_keys,
+                  stderr,
+                  JSON_INDENT (2));
+      json_decref (s_keys);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    json_decref (s_keys);
+  }
+  if (NULL != ges->master_priv_file)
+  {
+    if (GNUNET_SYSERR ==
+        GNUNET_CRYPTO_eddsa_key_from_file (ges->master_priv_file,
+                                           GNUNET_YES,
+                                           &ges->master_priv.eddsa_priv))
+    {
+      GNUNET_break (0);
+      TALER_EXCHANGE_keys_decref (xkeys);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+  }
+  ges->is = is;
+  ges->exchange
+    = TALER_EXCHANGE_get_keys (TALER_TESTING_interpreter_get_context (is),
+                               ges->exchange_url,
+                               xkeys,
+                               &cert_cb,
+                               ges);
+  TALER_EXCHANGE_keys_decref (xkeys);
+  if (NULL == ges->exchange)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (! ges->wait_for_keys)
+    TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Cleanup the state.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+get_exchange_cleanup (void *cls,
+                      const struct TALER_TESTING_Command *cmd)
+{
+  struct GetExchangeState *ges = cls;
+
+  if (NULL != ges->exchange)
+  {
+    TALER_EXCHANGE_get_keys_cancel (ges->exchange);
+    ges->exchange = NULL;
+  }
+  TALER_EXCHANGE_keys_decref (ges->keys);
+  ges->keys = NULL;
+  GNUNET_free (ges->master_priv_file);
+  GNUNET_free (ges->exchange_url);
+  GNUNET_free (ges);
+}
+
+
+/**
+ * Offer internal data to a "get_exchange" CMD state to other commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+get_exchange_traits (void *cls,
+                     const void **ret,
+                     const char *trait,
+                     unsigned int index)
+{
+  struct GetExchangeState *ges = cls;
+  unsigned int off = (NULL == ges->master_priv_file) ? 1 : 0;
+
+  if (NULL != ges->keys)
+  {
+    struct TALER_TESTING_Trait traits[] = {
+      TALER_TESTING_make_trait_master_priv (&ges->master_priv),
+      TALER_TESTING_make_trait_master_pub (&ges->keys->master_pub),
+      TALER_TESTING_make_trait_keys (ges->keys),
+      TALER_TESTING_make_trait_exchange_url (ges->exchange_url),
+      TALER_TESTING_make_trait_timestamp (0,
+                                          &ges->my_denom_date),
+      TALER_TESTING_trait_end ()
+    };
+
+    return TALER_TESTING_get_trait (&traits[off],
+                                    ret,
+                                    trait,
+                                    index);
+  }
+  else
+  {
+    struct TALER_TESTING_Trait traits[] = {
+      TALER_TESTING_make_trait_master_priv (&ges->master_priv),
+      TALER_TESTING_make_trait_exchange_url (ges->exchange_url),
+      TALER_TESTING_make_trait_timestamp (0,
+                                          &ges->my_denom_date),
+      TALER_TESTING_trait_end ()
+    };
+
+    return TALER_TESTING_get_trait (&traits[off],
+                                    ret,
+                                    trait,
+                                    index);
+  }
+}
+
+
+/**
+ * Get the base URL of the exchange from @a cfg.
+ *
+ * @param cfg configuration to evaluate
+ * @return base URL of the exchange according to @a cfg
+ */
+static char *
+get_exchange_base_url (
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *exchange_url;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &exchange_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    return NULL;
+  }
+  return exchange_url;
+}
+
+
+/**
+ * Get the file name of the master private key file of the exchange from @a
+ * cfg.
+ *
+ * @param cfg configuration to evaluate
+ * @return base URL of the exchange according to @a cfg
+ */
+static char *
+get_exchange_master_priv_file (
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *fn;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "exchange-offline",
+                                               "MASTER_PRIV_FILE",
+                                               &fn))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange-offline",
+                               "MASTER_PRIV_FILE");
+    return NULL;
+  }
+  return fn;
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_get_exchange (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *last_keys_ref,
+  bool wait_for_keys,
+  bool load_private_key)
+{
+  struct GetExchangeState *ges;
+
+  ges = GNUNET_new (struct GetExchangeState);
+  ges->exchange_url = get_exchange_base_url (cfg);
+  ges->last_keys_ref = last_keys_ref;
+  if (load_private_key)
+    ges->master_priv_file = get_exchange_master_priv_file (cfg);
+  ges->wait_for_keys = wait_for_keys;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ges,
+      .label = label,
+      .run = &get_exchange_run,
+      .cleanup = &get_exchange_cleanup,
+      .traits = &get_exchange_traits,
+      .name = "exchange"
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c
index 33e6cdcef..03e704c72 100644
--- a/src/testing/testing_api_cmd_insert_deposit.c
+++ b/src/testing/testing_api_cmd_insert_deposit.c
@@ -29,6 +29,7 @@
 #include "taler_signatures.h"
 #include "taler_testing_lib.h"
 #include "taler_exchangedb_plugin.h"
+#include "taler_exchangedb_lib.h"
 
 
 /**
@@ -37,9 +38,9 @@
 struct InsertDepositState
 {
   /**
-   * Configuration file used by the command.
+   * Database connection we use.
    */
-  const struct TALER_TESTING_DatabaseConnection *dbc;
+  struct TALER_EXCHANGEDB_Plugin *plugin;
 
   /**
    * Human-readable name of the shop.
@@ -71,6 +72,11 @@ struct InsertDepositState
    * Deposit fee.
    */
   const char *deposit_fee;
+
+  /**
+   * Do we used a cached @e plugin?
+   */
+  bool cached;
 };
 
 /**
@@ -126,32 +132,46 @@ insert_deposit_run (void *cls,
                     struct TALER_TESTING_Interpreter *is)
 {
   struct InsertDepositState *ids = cls;
-  struct TALER_EXCHANGEDB_Deposit deposit;
+  struct TALER_EXCHANGEDB_CoinDepositInformation deposit;
+  struct TALER_EXCHANGEDB_BatchDeposit bd;
   struct TALER_MerchantPrivateKeyP merchant_priv;
   struct TALER_EXCHANGEDB_DenominationKeyInformation issue;
   struct TALER_DenominationPublicKey dpk;
   struct TALER_DenominationPrivateKey denom_priv;
+  char *receiver_wire_account;
 
   (void) cmd;
-  // prepare and store issue first.
+  if (NULL == ids->plugin)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      ids->plugin->preflight (ids->plugin->cls))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
   fake_issue (&issue);
   GNUNET_assert (GNUNET_OK ==
                  TALER_denom_priv_create (&denom_priv,
                                           &dpk,
-                                          TALER_DENOMINATION_RSA,
+                                          GNUNET_CRYPTO_BSA_RSA,
                                           1024));
   TALER_denom_pub_hash (&dpk,
                         &issue.denom_hash);
 
   if ( (GNUNET_OK !=
-        ids->dbc->plugin->start (ids->dbc->plugin->cls,
-                                 "talertestinglib: denomination insertion")) ||
+        ids->plugin->start (ids->plugin->cls,
+                            "talertestinglib: denomination insertion")) ||
        (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-        ids->dbc->plugin->insert_denomination_info (ids->dbc->plugin->cls,
-                                                    &dpk,
-                                                    &issue)) ||
+        ids->plugin->insert_denomination_info (ids->plugin->cls,
+                                               &dpk,
+                                               &issue)) ||
        (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
-        ids->dbc->plugin->commit (ids->dbc->plugin->cls)) )
+        ids->plugin->commit (ids->plugin->cls)) )
   {
     TALER_TESTING_interpreter_fail (is);
     TALER_denom_pub_free (&dpk);
@@ -163,25 +183,29 @@ insert_deposit_run (void *cls,
   memset (&deposit,
           0,
           sizeof (deposit));
-
-  GNUNET_CRYPTO_kdf (&merchant_priv,
-                     sizeof (struct TALER_MerchantPrivateKeyP),
-                     "merchant-priv",
-                     strlen ("merchant-priv"),
-                     ids->merchant_name,
-                     strlen (ids->merchant_name),
-                     NULL,
-                     0);
+  memset (&bd,
+          0,
+          sizeof (bd));
+  bd.cdis = &deposit;
+  bd.num_cdis = 1;
+
+  GNUNET_assert (
+    GNUNET_YES ==
+    GNUNET_CRYPTO_kdf (&merchant_priv,
+                       sizeof (struct TALER_MerchantPrivateKeyP),
+                       "merchant-priv",
+                       strlen ("merchant-priv"),
+                       ids->merchant_name,
+                       strlen (ids->merchant_name),
+                       NULL,
+                       0));
   GNUNET_CRYPTO_eddsa_key_get_public (&merchant_priv.eddsa_priv,
-                                      &deposit.merchant_pub.eddsa_pub);
+                                      &bd.merchant_pub.eddsa_pub);
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK,
-                                    &deposit.h_contract_terms.hash);
-  if ( (GNUNET_OK !=
-        TALER_string_to_amount (ids->amount_with_fee,
-                                &deposit.amount_with_fee)) ||
-       (GNUNET_OK !=
-        TALER_string_to_amount (ids->deposit_fee,
-                                &deposit.deposit_fee)) )
+                                    &bd.h_contract_terms.hash);
+  if (GNUNET_OK !=
+      TALER_string_to_amount (ids->amount_with_fee,
+                              &deposit.amount_with_fee))
   {
     TALER_TESTING_interpreter_fail (is);
     TALER_denom_pub_free (&dpk);
@@ -199,19 +223,20 @@ insert_deposit_run (void *cls,
     struct TALER_PlanchetDetail pd;
     struct TALER_BlindedDenominationSignature bds;
     struct TALER_PlanchetMasterSecretP ps;
-    struct TALER_ExchangeWithdrawValues alg_values;
-    union TALER_DenominationBlindingKeyP bks;
+    union GNUNET_CRYPTO_BlindingSecretP bks;
+    const struct TALER_ExchangeWithdrawValues *alg_values;
 
-    alg_values.cipher = TALER_DENOMINATION_RSA;
+    alg_values = TALER_denom_ewv_rsa_singleton ();
     TALER_planchet_blinding_secret_create (&ps,
-                                           &alg_values,
+                                           alg_values,
                                            &bks);
     GNUNET_assert (GNUNET_OK ==
                    TALER_denom_blind (&dpk,
                                       &bks,
                                       NULL, /* no age restriction active */
+                                      NULL, /* no nonce needed */
                                       &deposit.coin.coin_pub,
-                                      &alg_values,
+                                      alg_values,
                                       &c_hash,
                                       &pd.blinded_planchet));
     GNUNET_assert (GNUNET_OK ==
@@ -225,44 +250,54 @@ insert_deposit_run (void *cls,
                                             &bds,
                                             &bks,
                                             &c_hash,
-                                            &alg_values,
+                                            alg_values,
                                             &dpk));
     TALER_blinded_denom_sig_free (&bds);
   }
-  GNUNET_asprintf (&deposit.receiver_wire_account,
-                   "payto://x-taler-bank/localhost/%s",
+  GNUNET_asprintf (&receiver_wire_account,
+                   "payto://x-taler-bank/localhost/%s?receiver-name=%s",
+                   ids->merchant_account,
                    ids->merchant_account);
-  memset (&deposit.wire_salt,
+  bd.receiver_wire_account = receiver_wire_account;
+  TALER_payto_hash (bd.receiver_wire_account,
+                    &bd.wire_target_h_payto);
+  memset (&bd.wire_salt,
           46,
-          sizeof (deposit.wire_salt));
-  deposit.timestamp = GNUNET_TIME_timestamp_get ();
-  deposit.wire_deadline = GNUNET_TIME_relative_to_timestamp (
+          sizeof (bd.wire_salt));
+  bd.wallet_timestamp = GNUNET_TIME_timestamp_get ();
+  bd.wire_deadline = GNUNET_TIME_relative_to_timestamp (
     ids->wire_deadline);
   /* finally, actually perform the DB operation */
   {
     uint64_t known_coin_id;
     struct TALER_DenominationHashP dph;
     struct TALER_AgeCommitmentHash agh;
+    bool balance_ok;
+    uint32_t bad_index;
+    bool ctr_conflict;
 
     if ( (GNUNET_OK !=
-          ids->dbc->plugin->start (ids->dbc->plugin->cls,
-                                   "libtalertesting: insert deposit")) ||
+          ids->plugin->start (ids->plugin->cls,
+                              "libtalertesting: insert deposit")) ||
          (0 >
-          ids->dbc->plugin->ensure_coin_known (ids->dbc->plugin->cls,
-                                               &deposit.coin,
-                                               &known_coin_id,
-                                               &dph,
-                                               &agh)) ||
+          ids->plugin->ensure_coin_known (ids->plugin->cls,
+                                          &deposit.coin,
+                                          &known_coin_id,
+                                          &dph,
+                                          &agh)) ||
          (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
-          ids->dbc->plugin->insert_deposit (ids->dbc->plugin->cls,
-                                            ids->exchange_timestamp,
-                                            &deposit)) ||
+          ids->plugin->do_deposit (ids->plugin->cls,
+                                   &bd,
+                                   &ids->exchange_timestamp,
+                                   &balance_ok,
+                                   &bad_index,
+                                   &ctr_conflict)) ||
          (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
-          ids->dbc->plugin->commit (ids->dbc->plugin->cls)) )
+          ids->plugin->commit (ids->plugin->cls)) )
     {
       GNUNET_break (0);
-      ids->dbc->plugin->rollback (ids->dbc->plugin->cls);
-      GNUNET_free (deposit.receiver_wire_account);
+      ids->plugin->rollback (ids->plugin->cls);
+      GNUNET_free (receiver_wire_account);
       TALER_denom_pub_free (&dpk);
       TALER_denom_priv_free (&denom_priv);
       TALER_TESTING_interpreter_fail (is);
@@ -273,7 +308,7 @@ insert_deposit_run (void *cls,
   TALER_denom_sig_free (&deposit.coin.denom_sig);
   TALER_denom_pub_free (&dpk);
   TALER_denom_priv_free (&denom_priv);
-  GNUNET_free (deposit.receiver_wire_account);
+  GNUNET_free (receiver_wire_account);
   TALER_TESTING_interpreter_next (is);
 }
 
@@ -292,6 +327,14 @@ insert_deposit_cleanup (void *cls,
   struct InsertDepositState *ids = cls;
 
   (void) cmd;
+  if ( (NULL != ids->plugin) &&
+       (! ids->cached) )
+  {
+    // FIXME: historically, we also did:
+    // ids->plugin->drop_tables (ids->plugin->cls);
+    TALER_EXCHANGEDB_plugin_unload (ids->plugin);
+    ids->plugin = NULL;
+  }
   GNUNET_free (ids);
 }
 
@@ -299,7 +342,7 @@ insert_deposit_cleanup (void *cls,
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_insert_deposit (
   const char *label,
-  const struct TALER_TESTING_DatabaseConnection *dbc,
+  const struct GNUNET_CONFIGURATION_Handle *db_cfg,
   const char *merchant_name,
   const char *merchant_account,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
@@ -307,10 +350,22 @@ TALER_TESTING_cmd_insert_deposit (
   const char *amount_with_fee,
   const char *deposit_fee)
 {
+  static struct TALER_EXCHANGEDB_Plugin *pluginc;
+  static const struct GNUNET_CONFIGURATION_Handle *db_cfgc;
   struct InsertDepositState *ids;
 
   ids = GNUNET_new (struct InsertDepositState);
-  ids->dbc = dbc;
+  if (db_cfgc == db_cfg)
+  {
+    ids->plugin = pluginc;
+    ids->cached = true;
+  }
+  else
+  {
+    ids->plugin = TALER_EXCHANGEDB_plugin_load (db_cfg);
+    pluginc = ids->plugin;
+    db_cfgc = db_cfg;
+  }
   ids->merchant_name = merchant_name;
   ids->merchant_account = merchant_account;
   ids->exchange_timestamp = exchange_timestamp;
diff --git a/src/testing/testing_api_cmd_kyc_check_get.c b/src/testing/testing_api_cmd_kyc_check_get.c
index 03b2321d1..25c7e98b8 100644
--- a/src/testing/testing_api_cmd_kyc_check_get.c
+++ b/src/testing/testing_api_cmd_kyc_check_get.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021-2023 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
@@ -73,19 +73,13 @@ check_kyc_cb (void *cls,
 {
   struct KycCheckGetState *kcg = cls;
   struct TALER_TESTING_Interpreter *is = kcg->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
   kcg->kwh = NULL;
   if (kcg->expected_response_code != ks->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                ks->http_status,
-                (int) ks->ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     ks->http_status,
+                                     kcg->expected_response_code);
     return;
   }
   switch (ks->http_status)
@@ -93,7 +87,7 @@ check_kyc_cb (void *cls,
   case MHD_HTTP_OK:
     break;
   case MHD_HTTP_ACCEPTED:
-    kcg->kyc_url = GNUNET_strdup (ks->details.kyc_url);
+    kcg->kyc_url = GNUNET_strdup (ks->details.accepted.kyc_url);
     break;
   case MHD_HTTP_NO_CONTENT:
     break;
@@ -119,15 +113,14 @@ check_kyc_run (void *cls,
 {
   struct KycCheckGetState *kcg = cls;
   const struct TALER_TESTING_Command *res_cmd;
-  const char **payto_uri;
-  const uint64_t *payment_target;
-  struct TALER_PaytoHashP h_payto;
+  const uint64_t *requirement_row;
+  const struct TALER_PaytoHashP *h_payto;
 
   (void) cmd;
   kcg->is = is;
-  res_cmd = TALER_TESTING_interpreter_lookup_command (kcg->is,
-                                                      kcg->
-                                                      payment_target_reference);
+  res_cmd = TALER_TESTING_interpreter_lookup_command (
+    kcg->is,
+    kcg->payment_target_reference);
   if (NULL == res_cmd)
   {
     GNUNET_break (0);
@@ -135,39 +128,37 @@ check_kyc_run (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      TALER_TESTING_get_trait_payto_uri (res_cmd,
-                                         &payto_uri))
+      TALER_TESTING_get_trait_legi_requirement_row (res_cmd,
+                                                    &requirement_row))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (kcg->is);
     return;
   }
   if (GNUNET_OK !=
-      TALER_TESTING_get_trait_payment_target_uuid (res_cmd,
-                                                   &payment_target))
+      TALER_TESTING_get_trait_h_payto (res_cmd,
+                                       &h_payto))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (kcg->is);
     return;
   }
-  if ( (NULL == *payto_uri) ||
-       (0 == *payment_target) )
+  if (0 == *requirement_row)
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (kcg->is);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Running KYC check for payto URI: %s\n",
-              *payto_uri);
-  TALER_payto_hash (*payto_uri,
-                    &h_payto);
-  kcg->kwh = TALER_EXCHANGE_kyc_check (is->exchange,
-                                       *payment_target,
-                                       &h_payto,
-                                       GNUNET_TIME_UNIT_SECONDS,
-                                       &check_kyc_cb,
-                                       kcg);
+  kcg->kwh = TALER_EXCHANGE_kyc_check (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    *requirement_row,
+    h_payto,
+    TALER_KYCLOGIC_KYC_UT_INDIVIDUAL,
+    GNUNET_TIME_UNIT_SECONDS,
+    &check_kyc_cb,
+    kcg);
   GNUNET_assert (NULL != kcg->kwh);
 }
 
@@ -187,10 +178,8 @@ check_kyc_cleanup (void *cls,
 
   if (NULL != kcg->kwh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                kcg->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (kcg->is,
+                                      cmd->label);
     TALER_EXCHANGE_kyc_check_cancel (kcg->kwh);
     kcg->kwh = NULL;
   }
@@ -216,8 +205,7 @@ check_kyc_traits (void *cls,
 {
   struct KycCheckGetState *kcg = cls;
   struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_kyc_url (
-      (const char **) &kcg->kyc_url),
+    TALER_TESTING_make_trait_kyc_url (kcg->kyc_url),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_kyc_proof.c b/src/testing/testing_api_cmd_kyc_proof.c
index f9a65afb3..b079fffce 100644
--- a/src/testing/testing_api_cmd_kyc_proof.c
+++ b/src/testing/testing_api_cmd_kyc_proof.c
@@ -44,9 +44,9 @@ struct KycProofGetState
   const char *code;
 
   /**
-   * State to pass.
+   * Logic section name to pass to `/kyc-proof/` handler.
    */
-  const char *state;
+  const char *logic;
 
   /**
    * Expected HTTP response code.
@@ -83,18 +83,13 @@ proof_kyc_cb (void *cls,
 {
   struct KycProofGetState *kcg = cls;
   struct TALER_TESTING_Interpreter *is = kcg->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
   kcg->kph = NULL;
   if (kcg->expected_response_code != kpr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                kpr->http_status,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     kpr->http_status,
+                                     kcg->expected_response_code);
     return;
   }
   switch (kpr->http_status)
@@ -131,11 +126,18 @@ proof_kyc_run (void *cls,
 {
   struct KycProofGetState *kps = cls;
   const struct TALER_TESTING_Command *res_cmd;
-  const char **payto_uri;
-  struct TALER_PaytoHashP h_payto;
+  const struct TALER_PaytoHashP *h_payto;
+  char *uargs;
+  const char *exchange_url;
 
   (void) cmd;
   kps->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   res_cmd = TALER_TESTING_interpreter_lookup_command (
     kps->is,
     kps->payment_target_reference);
@@ -146,35 +148,28 @@ proof_kyc_run (void *cls,
     return;
   }
   if (GNUNET_OK !=
-      TALER_TESTING_get_trait_payto_uri (res_cmd,
-                                         &payto_uri))
+      TALER_TESTING_get_trait_h_payto (res_cmd,
+                                       &h_payto))
   {
-    const struct TALER_PaytoHashP *hpt;
-
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_h_payto (res_cmd,
-                                         &hpt))
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (kps->is);
-      return;
-    }
-    h_payto = *hpt;
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (kps->is);
+    return;
   }
+  if (NULL == kps->code)
+    uargs = NULL;
   else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Triggering KYC proof for %s\n",
-                *payto_uri);
-    TALER_payto_hash (*payto_uri,
-                      &h_payto);
-  }
-  kps->kph = TALER_EXCHANGE_kyc_proof (is->exchange,
-                                       &h_payto,
-                                       kps->code,
-                                       kps->state,
-                                       &proof_kyc_cb,
-                                       kps);
+    GNUNET_asprintf (&uargs,
+                     "&code=%s",
+                     kps->code);
+  kps->kph = TALER_EXCHANGE_kyc_proof (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    h_payto,
+    kps->logic,
+    uargs,
+    &proof_kyc_cb,
+    kps);
+  GNUNET_free (uargs);
   GNUNET_assert (NULL != kps->kph);
 }
 
@@ -194,10 +189,8 @@ proof_kyc_cleanup (void *cls,
 
   if (NULL != kps->kph)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                kps->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (kps->is,
+                                      cmd->label);
     TALER_EXCHANGE_kyc_proof_cancel (kps->kph);
     kps->kph = NULL;
   }
@@ -223,8 +216,7 @@ proof_kyc_traits (void *cls,
 {
   struct KycProofGetState *kps = cls;
   struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_web_url (
-      (const char **) &kps->redirect_url),
+    TALER_TESTING_make_trait_web_url (kps->redirect_url),
     TALER_TESTING_trait_end ()
   };
 
@@ -236,17 +228,18 @@ proof_kyc_traits (void *cls,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_proof_kyc (const char *label,
-                             const char *payment_target_reference,
-                             const char *code,
-                             const char *state,
-                             unsigned int expected_response_code)
+TALER_TESTING_cmd_proof_kyc_oauth2 (
+  const char *label,
+  const char *payment_target_reference,
+  const char *logic_section,
+  const char *code,
+  unsigned int expected_response_code)
 {
   struct KycProofGetState *kps;
 
   kps = GNUNET_new (struct KycProofGetState);
   kps->code = code;
-  kps->state = state;
+  kps->logic = logic_section;
   kps->payment_target_reference = payment_target_reference;
   kps->expected_response_code = expected_response_code;
   {
diff --git a/src/testing/testing_api_cmd_kyc_wallet_get.c b/src/testing/testing_api_cmd_kyc_wallet_get.c
index 91ad09ff9..ffb143ffb 100644
--- a/src/testing/testing_api_cmd_kyc_wallet_get.c
+++ b/src/testing/testing_api_cmd_kyc_wallet_get.c
@@ -49,6 +49,11 @@ struct KycWalletGetState
   char *reserve_payto_uri;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Command to get a reserve private key from.
    */
   const char *reserve_reference;
@@ -59,10 +64,16 @@ struct KycWalletGetState
   unsigned int expected_response_code;
 
   /**
-   * Set to the KYC UUID *if* the exchange replied with
-   * a request for KYC (#MHD_HTTP_ACCEPTED).
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC (#MHD_HTTP_OK).
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC (#MHD_HTTP_OK).
    */
-  uint64_t kyc_uuid;
+  uint64_t requirement_row;
 
   /**
    * Handle to the "track transaction" pending operation.
@@ -70,6 +81,11 @@ struct KycWalletGetState
   struct TALER_EXCHANGE_KycWalletHandle *kwh;
 
   /**
+   * Balance to pass to the exchange.
+   */
+  struct TALER_Amount balance;
+
+  /**
    * Interpreter state.
    */
   struct TALER_TESTING_Interpreter *is;
@@ -88,33 +104,29 @@ wallet_kyc_cb (void *cls,
 {
   struct KycWalletGetState *kwg = cls;
   struct TALER_TESTING_Interpreter *is = kwg->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
   kwg->kwh = NULL;
   if (kwg->expected_response_code != wkr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d (wanted %u) to command %s in %s:%u\n",
-                wkr->http_status,
-                (int) wkr->ec,
-                kwg->expected_response_code,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     wkr->http_status,
+                                     kwg->expected_response_code);
     return;
   }
   switch (wkr->http_status)
   {
-  case MHD_HTTP_OK:
-    kwg->kyc_uuid = wkr->payment_target_uuid;
-    break;
   case MHD_HTTP_NO_CONTENT:
     break;
   case MHD_HTTP_FORBIDDEN:
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
     return;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    kwg->requirement_row
+      = wkr->details.unavailable_for_legal_reasons.requirement_row;
+    kwg->h_payto
+      = wkr->details.unavailable_for_legal_reasons.h_payto;
+    break;
   default:
     GNUNET_break (0);
     break;
@@ -136,9 +148,16 @@ wallet_kyc_run (void *cls,
                 struct TALER_TESTING_Interpreter *is)
 {
   struct KycWalletGetState *kwg = cls;
+  const char *exchange_url;
 
-  (void) cmd;
+  kwg->cmd = cmd;
   kwg->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   if (NULL != kwg->reserve_reference)
   {
     const struct TALER_TESTING_Command *res_cmd;
@@ -170,12 +189,15 @@ wallet_kyc_run (void *cls,
   GNUNET_CRYPTO_eddsa_key_get_public (&kwg->reserve_priv.eddsa_priv,
                                       &kwg->reserve_pub.eddsa_pub);
   kwg->reserve_payto_uri
-    = TALER_payto_from_reserve (TALER_EXCHANGE_get_base_url (is->exchange),
+    = TALER_reserve_make_payto (exchange_url,
                                 &kwg->reserve_pub);
-  kwg->kwh = TALER_EXCHANGE_kyc_wallet (is->exchange,
-                                        &kwg->reserve_priv,
-                                        &wallet_kyc_cb,
-                                        kwg);
+  kwg->kwh = TALER_EXCHANGE_kyc_wallet (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    &kwg->reserve_priv,
+    &kwg->balance,
+    &wallet_kyc_cb,
+    kwg);
   GNUNET_assert (NULL != kwg->kwh);
 }
 
@@ -195,10 +217,8 @@ wallet_kyc_cleanup (void *cls,
 
   if (NULL != kwg->kwh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                kwg->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (kwg->is,
+                                      cmd->label);
     TALER_EXCHANGE_kyc_wallet_cancel (kwg->kwh);
     kwg->kwh = NULL;
   }
@@ -226,9 +246,9 @@ wallet_kyc_traits (void *cls,
   struct TALER_TESTING_Trait traits[] = {
     TALER_TESTING_make_trait_reserve_priv (&kwg->reserve_priv),
     TALER_TESTING_make_trait_reserve_pub (&kwg->reserve_pub),
-    TALER_TESTING_make_trait_payment_target_uuid (&kwg->kyc_uuid),
-    TALER_TESTING_make_trait_payto_uri (
-      (const char **) &kwg->reserve_payto_uri),
+    TALER_TESTING_make_trait_legi_requirement_row (&kwg->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&kwg->h_payto),
+    TALER_TESTING_make_trait_payto_uri (kwg->reserve_payto_uri),
     TALER_TESTING_trait_end ()
   };
 
@@ -242,6 +262,7 @@ wallet_kyc_traits (void *cls,
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_wallet_kyc_get (const char *label,
                                   const char *reserve_reference,
+                                  const char *threshold_balance,
                                   unsigned int expected_response_code)
 {
   struct KycWalletGetState *kwg;
@@ -249,6 +270,9 @@ TALER_TESTING_cmd_wallet_kyc_get (const char *label,
   kwg = GNUNET_new (struct KycWalletGetState);
   kwg->reserve_reference = reserve_reference;
   kwg->expected_response_code = expected_response_code;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (threshold_balance,
+                                         &kwg->balance));
   {
     struct TALER_TESTING_Command cmd = {
       .cls = kwg,
diff --git a/src/testing/testing_api_cmd_oauth.c b/src/testing/testing_api_cmd_oauth.c
index 045b5eefa..80d38e4c8 100644
--- a/src/testing/testing_api_cmd_oauth.c
+++ b/src/testing/testing_api_cmd_oauth.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021 Taler Systems SA
+  Copyright (C) 2021-2023 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
@@ -40,6 +40,11 @@ struct OAuthState
   struct MHD_Daemon *mhd;
 
   /**
+   * Birthdate that the oauth server should return in a response, may be NULL
+   */
+  const char *birthdate;
+
+  /**
    * Port to listen on.
    */
   uint16_t port;
@@ -172,23 +177,36 @@ handler_cb (void *cls,
             void **con_cls)
 {
   struct RequestCtx *rc = *con_cls;
+  struct OAuthState *oas = cls;
   unsigned int hc;
   json_t *body;
 
-  (void) cls;
   (void) version;
   if (0 == strcasecmp (method,
                        MHD_HTTP_METHOD_GET))
   {
+    json_t *data =
+      GNUNET_JSON_PACK (
+        GNUNET_JSON_pack_string ("id",
+                                 "XXXID12345678"),
+        GNUNET_JSON_pack_string ("first_name",
+                                 "Bob"),
+        GNUNET_JSON_pack_string ("last_name",
+                                 "Builder"));
+
+    if (NULL != oas->birthdate)
+      GNUNET_assert (0 ==
+                     json_object_set_new (data,
+                                          "birthdate",
+                                          json_string_nocheck (
+                                            oas->birthdate)));
+
     body = GNUNET_JSON_PACK (
       GNUNET_JSON_pack_string (
         "status",
         "success"),
       GNUNET_JSON_pack_object_steal (
-        "data",
-        GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_string ("id",
-                                   "XXXID12345678"))));
+        "data", data));
     return TALER_MHD_reply_json_steal (connection,
                                        body,
                                        MHD_HTTP_OK);
@@ -305,6 +323,7 @@ cleanup (void *cls,
   (void) toe;
   if (NULL == rc)
     return;
+  MHD_destroy_post_processor (rc->pp);
   GNUNET_free (rc->code);
   GNUNET_free (rc->client_id);
   GNUNET_free (rc->redirect_uri);
@@ -328,12 +347,18 @@ oauth_run (void *cls,
   struct OAuthState *oas = cls;
 
   (void) cmd;
-  oas->mhd = MHD_start_daemon (MHD_USE_AUTO_INTERNAL_THREAD,
+  oas->mhd = MHD_start_daemon (MHD_USE_AUTO_INTERNAL_THREAD | MHD_USE_DEBUG,
                                oas->port,
                                NULL, NULL,
                                &handler_cb, oas,
                                MHD_OPTION_NOTIFY_COMPLETED, &cleanup, NULL,
                                NULL);
+  if (NULL == oas->mhd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
   TALER_TESTING_interpreter_next (is);
 }
 
@@ -362,13 +387,15 @@ oauth_cleanup (void *cls,
 
 
 struct TALER_TESTING_Command
-TALER_TESTING_cmd_oauth (const char *label,
-                         uint16_t port)
+TALER_TESTING_cmd_oauth_with_birthdate (const char *label,
+                                        const char *birthdate,
+                                        uint16_t port)
 {
   struct OAuthState *oas;
 
   oas = GNUNET_new (struct OAuthState);
   oas->port = port;
+  oas->birthdate = birthdate;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = oas,
diff --git a/src/testing/testing_api_cmd_offline_sign_global_fees.c b/src/testing/testing_api_cmd_offline_sign_global_fees.c
index 7c9032255..db3916258 100644
--- a/src/testing/testing_api_cmd_offline_sign_global_fees.c
+++ b/src/testing/testing_api_cmd_offline_sign_global_fees.c
@@ -52,11 +52,6 @@ struct OfflineSignState
   const char *history_fee_s;
 
   /**
-   * The KYC fee to sign.
-   */
-  const char *kyc_fee_s;
-
-  /**
    * The account fee to sign.
    */
   const char *account_fee_s;
@@ -72,11 +67,6 @@ struct OfflineSignState
   struct GNUNET_TIME_Relative purse_timeout;
 
   /**
-   * How long does a user have to complete the KYC?
-   */
-  struct GNUNET_TIME_Relative kyc_timeout;
-
-  /**
    * How long do we keep the history?
    */
   struct GNUNET_TIME_Relative history_expiration;
@@ -104,7 +94,6 @@ offlinesign_run (void *cls,
   char num_purses[12];
   char history_expiration[32];
   char purse_timeout[32];
-  char kyc_timeout[32];
 
   GNUNET_snprintf (num_purses,
                    sizeof (num_purses),
@@ -120,11 +109,6 @@ offlinesign_run (void *cls,
                    "%s",
                    GNUNET_TIME_relative2s (ks->purse_timeout,
                                            false));
-  GNUNET_snprintf (kyc_timeout,
-                   sizeof (kyc_timeout),
-                   "%s",
-                   GNUNET_TIME_relative2s (ks->kyc_timeout,
-                                           false));
   ks->offlinesign_proc
     = GNUNET_OS_start_process (
         GNUNET_OS_INHERIT_STD_ALL,
@@ -136,11 +120,9 @@ offlinesign_run (void *cls,
         "global-fee",
         "now",
         ks->history_fee_s,
-        ks->kyc_fee_s,
         ks->account_fee_s,
         ks->purse_fee_s,
         purse_timeout,
-        kyc_timeout,
         history_expiration,
         num_purses,
         "upload",
@@ -215,11 +197,9 @@ TALER_TESTING_cmd_exec_offline_sign_global_fees (
   const char *label,
   const char *config_filename,
   const char *history_fee,
-  const char *kyc_fee,
   const char *account_fee,
   const char *purse_fee,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   unsigned int num_purses)
 {
@@ -228,11 +208,9 @@ TALER_TESTING_cmd_exec_offline_sign_global_fees (
   ks = GNUNET_new (struct OfflineSignState);
   ks->config_filename = config_filename;
   ks->history_fee_s = history_fee;
-  ks->kyc_fee_s = kyc_fee;
   ks->account_fee_s = account_fee;
   ks->purse_fee_s = purse_fee;
   ks->purse_timeout = purse_timeout;
-  ks->kyc_timeout = kyc_timeout;
   ks->history_expiration = history_expiration;
   ks->num_purses = num_purses;
   {
diff --git a/src/testing/testing_api_cmd_offline_sign_wire_fees.c b/src/testing/testing_api_cmd_offline_sign_wire_fees.c
index 55746ebc5..0fccbcd0a 100644
--- a/src/testing/testing_api_cmd_offline_sign_wire_fees.c
+++ b/src/testing/testing_api_cmd_offline_sign_wire_fees.c
@@ -52,11 +52,6 @@ struct OfflineSignState
   const char *wire_fee_s;
 
   /**
-   * The wad fee to sign.
-   */
-  const char *wad_fee_s;
-
-  /**
    * The closing fee to sign.
    */
   const char *closing_fee_s;
@@ -91,7 +86,6 @@ offlinesign_run (void *cls,
         "x-taler-bank",
         ks->wire_fee_s,
         ks->closing_fee_s,
-        ks->wad_fee_s,
         "upload",
         NULL);
   if (NULL == ks->offlinesign_proc)
@@ -163,15 +157,13 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_exec_offline_sign_fees (const char *label,
                                           const char *config_filename,
                                           const char *wire_fee,
-                                          const char *closing_fee,
-                                          const char *wad_fee)
+                                          const char *closing_fee)
 {
   struct OfflineSignState *ks;
 
   ks = GNUNET_new (struct OfflineSignState);
   ks->config_filename = config_filename;
   ks->wire_fee_s = wire_fee;
-  ks->wad_fee_s = wad_fee;
   ks->closing_fee_s = closing_fee;
   {
     struct TALER_TESTING_Command cmd = {
diff --git a/src/testing/testing_api_cmd_purse_create_deposit.c b/src/testing/testing_api_cmd_purse_create_deposit.c
index ef98c9055..4740f9801 100644
--- a/src/testing/testing_api_cmd_purse_create_deposit.c
+++ b/src/testing/testing_api_cmd_purse_create_deposit.c
@@ -44,10 +44,20 @@ struct Coin
   unsigned int coin_index;
 
   /**
+   * Public key of the deposited coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
    * Amount to deposit (with fee).
    */
   struct TALER_Amount deposit_with_fee;
 
+  /**
+   * Entry in the coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
 };
 
 
@@ -162,22 +172,15 @@ deposit_cb (void *cls,
   ds->dh = NULL;
   if (ds->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
     return;
   }
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
-    ds->exchange_pub = dr->details.success.exchange_pub;
-    ds->exchange_sig = dr->details.success.exchange_sig;
+    ds->exchange_pub = dr->details.ok.exchange_pub;
+    ds->exchange_sig = dr->details.ok.exchange_sig;
   }
   TALER_TESTING_interpreter_next (ds->is);
 }
@@ -200,14 +203,19 @@ deposit_run (void *cls,
 
   (void) cmd;
   ds->is = is;
+  GNUNET_CRYPTO_eddsa_key_create (&ds->purse_priv.eddsa_priv);
+  GNUNET_CRYPTO_eddsa_key_create (&ds->merge_priv.eddsa_priv);
+  GNUNET_CRYPTO_ecdhe_key_create (&ds->contract_priv.ecdhe_priv);
+  GNUNET_CRYPTO_eddsa_key_get_public (&ds->purse_priv.eddsa_priv,
+                                      &ds->purse_pub.eddsa_pub);
+
   for (unsigned int i = 0; i<ds->num_coin_references; i++)
   {
-    const struct Coin *cr = &ds->coin_references[i];
+    struct Coin *cr = &ds->coin_references[i];
     struct TALER_EXCHANGE_PurseDeposit *pd = &deposits[i];
     const struct TALER_TESTING_Command *coin_cmd;
     const struct TALER_CoinSpendPrivateKeyP *coin_priv;
     const struct TALER_AgeCommitmentProof *age_commitment_proof = NULL;
-    struct TALER_AgeCommitmentHash h_age_commitment = {0};
     const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
     const struct TALER_DenominationSignature *denom_pub_sig;
 
@@ -242,26 +250,25 @@ deposit_run (void *cls,
       TALER_TESTING_interpreter_fail (is);
       return;
     }
-    if (NULL != age_commitment_proof)
-    {
-      TALER_age_commitment_hash (&age_commitment_proof->commitment,
-                                 &h_age_commitment);
-    }
-#if FIXME_OEC
-    pd->age_commitment = *h_age_commitment;
-#endif
+    pd->age_commitment_proof = age_commitment_proof;
     pd->denom_sig = *denom_pub_sig;
     pd->coin_priv = *coin_priv;
     pd->amount = cr->deposit_with_fee;
     pd->h_denom_pub = denom_pub->h_key;
+    GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                        &cr->coin_pub.eddsa_pub);
+    cr->che.type = TALER_EXCHANGE_CTT_PURSE_DEPOSIT;
+    cr->che.amount = cr->deposit_with_fee;
+    GNUNET_CRYPTO_eddsa_key_get_public (
+      &ds->purse_priv.eddsa_priv,
+      &cr->che.details.purse_deposit.purse_pub.eddsa_pub);
+    cr->che.details.purse_deposit.exchange_base_url
+      = TALER_TESTING_get_exchange_url (is);
+    TALER_age_commitment_hash (
+      &age_commitment_proof->commitment,
+      &cr->che.details.purse_deposit.phac);
   }
 
-  GNUNET_CRYPTO_eddsa_key_create (&ds->purse_priv.eddsa_priv);
-  GNUNET_CRYPTO_eddsa_key_create (&ds->merge_priv.eddsa_priv);
-  GNUNET_CRYPTO_ecdhe_key_create (&ds->contract_priv.ecdhe_priv);
-  GNUNET_CRYPTO_eddsa_key_get_public (&ds->purse_priv.eddsa_priv,
-                                      &ds->purse_pub.eddsa_pub);
-
   ds->purse_expiration =
     GNUNET_TIME_absolute_to_timestamp (
       GNUNET_TIME_relative_to_absolute (ds->rel_expiration));
@@ -271,7 +278,9 @@ deposit_run (void *cls,
                    "pay_deadline",
                    GNUNET_JSON_from_timestamp (ds->purse_expiration)));
   ds->dh = TALER_EXCHANGE_purse_create_with_deposit (
-    is->exchange,
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
     &ds->purse_priv,
     &ds->merge_priv,
     &ds->contract_priv,
@@ -307,10 +316,8 @@ deposit_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_purse_create_with_deposit_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -338,22 +345,33 @@ deposit_traits (void *cls,
                 unsigned int index)
 {
   struct PurseCreateDepositState *ds = cls;
-  struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_merge_priv (&ds->merge_priv),
-    TALER_TESTING_make_trait_contract_priv (&ds->contract_priv),
-    TALER_TESTING_make_trait_purse_priv (&ds->purse_priv),
-    TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
-    TALER_TESTING_make_trait_contract_terms (ds->contract_terms),
-    TALER_TESTING_make_trait_deposit_amount (&ds->target_amount),
-    TALER_TESTING_make_trait_timestamp (index,
-                                        &ds->purse_expiration),
-    TALER_TESTING_trait_end ()
-  };
-
-  return TALER_TESTING_get_trait (traits,
-                                  ret,
-                                  trait,
-                                  index);
+  if (index >= ds->num_coin_references)
+    return GNUNET_NO;
+
+  {
+    const struct Coin *co = &ds->coin_references[index];
+    struct TALER_TESTING_Trait traits[] = {
+      TALER_TESTING_make_trait_merge_priv (&ds->merge_priv),
+      TALER_TESTING_make_trait_contract_priv (&ds->contract_priv),
+      TALER_TESTING_make_trait_coin_history (index,
+                                             &co->che),
+      TALER_TESTING_make_trait_coin_pub (index,
+                                         &co->coin_pub),
+      TALER_TESTING_make_trait_purse_priv (&ds->purse_priv),
+      TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
+      TALER_TESTING_make_trait_contract_terms (ds->contract_terms),
+      TALER_TESTING_make_trait_deposit_amount (0,
+                                               &ds->target_amount),
+      TALER_TESTING_make_trait_timestamp (index,
+                                          &ds->purse_expiration),
+      TALER_TESTING_trait_end ()
+    };
+
+    return TALER_TESTING_get_trait (traits,
+                                    ret,
+                                    trait,
+                                    index);
+  }
 }
 
 
diff --git a/src/testing/testing_api_cmd_purse_delete.c b/src/testing/testing_api_cmd_purse_delete.c
new file mode 100644
index 000000000..26037359e
--- /dev/null
+++ b/src/testing/testing_api_cmd_purse_delete.c
@@ -0,0 +1,189 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_purse_delete.c
+ * @brief command for testing /management/purse/disable.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * State for a "purse_delete" CMD.
+ */
+struct PurseDeleteState
+{
+
+  /**
+   * Purse delete handle while operation is running.
+   */
+  struct TALER_EXCHANGE_PurseDeleteHandle *pdh;
+
+  /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Command that created the purse we now want to
+   * delete.
+   */
+  const char *purse_cmd;
+};
+
+
+/**
+ * Callback to analyze the DELETE /purses/$PID response, just used to check if
+ * the response code is acceptable.
+ *
+ * @param cls closure.
+ * @param pdr HTTP response details
+ */
+static void
+purse_delete_cb (void *cls,
+                 const struct TALER_EXCHANGE_PurseDeleteResponse *pdr)
+{
+  struct PurseDeleteState *pds = cls;
+
+  pds->pdh = NULL;
+  if (pds->expected_response_code != pdr->hr.http_status)
+  {
+    TALER_TESTING_unexpected_status (pds->is,
+                                     pdr->hr.http_status,
+                                     pds->expected_response_code);
+    return;
+  }
+  TALER_TESTING_interpreter_next (pds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+purse_delete_run (void *cls,
+                  const struct TALER_TESTING_Command *cmd,
+                  struct TALER_TESTING_Interpreter *is)
+{
+  struct PurseDeleteState *pds = cls;
+  const struct TALER_PurseContractPrivateKeyP *purse_priv;
+  const struct TALER_TESTING_Command *ref;
+  const char *exchange_url;
+
+  (void) cmd;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  pds->purse_cmd);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_purse_priv (ref,
+                                          &purse_priv))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  pds->is = is;
+  pds->pdh = TALER_EXCHANGE_purse_delete (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    purse_priv,
+    &purse_delete_cb,
+    pds);
+  if (NULL == pds->pdh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "purse_delete" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct PurseDeleteState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+purse_delete_cleanup (void *cls,
+                      const struct TALER_TESTING_Command *cmd)
+{
+  struct PurseDeleteState *pds = cls;
+
+  if (NULL != pds->pdh)
+  {
+    TALER_TESTING_command_incomplete (pds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_purse_delete_cancel (pds->pdh);
+    pds->pdh = NULL;
+  }
+  GNUNET_free (pds);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_purse_delete (const char *label,
+                                unsigned int expected_http_status,
+                                const char *purse_cmd)
+{
+  struct PurseDeleteState *ds;
+
+  ds = GNUNET_new (struct PurseDeleteState);
+  ds->expected_response_code = expected_http_status;
+  ds->purse_cmd = purse_cmd;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &purse_delete_run,
+      .cleanup = &purse_delete_cleanup
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_purse_delete.c */
diff --git a/src/testing/testing_api_cmd_purse_deposit.c b/src/testing/testing_api_cmd_purse_deposit.c
index ed4967776..048c6d736 100644
--- a/src/testing/testing_api_cmd_purse_deposit.c
+++ b/src/testing/testing_api_cmd_purse_deposit.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2022 Taler Systems SA
+  Copyright (C) 2022, 2023 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
@@ -39,6 +39,16 @@ struct Coin
   char *command_ref;
 
   /**
+   * Entry in the coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
+   * Public key of the deposited coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
    * index of the specific coin in the traits of @e command_ref.
    */
   unsigned int coin_index;
@@ -73,6 +83,12 @@ struct PurseDepositState
   struct TALER_PurseContractPublicKeyP purse_pub;
 
   /**
+   * The reserve we are being deposited into.
+   * Set as a trait once we know the reserve.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
    * PurseDeposit handle while operation is running.
    */
   struct TALER_EXCHANGE_PurseDepositHandle *dh;
@@ -88,6 +104,12 @@ struct PurseDepositState
   const char *purse_ref;
 
   /**
+   * Reserve history entry that corresponds to this operation.
+   * Will be of type #TALER_EXCHANGE_RTT_MERGE.
+   * Only valid if @e purse_complete is true.
+   */
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
+  /**
    * Expected HTTP response code.
    */
   unsigned int expected_response_code;
@@ -101,6 +123,11 @@ struct PurseDepositState
    * Minimum age to apply to all deposits.
    */
   uint8_t min_age;
+
+  /**
+   * Set to true if this deposit filled the purse.
+   */
+  bool purse_complete;
 };
 
 
@@ -120,21 +147,105 @@ deposit_cb (void *cls,
   ds->dh = NULL;
   if (ds->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
     return;
   }
   if (MHD_HTTP_OK == dr->hr.http_status)
   {
-    // FIXME: any data to keep from reply?
+    if (-1 !=
+        TALER_amount_cmp (&dr->details.ok.total_deposited,
+                          &dr->details.ok.purse_value_after_fees))
+    {
+      const struct TALER_TESTING_Command *purse_cmd;
+      const struct TALER_ReserveSignatureP *reserve_sig;
+      const struct TALER_ReservePublicKeyP *reserve_pub;
+      const struct GNUNET_TIME_Timestamp *merge_timestamp;
+      const struct TALER_PurseMergePublicKeyP *merge_pub;
+
+      purse_cmd = TALER_TESTING_interpreter_lookup_command (ds->is,
+                                                            ds->purse_ref);
+      GNUNET_assert (NULL != purse_cmd);
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_reserve_sig (purse_cmd,
+                                               &reserve_sig))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ds->is);
+        return;
+      }
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_reserve_pub (purse_cmd,
+                                               &reserve_pub))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ds->is);
+        return;
+      }
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_merge_pub (purse_cmd,
+                                             &merge_pub))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ds->is);
+        return;
+      }
+      ds->reserve_pub = *reserve_pub;
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_timestamp (purse_cmd,
+                                             0,
+                                             &merge_timestamp))
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ds->is);
+        return;
+      }
+
+      /* Deposits complete, create trait! */
+      ds->reserve_history.type = TALER_EXCHANGE_RTT_MERGE;
+      {
+        struct TALER_EXCHANGE_Keys *keys;
+        const struct TALER_EXCHANGE_GlobalFee *gf;
+
+        keys = TALER_TESTING_get_keys (ds->is);
+        GNUNET_assert (NULL != keys);
+        gf = TALER_EXCHANGE_get_global_fee (keys,
+                                            *merge_timestamp);
+        GNUNET_assert (NULL != gf);
+
+        /* Note: change when flags below changes! */
+        ds->reserve_history.amount
+          = dr->details.ok.purse_value_after_fees;
+        if (true)
+        {
+          ds->reserve_history.details.merge_details.purse_fee = gf->fees.purse;
+        }
+        else
+        {
+          TALER_amount_set_zero (
+            ds->reserve_history.amount.currency,
+            &ds->reserve_history.details.merge_details.purse_fee);
+        }
+      }
+      ds->reserve_history.details.merge_details.h_contract_terms
+        = dr->details.ok.h_contract_terms;
+      ds->reserve_history.details.merge_details.merge_pub
+        = *merge_pub;
+      ds->reserve_history.details.merge_details.purse_pub
+        = ds->purse_pub;
+      ds->reserve_history.details.merge_details.reserve_sig
+        = *reserve_sig;
+      ds->reserve_history.details.merge_details.merge_timestamp
+        = *merge_timestamp;
+      ds->reserve_history.details.merge_details.purse_expiration
+        = dr->details.ok.purse_expiration;
+      ds->reserve_history.details.merge_details.min_age
+        = ds->min_age;
+      ds->reserve_history.details.merge_details.flags
+        = TALER_WAMF_MODE_CREATE_WITH_PURSE_FEE;
+      ds->purse_complete = true;
+    }
   }
   TALER_TESTING_interpreter_next (ds->is);
 }
@@ -159,9 +270,9 @@ deposit_run (void *cls,
 
   (void) cmd;
   ds->is = is;
-
   purse_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                         ds->purse_ref);
+  GNUNET_assert (NULL != purse_cmd);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_purse_pub (purse_cmd,
                                          &purse_pub))
@@ -173,24 +284,17 @@ deposit_run (void *cls,
   ds->purse_pub = *purse_pub;
   for (unsigned int i = 0; i<ds->num_coin_references; i++)
   {
-    const struct Coin *cr = &ds->coin_references[i];
+    struct Coin *cr = &ds->coin_references[i];
     struct TALER_EXCHANGE_PurseDeposit *pd = &deposits[i];
     const struct TALER_TESTING_Command *coin_cmd;
     const struct TALER_CoinSpendPrivateKeyP *coin_priv;
     const struct TALER_AgeCommitmentProof *age_commitment_proof = NULL;
-    struct TALER_AgeCommitmentHash h_age_commitment = {0};
     const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
     const struct TALER_DenominationSignature *denom_pub_sig;
 
     coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                          cr->command_ref);
-    if (NULL == coin_cmd)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
+    GNUNET_assert (NULL != coin_cmd);
     if ( (GNUNET_OK !=
           TALER_TESTING_get_trait_coin_priv (coin_cmd,
                                              cr->coin_index,
@@ -213,14 +317,17 @@ deposit_run (void *cls,
       TALER_TESTING_interpreter_fail (is);
       return;
     }
-    if (NULL != age_commitment_proof)
-    {
-      TALER_age_commitment_hash (&age_commitment_proof->commitment,
-                                 &h_age_commitment);
-    }
-#if FIXME_OEC
-    pd->age_commitment = *h_age_commitment;
-#endif
+    GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                        &cr->coin_pub.eddsa_pub);
+    cr->che.type = TALER_EXCHANGE_CTT_PURSE_DEPOSIT;
+    cr->che.amount = cr->deposit_with_fee;
+    cr->che.details.purse_deposit.purse_pub = *purse_pub;
+    cr->che.details.purse_deposit.exchange_base_url
+      = TALER_TESTING_get_exchange_url (is);
+    TALER_age_commitment_hash (
+      &age_commitment_proof->commitment,
+      &cr->che.details.purse_deposit.phac);
+    pd->age_commitment_proof = age_commitment_proof;
     pd->denom_sig = *denom_pub_sig;
     pd->coin_priv = *coin_priv;
     pd->amount = cr->deposit_with_fee;
@@ -228,8 +335,10 @@ deposit_run (void *cls,
   }
 
   ds->dh = TALER_EXCHANGE_purse_deposit (
-    is->exchange,
-    NULL, /* FIXME: WADs support: purse exchange URL */
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    NULL, /* FIXME #7271: WADs support: purse exchange URL */
     &ds->purse_pub,
     ds->min_age,
     ds->num_coin_references,
@@ -262,10 +371,8 @@ deposit_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_purse_deposit_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -292,15 +399,31 @@ deposit_traits (void *cls,
                 unsigned int index)
 {
   struct PurseDepositState *ds = cls;
-  struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
-    TALER_TESTING_trait_end ()
-  };
-
-  return TALER_TESTING_get_trait (traits,
-                                  ret,
-                                  trait,
-                                  index);
+
+  if (index >= ds->num_coin_references)
+    return GNUNET_NO;
+  {
+    const struct Coin *co = &ds->coin_references[index];
+    struct TALER_TESTING_Trait traits[] = {
+      /* history entry MUST be first due to response code logic below! */
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &ds->reserve_history),
+      TALER_TESTING_make_trait_coin_history (index,
+                                             &co->che),
+      TALER_TESTING_make_trait_coin_pub (index,
+                                         &co->coin_pub),
+      TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
+      TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
+      TALER_TESTING_trait_end ()
+    };
+
+    return TALER_TESTING_get_trait (ds->purse_complete
+                                    ? &traits[0]   /* we have reserve history */
+                                    : &traits[1],  /* skip reserve history */
+                                    ret,
+                                    trait,
+                                    index);
+  }
 }
 
 
@@ -338,7 +461,8 @@ TALER_TESTING_cmd_purse_deposit_coins (
     {
       struct Coin *c = &ds->coin_references[i++];
 
-      GNUNET_assert (NULL != (val = va_arg (ap, const char *)));
+      GNUNET_assert (NULL != (val = va_arg (ap,
+                                            const char *)));
       GNUNET_assert (GNUNET_OK ==
                      TALER_TESTING_parse_coin_reference (
                        ref,
diff --git a/src/testing/testing_api_cmd_purse_get.c b/src/testing/testing_api_cmd_purse_get.c
index 61873721b..d5246660b 100644
--- a/src/testing/testing_api_cmd_purse_get.c
+++ b/src/testing/testing_api_cmd_purse_get.c
@@ -147,11 +147,11 @@ purse_status_cb (void *cls,
                    TALER_string_to_amount (ss->expected_balance,
                                            &eb));
     if (0 != TALER_amount_cmp (&eb,
-                               &rs->details.success.balance))
+                               &rs->details.ok.balance))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected amount in purse: %s\n",
-                  TALER_amount_to_string (&rs->details.success.balance));
+                  TALER_amount_to_string (&rs->details.ok.balance));
       TALER_TESTING_interpreter_fail (ss->is);
       return;
     }
@@ -188,13 +188,7 @@ status_run (void *cls,
   create_purse
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ss->purse_reference);
-
-  if (NULL == create_purse)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
+  GNUNET_assert (NULL != create_purse);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_purse_pub (create_purse,
                                          &ss->purse_pub))
@@ -204,12 +198,15 @@ status_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-  ss->pgh = TALER_EXCHANGE_purse_get (is->exchange,
-                                      ss->purse_pub,
-                                      ss->timeout,
-                                      ss->wait_for_merge,
-                                      &purse_status_cb,
-                                      ss);
+  ss->pgh = TALER_EXCHANGE_purse_get (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    ss->purse_pub,
+    ss->timeout,
+    ss->wait_for_merge,
+    &purse_status_cb,
+    ss);
   if (! GNUNET_TIME_relative_is_zero (ss->timeout))
   {
     TALER_TESTING_interpreter_next (is);
@@ -233,10 +230,8 @@ status_cleanup (void *cls,
 
   if (NULL != ss->pgh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ss->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
     TALER_EXCHANGE_purse_get_cancel (ss->pgh);
     ss->pgh = NULL;
   }
@@ -311,6 +306,7 @@ finish_run (void *cls,
   poll_purse
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ps->poll_reference);
+  GNUNET_assert (NULL != poll_purse);
   GNUNET_assert (poll_purse->run == &status_run);
   ss = poll_purse->cls;
   if (NULL == ss->pgh)
diff --git a/src/testing/testing_api_cmd_purse_merge.c b/src/testing/testing_api_cmd_purse_merge.c
index 27aa120ed..cf9d4f996 100644
--- a/src/testing/testing_api_cmd_purse_merge.c
+++ b/src/testing/testing_api_cmd_purse_merge.c
@@ -62,7 +62,7 @@ struct PurseMergeState
   const char *merge_ref;
 
   /**
-   * Refernece to the reserve, or NULL (!).
+   * Reference to the reserve, or NULL (!).
    */
   const char *reserve_ref;
 
@@ -72,6 +72,54 @@ struct PurseMergeState
   struct TALER_TESTING_Interpreter *is;
 
   /**
+   * Hash of the payto://-URI for the reserve we are
+   * merging into.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC.
+   */
+  uint64_t requirement_row;
+
+  /**
+   * Reserve history entry that corresponds to this operation.
+   * Will be of type #TALER_EXCHANGE_RTT_MERGE.
+   */
+  struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Public key of the merge capability.
+   */
+  struct TALER_PurseMergePublicKeyP merge_pub;
+
+  /**
+   * Contract value.
+   */
+  struct TALER_Amount value_after_fees;
+
+  /**
+   * Hash of the contract.
+   */
+  struct TALER_PrivateContractHashP h_contract_terms;
+
+  /**
+   * When does the purse expire.
+   */
+  struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Minimum age of deposits into the purse.
+   */
+  uint32_t min_age;
+
+  /**
    * Expected HTTP response code.
    */
   unsigned int expected_response_code;
@@ -93,18 +141,45 @@ merge_cb (void *cls,
   struct PurseMergeState *ds = cls;
 
   ds->dh = NULL;
+  switch (dr->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    ds->reserve_history.type = TALER_EXCHANGE_RTT_MERGE;
+    ds->reserve_history.amount = ds->value_after_fees;
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_amount_set_zero (
+                     ds->value_after_fees.currency,
+                     &ds->reserve_history.details.merge_details.purse_fee));
+    ds->reserve_history.details.merge_details.h_contract_terms
+      = ds->h_contract_terms;
+    ds->reserve_history.details.merge_details.merge_pub
+      = ds->merge_pub;
+    ds->reserve_history.details.merge_details.purse_pub
+      = ds->purse_pub;
+    ds->reserve_history.details.merge_details.reserve_sig
+      = *dr->reserve_sig;
+    ds->reserve_history.details.merge_details.merge_timestamp
+      = ds->merge_timestamp;
+    ds->reserve_history.details.merge_details.purse_expiration
+      = ds->purse_expiration;
+    ds->reserve_history.details.merge_details.min_age
+      = ds->min_age;
+    ds->reserve_history.details.merge_details.flags
+      = TALER_WAMF_MODE_MERGE_FULLY_PAID_PURSE;
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* KYC required */
+    ds->requirement_row =
+      dr->details.unavailable_for_legal_reasons.requirement_row;
+    break;
+  }
+
+
   if (ds->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -124,13 +199,8 @@ merge_run (void *cls,
            struct TALER_TESTING_Interpreter *is)
 {
   struct PurseMergeState *ds = cls;
-  const struct TALER_PurseContractPublicKeyP *purse_pub;
   const struct TALER_PurseMergePrivateKeyP *merge_priv;
   const json_t *ct;
-  struct TALER_PrivateContractHashP h_contract_terms;
-  uint32_t min_age = 0;
-  struct TALER_Amount value_after_fees;
-  struct GNUNET_TIME_Timestamp purse_expiration;
   const struct TALER_TESTING_Command *ref;
 
   (void) cmd;
@@ -146,14 +216,20 @@ merge_run (void *cls,
     TALER_TESTING_interpreter_fail (ds->is);
     return;
   }
-  if (GNUNET_OK !=
-      TALER_TESTING_get_trait_purse_pub (ref,
-                                         &purse_pub))
   {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (ds->is);
-    return;
+    const struct TALER_PurseContractPublicKeyP *purse_pub;
+
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_purse_pub (ref,
+                                           &purse_pub))
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (ds->is);
+      return;
+    }
+    ds->purse_pub = *purse_pub;
   }
+
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_contract_terms (ref,
                                               &ct))
@@ -164,7 +240,7 @@ merge_run (void *cls,
   }
   if (GNUNET_OK !=
       TALER_JSON_contract_hash (ct,
-                                &h_contract_terms))
+                                &ds->h_contract_terms))
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (ds->is);
@@ -173,12 +249,12 @@ merge_run (void *cls,
   {
     struct GNUNET_JSON_Specification spec[] = {
       GNUNET_JSON_spec_timestamp ("pay_deadline",
-                                  &purse_expiration),
+                                  &ds->purse_expiration),
       TALER_JSON_spec_amount_any ("amount",
-                                  &value_after_fees),
+                                  &ds->value_after_fees),
       GNUNET_JSON_spec_mark_optional (
         GNUNET_JSON_spec_uint32 ("minimum_age",
-                                 &min_age),
+                                 &ds->min_age),
         NULL),
       GNUNET_JSON_spec_end ()
     };
@@ -217,17 +293,43 @@ merge_run (void *cls,
   }
   GNUNET_CRYPTO_eddsa_key_get_public (&ds->reserve_priv.eddsa_priv,
                                       &ds->reserve_pub.eddsa_pub);
+  {
+    char *payto_uri;
+    const char *exchange_url;
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+    payto_uri = TALER_reserve_make_payto (exchange_url,
+                                          &ds->reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &ds->h_payto);
+    GNUNET_free (payto_uri);
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&merge_priv->eddsa_priv,
+                                      &ds->merge_pub.eddsa_pub);
   ds->merge_timestamp = GNUNET_TIME_timestamp_get ();
   ds->dh = TALER_EXCHANGE_account_merge (
-    is->exchange,
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
     NULL, /* no wad */
     &ds->reserve_priv,
-    purse_pub,
+    &ds->purse_pub,
     merge_priv,
-    &h_contract_terms,
-    min_age,
-    &value_after_fees,
-    purse_expiration,
+    &ds->h_contract_terms,
+    ds->min_age,
+    &ds->value_after_fees,
+    ds->purse_expiration,
     ds->merge_timestamp,
     &merge_cb,
     ds);
@@ -257,10 +359,8 @@ merge_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_account_merge_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -285,12 +385,20 @@ merge_traits (void *cls,
 {
   struct PurseMergeState *ds = cls;
   struct TALER_TESTING_Trait traits[] = {
+    /* history entry MUST be first due to response code logic below! */
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &ds->reserve_history),
+    TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
     TALER_TESTING_make_trait_timestamp (0,
                                         &ds->merge_timestamp),
+    TALER_TESTING_make_trait_legi_requirement_row (&ds->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&ds->h_payto),
     TALER_TESTING_trait_end ()
   };
 
-  return TALER_TESTING_get_trait (traits,
+  return TALER_TESTING_get_trait ((ds->expected_response_code == MHD_HTTP_OK)
+                                  ? &traits[0]   /* we have reserve history */
+                                  : &traits[1],  /* skip reserve history */
                                   ret,
                                   trait,
                                   index);
diff --git a/src/testing/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c
index 1a8290206..cefcd96bb 100644
--- a/src/testing/testing_api_cmd_recoup.c
+++ b/src/testing/testing_api_cmd_recoup.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2018 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -59,6 +59,16 @@ struct RecoupState
   struct TALER_ReservePublicKeyP reserve_pub;
 
   /**
+   * Entry in the coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
+   * Public key of the refunded coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin;
+
+  /**
    * Reserve history entry, set if this recoup actually filled up a reserve.
    * Otherwise `reserve_history.type` will be zero.
    */
@@ -73,17 +83,15 @@ struct RecoupState
  * was paid back belonged to the right reserve.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param reserve_pub public key of the reserve receiving the recoup
+ * @param rr response details
  */
 static void
 recoup_cb (void *cls,
-           const struct TALER_EXCHANGE_HttpResponse *hr,
-           const struct TALER_ReservePublicKeyP *reserve_pub)
+           const struct TALER_EXCHANGE_RecoupResponse *rr)
 {
   struct RecoupState *ps = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rr->hr;
   struct TALER_TESTING_Interpreter *is = ps->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   const struct TALER_TESTING_Command *reserve_cmd;
   char *cref;
   unsigned int idx;
@@ -91,18 +99,9 @@ recoup_cb (void *cls,
   ps->ph = NULL;
   if (ps->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    fprintf (stderr, "\n");
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     hr->http_status,
+                                     ps->expected_response_code);
     return;
   }
 
@@ -135,12 +134,6 @@ recoup_cb (void *cls,
     {
       const struct TALER_ReservePrivateKeyP *reserve_priv;
 
-      if (NULL == reserve_pub)
-      {
-        GNUNET_break (0);
-        TALER_TESTING_interpreter_fail (is);
-        return;
-      }
       if (GNUNET_OK !=
           TALER_TESTING_get_trait_reserve_priv (reserve_cmd,
                                                 &reserve_priv))
@@ -151,7 +144,7 @@ recoup_cb (void *cls,
       }
       GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
                                           &ps->reserve_pub.eddsa_pub);
-      if (0 != GNUNET_memcmp (reserve_pub,
+      if (0 != GNUNET_memcmp (&rr->details.ok.reserve_pub,
                               &ps->reserve_pub))
       {
         GNUNET_break (0);
@@ -162,6 +155,7 @@ recoup_cb (void *cls,
           TALER_amount_is_valid (&ps->reserve_history.amount))
         ps->reserve_history.type = TALER_EXCHANGE_RTT_RECOUP;
       /* ps->reserve_history.details.recoup_details.coin_pub; // initialized earlier */
+      ps->che.details.recoup.reserve_pub = ps->reserve_pub;
     }
     break;
   case MHD_HTTP_NOT_FOUND:
@@ -200,6 +194,7 @@ recoup_run (void *cls,
   char *cref;
   unsigned int idx;
   const struct TALER_ExchangeWithdrawValues *ewv;
+  struct TALER_DenominationHashP h_denom_pub;
 
   ps->is = is;
   if (GNUNET_OK !=
@@ -231,6 +226,8 @@ recoup_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
+  GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
+                                      &ps->coin.eddsa_pub);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_exchange_wd_value (coin_cmd,
                                                  idx,
@@ -273,13 +270,27 @@ recoup_run (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Trying to recoup denomination '%s'\n",
               TALER_B2S (&denom_pub->h_key));
-  ps->ph = TALER_EXCHANGE_recoup (is->exchange,
-                                  denom_pub,
-                                  coin_sig,
-                                  ewv,
-                                  planchet,
-                                  &recoup_cb,
-                                  ps);
+  ps->che.type = TALER_EXCHANGE_CTT_RECOUP;
+  ps->che.amount = ps->reserve_history.amount;
+  TALER_planchet_blinding_secret_create (planchet,
+                                         ewv,
+                                         &ps->che.details.recoup.coin_bks);
+  TALER_denom_pub_hash (&denom_pub->key,
+                        &h_denom_pub);
+  TALER_wallet_recoup_sign (&h_denom_pub,
+                            &ps->che.details.recoup.coin_bks,
+                            coin_priv,
+                            &ps->che.details.recoup.coin_sig);
+  ps->ph = TALER_EXCHANGE_recoup (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    denom_pub,
+    coin_sig,
+    ewv,
+    planchet,
+    &recoup_cb,
+    ps);
   GNUNET_assert (NULL != ps->ph);
 }
 
@@ -328,7 +339,12 @@ recoup_traits (void *cls,
   {
     struct TALER_TESTING_Trait traits[] = {
       TALER_TESTING_make_trait_reserve_pub (&ps->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&ps->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &ps->reserve_history),
+      TALER_TESTING_make_trait_coin_history (0,
+                                             &ps->che),
+      TALER_TESTING_make_trait_coin_pub (0,
+                                         &ps->coin),
       TALER_TESTING_trait_end ()
     };
 
diff --git a/src/testing/testing_api_cmd_recoup_refresh.c b/src/testing/testing_api_cmd_recoup_refresh.c
index 6081a4ba1..68d267be4 100644
--- a/src/testing/testing_api_cmd_recoup_refresh.c
+++ b/src/testing/testing_api_cmd_recoup_refresh.c
@@ -44,6 +44,26 @@ struct RecoupRefreshState
   const char *coin_reference;
 
   /**
+   * Entry in the old coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che_old;
+
+  /**
+   * Entry in the recouped coin's history generated by this operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che_new;
+
+  /**
+   * Public key of the refunded coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub_old;
+
+  /**
+   * Public key of the refunded coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub_new;
+
+  /**
    * Amount to be recouped.
    */
   struct TALER_Amount amount;
@@ -73,35 +93,24 @@ struct RecoupRefreshState
  * was paid back belonged to the right old coin.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param old_coin_pub public key of the dirty coin
+ * @param rrr response details
  */
 static void
 recoup_refresh_cb (void *cls,
-                   const struct TALER_EXCHANGE_HttpResponse *hr,
-                   const struct TALER_CoinSpendPublicKeyP *old_coin_pub)
+                   const struct TALER_EXCHANGE_RecoupRefreshResponse *rrr)
 {
   struct RecoupRefreshState *rrs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rrr->hr;
   struct TALER_TESTING_Interpreter *is = rrs->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   char *cref;
   unsigned int idx;
 
   rrs->ph = NULL;
   if (rrs->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    fprintf (stderr, "\n");
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     hr->http_status,
+                                     rrs->expected_response_code);
     return;
   }
 
@@ -150,7 +159,7 @@ recoup_refresh_cb (void *cls,
       GNUNET_CRYPTO_eddsa_key_get_public (&dirty_priv->eddsa_priv,
                                           &oc.eddsa_pub);
       if (0 != GNUNET_memcmp (&oc,
-                              old_coin_pub))
+                              &rrr->details.ok.old_coin_pub))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
@@ -189,6 +198,7 @@ recoup_refresh_run (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   const struct TALER_TESTING_Command *melt_cmd;
   const struct TALER_CoinSpendPrivateKeyP *coin_priv;
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv_old;
   const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
   const struct TALER_DenominationSignature *coin_sig;
   const struct TALER_RefreshMasterSecretP *rplanchet;
@@ -196,6 +206,7 @@ recoup_refresh_run (void *cls,
   const struct TALER_ExchangeWithdrawValues *ewv;
   char *cref;
   unsigned int idx;
+  struct TALER_DenominationHashP h_denom_pub;
 
   rrs->is = is;
   if (GNUNET_OK !=
@@ -235,6 +246,22 @@ recoup_refresh_run (void *cls,
     return;
   }
   if (GNUNET_OK !=
+      TALER_TESTING_get_trait_coin_priv (melt_cmd,
+                                         0,
+                                         &coin_priv_old))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (
+    &coin_priv->eddsa_priv,
+    &rrs->coin_pub_new.eddsa_pub);
+  GNUNET_CRYPTO_eddsa_key_get_public (
+    &coin_priv_old->eddsa_priv,
+    &rrs->coin_pub_old.eddsa_pub);
+
+  if (GNUNET_OK !=
       TALER_TESTING_get_trait_exchange_wd_value (melt_cmd,
                                                  idx,
                                                  &ewv))
@@ -281,15 +308,41 @@ recoup_refresh_run (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Trying to recoup_refresh denomination '%s'\n",
               TALER_B2S (&denom_pub->h_key));
-  rrs->ph = TALER_EXCHANGE_recoup_refresh (is->exchange,
-                                           denom_pub,
-                                           coin_sig,
-                                           ewv,
-                                           rplanchet,
-                                           planchet,
-                                           idx,
-                                           &recoup_refresh_cb,
-                                           rrs);
+  rrs->che_old.type
+    = TALER_EXCHANGE_CTT_OLD_COIN_RECOUP;
+  rrs->che_old.amount
+    = rrs->amount;
+  rrs->che_old.details.old_coin_recoup.new_coin_pub
+    = rrs->coin_pub_new;
+  rrs->che_new.type
+    = TALER_EXCHANGE_CTT_RECOUP_REFRESH;
+  rrs->che_new.amount
+    = rrs->amount;
+  rrs->che_new.details.recoup_refresh.old_coin_pub
+    = rrs->coin_pub_old;
+  TALER_planchet_blinding_secret_create (
+    planchet,
+    ewv,
+    &rrs->che_new.details.recoup_refresh.coin_bks);
+  TALER_denom_pub_hash (&denom_pub->key,
+                        &h_denom_pub);
+  TALER_wallet_recoup_refresh_sign (
+    &h_denom_pub,
+    &rrs->che_new.details.recoup_refresh.coin_bks,
+    coin_priv,
+    &rrs->che_new.details.recoup_refresh.coin_sig);
+  rrs->ph = TALER_EXCHANGE_recoup_refresh (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    denom_pub,
+    coin_sig,
+    ewv,
+    rplanchet,
+    planchet,
+    idx,
+    &recoup_refresh_cb,
+    rrs);
   GNUNET_assert (NULL != rrs->ph);
 }
 
@@ -315,6 +368,42 @@ recoup_refresh_cleanup (void *cls,
 }
 
 
+/**
+ * Offer internal data from a "recoup-refresh" CMD state to other
+ * commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+recoup_refresh_traits (void *cls,
+                       const void **ret,
+                       const char *trait,
+                       unsigned int index)
+{
+  struct RecoupRefreshState *rrs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_coin_history (0,
+                                           &rrs->che_old),
+    TALER_TESTING_make_trait_coin_pub (0,
+                                       &rrs->coin_pub_old),
+    TALER_TESTING_make_trait_coin_history (1,
+                                           &rrs->che_new),
+    TALER_TESTING_make_trait_coin_pub (1,
+                                       &rrs->coin_pub_new),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_recoup_refresh (const char *label,
                                   unsigned int expected_response_code,
@@ -343,7 +432,8 @@ TALER_TESTING_cmd_recoup_refresh (const char *label,
       .cls = rrs,
       .label = label,
       .run = &recoup_refresh_run,
-      .cleanup = &recoup_refresh_cleanup
+      .cleanup = &recoup_refresh_cleanup,
+      .traits = &recoup_refresh_traits
     };
 
     return cmd;
diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index 2b04156c5..111e9118f 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -75,12 +75,12 @@ struct TALER_TESTING_FreshCoinData
    * applicable.
    */
   struct TALER_AgeCommitmentProof *age_commitment_proof;
-  struct TALER_AgeCommitmentHash *h_age_commitment;
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
    * The blinding key (needed for recoup operations).
    */
-  union TALER_DenominationBlindingKeyP blinding_key;
+  union GNUNET_CRYPTO_BlindingSecretP blinding_key;
 
 };
 
@@ -103,6 +103,11 @@ struct RefreshMeltState
   struct TALER_EXCHANGE_RefreshData refresh_data;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Reference to a previous melt command.
    */
   const char *melt_reference;
@@ -113,6 +118,12 @@ struct RefreshMeltState
   struct TALER_EXCHANGE_MeltHandle *rmh;
 
   /**
+   * Expected entry in the coin history created by this
+   * operation.
+   */
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
    * Interpreter state.
    */
   struct TALER_TESTING_Interpreter *is;
@@ -140,6 +151,11 @@ struct RefreshMeltState
   const struct TALER_CoinSpendPrivateKeyP *melt_priv;
 
   /**
+   * Public key of the dirty coin being melted.
+   */
+  struct TALER_CoinSpendPublicKeyP melt_pub;
+
+  /**
    * Task scheduled to try later.
    */
   struct GNUNET_SCHEDULER_Task *retry_task;
@@ -210,6 +226,11 @@ struct RefreshRevealState
   struct TALER_EXCHANGE_RefreshesRevealHandle *rrh;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Convenience struct to keep in one place all the
    * data related to one fresh coin, set by the reveal callback
    * as it comes from the exchange.
@@ -273,6 +294,11 @@ struct RefreshLinkState
   const char *reveal_reference;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Handle to the ongoing operation.
    */
   struct TALER_EXCHANGE_LinkHandle *rlh;
@@ -334,8 +360,7 @@ do_reveal_retry (void *cls)
   struct RefreshRevealState *rrs = cls;
 
   rrs->retry_task = NULL;
-  rrs->is->commands[rrs->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (rrs->is);
   refresh_reveal_run (rrs,
                       NULL,
                       rrs->is);
@@ -348,15 +373,7 @@ do_reveal_retry (void *cls)
  * coming from the exchange, namely the fresh coins.
  *
  * @param cls closure, a `struct RefreshRevealState`
- * @param hr HTTP response details
- * @param num_coins number of fresh coins created, length of the
- *        @a sigs and @a coin_privs arrays, 0 if the operation
- *        failed.
- * @param coin_privs array of @a num_coins private keys for the
- *        coins that were created, NULL on error.
- * @param psa array of @a num_coins planchet secrets (derived from the transfer secret) for each of the coins
- * @param sigs array of signature over @a num_coins coins,
- *        NULL on error.
+ * @param rr HTTP response details
  */
 static void
 reveal_cb (void *cls,
@@ -388,24 +405,16 @@ reveal_cb (void *cls,
                                                          MAX_BACKOFF);
         rrs->total_backoff = GNUNET_TIME_relative_add (rrs->total_backoff,
                                                        rrs->backoff);
-        rrs->is->commands[rrs->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (rrs->is);
         rrs->retry_task = GNUNET_SCHEDULER_add_delayed (rrs->backoff,
                                                         &do_reveal_retry,
                                                         rrs);
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                rrs->is->commands[rrs->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rrs->is);
+    TALER_TESTING_unexpected_status (rrs->is,
+                                     hr->http_status,
+                                     rrs->expected_response_code);
     return;
   }
   melt_cmd = TALER_TESTING_interpreter_lookup_command (rrs->is,
@@ -419,7 +428,7 @@ reveal_cb (void *cls,
   switch (hr->http_status)
   {
   case MHD_HTTP_OK:
-    rrs->num_fresh_coins = rr->details.success.num_coins;
+    rrs->num_fresh_coins = rr->details.ok.num_coins;
     rrs->psa = GNUNET_new_array (rrs->num_fresh_coins,
                                  struct TALER_PlanchetMasterSecretP);
     rrs->fresh_coins = GNUNET_new_array (rrs->num_fresh_coins,
@@ -427,7 +436,7 @@ reveal_cb (void *cls,
     for (unsigned int i = 0; i<rrs->num_fresh_coins; i++)
     {
       const struct TALER_EXCHANGE_RevealedCoinInfo *coin
-        = &rr->details.success.coins[i];
+        = &rr->details.ok.coins[i];
       struct TALER_TESTING_FreshCoinData *fc = &rrs->fresh_coins[i];
 
       rrs->psa[i] = coin->ps;
@@ -442,19 +451,24 @@ reveal_cb (void *cls,
         return;
       }
       fc->coin_priv = coin->coin_priv;
-      fc->age_commitment_proof = coin->age_commitment_proof;
-      fc->h_age_commitment = coin->h_age_commitment;
 
-      TALER_denom_sig_deep_copy (&fc->sig,
-                                 &coin->sig);
+      if (NULL != coin->age_commitment_proof)
+      {
+        fc->age_commitment_proof =
+          TALER_age_commitment_proof_duplicate (coin->age_commitment_proof);
+        fc->h_age_commitment = coin->h_age_commitment;
+      }
+
+      TALER_denom_sig_copy (&fc->sig,
+                            &coin->sig);
     }
     if (0 != rrs->total_backoff.rel_value_us)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Total reveal backoff for %s was %s\n",
-                  rrs->is->commands[rrs->is->ip].label,
+                  rrs->cmd->label,
                   GNUNET_STRINGS_relative_time_to_string (rrs->total_backoff,
-                                                          GNUNET_YES));
+                                                          true));
     }
     break;
   default:
@@ -475,6 +489,19 @@ reveal_cb (void *cls,
  * @param is the interpreter state.
  */
 static void
+melt_run (void *cls,
+          const struct TALER_TESTING_Command *cmd,
+          struct TALER_TESTING_Interpreter *is);
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
 refresh_reveal_run (void *cls,
                     const struct TALER_TESTING_Command *cmd,
                     struct TALER_TESTING_Interpreter *is)
@@ -483,6 +510,7 @@ refresh_reveal_run (void *cls,
   struct RefreshMeltState *rms;
   const struct TALER_TESTING_Command *melt_cmd;
 
+  rrs->cmd = cmd;
   rrs->is = is;
   melt_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                        rrs->melt_reference);
@@ -492,21 +520,23 @@ refresh_reveal_run (void *cls,
     TALER_TESTING_interpreter_fail (rrs->is);
     return;
   }
-  // FIXME: use trait for 'rms'!
+  GNUNET_assert (melt_cmd->run == &melt_run);
   rms = melt_cmd->cls;
   {
     struct TALER_ExchangeWithdrawValues alg_values[rms->num_fresh_coins];
 
     for (unsigned int i = 0; i<rms->num_fresh_coins; i++)
       alg_values[i] = rms->mbds[i].alg_value;
-    rrs->rrh = TALER_EXCHANGE_refreshes_reveal (is->exchange,
-                                                &rms->rms,
-                                                &rms->refresh_data,
-                                                rms->num_fresh_coins,
-                                                alg_values,
-                                                rms->noreveal_index,
-                                                &reveal_cb,
-                                                rrs);
+    rrs->rrh = TALER_EXCHANGE_refreshes_reveal (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      &rms->rms,
+      &rms->refresh_data,
+      rms->num_fresh_coins,
+      alg_values,
+      rms->noreveal_index,
+      &reveal_cb,
+      rrs);
   }
   if (NULL == rrs->rrh)
   {
@@ -533,10 +563,8 @@ refresh_reveal_cleanup (void *cls,
   (void) cmd;
   if (NULL != rrs->rrh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                rrs->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (rrs->is,
+                                      cmd->label);
     TALER_EXCHANGE_refreshes_reveal_cancel (rrs->rrh);
     rrs->rrh = NULL;
   }
@@ -547,7 +575,11 @@ refresh_reveal_cleanup (void *cls,
   }
 
   for (unsigned int j = 0; j < rrs->num_fresh_coins; j++)
+  {
     TALER_denom_sig_free (&rrs->fresh_coins[j].sig);
+    TALER_age_commitment_proof_free (rrs->fresh_coins[j].age_commitment_proof);
+    GNUNET_free (rrs->fresh_coins[j].age_commitment_proof);
+  }
 
   GNUNET_free (rrs->fresh_coins);
   GNUNET_free (rrs->psa);
@@ -580,8 +612,7 @@ do_link_retry (void *cls)
   struct RefreshLinkState *rls = cls;
 
   rls->retry_task = NULL;
-  rls->is->commands[rls->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (rls->is);
   refresh_link_run (rls,
                     NULL,
                     rls->is);
@@ -594,16 +625,7 @@ do_link_retry (void *cls)
  * withdrawn by the "refresh reveal" CMD.
  *
  * @param cls closure.
- * @param hr HTTP response details
- * @param num_coins number of fresh coins created, length of the
- *        @a sigs and @a coin_privs arrays, 0 if the operation
- *        failed.
- * @param coin_privs array of @a num_coins private keys for the
- *        coins that were created, NULL on error.
- * @param sigs array of signature over @a num_coins coins, NULL on
- *        error.
- * @param pubs array of public keys for the @a sigs,
- *        NULL on error.
+ * @param lr HTTP response details
  */
 static void
 link_cb (void *cls,
@@ -612,7 +634,6 @@ link_cb (void *cls,
   struct RefreshLinkState *rls = cls;
   const struct TALER_EXCHANGE_HttpResponse *hr = &lr->hr;
   const struct TALER_TESTING_Command *reveal_cmd;
-  struct TALER_TESTING_Command *link_cmd = &rls->is->commands[rls->is->ip];
   unsigned int found;
   const unsigned int *num_fresh_coins;
 
@@ -638,24 +659,16 @@ link_cb (void *cls,
                                                          MAX_BACKOFF);
         rls->total_backoff = GNUNET_TIME_relative_add (rls->total_backoff,
                                                        rls->backoff);
-        rls->is->commands[rls->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (rls->is);
         rls->retry_task = GNUNET_SCHEDULER_add_delayed (rls->backoff,
                                                         &do_link_retry,
                                                         rls);
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                link_cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rls->is);
+    TALER_TESTING_unexpected_status (rls->is,
+                                     hr->http_status,
+                                     rls->expected_response_code);
     return;
   }
   reveal_cmd = TALER_TESTING_interpreter_lookup_command (rls->is,
@@ -679,11 +692,11 @@ link_cb (void *cls,
       TALER_TESTING_interpreter_fail (rls->is);
       return;
     }
-    if (lr->details.success.num_coins != *num_fresh_coins)
+    if (lr->details.ok.num_coins != *num_fresh_coins)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Unexpected number of fresh coins: %d vs %d in %s:%u\n",
-                  lr->details.success.num_coins,
+                  lr->details.ok.num_coins,
                   *num_fresh_coins,
                   __FILE__,
                   __LINE__);
@@ -691,11 +704,11 @@ link_cb (void *cls,
       return;
     }
     /* check that the coins match */
-    for (unsigned int i = 0; i<lr->details.success.num_coins; i++)
-      for (unsigned int j = i + 1; j<lr->details.success.num_coins; j++)
+    for (unsigned int i = 0; i<lr->details.ok.num_coins; i++)
+      for (unsigned int j = i + 1; j<lr->details.ok.num_coins; j++)
         if (0 ==
-            GNUNET_memcmp (&lr->details.success.coins[i].coin_priv,
-                           &lr->details.success.coins[j].coin_priv))
+            GNUNET_memcmp (&lr->details.ok.coins[i].coin_priv,
+                           &lr->details.ok.coins[j].coin_priv))
           GNUNET_break (0);
     /* Note: coins might be legitimately permutated in here... */
     found = 0;
@@ -713,12 +726,12 @@ link_cb (void *cls,
         return;
       }
 
-      for (unsigned int i = 0; i<lr->details.success.num_coins; i++)
+      for (unsigned int i = 0; i<lr->details.ok.num_coins; i++)
       {
         const struct TALER_EXCHANGE_LinkedCoinInfo *lci_i
-          = &lr->details.success.coins[i];
+          = &lr->details.ok.coins[i];
 
-        for (unsigned int j = 0; j<lr->details.success.num_coins; j++)
+        for (unsigned int j = 0; j<lr->details.ok.num_coins; j++)
         {
           const struct TALER_TESTING_FreshCoinData *fcj
             = &(*fc)[j];
@@ -739,12 +752,12 @@ link_cb (void *cls,
         } /* for j*/
       } /* for i */
     }
-    if (found != lr->details.success.num_coins)
+    if (found != lr->details.ok.num_coins)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Only %u/%u coins match expectations\n",
                   found,
-                  lr->details.success.num_coins);
+                  lr->details.ok.num_coins);
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rls->is);
       return;
@@ -753,9 +766,9 @@ link_cb (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Total link backoff for %s was %s\n",
-                  rls->is->commands[rls->is->ip].label,
+                  rls->cmd->label,
                   GNUNET_STRINGS_relative_time_to_string (rls->total_backoff,
-                                                          GNUNET_YES));
+                                                          true));
     }
     break;
   default:
@@ -786,9 +799,16 @@ refresh_link_run (void *cls,
   const struct TALER_TESTING_Command *reveal_cmd;
   const struct TALER_TESTING_Command *melt_cmd;
   const struct TALER_TESTING_Command *coin_cmd;
+  const char *exchange_url;
 
-  (void) cmd;
+  rls->cmd = cmd;
   rls->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
   reveal_cmd = TALER_TESTING_interpreter_lookup_command (rls->is,
                                                          rls->reveal_reference);
   if (NULL == reveal_cmd)
@@ -808,17 +828,15 @@ refresh_link_run (void *cls,
   }
 
   /* find reserve_withdraw command */
+  GNUNET_assert (melt_cmd->run == &melt_run);
+  rms = melt_cmd->cls;
+  coin_cmd = TALER_TESTING_interpreter_lookup_command (rls->is,
+                                                       rms->coin_reference);
+  if (NULL == coin_cmd)
   {
-    // FIXME: use trait!
-    rms = melt_cmd->cls;
-    coin_cmd = TALER_TESTING_interpreter_lookup_command (rls->is,
-                                                         rms->coin_reference);
-    if (NULL == coin_cmd)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (rls->is);
-      return;
-    }
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (rls->is);
+    return;
   }
 
   const struct TALER_CoinSpendPrivateKeyP *coin_priv;
@@ -833,11 +851,13 @@ refresh_link_run (void *cls,
   }
 
   /* finally, use private key from withdraw sign command */
-  rls->rlh = TALER_EXCHANGE_link (is->exchange,
-                                  coin_priv,
-                                  rms->refresh_data.melt_age_commitment_proof,
-                                  &link_cb,
-                                  rls);
+  rls->rlh = TALER_EXCHANGE_link (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    coin_priv,
+    rms->refresh_data.melt_age_commitment_proof,
+    &link_cb,
+    rls);
 
   if (NULL == rls->rlh)
   {
@@ -863,11 +883,8 @@ refresh_link_cleanup (void *cls,
 
   if (NULL != rls->rlh)
   {
-
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                rls->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (rls->is,
+                                      cmd->label);
     TALER_EXCHANGE_link_cancel (rls->rlh);
     rls->rlh = NULL;
   }
@@ -881,19 +898,6 @@ refresh_link_cleanup (void *cls,
 
 
 /**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-melt_run (void *cls,
-          const struct TALER_TESTING_Command *cmd,
-          struct TALER_TESTING_Interpreter *is);
-
-
-/**
  * Task scheduled to re-try #melt_run.
  *
  * @param cls a `struct RefreshMeltState`
@@ -904,8 +908,7 @@ do_melt_retry (void *cls)
   struct RefreshMeltState *rms = cls;
 
   rms->retry_task = NULL;
-  rms->is->commands[rms->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (rms->is);
   melt_run (rms,
             NULL,
             rms->is);
@@ -949,58 +952,56 @@ melt_cb (void *cls,
                                                          MAX_BACKOFF);
         rms->total_backoff = GNUNET_TIME_relative_add (rms->total_backoff,
                                                        rms->backoff);
-        rms->is->commands[rms->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (rms->is);
         rms->retry_task = GNUNET_SCHEDULER_add_delayed (rms->backoff,
                                                         &do_melt_retry,
                                                         rms);
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                rms->is->commands[rms->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rms->is);
+    TALER_TESTING_unexpected_status_with_body (rms->is,
+                                               hr->http_status,
+                                               rms->expected_response_code,
+                                               hr->reply);
     return;
   }
   if (MHD_HTTP_OK == hr->http_status)
   {
-    rms->noreveal_index = mr->details.success.noreveal_index;
-    if (mr->details.success.num_mbds != rms->num_fresh_coins)
+    rms->noreveal_index = mr->details.ok.noreveal_index;
+    if (mr->details.ok.num_mbds != rms->num_fresh_coins)
     {
       GNUNET_break (0);
       TALER_TESTING_interpreter_fail (rms->is);
       return;
     }
     GNUNET_free (rms->mbds);
-    rms->mbds = GNUNET_memdup (mr->details.success.mbds,
-                               mr->details.success.num_mbds
-                               * sizeof (struct
-                                         TALER_EXCHANGE_MeltBlindingDetail));
+    rms->mbds = GNUNET_new_array (
+      mr->details.ok.num_mbds,
+      struct TALER_EXCHANGE_MeltBlindingDetail);
+    for (unsigned int i = 0; i<mr->details.ok.num_mbds; i++)
+      TALER_denom_ewv_copy (&rms->mbds[i].alg_value,
+                            &mr->details.ok.mbds[i].alg_value);
   }
   if (0 != rms->total_backoff.rel_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Total melt backoff for %s was %s\n",
-                rms->is->commands[rms->is->ip].label,
+                rms->cmd->label,
                 GNUNET_STRINGS_relative_time_to_string (rms->total_backoff,
-                                                        GNUNET_YES));
+                                                        true));
   }
   if (rms->double_melt)
   {
     TALER_LOG_DEBUG ("Doubling the melt (%s)\n",
-                     rms->is->commands[rms->is->ip].label);
-    rms->rmh = TALER_EXCHANGE_melt (rms->is->exchange,
-                                    &rms->rms,
-                                    &rms->refresh_data,
-                                    &melt_cb,
-                                    rms);
+                     rms->cmd->label);
+    rms->rmh = TALER_EXCHANGE_melt (
+      TALER_TESTING_interpreter_get_context (rms->is),
+      TALER_TESTING_get_exchange_url (rms->is),
+      TALER_TESTING_get_keys (rms->is),
+      &rms->rms,
+      &rms->refresh_data,
+      &melt_cb,
+      rms);
     rms->double_melt = false;
     return;
   }
@@ -1028,7 +1029,7 @@ melt_run (void *cls,
   };
   const char **melt_fresh_amounts;
 
-  (void) cmd;
+  rms->cmd = cmd;
   if (NULL == (melt_fresh_amounts = rms->melt_fresh_amounts))
     melt_fresh_amounts = default_melt_fresh_amounts;
   rms->is = is;
@@ -1045,12 +1046,12 @@ melt_run (void *cls,
   {
     struct TALER_Amount melt_amount;
     struct TALER_Amount fresh_amount;
-    const struct TALER_AgeCommitmentProof *age_commitment_proof;
-    const struct TALER_AgeCommitmentHash *h_age_commitment;
+    const struct TALER_AgeCommitmentProof *age_commitment_proof = NULL;
+    const struct TALER_AgeCommitmentHash *h_age_commitment = NULL;
     const struct TALER_DenominationSignature *melt_sig;
     const struct TALER_EXCHANGE_DenomPublicKey *melt_denom_pub;
     const struct TALER_TESTING_Command *coin_command;
-    bool age_restricted;
+    bool age_restricted_denom;
 
     if (NULL == (coin_command
                    = TALER_TESTING_interpreter_lookup_command (
@@ -1071,7 +1072,6 @@ melt_run (void *cls,
       TALER_TESTING_interpreter_fail (rms->is);
       return;
     }
-
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_age_commitment_proof (coin_command,
                                                       0,
@@ -1091,7 +1091,6 @@ melt_run (void *cls,
       TALER_TESTING_interpreter_fail (rms->is);
       return;
     }
-
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_denom_sig (coin_command,
                                            0,
@@ -1101,7 +1100,6 @@ melt_run (void *cls,
       TALER_TESTING_interpreter_fail (rms->is);
       return;
     }
-
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_denom_pub (coin_command,
                                            0,
@@ -1115,7 +1113,10 @@ melt_run (void *cls,
     /* Melt amount starts with the melt fee of the old coin; we'll add the
        values and withdraw fees of the fresh coins next */
     melt_amount = melt_denom_pub->fees.refresh;
-    age_restricted = melt_denom_pub->key.age_mask.bits != 0;
+    age_restricted_denom = melt_denom_pub->key.age_mask.bits != 0;
+    GNUNET_assert (age_restricted_denom == (NULL != age_commitment_proof));
+    GNUNET_assert ((NULL == age_commitment_proof) ||
+                   (0 < age_commitment_proof->commitment.num));
     for (unsigned int i = 0; i<num_fresh_coins; i++)
     {
       const struct TALER_EXCHANGE_DenomPublicKey *fresh_pk;
@@ -1132,9 +1133,9 @@ melt_run (void *cls,
         TALER_TESTING_interpreter_fail (rms->is);
         return;
       }
-      fresh_pk = TALER_TESTING_find_pk (TALER_EXCHANGE_get_keys (is->exchange),
+      fresh_pk = TALER_TESTING_find_pk (TALER_TESTING_get_keys (rms->is),
                                         &fresh_amount,
-                                        age_restricted);
+                                        age_restricted_denom);
       if (NULL == fresh_pk)
       {
         GNUNET_break (0);
@@ -1152,27 +1153,46 @@ melt_run (void *cls,
                                        &fresh_pk->fees.withdraw));
       rms->fresh_pks[i] = *fresh_pk;
       /* Make a deep copy of the RSA key */
-      TALER_denom_pub_deep_copy (&rms->fresh_pks[i].key,
-                                 &fresh_pk->key);
+      TALER_denom_pub_copy (&rms->fresh_pks[i].key,
+                            &fresh_pk->key);
     } /* end for */
 
     rms->refresh_data.melt_priv = *rms->melt_priv;
+    GNUNET_CRYPTO_eddsa_key_get_public (&rms->melt_priv->eddsa_priv,
+                                        &rms->melt_pub.eddsa_pub);
     rms->refresh_data.melt_amount = melt_amount;
     rms->refresh_data.melt_sig = *melt_sig;
     rms->refresh_data.melt_pk = *melt_denom_pub;
-    rms->refresh_data.melt_age_commitment_proof = age_commitment_proof;
-    rms->refresh_data.melt_h_age_commitment = h_age_commitment;
+
+    if (NULL != age_commitment_proof)
+    {
+      GNUNET_assert (NULL != h_age_commitment);
+      rms->refresh_data.melt_age_commitment_proof = age_commitment_proof;
+      rms->refresh_data.melt_h_age_commitment = h_age_commitment;
+    }
     rms->refresh_data.fresh_pks = rms->fresh_pks;
     rms->refresh_data.fresh_pks_len = num_fresh_coins;
 
-    GNUNET_assert (age_restricted ==
+    GNUNET_assert (age_restricted_denom ==
                    (NULL != age_commitment_proof));
-
-    rms->rmh = TALER_EXCHANGE_melt (is->exchange,
-                                    &rms->rms,
-                                    &rms->refresh_data,
-                                    &melt_cb,
-                                    rms);
+    GNUNET_assert ((NULL == age_commitment_proof) ||
+                   (0 < age_commitment_proof->commitment.num));
+
+    rms->che.type = TALER_EXCHANGE_CTT_MELT;
+    rms->che.amount = melt_amount;
+    if (NULL != age_commitment_proof)
+      rms->che.details.melt.h_age_commitment = *h_age_commitment;
+    else
+      rms->che.details.melt.no_hac = true;
+
+    rms->rmh = TALER_EXCHANGE_melt (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      TALER_TESTING_get_keys (is),
+      &rms->rms,
+      &rms->refresh_data,
+      &melt_cb,
+      rms);
 
     if (NULL == rms->rmh)
     {
@@ -1200,10 +1220,8 @@ melt_cleanup (void *cls,
   (void) cmd;
   if (NULL != rms->rmh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                rms->is->ip,
-                rms->is->commands[rms->is->ip].label);
+    TALER_TESTING_command_incomplete (rms->is,
+                                      cmd->label);
     TALER_EXCHANGE_melt_cancel (rms->rmh);
     rms->rmh = NULL;
   }
@@ -1218,7 +1236,12 @@ melt_cleanup (void *cls,
       TALER_denom_pub_free (&rms->fresh_pks[i].key);
     GNUNET_free (rms->fresh_pks);
   }
-  GNUNET_free (rms->mbds);
+  if (NULL != rms->mbds)
+  {
+    for (unsigned int i = 0; i < rms->num_fresh_coins; i++)
+      TALER_denom_ewv_free (&rms->mbds[i].alg_value);
+    GNUNET_free (rms->mbds);
+  }
   GNUNET_free (rms->melt_fresh_amounts);
   GNUNET_free (rms);
 }
@@ -1250,17 +1273,23 @@ melt_traits (void *cls,
     struct TALER_TESTING_Trait traits[] = {
       TALER_TESTING_make_trait_denom_pub (index,
                                           &rms->fresh_pks[index]),
-      TALER_TESTING_make_trait_coin_priv (index,
+      TALER_TESTING_make_trait_coin_priv (0,
                                           rms->melt_priv),
+      TALER_TESTING_make_trait_coin_pub (0,
+                                         &rms->melt_pub),
+      TALER_TESTING_make_trait_coin_history (0,
+                                             &rms->che),
       TALER_TESTING_make_trait_age_commitment_proof (
         index,
         rms->refresh_data.melt_age_commitment_proof),
       TALER_TESTING_make_trait_h_age_commitment (
         index,
         rms->refresh_data.melt_h_age_commitment),
-      TALER_TESTING_make_trait_exchange_wd_value (index,
-                                                  &rms->mbds[index].alg_value),
       TALER_TESTING_make_trait_refresh_secret (&rms->rms),
+      (NULL != rms->mbds)
+      ? TALER_TESTING_make_trait_exchange_wd_value (index,
+                                                    &rms->mbds[index].alg_value)
+      : TALER_TESTING_trait_end (),
       TALER_TESTING_trait_end ()
     };
 
@@ -1427,7 +1456,7 @@ refresh_reveal_traits (void *cls,
         rrs->fresh_coins[index].age_commitment_proof),
       TALER_TESTING_make_trait_h_age_commitment (
         index,
-        rrs->fresh_coins[index].h_age_commitment),
+        &rrs->fresh_coins[index].h_age_commitment),
       TALER_TESTING_make_trait_denom_pub (
         index,
         rrs->fresh_coins[index].pk),
@@ -1445,6 +1474,7 @@ refresh_reveal_traits (void *cls,
                                                  &rrs->psa[index]),
       TALER_TESTING_trait_end ()
     };
+
     return TALER_TESTING_get_trait (traits,
                                     ret,
                                     trait,
diff --git a/src/testing/testing_api_cmd_refund.c b/src/testing/testing_api_cmd_refund.c
index 4be3605a4..29b68ef08 100644
--- a/src/testing/testing_api_cmd_refund.c
+++ b/src/testing/testing_api_cmd_refund.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -54,9 +54,14 @@ struct RefundState
   uint64_t refund_transaction_id;
 
   /**
-   * Connection to the exchange.
+   * Entry in the coin's history generated by this operation.
    */
-  struct TALER_EXCHANGE_Handle *exchange;
+  struct TALER_EXCHANGE_CoinHistoryEntry che;
+
+  /**
+   * Public key of the refunded coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin;
 
   /**
    * Handle to the refund operation.
@@ -75,38 +80,51 @@ struct RefundState
  * response code is acceptable.
  *
  * @param cls closure
- * @param hr HTTP response details
- * @param exchange_pub public key the exchange
- *        used for signing @a obj.
- * @param exchange_sig actual signature confirming the refund
+ * @param rr response details
  */
 static void
 refund_cb (void *cls,
-           const struct TALER_EXCHANGE_HttpResponse *hr,
-           const struct TALER_ExchangePublicKeyP *exchange_pub,
-           const struct TALER_ExchangeSignatureP *exchange_sig)
+           const struct TALER_EXCHANGE_RefundResponse *rr)
 {
-
   struct RefundState *rs = cls;
-  struct TALER_TESTING_Command *refund_cmd;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rr->hr;
 
-  refund_cmd = &rs->is->commands[rs->is->ip];
   rs->rh = NULL;
   if (rs->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                hr->ec,
-                refund_cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rs->is);
+    TALER_TESTING_unexpected_status (rs->is,
+                                     hr->http_status,
+                                     rs->expected_response_code);
     return;
   }
+  if (MHD_HTTP_OK == hr->http_status)
+  {
+    struct TALER_Amount refund_amount;
+
+    if (GNUNET_OK !=
+        TALER_string_to_amount (rs->refund_amount,
+                                &refund_amount))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to parse amount `%s'\n",
+                  rs->refund_amount);
+      TALER_TESTING_interpreter_fail (rs->is);
+      return;
+    }
+    if (0 >
+        TALER_amount_subtract (&rs->che.amount,
+                               &refund_amount,
+                               &rs->che.details.refund.refund_fee))
+    {
+      GNUNET_break (0);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to subtract %s from %s\n",
+                  TALER_amount2s (&rs->che.details.refund.refund_fee),
+                  rs->refund_amount);
+      TALER_TESTING_interpreter_fail (rs->is);
+      return;
+    }
+  }
   TALER_TESTING_interpreter_next (rs->is);
 }
 
@@ -125,24 +143,21 @@ refund_run (void *cls,
 {
   struct RefundState *rs = cls;
   const struct TALER_CoinSpendPrivateKeyP *coin_priv;
-  struct TALER_CoinSpendPublicKeyP coin;
   const json_t *contract_terms;
   struct TALER_PrivateContractHashP h_contract_terms;
   struct TALER_Amount refund_amount;
   const struct TALER_MerchantPrivateKeyP *merchant_priv;
   const struct TALER_TESTING_Command *coin_cmd;
+  const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
 
-  rs->exchange = is->exchange;
   rs->is = is;
-
   if (GNUNET_OK !=
       TALER_string_to_amount (rs->refund_amount,
                               &refund_amount))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to parse amount `%s' at %u/%s\n",
+                "Failed to parse amount `%s' at %s\n",
                 rs->refund_amount,
-                is->ip,
                 cmd->label);
     TALER_TESTING_interpreter_fail (is);
     return;
@@ -168,10 +183,15 @@ refund_run (void *cls,
                                            &h_contract_terms));
 
   /* Hunting for a coin .. */
-  if (GNUNET_OK !=
-      TALER_TESTING_get_trait_coin_priv (coin_cmd,
-                                         0,
-                                         &coin_priv))
+  if ( (GNUNET_OK !=
+        TALER_TESTING_get_trait_coin_priv (coin_cmd,
+                                           0,
+                                           &coin_priv)) ||
+       (GNUNET_OK !=
+        TALER_TESTING_get_trait_denom_pub (coin_cmd,
+                                           0,
+                                           &denom_pub)) )
+
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
@@ -179,7 +199,7 @@ refund_run (void *cls,
   }
 
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
-                                      &coin.eddsa_pub);
+                                      &rs->coin.eddsa_pub);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_merchant_priv (coin_cmd,
                                              &merchant_priv))
@@ -188,19 +208,67 @@ refund_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-  rs->rh = TALER_EXCHANGE_refund (rs->exchange,
-                                  &refund_amount,
-                                  &h_contract_terms,
-                                  &coin,
-                                  rs->refund_transaction_id,
-                                  merchant_priv,
-                                  &refund_cb,
-                                  rs);
+  rs->che.type = TALER_EXCHANGE_CTT_REFUND;
+  rs->che.details.refund.h_contract_terms = h_contract_terms;
+  GNUNET_CRYPTO_eddsa_key_get_public (
+    &merchant_priv->eddsa_priv,
+    &rs->che.details.refund.merchant_pub.eddsa_pub);
+  rs->che.details.refund.refund_fee = denom_pub->fees.refund;
+  rs->che.details.refund.sig_amount = refund_amount;
+  rs->che.details.refund.rtransaction_id = rs->refund_transaction_id;
+  TALER_merchant_refund_sign (&rs->coin,
+                              &h_contract_terms,
+                              rs->refund_transaction_id,
+                              &refund_amount,
+                              merchant_priv,
+                              &rs->che.details.refund.sig);
+  rs->rh = TALER_EXCHANGE_refund (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    &refund_amount,
+    &h_contract_terms,
+    &rs->coin,
+    rs->refund_transaction_id,
+    merchant_priv,
+    &refund_cb,
+    rs);
   GNUNET_assert (NULL != rs->rh);
 }
 
 
 /**
+ * Offer internal data from a "refund" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+refund_traits (void *cls,
+               const void **ret,
+               const char *trait,
+               unsigned int index)
+{
+  struct RefundState *rs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_coin_history (0,
+                                           &rs->che),
+    TALER_TESTING_make_trait_coin_pub (0,
+                                       &rs->coin),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+/**
  * Free the state from a "refund" CMD, and possibly cancel
  * a pending operation thereof.
  *
@@ -215,10 +283,8 @@ refund_cleanup (void *cls,
 
   if (NULL != rs->rh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                rs->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (rs->is,
+                                      cmd->label);
     TALER_EXCHANGE_refund_cancel (rs->rh);
     rs->rh = NULL;
   }
@@ -243,7 +309,8 @@ TALER_TESTING_cmd_refund (const char *label,
       .cls = rs,
       .label = label,
       .run = &refund_run,
-      .cleanup = &refund_cleanup
+      .cleanup = &refund_cleanup,
+      .traits = &refund_traits
     };
 
     return cmd;
@@ -271,7 +338,8 @@ TALER_TESTING_cmd_refund_with_id (
       .cls = rs,
       .label = label,
       .run = &refund_run,
-      .cleanup = &refund_cleanup
+      .cleanup = &refund_cleanup,
+      .traits = &refund_traits
     };
 
     return cmd;
diff --git a/src/testing/testing_api_cmd_reserve_attest.c b/src/testing/testing_api_cmd_reserve_attest.c
new file mode 100644
index 000000000..cf4b3a0c2
--- /dev/null
+++ b/src/testing/testing_api_cmd_reserve_attest.c
@@ -0,0 +1,263 @@
+/*
+  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/>
+*/
+/**
+ * @file testing/testing_api_cmd_reserve_attest.c
+ * @brief Implement the /reserve/$RID/attest test command.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+/**
+ * State for a "attest" CMD.
+ */
+struct AttestState
+{
+  /**
+   * Label to the command which created the reserve to check,
+   * needed to resort the reserve key.
+   */
+  const char *reserve_reference;
+
+  /**
+   * Handle to the "reserve attest" operation.
+   */
+  struct TALER_EXCHANGE_ReservesAttestHandle *rsh;
+
+  /**
+   * Private key of the reserve being analyzed.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Array of attributes to request, of length @e attrs_len.
+   */
+  const char **attrs;
+
+  /**
+   * Length of the @e attrs array.
+   */
+  unsigned int attrs_len;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /* TODO: expose fields below as traits... */
+
+  /**
+   * Attested attributes returned by the exchange.
+   */
+  json_t *attributes;
+
+  /**
+   * Expiration time of the attested attributes.
+   */
+  struct GNUNET_TIME_Timestamp expiration_time;
+
+  /**
+   * Signature by the exchange affirming the attributes.
+   */
+  struct TALER_ExchangeSignatureP exchange_sig;
+
+  /**
+   * Online signing key used by the exchange.
+   */
+  struct TALER_ExchangePublicKeyP exchange_pub;
+};
+
+
+/**
+ * Check that the reserve balance and HTTP response code are
+ * both acceptable.
+ *
+ * @param cls closure.
+ * @param rs HTTP response details
+ */
+static void
+reserve_attest_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ReservePostAttestResult *rs)
+{
+  struct AttestState *ss = cls;
+  struct TALER_TESTING_Interpreter *is = ss->is;
+
+  ss->rsh = NULL;
+  if (ss->expected_response_code != rs->hr.http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected HTTP response code: %d in %s:%u\n",
+                rs->hr.http_status,
+                __FILE__,
+                __LINE__);
+    json_dumpf (rs->hr.reply,
+                stderr,
+                JSON_INDENT (2));
+    TALER_TESTING_interpreter_fail (ss->is);
+    return;
+  }
+  if (MHD_HTTP_OK != rs->hr.http_status)
+  {
+    TALER_TESTING_interpreter_next (is);
+    return;
+  }
+  ss->attributes = json_incref ((json_t*) rs->details.ok.attributes);
+  ss->expiration_time = rs->details.ok.expiration_time;
+  ss->exchange_pub = rs->details.ok.exchange_pub;
+  ss->exchange_sig = rs->details.ok.exchange_sig;
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command being executed.
+ * @param is the interpreter state.
+ */
+static void
+attest_run (void *cls,
+            const struct TALER_TESTING_Command *cmd,
+            struct TALER_TESTING_Interpreter *is)
+{
+  struct AttestState *ss = cls;
+  const struct TALER_TESTING_Command *create_reserve;
+  const char *exchange_url;
+
+  ss->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ss->reserve_reference);
+
+  if (NULL == create_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+                                            &ss->reserve_priv))
+  {
+    GNUNET_break (0);
+    TALER_LOG_ERROR ("Failed to find reserve_priv for attest query\n");
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
+                                      &ss->reserve_pub.eddsa_pub);
+  ss->rsh = TALER_EXCHANGE_reserves_attest (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    TALER_TESTING_get_keys (is),
+    ss->reserve_priv,
+    ss->attrs_len,
+    ss->attrs,
+    &reserve_attest_cb,
+    ss);
+}
+
+
+/**
+ * Cleanup the state from a "reserve attest" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+attest_cleanup (void *cls,
+                const struct TALER_TESTING_Command *cmd)
+{
+  struct AttestState *ss = cls;
+
+  if (NULL != ss->rsh)
+  {
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
+    TALER_EXCHANGE_reserves_attest_cancel (ss->rsh);
+    ss->rsh = NULL;
+  }
+  json_decref (ss->attributes);
+  GNUNET_free (ss->attrs);
+  GNUNET_free (ss);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_attest (const char *label,
+                                  const char *reserve_reference,
+                                  unsigned int expected_response_code,
+                                  ...)
+{
+  struct AttestState *ss;
+  unsigned int num_args;
+  const char *ea;
+  va_list ap;
+
+  num_args = 0;
+  va_start (ap, expected_response_code);
+  while (NULL != va_arg (ap, const char *))
+    num_args++;
+  va_end (ap);
+
+  GNUNET_assert (NULL != reserve_reference);
+  ss = GNUNET_new (struct AttestState);
+  ss->reserve_reference = reserve_reference;
+  ss->expected_response_code = expected_response_code;
+  ss->attrs_len = num_args;
+  ss->attrs = GNUNET_new_array (num_args,
+                                const char *);
+  num_args = 0;
+  va_start (ap, expected_response_code);
+  while (NULL != (ea = va_arg (ap, const char *)))
+    ss->attrs[num_args++] = ea;
+  va_end (ap);
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &attest_run,
+      .cleanup = &attest_cleanup
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_reserve_close.c b/src/testing/testing_api_cmd_reserve_close.c
new file mode 100644
index 000000000..8e272f547
--- /dev/null
+++ b/src/testing/testing_api_cmd_reserve_close.c
@@ -0,0 +1,260 @@
+/*
+  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/>
+*/
+/**
+ * @file testing/testing_api_cmd_reserve_close.c
+ * @brief Implement the /reserve/$RID/close test command.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "close" CMD.
+ */
+struct CloseState
+{
+  /**
+   * Label to the command which created the reserve to check,
+   * needed to resort the reserve key.
+   */
+  const char *reserve_reference;
+
+  /**
+   * Handle to the "reserve close" operation.
+   */
+  struct TALER_EXCHANGE_ReservesCloseHandle *rsh;
+
+  /**
+   * payto://-URI where to wire the funds.
+   */
+  const char *target_account;
+
+  /**
+   * Private key of the reserve being analyzed.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC.
+   */
+  uint64_t requirement_row;
+};
+
+
+/**
+ * Check that the reserve balance and HTTP response code are
+ * both acceptable.
+ *
+ * @param cls closure.
+ * @param rs HTTP response details
+ */
+static void
+reserve_close_cb (void *cls,
+                  const struct TALER_EXCHANGE_ReserveCloseResult *rs)
+{
+  struct CloseState *ss = cls;
+  struct TALER_TESTING_Interpreter *is = ss->is;
+
+  ss->rsh = NULL;
+  if (ss->expected_response_code != rs->hr.http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected HTTP response code: %d in %s:%u\n",
+                rs->hr.http_status,
+                __FILE__,
+                __LINE__);
+    json_dumpf (rs->hr.reply,
+                stderr,
+                JSON_INDENT (2));
+    TALER_TESTING_interpreter_fail (ss->is);
+    return;
+  }
+  switch (rs->hr.http_status)
+  {
+  case MHD_HTTP_OK:
+    break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* nothing to check */
+    ss->requirement_row
+      = rs->details.unavailable_for_legal_reasons.requirement_row;
+    ss->h_payto
+      = rs->details.unavailable_for_legal_reasons.h_payto;
+    break;
+  default:
+    break;
+  }
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command being executed.
+ * @param is the interpreter state.
+ */
+static void
+close_run (void *cls,
+           const struct TALER_TESTING_Command *cmd,
+           struct TALER_TESTING_Interpreter *is)
+{
+  struct CloseState *ss = cls;
+  const struct TALER_TESTING_Command *create_reserve;
+
+  ss->is = is;
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ss->reserve_reference);
+
+  if (NULL == create_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+                                            &ss->reserve_priv))
+  {
+    GNUNET_break (0);
+    TALER_LOG_ERROR ("Failed to find reserve_priv for close query\n");
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
+                                      &ss->reserve_pub.eddsa_pub);
+  ss->rsh = TALER_EXCHANGE_reserves_close (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    ss->reserve_priv,
+    ss->target_account,
+    &reserve_close_cb,
+    ss);
+}
+
+
+/**
+ * Cleanup the state from a "reserve close" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+close_cleanup (void *cls,
+               const struct TALER_TESTING_Command *cmd)
+{
+  struct CloseState *ss = cls;
+
+  if (NULL != ss->rsh)
+  {
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
+    TALER_EXCHANGE_reserves_close_cancel (ss->rsh);
+    ss->rsh = NULL;
+  }
+  GNUNET_free (ss);
+}
+
+
+/**
+ * Offer internal data to a "close" CMD state to other
+ * commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+close_traits (void *cls,
+              const void **ret,
+              const char *trait,
+              unsigned int index)
+{
+  struct CloseState *cs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_legi_requirement_row (
+      &cs->requirement_row),
+    TALER_TESTING_make_trait_h_payto (
+      &cs->h_payto),
+    TALER_TESTING_trait_end ()
+  };
+
+  if (cs->expected_response_code != MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS)
+    return GNUNET_NO;
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_close (const char *label,
+                                 const char *reserve_reference,
+                                 const char *target_account,
+                                 unsigned int expected_response_code)
+{
+  struct CloseState *ss;
+
+  GNUNET_assert (NULL != reserve_reference);
+  ss = GNUNET_new (struct CloseState);
+  ss->reserve_reference = reserve_reference;
+  ss->target_account = target_account;
+  ss->expected_response_code = expected_response_code;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &close_run,
+      .cleanup = &close_cleanup,
+      .traits = &close_traits
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_reserve_get.c b/src/testing/testing_api_cmd_reserve_get.c
index f9b8ff6cd..9a938cf82 100644
--- a/src/testing/testing_api_cmd_reserve_get.c
+++ b/src/testing/testing_api_cmd_reserve_get.c
@@ -178,18 +178,19 @@ status_run (void *cls,
 {
   struct StatusState *ss = cls;
   const struct TALER_TESTING_Command *create_reserve;
+  const char *exchange_url;
 
   ss->is = is;
-  create_reserve
-    = TALER_TESTING_interpreter_lookup_command (is,
-                                                ss->reserve_reference);
-
-  if (NULL == create_reserve)
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
   {
     GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
     return;
   }
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ss->reserve_reference);
+  GNUNET_assert (NULL != create_reserve);
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_reserve_pub (create_reserve,
                                            &ss->reserve_pubp))
@@ -199,11 +200,13 @@ status_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-  ss->rsh = TALER_EXCHANGE_reserves_get (is->exchange,
-                                         ss->reserve_pubp,
-                                         ss->timeout,
-                                         &reserve_status_cb,
-                                         ss);
+  ss->rsh = TALER_EXCHANGE_reserves_get (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    ss->reserve_pubp,
+    ss->timeout,
+    &reserve_status_cb,
+    ss);
   if (! GNUNET_TIME_relative_is_zero (ss->timeout))
   {
     TALER_TESTING_interpreter_next (is);
@@ -227,10 +230,8 @@ status_cleanup (void *cls,
 
   if (NULL != ss->rsh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ss->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
     TALER_EXCHANGE_reserves_get_cancel (ss->rsh);
     ss->rsh = NULL;
   }
@@ -328,6 +329,7 @@ finish_run (void *cls,
   poll_reserve
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ps->poll_reference);
+  GNUNET_assert (NULL != poll_reserve);
   GNUNET_assert (poll_reserve->run == &status_run);
   ss = poll_reserve->cls;
   if (NULL == ss->rsh)
diff --git a/src/testing/testing_api_cmd_reserve_get_attestable.c b/src/testing/testing_api_cmd_reserve_get_attestable.c
new file mode 100644
index 000000000..ed1eb1355
--- /dev/null
+++ b/src/testing/testing_api_cmd_reserve_get_attestable.c
@@ -0,0 +1,242 @@
+/*
+  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/>
+*/
+/**
+ * @file testing/testing_api_cmd_reserve_get_attestable.c
+ * @brief Implement the /reserve/$RID/get_attestable test command.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "get_attestable" CMD.
+ */
+struct GetAttestableState
+{
+  /**
+   * Label to the command which created the reserve to check,
+   * needed to resort the reserve key.
+   */
+  const char *reserve_reference;
+
+  /**
+   * Handle to the "reserve get_attestable" operation.
+   */
+  struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah;
+
+  /**
+   * Expected attestable attributes.
+   */
+  const char **expected_attestables;
+
+  /**
+   * Length of the @e expected_attestables array.
+   */
+  unsigned int expected_attestables_length;
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+};
+
+
+/**
+ * Check that the reserve balance and HTTP response code are
+ * both acceptable.
+ *
+ * @param cls closure.
+ * @param rs HTTP response details
+ */
+static void
+reserve_get_attestable_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_ReserveGetAttestResult *rs)
+{
+  struct GetAttestableState *ss = cls;
+  struct TALER_TESTING_Interpreter *is = ss->is;
+
+  ss->rgah = NULL;
+  if (ss->expected_response_code != rs->hr.http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected HTTP response code: %d in %s:%u\n",
+                rs->hr.http_status,
+                __FILE__,
+                __LINE__);
+    json_dumpf (rs->hr.reply,
+                stderr,
+                JSON_INDENT (2));
+    TALER_TESTING_interpreter_fail (ss->is);
+    return;
+  }
+  if (MHD_HTTP_OK != rs->hr.http_status)
+  {
+    TALER_TESTING_interpreter_next (is);
+    return;
+  }
+  // FIXME: check returned list matches expectations!
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command being executed.
+ * @param is the interpreter state.
+ */
+static void
+get_attestable_run (void *cls,
+                    const struct TALER_TESTING_Command *cmd,
+                    struct TALER_TESTING_Interpreter *is)
+{
+  struct GetAttestableState *ss = cls;
+  const struct TALER_TESTING_Command *ref_reserve;
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+  const char *exchange_url;
+
+  ss->is = is;
+  exchange_url = TALER_TESTING_get_exchange_url (is);
+  if (NULL == exchange_url)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  ref_reserve
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ss->reserve_reference);
+
+  if (NULL == ref_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK ==
+      TALER_TESTING_get_trait_reserve_priv (ref_reserve,
+                                            &reserve_priv))
+  {
+    GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+                                        &ss->reserve_pub.eddsa_pub);
+  }
+  else
+  {
+    if (GNUNET_OK !=
+        TALER_TESTING_get_trait_reserve_pub (ref_reserve,
+                                             &reserve_pub))
+    {
+      GNUNET_break (0);
+      TALER_LOG_ERROR (
+        "Failed to find reserve_priv for get_attestable query\n");
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    ss->reserve_pub = *reserve_pub;
+  }
+  ss->rgah = TALER_EXCHANGE_reserves_get_attestable (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    &ss->reserve_pub,
+    &reserve_get_attestable_cb,
+    ss);
+}
+
+
+/**
+ * Cleanup the state from a "reserve get_attestable" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+get_attestable_cleanup (void *cls,
+                        const struct TALER_TESTING_Command *cmd)
+{
+  struct GetAttestableState *ss = cls;
+
+  if (NULL != ss->rgah)
+  {
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
+    TALER_EXCHANGE_reserves_get_attestable_cancel (ss->rgah);
+    ss->rgah = NULL;
+  }
+  GNUNET_free (ss->expected_attestables);
+  GNUNET_free (ss);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_get_attestable (const char *label,
+                                          const char *reserve_reference,
+                                          unsigned int expected_response_code,
+                                          ...)
+{
+  struct GetAttestableState *ss;
+  va_list ap;
+  unsigned int num_expected;
+  const char *ea;
+
+  num_expected = 0;
+  va_start (ap, expected_response_code);
+  while (NULL != va_arg (ap, const char *))
+    num_expected++;
+  va_end (ap);
+
+  GNUNET_assert (NULL != reserve_reference);
+  ss = GNUNET_new (struct GetAttestableState);
+  ss->reserve_reference = reserve_reference;
+  ss->expected_response_code = expected_response_code;
+  ss->expected_attestables_length = num_expected;
+  ss->expected_attestables = GNUNET_new_array (num_expected,
+                                               const char *);
+  num_expected = 0;
+  va_start (ap, expected_response_code);
+  while (NULL != (ea = va_arg (ap, const char *)))
+    ss->expected_attestables[num_expected++] = ea;
+  va_end (ap);
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &get_attestable_run,
+      .cleanup = &get_attestable_cleanup
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_reserve_history.c b/src/testing/testing_api_cmd_reserve_history.c
index fc94d8443..ecb236a54 100644
--- a/src/testing/testing_api_cmd_reserve_history.c
+++ b/src/testing/testing_api_cmd_reserve_history.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file testing/testing_api_cmd_history.c
+ * @file testing/testing_api_cmd_reserve_history.c
  * @brief Implement the /reserve/history test command.
  * @author Marcello Stanisci
  */
@@ -32,6 +32,12 @@
  */
 struct HistoryState
 {
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
   /**
    * Label to the command which created the reserve to check,
    * needed to resort the reserve key.
@@ -54,19 +60,47 @@ struct HistoryState
   const struct TALER_ReservePrivateKeyP *reserve_priv;
 
   /**
-   * Public key of the reserve being analyzed.
+   * Interpreter state.
    */
-  struct TALER_ReservePublicKeyP reserve_pub;
+  struct TALER_TESTING_Interpreter *is;
 
   /**
    * Expected HTTP response code.
    */
   unsigned int expected_response_code;
 
+};
+
+
+/**
+ * Closure for analysis_cb().
+ */
+struct AnalysisContext
+{
   /**
-   * Interpreter state.
+   * Reserve public key we are looking at.
    */
-  struct TALER_TESTING_Interpreter *is;
+  const struct TALER_ReservePublicKeyP *reserve_pub;
+
+  /**
+   * Length of the @e history array.
+   */
+  unsigned int history_length;
+
+  /**
+   * Array of history items to match.
+   */
+  const struct TALER_EXCHANGE_ReserveHistoryEntry *history;
+
+  /**
+   * Array of @e history_length of matched entries.
+   */
+  bool *found;
+
+  /**
+   * Set to true if an entry could not be found.
+   */
+  bool failure;
 };
 
 
@@ -78,8 +112,9 @@ struct HistoryState
  * @return 0 if @a h1 and @a h2 are equal
  */
 static int
-history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
-                   const struct TALER_EXCHANGE_ReserveHistoryEntry *h2)
+history_entry_cmp (
+  const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
+  const struct TALER_EXCHANGE_ReserveHistoryEntry *h2)
 {
   if (h1->type != h2->type)
     return 1;
@@ -110,6 +145,20 @@ history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
          that should be good enough. */
       return 0;
     return 1;
+  case TALER_EXCHANGE_RTT_AGEWITHDRAWAL:
+    /* testing_api_cmd_age_withdraw doesn't set the out_authorization_sig,
+       so we cannot test for it here. but if the amount matches,
+       that should be good enough. */
+    if ( (0 ==
+          TALER_amount_cmp (&h1->amount,
+                            &h2->amount)) &&
+         (0 ==
+          TALER_amount_cmp (&h1->details.age_withdraw.fee,
+                            &h2->details.age_withdraw.fee)) &&
+         (h1->details.age_withdraw.max_age ==
+          h2->details.age_withdraw.max_age))
+      return 0;
+    return 1;
   case TALER_EXCHANGE_RTT_RECOUP:
     /* exchange_sig, exchange_pub and timestamp are NOT available
        from the original recoup response, hence here NOT check(able/ed) */
@@ -121,7 +170,7 @@ history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
                          &h2->details.recoup_details.coin_pub)) )
       return 0;
     return 1;
-  case TALER_EXCHANGE_RTT_CLOSE:
+  case TALER_EXCHANGE_RTT_CLOSING:
     /* testing_api_cmd_exec_closer doesn't set the
        receiver_account_details, exchange_sig, exchange_pub or wtid or timestamp
        so we cannot test for it here. but if the amount matches,
@@ -134,6 +183,77 @@ history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
                             &h2->details.close_details.fee)) )
       return 0;
     return 1;
+  case TALER_EXCHANGE_RTT_MERGE:
+    if ( (0 ==
+          TALER_amount_cmp (&h1->amount,
+                            &h2->amount)) &&
+         (0 ==
+          TALER_amount_cmp (&h1->details.merge_details.purse_fee,
+                            &h2->details.merge_details.purse_fee)) &&
+         (GNUNET_TIME_timestamp_cmp (h1->details.merge_details.merge_timestamp,
+                                     ==,
+                                     h2->details.merge_details.merge_timestamp))
+         &&
+         (GNUNET_TIME_timestamp_cmp (h1->details.merge_details.purse_expiration,
+                                     ==,
+                                     h2->details.merge_details.purse_expiration))
+         &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.merge_details.merge_pub,
+                         &h2->details.merge_details.merge_pub)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.merge_details.h_contract_terms,
+                         &h2->details.merge_details.h_contract_terms)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.merge_details.purse_pub,
+                         &h2->details.merge_details.purse_pub)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.merge_details.reserve_sig,
+                         &h2->details.merge_details.reserve_sig)) &&
+         (h1->details.merge_details.min_age ==
+          h2->details.merge_details.min_age) &&
+         (h1->details.merge_details.flags ==
+          h2->details.merge_details.flags) )
+      return 0;
+    return 1;
+  case TALER_EXCHANGE_RTT_OPEN:
+    if ( (0 ==
+          TALER_amount_cmp (&h1->amount,
+                            &h2->amount)) &&
+         (GNUNET_TIME_timestamp_cmp (
+            h1->details.open_request.request_timestamp,
+            ==,
+            h2->details.open_request.request_timestamp)) &&
+         (GNUNET_TIME_timestamp_cmp (
+            h1->details.open_request.reserve_expiration,
+            ==,
+            h2->details.open_request.reserve_expiration)) &&
+         (h1->details.open_request.purse_limit ==
+          h2->details.open_request.purse_limit) &&
+         (0 ==
+          TALER_amount_cmp (&h1->details.open_request.reserve_payment,
+                            &h2->details.open_request.reserve_payment)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.open_request.reserve_sig,
+                         &h2->details.open_request.reserve_sig)) )
+      return 0;
+    return 1;
+  case TALER_EXCHANGE_RTT_CLOSE:
+    if ( (0 ==
+          TALER_amount_cmp (&h1->amount,
+                            &h2->amount)) &&
+         (GNUNET_TIME_timestamp_cmp (
+            h1->details.close_request.request_timestamp,
+            ==,
+            h2->details.close_request.request_timestamp)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.close_request.target_account_h_payto,
+                         &h2->details.close_request.target_account_h_payto)) &&
+         (0 ==
+          GNUNET_memcmp (&h1->details.close_request.reserve_sig,
+                         &h2->details.close_request.reserve_sig)) )
+      return 0;
+    return 1;
   }
   GNUNET_assert (0);
   return 1;
@@ -142,27 +262,26 @@ history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
 
 /**
  * Check if @a cmd changed the reserve, if so, find the
- * entry in @a history and set the respective index in @a found
- * to #GNUNET_YES. If the entry is not found, return #GNUNET_SYSERR.
+ * entry in our history and set the respective index in found
+ * to true. If the entry is not found, set failure.
  *
- * @param reserve_pub public key of the reserve for which we have the @a history
+ * @param cls our `struct AnalysisContext *`
  * @param cmd command to analyze for impact on history
- * @param history_length number of entries in @a history and @a found
- * @param history history to check
- * @param[in,out] found array to update
- * @return #GNUNET_OK if @a cmd action on reserve was found in @a history
  */
-static enum GNUNET_GenericReturnValue
-analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
-                 const struct TALER_TESTING_Command *cmd,
-                 unsigned int history_length,
-                 const struct TALER_EXCHANGE_ReserveHistoryEntry *history,
-                 int *found)
+static void
+analyze_command (void *cls,
+                 const struct TALER_TESTING_Command *cmd)
 {
+  struct AnalysisContext *ac = cls;
+  const struct TALER_ReservePublicKeyP *reserve_pub = ac->reserve_pub;
+  const struct TALER_EXCHANGE_ReserveHistoryEntry *history = ac->history;
+  unsigned int history_length = ac->history_length;
+  bool *found = ac->found;
+
   if (TALER_TESTING_cmd_is_batch (cmd))
   {
     struct TALER_TESTING_Command *cur;
-    struct TALER_TESTING_Command **bcmd;
+    struct TALER_TESTING_Command *bcmd;
 
     cur = TALER_TESTING_cmd_batch_get_current (cmd);
     if (GNUNET_OK !=
@@ -170,63 +289,79 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
                                             &bcmd))
     {
       GNUNET_break (0);
-      return GNUNET_SYSERR;
+      ac->failure = true;
+      return;
     }
-    for (unsigned int i = 0; NULL != (*bcmd)[i].label; i++)
+    for (unsigned int i = 0; NULL != bcmd[i].label; i++)
     {
-      struct TALER_TESTING_Command *step = &(*bcmd)[i];
+      struct TALER_TESTING_Command *step = &bcmd[i];
 
+      analyze_command (ac,
+                       step);
+      if (ac->failure)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Entry for batch step `%s' missing in history\n",
+                    step->label);
+        return;
+      }
       if (step == cur)
         break; /* if *we* are in a batch, make sure not to analyze commands past 'now' */
-      if (GNUNET_OK !=
-          analyze_command (reserve_pub,
-                           step,
-                           history_length,
-                           history,
-                           found))
-        return GNUNET_SYSERR;
     }
-    return GNUNET_OK;
+    return;
   }
-  else
+
   {
     const struct TALER_ReservePublicKeyP *rp;
-    const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
 
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_reserve_pub (cmd,
                                              &rp))
-      return GNUNET_OK; /* command does nothing for reserves */
+      return; /* command does nothing for reserves */
     if (0 !=
         GNUNET_memcmp (rp,
                        reserve_pub))
-      return GNUNET_OK; /* command affects some _other_ reserve */
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_history (cmd,
-                                                 &he))
-    {
-      /* NOTE: only for debugging... */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
-                  cmd->label);
-      return GNUNET_OK; /* command does nothing for reserves */
-    }
-    for (unsigned int i = 0; i<history_length; i++)
+      return; /* command affects some _other_ reserve */
+    for (unsigned int j = 0; true; j++)
     {
-      if (found[i])
-        continue; /* already found, skip */
-      if (0 ==
-          history_entry_cmp (he,
-                             &history[i]))
+      const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
+      bool matched = false;
+
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_reserve_history (cmd,
+                                                   j,
+                                                   &he))
+      {
+        /* NOTE: only for debugging... */
+        if (0 == j)
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Command `%s' has the reserve_pub, but lacks reserve history trait\n",
+                      cmd->label);
+        return; /* command does nothing for reserves */
+      }
+      for (unsigned int i = 0; i<history_length; i++)
+      {
+        if (found[i])
+          continue; /* already found, skip */
+        if (0 ==
+            history_entry_cmp (he,
+                               &history[i]))
+        {
+          found[i] = true;
+          matched = true;
+          break;
+        }
+      }
+      if (! matched)
       {
-        found[i] = GNUNET_YES;
-        return GNUNET_OK;
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Command `%s' reserve history entry #%u not found\n",
+                    cmd->label,
+                    j);
+        ac->failure = true;
+        return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Command `%s' reserve history entry not found\n",
-                cmd->label);
-    return GNUNET_SYSERR;
   }
 }
 
@@ -272,46 +407,54 @@ reserve_history_cb (void *cls,
   if (0 != TALER_amount_cmp (&eb,
                              &rs->details.ok.balance))
   {
+    GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected amount in reserve: %s\n",
                 TALER_amount_to_string (&rs->details.ok.balance));
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Expected balance of: %s\n",
+                TALER_amount_to_string (&eb));
     TALER_TESTING_interpreter_fail (ss->is);
     return;
   }
   {
-    int found[rs->details.ok.history_len];
+    bool found[rs->details.ok.history_len];
+    struct AnalysisContext ac = {
+      .reserve_pub = &ss->reserve_pub,
+      .history = rs->details.ok.history,
+      .history_length = rs->details.ok.history_len,
+      .found = found
+    };
 
     memset (found,
             0,
             sizeof (found));
-    for (unsigned int i = 0; i<= (unsigned int) is->ip; i++)
+    TALER_TESTING_iterate (is,
+                           true,
+                           &analyze_command,
+                           &ac);
+    if (ac.failure)
     {
-      struct TALER_TESTING_Command *cmd = &is->commands[i];
-
-      if (GNUNET_OK !=
-          analyze_command (&ss->reserve_pub,
-                           cmd,
-                           rs->details.ok.history_len,
-                           rs->details.ok.history,
-                           found))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Entry for command `%s' missing in history\n",
-                    cmd->label);
-        TALER_TESTING_interpreter_fail (ss->is);
-        return;
-      }
+      json_dumpf (rs->hr.reply,
+                  stderr,
+                  JSON_INDENT (2));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
     }
     for (unsigned int i = 0; i<rs->details.ok.history_len; i++)
-      if (! found[i])
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "History entry at index %u of type %d not justified by command history\n",
-                    i,
-                    rs->details.ok.history[i].type);
-        TALER_TESTING_interpreter_fail (ss->is);
-        return;
-      }
+    {
+      if (found[i])
+        continue;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "History entry at index %u of type %d not justified by command history\n",
+                  i,
+                  rs->details.ok.history[i].type);
+      json_dumpf (rs->hr.reply,
+                  stderr,
+                  JSON_INDENT (2));
+      TALER_TESTING_interpreter_fail (ss->is);
+      return;
+    }
   }
   TALER_TESTING_interpreter_next (is);
 }
@@ -336,7 +479,6 @@ history_run (void *cls,
   create_reserve
     = TALER_TESTING_interpreter_lookup_command (is,
                                                 ss->reserve_reference);
-
   if (NULL == create_reserve)
   {
     GNUNET_break (0);
@@ -354,10 +496,42 @@ history_run (void *cls,
   }
   GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
                                       &ss->reserve_pub.eddsa_pub);
-  ss->rsh = TALER_EXCHANGE_reserves_history (is->exchange,
-                                             ss->reserve_priv,
-                                             &reserve_history_cb,
-                                             ss);
+  ss->rsh = TALER_EXCHANGE_reserves_history (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    ss->reserve_priv,
+    0,
+    &reserve_history_cb,
+    ss);
+}
+
+
+/**
+ * Offer internal data from a "history" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+history_traits (void *cls,
+                const void **ret,
+                const char *trait,
+                unsigned int index)
+{
+  struct HistoryState *hs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_reserve_pub (&hs->reserve_pub),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
 }
 
 
@@ -376,10 +550,8 @@ history_cleanup (void *cls,
 
   if (NULL != ss->rsh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ss->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
     TALER_EXCHANGE_reserves_history_cancel (ss->rsh);
     ss->rsh = NULL;
   }
@@ -405,7 +577,8 @@ TALER_TESTING_cmd_reserve_history (const char *label,
       .cls = ss,
       .label = label,
       .run = &history_run,
-      .cleanup = &history_cleanup
+      .cleanup = &history_cleanup,
+      .traits = &history_traits
     };
 
     return cmd;
diff --git a/src/testing/testing_api_cmd_reserve_open.c b/src/testing/testing_api_cmd_reserve_open.c
new file mode 100644
index 000000000..189d06b26
--- /dev/null
+++ b/src/testing/testing_api_cmd_reserve_open.c
@@ -0,0 +1,349 @@
+/*
+  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/>
+*/
+/**
+ * @file testing/testing_api_cmd_reserve_open.c
+ * @brief Implement the /reserve/$RID/open test command.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+
+/**
+ * Information we track per coin used to pay for opening the
+ * reserve.
+ */
+struct CoinDetail
+{
+  /**
+   * Name of the command and index of the coin to use.
+   */
+  const char *name;
+
+  /**
+   * Amount to charge to this coin.
+   */
+  struct TALER_Amount amount;
+};
+
+
+/**
+ * State for a "open" CMD.
+ */
+struct OpenState
+{
+  /**
+   * Label to the command which created the reserve to check,
+   * needed to resort the reserve key.
+   */
+  const char *reserve_reference;
+
+  /**
+   * Requested expiration time.
+   */
+  struct GNUNET_TIME_Relative req_expiration_time;
+
+  /**
+   * Requested minimum number of purses.
+   */
+  uint32_t min_purses;
+
+  /**
+   * Amount to pay for the opening from the reserve balance.
+   */
+  struct TALER_Amount reserve_pay;
+
+  /**
+   * Handle to the "reserve open" operation.
+   */
+  struct TALER_EXCHANGE_ReservesOpenHandle *rsh;
+
+  /**
+   * Expected reserve balance.
+   */
+  const char *expected_balance;
+
+  /**
+   * Length of the @e cd array.
+   */
+  unsigned int cpl;
+
+  /**
+   * Coin details, array of length @e cpl.
+   */
+  struct CoinDetail *cd;
+
+  /**
+   * Private key of the reserve being analyzed.
+   */
+  const struct TALER_ReservePrivateKeyP *reserve_priv;
+
+  /**
+   * Public key of the reserve being analyzed.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Expected HTTP response code.
+   */
+  unsigned int expected_response_code;
+
+  /**
+   * Interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+};
+
+
+/**
+ * Check that the reserve balance and HTTP response code are
+ * both acceptable.
+ *
+ * @param cls closure.
+ * @param rs HTTP response details
+ */
+static void
+reserve_open_cb (void *cls,
+                 const struct TALER_EXCHANGE_ReserveOpenResult *rs)
+{
+  struct OpenState *ss = cls;
+  struct TALER_TESTING_Interpreter *is = ss->is;
+
+  ss->rsh = NULL;
+  if (ss->expected_response_code != rs->hr.http_status)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected HTTP response code: %d in %s:%u\n",
+                rs->hr.http_status,
+                __FILE__,
+                __LINE__);
+    json_dumpf (rs->hr.reply,
+                stderr,
+                JSON_INDENT (2));
+    TALER_TESTING_interpreter_fail (ss->is);
+    return;
+  }
+  if (MHD_HTTP_OK != rs->hr.http_status)
+  {
+    TALER_TESTING_interpreter_next (is);
+    return;
+  }
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command being executed.
+ * @param is the interpreter state.
+ */
+static void
+open_run (void *cls,
+          const struct TALER_TESTING_Command *cmd,
+          struct TALER_TESTING_Interpreter *is)
+{
+  struct OpenState *ss = cls;
+  const struct TALER_TESTING_Command *create_reserve;
+  struct TALER_EXCHANGE_PurseDeposit cp[GNUNET_NZL (ss->cpl)];
+
+  ss->is = is;
+  create_reserve
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ss->reserve_reference);
+
+  if (NULL == create_reserve)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_reserve_priv (create_reserve,
+                                            &ss->reserve_priv))
+  {
+    GNUNET_break (0);
+    TALER_LOG_ERROR ("Failed to find reserve_priv for open query\n");
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
+                                      &ss->reserve_pub.eddsa_pub);
+  for (unsigned int i = 0; i<ss->cpl; i++)
+  {
+    struct TALER_EXCHANGE_PurseDeposit *cpi = &cp[i];
+    const struct TALER_TESTING_Command *cmdi;
+    const struct TALER_AgeCommitmentProof *age_commitment_proof;
+    const struct TALER_CoinSpendPrivateKeyP *coin_priv;
+    const struct TALER_DenominationSignature *denom_sig;
+    const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
+    char *cref;
+    unsigned int cidx;
+
+    if (GNUNET_OK !=
+        TALER_TESTING_parse_coin_reference (ss->cd[i].name,
+                                            &cref,
+                                            &cidx))
+    {
+      GNUNET_break (0);
+      TALER_LOG_ERROR ("Failed to parse coin reference `%s'\n",
+                       ss->cd[i].name);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    cmdi = TALER_TESTING_interpreter_lookup_command (is,
+                                                     cref);
+    GNUNET_free (cref);
+    if (NULL == cmdi)
+    {
+      GNUNET_break (0);
+      TALER_LOG_ERROR ("Command `%s' not found\n",
+                       ss->cd[i].name);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    if ( (GNUNET_OK !=
+          TALER_TESTING_get_trait_age_commitment_proof (cmdi,
+                                                        cidx,
+                                                        &age_commitment_proof))
+         ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_coin_priv (cmdi,
+                                             cidx,
+                                             &coin_priv)) ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_denom_sig (cmdi,
+                                             cidx,
+                                             &denom_sig)) ||
+         (GNUNET_OK !=
+          TALER_TESTING_get_trait_denom_pub (cmdi,
+                                             cidx,
+                                             &denom_pub)) )
+    {
+      GNUNET_break (0);
+      TALER_LOG_ERROR ("Coin trait not found in `%s'\n",
+                       ss->cd[i].name);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    cpi->age_commitment_proof = age_commitment_proof;
+    cpi->coin_priv = *coin_priv;
+    cpi->denom_sig = *denom_sig;
+    cpi->amount = ss->cd[i].amount;
+    cpi->h_denom_pub = denom_pub->h_key;
+  }
+  ss->rsh = TALER_EXCHANGE_reserves_open (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    ss->reserve_priv,
+    &ss->reserve_pay,
+    ss->cpl,
+    cp,
+    GNUNET_TIME_relative_to_timestamp (ss->req_expiration_time),
+    ss->min_purses,
+    &reserve_open_cb,
+    ss);
+}
+
+
+/**
+ * Cleanup the state from a "reserve open" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+open_cleanup (void *cls,
+              const struct TALER_TESTING_Command *cmd)
+{
+  struct OpenState *ss = cls;
+
+  if (NULL != ss->rsh)
+  {
+    TALER_TESTING_command_incomplete (ss->is,
+                                      cmd->label);
+    TALER_EXCHANGE_reserves_open_cancel (ss->rsh);
+    ss->rsh = NULL;
+  }
+  GNUNET_free (ss);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_reserve_open (const char *label,
+                                const char *reserve_reference,
+                                const char *reserve_pay,
+                                struct GNUNET_TIME_Relative expiration_time,
+                                uint32_t min_purses,
+                                unsigned int expected_response_code,
+                                ...)
+{
+  struct OpenState *ss;
+  va_list ap;
+  const char *name;
+  unsigned int i;
+
+  GNUNET_assert (NULL != reserve_reference);
+  ss = GNUNET_new (struct OpenState);
+  ss->reserve_reference = reserve_reference;
+  ss->req_expiration_time = expiration_time;
+  ss->min_purses = min_purses;
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_string_to_amount (reserve_pay,
+                                         &ss->reserve_pay));
+  ss->expected_response_code = expected_response_code;
+  va_start (ap,
+            expected_response_code);
+  while (NULL != (name = va_arg (ap, const char *)))
+    ss->cpl++;
+  va_end (ap);
+  GNUNET_assert (0 == (ss->cpl % 2));
+  ss->cpl /= 2; /* name and amount per coin */
+  ss->cd = GNUNET_new_array (ss->cpl,
+                             struct CoinDetail);
+  i = 0;
+  va_start (ap,
+            expected_response_code);
+  while (NULL != (name = va_arg (ap, const char *)))
+  {
+    struct CoinDetail *cd = &ss->cd[i];
+    cd->name = name;
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_string_to_amount (va_arg (ap,
+                                                   const char *),
+                                           &cd->amount));
+    i++;
+  }
+  va_end (ap);
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &open_run,
+      .cleanup = &open_cleanup
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_reserve_purse.c b/src/testing/testing_api_cmd_reserve_purse.c
index b923e1cc6..ef6964f26 100644
--- a/src/testing/testing_api_cmd_reserve_purse.c
+++ b/src/testing/testing_api_cmd_reserve_purse.c
@@ -47,6 +47,17 @@ struct ReservePurseState
   struct TALER_ReservePrivateKeyP reserve_priv;
 
   /**
+   * Reserve public key.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Reserve signature generated for the request
+   * (client-side).
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
    * Private key of the purse.
    */
   struct TALER_PurseContractPrivateKeyP purse_priv;
@@ -62,6 +73,11 @@ struct ReservePurseState
   struct TALER_PurseMergePrivateKeyP merge_priv;
 
   /**
+   * Public key of the merge capability.
+   */
+  struct TALER_PurseMergePublicKeyP merge_pub;
+
+  /**
    * Private key to decrypt the contract.
    */
   struct TALER_ContractDiffiePrivateP contract_priv;
@@ -82,12 +98,24 @@ struct ReservePurseState
   struct GNUNET_TIME_Timestamp purse_expiration;
 
   /**
+   * Hash of the payto://-URI for the reserve we are
+   * merging into.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
+   * a request for KYC.
+   */
+  uint64_t requirement_row;
+
+  /**
    * Contract terms for the purse.
    */
   json_t *contract_terms;
 
   /**
-   * Refernece to the reserve, or NULL (!).
+   * Reference to the reserve, or NULL (!).
    */
   const char *reserve_ref;
 
@@ -101,6 +129,10 @@ struct ReservePurseState
    */
   unsigned int expected_response_code;
 
+  /**
+   * True to pay the purse fee.
+   */
+  bool pay_purse_fee;
 };
 
 
@@ -118,20 +150,22 @@ purse_cb (void *cls,
   struct ReservePurseState *ds = cls;
 
   ds->dh = NULL;
+  ds->reserve_sig = *dr->reserve_sig;
   if (ds->expected_response_code != dr->hr.http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                dr->hr.http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (dr->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     dr->hr.http_status,
+                                     ds->expected_response_code);
     return;
   }
+  switch (dr->hr.http_status)
+  {
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* KYC required */
+    ds->requirement_row =
+      dr->details.unavailable_for_legal_reasons.requirement_row;
+    break;
+  }
   TALER_TESTING_interpreter_next (ds->is);
 }
 
@@ -169,10 +203,38 @@ purse_run (void *cls,
   GNUNET_CRYPTO_eddsa_key_create (&ds->purse_priv.eddsa_priv);
   GNUNET_CRYPTO_eddsa_key_get_public (&ds->purse_priv.eddsa_priv,
                                       &ds->purse_pub.eddsa_pub);
+  GNUNET_CRYPTO_eddsa_key_get_public (&ds->reserve_priv.eddsa_priv,
+                                      &ds->reserve_pub.eddsa_pub);
   GNUNET_CRYPTO_eddsa_key_create (&ds->merge_priv.eddsa_priv);
+  GNUNET_CRYPTO_eddsa_key_get_public (&ds->merge_priv.eddsa_priv,
+                                      &ds->merge_pub.eddsa_pub);
   GNUNET_CRYPTO_ecdhe_key_create (&ds->contract_priv.ecdhe_priv);
   ds->purse_expiration = GNUNET_TIME_absolute_to_timestamp (
     GNUNET_TIME_relative_to_absolute (ds->expiration_rel));
+
+  {
+    char *payto_uri;
+    const char *exchange_url;
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+    payto_uri = TALER_reserve_make_payto (exchange_url,
+                                          &ds->reserve_pub);
+    TALER_payto_hash (payto_uri,
+                      &ds->h_payto);
+    GNUNET_free (payto_uri);
+  }
+
   GNUNET_assert (0 ==
                  json_object_set_new (
                    ds->contract_terms,
@@ -180,14 +242,16 @@ purse_run (void *cls,
                    GNUNET_JSON_from_timestamp (ds->purse_expiration)));
   ds->merge_timestamp = GNUNET_TIME_timestamp_get ();
   ds->dh = TALER_EXCHANGE_purse_create_with_merge (
-    is->exchange,
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
     &ds->reserve_priv,
     &ds->purse_priv,
     &ds->merge_priv,
     &ds->contract_priv,
     ds->contract_terms,
     true /* upload contract */,
-    false /* do not pay purse fee -- FIXME: make this a choice to test this case! */,
+    ds->pay_purse_fee,
     ds->merge_timestamp,
     &purse_cb,
     ds);
@@ -217,10 +281,8 @@ purse_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_purse_create_with_merge_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -252,8 +314,13 @@ purse_traits (void *cls,
     TALER_TESTING_make_trait_purse_priv (&ds->purse_priv),
     TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
     TALER_TESTING_make_trait_merge_priv (&ds->merge_priv),
+    TALER_TESTING_make_trait_merge_pub (&ds->merge_pub),
     TALER_TESTING_make_trait_contract_priv (&ds->contract_priv),
     TALER_TESTING_make_trait_reserve_priv (&ds->reserve_priv),
+    TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
+    TALER_TESTING_make_trait_reserve_sig (&ds->reserve_sig),
+    TALER_TESTING_make_trait_legi_requirement_row (&ds->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&ds->h_payto),
     TALER_TESTING_trait_end ()
   };
 
@@ -270,6 +337,7 @@ TALER_TESTING_cmd_purse_create_with_reserve (
   unsigned int expected_http_status,
   const char *contract_terms,
   bool upload_contract,
+  bool pay_purse_fee,
   struct GNUNET_TIME_Relative expiration,
   const char *reserve_ref)
 {
@@ -282,6 +350,7 @@ TALER_TESTING_cmd_purse_create_with_reserve (
                                    0 /* flags */,
                                    &err);
   GNUNET_assert (NULL != ds->contract_terms);
+  ds->pay_purse_fee = pay_purse_fee;
   ds->reserve_ref = reserve_ref;
   ds->expected_response_code = expected_http_status;
 
diff --git a/src/testing/testing_api_cmd_reserve_status.c b/src/testing/testing_api_cmd_reserve_status.c
deleted file mode 100644
index 10f3ee99b..000000000
--- a/src/testing/testing_api_cmd_reserve_status.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
-
-  TALER is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as
-  published by the Free Software 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/>
-*/
-/**
- * @file testing/testing_api_cmd_status.c
- * @brief Implement the /reserve/$RID/status test command.
- * @author Marcello Stanisci
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_testing_lib.h"
-
-
-/**
- * State for a "status" CMD.
- */
-struct StatusState
-{
-  /**
-   * Label to the command which created the reserve to check,
-   * needed to resort the reserve key.
-   */
-  const char *reserve_reference;
-
-  /**
-   * Handle to the "reserve status" operation.
-   */
-  struct TALER_EXCHANGE_ReservesStatusHandle *rsh;
-
-  /**
-   * Expected reserve balance.
-   */
-  const char *expected_balance;
-
-  /**
-   * Private key of the reserve being analyzed.
-   */
-  const struct TALER_ReservePrivateKeyP *reserve_priv;
-
-  /**
-   * Public key of the reserve being analyzed.
-   */
-  struct TALER_ReservePublicKeyP reserve_pub;
-
-  /**
-   * Expected HTTP response code.
-   */
-  unsigned int expected_response_code;
-
-  /**
-   * Interpreter state.
-   */
-  struct TALER_TESTING_Interpreter *is;
-};
-
-
-/**
- * Compare @a h1 and @a h2.
- *
- * @param h1 a history entry
- * @param h2 a history entry
- * @return 0 if @a h1 and @a h2 are equal
- */
-static int
-history_entry_cmp (const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
-                   const struct TALER_EXCHANGE_ReserveHistoryEntry *h2)
-{
-  if (h1->type != h2->type)
-    return 1;
-  switch (h1->type)
-  {
-  case TALER_EXCHANGE_RTT_CREDIT:
-    if ( (0 ==
-          TALER_amount_cmp (&h1->amount,
-                            &h2->amount)) &&
-         (0 == strcasecmp (h1->details.in_details.sender_url,
-                           h2->details.in_details.sender_url)) &&
-         (h1->details.in_details.wire_reference ==
-          h2->details.in_details.wire_reference) &&
-         (GNUNET_TIME_timestamp_cmp (h1->details.in_details.timestamp,
-                                     ==,
-                                     h2->details.in_details.timestamp)) )
-      return 0;
-    return 1;
-  case TALER_EXCHANGE_RTT_WITHDRAWAL:
-    if ( (0 ==
-          TALER_amount_cmp (&h1->amount,
-                            &h2->amount)) &&
-         (0 ==
-          TALER_amount_cmp (&h1->details.withdraw.fee,
-                            &h2->details.withdraw.fee)) )
-      /* testing_api_cmd_withdraw doesn't set the out_authorization_sig,
-         so we cannot test for it here. but if the amount matches,
-         that should be good enough. */
-      return 0;
-    return 1;
-  case TALER_EXCHANGE_RTT_RECOUP:
-    /* exchange_sig, exchange_pub and timestamp are NOT available
-       from the original recoup response, hence here NOT check(able/ed) */
-    if ( (0 ==
-          TALER_amount_cmp (&h1->amount,
-                            &h2->amount)) &&
-         (0 ==
-          GNUNET_memcmp (&h1->details.recoup_details.coin_pub,
-                         &h2->details.recoup_details.coin_pub)) )
-      return 0;
-    return 1;
-  case TALER_EXCHANGE_RTT_CLOSE:
-    /* testing_api_cmd_exec_closer doesn't set the
-       receiver_account_details, exchange_sig, exchange_pub or wtid or timestamp
-       so we cannot test for it here. but if the amount matches,
-       that should be good enough. */
-    if ( (0 ==
-          TALER_amount_cmp (&h1->amount,
-                            &h2->amount)) &&
-         (0 ==
-          TALER_amount_cmp (&h1->details.close_details.fee,
-                            &h2->details.close_details.fee)) )
-      return 0;
-    return 1;
-  }
-  GNUNET_assert (0);
-  return 1;
-}
-
-
-/**
- * Check if @a cmd changed the reserve, if so, find the
- * entry in @a history and set the respective index in @a found
- * to #GNUNET_YES. If the entry is not found, return #GNUNET_SYSERR.
- *
- * @param reserve_pub public key of the reserve for which we have the @a history
- * @param cmd command to analyze for impact on history
- * @param history_length number of entries in @a history and @a found
- * @param history history to check
- * @param[in,out] found array to update
- * @return #GNUNET_OK if @a cmd action on reserve was found in @a history
- */
-static enum GNUNET_GenericReturnValue
-analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
-                 const struct TALER_TESTING_Command *cmd,
-                 unsigned int history_length,
-                 const struct TALER_EXCHANGE_ReserveHistoryEntry *history,
-                 int *found)
-{
-  if (TALER_TESTING_cmd_is_batch (cmd))
-  {
-    struct TALER_TESTING_Command *cur;
-    struct TALER_TESTING_Command **bcmd;
-
-    cur = TALER_TESTING_cmd_batch_get_current (cmd);
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_batch_cmds (cmd,
-                                            &bcmd))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    for (unsigned int i = 0; NULL != (*bcmd)[i].label; i++)
-    {
-      struct TALER_TESTING_Command *step = &(*bcmd)[i];
-
-      if (step == cur)
-        break; /* if *we* are in a batch, make sure not to analyze commands past 'now' */
-      if (GNUNET_OK !=
-          analyze_command (reserve_pub,
-                           step,
-                           history_length,
-                           history,
-                           found))
-        return GNUNET_SYSERR;
-    }
-    return GNUNET_OK;
-  }
-  else
-  {
-    const struct TALER_ReservePublicKeyP *rp;
-    const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
-
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_pub (cmd,
-                                             &rp))
-      return GNUNET_OK; /* command does nothing for reserves */
-    if (0 !=
-        GNUNET_memcmp (rp,
-                       reserve_pub))
-      return GNUNET_OK; /* command affects some _other_ reserve */
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_history (cmd,
-                                                 &he))
-    {
-      /* NOTE: only for debugging... */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
-                  cmd->label);
-      return GNUNET_OK; /* command does nothing for reserves */
-    }
-    for (unsigned int i = 0; i<history_length; i++)
-    {
-      if (found[i])
-        continue; /* already found, skip */
-      if (0 ==
-          history_entry_cmp (he,
-                             &history[i]))
-      {
-        found[i] = GNUNET_YES;
-        return GNUNET_OK;
-      }
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Command `%s' reserve history entry not found\n",
-                cmd->label);
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Check that the reserve balance and HTTP response code are
- * both acceptable.
- *
- * @param cls closure.
- * @param rs HTTP response details
- */
-static void
-reserve_status_cb (void *cls,
-                   const struct TALER_EXCHANGE_ReserveStatus *rs)
-{
-  struct StatusState *ss = cls;
-  struct TALER_TESTING_Interpreter *is = ss->is;
-  struct TALER_Amount eb;
-
-  ss->rsh = NULL;
-  if (ss->expected_response_code != rs->hr.http_status)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected HTTP response code: %d in %s:%u\n",
-                rs->hr.http_status,
-                __FILE__,
-                __LINE__);
-    json_dumpf (rs->hr.reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ss->is);
-    return;
-  }
-  if (MHD_HTTP_OK != rs->hr.http_status)
-  {
-    TALER_TESTING_interpreter_next (is);
-    return;
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (ss->expected_balance,
-                                         &eb));
-
-  if (0 != TALER_amount_cmp (&eb,
-                             &rs->details.ok.balance))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected amount in reserve: %s\n",
-                TALER_amount_to_string (&rs->details.ok.balance));
-    TALER_TESTING_interpreter_fail (ss->is);
-    return;
-  }
-  {
-    int found[rs->details.ok.history_len];
-
-    memset (found,
-            0,
-            sizeof (found));
-    for (unsigned int i = 0; i<= (unsigned int) is->ip; i++)
-    {
-      struct TALER_TESTING_Command *cmd = &is->commands[i];
-
-      if (GNUNET_OK !=
-          analyze_command (&ss->reserve_pub,
-                           cmd,
-                           rs->details.ok.history_len,
-                           rs->details.ok.history,
-                           found))
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Entry for command `%s' missing in history\n",
-                    cmd->label);
-        TALER_TESTING_interpreter_fail (ss->is);
-        return;
-      }
-    }
-    for (unsigned int i = 0; i<rs->details.ok.history_len; i++)
-      if (! found[i])
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "History entry at index %u of type %d not justified by command status\n",
-                    i,
-                    rs->details.ok.history[i].type);
-        TALER_TESTING_interpreter_fail (ss->is);
-        return;
-      }
-  }
-  TALER_TESTING_interpreter_next (is);
-}
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command being executed.
- * @param is the interpreter state.
- */
-static void
-status_run (void *cls,
-            const struct TALER_TESTING_Command *cmd,
-            struct TALER_TESTING_Interpreter *is)
-{
-  struct StatusState *ss = cls;
-  const struct TALER_TESTING_Command *create_reserve;
-
-  ss->is = is;
-  create_reserve
-    = TALER_TESTING_interpreter_lookup_command (is,
-                                                ss->reserve_reference);
-
-  if (NULL == create_reserve)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  if (GNUNET_OK !=
-      TALER_TESTING_get_trait_reserve_priv (create_reserve,
-                                            &ss->reserve_priv))
-  {
-    GNUNET_break (0);
-    TALER_LOG_ERROR ("Failed to find reserve_priv for status query\n");
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
-                                      &ss->reserve_pub.eddsa_pub);
-  ss->rsh = TALER_EXCHANGE_reserves_status (is->exchange,
-                                            ss->reserve_priv,
-                                            &reserve_status_cb,
-                                            ss);
-}
-
-
-/**
- * Cleanup the state from a "reserve status" CMD, and possibly
- * cancel a pending operation thereof.
- *
- * @param cls closure.
- * @param cmd the command which is being cleaned up.
- */
-static void
-status_cleanup (void *cls,
-                const struct TALER_TESTING_Command *cmd)
-{
-  struct StatusState *ss = cls;
-
-  if (NULL != ss->rsh)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ss->is->ip,
-                cmd->label);
-    TALER_EXCHANGE_reserves_status_cancel (ss->rsh);
-    ss->rsh = NULL;
-  }
-  GNUNET_free (ss);
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_reserve_status (const char *label,
-                                  const char *reserve_reference,
-                                  const char *expected_balance,
-                                  unsigned int expected_response_code)
-{
-  struct StatusState *ss;
-
-  GNUNET_assert (NULL != reserve_reference);
-  ss = GNUNET_new (struct StatusState);
-  ss->reserve_reference = reserve_reference;
-  ss->expected_balance = expected_balance;
-  ss->expected_response_code = expected_response_code;
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = ss,
-      .label = label,
-      .run = &status_run,
-      .cleanup = &status_cleanup
-    };
-
-    return cmd;
-  }
-}
diff --git a/src/testing/testing_api_cmd_revoke.c b/src/testing/testing_api_cmd_revoke.c
index 4522dede1..f734be1a4 100644
--- a/src/testing/testing_api_cmd_revoke.c
+++ b/src/testing/testing_api_cmd_revoke.c
@@ -141,14 +141,12 @@ revoke_run (void *cls,
   /* Get denom pub from trait */
   coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
                                                        rs->coin_reference);
-
   if (NULL == coin_cmd)
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-
   GNUNET_assert (GNUNET_OK ==
                  TALER_TESTING_get_trait_denom_pub (coin_cmd,
                                                     0,
diff --git a/src/testing/testing_api_cmd_revoke_denom_key.c b/src/testing/testing_api_cmd_revoke_denom_key.c
index 7c77c3566..2663c538f 100644
--- a/src/testing/testing_api_cmd_revoke_denom_key.c
+++ b/src/testing/testing_api_cmd_revoke_denom_key.c
@@ -65,28 +65,22 @@ struct RevokeState
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct RevokeState *`
- * @param hr HTTP response data
+ * @param rdr response data
  */
 static void
 success_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeDenominationResponse *rdr)
 {
   struct RevokeState *rs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rdr->hr;
 
   rs->kh = NULL;
   if (rs->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                rs->is->commands[rs->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rs->is);
+    TALER_TESTING_unexpected_status (rs->is,
+                                     hr->http_status,
+                                     rs->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (rs->is);
@@ -158,7 +152,23 @@ revoke_run (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
   struct TALER_MasterSignatureP master_sig;
+  const char *exchange_url;
 
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
   rs->is = is;
   /* Get denom pub from trait */
   coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
@@ -185,13 +195,27 @@ revoke_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_denomination_revoke_sign (&denom_pub->h_key,
-                                                     &is->master_priv,
+                                                     master_priv,
                                                      &master_sig);
   }
   rs->kh = TALER_EXCHANGE_management_revoke_denomination_key (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     &denom_pub->h_key,
     &master_sig,
     &success_cb,
diff --git a/src/testing/testing_api_cmd_revoke_sign_key.c b/src/testing/testing_api_cmd_revoke_sign_key.c
index 9745d728d..65b80b4c9 100644
--- a/src/testing/testing_api_cmd_revoke_sign_key.c
+++ b/src/testing/testing_api_cmd_revoke_sign_key.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -65,28 +65,22 @@ struct RevokeState
  * Function called with information about the post revocation operation result.
  *
  * @param cls closure with a `struct RevokeState *`
- * @param hr HTTP response data
+ * @param rsr response data
  */
 static void
 success_cb (
   void *cls,
-  const struct TALER_EXCHANGE_HttpResponse *hr)
+  const struct TALER_EXCHANGE_ManagementRevokeSigningKeyResponse *rsr)
 {
   struct RevokeState *rs = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &rsr->hr;
 
   rs->kh = NULL;
   if (rs->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                rs->is->commands[rs->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (rs->is);
+    TALER_TESTING_unexpected_status (rs->is,
+                                     hr->http_status,
+                                     rs->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (rs->is);
@@ -158,7 +152,23 @@ revoke_run (void *cls,
   const struct TALER_TESTING_Command *coin_cmd;
   const struct TALER_ExchangePublicKeyP *exchange_pub;
   struct TALER_MasterSignatureP master_sig;
+  const char *exchange_url;
 
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
   rs->is = is;
   /* Get sign pub from trait */
   coin_cmd = TALER_TESTING_interpreter_lookup_command (is,
@@ -185,13 +195,27 @@ revoke_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_signkey_revoke_sign (exchange_pub,
-                                                &is->master_priv,
+                                                master_priv,
                                                 &master_sig);
   }
   rs->kh = TALER_EXCHANGE_management_revoke_signing_key (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     exchange_pub,
     &master_sig,
     &success_cb,
diff --git a/src/testing/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c
deleted file mode 100644
index 93b38d3c3..000000000
--- a/src/testing/testing_api_cmd_rewind.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
-
-  TALER is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as
-  published by the Free Software 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/>
-*/
-/**
- * @file testing/testing_api_cmd_rewind.c
- * @brief command to rewind the instruction pointer.
- * @author Marcello Stanisci
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "taler_exchange_service.h"
-#include "taler_testing_lib.h"
-
-
-/**
- * State for a "rewind" CMD.
- */
-struct RewindIpState
-{
-  /**
-   * Instruction pointer to set into the interpreter.
-   */
-  const char *target_label;
-
-  /**
-   * How many times this set should take place.  However, this value lives at
-   * the calling process, and this CMD is only in charge of checking and
-   * decremeting it.
-   */
-  unsigned int counter;
-};
-
-
-/**
- * Seek for the @a target command in @a batch (and rewind to it
- * if successful).
- *
- * @param is the interpreter state (for failures)
- * @param cmd batch to search for @a target
- * @param target command to search for
- * @return #GNUNET_OK on success, #GNUNET_NO if target was not found,
- *         #GNUNET_SYSERR if target is in the future and we failed
- */
-static enum GNUNET_GenericReturnValue
-seek_batch (struct TALER_TESTING_Interpreter *is,
-            const struct TALER_TESTING_Command *cmd,
-            const struct TALER_TESTING_Command *target)
-{
-  unsigned int new_ip;
-  struct TALER_TESTING_Command **batch;
-  struct TALER_TESTING_Command *current;
-  struct TALER_TESTING_Command *icmd;
-  struct TALER_TESTING_Command *match;
-
-  current = TALER_TESTING_cmd_batch_get_current (cmd);
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_TESTING_get_trait_batch_cmds (cmd,
-                                                     &batch));
-  match = NULL;
-  for (new_ip = 0;
-       NULL != (icmd = &(*batch)[new_ip]);
-       new_ip++)
-  {
-    if (current == target)
-      current = NULL;
-    if (icmd == target)
-    {
-      match = icmd;
-      break;
-    }
-    if (TALER_TESTING_cmd_is_batch (icmd))
-    {
-      int ret = seek_batch (is,
-                            icmd,
-                            target);
-      if (GNUNET_SYSERR == ret)
-        return GNUNET_SYSERR; /* failure! */
-      if (GNUNET_OK == ret)
-      {
-        match = icmd;
-        break;
-      }
-    }
-  }
-  if (NULL == current)
-  {
-    /* refuse to jump forward */
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return GNUNET_SYSERR;
-  }
-  if (NULL == match)
-    return GNUNET_NO; /* not found */
-  TALER_TESTING_cmd_batch_set_current (cmd,
-                                       new_ip);
-  return GNUNET_OK;
-}
-
-
-/**
- * Run the "rewind" CMD.
- *
- * @param cls closure.
- * @param cmd command being executed now.
- * @param is the interpreter state.
- */
-static void
-rewind_ip_run (void *cls,
-               const struct TALER_TESTING_Command *cmd,
-               struct TALER_TESTING_Interpreter *is)
-{
-  struct RewindIpState *ris = cls;
-  const struct TALER_TESTING_Command *target;
-  unsigned int new_ip;
-
-  (void) cmd;
-  if (0 == ris->counter)
-  {
-    TALER_TESTING_interpreter_next (is);
-    return;
-  }
-  target
-    = TALER_TESTING_interpreter_lookup_command (is,
-                                                ris->target_label);
-  if (NULL == target)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  ris->counter--;
-  for (new_ip = 0;
-       NULL != is->commands[new_ip].label;
-       new_ip++)
-  {
-    const struct TALER_TESTING_Command *cmd = &is->commands[new_ip];
-
-    if (cmd == target)
-      break;
-    if (TALER_TESTING_cmd_is_batch (cmd))
-    {
-      int ret = seek_batch (is,
-                            cmd,
-                            target);
-      if (GNUNET_SYSERR == ret)
-        return;   /* failure! */
-      if (GNUNET_OK == ret)
-        break;
-    }
-  }
-  if (new_ip > (unsigned int) is->ip)
-  {
-    /* refuse to jump forward */
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  is->ip = new_ip - 1; /* -1 because the next function will advance by one */
-  TALER_TESTING_interpreter_next (is);
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_rewind_ip (const char *label,
-                             const char *target_label,
-                             unsigned int counter)
-{
-  struct RewindIpState *ris;
-
-  ris = GNUNET_new (struct RewindIpState);
-  ris->target_label = target_label;
-  ris->counter = counter;
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = ris,
-      .label = label,
-      .run = &rewind_ip_run
-    };
-
-    return cmd;
-  }
-}
diff --git a/src/testing/testing_api_cmd_run_fakebank.c b/src/testing/testing_api_cmd_run_fakebank.c
new file mode 100644
index 000000000..7739d3c0c
--- /dev/null
+++ b/src/testing/testing_api_cmd_run_fakebank.c
@@ -0,0 +1,214 @@
+/*
+  This file is part of TALER
+  (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_run_fakebank.c
+ * @brief Command to run fakebank in-process
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+
+/**
+ * State for a "run fakebank" CMD.
+ */
+struct RunFakebankState
+{
+
+  /**
+   * Our interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Handle to the fakebank we are running.
+   */
+  struct TALER_FAKEBANK_Handle *fakebank;
+
+  /**
+   * URL of the bank.
+   */
+  char *bank_url;
+
+  /**
+   * Currency to use.
+   */
+  char *currency;
+
+  /**
+   * Data for access control.
+   */
+  struct TALER_BANK_AuthenticationData ba;
+
+  /**
+   * Port to use.
+   */
+  uint16_t port;
+};
+
+
+/**
+ * Run the "get_exchange" command.
+ *
+ * @param cls closure.
+ * @param cmd the command currently being executed.
+ * @param is the interpreter state.
+ */
+static void
+run_fakebank_run (void *cls,
+                  const struct TALER_TESTING_Command *cmd,
+                  struct TALER_TESTING_Interpreter *is)
+{
+  struct RunFakebankState *rfs = cls;
+
+  (void) cmd;
+  rfs->fakebank = TALER_FAKEBANK_start (rfs->port,
+                                        rfs->currency);
+  if (NULL == rfs->fakebank)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  TALER_TESTING_interpreter_next (is);
+}
+
+
+/**
+ * Cleanup the state.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+run_fakebank_cleanup (void *cls,
+                      const struct TALER_TESTING_Command *cmd)
+{
+  struct RunFakebankState *rfs = cls;
+
+  if (NULL != rfs->fakebank)
+  {
+    TALER_FAKEBANK_stop (rfs->fakebank);
+    rfs->fakebank = NULL;
+  }
+  GNUNET_free (rfs->ba.wire_gateway_url);
+  GNUNET_free (rfs->bank_url);
+  GNUNET_free (rfs->currency);
+  GNUNET_free (rfs);
+}
+
+
+/**
+ * Offer internal data to a "run_fakebank" CMD state to other commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+run_fakebank_traits (void *cls,
+                     const void **ret,
+                     const char *trait,
+                     unsigned int index)
+{
+  struct RunFakebankState *rfs = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_bank_auth_data (&rfs->ba),
+    TALER_TESTING_make_trait_fakebank (rfs->fakebank),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_run_fakebank (
+  const char *label,
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *exchange_account_section)
+{
+  struct RunFakebankState *rfs;
+  unsigned long long fakebank_port;
+  char *exchange_payto_uri;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg,
+                                             "BANK",
+                                             "HTTP_PORT",
+                                             &fakebank_port))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "BANK",
+                               "HTTP_PORT");
+    GNUNET_assert (0);
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             exchange_account_section,
+                                             "PAYTO_URI",
+                                             &exchange_payto_uri))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               exchange_account_section,
+                               "PAYTO_URI");
+    GNUNET_assert (0);
+  }
+  rfs = GNUNET_new (struct RunFakebankState);
+  rfs->port = (uint16_t) fakebank_port;
+  GNUNET_asprintf (&rfs->bank_url,
+                   "http://localhost:%u/",
+                   (unsigned int) rfs->port);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_config_get_currency (cfg,
+                                            &rfs->currency));
+  {
+    char *exchange_xtalerbank_account;
+
+    exchange_xtalerbank_account
+      = TALER_xtalerbank_account_from_payto (exchange_payto_uri);
+    GNUNET_assert (NULL != exchange_xtalerbank_account);
+    GNUNET_asprintf (&rfs->ba.wire_gateway_url,
+                     "http://localhost:%u/%s/",
+                     (unsigned int) fakebank_port,
+                     exchange_xtalerbank_account);
+    GNUNET_free (exchange_xtalerbank_account);
+    GNUNET_free (exchange_payto_uri);
+  }
+  GNUNET_free (exchange_payto_uri);
+  rfs->ba.method = TALER_BANK_AUTH_NONE;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = rfs,
+      .label = label,
+      .run = &run_fakebank_run,
+      .cleanup = &run_fakebank_cleanup,
+      .traits = &run_fakebank_traits,
+      .name = "fakebank"
+    };
+
+    return cmd;
+  }
+}
diff --git a/src/testing/testing_api_cmd_serialize_keys.c b/src/testing/testing_api_cmd_serialize_keys.c
deleted file mode 100644
index ef912bf51..000000000
--- a/src/testing/testing_api_cmd_serialize_keys.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
-  This file is part of TALER
-  (C) 2018 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/>
-*/
-/**
- * @file testing/testing_api_cmd_serialize_keys.c
- * @brief Lets tests use the keys serialization API.
- * @author Marcello Stanisci
- */
-#include "platform.h"
-#include <jansson.h>
-#include "taler_testing_lib.h"
-
-
-/**
- * Internal state for a serialize-keys CMD.
- */
-struct SerializeKeysState
-{
-  /**
-   * Serialized keys.
-   */
-  json_t *keys;
-
-  /**
-   * Exchange URL.  Needed because the exchange gets disconnected
-   * from, after keys serialization.  This value is then needed by
-   * subsequent commands that have to reconnect to the exchange.
-   */
-  char *exchange_url;
-};
-
-
-/**
- * Internal state for a connect-with-state CMD.
- */
-struct ConnectWithStateState
-{
-
-  /**
-   * Reference to a CMD that offers a serialized key-state
-   * that will be used in the reconnection.
-   */
-  const char *state_reference;
-
-  /**
-   * If set to GNUNET_YES, then the /keys callback has already
-   * been passed the control to the next CMD.  This is necessary
-   * because it is not uncommon that the /keys callback gets
-   * invoked multiple times, and without this flag, we would keep
-   * going "next" CMD upon every invocation (causing impredictable
-   * behaviour as for the instruction pointer.)
-   */
-  unsigned int consumed;
-
-  /**
-   * Interpreter state.
-   */
-  struct TALER_TESTING_Interpreter *is;
-};
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-serialize_keys_run (void *cls,
-                    const struct TALER_TESTING_Command *cmd,
-                    struct TALER_TESTING_Interpreter *is)
-{
-  struct SerializeKeysState *sks = cls;
-
-  sks->keys = TALER_EXCHANGE_serialize_data (is->exchange);
-  if (NULL == sks->keys)
-    TALER_TESTING_interpreter_fail (is);
-
-  sks->exchange_url = GNUNET_strdup
-                        (TALER_EXCHANGE_get_base_url (is->exchange));
-  TALER_EXCHANGE_disconnect (is->exchange);
-  is->exchange = NULL;
-  is->working = GNUNET_NO;
-  TALER_TESTING_interpreter_next (is);
-}
-
-
-/**
- * Cleanup the state of a "serialize keys" CMD.
- *
- * @param cls closure.
- * @param cmd the command which is being cleaned up.
- */
-static void
-serialize_keys_cleanup (void *cls,
-                        const struct TALER_TESTING_Command *cmd)
-{
-  struct SerializeKeysState *sks = cls;
-
-  if (NULL != sks->keys)
-  {
-    json_decref (sks->keys);
-  }
-  GNUNET_free (sks->exchange_url);
-  GNUNET_free (sks);
-}
-
-
-/**
- * Offer serialized keys as trait.
- *
- * @param cls closure.
- * @param[out] ret result.
- * @param trait name of the trait.
- * @param index index number of the object to offer.
- * @return #GNUNET_OK on success.
- */
-static enum GNUNET_GenericReturnValue
-serialize_keys_traits (void *cls,
-                       const void **ret,
-                       const char *trait,
-                       unsigned int index)
-{
-  struct SerializeKeysState *sks = cls;
-  struct TALER_TESTING_Trait traits[] = {
-    TALER_TESTING_make_trait_exchange_keys (sks->keys),
-    TALER_TESTING_make_trait_exchange_url (
-      (const char **) &sks->exchange_url),
-    TALER_TESTING_trait_end ()
-  };
-
-  return TALER_TESTING_get_trait (traits,
-                                  ret,
-                                  trait,
-                                  index);
-}
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param cmd the command to execute.
- * @param is the interpreter state.
- */
-static void
-connect_with_state_run (void *cls,
-                        const struct TALER_TESTING_Command *cmd,
-                        struct TALER_TESTING_Interpreter *is)
-{
-  struct ConnectWithStateState *cwss = cls;
-  const struct TALER_TESTING_Command *state_cmd;
-  const json_t *serialized_keys;
-  const char **exchange_url;
-
-  /* This command usually gets rescheduled after serialized
-   * reconnection.  */
-  if (GNUNET_YES == cwss->consumed)
-  {
-    TALER_TESTING_interpreter_next (is);
-    return;
-  }
-
-  cwss->is = is;
-  state_cmd = TALER_TESTING_interpreter_lookup_command (is,
-                                                        cwss->state_reference);
-
-  /* Command providing serialized keys not found.  */
-  if (NULL == state_cmd)
-  {
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_TESTING_get_trait_exchange_keys (state_cmd,
-                                                        &serialized_keys));
-  {
-    char *dump;
-
-    dump = json_dumps (serialized_keys,
-                       JSON_INDENT (1));
-    TALER_LOG_DEBUG ("Serialized key-state: %s\n",
-                     dump);
-    free (dump);
-  }
-
-  GNUNET_assert (GNUNET_OK ==
-                 TALER_TESTING_get_trait_exchange_url (state_cmd,
-                                                       &exchange_url));
-  is->exchange = TALER_EXCHANGE_connect (is->ctx,
-                                         *exchange_url,
-                                         &TALER_TESTING_cert_cb,
-                                         cwss,
-                                         TALER_EXCHANGE_OPTION_DATA,
-                                         serialized_keys,
-                                         TALER_EXCHANGE_OPTION_END);
-  cwss->consumed = GNUNET_YES;
-}
-
-
-/**
- * Cleanup the state of a "connect with state" CMD.  Just
- * a placeholder to avoid jumping on an invalid address.
- *
- * @param cls closure.
- * @param cmd the command which is being cleaned up.
- */
-static void
-connect_with_state_cleanup (void *cls,
-                            const struct TALER_TESTING_Command *cmd)
-{
-  struct ConnectWithStateState *cwss = cls;
-
-  GNUNET_free (cwss);
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_serialize_keys (const char *label)
-{
-  struct SerializeKeysState *sks;
-
-  sks = GNUNET_new (struct SerializeKeysState);
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = sks,
-      .label = label,
-      .run = serialize_keys_run,
-      .cleanup = serialize_keys_cleanup,
-      .traits = serialize_keys_traits
-    };
-
-    return cmd;
-  }
-}
-
-
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_connect_with_state (const char *label,
-                                      const char *state_reference)
-{
-  struct ConnectWithStateState *cwss;
-
-  cwss = GNUNET_new (struct ConnectWithStateState);
-  cwss->state_reference = state_reference;
-  cwss->consumed = GNUNET_NO;
-  {
-    struct TALER_TESTING_Command cmd = {
-      .cls = cwss,
-      .label = label,
-      .run = connect_with_state_run,
-      .cleanup = connect_with_state_cleanup
-    };
-
-    return cmd;
-  }
-}
diff --git a/src/testing/testing_api_cmd_set_officer.c b/src/testing/testing_api_cmd_set_officer.c
new file mode 100644
index 000000000..4fbe5e368
--- /dev/null
+++ b/src/testing/testing_api_cmd_set_officer.c
@@ -0,0 +1,301 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_set_officer.c
+ * @brief command for testing /management/aml-officers
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * State for a "set_officer" CMD.
+ */
+struct SetOfficerState
+{
+
+  /**
+   * Update AML officer handle while operation is running.
+   */
+  struct TALER_EXCHANGE_ManagementUpdateAmlOfficer *dh;
+
+  /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Reference to command to previous set officer
+   * to update, or NULL.
+   */
+  const char *ref_cmd;
+
+  /**
+   * Name to use for the officer.
+   */
+  const char *name;
+
+  /**
+   * Private key of the AML officer.
+   */
+  struct TALER_AmlOfficerPrivateKeyP officer_priv;
+
+  /**
+   * Public key of the AML officer.
+   */
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+
+  /**
+   * Is the officer supposed to be enabled?
+   */
+  bool is_active;
+
+  /**
+   * Is access supposed to be read-only?
+   */
+  bool read_only;
+
+};
+
+
+/**
+ * Callback to analyze the /management/XXX response, just used to check
+ * if the response code is acceptable.
+ *
+ * @param cls closure.
+ * @param ar response details
+ */
+static void
+set_officer_cb (void *cls,
+                const struct
+                TALER_EXCHANGE_ManagementUpdateAmlOfficerResponse *ar)
+{
+  struct SetOfficerState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &ar->hr;
+
+  ds->dh = NULL;
+  if (MHD_HTTP_NO_CONTENT != hr->http_status)
+  {
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     MHD_HTTP_NO_CONTENT);
+    return;
+  }
+  TALER_TESTING_interpreter_next (ds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+set_officer_run (void *cls,
+                 const struct TALER_TESTING_Command *cmd,
+                 struct TALER_TESTING_Interpreter *is)
+{
+  struct SetOfficerState *ds = cls;
+  struct GNUNET_TIME_Timestamp now;
+  struct TALER_MasterSignatureP master_sig;
+  const char *exchange_url;
+
+  (void) cmd;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
+  now = GNUNET_TIME_timestamp_get ();
+  ds->is = is;
+  if (NULL == ds->ref_cmd)
+  {
+    GNUNET_CRYPTO_eddsa_key_create (&ds->officer_priv.eddsa_priv);
+    GNUNET_CRYPTO_eddsa_key_get_public (&ds->officer_priv.eddsa_priv,
+                                        &ds->officer_pub.eddsa_pub);
+  }
+  else
+  {
+    const struct TALER_TESTING_Command *ref;
+    const struct TALER_AmlOfficerPrivateKeyP *officer_priv;
+    const struct TALER_AmlOfficerPublicKeyP *officer_pub;
+
+    ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                    ds->ref_cmd);
+    if (NULL == ref)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_officer_pub (ref,
+                                                        &officer_pub));
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_officer_priv (ref,
+                                                         &officer_priv));
+    ds->officer_pub = *officer_pub;
+    ds->officer_priv = *officer_priv;
+  }
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
+
+    TALER_exchange_offline_aml_officer_status_sign (&ds->officer_pub,
+                                                    ds->name,
+                                                    now,
+                                                    ds->is_active,
+                                                    ds->read_only,
+                                                    master_priv,
+                                                    &master_sig);
+  }
+  ds->dh = TALER_EXCHANGE_management_update_aml_officer (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    &ds->officer_pub,
+    ds->name,
+    now,
+    ds->is_active,
+    ds->read_only,
+    &master_sig,
+    &set_officer_cb,
+    ds);
+  if (NULL == ds->dh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "set_officer" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct SetOfficerState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+set_officer_cleanup (void *cls,
+                     const struct TALER_TESTING_Command *cmd)
+{
+  struct SetOfficerState *ds = cls;
+
+  if (NULL != ds->dh)
+  {
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_management_update_aml_officer_cancel (ds->dh);
+    ds->dh = NULL;
+  }
+  GNUNET_free (ds);
+}
+
+
+/**
+ * Offer internal data of a "set officer" CMD state to other
+ * commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+set_officer_traits (void *cls,
+                    const void **ret,
+                    const char *trait,
+                    unsigned int index)
+{
+  struct SetOfficerState *ws = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_officer_pub (&ws->officer_pub),
+    TALER_TESTING_make_trait_officer_priv (&ws->officer_priv),
+    TALER_TESTING_make_trait_officer_name (ws->name),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_set_officer (
+  const char *label,
+  const char *ref_cmd,
+  const char *name,
+  bool is_active,
+  bool read_only)
+{
+  struct SetOfficerState *ds;
+
+  ds = GNUNET_new (struct SetOfficerState);
+  ds->ref_cmd = ref_cmd;
+  ds->name = name;
+  ds->is_active = is_active;
+  ds->read_only = read_only;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &set_officer_run,
+      .cleanup = &set_officer_cleanup,
+      .traits = &set_officer_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_set_officer.c */
diff --git a/src/testing/testing_api_cmd_set_wire_fee.c b/src/testing/testing_api_cmd_set_wire_fee.c
index 8eb993878..460a71e40 100644
--- a/src/testing/testing_api_cmd_set_wire_fee.c
+++ b/src/testing/testing_api_cmd_set_wire_fee.c
@@ -61,11 +61,6 @@ struct WireFeeState
   const char *closing_fee;
 
   /**
-   * Wad fee amount to use.
-   */
-  const char *wad_fee;
-
-  /**
    * Expected HTTP response code.
    */
   unsigned int expected_response_code;
@@ -82,27 +77,21 @@ struct WireFeeState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param sfr response details
  */
 static void
 wire_add_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementSetWireFeeResponse *sfr)
 {
   struct WireFeeState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &sfr->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -127,8 +116,24 @@ wire_add_run (void *cls,
   struct GNUNET_TIME_Timestamp start_time;
   struct GNUNET_TIME_Timestamp end_time;
   struct TALER_WireFeeSet fees;
+  const char *exchange_url;
 
   (void) cmd;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
   ds->is = is;
   now = GNUNET_TIME_absolute_get ();
   start_time = GNUNET_TIME_absolute_to_timestamp (
@@ -141,9 +146,6 @@ wire_add_run (void *cls,
         TALER_string_to_amount (ds->closing_fee,
                                 &fees.closing)) ||
        (GNUNET_OK !=
-        TALER_string_to_amount (ds->wad_fee,
-                                &fees.wad)) ||
-       (GNUNET_OK !=
         TALER_string_to_amount (ds->wire_fee,
                                 &fees.wire)) )
   {
@@ -160,16 +162,30 @@ wire_add_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_wire_fee_sign (ds->wire_method,
                                           start_time,
                                           end_time,
                                           &fees,
-                                          &is->master_priv,
+                                          master_priv,
                                           &master_sig);
   }
   ds->dh = TALER_EXCHANGE_management_set_wire_fees (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     ds->wire_method,
     start_time,
     end_time,
@@ -201,10 +217,8 @@ wire_add_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_set_wire_fees_cancel (ds->dh);
     ds->dh = NULL;
   }
@@ -217,7 +231,6 @@ TALER_TESTING_cmd_set_wire_fee (const char *label,
                                 const char *wire_method,
                                 const char *wire_fee,
                                 const char *closing_fee,
-                                const char *wad_fee,
                                 unsigned int expected_http_status,
                                 bool bad_sig)
 {
@@ -229,7 +242,6 @@ TALER_TESTING_cmd_set_wire_fee (const char *label,
   ds->wire_method = wire_method;
   ds->wire_fee = wire_fee;
   ds->closing_fee = closing_fee;
-  ds->wad_fee = wad_fee;
   {
     struct TALER_TESTING_Command cmd = {
       .cls = ds,
diff --git a/src/testing/testing_api_cmd_stat.c b/src/testing/testing_api_cmd_stat.c
index 5d41c05c9..8723aac0d 100644
--- a/src/testing/testing_api_cmd_stat.c
+++ b/src/testing/testing_api_cmd_stat.c
@@ -28,6 +28,19 @@
 
 
 /**
+ * Run a "stat" CMD.
+ *
+ * @param cls closure.
+ * @param cmd the command being run.
+ * @param is the interpreter state.
+ */
+static void
+stat_run (void *cls,
+          const struct TALER_TESTING_Command *cmd,
+          struct TALER_TESTING_Interpreter *is);
+
+
+/**
  * Add the time @a cmd took to the respective duration in @a timings.
  *
  * @param timings where to add up times
@@ -40,9 +53,20 @@ stat_cmd (struct TALER_TESTING_Timer *timings,
   struct GNUNET_TIME_Relative duration;
   struct GNUNET_TIME_Relative lat;
 
-  if (cmd->start_time.abs_value_us > cmd->finish_time.abs_value_us)
+  if (GNUNET_TIME_absolute_cmp (cmd->start_time,
+                                >,
+                                cmd->finish_time))
   {
-    GNUNET_break (0);
+    /* This is a problem, except of course for
+       this command itself, as we clearly did not yet
+       finish... */
+    if (cmd->run != &stat_run)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Bad timings for `%s'\n",
+                  cmd->label);
+      GNUNET_break (0);
+    }
     return;
   }
   duration = GNUNET_TIME_absolute_get_difference (cmd->start_time,
@@ -74,16 +98,18 @@ stat_cmd (struct TALER_TESTING_Timer *timings,
 /**
  * Obtain statistics for @a timings of @a cmd
  *
- * @param timings what timings to get
+ * @param[in,out] cls what timings to get
  * @param cmd command to process
  */
 static void
-do_stat (struct TALER_TESTING_Timer *timings,
+do_stat (void *cls,
          const struct TALER_TESTING_Command *cmd)
 {
+  struct TALER_TESTING_Timer *timings = cls;
+
   if (TALER_TESTING_cmd_is_batch (cmd))
   {
-    struct TALER_TESTING_Command **bcmd;
+    struct TALER_TESTING_Command *bcmd;
 
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_batch_cmds (cmd,
@@ -92,18 +118,15 @@ do_stat (struct TALER_TESTING_Timer *timings,
       GNUNET_break (0);
       return;
     }
-
     for (unsigned int j = 0;
-         NULL != (*bcmd)[j].label;
+         NULL != bcmd[j].label;
          j++)
       do_stat (timings,
-               &(*bcmd)[j]);
-  }
-  else
-  {
-    stat_cmd (timings,
-              cmd);
+               &bcmd[j]);
+    return;
   }
+  stat_cmd (timings,
+            cmd);
 }
 
 
@@ -121,13 +144,10 @@ stat_run (void *cls,
 {
   struct TALER_TESTING_Timer *timings = cls;
 
-  for (unsigned int i = 0; NULL != is->commands[i].label; i++)
-  {
-    if (cmd == &is->commands[i])
-      break; /* skip at our current command */
-    do_stat (timings,
-             &is->commands[i]);
-  }
+  TALER_TESTING_iterate (is,
+                         true,
+                         &do_stat,
+                         timings);
   TALER_TESTING_interpreter_next (is);
 }
 
@@ -137,7 +157,7 @@ TALER_TESTING_cmd_stat (struct TALER_TESTING_Timer *timers)
 {
   struct TALER_TESTING_Command cmd = {
     .label = "stat",
-    .run = stat_run,
+    .run = &stat_run,
     .cls = (void *) timers
   };
 
@@ -145,4 +165,4 @@ TALER_TESTING_cmd_stat (struct TALER_TESTING_Timer *timers)
 }
 
 
-/* end of testing_api_cmd_sleep.c  */
+/* end of testing_api_cmd_stat.c  */
diff --git a/src/testing/testing_api_cmd_system_start.c b/src/testing/testing_api_cmd_system_start.c
new file mode 100644
index 000000000..541ad75c1
--- /dev/null
+++ b/src/testing/testing_api_cmd_system_start.c
@@ -0,0 +1,395 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_system_start.c
+ * @brief run taler-benchmark-setup.sh command
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_signatures.h"
+#include "taler_testing_lib.h"
+
+
+/**
+ * State for a "system" CMD.
+ */
+struct SystemState
+{
+
+  /**
+   * System process.
+   */
+  struct GNUNET_OS_Process *system_proc;
+
+  /**
+   * Input pipe to @e system_proc, used to keep the
+   * process alive until we are done.
+   */
+  struct GNUNET_DISK_PipeHandle *pipe_in;
+
+  /**
+   * Output pipe to @e system_proc, used to find out
+   * when the services are ready.
+   */
+  struct GNUNET_DISK_PipeHandle *pipe_out;
+
+  /**
+   * Task reading from @e pipe_in.
+   */
+  struct GNUNET_SCHEDULER_Task *reader;
+
+  /**
+   * Waiting for child to die.
+   */
+  struct GNUNET_ChildWaitHandle *cwh;
+
+  /**
+   * Our interpreter state.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * NULL-terminated array of command-line arguments.
+   */
+  char **args;
+
+  /**
+   * Current input buffer, 0-terminated.  Contains the last 15 bytes of input
+   * so we can search them again for the "<<READY>>" tag.
+   */
+  char ibuf[16];
+
+  /**
+   * Did we find the ready tag?
+   */
+  bool ready;
+
+  /**
+   * Is the child process still running?
+   */
+  bool active;
+};
+
+
+/**
+ * Defines a GNUNET_ChildCompletedCallback which is sent back
+ * upon death or completion of a child process.
+ *
+ * @param cls our `struct SystemState *`
+ * @param type type of the process
+ * @param exit_code status code of the process
+ */
+static void
+setup_terminated (void *cls,
+                  enum GNUNET_OS_ProcessStatusType type,
+                  long unsigned int exit_code)
+{
+  struct SystemState *as = cls;
+
+  as->cwh = NULL;
+  as->active = false;
+  if (NULL != as->reader)
+  {
+    GNUNET_SCHEDULER_cancel (as->reader);
+    as->reader = NULL;
+  }
+  if (! as->ready)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Launching Taler system failed: %d/%llu\n",
+                (int) type,
+                (unsigned long long) exit_code);
+    TALER_TESTING_interpreter_fail (as->is);
+    return;
+  }
+}
+
+
+/**
+ * Start helper to read from stdout of child.
+ *
+ * @param as our system state
+ */
+static void
+start_reader (struct SystemState *as);
+
+
+static void
+read_stdout (void *cls)
+{
+  struct SystemState *as = cls;
+  const struct GNUNET_DISK_FileHandle *fh;
+  char buf[1024 * 10];
+  ssize_t ret;
+  size_t off = 0;
+
+  as->reader = NULL;
+  strcpy (buf,
+          as->ibuf);
+  off = strlen (buf);
+  fh = GNUNET_DISK_pipe_handle (as->pipe_out,
+                                GNUNET_DISK_PIPE_END_READ);
+  ret = GNUNET_DISK_file_read (fh,
+                               &buf[off],
+                               sizeof (buf) - off);
+  if (-1 == ret)
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                         "read");
+    TALER_TESTING_interpreter_fail (as->is);
+    return;
+  }
+  if (0 == ret)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Child closed stdout\n");
+    return;
+  }
+  /* forward log, except single '.' outputs */
+  if ( (1 != ret) ||
+       ('.' != buf[off]) )
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "TUS: %.*s\n",
+                (int) ret,
+                &buf[off]);
+  start_reader (as);
+  off += ret;
+  if (as->ready)
+  {
+    /* already done */
+    return;
+  }
+  if (NULL !=
+      memmem (buf,
+              off,
+              "\n<<READY>>\n",
+              strlen ("\n<<READY>>\n")))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Taler system UP\n");
+    as->ready = true;
+    TALER_TESTING_interpreter_next (as->is);
+    return;
+  }
+
+  {
+    size_t mcpy;
+
+    mcpy = GNUNET_MIN (off,
+                       sizeof (as->ibuf) - 1);
+    memcpy (as->ibuf,
+            &buf[off - mcpy],
+            mcpy);
+    as->ibuf[mcpy] = '\0';
+  }
+}
+
+
+static void
+start_reader (struct SystemState *as)
+{
+  const struct GNUNET_DISK_FileHandle *fh;
+
+  GNUNET_assert (NULL == as->reader);
+  fh = GNUNET_DISK_pipe_handle (as->pipe_out,
+                                GNUNET_DISK_PIPE_END_READ);
+  as->reader = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                               fh,
+                                               &read_stdout,
+                                               as);
+}
+
+
+/**
+ * Run the command.  Use the `taler-exchange-system' program.
+ *
+ * @param cls closure.
+ * @param cmd command being run.
+ * @param is interpreter state.
+ */
+static void
+system_run (void *cls,
+            const struct TALER_TESTING_Command *cmd,
+            struct TALER_TESTING_Interpreter *is)
+{
+  struct SystemState *as = cls;
+
+  (void) cmd;
+  as->is = is;
+  as->pipe_in = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_READ);
+  GNUNET_assert (NULL != as->pipe_in);
+  as->pipe_out = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
+  GNUNET_assert (NULL != as->pipe_out);
+  as->system_proc
+    = GNUNET_OS_start_process_vap (
+        GNUNET_OS_INHERIT_STD_ERR,
+        as->pipe_in, as->pipe_out, NULL,
+        "taler-unified-setup.sh",
+        as->args);
+  if (NULL == as->system_proc)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  as->active = true;
+  start_reader (as);
+  as->cwh = GNUNET_wait_child (as->system_proc,
+                               &setup_terminated,
+                               as);
+}
+
+
+/**
+ * Free the state of a "system" CMD, and possibly kill its
+ * process if it did not terminate correctly.
+ *
+ * @param cls closure.
+ * @param cmd the command being freed.
+ */
+static void
+system_cleanup (void *cls,
+                const struct TALER_TESTING_Command *cmd)
+{
+  struct SystemState *as = cls;
+
+  (void) cmd;
+  if (NULL != as->cwh)
+  {
+    GNUNET_wait_child_cancel (as->cwh);
+    as->cwh = NULL;
+  }
+  if (NULL != as->reader)
+  {
+    GNUNET_SCHEDULER_cancel (as->reader);
+    as->reader = NULL;
+  }
+  if (NULL != as->system_proc)
+  {
+    if (as->active)
+    {
+      GNUNET_break (0 ==
+                    GNUNET_OS_process_kill (as->system_proc,
+                                            SIGTERM));
+      GNUNET_OS_process_wait (as->system_proc);
+    }
+    GNUNET_OS_process_destroy (as->system_proc);
+    as->system_proc = NULL;
+  }
+  if (NULL != as->pipe_in)
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_pipe_close (as->pipe_in));
+    as->pipe_in = NULL;
+  }
+  if (NULL != as->pipe_out)
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_pipe_close (as->pipe_out));
+    as->pipe_out = NULL;
+  }
+
+  for (unsigned int i = 0; NULL != as->args[i]; i++)
+    GNUNET_free (as->args[i]);
+  GNUNET_free (as->args);
+  GNUNET_free (as);
+}
+
+
+/**
+ * Offer "system" CMD internal data to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+system_traits (void *cls,
+               const void **ret,
+               const char *trait,
+               unsigned int index)
+{
+  struct SystemState *as = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_process (&as->system_proc),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_system_start (
+  const char *label,
+  const char *config_file,
+  ...)
+{
+  struct SystemState *as;
+  va_list ap;
+  const char *arg;
+  unsigned int cnt;
+
+  as = GNUNET_new (struct SystemState);
+  cnt = 4; /* 0-2 reserved, +1 for NULL termination */
+  va_start (ap,
+            config_file);
+  while (NULL != (arg = va_arg (ap,
+                                const char *)))
+  {
+    cnt++;
+  }
+  va_end (ap);
+  as->args = GNUNET_new_array (cnt,
+                               char *);
+  as->args[0] = GNUNET_strdup ("taler-unified-setup");
+  as->args[1] = GNUNET_strdup ("-c");
+  as->args[2] = GNUNET_strdup (config_file);
+  cnt = 3;
+  va_start (ap,
+            config_file);
+  while (NULL != (arg = va_arg (ap,
+                                const char *)))
+  {
+    as->args[cnt++] = GNUNET_strdup (arg);
+  }
+  va_end (ap);
+
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = as,
+      .label = label,
+      .run = &system_run,
+      .cleanup = &system_cleanup,
+      .traits = &system_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_system_start.c */
diff --git a/src/testing/testing_api_cmd_take_aml_decision.c b/src/testing/testing_api_cmd_take_aml_decision.c
new file mode 100644
index 000000000..c0e23de22
--- /dev/null
+++ b/src/testing/testing_api_cmd_take_aml_decision.c
@@ -0,0 +1,321 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file testing/testing_api_cmd_take_aml_decision.c
+ * @brief command for testing /aml/$OFFICER_PUB/decision
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_json_lib.h"
+#include <gnunet/gnunet_curl_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_signatures.h"
+#include "backoff.h"
+
+
+/**
+ * State for a "take_aml_decision" CMD.
+ */
+struct AmlDecisionState
+{
+
+  /**
+   * Auditor enable handle while operation is running.
+   */
+  struct TALER_EXCHANGE_AddAmlDecision *dh;
+
+  /**
+   * Our interpreter.
+   */
+  struct TALER_TESTING_Interpreter *is;
+
+  /**
+   * Reference to command to previous set officer command that gives
+   * us an officer_priv trait.
+   */
+  const char *officer_ref_cmd;
+
+  /**
+   * Reference to command to previous AML-triggering event that gives
+   * us a payto-hash trait.
+   */
+  const char *account_ref_cmd;
+
+  /**
+   * Payto hash of the account we are manipulating the AML settings for.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * New AML state to use.
+   */
+  enum TALER_AmlDecisionState new_state;
+
+  /**
+   * Justification given.
+   */
+  const char *justification;
+
+  /**
+   * KYC requirement to add.
+   */
+  const char *kyc_requirement;
+
+  /**
+   * Threshold transaction amount.
+   */
+  struct TALER_Amount new_threshold;
+
+  /**
+   * Expected response code.
+   */
+  unsigned int expected_response;
+};
+
+
+/**
+ * Callback to analyze the /aml-decision/$OFFICER_PUB response, just used to check
+ * if the response code is acceptable.
+ *
+ * @param cls closure.
+ * @param adr response details
+ */
+static void
+take_aml_decision_cb (
+  void *cls,
+  const struct TALER_EXCHANGE_AddAmlDecisionResponse *adr)
+{
+  struct AmlDecisionState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &adr->hr;
+
+  ds->dh = NULL;
+  if (ds->expected_response != hr->http_status)
+  {
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response);
+    return;
+  }
+  TALER_TESTING_interpreter_next (ds->is);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+take_aml_decision_run (void *cls,
+                       const struct TALER_TESTING_Command *cmd,
+                       struct TALER_TESTING_Interpreter *is)
+{
+  struct AmlDecisionState *ds = cls;
+  struct GNUNET_TIME_Timestamp now;
+  const struct TALER_PaytoHashP *h_payto;
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv;
+  const struct TALER_TESTING_Command *ref;
+  json_t *kyc_requirements = NULL;
+  const char *exchange_url;
+
+  (void) cmd;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
+  now = GNUNET_TIME_timestamp_get ();
+  ds->is = is;
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ds->account_ref_cmd);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_h_payto (ref,
+                                       &h_payto))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  ref = TALER_TESTING_interpreter_lookup_command (is,
+                                                  ds->officer_ref_cmd);
+  if (NULL == ref)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_officer_priv (ref,
+                                            &officer_priv))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  ds->h_payto = *h_payto;
+  if (NULL != ds->kyc_requirement)
+  {
+    kyc_requirements = json_array ();
+    GNUNET_assert (NULL != kyc_requirements);
+    GNUNET_assert (0 ==
+                   json_array_append (kyc_requirements,
+                                      json_string (ds->kyc_requirement)));
+  }
+
+  ds->dh = TALER_EXCHANGE_add_aml_decision (
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
+    ds->justification,
+    now,
+    &ds->new_threshold,
+    h_payto,
+    ds->new_state,
+    kyc_requirements,
+    officer_priv,
+    &take_aml_decision_cb,
+    ds);
+  json_decref (kyc_requirements);
+  if (NULL == ds->dh)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+}
+
+
+/**
+ * Free the state of a "take_aml_decision" CMD, and possibly cancel a
+ * pending operation thereof.
+ *
+ * @param cls closure, must be a `struct AmlDecisionState`.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+take_aml_decision_cleanup (void *cls,
+                           const struct TALER_TESTING_Command *cmd)
+{
+  struct AmlDecisionState *ds = cls;
+
+  if (NULL != ds->dh)
+  {
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
+    TALER_EXCHANGE_add_aml_decision_cancel (ds->dh);
+    ds->dh = NULL;
+  }
+  GNUNET_free (ds);
+}
+
+
+/**
+ * Offer internal data of a "AML decision" CMD state to other
+ * commands.
+ *
+ * @param cls closure
+ * @param[out] ret result (could be anything)
+ * @param trait name of the trait
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+take_aml_decision_traits (void *cls,
+                          const void **ret,
+                          const char *trait,
+                          unsigned int index)
+{
+  struct AmlDecisionState *ws = cls;
+  struct TALER_TESTING_Trait traits[] = {
+    TALER_TESTING_make_trait_h_payto (&ws->h_payto),
+    TALER_TESTING_make_trait_aml_justification (ws->justification),
+    TALER_TESTING_make_trait_aml_decision (&ws->new_state),
+    TALER_TESTING_make_trait_amount (&ws->new_threshold),
+    TALER_TESTING_trait_end ()
+  };
+
+  return TALER_TESTING_get_trait (traits,
+                                  ret,
+                                  trait,
+                                  index);
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_take_aml_decision (
+  const char *label,
+  const char *ref_officer,
+  const char *ref_operation,
+  const char *new_threshold,
+  const char *justification,
+  enum TALER_AmlDecisionState new_state,
+  const char *kyc_requirement,
+  unsigned int expected_response)
+{
+  struct AmlDecisionState *ds;
+
+  ds = GNUNET_new (struct AmlDecisionState);
+  ds->officer_ref_cmd = ref_officer;
+  ds->account_ref_cmd = ref_operation;
+  ds->kyc_requirement = kyc_requirement;
+  if (GNUNET_OK !=
+      TALER_string_to_amount (new_threshold,
+                              &ds->new_threshold))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to parse amount `%s' at %s\n",
+                new_threshold,
+                label);
+    GNUNET_assert (0);
+  }
+  ds->new_state = new_state;
+  ds->justification = justification;
+  ds->expected_response = expected_response;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ds,
+      .label = label,
+      .run = &take_aml_decision_run,
+      .cleanup = &take_aml_decision_cleanup,
+      .traits = &take_aml_decision_traits
+    };
+
+    return cmd;
+  }
+}
+
+
+/* end of testing_api_cmd_take_aml_decision.c */
diff --git a/src/testing/testing_api_cmd_transfer_get.c b/src/testing/testing_api_cmd_transfer_get.c
index 3c467e6da..405c8b7f9 100644
--- a/src/testing/testing_api_cmd_transfer_get.c
+++ b/src/testing/testing_api_cmd_transfer_get.c
@@ -44,6 +44,11 @@ struct TrackTransferState
   const char *expected_wire_fee;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Reference to any operation that can provide a WTID.
    * Will be the WTID to track.
    */
@@ -98,10 +103,8 @@ track_transfer_cleanup (void *cls,
 
   if (NULL != tts->tth)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                tts->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (tts->is,
+                                      cmd->label);
     TALER_EXCHANGE_transfers_get_cancel (tts->tth);
     tts->tth = NULL;
   }
@@ -115,180 +118,178 @@ track_transfer_cleanup (void *cls,
  * wire fees and hashed wire details as well.
  *
  * @param cls closure.
- * @param hr HTTP response details
- * @param ta transfer data returned by the exchange
+ * @param tgr response details
  */
 static void
 track_transfer_cb (void *cls,
-                   const struct TALER_EXCHANGE_HttpResponse *hr,
-                   const struct TALER_EXCHANGE_TransferData *ta)
+                   const struct TALER_EXCHANGE_TransfersGetResponse *tgr)
 {
   struct TrackTransferState *tts = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &tgr->hr;
   struct TALER_TESTING_Interpreter *is = tts->is;
-  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
   struct TALER_Amount expected_amount;
 
   tts->tth = NULL;
   if (tts->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                hr->http_status,
-                (int) hr->ec,
-                cmd->label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status (is,
+                                     hr->http_status,
+                                     tts->expected_response_code);
     return;
   }
 
   switch (hr->http_status)
   {
   case MHD_HTTP_OK:
-    if (NULL == tts->expected_total_amount)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    if (NULL == tts->expected_wire_fee)
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (GNUNET_OK !=
-        TALER_string_to_amount (tts->expected_total_amount,
-                                &expected_amount))
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-    if (0 != TALER_amount_cmp (&ta->total_amount,
-                               &expected_amount))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Total amount mismatch to command %s - "
-                  "%s vs %s\n",
-                  cmd->label,
-                  TALER_amount_to_string (&ta->total_amount),
-                  TALER_amount_to_string (&expected_amount));
-      json_dumpf (hr->reply,
-                  stderr,
-                  0);
-      fprintf (stderr, "\n");
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (GNUNET_OK !=
-        TALER_string_to_amount (tts->expected_wire_fee,
-                                &expected_amount))
-    {
-      GNUNET_break (0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
-
-    if (0 != TALER_amount_cmp (&ta->wire_fee,
-                               &expected_amount))
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Wire fee mismatch to command %s\n",
-                  cmd->label);
-      json_dumpf (hr->reply,
-                  stderr,
-                  0);
-      TALER_TESTING_interpreter_fail (is);
-      return;
-    }
+      const struct TALER_EXCHANGE_TransferData *ta
+        = &tgr->details.ok.td;
 
-    /**
-     * Optionally checking: (1) wire-details for this transfer
-     * match the ones from a referenced "deposit" operation -
-     * or any operation that could provide wire-details.  (2)
-     * Total amount for this transfer matches the one from any
-     * referenced command that could provide one.
-     */
-    if (NULL != tts->wire_details_reference)
-    {
-      const struct TALER_TESTING_Command *wire_details_cmd;
-      const char **payto_uri;
-      struct TALER_PaytoHashP h_payto;
-
-      wire_details_cmd
-        = TALER_TESTING_interpreter_lookup_command (is,
-                                                    tts->wire_details_reference);
-      if (NULL == wire_details_cmd)
+      if (NULL == tts->expected_total_amount)
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (is);
+        return;
+      }
+      if (NULL == tts->expected_wire_fee)
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
+
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
-                                             &payto_uri))
+          TALER_string_to_amount (tts->expected_total_amount,
+                                  &expected_amount))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-      TALER_payto_hash (*payto_uri,
-                        &h_payto);
-      if (0 != GNUNET_memcmp (&h_payto,
-                              &ta->h_payto))
+      if (0 != TALER_amount_cmp (&ta->total_amount,
+                                 &expected_amount))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Wire hash missmath to command %s\n",
-                    cmd->label);
+                    "Total amount mismatch to command %s - "
+                    "%s vs %s\n",
+                    tts->cmd->label,
+                    TALER_amount_to_string (&ta->total_amount),
+                    TALER_amount_to_string (&expected_amount));
         json_dumpf (hr->reply,
                     stderr,
                     0);
+        fprintf (stderr, "\n");
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-    }
-    if (NULL != tts->total_amount_reference)
-    {
-      const struct TALER_TESTING_Command *total_amount_cmd;
-      const struct TALER_Amount *total_amount_from_reference;
 
-      total_amount_cmd
-        = TALER_TESTING_interpreter_lookup_command (is,
-                                                    tts->total_amount_reference);
-      if (NULL == total_amount_cmd)
-      {
-        GNUNET_break (0);
-        TALER_TESTING_interpreter_fail (is);
-        return;
-      }
       if (GNUNET_OK !=
-          TALER_TESTING_get_trait_amount (total_amount_cmd,
-                                          &total_amount_from_reference))
+          TALER_string_to_amount (tts->expected_wire_fee,
+                                  &expected_amount))
       {
         GNUNET_break (0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-      if (0 != TALER_amount_cmp (&ta->total_amount,
-                                 total_amount_from_reference))
+
+      if (0 != TALER_amount_cmp (&ta->wire_fee,
+                                 &expected_amount))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                    "Amount missmath to command %s\n",
-                    cmd->label);
+                    "Wire fee mismatch to command %s\n",
+                    tts->cmd->label);
         json_dumpf (hr->reply,
                     stderr,
                     0);
         TALER_TESTING_interpreter_fail (is);
         return;
       }
-    }
-  }
+
+      /**
+       * Optionally checking: (1) wire-details for this transfer
+       * match the ones from a referenced "deposit" operation -
+       * or any operation that could provide wire-details.  (2)
+       * Total amount for this transfer matches the one from any
+       * referenced command that could provide one.
+       */
+      if (NULL != tts->wire_details_reference)
+      {
+        const struct TALER_TESTING_Command *wire_details_cmd;
+        const char *payto_uri;
+        struct TALER_PaytoHashP h_payto;
+
+        wire_details_cmd
+          = TALER_TESTING_interpreter_lookup_command (is,
+                                                      tts->
+                                                      wire_details_reference);
+        if (NULL == wire_details_cmd)
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (GNUNET_OK !=
+            TALER_TESTING_get_trait_payto_uri (wire_details_cmd,
+                                               &payto_uri))
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        TALER_payto_hash (payto_uri,
+                          &h_payto);
+        if (0 != GNUNET_memcmp (&h_payto,
+                                &ta->h_payto))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Wire hash missmath to command %s\n",
+                      tts->cmd->label);
+          json_dumpf (hr->reply,
+                      stderr,
+                      0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+      }
+      if (NULL != tts->total_amount_reference)
+      {
+        const struct TALER_TESTING_Command *total_amount_cmd;
+        const struct TALER_Amount *total_amount_from_reference;
+
+        total_amount_cmd
+          = TALER_TESTING_interpreter_lookup_command (is,
+                                                      tts->
+                                                      total_amount_reference);
+        if (NULL == total_amount_cmd)
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (GNUNET_OK !=
+            TALER_TESTING_get_trait_amount (total_amount_cmd,
+                                            &total_amount_from_reference))
+        {
+          GNUNET_break (0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+        if (0 != TALER_amount_cmp (&ta->total_amount,
+                                   total_amount_from_reference))
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Amount mismatch in command %s\n",
+                      tts->cmd->label);
+          json_dumpf (hr->reply,
+                      stderr,
+                      0);
+          TALER_TESTING_interpreter_fail (is);
+          return;
+        }
+      }
+      break;
+    } /* case OK */
+  } /* switch on status */
   TALER_TESTING_interpreter_next (is);
 }
 
@@ -310,13 +311,13 @@ track_transfer_run (void *cls,
   struct TALER_WireTransferIdentifierRawP wtid;
   const struct TALER_WireTransferIdentifierRawP *wtid_ptr;
 
+  tts->cmd = cmd;
   /* If no reference is given, we'll use a all-zeros
    * WTID */
   memset (&wtid,
           0,
           sizeof (wtid));
   wtid_ptr = &wtid;
-
   tts->is = is;
   if (NULL != tts->wtid_reference)
   {
@@ -341,10 +342,13 @@ track_transfer_run (void *cls,
     }
     GNUNET_assert (NULL != wtid_ptr);
   }
-  tts->tth = TALER_EXCHANGE_transfers_get (is->exchange,
-                                           wtid_ptr,
-                                           &track_transfer_cb,
-                                           tts);
+  tts->tth = TALER_EXCHANGE_transfers_get (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    wtid_ptr,
+    &track_transfer_cb,
+    tts);
   GNUNET_assert (NULL != tts->tth);
 }
 
diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c
index d1d781f5a..bf83c1f80 100644
--- a/src/testing/testing_api_cmd_twister_exec_client.c
+++ b/src/testing/testing_api_cmd_twister_exec_client.c
@@ -572,7 +572,7 @@ flip_object_cleanup
  * @param index index number of the object to offer.
  * @return #GNUNET_OK on success
  */
-static int
+static enum GNUNET_GenericReturnValue
 flip_object_traits (void *cls,
                     const void **ret,
                     const char *trait,
diff --git a/src/testing/testing_api_cmd_wire.c b/src/testing/testing_api_cmd_wire.c
index 4b0a177b5..41ff7a978 100644
--- a/src/testing/testing_api_cmd_wire.c
+++ b/src/testing/testing_api_cmd_wire.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018 Taler Systems SA
+  Copyright (C) 2018, 2023 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
@@ -39,6 +39,11 @@ struct WireState
   struct TALER_EXCHANGE_WireHandle *wh;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * Which wire-method we expect is offered by the exchange.
    */
   const char *expected_method;
@@ -72,19 +77,14 @@ struct WireState
  * that the wire fee is acceptable too.
  *
  * @param cls closure.
- * @param hr HTTP response details
- * @param accounts_len length of the @a accounts array.
- * @param accounts list of wire accounts of the exchange,
- *        NULL on error.
+ * @param wr response details
  */
 static void
 wire_cb (void *cls,
-         const struct TALER_EXCHANGE_HttpResponse *hr,
-         unsigned int accounts_len,
-         const struct TALER_EXCHANGE_WireAccount *accounts)
+         const struct TALER_EXCHANGE_WireResponse *wr)
 {
   struct WireState *ws = cls;
-  struct TALER_TESTING_Command *cmd = &ws->is->commands[ws->is->ip];
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wr->hr;
   struct TALER_Amount expected_fee;
 
   TALER_LOG_DEBUG ("Checking parsed /wire response\n");
@@ -100,41 +100,70 @@ wire_cb (void *cls,
 
   if (MHD_HTTP_OK == hr->http_status)
   {
+    unsigned int accounts_len
+      = wr->details.ok.accounts_len;
+    unsigned int fees_len
+      = wr->details.ok.fees_len;
+    const struct TALER_EXCHANGE_WireAccount *accounts
+      = wr->details.ok.accounts;
+    const struct TALER_EXCHANGE_WireFeesByMethod *fees
+      = wr->details.ok.fees;
+
     for (unsigned int i = 0; i<accounts_len; i++)
     {
       char *method;
 
       method = TALER_payto_get_method (accounts[i].payto_uri);
+      if (NULL == method)
+      {
+        GNUNET_break (0);
+        TALER_TESTING_interpreter_fail (ws->is);
+        return;
+      }
       if (0 == strcmp (ws->expected_method,
                        method))
       {
         ws->method_found = GNUNET_OK;
-        if (NULL != ws->expected_fee)
+      }
+      GNUNET_free (method);
+    }
+    if (NULL != ws->expected_fee)
+    {
+      bool fee_found = false;
+
+      GNUNET_assert (GNUNET_OK ==
+                     TALER_string_to_amount (ws->expected_fee,
+                                             &expected_fee));
+      for (unsigned int i = 0; i<fees_len; i++)
+      {
+        if (0 != strcmp (fees[i].method,
+                         ws->expected_method))
+          continue;
+        for (const struct TALER_EXCHANGE_WireAggregateFees *waf
+               = fees[i].fees_head;
+             NULL != waf;
+             waf = waf->next)
         {
-          GNUNET_assert (GNUNET_OK ==
-                         TALER_string_to_amount (ws->expected_fee,
-                                                 &expected_fee));
-          for (const struct TALER_EXCHANGE_WireAggregateFees *waf
-                 = accounts[i].fees;
-               NULL != waf;
-               waf = waf->next)
+          if (0 != TALER_amount_cmp (&waf->fees.wire,
+                                     &expected_fee))
           {
-            if (0 != TALER_amount_cmp (&waf->fees.wire,
-                                       &expected_fee))
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                          "Wire fee mismatch to command %s\n",
-                          cmd->label);
-              TALER_TESTING_interpreter_fail (ws->is);
-              GNUNET_free (method);
-              return;
-            }
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                        "Wire fee mismatch to command %s\n",
+                        ws->cmd->label);
+            TALER_TESTING_interpreter_fail (ws->is);
+            return;
           }
+          fee_found = true;
         }
       }
-      TALER_LOG_DEBUG ("Freeing method '%s'\n",
-                       method);
-      GNUNET_free (method);
+      if (! fee_found)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "/wire does not contain expected fee '%s'\n",
+                    ws->expected_fee);
+        TALER_TESTING_interpreter_fail (ws->is);
+        return;
+      }
     }
     if (GNUNET_OK != ws->method_found)
     {
@@ -163,11 +192,14 @@ wire_run (void *cls,
 {
   struct WireState *ws = cls;
 
-  (void) cmd;
+  ws->cmd = cmd;
   ws->is = is;
-  ws->wh = TALER_EXCHANGE_wire (is->exchange,
-                                &wire_cb,
-                                ws);
+  ws->wh = TALER_EXCHANGE_wire (
+    TALER_TESTING_interpreter_get_context (is),
+    TALER_TESTING_get_exchange_url (is),
+    TALER_TESTING_get_keys (is),
+    &wire_cb,
+    ws);
 }
 
 
@@ -186,10 +218,8 @@ wire_cleanup (void *cls,
 
   if (NULL != ws->wh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ws->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ws->is,
+                                      cmd->label);
     TALER_EXCHANGE_wire_cancel (ws->wh);
     ws->wh = NULL;
   }
@@ -197,17 +227,6 @@ wire_cleanup (void *cls,
 }
 
 
-/**
- * Create a "wire" command.
- *
- * @param label the command label.
- * @param expected_method which wire-transfer method is expected
- *        to be offered by the exchange.
- * @param expected_fee the fee the exchange should charge.
- * @param expected_response_code the HTTP response the exchange
- *        should return.
- * @return the command.
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_wire (const char *label,
                         const char *expected_method,
diff --git a/src/testing/testing_api_cmd_wire_add.c b/src/testing/testing_api_cmd_wire_add.c
index c07e9bba6..d2a15894a 100644
--- a/src/testing/testing_api_cmd_wire_add.c
+++ b/src/testing/testing_api_cmd_wire_add.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-2023 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
@@ -67,27 +67,21 @@ struct WireAddState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param wer response details
  */
 static void
 wire_add_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireEnableResponse *wer)
 {
   struct WireAddState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wer->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -110,10 +104,30 @@ wire_add_run (void *cls,
   struct TALER_MasterSignatureP master_sig1;
   struct TALER_MasterSignatureP master_sig2;
   struct GNUNET_TIME_Timestamp now;
+  json_t *credit_rest;
+  json_t *debit_rest;
+  const char *exchange_url;
 
   (void) cmd;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
   now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
+  debit_rest = json_array ();
+  credit_rest = json_array ();
   if (ds->bad_sig)
   {
     memset (&master_sig1,
@@ -125,23 +139,50 @@ wire_add_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_wire_add_sign (ds->payto_uri,
+                                          NULL,
+                                          debit_rest,
+                                          credit_rest,
                                           now,
-                                          &is->master_priv,
+                                          master_priv,
                                           &master_sig1);
     TALER_exchange_wire_signature_make (ds->payto_uri,
-                                        &is->master_priv,
+                                        NULL,
+                                        debit_rest,
+                                        credit_rest,
+                                        master_priv,
                                         &master_sig2);
   }
   ds->dh = TALER_EXCHANGE_management_enable_wire (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     ds->payto_uri,
+    NULL,
+    debit_rest,
+    credit_rest,
     now,
     &master_sig1,
     &master_sig2,
+    NULL,
+    0LL,
     &wire_add_cb,
     ds);
+  json_decref (debit_rest);
+  json_decref (credit_rest);
   if (NULL == ds->dh)
   {
     GNUNET_break (0);
@@ -166,10 +207,8 @@ wire_add_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_enable_wire_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_wire_del.c b/src/testing/testing_api_cmd_wire_del.c
index 15d29d727..50ebfc7cb 100644
--- a/src/testing/testing_api_cmd_wire_del.c
+++ b/src/testing/testing_api_cmd_wire_del.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020, 2023 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
@@ -67,27 +67,22 @@ struct WireDelState
  * if the response code is acceptable.
  *
  * @param cls closure.
- * @param hr HTTP response details
+ * @param wdr response details
  */
 static void
 wire_del_cb (void *cls,
-             const struct TALER_EXCHANGE_HttpResponse *hr)
+             const struct TALER_EXCHANGE_ManagementWireDisableResponse *wdr)
 {
   struct WireDelState *ds = cls;
+  const struct TALER_EXCHANGE_HttpResponse *hr = &wdr->hr;
 
   ds->dh = NULL;
   if (ds->expected_response_code != hr->http_status)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u to command %s in %s:%u\n",
-                hr->http_status,
-                ds->is->commands[ds->is->ip].label,
-                __FILE__,
-                __LINE__);
-    json_dumpf (hr->reply,
-                stderr,
-                0);
-    TALER_TESTING_interpreter_fail (ds->is);
+    TALER_TESTING_unexpected_status (ds->is,
+                                     hr->http_status,
+                                     ds->expected_response_code);
+
     return;
   }
   TALER_TESTING_interpreter_next (ds->is);
@@ -109,8 +104,24 @@ wire_del_run (void *cls,
   struct WireDelState *ds = cls;
   struct TALER_MasterSignatureP master_sig;
   struct GNUNET_TIME_Timestamp now;
+  const char *exchange_url;
 
   (void) cmd;
+  {
+    const struct TALER_TESTING_Command *exchange_cmd;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                                         &exchange_url));
+  }
   now = GNUNET_TIME_timestamp_get ();
   ds->is = is;
   if (ds->bad_sig)
@@ -121,14 +132,28 @@ wire_del_run (void *cls,
   }
   else
   {
+    const struct TALER_TESTING_Command *exchange_cmd;
+    const struct TALER_MasterPrivateKeyP *master_priv;
+
+    exchange_cmd = TALER_TESTING_interpreter_get_command (is,
+                                                          "exchange");
+    if (NULL == exchange_cmd)
+    {
+      GNUNET_break (0);
+      TALER_TESTING_interpreter_fail (is);
+      return;
+    }
+    GNUNET_assert (GNUNET_OK ==
+                   TALER_TESTING_get_trait_master_priv (exchange_cmd,
+                                                        &master_priv));
     TALER_exchange_offline_wire_del_sign (ds->payto_uri,
                                           now,
-                                          &is->master_priv,
+                                          master_priv,
                                           &master_sig);
   }
   ds->dh = TALER_EXCHANGE_management_disable_wire (
-    is->ctx,
-    is->exchange_url,
+    TALER_TESTING_interpreter_get_context (is),
+    exchange_url,
     ds->payto_uri,
     now,
     &master_sig,
@@ -158,10 +183,8 @@ wire_del_cleanup (void *cls,
 
   if (NULL != ds->dh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %u (%s) did not complete\n",
-                ds->is->ip,
-                cmd->label);
+    TALER_TESTING_command_incomplete (ds->is,
+                                      cmd->label);
     TALER_EXCHANGE_management_disable_wire_cancel (ds->dh);
     ds->dh = NULL;
   }
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index de862f91a..f8ff0205b 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -62,11 +62,16 @@ struct WithdrawState
 
   /**
    * Reference to a withdraw or reveal operation from which we should
-   * re-use the private coin key, or NULL for regular withdrawal.
+   * reuse the private coin key, or NULL for regular withdrawal.
    */
   const char *reuse_coin_key_ref;
 
   /**
+   * Our command.
+   */
+  const struct TALER_TESTING_Command *cmd;
+
+  /**
    * String describing the denomination value we should withdraw.
    * A corresponding denomination key must exist in the exchange's
    * offerings.  Can be NULL if @e pk is set instead.
@@ -108,7 +113,7 @@ struct WithdrawState
   /**
    * Blinding key used during the operation.
    */
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
 
   /**
    * Values contributed from the exchange during the
@@ -139,10 +144,10 @@ struct WithdrawState
 
   /**
    * If age > 0, put here the corresponding age commitment with its proof and
-   * its hash, respectivelly, NULL otherwise.
+   * its hash, respectively.
    */
-  struct TALER_AgeCommitmentProof *age_commitment_proof;
-  struct TALER_AgeCommitmentHash *h_age_commitment;
+  struct TALER_AgeCommitmentProof age_commitment_proof;
+  struct TALER_AgeCommitmentHash h_age_commitment;
 
   /**
    * Reserve history entry that corresponds to this operation.
@@ -153,7 +158,7 @@ struct WithdrawState
   /**
    * Withdraw handle (while operation is running).
    */
-  struct TALER_EXCHANGE_WithdrawHandle *wsh;
+  struct TALER_EXCHANGE_BatchWithdrawHandle *wsh;
 
   /**
    * Task scheduled to try later.
@@ -171,10 +176,16 @@ struct WithdrawState
   struct GNUNET_TIME_Relative total_backoff;
 
   /**
-   * Set to the KYC UUID *if* the exchange replied with
+   * Set to the KYC requirement payto hash *if* the exchange replied with a
+   * request for KYC.
+   */
+  struct TALER_PaytoHashP h_payto;
+
+  /**
+   * Set to the KYC requirement row *if* the exchange replied with
    * a request for KYC.
    */
-  uint64_t kyc_uuid;
+  uint64_t requirement_row;
 
   /**
    * Expected HTTP response code to the request.
@@ -214,8 +225,7 @@ do_retry (void *cls)
   struct WithdrawState *ws = cls;
 
   ws->retry_task = NULL;
-  ws->is->commands[ws->is->ip].last_req_time
-    = GNUNET_TIME_absolute_get ();
+  TALER_TESTING_touch_cmd (ws->is);
   withdraw_run (ws,
                 NULL,
                 ws->is);
@@ -232,7 +242,7 @@ do_retry (void *cls)
  */
 static void
 reserve_withdraw_cb (void *cls,
-                     const struct TALER_EXCHANGE_WithdrawResponse *wr)
+                     const struct TALER_EXCHANGE_BatchWithdrawResponse *wr)
 {
   struct WithdrawState *ws = cls;
   struct TALER_TESTING_Interpreter *is = ws->is;
@@ -242,12 +252,12 @@ reserve_withdraw_cb (void *cls,
   {
     if (0 != ws->do_retry)
     {
-      if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != wr->hr.ec)
+      if (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN != wr->hr.ec)
         ws->do_retry--; /* we don't count reserve unknown as failures here */
       if ( (0 == wr->hr.http_status) ||
            (TALER_EC_GENERIC_DB_SOFT_FAILURE == wr->hr.ec) ||
            (TALER_EC_EXCHANGE_WITHDRAW_INSUFFICIENT_FUNDS == wr->hr.ec) ||
-           (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN == wr->hr.ec) ||
+           (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN == wr->hr.ec) ||
            (MHD_HTTP_INTERNAL_SERVER_ERROR == wr->hr.http_status) )
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -257,7 +267,7 @@ reserve_withdraw_cb (void *cls,
         /* on DB conflicts, do not use backoff */
         if (TALER_EC_GENERIC_DB_SOFT_FAILURE == wr->hr.ec)
           ws->backoff = GNUNET_TIME_UNIT_ZERO;
-        else if (TALER_EC_EXCHANGE_WITHDRAW_RESERVE_UNKNOWN != wr->hr.ec)
+        else if (TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN != wr->hr.ec)
           ws->backoff = EXCHANGE_LIB_BACKOFF (ws->backoff);
         else
           ws->backoff = GNUNET_TIME_relative_max (UNKNOWN_MIN_BACKOFF,
@@ -266,48 +276,38 @@ reserve_withdraw_cb (void *cls,
                                                 UNKNOWN_MAX_BACKOFF);
         ws->total_backoff = GNUNET_TIME_relative_add (ws->total_backoff,
                                                       ws->backoff);
-        ws->is->commands[ws->is->ip].num_tries++;
+        TALER_TESTING_inc_tries (ws->is);
         ws->retry_task = GNUNET_SCHEDULER_add_delayed (ws->backoff,
                                                        &do_retry,
                                                        ws);
         return;
       }
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected response code %u/%d to command %s in %s:%u\n",
-                wr->hr.http_status,
-                (int) wr->hr.ec,
-                TALER_TESTING_interpreter_get_current_label (is),
-                __FILE__,
-                __LINE__);
-    json_dumpf (wr->hr.reply,
-                stderr,
-                0);
-    GNUNET_break (0);
-    TALER_TESTING_interpreter_fail (is);
+    TALER_TESTING_unexpected_status_with_body (is,
+                                               wr->hr.http_status,
+                                               ws->expected_response_code,
+                                               wr->hr.reply);
     return;
   }
   switch (wr->hr.http_status)
   {
   case MHD_HTTP_OK:
-    TALER_denom_sig_deep_copy (&ws->sig,
-                               &wr->details.success.sig);
-    ws->coin_priv = wr->details.success.coin_priv;
-    ws->bks = wr->details.success.bks;
-    ws->exchange_vals = wr->details.success.exchange_vals;
+    GNUNET_assert (1 == wr->details.ok.num_coins);
+    TALER_denom_sig_copy (&ws->sig,
+                          &wr->details.ok.coins[0].sig);
+    ws->coin_priv = wr->details.ok.coins[0].coin_priv;
+    ws->bks = wr->details.ok.coins[0].bks;
+    TALER_denom_ewv_copy (&ws->exchange_vals,
+                          &wr->details.ok.coins[0].exchange_vals);
     if (0 != ws->total_backoff.rel_value_us)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Total withdraw backoff for %s was %s\n",
-                  is->commands[is->ip].label,
+                  ws->cmd->label,
                   GNUNET_STRINGS_relative_time_to_string (ws->total_backoff,
-                                                          GNUNET_YES));
+                                                          true));
     }
     break;
-  case MHD_HTTP_ACCEPTED:
-    /* nothing to check */
-    ws->kyc_uuid = wr->details.accepted.payment_target_uuid;
-    break;
   case MHD_HTTP_FORBIDDEN:
     /* nothing to check */
     break;
@@ -320,6 +320,13 @@ reserve_withdraw_cb (void *cls,
   case MHD_HTTP_GONE:
     /* theoretically could check that the key was actually */
     break;
+  case MHD_HTTP_UNAVAILABLE_FOR_LEGAL_REASONS:
+    /* KYC required */
+    ws->requirement_row =
+      wr->details.unavailable_for_legal_reasons.requirement_row;
+    ws->h_payto
+      = wr->details.unavailable_for_legal_reasons.h_payto;
+    break;
   default:
     /* Unsupported status code (by test harness) */
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -345,20 +352,19 @@ withdraw_run (void *cls,
   const struct TALER_TESTING_Command *create_reserve;
   const struct TALER_EXCHANGE_DenomPublicKey *dpk;
 
-  (void) cmd;
+  if (NULL != cmd)
+    ws->cmd = cmd;
   ws->is = is;
   create_reserve
     = TALER_TESTING_interpreter_lookup_command (
         is,
         ws->reserve_reference);
-
   if (NULL == create_reserve)
   {
     GNUNET_break (0);
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_reserve_priv (create_reserve,
                                             &rp))
@@ -367,15 +373,14 @@ withdraw_run (void *cls,
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-
   if (NULL == ws->exchange_url)
     ws->exchange_url
-      = GNUNET_strdup (TALER_EXCHANGE_get_base_url (is->exchange));
+      = GNUNET_strdup (TALER_TESTING_get_exchange_url (is));
   ws->reserve_priv = *rp;
   GNUNET_CRYPTO_eddsa_key_get_public (&ws->reserve_priv.eddsa_priv,
                                       &ws->reserve_pub.eddsa_pub);
   ws->reserve_payto_uri
-    = TALER_payto_from_reserve (ws->exchange_url,
+    = TALER_reserve_make_payto (ws->exchange_url,
                                 &ws->reserve_pub);
 
   if (NULL == ws->reuse_coin_key_ref)
@@ -406,7 +411,7 @@ withdraw_run (void *cls,
 
   if (NULL == ws->pk)
   {
-    dpk = TALER_TESTING_find_pk (TALER_EXCHANGE_get_keys (is->exchange),
+    dpk = TALER_TESTING_find_pk (TALER_TESTING_get_keys (is),
                                  &ws->amount,
                                  ws->age > 0);
     if (NULL == dpk)
@@ -433,13 +438,23 @@ withdraw_run (void *cls,
                                    &ws->amount,
                                    &ws->pk->fees.withdraw));
   ws->reserve_history.details.withdraw.fee = ws->pk->fees.withdraw;
-  ws->wsh = TALER_EXCHANGE_withdraw (is->exchange,
-                                     ws->pk,
-                                     rp,
-                                     &ws->ps,
-                                     ws->h_age_commitment,
-                                     &reserve_withdraw_cb,
-                                     ws);
+  {
+    struct TALER_EXCHANGE_WithdrawCoinInput wci = {
+      .pk = ws->pk,
+      .ps = &ws->ps,
+      .ach = 0 < ws->age ? &ws->h_age_commitment : NULL
+    };
+
+    ws->wsh = TALER_EXCHANGE_batch_withdraw (
+      TALER_TESTING_interpreter_get_context (is),
+      TALER_TESTING_get_exchange_url (is),
+      TALER_TESTING_get_keys (is),
+      rp,
+      1,
+      &wci,
+      &reserve_withdraw_cb,
+      ws);
+  }
   if (NULL == ws->wsh)
   {
     GNUNET_break (0);
@@ -464,10 +479,9 @@ withdraw_cleanup (void *cls,
 
   if (NULL != ws->wsh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Command %s did not complete\n",
-                cmd->label);
-    TALER_EXCHANGE_withdraw_cancel (ws->wsh);
+    TALER_TESTING_command_incomplete (ws->is,
+                                      cmd->label);
+    TALER_EXCHANGE_batch_withdraw_cancel (ws->wsh);
     ws->wsh = NULL;
   }
   if (NULL != ws->retry_task)
@@ -476,21 +490,14 @@ withdraw_cleanup (void *cls,
     ws->retry_task = NULL;
   }
   TALER_denom_sig_free (&ws->sig);
+  TALER_denom_ewv_free (&ws->exchange_vals);
   if (NULL != ws->pk)
   {
     TALER_EXCHANGE_destroy_denomination_key (ws->pk);
     ws->pk = NULL;
   }
-  if (NULL != ws->age_commitment_proof)
-  {
-    TALER_age_commitment_proof_free (ws->age_commitment_proof);
-    ws->age_commitment_proof = NULL;
-  }
-  if (NULL != ws->h_age_commitment)
-  {
-    GNUNET_free (ws->h_age_commitment);
-    ws->h_age_commitment = NULL;
-  }
+  if (ws->age > 0)
+    TALER_age_commitment_proof_free (&ws->age_commitment_proof);
   GNUNET_free (ws->exchange_url);
   GNUNET_free (ws->reserve_payto_uri);
   GNUNET_free (ws);
@@ -516,7 +523,8 @@ withdraw_traits (void *cls,
   struct WithdrawState *ws = cls;
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_reserve_history (&ws->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &ws->reserve_history),
     TALER_TESTING_make_trait_coin_priv (0 /* only one coin */,
                                         &ws->coin_priv),
     TALER_TESTING_make_trait_planchet_secret (&ws->ps),
@@ -531,13 +539,18 @@ withdraw_traits (void *cls,
     TALER_TESTING_make_trait_reserve_priv (&ws->reserve_priv),
     TALER_TESTING_make_trait_reserve_pub (&ws->reserve_pub),
     TALER_TESTING_make_trait_amount (&ws->amount),
-    TALER_TESTING_make_trait_payment_target_uuid (&ws->kyc_uuid),
-    TALER_TESTING_make_trait_payto_uri (
-      (const char **) &ws->reserve_payto_uri),
-    TALER_TESTING_make_trait_exchange_url (
-      (const char **) &ws->exchange_url),
-    TALER_TESTING_make_trait_age_commitment_proof (0, ws->age_commitment_proof),
-    TALER_TESTING_make_trait_h_age_commitment (0, ws->h_age_commitment),
+    TALER_TESTING_make_trait_legi_requirement_row (&ws->requirement_row),
+    TALER_TESTING_make_trait_h_payto (&ws->h_payto),
+    TALER_TESTING_make_trait_payto_uri (ws->reserve_payto_uri),
+    TALER_TESTING_make_trait_exchange_url (ws->exchange_url),
+    TALER_TESTING_make_trait_age_commitment_proof (0,
+                                                   0 < ws->age
+                                                   ? &ws->age_commitment_proof
+                                                   : NULL),
+    TALER_TESTING_make_trait_h_age_commitment (0,
+                                               0 < ws->age
+                                               ? &ws->h_age_commitment
+                                               : NULL),
     TALER_TESTING_trait_end ()
   };
 
@@ -550,61 +563,32 @@ withdraw_traits (void *cls,
 }
 
 
-/**
- * Create a withdraw command, letting the caller specify
- * the desired amount as string.
- *
- * @param label command label.
- * @param reserve_reference command providing us with a reserve to withdraw from
- * @param amount how much we withdraw.
- * @param age if > 0, age restriction is activated
- * @param expected_response_code which HTTP response code
- *        we expect from the exchange.
- * @return the withdraw command to be executed by the interpreter.
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_withdraw_amount (const char *label,
                                    const char *reserve_reference,
                                    const char *amount,
-                                   const uint8_t age,
+                                   uint8_t age,
                                    unsigned int expected_response_code)
 {
   struct WithdrawState *ws;
 
   ws = GNUNET_new (struct WithdrawState);
-
   ws->age = age;
   if (0 < age)
   {
-    struct TALER_AgeCommitmentProof *acp;
-    struct TALER_AgeCommitmentHash *hac;
     struct GNUNET_HashCode seed;
     struct TALER_AgeMask mask;
 
-    acp = GNUNET_new (struct TALER_AgeCommitmentProof);
-    hac = GNUNET_new (struct TALER_AgeCommitmentHash);
-    mask = TALER_extensions_age_restriction_ageMask ();
+    mask = TALER_extensions_get_age_restriction_mask ();
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &seed,
                                 sizeof(seed));
-
-    if (GNUNET_OK !=
-        TALER_age_restriction_commit (
-          &mask,
-          age,
-          &seed,
-          acp))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to generate age commitment for age %d at %s\n",
-                  age,
-                  label);
-      GNUNET_assert (0);
-    }
-
-    TALER_age_commitment_hash (&acp->commitment,hac);
-    ws->age_commitment_proof = acp;
-    ws->h_age_commitment = hac;
+    TALER_age_restriction_commit (&mask,
+                                  age,
+                                  &seed,
+                                  &ws->age_commitment_proof);
+    TALER_age_commitment_hash (&ws->age_commitment_proof.commitment,
+                               &ws->h_age_commitment);
   }
 
   ws->reserve_reference = reserve_reference;
@@ -633,22 +617,6 @@ TALER_TESTING_cmd_withdraw_amount (const char *label,
 }
 
 
-/**
- * Create a withdraw command, letting the caller specify
- * the desired amount as string and also re-using an existing
- * coin private key in the process (violating the specification,
- * which will result in an error when spending the coin!).
- *
- * @param label command label.
- * @param reserve_reference command providing us with a reserve to withdraw from
- * @param amount how much we withdraw.
- * @param age if > 0, age restriction is activated
- * @param coin_ref reference to (withdraw/reveal) command of a coin
- *        from which we should re-use the private key
- * @param expected_response_code which HTTP response code
- *        we expect from the exchange.
- * @return the withdraw command to be executed by the interpreter.
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_withdraw_amount_reuse_key (
   const char *label,
@@ -674,18 +642,6 @@ TALER_TESTING_cmd_withdraw_amount_reuse_key (
 }
 
 
-/**
- * Create withdraw command, letting the caller specify the
- * amount by a denomination key.
- *
- * @param label command label.
- * @param reserve_reference reference to the reserve to withdraw
- *        from; will provide reserve priv to sign the request.
- * @param dk denomination public key.
- * @param expected_response_code expected HTTP response code.
- *
- * @return the command.
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_withdraw_denomination (
   const char *label,
@@ -720,14 +676,6 @@ TALER_TESTING_cmd_withdraw_denomination (
 }
 
 
-/**
- * Modify a withdraw command to enable retries when the
- * reserve is not yet full or we get other transient
- * errors from the exchange.
- *
- * @param cmd a withdraw command
- * @return the command with retries enabled
- */
 struct TALER_TESTING_Command
 TALER_TESTING_cmd_withdraw_with_retry (struct TALER_TESTING_Command cmd)
 {
diff --git a/src/testing/testing_api_helpers_auditor.c b/src/testing/testing_api_helpers_auditor.c
deleted file mode 100644
index b74258004..000000000
--- a/src/testing/testing_api_helpers_auditor.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2018 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/>
-*/
-/**
- * @file testing/testing_api_helpers_auditor.c
- * @brief helper functions
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_testing_lib.h"
-#include "taler_auditor_service.h"
-
-
-/**
- * Closure for #cleanup_auditor.
- */
-struct CleanupContext
-{
-  /**
-   * Where we find the state to clean up.
-   */
-  struct TALER_TESTING_Interpreter *is;
-
-  /**
-   * Next cleanup routine to call, NULL for none.
-   */
-  GNUNET_SCHEDULER_TaskCallback fcb;
-
-  /**
-   * Closure for @e fcb
-   */
-  void *fcb_cls;
-};
-
-
-/**
- * Function to clean up the auditor connection.
- *
- * @param cls a `struct CleanupContext`
- */
-static void
-cleanup_auditor (void *cls)
-{
-  struct CleanupContext *cc = cls;
-  struct TALER_TESTING_Interpreter *is = cc->is;
-
-  TALER_AUDITOR_disconnect (is->auditor);
-  is->auditor = NULL;
-  if (NULL != cc->fcb)
-    cc->fcb (cc->fcb_cls);
-  GNUNET_free (cc);
-}
-
-
-/**
- * Closure for #auditor_main_wrapper()
- */
-struct MainWrapperContext
-{
-  /**
-   * Main function to launch.
-   */
-  TALER_TESTING_Main main_cb;
-
-  /**
-   * Closure for @e main_cb.
-   */
-  void *main_cb_cls;
-
-  /**
-   * Configuration we use.
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Name of the configuration file.
-   */
-  const char *config_filename;
-
-};
-
-
-/**
- * Function called with information about the auditor.
- *
- * @param cls closure
- * @param hr http response details
- * @param vi basic information about the auditor
- * @param compat protocol compatibility information
- */
-static void
-auditor_version_cb (void *cls,
-                    const struct TALER_AUDITOR_HttpResponse *hr,
-                    const struct TALER_AUDITOR_VersionInformation *vi,
-                    enum TALER_AUDITOR_VersionCompatibility compat)
-{
-  struct TALER_TESTING_Interpreter *is = cls;
-
-  (void) hr;
-  if (TALER_AUDITOR_VC_MATCH != compat)
-  {
-    TALER_TESTING_interpreter_fail (is);
-    return;
-  }
-  is->auditor_working = GNUNET_YES;
-}
-
-
-/**
- * Setup the @a is 'auditor' member before running the main test loop.
- *
- * @param cls must be a `struct MainWrapperContext *`
- * @param[in,out] is interpreter state to setup
- */
-static void
-auditor_main_wrapper (void *cls,
-                      struct TALER_TESTING_Interpreter *is)
-{
-  struct MainWrapperContext *mwc = cls;
-  struct CleanupContext *cc;
-  char *auditor_base_url;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (mwc->cfg,
-                                             "auditor",
-                                             "BASE_URL",
-                                             &auditor_base_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "BASE_URL");
-    return;
-  }
-
-  is->auditor = TALER_AUDITOR_connect (is->ctx,
-                                       auditor_base_url,
-                                       &auditor_version_cb,
-                                       is);
-  GNUNET_free (auditor_base_url);
-
-  if (NULL == is->auditor)
-  {
-    GNUNET_break (0);
-    return;
-  }
-
-  cc = GNUNET_new (struct CleanupContext);
-  cc->is = is;
-  cc->fcb = is->final_cleanup_cb;
-  cc->fcb_cls = is->final_cleanup_cb_cls;
-  is->final_cleanup_cb = cleanup_auditor;
-  is->final_cleanup_cb_cls = cc;
-  mwc->main_cb (mwc->main_cb_cls,
-                is);
-}
-
-
-/**
- * Install signal handlers plus schedules the main wrapper
- * around the "run" method.
- *
- * @param cls our `struct MainWrapperContext`
- * @param cfg configuration we use
- * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
- *         non-GNUNET_OK codes are #GNUNET_SYSERR most of the
- *         times.
- */
-static int
-setup_with_cfg (void *cls,
-                const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct MainWrapperContext *mwc = cls;
-  struct TALER_TESTING_SetupContext setup_ctx = {
-    .config_filename = mwc->config_filename,
-    .main_cb = &auditor_main_wrapper,
-    .main_cb_cls = mwc
-  };
-
-  mwc->cfg = cfg;
-  return TALER_TESTING_setup_with_auditor_and_exchange_cfg (&setup_ctx,
-                                                            cfg);
-}
-
-
-/**
- * Install signal handlers plus schedules the main wrapper
- * around the "run" method.
- *
- * @param main_cb the "run" method which contains all the
- *        commands.
- * @param main_cb_cls a closure for "run", typically NULL.
- * @param config_filename configuration filename.
- * @return #GNUNET_OK if all is okay, != #GNUNET_OK otherwise.
- *         non-GNUNET_OK codes are #GNUNET_SYSERR most of the
- *         times.
- */
-int
-TALER_TESTING_auditor_setup (TALER_TESTING_Main main_cb,
-                             void *main_cb_cls,
-                             const char *config_filename)
-{
-  struct MainWrapperContext mwc = {
-    .main_cb = main_cb,
-    .main_cb_cls = main_cb_cls,
-    .config_filename = config_filename
-  };
-
-  return GNUNET_CONFIGURATION_parse_and_run (config_filename,
-                                             &setup_with_cfg,
-                                             &mwc);
-}
-
-
-/* end of testing_auditor_api_helpers.c */
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
deleted file mode 100644
index 0d8017e65..000000000
--- a/src/testing/testing_api_helpers_bank.c
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2018-2021 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/>
-*/
-/**
- * @file testing/testing_api_helpers_bank.c
- * @brief convenience functions for bank tests.
- * @author Marcello Stanisci
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include "taler_testing_lib.h"
-#include "taler_fakebank_lib.h"
-
-#define BANK_FAIL() \
-  do {GNUNET_break (0); return NULL; } while (0)
-
-
-struct TALER_FAKEBANK_Handle *
-TALER_TESTING_run_fakebank (const char *bank_url,
-                            const char *currency)
-{
-  const char *port;
-  long pnum;
-  struct TALER_FAKEBANK_Handle *fakebankd;
-
-  port = strrchr (bank_url,
-                  (unsigned char) ':');
-  if (NULL == port)
-    pnum = 80;
-  else
-    pnum = strtol (port + 1, NULL, 10);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Starting Fakebank on port %u (%s)\n",
-              (unsigned int) pnum,
-              bank_url);
-  fakebankd = TALER_FAKEBANK_start ((uint16_t) pnum,
-                                    currency);
-  if (NULL == fakebankd)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  return fakebankd;
-}
-
-
-int
-TALER_TESTING_has_in_name (const char *prog,
-                           const char *marker)
-{
-  size_t name_pos;
-  size_t pos;
-
-  if (! prog || ! marker)
-    return GNUNET_NO;
-
-  pos = 0;
-  name_pos = 0;
-  while (prog[pos])
-  {
-    if ('/' == prog[pos])
-      name_pos = pos + 1;
-    pos++;
-  }
-  if (name_pos == pos)
-    return GNUNET_YES;
-  return (NULL != strstr (prog + name_pos, marker));
-}
-
-
-struct TALER_TESTING_LibeufinServices
-TALER_TESTING_run_libeufin (const struct TALER_TESTING_BankConfiguration *bc)
-{
-  struct GNUNET_OS_Process *nexus_proc;
-  struct GNUNET_OS_Process *sandbox_proc;
-  struct TALER_TESTING_LibeufinServices ret = { 0 };
-  unsigned int iter;
-  char *curl_check_cmd;
-
-  nexus_proc = GNUNET_OS_start_process (
-    GNUNET_OS_INHERIT_STD_ERR,
-    NULL, NULL, NULL,
-    "libeufin-nexus",
-    "libeufin-nexus",
-    "serve",
-    "--db-name", "/tmp/nexus-exchange-test.sqlite3",
-    NULL);
-  if (NULL == nexus_proc)
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                              "exec",
-                              "libeufin-nexus");
-    return ret;
-  }
-  GNUNET_asprintf (&curl_check_cmd,
-                   "curl -s %s",
-                   bc->exchange_auth.wire_gateway_url);
-  /* give child time to start and bind against the socket */
-  fprintf (stderr,
-           "Waiting for `nexus' to be ready (via %s)\n", curl_check_cmd);
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      fprintf (
-        stderr,
-        "Failed to launch `nexus'\n");
-      GNUNET_OS_process_kill (nexus_proc,
-                              SIGTERM);
-      GNUNET_OS_process_wait (nexus_proc);
-      GNUNET_OS_process_destroy (nexus_proc);
-      GNUNET_free (curl_check_cmd);
-      GNUNET_break (0);
-      return ret;
-    }
-    fprintf (stderr, ".");
-    sleep (1);
-    iter++;
-  }
-  while (0 != system (curl_check_cmd));
-
-  // start sandbox.
-  GNUNET_free (curl_check_cmd);
-  fprintf (stderr, "\n");
-
-  sandbox_proc = GNUNET_OS_start_process (
-    GNUNET_OS_INHERIT_STD_ERR,
-    NULL, NULL, NULL,
-    "libeufin-sandbox",
-    "libeufin-sandbox",
-    "serve",
-    "--db-name", "/tmp/sandbox-exchange-test.sqlite3",
-    NULL);
-  if (NULL == sandbox_proc)
-  {
-    GNUNET_break (0);
-    return ret;
-  }
-
-  /* give child time to start and bind against the socket */
-  fprintf (stderr,
-           "Waiting for `sandbox' to be ready.\n");
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      fprintf (
-        stderr,
-        "Failed to launch `sandbox'\n");
-      GNUNET_OS_process_kill (sandbox_proc,
-                              SIGTERM);
-      GNUNET_OS_process_wait (sandbox_proc);
-      GNUNET_OS_process_destroy (sandbox_proc);
-      GNUNET_break (0);
-      return ret;
-    }
-    fprintf (stderr, ".");
-    sleep (1);
-    iter++;
-  }
-  while (0 != system ("curl -s http://localhost:5000/"));
-  fprintf (stderr, "\n");
-
-  // Creates nexus user + bank loopback connection + Taler facade.
-  if (0 != system ("taler-nexus-prepare"))
-  {
-    GNUNET_OS_process_kill (nexus_proc, SIGTERM);
-    GNUNET_OS_process_wait (nexus_proc);
-    GNUNET_OS_process_destroy (nexus_proc);
-    GNUNET_OS_process_kill (sandbox_proc, SIGTERM);
-    GNUNET_OS_process_wait (sandbox_proc);
-    GNUNET_OS_process_destroy (sandbox_proc);
-    TALER_LOG_ERROR ("Could not prepare nexus\n");
-    GNUNET_break (0);
-    return ret;
-  }
-  ret.nexus = nexus_proc;
-  ret.sandbox = sandbox_proc;
-  return ret;
-}
-
-
-struct GNUNET_OS_Process *
-TALER_TESTING_run_bank (const char *config_filename,
-                        const char *bank_url)
-{
-  struct GNUNET_OS_Process *bank_proc;
-  unsigned int iter;
-  char *wget_cmd;
-  char *database;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_load (cfg,
-                                 config_filename))
-  {
-    GNUNET_break (0);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    exit (77);
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "bank",
-                                             "database",
-                                             &database))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               "bank",
-                               "database");
-    GNUNET_break (0);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    exit (77);
-  }
-  GNUNET_CONFIGURATION_destroy (cfg);
-  bank_proc = GNUNET_OS_start_process (
-    GNUNET_OS_INHERIT_STD_ERR,
-    NULL, NULL, NULL,
-    "taler-bank-manage-testing",
-    "taler-bank-manage-testing",
-    config_filename,
-    database,
-    "serve", NULL);
-  GNUNET_free (database);
-  if (NULL == bank_proc)
-  {
-    BANK_FAIL ();
-  }
-
-  GNUNET_asprintf (&wget_cmd,
-                   "wget -q -t 2 -T 1 %s -o /dev/null -O /dev/null",
-                   bank_url);
-
-  /* give child time to start and bind against the socket */
-  fprintf (stderr,
-           "Waiting for `taler-bank-manage' to be ready (via %s)\n", wget_cmd);
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      fprintf (
-        stderr,
-        "Failed to launch `taler-bank-manage' (or `wget')\n");
-      GNUNET_OS_process_kill (bank_proc,
-                              SIGTERM);
-      GNUNET_OS_process_wait (bank_proc);
-      GNUNET_OS_process_destroy (bank_proc);
-      GNUNET_free (wget_cmd);
-      BANK_FAIL ();
-    }
-    fprintf (stderr, ".");
-    sleep (1);
-    iter++;
-  }
-  while (0 != system (wget_cmd));
-  GNUNET_free (wget_cmd);
-  fprintf (stderr, "\n");
-
-  return bank_proc;
-
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_nexus (const char *config_filename,
-                             int reset_db,
-                             const char *config_section,
-                             struct TALER_TESTING_BankConfiguration *bc)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  unsigned long long port;
-  char *database = NULL; // silence compiler
-  char *exchange_payto_uri;
-
-  GNUNET_assert (0 ==
-                 strncasecmp (config_section,
-                              "exchange-account-",
-                              strlen ("exchange-account-")));
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_load (cfg,
-                                 config_filename))
-  {
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             config_section,
-                                             "PAYTO_URI",
-                                             &exchange_payto_uri))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               config_section,
-                               "PAYTO_URI");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "bank",
-                                             "HTTP_PORT",
-                                             &port))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "bank",
-                               "HTTP_PORT");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_free (database);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
-                                     (uint16_t) port))
-  {
-    fprintf (stderr,
-             "Required port %llu not available, skipping.\n",
-             port);
-    GNUNET_break (0);
-    GNUNET_free (database);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-
-  /* DB preparation */
-  if (GNUNET_YES == reset_db)
-  {
-    if (0 != system (
-          "rm -f /tmp/nexus-exchange-test.sqlite3 && rm -f /tmp/sandbox-exchange-test.sqlite3"))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to invoke db-removal command.\n");
-      GNUNET_free (database);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return GNUNET_SYSERR;
-    }
-  }
-
-  {
-    char *csn;
-
-    GNUNET_asprintf (&csn,
-                     "exchange-accountcredentials-%s",
-                     &config_section[strlen ("exchange-account-")]);
-
-
-    if (GNUNET_OK !=
-        TALER_BANK_auth_parse_cfg (cfg,
-                                   csn,
-                                   &bc->exchange_auth))
-    {
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (csn);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (csn);
-  }
-  GNUNET_CONFIGURATION_destroy (cfg);
-  bc->exchange_payto = exchange_payto_uri;
-  bc->user42_payto =
-    "payto://iban/BIC/FR7630006000011234567890189?receiver-name=User42";
-  bc->user43_payto =
-    "payto://iban/BIC/GB33BUKB20201555555555?receiver-name=User43";
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Relying on nexus %s on port %u\n",
-              bc->exchange_auth.wire_gateway_url,
-              (unsigned int) port);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exchange payto: %s\n",
-              bc->exchange_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n",
-              bc->user42_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n",
-              bc->user43_payto);
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_bank (const char *config_filename,
-                            int reset_db,
-                            const char *config_section,
-                            struct TALER_TESTING_BankConfiguration *bc)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  unsigned long long port;
-  struct GNUNET_OS_Process *dbreset_proc;
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-  char *database;
-  char *exchange_payto_uri;
-
-  GNUNET_assert (0 ==
-                 strncasecmp (config_section,
-                              "exchange-account-",
-                              strlen ("exchange-account-")));
-  cfg = GNUNET_CONFIGURATION_create ();
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_load (cfg,
-                                 config_filename))
-  {
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "bank",
-                                             "DATABASE",
-                                             &database))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "bank",
-                               "DATABASE");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             config_section,
-                                             "PAYTO_URI",
-                                             &exchange_payto_uri))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               config_section,
-                               "PAYTO_URI");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "bank",
-                                             "HTTP_PORT",
-                                             &port))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "bank",
-                               "HTTP_PORT");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_free (database);
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
-                                     (uint16_t) port))
-  {
-    fprintf (stderr,
-             "Required port %llu not available, skipping.\n",
-             port);
-    GNUNET_break (0);
-    GNUNET_free (database);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-
-  /* DB preparation */
-  if (GNUNET_YES == reset_db)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Flushing bank database\n");
-    if (NULL ==
-        (dbreset_proc = GNUNET_OS_start_process (
-           GNUNET_OS_INHERIT_STD_ERR,
-           NULL, NULL, NULL,
-           "taler-bank-manage",
-           "taler-bank-manage",
-           "-c", config_filename,
-           "--with-db", database,
-           "django",
-           "flush",
-           "--no-input", NULL)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to flush the bank db.\n");
-      GNUNET_free (database);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return GNUNET_SYSERR;
-    }
-
-    if (GNUNET_SYSERR ==
-        GNUNET_OS_process_wait_status (dbreset_proc,
-                                       &type,
-                                       &code))
-    {
-      GNUNET_OS_process_destroy (dbreset_proc);
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (database);
-      return GNUNET_SYSERR;
-    }
-    if ( (type == GNUNET_OS_PROCESS_EXITED) &&
-         (0 != code) )
-    {
-      fprintf (stderr,
-               "Failed to setup database `%s'\n",
-               database);
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      GNUNET_free (database);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (database);
-    if ( (type != GNUNET_OS_PROCESS_EXITED) ||
-         (0 != code) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unexpected error running `taler-bank-manage django flush'!\n");
-      GNUNET_break (0);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_OS_process_destroy (dbreset_proc);
-  }
-  {
-    char *csn;
-
-    GNUNET_asprintf (&csn,
-                     "exchange-accountcredentials-%s",
-                     &config_section[strlen ("exchange-account-")]);
-
-    if (GNUNET_OK !=
-        TALER_BANK_auth_parse_cfg (cfg,
-                                   csn,
-                                   &bc->exchange_auth))
-    {
-      GNUNET_break (0);
-      GNUNET_free (csn);
-      GNUNET_CONFIGURATION_destroy (cfg);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_free (csn);
-  }
-  GNUNET_CONFIGURATION_destroy (cfg);
-  bc->exchange_payto = exchange_payto_uri;
-  bc->user42_payto = "payto://x-taler-bank/localhost/42";
-  bc->user43_payto = "payto://x-taler-bank/localhost/43";
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Using pybank %s on port %u\n",
-              bc->exchange_auth.wire_gateway_url,
-              (unsigned int) port);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "exchange payto: %s\n",
-              bc->exchange_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "user42_payto: %s\n",
-              bc->user42_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "user43_payto: %s\n",
-              bc->user43_payto);
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_fakebank (const char *config_filename,
-                                const char *config_section,
-                                struct TALER_TESTING_BankConfiguration *bc)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  unsigned long long fakebank_port;
-  char *exchange_payto_uri;
-
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg,
-                                              config_filename))
-    return GNUNET_SYSERR;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (cfg,
-                                             "BANK",
-                                             "HTTP_PORT",
-                                             &fakebank_port))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               "BANK",
-                               "HTTP_PORT");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             config_section,
-                                             "PAYTO_URI",
-                                             &exchange_payto_uri))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               config_section,
-                               "PAYTO_URI");
-    GNUNET_CONFIGURATION_destroy (cfg);
-    return GNUNET_SYSERR;
-  }
-  {
-    char *exchange_xtalerbank_account;
-
-    exchange_xtalerbank_account
-      = TALER_xtalerbank_account_from_payto (exchange_payto_uri);
-    if (NULL == exchange_xtalerbank_account)
-    {
-      GNUNET_break (0);
-      GNUNET_free (exchange_payto_uri);
-      return GNUNET_SYSERR;
-    }
-    GNUNET_asprintf (&bc->exchange_auth.wire_gateway_url,
-                     "http://localhost:%u/%s/",
-                     (unsigned int) fakebank_port,
-                     exchange_xtalerbank_account);
-    GNUNET_free (exchange_xtalerbank_account);
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Using fakebank %s on port %u\n",
-              bc->exchange_auth.wire_gateway_url,
-              (unsigned int) fakebank_port);
-
-  GNUNET_CONFIGURATION_destroy (cfg);
-  if (GNUNET_OK !=
-      TALER_TESTING_url_port_free (bc->exchange_auth.wire_gateway_url))
-  {
-    GNUNET_free (bc->exchange_auth.wire_gateway_url);
-    bc->exchange_auth.wire_gateway_url = NULL;
-    GNUNET_free (exchange_payto_uri);
-    return GNUNET_SYSERR;
-  }
-  /* Now we know it's the fake bank, for purpose of authentication, we
-   * don't have any auth. */
-  bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
-  bc->exchange_payto = exchange_payto_uri;
-  bc->user42_payto = "payto://x-taler-bank/localhost/42";
-  bc->user43_payto = "payto://x-taler-bank/localhost/43";
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exchange payto: %s\n",
-              bc->exchange_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n",
-              bc->user42_payto);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user43_payto: %s\n",
-              bc->user43_payto);
-  return GNUNET_OK;
-}
-
-
-json_t *
-TALER_TESTING_make_wire_details (const char *payto)
-{
-  struct TALER_WireSaltP salt;
-
-  /* salt must be constant for aggregation tests! */
-  memset (&salt,
-          47,
-          sizeof (salt));
-  return GNUNET_JSON_PACK (
-    GNUNET_JSON_pack_string ("payto_uri",
-                             payto),
-    GNUNET_JSON_pack_data_auto ("salt",
-                                &salt));
-}
-
-
-/* end of testing_api_helpers_bank.c */
diff --git a/src/testing/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c
deleted file mode 100644
index c47a1c2fb..000000000
--- a/src/testing/testing_api_helpers_exchange.c
+++ /dev/null
@@ -1,982 +0,0 @@
-/*
-  This file is part of TALER
-  Copyright (C) 2018-2020 Taler Systems SA
-
-  TALER is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as
-  published by the Free Software 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/>
-*/
-
-/**
- * @file testing/testing_api_helpers_exchange.c
- * @brief helper functions
- * @author Christian Grothoff
- * @author Marcello Stanisci
- */
-#include "platform.h"
-#include "taler_json_lib.h"
-#include <gnunet/gnunet_curl_lib.h>
-#include "taler_signatures.h"
-#include "taler_extensions.h"
-#include "taler_testing_lib.h"
-
-/**
- * Run multiple taler-exchange-httpd processes in
- * parallel using GNU parallel?
- */
-#define GNU_PARALLEL 0
-
-
-void
-TALER_TESTING_cleanup_files (const char *config_name)
-{
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_parse_and_run (config_name,
-                                          &TALER_TESTING_cleanup_files_cfg,
-                                          NULL))
-    exit (77);
-}
-
-
-/**
- * Remove @a option directory from @a section in @a cfg.
- *
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-remove_dir (const struct GNUNET_CONFIGURATION_Handle *cfg,
-            const char *section,
-            const char *option)
-{
-  char *dir;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               section,
-                                               option,
-                                               &dir))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               section,
-                               option);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_YES ==
-      GNUNET_DISK_directory_test (dir,
-                                  GNUNET_NO))
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_DISK_directory_remove (dir));
-  GNUNET_free (dir);
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_cleanup_files_cfg (void *cls,
-                                 const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  char *dir;
-
-  (void) cls;
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "exchange-offline",
-                                               "SECM_TOFU_FILE",
-                                               &dir))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-offline",
-                               "SECM_TOFU_FILE");
-    return GNUNET_SYSERR;
-  }
-  if ( (0 != unlink (dir)) &&
-       (ENOENT != errno) )
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
-                              "unlink",
-                              dir);
-    GNUNET_free (dir);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (dir);
-  if (GNUNET_OK !=
-      remove_dir (cfg,
-                  "taler-exchange-secmod-eddsa",
-                  "KEY_DIR"))
-    return GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      remove_dir (cfg,
-                  "taler-exchange-secmod-rsa",
-                  "KEY_DIR"))
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_run_auditor_exchange (const char *config_filename,
-                                    const char *exchange_master_pub,
-                                    const char *exchange_base_url,
-                                    int do_remove)
-{
-  struct GNUNET_OS_Process *proc;
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-
-  TALER_LOG_DEBUG ("Add exchange (%s,%s) to the auditor\n",
-                   exchange_base_url,
-                   exchange_master_pub);
-
-  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                  NULL, NULL, NULL,
-                                  "taler-auditor-exchange",
-                                  "taler-auditor-exchange",
-                                  "-c", config_filename,
-                                  "-u", exchange_base_url,
-                                  "-m", exchange_master_pub,
-                                  (GNUNET_YES == do_remove)
-                                  ? "-r"
-                                  : NULL,
-                                  NULL);
-  if (NULL == proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to run `taler-auditor-exchange`, is your PATH correct?\n");
-    return GNUNET_SYSERR;
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_OS_process_wait_status (proc,
-                                                &type,
-                                                &code));
-  GNUNET_OS_process_destroy (proc);
-  if ( (0 != code) ||
-       (GNUNET_OS_PROCESS_EXITED != type) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "taler-auditor-exchange terminated with error (%d/%d)\n",
-                (int) type,
-                (int) code);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_exchange_db_reset (const char *config_filename)
-{
-  struct GNUNET_OS_Process *proc;
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-
-  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                  NULL, NULL, NULL,
-                                  "taler-exchange-dbinit",
-                                  "taler-exchange-dbinit",
-                                  "-c", config_filename,
-                                  "-r",
-                                  NULL);
-  if (NULL == proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to run `taler-exchange-dbinit`, is your PATH correct?\n");
-    return GNUNET_NO;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_OS_process_wait_status (proc,
-                                     &type,
-                                     &code))
-  {
-    GNUNET_break (0);
-    GNUNET_OS_process_destroy (proc);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_OS_process_destroy (proc);
-  if ( (type == GNUNET_OS_PROCESS_EXITED) &&
-       (0 != code) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup (exchange) database, exit code %d\n",
-                (int) code);
-    return GNUNET_NO;
-  }
-  if ( (type != GNUNET_OS_PROCESS_EXITED) ||
-       (0 != code) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected error (%d/%d) running `taler-exchange-dbinit'!\n",
-                (int) type,
-                (int) code);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_auditor_db_reset (const char *config_filename)
-{
-  struct GNUNET_OS_Process *proc;
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
-
-  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                  NULL, NULL, NULL,
-                                  "taler-auditor-dbinit",
-                                  "taler-auditor-dbinit",
-                                  "-c", config_filename,
-                                  "-R",
-                                  NULL);
-  if (NULL == proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to run `taler-auditor-dbinit`, is your PATH correct?\n");
-    return GNUNET_NO;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_OS_process_wait_status (proc,
-                                     &type,
-                                     &code))
-  {
-    GNUNET_break (0);
-    GNUNET_OS_process_destroy (proc);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_OS_process_destroy (proc);
-  if ( (type == GNUNET_OS_PROCESS_EXITED) &&
-       (0 != code) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed to setup (auditor) database, exit code %d\n",
-                (int) code);
-    return GNUNET_NO;
-  }
-  if ( (type != GNUNET_OS_PROCESS_EXITED) ||
-       (0 != code) )
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unexpected error (%d/%d) running `taler-auditor-dbinit'!\n",
-                (int) type,
-                (int) code);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Type of closure for
- * #sign_keys_for_exchange.
- */
-struct SignInfo
-{
-  /**
-   * Members will be set to the exchange configuration.
-   */
-  struct TALER_TESTING_ExchangeConfiguration *ec;
-
-  /**
-   * Name of the configuration file to use.
-   */
-  const char *config_filename;
-
-  /**
-   * Did we reset the database?
-   */
-  int db_reset;
-};
-
-
-/**
- * Sign the keys for an exchange given configuration @a cfg.
- * The information to be signed must be in a file "auditor.in".
- *
- * @param[in,out] cls a `struct SignInfo` with further parameters
- * @param cfg configuration to use
- * @return #GNUNET_OK on success
- */
-static enum GNUNET_GenericReturnValue
-sign_keys_for_exchange (void *cls,
-                        const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct SignInfo *si = cls;
-  char *exchange_master_pub;
-  int ret;
-
-  /* Load the age restriction mask from the configuration */
-  TALER_extensions_load_taler_config (cfg);
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "exchange",
-                                             "BASE_URL",
-                                             &si->ec->exchange_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               "exchange",
-                               "BASE_URL");
-    si->ec->exchange_url = NULL;
-    return GNUNET_NO;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "auditor",
-                                             "BASE_URL",
-                                             &si->ec->auditor_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                               "auditor",
-                               "BASE_URL");
-    GNUNET_free (si->ec->exchange_url);
-    si->ec->exchange_url = NULL;
-    si->ec->auditor_url = NULL;
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "exchange",
-                                             "MASTER_PUBLIC_KEY",
-                                             &exchange_master_pub))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "MASTER_PUBLIC_KEY");
-    ret = GNUNET_SYSERR;
-    goto fail;
-  }
-  if ( (GNUNET_OK !=
-        TALER_TESTING_run_auditor_exchange (si->config_filename,
-                                            exchange_master_pub,
-                                            si->ec->exchange_url,
-                                            GNUNET_NO)) &&
-       (GNUNET_YES == si->db_reset) )
-  {
-    ret = GNUNET_NO;
-    goto fail;
-  }
-  GNUNET_free (exchange_master_pub);
-  return GNUNET_OK;
-fail:
-  GNUNET_free (si->ec->exchange_url);
-  GNUNET_free (si->ec->auditor_url);
-  si->ec->exchange_url = NULL;
-  si->ec->auditor_url = NULL;
-  return ret;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_prepare_exchange (const char *config_filename,
-                                int reset_db,
-                                struct TALER_TESTING_ExchangeConfiguration *ec)
-{
-  struct SignInfo si = {
-    .config_filename = config_filename,
-    .ec = ec,
-    .db_reset = reset_db
-  };
-
-  if (GNUNET_YES == reset_db)
-  {
-    if (GNUNET_OK !=
-        TALER_TESTING_exchange_db_reset (config_filename))
-      return GNUNET_NO;
-    if (GNUNET_OK !=
-        TALER_TESTING_auditor_db_reset (config_filename))
-      return GNUNET_NO;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_parse_and_run (config_filename,
-                                          &sign_keys_for_exchange,
-                                          &si))
-    return GNUNET_NO;
-  return GNUNET_OK;
-}
-
-
-const struct TALER_EXCHANGE_DenomPublicKey *
-TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys *keys,
-                       const struct TALER_Amount *amount,
-                       bool age_restricted)
-{
-  struct GNUNET_TIME_Timestamp now;
-  struct TALER_EXCHANGE_DenomPublicKey *pk;
-  char *str;
-
-  now = GNUNET_TIME_timestamp_get ();
-  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
-  {
-    pk = &keys->denom_keys[i];
-    if ( (0 == TALER_amount_cmp (amount,
-                                 &pk->value)) &&
-         (GNUNET_TIME_timestamp_cmp (now,
-                                     >=,
-                                     pk->valid_from)) &&
-         (GNUNET_TIME_timestamp_cmp (now,
-                                     <,
-                                     pk->withdraw_valid_until)) &&
-         (age_restricted == (0 != pk->key.age_mask.bits)) )
-      return pk;
-  }
-  /* do 2nd pass to check if expiration times are to blame for
-   * failure */
-  str = TALER_amount_to_string (amount);
-  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
-  {
-    pk = &keys->denom_keys[i];
-    if ( (0 == TALER_amount_cmp (amount,
-                                 &pk->value)) &&
-         (GNUNET_TIME_timestamp_cmp (now,
-                                     <,
-                                     pk->valid_from) ||
-          GNUNET_TIME_timestamp_cmp (now,
-                                     >,
-                                     pk->withdraw_valid_until) ) &&
-         (age_restricted == (0 != pk->key.age_mask.bits)) )
-    {
-      GNUNET_log
-        (GNUNET_ERROR_TYPE_WARNING,
-        "Have denomination key for `%s', but with wrong"
-        " expiration range %llu vs [%llu,%llu)\n",
-        str,
-        (unsigned long long) now.abs_time.abs_value_us,
-        (unsigned long long) pk->valid_from.abs_time.abs_value_us,
-        (unsigned long long) pk->withdraw_valid_until.abs_time.abs_value_us);
-      GNUNET_free (str);
-      return NULL;
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "No denomination key for amount %s found\n",
-              str);
-  GNUNET_free (str);
-  return NULL;
-}
-
-
-int
-TALER_TESTING_wait_exchange_ready (const char *base_url)
-{
-  char *wget_cmd;
-  unsigned int iter;
-
-  GNUNET_asprintf (&wget_cmd,
-                   "wget -q -t 1 -T 1 %sseed -o /dev/null -O /dev/null",
-                   base_url); // make sure ends with '/'
-  /* give child time to start and bind against the socket */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Waiting for `taler-exchange-httpd` service to be ready (check with: %s)\n",
-              wget_cmd);
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to launch `taler-exchange-httpd` service (or `wget')\n");
-      GNUNET_free (wget_cmd);
-      return 77;
-    }
-    sleep (1);
-    iter++;
-  }
-  while (0 != system (wget_cmd));
-  GNUNET_free (wget_cmd);
-  return 0;
-}
-
-
-int
-TALER_TESTING_wait_httpd_ready (const char *base_url)
-{
-  char *wget_cmd;
-  unsigned int iter;
-
-  GNUNET_asprintf (&wget_cmd,
-                   "wget -q -t 1 -T 1 %s -o /dev/null -O /dev/null",
-                   base_url); // make sure ends with '/'
-  /* give child time to start and bind against the socket */
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Waiting for HTTP service to be ready (check with: %s)\n",
-              wget_cmd);
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Failed to launch HTTP service (or `wget')\n");
-      GNUNET_free (wget_cmd);
-      return 77;
-    }
-    sleep (1);
-    iter++;
-  }
-  while (0 != system (wget_cmd));
-  GNUNET_free (wget_cmd);
-  return 0;
-}
-
-
-/**
- * Wait for the auditor to have started. Waits for at
- * most 10s, after that returns 77 to indicate an error.
- *
- * @param base_url what URL should we expect the auditor
- *        to be running at
- * @return 0 on success
- */
-int
-TALER_TESTING_wait_auditor_ready (const char *base_url)
-{
-  char *wget_cmd;
-  unsigned int iter;
-
-  GNUNET_asprintf (&wget_cmd,
-                   "wget -q -t 1 -T 1 %sversion -o /dev/null -O /dev/null",
-                   base_url); // make sure ends with '/'
-  /* give child time to start and bind against the socket */
-  fprintf (stderr,
-           "Waiting for `taler-auditor-httpd' to be ready at %s\n",
-           base_url);
-  iter = 0;
-  do
-  {
-    if (10 == iter)
-    {
-      fprintf (stderr,
-               "Failed to launch `taler-auditor-httpd' (or `wget')\n");
-      GNUNET_free (wget_cmd);
-      return 77;
-    }
-    fprintf (stderr, ".\n");
-    sleep (1);
-    iter++;
-  }
-  while (0 != system (wget_cmd));
-  GNUNET_free (wget_cmd);
-  return 0;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_exchange (TALER_TESTING_Main main_cb,
-                                   void *main_cb_cls,
-                                   const char *config_file)
-{
-  struct TALER_TESTING_SetupContext setup_ctx = {
-    .config_filename = config_file,
-    .main_cb = main_cb,
-    .main_cb_cls = main_cb_cls
-  };
-  enum GNUNET_GenericReturnValue result;
-
-  result =
-    GNUNET_CONFIGURATION_parse_and_run (config_file,
-                                        &TALER_TESTING_setup_with_exchange_cfg,
-                                        &setup_ctx);
-  if (GNUNET_OK != result)
-    return result;
-  return GNUNET_OK;
-}
-
-
-/**
- * Stop taler-exchange-crypto helpers.
- *
- * @param[in] helpers the process handles.
- */
-static void
-stop_helpers (struct GNUNET_OS_Process *helpers[3])
-{
-  for (unsigned int i = 0; i<3; i++)
-  {
-    if (NULL == helpers[i])
-      continue;
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (helpers[i],
-                                          SIGTERM));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (helpers[i]));
-    GNUNET_OS_process_destroy (helpers[i]);
-  }
-}
-
-
-/**
- * Start taler-exchange-crypto helpers.
- *
- * @param config_filename configuration file to use
- * @param[out] helpers where to store the process handles.
- */
-static enum GNUNET_GenericReturnValue
-start_helpers (const char *config_filename,
-               struct GNUNET_OS_Process *helpers[3])
-{
-  char *dir;
-  const struct GNUNET_OS_ProjectData *pd;
-
-  pd = GNUNET_OS_project_data_get ();
-  GNUNET_OS_init (TALER_project_data_default ());
-  dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
-  GNUNET_OS_init (pd);
-  if (NULL == dir)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  {
-    char *fn;
-
-    GNUNET_asprintf (&fn,
-                     "%s/%s",
-                     dir,
-                     "taler-exchange-secmod-eddsa");
-    helpers[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                          NULL, NULL, NULL,
-                                          fn,
-                                          "taler-exchange-secmod-eddsa",
-                                          "-c", config_filename,
-                                          "-L", "INFO",
-                                          NULL);
-    GNUNET_free (fn);
-  }
-  {
-    char *fn;
-
-    GNUNET_asprintf (&fn,
-                     "%s/%s",
-                     dir,
-                     "taler-exchange-secmod-rsa");
-    helpers[1] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                          NULL, NULL, NULL,
-                                          fn,
-                                          "taler-exchange-secmod-rsa",
-                                          "-c", config_filename,
-                                          "-L", "INFO",
-                                          NULL);
-    GNUNET_free (fn);
-  }
-  {
-    char *fn;
-
-    GNUNET_asprintf (&fn,
-                     "%s/%s",
-                     dir,
-                     "taler-exchange-secmod-cs");
-    helpers[2] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                          NULL, NULL, NULL,
-                                          fn,
-                                          "taler-exchange-secmod-cs",
-                                          "-c", config_filename,
-                                          "-L", "INFO",
-                                          NULL);
-    GNUNET_free (fn);
-  }
-  GNUNET_free (dir);
-  if ( (NULL == helpers[0]) ||
-       (NULL == helpers[1]) ||
-       (NULL == helpers[2]) )
-  {
-    stop_helpers (helpers);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_exchange_cfg (
-  void *cls,
-  const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  const struct TALER_TESTING_SetupContext *setup_ctx = cls;
-  struct GNUNET_OS_Process *exchanged;
-  struct GNUNET_OS_Process *helpers[3];
-  unsigned long long port;
-  char *serve;
-  char *base_url;
-  int result;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "exchange",
-                                             "SERVE",
-                                             &serve))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "SERVE");
-    return GNUNET_NO;
-  }
-
-  if (0 == strcmp ("tcp",
-                   serve))
-  {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_number (cfg,
-                                               "exchange",
-                                               "PORT",
-                                               &port))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "exchange",
-                                 "PORT");
-      GNUNET_free (serve);
-      return GNUNET_NO;
-    }
-
-    if (GNUNET_OK !=
-        GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
-                                       (uint16_t) port))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Required port %llu not available, skipping.\n",
-                  port);
-      GNUNET_free (serve);
-      return GNUNET_NO;
-    }
-  }
-  GNUNET_free (serve);
-  if (GNUNET_OK !=
-      start_helpers (setup_ctx->config_filename,
-                     helpers))
-  {
-    GNUNET_break (0);
-    return 77;
-  }
-  exchanged = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                       NULL, NULL, NULL,
-#if GNU_PARALLEL
-                                       "parallel",
-#endif
-                                       "taler-exchange-httpd",
-                                       "taler-exchange-httpd",
-                                       "-L", "INFO",
-                                       "-a", /* some tests may need timetravel */
-                                       "-c", setup_ctx->config_filename,
-#if GNU_PARALLEL
-                                       "-r",
-                                       ":::",
-                                       "-",
-                                       "-",
-                                       "-",
-                                       "-",
-#endif
-                                       NULL);
-  if (NULL == exchanged)
-  {
-    GNUNET_break (0);
-    stop_helpers (helpers);
-    return 77;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "exchange",
-                                             "BASE_URL",
-                                             &base_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "BASE_URL");
-    stop_helpers (helpers);
-    return GNUNET_NO;
-  }
-
-  if (0 != TALER_TESTING_wait_exchange_ready (base_url))
-  {
-    GNUNET_free (base_url);
-    stop_helpers (helpers);
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (exchanged,
-                                          SIGTERM));
-#if GNU_PARALLEL
-    /* GNU Parallel kills on 2nd SIGTERM, need to give it a
-       chance to process the 1st signal first... */
-    sleep (1);
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (exchanged,
-                                          SIGTERM));
-#endif
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (exchanged));
-    GNUNET_OS_process_destroy (exchanged);
-    return 77;
-  }
-  GNUNET_free (base_url);
-
-  /* NOTE: this call blocks.  */
-  result = TALER_TESTING_setup (setup_ctx->main_cb,
-                                setup_ctx->main_cb_cls,
-                                cfg,
-                                exchanged,
-                                GNUNET_YES);
-  GNUNET_break (0 ==
-                GNUNET_OS_process_kill (exchanged,
-                                        SIGTERM));
-#if GNU_PARALLEL
-  /* GNU Parallel kills on 2nd SIGTERM, need to give it a
-     chance to process the 1st signal first... */
-  sleep (1);
-  GNUNET_break (0 ==
-                GNUNET_OS_process_kill (exchanged,
-                                        SIGTERM));
-#endif
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_OS_process_wait (exchanged));
-  GNUNET_OS_process_destroy (exchanged);
-  stop_helpers (helpers);
-  return result;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_auditor_and_exchange_cfg (
-  void *cls,
-  const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  const struct TALER_TESTING_SetupContext *setup_ctx = cls;
-  struct GNUNET_OS_Process *auditord;
-  unsigned long long port;
-  char *serve;
-  char *base_url;
-  int result;
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "auditor",
-                                             "SERVE",
-                                             &serve))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "SERVE");
-    return GNUNET_NO;
-  }
-
-  if (0 == strcmp ("tcp", serve))
-  {
-    if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_number (cfg,
-                                               "auditor",
-                                               "PORT",
-                                               &port))
-    {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                                 "auditor",
-                                 "PORT");
-      GNUNET_free (serve);
-      return GNUNET_NO;
-    }
-
-    if (GNUNET_OK !=
-        GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
-                                       (uint16_t) port))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Required port %llu not available, skipping.\n",
-                  port);
-      GNUNET_free (serve);
-      return GNUNET_NO;
-    }
-  }
-  GNUNET_free (serve);
-  auditord = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
-                                      NULL, NULL, NULL,
-                                      "taler-auditor-httpd",
-                                      "taler-auditor-httpd",
-                                      "-c", setup_ctx->config_filename,
-                                      NULL);
-
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "auditor",
-                                             "BASE_URL",
-                                             &base_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "BASE_URL");
-    return GNUNET_NO;
-  }
-
-  if (0 != TALER_TESTING_wait_auditor_ready (base_url))
-  {
-    GNUNET_free (base_url);
-    GNUNET_break (0 ==
-                  GNUNET_OS_process_kill (auditord,
-                                          SIGTERM));
-    GNUNET_break (GNUNET_OK ==
-                  GNUNET_OS_process_wait (auditord));
-    GNUNET_OS_process_destroy (auditord);
-    return 77;
-  }
-  GNUNET_free (base_url);
-
-  /* NOTE: this call blocks.  */
-  result = TALER_TESTING_setup_with_exchange_cfg ((void *) setup_ctx,
-                                                  cfg);
-  GNUNET_break (0 ==
-                GNUNET_OS_process_kill (auditord,
-                                        SIGTERM));
-  GNUNET_break (GNUNET_OK ==
-                GNUNET_OS_process_wait (auditord));
-  GNUNET_OS_process_destroy (auditord);
-  return result;
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup_with_auditor_and_exchange (TALER_TESTING_Main main_cb,
-                                               void *main_cb_cls,
-                                               const char *config_file)
-{
-  struct TALER_TESTING_SetupContext setup_ctx = {
-    .config_filename = config_file,
-    .main_cb = main_cb,
-    .main_cb_cls = main_cb_cls
-  };
-
-  return GNUNET_CONFIGURATION_parse_and_run (
-    config_file,
-    &TALER_TESTING_setup_with_auditor_and_exchange_cfg,
-    &setup_ctx);
-}
-
-
-enum GNUNET_GenericReturnValue
-TALER_TESTING_url_port_free (const char *url)
-{
-  const char *port;
-  long pnum;
-
-  port = strrchr (url,
-                  (unsigned char) ':');
-  if (NULL == port)
-    pnum = 80;
-  else
-    pnum = strtol (port + 1, NULL, 10);
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
-                                     pnum))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Port %u not available.\n",
-                (unsigned int) pnum);
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/* end of testing_api_helpers_exchange.c */
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index 7b1387b59..0f242f7f1 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2018 Taler Systems SA
+  Copyright (C) 2018-2023 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
@@ -26,15 +26,65 @@
 #include "platform.h"
 #include "taler_json_lib.h"
 #include <gnunet/gnunet_curl_lib.h>
+#include "taler_extensions.h"
 #include "taler_signatures.h"
 #include "taler_testing_lib.h"
-#include "taler_fakebank_lib.h"
+
 
 /**
- * Pipe used to communicate child death via signal.
- * Must be global, as used in signal handler!
+ * The interpreter and its state
  */
-static struct GNUNET_DISK_PipeHandle *sigpipe;
+struct TALER_TESTING_Interpreter
+{
+
+  /**
+   * Commands the interpreter will run.
+   */
+  struct TALER_TESTING_Command *commands;
+
+  /**
+   * Interpreter task (if one is scheduled).
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Handle for the child management.
+   */
+  struct GNUNET_ChildWaitHandle *cwh;
+
+  /**
+   * Main execution context for the main loop.
+   */
+  struct GNUNET_CURL_Context *ctx;
+
+  /**
+   * Context for running the CURL event loop.
+   */
+  struct GNUNET_CURL_RescheduleContext *rc;
+
+  /**
+   * Hash map mapping variable names to commands.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *vars;
+
+  /**
+   * Task run on timeout.
+   */
+  struct GNUNET_SCHEDULER_Task *timeout_task;
+
+  /**
+   * Instruction pointer.  Tells #interpreter_run() which instruction to run
+   * next.  Need (signed) int because it gets -1 when rewinding the
+   * interpreter to the first CMD.
+   */
+  int ip;
+
+  /**
+   * Result of the testcases, #GNUNET_OK on success
+   */
+  enum GNUNET_GenericReturnValue result;
+
+};
 
 
 const struct TALER_TESTING_Command *
@@ -60,7 +110,7 @@ TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
 
     if (TALER_TESTING_cmd_is_batch (cmd))
     {
-      struct TALER_TESTING_Command **batch;
+      struct TALER_TESTING_Command *batch;
       struct TALER_TESTING_Command *current;
       struct TALER_TESTING_Command *icmd;
       const struct TALER_TESTING_Command *match;
@@ -72,7 +122,7 @@ TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
       /* We must do the loop forward, but we can find the last match */
       match = NULL;
       for (unsigned int j = 0;
-           NULL != (icmd = &(*batch)[j])->label;
+           NULL != (icmd = &batch[j])->label;
            j++)
       {
         if (current == icmd)
@@ -90,13 +140,29 @@ TALER_TESTING_interpreter_lookup_command (struct TALER_TESTING_Interpreter *is,
               "Command not found: %s\n",
               label);
   return NULL;
+}
+
 
+const struct TALER_TESTING_Command *
+TALER_TESTING_interpreter_get_command (struct TALER_TESTING_Interpreter *is,
+                                       const char *name)
+{
+  const struct TALER_TESTING_Command *cmd;
+  struct GNUNET_HashCode h_name;
+
+  GNUNET_CRYPTO_hash (name,
+                      strlen (name),
+                      &h_name);
+  cmd = GNUNET_CONTAINER_multihashmap_get (is->vars,
+                                           &h_name);
+  if (NULL == cmd)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Command not found by name: %s\n",
+                name);
+  return cmd;
 }
 
 
-/**
- * Obtain main execution context for the main loop.
- */
 struct GNUNET_CURL_Context *
 TALER_TESTING_interpreter_get_context (struct TALER_TESTING_Interpreter *is)
 {
@@ -104,38 +170,18 @@ TALER_TESTING_interpreter_get_context (struct TALER_TESTING_Interpreter *is)
 }
 
 
-struct TALER_FAKEBANK_Handle *
-TALER_TESTING_interpreter_get_fakebank (struct TALER_TESTING_Interpreter *is)
+void
+TALER_TESTING_touch_cmd (struct TALER_TESTING_Interpreter *is)
 {
-  return is->fakebank;
+  is->commands[is->ip].last_req_time
+    = GNUNET_TIME_absolute_get ();
 }
 
 
 void
-TALER_TESTING_run_with_fakebank (struct TALER_TESTING_Interpreter *is,
-                                 struct TALER_TESTING_Command *commands,
-                                 const char *bank_url)
+TALER_TESTING_inc_tries (struct TALER_TESTING_Interpreter *is)
 {
-  char *currency;
-
-  if (GNUNET_OK !=
-      TALER_config_get_currency (is->cfg,
-                                 &currency))
-  {
-    is->result = GNUNET_SYSERR;
-    return;
-  }
-  is->fakebank = TALER_TESTING_run_fakebank (bank_url,
-                                             currency);
-  GNUNET_free (currency);
-  if (NULL == is->fakebank)
-  {
-    GNUNET_break (0);
-    is->result = GNUNET_SYSERR;
-    return;
-  }
-  TALER_TESTING_run (is,
-                     commands);
+  is->commands[is->ip].num_tries++;
 }
 
 
@@ -159,7 +205,13 @@ TALER_TESTING_interpreter_next (struct TALER_TESTING_Interpreter *is)
     return; /* ignore, we already failed! */
   if (TALER_TESTING_cmd_is_batch (cmd))
   {
-    TALER_TESTING_cmd_batch_next (is);
+    if (TALER_TESTING_cmd_batch_next (is,
+                                      cmd->cls))
+    {
+      /* batch is done */
+      cmd->finish_time = GNUNET_TIME_absolute_get ();
+      is->ip++;
+    }
   }
   else
   {
@@ -173,7 +225,7 @@ TALER_TESTING_interpreter_next (struct TALER_TESTING_Interpreter *is)
                   "Interpreter executed 1000 instructions in %s\n",
                   GNUNET_STRINGS_relative_time_to_string (
                     GNUNET_TIME_absolute_get_duration (last_report),
-                    GNUNET_YES));
+                    true));
     last_report = GNUNET_TIME_absolute_get ();
   }
   ipc++;
@@ -202,19 +254,9 @@ TALER_TESTING_interpreter_fail (struct TALER_TESTING_Interpreter *is)
 }
 
 
-struct TALER_TESTING_Command
-TALER_TESTING_cmd_end (void)
-{
-  static struct TALER_TESTING_Command cmd;
-  cmd.label = NULL;
-
-  return cmd;
-}
-
-
 const char *
-TALER_TESTING_interpreter_get_current_label (struct
-                                             TALER_TESTING_Interpreter *is)
+TALER_TESTING_interpreter_get_current_label (
+  struct TALER_TESTING_Interpreter *is)
 {
   struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
@@ -246,6 +288,19 @@ interpreter_run (void *cls)
     = cmd->last_req_time
       = GNUNET_TIME_absolute_get ();
   cmd->num_tries = 1;
+  if (NULL != cmd->name)
+  {
+    struct GNUNET_HashCode h_name;
+
+    GNUNET_CRYPTO_hash (cmd->name,
+                        strlen (cmd->name),
+                        &h_name);
+    (void) GNUNET_CONTAINER_multihashmap_put (
+      is->vars,
+      &h_name,
+      cmd,
+      GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+  }
   cmd->run (cmd->cls,
             cmd,
             is);
@@ -274,24 +329,14 @@ do_shutdown (void *cls)
   for (unsigned int j = 0;
        NULL != (cmd = &is->commands[j])->label;
        j++)
-    cmd->cleanup (cmd->cls,
-                  cmd);
-  if (NULL != is->exchange)
-  {
-    TALER_LOG_DEBUG ("Disconnecting the exchange\n");
-    TALER_EXCHANGE_disconnect (is->exchange);
-    is->exchange = NULL;
-  }
+    if (NULL != cmd->cleanup)
+      cmd->cleanup (cmd->cls,
+                    cmd);
   if (NULL != is->task)
   {
     GNUNET_SCHEDULER_cancel (is->task);
     is->task = NULL;
   }
-  if (NULL != is->fakebank)
-  {
-    TALER_FAKEBANK_stop (is->fakebank);
-    is->fakebank = NULL;
-  }
   if (NULL != is->ctx)
   {
     GNUNET_CURL_fini (is->ctx);
@@ -302,15 +347,20 @@ do_shutdown (void *cls)
     GNUNET_CURL_gnunet_rc_destroy (is->rc);
     is->rc = NULL;
   }
+  if (NULL != is->vars)
+  {
+    GNUNET_CONTAINER_multihashmap_destroy (is->vars);
+    is->vars = NULL;
+  }
   if (NULL != is->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (is->timeout_task);
     is->timeout_task = NULL;
   }
-  if (NULL != is->child_death_task)
+  if (NULL != is->cwh)
   {
-    GNUNET_SCHEDULER_cancel (is->child_death_task);
-    is->child_death_task = NULL;
+    GNUNET_wait_child_cancel (is->cwh);
+    is->cwh = NULL;
   }
   GNUNET_free (is->commands);
 }
@@ -338,30 +388,24 @@ do_timeout (void *cls)
  * process died).
  *
  * @param cls the `struct TALER_TESTING_Interpreter *`
+ * @param type type of the process
+ * @param code status code of the process
  */
 static void
-maint_child_death (void *cls)
+maint_child_death (void *cls,
+                   enum GNUNET_OS_ProcessStatusType type,
+                   long unsigned int code)
 {
   struct TALER_TESTING_Interpreter *is = cls;
   struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
-  const struct GNUNET_DISK_FileHandle *pr;
   struct GNUNET_OS_Process **processp;
-  char c[16];
-  enum GNUNET_OS_ProcessStatusType type;
-  unsigned long code;
 
+  is->cwh = NULL;
   while (TALER_TESTING_cmd_is_batch (cmd))
     cmd = TALER_TESTING_cmd_batch_get_current (cmd);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Got SIGCHLD for `%s'.\n",
               cmd->label);
-  is->child_death_task = NULL;
-  pr = GNUNET_DISK_pipe_handle (sigpipe,
-                                GNUNET_DISK_PIPE_END_READ);
-  GNUNET_break (0 <
-                GNUNET_DISK_file_read (pr,
-                                       &c,
-                                       sizeof (c)));
   if (GNUNET_OK !=
       TALER_TESTING_get_trait_process (cmd,
                                        &processp))
@@ -370,13 +414,8 @@ maint_child_death (void *cls)
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Got the dead child process handle, waiting for termination ...\n");
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_OS_process_wait_status (*processp,
-                                                &type,
-                                                &code));
   GNUNET_OS_process_destroy (*processp);
   *processp = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -410,7 +449,6 @@ maint_child_death (void *cls)
     TALER_TESTING_interpreter_fail (is);
     return;
   }
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Dead child, go on with next command.\n");
   TALER_TESTING_interpreter_next (is);
@@ -420,16 +458,24 @@ maint_child_death (void *cls)
 void
 TALER_TESTING_wait_for_sigchld (struct TALER_TESTING_Interpreter *is)
 {
-  const struct GNUNET_DISK_FileHandle *pr;
+  struct GNUNET_OS_Process **processp;
+  struct TALER_TESTING_Command *cmd = &is->commands[is->ip];
 
-  GNUNET_assert (NULL == is->child_death_task);
-  pr = GNUNET_DISK_pipe_handle (sigpipe,
-                                GNUNET_DISK_PIPE_END_READ);
-  is->child_death_task
-    = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      pr,
-                                      &maint_child_death,
-                                      is);
+  while (TALER_TESTING_cmd_is_batch (cmd))
+    cmd = TALER_TESTING_cmd_batch_get_current (cmd);
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_process (cmd,
+                                       &processp))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
+  }
+  GNUNET_assert (NULL == is->cwh);
+  is->cwh
+    = GNUNET_wait_child (*processp,
+                         &maint_child_death,
+                         is);
 }
 
 
@@ -448,11 +494,12 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is,
   /* get the number of commands */
   for (i = 0; NULL != commands[i].label; i++)
     ;
-  is->commands = GNUNET_new_array (i + 1,
-                                   struct TALER_TESTING_Command);
-  memcpy (is->commands,
-          commands,
-          sizeof (struct TALER_TESTING_Command) * i);
+  is->commands = GNUNET_malloc_large ( (i + 1)
+                                       * sizeof (struct TALER_TESTING_Command));
+  GNUNET_assert (NULL != is->commands);
+  GNUNET_memcpy (is->commands,
+                 commands,
+                 sizeof (struct TALER_TESTING_Command) * i);
   is->timeout_task = GNUNET_SCHEDULER_add_delayed (
     timeout,
     &do_timeout,
@@ -464,14 +511,19 @@ TALER_TESTING_run2 (struct TALER_TESTING_Interpreter *is,
 }
 
 
+#include "valgrind.h"
+
 void
 TALER_TESTING_run (struct TALER_TESTING_Interpreter *is,
                    struct TALER_TESTING_Command *commands)
 {
   TALER_TESTING_run2 (is,
                       commands,
-                      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES,
-                                                     5));
+                      0 == RUNNING_ON_VALGRIND
+                      ? GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES,
+                                                       5)
+                      : GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES,
+                                                       50));
 }
 
 
@@ -505,352 +557,446 @@ struct MainContext
 
 
 /**
- * Signal handler called for SIGCHLD.  Triggers the
- * respective handler by writing to the trigger pipe.
+ * Initialize scheduler loop and curl context for the testcase,
+ * and responsible to run the "run" method.
+ *
+ * @param cls closure, typically the "run" method, the
+ *        interpreter state and a closure for "run".
  */
 static void
-sighandler_child_death (void)
+main_wrapper (void *cls)
+{
+  struct MainContext *main_ctx = cls;
+
+  main_ctx->main_cb (main_ctx->main_cb_cls,
+                     main_ctx->is);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TESTING_loop (TALER_TESTING_Main main_cb,
+                    void *main_cb_cls)
+{
+  struct TALER_TESTING_Interpreter is;
+  struct MainContext main_ctx = {
+    .main_cb = main_cb,
+    .main_cb_cls = main_cb_cls,
+    /* needed to init the curl ctx */
+    .is = &is,
+  };
+
+  memset (&is,
+          0,
+          sizeof (is));
+  is.ctx = GNUNET_CURL_init (
+    &GNUNET_CURL_gnunet_scheduler_reschedule,
+    &is.rc);
+  GNUNET_CURL_enable_async_scope_header (is.ctx,
+                                         "Taler-Correlation-Id");
+  GNUNET_assert (NULL != is.ctx);
+  is.rc = GNUNET_CURL_gnunet_rc_create (is.ctx);
+  is.vars = GNUNET_CONTAINER_multihashmap_create (1024,
+                                                  false);
+  /* Blocking */
+  GNUNET_SCHEDULER_run (&main_wrapper,
+                        &main_ctx);
+  return is.result;
+}
+
+
+int
+TALER_TESTING_main (char *const *argv,
+                    const char *loglevel,
+                    const char *cfg_file,
+                    const char *exchange_account_section,
+                    enum TALER_TESTING_BankSystem bs,
+                    struct TALER_TESTING_Credentials *cred,
+                    TALER_TESTING_Main main_cb,
+                    void *main_cb_cls)
 {
-  static char c;
-  int old_errno = errno;  /* back-up errno */
+  enum GNUNET_GenericReturnValue ret;
 
-  GNUNET_break (1 == GNUNET_DISK_file_write
-                  (GNUNET_DISK_pipe_handle (sigpipe,
-                                            GNUNET_DISK_PIPE_END_WRITE),
-                  &c, sizeof (c)));
-  errno = old_errno;    /* restore errno */
+  unsetenv ("XDG_DATA_HOME");
+  unsetenv ("XDG_CONFIG_HOME");
+  GNUNET_log_setup (argv[0],
+                    loglevel,
+                    NULL);
+  if (GNUNET_OK !=
+      TALER_TESTING_get_credentials (cfg_file,
+                                     exchange_account_section,
+                                     bs,
+                                     cred))
+  {
+    GNUNET_break (0);
+    return 77;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_cleanup_files_cfg (NULL,
+                                       cred->cfg))
+  {
+    GNUNET_break (0);
+    return 77;
+  }
+  if (GNUNET_OK !=
+      TALER_extensions_init (cred->cfg))
+  {
+    GNUNET_break (0);
+    return 77;
+  }
+  ret = TALER_TESTING_loop (main_cb,
+                            main_cb_cls);
+  /* TODO: should we free 'cred' resources here? */
+  return (GNUNET_OK == ret) ? 0 : 1;
 }
 
 
+/* ************** iterate over commands ********* */
+
+
 void
-TALER_TESTING_cert_cb (void *cls,
-                       const struct TALER_EXCHANGE_HttpResponse *hr,
-                       const struct TALER_EXCHANGE_Keys *keys,
-                       enum TALER_EXCHANGE_VersionCompatibility compat)
+TALER_TESTING_iterate (struct TALER_TESTING_Interpreter *is,
+                       bool asc,
+                       TALER_TESTING_CommandIterator cb,
+                       void *cb_cls)
 {
-  struct MainContext *main_ctx = cls;
-  struct TALER_TESTING_Interpreter *is = main_ctx->is;
+  unsigned int start;
+  unsigned int end;
+  int inc;
 
-  (void) compat;
-  if (NULL == keys)
+  if (asc)
   {
-    if (GNUNET_NO == is->working)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Got NULL response for /keys during startup (%u/%d), retrying!\n",
-                  hr->http_status,
-                  (int) hr->ec);
-      TALER_EXCHANGE_disconnect (is->exchange);
-      GNUNET_assert (
-        NULL != (is->exchange
-                   = TALER_EXCHANGE_connect (is->ctx,
-                                             main_ctx->exchange_url,
-                                             &TALER_TESTING_cert_cb,
-                                             main_ctx,
-                                             TALER_EXCHANGE_OPTION_END)));
-      return;
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Got NULL response for /keys during execution (%u/%d)!\n",
-                  hr->http_status,
-                  (int) hr->ec);
-    }
+    inc = 1;
+    start = 0;
+    end = is->ip;
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Got %d DK from /keys in generation %u\n",
-                keys->num_denom_keys,
-                is->key_generation + 1);
+    inc = -1;
+    start = is->ip;
+    end = 0;
+  }
+  for (unsigned int off = start; off != end + inc; off += inc)
+  {
+    const struct TALER_TESTING_Command *cmd = &is->commands[off];
+
+    cb (cb_cls,
+        cmd);
   }
-  is->key_generation++;
-  is->keys = keys;
+}
 
-  /* /keys has been called for some reason and
-   * the interpreter is already running. */
-  if (GNUNET_YES == is->working)
-    return;
-  is->working = GNUNET_YES;
-  /* Trigger the next command. */
-  TALER_LOG_DEBUG ("Cert_cb, scheduling CMD (ip: %d)\n",
-                   is->ip);
-  GNUNET_SCHEDULER_add_now (&interpreter_run,
-                            is);
+
+/* ************** special commands ********* */
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_end (void)
+{
+  static struct TALER_TESTING_Command cmd;
+  cmd.label = NULL;
+
+  return cmd;
+}
+
+
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_set_var (const char *name,
+                           struct TALER_TESTING_Command cmd)
+{
+  cmd.name = name;
+  return cmd;
 }
 
 
 /**
- * Initialize scheduler loop and curl context for the testcase,
- * and responsible to run the "run" method.
+ * State for a "rewind" CMD.
+ */
+struct RewindIpState
+{
+  /**
+   * Instruction pointer to set into the interpreter.
+   */
+  const char *target_label;
+
+  /**
+   * How many times this set should take place.  However, this value lives at
+   * the calling process, and this CMD is only in charge of checking and
+   * decremeting it.
+   */
+  unsigned int counter;
+};
+
+
+/**
+ * Seek for the @a target command in @a batch (and rewind to it
+ * if successful).
  *
- * @param cls closure, typically the "run" method, the
- *        interpreter state and a closure for "run".
+ * @param is the interpreter state (for failures)
+ * @param cmd batch to search for @a target
+ * @param target command to search for
+ * @return #GNUNET_OK on success, #GNUNET_NO if target was not found,
+ *         #GNUNET_SYSERR if target is in the future and we failed
  */
-static void
-main_wrapper_exchange_agnostic (void *cls)
+static enum GNUNET_GenericReturnValue
+seek_batch (struct TALER_TESTING_Interpreter *is,
+            const struct TALER_TESTING_Command *cmd,
+            const struct TALER_TESTING_Command *target)
 {
-  struct MainContext *main_ctx = cls;
+  unsigned int new_ip;
+  struct TALER_TESTING_Command *batch;
+  struct TALER_TESTING_Command *current;
+  struct TALER_TESTING_Command *icmd;
+  struct TALER_TESTING_Command *match;
 
-  main_ctx->main_cb (main_ctx->main_cb_cls,
-                     main_ctx->is);
+  current = TALER_TESTING_cmd_batch_get_current (cmd);
+  GNUNET_assert (GNUNET_OK ==
+                 TALER_TESTING_get_trait_batch_cmds (cmd,
+                                                     &batch));
+  match = NULL;
+  for (new_ip = 0;
+       NULL != (icmd = &batch[new_ip]);
+       new_ip++)
+  {
+    if (current == target)
+      current = NULL;
+    if (icmd == target)
+    {
+      match = icmd;
+      break;
+    }
+    if (TALER_TESTING_cmd_is_batch (icmd))
+    {
+      int ret = seek_batch (is,
+                            icmd,
+                            target);
+      if (GNUNET_SYSERR == ret)
+        return GNUNET_SYSERR; /* failure! */
+      if (GNUNET_OK == ret)
+      {
+        match = icmd;
+        break;
+      }
+    }
+  }
+  if (NULL == current)
+  {
+    /* refuse to jump forward */
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return GNUNET_SYSERR;
+  }
+  if (NULL == match)
+    return GNUNET_NO; /* not found */
+  TALER_TESTING_cmd_batch_set_current (cmd,
+                                       new_ip);
+  return GNUNET_OK;
 }
 
 
 /**
- * Function run when the test is aborted before we launch the actual
- * interpreter.  Cleans up our state.
+ * Run the "rewind" CMD.
  *
- * @param cls the main context
+ * @param cls closure.
+ * @param cmd command being executed now.
+ * @param is the interpreter state.
  */
 static void
-do_abort (void *cls)
+rewind_ip_run (void *cls,
+               const struct TALER_TESTING_Command *cmd,
+               struct TALER_TESTING_Interpreter *is)
 {
-  struct MainContext *main_ctx = cls;
-  struct TALER_TESTING_Interpreter *is = main_ctx->is;
+  struct RewindIpState *ris = cls;
+  const struct TALER_TESTING_Command *target;
+  unsigned int new_ip;
 
-  is->timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Executing abort prior to interpreter launch\n");
-  if (NULL != is->exchange)
+  (void) cmd;
+  if (0 == ris->counter)
   {
-    TALER_EXCHANGE_disconnect (is->exchange);
-    is->exchange = NULL;
+    TALER_TESTING_interpreter_next (is);
+    return;
   }
-  if (NULL != is->fakebank)
+  target
+    = TALER_TESTING_interpreter_lookup_command (is,
+                                                ris->target_label);
+  if (NULL == target)
   {
-    TALER_FAKEBANK_stop (is->fakebank);
-    is->fakebank = NULL;
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
   }
-  if (NULL != is->ctx)
+  ris->counter--;
+  for (new_ip = 0;
+       NULL != is->commands[new_ip].label;
+       new_ip++)
   {
-    GNUNET_CURL_fini (is->ctx);
-    is->ctx = NULL;
+    const struct TALER_TESTING_Command *cmd = &is->commands[new_ip];
+
+    if (cmd == target)
+      break;
+    if (TALER_TESTING_cmd_is_batch (cmd))
+    {
+      int ret = seek_batch (is,
+                            cmd,
+                            target);
+      if (GNUNET_SYSERR == ret)
+        return;   /* failure! */
+      if (GNUNET_OK == ret)
+        break;
+    }
   }
-  if (NULL != is->rc)
+  if (new_ip > (unsigned int) is->ip)
   {
-    GNUNET_CURL_gnunet_rc_destroy (is->rc);
-    is->rc = NULL;
+    /* refuse to jump forward */
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return;
   }
+  is->ip = new_ip - 1; /* -1 because the next function will advance by one */
+  TALER_TESTING_interpreter_next (is);
 }
 
 
-/**
- * Initialize scheduler loop and curl context for the testcase,
- * and responsible to run the "run" method.
- *
- * @param cls a `struct MainContext *`
- */
-static void
-main_wrapper_exchange_connect (void *cls)
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_rewind_ip (const char *label,
+                             const char *target_label,
+                             unsigned int counter)
 {
-  struct MainContext *main_ctx = cls;
-  struct TALER_TESTING_Interpreter *is = main_ctx->is;
-  char *exchange_url;
+  struct RewindIpState *ris;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (is->cfg,
-                                             "exchange",
-                                             "BASE_URL",
-                                             &exchange_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "BASE_URL");
-    return;
+  ris = GNUNET_new (struct RewindIpState);
+  ris->target_label = target_label;
+  ris->counter = counter;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ris,
+      .label = label,
+      .run = &rewind_ip_run
+    };
+
+    return cmd;
   }
-  main_ctx->exchange_url = exchange_url;
-  is->timeout_task = GNUNET_SCHEDULER_add_shutdown (&do_abort,
-                                                    main_ctx);
-  is->working = GNUNET_YES;
-  GNUNET_assert (NULL == is->exchange);
-  GNUNET_break (
-    NULL != (is->exchange =
-               TALER_EXCHANGE_connect (is->ctx,
-                                       exchange_url,
-                                       &TALER_TESTING_cert_cb,
-                                       main_ctx,
-                                       TALER_EXCHANGE_OPTION_END)));
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Starting main test loop\n");
-  main_ctx->main_cb (main_ctx->main_cb_cls,
-                     is);
 }
 
 
 /**
- * Load the exchange and auditor key material into @a is.
+ * State for a "authchange" CMD.
+ */
+struct AuthchangeState
+{
+
+  /**
+   * What is the new authorization token to send?
+   */
+  const char *auth_token;
+
+  /**
+   * Old context, clean up on termination.
+   */
+  struct GNUNET_CURL_Context *old_ctx;
+};
+
+
+/**
+ * Run the command.
  *
- * @param[in,out] is state to initialize
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
  */
-static enum GNUNET_GenericReturnValue
-load_keys (struct TALER_TESTING_Interpreter *is)
+static void
+authchange_run (void *cls,
+                const struct TALER_TESTING_Command *cmd,
+                struct TALER_TESTING_Interpreter *is)
 {
-  char *fn;
+  struct AuthchangeState *ss = cls;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (is->cfg,
-                                               "exchange-offline",
-                                               "MASTER_PRIV_FILE",
-                                               &fn))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange-offline",
-                               "MASTER_PRIV_FILE");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_DISK_directory_create_for_file (fn))
+  (void) cmd;
+  ss->old_ctx = is->ctx;
+  if (NULL != is->rc)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not setup directory for master private key file `%s'\n",
-                fn);
-    GNUNET_free (fn);
-    return GNUNET_SYSERR;
+    GNUNET_CURL_gnunet_rc_destroy (is->rc);
+    is->rc = NULL;
   }
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_eddsa_key_from_file (fn,
-                                         GNUNET_YES,
-                                         &is->master_priv.eddsa_priv))
+  is->ctx = GNUNET_CURL_init (&GNUNET_CURL_gnunet_scheduler_reschedule,
+                              &is->rc);
+  GNUNET_CURL_enable_async_scope_header (is->ctx,
+                                         "Taler-Correlation-Id");
+  GNUNET_assert (NULL != is->ctx);
+  is->rc = GNUNET_CURL_gnunet_rc_create (is->ctx);
+  if (NULL != ss->auth_token)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not load master private key from `%s'\n",
-                fn);
-    GNUNET_free (fn);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (fn);
-  GNUNET_CRYPTO_eddsa_key_get_public (&is->master_priv.eddsa_priv,
-                                      &is->master_pub.eddsa_pub);
+    char *authorization;
 
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (is->cfg,
-                                               "auditor",
-                                               "AUDITOR_PRIV_FILE",
-                                               &fn))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "AUDITOR_PRIV_FILE");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_DISK_directory_create_for_file (fn))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not setup directory for auditor private key file `%s'\n",
-                fn);
-    GNUNET_free (fn);
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_CRYPTO_eddsa_key_from_file (fn,
-                                         GNUNET_YES,
-                                         &is->auditor_priv.eddsa_priv))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not load auditor private key from `%s'\n",
-                fn);
-    GNUNET_free (fn);
-    return GNUNET_SYSERR;
+    GNUNET_asprintf (&authorization,
+                     "%s: %s",
+                     MHD_HTTP_HEADER_AUTHORIZATION,
+                     ss->auth_token);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CURL_append_header (is->ctx,
+                                              authorization));
+    GNUNET_free (authorization);
   }
-  GNUNET_free (fn);
-  GNUNET_CRYPTO_eddsa_key_get_public (&is->auditor_priv.eddsa_priv,
-                                      &is->auditor_pub.eddsa_pub);
-  return GNUNET_OK;
+  TALER_TESTING_interpreter_next (is);
 }
 
 
 /**
- * Load the exchange and auditor URLs from the configuration into @a is.
+ * Call GNUNET_CURL_fini(). Done as a separate task to
+ * ensure that all of the command's cleanups have been
+ * executed first.  See #7151.
  *
- * @param[in,out] is state to initialize
+ * @param cls a `struct GNUNET_CURL_Context *` to clean up.
  */
-static enum GNUNET_GenericReturnValue
-load_urls (struct TALER_TESTING_Interpreter *is)
+static void
+deferred_cleanup_cb (void *cls)
 {
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (is->cfg,
-                                             "auditor",
-                                             "BASE_URL",
-                                             &is->auditor_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "auditor",
-                               "BASE_URL");
-    return GNUNET_SYSERR;
-  }
-  if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (is->cfg,
-                                             "exchange",
-                                             "BASE_URL",
-                                             &is->exchange_url))
-  {
-    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "exchange",
-                               "BASE_URL");
-    GNUNET_free (is->auditor_url);
-    return GNUNET_SYSERR;
+  struct GNUNET_CURL_Context *ctx = cls;
+
+  GNUNET_CURL_fini (ctx);
+}
+
+
+/**
+ * Cleanup the state from a "authchange" CMD.
+ *
+ * @param cls closure.
+ * @param cmd the command which is being cleaned up.
+ */
+static void
+authchange_cleanup (void *cls,
+                    const struct TALER_TESTING_Command *cmd)
+{
+  struct AuthchangeState *ss = cls;
+
+  (void) cmd;
+  if (NULL != ss->old_ctx)
+  {
+    (void) GNUNET_SCHEDULER_add_now (&deferred_cleanup_cb,
+                                     ss->old_ctx);
+    ss->old_ctx = NULL;
   }
-  return GNUNET_OK;
+  GNUNET_free (ss);
 }
 
 
-enum GNUNET_GenericReturnValue
-TALER_TESTING_setup (TALER_TESTING_Main main_cb,
-                     void *main_cb_cls,
-                     const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     struct GNUNET_OS_Process *exchanged,
-                     int exchange_connect)
-{
-  struct TALER_TESTING_Interpreter is = {
-    .cfg = cfg,
-    .exchanged = exchanged
-  };
-  struct MainContext main_ctx = {
-    .main_cb = main_cb,
-    .main_cb_cls = main_cb_cls,
-    /* needed to init the curl ctx */
-    .is = &is,
-  };
-  struct GNUNET_SIGNAL_Context *shc_chld;
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_set_authorization (const char *label,
+                                     const char *auth_token)
+{
+  struct AuthchangeState *ss;
 
-  if (GNUNET_OK !=
-      load_keys (&is))
-    return GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      load_urls (&is))
-    return GNUNET_SYSERR;
-  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
-  GNUNET_assert (NULL != sigpipe);
-  shc_chld = GNUNET_SIGNAL_handler_install (
-    GNUNET_SIGCHLD,
-    &sighandler_child_death);
-  is.ctx = GNUNET_CURL_init (
-    &GNUNET_CURL_gnunet_scheduler_reschedule,
-    &is.rc);
-  GNUNET_CURL_enable_async_scope_header (is.ctx,
-                                         "Taler-Correlation-Id");
-  GNUNET_assert (NULL != is.ctx);
-  is.rc = GNUNET_CURL_gnunet_rc_create (is.ctx);
+  ss = GNUNET_new (struct AuthchangeState);
+  ss->auth_token = auth_token;
 
-  /* Blocking */
-  if (GNUNET_YES == exchange_connect)
-    GNUNET_SCHEDULER_run (&main_wrapper_exchange_connect,
-                          &main_ctx);
-  else
-    GNUNET_SCHEDULER_run (&main_wrapper_exchange_agnostic,
-                          &main_ctx);
-  if (NULL != is.final_cleanup_cb)
-    is.final_cleanup_cb (is.final_cleanup_cb_cls);
-  GNUNET_free (main_ctx.exchange_url);
-  GNUNET_SIGNAL_handler_uninstall (shc_chld);
-  GNUNET_DISK_pipe_close (sigpipe);
-  sigpipe = NULL;
-  GNUNET_free (is.auditor_url);
-  GNUNET_free (is.exchange_url);
-  return is.result;
+  {
+    struct TALER_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &authchange_run,
+      .cleanup = &authchange_cleanup
+    };
+
+    return cmd;
+  }
 }
 
 
diff --git a/src/testing/testing_api_misc.c b/src/testing/testing_api_misc.c
new file mode 100644
index 000000000..80ff0b6c8
--- /dev/null
+++ b/src/testing/testing_api_misc.c
@@ -0,0 +1,394 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2018-2023 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/>
+*/
+/**
+ * @file testing/testing_api_misc.c
+ * @brief non-command functions useful for writing tests
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <gnunet/gnunet_util_lib.h>
+#include "taler_testing_lib.h"
+#include "taler_fakebank_lib.h"
+
+
+bool
+TALER_TESTING_has_in_name (const char *prog,
+                           const char *marker)
+{
+  size_t name_pos;
+  size_t pos;
+
+  if (! prog || ! marker)
+    return false;
+
+  pos = 0;
+  name_pos = 0;
+  while (prog[pos])
+  {
+    if ('/' == prog[pos])
+      name_pos = pos + 1;
+    pos++;
+  }
+  if (name_pos == pos)
+    return true;
+  return (NULL != strstr (prog + name_pos,
+                          marker));
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TESTING_get_credentials (
+  const char *cfg_file,
+  const char *exchange_account_section,
+  enum TALER_TESTING_BankSystem bs,
+  struct TALER_TESTING_Credentials *ua)
+{
+  unsigned long long port;
+  char *exchange_payto_uri;
+
+  ua->cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_load (ua->cfg,
+                                 cfg_file))
+  {
+    GNUNET_break (0);
+    GNUNET_CONFIGURATION_destroy (ua->cfg);
+    return GNUNET_SYSERR;
+  }
+  if (0 !=
+      strncasecmp (exchange_account_section,
+                   "exchange-account-",
+                   strlen ("exchange-account-")))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ua->cfg,
+                                             exchange_account_section,
+                                             "PAYTO_URI",
+                                             &exchange_payto_uri))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               exchange_account_section,
+                               "PAYTO_URI");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (ua->cfg,
+                                             "bank",
+                                             "HTTP_PORT",
+                                             &port))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "bank",
+                               "HTTP_PORT");
+    return GNUNET_SYSERR;
+  }
+  {
+    char *csn;
+
+    GNUNET_asprintf (&csn,
+                     "exchange-accountcredentials-%s",
+                     &exchange_account_section[strlen ("exchange-account-")]);
+    if (GNUNET_OK !=
+        TALER_BANK_auth_parse_cfg (ua->cfg,
+                                   csn,
+                                   &ua->ba))
+    {
+      GNUNET_break (0);
+      GNUNET_free (csn);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (csn);
+  }
+  {
+    char *csn;
+
+    GNUNET_asprintf (&csn,
+                     "admin-accountcredentials-%s",
+                     &exchange_account_section[strlen ("exchange-account-")]);
+    if (GNUNET_OK !=
+        TALER_BANK_auth_parse_cfg (ua->cfg,
+                                   csn,
+                                   &ua->ba_admin))
+    {
+      GNUNET_break (0);
+      GNUNET_free (csn);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (csn);
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ua->cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             &ua->exchange_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange",
+                               "BASE_URL");
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (ua->cfg,
+                                             "auditor",
+                                             "BASE_URL",
+                                             &ua->auditor_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "auditor",
+                               "BASE_URL");
+    return GNUNET_SYSERR;
+  }
+
+  switch (bs)
+  {
+  case TALER_TESTING_BS_FAKEBANK:
+    ua->exchange_payto
+      = exchange_payto_uri;
+    ua->user42_payto
+      = GNUNET_strdup ("payto://x-taler-bank/localhost/42?receiver-name=42");
+    ua->user43_payto
+      = GNUNET_strdup ("payto://x-taler-bank/localhost/43?receiver-name=43");
+    break;
+  case TALER_TESTING_BS_IBAN:
+    ua->exchange_payto
+      = exchange_payto_uri;
+    ua->user42_payto
+      = GNUNET_strdup (
+          "payto://iban/SANDBOXX/FR7630006000011234567890189?receiver-name=User42");
+    ua->user43_payto
+      = GNUNET_strdup (
+          "payto://iban/SANDBOXX/GB33BUKB20201555555555?receiver-name=User43");
+    break;
+  }
+  return GNUNET_OK;
+}
+
+
+json_t *
+TALER_TESTING_make_wire_details (const char *payto)
+{
+  struct TALER_WireSaltP salt;
+
+  /* salt must be constant for aggregation tests! */
+  memset (&salt,
+          47,
+          sizeof (salt));
+  return GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("payto_uri",
+                             payto),
+    GNUNET_JSON_pack_data_auto ("salt",
+                                &salt));
+}
+
+
+/**
+ * Remove @a option directory from @a section in @a cfg.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+remove_dir (const struct GNUNET_CONFIGURATION_Handle *cfg,
+            const char *section,
+            const char *option)
+{
+  char *dir;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               section,
+                                               option,
+                                               &dir))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               option);
+    return GNUNET_SYSERR;
+  }
+  if (GNUNET_YES ==
+      GNUNET_DISK_directory_test (dir,
+                                  GNUNET_NO))
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_directory_remove (dir));
+  GNUNET_free (dir);
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TESTING_cleanup_files_cfg (
+  void *cls,
+  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *dir;
+
+  (void) cls;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg,
+                                               "exchange-offline",
+                                               "SECM_TOFU_FILE",
+                                               &dir))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "exchange-offline",
+                               "SECM_TOFU_FILE");
+    return GNUNET_SYSERR;
+  }
+  if ( (0 != unlink (dir)) &&
+       (ENOENT != errno) )
+  {
+    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                              "unlink",
+                              dir);
+    GNUNET_free (dir);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (dir);
+  if (GNUNET_OK !=
+      remove_dir (cfg,
+                  "taler-exchange-secmod-eddsa",
+                  "KEY_DIR"))
+    return GNUNET_SYSERR;
+  if (GNUNET_OK !=
+      remove_dir (cfg,
+                  "taler-exchange-secmod-rsa",
+                  "KEY_DIR"))
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
+}
+
+
+const struct TALER_EXCHANGE_DenomPublicKey *
+TALER_TESTING_find_pk (
+  const struct TALER_EXCHANGE_Keys *keys,
+  const struct TALER_Amount *amount,
+  bool age_restricted)
+{
+  struct GNUNET_TIME_Timestamp now;
+  struct TALER_EXCHANGE_DenomPublicKey *pk;
+  char *str;
+
+  now = GNUNET_TIME_timestamp_get ();
+  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
+  {
+    pk = &keys->denom_keys[i];
+    if ( (0 == TALER_amount_cmp (amount,
+                                 &pk->value)) &&
+         (GNUNET_TIME_timestamp_cmp (now,
+                                     >=,
+                                     pk->valid_from)) &&
+         (GNUNET_TIME_timestamp_cmp (now,
+                                     <,
+                                     pk->withdraw_valid_until)) &&
+         (age_restricted == (0 != pk->key.age_mask.bits)) )
+      return pk;
+  }
+  /* do 2nd pass to check if expiration times are to blame for
+   * failure */
+  str = TALER_amount_to_string (amount);
+  for (unsigned int i = 0; i<keys->num_denom_keys; i++)
+  {
+    pk = &keys->denom_keys[i];
+    if ( (0 == TALER_amount_cmp (amount,
+                                 &pk->value)) &&
+         (GNUNET_TIME_timestamp_cmp (now,
+                                     <,
+                                     pk->valid_from) ||
+          GNUNET_TIME_timestamp_cmp (now,
+                                     >,
+                                     pk->withdraw_valid_until) ) &&
+         (age_restricted == (0 != pk->key.age_mask.bits)) )
+    {
+      GNUNET_log
+        (GNUNET_ERROR_TYPE_WARNING,
+        "Have denomination key for `%s', but with wrong"
+        " expiration range %llu vs [%llu,%llu)\n",
+        str,
+        (unsigned long long) now.abs_time.abs_value_us,
+        (unsigned long long) pk->valid_from.abs_time.abs_value_us,
+        (unsigned long long) pk->withdraw_valid_until.abs_time.abs_value_us);
+      GNUNET_free (str);
+      return NULL;
+    }
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "No denomination key for amount %s found\n",
+              str);
+  GNUNET_free (str);
+  return NULL;
+}
+
+
+int
+TALER_TESTING_wait_httpd_ready (const char *base_url)
+{
+  char *wget_cmd;
+  unsigned int iter;
+
+  GNUNET_asprintf (&wget_cmd,
+                   "wget -q -t 1 -T 1 %s -o /dev/null -O /dev/null",
+                   base_url); // make sure ends with '/'
+  /* give child time to start and bind against the socket */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Waiting for HTTP service to be ready (check with: %s)\n",
+              wget_cmd);
+  iter = 0;
+  do
+  {
+    if (10 == iter)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to launch HTTP service (or `wget')\n");
+      GNUNET_free (wget_cmd);
+      return 77;
+    }
+    sleep (1);
+    iter++;
+  }
+  while (0 != system (wget_cmd));
+  GNUNET_free (wget_cmd);
+  return 0;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_TESTING_url_port_free (const char *url)
+{
+  const char *port;
+  long pnum;
+
+  port = strrchr (url,
+                  (unsigned char) ':');
+  if (NULL == port)
+    pnum = 80;
+  else
+    pnum = strtol (port + 1, NULL, 10);
+  if (GNUNET_OK !=
+      GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
+                                     pnum))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Port %u not available.\n",
+                (unsigned int) pnum);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
diff --git a/src/testing/testing_api_traits.c b/src/testing/testing_api_traits.c
index db94e81a5..799ae6718 100644
--- a/src/testing/testing_api_traits.c
+++ b/src/testing/testing_api_traits.c
@@ -67,7 +67,7 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
       return GNUNET_OK;
     }
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Trait %s/%u not found.\n",
               trait,
               index);
@@ -75,4 +75,59 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
 }
 
 
+const char *
+TALER_TESTING_get_exchange_url (struct TALER_TESTING_Interpreter *is)
+{
+  const char *exchange_url;
+  const struct TALER_TESTING_Command *exchange_cmd;
+
+  exchange_cmd
+    = TALER_TESTING_interpreter_get_command (is,
+                                             "exchange");
+  if (NULL == exchange_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_exchange_url (exchange_cmd,
+                                            &exchange_url))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return NULL;
+  }
+  return exchange_url;
+}
+
+
+struct TALER_EXCHANGE_Keys *
+TALER_TESTING_get_keys (
+  struct TALER_TESTING_Interpreter *is)
+{
+  struct TALER_EXCHANGE_Keys *keys;
+  const struct TALER_TESTING_Command *exchange_cmd;
+
+  exchange_cmd
+    = TALER_TESTING_interpreter_get_command (is,
+                                             "exchange");
+  if (NULL == exchange_cmd)
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      TALER_TESTING_get_trait_keys (exchange_cmd,
+                                    &keys))
+  {
+    GNUNET_break (0);
+    TALER_TESTING_interpreter_fail (is);
+    return NULL;
+  }
+  return keys;
+}
+
+
 /* end of testing_api_traits.c */
diff --git a/src/testing/testing_api_twister_helpers.c b/src/testing/testing_api_twister_helpers.c
index 935d8bcc1..68fbf0082 100644
--- a/src/testing/testing_api_twister_helpers.c
+++ b/src/testing/testing_api_twister_helpers.c
@@ -116,7 +116,9 @@ TALER_TWISTER_run_twister (const char *config_filename)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Could not start the taler-twister client\n");
-    GNUNET_OS_process_kill (proc, SIGTERM);
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (proc,
+                                          SIGTERM));
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     TWISTER_FAIL ();
@@ -129,7 +131,9 @@ TALER_TWISTER_run_twister (const char *config_filename)
                                      &code))
   {
     GNUNET_OS_process_destroy (client_proc);
-    GNUNET_OS_process_kill (proc, SIGTERM);
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (proc,
+                                          SIGTERM));
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     TWISTER_FAIL ();
@@ -140,7 +144,9 @@ TALER_TWISTER_run_twister (const char *config_filename)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to check twister works.\n");
     GNUNET_OS_process_destroy (client_proc);
-    GNUNET_OS_process_kill (proc, SIGTERM);
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (proc,
+                                          SIGTERM));
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     TWISTER_FAIL ();
@@ -151,7 +157,9 @@ TALER_TWISTER_run_twister (const char *config_filename)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Unexpected error running `taler-twister'!\n");
     GNUNET_OS_process_destroy (client_proc);
-    GNUNET_OS_process_kill (proc, SIGTERM);
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (proc,
+                                          SIGTERM));
     GNUNET_OS_process_wait (proc);
     GNUNET_OS_process_destroy (proc);
     TWISTER_FAIL ();
diff --git a/src/testing/valgrind.h b/src/testing/valgrind.h
new file mode 100644
index 000000000..eaf1632e1
--- /dev/null
+++ b/src/testing/valgrind.h
@@ -0,0 +1,7165 @@
+/* -*- c -*-
+   ----------------------------------------------------------------
+
+   Notice that the following BSD-style license applies to this one
+   file (valgrind.h) only.  The rest of Valgrind is licensed under the
+   terms of the GNU General Public License, version 2, unless
+   otherwise indicated.  See the COPYING file in the source
+   distribution for details.
+
+   ----------------------------------------------------------------
+
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2017 Julian Seward.  All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. The origin of this software must not be misrepresented; you must 
+      not claim that you wrote the original software.  If you use this 
+      software in a product, an acknowledgment in the product 
+      documentation would be appreciated but is not required.
+
+   3. Altered source versions must be plainly marked as such, and must
+      not be misrepresented as being the original software.
+
+   4. The name of the author may not be used to endorse or promote 
+      products derived from this software without specific prior written 
+      permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+   GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+   ----------------------------------------------------------------
+
+   Notice that the above BSD-style license applies to this one file
+   (valgrind.h) only.  The entire rest of Valgrind is licensed under
+   the terms of the GNU General Public License, version 2.  See the
+   COPYING file in the source distribution for details.
+
+   ---------------------------------------------------------------- 
+*/
+
+
+/* This file is for inclusion into client (your!) code.
+
+   You can use these macros to manipulate and query Valgrind's 
+   execution inside your own programs.
+
+   The resulting executables will still run without Valgrind, just a
+   little bit more slowly than they otherwise would, but otherwise
+   unchanged.  When not running on valgrind, each client request
+   consumes very few (eg. 7) instructions, so the resulting performance
+   loss is negligible unless you plan to execute client requests
+   millions of times per second.  Nevertheless, if that is still a
+   problem, you can compile with the NVALGRIND symbol defined (gcc
+   -DNVALGRIND) so that client requests are not even compiled in.  */
+
+#ifndef __VALGRIND_H
+#define __VALGRIND_H
+
+
+/* ------------------------------------------------------------------ */
+/* VERSION NUMBER OF VALGRIND                                         */
+/* ------------------------------------------------------------------ */
+
+/* Specify Valgrind's version number, so that user code can
+   conditionally compile based on our version number.  Note that these
+   were introduced at version 3.6 and so do not exist in version 3.5
+   or earlier.  The recommended way to use them to check for "version
+   X.Y or later" is (eg)
+
+#if defined(__VALGRIND_MAJOR__) && defined(__VALGRIND_MINOR__)   \
+    && (__VALGRIND_MAJOR__ > 3                                   \
+        || (__VALGRIND_MAJOR__ == 3 && __VALGRIND_MINOR__ >= 6))
+*/
+#define __VALGRIND_MAJOR__    3
+#define __VALGRIND_MINOR__    19
+
+
+#include <stdarg.h>
+
+/* Nb: this file might be included in a file compiled with -ansi.  So
+   we can't use C++ style "//" comments nor the "asm" keyword (instead
+   use "__asm__"). */
+
+/* Derive some tags indicating what the target platform is.  Note
+   that in this file we're using the compiler's CPP symbols for
+   identifying architectures, which are different to the ones we use
+   within the rest of Valgrind.  Note, __powerpc__ is active for both
+   32 and 64-bit PPC, whereas __powerpc64__ is only active for the
+   latter (on Linux, that is).
+
+   Misc note: how to find out what's predefined in gcc by default:
+   gcc -Wp,-dM somefile.c
+*/
+#undef PLAT_x86_darwin
+#undef PLAT_amd64_darwin
+#undef PLAT_x86_freebsd
+#undef PLAT_amd64_freebsd
+#undef PLAT_x86_win32
+#undef PLAT_amd64_win64
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64be_linux
+#undef PLAT_ppc64le_linux
+#undef PLAT_arm_linux
+#undef PLAT_arm64_linux
+#undef PLAT_s390x_linux
+#undef PLAT_mips32_linux
+#undef PLAT_mips64_linux
+#undef PLAT_nanomips_linux
+#undef PLAT_x86_solaris
+#undef PLAT_amd64_solaris
+
+
+#if defined(__APPLE__) && defined(__i386__)
+#  define PLAT_x86_darwin 1
+#elif defined(__APPLE__) && defined(__x86_64__)
+#  define PLAT_amd64_darwin 1
+#elif defined(__FreeBSD__) && defined(__i386__)
+#  define PLAT_x86_freebsd 1
+#elif defined(__FreeBSD__) && defined(__amd64__)
+#  define PLAT_amd64_freebsd 1
+#elif (defined(__MINGW32__) && defined(__i386__)) \
+      || defined(__CYGWIN32__) \
+      || (defined(_WIN32) && defined(_M_IX86))
+#  define PLAT_x86_win32 1
+#elif (defined(__MINGW32__) && defined(__x86_64__)) \
+      || (defined(_WIN32) && defined(_M_X64))
+/* __MINGW32__ and _WIN32 are defined in 64 bit mode as well. */
+#  define PLAT_amd64_win64 1
+#elif defined(__linux__) && defined(__i386__)
+#  define PLAT_x86_linux 1
+#elif defined(__linux__) && defined(__x86_64__) && !defined(__ILP32__)
+#  define PLAT_amd64_linux 1
+#elif defined(__linux__) && defined(__powerpc__) && !defined(__powerpc64__)
+#  define PLAT_ppc32_linux 1
+#elif defined(__linux__) && defined(__powerpc__) && defined(__powerpc64__) && _CALL_ELF != 2
+/* Big Endian uses ELF version 1 */
+#  define PLAT_ppc64be_linux 1
+#elif defined(__linux__) && defined(__powerpc__) && defined(__powerpc64__) && _CALL_ELF == 2
+/* Little Endian uses ELF version 2 */
+#  define PLAT_ppc64le_linux 1
+#elif defined(__linux__) && defined(__arm__) && !defined(__aarch64__)
+#  define PLAT_arm_linux 1
+#elif defined(__linux__) && defined(__aarch64__) && !defined(__arm__)
+#  define PLAT_arm64_linux 1
+#elif defined(__linux__) && defined(__s390__) && defined(__s390x__)
+#  define PLAT_s390x_linux 1
+#elif defined(__linux__) && defined(__mips__) && (__mips==64)
+#  define PLAT_mips64_linux 1
+#elif defined(__linux__) && defined(__mips__) && (__mips==32)
+#  define PLAT_mips32_linux 1
+#elif defined(__linux__) && defined(__nanomips__)
+#  define PLAT_nanomips_linux 1
+#elif defined(__sun) && defined(__i386__)
+#  define PLAT_x86_solaris 1
+#elif defined(__sun) && defined(__x86_64__)
+#  define PLAT_amd64_solaris 1
+#else
+/* If we're not compiling for our target platform, don't generate
+   any inline asms.  */
+#  if !defined(NVALGRIND)
+#    define NVALGRIND 1
+#  endif
+#endif
+
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE SPECIFICS for SPECIAL INSTRUCTIONS.  There is nothing */
+/* in here of use to end-users -- skip to the next section.           */
+/* ------------------------------------------------------------------ */
+
+/*
+ * VALGRIND_DO_CLIENT_REQUEST(): a statement that invokes a Valgrind client
+ * request. Accepts both pointers and integers as arguments.
+ *
+ * VALGRIND_DO_CLIENT_REQUEST_STMT(): a statement that invokes a Valgrind
+ * client request that does not return a value.
+
+ * VALGRIND_DO_CLIENT_REQUEST_EXPR(): a C expression that invokes a Valgrind
+ * client request and whose value equals the client request result.  Accepts
+ * both pointers and integers as arguments.  Note that such calls are not
+ * necessarily pure functions -- they may have side effects.
+ */
+
+#define VALGRIND_DO_CLIENT_REQUEST(_zzq_rlval, _zzq_default,            \
+                                   _zzq_request, _zzq_arg1, _zzq_arg2,  \
+                                   _zzq_arg3, _zzq_arg4, _zzq_arg5)     \
+  do { (_zzq_rlval) = VALGRIND_DO_CLIENT_REQUEST_EXPR((_zzq_default),   \
+                        (_zzq_request), (_zzq_arg1), (_zzq_arg2),       \
+                        (_zzq_arg3), (_zzq_arg4), (_zzq_arg5)); } while (0)
+
+#define VALGRIND_DO_CLIENT_REQUEST_STMT(_zzq_request, _zzq_arg1,        \
+                           _zzq_arg2,  _zzq_arg3, _zzq_arg4, _zzq_arg5) \
+  do { (void) VALGRIND_DO_CLIENT_REQUEST_EXPR(0,                        \
+                    (_zzq_request), (_zzq_arg1), (_zzq_arg2),           \
+                    (_zzq_arg3), (_zzq_arg4), (_zzq_arg5)); } while (0)
+
+#if defined(NVALGRIND)
+
+/* Define NVALGRIND to completely remove the Valgrind magic sequence
+   from the compiled code (analogous to NDEBUG's effects on
+   assert()) */
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+      (_zzq_default)
+
+#else  /* ! NVALGRIND */
+
+/* The following defines the magic code sequences which the JITter
+   spots and handles magically.  Don't look too closely at them as
+   they will rot your brain.
+
+   The assembly code sequences for all architectures is in this one
+   file.  This is because this file must be stand-alone, and we don't
+   want to have multiple files.
+
+   For VALGRIND_DO_CLIENT_REQUEST, we must ensure that the default
+   value gets put in the return slot, so that everything works when
+   this is executed not under Valgrind.  Args are passed in a memory
+   block, and so there's no intrinsic limit to the number that could
+   be passed, but it's currently five.
+   
+   The macro args are: 
+      _zzq_rlval    result lvalue
+      _zzq_default  default value (result returned when running on real CPU)
+      _zzq_request  request code
+      _zzq_arg1..5  request params
+
+   The other two macros are used to support function wrapping, and are
+   a lot simpler.  VALGRIND_GET_NR_CONTEXT returns the value of the
+   guest's NRADDR pseudo-register and whatever other information is
+   needed to safely run the call original from the wrapper: on
+   ppc64-linux, the R2 value at the divert point is also needed.  This
+   information is abstracted into a user-visible type, OrigFn.
+
+   VALGRIND_CALL_NOREDIR_* behaves the same as the following on the
+   guest, but guarantees that the branch instruction will not be
+   redirected: x86: call *%eax, amd64: call *%rax, ppc32/ppc64:
+   branch-and-link-to-r11.  VALGRIND_CALL_NOREDIR is just text, not a
+   complete inline asm, since it needs to be combined with more magic
+   inline asm stuff to be useful.
+*/
+
+/* ----------------- x86-{linux,darwin,solaris} ---------------- */
+
+#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin)  \
+    ||  (defined(PLAT_x86_win32) && defined(__GNUC__)) \
+    ||  defined(PLAT_x86_solaris) || defined(PLAT_x86_freebsd)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "roll $3,  %%edi ; roll $13, %%edi\n\t"      \
+                     "roll $29, %%edi ; roll $19, %%edi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  __extension__                                                   \
+  ({volatile unsigned int _zzq_args[6];                           \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EDX = client_request ( %EAX ) */         \
+                     "xchgl %%ebx,%%ebx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %EAX = guest_NRADDR */                    \
+                     "xchgl %%ecx,%%ecx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_EAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%EAX */                     \
+                     "xchgl %%edx,%%edx\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "xchgl %%edi,%%edi\n\t"                     \
+                     : : : "cc", "memory"                        \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_x86_linux || PLAT_x86_darwin || (PLAT_x86_win32 && __GNUC__)
+          || PLAT_x86_solaris */
+
+/* ------------------------- x86-Win32 ------------------------- */
+
+#if defined(PLAT_x86_win32) && !defined(__GNUC__)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#if defined(_MSC_VER)
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     __asm rol edi, 3  __asm rol edi, 13          \
+                     __asm rol edi, 29 __asm rol edi, 19
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+    valgrind_do_client_request_expr((uintptr_t)(_zzq_default),    \
+        (uintptr_t)(_zzq_request), (uintptr_t)(_zzq_arg1),        \
+        (uintptr_t)(_zzq_arg2), (uintptr_t)(_zzq_arg3),           \
+        (uintptr_t)(_zzq_arg4), (uintptr_t)(_zzq_arg5))
+
+static __inline uintptr_t
+valgrind_do_client_request_expr(uintptr_t _zzq_default, uintptr_t _zzq_request,
+                                uintptr_t _zzq_arg1, uintptr_t _zzq_arg2,
+                                uintptr_t _zzq_arg3, uintptr_t _zzq_arg4,
+                                uintptr_t _zzq_arg5)
+{
+    volatile uintptr_t _zzq_args[6];
+    volatile unsigned int _zzq_result;
+    _zzq_args[0] = (uintptr_t)(_zzq_request);
+    _zzq_args[1] = (uintptr_t)(_zzq_arg1);
+    _zzq_args[2] = (uintptr_t)(_zzq_arg2);
+    _zzq_args[3] = (uintptr_t)(_zzq_arg3);
+    _zzq_args[4] = (uintptr_t)(_zzq_arg4);
+    _zzq_args[5] = (uintptr_t)(_zzq_arg5);
+    __asm { __asm lea eax, _zzq_args __asm mov edx, _zzq_default
+            __SPECIAL_INSTRUCTION_PREAMBLE
+            /* %EDX = client_request ( %EAX ) */
+            __asm xchg ebx,ebx
+            __asm mov _zzq_result, edx
+    }
+    return _zzq_result;
+}
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm { __SPECIAL_INSTRUCTION_PREAMBLE                        \
+            /* %EAX = guest_NRADDR */                             \
+            __asm xchg ecx,ecx                                    \
+            __asm mov __addr, eax                                 \
+    }                                                             \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_EAX ERROR
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm { __SPECIAL_INSTRUCTION_PREAMBLE                       \
+            __asm xchg edi,edi                                   \
+    }                                                            \
+ } while (0)
+
+#else
+#error Unsupported compiler.
+#endif
+
+#endif /* PLAT_x86_win32 */
+
+/* ----------------- amd64-{linux,darwin,solaris} --------------- */
+
+#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin) \
+    ||  defined(PLAT_amd64_solaris) \
+    ||  defined(PLAT_amd64_freebsd) \
+    ||  (defined(PLAT_amd64_win64) && defined(__GNUC__))
+
+typedef
+   struct { 
+      unsigned long int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rolq $3,  %%rdi ; rolq $13, %%rdi\n\t"      \
+                     "rolq $61, %%rdi ; rolq $51, %%rdi\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+    __extension__                                                 \
+    ({ volatile unsigned long int _zzq_args[6];                   \
+    volatile unsigned long int _zzq_result;                       \
+    _zzq_args[0] = (unsigned long int)(_zzq_request);             \
+    _zzq_args[1] = (unsigned long int)(_zzq_arg1);                \
+    _zzq_args[2] = (unsigned long int)(_zzq_arg2);                \
+    _zzq_args[3] = (unsigned long int)(_zzq_arg3);                \
+    _zzq_args[4] = (unsigned long int)(_zzq_arg4);                \
+    _zzq_args[5] = (unsigned long int)(_zzq_arg5);                \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RDX = client_request ( %RAX ) */         \
+                     "xchgq %%rbx,%%rbx"                          \
+                     : "=d" (_zzq_result)                         \
+                     : "a" (&_zzq_args[0]), "0" (_zzq_default)    \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_result;                                                  \
+    })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned long int __addr;                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %RAX = guest_NRADDR */                    \
+                     "xchgq %%rcx,%%rcx"                          \
+                     : "=a" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory"                             \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_RAX                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* call-noredir *%RAX */                     \
+                     "xchgq %%rdx,%%rdx\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "xchgq %%rdi,%%rdi\n\t"                     \
+                     : : : "cc", "memory"                        \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin || PLAT_amd64_solaris */
+
+/* ------------------------- amd64-Win64 ------------------------- */
+
+#if defined(PLAT_amd64_win64) && !defined(__GNUC__)
+
+#error Unsupported compiler.
+
+#endif /* PLAT_amd64_win64 */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                    "rlwinm 0,0,3,0,31  ; rlwinm 0,0,13,0,31\n\t" \
+                    "rlwinm 0,0,29,0,31 ; rlwinm 0,0,19,0,31\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+    __extension__                                                 \
+  ({         unsigned int  _zzq_args[6];                          \
+             unsigned int  _zzq_result;                           \
+             unsigned int* _zzq_ptr;                              \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_result;                                                  \
+    })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned int __addr;                                          \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "or 5,5,5\n\t"                              \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64be_linux)
+
+typedef
+   struct { 
+      unsigned long int nraddr; /* where's the code? */
+      unsigned long int r2;  /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  __extension__                                                   \
+  ({         unsigned long int  _zzq_args[6];                     \
+             unsigned long int  _zzq_result;                      \
+             unsigned long int* _zzq_ptr;                         \
+    _zzq_args[0] = (unsigned long int)(_zzq_request);             \
+    _zzq_args[1] = (unsigned long int)(_zzq_arg1);                \
+    _zzq_args[2] = (unsigned long int)(_zzq_arg2);                \
+    _zzq_args[3] = (unsigned long int)(_zzq_arg3);                \
+    _zzq_args[4] = (unsigned long int)(_zzq_arg4);                \
+    _zzq_args[5] = (unsigned long int)(_zzq_arg5);                \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned long int __addr;                                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R11 */       \
+                     "or 3,3,3\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "or 5,5,5\n\t"                              \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_ppc64be_linux */
+
+#if defined(PLAT_ppc64le_linux)
+
+typedef
+   struct {
+      unsigned long int nraddr; /* where's the code? */
+      unsigned long int r2;     /* what tocptr do we need? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+                     "rotldi 0,0,3  ; rotldi 0,0,13\n\t"          \
+                     "rotldi 0,0,61 ; rotldi 0,0,51\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  __extension__                                                   \
+  ({         unsigned long int  _zzq_args[6];                     \
+             unsigned long int  _zzq_result;                      \
+             unsigned long int* _zzq_ptr;                         \
+    _zzq_args[0] = (unsigned long int)(_zzq_request);             \
+    _zzq_args[1] = (unsigned long int)(_zzq_arg1);                \
+    _zzq_args[2] = (unsigned long int)(_zzq_arg2);                \
+    _zzq_args[3] = (unsigned long int)(_zzq_arg3);                \
+    _zzq_args[4] = (unsigned long int)(_zzq_arg4);                \
+    _zzq_args[5] = (unsigned long int)(_zzq_arg5);                \
+    _zzq_ptr = _zzq_args;                                         \
+    __asm__ volatile("mr 3,%1\n\t" /*default*/                    \
+                     "mr 4,%2\n\t" /*ptr*/                        \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = client_request ( %R4 ) */           \
+                     "or 1,1,1\n\t"                               \
+                     "mr %0,3"     /*result*/                     \
+                     : "=b" (_zzq_result)                         \
+                     : "b" (_zzq_default), "b" (_zzq_ptr)         \
+                     : "cc", "memory", "r3", "r4");               \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned long int __addr;                                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR */                     \
+                     "or 2,2,2\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %R3 = guest_NRADDR_GPR2 */                \
+                     "or 4,4,4\n\t"                               \
+                     "mr %0,3"                                    \
+                     : "=b" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->r2 = __addr;                                       \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R12 */       \
+                     "or 3,3,3\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "or 5,5,5\n\t"                              \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_ppc64le_linux */
+
+/* ------------------------- arm-linux ------------------------- */
+
+#if defined(PLAT_arm_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+            "mov r12, r12, ror #3  ; mov r12, r12, ror #13 \n\t"  \
+            "mov r12, r12, ror #29 ; mov r12, r12, ror #19 \n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  __extension__                                                   \
+  ({volatile unsigned int  _zzq_args[6];                          \
+    volatile unsigned int  _zzq_result;                           \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile("mov r3, %1\n\t" /*default*/                 \
+                     "mov r4, %2\n\t" /*ptr*/                     \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* R3 = client_request ( R4 ) */             \
+                     "orr r10, r10, r10\n\t"                      \
+                     "mov %0, r3"     /*result*/                  \
+                     : "=r" (_zzq_result)                         \
+                     : "r" (_zzq_default), "r" (&_zzq_args[0])    \
+                     : "cc","memory", "r3", "r4");                \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned int __addr;                                          \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* R3 = guest_NRADDR */                      \
+                     "orr r11, r11, r11\n\t"                      \
+                     "mov %0, r3"                                 \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "r3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                    \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir *%R4 */        \
+                     "orr r12, r12, r12\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "orr r9, r9, r9\n\t"                        \
+                     : : : "cc", "memory"                        \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_arm_linux */
+
+/* ------------------------ arm64-linux ------------------------- */
+
+#if defined(PLAT_arm64_linux)
+
+typedef
+   struct { 
+      unsigned long int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE                            \
+            "ror x12, x12, #3  ;  ror x12, x12, #13 \n\t"         \
+            "ror x12, x12, #51 ;  ror x12, x12, #61 \n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+        _zzq_default, _zzq_request,                               \
+        _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+                                                                  \
+  __extension__                                                   \
+  ({volatile unsigned long int  _zzq_args[6];                     \
+    volatile unsigned long int  _zzq_result;                      \
+    _zzq_args[0] = (unsigned long int)(_zzq_request);             \
+    _zzq_args[1] = (unsigned long int)(_zzq_arg1);                \
+    _zzq_args[2] = (unsigned long int)(_zzq_arg2);                \
+    _zzq_args[3] = (unsigned long int)(_zzq_arg3);                \
+    _zzq_args[4] = (unsigned long int)(_zzq_arg4);                \
+    _zzq_args[5] = (unsigned long int)(_zzq_arg5);                \
+    __asm__ volatile("mov x3, %1\n\t" /*default*/                 \
+                     "mov x4, %2\n\t" /*ptr*/                     \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* X3 = client_request ( X4 ) */             \
+                     "orr x10, x10, x10\n\t"                      \
+                     "mov %0, x3"     /*result*/                  \
+                     : "=r" (_zzq_result)                         \
+                     : "r" ((unsigned long int)(_zzq_default)),   \
+                       "r" (&_zzq_args[0])                        \
+                     : "cc","memory", "x3", "x4");                \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    unsigned long int __addr;                                     \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* X3 = guest_NRADDR */                      \
+                     "orr x11, x11, x11\n\t"                      \
+                     "mov %0, x3"                                 \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "cc", "memory", "x3"                       \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                    \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* branch-and-link-to-noredir X8 */          \
+                     "orr x12, x12, x12\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "orr x9, x9, x9\n\t"                        \
+                     : : : "cc", "memory"                        \
+                    );                                           \
+ } while (0)
+
+#endif /* PLAT_arm64_linux */
+
+/* ------------------------ s390x-linux ------------------------ */
+
+#if defined(PLAT_s390x_linux)
+
+typedef
+  struct {
+     unsigned long int nraddr; /* where's the code? */
+  }
+  OrigFn;
+
+/* __SPECIAL_INSTRUCTION_PREAMBLE will be used to identify Valgrind specific
+ * code. This detection is implemented in platform specific toIR.c
+ * (e.g. VEX/priv/guest_s390_decoder.c).
+ */
+#define __SPECIAL_INSTRUCTION_PREAMBLE                           \
+                     "lr 15,15\n\t"                              \
+                     "lr 1,1\n\t"                                \
+                     "lr 2,2\n\t"                                \
+                     "lr 3,3\n\t"
+
+#define __CLIENT_REQUEST_CODE "lr 2,2\n\t"
+#define __GET_NR_CONTEXT_CODE "lr 3,3\n\t"
+#define __CALL_NO_REDIR_CODE  "lr 4,4\n\t"
+#define __VEX_INJECT_IR_CODE  "lr 5,5\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                         \
+       _zzq_default, _zzq_request,                               \
+       _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)    \
+  __extension__                                                  \
+ ({volatile unsigned long int _zzq_args[6];                      \
+   volatile unsigned long int _zzq_result;                       \
+   _zzq_args[0] = (unsigned long int)(_zzq_request);             \
+   _zzq_args[1] = (unsigned long int)(_zzq_arg1);                \
+   _zzq_args[2] = (unsigned long int)(_zzq_arg2);                \
+   _zzq_args[3] = (unsigned long int)(_zzq_arg3);                \
+   _zzq_args[4] = (unsigned long int)(_zzq_arg4);                \
+   _zzq_args[5] = (unsigned long int)(_zzq_arg5);                \
+   __asm__ volatile(/* r2 = args */                              \
+                    "lgr 2,%1\n\t"                               \
+                    /* r3 = default */                           \
+                    "lgr 3,%2\n\t"                               \
+                    __SPECIAL_INSTRUCTION_PREAMBLE               \
+                    __CLIENT_REQUEST_CODE                        \
+                    /* results = r3 */                           \
+                    "lgr %0, 3\n\t"                              \
+                    : "=d" (_zzq_result)                         \
+                    : "a" (&_zzq_args[0]),                       \
+                      "0" ((unsigned long int)_zzq_default)      \
+                    : "cc", "2", "3", "memory"                   \
+                   );                                            \
+   _zzq_result;                                                  \
+ })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                      \
+ { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+   volatile unsigned long int __addr;                            \
+   __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                    __GET_NR_CONTEXT_CODE                        \
+                    "lgr %0, 3\n\t"                              \
+                    : "=a" (__addr)                              \
+                    :                                            \
+                    : "cc", "3", "memory"                        \
+                   );                                            \
+   _zzq_orig->nraddr = __addr;                                   \
+ }
+
+#define VALGRIND_CALL_NOREDIR_R1                                 \
+                    __SPECIAL_INSTRUCTION_PREAMBLE               \
+                    __CALL_NO_REDIR_CODE
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     __VEX_INJECT_IR_CODE);                      \
+ } while (0)
+
+#endif /* PLAT_s390x_linux */
+
+/* ------------------------- mips32-linux ---------------- */
+
+#if defined(PLAT_mips32_linux)
+
+typedef
+   struct { 
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+/* .word  0x342
+ * .word  0x742
+ * .word  0xC2
+ * .word  0x4C2*/
+#define __SPECIAL_INSTRUCTION_PREAMBLE          \
+                     "srl $0, $0, 13\n\t"       \
+                     "srl $0, $0, 29\n\t"       \
+                     "srl $0, $0, 3\n\t"        \
+                     "srl $0, $0, 19\n\t"
+                    
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+       _zzq_default, _zzq_request,                                \
+       _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)     \
+  __extension__                                                   \
+  ({ volatile unsigned int _zzq_args[6];                          \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+        __asm__ volatile("move $11, %1\n\t" /*default*/           \
+                     "move $12, %2\n\t" /*ptr*/                   \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* T3 = client_request ( T4 ) */             \
+                     "or $13, $13, $13\n\t"                       \
+                     "move %0, $11\n\t"     /*result*/            \
+                     : "=r" (_zzq_result)                         \
+                     : "r" (_zzq_default), "r" (&_zzq_args[0])    \
+                     : "$11", "$12", "memory");                   \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                       \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                   \
+    volatile unsigned int __addr;                                 \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* %t9 = guest_NRADDR */                     \
+                     "or $14, $14, $14\n\t"                       \
+                     "move %0, $11"     /*result*/                \
+                     : "=r" (__addr)                              \
+                     :                                            \
+                     : "$11"                                      \
+                    );                                            \
+    _zzq_orig->nraddr = __addr;                                   \
+  }
+
+#define VALGRIND_CALL_NOREDIR_T9                                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE              \
+                     /* call-noredir *%t9 */                     \
+                     "or $15, $15, $15\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                 \
+ do {                                                            \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE              \
+                     "or $11, $11, $11\n\t"                      \
+                    );                                           \
+ } while (0)
+
+
+#endif /* PLAT_mips32_linux */
+
+/* ------------------------- mips64-linux ---------------- */
+
+#if defined(PLAT_mips64_linux)
+
+typedef
+   struct {
+      unsigned long nraddr; /* where's the code? */
+   }
+   OrigFn;
+
+/* dsll $0,$0, 3
+ * dsll $0,$0, 13
+ * dsll $0,$0, 29
+ * dsll $0,$0, 19*/
+#define __SPECIAL_INSTRUCTION_PREAMBLE                              \
+                     "dsll $0,$0, 3 ; dsll $0,$0,13\n\t"            \
+                     "dsll $0,$0,29 ; dsll $0,$0,19\n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                            \
+       _zzq_default, _zzq_request,                                  \
+       _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)       \
+  __extension__                                                     \
+  ({ volatile unsigned long int _zzq_args[6];                       \
+    volatile unsigned long int _zzq_result;                         \
+    _zzq_args[0] = (unsigned long int)(_zzq_request);               \
+    _zzq_args[1] = (unsigned long int)(_zzq_arg1);                  \
+    _zzq_args[2] = (unsigned long int)(_zzq_arg2);                  \
+    _zzq_args[3] = (unsigned long int)(_zzq_arg3);                  \
+    _zzq_args[4] = (unsigned long int)(_zzq_arg4);                  \
+    _zzq_args[5] = (unsigned long int)(_zzq_arg5);                  \
+        __asm__ volatile("move $11, %1\n\t" /*default*/             \
+                         "move $12, %2\n\t" /*ptr*/                 \
+                         __SPECIAL_INSTRUCTION_PREAMBLE             \
+                         /* $11 = client_request ( $12 ) */         \
+                         "or $13, $13, $13\n\t"                     \
+                         "move %0, $11\n\t"     /*result*/          \
+                         : "=r" (_zzq_result)                       \
+                         : "r" (_zzq_default), "r" (&_zzq_args[0])  \
+                         : "$11", "$12", "memory");                 \
+    _zzq_result;                                                    \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                         \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                     \
+    volatile unsigned long int __addr;                              \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     /* $11 = guest_NRADDR */                       \
+                     "or $14, $14, $14\n\t"                         \
+                     "move %0, $11"     /*result*/                  \
+                     : "=r" (__addr)                                \
+                     :                                              \
+                     : "$11");                                      \
+    _zzq_orig->nraddr = __addr;                                     \
+  }
+
+#define VALGRIND_CALL_NOREDIR_T9                                    \
+                     __SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     /* call-noredir $25 */                         \
+                     "or $15, $15, $15\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                    \
+ do {                                                               \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     "or $11, $11, $11\n\t"                         \
+                    );                                              \
+ } while (0)
+
+#endif /* PLAT_mips64_linux */
+
+#if defined(PLAT_nanomips_linux)
+
+typedef
+   struct {
+      unsigned int nraddr; /* where's the code? */
+   }
+   OrigFn;
+/*
+   8000 c04d  srl  zero, zero, 13
+   8000 c05d  srl  zero, zero, 29
+   8000 c043  srl  zero, zero,  3
+   8000 c053  srl  zero, zero, 19
+*/
+
+#define __SPECIAL_INSTRUCTION_PREAMBLE "srl[32] $zero, $zero, 13 \n\t" \
+                                       "srl[32] $zero, $zero, 29 \n\t" \
+                                       "srl[32] $zero, $zero, 3  \n\t" \
+                                       "srl[32] $zero, $zero, 19 \n\t"
+
+#define VALGRIND_DO_CLIENT_REQUEST_EXPR(                          \
+       _zzq_default, _zzq_request,                                \
+       _zzq_arg1, _zzq_arg2, _zzq_arg3, _zzq_arg4, _zzq_arg5)     \
+  __extension__                                                   \
+  ({ volatile unsigned int _zzq_args[6];                          \
+    volatile unsigned int _zzq_result;                            \
+    _zzq_args[0] = (unsigned int)(_zzq_request);                  \
+    _zzq_args[1] = (unsigned int)(_zzq_arg1);                     \
+    _zzq_args[2] = (unsigned int)(_zzq_arg2);                     \
+    _zzq_args[3] = (unsigned int)(_zzq_arg3);                     \
+    _zzq_args[4] = (unsigned int)(_zzq_arg4);                     \
+    _zzq_args[5] = (unsigned int)(_zzq_arg5);                     \
+    __asm__ volatile("move $a7, %1\n\t" /* default */             \
+                     "move $t0, %2\n\t" /* ptr */                 \
+                     __SPECIAL_INSTRUCTION_PREAMBLE               \
+                     /* $a7 = client_request( $t0 ) */            \
+                     "or[32] $t0, $t0, $t0\n\t"                   \
+                     "move %0, $a7\n\t"     /* result */          \
+                     : "=r" (_zzq_result)                         \
+                     : "r" (_zzq_default), "r" (&_zzq_args[0])    \
+                     : "$a7", "$t0", "memory");                   \
+    _zzq_result;                                                  \
+  })
+
+#define VALGRIND_GET_NR_CONTEXT(_zzq_rlval)                         \
+  { volatile OrigFn* _zzq_orig = &(_zzq_rlval);                     \
+    volatile unsigned long int __addr;                              \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     /* $a7 = guest_NRADDR */                       \
+                     "or[32] $t1, $t1, $t1\n\t"                     \
+                     "move %0, $a7"     /*result*/                  \
+                     : "=r" (__addr)                                \
+                     :                                              \
+                     : "$a7");                                      \
+    _zzq_orig->nraddr = __addr;                                     \
+  }
+
+#define VALGRIND_CALL_NOREDIR_T9                                    \
+                     __SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     /* call-noredir $25 */                         \
+                     "or[32] $t2, $t2, $t2\n\t"
+
+#define VALGRIND_VEX_INJECT_IR()                                    \
+ do {                                                               \
+    __asm__ volatile(__SPECIAL_INSTRUCTION_PREAMBLE                 \
+                     "or[32] $t3, $t3, $t3\n\t"                     \
+                    );                                              \
+ } while (0)
+
+#endif
+/* Insert assembly code for other platforms here... */
+
+#endif /* NVALGRIND */
+
+
+/* ------------------------------------------------------------------ */
+/* PLATFORM SPECIFICS for FUNCTION WRAPPING.  This is all very        */
+/* ugly.  It's the least-worst tradeoff I can think of.               */
+/* ------------------------------------------------------------------ */
+
+/* This section defines magic (a.k.a appalling-hack) macros for doing
+   guaranteed-no-redirection macros, so as to get from function
+   wrappers to the functions they are wrapping.  The whole point is to
+   construct standard call sequences, but to do the call itself with a
+   special no-redirect call pseudo-instruction that the JIT
+   understands and handles specially.  This section is long and
+   repetitious, and I can't see a way to make it shorter.
+
+   The naming scheme is as follows:
+
+      CALL_FN_{W,v}_{v,W,WW,WWW,WWWW,5W,6W,7W,etc}
+
+   'W' stands for "word" and 'v' for "void".  Hence there are
+   different macros for calling arity 0, 1, 2, 3, 4, etc, functions,
+   and for each, the possibility of returning a word-typed result, or
+   no result.
+*/
+
+/* Use these to write the name of your wrapper.  NOTE: duplicates
+   VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h.  NOTE also: inserts
+   the default behaviour equivalance class tag "0000" into the name.
+   See pub_tool_redir.h for details -- normally you don't need to
+   think about this, though. */
+
+/* Use an extra level of macroisation so as to ensure the soname/fnname
+   args are fully macro-expanded before pasting them together. */
+#define VG_CONCAT4(_aa,_bb,_cc,_dd) _aa##_bb##_cc##_dd
+
+#define I_WRAP_SONAME_FNNAME_ZU(soname,fnname)                    \
+   VG_CONCAT4(_vgw00000ZU_,soname,_,fnname)
+
+#define I_WRAP_SONAME_FNNAME_ZZ(soname,fnname)                    \
+   VG_CONCAT4(_vgw00000ZZ_,soname,_,fnname)
+
+/* Use this macro from within a wrapper function to collect the
+   context (address and possibly other info) of the original function.
+   Once you have that you can then use it in one of the CALL_FN_
+   macros.  The type of the argument _lval is OrigFn. */
+#define VALGRIND_GET_ORIG_FN(_lval)  VALGRIND_GET_NR_CONTEXT(_lval)
+
+/* Also provide end-user facilities for function replacement, rather
+   than wrapping.  A replacement function differs from a wrapper in
+   that it has no way to get hold of the original function being
+   called, and hence no way to call onwards to it.  In a replacement
+   function, VALGRIND_GET_ORIG_FN always returns zero. */
+
+#define I_REPLACE_SONAME_FNNAME_ZU(soname,fnname)                 \
+   VG_CONCAT4(_vgr00000ZU_,soname,_,fnname)
+
+#define I_REPLACE_SONAME_FNNAME_ZZ(soname,fnname)                 \
+   VG_CONCAT4(_vgr00000ZZ_,soname,_,fnname)
+
+/* Derivatives of the main macros below, for calling functions
+   returning void. */
+
+#define CALL_FN_v_v(fnptr)                                        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_v(_junk,fnptr); } while (0)
+
+#define CALL_FN_v_W(fnptr, arg1)                                  \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_W(_junk,fnptr,arg1); } while (0)
+
+#define CALL_FN_v_WW(fnptr, arg1,arg2)                            \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WW(_junk,fnptr,arg1,arg2); } while (0)
+
+#define CALL_FN_v_WWW(fnptr, arg1,arg2,arg3)                      \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWW(_junk,fnptr,arg1,arg2,arg3); } while (0)
+
+#define CALL_FN_v_WWWW(fnptr, arg1,arg2,arg3,arg4)                \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_WWWW(_junk,fnptr,arg1,arg2,arg3,arg4); } while (0)
+
+#define CALL_FN_v_5W(fnptr, arg1,arg2,arg3,arg4,arg5)             \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_5W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5); } while (0)
+
+#define CALL_FN_v_6W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6)        \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_6W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6); } while (0)
+
+#define CALL_FN_v_7W(fnptr, arg1,arg2,arg3,arg4,arg5,arg6,arg7)   \
+   do { volatile unsigned long _junk;                             \
+        CALL_FN_W_7W(_junk,fnptr,arg1,arg2,arg3,arg4,arg5,arg6,arg7); } while (0)
+
+/* ----------------- x86-{linux,darwin,solaris} ---------------- */
+
+#if defined(PLAT_x86_linux)  ||  defined(PLAT_x86_darwin) \
+    ||  defined(PLAT_x86_solaris)  || defined(PLAT_x86_freebsd)
+
+/* These regs are trashed by the hidden call.  No need to mention eax
+   as gcc can already see that, plus causes gcc to bomb. */
+#define __CALLER_SAVED_REGS /*"eax"*/ "ecx", "edx"
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+#define VALGRIND_ALIGN_STACK               \
+      "movl %%esp,%%edi\n\t"               \
+      "andl $0xfffffff0,%%esp\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "movl %%edi,%%esp\n\t"
+
+/* These CALL_FN_ macros assume that on x86-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $12, %%esp\n\t"                                    \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $8, %%esp\n\t"                                     \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $4, %%esp\n\t"                                     \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $12, %%esp\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $8, %%esp\n\t"                                     \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $4, %%esp\n\t"                                     \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $12, %%esp\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $8, %%esp\n\t"                                     \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "subl $4, %%esp\n\t"                                     \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "pushl 48(%%eax)\n\t"                                    \
+         "pushl 44(%%eax)\n\t"                                    \
+         "pushl 40(%%eax)\n\t"                                    \
+         "pushl 36(%%eax)\n\t"                                    \
+         "pushl 32(%%eax)\n\t"                                    \
+         "pushl 28(%%eax)\n\t"                                    \
+         "pushl 24(%%eax)\n\t"                                    \
+         "pushl 20(%%eax)\n\t"                                    \
+         "pushl 16(%%eax)\n\t"                                    \
+         "pushl 12(%%eax)\n\t"                                    \
+         "pushl 8(%%eax)\n\t"                                     \
+         "pushl 4(%%eax)\n\t"                                     \
+         "movl (%%eax), %%eax\n\t"  /* target->%eax */            \
+         VALGRIND_CALL_NOREDIR_EAX                                \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=a" (_res)                                  \
+         : /*in*/    "a" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "edi"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_x86_linux || PLAT_x86_darwin || PLAT_x86_solaris */
+
+/* ---------------- amd64-{linux,darwin,solaris} --------------- */
+
+#if defined(PLAT_amd64_linux)  ||  defined(PLAT_amd64_darwin) \
+    ||  defined(PLAT_amd64_solaris)  ||  defined(PLAT_amd64_freebsd)
+
+/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi",       \
+                            "rdi", "r8", "r9", "r10", "r11"
+
+/* This is all pretty complex.  It's so as to make stack unwinding
+   work reliably.  See bug 243270.  The basic problem is the sub and
+   add of 128 of %rsp in all of the following macros.  If gcc believes
+   the CFA is in %rsp, then unwinding may fail, because what's at the
+   CFA is not what gcc "expected" when it constructs the CFIs for the
+   places where the macros are instantiated.
+
+   But we can't just add a CFI annotation to increase the CFA offset
+   by 128, to match the sub of 128 from %rsp, because we don't know
+   whether gcc has chosen %rsp as the CFA at that point, or whether it
+   has chosen some other register (eg, %rbp).  In the latter case,
+   adding a CFI annotation to change the CFA offset is simply wrong.
+
+   So the solution is to get hold of the CFA using
+   __builtin_dwarf_cfa(), put it in a known register, and add a
+   CFI annotation to say what the register is.  We choose %rbp for
+   this (perhaps perversely), because:
+
+   (1) %rbp is already subject to unwinding.  If a new register was
+       chosen then the unwinder would have to unwind it in all stack
+       traces, which is expensive, and
+
+   (2) %rbp is already subject to precise exception updates in the
+       JIT.  If a new register was chosen, we'd have to have precise
+       exceptions for it too, which reduces performance of the
+       generated code.
+
+   However .. one extra complication.  We can't just whack the result
+   of __builtin_dwarf_cfa() into %rbp and then add %rbp to the
+   list of trashed registers at the end of the inline assembly
+   fragments; gcc won't allow %rbp to appear in that list.  Hence
+   instead we need to stash %rbp in %r15 for the duration of the asm,
+   and say that %r15 is trashed instead.  gcc seems happy to go with
+   that.
+
+   Oh .. and this all needs to be conditionalised so that it is
+   unchanged from before this commit, when compiled with older gccs
+   that don't support __builtin_dwarf_cfa.  Furthermore, since
+   this header file is freestanding, it has to be independent of
+   config.h, and so the following conditionalisation cannot depend on
+   configure time checks.
+
+   Although it's not clear from
+   'defined(__GNUC__) && defined(__GCC_HAVE_DWARF2_CFI_ASM)',
+   this expression excludes Darwin.
+   .cfi directives in Darwin assembly appear to be completely
+   different and I haven't investigated how they work.
+
+   For even more entertainment value, note we have to use the
+   completely undocumented __builtin_dwarf_cfa(), which appears to
+   really compute the CFA, whereas __builtin_frame_address(0) claims
+   to but actually doesn't.  See
+   https://bugs.kde.org/show_bug.cgi?id=243270#c47
+*/
+#if defined(__GNUC__) && defined(__GCC_HAVE_DWARF2_CFI_ASM)
+#  define __FRAME_POINTER                                         \
+      ,"r"(__builtin_dwarf_cfa())
+#  define VALGRIND_CFI_PROLOGUE                                   \
+      "movq %%rbp, %%r15\n\t"                                     \
+      "movq %2, %%rbp\n\t"                                        \
+      ".cfi_remember_state\n\t"                                   \
+      ".cfi_def_cfa rbp, 0\n\t"
+#  define VALGRIND_CFI_EPILOGUE                                   \
+      "movq %%r15, %%rbp\n\t"                                     \
+      ".cfi_restore_state\n\t"
+#else
+#  define __FRAME_POINTER
+#  define VALGRIND_CFI_PROLOGUE
+#  define VALGRIND_CFI_EPILOGUE
+#endif
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+#define VALGRIND_ALIGN_STACK               \
+      "movq %%rsp,%%r14\n\t"               \
+      "andq $0xfffffffffffffff0,%%rsp\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "movq %%r14,%%rsp\n\t"
+
+/* These CALL_FN_ macros assume that on amd64-linux, sizeof(unsigned
+   long) == 8. */
+
+/* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
+   macros.  In order not to trash the stack redzone, we need to drop
+   %rsp by 128 before the hidden call, and restore afterwards.  The
+   nastyness is that it is only by luck that the stack still appears
+   to be unwindable during the hidden call - since then the behaviour
+   of any routine using this macro does not match what the CFI data
+   says.  Sigh.
+
+   Why is this important?  Imagine that a wrapper has a stack
+   allocated local, and passes to the hidden call, a pointer to it.
+   Because gcc does not know about the hidden call, it may allocate
+   that local in the redzone.  Unfortunately the hidden call may then
+   trash it before it comes to use it.  So we must step clear of the
+   redzone, for the duration of the hidden call, to make it safe.
+
+   Probably the same problem afflicts the other redzone-style ABIs too
+   (ppc64-linux); but for those, the stack is
+   self describing (none of this CFI nonsense) so at least messing
+   with the stack pointer doesn't give a danger of non-unwindable
+   stack. */
+
+#define CALL_FN_W_v(lval, orig)                                        \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[1];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                                  \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[2];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                            \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[3];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                      \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[4];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)                \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[5];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)             \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[6];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)        \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[7];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,        \
+                                 arg7)                                 \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[8];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $136,%%rsp\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,        \
+                                 arg7,arg8)                            \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[9];                               \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      _argvec[8] = (unsigned long)(arg8);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "pushq 64(%%rax)\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,        \
+                                 arg7,arg8,arg9)                       \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[10];                              \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      _argvec[8] = (unsigned long)(arg8);                              \
+      _argvec[9] = (unsigned long)(arg9);                              \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $136,%%rsp\n\t"                                         \
+         "pushq 72(%%rax)\n\t"                                         \
+         "pushq 64(%%rax)\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,       \
+                                  arg7,arg8,arg9,arg10)                \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[11];                              \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      _argvec[8] = (unsigned long)(arg8);                              \
+      _argvec[9] = (unsigned long)(arg9);                              \
+      _argvec[10] = (unsigned long)(arg10);                            \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "pushq 80(%%rax)\n\t"                                         \
+         "pushq 72(%%rax)\n\t"                                         \
+         "pushq 64(%%rax)\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,       \
+                                  arg7,arg8,arg9,arg10,arg11)          \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[12];                              \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      _argvec[8] = (unsigned long)(arg8);                              \
+      _argvec[9] = (unsigned long)(arg9);                              \
+      _argvec[10] = (unsigned long)(arg10);                            \
+      _argvec[11] = (unsigned long)(arg11);                            \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $136,%%rsp\n\t"                                         \
+         "pushq 88(%%rax)\n\t"                                         \
+         "pushq 80(%%rax)\n\t"                                         \
+         "pushq 72(%%rax)\n\t"                                         \
+         "pushq 64(%%rax)\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,       \
+                                arg7,arg8,arg9,arg10,arg11,arg12)      \
+   do {                                                                \
+      volatile OrigFn        _orig = (orig);                           \
+      volatile unsigned long _argvec[13];                              \
+      volatile unsigned long _res;                                     \
+      _argvec[0] = (unsigned long)_orig.nraddr;                        \
+      _argvec[1] = (unsigned long)(arg1);                              \
+      _argvec[2] = (unsigned long)(arg2);                              \
+      _argvec[3] = (unsigned long)(arg3);                              \
+      _argvec[4] = (unsigned long)(arg4);                              \
+      _argvec[5] = (unsigned long)(arg5);                              \
+      _argvec[6] = (unsigned long)(arg6);                              \
+      _argvec[7] = (unsigned long)(arg7);                              \
+      _argvec[8] = (unsigned long)(arg8);                              \
+      _argvec[9] = (unsigned long)(arg9);                              \
+      _argvec[10] = (unsigned long)(arg10);                            \
+      _argvec[11] = (unsigned long)(arg11);                            \
+      _argvec[12] = (unsigned long)(arg12);                            \
+      __asm__ volatile(                                                \
+         VALGRIND_CFI_PROLOGUE                                         \
+         VALGRIND_ALIGN_STACK                                          \
+         "subq $128,%%rsp\n\t"                                         \
+         "pushq 96(%%rax)\n\t"                                         \
+         "pushq 88(%%rax)\n\t"                                         \
+         "pushq 80(%%rax)\n\t"                                         \
+         "pushq 72(%%rax)\n\t"                                         \
+         "pushq 64(%%rax)\n\t"                                         \
+         "pushq 56(%%rax)\n\t"                                         \
+         "movq 48(%%rax), %%r9\n\t"                                    \
+         "movq 40(%%rax), %%r8\n\t"                                    \
+         "movq 32(%%rax), %%rcx\n\t"                                   \
+         "movq 24(%%rax), %%rdx\n\t"                                   \
+         "movq 16(%%rax), %%rsi\n\t"                                   \
+         "movq 8(%%rax), %%rdi\n\t"                                    \
+         "movq (%%rax), %%rax\n\t"  /* target->%rax */                 \
+         VALGRIND_CALL_NOREDIR_RAX                                     \
+         VALGRIND_RESTORE_STACK                                        \
+         VALGRIND_CFI_EPILOGUE                                         \
+         : /*out*/   "=a" (_res)                                       \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER                 \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r14", "r15" \
+      );                                                               \
+      lval = (__typeof__(lval)) _res;                                  \
+   } while (0)
+
+#endif /* PLAT_amd64_linux || PLAT_amd64_darwin || PLAT_amd64_solaris */
+
+/* ------------------------ ppc32-linux ------------------------ */
+
+#if defined(PLAT_ppc32_linux)
+
+/* This is useful for finding out about the on-stack stuff:
+
+   extern int f9  ( int,int,int,int,int,int,int,int,int );
+   extern int f10 ( int,int,int,int,int,int,int,int,int,int );
+   extern int f11 ( int,int,int,int,int,int,int,int,int,int,int );
+   extern int f12 ( int,int,int,int,int,int,int,int,int,int,int,int );
+
+   int g9 ( void ) {
+      return f9(11,22,33,44,55,66,77,88,99);
+   }
+   int g10 ( void ) {
+      return f10(11,22,33,44,55,66,77,88,99,110);
+   }
+   int g11 ( void ) {
+      return f11(11,22,33,44,55,66,77,88,99,110,121);
+   }
+   int g12 ( void ) {
+      return f12(11,22,33,44,55,66,77,88,99,110,121,132);
+   }
+*/
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",   \
+   "r11", "r12", "r13"
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+#define VALGRIND_ALIGN_STACK               \
+      "mr 28,1\n\t"                        \
+      "rlwinm 1,1,0,0,27\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "mr 1,28\n\t"
+
+/* These CALL_FN_ macros assume that on ppc32-linux, 
+   sizeof(unsigned long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-16\n\t"                                       \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)arg1;                           \
+      _argvec[2] = (unsigned long)arg2;                           \
+      _argvec[3] = (unsigned long)arg3;                           \
+      _argvec[4] = (unsigned long)arg4;                           \
+      _argvec[5] = (unsigned long)arg5;                           \
+      _argvec[6] = (unsigned long)arg6;                           \
+      _argvec[7] = (unsigned long)arg7;                           \
+      _argvec[8] = (unsigned long)arg8;                           \
+      _argvec[9] = (unsigned long)arg9;                           \
+      _argvec[10] = (unsigned long)arg10;                         \
+      _argvec[11] = (unsigned long)arg11;                         \
+      _argvec[12] = (unsigned long)arg12;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "addi 1,1,-32\n\t"                                       \
+         /* arg12 */                                              \
+         "lwz 3,48(11)\n\t"                                       \
+         "stw 3,20(1)\n\t"                                        \
+         /* arg11 */                                              \
+         "lwz 3,44(11)\n\t"                                       \
+         "stw 3,16(1)\n\t"                                        \
+         /* arg10 */                                              \
+         "lwz 3,40(11)\n\t"                                       \
+         "stw 3,12(1)\n\t"                                        \
+         /* arg9 */                                               \
+         "lwz 3,36(11)\n\t"                                       \
+         "stw 3,8(1)\n\t"                                         \
+         /* args1-8 */                                            \
+         "lwz 3,4(11)\n\t"   /* arg1->r3 */                       \
+         "lwz 4,8(11)\n\t"                                        \
+         "lwz 5,12(11)\n\t"                                       \
+         "lwz 6,16(11)\n\t"  /* arg4->r6 */                       \
+         "lwz 7,20(11)\n\t"                                       \
+         "lwz 8,24(11)\n\t"                                       \
+         "lwz 9,28(11)\n\t"                                       \
+         "lwz 10,32(11)\n\t" /* arg8->r10 */                      \
+         "lwz 11,0(11)\n\t"  /* target->r11 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         VALGRIND_RESTORE_STACK                                   \
+         "mr %0,3"                                                \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc32_linux */
+
+/* ------------------------ ppc64-linux ------------------------ */
+
+#if defined(PLAT_ppc64be_linux)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",         \
+   "r11", "r12", "r13"
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+#define VALGRIND_ALIGN_STACK               \
+      "mr 28,1\n\t"                        \
+      "rldicr 1,1,0,59\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "mr 1,28\n\t"
+
+/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 11,%1\n\t"                                           \
+         "std 2,-16(11)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(11)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg12 */                                              \
+         "ld  3,96(11)\n\t"                                       \
+         "std 3,136(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(11)\n\t"                                       \
+         "std 3,128(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(11)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(11)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* args1-8 */                                            \
+         "ld   3, 8(11)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(11)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(11)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(11)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(11)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(11)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(11)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(11)\n\t" /* arg8->r10 */                     \
+         "ld  11, 0(11)\n\t"  /* target->r11 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R11                  \
+         "mr 11,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(11)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64be_linux */
+
+/* ------------------------- ppc64le-linux ----------------------- */
+#if defined(PLAT_ppc64le_linux)
+
+/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS                                       \
+   "lr", "ctr", "xer",                                            \
+   "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",        \
+   "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",         \
+   "r11", "r12", "r13"
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+#define VALGRIND_ALIGN_STACK               \
+      "mr 28,1\n\t"                        \
+      "rldicr 1,1,0,59\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "mr 1,28\n\t"
+
+/* These CALL_FN_ macros assume that on ppc64-linux, sizeof(unsigned
+   long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+0];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1] = (unsigned long)_orig.r2;                       \
+      _argvec[2] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+1];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+2];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+3];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+4];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+5];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+6];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+7];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+8];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(12)\n\t" /* arg8->r10 */                     \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+9];                        \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg9 */                                               \
+         "ld  3,72(12)\n\t"                                       \
+         "std 3,96(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(12)\n\t" /* arg8->r10 */                     \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+10];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-128\n\t"  /* expand stack frame */            \
+         /* arg10 */                                              \
+         "ld  3,80(12)\n\t"                                       \
+         "std 3,104(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(12)\n\t"                                       \
+         "std 3,96(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(12)\n\t" /* arg8->r10 */                     \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+11];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg11 */                                              \
+         "ld  3,88(12)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(12)\n\t"                                       \
+         "std 3,104(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(12)\n\t"                                       \
+         "std 3,96(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(12)\n\t" /* arg8->r10 */                     \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                arg7,arg8,arg9,arg10,arg11,arg12) \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3+12];                       \
+      volatile unsigned long _res;                                \
+      /* _argvec[0] holds current r2 across the call */           \
+      _argvec[1]   = (unsigned long)_orig.r2;                     \
+      _argvec[2]   = (unsigned long)_orig.nraddr;                 \
+      _argvec[2+1] = (unsigned long)arg1;                         \
+      _argvec[2+2] = (unsigned long)arg2;                         \
+      _argvec[2+3] = (unsigned long)arg3;                         \
+      _argvec[2+4] = (unsigned long)arg4;                         \
+      _argvec[2+5] = (unsigned long)arg5;                         \
+      _argvec[2+6] = (unsigned long)arg6;                         \
+      _argvec[2+7] = (unsigned long)arg7;                         \
+      _argvec[2+8] = (unsigned long)arg8;                         \
+      _argvec[2+9] = (unsigned long)arg9;                         \
+      _argvec[2+10] = (unsigned long)arg10;                       \
+      _argvec[2+11] = (unsigned long)arg11;                       \
+      _argvec[2+12] = (unsigned long)arg12;                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "mr 12,%1\n\t"                                           \
+         "std 2,-16(12)\n\t"  /* save tocptr */                   \
+         "ld   2,-8(12)\n\t"  /* use nraddr's tocptr */           \
+         "addi 1,1,-144\n\t"  /* expand stack frame */            \
+         /* arg12 */                                              \
+         "ld  3,96(12)\n\t"                                       \
+         "std 3,120(1)\n\t"                                       \
+         /* arg11 */                                              \
+         "ld  3,88(12)\n\t"                                       \
+         "std 3,112(1)\n\t"                                       \
+         /* arg10 */                                              \
+         "ld  3,80(12)\n\t"                                       \
+         "std 3,104(1)\n\t"                                       \
+         /* arg9 */                                               \
+         "ld  3,72(12)\n\t"                                       \
+         "std 3,96(1)\n\t"                                        \
+         /* args1-8 */                                            \
+         "ld   3, 8(12)\n\t"  /* arg1->r3 */                      \
+         "ld   4, 16(12)\n\t" /* arg2->r4 */                      \
+         "ld   5, 24(12)\n\t" /* arg3->r5 */                      \
+         "ld   6, 32(12)\n\t" /* arg4->r6 */                      \
+         "ld   7, 40(12)\n\t" /* arg5->r7 */                      \
+         "ld   8, 48(12)\n\t" /* arg6->r8 */                      \
+         "ld   9, 56(12)\n\t" /* arg7->r9 */                      \
+         "ld  10, 64(12)\n\t" /* arg8->r10 */                     \
+         "ld  12, 0(12)\n\t"  /* target->r12 */                   \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R12                  \
+         "mr 12,%1\n\t"                                           \
+         "mr %0,3\n\t"                                            \
+         "ld 2,-16(12)\n\t" /* restore tocptr */                  \
+         VALGRIND_RESTORE_STACK                                   \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[2])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r28"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_ppc64le_linux */
+
+/* ------------------------- arm-linux ------------------------- */
+
+#if defined(PLAT_arm_linux)
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS "r0", "r1", "r2", "r3","r4", "r12", "r14"
+
+/* Macros to save and align the stack before making a function
+   call and restore it afterwards as gcc may not keep the stack
+   pointer aligned if it doesn't realise calls are being made
+   to other functions. */
+
+/* This is a bit tricky.  We store the original stack pointer in r10
+   as it is callee-saves.  gcc doesn't allow the use of r11 for some
+   reason.  Also, we can't directly "bic" the stack pointer in thumb
+   mode since r13 isn't an allowed register number in that context.
+   So use r4 as a temporary, since that is about to get trashed
+   anyway, just after each use of this macro.  Side effect is we need
+   to be very careful about any future changes, since
+   VALGRIND_ALIGN_STACK simply assumes r4 is usable. */
+#define VALGRIND_ALIGN_STACK               \
+      "mov r10, sp\n\t"                    \
+      "mov r4,  sp\n\t"                    \
+      "bic r4,  r4, #7\n\t"                \
+      "mov sp,  r4\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "mov sp,  r10\n\t"
+
+/* These CALL_FN_ macros assume that on arm-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #4 \n\t"                                    \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "push {r0} \n\t"                                         \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "push {r0, r1} \n\t"                                     \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #4 \n\t"                                    \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "push {r0, r1, r2} \n\t"                                 \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "ldr r3, [%1, #32] \n\t"                                 \
+         "push {r0, r1, r2, r3} \n\t"                             \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #4 \n\t"                                    \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "ldr r3, [%1, #32] \n\t"                                 \
+         "ldr r4, [%1, #36] \n\t"                                 \
+         "push {r0, r1, r2, r3, r4} \n\t"                         \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #40] \n\t"                                 \
+         "push {r0} \n\t"                                         \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "ldr r3, [%1, #32] \n\t"                                 \
+         "ldr r4, [%1, #36] \n\t"                                 \
+         "push {r0, r1, r2, r3, r4} \n\t"                         \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #4 \n\t"                                    \
+         "ldr r0, [%1, #40] \n\t"                                 \
+         "ldr r1, [%1, #44] \n\t"                                 \
+         "push {r0, r1} \n\t"                                     \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "ldr r3, [%1, #32] \n\t"                                 \
+         "ldr r4, [%1, #36] \n\t"                                 \
+         "push {r0, r1, r2, r3, r4} \n\t"                         \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr r0, [%1, #40] \n\t"                                 \
+         "ldr r1, [%1, #44] \n\t"                                 \
+         "ldr r2, [%1, #48] \n\t"                                 \
+         "push {r0, r1, r2} \n\t"                                 \
+         "ldr r0, [%1, #20] \n\t"                                 \
+         "ldr r1, [%1, #24] \n\t"                                 \
+         "ldr r2, [%1, #28] \n\t"                                 \
+         "ldr r3, [%1, #32] \n\t"                                 \
+         "ldr r4, [%1, #36] \n\t"                                 \
+         "push {r0, r1, r2, r3, r4} \n\t"                         \
+         "ldr r0, [%1, #4] \n\t"                                  \
+         "ldr r1, [%1, #8] \n\t"                                  \
+         "ldr r2, [%1, #12] \n\t"                                 \
+         "ldr r3, [%1, #16] \n\t"                                 \
+         "ldr r4, [%1] \n\t"  /* target->r4 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_R4                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, r0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "r10"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_arm_linux */
+
+/* ------------------------ arm64-linux ------------------------ */
+
+#if defined(PLAT_arm64_linux)
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS \
+     "x0", "x1", "x2", "x3","x4", "x5", "x6", "x7", "x8", "x9",   \
+     "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17",      \
+     "x18", "x19", "x20", "x30",                                  \
+     "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9",  \
+     "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17",      \
+     "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25",      \
+     "v26", "v27", "v28", "v29", "v30", "v31"
+
+/* x21 is callee-saved, so we can use it to save and restore SP around
+   the hidden call. */
+#define VALGRIND_ALIGN_STACK               \
+      "mov x21, sp\n\t"                    \
+      "bic sp, x21, #15\n\t"
+#define VALGRIND_RESTORE_STACK             \
+      "mov sp,  x21\n\t"
+
+/* These CALL_FN_ macros assume that on arm64-linux,
+   sizeof(unsigned long) == 8. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0\n"                                           \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x7, [%1, #64] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #0x20 \n\t"                                 \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x7, [%1, #64] \n\t"                                 \
+         "ldr x8, [%1, #72] \n\t"                                 \
+         "str x8, [sp, #0]  \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #0x20 \n\t"                                 \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x7, [%1, #64] \n\t"                                 \
+         "ldr x8, [%1, #72] \n\t"                                 \
+         "str x8, [sp, #0]  \n\t"                                 \
+         "ldr x8, [%1, #80] \n\t"                                 \
+         "str x8, [sp, #8]  \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11)     \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #0x30 \n\t"                                 \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x7, [%1, #64] \n\t"                                 \
+         "ldr x8, [%1, #72] \n\t"                                 \
+         "str x8, [sp, #0]  \n\t"                                 \
+         "ldr x8, [%1, #80] \n\t"                                 \
+         "str x8, [sp, #8]  \n\t"                                 \
+         "ldr x8, [%1, #88] \n\t"                                 \
+         "str x8, [sp, #16] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10,arg11,     \
+                                  arg12)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         VALGRIND_ALIGN_STACK                                     \
+         "sub sp, sp, #0x30 \n\t"                                 \
+         "ldr x0, [%1, #8] \n\t"                                  \
+         "ldr x1, [%1, #16] \n\t"                                 \
+         "ldr x2, [%1, #24] \n\t"                                 \
+         "ldr x3, [%1, #32] \n\t"                                 \
+         "ldr x4, [%1, #40] \n\t"                                 \
+         "ldr x5, [%1, #48] \n\t"                                 \
+         "ldr x6, [%1, #56] \n\t"                                 \
+         "ldr x7, [%1, #64] \n\t"                                 \
+         "ldr x8, [%1, #72] \n\t"                                 \
+         "str x8, [sp, #0]  \n\t"                                 \
+         "ldr x8, [%1, #80] \n\t"                                 \
+         "str x8, [sp, #8]  \n\t"                                 \
+         "ldr x8, [%1, #88] \n\t"                                 \
+         "str x8, [sp, #16] \n\t"                                 \
+         "ldr x8, [%1, #96] \n\t"                                 \
+         "str x8, [sp, #24] \n\t"                                 \
+         "ldr x8, [%1] \n\t"  /* target->x8 */                    \
+         VALGRIND_BRANCH_AND_LINK_TO_NOREDIR_X8                   \
+         VALGRIND_RESTORE_STACK                                   \
+         "mov %0, x0"                                             \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS, "x21"   \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_arm64_linux */
+
+/* ------------------------- s390x-linux ------------------------- */
+
+#if defined(PLAT_s390x_linux)
+
+/* Similar workaround as amd64 (see above), but we use r11 as frame
+   pointer and save the old r11 in r7. r11 might be used for
+   argvec, therefore we copy argvec in r1 since r1 is clobbered
+   after the call anyway.  */
+#if defined(__GNUC__) && defined(__GCC_HAVE_DWARF2_CFI_ASM)
+#  define __FRAME_POINTER                                         \
+      ,"d"(__builtin_dwarf_cfa())
+#  define VALGRIND_CFI_PROLOGUE                                   \
+      ".cfi_remember_state\n\t"                                   \
+      "lgr 1,%1\n\t" /* copy the argvec pointer in r1 */          \
+      "lgr 7,11\n\t"                                              \
+      "lgr 11,%2\n\t"                                             \
+      ".cfi_def_cfa r11, 0\n\t"
+#  define VALGRIND_CFI_EPILOGUE                                   \
+      "lgr 11, 7\n\t"                                             \
+      ".cfi_restore_state\n\t"
+#else
+#  define __FRAME_POINTER
+#  define VALGRIND_CFI_PROLOGUE                                   \
+      "lgr 1,%1\n\t"
+#  define VALGRIND_CFI_EPILOGUE
+#endif
+
+/* Nb: On s390 the stack pointer is properly aligned *at all times*
+   according to the s390 GCC maintainer. (The ABI specification is not
+   precise in this regard.) Therefore, VALGRIND_ALIGN_STACK and
+   VALGRIND_RESTORE_STACK are not defined here. */
+
+/* These regs are trashed by the hidden call. Note that we overwrite
+   r14 in s390_irgen_noredir (VEX/priv/guest_s390_irgen.c) to give the
+   function a proper return address. All others are ABI defined call
+   clobbers. */
+#if defined(__VX__) || defined(__S390_VX__)
+#define __CALLER_SAVED_REGS "0", "1", "2", "3", "4", "5", "14",   \
+      "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7",             \
+      "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15",       \
+      "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",     \
+      "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"
+#else
+#define __CALLER_SAVED_REGS "0", "1", "2", "3", "4", "5", "14",   \
+      "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7"
+#endif
+
+/* Nb: Although r11 is modified in the asm snippets below (inside 
+   VALGRIND_CFI_PROLOGUE) it is not listed in the clobber section, for
+   two reasons:
+   (1) r11 is restored in VALGRIND_CFI_EPILOGUE, so effectively it is not
+       modified
+   (2) GCC will complain that r11 cannot appear inside a clobber section,
+       when compiled with -O -fno-omit-frame-pointer
+ */
+
+#define CALL_FN_W_v(lval, orig)                                  \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long  _argvec[1];                        \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 1, 0(1)\n\t"  /* target->r1 */                      \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "d" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"7"     \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+/* The call abi has the arguments in r2-r6 and stack */
+#define CALL_FN_W_W(lval, orig, arg1)                            \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[2];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"7"     \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1, arg2)                     \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[3];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"7"     \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1, arg2, arg3)              \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[4];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"7"     \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1, arg2, arg3, arg4)       \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[5];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"7"     \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1, arg2, arg3, arg4, arg5)   \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[6];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-160\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,160\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1, arg2, arg3, arg4, arg5,   \
+                     arg6)                                       \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[7];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-168\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,168\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1, arg2, arg3, arg4, arg5,   \
+                     arg6, arg7)                                 \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[8];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-176\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,176\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1, arg2, arg3, arg4, arg5,   \
+                     arg6, arg7 ,arg8)                           \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[9];                         \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      _argvec[8] = (unsigned long)arg8;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-184\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "mvc 176(8,15), 64(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,184\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1, arg2, arg3, arg4, arg5,   \
+                     arg6, arg7 ,arg8, arg9)                     \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[10];                        \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      _argvec[8] = (unsigned long)arg8;                          \
+      _argvec[9] = (unsigned long)arg9;                          \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-192\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "mvc 176(8,15), 64(1)\n\t"                              \
+         "mvc 184(8,15), 72(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,192\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1, arg2, arg3, arg4, arg5,  \
+                     arg6, arg7 ,arg8, arg9, arg10)              \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[11];                        \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      _argvec[8] = (unsigned long)arg8;                          \
+      _argvec[9] = (unsigned long)arg9;                          \
+      _argvec[10] = (unsigned long)arg10;                        \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-200\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "mvc 176(8,15), 64(1)\n\t"                              \
+         "mvc 184(8,15), 72(1)\n\t"                              \
+         "mvc 192(8,15), 80(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,200\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1, arg2, arg3, arg4, arg5,  \
+                     arg6, arg7 ,arg8, arg9, arg10, arg11)       \
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[12];                        \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      _argvec[8] = (unsigned long)arg8;                          \
+      _argvec[9] = (unsigned long)arg9;                          \
+      _argvec[10] = (unsigned long)arg10;                        \
+      _argvec[11] = (unsigned long)arg11;                        \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-208\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "mvc 176(8,15), 64(1)\n\t"                              \
+         "mvc 184(8,15), 72(1)\n\t"                              \
+         "mvc 192(8,15), 80(1)\n\t"                              \
+         "mvc 200(8,15), 88(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,208\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1, arg2, arg3, arg4, arg5,  \
+                     arg6, arg7 ,arg8, arg9, arg10, arg11, arg12)\
+   do {                                                          \
+      volatile OrigFn        _orig = (orig);                     \
+      volatile unsigned long _argvec[13];                        \
+      volatile unsigned long _res;                               \
+      _argvec[0] = (unsigned long)_orig.nraddr;                  \
+      _argvec[1] = (unsigned long)arg1;                          \
+      _argvec[2] = (unsigned long)arg2;                          \
+      _argvec[3] = (unsigned long)arg3;                          \
+      _argvec[4] = (unsigned long)arg4;                          \
+      _argvec[5] = (unsigned long)arg5;                          \
+      _argvec[6] = (unsigned long)arg6;                          \
+      _argvec[7] = (unsigned long)arg7;                          \
+      _argvec[8] = (unsigned long)arg8;                          \
+      _argvec[9] = (unsigned long)arg9;                          \
+      _argvec[10] = (unsigned long)arg10;                        \
+      _argvec[11] = (unsigned long)arg11;                        \
+      _argvec[12] = (unsigned long)arg12;                        \
+      __asm__ volatile(                                          \
+         VALGRIND_CFI_PROLOGUE                                   \
+         "aghi 15,-216\n\t"                                      \
+         "lg 2, 8(1)\n\t"                                        \
+         "lg 3,16(1)\n\t"                                        \
+         "lg 4,24(1)\n\t"                                        \
+         "lg 5,32(1)\n\t"                                        \
+         "lg 6,40(1)\n\t"                                        \
+         "mvc 160(8,15), 48(1)\n\t"                              \
+         "mvc 168(8,15), 56(1)\n\t"                              \
+         "mvc 176(8,15), 64(1)\n\t"                              \
+         "mvc 184(8,15), 72(1)\n\t"                              \
+         "mvc 192(8,15), 80(1)\n\t"                              \
+         "mvc 200(8,15), 88(1)\n\t"                              \
+         "mvc 208(8,15), 96(1)\n\t"                              \
+         "lg 1, 0(1)\n\t"                                        \
+         VALGRIND_CALL_NOREDIR_R1                                \
+         "aghi 15,216\n\t"                                       \
+         VALGRIND_CFI_EPILOGUE                                   \
+         "lgr %0, 2\n\t"                                         \
+         : /*out*/   "=d" (_res)                                 \
+         : /*in*/    "a" (&_argvec[0]) __FRAME_POINTER           \
+         : /*trash*/ "cc", "memory", __CALLER_SAVED_REGS,"6","7" \
+      );                                                         \
+      lval = (__typeof__(lval)) _res;                            \
+   } while (0)
+
+
+#endif /* PLAT_s390x_linux */
+
+/* ------------------------- mips32-linux ----------------------- */
+ 
+#if defined(PLAT_mips32_linux)
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS "$2", "$3", "$4", "$5", "$6",       \
+"$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
+"$25", "$31"
+
+/* These CALL_FN_ macros assume that on mips-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "subu $29, $29, 16 \n\t"                                 \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 16\n\t"                                  \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+     volatile unsigned long _argvec[2];                           \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "subu $29, $29, 16 \n\t"                                 \
+         "lw $4, 4(%1) \n\t"   /* arg1*/                          \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 16 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory",  __CALLER_SAVED_REGS               \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "subu $29, $29, 16 \n\t"                                 \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 16 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "subu $29, $29, 16 \n\t"                                 \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 16 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "subu $29, $29, 16 \n\t"                                 \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 16 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 24\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 24 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 32\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "nop\n\t"                                                \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 32 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 32\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 32 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 40\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 32(%1) \n\t"                                     \
+         "sw $4, 28($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 40 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 40\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 32(%1) \n\t"                                     \
+         "sw $4, 28($29) \n\t"                                    \
+         "lw $4, 36(%1) \n\t"                                     \
+         "sw $4, 32($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 40 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 48\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 32(%1) \n\t"                                     \
+         "sw $4, 28($29) \n\t"                                    \
+         "lw $4, 36(%1) \n\t"                                     \
+         "sw $4, 32($29) \n\t"                                    \
+         "lw $4, 40(%1) \n\t"                                     \
+         "sw $4, 36($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 48 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 48\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 32(%1) \n\t"                                     \
+         "sw $4, 28($29) \n\t"                                    \
+         "lw $4, 36(%1) \n\t"                                     \
+         "sw $4, 32($29) \n\t"                                    \
+         "lw $4, 40(%1) \n\t"                                     \
+         "sw $4, 36($29) \n\t"                                    \
+         "lw $4, 44(%1) \n\t"                                     \
+         "sw $4, 40($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 48 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "subu $29, $29, 8 \n\t"                                  \
+         "sw $28, 0($29) \n\t"                                    \
+         "sw $31, 4($29) \n\t"                                    \
+         "lw $4, 20(%1) \n\t"                                     \
+         "subu $29, $29, 56\n\t"                                  \
+         "sw $4, 16($29) \n\t"                                    \
+         "lw $4, 24(%1) \n\t"                                     \
+         "sw $4, 20($29) \n\t"                                    \
+         "lw $4, 28(%1) \n\t"                                     \
+         "sw $4, 24($29) \n\t"                                    \
+         "lw $4, 32(%1) \n\t"                                     \
+         "sw $4, 28($29) \n\t"                                    \
+         "lw $4, 36(%1) \n\t"                                     \
+         "sw $4, 32($29) \n\t"                                    \
+         "lw $4, 40(%1) \n\t"                                     \
+         "sw $4, 36($29) \n\t"                                    \
+         "lw $4, 44(%1) \n\t"                                     \
+         "sw $4, 40($29) \n\t"                                    \
+         "lw $4, 48(%1) \n\t"                                     \
+         "sw $4, 44($29) \n\t"                                    \
+         "lw $4, 4(%1) \n\t"                                      \
+         "lw $5, 8(%1) \n\t"                                      \
+         "lw $6, 12(%1) \n\t"                                     \
+         "lw $7, 16(%1) \n\t"                                     \
+         "lw $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "addu $29, $29, 56 \n\t"                                 \
+         "lw $28, 0($29) \n\t"                                    \
+         "lw $31, 4($29) \n\t"                                    \
+         "addu $29, $29, 8 \n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_mips32_linux */
+
+/* ------------------------- nanomips-linux -------------------- */
+
+#if defined(PLAT_nanomips_linux)
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS "$t4", "$t5", "$a0", "$a1", "$a2",     \
+"$a3", "$a4", "$a5", "$a6", "$a7", "$t0", "$t1", "$t2", "$t3",     \
+"$t8","$t9", "$at"
+
+/* These CALL_FN_ macros assume that on mips-linux, sizeof(unsigned
+   long) == 4. */
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[1];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[2];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[3];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[4];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[5];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         "lw $a3,16(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[6];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         "lw $a3,16(%1)\n\t"                                      \
+         "lw $a4,20(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[7];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         "lw $a3,16(%1)\n\t"                                      \
+         "lw $a4,20(%1)\n\t"                                      \
+         "lw $a5,24(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[8];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         "lw $a3,16(%1)\n\t"                                      \
+         "lw $a4,20(%1)\n\t"                                      \
+         "lw $a5,24(%1)\n\t"                                      \
+         "lw $a6,28(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[9];                          \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      __asm__ volatile(                                           \
+         "lw $t9, 0(%1)\n\t"                                      \
+         "lw $a0, 4(%1)\n\t"                                      \
+         "lw $a1, 8(%1)\n\t"                                      \
+         "lw $a2,12(%1)\n\t"                                      \
+         "lw $a3,16(%1)\n\t"                                      \
+         "lw $a4,20(%1)\n\t"                                      \
+         "lw $a5,24(%1)\n\t"                                      \
+         "lw $a6,28(%1)\n\t"                                      \
+         "lw $a7,32(%1)\n\t"                                      \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0\n"                                         \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[10];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      __asm__ volatile(                                           \
+         "addiu $sp, $sp, -16  \n\t"                              \
+         "lw $t9,36(%1)        \n\t"                              \
+         "sw $t9, 0($sp)       \n\t"                              \
+         "lw $t9, 0(%1)        \n\t"                              \
+         "lw $a0, 4(%1)        \n\t"                              \
+         "lw $a1, 8(%1)        \n\t"                              \
+         "lw $a2,12(%1)        \n\t"                              \
+         "lw $a3,16(%1)        \n\t"                              \
+         "lw $a4,20(%1)        \n\t"                              \
+         "lw $a5,24(%1)        \n\t"                              \
+         "lw $a6,28(%1)        \n\t"                              \
+         "lw $a7,32(%1)        \n\t"                              \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0         \n\t"                              \
+         "addiu $sp, $sp, 16   \n\t"                              \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[11];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      __asm__ volatile(                                           \
+         "addiu $sp, $sp, -16  \n\t"                              \
+         "lw $t9,36(%1)        \n\t"                              \
+         "sw $t9, 0($sp)       \n\t"                              \
+         "lw $t9,40(%1)        \n\t"                              \
+         "sw $t9, 4($sp)       \n\t"                              \
+         "lw $t9, 0(%1)        \n\t"                              \
+         "lw $a0, 4(%1)        \n\t"                              \
+         "lw $a1, 8(%1)        \n\t"                              \
+         "lw $a2,12(%1)        \n\t"                              \
+         "lw $a3,16(%1)        \n\t"                              \
+         "lw $a4,20(%1)        \n\t"                              \
+         "lw $a5,24(%1)        \n\t"                              \
+         "lw $a6,28(%1)        \n\t"                              \
+         "lw $a7,32(%1)        \n\t"                              \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0         \n\t"                              \
+         "addiu $sp, $sp, 16   \n\t"                              \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[12];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      __asm__ volatile(                                           \
+         "addiu $sp, $sp, -16  \n\t"                              \
+         "lw $t9,36(%1)        \n\t"                              \
+         "sw $t9, 0($sp)       \n\t"                              \
+         "lw $t9,40(%1)        \n\t"                              \
+         "sw $t9, 4($sp)       \n\t"                              \
+         "lw $t9,44(%1)        \n\t"                              \
+         "sw $t9, 8($sp)       \n\t"                              \
+         "lw $t9, 0(%1)        \n\t"                              \
+         "lw $a0, 4(%1)        \n\t"                              \
+         "lw $a1, 8(%1)        \n\t"                              \
+         "lw $a2,12(%1)        \n\t"                              \
+         "lw $a3,16(%1)        \n\t"                              \
+         "lw $a4,20(%1)        \n\t"                              \
+         "lw $a5,24(%1)        \n\t"                              \
+         "lw $a6,28(%1)        \n\t"                              \
+         "lw $a7,32(%1)        \n\t"                              \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0         \n\t"                              \
+         "addiu $sp, $sp, 16   \n\t"                              \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long _argvec[13];                         \
+      volatile unsigned long _res;                                \
+      _argvec[0] = (unsigned long)_orig.nraddr;                   \
+      _argvec[1] = (unsigned long)(arg1);                         \
+      _argvec[2] = (unsigned long)(arg2);                         \
+      _argvec[3] = (unsigned long)(arg3);                         \
+      _argvec[4] = (unsigned long)(arg4);                         \
+      _argvec[5] = (unsigned long)(arg5);                         \
+      _argvec[6] = (unsigned long)(arg6);                         \
+      _argvec[7] = (unsigned long)(arg7);                         \
+      _argvec[8] = (unsigned long)(arg8);                         \
+      _argvec[9] = (unsigned long)(arg9);                         \
+      _argvec[10] = (unsigned long)(arg10);                       \
+      _argvec[11] = (unsigned long)(arg11);                       \
+      _argvec[12] = (unsigned long)(arg12);                       \
+      __asm__ volatile(                                           \
+         "addiu $sp, $sp, -16  \n\t"                              \
+         "lw $t9,36(%1)        \n\t"                              \
+         "sw $t9, 0($sp)       \n\t"                              \
+         "lw $t9,40(%1)        \n\t"                              \
+         "sw $t9, 4($sp)       \n\t"                              \
+         "lw $t9,44(%1)        \n\t"                              \
+         "sw $t9, 8($sp)       \n\t"                              \
+         "lw $t9,48(%1)        \n\t"                              \
+         "sw $t9,12($sp)       \n\t"                              \
+         "lw $t9, 0(%1)        \n\t"                              \
+         "lw $a0, 4(%1)        \n\t"                              \
+         "lw $a1, 8(%1)        \n\t"                              \
+         "lw $a2,12(%1)        \n\t"                              \
+         "lw $a3,16(%1)        \n\t"                              \
+         "lw $a4,20(%1)        \n\t"                              \
+         "lw $a5,24(%1)        \n\t"                              \
+         "lw $a6,28(%1)        \n\t"                              \
+         "lw $a7,32(%1)        \n\t"                              \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $a0         \n\t"                              \
+         "addiu $sp, $sp, 16   \n\t"                              \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) _res;                             \
+   } while (0)
+
+#endif /* PLAT_nanomips_linux */
+
+/* ------------------------- mips64-linux ------------------------- */
+
+#if defined(PLAT_mips64_linux)
+
+/* These regs are trashed by the hidden call. */
+#define __CALLER_SAVED_REGS "$2", "$3", "$4", "$5", "$6",       \
+"$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \
+"$25", "$31"
+
+/* These CALL_FN_ macros assume that on mips64-linux,
+   sizeof(long long) == 8. */
+
+#define MIPS64_LONG2REG_CAST(x) ((long long)(long)x)
+
+#define CALL_FN_W_v(lval, orig)                                   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[1];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      __asm__ volatile(                                           \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "0" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_W(lval, orig, arg1)                             \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[2];                     \
+      volatile unsigned long long  _res;                          \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"   /* arg1*/                           \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_WW(lval, orig, arg1,arg2)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[3];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = _orig.nraddr;                                  \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+
+#define CALL_FN_W_WWW(lval, orig, arg1,arg2,arg3)                 \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[4];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = _orig.nraddr;                                  \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_WWWW(lval, orig, arg1,arg2,arg3,arg4)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[5];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_5W(lval, orig, arg1,arg2,arg3,arg4,arg5)        \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[6];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_6W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6)   \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[7];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_7W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7)                            \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[8];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_8W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8)                       \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[9];                     \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      _argvec[8] = MIPS64_LONG2REG_CAST(arg8);                    \
+      __asm__ volatile(                                           \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $11, 64(%1)\n\t"                                     \
+         "ld $25, 0(%1) \n\t"  /* target->t9 */                   \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_9W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,   \
+                                 arg7,arg8,arg9)                  \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[10];                    \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      _argvec[8] = MIPS64_LONG2REG_CAST(arg8);                    \
+      _argvec[9] = MIPS64_LONG2REG_CAST(arg9);                    \
+      __asm__ volatile(                                           \
+         "dsubu $29, $29, 8\n\t"                                  \
+         "ld $4, 72(%1)\n\t"                                      \
+         "sd $4, 0($29)\n\t"                                      \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $11, 64(%1)\n\t"                                     \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "daddu $29, $29, 8\n\t"                                  \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_10W(lval, orig, arg1,arg2,arg3,arg4,arg5,arg6,  \
+                                  arg7,arg8,arg9,arg10)           \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[11];                    \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      _argvec[8] = MIPS64_LONG2REG_CAST(arg8);                    \
+      _argvec[9] = MIPS64_LONG2REG_CAST(arg9);                    \
+      _argvec[10] = MIPS64_LONG2REG_CAST(arg10);                  \
+      __asm__ volatile(                                           \
+         "dsubu $29, $29, 16\n\t"                                 \
+         "ld $4, 72(%1)\n\t"                                      \
+         "sd $4, 0($29)\n\t"                                      \
+         "ld $4, 80(%1)\n\t"                                      \
+         "sd $4, 8($29)\n\t"                                      \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $11, 64(%1)\n\t"                                     \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "daddu $29, $29, 16\n\t"                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_11W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11)                          \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[12];                    \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      _argvec[8] = MIPS64_LONG2REG_CAST(arg8);                    \
+      _argvec[9] = MIPS64_LONG2REG_CAST(arg9);                    \
+      _argvec[10] = MIPS64_LONG2REG_CAST(arg10);                  \
+      _argvec[11] = MIPS64_LONG2REG_CAST(arg11);                  \
+      __asm__ volatile(                                           \
+         "dsubu $29, $29, 24\n\t"                                 \
+         "ld $4, 72(%1)\n\t"                                      \
+         "sd $4, 0($29)\n\t"                                      \
+         "ld $4, 80(%1)\n\t"                                      \
+         "sd $4, 8($29)\n\t"                                      \
+         "ld $4, 88(%1)\n\t"                                      \
+         "sd $4, 16($29)\n\t"                                     \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $11, 64(%1)\n\t"                                     \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "daddu $29, $29, 24\n\t"                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#define CALL_FN_W_12W(lval, orig, arg1,arg2,arg3,arg4,arg5,       \
+                                  arg6,arg7,arg8,arg9,arg10,      \
+                                  arg11,arg12)                    \
+   do {                                                           \
+      volatile OrigFn        _orig = (orig);                      \
+      volatile unsigned long long _argvec[13];                    \
+      volatile unsigned long long _res;                           \
+      _argvec[0] = MIPS64_LONG2REG_CAST(_orig.nraddr);            \
+      _argvec[1] = MIPS64_LONG2REG_CAST(arg1);                    \
+      _argvec[2] = MIPS64_LONG2REG_CAST(arg2);                    \
+      _argvec[3] = MIPS64_LONG2REG_CAST(arg3);                    \
+      _argvec[4] = MIPS64_LONG2REG_CAST(arg4);                    \
+      _argvec[5] = MIPS64_LONG2REG_CAST(arg5);                    \
+      _argvec[6] = MIPS64_LONG2REG_CAST(arg6);                    \
+      _argvec[7] = MIPS64_LONG2REG_CAST(arg7);                    \
+      _argvec[8] = MIPS64_LONG2REG_CAST(arg8);                    \
+      _argvec[9] = MIPS64_LONG2REG_CAST(arg9);                    \
+      _argvec[10] = MIPS64_LONG2REG_CAST(arg10);                  \
+      _argvec[11] = MIPS64_LONG2REG_CAST(arg11);                  \
+      _argvec[12] = MIPS64_LONG2REG_CAST(arg12);                  \
+      __asm__ volatile(                                           \
+         "dsubu $29, $29, 32\n\t"                                 \
+         "ld $4, 72(%1)\n\t"                                      \
+         "sd $4, 0($29)\n\t"                                      \
+         "ld $4, 80(%1)\n\t"                                      \
+         "sd $4, 8($29)\n\t"                                      \
+         "ld $4, 88(%1)\n\t"                                      \
+         "sd $4, 16($29)\n\t"                                     \
+         "ld $4, 96(%1)\n\t"                                      \
+         "sd $4, 24($29)\n\t"                                     \
+         "ld $4, 8(%1)\n\t"                                       \
+         "ld $5, 16(%1)\n\t"                                      \
+         "ld $6, 24(%1)\n\t"                                      \
+         "ld $7, 32(%1)\n\t"                                      \
+         "ld $8, 40(%1)\n\t"                                      \
+         "ld $9, 48(%1)\n\t"                                      \
+         "ld $10, 56(%1)\n\t"                                     \
+         "ld $11, 64(%1)\n\t"                                     \
+         "ld $25, 0(%1)\n\t"  /* target->t9 */                    \
+         VALGRIND_CALL_NOREDIR_T9                                 \
+         "daddu $29, $29, 32\n\t"                                 \
+         "move %0, $2\n"                                          \
+         : /*out*/   "=r" (_res)                                  \
+         : /*in*/    "r" (&_argvec[0])                            \
+         : /*trash*/ "memory", __CALLER_SAVED_REGS                \
+      );                                                          \
+      lval = (__typeof__(lval)) (long)_res;                       \
+   } while (0)
+
+#endif /* PLAT_mips64_linux */
+
+/* ------------------------------------------------------------------ */
+/* ARCHITECTURE INDEPENDENT MACROS for CLIENT REQUESTS.               */
+/*                                                                    */
+/* ------------------------------------------------------------------ */
+
+/* Some request codes.  There are many more of these, but most are not
+   exposed to end-user view.  These are the public ones, all of the
+   form 0x1000 + small_number.
+
+   Core ones are in the range 0x00000000--0x0000ffff.  The non-public
+   ones start at 0x2000.
+*/
+
+/* These macros are used by tools -- they must be public, but don't
+   embed them into other programs. */
+#define VG_USERREQ_TOOL_BASE(a,b) \
+   ((unsigned int)(((a)&0xff) << 24 | ((b)&0xff) << 16))
+#define VG_IS_TOOL_USERREQ(a, b, v) \
+   (VG_USERREQ_TOOL_BASE(a,b) == ((v) & 0xffff0000))
+
+/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !! 
+   This enum comprises an ABI exported by Valgrind to programs
+   which use client requests.  DO NOT CHANGE THE NUMERIC VALUES OF THESE
+   ENTRIES, NOR DELETE ANY -- add new ones at the end of the most
+   relevant group. */
+typedef
+   enum { VG_USERREQ__RUNNING_ON_VALGRIND  = 0x1001,
+          VG_USERREQ__DISCARD_TRANSLATIONS = 0x1002,
+
+          /* These allow any function to be called from the simulated
+             CPU but run on the real CPU.  Nb: the first arg passed to
+             the function is always the ThreadId of the running
+             thread!  So CLIENT_CALL0 actually requires a 1 arg
+             function, etc. */
+          VG_USERREQ__CLIENT_CALL0 = 0x1101,
+          VG_USERREQ__CLIENT_CALL1 = 0x1102,
+          VG_USERREQ__CLIENT_CALL2 = 0x1103,
+          VG_USERREQ__CLIENT_CALL3 = 0x1104,
+
+          /* Can be useful in regression testing suites -- eg. can
+             send Valgrind's output to /dev/null and still count
+             errors. */
+          VG_USERREQ__COUNT_ERRORS = 0x1201,
+
+          /* Allows the client program and/or gdbserver to execute a monitor
+             command. */
+          VG_USERREQ__GDB_MONITOR_COMMAND = 0x1202,
+
+          /* Allows the client program to change a dynamic command line
+             option.  */
+          VG_USERREQ__CLO_CHANGE = 0x1203,
+
+          /* These are useful and can be interpreted by any tool that
+             tracks malloc() et al, by using vg_replace_malloc.c. */
+          VG_USERREQ__MALLOCLIKE_BLOCK = 0x1301,
+          VG_USERREQ__RESIZEINPLACE_BLOCK = 0x130b,
+          VG_USERREQ__FREELIKE_BLOCK   = 0x1302,
+          /* Memory pool support. */
+          VG_USERREQ__CREATE_MEMPOOL   = 0x1303,
+          VG_USERREQ__DESTROY_MEMPOOL  = 0x1304,
+          VG_USERREQ__MEMPOOL_ALLOC    = 0x1305,
+          VG_USERREQ__MEMPOOL_FREE     = 0x1306,
+          VG_USERREQ__MEMPOOL_TRIM     = 0x1307,
+          VG_USERREQ__MOVE_MEMPOOL     = 0x1308,
+          VG_USERREQ__MEMPOOL_CHANGE   = 0x1309,
+          VG_USERREQ__MEMPOOL_EXISTS   = 0x130a,
+
+          /* Allow printfs to valgrind log. */
+          /* The first two pass the va_list argument by value, which
+             assumes it is the same size as or smaller than a UWord,
+             which generally isn't the case.  Hence are deprecated.
+             The second two pass the vargs by reference and so are
+             immune to this problem. */
+          /* both :: char* fmt, va_list vargs (DEPRECATED) */
+          VG_USERREQ__PRINTF           = 0x1401,
+          VG_USERREQ__PRINTF_BACKTRACE = 0x1402,
+          /* both :: char* fmt, va_list* vargs */
+          VG_USERREQ__PRINTF_VALIST_BY_REF = 0x1403,
+          VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF = 0x1404,
+
+          /* Stack support. */
+          VG_USERREQ__STACK_REGISTER   = 0x1501,
+          VG_USERREQ__STACK_DEREGISTER = 0x1502,
+          VG_USERREQ__STACK_CHANGE     = 0x1503,
+
+          /* Wine support */
+          VG_USERREQ__LOAD_PDB_DEBUGINFO = 0x1601,
+
+          /* Querying of debug info. */
+          VG_USERREQ__MAP_IP_TO_SRCLOC = 0x1701,
+
+          /* Disable/enable error reporting level.  Takes a single
+             Word arg which is the delta to this thread's error
+             disablement indicator.  Hence 1 disables or further
+             disables errors, and -1 moves back towards enablement.
+             Other values are not allowed. */
+          VG_USERREQ__CHANGE_ERR_DISABLEMENT = 0x1801,
+
+          /* Some requests used for Valgrind internal, such as
+             self-test or self-hosting. */
+          /* Initialise IR injection */
+          VG_USERREQ__VEX_INIT_FOR_IRI = 0x1901,
+          /* Used by Inner Valgrind to inform Outer Valgrind where to
+             find the list of inner guest threads */
+          VG_USERREQ__INNER_THREADS    = 0x1902
+   } Vg_ClientRequest;
+
+#if !defined(__GNUC__)
+#  define __extension__ /* */
+#endif
+
+
+/* Returns the number of Valgrinds this code is running under.  That
+   is, 0 if running natively, 1 if running under Valgrind, 2 if
+   running under Valgrind which is running under another Valgrind,
+   etc. */
+#define RUNNING_ON_VALGRIND                                           \
+    (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* if not */,         \
+                                    VG_USERREQ__RUNNING_ON_VALGRIND,  \
+                                    0, 0, 0, 0, 0)                    \
+
+
+/* Discard translation of code in the range [_qzz_addr .. _qzz_addr +
+   _qzz_len - 1].  Useful if you are debugging a JITter or some such,
+   since it provides a way to make sure valgrind will retranslate the
+   invalidated area.  Returns no value. */
+#define VALGRIND_DISCARD_TRANSLATIONS(_qzz_addr,_qzz_len)              \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DISCARD_TRANSLATIONS,  \
+                                    _qzz_addr, _qzz_len, 0, 0, 0)
+
+#define VALGRIND_INNER_THREADS(_qzz_addr)                               \
+   VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__INNER_THREADS,           \
+                                   _qzz_addr, 0, 0, 0, 0)
+
+
+/* These requests are for getting Valgrind itself to print something.
+   Possibly with a backtrace.  This is a really ugly hack.  The return value
+   is the number of characters printed, excluding the "**<pid>** " part at the
+   start and the backtrace (if present). */
+
+#if defined(__GNUC__) || defined(__INTEL_COMPILER) && !defined(_MSC_VER)
+/* Modern GCC will optimize the static routine out if unused,
+   and unused attribute will shut down warnings about it.  */
+static int VALGRIND_PRINTF(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+#endif
+static int
+#if defined(_MSC_VER)
+__inline
+#endif
+VALGRIND_PRINTF(const char *format, ...)
+{
+#if defined(NVALGRIND)
+   (void)format;
+   return 0;
+#else /* NVALGRIND */
+#if defined(_MSC_VER) || defined(__MINGW64__)
+   uintptr_t _qzz_res;
+#else
+   unsigned long _qzz_res;
+#endif
+   va_list vargs;
+   va_start(vargs, format);
+#if defined(_MSC_VER) || defined(__MINGW64__)
+   _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
+                              VG_USERREQ__PRINTF_VALIST_BY_REF,
+                              (uintptr_t)format,
+                              (uintptr_t)&vargs,
+                              0, 0, 0);
+#else
+   _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
+                              VG_USERREQ__PRINTF_VALIST_BY_REF,
+                              (unsigned long)format,
+                              (unsigned long)&vargs, 
+                              0, 0, 0);
+#endif
+   va_end(vargs);
+   return (int)_qzz_res;
+#endif /* NVALGRIND */
+}
+
+#if defined(__GNUC__) || defined(__INTEL_COMPILER) && !defined(_MSC_VER)
+static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+   __attribute__((format(__printf__, 1, 2), __unused__));
+#endif
+static int
+#if defined(_MSC_VER)
+__inline
+#endif
+VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
+{
+#if defined(NVALGRIND)
+   (void)format;
+   return 0;
+#else /* NVALGRIND */
+#if defined(_MSC_VER) || defined(__MINGW64__)
+   uintptr_t _qzz_res;
+#else
+   unsigned long _qzz_res;
+#endif
+   va_list vargs;
+   va_start(vargs, format);
+#if defined(_MSC_VER) || defined(__MINGW64__)
+   _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
+                              VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF,
+                              (uintptr_t)format,
+                              (uintptr_t)&vargs,
+                              0, 0, 0);
+#else
+   _qzz_res = VALGRIND_DO_CLIENT_REQUEST_EXPR(0,
+                              VG_USERREQ__PRINTF_BACKTRACE_VALIST_BY_REF,
+                              (unsigned long)format,
+                              (unsigned long)&vargs, 
+                              0, 0, 0);
+#endif
+   va_end(vargs);
+   return (int)_qzz_res;
+#endif /* NVALGRIND */
+}
+
+
+/* These requests allow control to move from the simulated CPU to the
+   real CPU, calling an arbitrary function.
+   
+   Note that the current ThreadId is inserted as the first argument.
+   So this call:
+
+     VALGRIND_NON_SIMD_CALL2(f, arg1, arg2)
+
+   requires f to have this signature:
+
+     Word f(Word tid, Word arg1, Word arg2)
+
+   where "Word" is a word-sized type.
+
+   Note that these client requests are not entirely reliable.  For example,
+   if you call a function with them that subsequently calls printf(),
+   there's a high chance Valgrind will crash.  Generally, your prospects of
+   these working are made higher if the called function does not refer to
+   any global variables, and does not refer to any libc or other functions
+   (printf et al).  Any kind of entanglement with libc or dynamic linking is
+   likely to have a bad outcome, for tricky reasons which we've grappled
+   with a lot in the past.
+*/
+#define VALGRIND_NON_SIMD_CALL0(_qyy_fn)                          \
+    VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */,       \
+                                    VG_USERREQ__CLIENT_CALL0,     \
+                                    _qyy_fn,                      \
+                                    0, 0, 0, 0)
+
+#define VALGRIND_NON_SIMD_CALL1(_qyy_fn, _qyy_arg1)                    \
+    VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */,            \
+                                    VG_USERREQ__CLIENT_CALL1,          \
+                                    _qyy_fn,                           \
+                                    _qyy_arg1, 0, 0, 0)
+
+#define VALGRIND_NON_SIMD_CALL2(_qyy_fn, _qyy_arg1, _qyy_arg2)         \
+    VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */,            \
+                                    VG_USERREQ__CLIENT_CALL2,          \
+                                    _qyy_fn,                           \
+                                    _qyy_arg1, _qyy_arg2, 0, 0)
+
+#define VALGRIND_NON_SIMD_CALL3(_qyy_fn, _qyy_arg1, _qyy_arg2, _qyy_arg3) \
+    VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */,             \
+                                    VG_USERREQ__CLIENT_CALL3,           \
+                                    _qyy_fn,                            \
+                                    _qyy_arg1, _qyy_arg2,               \
+                                    _qyy_arg3, 0)
+
+
+/* Counts the number of errors that have been recorded by a tool.  Nb:
+   the tool must record the errors with VG_(maybe_record_error)() or
+   VG_(unique_error)() for them to be counted. */
+#define VALGRIND_COUNT_ERRORS                                     \
+    (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(                    \
+                               0 /* default return */,            \
+                               VG_USERREQ__COUNT_ERRORS,          \
+                               0, 0, 0, 0, 0)
+
+/* Several Valgrind tools (Memcheck, Massif, Helgrind, DRD) rely on knowing
+   when heap blocks are allocated in order to give accurate results.  This
+   happens automatically for the standard allocator functions such as
+   malloc(), calloc(), realloc(), memalign(), new, new[], free(), delete,
+   delete[], etc.
+
+   But if your program uses a custom allocator, this doesn't automatically
+   happen, and Valgrind will not do as well.  For example, if you allocate
+   superblocks with mmap() and then allocates chunks of the superblocks, all
+   Valgrind's observations will be at the mmap() level and it won't know that
+   the chunks should be considered separate entities.  In Memcheck's case,
+   that means you probably won't get heap block overrun detection (because
+   there won't be redzones marked as unaddressable) and you definitely won't
+   get any leak detection.
+
+   The following client requests allow a custom allocator to be annotated so
+   that it can be handled accurately by Valgrind.
+
+   VALGRIND_MALLOCLIKE_BLOCK marks a region of memory as having been allocated
+   by a malloc()-like function.  For Memcheck (an illustrative case), this
+   does two things:
+
+   - It records that the block has been allocated.  This means any addresses
+     within the block mentioned in error messages will be
+     identified as belonging to the block.  It also means that if the block
+     isn't freed it will be detected by the leak checker.
+
+   - It marks the block as being addressable and undefined (if 'is_zeroed' is
+     not set), or addressable and defined (if 'is_zeroed' is set).  This
+     controls how accesses to the block by the program are handled.
+   
+   'addr' is the start of the usable block (ie. after any
+   redzone), 'sizeB' is its size.  'rzB' is the redzone size if the allocator
+   can apply redzones -- these are blocks of padding at the start and end of
+   each block.  Adding redzones is recommended as it makes it much more likely
+   Valgrind will spot block overruns.  `is_zeroed' indicates if the memory is
+   zeroed (or filled with another predictable value), as is the case for
+   calloc().
+   
+   VALGRIND_MALLOCLIKE_BLOCK should be put immediately after the point where a
+   heap block -- that will be used by the client program -- is allocated.
+   It's best to put it at the outermost level of the allocator if possible;
+   for example, if you have a function my_alloc() which calls
+   internal_alloc(), and the client request is put inside internal_alloc(),
+   stack traces relating to the heap block will contain entries for both
+   my_alloc() and internal_alloc(), which is probably not what you want.
+
+   For Memcheck users: if you use VALGRIND_MALLOCLIKE_BLOCK to carve out
+   custom blocks from within a heap block, B, that has been allocated with
+   malloc/calloc/new/etc, then block B will be *ignored* during leak-checking
+   -- the custom blocks will take precedence.
+
+   VALGRIND_FREELIKE_BLOCK is the partner to VALGRIND_MALLOCLIKE_BLOCK.  For
+   Memcheck, it does two things:
+
+   - It records that the block has been deallocated.  This assumes that the
+     block was annotated as having been allocated via
+     VALGRIND_MALLOCLIKE_BLOCK.  Otherwise, an error will be issued.
+
+   - It marks the block as being unaddressable.
+
+   VALGRIND_FREELIKE_BLOCK should be put immediately after the point where a
+   heap block is deallocated.
+
+   VALGRIND_RESIZEINPLACE_BLOCK informs a tool about reallocation. For
+   Memcheck, it does four things:
+
+   - It records that the size of a block has been changed.  This assumes that
+     the block was annotated as having been allocated via
+     VALGRIND_MALLOCLIKE_BLOCK.  Otherwise, an error will be issued.
+
+   - If the block shrunk, it marks the freed memory as being unaddressable.
+
+   - If the block grew, it marks the new area as undefined and defines a red
+     zone past the end of the new block.
+
+   - The V-bits of the overlap between the old and the new block are preserved.
+
+   VALGRIND_RESIZEINPLACE_BLOCK should be put after allocation of the new block
+   and before deallocation of the old block.
+
+   In many cases, these three client requests will not be enough to get your
+   allocator working well with Memcheck.  More specifically, if your allocator
+   writes to freed blocks in any way then a VALGRIND_MAKE_MEM_UNDEFINED call
+   will be necessary to mark the memory as addressable just before the zeroing
+   occurs, otherwise you'll get a lot of invalid write errors.  For example,
+   you'll need to do this if your allocator recycles freed blocks, but it
+   zeroes them before handing them back out (via VALGRIND_MALLOCLIKE_BLOCK).
+   Alternatively, if your allocator reuses freed blocks for allocator-internal
+   data structures, VALGRIND_MAKE_MEM_UNDEFINED calls will also be necessary.
+
+   Really, what's happening is a blurring of the lines between the client
+   program and the allocator... after VALGRIND_FREELIKE_BLOCK is called, the
+   memory should be considered unaddressable to the client program, but the
+   allocator knows more than the rest of the client program and so may be able
+   to safely access it.  Extra client requests are necessary for Valgrind to
+   understand the distinction between the allocator and the rest of the
+   program.
+
+   Ignored if addr == 0.
+*/
+#define VALGRIND_MALLOCLIKE_BLOCK(addr, sizeB, rzB, is_zeroed)          \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MALLOCLIKE_BLOCK,       \
+                                    addr, sizeB, rzB, is_zeroed, 0)
+
+/* See the comment for VALGRIND_MALLOCLIKE_BLOCK for details.
+   Ignored if addr == 0.
+*/
+#define VALGRIND_RESIZEINPLACE_BLOCK(addr, oldSizeB, newSizeB, rzB)     \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__RESIZEINPLACE_BLOCK,    \
+                                    addr, oldSizeB, newSizeB, rzB, 0)
+
+/* See the comment for VALGRIND_MALLOCLIKE_BLOCK for details.
+   Ignored if addr == 0.
+*/
+#define VALGRIND_FREELIKE_BLOCK(addr, rzB)                              \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__FREELIKE_BLOCK,         \
+                                    addr, rzB, 0, 0, 0)
+
+/* Create a memory pool. */
+#define VALGRIND_CREATE_MEMPOOL(pool, rzB, is_zeroed)             \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CREATE_MEMPOOL,   \
+                                    pool, rzB, is_zeroed, 0, 0)
+
+/* Create a memory pool with some flags specifying extended behaviour.
+   When flags is zero, the behaviour is identical to VALGRIND_CREATE_MEMPOOL.
+   
+   The flag VALGRIND_MEMPOOL_METAPOOL specifies that the pieces of memory 
+   associated with the pool using VALGRIND_MEMPOOL_ALLOC  will be used
+   by the application as superblocks to dole out MALLOC_LIKE blocks using
+   VALGRIND_MALLOCLIKE_BLOCK. In other words, a meta pool is a "2 levels"
+   pool : first level is the blocks described by VALGRIND_MEMPOOL_ALLOC.
+   The second level blocks are described using VALGRIND_MALLOCLIKE_BLOCK.
+   Note that the association between the pool and the second level blocks
+   is implicit : second level blocks will be located inside first level
+   blocks. It is necessary to use the VALGRIND_MEMPOOL_METAPOOL flag
+   for such 2 levels pools, as otherwise valgrind will detect overlapping
+   memory blocks, and will abort execution (e.g. during leak search).
+
+   Such a meta pool can also be marked as an 'auto free' pool using the flag
+   VALGRIND_MEMPOOL_AUTO_FREE, which must be OR-ed together with the
+   VALGRIND_MEMPOOL_METAPOOL. For an 'auto free' pool, VALGRIND_MEMPOOL_FREE
+   will automatically free the second level blocks that are contained
+   inside the first level block freed with VALGRIND_MEMPOOL_FREE.
+   In other words, calling VALGRIND_MEMPOOL_FREE will cause implicit calls
+   to VALGRIND_FREELIKE_BLOCK for all the second level blocks included
+   in the first level block.
+   Note: it is an error to use the VALGRIND_MEMPOOL_AUTO_FREE flag
+   without the VALGRIND_MEMPOOL_METAPOOL flag.
+*/
+#define VALGRIND_MEMPOOL_AUTO_FREE  1
+#define VALGRIND_MEMPOOL_METAPOOL   2
+#define VALGRIND_CREATE_MEMPOOL_EXT(pool, rzB, is_zeroed, flags)        \
+   VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CREATE_MEMPOOL,          \
+                                   pool, rzB, is_zeroed, flags, 0)
+
+/* Destroy a memory pool. */
+#define VALGRIND_DESTROY_MEMPOOL(pool)                            \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DESTROY_MEMPOOL,  \
+                                    pool, 0, 0, 0, 0)
+
+/* Associate a piece of memory with a memory pool. */
+#define VALGRIND_MEMPOOL_ALLOC(pool, addr, size)                  \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MEMPOOL_ALLOC,    \
+                                    pool, addr, size, 0, 0)
+
+/* Disassociate a piece of memory from a memory pool. */
+#define VALGRIND_MEMPOOL_FREE(pool, addr)                         \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MEMPOOL_FREE,     \
+                                    pool, addr, 0, 0, 0)
+
+/* Disassociate any pieces outside a particular range. */
+#define VALGRIND_MEMPOOL_TRIM(pool, addr, size)                   \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MEMPOOL_TRIM,     \
+                                    pool, addr, size, 0, 0)
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MOVE_MEMPOOL(poolA, poolB)                       \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MOVE_MEMPOOL,     \
+                                    poolA, poolB, 0, 0, 0)
+
+/* Resize and/or move a piece associated with a memory pool. */
+#define VALGRIND_MEMPOOL_CHANGE(pool, addrA, addrB, size)         \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__MEMPOOL_CHANGE,   \
+                                    pool, addrA, addrB, size, 0)
+
+/* Return 1 if a mempool exists, else 0. */
+#define VALGRIND_MEMPOOL_EXISTS(pool)                             \
+    (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0,                  \
+                               VG_USERREQ__MEMPOOL_EXISTS,        \
+                               pool, 0, 0, 0, 0)
+
+/* Mark a piece of memory as being a stack. Returns a stack id.
+   start is the lowest addressable stack byte, end is the highest
+   addressable stack byte. */
+#define VALGRIND_STACK_REGISTER(start, end)                       \
+    (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0,                  \
+                               VG_USERREQ__STACK_REGISTER,        \
+                               start, end, 0, 0, 0)
+
+/* Unmark the piece of memory associated with a stack id as being a
+   stack. */
+#define VALGRIND_STACK_DEREGISTER(id)                             \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__STACK_DEREGISTER, \
+                                    id, 0, 0, 0, 0)
+
+/* Change the start and end address of the stack id.
+   start is the new lowest addressable stack byte, end is the new highest
+   addressable stack byte. */
+#define VALGRIND_STACK_CHANGE(id, start, end)                     \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__STACK_CHANGE,     \
+                                    id, start, end, 0, 0)
+
+/* Load PDB debug info for Wine PE image_map. */
+#define VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta)     \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__LOAD_PDB_DEBUGINFO, \
+                                    fd, ptr, total_size, delta, 0)
+
+/* Map a code address to a source file name and line number.  buf64
+   must point to a 64-byte buffer in the caller's address space.  The
+   result will be dumped in there and is guaranteed to be zero
+   terminated.  If no info is found, the first byte is set to zero. */
+#define VALGRIND_MAP_IP_TO_SRCLOC(addr, buf64)                    \
+    (unsigned)VALGRIND_DO_CLIENT_REQUEST_EXPR(0,                  \
+                               VG_USERREQ__MAP_IP_TO_SRCLOC,      \
+                               addr, buf64, 0, 0, 0)
+
+/* Disable error reporting for this thread.  Behaves in a stack like
+   way, so you can safely call this multiple times provided that
+   VALGRIND_ENABLE_ERROR_REPORTING is called the same number of times
+   to re-enable reporting.  The first call of this macro disables
+   reporting.  Subsequent calls have no effect except to increase the
+   number of VALGRIND_ENABLE_ERROR_REPORTING calls needed to re-enable
+   reporting.  Child threads do not inherit this setting from their
+   parents -- they are always created with reporting enabled. */
+#define VALGRIND_DISABLE_ERROR_REPORTING                                \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CHANGE_ERR_DISABLEMENT, \
+                                    1, 0, 0, 0, 0)
+
+/* Re-enable error reporting, as per comments on
+   VALGRIND_DISABLE_ERROR_REPORTING. */
+#define VALGRIND_ENABLE_ERROR_REPORTING                                 \
+    VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CHANGE_ERR_DISABLEMENT, \
+                                    -1, 0, 0, 0, 0)
+
+/* Execute a monitor command from the client program.
+   If a connection is opened with GDB, the output will be sent
+   according to the output mode set for vgdb.
+   If no connection is opened, output will go to the log output.
+   Returns 1 if command not recognised, 0 otherwise. */
+#define VALGRIND_MONITOR_COMMAND(command)                               \
+   VALGRIND_DO_CLIENT_REQUEST_EXPR(0, VG_USERREQ__GDB_MONITOR_COMMAND, \
+                                   command, 0, 0, 0, 0)
+
+
+/* Change the value of a dynamic command line option.
+   Note that unknown or not dynamically changeable options
+   will cause a warning message to be output.  */
+#define VALGRIND_CLO_CHANGE(option)                           \
+   VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__CLO_CHANGE, \
+                                   option, 0, 0, 0, 0)
+
+
+#undef PLAT_x86_darwin
+#undef PLAT_amd64_darwin
+#undef PLAT_x86_win32
+#undef PLAT_amd64_win64
+#undef PLAT_x86_linux
+#undef PLAT_amd64_linux
+#undef PLAT_ppc32_linux
+#undef PLAT_ppc64be_linux
+#undef PLAT_ppc64le_linux
+#undef PLAT_arm_linux
+#undef PLAT_s390x_linux
+#undef PLAT_mips32_linux
+#undef PLAT_mips64_linux
+#undef PLAT_nanomips_linux
+#undef PLAT_x86_solaris
+#undef PLAT_amd64_solaris
+
+#endif   /* __VALGRIND_H */
diff --git a/src/util/.gitignore b/src/util/.gitignore
index c5f8c76dd..d79786ec7 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -9,3 +9,4 @@ test_helper_cs
 test_helper_cs_home/
 test_helper_eddsa
 test_helper_eddsa_home/
+test_conversion
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 94edac021..d2504588b 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -10,6 +10,7 @@ endif
 pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
+  currencies.conf \
   paths.conf \
   taler-exchange-secmod-eddsa.conf \
   taler-exchange-secmod-rsa.conf \
@@ -20,7 +21,8 @@ EXTRA_DIST = \
   taler-config.in \
   test_helper_eddsa.conf \
   test_helper_rsa.conf \
-  test_helper_cs.conf
+  test_helper_cs.conf \
+  test_conversion.sh
 
 bin_PROGRAMS = \
   taler-exchange-secmod-eddsa \
@@ -77,9 +79,12 @@ lib_LTLIBRARIES = \
 libtalerutil_la_SOURCES = \
   age_restriction.c \
   amount.c \
+  aml_signatures.c \
   auditor_signatures.c \
   config.c \
+  conversion.c \
   crypto.c \
+  crypto_confirmation.c \
   crypto_contract.c \
   crypto_helper_common.c crypto_helper_common.h \
   crypto_helper_rsa.c \
@@ -105,15 +110,17 @@ libtalerutil_la_SOURCES = \
 
 libtalerutil_la_LIBADD = \
   -lgnunetutil \
+  -lgnunetjson \
   -lsodium \
   -ljansson \
   $(LIBGCRYPT_LIBS) \
   -lmicrohttpd $(XLIB) \
+  -lunistring \
   -lz \
   -lm
 
 libtalerutil_la_LDFLAGS = \
-  -version-info 0:0:0 \
+  -version-info 3:3:2 \
   -no-undefined
 
 
@@ -122,6 +129,7 @@ AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=
 check_PROGRAMS = \
  test_age_restriction \
  test_amount \
+ test_conversion \
  test_crypto \
  test_helper_eddsa \
  test_helper_rsa \
@@ -138,6 +146,14 @@ test_age_restriction_LDADD = \
   -lgnunetutil \
   libtalerutil.la
 
+test_conversion_SOURCES = \
+  test_conversion.c
+test_conversion_LDADD = \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  libtalerutil.la
+
 test_amount_SOURCES = \
   test_amount.c
 test_amount_LDADD = \
diff --git a/src/util/age_restriction.c b/src/util/age_restriction.c
index 0ee020ebd..c2a7fc07c 100644
--- a/src/util/age_restriction.c
+++ b/src/util/age_restriction.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2022 Taler Systems SA
+  Copyright (C) 2022-2023 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
@@ -21,7 +21,22 @@
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
+#include <gnunet/gnunet_json_lib.h>
 #include <gcrypt.h>
+#include <stdint.h>
+
+struct
+#ifndef AGE_RESTRICTION_WITH_ECDSA
+GNUNET_CRYPTO_Edx25519PublicKey
+#else
+GNUNET_CRYPTO_EcdsaPublicKey
+#endif
+TALER_age_commitment_base_public_key = {
+  .q_y = { 0x64, 0x41, 0xb9, 0xbd, 0xbf, 0x14, 0x39, 0x8e,
+           0x46, 0xeb, 0x5c, 0x1d, 0x34, 0xd3, 0x9b, 0x2f,
+           0x9b, 0x7d, 0xc8, 0x18, 0xeb, 0x9c, 0x09, 0xfb,
+           0x43, 0xad, 0x16, 0x64, 0xbc, 0x18, 0x49, 0xb5},
+};
 
 void
 TALER_age_commitment_hash (
@@ -39,7 +54,7 @@ TALER_age_commitment_hash (
   }
 
   GNUNET_assert (__builtin_popcount (commitment->mask.bits) - 1 ==
-                 commitment->num);
+                 (int) commitment->num);
 
   hash_context = GNUNET_CRYPTO_hash_context_start ();
 
@@ -62,7 +77,7 @@ TALER_age_commitment_hash (
  * defined by the given mask.
  */
 uint8_t
-get_age_group (
+TALER_get_age_group (
   const struct TALER_AgeMask *mask,
   uint8_t age)
 {
@@ -81,37 +96,97 @@ get_age_group (
 }
 
 
-enum GNUNET_GenericReturnValue
+uint8_t
+TALER_get_lowest_age (
+  const struct TALER_AgeMask *mask,
+  uint8_t age)
+{
+  uint32_t m = mask->bits;
+  uint8_t group = TALER_get_age_group (mask, age);
+  uint8_t lowest = 0;
+
+  while (group > 0)
+  {
+    m = m >> 1;
+    if (m & 1)
+      group--;
+    lowest++;
+  }
+
+  return lowest;
+}
+
+
+#ifdef AGE_RESTRICTION_WITH_ECDSA
+/**
+ * @brief Helper function to generate a ECDSA private key
+ *
+ * @param seed Input seed
+ * @param size Size of the seed in bytes
+ * @param[out] pkey ECDSA private key
+ */
+static void
+ecdsa_create_from_seed (
+  const void *seed,
+  size_t seed_size,
+  struct GNUNET_CRYPTO_EcdsaPrivateKey *key)
+{
+  enum GNUNET_GenericReturnValue ret;
+
+  GNUNET_assert (
+    GNUNET_OK ==
+    GNUNET_CRYPTO_kdf (key,
+                       sizeof (*key),
+                       &seed,
+                       seed_size,
+                       "age commitment",
+                       sizeof ("age commitment") - 1,
+                       NULL, 0));
+  /* See GNUNET_CRYPTO_ecdsa_key_create */
+  key->d[0] &= 248;
+  key->d[31] &= 127;
+  key->d[31] |= 64;
+}
+
+
+#endif
+
+
+void
 TALER_age_restriction_commit (
   const struct TALER_AgeMask *mask,
-  const uint8_t age,
+  uint8_t age,
   const struct GNUNET_HashCode *seed,
-  struct TALER_AgeCommitmentProof *new)
+  struct TALER_AgeCommitmentProof *ncp)
 {
   struct GNUNET_HashCode seed_i;
-  uint8_t num_pub = __builtin_popcount (mask->bits) - 1;
-  uint8_t num_priv = get_age_group (mask, age);
+  uint8_t num_pub;
+  uint8_t num_priv;
   size_t i;
 
+  GNUNET_assert (NULL != mask);
   GNUNET_assert (NULL != seed);
-  GNUNET_assert (NULL != new);
-  GNUNET_assert (mask->bits & 1); /* fist bit must have been set */
-  GNUNET_assert (0 <= num_priv);
+  GNUNET_assert (NULL != ncp);
+  GNUNET_assert (mask->bits & 1); /* first bit must have been set */
+
+  num_pub = __builtin_popcount (mask->bits) - 1;
+  num_priv = TALER_get_age_group (mask, age);
+
   GNUNET_assert (31 > num_priv);
   GNUNET_assert (num_priv <= num_pub);
 
   seed_i = *seed;
-  new->commitment.mask.bits = mask->bits;
-  new->commitment.num = num_pub;
-  new->proof.num = num_priv;
-  new->proof.keys = NULL;
+  ncp->commitment.mask.bits = mask->bits;
+  ncp->commitment.num = num_pub;
+  ncp->proof.num = num_priv;
+  ncp->proof.keys = NULL;
 
-  new->commitment.keys = GNUNET_new_array (
+  ncp->commitment.keys = GNUNET_new_array (
     num_pub,
     struct TALER_AgeCommitmentPublicKeyP);
 
   if (0 < num_priv)
-    new->proof.keys = GNUNET_new_array (
+    ncp->proof.keys = GNUNET_new_array (
       num_priv,
       struct TALER_AgeCommitmentPrivateKeyP);
 
@@ -126,47 +201,24 @@ TALER_age_restriction_commit (
 
     /* Only save the private keys for age groups less than num_priv */
     if (i < num_priv)
-      pkey = &new->proof.keys[i];
+      pkey = &ncp->proof.keys[i];
 
 #ifndef AGE_RESTRICTION_WITH_ECDSA
     GNUNET_CRYPTO_edx25519_key_create_from_seed (&seed_i,
                                                  sizeof(seed_i),
                                                  &pkey->priv);
     GNUNET_CRYPTO_edx25519_key_get_public (&pkey->priv,
-                                           &new->commitment.keys[i].pub);
-    seed_i.bits[0] += 1;
-  }
-
-  return GNUNET_OK;
+                                           &ncp->commitment.keys[i].pub);
 #else
-    if  (GNUNET_OK !=
-         GNUNET_CRYPTO_kdf (pkey,
-                            sizeof (*pkey),
-                            &salti,
-                            sizeof (salti),
-                            "age commitment",
-                            strlen ("age commitment"),
-                            NULL, 0))
-      goto FAIL;
-
-    /* See GNUNET_CRYPTO_ecdsa_key_create */
-    pkey->priv.d[0] &= 248;
-    pkey->priv.d[31] &= 127;
-    pkey->priv.d[31] |= 64;
-
+    ecdsa_create_from_seed (&seed_i,
+                            sizeof(seed_i),
+                            &pkey->priv);
     GNUNET_CRYPTO_ecdsa_key_get_public (&pkey->priv,
-                                        &new->commitment.keys[i].pub);
+                                        &ncp->commitment.keys[i].pub);
+#endif
 
+    seed_i.bits[0] += 1;
   }
-
-  return GNUNET_OK;
-
-FAIL:
-  GNUNET_free (new->commitment.keys);
-  if (NULL != new->proof.keys)
-    GNUNET_free (new->proof.keys);
-  return GNUNET_SYSERR;
-#endif
 }
 
 
@@ -179,7 +231,7 @@ TALER_age_commitment_derive (
   GNUNET_assert (NULL != newacp);
   GNUNET_assert (orig->proof.num <=
                  orig->commitment.num);
-  GNUNET_assert (orig->commitment.num ==
+  GNUNET_assert (((int) orig->commitment.num) ==
                  __builtin_popcount (orig->commitment.mask.bits) - 1);
 
   newacp->commitment.mask = orig->commitment.mask;
@@ -216,33 +268,30 @@ TALER_age_commitment_derive (
       &newacp->proof.keys[i].priv);
   }
 #else
-  char label[sizeof(uint64_t) + 1] = {0};
-
-  /* Because GNUNET_CRYPTO_ecdsa_public_key_derive expects char * (and calls
-   * strlen on it), we must avoid 0's in the label.  */
-  uint64_t nz_salt = salt | 0x8040201008040201;
-  memcpy (label, &nz_salt, sizeof(nz_salt));
-
-  /* 1. Derive the public keys */
-  for (size_t i = 0; i < orig->commitment.num; i++)
-  {
-    GNUNET_CRYPTO_ecdsa_public_key_derive (
-      &orig->commitment.keys[i].pub,
-      label,
-      "age commitment derive",
-      &newacp->commitment.keys[i].pub);
-  }
-
-  /* 2. Derive the private keys */
-  for (size_t i = 0; i < orig->proof.num; i++)
   {
-    struct GNUNET_CRYPTO_EcdsaPrivateKey *priv;
-    priv = GNUNET_CRYPTO_ecdsa_private_key_derive (
-      &orig->proof.keys[i].priv,
-      label,
-      "age commitment derive");
-    newacp->proof.keys[i].priv = *priv;
-    GNUNET_free (priv);
+    const char *label = GNUNET_h2s (salt);
+
+    /* 1. Derive the public keys */
+    for (size_t i = 0; i < orig->commitment.num; i++)
+    {
+      GNUNET_CRYPTO_ecdsa_public_key_derive (
+        &orig->commitment.keys[i].pub,
+        label,
+        "age commitment derive",
+        &newacp->commitment.keys[i].pub);
+    }
+
+    /* 2. Derive the private keys */
+    for (size_t i = 0; i < orig->proof.num; i++)
+    {
+      struct GNUNET_CRYPTO_EcdsaPrivateKey *priv;
+      priv = GNUNET_CRYPTO_ecdsa_private_key_derive (
+        &orig->proof.keys[i].priv,
+        label,
+        "age commitment derive");
+      newacp->proof.keys[i].priv = *priv;
+      GNUNET_free (priv);
+    }
   }
 #endif
 
@@ -297,8 +346,8 @@ TALER_age_commitment_attest (
   GNUNET_assert (NULL != attest);
   GNUNET_assert (NULL != cp);
 
-  group = get_age_group (&cp->commitment.mask,
-                         age);
+  group = TALER_get_age_group (&cp->commitment.mask,
+                               age);
 
   GNUNET_assert (group < 32);
 
@@ -332,6 +381,7 @@ TALER_age_commitment_attest (
           &at,
           &attest->signature);
   }
+#undef sign
 
   return GNUNET_OK;
 }
@@ -348,8 +398,8 @@ TALER_age_commitment_verify (
   GNUNET_assert (NULL != attest);
   GNUNET_assert (NULL != comm);
 
-  group = get_age_group (&comm->mask,
-                         age);
+  group = TALER_get_age_group (&comm->mask,
+                               age);
 
   GNUNET_assert (group < 32);
 
@@ -381,6 +431,7 @@ TALER_age_commitment_verify (
                    &attest->signature,
                    &comm->keys[group - 1].pub);
   }
+#undef verify
 }
 
 
@@ -404,6 +455,9 @@ void
 TALER_age_proof_free (
   struct TALER_AgeProof *proof)
 {
+  if (NULL == proof)
+    return;
+
   if (NULL != proof->keys)
   {
     GNUNET_CRYPTO_zero_keys (
@@ -419,21 +473,323 @@ TALER_age_proof_free (
 
 void
 TALER_age_commitment_proof_free (
-  struct TALER_AgeCommitmentProof *cp)
+  struct TALER_AgeCommitmentProof *acp)
 {
-  if (NULL != cp->proof.keys)
+  if (NULL == acp)
+    return;
+
+  if (NULL != acp->proof.keys)
   {
     GNUNET_CRYPTO_zero_keys (
-      cp->proof.keys,
-      sizeof(*cp->proof.keys) * cp->proof.num);
+      acp->proof.keys,
+      sizeof(*acp->proof.keys) * acp->proof.num);
 
-    GNUNET_free (cp->proof.keys);
-    cp->proof.keys = NULL;
+    GNUNET_free (acp->proof.keys);
+    acp->proof.keys = NULL;
   }
 
-  if (NULL != cp->commitment.keys)
+  if (NULL != acp->commitment.keys)
   {
-    GNUNET_free (cp->commitment.keys);
-    cp->commitment.keys = NULL;
+    GNUNET_free (acp->commitment.keys);
+    acp->commitment.keys = NULL;
   }
 }
+
+
+struct TALER_AgeCommitmentProof *
+TALER_age_commitment_proof_duplicate (
+  const struct TALER_AgeCommitmentProof *acp)
+{
+  struct TALER_AgeCommitmentProof *nacp;
+
+  GNUNET_assert (NULL != acp);
+  GNUNET_assert (__builtin_popcount (acp->commitment.mask.bits) - 1 ==
+                 (int) acp->commitment.num);
+
+  nacp = GNUNET_new (struct TALER_AgeCommitmentProof);
+
+  TALER_age_commitment_proof_deep_copy (acp,nacp);
+  return nacp;
+}
+
+
+void
+TALER_age_commitment_proof_deep_copy (
+  const struct TALER_AgeCommitmentProof *acp,
+  struct TALER_AgeCommitmentProof *nacp)
+{
+  GNUNET_assert (NULL != acp);
+  GNUNET_assert (__builtin_popcount (acp->commitment.mask.bits) - 1 ==
+                 (int) acp->commitment.num);
+
+  *nacp = *acp;
+  nacp->commitment.keys =
+    GNUNET_new_array (acp->commitment.num,
+                      struct TALER_AgeCommitmentPublicKeyP);
+  nacp->proof.keys =
+    GNUNET_new_array (acp->proof.num,
+                      struct TALER_AgeCommitmentPrivateKeyP);
+
+  for (size_t i = 0; i < acp->commitment.num; i++)
+    nacp->commitment.keys[i] = acp->commitment.keys[i];
+
+  for (size_t i = 0; i < acp->proof.num; i++)
+    nacp->proof.keys[i] = acp->proof.keys[i];
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_JSON_parse_age_groups (const json_t *root,
+                             struct TALER_AgeMask *mask)
+{
+  enum GNUNET_GenericReturnValue ret;
+  const char *str;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_string ("age_groups",
+                             &str),
+    GNUNET_JSON_spec_end ()
+  };
+
+  ret = GNUNET_JSON_parse (root,
+                           spec,
+                           NULL,
+                           NULL);
+  if (GNUNET_OK == ret)
+    TALER_parse_age_group_string (str, mask);
+
+  GNUNET_JSON_parse_free (spec);
+
+  return ret;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_parse_age_group_string (
+  const char *groups,
+  struct TALER_AgeMask *mask)
+{
+
+  const char *pos = groups;
+  unsigned int prev = 0;
+  unsigned int val = 0;
+  char c;
+
+  /* reset mask */
+  mask->bits = 0;
+
+  while (*pos)
+  {
+    c = *pos++;
+    if (':' == c)
+    {
+      if (prev >= val)
+        return GNUNET_SYSERR;
+
+      mask->bits |= 1 << val;
+      prev = val;
+      val = 0;
+      continue;
+    }
+
+    if ('0'>c || '9'<c)
+      return GNUNET_SYSERR;
+
+    val = 10 * val + c - '0';
+
+    if (0>=val || 32<=val)
+      return GNUNET_SYSERR;
+  }
+
+  if (32<=val || prev>=val)
+    return GNUNET_SYSERR;
+
+  mask->bits |= (1 << val);
+  mask->bits |= 1; // mark zeroth group, too
+
+  return GNUNET_OK;
+}
+
+
+const char *
+TALER_age_mask_to_string (
+  const struct TALER_AgeMask *mask)
+{
+  static char buf[256] = {0};
+  uint32_t bits = mask->bits;
+  unsigned int n = 0;
+  char *pos = buf;
+
+  memset (buf, 0, sizeof(buf));
+
+  while (bits != 0)
+  {
+    bits >>= 1;
+    n++;
+    if (0 == (bits & 1))
+    {
+      continue;
+    }
+
+    if (n > 9)
+    {
+      *(pos++) = '0' + n / 10;
+    }
+    *(pos++) = '0' + n % 10;
+
+    if (0 != (bits >> 1))
+    {
+      *(pos++) = ':';
+    }
+  }
+  return buf;
+}
+
+
+void
+TALER_age_restriction_from_secret (
+  const struct TALER_PlanchetMasterSecretP *secret,
+  const struct TALER_AgeMask *mask,
+  const uint8_t max_age,
+  struct TALER_AgeCommitmentProof *ncp)
+{
+  struct GNUNET_HashCode seed_i = {0};
+  uint8_t num_pub;
+  uint8_t num_priv;
+
+  GNUNET_assert (NULL != mask);
+  GNUNET_assert (NULL != secret);
+  GNUNET_assert (NULL != ncp);
+  GNUNET_assert (mask->bits & 1); /* fist bit must have been set */
+
+  num_pub = __builtin_popcount (mask->bits) - 1;
+  num_priv = TALER_get_age_group (mask, max_age);
+
+  GNUNET_assert (31 > num_priv);
+  GNUNET_assert (num_priv <= num_pub);
+
+  ncp->commitment.mask.bits = mask->bits;
+  ncp->commitment.num = num_pub;
+  ncp->proof.num = num_priv;
+  ncp->proof.keys = NULL;
+  ncp->commitment.keys = GNUNET_new_array (
+    num_pub,
+    struct TALER_AgeCommitmentPublicKeyP);
+  if (0 < num_priv)
+    ncp->proof.keys = GNUNET_new_array (
+      num_priv,
+      struct TALER_AgeCommitmentPrivateKeyP);
+
+  /* Create as many private keys as allow with max_age and derive the
+   * corresponding public keys.  The rest of the needed public keys are created
+   * by scalar multiplication with the TALER_age_commitment_base_public_key. */
+  for (size_t i = 0; i < num_pub; i++)
+  {
+    enum GNUNET_GenericReturnValue ret;
+    const char *label = i < num_priv ? "age-commitment" : "age-factor";
+
+    ret = GNUNET_CRYPTO_kdf (&seed_i, sizeof(seed_i),
+                             secret, sizeof(*secret),
+                             label, strlen (label),
+                             &i, sizeof(i),
+                             NULL, 0);
+    GNUNET_assert (GNUNET_OK == ret);
+
+    /* Only generate and save the private keys and public keys for age groups
+     * less than num_priv */
+    if (i < num_priv)
+    {
+      struct TALER_AgeCommitmentPrivateKeyP *pkey = &ncp->proof.keys[i];
+
+#ifndef AGE_RESTRICTION_WITH_ECDSA
+      GNUNET_CRYPTO_edx25519_key_create_from_seed (&seed_i,
+                                                   sizeof(seed_i),
+                                                   &pkey->priv);
+      GNUNET_CRYPTO_edx25519_key_get_public (&pkey->priv,
+                                             &ncp->commitment.keys[i].pub);
+#else
+      ecdsa_create_from_seed (&seed_i,
+                              sizeof(seed_i),
+                              &pkey->priv);
+      GNUNET_CRYPTO_ecdsa_key_get_public (&pkey->priv,
+                                          &ncp->commitment.keys[i].pub);
+#endif
+    }
+    else
+    {
+      /* For all indices larger than num_priv, derive a public key from
+       * TALER_age_commitment_base_public_key by scalar multiplication */
+#ifndef AGE_RESTRICTION_WITH_ECDSA
+      GNUNET_CRYPTO_edx25519_public_key_derive (
+        &TALER_age_commitment_base_public_key,
+        &seed_i,
+        sizeof(seed_i),
+        &ncp->commitment.keys[i].pub);
+#else
+
+      GNUNET_CRYPTO_ecdsa_public_key_derive (
+        &TALER_age_commitment_base_public_key,
+        GNUNET_h2s (&seed_i),
+        "age withdraw",
+        &ncp->commitment.keys[i].pub);
+#endif
+    }
+  }
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_parse_coarse_date (
+  const char *in,
+  const struct TALER_AgeMask *mask,
+  uint32_t *out)
+{
+  struct tm date = {0};
+  struct tm limit = {0};
+  time_t seconds;
+
+  if (NULL == in)
+  {
+    /* FIXME[oec]: correct behaviour? */
+    *out = 0;
+    return GNUNET_OK;
+  }
+
+  GNUNET_assert (NULL !=mask);
+  GNUNET_assert (NULL !=out);
+
+  if (NULL == strptime (in, "%Y-%m-%d", &date))
+  {
+    if (NULL == strptime (in, "%Y-%m-00", &date))
+      if (NULL == strptime (in, "%Y-00-00", &date))
+        return GNUNET_SYSERR;
+    /* turns out that the day is off by one in the last two cases */
+    date.tm_mday += 1;
+  }
+
+  seconds = timegm (&date);
+  if (-1 == seconds)
+    return GNUNET_SYSERR;
+
+  /* calculate the limit date for the largest age group */
+  {
+    time_t l = time (NULL);
+    localtime_r (&l, &limit);
+  }
+  limit.tm_year -= TALER_adult_age (mask);
+  GNUNET_assert (-1 != timegm (&limit));
+
+  if ((limit.tm_year < date.tm_year)
+      || ((limit.tm_year == date.tm_year)
+          && (limit.tm_mon < date.tm_mon))
+      || ((limit.tm_year == date.tm_year)
+          && (limit.tm_mon == date.tm_mon)
+          && (limit.tm_mday < date.tm_mday)))
+    *out = seconds / 60 / 60 / 24;
+  else
+    *out = 0;
+
+  return GNUNET_OK;
+}
+
+
+/* end util/age_restriction.c */
diff --git a/src/util/aml_signatures.c b/src/util/aml_signatures.c
new file mode 100644
index 000000000..a61646c0d
--- /dev/null
+++ b/src/util/aml_signatures.c
@@ -0,0 +1,201 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file aml_signatures.c
+ * @brief Utility functions for AML officers
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_signatures.h"
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * @brief Format used to generate the signature on an AML decision.
+ */
+struct TALER_AmlDecisionPS
+{
+  /**
+   * Purpose must be #TALER_SIGNATURE_AML_DECISION.
+   * Used for an EdDSA signature with the `struct TALER_AmlOfficerPublicKeyP`.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Hash over the justification text.
+   */
+  struct GNUNET_HashCode h_justification GNUNET_PACKED;
+
+  /**
+   * Time when this decision was made.
+   */
+  struct GNUNET_TIME_TimestampNBO decision_time;
+
+  /**
+   * New threshold for triggering possibly a new AML process.
+   */
+  struct TALER_AmountNBO new_threshold;
+
+  /**
+   * Hash of the account identifier to which the decision applies.
+   */
+  struct TALER_PaytoHashP h_payto GNUNET_PACKED;
+
+  /**
+   * Hash over JSON array with KYC requirements that were imposed. All zeros
+   * for none.
+   */
+  struct GNUNET_HashCode h_kyc_requirements;
+
+  /**
+   * What is the new AML status?
+   */
+  uint32_t new_state GNUNET_PACKED;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+void
+TALER_officer_aml_decision_sign (
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  struct TALER_AmlOfficerSignatureP *officer_sig)
+{
+  struct TALER_AmlDecisionPS ad = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_AML_DECISION),
+    .purpose.size = htonl (sizeof (ad)),
+    .decision_time = GNUNET_TIME_timestamp_hton (decision_time),
+    .h_payto = *h_payto,
+    .new_state = htonl ((uint32_t) new_state)
+  };
+
+  GNUNET_CRYPTO_hash (justification,
+                      strlen (justification),
+                      &ad.h_justification);
+  TALER_amount_hton (&ad.new_threshold,
+                     new_threshold);
+  if (NULL != kyc_requirements)
+    TALER_json_hash (kyc_requirements,
+                     &ad.h_kyc_requirements);
+  GNUNET_CRYPTO_eddsa_sign (&officer_priv->eddsa_priv,
+                            &ad,
+                            &officer_sig->eddsa_signature);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_officer_aml_decision_verify (
+  const char *justification,
+  struct GNUNET_TIME_Timestamp decision_time,
+  const struct TALER_Amount *new_threshold,
+  const struct TALER_PaytoHashP *h_payto,
+  enum TALER_AmlDecisionState new_state,
+  const json_t *kyc_requirements,
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const struct TALER_AmlOfficerSignatureP *officer_sig)
+{
+  struct TALER_AmlDecisionPS ad = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_AML_DECISION),
+    .purpose.size = htonl (sizeof (ad)),
+    .decision_time = GNUNET_TIME_timestamp_hton (decision_time),
+    .h_payto = *h_payto,
+    .new_state = htonl ((uint32_t) new_state)
+  };
+
+  GNUNET_CRYPTO_hash (justification,
+                      strlen (justification),
+                      &ad.h_justification);
+  TALER_amount_hton (&ad.new_threshold,
+                     new_threshold);
+  if (NULL != kyc_requirements)
+    TALER_json_hash (kyc_requirements,
+                     &ad.h_kyc_requirements);
+  return GNUNET_CRYPTO_eddsa_verify (
+    TALER_SIGNATURE_AML_DECISION,
+    &ad,
+    &officer_sig->eddsa_signature,
+    &officer_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * @brief Format used to generate the signature on any AML query.
+ */
+struct TALER_AmlQueryPS
+{
+  /**
+   * Purpose must be #TALER_SIGNATURE_AML_QUERY.
+   * Used for an EdDSA signature with the `struct TALER_AmlOfficerPublicKeyP`.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_officer_aml_query_sign (
+  const struct TALER_AmlOfficerPrivateKeyP *officer_priv,
+  struct TALER_AmlOfficerSignatureP *officer_sig)
+{
+  struct TALER_AmlQueryPS aq = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_AML_QUERY),
+    .purpose.size = htonl (sizeof (aq))
+  };
+
+  GNUNET_CRYPTO_eddsa_sign (&officer_priv->eddsa_priv,
+                            &aq,
+                            &officer_sig->eddsa_signature);
+}
+
+
+/**
+ * Verify AML query authorization.
+ *
+ * @param officer_pub public key of AML officer
+ * @param officer_sig signature to verify
+ * @return #GNUNET_OK if the signature is valid
+ */
+enum GNUNET_GenericReturnValue
+TALER_officer_aml_query_verify (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const struct TALER_AmlOfficerSignatureP *officer_sig)
+{
+  struct TALER_AmlQueryPS aq = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_AML_QUERY),
+    .purpose.size = htonl (sizeof (aq))
+  };
+
+  return GNUNET_CRYPTO_eddsa_verify (
+    TALER_SIGNATURE_AML_QUERY,
+    &aq,
+    &officer_sig->eddsa_signature,
+    &officer_pub->eddsa_pub);
+}
+
+
+/* end of aml_signatures.c */
diff --git a/src/util/amount.c b/src/util/amount.c
index 43116af85..cce84d73a 100644
--- a/src/util/amount.c
+++ b/src/util/amount.c
@@ -40,6 +40,31 @@ invalidate (struct TALER_Amount *a)
 
 
 enum GNUNET_GenericReturnValue
+TALER_check_currency (const char *str)
+{
+  if (strlen (str) >= TALER_CURRENCY_LEN)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Currency code name `%s' is too long\n",
+                str);
+    return GNUNET_SYSERR;
+  }
+  /* validate str has only legal characters in it! */
+  for (unsigned int i = 0; '\0' != str[i]; i++)
+  {
+    if ( ('A' > str[i]) || ('Z' < str[i]) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Currency code name `%s' contains illegal characters (only A-Z allowed)\n",
+                  str);
+      return GNUNET_SYSERR;
+    }
+  }
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
 TALER_string_to_amount (const char *str,
                         struct TALER_Amount *amount)
 {
@@ -62,6 +87,7 @@ TALER_string_to_amount (const char *str,
   /* parse currency */
   colon = strchr (str, (int) ':');
   if ( (NULL == colon) ||
+       (colon == str) ||
        ((colon - str) >= TALER_CURRENCY_LEN) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -72,14 +98,15 @@ TALER_string_to_amount (const char *str,
   }
 
   GNUNET_assert (TALER_CURRENCY_LEN > (colon - str));
-  memcpy (amount->currency,
-          str,
-          colon - str);
+  for (unsigned int i = 0; i<colon - str; i++)
+    amount->currency[i] = str[i];
   /* 0-terminate *and* normalize buffer by setting everything to '\0' */
   memset (&amount->currency [colon - str],
           0,
           TALER_CURRENCY_LEN - (colon - str));
-
+  if (GNUNET_OK !=
+      TALER_check_currency (amount->currency))
+    return GNUNET_SYSERR;
   /* skip colon */
   value = colon + 1;
   if ('\0' == value[0])
@@ -193,9 +220,8 @@ TALER_amount_hton (struct TALER_AmountNBO *res,
                  TALER_amount_is_valid (d));
   res->value = GNUNET_htonll (d->value);
   res->fraction = htonl (d->fraction);
-  memcpy (res->currency,
-          d->currency,
-          TALER_CURRENCY_LEN);
+  for (unsigned int i = 0; i<TALER_CURRENCY_LEN; i++)
+    res->currency[i] = d->currency[i];
 }
 
 
@@ -205,9 +231,9 @@ TALER_amount_ntoh (struct TALER_Amount *res,
 {
   res->value = GNUNET_ntohll (dn->value);
   res->fraction = ntohl (dn->fraction);
-  memcpy (res->currency,
-          dn->currency,
-          TALER_CURRENCY_LEN);
+  GNUNET_memcpy (res->currency,
+                 dn->currency,
+                 TALER_CURRENCY_LEN);
   GNUNET_assert (GNUNET_YES ==
                  TALER_amount_is_valid (res));
 }
@@ -219,15 +245,15 @@ TALER_amount_set_zero (const char *cur,
 {
   size_t slen;
 
-  slen = strlen (cur);
-  if (slen >= TALER_CURRENCY_LEN)
+  if (GNUNET_OK !=
+      TALER_check_currency (cur))
     return GNUNET_SYSERR;
+  slen = strlen (cur);
   memset (amount,
           0,
           sizeof (struct TALER_Amount));
-  memcpy (amount->currency,
-          cur,
-          slen);
+  for (unsigned int i = 0; i<slen; i++)
+    amount->currency[i] = cur[i];
   return GNUNET_OK;
 }
 
@@ -236,7 +262,10 @@ enum GNUNET_GenericReturnValue
 TALER_amount_is_valid (const struct TALER_Amount *amount)
 {
   if (amount->value > TALER_AMOUNT_MAX_VALUE)
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
   return ('\0' != amount->currency[0]) ? GNUNET_OK : GNUNET_NO;
 }
 
@@ -553,8 +582,8 @@ const char *
 TALER_amount2s (const struct TALER_Amount *amount)
 {
   /* 24 is sufficient for a uint64_t value in decimal; 3 is for ":.\0" */
-  static GNUNET_THREAD_LOCAL char result[TALER_AMOUNT_FRAC_LEN
-                                         + TALER_CURRENCY_LEN + 3 + 24];
+  static TALER_THREAD_LOCAL char result[TALER_AMOUNT_FRAC_LEN
+                                        + TALER_CURRENCY_LEN + 3 + 24];
   struct TALER_Amount norm;
 
   if (GNUNET_YES != TALER_amount_is_valid (amount))
@@ -680,9 +709,9 @@ TALER_amount_multiply (struct TALER_Amount *result,
   if (GNUNET_SYSERR ==
       TALER_amount_normalize (&in))
     return TALER_AAR_INVALID_NORMALIZATION_FAILED;
-  memcpy (result->currency,
-          amount->currency,
-          TALER_CURRENCY_LEN);
+  GNUNET_memcpy (result->currency,
+                 amount->currency,
+                 TALER_CURRENCY_LEN);
   if ( (0 == factor) ||
        ( (0 == in.value) &&
          (0 == in.fraction) ) )
diff --git a/src/util/bench_age_restriction.c b/src/util/bench_age_restriction.c
new file mode 100644
index 000000000..abda9416a
--- /dev/null
+++ b/src/util/bench_age_restriction.c
@@ -0,0 +1,208 @@
+/**
+ * @file util/bench_age_restriction.c
+ * @brief Measure Commit, Attest, Verify, Derive and Compare
+ * @author Özgür Kesim
+ *
+ * compile in exchange/src/util with
+ *
+ * gcc benc_age_restriction.c \
+ *    -lgnunetutil -lgnunetjson -lsodium -ljansson \
+ *    -L/usr/lib/x86_64-linux-gnu -lmicrohttpd -ltalerutil \
+ *    -I../include \
+ *    -o bench_age_restriction
+ *
+ */
+#include "platform.h"
+#include <math.h>
+#include <gnunet/gnunet_util_lib.h>
+#include <taler/taler_util.h>
+#include <taler/taler_crypto_lib.h>
+
+static struct TALER_AgeMask
+  age_mask = { .bits = 1
+                       | 1 << 8 | 1 << 10 | 1 << 12
+                       | 1 << 14 | 1 << 16 | 1 << 18 | 1 << 21 };
+
+extern uint8_t
+get_age_group (
+  const struct TALER_AgeMask *mask,
+  uint8_t age);
+
+/**
+ * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
+ */
+char *
+age_mask_to_string (
+  const struct TALER_AgeMask *m)
+{
+  uint32_t bits = m->bits;
+  unsigned int n = 0;
+  char *buf = GNUNET_malloc (32 * 3); // max characters possible
+  char *pos = buf;
+
+  if (NULL == buf)
+  {
+    return buf;
+  }
+
+  while (bits != 0)
+  {
+    bits >>= 1;
+    n++;
+    if (0 == (bits & 1))
+    {
+      continue;
+    }
+
+    if (n > 9)
+    {
+      *(pos++) = '0' + n / 10;
+    }
+    *(pos++) = '0' + n % 10;
+
+    if (0 != (bits >> 1))
+    {
+      *(pos++) = ':';
+    }
+  }
+  return buf;
+}
+
+
+#define ITER 2000
+
+double
+average (long *times, size_t size)
+{
+  double mean = 0.0;
+  for (int i = 0; i < size; i++)
+  {
+    mean += times[i];
+  }
+  return mean / size;
+}
+
+
+double
+stdev (long *times, size_t size)
+{
+  double mean = average (times, size);
+  double V = 0.0;
+  for (int i = 0; i < size; i++)
+  {
+    double d = times[i] - mean;
+    d *= d;
+    V += d;
+  }
+  return sqrt (V / size);
+}
+
+
+#define pr(n,t, i) printf ("%10s (%dx):\t%.2f ± %.2fµs\n", (n), i, average ( \
+                             &t[0], ITER) / 1000, stdev (&t[0], ITER) / 1000); \
+  i = 0;
+
+#define starttime clock_gettime (CLOCK_MONOTONIC, &tstart)
+#define stoptime clock_gettime (CLOCK_MONOTONIC, &tend); \
+  times[i] = ((long) tend.tv_sec * 1000 * 1000 * 1000 + tend.tv_nsec) \
+             - ((long) tstart.tv_sec * 1000 * 1000 * 1000 + tstart.tv_nsec);
+
+
+int
+main (int argc,
+      const char *const argv[])
+{
+  struct timespec tstart = {0,0}, tend = {0,0};
+  enum GNUNET_GenericReturnValue ret;
+  struct TALER_AgeCommitmentProof acp = {0};
+  uint8_t age = 21;
+  uint8_t age_group = get_age_group (&age_mask, age);
+  struct GNUNET_HashCode seed;
+  long times[ITER] = {0};
+  int i = 0;
+
+  //  commit
+  for (; i < ITER; i++)
+  {
+    starttime;
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &seed,
+                                sizeof(seed));
+
+    ret = TALER_age_restriction_commit (&age_mask,
+                                        age,
+                                        &seed,
+                                        &acp);
+    stoptime;
+
+  }
+  pr ("commit", times, i);
+
+  // attest
+  for (; i < ITER; i++)
+  {
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &seed,
+                                sizeof(seed));
+
+    ret = TALER_age_restriction_commit (&age_mask,
+                                        age,
+                                        &seed,
+                                        &acp);
+
+    starttime;
+    uint8_t min_group = get_age_group (&age_mask, 13);
+    struct TALER_AgeAttestation at = {0};
+    ret = TALER_age_commitment_attest (&acp,
+                                       13,
+                                       &at);
+    stoptime;
+  }
+  pr ("attest", times, i);
+
+  // verify
+  for (; i < ITER; i++)
+  {
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &seed,
+                                sizeof(seed));
+
+    ret = TALER_age_restriction_commit (&age_mask,
+                                        age,
+                                        &seed,
+                                        &acp);
+
+    uint8_t min_group = get_age_group (&age_mask, 13);
+    struct TALER_AgeAttestation at = {0};
+
+    ret = TALER_age_commitment_attest (&acp,
+                                       13,
+                                       &at);
+    starttime;
+    ret = TALER_age_commitment_verify (&acp.commitment,
+                                       13,
+                                       &at);
+    stoptime;
+  }
+  pr ("verify", times, i);
+
+  // derive
+  for (; i < ITER; i++)
+  {
+    struct TALER_AgeCommitmentProof acp2 = {0};
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &seed,
+                                sizeof(seed));
+    starttime;
+    TALER_age_commitment_derive (&acp,
+                                 &seed,
+                                 &acp2);
+    stoptime;
+  }
+  pr ("derive", times, i);
+
+  return 0;
+}
+
+
+/* end of tv_age_restriction.c */
diff --git a/src/util/config.c b/src/util/config.c
index c00792469..f5accaad8 100644
--- a/src/util/config.c
+++ b/src/util/config.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -21,7 +21,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-
+#include <gnunet/gnunet_json_lib.h>
 
 enum GNUNET_GenericReturnValue
 TALER_config_get_amount (const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -166,3 +166,345 @@ TALER_config_get_currency (const struct GNUNET_CONFIGURATION_Handle *cfg,
     }
   return GNUNET_OK;
 }
+
+
+/**
+ * Closure for #parse_currencies_cb().
+ */
+struct CurrencyParserContext
+{
+  /**
+   * Current offset in @e cspecs.
+   */
+  unsigned int num_currencies;
+
+  /**
+   * Length of the @e cspecs array.
+   */
+  unsigned int len_cspecs;
+
+  /**
+   * Array of currency specifications (see DD 51).
+   */
+  struct TALER_CurrencySpecification *cspecs;
+
+  /**
+   * Configuration we are parsing.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * Set to true if the configuration was malformed.
+   */
+  bool failure;
+};
+
+
+/**
+ * Function to iterate over section.
+ *
+ * @param cls closure with a `struct CurrencyParserContext *`
+ * @param section name of the section
+ */
+static void
+parse_currencies_cb (void *cls,
+                     const char *section)
+{
+  struct CurrencyParserContext *cpc = cls;
+  struct TALER_CurrencySpecification *cspec;
+  unsigned long long num;
+  char *str;
+
+  if (cpc->failure)
+    return;
+  if (0 != strncasecmp (section,
+                        "currency-",
+                        strlen ("currency-")))
+    return; /* not interesting */
+  if (GNUNET_YES !=
+      GNUNET_CONFIGURATION_get_value_yesno (cpc->cfg,
+                                            section,
+                                            "ENABLED"))
+    return; /* disabled */
+  if (cpc->len_cspecs == cpc->num_currencies)
+  {
+    GNUNET_array_grow (cpc->cspecs,
+                       cpc->len_cspecs,
+                       cpc->len_cspecs * 2 + 4);
+  }
+  cspec = &cpc->cspecs[cpc->num_currencies++];
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cpc->cfg,
+                                             section,
+                                             "CODE",
+                                             &str))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "CODE");
+    cpc->failure = true;
+    return;
+  }
+  if (GNUNET_OK !=
+      TALER_check_currency (str))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "CODE",
+                               "Currency code name given is invalid");
+    cpc->failure = true;
+    GNUNET_free (str);
+    return;
+  }
+  memset (cspec->currency,
+          0,
+          sizeof (cspec->currency));
+  /* Already checked in TALER_check_currency(), repeated here
+     just to make static analysis happy */
+  GNUNET_assert (strlen (str) < TALER_CURRENCY_LEN);
+  strcpy (cspec->currency,
+          str);
+  GNUNET_free (str);
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cpc->cfg,
+                                             section,
+                                             "NAME",
+                                             &str))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "NAME");
+    cpc->failure = true;
+    return;
+  }
+  cspec->name = str;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cpc->cfg,
+                                             section,
+                                             "FRACTIONAL_INPUT_DIGITS",
+                                             &num))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_INPUT_DIGITS");
+    cpc->failure = true;
+    return;
+  }
+  if (num > TALER_AMOUNT_FRAC_LEN)
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_INPUT_DIGITS",
+                               "Number given is too big");
+    cpc->failure = true;
+    return;
+  }
+  cspec->num_fractional_input_digits = num;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cpc->cfg,
+                                             section,
+                                             "FRACTIONAL_NORMAL_DIGITS",
+                                             &num))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_NORMAL_DIGITS");
+    cpc->failure = true;
+    return;
+  }
+  if (num > TALER_AMOUNT_FRAC_LEN)
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_NORMAL_DIGITS",
+                               "Number given is too big");
+    cpc->failure = true;
+    return;
+  }
+  cspec->num_fractional_normal_digits = num;
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cpc->cfg,
+                                             section,
+                                             "FRACTIONAL_TRAILING_ZERO_DIGITS",
+                                             &num))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_TRAILING_ZERO_DIGITS");
+    cpc->failure = true;
+    return;
+  }
+  if (num > TALER_AMOUNT_FRAC_LEN)
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "FRACTIONAL_TRAILING_ZERO_DIGITS",
+                               "Number given is too big");
+    cpc->failure = true;
+    return;
+  }
+  cspec->num_fractional_trailing_zero_digits = num;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cpc->cfg,
+                                             section,
+                                             "ALT_UNIT_NAMES",
+                                             &str))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "ALT_UNIT_NAMES");
+    cpc->failure = true;
+    return;
+  }
+  {
+    json_error_t err;
+
+    cspec->map_alt_unit_names = json_loads (str,
+                                            JSON_REJECT_DUPLICATES,
+                                            &err);
+    GNUNET_free (str);
+    if (NULL == cspec->map_alt_unit_names)
+    {
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                                 section,
+                                 "ALT_UNIT_NAMES",
+                                 err.text);
+      cpc->failure = true;
+      return;
+    }
+  }
+  if (GNUNET_OK !=
+      TALER_check_currency_scale_map (cspec->map_alt_unit_names))
+  {
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+                               section,
+                               "ALT_UNIT_NAMES",
+                               "invalid map entry detected");
+    cpc->failure = true;
+    json_decref (cspec->map_alt_unit_names);
+    cspec->map_alt_unit_names = NULL;
+    return;
+  }
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_check_currency_scale_map (const json_t *map)
+{
+  /* validate map only maps from decimal numbers to strings! */
+  const char *str;
+  const json_t *val;
+  bool zf = false;
+
+  if (! json_is_object (map))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Object required for currency scale map\n");
+    return GNUNET_SYSERR;
+  }
+  json_object_foreach ((json_t *) map, str, val)
+  {
+    int idx;
+    char dummy;
+
+    if ( (1 != sscanf (str,
+                       "%d%c",
+                       &idx,
+                       &dummy)) ||
+         (idx < -12) ||
+         (idx > 24) ||
+         (! json_is_string (val) ) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Invalid entry `%s' in currency scale map\n",
+                  str);
+      return GNUNET_SYSERR;
+    }
+    if (0 == idx)
+      zf = true;
+  }
+  if (! zf)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Entry for 0 missing in currency scale map\n");
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_CONFIG_parse_currencies (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               unsigned int *num_currencies,
+                               struct TALER_CurrencySpecification **cspecs)
+{
+  struct CurrencyParserContext cpc = {
+    .cfg = cfg
+  };
+
+  GNUNET_CONFIGURATION_iterate_sections (cfg,
+                                         &parse_currencies_cb,
+                                         &cpc);
+  if (cpc.failure)
+  {
+    GNUNET_array_grow (cpc.cspecs,
+                       cpc.len_cspecs,
+                       0);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_array_grow (cpc.cspecs,
+                     cpc.len_cspecs,
+                     cpc.num_currencies);
+  *num_currencies = cpc.num_currencies;
+  *cspecs = cpc.cspecs;
+  if (0 == *num_currencies)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "No currency formatting specification found! Please check your installation!\n");
+    return GNUNET_NO;
+  }
+  return GNUNET_OK;
+}
+
+
+json_t *
+TALER_CONFIG_currency_specs_to_json (const struct
+                                     TALER_CurrencySpecification *cspec)
+{
+  return GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("name",
+                             cspec->name),
+    /* 'currency' is deprecated as of exchange v18 and merchant v6;
+       remove this line once current-age > 6*/
+    GNUNET_JSON_pack_string ("currency",
+                             cspec->currency),
+    GNUNET_JSON_pack_uint64 ("num_fractional_input_digits",
+                             cspec->num_fractional_input_digits),
+    GNUNET_JSON_pack_uint64 ("num_fractional_normal_digits",
+                             cspec->num_fractional_normal_digits),
+    GNUNET_JSON_pack_uint64 ("num_fractional_trailing_zero_digits",
+                             cspec->num_fractional_trailing_zero_digits),
+    GNUNET_JSON_pack_object_incref ("alt_unit_names",
+                                    cspec->map_alt_unit_names));
+}
+
+
+void
+TALER_CONFIG_free_currencies (
+  unsigned int num_currencies,
+  struct TALER_CurrencySpecification cspecs[static num_currencies])
+{
+  for (unsigned int i = 0; i<num_currencies; i++)
+  {
+    struct TALER_CurrencySpecification *cspec = &cspecs[i];
+
+    GNUNET_free (cspec->name);
+    json_decref (cspec->map_alt_unit_names);
+  }
+  GNUNET_array_grow (cspecs,
+                     num_currencies,
+                     0);
+}
diff --git a/src/util/conversion.c b/src/util/conversion.c
new file mode 100644
index 000000000..a7bc63789
--- /dev/null
+++ b/src/util/conversion.c
@@ -0,0 +1,405 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file conversion.c
+ * @brief helper routines to run some external JSON-to-JSON converter
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include <gnunet/gnunet_util_lib.h>
+
+
+struct TALER_JSON_ExternalConversion
+{
+  /**
+   * Callback to call with the result.
+   */
+  TALER_JSON_JsonCallback cb;
+
+  /**
+   * Closure for @e cb.
+   */
+  void *cb_cls;
+
+  /**
+   * Handle to the helper process.
+   */
+  struct GNUNET_OS_Process *helper;
+
+  /**
+   * Pipe for the stdin of the @e helper.
+   */
+  struct GNUNET_DISK_FileHandle *chld_stdin;
+
+  /**
+   * Pipe for the stdout of the @e helper.
+   */
+  struct GNUNET_DISK_FileHandle *chld_stdout;
+
+  /**
+   * Handle to wait on the child to terminate.
+   */
+  struct GNUNET_ChildWaitHandle *cwh;
+
+  /**
+   * Task to read JSON output from the child.
+   */
+  struct GNUNET_SCHEDULER_Task *read_task;
+
+  /**
+   * Task to send JSON input to the child.
+   */
+  struct GNUNET_SCHEDULER_Task *write_task;
+
+  /**
+   * Buffer with data we need to send to the helper.
+   */
+  void *write_buf;
+
+  /**
+   * Buffer for reading data from the helper.
+   */
+  void *read_buf;
+
+  /**
+   * Total length of @e write_buf.
+   */
+  size_t write_size;
+
+  /**
+   * Current write position in @e write_buf.
+   */
+  size_t write_pos;
+
+  /**
+   * Current size of @a read_buf.
+   */
+  size_t read_size;
+
+  /**
+   * Current offset in @a read_buf.
+   */
+  size_t read_pos;
+
+};
+
+
+/**
+ * Function called when we can read more data from
+ * the child process.
+ *
+ * @param cls our `struct TALER_JSON_ExternalConversion *`
+ */
+static void
+read_cb (void *cls)
+{
+  struct TALER_JSON_ExternalConversion *ec = cls;
+
+  ec->read_task = NULL;
+  while (1)
+  {
+    ssize_t ret;
+
+    if (ec->read_size == ec->read_pos)
+    {
+      /* Grow input buffer */
+      size_t ns;
+      void *tmp;
+
+      ns = GNUNET_MAX (2 * ec->read_size,
+                       1024);
+      if (ns > GNUNET_MAX_MALLOC_CHECKED)
+        ns = GNUNET_MAX_MALLOC_CHECKED;
+      if (ec->read_size == ns)
+      {
+        /* Helper returned more than 40 MB of data! Stop reading! */
+        GNUNET_break (0);
+        GNUNET_break (GNUNET_OK ==
+                      GNUNET_DISK_file_close (ec->chld_stdin));
+        return;
+      }
+      tmp = GNUNET_malloc_large (ns);
+      if (NULL == tmp)
+      {
+        /* out of memory, also stop reading */
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                             "malloc");
+        GNUNET_break (GNUNET_OK ==
+                      GNUNET_DISK_file_close (ec->chld_stdin));
+        return;
+      }
+      GNUNET_memcpy (tmp,
+                     ec->read_buf,
+                     ec->read_pos);
+      GNUNET_free (ec->read_buf);
+      ec->read_buf = tmp;
+      ec->read_size = ns;
+    }
+    ret = GNUNET_DISK_file_read (ec->chld_stdout,
+                                 ec->read_buf + ec->read_pos,
+                                 ec->read_size - ec->read_pos);
+    if (ret < 0)
+    {
+      if ( (EAGAIN != errno) &&
+           (EWOULDBLOCK != errno) &&
+           (EINTR != errno) )
+      {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "read");
+        return;
+      }
+      break;
+    }
+    if (0 == ret)
+    {
+      /* regular end of stream, good! */
+      return;
+    }
+    GNUNET_assert (ec->read_size >= ec->read_pos + ret);
+    ec->read_pos += ret;
+  }
+  ec->read_task
+    = GNUNET_SCHEDULER_add_read_file (
+        GNUNET_TIME_UNIT_FOREVER_REL,
+        ec->chld_stdout,
+        &read_cb,
+        ec);
+}
+
+
+/**
+ * Function called when we can write more data to
+ * the child process.
+ *
+ * @param cls our `struct TALER_JSON_ExternalConversion *`
+ */
+static void
+write_cb (void *cls)
+{
+  struct TALER_JSON_ExternalConversion *ec = cls;
+  ssize_t ret;
+
+  ec->write_task = NULL;
+  while (ec->write_size > ec->write_pos)
+  {
+    ret = GNUNET_DISK_file_write (ec->chld_stdin,
+                                  ec->write_buf + ec->write_pos,
+                                  ec->write_size - ec->write_pos);
+    if (ret < 0)
+    {
+      if ( (EAGAIN != errno) &&
+           (EINTR != errno) )
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "write");
+      break;
+    }
+    if (0 == ret)
+    {
+      GNUNET_break (0);
+      break;
+    }
+    GNUNET_assert (ec->write_size >= ec->write_pos + ret);
+    ec->write_pos += ret;
+  }
+  if ( (ec->write_size > ec->write_pos) &&
+       ( (EAGAIN == errno) ||
+         (EWOULDBLOCK == errno) ||
+         (EINTR == errno) ) )
+  {
+    ec->write_task
+      = GNUNET_SCHEDULER_add_write_file (
+          GNUNET_TIME_UNIT_FOREVER_REL,
+          ec->chld_stdin,
+          &write_cb,
+          ec);
+  }
+  else
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_file_close (ec->chld_stdin));
+    ec->chld_stdin = NULL;
+  }
+}
+
+
+/**
+ * Defines a GNUNET_ChildCompletedCallback which is sent back
+ * upon death or completion of a child process.
+ *
+ * @param cls handle for the callback
+ * @param type type of the process
+ * @param exit_code status code of the process
+ *
+ */
+static void
+child_done_cb (void *cls,
+               enum GNUNET_OS_ProcessStatusType type,
+               long unsigned int exit_code)
+{
+  struct TALER_JSON_ExternalConversion *ec = cls;
+  json_t *j = NULL;
+  json_error_t err;
+
+  ec->cwh = NULL;
+  if (NULL != ec->read_task)
+  {
+    GNUNET_SCHEDULER_cancel (ec->read_task);
+    /* We could get the process termination notification before having drained
+       the read buffer. So drain it now, just in case. */
+    read_cb (ec);
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Conversion helper exited with status %d and code %llu after outputting %llu bytes of data\n",
+              (int) type,
+              (unsigned long long) exit_code,
+              (unsigned long long) ec->read_pos);
+  GNUNET_OS_process_destroy (ec->helper);
+  ec->helper = NULL;
+  if (0 != ec->read_pos)
+  {
+    j = json_loadb (ec->read_buf,
+                    ec->read_pos,
+                    JSON_REJECT_DUPLICATES,
+                    &err);
+    if (NULL == j)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Failed to parse JSON from helper at %d: %s\n",
+                  err.position,
+                  err.text);
+    }
+  }
+  ec->cb (ec->cb_cls,
+          type,
+          exit_code,
+          j);
+  json_decref (j);
+  TALER_JSON_external_conversion_stop (ec);
+}
+
+
+struct TALER_JSON_ExternalConversion *
+TALER_JSON_external_conversion_start (const json_t *input,
+                                      TALER_JSON_JsonCallback cb,
+                                      void *cb_cls,
+                                      const char *binary,
+                                      ...)
+{
+  struct TALER_JSON_ExternalConversion *ec;
+  struct GNUNET_DISK_PipeHandle *pipe_stdin;
+  struct GNUNET_DISK_PipeHandle *pipe_stdout;
+  va_list ap;
+
+  ec = GNUNET_new (struct TALER_JSON_ExternalConversion);
+  ec->cb = cb;
+  ec->cb_cls = cb_cls;
+  pipe_stdin = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_READ);
+  GNUNET_assert (NULL != pipe_stdin);
+  pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_WRITE);
+  GNUNET_assert (NULL != pipe_stdout);
+  va_start (ap,
+            binary);
+  ec->helper = GNUNET_OS_start_process_va (GNUNET_OS_INHERIT_STD_ERR,
+                                           pipe_stdin,
+                                           pipe_stdout,
+                                           NULL,
+                                           binary,
+                                           ap);
+  va_end (ap);
+  if (NULL == ec->helper)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to run conversion helper `%s'\n",
+                binary);
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_pipe_close (pipe_stdin));
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_pipe_close (pipe_stdout));
+    GNUNET_free (ec);
+    return NULL;
+  }
+  ec->chld_stdin =
+    GNUNET_DISK_pipe_detach_end (pipe_stdin,
+                                 GNUNET_DISK_PIPE_END_WRITE);
+  ec->chld_stdout =
+    GNUNET_DISK_pipe_detach_end (pipe_stdout,
+                                 GNUNET_DISK_PIPE_END_READ);
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_DISK_pipe_close (pipe_stdin));
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_DISK_pipe_close (pipe_stdout));
+  ec->write_buf = json_dumps (input, JSON_COMPACT);
+  ec->write_size = strlen (ec->write_buf);
+  ec->read_task
+    = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                      ec->chld_stdout,
+                                      &read_cb,
+                                      ec);
+  ec->write_task
+    = GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                       ec->chld_stdin,
+                                       &write_cb,
+                                       ec);
+  ec->cwh = GNUNET_wait_child (ec->helper,
+                               &child_done_cb,
+                               ec);
+  return ec;
+}
+
+
+void
+TALER_JSON_external_conversion_stop (
+  struct TALER_JSON_ExternalConversion *ec)
+{
+  if (NULL != ec->cwh)
+  {
+    GNUNET_wait_child_cancel (ec->cwh);
+    ec->cwh = NULL;
+  }
+  if (NULL != ec->helper)
+  {
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (ec->helper,
+                                          SIGKILL));
+    GNUNET_OS_process_destroy (ec->helper);
+  }
+  if (NULL != ec->read_task)
+  {
+    GNUNET_SCHEDULER_cancel (ec->read_task);
+    ec->read_task = NULL;
+  }
+  if (NULL != ec->write_task)
+  {
+    GNUNET_SCHEDULER_cancel (ec->write_task);
+    ec->write_task = NULL;
+  }
+  if (NULL != ec->chld_stdin)
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_file_close (ec->chld_stdin));
+    ec->chld_stdin = NULL;
+  }
+  if (NULL != ec->chld_stdout)
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_DISK_file_close (ec->chld_stdout));
+    ec->chld_stdout = NULL;
+  }
+  GNUNET_free (ec->read_buf);
+  free (ec->write_buf);
+  GNUNET_free (ec);
+}
diff --git a/src/util/crypto.c b/src/util/crypto.c
index 974566dc0..4735af3b0 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -27,11 +27,6 @@
 #include <gcrypt.h>
 
 /**
- * Used in TALER_AgeCommitmentHash_isNullOrZero for comparison
- */
-const struct TALER_AgeCommitmentHash TALER_ZeroAgeCommitmentHash = {0};
-
-/**
  * Function called by libgcrypt on serious errors.
  * Prints an error message and aborts the process.
  *
@@ -90,7 +85,9 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info,
 #endif
 
   TALER_coin_pub_hash (&coin_public_info->coin_pub,
-                       &coin_public_info->h_age_commitment,
+                       coin_public_info->no_age_commitment
+                       ? NULL
+                       : &coin_public_info->h_age_commitment,
                        &c_hash);
 
   if (GNUNET_OK !=
@@ -217,7 +214,7 @@ TALER_planchet_secret_to_transfer_priv (
 void
 TALER_cs_withdraw_nonce_derive (
   const struct TALER_PlanchetMasterSecretP *ps,
-  struct TALER_CsNonce *nonce)
+  struct GNUNET_CRYPTO_CsSessionNonce *nonce)
 {
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CRYPTO_kdf (nonce,
@@ -235,7 +232,7 @@ void
 TALER_cs_refresh_nonce_derive (
   const struct TALER_RefreshMasterSecretP *rms,
   uint32_t coin_num_salt,
-  struct TALER_CsNonce *nonce)
+  struct GNUNET_CRYPTO_CsSessionNonce *nonce)
 {
   uint32_t be_salt = htonl (coin_num_salt);
 
@@ -244,7 +241,7 @@ TALER_cs_refresh_nonce_derive (
                                     sizeof (*nonce),
                                     &be_salt,
                                     sizeof (be_salt),
-                                    "refresh-n", // FIXME: value used in spec?
+                                    "refresh-n",
                                     strlen ("refresh-n"),
                                     rms,
                                     sizeof(*rms),
@@ -253,10 +250,31 @@ TALER_cs_refresh_nonce_derive (
 }
 
 
+void
+TALER_rsa_pub_hash (const struct GNUNET_CRYPTO_RsaPublicKey *rsa,
+                    struct TALER_RsaPubHashP *h_rsa)
+{
+  GNUNET_CRYPTO_rsa_public_key_hash (rsa,
+                                     &h_rsa->hash);
+
+}
+
+
+void
+TALER_cs_pub_hash (const struct GNUNET_CRYPTO_CsPublicKey *cs,
+                   struct TALER_CsPubHashP *h_cs)
+{
+  GNUNET_CRYPTO_hash (cs,
+                      sizeof(*cs),
+                      &h_cs->hash);
+}
+
+
 enum GNUNET_GenericReturnValue
 TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk,
                         const struct TALER_ExchangeWithdrawValues *alg_values,
-                        const union TALER_DenominationBlindingKeyP *bks,
+                        const union GNUNET_CRYPTO_BlindingSecretP *bks,
+                        const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
                         const struct TALER_CoinSpendPrivateKeyP *coin_priv,
                         const struct TALER_AgeCommitmentHash *ach,
                         struct TALER_CoinPubHashP *c_hash,
@@ -265,12 +283,14 @@ TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk,
 {
   struct TALER_CoinSpendPublicKeyP coin_pub;
 
-  GNUNET_assert (alg_values->cipher == dk->cipher);
+  GNUNET_assert (alg_values->blinding_inputs->cipher ==
+                 dk->bsign_pub_key->cipher);
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
                                       &coin_pub.eddsa_pub);
   if (GNUNET_OK !=
       TALER_denom_blind (dk,
                          bks,
+                         nonce,
                          ach,
                          &coin_pub,
                          alg_values,
@@ -297,15 +317,21 @@ enum GNUNET_GenericReturnValue
 TALER_planchet_to_coin (
   const struct TALER_DenominationPublicKey *dk,
   const struct TALER_BlindedDenominationSignature *blind_sig,
-  const union TALER_DenominationBlindingKeyP *bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   const struct TALER_AgeCommitmentHash *ach,
   const struct TALER_CoinPubHashP *c_hash,
   const struct TALER_ExchangeWithdrawValues *alg_values,
   struct TALER_FreshCoin *coin)
 {
-  if ( (dk->cipher != blind_sig->cipher) ||
-       (dk->cipher != alg_values->cipher) )
+  if (dk->bsign_pub_key->cipher !=
+      blind_sig->blinded_sig->cipher)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (dk->bsign_pub_key->cipher !=
+      alg_values->blinding_inputs->cipher)
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -426,24 +452,28 @@ TALER_coin_pub_hash (const struct TALER_CoinSpendPublicKeyP *coin_pub,
   {
     /* Coin comes with age commitment.  Take the hash of the age commitment
      * into account */
-    const size_t key_s = sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey);
-    const size_t age_s = sizeof(struct TALER_AgeCommitmentHash);
-    char data[key_s + age_s];
-
-    GNUNET_memcpy (&data[0],
-                   &coin_pub->eddsa_pub,
-                   key_s);
-    GNUNET_memcpy (&data[key_s],
-                   ach,
-                   age_s);
-    GNUNET_CRYPTO_hash (&data,
-                        key_s + age_s,
-                        &coin_h->hash);
+    struct GNUNET_HashContext *hash_context;
+
+    hash_context = GNUNET_CRYPTO_hash_context_start ();
+
+    GNUNET_CRYPTO_hash_context_read (
+      hash_context,
+      &coin_pub->eddsa_pub,
+      sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey));
+
+    GNUNET_CRYPTO_hash_context_read (
+      hash_context,
+      ach,
+      sizeof(struct TALER_AgeCommitmentHash));
+
+    GNUNET_CRYPTO_hash_context_finish (
+      hash_context,
+      &coin_h->hash);
   }
 }
 
 
-enum GNUNET_GenericReturnValue
+void
 TALER_coin_ev_hash (const struct TALER_BlindedPlanchet *blinded_planchet,
                     const struct TALER_DenominationHashP *denom_hash,
                     struct TALER_BlindedCoinHashP *bch)
@@ -458,7 +488,56 @@ TALER_coin_ev_hash (const struct TALER_BlindedPlanchet *blinded_planchet,
                                 hash_context);
   GNUNET_CRYPTO_hash_context_finish (hash_context,
                                      &bch->hash);
-  return GNUNET_OK;
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+/**
+ * Structure we hash to compute the group key for
+ * a denomination group.
+ */
+struct DenominationGroupP
+{
+  /**
+   * Value of coins in this denomination group.
+   */
+  struct TALER_AmountNBO value;
+
+  /**
+   * Fee structure for all coins in the group.
+   */
+  struct TALER_DenomFeeSetNBOP fees;
+
+  /**
+   * Age mask for the denomiation, in NBO.
+   */
+  uint32_t age_mask GNUNET_PACKED;
+
+  /**
+   * Cipher used for the denomination, in NBO.
+   */
+  uint32_t cipher GNUNET_PACKED;
+};
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_denomination_group_get_key (
+  const struct TALER_DenominationGroup *dg,
+  struct GNUNET_HashCode *key)
+{
+  struct DenominationGroupP dgp = {
+    .age_mask = htonl (dg->age_mask.bits),
+    .cipher = htonl (dg->cipher)
+  };
+
+  TALER_amount_hton (&dgp.value,
+                     &dg->value);
+  TALER_denom_fee_set_hton (&dgp.fees,
+                            &dg->fees);
+  GNUNET_CRYPTO_hash (&dgp,
+                      sizeof (dgp),
+                      key);
 }
 
 
diff --git a/src/util/crypto_confirmation.c b/src/util/crypto_confirmation.c
new file mode 100644
index 000000000..99552f150
--- /dev/null
+++ b/src/util/crypto_confirmation.c
@@ -0,0 +1,293 @@
+/*
+  This file is part of TALER
+  Copyright (C) 2023 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/>
+*/
+/**
+ * @file util/crypto_confirmation.c
+ * @brief confirmation computation
+ * @author Christian Grothoff
+ * @author Priscilla Huang
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include "taler_mhd_lib.h"
+#include <gnunet/gnunet_db_lib.h>
+#include <gcrypt.h>
+
+/**
+ * How long is a TOTP code valid?
+ */
+#define TOTP_VALIDITY_PERIOD GNUNET_TIME_relative_multiply ( \
+    GNUNET_TIME_UNIT_SECONDS, 30)
+
+/**
+ * Range of time we allow (plus-minus).
+ */
+#define TIME_INTERVAL_RANGE 2
+
+
+/**
+ * Compute TOTP code at current time with offset
+ * @a time_off for the @a key.
+ *
+ * @param ts current time
+ * @param time_off offset to apply when computing the code
+ * @param key pos_key in binary
+ * @param key_size number of bytes in @a key
+ */
+static uint64_t
+compute_totp (struct GNUNET_TIME_Timestamp ts,
+              int time_off,
+              const void *key,
+              size_t key_size)
+{
+  struct GNUNET_TIME_Absolute now;
+  time_t t;
+  uint64_t ctr;
+  uint8_t hmac[20]; /* SHA1: 20 bytes */
+
+  now = ts.abs_time;
+  while (time_off < 0)
+  {
+    now = GNUNET_TIME_absolute_subtract (now,
+                                         TOTP_VALIDITY_PERIOD);
+    time_off++;
+  }
+  while (time_off > 0)
+  {
+    now = GNUNET_TIME_absolute_add (now,
+                                    TOTP_VALIDITY_PERIOD);
+    time_off--;
+  }
+  t = now.abs_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+  ctr = GNUNET_htonll (t / 30LLU);
+
+  {
+    gcry_md_hd_t md;
+    const unsigned char *mc;
+
+    GNUNET_assert (GPG_ERR_NO_ERROR ==
+                   gcry_md_open (&md,
+                                 GCRY_MD_SHA1,
+                                 GCRY_MD_FLAG_HMAC));
+    GNUNET_assert (GPG_ERR_NO_ERROR ==
+                   gcry_md_setkey (md,
+                                   key,
+                                   key_size));
+    gcry_md_write (md,
+                   &ctr,
+                   sizeof (ctr));
+    mc = gcry_md_read (md,
+                       GCRY_MD_SHA1);
+    GNUNET_assert (NULL != mc);
+    GNUNET_memcpy (hmac,
+                   mc,
+                   sizeof (hmac));
+    gcry_md_close (md);
+  }
+
+  {
+    uint32_t code = 0;
+    int offset;
+
+    offset = hmac[sizeof (hmac) - 1] & 0x0f;
+    for (int count = 0; count < 4; count++)
+      code |= ((uint32_t) hmac[offset + 3 - count]) << (8 * count);
+    code &= 0x7fffffff;
+    /* always use 8 digits (maximum) */
+    code = code % 100000000;
+    return code;
+  }
+}
+
+
+int
+TALER_rfc3548_base32decode (const char *val,
+                            size_t val_size,
+                            void *key,
+                            size_t key_len)
+{
+  /**
+   * 32 characters for decoding, using RFC 3548.
+   */
+  static const char *decTable__ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+  unsigned char *udata = key;
+  unsigned int wpos = 0;
+  unsigned int rpos = 0;
+  unsigned int bits = 0;
+  unsigned int vbit = 0;
+
+  while ((rpos < val_size) || (vbit >= 8))
+  {
+    if ((rpos < val_size) && (vbit < 8))
+    {
+      char c = val[rpos++];
+
+      if (c == '=')
+      {
+        /* padding character */
+        if (rpos == val_size)
+          break; /* Ok, 1x '=' padding is allowed */
+        if ( ('=' == val[rpos]) &&
+             (rpos + 1 == val_size) )
+          break; /* Ok, 2x '=' padding is allowed */
+        return -1; /* invalid padding */
+      }
+      const char *p = strchr (decTable__, toupper (c));
+      if (! p)
+      {
+        /* invalid character */
+        return -1;
+      }
+      bits = (bits << 5) | (p - decTable__);
+      vbit += 5;
+    }
+    if (vbit >= 8)
+    {
+      udata[wpos++] = (bits >> (vbit - 8)) & 0xFF;
+      vbit -= 8;
+    }
+  }
+  return wpos;
+}
+
+
+/**
+ * @brief Builds POS confirmation to verify payment.
+ *
+ * @param h_key opaque key for the totp operation
+ * @param h_key_len size of h_key in bytes
+ * @param ts current time
+ * @return Token on success, NULL of failure
+ */
+static char *
+executive_totp (void *h_key,
+                size_t h_key_len,
+                struct GNUNET_TIME_Timestamp ts)
+{
+  uint64_t code; /* totp code */
+  char *ret;
+  ret = NULL;
+
+  for (int i = -TIME_INTERVAL_RANGE; i<= TIME_INTERVAL_RANGE; i++)
+  {
+    code = compute_totp (ts,
+                         i,
+                         h_key,
+                         h_key_len);
+    if (NULL == ret)
+    {
+      GNUNET_asprintf (&ret,
+                       "%08llu",
+                       (unsigned long long) code);
+    }
+    else
+    {
+      char *tmp;
+
+      GNUNET_asprintf (&tmp,
+                       "%s\n%08llu",
+                       ret,
+                       (unsigned long long) code);
+      GNUNET_free (ret);
+      ret = tmp;
+    }
+  }
+  return ret;
+
+}
+
+
+char *
+TALER_build_pos_confirmation (const char *pos_key,
+                              enum TALER_MerchantConfirmationAlgorithm pos_alg,
+                              const struct TALER_Amount *total,
+                              struct GNUNET_TIME_Timestamp ts)
+{
+  size_t pos_key_length = strlen (pos_key);
+  void *key; /* pos_key in binary */
+  size_t key_len; /* length of the key */
+  char *ret;
+  int dret;
+
+  if (TALER_MCA_NONE == pos_alg)
+    return NULL;
+  key_len = pos_key_length * 5 / 8;
+  key = GNUNET_malloc (key_len);
+  dret = TALER_rfc3548_base32decode (pos_key,
+                                     pos_key_length,
+                                     key,
+                                     key_len);
+  if (-1 == dret)
+  {
+    GNUNET_free (key);
+    GNUNET_break_op (0);
+    return NULL;
+  }
+  GNUNET_assert (dret <= key_len);
+  key_len = (size_t) dret;
+  switch (pos_alg)
+  {
+  case TALER_MCA_NONE:
+    GNUNET_break (0);
+    GNUNET_free (key);
+    return NULL;
+  case TALER_MCA_WITHOUT_PRICE: /* and 30s */
+    /* Return all T-OTP codes in range separated by new lines, e.g.
+       "12345678
+        24522552
+        25262425
+        42543525
+        25253552"
+    */
+    ret = executive_totp (key,
+                          key_len,
+                          ts);
+    GNUNET_free (key);
+    return ret;
+  case TALER_MCA_WITH_PRICE:
+    {
+      struct GNUNET_HashCode hkey;
+      struct TALER_AmountNBO ntotal;
+
+      if ( (NULL == total) ||
+           (GNUNET_YES !=
+            TALER_amount_is_valid (total) ) )
+      {
+        GNUNET_break_op (0);
+        return NULL;
+      }
+      TALER_amount_hton (&ntotal,
+                         total);
+      GNUNET_assert (GNUNET_YES ==
+                     GNUNET_CRYPTO_kdf (&hkey,
+                                        sizeof (hkey),
+                                        &ntotal,
+                                        sizeof (ntotal),
+                                        key,
+                                        key_len,
+                                        NULL,
+                                        0));
+      GNUNET_free (key);
+      ret = executive_totp (&hkey,
+                            sizeof(hkey),
+                            ts);
+      GNUNET_free (key);
+      return ret;
+    }
+  }
+  GNUNET_free (key);
+  GNUNET_break (0);
+  return NULL;
+}
diff --git a/src/util/crypto_contract.c b/src/util/crypto_contract.c
index fe6b1e6af..bec34c983 100644
--- a/src/util/crypto_contract.c
+++ b/src/util/crypto_contract.c
@@ -109,14 +109,14 @@ derive_key (const void *key_material,
  * @param[out] res_size size of the ciphertext
  */
 static void
-contract_encrypt (const struct NonceP *nonce,
-                  const void *key,
-                  size_t key_len,
-                  const void *data,
-                  size_t data_size,
-                  const char *salt,
-                  void **res,
-                  size_t *res_size)
+blob_encrypt (const struct NonceP *nonce,
+              const void *key,
+              size_t key_len,
+              const void *data,
+              size_t data_size,
+              const char *salt,
+              void **res,
+              size_t *res_size)
 {
   size_t ciphertext_size;
   struct SymKeyP skey;
@@ -127,10 +127,13 @@ contract_encrypt (const struct NonceP *nonce,
               salt,
               &skey);
   ciphertext_size = crypto_secretbox_NONCEBYTES
-                    + crypto_secretbox_MACBYTES + data_size;
+                    + crypto_secretbox_MACBYTES
+                    + data_size;
   *res_size = ciphertext_size;
   *res = GNUNET_malloc (ciphertext_size);
-  memcpy (*res, nonce, crypto_secretbox_NONCEBYTES);
+  GNUNET_memcpy (*res,
+                 nonce,
+                 crypto_secretbox_NONCEBYTES);
   GNUNET_assert (0 ==
                  crypto_secretbox_easy (*res + crypto_secretbox_NONCEBYTES,
                                         data,
@@ -153,13 +156,13 @@ contract_encrypt (const struct NonceP *nonce,
  * @return #GNUNET_OK on success
  */
 static enum GNUNET_GenericReturnValue
-contract_decrypt (const void *key,
-                  size_t key_len,
-                  const void *data,
-                  size_t data_size,
-                  const char *salt,
-                  void **res,
-                  size_t *res_size)
+blob_decrypt (const void *key,
+              size_t key_len,
+              const void *data,
+              size_t data_size,
+              const char *salt,
+              void **res,
+              size_t *res_size)
 {
   const struct NonceP *nonce;
   struct SymKeyP skey;
@@ -271,21 +274,21 @@ TALER_CRYPTO_contract_encrypt_for_merge (
   hdr->header.ctype = htonl (TALER_EXCHANGE_CONTRACT_PAYMENT_OFFER);
   hdr->header.clen = htonl ((uint32_t) clen);
   hdr->merge_priv = *merge_priv;
-  memcpy (&hdr[1],
-          xbuf,
-          cbuf_size);
+  GNUNET_memcpy (&hdr[1],
+                 xbuf,
+                 cbuf_size);
   GNUNET_free (xbuf);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &nonce,
                               sizeof (nonce));
-  contract_encrypt (&nonce,
-                    &key,
-                    sizeof (key),
-                    hdr,
-                    sizeof (*hdr) + cbuf_size,
-                    MERGE_SALT,
-                    econtract,
-                    econtract_size);
+  blob_encrypt (&nonce,
+                &key,
+                sizeof (key),
+                hdr,
+                sizeof (*hdr) + cbuf_size,
+                MERGE_SALT,
+                econtract,
+                econtract_size);
   GNUNET_free (hdr);
 }
 
@@ -316,13 +319,13 @@ TALER_CRYPTO_contract_decrypt_for_merge (
     return NULL;
   }
   if (GNUNET_OK !=
-      contract_decrypt (&key,
-                        sizeof (key),
-                        econtract,
-                        econtract_size,
-                        MERGE_SALT,
-                        &xhdr,
-                        &hdr_size))
+      blob_decrypt (&key,
+                    sizeof (key),
+                    econtract,
+                    econtract_size,
+                    MERGE_SALT,
+                    &xhdr,
+                    &hdr_size))
   {
     GNUNET_break_op (0);
     return NULL;
@@ -407,6 +410,7 @@ TALER_CRYPTO_contract_encrypt_for_deposit (
                                            &key));
   cstr = json_dumps (contract_terms,
                      JSON_COMPACT | JSON_SORT_KEYS);
+  GNUNET_assert (NULL != cstr);
   clen = strlen (cstr);
   cbuf_size = compressBound (clen);
   xbuf = GNUNET_malloc (cbuf_size);
@@ -419,30 +423,30 @@ TALER_CRYPTO_contract_encrypt_for_deposit (
   hdr = GNUNET_malloc (sizeof (*hdr) + cbuf_size);
   hdr->ctype = htonl (TALER_EXCHANGE_CONTRACT_PAYMENT_REQUEST);
   hdr->clen = htonl ((uint32_t) clen);
-  memcpy (&hdr[1],
-          xbuf,
-          cbuf_size);
+  GNUNET_memcpy (&hdr[1],
+                 xbuf,
+                 cbuf_size);
   GNUNET_free (xbuf);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
                               &nonce,
                               sizeof (nonce));
-  contract_encrypt (&nonce,
-                    &key,
-                    sizeof (key),
-                    hdr,
-                    sizeof (*hdr) + cbuf_size,
-                    DEPOSIT_SALT,
-                    &xecontract,
-                    &xecontract_size);
+  blob_encrypt (&nonce,
+                &key,
+                sizeof (key),
+                hdr,
+                sizeof (*hdr) + cbuf_size,
+                DEPOSIT_SALT,
+                &xecontract,
+                &xecontract_size);
   GNUNET_free (hdr);
   /* prepend purse_pub */
   *econtract = GNUNET_malloc (xecontract_size + sizeof (*purse_pub));
-  memcpy (*econtract,
-          purse_pub,
-          sizeof (*purse_pub));
-  memcpy (sizeof (*purse_pub) + *econtract,
-          xecontract,
-          xecontract_size);
+  GNUNET_memcpy (*econtract,
+                 purse_pub,
+                 sizeof (*purse_pub));
+  GNUNET_memcpy (sizeof (*purse_pub) + *econtract,
+                 xecontract,
+                 xecontract_size);
   *econtract_size = xecontract_size + sizeof (*purse_pub);
   GNUNET_free (xecontract);
 }
@@ -481,13 +485,13 @@ TALER_CRYPTO_contract_decrypt_for_deposit (
   econtract += sizeof (*purse_pub);
   econtract_size -= sizeof (*purse_pub);
   if (GNUNET_OK !=
-      contract_decrypt (&key,
-                        sizeof (key),
-                        econtract,
-                        econtract_size,
-                        DEPOSIT_SALT,
-                        &xhdr,
-                        &hdr_size))
+      blob_decrypt (&key,
+                    sizeof (key),
+                    econtract,
+                    econtract_size,
+                    DEPOSIT_SALT,
+                    &xhdr,
+                    &hdr_size))
   {
     GNUNET_break_op (0);
     return NULL;
@@ -538,3 +542,120 @@ TALER_CRYPTO_contract_decrypt_for_deposit (
   GNUNET_free (cstr);
   return ret;
 }
+
+
+/**
+ * Salt we use when encrypting KYC attributes.
+ */
+#define ATTRIBUTE_SALT "kyc-attributes"
+
+
+void
+TALER_CRYPTO_kyc_attributes_encrypt (
+  const struct TALER_AttributeEncryptionKeyP *key,
+  const json_t *attr,
+  void **enc_attr,
+  size_t *enc_attr_size)
+{
+  uLongf cbuf_size;
+  char *cstr;
+  uLongf clen;
+  void *xbuf;
+  int ret;
+  uint32_t belen;
+  struct NonceP nonce;
+
+  cstr = json_dumps (attr,
+                     JSON_COMPACT | JSON_SORT_KEYS);
+  GNUNET_assert (NULL != cstr);
+  clen = strlen (cstr);
+  GNUNET_assert (clen <= UINT32_MAX);
+  cbuf_size = compressBound (clen);
+  xbuf = GNUNET_malloc (cbuf_size + sizeof (uint32_t));
+  belen = htonl ((uint32_t) clen);
+  GNUNET_memcpy (xbuf,
+                 &belen,
+                 sizeof (belen));
+  ret = compress (xbuf + 4,
+                  &cbuf_size,
+                  (const Bytef *) cstr,
+                  clen);
+  GNUNET_assert (Z_OK == ret);
+  free (cstr);
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                              &nonce,
+                              sizeof (nonce));
+  blob_encrypt (&nonce,
+                key,
+                sizeof (*key),
+                xbuf,
+                cbuf_size + sizeof (uint32_t),
+                ATTRIBUTE_SALT,
+                enc_attr,
+                enc_attr_size);
+  GNUNET_free (xbuf);
+}
+
+
+json_t *
+TALER_CRYPTO_kyc_attributes_decrypt (
+  const struct TALER_AttributeEncryptionKeyP *key,
+  const void *enc_attr,
+  size_t enc_attr_size)
+{
+  void *xhdr;
+  size_t hdr_size;
+  char *cstr;
+  uLongf clen;
+  json_error_t json_error;
+  json_t *ret;
+  uint32_t belen;
+
+  if (GNUNET_OK !=
+      blob_decrypt (key,
+                    sizeof (*key),
+                    enc_attr,
+                    enc_attr_size,
+                    ATTRIBUTE_SALT,
+                    &xhdr,
+                    &hdr_size))
+  {
+    GNUNET_break_op (0);
+    return NULL;
+  }
+  GNUNET_memcpy (&belen,
+                 xhdr,
+                 sizeof (belen));
+  clen = ntohl (belen);
+  if (clen >= GNUNET_MAX_MALLOC_CHECKED)
+  {
+    GNUNET_break_op (0);
+    GNUNET_free (xhdr);
+    return NULL;
+  }
+  cstr = GNUNET_malloc (clen + 1);
+  if (Z_OK !=
+      uncompress ((Bytef *) cstr,
+                  &clen,
+                  (const Bytef *) (xhdr + sizeof (uint32_t)),
+                  hdr_size - sizeof (uint32_t)))
+  {
+    GNUNET_break_op (0);
+    GNUNET_free (cstr);
+    GNUNET_free (xhdr);
+    return NULL;
+  }
+  GNUNET_free (xhdr);
+  ret = json_loadb ((char *) cstr,
+                    clen,
+                    JSON_DECODE_ANY,
+                    &json_error);
+  if (NULL == ret)
+  {
+    GNUNET_break_op (0);
+    GNUNET_free (cstr);
+    return NULL;
+  }
+  GNUNET_free (cstr);
+  return ret;
+}
diff --git a/src/util/crypto_helper_cs.c b/src/util/crypto_helper_cs.c
index e12d5ad61..4c4a56feb 100644
--- a/src/util/crypto_helper_cs.c
+++ b/src/util/crypto_helper_cs.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020, 2021 Taler Systems SA
+  Copyright (C) 2020, 2021, 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
@@ -113,21 +113,27 @@ try_connect (struct TALER_CRYPTO_CsDenominationHelper *dh)
 struct TALER_CRYPTO_CsDenominationHelper *
 TALER_CRYPTO_helper_cs_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_CsDenominationKeyStatusCallback dkc,
   void *dkc_cls)
 {
   struct TALER_CRYPTO_CsDenominationHelper *dh;
   char *unixpath;
+  char *secname;
 
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-cs",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-cs",
+                                               secname,
                                                "UNIXPATH",
                                                &unixpath))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "UNIXPATH");
+    GNUNET_free (secname);
     return NULL;
   }
   /* we use >= here because we want the sun_path to always
@@ -135,12 +141,14 @@ TALER_CRYPTO_helper_cs_connect (
   if (strlen (unixpath) >= sizeof (dh->sa.sun_path))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "UNIXPATH",
                                "path too long");
     GNUNET_free (unixpath);
+    GNUNET_free (secname);
     return NULL;
   }
+  GNUNET_free (secname);
   dh = GNUNET_new (struct TALER_CRYPTO_CsDenominationHelper);
   dh->dkc = dkc;
   dh->dkc_cls = dkc_cls;
@@ -201,13 +209,18 @@ handle_mt_avail (struct TALER_CRYPTO_CsDenominationHelper *dh,
   }
 
   {
-    struct TALER_DenominationPublicKey denom_pub;
+    struct GNUNET_CRYPTO_BlindSignPublicKey *bsign_pub;
     struct TALER_CsPubHashP h_cs;
 
-    denom_pub.cipher = TALER_DENOMINATION_CS;
-    denom_pub.details.cs_public_key = kan->denom_pub;
+    bsign_pub = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+    bsign_pub->cipher = GNUNET_CRYPTO_BSA_CS;
+    bsign_pub->rc = 1;
+    bsign_pub->details.cs_public_key = kan->denom_pub;
 
-    TALER_cs_pub_hash (&denom_pub.details.cs_public_key, &h_cs);
+    GNUNET_CRYPTO_hash (&bsign_pub->details.cs_public_key,
+                        sizeof (bsign_pub->details.cs_public_key),
+                        &bsign_pub->pub_key_hash);
+    h_cs.hash = bsign_pub->pub_key_hash;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Received CS key %s (%s)\n",
                 GNUNET_h2s (&h_cs.hash),
@@ -222,7 +235,7 @@ handle_mt_avail (struct TALER_CRYPTO_CsDenominationHelper *dh,
           &kan->secm_sig))
     {
       GNUNET_break_op (0);
-      TALER_denom_pub_free (&denom_pub);
+      GNUNET_CRYPTO_blind_sign_pub_decref (bsign_pub);
       return GNUNET_SYSERR;
     }
     dh->dkc (dh->dkc_cls,
@@ -230,10 +243,10 @@ handle_mt_avail (struct TALER_CRYPTO_CsDenominationHelper *dh,
              GNUNET_TIME_timestamp_ntoh (kan->anchor_time),
              GNUNET_TIME_relative_ntoh (kan->duration_withdraw),
              &h_cs,
-             &denom_pub,
+             bsign_pub,
              &kan->secm_pub,
              &kan->secm_sig);
-    TALER_denom_pub_free (&denom_pub);
+    GNUNET_CRYPTO_blind_sign_pub_decref (bsign_pub);
   }
   return GNUNET_OK;
 }
@@ -378,34 +391,19 @@ more:
 }
 
 
-/**
- * Request helper @a dh to sign @a msg using the public key corresponding to
- * @a h_denom_pub.
- *
- * This operation will block until the signature has been obtained.  Should
- * this process receive a signal (that is not ignored) while the operation is
- * pending, the operation will fail.  Note that the helper may still believe
- * that it created the signature. Thus, signals may result in a small
- * differences in the signature counters.  Retrying in this case may work.
- *
- * @param dh helper process connection
- * @param h_cs hash of the CS public key to use to sign
- * @param blinded_planchet blinded planchet containing c and nonce
- * @param for_melt true if the HKDF for melt should be used
- * @param[out] bs set to the blind signature
- * @return #TALER_EC_NONE on success
- */
-static enum TALER_ErrorCode
-helper_cs_sign (
+enum TALER_ErrorCode
+TALER_CRYPTO_helper_cs_sign (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_BlindedCsPlanchet *blinded_planchet,
+  const struct TALER_CRYPTO_CsSignRequest *req,
   bool for_melt,
   struct TALER_BlindedDenominationSignature *bs)
 {
   enum TALER_ErrorCode ec = TALER_EC_INVALID;
+  const struct TALER_CsPubHashP *h_cs = req->h_cs;
 
-  bs->cipher = TALER_DENOMINATION_INVALID;
+  memset (bs,
+          0,
+          sizeof (*bs));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting signature process\n");
   if (GNUNET_OK !=
@@ -419,15 +417,15 @@ helper_cs_sign (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Requesting signature\n");
   {
-    char buf[sizeof (struct TALER_CRYPTO_CsSignRequest)];
-    struct TALER_CRYPTO_CsSignRequest *sr
-      = (struct TALER_CRYPTO_CsSignRequest *) buf;
+    char buf[sizeof (struct TALER_CRYPTO_CsSignRequestMessage)];
+    struct TALER_CRYPTO_CsSignRequestMessage *sr
+      = (struct TALER_CRYPTO_CsSignRequestMessage *) buf;
 
     sr->header.size = htons (sizeof (buf));
     sr->header.type = htons (TALER_HELPER_CS_MT_REQ_SIGN);
     sr->for_melt = htonl (for_melt ? 1 : 0);
     sr->h_cs = *h_cs;
-    sr->planchet = *blinded_planchet;
+    sr->message = *req->blinded_planchet;
     if (GNUNET_OK !=
         TALER_crypto_helper_send_all (dh->sock,
                                       buf,
@@ -493,7 +491,7 @@ more:
       switch (ntohs (hdr->type))
       {
       case TALER_HELPER_CS_MT_RES_SIGNATURE:
-        if (msize < sizeof (struct TALER_CRYPTO_SignResponse))
+        if (msize != sizeof (struct TALER_CRYPTO_SignResponse))
         {
           GNUNET_break_op (0);
           do_disconnect (dh);
@@ -510,13 +508,18 @@ more:
         {
           const struct TALER_CRYPTO_SignResponse *sr =
             (const struct TALER_CRYPTO_SignResponse *) buf;
+          struct GNUNET_CRYPTO_BlindedSignature *blinded_sig;
 
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "Received signature\n");
           ec = TALER_EC_NONE;
           finished = true;
-          bs->cipher = TALER_DENOMINATION_CS;
-          bs->details.blinded_cs_answer = sr->cs_answer;
+          blinded_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+          blinded_sig->cipher = GNUNET_CRYPTO_BSA_CS;
+          blinded_sig->rc = 1;
+          blinded_sig->details.blinded_cs_answer.b = ntohl (sr->b);
+          blinded_sig->details.blinded_cs_answer.s_scalar = sr->cs_answer;
+          bs->blinded_sig = blinded_sig;
           break;
         }
       case TALER_HELPER_CS_MT_RES_SIGN_FAILURE:
@@ -533,7 +536,8 @@ more:
 
           ec = (enum TALER_ErrorCode) ntohl (sf->ec);
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Signing failed!\n");
+                      "Signing failed with status %d!\n",
+                      ec);
           finished = true;
           break;
         }
@@ -591,36 +595,6 @@ end:
 }
 
 
-enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_sign_melt (
-  struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_BlindedCsPlanchet *blinded_planchet,
-  struct TALER_BlindedDenominationSignature *bs)
-{
-  return helper_cs_sign (dh,
-                         h_cs,
-                         blinded_planchet,
-                         true,
-                         bs);
-}
-
-
-enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_sign_withdraw (
-  struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_BlindedCsPlanchet *blinded_planchet,
-  struct TALER_BlindedDenominationSignature *bs)
-{
-  return helper_cs_sign (dh,
-                         h_cs,
-                         blinded_planchet,
-                         false,
-                         bs);
-}
-
-
 void
 TALER_CRYPTO_helper_cs_revoke (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
@@ -651,31 +625,15 @@ TALER_CRYPTO_helper_cs_revoke (
 }
 
 
-/**
- * Ask the helper to derive R using the @a nonce and denomination key
- * associated with @a h_cs.
- *
- * This operation will block until the R has been obtained.  Should
- * this process receive a signal (that is not ignored) while the operation is
- * pending, the operation will fail.  Note that the helper may still believe
- * that it created the signature. Thus, signals may result in a small
- * differences in the signature counters.  Retrying in this case may work.
- *
- * @param dh helper to process connection
- * @param h_cs hash of the CS public key to revoke
- * @param nonce witdhraw nonce
- * @param for_melt true if the HKDF for melt should be used
- * @param[out] crp set to the pair of R values
- * @return set to the error code (or #TALER_EC_NONE on success)
- */
-static enum TALER_ErrorCode
-helper_cs_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh,
-                    const struct TALER_CsPubHashP *h_cs,
-                    const struct TALER_CsNonce *nonce,
-                    bool for_melt,
-                    struct TALER_DenominationCSPublicRPairP *crp)
+enum TALER_ErrorCode
+TALER_CRYPTO_helper_cs_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh,
+                                 const struct TALER_CRYPTO_CsDeriveRequest *cdr,
+                                 bool for_melt,
+                                 struct GNUNET_CRYPTO_CSPublicRPairP *crp)
 {
   enum TALER_ErrorCode ec = TALER_EC_INVALID;
+  const struct TALER_CsPubHashP *h_cs = cdr->h_cs;
+  const struct GNUNET_CRYPTO_CsSessionNonce *nonce = cdr->nonce;
 
   memset (crp,
           0,
@@ -853,32 +811,495 @@ more:
 
 
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_r_derive_withdraw (
+TALER_CRYPTO_helper_cs_batch_sign (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *crp)
+  unsigned int reqs_length,
+  const struct TALER_CRYPTO_CsSignRequest reqs[static reqs_length],
+  bool for_melt,
+  struct TALER_BlindedDenominationSignature bss[static reqs_length])
 {
-  return helper_cs_r_derive (dh,
-                             h_cs,
-                             nonce,
-                             false,
-                             crp);
+  enum TALER_ErrorCode ec = TALER_EC_INVALID;
+  unsigned int rpos;
+  unsigned int rend;
+  unsigned int wpos;
+
+  memset (bss,
+          0,
+          sizeof (*bss) * reqs_length);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting signature process\n");
+  if (GNUNET_OK !=
+      try_connect (dh))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to helper\n");
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting %u signatures\n",
+              reqs_length);
+  rpos = 0;
+  rend = 0;
+  wpos = 0;
+  while (rpos < reqs_length)
+  {
+    unsigned int mlen = sizeof (struct TALER_CRYPTO_BatchSignRequest);
+
+    while ( (rend < reqs_length) &&
+            (mlen + sizeof (struct TALER_CRYPTO_CsSignRequestMessage)
+             < UINT16_MAX) )
+    {
+      mlen += sizeof (struct TALER_CRYPTO_CsSignRequestMessage);
+      rend++;
+    }
+    {
+      char obuf[mlen] GNUNET_ALIGN;
+      struct TALER_CRYPTO_BatchSignRequest *bsr
+        = (struct TALER_CRYPTO_BatchSignRequest *) obuf;
+      void *wbuf;
+
+      bsr->header.type = htons (TALER_HELPER_CS_MT_REQ_BATCH_SIGN);
+      bsr->header.size = htons (mlen);
+      bsr->batch_size = htonl (rend - rpos);
+      wbuf = &bsr[1];
+      for (unsigned int i = rpos; i<rend; i++)
+      {
+        struct TALER_CRYPTO_CsSignRequestMessage *csm = wbuf;
+        const struct TALER_CRYPTO_CsSignRequest *csr = &reqs[i];
+
+        csm->header.size = htons (sizeof (*csm));
+        csm->header.type = htons (TALER_HELPER_CS_MT_REQ_SIGN);
+        csm->for_melt = htonl (for_melt ? 1 : 0);
+        csm->h_cs = *csr->h_cs;
+        csm->message = *csr->blinded_planchet;
+        wbuf += sizeof (*csm);
+      }
+      GNUNET_assert (wbuf == &obuf[mlen]);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Sending batch request [%u-%u)\n",
+                  rpos,
+                  rend);
+      if (GNUNET_OK !=
+          TALER_crypto_helper_send_all (dh->sock,
+                                        obuf,
+                                        sizeof (obuf)))
+      {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "send");
+        do_disconnect (dh);
+        return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+      }
+    } /* end of obuf scope */
+    rpos = rend;
+    {
+      char buf[UINT16_MAX];
+      size_t off = 0;
+      const struct GNUNET_MessageHeader *hdr
+        = (const struct GNUNET_MessageHeader *) buf;
+      bool finished = false;
+
+      while (1)
+      {
+        uint16_t msize;
+        ssize_t ret;
+
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Awaiting reply at %u (up to %u)\n",
+                    wpos,
+                    rend);
+        ret = recv (dh->sock,
+                    &buf[off],
+                    sizeof (buf) - off,
+                    (finished && (0 == off))
+                  ? MSG_DONTWAIT
+                  : 0);
+        if (ret < 0)
+        {
+          if (EINTR == errno)
+            continue;
+          if (EAGAIN == errno)
+          {
+            GNUNET_assert (finished);
+            GNUNET_assert (0 == off);
+            break;
+          }
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                               "recv");
+          do_disconnect (dh);
+          return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+        }
+        if (0 == ret)
+        {
+          GNUNET_break (0 == off);
+          if (! finished)
+            return TALER_EC_EXCHANGE_SIGNKEY_HELPER_BUG;
+          if (TALER_EC_NONE == ec)
+            break;
+          return ec;
+        }
+        off += ret;
+more:
+        if (off < sizeof (struct GNUNET_MessageHeader))
+          continue;
+        msize = ntohs (hdr->size);
+        if (off < msize)
+          continue;
+        switch (ntohs (hdr->type))
+        {
+        case TALER_HELPER_CS_MT_RES_SIGNATURE:
+          if (msize != sizeof (struct TALER_CRYPTO_SignResponse))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          if (finished)
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_SignResponse *sr =
+              (const struct TALER_CRYPTO_SignResponse *) buf;
+            struct GNUNET_CRYPTO_BlindedSignature *blinded_sig;
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Received %u signature\n",
+                        wpos);
+            blinded_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+            blinded_sig->cipher = GNUNET_CRYPTO_BSA_CS;
+            blinded_sig->rc = 1;
+            blinded_sig->details.blinded_cs_answer.b = ntohl (sr->b);
+            blinded_sig->details.blinded_cs_answer.s_scalar = sr->cs_answer;
+
+            bss[wpos].blinded_sig = blinded_sig;
+            wpos++;
+            if (wpos == rend)
+            {
+              if (TALER_EC_INVALID == ec)
+                ec = TALER_EC_NONE;
+              finished = true;
+            }
+            break;
+          }
+
+        case TALER_HELPER_CS_MT_RES_SIGN_FAILURE:
+          if (msize != sizeof (struct TALER_CRYPTO_SignFailure))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_SignFailure *sf =
+              (const struct TALER_CRYPTO_SignFailure *) buf;
+
+            ec = (enum TALER_ErrorCode) ntohl (sf->ec);
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Signing %u failed with status %d!\n",
+                        wpos,
+                        ec);
+            wpos++;
+            if (wpos == rend)
+            {
+              finished = true;
+            }
+            break;
+          }
+        case TALER_HELPER_CS_MT_AVAIL:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received new key!\n");
+          if (GNUNET_OK !=
+              handle_mt_avail (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_CS_MT_PURGE:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received revocation!\n");
+          if (GNUNET_OK !=
+              handle_mt_purge (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_CS_SYNCED:
+          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                      "Synchronized add odd time with CS helper!\n");
+          dh->synced = true;
+          break;
+        default:
+          GNUNET_break_op (0);
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Received unexpected message of type %u\n",
+                      ntohs (hdr->type));
+          do_disconnect (dh);
+          return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+        }
+        memmove (buf,
+                 &buf[msize],
+                 off - msize);
+        off -= msize;
+        goto more;
+      } /* while(1) */
+    } /* scope */
+  } /* while (rpos < cdrs_length) */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Existing with %u signatures and status %d\n",
+              wpos,
+              ec);
+  return ec;
 }
 
 
 enum TALER_ErrorCode
-TALER_CRYPTO_helper_cs_r_derive_melt (
+TALER_CRYPTO_helper_cs_r_batch_derive (
   struct TALER_CRYPTO_CsDenominationHelper *dh,
-  const struct TALER_CsPubHashP *h_cs,
-  const struct TALER_CsNonce *nonce,
-  struct TALER_DenominationCSPublicRPairP *crp)
+  unsigned int cdrs_length,
+  const struct TALER_CRYPTO_CsDeriveRequest cdrs[static cdrs_length],
+  bool for_melt,
+  struct GNUNET_CRYPTO_CSPublicRPairP crps[static cdrs_length])
 {
-  return helper_cs_r_derive (dh,
-                             h_cs,
-                             nonce,
-                             true,
-                             crp);
+  enum TALER_ErrorCode ec = TALER_EC_INVALID;
+  unsigned int rpos;
+  unsigned int rend;
+  unsigned int wpos;
+
+  memset (crps,
+          0,
+          sizeof (*crps) * cdrs_length);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting R derivation process\n");
+  if (GNUNET_OK !=
+      try_connect (dh))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to helper\n");
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting %u R pairs\n",
+              cdrs_length);
+  rpos = 0;
+  rend = 0;
+  wpos = 0;
+  while (rpos < cdrs_length)
+  {
+    unsigned int mlen = sizeof (struct TALER_CRYPTO_BatchDeriveRequest);
+
+    while ( (rend < cdrs_length) &&
+            (mlen + sizeof (struct TALER_CRYPTO_CsRDeriveRequest)
+             < UINT16_MAX) )
+    {
+      mlen += sizeof (struct TALER_CRYPTO_CsRDeriveRequest);
+      rend++;
+    }
+    {
+      char obuf[mlen] GNUNET_ALIGN;
+      struct TALER_CRYPTO_BatchDeriveRequest *bdr
+        = (struct TALER_CRYPTO_BatchDeriveRequest *) obuf;
+      void *wbuf;
+
+      bdr->header.type = htons (TALER_HELPER_CS_MT_REQ_BATCH_RDERIVE);
+      bdr->header.size = htons (mlen);
+      bdr->batch_size = htonl (rend - rpos);
+      wbuf = &bdr[1];
+      for (unsigned int i = rpos; i<rend; i++)
+      {
+        struct TALER_CRYPTO_CsRDeriveRequest *rdr = wbuf;
+        const struct TALER_CRYPTO_CsDeriveRequest *cdr = &cdrs[i];
+
+        rdr->header.size = htons (sizeof (*rdr));
+        rdr->header.type = htons (TALER_HELPER_CS_MT_REQ_RDERIVE);
+        rdr->for_melt = htonl (for_melt ? 1 : 0);
+        rdr->h_cs = *cdr->h_cs;
+        rdr->nonce = *cdr->nonce;
+        wbuf += sizeof (*rdr);
+      }
+      GNUNET_assert (wbuf == &obuf[mlen]);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Sending batch request [%u-%u)\n",
+                  rpos,
+                  rend);
+      if (GNUNET_OK !=
+          TALER_crypto_helper_send_all (dh->sock,
+                                        obuf,
+                                        sizeof (obuf)))
+      {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "send");
+        do_disconnect (dh);
+        return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+      }
+    } /* end of obuf scope */
+    rpos = rend;
+    {
+      char buf[UINT16_MAX];
+      size_t off = 0;
+      const struct GNUNET_MessageHeader *hdr
+        = (const struct GNUNET_MessageHeader *) buf;
+      bool finished = false;
+
+      while (1)
+      {
+        uint16_t msize;
+        ssize_t ret;
+
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Awaiting reply at %u (up to %u)\n",
+                    wpos,
+                    rend);
+        ret = recv (dh->sock,
+                    &buf[off],
+                    sizeof (buf) - off,
+                    (finished && (0 == off))
+                  ? MSG_DONTWAIT
+                  : 0);
+        if (ret < 0)
+        {
+          if (EINTR == errno)
+            continue;
+          if (EAGAIN == errno)
+          {
+            GNUNET_assert (finished);
+            GNUNET_assert (0 == off);
+            break;
+          }
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                               "recv");
+          do_disconnect (dh);
+          return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+        }
+        if (0 == ret)
+        {
+          GNUNET_break (0 == off);
+          if (! finished)
+            return TALER_EC_EXCHANGE_SIGNKEY_HELPER_BUG;
+          if (TALER_EC_NONE == ec)
+            break;
+          return ec;
+        }
+        off += ret;
+more:
+        if (off < sizeof (struct GNUNET_MessageHeader))
+          continue;
+        msize = ntohs (hdr->size);
+        if (off < msize)
+          continue;
+        switch (ntohs (hdr->type))
+        {
+        case TALER_HELPER_CS_MT_RES_RDERIVE:
+          if (msize != sizeof (struct TALER_CRYPTO_RDeriveResponse))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          if (finished)
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_RDeriveResponse *rdr =
+              (const struct TALER_CRYPTO_RDeriveResponse *) buf;
+
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Received %u R pair\n",
+                        wpos);
+            crps[wpos] = rdr->r_pub;
+            wpos++;
+            if (wpos == rend)
+            {
+              if (TALER_EC_INVALID == ec)
+                ec = TALER_EC_NONE;
+              finished = true;
+            }
+            break;
+          }
+        case TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE:
+          if (msize != sizeof (struct TALER_CRYPTO_RDeriveFailure))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_RDeriveFailure *rdf =
+              (const struct TALER_CRYPTO_RDeriveFailure *) buf;
+
+            ec = (enum TALER_ErrorCode) ntohl (rdf->ec);
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "R derivation %u failed with status %d!\n",
+                        wpos,
+                        ec);
+            wpos++;
+            if (wpos == rend)
+            {
+              finished = true;
+            }
+            break;
+          }
+        case TALER_HELPER_CS_MT_AVAIL:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received new key!\n");
+          if (GNUNET_OK !=
+              handle_mt_avail (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_CS_MT_PURGE:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received revocation!\n");
+          if (GNUNET_OK !=
+              handle_mt_purge (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_CS_SYNCED:
+          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                      "Synchronized add odd time with CS helper!\n");
+          dh->synced = true;
+          break;
+        default:
+          GNUNET_break_op (0);
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Received unexpected message of type %u\n",
+                      ntohs (hdr->type));
+          do_disconnect (dh);
+          return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+        }
+        memmove (buf,
+                 &buf[msize],
+                 off - msize);
+        off -= msize;
+        goto more;
+      } /* while(1) */
+    } /* scope */
+  } /* while (rpos < cdrs_length) */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Existing with %u signatures and status %d\n",
+              wpos,
+              ec);
+  return ec;
 }
 
 
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index 5a9ad74e2..e044d31d1 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -111,21 +111,28 @@ try_connect (struct TALER_CRYPTO_ExchangeSignHelper *esh)
 struct TALER_CRYPTO_ExchangeSignHelper *
 TALER_CRYPTO_helper_esign_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_ExchangeKeyStatusCallback ekc,
   void *ekc_cls)
 {
   struct TALER_CRYPTO_ExchangeSignHelper *esh;
   char *unixpath;
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-eddsa",
+                   section);
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-eddsa",
+                                               secname,
                                                "UNIXPATH",
                                                &unixpath))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "UNIXPATH");
+    GNUNET_free (secname);
     return NULL;
   }
   /* we use >= here because we want the sun_path to always
@@ -133,12 +140,14 @@ TALER_CRYPTO_helper_esign_connect (
   if (strlen (unixpath) >= sizeof (esh->sa.sun_path))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "UNIXPATH",
                                "path too long");
     GNUNET_free (unixpath);
+    GNUNET_free (secname);
     return NULL;
   }
+  GNUNET_free (secname);
   esh = GNUNET_new (struct TALER_CRYPTO_ExchangeSignHelper);
   esh->ekc = ekc;
   esh->ekc_cls = ekc_cls;
@@ -357,9 +366,9 @@ TALER_CRYPTO_helper_esign_sign_ (
     sr->header.size = htons (sizeof (buf));
     sr->header.type = htons (TALER_HELPER_EDDSA_MT_REQ_SIGN);
     sr->reserved = htonl (0);
-    memcpy (&sr->purpose,
-            purpose,
-            purpose_size);
+    GNUNET_memcpy (&sr->purpose,
+                   purpose,
+                   purpose_size);
     if (GNUNET_OK !=
         TALER_crypto_helper_send_all (esh->sock,
                                       buf,
diff --git a/src/util/crypto_helper_rsa.c b/src/util/crypto_helper_rsa.c
index d3f498c07..e23e12a88 100644
--- a/src/util/crypto_helper_rsa.c
+++ b/src/util/crypto_helper_rsa.c
@@ -113,21 +113,28 @@ try_connect (struct TALER_CRYPTO_RsaDenominationHelper *dh)
 struct TALER_CRYPTO_RsaDenominationHelper *
 TALER_CRYPTO_helper_rsa_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
   TALER_CRYPTO_RsaDenominationKeyStatusCallback dkc,
   void *dkc_cls)
 {
   struct TALER_CRYPTO_RsaDenominationHelper *dh;
   char *unixpath;
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-rsa",
+                   section);
 
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-rsa",
+                                               secname,
                                                "UNIXPATH",
                                                &unixpath))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               secname,
                                "UNIXPATH");
+    GNUNET_free (secname);
     return NULL;
   }
   /* we use >= here because we want the sun_path to always
@@ -135,12 +142,14 @@ TALER_CRYPTO_helper_rsa_connect (
   if (strlen (unixpath) >= sizeof (dh->sa.sun_path))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               secname,
                                "UNIXPATH",
                                "path too long");
     GNUNET_free (unixpath);
+    GNUNET_free (secname);
     return NULL;
   }
+  GNUNET_free (secname);
   dh = GNUNET_new (struct TALER_CRYPTO_RsaDenominationHelper);
   dh->dkc = dkc;
   dh->dkc_cls = dkc_cls;
@@ -203,23 +212,27 @@ handle_mt_avail (struct TALER_CRYPTO_RsaDenominationHelper *dh,
   }
 
   {
-    struct TALER_DenominationPublicKey denom_pub;
+    struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub;
     struct TALER_RsaPubHashP h_rsa;
 
-    denom_pub.cipher = TALER_DENOMINATION_RSA;
-    denom_pub.details.rsa_public_key
+    bs_pub = GNUNET_new (struct GNUNET_CRYPTO_BlindSignPublicKey);
+    bs_pub->cipher = GNUNET_CRYPTO_BSA_RSA;
+    bs_pub->details.rsa_public_key
       = GNUNET_CRYPTO_rsa_public_key_decode (buf,
                                              ntohs (kan->pub_size));
-    if (NULL == denom_pub.details.rsa_public_key)
+    if (NULL == bs_pub->details.rsa_public_key)
     {
       GNUNET_break_op (0);
+      GNUNET_free (bs_pub);
       return GNUNET_SYSERR;
     }
-    GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.details.rsa_public_key,
-                                       &h_rsa.hash);
+    bs_pub->rc = 1;
+    GNUNET_CRYPTO_rsa_public_key_hash (bs_pub->details.rsa_public_key,
+                                       &bs_pub->pub_key_hash);
+    h_rsa.hash = bs_pub->pub_key_hash;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Received RSA key %s (%s)\n",
-                GNUNET_h2s (&h_rsa.hash),
+                GNUNET_h2s (&bs_pub->pub_key_hash),
                 section_name);
     if (GNUNET_OK !=
         TALER_exchange_secmod_rsa_verify (
@@ -231,7 +244,7 @@ handle_mt_avail (struct TALER_CRYPTO_RsaDenominationHelper *dh,
           &kan->secm_sig))
     {
       GNUNET_break_op (0);
-      TALER_denom_pub_free (&denom_pub);
+      GNUNET_CRYPTO_blind_sign_pub_decref (bs_pub);
       return GNUNET_SYSERR;
     }
     dh->dkc (dh->dkc_cls,
@@ -239,10 +252,10 @@ handle_mt_avail (struct TALER_CRYPTO_RsaDenominationHelper *dh,
              GNUNET_TIME_timestamp_ntoh (kan->anchor_time),
              GNUNET_TIME_relative_ntoh (kan->duration_withdraw),
              &h_rsa,
-             &denom_pub,
+             bs_pub,
              &kan->secm_pub,
              &kan->secm_sig);
-    TALER_denom_pub_free (&denom_pub);
+    GNUNET_CRYPTO_blind_sign_pub_decref (bs_pub);
   }
   return GNUNET_OK;
 }
@@ -390,14 +403,14 @@ more:
 enum TALER_ErrorCode
 TALER_CRYPTO_helper_rsa_sign (
   struct TALER_CRYPTO_RsaDenominationHelper *dh,
-  const struct TALER_RsaPubHashP *h_rsa,
-  const void *msg,
-  size_t msg_size,
+  const struct TALER_CRYPTO_RsaSignRequest *rsr,
   struct TALER_BlindedDenominationSignature *bs)
 {
   enum TALER_ErrorCode ec = TALER_EC_INVALID;
 
-  bs->cipher = TALER_DENOMINATION_INVALID;
+  memset (bs,
+          0,
+          sizeof (*bs));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Starting signature process\n");
   if (GNUNET_OK !=
@@ -411,17 +424,17 @@ TALER_CRYPTO_helper_rsa_sign (
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Requesting signature\n");
   {
-    char buf[sizeof (struct TALER_CRYPTO_SignRequest) + msg_size];
+    char buf[sizeof (struct TALER_CRYPTO_SignRequest) + rsr->msg_size];
     struct TALER_CRYPTO_SignRequest *sr
       = (struct TALER_CRYPTO_SignRequest *) buf;
 
     sr->header.size = htons (sizeof (buf));
     sr->header.type = htons (TALER_HELPER_RSA_MT_REQ_SIGN);
     sr->reserved = htonl (0);
-    sr->h_rsa = *h_rsa;
-    memcpy (&sr[1],
-            msg,
-            msg_size);
+    sr->h_rsa = *rsr->h_rsa;
+    GNUNET_memcpy (&sr[1],
+                   rsr->msg,
+                   rsr->msg_size);
     if (GNUNET_OK !=
         TALER_crypto_helper_send_all (dh->sock,
                                       buf,
@@ -505,6 +518,7 @@ more:
           const struct TALER_CRYPTO_SignResponse *sr =
             (const struct TALER_CRYPTO_SignResponse *) buf;
           struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
+          struct GNUNET_CRYPTO_BlindedSignature *blind_sig;
 
           rsa_signature = GNUNET_CRYPTO_rsa_signature_decode (
             &sr[1],
@@ -520,8 +534,11 @@ more:
                       "Received signature\n");
           ec = TALER_EC_NONE;
           finished = true;
-          bs->cipher = TALER_DENOMINATION_RSA;
-          bs->details.blinded_rsa_signature = rsa_signature;
+          blind_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+          blind_sig->cipher = GNUNET_CRYPTO_BSA_RSA;
+          blind_sig->rc = 1;
+          blind_sig->details.blinded_rsa_signature = rsa_signature;
+          bs->blinded_sig = blind_sig;
           break;
         }
       case TALER_HELPER_RSA_MT_RES_SIGN_FAILURE:
@@ -596,6 +613,266 @@ end:
 }
 
 
+enum TALER_ErrorCode
+TALER_CRYPTO_helper_rsa_batch_sign (
+  struct TALER_CRYPTO_RsaDenominationHelper *dh,
+  unsigned int rsrs_length,
+  const struct TALER_CRYPTO_RsaSignRequest rsrs[static rsrs_length],
+  struct TALER_BlindedDenominationSignature bss[static rsrs_length])
+{
+  enum TALER_ErrorCode ec = TALER_EC_INVALID;
+  unsigned int rpos;
+  unsigned int rend;
+  unsigned int wpos;
+
+  memset (bss,
+          0,
+          sizeof (*bss) * rsrs_length);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting signature process\n");
+  if (GNUNET_OK !=
+      try_connect (dh))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to connect to helper\n");
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting %u signatures\n",
+              rsrs_length);
+  rpos = 0;
+  rend = 0;
+  wpos = 0;
+  while (rpos < rsrs_length)
+  {
+    unsigned int mlen = sizeof (struct TALER_CRYPTO_BatchSignRequest);
+
+    while ( (rend < rsrs_length) &&
+            (mlen
+             + sizeof (struct TALER_CRYPTO_SignRequest)
+             + rsrs[rend].msg_size < UINT16_MAX) )
+    {
+      mlen += sizeof (struct TALER_CRYPTO_SignRequest) + rsrs[rend].msg_size;
+      rend++;
+    }
+    {
+      char obuf[mlen] GNUNET_ALIGN;
+      struct TALER_CRYPTO_BatchSignRequest *bsr
+        = (struct TALER_CRYPTO_BatchSignRequest *) obuf;
+      void *wbuf;
+
+      bsr->header.type = htons (TALER_HELPER_RSA_MT_REQ_BATCH_SIGN);
+      bsr->header.size = htons (mlen);
+      bsr->batch_size = htonl (rend - rpos);
+      wbuf = &bsr[1];
+      for (unsigned int i = rpos; i<rend; i++)
+      {
+        struct TALER_CRYPTO_SignRequest *sr = wbuf;
+        const struct TALER_CRYPTO_RsaSignRequest *rsr = &rsrs[i];
+
+        sr->header.type = htons (TALER_HELPER_RSA_MT_REQ_SIGN);
+        sr->header.size = htons (sizeof (*sr) + rsr->msg_size);
+        sr->reserved = htonl (0);
+        sr->h_rsa = *rsr->h_rsa;
+        GNUNET_memcpy (&sr[1],
+                       rsr->msg,
+                       rsr->msg_size);
+        wbuf += sizeof (*sr) + rsr->msg_size;
+      }
+      GNUNET_assert (wbuf == &obuf[mlen]);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Sending batch request [%u-%u)\n",
+                  rpos,
+                  rend);
+      if (GNUNET_OK !=
+          TALER_crypto_helper_send_all (dh->sock,
+                                        obuf,
+                                        sizeof (obuf)))
+      {
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "send");
+        do_disconnect (dh);
+        return TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+      }
+    }
+    rpos = rend;
+    {
+      char buf[UINT16_MAX];
+      size_t off = 0;
+      const struct GNUNET_MessageHeader *hdr
+        = (const struct GNUNET_MessageHeader *) buf;
+      bool finished = false;
+
+      while (1)
+      {
+        uint16_t msize;
+        ssize_t ret;
+
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Awaiting reply at %u (up to %u)\n",
+                    wpos,
+                    rend);
+        ret = recv (dh->sock,
+                    &buf[off],
+                    sizeof (buf) - off,
+                    (finished && (0 == off))
+                  ? MSG_DONTWAIT
+                  : 0);
+        if (ret < 0)
+        {
+          if (EINTR == errno)
+            continue;
+          if (EAGAIN == errno)
+          {
+            GNUNET_assert (finished);
+            GNUNET_assert (0 == off);
+            break;
+          }
+          GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                               "recv");
+          do_disconnect (dh);
+          ec = TALER_EC_EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE;
+          break;
+        }
+        if (0 == ret)
+        {
+          GNUNET_break (0 == off);
+          if (! finished)
+            ec = TALER_EC_EXCHANGE_SIGNKEY_HELPER_BUG;
+          if (TALER_EC_NONE == ec)
+            break;
+          return ec;
+        }
+        off += ret;
+more:
+        if (off < sizeof (struct GNUNET_MessageHeader))
+          continue;
+        msize = ntohs (hdr->size);
+        if (off < msize)
+          continue;
+        switch (ntohs (hdr->type))
+        {
+        case TALER_HELPER_RSA_MT_RES_SIGNATURE:
+          if (msize < sizeof (struct TALER_CRYPTO_SignResponse))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          if (finished)
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_SignResponse *sr =
+              (const struct TALER_CRYPTO_SignResponse *) buf;
+            struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
+            struct GNUNET_CRYPTO_BlindedSignature *blind_sig;
+
+            rsa_signature = GNUNET_CRYPTO_rsa_signature_decode (
+              &sr[1],
+              msize - sizeof (*sr));
+            if (NULL == rsa_signature)
+            {
+              GNUNET_break_op (0);
+              do_disconnect (dh);
+              return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+            }
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Received %u signature\n",
+                        wpos);
+            blind_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+            blind_sig->cipher = GNUNET_CRYPTO_BSA_RSA;
+            blind_sig->rc = 1;
+            blind_sig->details.blinded_rsa_signature = rsa_signature;
+            bss[wpos].blinded_sig = blind_sig;
+            wpos++;
+            if (wpos == rend)
+            {
+              if (TALER_EC_INVALID == ec)
+                ec = TALER_EC_NONE;
+              finished = true;
+            }
+            break;
+          }
+        case TALER_HELPER_RSA_MT_RES_SIGN_FAILURE:
+          if (msize != sizeof (struct TALER_CRYPTO_SignFailure))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          {
+            const struct TALER_CRYPTO_SignFailure *sf =
+              (const struct TALER_CRYPTO_SignFailure *) buf;
+
+            ec = (enum TALER_ErrorCode) ntohl (sf->ec);
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                        "Signing %u failed with status %d!\n",
+                        wpos,
+                        ec);
+            wpos++;
+            if (wpos == rend)
+            {
+              finished = true;
+            }
+            break;
+          }
+        case TALER_HELPER_RSA_MT_AVAIL:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received new key!\n");
+          if (GNUNET_OK !=
+              handle_mt_avail (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_RSA_MT_PURGE:
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Received revocation!\n");
+          if (GNUNET_OK !=
+              handle_mt_purge (dh,
+                               hdr))
+          {
+            GNUNET_break_op (0);
+            do_disconnect (dh);
+            return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+          }
+          break; /* while(1) loop ensures we recvfrom() again */
+        case TALER_HELPER_RSA_SYNCED:
+          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                      "Synchronized add odd time with RSA helper!\n");
+          dh->synced = true;
+          break;
+        default:
+          GNUNET_break_op (0);
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Received unexpected message of type %u\n",
+                      ntohs (hdr->type));
+          do_disconnect (dh);
+          return TALER_EC_EXCHANGE_DENOMINATION_HELPER_BUG;
+        }
+        memmove (buf,
+                 &buf[msize],
+                 off - msize);
+        off -= msize;
+        goto more;
+      } /* while(1) */
+    } /* scope */
+  }   /* while (rpos < rsrs_length) */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Existing with %u signatures and status %d\n",
+              wpos,
+              ec);
+  return ec;
+}
+
+
 void
 TALER_CRYPTO_helper_rsa_revoke (
   struct TALER_CRYPTO_RsaDenominationHelper *dh,
diff --git a/src/util/currencies.conf b/src/util/currencies.conf
new file mode 100644
index 000000000..0fa831bf3
--- /dev/null
+++ b/src/util/currencies.conf
@@ -0,0 +1,89 @@
+[currency-euro]
+ENABLED = YES
+name = "Euro"
+code = "EUR"
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"€"}
+
+[currency-swiss-francs]
+ENABLED = YES
+name = "Swiss Francs"
+code = "CHF"
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"Fr.","-2":"Rp."}
+
+[currency-forint]
+ENABLED = NO
+name = "Hungarian Forint"
+code = "HUF"
+fractional_input_digits = 0
+fractional_normal_digits = 0
+fractional_trailing_zero_digits = 0
+alt_unit_names = {"0":"Ft"}
+
+[currency-us-dollar]
+ENABLED = NO
+name = "US Dollar"
+code = "USD"
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"$"}
+
+[currency-kudos]
+ENABLED = YES
+name = "Kudos (Taler Demonstrator)"
+code = "KUDOS"
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"ク"}
+
+[currency-testkudos]
+ENABLED = YES
+name = "Test-kudos (Taler Demonstrator)"
+code = "TESTKUDOS"
+fractional_input_digits = 2
+fractional_normal_digits = 2
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"テ","3":"kテ","-3":"mテ"}
+
+[currency-japanese-yen]
+ENABLED = NO
+name = "Japanese Yen"
+code = "JPY"
+fractional_input_digits = 2
+fractional_normal_digits = 0
+fractional_trailing_zero_digits = 2
+alt_unit_names = {"0":"¥"}
+
+[currency-bitcoin-mainnet]
+ENABLED = NO
+name = "Bitcoin (Mainnet)"
+code = "BITCOINBTC"
+fractional_input_digits = 8
+fractional_normal_digits = 3
+fractional_trailing_zero_digits = 0
+alt_unit_names = {"0":"BTC","-3":"mBTC"}
+
+[currency-ethereum]
+ENABLED = NO
+name = "WAI-ETHER (Ethereum)"
+code = "EthereumWAI"
+fractional_input_digits = 0
+fractional_normal_digits = 0
+fractional_trailing_zero_digits = 0
+alt_unit_names = {"0":"WAI","3":"KWAI","6":"MWAI","9":"GWAI","12":"Szabo","15":"Finney","18":"Ether","21":"KEther","24":"MEther"}
+
+[currency-netzbon]
+ENABLED=YES
+name=NetzBon
+code=NETZBON
+fractional_input_digits=2
+fractional_normal_digits=2
+fractional_trailing_zero_digits=2
+alt_unit_names = {"0":"NETZBON"}
diff --git a/src/util/denom.c b/src/util/denom.c
index c1c3cdf5a..cb232c4a3 100644
--- a/src/util/denom.c
+++ b/src/util/denom.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021, 2022 Taler Systems SA
+  Copyright (C) 2021, 2022, 2023 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
@@ -25,60 +25,27 @@
 enum GNUNET_GenericReturnValue
 TALER_denom_priv_create (struct TALER_DenominationPrivateKey *denom_priv,
                          struct TALER_DenominationPublicKey *denom_pub,
-                         enum TALER_DenominationCipher cipher,
+                         enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher,
                          ...)
 {
-  memset (denom_priv,
-          0,
-          sizeof (*denom_priv));
+  enum GNUNET_GenericReturnValue ret;
+  va_list ap;
+
   memset (denom_pub,
           0,
           sizeof (*denom_pub));
-
-  switch (cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  case TALER_DENOMINATION_RSA:
-    {
-      va_list ap;
-      unsigned int bits;
-
-      va_start (ap, cipher);
-      bits = va_arg (ap, unsigned int);
-      va_end (ap);
-      if (bits < 512)
-      {
-        GNUNET_break (0);
-        return GNUNET_SYSERR;
-      }
-      denom_priv->details.rsa_private_key
-        = GNUNET_CRYPTO_rsa_private_key_create (bits);
-    }
-    if (NULL == denom_priv->details.rsa_private_key)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    denom_pub->details.rsa_public_key
-      = GNUNET_CRYPTO_rsa_private_key_get_public (
-          denom_priv->details.rsa_private_key);
-    denom_priv->cipher = TALER_DENOMINATION_RSA;
-    denom_pub->cipher = TALER_DENOMINATION_RSA;
-    return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    GNUNET_CRYPTO_cs_private_key_generate (&denom_priv->details.cs_private_key);
-    GNUNET_CRYPTO_cs_private_key_get_public (
-      &denom_priv->details.cs_private_key,
-      &denom_pub->details.cs_public_key);
-    denom_priv->cipher = TALER_DENOMINATION_CS;
-    denom_pub->cipher = TALER_DENOMINATION_CS;
-    return GNUNET_OK;
-  default:
-    GNUNET_break (0);
-  }
-  return GNUNET_SYSERR;
+  memset (denom_priv,
+          0,
+          sizeof (*denom_priv));
+  va_start (ap,
+            cipher);
+  ret = GNUNET_CRYPTO_blind_sign_keys_create_va (
+    &denom_priv->bsign_priv_key,
+    &denom_pub->bsign_pub_key,
+    cipher,
+    ap);
+  va_end (ap);
+  return ret;
 }
 
 
@@ -88,57 +55,13 @@ TALER_denom_sign_blinded (struct TALER_BlindedDenominationSignature *denom_sig,
                           bool for_melt,
                           const struct TALER_BlindedPlanchet *blinded_planchet)
 {
-  memset (denom_sig,
-          0,
-          sizeof (*denom_sig));
-  if (blinded_planchet->cipher != denom_priv->cipher)
-  {
-    GNUNET_break (0);
+  denom_sig->blinded_sig
+    = GNUNET_CRYPTO_blind_sign (denom_priv->bsign_priv_key,
+                                for_melt ? "rm" : "rw",
+                                blinded_planchet->blinded_message);
+  if (NULL == denom_sig->blinded_sig)
     return GNUNET_SYSERR;
-  }
-  switch (denom_priv->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  case TALER_DENOMINATION_RSA:
-    denom_sig->details.blinded_rsa_signature
-      = GNUNET_CRYPTO_rsa_sign_blinded (
-          denom_priv->details.rsa_private_key,
-          blinded_planchet->details.rsa_blinded_planchet.blinded_msg,
-          blinded_planchet->details.rsa_blinded_planchet.blinded_msg_size);
-    if (NULL == denom_sig->details.blinded_rsa_signature)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    denom_sig->cipher = TALER_DENOMINATION_RSA;
-    return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    {
-      struct GNUNET_CRYPTO_CsRSecret r[2];
-
-      GNUNET_CRYPTO_cs_r_derive (
-        &blinded_planchet->details.cs_blinded_planchet.nonce.nonce,
-        for_melt ? "rm" : "rw",
-        &denom_priv->details.cs_private_key,
-        r);
-      denom_sig->details.blinded_cs_answer.b =
-        GNUNET_CRYPTO_cs_sign_derive (&denom_priv->details.cs_private_key,
-                                      r,
-                                      blinded_planchet->details.
-                                      cs_blinded_planchet.c,
-                                      &blinded_planchet->details.
-                                      cs_blinded_planchet.nonce.nonce,
-                                      &denom_sig->details.blinded_cs_answer.
-                                      s_scalar);
-      denom_sig->cipher = TALER_DENOMINATION_CS;
-    }
-    return GNUNET_OK;
-  default:
-    GNUNET_break (0);
-  }
-  return GNUNET_SYSERR;
+  return GNUNET_OK;
 }
 
 
@@ -146,82 +69,24 @@ enum GNUNET_GenericReturnValue
 TALER_denom_sig_unblind (
   struct TALER_DenominationSignature *denom_sig,
   const struct TALER_BlindedDenominationSignature *bdenom_sig,
-  const union TALER_DenominationBlindingKeyP *bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *bks,
   const struct TALER_CoinPubHashP *c_hash,
   const struct TALER_ExchangeWithdrawValues *alg_values,
   const struct TALER_DenominationPublicKey *denom_pub)
 {
-  if (bdenom_sig->cipher != denom_pub->cipher)
+  denom_sig->unblinded_sig
+    = GNUNET_CRYPTO_blind_sig_unblind (bdenom_sig->blinded_sig,
+                                       bks,
+                                       c_hash,
+                                       sizeof (*c_hash),
+                                       alg_values->blinding_inputs,
+                                       denom_pub->bsign_pub_key);
+  if (NULL == denom_sig->unblinded_sig)
   {
-    GNUNET_break (0);
+    GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  switch (denom_pub->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  case TALER_DENOMINATION_RSA:
-    denom_sig->details.rsa_signature
-      = GNUNET_CRYPTO_rsa_unblind (
-          bdenom_sig->details.blinded_rsa_signature,
-          &bks->rsa_bks,
-          denom_pub->details.rsa_public_key);
-    if (NULL == denom_sig->details.rsa_signature)
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    denom_sig->cipher = TALER_DENOMINATION_RSA;
-    return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    {
-      struct GNUNET_CRYPTO_CsBlindingSecret bs[2];
-      struct GNUNET_CRYPTO_CsC c[2];
-      struct TALER_DenominationCSPublicRPairP r_pub_blind;
-
-      GNUNET_CRYPTO_cs_blinding_secrets_derive (&bks->nonce,
-                                                bs);
-      GNUNET_CRYPTO_cs_calc_blinded_c (
-        bs,
-        alg_values->details.cs_values.r_pub,
-        &denom_pub->details.cs_public_key,
-        &c_hash->hash,
-        sizeof(struct GNUNET_HashCode),
-        c,
-        r_pub_blind.r_pub);
-      denom_sig->details.cs_signature.r_point
-        = r_pub_blind.r_pub[bdenom_sig->details.blinded_cs_answer.b];
-      GNUNET_CRYPTO_cs_unblind (&bdenom_sig->details.blinded_cs_answer.s_scalar,
-                                &bs[bdenom_sig->details.blinded_cs_answer.b],
-                                &denom_sig->details.cs_signature.s_scalar);
-      denom_sig->cipher = TALER_DENOMINATION_CS;
-      return GNUNET_OK;
-    }
-  default:
-    GNUNET_break (0);
-  }
-  return GNUNET_SYSERR;
-}
-
-
-void
-TALER_rsa_pub_hash (const struct GNUNET_CRYPTO_RsaPublicKey *rsa,
-                    struct TALER_RsaPubHashP *h_rsa)
-{
-  GNUNET_CRYPTO_rsa_public_key_hash (rsa,
-                                     &h_rsa->hash);
-
-}
-
-
-void
-TALER_cs_pub_hash (const struct GNUNET_CRYPTO_CsPublicKey *cs,
-                   struct TALER_CsPubHashP *h_cs)
-{
-  GNUNET_CRYPTO_hash (cs,
-                      sizeof(*cs),
-                      &h_cs->hash);
+  return GNUNET_OK;
 }
 
 
@@ -229,9 +94,11 @@ void
 TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub,
                       struct TALER_DenominationHashP *denom_hash)
 {
+  struct GNUNET_CRYPTO_BlindSignPublicKey *bsp
+    = denom_pub->bsign_pub_key;
   uint32_t opt[2] = {
     htonl (denom_pub->age_mask.bits),
-    htonl ((uint32_t) denom_pub->cipher)
+    htonl ((uint32_t) bsp->cipher)
   };
   struct GNUNET_HashContext *hc;
 
@@ -239,15 +106,15 @@ TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub,
   GNUNET_CRYPTO_hash_context_read (hc,
                                    opt,
                                    sizeof (opt));
-  switch (denom_pub->cipher)
+  switch (bsp->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     {
       void *buf;
       size_t blen;
 
       blen = GNUNET_CRYPTO_rsa_public_key_encode (
-        denom_pub->details.rsa_public_key,
+        bsp->details.rsa_public_key,
         &buf);
       GNUNET_CRYPTO_hash_context_read (hc,
                                        buf,
@@ -255,10 +122,10 @@ TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub,
       GNUNET_free (buf);
     }
     break;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     GNUNET_CRYPTO_hash_context_read (hc,
-                                     &denom_pub->details.cs_public_key,
-                                     sizeof(denom_pub->details.cs_public_key));
+                                     &bsp->details.cs_public_key,
+                                     sizeof(bsp->details.cs_public_key));
     break;
   default:
     GNUNET_assert (0);
@@ -268,37 +135,24 @@ TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub,
 }
 
 
-void
-TALER_denom_priv_to_pub (const struct TALER_DenominationPrivateKey *denom_priv,
-                         const struct TALER_AgeMask age_mask,
-                         struct TALER_DenominationPublicKey *denom_pub)
+const struct TALER_ExchangeWithdrawValues *
+TALER_denom_ewv_rsa_singleton ()
 {
-  switch (denom_priv->cipher)
-  {
-  case TALER_DENOMINATION_RSA:
-    denom_pub->cipher = TALER_DENOMINATION_RSA;
-    denom_pub->age_mask = age_mask;
-    denom_pub->details.rsa_public_key
-      = GNUNET_CRYPTO_rsa_private_key_get_public (
-          denom_priv->details.rsa_private_key);
-    return;
-  case TALER_DENOMINATION_CS:
-    denom_pub->cipher = TALER_DENOMINATION_CS;
-    denom_pub->age_mask = age_mask;
-    GNUNET_CRYPTO_cs_private_key_get_public (
-      &denom_priv->details.cs_private_key,
-      &denom_pub->details.cs_public_key);
-    return;
-  default:
-    GNUNET_assert (0);
-  }
+  static struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_RSA
+  };
+  static struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+  return &alg_values;
 }
 
 
 enum GNUNET_GenericReturnValue
 TALER_denom_blind (
   const struct TALER_DenominationPublicKey *dk,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
   const struct TALER_AgeCommitmentHash *ach,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_ExchangeWithdrawValues *alg_values,
@@ -308,44 +162,16 @@ TALER_denom_blind (
   TALER_coin_pub_hash (coin_pub,
                        ach,
                        c_hash);
-  switch (dk->cipher)
-  {
-  case TALER_DENOMINATION_RSA:
-    blinded_planchet->cipher = dk->cipher;
-    if (GNUNET_YES !=
-        GNUNET_CRYPTO_rsa_blind (
-          &c_hash->hash,
-          &coin_bks->rsa_bks,
-          dk->details.rsa_public_key,
-          &blinded_planchet->details.rsa_blinded_planchet.blinded_msg,
-          &blinded_planchet->details.rsa_blinded_planchet.blinded_msg_size))
-    {
-      GNUNET_break (0);
-      return GNUNET_SYSERR;
-    }
-    return GNUNET_OK;
-  case TALER_DENOMINATION_CS:
-    {
-      struct TALER_DenominationCSPublicRPairP blinded_r_pub;
-      struct GNUNET_CRYPTO_CsBlindingSecret bs[2];
-
-      blinded_planchet->cipher = TALER_DENOMINATION_CS;
-      GNUNET_CRYPTO_cs_blinding_secrets_derive (&coin_bks->nonce,
-                                                bs);
-      GNUNET_CRYPTO_cs_calc_blinded_c (
-        bs,
-        alg_values->details.cs_values.r_pub,
-        &dk->details.cs_public_key,
-        c_hash,
-        sizeof(*c_hash),
-        blinded_planchet->details.cs_blinded_planchet.c,
-        blinded_r_pub.r_pub);
-      return GNUNET_OK;
-    }
-  default:
-    GNUNET_break (0);
+  blinded_planchet->blinded_message
+    = GNUNET_CRYPTO_message_blind_to_sign (dk->bsign_pub_key,
+                                           coin_bks,
+                                           nonce,
+                                           c_hash,
+                                           sizeof (*c_hash),
+                                           alg_values->blinding_inputs);
+  if (NULL == blinded_planchet->blinded_message)
     return GNUNET_SYSERR;
-  }
+  return GNUNET_OK;
 }
 
 
@@ -354,64 +180,20 @@ TALER_denom_pub_verify (const struct TALER_DenominationPublicKey *denom_pub,
                         const struct TALER_DenominationSignature *denom_sig,
                         const struct TALER_CoinPubHashP *c_hash)
 {
-  if (denom_pub->cipher != denom_sig->cipher)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  switch (denom_pub->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    GNUNET_break (0);
-    return GNUNET_NO;
-  case TALER_DENOMINATION_RSA:
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_rsa_verify (&c_hash->hash,
-                                  denom_sig->details.rsa_signature,
-                                  denom_pub->details.rsa_public_key))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Coin signature is invalid\n");
-      return GNUNET_NO;
-    }
-    return GNUNET_YES;
-  case TALER_DENOMINATION_CS:
-    if (GNUNET_OK !=
-        GNUNET_CRYPTO_cs_verify (&denom_sig->details.cs_signature,
-                                 &denom_pub->details.cs_public_key,
-                                 &c_hash->hash,
-                                 sizeof(struct GNUNET_HashCode)))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Coin signature is invalid\n");
-      return GNUNET_NO;
-    }
-    return GNUNET_YES;
-  default:
-    GNUNET_assert (0);
-  }
+  return GNUNET_CRYPTO_blind_sig_verify (denom_pub->bsign_pub_key,
+                                         denom_sig->unblinded_sig,
+                                         c_hash,
+                                         sizeof (*c_hash));
 }
 
 
 void
 TALER_denom_pub_free (struct TALER_DenominationPublicKey *denom_pub)
 {
-  switch (denom_pub->cipher)
+  if (NULL != denom_pub->bsign_pub_key)
   {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    if (NULL != denom_pub->details.rsa_public_key)
-    {
-      GNUNET_CRYPTO_rsa_public_key_free (denom_pub->details.rsa_public_key);
-      denom_pub->details.rsa_public_key = NULL;
-    }
-    denom_pub->cipher = TALER_DENOMINATION_INVALID;
-    return;
-  case TALER_DENOMINATION_CS:
-    return;
-  default:
-    GNUNET_assert (0);
+    GNUNET_CRYPTO_blind_sign_pub_decref (denom_pub->bsign_pub_key);
+    denom_pub->bsign_pub_key = NULL;
   }
 }
 
@@ -419,22 +201,10 @@ TALER_denom_pub_free (struct TALER_DenominationPublicKey *denom_pub)
 void
 TALER_denom_priv_free (struct TALER_DenominationPrivateKey *denom_priv)
 {
-  switch (denom_priv->cipher)
+  if (NULL != denom_priv->bsign_priv_key)
   {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    if (NULL != denom_priv->details.rsa_private_key)
-    {
-      GNUNET_CRYPTO_rsa_private_key_free (denom_priv->details.rsa_private_key);
-      denom_priv->details.rsa_private_key = NULL;
-    }
-    denom_priv->cipher = TALER_DENOMINATION_INVALID;
-    return;
-  case TALER_DENOMINATION_CS:
-    return;
-  default:
-    GNUNET_assert (0);
+    GNUNET_CRYPTO_blind_sign_priv_decref (denom_priv->bsign_priv_key);
+    denom_priv->bsign_priv_key = NULL;
   }
 }
 
@@ -442,22 +212,10 @@ TALER_denom_priv_free (struct TALER_DenominationPrivateKey *denom_priv)
 void
 TALER_denom_sig_free (struct TALER_DenominationSignature *denom_sig)
 {
-  switch (denom_sig->cipher)
+  if (NULL != denom_sig->unblinded_sig)
   {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    if (NULL != denom_sig->details.rsa_signature)
-    {
-      GNUNET_CRYPTO_rsa_signature_free (denom_sig->details.rsa_signature);
-      denom_sig->details.rsa_signature = NULL;
-    }
-    denom_sig->cipher = TALER_DENOMINATION_INVALID;
-    return;
-  case TALER_DENOMINATION_CS:
-    return;
-  default:
-    GNUNET_assert (0);
+    GNUNET_CRYPTO_unblinded_sig_decref (denom_sig->unblinded_sig);
+    denom_sig->unblinded_sig = NULL;
   }
 }
 
@@ -466,89 +224,73 @@ void
 TALER_blinded_denom_sig_free (
   struct TALER_BlindedDenominationSignature *denom_sig)
 {
-  switch (denom_sig->cipher)
+  if (NULL != denom_sig->blinded_sig)
   {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    if (NULL != denom_sig->details.blinded_rsa_signature)
-    {
-      GNUNET_CRYPTO_rsa_signature_free (
-        denom_sig->details.blinded_rsa_signature);
-      denom_sig->details.blinded_rsa_signature = NULL;
-    }
-    denom_sig->cipher = TALER_DENOMINATION_INVALID;
-    return;
-  case TALER_DENOMINATION_CS:
-    return;
-  default:
-    GNUNET_assert (0);
+    GNUNET_CRYPTO_blinded_sig_decref (denom_sig->blinded_sig);
+    denom_sig->blinded_sig = NULL;
   }
 }
 
 
 void
-TALER_denom_pub_deep_copy (struct TALER_DenominationPublicKey *denom_dst,
-                           const struct TALER_DenominationPublicKey *denom_src)
+TALER_denom_ewv_free (struct TALER_ExchangeWithdrawValues *ewv)
 {
-  *denom_dst = *denom_src; /* shallow copy */
-  switch (denom_src->cipher)
-  {
-  case TALER_DENOMINATION_RSA:
-    denom_dst->details.rsa_public_key
-      = GNUNET_CRYPTO_rsa_public_key_dup (
-          denom_src->details.rsa_public_key);
+  if (ewv == TALER_denom_ewv_rsa_singleton ())
     return;
-  case TALER_DENOMINATION_CS:
+  if (ewv->blinding_inputs ==
+      TALER_denom_ewv_rsa_singleton ()->blinding_inputs)
+  {
+    ewv->blinding_inputs = NULL;
     return;
-  default:
-    GNUNET_assert (0);
+  }
+  if (NULL != ewv->blinding_inputs)
+  {
+    GNUNET_CRYPTO_blinding_input_values_decref (ewv->blinding_inputs);
+    ewv->blinding_inputs = NULL;
   }
 }
 
 
 void
-TALER_denom_sig_deep_copy (struct TALER_DenominationSignature *denom_dst,
-                           const struct TALER_DenominationSignature *denom_src)
+TALER_denom_ewv_copy (struct TALER_ExchangeWithdrawValues *bi_dst,
+                      const struct TALER_ExchangeWithdrawValues *bi_src)
 {
-  *denom_dst = *denom_src; /* shallow copy */
-  switch (denom_src->cipher)
+  if (bi_src == TALER_denom_ewv_rsa_singleton ())
   {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    denom_dst->details.rsa_signature
-      = GNUNET_CRYPTO_rsa_signature_dup (
-          denom_src->details.rsa_signature);
-    return;
-  case TALER_DENOMINATION_CS:
+    *bi_dst = *bi_src;
     return;
-  default:
-    GNUNET_assert (0);
   }
+  bi_dst->blinding_inputs
+    = GNUNET_CRYPTO_blinding_input_values_incref (bi_src->blinding_inputs);
+}
+
+
+void
+TALER_denom_pub_copy (struct TALER_DenominationPublicKey *denom_dst,
+                      const struct TALER_DenominationPublicKey *denom_src)
+{
+  denom_dst->age_mask = denom_src->age_mask;
+  denom_dst->bsign_pub_key
+    = GNUNET_CRYPTO_bsign_pub_incref (denom_src->bsign_pub_key);
 }
 
 
 void
-TALER_blinded_denom_sig_deep_copy (
+TALER_denom_sig_copy (struct TALER_DenominationSignature *denom_dst,
+                      const struct TALER_DenominationSignature *denom_src)
+{
+  denom_dst->unblinded_sig
+    = GNUNET_CRYPTO_ub_sig_incref (denom_src->unblinded_sig);
+}
+
+
+void
+TALER_blinded_denom_sig_copy (
   struct TALER_BlindedDenominationSignature *denom_dst,
   const struct TALER_BlindedDenominationSignature *denom_src)
 {
-  *denom_dst = *denom_src; /* shallow copy */
-  switch (denom_src->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    return;
-  case TALER_DENOMINATION_RSA:
-    denom_dst->details.blinded_rsa_signature
-      = GNUNET_CRYPTO_rsa_signature_dup (
-          denom_src->details.blinded_rsa_signature);
-    return;
-  case TALER_DENOMINATION_CS:
-    return;
-  default:
-    GNUNET_assert (0);
-  }
+  denom_dst->blinded_sig
+    = GNUNET_CRYPTO_blind_sig_incref (denom_src->blinded_sig);
 }
 
 
@@ -556,24 +298,14 @@ int
 TALER_denom_pub_cmp (const struct TALER_DenominationPublicKey *denom1,
                      const struct TALER_DenominationPublicKey *denom2)
 {
-  if (denom1->cipher != denom2->cipher)
-    return (denom1->cipher > denom2->cipher) ? 1 : -1;
+  if (denom1->bsign_pub_key->cipher !=
+      denom2->bsign_pub_key->cipher)
+    return (denom1->bsign_pub_key->cipher >
+            denom2->bsign_pub_key->cipher) ? 1 : -1;
   if (denom1->age_mask.bits != denom2->age_mask.bits)
     return (denom1->age_mask.bits > denom2->age_mask.bits) ? 1 : -1;
-  switch (denom1->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    return 0;
-  case TALER_DENOMINATION_RSA:
-    return GNUNET_CRYPTO_rsa_public_key_cmp (denom1->details.rsa_public_key,
-                                             denom2->details.rsa_public_key);
-  case TALER_DENOMINATION_CS:
-    return GNUNET_memcmp (&denom1->details.cs_public_key,
-                          &denom2->details.cs_public_key);
-  default:
-    GNUNET_assert (0);
-  }
-  return -2;
+  return GNUNET_CRYPTO_bsign_pub_cmp (denom1->bsign_pub_key,
+                                      denom2->bsign_pub_key);
 }
 
 
@@ -581,22 +313,8 @@ int
 TALER_denom_sig_cmp (const struct TALER_DenominationSignature *sig1,
                      const struct TALER_DenominationSignature *sig2)
 {
-  if (sig1->cipher != sig2->cipher)
-    return (sig1->cipher > sig2->cipher) ? 1 : -1;
-  switch (sig1->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    return 0;
-  case TALER_DENOMINATION_RSA:
-    return GNUNET_CRYPTO_rsa_signature_cmp (sig1->details.rsa_signature,
-                                            sig2->details.rsa_signature);
-  case TALER_DENOMINATION_CS:
-    return GNUNET_memcmp (&sig1->details.cs_signature,
-                          &sig2->details.cs_signature);
-  default:
-    GNUNET_assert (0);
-  }
-  return -2;
+  return GNUNET_CRYPTO_ub_sig_cmp (sig1->unblinded_sig,
+                                   sig1->unblinded_sig);
 }
 
 
@@ -605,27 +323,8 @@ TALER_blinded_planchet_cmp (
   const struct TALER_BlindedPlanchet *bp1,
   const struct TALER_BlindedPlanchet *bp2)
 {
-  if (bp1->cipher != bp2->cipher)
-    return (bp1->cipher > bp2->cipher) ? 1 : -1;
-  switch (bp1->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    return 0;
-  case TALER_DENOMINATION_RSA:
-    if (bp1->details.rsa_blinded_planchet.blinded_msg_size !=
-        bp2->details.rsa_blinded_planchet.blinded_msg_size)
-      return (bp1->details.rsa_blinded_planchet.blinded_msg_size >
-              bp2->details.rsa_blinded_planchet.blinded_msg_size) ? 1 : -1;
-    return memcmp (bp1->details.rsa_blinded_planchet.blinded_msg,
-                   bp2->details.rsa_blinded_planchet.blinded_msg,
-                   bp1->details.rsa_blinded_planchet.blinded_msg_size);
-  case TALER_DENOMINATION_CS:
-    return GNUNET_memcmp (&bp1->details.cs_blinded_planchet,
-                          &bp2->details.cs_blinded_planchet);
-  default:
-    GNUNET_assert (0);
-  }
-  return -2;
+  return GNUNET_CRYPTO_blinded_message_cmp (bp1->blinded_message,
+                                            bp2->blinded_message);
 }
 
 
@@ -634,22 +333,8 @@ TALER_blinded_denom_sig_cmp (
   const struct TALER_BlindedDenominationSignature *sig1,
   const struct TALER_BlindedDenominationSignature *sig2)
 {
-  if (sig1->cipher != sig2->cipher)
-    return (sig1->cipher > sig2->cipher) ? 1 : -1;
-  switch (sig1->cipher)
-  {
-  case TALER_DENOMINATION_INVALID:
-    return 0;
-  case TALER_DENOMINATION_RSA:
-    return GNUNET_CRYPTO_rsa_signature_cmp (sig1->details.blinded_rsa_signature,
-                                            sig2->details.blinded_rsa_signature);
-  case TALER_DENOMINATION_CS:
-    return GNUNET_memcmp (&sig1->details.blinded_cs_answer,
-                          &sig2->details.blinded_cs_answer);
-  default:
-    GNUNET_assert (0);
-  }
-  return -2;
+  return GNUNET_CRYPTO_blind_sig_cmp (sig1->blinded_sig,
+                                      sig1->blinded_sig);
 }
 
 
@@ -657,31 +342,31 @@ void
 TALER_blinded_planchet_hash_ (const struct TALER_BlindedPlanchet *bp,
                               struct GNUNET_HashContext *hash_context)
 {
-  uint32_t cipher = htonl (bp->cipher);
+  const struct GNUNET_CRYPTO_BlindedMessage *bm = bp->blinded_message;
+  uint32_t cipher = htonl (bm->cipher);
 
   GNUNET_CRYPTO_hash_context_read (hash_context,
                                    &cipher,
                                    sizeof (cipher));
-  switch (bp->cipher)
+  switch (bm->cipher)
   {
-  case TALER_DENOMINATION_INVALID:
-    break;
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    GNUNET_break (0);
+    return;
+  case GNUNET_CRYPTO_BSA_RSA:
     GNUNET_CRYPTO_hash_context_read (
       hash_context,
-      bp->details.rsa_blinded_planchet.blinded_msg,
-      bp->details.rsa_blinded_planchet.blinded_msg_size);
-    break;
-  case TALER_DENOMINATION_CS:
+      bm->details.rsa_blinded_message.blinded_msg,
+      bm->details.rsa_blinded_message.blinded_msg_size);
+    return;
+  case GNUNET_CRYPTO_BSA_CS:
     GNUNET_CRYPTO_hash_context_read (
       hash_context,
-      &bp->details.cs_blinded_planchet,
-      sizeof (bp->details.cs_blinded_planchet));
-    break;
-  default:
-    GNUNET_assert (0);
-    break;
+      &bm->details.cs_blinded_message,
+      sizeof (bm->details.cs_blinded_message));
+    return;
   }
+  GNUNET_assert (0);
 }
 
 
@@ -689,14 +374,17 @@ void
 TALER_planchet_blinding_secret_create (
   const struct TALER_PlanchetMasterSecretP *ps,
   const struct TALER_ExchangeWithdrawValues *alg_values,
-  union TALER_DenominationBlindingKeyP *bks)
+  union GNUNET_CRYPTO_BlindingSecretP *bks)
 {
-  switch (alg_values->cipher)
+  const struct GNUNET_CRYPTO_BlindingInputValues *bi =
+    alg_values->blinding_inputs;
+
+  switch (bi->cipher)
   {
-  case TALER_DENOMINATION_INVALID:
+  case GNUNET_CRYPTO_BSA_INVALID:
     GNUNET_break (0);
     return;
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CRYPTO_kdf (&bks->rsa_bks,
                                       sizeof (bks->rsa_bks),
@@ -707,7 +395,7 @@ TALER_planchet_blinding_secret_create (
                                       NULL,
                                       0));
     return;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CRYPTO_kdf (&bks->nonce,
                                       sizeof (bks->nonce),
@@ -715,14 +403,13 @@ TALER_planchet_blinding_secret_create (
                                       strlen ("bseed"),
                                       ps,
                                       sizeof(*ps),
-                                      &alg_values->details.cs_values,
-                                      sizeof(alg_values->details.cs_values),
+                                      &bi->details.cs_values,
+                                      sizeof(bi->details.cs_values),
                                       NULL,
                                       0));
     return;
-  default:
-    GNUNET_break (0);
   }
+  GNUNET_assert (0);
 }
 
 
@@ -732,9 +419,18 @@ TALER_planchet_setup_coin_priv (
   const struct TALER_ExchangeWithdrawValues *alg_values,
   struct TALER_CoinSpendPrivateKeyP *coin_priv)
 {
-  switch (alg_values->cipher)
+  const struct GNUNET_CRYPTO_BlindingInputValues *bi
+    = alg_values->blinding_inputs;
+
+  switch (bi->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_INVALID:
+    GNUNET_break (0);
+    memset (coin_priv,
+            0,
+            sizeof (*coin_priv));
+    return;
+  case GNUNET_CRYPTO_BSA_RSA:
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CRYPTO_kdf (coin_priv,
                                       sizeof (*coin_priv),
@@ -744,8 +440,8 @@ TALER_planchet_setup_coin_priv (
                                       sizeof(*ps),
                                       NULL,
                                       0));
-    break;
-  case TALER_DENOMINATION_CS:
+    return;
+  case GNUNET_CRYPTO_BSA_CS:
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CRYPTO_kdf (coin_priv,
                                       sizeof (*coin_priv),
@@ -753,37 +449,24 @@ TALER_planchet_setup_coin_priv (
                                       strlen ("coin"),
                                       ps,
                                       sizeof(*ps),
-                                      &alg_values->details.cs_values,
-                                      sizeof(alg_values->details.cs_values),
+                                      &bi->details.cs_values,
+                                      sizeof(bi->details.cs_values),
                                       NULL,
                                       0));
-    break;
-  default:
-    GNUNET_break (0);
     return;
   }
+  GNUNET_assert (0);
 }
 
 
 void
 TALER_blinded_planchet_free (struct TALER_BlindedPlanchet *blinded_planchet)
 {
-  switch (blinded_planchet->cipher)
+  if (NULL != blinded_planchet->blinded_message)
   {
-  case TALER_DENOMINATION_INVALID:
-    GNUNET_break (0);
-    return;
-  case TALER_DENOMINATION_RSA:
-    GNUNET_free (blinded_planchet->details.rsa_blinded_planchet.blinded_msg);
-    return;
-  case TALER_DENOMINATION_CS:
-    memset (blinded_planchet,
-            0,
-            sizeof (*blinded_planchet));
-    /* nothing to do for CS */
-    return;
+    GNUNET_CRYPTO_blinded_message_decref (blinded_planchet->blinded_message);
+    blinded_planchet->blinded_message = NULL;
   }
-  GNUNET_assert (0);
 }
 
 
diff --git a/src/util/do_bench_age_restriction b/src/util/do_bench_age_restriction
new file mode 100755
index 000000000..a65713439
--- /dev/null
+++ b/src/util/do_bench_age_restriction
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+gcc bench_age_restriction.c \
+   -lgnunetutil -lgnunetjson -lsodium -ljansson \
+   -L/usr/lib/x86_64-linux-gnu -lmicrohttpd -ltalerutil -lm \
+   -I../include \
+   -o bench_age_restriction && ./bench_age_restriction
+
diff --git a/src/util/exchange_signatures.c b/src/util/exchange_signatures.c
index 5c72289e1..aaefb5cec 100644
--- a/src/util/exchange_signatures.c
+++ b/src/util/exchange_signatures.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021, 2022 Taler Systems SA
+  Copyright (C) 2021-2023 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
@@ -48,10 +48,10 @@ struct TALER_DepositConfirmationPS
   struct TALER_MerchantWireHashP h_wire GNUNET_PACKED;
 
   /**
-   * Hash over the extension options of the deposit, 0 if there
-   * were not extension options.
+   * Hash over the optional policy extension of the deposit, 0 if there
+   * was no policy.
    */
-  struct TALER_ExtensionContractHashP h_extensions GNUNET_PACKED;
+  struct TALER_ExtensionPolicyHashP h_policy GNUNET_PACKED;
 
   /**
    * Time when this confirmation was generated / when the exchange received
@@ -78,12 +78,12 @@ struct TALER_DepositConfirmationPS
    * Amount to be deposited, excluding fee.  Calculated from the
    * amount with fee and the fee from the deposit request.
    */
-  struct TALER_AmountNBO amount_without_fee;
+  struct TALER_AmountNBO total_without_fee;
 
   /**
-   * The public key of the coin that was deposited.
+   * Hash over all of the coin signatures.
    */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  struct GNUNET_HashCode h_coin_sigs;
 
   /**
    * The Merchant's public key.  Allows the merchant to later refund
@@ -101,12 +101,13 @@ TALER_exchange_online_deposit_confirmation_sign (
   TALER_ExchangeSignCallback scb,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendSignatureP *coin_sigs[static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig)
@@ -119,14 +120,22 @@ TALER_exchange_online_deposit_confirmation_sign (
     .exchange_timestamp = GNUNET_TIME_timestamp_hton (exchange_timestamp),
     .wire_deadline = GNUNET_TIME_timestamp_hton (wire_deadline),
     .refund_deadline = GNUNET_TIME_timestamp_hton (refund_deadline),
-    .coin_pub = *coin_pub,
-    .merchant_pub = *merchant_pub
+    .merchant_pub = *merchant_pub,
+    .h_policy = {{{0}}}
   };
-
-  if (NULL != h_extensions)
-    dcs.h_extensions = *h_extensions;
-  TALER_amount_hton (&dcs.amount_without_fee,
-                     amount_without_fee);
+  struct GNUNET_HashContext *hc;
+
+  hc = GNUNET_CRYPTO_hash_context_start ();
+  for (unsigned int i = 0; i<num_coins; i++)
+    GNUNET_CRYPTO_hash_context_read (hc,
+                                     coin_sigs[i],
+                                     sizeof (*coin_sigs[i]));
+  GNUNET_CRYPTO_hash_context_finish (hc,
+                                     &dcs.h_coin_sigs);
+  if (NULL != h_policy)
+    dcs.h_policy = *h_policy;
+  TALER_amount_hton (&dcs.total_without_fee,
+                     total_without_fee);
   return scb (&dcs.purpose,
               pub,
               sig);
@@ -137,12 +146,13 @@ enum GNUNET_GenericReturnValue
 TALER_exchange_online_deposit_confirmation_verify (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   struct GNUNET_TIME_Timestamp exchange_timestamp,
   struct GNUNET_TIME_Timestamp wire_deadline,
   struct GNUNET_TIME_Timestamp refund_deadline,
-  const struct TALER_Amount *amount_without_fee,
-  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_Amount *total_without_fee,
+  unsigned int num_coins,
+  const struct TALER_CoinSpendSignatureP *coin_sigs[static num_coins],
   const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_ExchangePublicKeyP *exchange_pub,
   const struct TALER_ExchangeSignatureP *exchange_sig)
@@ -155,14 +165,21 @@ TALER_exchange_online_deposit_confirmation_verify (
     .exchange_timestamp = GNUNET_TIME_timestamp_hton (exchange_timestamp),
     .wire_deadline = GNUNET_TIME_timestamp_hton (wire_deadline),
     .refund_deadline = GNUNET_TIME_timestamp_hton (refund_deadline),
-    .coin_pub = *coin_pub,
     .merchant_pub = *merchant_pub
   };
-
-  if (NULL != h_extensions)
-    dcs.h_extensions = *h_extensions;
-  TALER_amount_hton (&dcs.amount_without_fee,
-                     amount_without_fee);
+  struct GNUNET_HashContext *hc;
+
+  hc = GNUNET_CRYPTO_hash_context_start ();
+  for (unsigned int i = 0; i<num_coins; i++)
+    GNUNET_CRYPTO_hash_context_read (hc,
+                                     coin_sigs[i],
+                                     sizeof (*coin_sigs[i]));
+  GNUNET_CRYPTO_hash_context_finish (hc,
+                                     &dcs.h_coin_sigs);
+  if (NULL != h_policy)
+    dcs.h_policy = *h_policy;
+  TALER_amount_hton (&dcs.total_without_fee,
+                     total_without_fee);
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT,
                                   &dcs,
@@ -362,6 +379,91 @@ TALER_exchange_online_melt_confirmation_verify (
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
+ * @brief Format of the block signed by the Exchange in response to a
+ * successful "/reserves/$RESERVE_PUB/age-withdraw" request.  Hereby the
+ * exchange affirms that the commitment along with the maximum age group and
+ * the amount were accepted.  This also commits the exchange to a particular
+ * index to not be revealed during the reveal.
+ */
+struct TALER_AgeWithdrawConfirmationPS
+{
+  /**
+   * Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_AGE_WITHDRAW.   Signed by a
+   * `struct TALER_ExchangePublicKeyP` using EdDSA.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Commitment made in the /reserves/$RESERVE_PUB/age-withdraw.
+   */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment GNUNET_PACKED;
+
+  /**
+   * Index that the client will not have to reveal, in NBO.
+   * Must be smaller than #TALER_CNC_KAPPA.
+   */
+  uint32_t noreveal_index GNUNET_PACKED;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+enum TALER_ErrorCode
+TALER_exchange_online_age_withdraw_confirmation_sign (
+  TALER_ExchangeSignCallback scb,
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  uint32_t noreveal_index,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig)
+{
+
+  struct TALER_AgeWithdrawConfirmationPS confirm = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_AGE_WITHDRAW),
+    .purpose.size = htonl (sizeof (confirm)),
+    .h_commitment = *h_commitment,
+    .noreveal_index = htonl (noreveal_index)
+  };
+
+  return scb (&confirm.purpose,
+              pub,
+              sig);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_age_withdraw_confirmation_verify (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  uint32_t noreveal_index,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  const struct TALER_ExchangeSignatureP *exchange_sig)
+{
+  struct TALER_AgeWithdrawConfirmationPS confirm = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_AGE_WITHDRAW),
+    .purpose.size = htonl (sizeof (confirm)),
+    .h_commitment = *h_commitment,
+    .noreveal_index = htonl (noreveal_index)
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_eddsa_verify (
+        TALER_SIGNATURE_EXCHANGE_CONFIRM_AGE_WITHDRAW,
+        &confirm,
+        &exchange_sig->eddsa_signature,
+        &exchange_pub->eddsa_pub))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/* TODO:oec: add signature for age-withdraw, age-reveal */
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
  * @brief Signature made by the exchange over the full set of keys, used
  * to detect cheating exchanges that give out different sets to
  * different users.
@@ -449,15 +551,20 @@ struct TALER_ExchangeAccountSetupSuccessPS
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * Hash over the payto for which the signature was
-   * made.
+   * Hash over the payto for which the signature was made.
    */
   struct TALER_PaytoHashP h_payto;
 
   /**
+   * Hash over details on *which* KYC obligations were discharged!
+   */
+  struct GNUNET_HashCode h_kyc;
+
+  /**
    * When was the signature made.
    */
   struct GNUNET_TIME_TimestampNBO timestamp;
+
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -467,6 +574,7 @@ enum TALER_ErrorCode
 TALER_exchange_online_account_setup_success_sign (
   TALER_ExchangeSignCallback scb,
   const struct TALER_PaytoHashP *h_payto,
+  const json_t *kyc,
   struct GNUNET_TIME_Timestamp timestamp,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig)
@@ -476,10 +584,11 @@ TALER_exchange_online_account_setup_success_sign (
     .purpose.purpose = htonl (
       TALER_SIGNATURE_EXCHANGE_ACCOUNT_SETUP_SUCCESS),
     .h_payto = *h_payto,
-    .timestamp = GNUNET_TIME_timestamp_hton (
-      timestamp)
+    .timestamp = GNUNET_TIME_timestamp_hton (timestamp)
   };
 
+  TALER_json_hash (kyc,
+                   &kyc_purpose.h_kyc);
   return scb (&kyc_purpose.purpose,
               pub,
               sig);
@@ -489,6 +598,7 @@ TALER_exchange_online_account_setup_success_sign (
 enum GNUNET_GenericReturnValue
 TALER_exchange_online_account_setup_success_verify (
   const struct TALER_PaytoHashP *h_payto,
+  const json_t *kyc,
   struct GNUNET_TIME_Timestamp timestamp,
   const struct TALER_ExchangePublicKeyP *pub,
   const struct TALER_ExchangeSignatureP *sig)
@@ -498,10 +608,11 @@ TALER_exchange_online_account_setup_success_verify (
     .purpose.purpose = htonl (
       TALER_SIGNATURE_EXCHANGE_ACCOUNT_SETUP_SUCCESS),
     .h_payto = *h_payto,
-    .timestamp = GNUNET_TIME_timestamp_hton (
-      timestamp)
+    .timestamp = GNUNET_TIME_timestamp_hton (timestamp)
   };
 
+  TALER_json_hash (kyc,
+                   &kyc_purpose.h_kyc);
   return
     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_EXCHANGE_ACCOUNT_SETUP_SUCCESS,
                                 &kyc_purpose,
@@ -849,8 +960,9 @@ TALER_exchange_online_confirm_recoup_sign (
   struct TALER_RecoupConfirmationPS pc = {
     .purpose.size = htonl (sizeof (pc)),
     .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP),
-    .reserve_pub = *reserve_pub,
-    .coin_pub = *coin_pub
+    .timestamp = GNUNET_TIME_timestamp_hton (timestamp),
+    .coin_pub = *coin_pub,
+    .reserve_pub = *reserve_pub
   };
 
   TALER_amount_hton (&pc.recoup_amount,
@@ -873,8 +985,9 @@ TALER_exchange_online_confirm_recoup_verify (
   struct TALER_RecoupConfirmationPS pc = {
     .purpose.size = htonl (sizeof (pc)),
     .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP),
-    .reserve_pub = *reserve_pub,
-    .coin_pub = *coin_pub
+    .timestamp = GNUNET_TIME_timestamp_hton (timestamp),
+    .coin_pub = *coin_pub,
+    .reserve_pub = *reserve_pub
   };
 
   TALER_amount_hton (&pc.recoup_amount,
@@ -1109,10 +1222,10 @@ TALER_exchange_online_denomination_expired_sign (
   };
 
   /* strncpy would create a compiler warning */
-  memcpy (dua.operation,
-          op,
-          GNUNET_MIN (sizeof (dua.operation),
-                      strlen (op)));
+  GNUNET_memcpy (dua.operation,
+                 op,
+                 GNUNET_MIN (sizeof (dua.operation),
+                             strlen (op)));
   return scb (&dua.purpose,
               pub,
               sig);
@@ -1136,10 +1249,10 @@ TALER_exchange_online_denomination_expired_verify (
   };
 
   /* strncpy would create a compiler warning */
-  memcpy (dua.operation,
-          op,
-          GNUNET_MIN (sizeof (dua.operation),
-                      strlen (op)));
+  GNUNET_memcpy (dua.operation,
+                 op,
+                 GNUNET_MIN (sizeof (dua.operation),
+                             strlen (op)));
   return
     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_EXPIRED,
                                 &dua,
@@ -1301,11 +1414,6 @@ struct TALER_PurseCreateDepositConfirmationPS
   struct TALER_PurseContractPublicKeyP purse_pub;
 
   /**
-   * Public key of the merge capability.
-   */
-  struct TALER_PurseMergePublicKeyP merge_pub;
-
-  /**
    * Hash of the contract of the purse.
    */
   struct TALER_PrivateContractHashP h_contract_terms;
@@ -1323,7 +1431,6 @@ TALER_exchange_online_purse_created_sign (
   const struct TALER_Amount *amount_without_fee,
   const struct TALER_Amount *total_deposited,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   struct TALER_ExchangePublicKeyP *pub,
   struct TALER_ExchangeSignatureP *sig)
@@ -1333,7 +1440,6 @@ TALER_exchange_online_purse_created_sign (
     .purpose.size = htonl (sizeof (dc)),
     .h_contract_terms = *h_contract_terms,
     .purse_pub = *purse_pub,
-    .merge_pub = *merge_pub,
     .purse_expiration = GNUNET_TIME_timestamp_hton (purse_expiration),
     .exchange_time = GNUNET_TIME_timestamp_hton (exchange_time)
   };
@@ -1355,7 +1461,6 @@ TALER_exchange_online_purse_created_verify (
   const struct TALER_Amount *amount_without_fee,
   const struct TALER_Amount *total_deposited,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
-  const struct TALER_PurseMergePublicKeyP *merge_pub,
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_ExchangePublicKeyP *pub,
   const struct TALER_ExchangeSignatureP *sig)
@@ -1365,7 +1470,6 @@ TALER_exchange_online_purse_created_verify (
     .purpose.size = htonl (sizeof (dc)),
     .h_contract_terms = *h_contract_terms,
     .purse_pub = *purse_pub,
-    .merge_pub = *merge_pub,
     .purse_expiration = GNUNET_TIME_timestamp_hton (purse_expiration),
     .exchange_time = GNUNET_TIME_timestamp_hton (exchange_time)
   };
@@ -1386,6 +1490,100 @@ GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Response by which the exchange affirms that it has
+ * received funds deposited into a purse.
+ */
+struct TALER_CoinPurseRefundConfirmationPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Public key of the purse.
+   */
+  struct TALER_PurseContractPublicKeyP purse_pub;
+
+  /**
+   * Public key of the coin.
+   */
+  struct TALER_CoinSpendPublicKeyP coin_pub;
+
+  /**
+   * How much will be refunded to the purse.
+   */
+  struct TALER_AmountNBO refunded_amount;
+
+  /**
+   * How much was the refund fee.
+   */
+  struct TALER_AmountNBO refund_fee;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+enum TALER_ErrorCode
+TALER_exchange_online_purse_refund_sign (
+  TALER_ExchangeSignCallback scb,
+  const struct TALER_Amount *amount_without_fee,
+  const struct TALER_Amount *refund_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig)
+{
+  struct TALER_CoinPurseRefundConfirmationPS dc = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND),
+    .purpose.size = htonl (sizeof (dc)),
+    .coin_pub = *coin_pub,
+    .purse_pub = *purse_pub,
+  };
+
+  TALER_amount_hton (&dc.refunded_amount,
+                     amount_without_fee);
+  TALER_amount_hton (&dc.refund_fee,
+                     refund_fee);
+  return scb (&dc.purpose,
+              pub,
+              sig);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_purse_refund_verify (
+  const struct TALER_Amount *amount_without_fee,
+  const struct TALER_Amount *refund_fee,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_ExchangePublicKeyP *pub,
+  const struct TALER_ExchangeSignatureP *sig)
+{
+  struct TALER_CoinPurseRefundConfirmationPS dc = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND),
+    .purpose.size = htonl (sizeof (dc)),
+    .coin_pub = *coin_pub,
+    .purse_pub = *purse_pub,
+  };
+
+  TALER_amount_hton (&dc.refunded_amount,
+                     amount_without_fee);
+  TALER_amount_hton (&dc.refund_fee,
+                     refund_fee);
+  return
+    GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND,
+                                &dc,
+                                &sig->eddsa_signature,
+                                &pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Response by which the exchange affirms that it has
  * merged a purse into a reserve.
  */
 struct TALER_PurseMergedConfirmationPS
@@ -1594,4 +1792,103 @@ TALER_exchange_online_purse_status_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by the exchange to affirm that the
+ * owner of a reserve has certain attributes.
+ */
+struct TALER_ExchangeAttestPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Time when the attestation was made.
+   */
+  struct GNUNET_TIME_TimestampNBO attest_timestamp;
+
+  /**
+   * Time when the attestation expires.
+   */
+  struct GNUNET_TIME_TimestampNBO expiration_time;
+
+  /**
+   * Public key of the reserve for which the attributes
+   * are attested.
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Hash over the attributes.
+   */
+  struct GNUNET_HashCode h_attributes;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+enum TALER_ErrorCode
+TALER_exchange_online_reserve_attest_details_sign (
+  TALER_ExchangeSignCallback scb,
+  struct GNUNET_TIME_Timestamp attest_timestamp,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const json_t *attributes,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig)
+{
+  struct TALER_ExchangeAttestPS rap = {
+    .purpose.size = htonl (sizeof (rap)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS),
+    .attest_timestamp = GNUNET_TIME_timestamp_hton (attest_timestamp),
+    .expiration_time = GNUNET_TIME_timestamp_hton (expiration_time),
+    .reserve_pub = *reserve_pub
+  };
+
+  TALER_json_hash (attributes,
+                   &rap.h_attributes);
+  return scb (&rap.purpose,
+              pub,
+              sig);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_exchange_online_reserve_attest_details_verify (
+  struct GNUNET_TIME_Timestamp attest_timestamp,
+  struct GNUNET_TIME_Timestamp expiration_time,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const json_t *attributes,
+  struct TALER_ExchangePublicKeyP *pub,
+  struct TALER_ExchangeSignatureP *sig)
+{
+  struct TALER_ExchangeAttestPS rap = {
+    .purpose.size = htonl (sizeof (rap)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS),
+    .attest_timestamp = GNUNET_TIME_timestamp_hton (attest_timestamp),
+    .expiration_time = GNUNET_TIME_timestamp_hton (expiration_time),
+    .reserve_pub = *reserve_pub
+  };
+
+  TALER_json_hash (attributes,
+                   &rap.h_attributes);
+  if (GNUNET_OK !=
+      GNUNET_CRYPTO_eddsa_verify (
+        TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS,
+        &rap,
+        &sig->eddsa_signature,
+        &pub->eddsa_pub))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
 /* end of exchange_signatures.c */
diff --git a/src/util/iban.c b/src/util/iban.c
index efd8c4282..c2274d3cb 100644
--- a/src/util/iban.c
+++ b/src/util/iban.c
@@ -233,9 +233,9 @@ TALER_iban_validate (const char *iban)
     return GNUNET_strdup ("IBAN number too short to be valid");
   if (len > 34)
     return GNUNET_strdup ("IBAN number too long to be valid");
-  memcpy (cc, iban, 2);
-  memcpy (ibancpy, iban + 4, len - 4);
-  memcpy (ibancpy + len - 4, iban, 4);
+  GNUNET_memcpy (cc, iban, 2);
+  GNUNET_memcpy (ibancpy, iban + 4, len - 4);
+  GNUNET_memcpy (ibancpy + len - 4, iban, 4);
   ibancpy[len] = '\0';
   cc_entry.code = cc;
   cc_entry.english = NULL;
diff --git a/src/util/merchant_signatures.c b/src/util/merchant_signatures.c
index 112f92253..35e0b0e07 100644
--- a/src/util/merchant_signatures.c
+++ b/src/util/merchant_signatures.c
@@ -47,12 +47,6 @@ struct TALER_DepositTrackPS
   struct TALER_MerchantWireHashP h_wire GNUNET_PACKED;
 
   /**
-   * The Merchant's public key.  The deposit inquiry request is to be
-   * signed by the corresponding private key (using EdDSA).
-   */
-  struct TALER_MerchantPublicKeyP merchant;
-
-  /**
    * The coin's public key.  This is the value that must have been
    * signed (blindly) by the Exchange.
    */
@@ -68,7 +62,6 @@ TALER_merchant_deposit_sign (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
-  const struct TALER_MerchantPublicKeyP *merchant_pub,
   const struct TALER_MerchantPrivateKeyP *merchant_priv,
   struct TALER_MerchantSignatureP *merchant_sig)
 {
@@ -77,9 +70,9 @@ TALER_merchant_deposit_sign (
     .purpose.size = htonl (sizeof (dtp)),
     .h_contract_terms = *h_contract_terms,
     .h_wire = *h_wire,
-    .merchant = *merchant_pub,
     .coin_pub = *coin_pub
   };
+
   GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv,
                             &dtp,
                             &merchant_sig->eddsa_sig);
@@ -97,7 +90,6 @@ TALER_merchant_deposit_verify (
   struct TALER_DepositTrackPS tps = {
     .purpose.size = htonl (sizeof (tps)),
     .purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION),
-    .merchant = *merchant,
     .coin_pub = *coin_pub,
     .h_contract_terms = *h_contract_terms,
     .h_wire = *h_wire
@@ -107,7 +99,7 @@ TALER_merchant_deposit_verify (
     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION,
                                 &tps,
                                 &merchant_sig->eddsa_sig,
-                                &tps.merchant.eddsa_pub);
+                                &merchant->eddsa_pub);
 }
 
 
@@ -285,7 +277,7 @@ void
 TALER_merchant_pay_sign (
   const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_MerchantPrivateKeyP *merch_priv,
-  struct GNUNET_CRYPTO_EddsaSignature *merch_sig)
+  struct TALER_MerchantSignatureP *merch_sig)
 {
   struct TALER_PaymentResponsePS mr = {
     .purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_PAYMENT_OK),
@@ -295,7 +287,7 @@ TALER_merchant_pay_sign (
 
   GNUNET_CRYPTO_eddsa_sign (&merch_priv->eddsa_priv,
                             &mr,
-                            merch_sig);
+                            &merch_sig->eddsa_sig);
 }
 
 
diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c
index 54da2b114..fbff850df 100644
--- a/src/util/offline_signatures.c
+++ b/src/util/offline_signatures.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020-2022 Taler Systems SA
+  Copyright (C) 2020-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,99 @@ GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * @brief Signature made by the exchange offline key over the information of
+ * an AML officer status change.
+ */
+struct TALER_MasterAmlOfficerStatusPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_MASTER_AML_KEY.   Signed
+   * by a `struct TALER_MasterPublicKeyP` using EdDSA.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Time of the change.
+   */
+  struct GNUNET_TIME_TimestampNBO change_date;
+
+  /**
+   * Public key of the AML officer.
+   */
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
+
+  /**
+   * Hash over the AML officer's name.
+   */
+  struct GNUNET_HashCode h_officer_name GNUNET_PACKED;
+
+  /**
+   * Bitmask: 1 if enabled; 2 for read-only access. in NBO.
+   */
+  uint32_t is_active GNUNET_PACKED;
+};
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_exchange_offline_aml_officer_status_sign (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterPrivateKeyP *master_priv,
+  struct TALER_MasterSignatureP *master_sig)
+{
+  struct TALER_MasterAmlOfficerStatusPS as = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_AML_KEY),
+    .purpose.size = htonl (sizeof (as)),
+    .change_date = GNUNET_TIME_timestamp_hton (change_date),
+    .officer_pub = *officer_pub,
+    .is_active = htonl ((is_active ? 1 : 0) + (read_only ? 2 : 0))
+  };
+
+  GNUNET_CRYPTO_hash (officer_name,
+                      strlen (officer_name) + 1,
+                      &as.h_officer_name);
+  GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
+                            &as,
+                            &master_sig->eddsa_signature);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_exchange_offline_aml_officer_status_verify (
+  const struct TALER_AmlOfficerPublicKeyP *officer_pub,
+  const char *officer_name,
+  struct GNUNET_TIME_Timestamp change_date,
+  bool is_active,
+  bool read_only,
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct TALER_MasterAmlOfficerStatusPS as = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_AML_KEY),
+    .purpose.size = htonl (sizeof (as)),
+    .change_date = GNUNET_TIME_timestamp_hton (change_date),
+    .officer_pub = *officer_pub,
+    .is_active = htonl ((is_active ? 1 : 0) + (read_only ? 2 : 0))
+  };
+
+  GNUNET_CRYPTO_hash (officer_name,
+                      strlen (officer_name) + 1,
+                      &as.h_officer_name);
+  return GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_AML_KEY,
+                                     &as,
+                                     &master_sig->eddsa_signature,
+                                     &master_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * @brief Signature made by the exchange offline key over the information of
  * an auditor to be added to the exchange's set of auditors.
  */
 struct TALER_MasterAddAuditorPS
@@ -584,6 +677,22 @@ struct TALER_MasterAddWirePS
    * Hash over the exchange's payto URI.
    */
   struct TALER_PaytoHashP h_payto GNUNET_PACKED;
+
+  /**
+   * Hash over the conversion URL, all zeros if there
+   * is no conversion URL.
+   */
+  struct GNUNET_HashCode h_conversion_url;
+
+  /**
+   * Hash over the debit restrictions.
+   */
+  struct GNUNET_HashCode h_debit_restrictions;
+
+  /**
+   * Hash over the credit restrictions.
+   */
+  struct GNUNET_HashCode h_credit_restrictions;
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -592,6 +701,9 @@ GNUNET_NETWORK_STRUCT_END
 void
 TALER_exchange_offline_wire_add_sign (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp now,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig)
@@ -604,6 +716,14 @@ TALER_exchange_offline_wire_add_sign (
 
   TALER_payto_hash (payto_uri,
                     &kv.h_payto);
+  if (NULL != conversion_url)
+    GNUNET_CRYPTO_hash (conversion_url,
+                        strlen (conversion_url) + 1,
+                        &kv.h_conversion_url);
+  TALER_json_hash (debit_restrictions,
+                   &kv.h_debit_restrictions);
+  TALER_json_hash (credit_restrictions,
+                   &kv.h_credit_restrictions);
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
                             &kv,
                             &master_sig->eddsa_signature);
@@ -613,6 +733,9 @@ TALER_exchange_offline_wire_add_sign (
 enum GNUNET_GenericReturnValue
 TALER_exchange_offline_wire_add_verify (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   struct GNUNET_TIME_Timestamp sign_time,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig)
@@ -625,6 +748,14 @@ TALER_exchange_offline_wire_add_verify (
 
   TALER_payto_hash (payto_uri,
                     &aw.h_payto);
+  if (NULL != conversion_url)
+    GNUNET_CRYPTO_hash (conversion_url,
+                        strlen (conversion_url) + 1,
+                        &aw.h_conversion_url);
+  TALER_json_hash (debit_restrictions,
+                   &aw.h_debit_restrictions);
+  TALER_json_hash (credit_restrictions,
+                   &aw.h_credit_restrictions);
   return
     GNUNET_CRYPTO_eddsa_verify (
     TALER_SIGNATURE_MASTER_ADD_WIRE,
@@ -840,15 +971,6 @@ struct TALER_MasterGlobalFeePS
   struct GNUNET_TIME_RelativeNBO purse_timeout;
 
   /**
-   * How long does the exchange promise to keep funds
-   * an account for which the KYC has never happened
-   * after a purse was merged into an account? Basically,
-   * after this time funds in an account without KYC are
-   * forfeit.
-   */
-  struct GNUNET_TIME_RelativeNBO kyc_timeout;
-
-  /**
    * How long will the exchange preserve the account history?  After an
    * account was deleted/closed, the exchange will retain the account history
    * for legal reasons until this time.
@@ -878,27 +1000,25 @@ TALER_exchange_offline_global_fee_sign (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig)
 {
-  struct TALER_MasterGlobalFeePS kv = {
+  struct TALER_MasterGlobalFeePS wf = {
     .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_GLOBAL_FEES),
-    .purpose.size = htonl (sizeof (kv)),
+    .purpose.size = htonl (sizeof (wf)),
     .start_date = GNUNET_TIME_timestamp_hton (start_time),
     .end_date = GNUNET_TIME_timestamp_hton (end_time),
     .purse_timeout = GNUNET_TIME_relative_hton (purse_timeout),
-    .kyc_timeout = GNUNET_TIME_relative_hton (kyc_timeout),
     .history_expiration = GNUNET_TIME_relative_hton (history_expiration),
     .purse_account_limit = htonl (purse_account_limit)
   };
 
-  TALER_global_fee_set_hton (&kv.fees,
+  TALER_global_fee_set_hton (&wf.fees,
                              fees);
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
-                            &kv,
+                            &wf,
                             &master_sig->eddsa_signature);
 }
 
@@ -909,7 +1029,6 @@ TALER_exchange_offline_global_fee_verify (
   struct GNUNET_TIME_Timestamp end_time,
   const struct TALER_GlobalFeeSet *fees,
   struct GNUNET_TIME_Relative purse_timeout,
-  struct GNUNET_TIME_Relative kyc_timeout,
   struct GNUNET_TIME_Relative history_expiration,
   uint32_t purse_account_limit,
   const struct TALER_MasterPublicKeyP *master_pub,
@@ -921,7 +1040,6 @@ TALER_exchange_offline_global_fee_verify (
     .start_date = GNUNET_TIME_timestamp_hton (start_time),
     .end_date = GNUNET_TIME_timestamp_hton (end_time),
     .purse_timeout = GNUNET_TIME_relative_hton (purse_timeout),
-    .kyc_timeout = GNUNET_TIME_relative_hton (kyc_timeout),
     .history_expiration = GNUNET_TIME_relative_hton (history_expiration),
     .purse_account_limit = htonl (purse_account_limit)
   };
@@ -939,10 +1057,10 @@ TALER_exchange_offline_global_fee_verify (
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * @brief Signature made by the exchange offline key over the
- * configuration of an extension.
+ * @brief Signature made by the exchange offline key over the manifest of
+ * an extension.
  */
-struct TALER_MasterExtensionConfigurationPS
+struct TALER_MasterExtensionManifestPS
 {
   /**
    * Purpose is #TALER_SIGNATURE_MASTER_EXTENSION.   Signed
@@ -951,24 +1069,24 @@ struct TALER_MasterExtensionConfigurationPS
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * Hash of the JSON object that represents the configuration of an extension.
+   * Hash of the JSON object that represents the manifests of extensions.
    */
-  struct TALER_ExtensionConfigHashP h_config GNUNET_PACKED;
+  struct TALER_ExtensionManifestsHashP h_manifest GNUNET_PACKED;
 };
 
 GNUNET_NETWORK_STRUCT_END
 
 
 void
-TALER_exchange_offline_extension_config_hash_sign (
-  const struct TALER_ExtensionConfigHashP *h_config,
+TALER_exchange_offline_extension_manifests_hash_sign (
+  const struct TALER_ExtensionManifestsHashP *h_manifest,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig)
 {
-  struct TALER_MasterExtensionConfigurationPS ec = {
+  struct TALER_MasterExtensionManifestPS ec = {
     .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_EXTENSION),
     .purpose.size = htonl (sizeof(ec)),
-    .h_config = *h_config
+    .h_manifest = *h_manifest
   };
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
                             &ec,
@@ -977,16 +1095,16 @@ TALER_exchange_offline_extension_config_hash_sign (
 
 
 enum GNUNET_GenericReturnValue
-TALER_exchange_offline_extension_config_hash_verify (
-  const struct TALER_ExtensionConfigHashP *h_config,
+TALER_exchange_offline_extension_manifests_hash_verify (
+  const struct TALER_ExtensionManifestsHashP *h_manifest,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig
   )
 {
-  struct TALER_MasterExtensionConfigurationPS ec = {
+  struct TALER_MasterExtensionManifestPS ec = {
     .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_EXTENSION),
     .purpose.size = htonl (sizeof(ec)),
-    .h_config = *h_config
+    .h_manifest = *h_manifest
   };
 
   return GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_EXTENSION,
@@ -1015,6 +1133,22 @@ struct TALER_MasterWireDetailsPS
    */
   struct TALER_PaytoHashP h_wire_details GNUNET_PACKED;
 
+  /**
+   * Hash over the conversion URL, all zeros if there
+   * is no conversion URL.
+   */
+  struct GNUNET_HashCode h_conversion_url;
+
+  /**
+   * Hash over the debit restrictions.
+   */
+  struct GNUNET_HashCode h_debit_restrictions;
+
+  /**
+   * Hash over the credit restrictions.
+   */
+  struct GNUNET_HashCode h_credit_restrictions;
+
 };
 
 GNUNET_NETWORK_STRUCT_END
@@ -1023,6 +1157,9 @@ GNUNET_NETWORK_STRUCT_END
 enum GNUNET_GenericReturnValue
 TALER_exchange_wire_signature_check (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   const struct TALER_MasterPublicKeyP *master_pub,
   const struct TALER_MasterSignatureP *master_sig)
 {
@@ -1033,6 +1170,14 @@ TALER_exchange_wire_signature_check (
 
   TALER_payto_hash (payto_uri,
                     &wd.h_wire_details);
+  if (NULL != conversion_url)
+    GNUNET_CRYPTO_hash (conversion_url,
+                        strlen (conversion_url) + 1,
+                        &wd.h_conversion_url);
+  TALER_json_hash (debit_restrictions,
+                   &wd.h_debit_restrictions);
+  TALER_json_hash (credit_restrictions,
+                   &wd.h_credit_restrictions);
   return GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_WIRE_DETAILS,
                                      &wd,
                                      &master_sig->eddsa_signature,
@@ -1043,6 +1188,9 @@ TALER_exchange_wire_signature_check (
 void
 TALER_exchange_wire_signature_make (
   const char *payto_uri,
+  const char *conversion_url,
+  const json_t *debit_restrictions,
+  const json_t *credit_restrictions,
   const struct TALER_MasterPrivateKeyP *master_priv,
   struct TALER_MasterSignatureP *master_sig)
 {
@@ -1053,6 +1201,14 @@ TALER_exchange_wire_signature_make (
 
   TALER_payto_hash (payto_uri,
                     &wd.h_wire_details);
+  if (NULL != conversion_url)
+    GNUNET_CRYPTO_hash (conversion_url,
+                        strlen (conversion_url) + 1,
+                        &wd.h_conversion_url);
+  TALER_json_hash (debit_restrictions,
+                   &wd.h_debit_restrictions);
+  TALER_json_hash (credit_restrictions,
+                   &wd.h_credit_restrictions);
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
                             &wd,
                             &master_sig->eddsa_signature);
@@ -1145,4 +1301,88 @@ TALER_exchange_offline_partner_details_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by account to drain profits
+ * from the escrow account of the exchange.
+ */
+struct TALER_DrainProfitPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_MASTER_DRAIN_PROFITS
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+  struct TALER_WireTransferIdentifierRawP wtid;
+  struct GNUNET_TIME_TimestampNBO date;
+  struct TALER_AmountNBO amount;
+  struct GNUNET_HashCode h_section;
+  struct TALER_PaytoHashP h_payto;
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_exchange_offline_profit_drain_sign (
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_Amount *amount,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterPrivateKeyP *master_priv,
+  struct TALER_MasterSignatureP *master_sig)
+{
+  struct TALER_DrainProfitPS wd = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DRAIN_PROFIT),
+    .purpose.size = htonl (sizeof (wd)),
+    .wtid = *wtid,
+    .date = GNUNET_TIME_timestamp_hton (date),
+  };
+
+  GNUNET_CRYPTO_hash (account_section,
+                      strlen (account_section) + 1,
+                      &wd.h_section);
+  TALER_payto_hash (payto_uri,
+                    &wd.h_payto);
+  TALER_amount_hton (&wd.amount,
+                     amount);
+  GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
+                            &wd,
+                            &master_sig->eddsa_signature);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_exchange_offline_profit_drain_verify (
+  const struct TALER_WireTransferIdentifierRawP *wtid,
+  struct GNUNET_TIME_Timestamp date,
+  const struct TALER_Amount *amount,
+  const char *account_section,
+  const char *payto_uri,
+  const struct TALER_MasterPublicKeyP *master_pub,
+  const struct TALER_MasterSignatureP *master_sig)
+{
+  struct TALER_DrainProfitPS wd = {
+    .purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DRAIN_PROFIT),
+    .purpose.size = htonl (sizeof (wd)),
+    .wtid = *wtid,
+    .date = GNUNET_TIME_timestamp_hton (date),
+  };
+
+  GNUNET_CRYPTO_hash (account_section,
+                      strlen (account_section) + 1,
+                      &wd.h_section);
+  TALER_payto_hash (payto_uri,
+                    &wd.h_payto);
+  TALER_amount_hton (&wd.amount,
+                     amount);
+  return GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_DRAIN_PROFIT,
+                                     &wd,
+                                     &master_sig->eddsa_signature,
+                                     &master_pub->eddsa_pub);
+}
+
+
 /* end of offline_signatures.c */
diff --git a/src/util/paths.conf b/src/util/paths.conf
index c1d2194d8..f34ccb41e 100644
--- a/src/util/paths.conf
+++ b/src/util/paths.conf
@@ -17,13 +17,13 @@ TALER_HOME = ${TALER_TEST_HOME:-${HOME:-${USERPROFILE}}}
 # for how these should be used.
 
 # Persistent data storage
-TALER_DATA_HOME = ${XDG_DATA_HOME:-$TALER_HOME/.local/share}/taler/
+TALER_DATA_HOME = ${XDG_DATA_HOME:-${TALER_HOME}/.local/share}/taler/
 
 # Configuration files
-TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-$TALER_HOME/.config}/taler/
+TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-${TALER_HOME}/.config}/taler/
 
 # Cached data, no big deal if lost
-TALER_CACHE_HOME = ${XDG_CACHE_HOME:-$TALER_HOME/.cache}/taler/
+TALER_CACHE_HOME = ${XDG_CACHE_HOME:-${TALER_HOME}/.cache}/taler/
 
 # Runtime data (always lost on system boot)
 TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-system-runtime/
diff --git a/src/util/payto.c b/src/util/payto.c
index 442107a0f..6092b73fd 100644
--- a/src/util/payto.c
+++ b/src/util/payto.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2019-2021 Taler Systems SA
+  Copyright (C) 2019-2024 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
@@ -101,7 +101,9 @@ TALER_payto_get_method (const char *payto_uri)
 char *
 TALER_xtalerbank_account_from_payto (const char *payto)
 {
+  const char *host;
   const char *beg;
+  const char *nxt;
   const char *end;
 
   if (0 != strncasecmp (payto,
@@ -111,20 +113,27 @@ TALER_xtalerbank_account_from_payto (const char *payto)
     GNUNET_break_op (0);
     return NULL;
   }
-  beg = strchr (&payto[strlen (PAYTO "x-taler-bank/")],
+  host = &payto[strlen (PAYTO "x-taler-bank/")];
+  beg = strchr (host,
                 '/');
   if (NULL == beg)
   {
     GNUNET_break_op (0);
     return NULL;
   }
-  beg++; /* now points to $ACCOUNT */
+  beg++; /* now points to $ACCOUNT or $PATH */
+  nxt = strchr (beg,
+                '/');
   end = strchr (beg,
                 '?');
   if (NULL == end)
+    end = &beg[strlen (beg)];
+  while ( (NULL != nxt) &&
+          (end - nxt > 0) )
   {
-    GNUNET_break_op (0);
-    return GNUNET_strdup (beg); /* optional part is missing */
+    beg = nxt + 1;
+    nxt = strchr (beg,
+                  '/');
   }
   return GNUNET_strndup (beg,
                          end - beg);
@@ -152,7 +161,6 @@ validate_payto_iban (const char *account_url)
                         IBAN_PREFIX,
                         strlen (IBAN_PREFIX)))
     return NULL; /* not an IBAN */
-
   iban = strrchr (account_url, '/') + 1;
 #undef IBAN_PREFIX
   q = strchr (iban,
@@ -186,6 +194,138 @@ validate_payto_iban (const char *account_url)
 }
 
 
+/**
+ * Validate payto://x-taler-bank/ account URL (only account information,
+ * wire subject and amount are ignored).
+ *
+ * @param account_url payto URL to parse
+ * @return NULL on success, otherwise an error message
+ *      to be freed by the caller
+ */
+static char *
+validate_payto_xtalerbank (const char *account_url)
+{
+  const char *user;
+  const char *nxt;
+  const char *beg;
+  const char *end;
+  const char *host;
+  bool dot_ok;
+  bool post_colon;
+  bool port_ok;
+
+#define XTALERBANK_PREFIX PAYTO "x-taler-bank/"
+  if (0 != strncasecmp (account_url,
+                        XTALERBANK_PREFIX,
+                        strlen (XTALERBANK_PREFIX)))
+    return NULL; /* not an IBAN */
+  host = &account_url[strlen (XTALERBANK_PREFIX)];
+#undef XTALERBANK_PREFIX
+  beg = strchr (host,
+                '/');
+  if (NULL == beg)
+  {
+    return GNUNET_strdup ("account name missing");
+  }
+  beg++; /* now points to $ACCOUNT or $PATH */
+  nxt = strchr (beg,
+                '/');
+  end = strchr (beg,
+                '?');
+  if (NULL == end)
+  {
+    return GNUNET_strdup ("'receiver-name' parameter missing");
+  }
+  while ( (NULL != nxt) &&
+          (end - nxt > 0) )
+  {
+    beg = nxt + 1;
+    nxt = strchr (beg,
+                  '/');
+  }
+  user = beg;
+  if (user == host + 1)
+  {
+    return GNUNET_strdup ("domain name missing");
+  }
+  if ('-' == host[0])
+    return GNUNET_strdup ("invalid character '-' at start of domain name");
+  dot_ok = false;
+  post_colon = false;
+  port_ok = false;
+  while (host != user)
+  {
+    char c = host[0];
+
+    if ('/' == c)
+    {
+      /* path started, do not care about characters
+         in the path */
+      break;
+    }
+    if (':' == c)
+    {
+      post_colon = true;
+      host++;
+      continue;
+    }
+    if (post_colon)
+    {
+      if (! ( ('0' <= c) && ('9' >= c) ) )
+      {
+        char *err;
+
+        GNUNET_asprintf (&err,
+                         "invalid character '%c' in port",
+                         c);
+        return err;
+      }
+      port_ok = true;
+    }
+    else
+    {
+      if ('.' == c)
+      {
+        if (! dot_ok)
+          return GNUNET_strdup ("invalid domain name (misplaced '.')");
+        dot_ok = false;
+      }
+      else
+      {
+        if (! ( ('-' == c) ||
+                ( ('0' <= c) && ('9' >= c) ) ||
+                ( ('a' <= c) && ('z' >= c) ) ||
+                ( ('A' <= c) && ('Z' >= c) ) ) )
+        {
+          char *err;
+
+          GNUNET_asprintf (&err,
+                           "invalid character '%c' in domain name",
+                           c);
+          return err;
+        }
+        dot_ok = true;
+      }
+    }
+    host++;
+  }
+  if (post_colon && (! port_ok) )
+  {
+    return GNUNET_strdup ("port missing after ':'");
+  }
+  {
+    char *target;
+
+    target = payto_get_key (account_url,
+                            "receiver-name=");
+    if (NULL == target)
+      return GNUNET_strdup ("'receiver-name' parameter missing");
+    GNUNET_free (target);
+  }
+  return NULL;
+}
+
+
 char *
 TALER_payto_validate (const char *payto_uri)
 {
@@ -202,7 +342,7 @@ TALER_payto_validate (const char *payto_uri)
     /* This is more strict than RFC 8905, alas we do not need to support messages/instructions/etc.,
        and it is generally better to start with a narrow whitelist; we can be more permissive later ...*/
 #define ALLOWED_CHARACTERS \
-  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/:&?-.,=+"
+        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/:&?-.,=+%~"
     if (NULL == strchr (ALLOWED_CHARACTERS,
                         (int) payto_uri[i]))
     {
@@ -226,6 +366,8 @@ TALER_payto_validate (const char *payto_uri)
 
   if (NULL != (ret = validate_payto_iban (payto_uri)))
     return ret; /* got a definitive answer */
+  if (NULL != (ret = validate_payto_xtalerbank (payto_uri)))
+    return ret; /* got a definitive answer */
 
   /* Insert other bank account validation methods here later! */
 
@@ -233,6 +375,262 @@ TALER_payto_validate (const char *payto_uri)
 }
 
 
+char *
+TALER_payto_get_receiver_name (const char *payto)
+{
+  char *err;
+
+  err = TALER_payto_validate (payto);
+  if (NULL != err)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Invalid payto://-URI `%s': %s\n",
+                payto,
+                err);
+    GNUNET_free (err);
+    return NULL;
+  }
+  return payto_get_key (payto,
+                        "receiver-name=");
+}
+
+
+/**
+ * Normalize "payto://x-taler-bank/$HOSTNAME/[$PATH/]$USERNAME"
+ * URI in @a input.
+ *
+ * Converts to lower-case, except for [$PATH/]$USERNAME which
+ * is case-sensitive.
+ *
+ * @param len number of bytes in @a input
+ * @param input input URL
+ * @return NULL on error, otherwise 0-terminated canonicalized URI.
+ */
+static char *
+normalize_payto_x_taler_bank (size_t len,
+                              const char input[static len])
+{
+  char *res = GNUNET_malloc (len + 1);
+  unsigned int sc = 0;
+
+  for (unsigned int i = 0; i<len; i++)
+  {
+    char c = input[i];
+
+    if ('/' == c)
+      sc++;
+    if (sc < 4)
+      res[i] = (char) tolower ((int) c);
+    else
+      res[i] = c;
+  }
+  return res;
+}
+
+
+/**
+ * Normalize "payto://iban[/$BIC]/$IBAN"
+ * URI in @a input.
+ *
+ * Removes $BIC (if present) and converts $IBAN to upper-case and prefix to
+ * lower-case.
+ *
+ * @param len number of bytes in @a input
+ * @param input input URL
+ * @return NULL on error, otherwise 0-terminated canonicalized URI.
+ */
+static char *
+normalize_payto_iban (size_t len,
+                      const char input[static len])
+{
+  char *res;
+  size_t pos = 0;
+  unsigned int sc = 0;
+  bool have_bic;
+
+  for (unsigned int i = 0; i<len; i++)
+    if ('/' == input[i])
+      sc++;
+  if ( (sc > 4) ||
+       (sc < 3) )
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  have_bic = (4 == sc);
+  res = GNUNET_malloc (len + 1);
+  sc = 0;
+  for (unsigned int i = 0; i<len; i++)
+  {
+    char c = input[i];
+
+    if ('/' == c)
+      sc++;
+    switch (sc)
+    {
+    case 0: /* payto: */
+    case 1: /* / */
+    case 2: /* /iban */
+      res[pos++] = (char) tolower ((int) c);
+      break;
+    case 3: /* /$BIC or /$IBAN */
+      if (have_bic)
+        continue;
+      res[pos++] = (char) toupper ((int) c);
+      break;
+    case 4: /* /$IBAN */
+      res[pos++] = (char) toupper ((int) c);
+      break;
+    }
+  }
+  GNUNET_assert (pos <= len);
+  return res;
+}
+
+
+/**
+ * Normalize "payto://upi/$EMAIL"
+ * URI in @a input.
+ *
+ * Converts to lower-case.
+ *
+ * @param len number of bytes in @a input
+ * @param input input URL
+ * @return NULL on error, otherwise 0-terminated canonicalized URI.
+ */
+static char *
+normalize_payto_upi (size_t len,
+                     const char input[static len])
+{
+  char *res = GNUNET_malloc (len + 1);
+
+  for (unsigned int i = 0; i<len; i++)
+  {
+    char c = input[i];
+
+    res[i] = (char) tolower ((int) c);
+  }
+  return res;
+}
+
+
+/**
+ * Normalize "payto://bitcoin/$ADDRESS"
+ * URI in @a input.
+ *
+ * Converts to lower-case, except for $ADDRESS which
+ * is case-sensitive.
+ *
+ * @param len number of bytes in @a input
+ * @param input input URL
+ * @return NULL on error, otherwise 0-terminated canonicalized URI.
+ */
+static char *
+normalize_payto_bitcoin (size_t len,
+                         const char input[static len])
+{
+  char *res = GNUNET_malloc (len + 1);
+  unsigned int sc = 0;
+
+  for (unsigned int i = 0; i<len; i++)
+  {
+    char c = input[i];
+
+    if ('/' == c)
+      sc++;
+    if (sc < 3)
+      res[i] = (char) tolower ((int) c);
+    else
+      res[i] = c;
+  }
+  return res;
+}
+
+
+/**
+ * Normalize "payto://ilp/$NAME"
+ * URI in @a input.
+ *
+ * Converts to lower-case.
+ *
+ * @param len number of bytes in @a input
+ * @param input input URL
+ * @return NULL on error, otherwise 0-terminated canonicalized URI.
+ */
+static char *
+normalize_payto_ilp (size_t len,
+                     const char input[static len])
+{
+  char *res = GNUNET_malloc (len + 1);
+
+  for (unsigned int i = 0; i<len; i++)
+  {
+    char c = input[i];
+
+    res[i] = (char) tolower ((int) c);
+  }
+  return res;
+}
+
+
+char *
+TALER_payto_normalize (const char *input)
+{
+  char *method;
+  const char *end;
+  char *ret;
+
+  {
+    char *err;
+
+    err = TALER_payto_validate (input);
+    if (NULL != err)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Malformed payto://-URI `%s': %s\n",
+                  input,
+                  err);
+      GNUNET_free (err);
+      return NULL;
+    }
+  }
+  method = TALER_payto_get_method (input);
+  if (NULL == method)
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  end = strchr (input, '?');
+  if (NULL == end)
+    end = &input[strlen (input)];
+  if (0 == strcasecmp (method,
+                       "x-taler-bank"))
+    ret = normalize_payto_x_taler_bank (end - input,
+                                        input);
+  else if (0 == strcasecmp (method,
+                            "iban"))
+    ret = normalize_payto_iban (end - input,
+                                input);
+  else if (0 == strcasecmp (method,
+                            "upi"))
+    ret = normalize_payto_upi (end - input,
+                               input);
+  else if (0 == strcasecmp (method,
+                            "bitcoin"))
+    ret = normalize_payto_bitcoin (end - input,
+                                   input);
+  else if (0 == strcasecmp (method,
+                            "ilp"))
+    ret = normalize_payto_ilp (end - input,
+                               input);
+  else
+    ret = GNUNET_strndup (input,
+                          end - input);
+  GNUNET_free (method);
+  return ret;
+}
+
+
 void
 TALER_payto_hash (const char *payto,
                   struct TALER_PaytoHashP *h_payto)
@@ -244,48 +642,53 @@ TALER_payto_hash (const char *payto,
                       &sha512);
   GNUNET_static_assert (sizeof (sha512) > sizeof (*h_payto));
   /* truncate */
-  memcpy (h_payto,
-          &sha512,
-          sizeof (*h_payto));
+  GNUNET_memcpy (h_payto,
+                 &sha512,
+                 sizeof (*h_payto));
 }
 
 
 char *
-TALER_payto_from_reserve (const char *exchange_base_url,
+TALER_reserve_make_payto (const char *exchange_url,
                           const struct TALER_ReservePublicKeyP *reserve_pub)
 {
-  char *payto_uri;
-  char *rps;
-  unsigned int skip;
-  const char *extra = "";
-  int url_len;
-
-  rps = GNUNET_STRINGS_data_to_string_alloc (reserve_pub,
-                                             sizeof (*reserve_pub));
-  skip = 0;
-  if (0 == strncasecmp (exchange_base_url,
-                        "http://",
-                        strlen ("http://")))
+  char pub_str[sizeof (*reserve_pub) * 2];
+  char *end;
+  bool is_http;
+  char *reserve_url;
+
+  end = GNUNET_STRINGS_data_to_string (
+    reserve_pub,
+    sizeof (*reserve_pub),
+    pub_str,
+    sizeof (pub_str));
+  *end = '\0';
+  if (0 == strncmp (exchange_url,
+                    "http://",
+                    strlen ("http://")))
+  {
+    is_http = true;
+    exchange_url = &exchange_url[strlen ("http://")];
+  }
+  else if (0 == strncmp (exchange_url,
+                         "https://",
+                         strlen ("https://")))
   {
-    skip = strlen ("http://");
-    extra = "+http";
+    is_http = false;
+    exchange_url = &exchange_url[strlen ("https://")];
+  }
+  else
+  {
+    GNUNET_break (0);
+    return NULL;
   }
-  if (0 == strncasecmp (exchange_base_url,
-                        "https://",
-                        strlen ("https://")))
-    skip = strlen ("https://");
-  url_len = strlen (exchange_base_url);
-  if ('/' == exchange_base_url[url_len - 1])
-    url_len--;
-  url_len -= skip;
-  GNUNET_asprintf (&payto_uri,
-                   "taler%s://reserve/%.*s/%s",
-                   extra,
-                   url_len,
-                   exchange_base_url + skip,
-                   rps);
-  GNUNET_free (rps);
-  return payto_uri;
+  /* exchange_url includes trailing '/' */
+  GNUNET_asprintf (&reserve_url,
+                   "payto://%s/%s%s",
+                   is_http ? "taler-reserve-http" : "taler-reserve",
+                   exchange_url,
+                   pub_str);
+  return reserve_url;
 }
 
 
diff --git a/src/util/taler-config.in b/src/util/taler-config.in
index 07f6401d6..3399aec10 100644
--- a/src/util/taler-config.in
+++ b/src/util/taler-config.in
@@ -7,7 +7,7 @@ if ! type gnunet-config >/dev/null; then
   exit 1
 fi
 
-GC=`which gnunet-config`
-SO=`ls %libdir%/libtalerutil.so.* | sort -n | tail -n1`
+GC=$(which gnunet-config)
+SO=$(ls %libdir%/libtalerutil.so.* | sort -n | tail -n1)
 export LD_PRELOAD=${LD_PRELOAD:-}:${SO}
 exec gnunet-config "$@"
diff --git a/src/util/taler-exchange-secmod-cs.c b/src/util/taler-exchange-secmod-cs.c
index 33167c8ea..3e9ba1558 100644
--- a/src/util/taler-exchange-secmod-cs.c
+++ b/src/util/taler-exchange-secmod-cs.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  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
@@ -161,6 +161,164 @@ struct Denomination
 
 
 /**
+ * A semaphore.
+ */
+struct Semaphore
+{
+  /**
+   * Mutex for the semaphore.
+   */
+  pthread_mutex_t mutex;
+
+  /**
+   * Condition variable for the semaphore.
+   */
+  pthread_cond_t cv;
+
+  /**
+   * Counter of the semaphore.
+   */
+  unsigned int ctr;
+};
+
+
+/**
+ * Job in a batch sign request.
+ */
+struct BatchJob;
+
+/**
+ * Handle for a thread that does work in batch signing.
+ */
+struct Worker
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct Worker *prev;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct Worker *next;
+
+  /**
+   * Job this worker should do next.
+   */
+  struct BatchJob *job;
+
+  /**
+   * Semaphore to signal the worker that a job is available.
+   */
+  struct Semaphore sem;
+
+  /**
+   * Handle for this thread.
+   */
+  pthread_t pt;
+
+  /**
+   * Set to true if the worker should terminate.
+   */
+  bool do_shutdown;
+};
+
+
+/**
+ * Job in a batch sign request.
+ */
+struct BatchJob
+{
+
+  /**
+   * Thread doing the work.
+   */
+  struct Worker *worker;
+
+  /**
+   * Semaphore to signal that the job is finished.
+   */
+  struct Semaphore sem;
+
+  /**
+   * Computation status.
+   */
+  enum TALER_ErrorCode ec;
+
+  /**
+   * Which type of request is this?
+   */
+  enum { TYPE_SIGN, TYPE_RDERIVE } type;
+
+  /**
+   * Details depending on @e type.
+   */
+  union
+  {
+
+    /**
+     * Details if @e type is TYPE_SIGN.
+     */
+    struct
+    {
+      /**
+       * Request we are working on.
+       */
+      const struct TALER_CRYPTO_CsSignRequestMessage *sr;
+
+      /**
+       * Result with the signature.
+       */
+      struct GNUNET_CRYPTO_CsBlindSignature cs_answer;
+    } sign;
+
+    /**
+     * Details if type is TYPE_RDERIVE.
+     */
+    struct
+    {
+      /**
+       * Request we are answering.
+       */
+      const struct TALER_CRYPTO_CsRDeriveRequest *rdr;
+
+      /**
+       * Pair of points to return.
+       */
+      struct GNUNET_CRYPTO_CSPublicRPairP rpairp;
+
+    } rderive;
+
+  } details;
+
+};
+
+/**
+ * Head of DLL of workers ready for more work.
+ */
+static struct Worker *worker_head;
+
+/**
+ * Tail of DLL of workers ready for more work.
+ */
+static struct Worker *worker_tail;
+
+/**
+ * Lock for manipulating the worker DLL.
+ */
+static pthread_mutex_t worker_lock;
+
+/**
+ * Total number of workers that were started.
+ */
+static unsigned int workers;
+
+/**
+ * Semaphore used to grab a worker.
+ */
+static struct Semaphore worker_sem;
+
+/**
  * Return value from main().
  */
 static int global_ret;
@@ -183,6 +341,13 @@ static struct GNUNET_TIME_Timestamp now_tmp;
 static char *keydir;
 
 /**
+ * Name of the configuration section prefix to use.  Usually either "taler-exchange" or
+ * "donau". The actual configuration section will then be
+ * "$SECTION-secmod-cs".
+ */
+static char *section;
+
+/**
  * How much should coin creation (@e duration_withdraw) duration overlap
  * with the next denomination?  Basically, the starting time of two
  * denominations is always @e duration_withdraw - #overlap_duration apart.
@@ -225,6 +390,12 @@ static pthread_mutex_t keys_lock;
  */
 static uint64_t key_gen;
 
+/**
+ * Number of workers to launch. Note that connections to
+ * exchanges are NOT workers.
+ */
+static unsigned int max_workers = 16;
+
 
 /**
  * Generate the announcement message for @a dk.
@@ -259,14 +430,139 @@ generate_response (struct DenominationKey *dk)
                                  &an->secm_sig);
   an->secm_pub = TES_smpub;
   p = (void *) &an[1];
-  memcpy (p,
-          denom->section,
-          nlen);
+  GNUNET_memcpy (p,
+                 denom->section,
+                 nlen);
   dk->an = an;
 }
 
 
 /**
+ * Do the actual signing work.
+ *
+ * @param h_cs hash of key to sign with
+ * @param planchet message to sign
+ * @param for_melt true if for melting
+ * @param[out] cs_sigp set to the CS signature
+ * @return #TALER_EC_NONE on success
+ */
+static enum TALER_ErrorCode
+do_sign (const struct TALER_CsPubHashP *h_cs,
+         const struct GNUNET_CRYPTO_CsBlindedMessage *planchet,
+         bool for_melt,
+         struct GNUNET_CRYPTO_CsBlindSignature *cs_sigp)
+{
+  struct GNUNET_CRYPTO_CsRSecret r[2];
+  struct DenominationKey *dk;
+
+  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
+  dk = GNUNET_CONTAINER_multihashmap_get (keys,
+                                          &h_cs->hash);
+  if (NULL == dk)
+  {
+    GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Signing request failed, denomination key %s unknown\n",
+                GNUNET_h2s (&h_cs->hash));
+    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
+  }
+  if (GNUNET_TIME_absolute_is_future (dk->anchor.abs_time))
+  {
+    GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Signing request failed, denomination key %s is not yet valid\n",
+                GNUNET_h2s (&h_cs->hash));
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Received request to sign over bytes with key %s\n",
+              GNUNET_h2s (&h_cs->hash));
+  GNUNET_assert (dk->rc < UINT_MAX);
+  dk->rc++;
+  GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
+  GNUNET_CRYPTO_cs_r_derive (&planchet->nonce,
+                             for_melt ? "rm" : "rw",
+                             &dk->denom_priv,
+                             r);
+  GNUNET_CRYPTO_cs_sign_derive (&dk->denom_priv,
+                                r,
+                                planchet,
+                                cs_sigp);
+  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
+  GNUNET_assert (dk->rc > 0);
+  dk->rc--;
+  GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
+  return TALER_EC_NONE;
+}
+
+
+/**
+ * Generate error response that signing failed.
+ *
+ * @param client client to send response to
+ * @param ec error code to include
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+fail_sign (struct TES_Client *client,
+           enum TALER_ErrorCode ec)
+{
+  struct TALER_CRYPTO_SignFailure sf = {
+    .header.size = htons (sizeof (sf)),
+    .header.type = htons (TALER_HELPER_CS_MT_RES_SIGN_FAILURE),
+    .ec = htonl (ec)
+  };
+
+  return TES_transmit (client->csock,
+                       &sf.header);
+}
+
+
+/**
+ * Generate error response that deriving failed.
+ *
+ * @param client client to send response to
+ * @param ec error code to include
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+fail_derive (struct TES_Client *client,
+             enum TALER_ErrorCode ec)
+{
+  struct TALER_CRYPTO_RDeriveFailure sf = {
+    .header.size = htons (sizeof (sf)),
+    .header.type = htons (TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE),
+    .ec = htonl (ec)
+  };
+
+  return TES_transmit (client->csock,
+                       &sf.header);
+}
+
+
+/**
+ * Generate signature response.
+ *
+ * @param client client to send response to
+ * @param cs_answer signature to send
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+send_signature (struct TES_Client *client,
+                const struct GNUNET_CRYPTO_CsBlindSignature *cs_answer)
+{
+  struct TALER_CRYPTO_SignResponse sres;
+
+  sres.header.size = htons (sizeof (sres));
+  sres.header.type = htons (TALER_HELPER_CS_MT_RES_SIGNATURE);
+  sres.b = htonl (cs_answer->b);
+  sres.cs_answer = cs_answer->s_scalar;
+  return TES_transmit (client->csock,
+                       &sres.header);
+}
+
+
+/**
  * Handle @a client request @a sr to create signature. Create the
  * signature using the respective key and return the result to
  * the client.
@@ -277,108 +573,510 @@ generate_response (struct DenominationKey *dk)
  */
 static enum GNUNET_GenericReturnValue
 handle_sign_request (struct TES_Client *client,
-                     const struct TALER_CRYPTO_CsSignRequest *sr)
+                     const struct TALER_CRYPTO_CsSignRequestMessage *sr)
 {
-  struct DenominationKey *dk;
-  struct GNUNET_CRYPTO_CsRSecret r[2];
-  struct TALER_BlindedDenominationCsSignAnswer cs_answer;
+  struct GNUNET_CRYPTO_CsBlindSignature cs_answer;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  bool for_melt;
+  enum TALER_ErrorCode ec;
+  enum GNUNET_GenericReturnValue ret;
+
+  ec = do_sign (&sr->h_cs,
+                &sr->message,
+                (0 != ntohl (sr->for_melt)),
+                &cs_answer);
+  if (TALER_EC_NONE != ec)
+  {
+    return fail_sign (client,
+                      ec);
+  }
+  ret = send_signature (client,
+                        &cs_answer);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Sent CS signature after %s\n",
+              GNUNET_TIME_relative2s (
+                GNUNET_TIME_absolute_get_duration (now),
+                GNUNET_YES));
+  return ret;
+}
+
+
+/**
+ * Do the actual deriving work.
+ *
+ * @param h_cs key to sign with
+ * @param nonce nonce to derive from
+ * @param for_melt true if for melting
+ * @param[out] rpairp set to the derived values
+ * @return #TALER_EC_NONE on success
+ */
+static enum TALER_ErrorCode
+do_derive (const struct TALER_CsPubHashP *h_cs,
+           const struct GNUNET_CRYPTO_CsSessionNonce *nonce,
+           bool for_melt,
+           struct GNUNET_CRYPTO_CSPublicRPairP *rpairp)
+{
+  struct DenominationKey *dk;
+  struct GNUNET_CRYPTO_CSPrivateRPairP r_priv;
 
   GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   dk = GNUNET_CONTAINER_multihashmap_get (keys,
-                                          &sr->h_cs.hash);
+                                          &h_cs->hash);
   if (NULL == dk)
   {
-    struct TALER_CRYPTO_SignFailure sf = {
-      .header.size = htons (sizeof (sr)),
-      .header.type = htons (TALER_HELPER_CS_MT_RES_SIGN_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN)
-    };
-
     GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Signing request failed, denomination key %s unknown\n",
-                GNUNET_h2s (&sr->h_cs.hash));
-    return TES_transmit (client->csock,
-                         &sf.header);
+                "R Derive request failed, denomination key %s unknown\n",
+                GNUNET_h2s (&h_cs->hash));
+    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
   }
   if (GNUNET_TIME_absolute_is_future (dk->anchor.abs_time))
   {
-    /* it is too early */
-    struct TALER_CRYPTO_SignFailure sf = {
-      .header.size = htons (sizeof (sr)),
-      .header.type = htons (TALER_HELPER_CS_MT_RES_SIGN_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY)
-    };
-
     GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Signing request failed, denomination key %s is not yet valid\n",
-                GNUNET_h2s (&sr->h_cs.hash));
-    return TES_transmit (client->csock,
-                         &sf.header);
+                "R Derive request failed, denomination key %s is not yet valid\n",
+                GNUNET_h2s (&h_cs->hash));
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY;
   }
-  for_melt = (0 != ntohl (sr->for_melt));
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received request to sign over bytes with key %s\n",
-              GNUNET_h2s (&sr->h_cs.hash));
+              "Received request to derive R with key %s\n",
+              GNUNET_h2s (&h_cs->hash));
   GNUNET_assert (dk->rc < UINT_MAX);
   dk->rc++;
   GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-  GNUNET_CRYPTO_cs_r_derive (&sr->planchet.nonce.nonce,
+  GNUNET_CRYPTO_cs_r_derive (nonce,
                              for_melt ? "rm" : "rw",
                              &dk->denom_priv,
-                             r);
-  cs_answer.b = GNUNET_CRYPTO_cs_sign_derive (&dk->denom_priv,
-                                              r,
-                                              sr->planchet.c,
-                                              &sr->planchet.nonce.nonce,
-                                              &cs_answer.s_scalar);
-
+                             r_priv.r);
   GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   GNUNET_assert (dk->rc > 0);
   dk->rc--;
   GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-  // if (NULL == cs_answer)
-  // {
-  //   struct TALER_CRYPTO_SignFailure sf = {
-  //     .header.size = htons (sizeof (sf)),
-  //     .header.type = htons (TALER_HELPER_CS_MT_RES_SIGN_FAILURE),
-  //     .ec = htonl (TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE)
-  //   };
-
-  //   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-  //               "Signing request failed, worker failed to produce signature\n");
-  //   return TES_transmit (client->csock,
-  //                        &sf.header);
-  // }
-
-  {
-    struct TALER_CRYPTO_SignResponse *sr;
-    size_t tsize;
-    enum GNUNET_GenericReturnValue ret;
-
-    tsize = sizeof (*sr) + sizeof(cs_answer);
-    GNUNET_assert (tsize < UINT16_MAX);
-    sr = GNUNET_malloc (tsize);
-    sr->header.size = htons (tsize);
-    sr->header.type = htons (TALER_HELPER_CS_MT_RES_SIGNATURE);
-    sr->cs_answer = cs_answer;
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sending CS signature after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    ret = TES_transmit (client->csock,
-                        &sr->header);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sent CS signature after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    GNUNET_free (sr);
-    return ret;
+  GNUNET_CRYPTO_cs_r_get_public (&r_priv.r[0],
+                                 &rpairp->r_pub[0]);
+  GNUNET_CRYPTO_cs_r_get_public (&r_priv.r[1],
+                                 &rpairp->r_pub[1]);
+  return TALER_EC_NONE;
+}
+
+
+/**
+ * Generate derivation response.
+ *
+ * @param client client to send response to
+ * @param r_pub public point value pair to send
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+send_derivation (struct TES_Client *client,
+                 const struct GNUNET_CRYPTO_CSPublicRPairP *r_pub)
+{
+  struct TALER_CRYPTO_RDeriveResponse rdr = {
+    .header.size = htons (sizeof (rdr)),
+    .header.type = htons (TALER_HELPER_CS_MT_RES_RDERIVE),
+    .r_pub = *r_pub
+  };
+
+  return TES_transmit (client->csock,
+                       &rdr.header);
+}
+
+
+/**
+ * Initialize a semaphore @a sem with a value of @a val.
+ *
+ * @param[out] sem semaphore to initialize
+ * @param val initial value of the semaphore
+ */
+static void
+sem_init (struct Semaphore *sem,
+          unsigned int val)
+{
+  GNUNET_assert (0 ==
+                 pthread_mutex_init (&sem->mutex,
+                                     NULL));
+  GNUNET_assert (0 ==
+                 pthread_cond_init (&sem->cv,
+                                    NULL));
+  sem->ctr = val;
+}
+
+
+/**
+ * Decrement semaphore, blocks until this is possible.
+ *
+ * @param[in,out] sem semaphore to decrement
+ */
+static void
+sem_down (struct Semaphore *sem)
+{
+  GNUNET_assert (0 == pthread_mutex_lock (&sem->mutex));
+  while (0 == sem->ctr)
+  {
+    pthread_cond_wait (&sem->cv,
+                       &sem->mutex);
+  }
+  sem->ctr--;
+  GNUNET_assert (0 == pthread_mutex_unlock (&sem->mutex));
+}
+
+
+/**
+ * Increment semaphore, blocks until this is possible.
+ *
+ * @param[in,out] sem semaphore to decrement
+ */
+static void
+sem_up (struct Semaphore *sem)
+{
+  GNUNET_assert (0 == pthread_mutex_lock (&sem->mutex));
+  sem->ctr++;
+  GNUNET_assert (0 == pthread_mutex_unlock (&sem->mutex));
+  pthread_cond_signal (&sem->cv);
+}
+
+
+/**
+ * Release resources used by @a sem.
+ *
+ * @param[in] sem semaphore to release (except the memory itself)
+ */
+static void
+sem_done (struct Semaphore *sem)
+{
+  GNUNET_break (0 == pthread_cond_destroy (&sem->cv));
+  GNUNET_break (0 == pthread_mutex_destroy (&sem->mutex));
+}
+
+
+/**
+ * Main logic of a worker thread. Grabs work, does it,
+ * grabs more work.
+ *
+ * @param cls a `struct Worker *`
+ * @returns cls
+ */
+static void *
+worker (void *cls)
+{
+  struct Worker *w = cls;
+
+  while (true)
+  {
+    GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+    GNUNET_CONTAINER_DLL_insert (worker_head,
+                                 worker_tail,
+                                 w);
+    GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+    sem_up (&worker_sem);
+    sem_down (&w->sem);
+    if (w->do_shutdown)
+      break;
+    {
+      struct BatchJob *bj = w->job;
+
+      switch (bj->type)
+      {
+      case TYPE_SIGN:
+        {
+          const struct TALER_CRYPTO_CsSignRequestMessage *sr
+            = bj->details.sign.sr;
+
+          bj->ec = do_sign (&sr->h_cs,
+                            &sr->message,
+                            (0 != ntohl (sr->for_melt)),
+                            &bj->details.sign.cs_answer);
+          break;
+        }
+      case TYPE_RDERIVE:
+        {
+          const struct TALER_CRYPTO_CsRDeriveRequest *rdr
+            = bj->details.rderive.rdr;
+          bj->ec = do_derive (&rdr->h_cs,
+                              &rdr->nonce,
+                              (0 != ntohl (rdr->for_melt)),
+                              &bj->details.rderive.rpairp);
+          break;
+        }
+      }
+      sem_up (&bj->sem);
+      w->job = NULL;
+    }
+  }
+  return w;
+}
+
+
+/**
+ * Start batch job @a bj to sign @a sr.
+ *
+ * @param sr signature request to answer
+ * @param[out] bj job data structure
+ */
+static void
+start_sign_job (const struct TALER_CRYPTO_CsSignRequestMessage *sr,
+                struct BatchJob *bj)
+{
+  sem_init (&bj->sem,
+            0);
+  bj->type = TYPE_SIGN;
+  bj->details.sign.sr = sr;
+  sem_down (&worker_sem);
+  GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+  bj->worker = worker_head;
+  GNUNET_CONTAINER_DLL_remove (worker_head,
+                               worker_tail,
+                               bj->worker);
+  GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+  bj->worker->job = bj;
+  sem_up (&bj->worker->sem);
+}
+
+
+/**
+ * Start batch job @a bj to derive @a rdr.
+ *
+ * @param rdr derivation request to answer
+ * @param[out] bj job data structure
+ */
+static void
+start_derive_job (const struct TALER_CRYPTO_CsRDeriveRequest *rdr,
+                  struct BatchJob *bj)
+{
+  sem_init (&bj->sem,
+            0);
+  bj->type = TYPE_RDERIVE;
+  bj->details.rderive.rdr = rdr;
+  sem_down (&worker_sem);
+  GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+  bj->worker = worker_head;
+  GNUNET_CONTAINER_DLL_remove (worker_head,
+                               worker_tail,
+                               bj->worker);
+  GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+  bj->worker->job = bj;
+  sem_up (&bj->worker->sem);
+}
+
+
+/**
+ * Finish a job @a bj for a @a client.
+ *
+ * @param client who made the request
+ * @param[in,out] bj job to finish
+ */
+static void
+finish_job (struct TES_Client *client,
+            struct BatchJob *bj)
+{
+  sem_down (&bj->sem);
+  sem_done (&bj->sem);
+  switch (bj->type)
+  {
+  case TYPE_SIGN:
+    if (TALER_EC_NONE != bj->ec)
+    {
+      fail_sign (client,
+                 bj->ec);
+      return;
+    }
+    send_signature (client,
+                    &bj->details.sign.cs_answer);
+    break;
+  case TYPE_RDERIVE:
+    if (TALER_EC_NONE != bj->ec)
+    {
+      fail_derive (client,
+                   bj->ec);
+      return;
+    }
+    send_derivation (client,
+                     &bj->details.rderive.rpairp);
+    break;
+  }
+}
+
+
+/**
+ * Handle @a client request @a sr to create a batch of signature. Creates the
+ * signatures using the respective key and return the results to the client.
+ *
+ * @param client the client making the request
+ * @param bsr the request details
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_batch_sign_request (struct TES_Client *client,
+                           const struct TALER_CRYPTO_BatchSignRequest *bsr)
+{
+  uint32_t bs = ntohl (bsr->batch_size);
+  uint16_t size = ntohs (bsr->header.size) - sizeof (*bsr);
+  const void *off = (const void *) &bsr[1];
+  unsigned int idx = 0;
+  struct BatchJob jobs[GNUNET_NZL (bs)];
+  bool failure = false;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Handling batch sign request of size %u\n",
+              (unsigned int) bs);
+  if (bs > TALER_MAX_FRESH_COINS)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  while ( (bs > 0) &&
+          (size >= sizeof (struct TALER_CRYPTO_CsSignRequestMessage)) )
+  {
+    const struct TALER_CRYPTO_CsSignRequestMessage *sr = off;
+    uint16_t s = ntohs (sr->header.size);
+
+    if (s > size)
+    {
+      failure = true;
+      bs = idx;
+      break;
+    }
+    start_sign_job (sr,
+                    &jobs[idx++]);
+    off += s;
+    size -= s;
+  }
+  GNUNET_break_op (0 == size);
+  bs = GNUNET_MIN (bs,
+                   idx);
+  for (unsigned int i = 0; i<bs; i++)
+    finish_job (client,
+                &jobs[i]);
+  if (failure)
+  {
+    struct TALER_CRYPTO_SignFailure sf = {
+      .header.size = htons (sizeof (sf)),
+      .header.type = htons (TALER_HELPER_CS_MT_RES_BATCH_SIGN_FAILURE),
+      .ec = htonl (TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE)
+    };
+
+    GNUNET_break (0);
+    return TES_transmit (client->csock,
+                         &sf.header);
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handle @a client request @a sr to create a batch of derivations. Creates the
+ * derivations using the respective key and return the results to the client.
+ *
+ * @param client the client making the request
+ * @param bdr the request details
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_batch_derive_request (struct TES_Client *client,
+                             const struct TALER_CRYPTO_BatchDeriveRequest *bdr)
+{
+  uint32_t bs = ntohl (bdr->batch_size);
+  uint16_t size = ntohs (bdr->header.size) - sizeof (*bdr);
+  const void *off = (const void *) &bdr[1];
+  unsigned int idx = 0;
+  struct BatchJob jobs[bs];
+  bool failure = false;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Handling batch derivation request of size %u\n",
+              (unsigned int) bs);
+  if (bs > TALER_MAX_FRESH_COINS)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  while ( (bs > 0) &&
+          (size >= sizeof (struct TALER_CRYPTO_CsRDeriveRequest)) )
+  {
+    const struct TALER_CRYPTO_CsRDeriveRequest *rdr = off;
+    uint16_t s = ntohs (rdr->header.size);
+
+    if ( (s > size) ||
+         (s != sizeof (*rdr)) )
+    {
+      failure = true;
+      bs = idx;
+      break;
+    }
+    start_derive_job (rdr,
+                      &jobs[idx++]);
+    off += s;
+    size -= s;
+  }
+  GNUNET_break_op (0 == size);
+  bs = GNUNET_MIN (bs,
+                   idx);
+  for (unsigned int i = 0; i<bs; i++)
+    finish_job (client,
+                &jobs[i]);
+  if (failure)
+  {
+    GNUNET_break (0);
+    return fail_derive (client,
+                        TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE);
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Start worker thread for batch processing.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+start_worker (void)
+{
+  struct Worker *w;
+
+  w = GNUNET_new (struct Worker);
+  sem_init (&w->sem,
+            0);
+  if (0 != pthread_create (&w->pt,
+                           NULL,
+                           &worker,
+                           w))
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                         "pthread_create");
+    GNUNET_free (w);
+    return GNUNET_SYSERR;
+  }
+  workers++;
+  return GNUNET_OK;
+}
+
+
+/**
+ * Stop all worker threads.
+ */
+static void
+stop_workers (void)
+{
+  while (workers > 0)
+  {
+    struct Worker *w;
+    void *result;
+
+    sem_down (&worker_sem);
+    GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+    w = worker_head;
+    GNUNET_CONTAINER_DLL_remove (worker_head,
+                                 worker_tail,
+                                 w);
+    GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+    w->do_shutdown = true;
+    sem_up (&w->sem);
+    pthread_join (w->pt,
+                  &result);
+    GNUNET_assert (result == w);
+    sem_done (&w->sem);
+    GNUNET_free (w);
+    workers--;
   }
 }
 
@@ -401,8 +1099,9 @@ setup_key (struct DenominationKey *dk,
   GNUNET_CRYPTO_cs_private_key_generate (&priv);
   GNUNET_CRYPTO_cs_private_key_get_public (&priv,
                                            &pub);
-  TALER_cs_pub_hash (&pub,
-                     &dk->h_cs);
+  GNUNET_CRYPTO_hash (&pub,
+                      sizeof (pub),
+                      &dk->h_cs.hash);
   GNUNET_asprintf (&dk->filename,
                    "%s/%s/%llu",
                    keydir,
@@ -550,88 +1249,29 @@ static enum GNUNET_GenericReturnValue
 handle_r_derive_request (struct TES_Client *client,
                          const struct TALER_CRYPTO_CsRDeriveRequest *rdr)
 {
-  struct DenominationKey *dk;
-  struct TALER_DenominationCSPrivateRPairP r_priv;
-  struct TALER_DenominationCSPublicRPairP r_pub;
+  struct GNUNET_CRYPTO_CSPublicRPairP r_pub;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
-  bool for_melt;
+  enum TALER_ErrorCode ec;
+  enum GNUNET_GenericReturnValue ret;
 
-  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
-  dk = GNUNET_CONTAINER_multihashmap_get (keys,
-                                          &rdr->h_cs.hash);
-  if (NULL == dk)
+  ec = do_derive (&rdr->h_cs,
+                  &rdr->nonce,
+                  (0 != ntohl (rdr->for_melt)),
+                  &r_pub);
+  if (TALER_EC_NONE != ec)
   {
-    struct TALER_CRYPTO_RDeriveFailure rdf = {
-      .header.size = htons (sizeof (rdr)),
-      .header.type = htons (TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN)
-    };
-
-    GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "R Derive request failed, denomination key %s unknown\n",
-                GNUNET_h2s (&rdr->h_cs.hash));
-    return TES_transmit (client->csock,
-                         &rdf.header);
+    return fail_derive (client,
+                        ec);
   }
-  if (GNUNET_TIME_absolute_is_future (dk->anchor.abs_time))
-  {
-    /* it is too early */
-    struct TALER_CRYPTO_RDeriveFailure rdf = {
-      .header.size = htons (sizeof (rdr)),
-      .header.type = htons (TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY)
-    };
 
-    GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "R Derive request failed, denomination key %s is not yet valid\n",
-                GNUNET_h2s (&rdr->h_cs.hash));
-    return TES_transmit (client->csock,
-                         &rdf.header);
-  }
-  for_melt = (0 != ntohl (rdr->for_melt));
+  ret = send_derivation (client,
+                         &r_pub);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Received request to derive R with key %s\n",
-              GNUNET_h2s (&rdr->h_cs.hash));
-  GNUNET_assert (dk->rc < UINT_MAX);
-  dk->rc++;
-  GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-  GNUNET_CRYPTO_cs_r_derive (&rdr->nonce.nonce,
-                             for_melt ? "rm" : "rw",
-                             &dk->denom_priv,
-                             r_priv.r);
-  GNUNET_CRYPTO_cs_r_get_public (&r_priv.r[0],
-                                 &r_pub.r_pub[0]);
-  GNUNET_CRYPTO_cs_r_get_public (&r_priv.r[1],
-                                 &r_pub.r_pub[1]);
-  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
-  GNUNET_assert (dk->rc > 0);
-  dk->rc--;
-  GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
-
-  {
-    struct TALER_CRYPTO_RDeriveResponse rdr = {
-      .header.size = htons (sizeof (struct TALER_CRYPTO_RDeriveResponse)),
-      .header.type = htons (TALER_HELPER_CS_MT_RES_RDERIVE),
-      .r_pub = r_pub
-    };
-    enum GNUNET_GenericReturnValue ret;
-
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sending CS Derived R after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    ret = TES_transmit (client->csock,
-                        &rdr.header);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sent CS Derived R after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    return ret;
-  }
+              "Sent CS Derived R after %s\n",
+              GNUNET_TIME_relative2s (
+                GNUNET_TIME_absolute_get_duration (now),
+                GNUNET_YES));
+  return ret;
 }
 
 
@@ -651,14 +1291,14 @@ cs_work_dispatch (struct TES_Client *client,
   switch (ntohs (hdr->type))
   {
   case TALER_HELPER_CS_MT_REQ_SIGN:
-    if (msize < sizeof (struct TALER_CRYPTO_CsSignRequest))
+    if (msize < sizeof (struct TALER_CRYPTO_CsSignRequestMessage))
     {
       GNUNET_break_op (0);
       return GNUNET_SYSERR;
     }
     return handle_sign_request (
       client,
-      (const struct TALER_CRYPTO_CsSignRequest *) hdr);
+      (const struct TALER_CRYPTO_CsSignRequestMessage *) hdr);
   case TALER_HELPER_CS_MT_REQ_REVOKE:
     if (msize != sizeof (struct TALER_CRYPTO_CsRevokeRequest))
     {
@@ -668,6 +1308,24 @@ cs_work_dispatch (struct TES_Client *client,
     return handle_revoke_request (
       client,
       (const struct TALER_CRYPTO_CsRevokeRequest *) hdr);
+  case TALER_HELPER_CS_MT_REQ_BATCH_SIGN:
+    if (msize <= sizeof (struct TALER_CRYPTO_BatchSignRequest))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    return handle_batch_sign_request (
+      client,
+      (const struct TALER_CRYPTO_BatchSignRequest *) hdr);
+  case TALER_HELPER_CS_MT_REQ_BATCH_RDERIVE:
+    if (msize <= sizeof (struct TALER_CRYPTO_BatchDeriveRequest))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    return handle_batch_derive_request (
+      client,
+      (const struct TALER_CRYPTO_BatchDeriveRequest *) hdr);
   case TALER_HELPER_CS_MT_REQ_RDERIVE:
     if (msize != sizeof (struct TALER_CRYPTO_CsRDeriveRequest))
     {
@@ -722,9 +1380,9 @@ cs_client_init (struct TES_Client *client)
          NULL != dk;
          dk = dk->next)
     {
-      memcpy (&buf[obs],
-              dk->an,
-              ntohs (dk->an->header.size));
+      GNUNET_memcpy (&buf[obs],
+                     dk->an,
+                     ntohs (dk->an->header.size));
       obs += ntohs (dk->an->header.size);
     }
   }
@@ -821,16 +1479,20 @@ cs_update_client_keys (struct TES_Client *client)
           .h_cs = key->h_cs
         };
 
-        memcpy (&buf[obs],
-                &pn,
-                sizeof (pn));
+        GNUNET_memcpy (&buf[obs],
+                       &pn,
+                       sizeof (pn));
+        GNUNET_assert (obs + sizeof (pn)
+                       > obs);
         obs += sizeof (pn);
       }
       else
       {
-        memcpy (&buf[obs],
-                key->an,
-                ntohs (key->an->header.size));
+        GNUNET_memcpy (&buf[obs],
+                       key->an,
+                       ntohs (key->an->header.size));
+        GNUNET_assert (obs + ntohs (key->an->header.size)
+                       > obs);
         obs += ntohs (key->an->header.size);
       }
     }
@@ -1118,20 +1780,19 @@ parse_key (struct Denomination *denom,
     return;
   }
   {
-    struct GNUNET_CRYPTO_CsPublicKey pub;
     struct DenominationKey *dk;
     struct DenominationKey *before;
 
-    GNUNET_CRYPTO_cs_private_key_get_public (priv,
-                                             &pub);
     dk = GNUNET_new (struct DenominationKey);
     dk->denom_priv = *priv;
     dk->denom = denom;
     dk->anchor = anchor;
     dk->filename = GNUNET_strdup (filename);
-    TALER_cs_pub_hash (&pub,
-                       &dk->h_cs);
-    dk->denom_pub = pub;
+    GNUNET_CRYPTO_cs_private_key_get_public (priv,
+                                             &dk->denom_pub);
+    GNUNET_CRYPTO_hash (&dk->denom_pub,
+                        sizeof (dk->denom_pub),
+                        &dk->h_cs.hash);
     generate_response (dk);
     if (GNUNET_OK !=
         GNUNET_CONTAINER_multihashmap_put (
@@ -1153,7 +1814,9 @@ parse_key (struct Denomination *denom,
          NULL != pos;
          pos = pos->next)
     {
-      if (GNUNET_TIME_timestamp_cmp (pos->anchor, >, anchor))
+      if (GNUNET_TIME_timestamp_cmp (pos->anchor,
+                                     >,
+                                     anchor))
         break;
       before = pos;
     }
@@ -1209,13 +1872,12 @@ import_key (void *cls,
   }
 
   fd = open (filename,
-             O_CLOEXEC);
+             O_RDONLY | O_CLOEXEC);
   if (-1 == fd)
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "open",
                               filename);
-    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (0 != fstat (fd,
@@ -1224,6 +1886,7 @@ import_key (void *cls,
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "stat",
                               filename);
+    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (! S_ISREG (sbuf.st_mode))
@@ -1301,6 +1964,11 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                         const char *ct,
                         struct Denomination *denom)
 {
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-cs",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
                                            ct,
@@ -1310,6 +1978,7 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                ct,
                                "DURATION_WITHDRAW");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if (GNUNET_TIME_relative_cmp (overlap_duration,
@@ -1317,11 +1986,13 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                 denom->duration_withdraw))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "OVERLAP_DURATION",
                                "Value given must be smaller than value for DURATION_WITHDRAW!");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
+  GNUNET_free (secname);
   denom->section = GNUNET_strdup (ct);
   return GNUNET_OK;
 }
@@ -1436,28 +2107,36 @@ load_denominations (void *cls,
 static enum GNUNET_GenericReturnValue
 load_durations (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-cs",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-cs",
+                                           secname,
                                            "OVERLAP_DURATION",
                                            &overlap_duration))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "OVERLAP_DURATION");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-cs",
+                                           secname,
                                            "LOOKAHEAD_SIGN",
                                            &lookahead_sign))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "LOOKAHEAD_SIGN");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
+  GNUNET_free (secname);
   return GNUNET_OK;
 }
 
@@ -1477,6 +2156,8 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (keygen_task);
     keygen_task = NULL;
   }
+  stop_workers ();
+  sem_done (&worker_sem);
 }
 
 
@@ -1499,6 +2180,7 @@ run (void *cls,
     .updater = &cs_update_client_keys,
     .init = &cs_client_init
   };
+  char *secname;
 
   (void) cls;
   (void) args;
@@ -1513,31 +2195,62 @@ run (void *cls,
     /* get current time again, we may be timetraveling! */
     now = GNUNET_TIME_timestamp_get ();
   }
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-cs",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-cs",
+                                               secname,
                                                "KEY_DIR",
                                                &keydir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-cs",
+                               secname,
                                "KEY_DIR");
+    GNUNET_free (secname);
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
+  GNUNET_free (secname);
   if (GNUNET_OK !=
       load_durations (cfg))
   {
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
-  global_ret = TES_listen_start (cfg,
-                                 "taler-exchange-secmod-cs",
-                                 &cb);
+  {
+    char *secname;
+
+    GNUNET_asprintf (&secname,
+                     "%s-secmod-cs",
+                     section);
+    global_ret = TES_listen_start (cfg,
+                                   secname,
+                                   &cb);
+    GNUNET_free (secname);
+  }
   if (0 != global_ret)
     return;
+  sem_init (&worker_sem,
+            0);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
+  if (0 == max_workers)
+  {
+    long lret;
+
+    lret = sysconf (_SC_NPROCESSORS_CONF);
+    if (lret <= 0)
+      lret = 1;
+    max_workers = (unsigned int) lret;
+  }
+  for (unsigned int i = 0; i<max_workers; i++)
+    if (GNUNET_OK !=
+        start_worker ())
+    {
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
   /* Load denominations */
   keys = GNUNET_CONTAINER_multihashmap_create (65536,
                                                GNUNET_YES);
@@ -1588,6 +2301,11 @@ main (int argc,
       char **argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('s',
+                                 "section",
+                                 "SECTION",
+                                 "name of the configuration section prefix to use, default is 'taler'",
+                                 &section),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_option_timestamp ('t',
@@ -1595,13 +2313,18 @@ main (int argc,
                                     "TIMESTAMP",
                                     "pretend it is a different time for the update",
                                     &now_tmp),
+    GNUNET_GETOPT_option_uint ('w',
+                               "workers",
+                               "COUNT",
+                               "use COUNT workers for parallel processing of batch requests",
+                               &max_workers),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
 
   /* Restrict permissions for the key files that we create. */
   (void) umask (S_IWGRP | S_IROTH | S_IWOTH | S_IXOTH);
-
+  section = GNUNET_strdup ("taler-exchange");
   /* force linker to link against libtalerutil; if we do
    not do this, the linker may "optimize" libtalerutil
    away and skip #TALER_OS_init(), which we do need */
diff --git a/src/util/taler-exchange-secmod-cs.conf b/src/util/taler-exchange-secmod-cs.conf
index 5085eab79..fa3cdba40 100644
--- a/src/util/taler-exchange-secmod-cs.conf
+++ b/src/util/taler-exchange-secmod-cs.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-cs/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-cs/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-cs/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-cs/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-cs/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-cs/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-cs/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-cs/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-cs.h b/src/util/taler-exchange-secmod-cs.h
index c71c3b9af..0321335da 100644
--- a/src/util/taler-exchange-secmod-cs.h
+++ b/src/util/taler-exchange-secmod-cs.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-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
@@ -26,17 +26,21 @@
 #define TALER_HELPER_CS_MT_PURGE 1
 #define TALER_HELPER_CS_MT_AVAIL 2
 
-#define TALER_HELPER_CS_MT_REQ_INIT 4
+#define TALER_HELPER_CS_MT_REQ_INIT 3
+#define TALER_HELPER_CS_MT_REQ_BATCH_SIGN 4
 #define TALER_HELPER_CS_MT_REQ_SIGN 5
 #define TALER_HELPER_CS_MT_REQ_REVOKE 6
-#define TALER_HELPER_CS_MT_REQ_RDERIVE 7
+#define TALER_HELPER_CS_MT_REQ_BATCH_RDERIVE 7
+#define TALER_HELPER_CS_MT_REQ_RDERIVE 8
 
-#define TALER_HELPER_CS_MT_RES_SIGNATURE 8
-#define TALER_HELPER_CS_MT_RES_SIGN_FAILURE 9
-#define TALER_HELPER_CS_MT_RES_RDERIVE 10
-#define TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE 11
+#define TALER_HELPER_CS_MT_RES_SIGNATURE 9
+#define TALER_HELPER_CS_MT_RES_SIGN_FAILURE 10
+#define TALER_HELPER_CS_MT_RES_BATCH_SIGN_FAILURE 11
+#define TALER_HELPER_CS_MT_RES_RDERIVE 12
+#define TALER_HELPER_CS_MT_RES_RDERIVE_FAILURE 13
+#define TALER_HELPER_CS_MT_RES_BATCH_RDERIVE_FAILURE 14
 
-#define TALER_HELPER_CS_SYNCED 12
+#define TALER_HELPER_CS_SYNCED 15
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -114,7 +118,7 @@ struct TALER_CRYPTO_CsKeyPurgeNotification
 /**
  * Message sent if a signature is requested.
  */
-struct TALER_CRYPTO_CsSignRequest
+struct TALER_CRYPTO_CsSignRequestMessage
 {
   /**
    * Type is #TALER_HELPER_CS_MT_REQ_SIGN.
@@ -132,13 +136,35 @@ struct TALER_CRYPTO_CsSignRequest
   struct TALER_CsPubHashP h_cs;
 
   /**
-   * Planchet containing message to sign
-   * and nonce to derive R from
+   * Message to sign.
    */
-  struct TALER_BlindedCsPlanchet planchet;
+  struct GNUNET_CRYPTO_CsBlindedMessage message;
 
 };
 
+
+/**
+ * Message sent if a batch of signatures is requested.
+ */
+struct TALER_CRYPTO_BatchSignRequest
+{
+  /**
+   * Type is #TALER_HELPER_CS_MT_REQ_BATCH_SIGN.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Number of signatures to create, in NBO.
+   */
+  uint32_t batch_size;
+
+  /*
+   * Followed by @e batch_size batch sign requests.
+   */
+
+};
+
+
 /**
  * Message sent if a signature is requested.
  */
@@ -162,9 +188,32 @@ struct TALER_CRYPTO_CsRDeriveRequest
   /**
    * Withdraw nonce to derive R from
    */
-  struct TALER_CsNonce nonce;
+  struct GNUNET_CRYPTO_CsSessionNonce nonce;
+};
+
+
+/**
+ * Message sent if a batch of derivations is requested.
+ */
+struct TALER_CRYPTO_BatchDeriveRequest
+{
+  /**
+   * Type is #TALER_HELPER_CS_MT_REQ_BATCH_RDERIVE.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Number of derivations to create, in NBO.
+   */
+  uint32_t batch_size;
+
+  /*
+   * Followed by @e batch_size derive requests.
+   */
+
 };
 
+
 /**
  * Message sent if a key was revoked.
  */
@@ -199,14 +248,14 @@ struct TALER_CRYPTO_SignResponse
   struct GNUNET_MessageHeader header;
 
   /**
-   * For now, always zero.
+   * The chosen 'b' (0 or 1).
    */
-  uint32_t reserved;
+  uint32_t b;
 
   /**
-   * Contains the blindided s and the chosen b
+   * Contains the blindided s.
    */
-  struct TALER_BlindedDenominationCsSignAnswer cs_answer;
+  struct GNUNET_CRYPTO_CsBlindS cs_answer;
 };
 
 /**
@@ -225,9 +274,9 @@ struct TALER_CRYPTO_RDeriveResponse
   uint32_t reserved;
 
   /**
-   * derived R
+   * Pair of derived R values
    */
-  struct TALER_DenominationCSPublicRPairP r_pub;
+  struct GNUNET_CRYPTO_CSPublicRPairP r_pub;
 };
 
 
diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c
index 21aedbc2a..0b95447f7 100644
--- a/src/util/taler-exchange-secmod-eddsa.c
+++ b/src/util/taler-exchange-secmod-eddsa.c
@@ -137,6 +137,13 @@ static struct GNUNET_TIME_Timestamp now_tmp;
 static char *keydir;
 
 /**
+ * Name of the configuration section prefix to use.  Usually either "taler-exchange" or
+ * "donau". The actual configuration section will then be
+ * "$SECTION-secmod-eddsa".
+ */
+static char *section;
+
+/**
  * How much should coin creation duration overlap
  * with the next key?  Basically, the starting time of two
  * keys is always #duration - #overlap_duration apart.
@@ -584,11 +591,11 @@ eddsa_client_init (struct TES_Client *client)
 static enum GNUNET_GenericReturnValue
 eddsa_update_client_keys (struct TES_Client *client)
 {
+  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Updating client %p to generation %llu\n",
               client,
               (unsigned long long) key_gen);
-  GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   for (struct Key *key = keys_head;
        NULL != key;
        key = key->next)
@@ -826,9 +833,9 @@ parse_key (const char *filename,
                 filename);
     return GNUNET_SYSERR;
   }
-  memcpy (&priv,
-          buf,
-          buf_size);
+  GNUNET_memcpy (&priv,
+                 buf,
+                 buf_size);
 
   {
     struct GNUNET_CRYPTO_EddsaPublicKey pub;
@@ -904,7 +911,7 @@ import_key (void *cls,
   }
 
   fd = open (filename,
-             O_CLOEXEC);
+             O_RDONLY | O_CLOEXEC);
   if (-1 == fd)
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
@@ -918,6 +925,7 @@ import_key (void *cls,
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "stat",
                               filename);
+    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (! S_ISREG (sbuf.st_mode))
@@ -925,6 +933,7 @@ import_key (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "File `%s' is not a regular file, which is not allowed for private keys!\n",
                 filename);
+    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (0 != (sbuf.st_mode & (S_IWUSR | S_IRWXG | S_IRWXO)))
@@ -989,39 +998,48 @@ import_key (void *cls,
 static enum GNUNET_GenericReturnValue
 load_durations (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-eddsa",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-eddsa",
+                                           secname,
                                            "OVERLAP_DURATION",
                                            &overlap_duration))
   {
+    GNUNET_free (secname);
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "OVERLAP_DURATION");
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-eddsa",
+                                           secname,
                                            "DURATION",
                                            &duration))
   {
+    GNUNET_free (secname);
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "DURATION");
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-eddsa",
+                                           secname,
                                            "LOOKAHEAD_SIGN",
                                            &lookahead_sign))
   {
+    GNUNET_free (secname);
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "LOOKAHEAD_SIGN");
     return GNUNET_SYSERR;
   }
+  GNUNET_free (secname);
   return GNUNET_OK;
 }
 
@@ -1063,6 +1081,7 @@ run (void *cls,
     .updater = eddsa_update_client_keys,
     .init = eddsa_client_init
   };
+  char *secname;
 
   (void) cls;
   (void) args;
@@ -1077,6 +1096,9 @@ run (void *cls,
     /* get current time again, we may be timetraveling! */
     now = GNUNET_TIME_timestamp_get ();
   }
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-eddsa",
+                   section);
   if (GNUNET_OK !=
       load_durations (cfg))
   {
@@ -1085,21 +1107,31 @@ run (void *cls,
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-eddsa",
+                                               secname,
                                                "KEY_DIR",
                                                &keydir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-eddsa",
+                               secname,
                                "KEY_DIR");
+    GNUNET_free (secname);
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
+  GNUNET_free (secname);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
-  global_ret = TES_listen_start (cfg,
-                                 "taler-exchange-secmod-eddsa",
-                                 &cb);
+  {
+    char *secname;
+
+    GNUNET_asprintf (&secname,
+                     "%s-secmod-eddsa",
+                     section);
+    global_ret = TES_listen_start (cfg,
+                                   secname,
+                                   &cb);
+    GNUNET_free (secname);
+  }
   if (0 != global_ret)
     return;
   /* Load keys */
@@ -1142,6 +1174,11 @@ main (int argc,
       char **argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('s',
+                                 "section",
+                                 "SECTION",
+                                 "name of the configuration section prefix to use, default is 'taler'",
+                                 &section),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_option_timestamp ('t',
@@ -1155,7 +1192,7 @@ main (int argc,
 
   /* Restrict permissions for the key files that we create. */
   (void) umask (S_IWGRP | S_IROTH | S_IWOTH | S_IXOTH);
-
+  section = GNUNET_strdup ("taler-exchange");
   /* force linker to link against libtalerutil; if we do
    not do this, the linker may "optimize" libtalerutil
    away and skip #TALER_OS_init(), which we do need */
diff --git a/src/util/taler-exchange-secmod-eddsa.conf b/src/util/taler-exchange-secmod-eddsa.conf
index ea09f0334..0cb4a4ffc 100644
--- a/src/util/taler-exchange-secmod-eddsa.conf
+++ b/src/util/taler-exchange-secmod-eddsa.conf
@@ -8,16 +8,16 @@
 OVERLAP_DURATION = 5m
 
 # Where do we store the private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-eddsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-eddsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-eddsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-eddsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index 402e43196..c80e2e3c4 100644
--- a/src/util/taler-exchange-secmod-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2021 Taler Systems SA
+  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
@@ -164,6 +164,128 @@ struct Denomination
 
 
 /**
+ * A semaphore.
+ */
+struct Semaphore
+{
+  /**
+   * Mutex for the semaphore.
+   */
+  pthread_mutex_t mutex;
+
+  /**
+   * Condition variable for the semaphore.
+   */
+  pthread_cond_t cv;
+
+  /**
+   * Counter of the semaphore.
+   */
+  unsigned int ctr;
+};
+
+
+/**
+ * Job in a batch sign request.
+ */
+struct BatchJob;
+
+/**
+ * Handle for a thread that does work in batch signing.
+ */
+struct Worker
+{
+  /**
+   * Kept in a DLL.
+   */
+  struct Worker *prev;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct Worker *next;
+
+  /**
+   * Job this worker should do next.
+   */
+  struct BatchJob *job;
+
+  /**
+   * Semaphore to signal the worker that a job is available.
+   */
+  struct Semaphore sem;
+
+  /**
+   * Handle for this thread.
+   */
+  pthread_t pt;
+
+  /**
+   * Set to true if the worker should terminate.
+   */
+  bool do_shutdown;
+};
+
+
+/**
+ * Job in a batch sign request.
+ */
+struct BatchJob
+{
+  /**
+   * Request we are working on.
+   */
+  const struct TALER_CRYPTO_SignRequest *sr;
+
+  /**
+   * Thread doing the work.
+   */
+  struct Worker *worker;
+
+  /**
+   * Result with the signature.
+   */
+  struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
+
+  /**
+   * Semaphore to signal that the job is finished.
+   */
+  struct Semaphore sem;
+
+  /**
+   * Computation status.
+   */
+  enum TALER_ErrorCode ec;
+
+};
+
+
+/**
+ * Head of DLL of workers ready for more work.
+ */
+static struct Worker *worker_head;
+
+/**
+ * Tail of DLL of workers ready for more work.
+ */
+static struct Worker *worker_tail;
+
+/**
+ * Lock for manipulating the worker DLL.
+ */
+static pthread_mutex_t worker_lock;
+
+/**
+ * Total number of workers that were started.
+ */
+static unsigned int workers;
+
+/**
+ * Semaphore used to grab a worker.
+ */
+static struct Semaphore worker_sem;
+
+/**
  * Return value from main().
  */
 static int global_ret;
@@ -186,6 +308,13 @@ static struct GNUNET_TIME_Timestamp now_tmp;
 static char *keydir;
 
 /**
+ * Name of the configuration section prefix to use.  Usually either "taler-exchange" or
+ * "donau". The actual configuration section will then be
+ * "$SECTION-secmod-rsa".
+ */
+static char *section;
+
+/**
  * How much should coin creation (@e duration_withdraw) duration overlap
  * with the next denomination?  Basically, the starting time of two
  * denominations is always @e duration_withdraw - #overlap_duration apart.
@@ -228,6 +357,12 @@ static pthread_mutex_t keys_lock;
  */
 static uint64_t key_gen;
 
+/**
+ * Number of workers to launch. Note that connections to
+ * exchanges are NOT workers.
+ */
+static unsigned int max_workers = 16;
+
 
 /**
  * Generate the announcement message for @a dk.
@@ -266,133 +401,453 @@ generate_response (struct DenominationKey *dk)
                                   &an->secm_sig);
   an->secm_pub = TES_smpub;
   p = (void *) &an[1];
-  memcpy (p,
-          buf,
-          buf_len);
+  GNUNET_memcpy (p,
+                 buf,
+                 buf_len);
   GNUNET_free (buf);
-  memcpy (p + buf_len,
-          denom->section,
-          nlen);
+  GNUNET_memcpy (p + buf_len,
+                 denom->section,
+                 nlen);
   dk->an = an;
 }
 
 
 /**
- * Handle @a client request @a sr to create signature. Create the
- * signature using the respective key and return the result to
- * the client.
+ * Do the actual signing work.
  *
- * @param client the client making the request
- * @param sr the request details
- * @return #GNUNET_OK on success
+ * @param h_rsa key to sign with
+ * @param bm blinded message to sign
+ * @param[out] rsa_signaturep set to the RSA signature
+ * @return #TALER_EC_NONE on success
  */
-static enum GNUNET_GenericReturnValue
-handle_sign_request (struct TES_Client *client,
-                     const struct TALER_CRYPTO_SignRequest *sr)
+static enum TALER_ErrorCode
+do_sign (const struct TALER_RsaPubHashP *h_rsa,
+         const struct GNUNET_CRYPTO_RsaBlindedMessage *bm,
+         struct GNUNET_CRYPTO_RsaSignature **rsa_signaturep)
 {
   struct DenominationKey *dk;
-  const void *blinded_msg = &sr[1];
-  size_t blinded_msg_size = ntohs (sr->header.size) - sizeof (*sr);
   struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
 
   GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   dk = GNUNET_CONTAINER_multihashmap_get (keys,
-                                          &sr->h_rsa.hash);
+                                          &h_rsa->hash);
   if (NULL == dk)
   {
-    struct TALER_CRYPTO_SignFailure sf = {
-      .header.size = htons (sizeof (sr)),
-      .header.type = htons (TALER_HELPER_RSA_MT_RES_SIGN_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN)
-    };
-
     GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Signing request failed, denomination key %s unknown\n",
-                GNUNET_h2s (&sr->h_rsa.hash));
-    return TES_transmit (client->csock,
-                         &sf.header);
+                GNUNET_h2s (&h_rsa->hash));
+    return TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN;
   }
   if (GNUNET_TIME_absolute_is_future (dk->anchor.abs_time))
   {
     /* it is too early */
-    struct TALER_CRYPTO_SignFailure sf = {
-      .header.size = htons (sizeof (sr)),
-      .header.type = htons (TALER_HELPER_RSA_MT_RES_SIGN_FAILURE),
-      .ec = htonl (TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY)
-    };
-
     GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Signing request failed, denomination key %s is not yet valid\n",
-                GNUNET_h2s (&sr->h_rsa.hash));
-    return TES_transmit (client->csock,
-                         &sf.header);
+                GNUNET_h2s (&h_rsa->hash));
+    return TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY;
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Received request to sign over %u bytes with key %s\n",
-              (unsigned int) blinded_msg_size,
-              GNUNET_h2s (&sr->h_rsa.hash));
+              (unsigned int) bm->blinded_msg_size,
+              GNUNET_h2s (&h_rsa->hash));
   GNUNET_assert (dk->rc < UINT_MAX);
   dk->rc++;
   GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
   rsa_signature
     = GNUNET_CRYPTO_rsa_sign_blinded (dk->denom_priv,
-                                      blinded_msg,
-                                      blinded_msg_size);
+                                      bm);
   GNUNET_assert (0 == pthread_mutex_lock (&keys_lock));
   GNUNET_assert (dk->rc > 0);
   dk->rc--;
   GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
   if (NULL == rsa_signature)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Signing request failed, worker failed to produce signature\n");
+    return TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Sending RSA signature after %s\n",
+              GNUNET_TIME_relative2s (
+                GNUNET_TIME_absolute_get_duration (now),
+                GNUNET_YES));
+  *rsa_signaturep = rsa_signature;
+  return TALER_EC_NONE;
+}
+
+
+/**
+ * Generate error response that signing failed.
+ *
+ * @param client client to send response to
+ * @param ec error code to include
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+fail_sign (struct TES_Client *client,
+           enum TALER_ErrorCode ec)
+{
+  struct TALER_CRYPTO_SignFailure sf = {
+    .header.size = htons (sizeof (sf)),
+    .header.type = htons (TALER_HELPER_RSA_MT_RES_SIGN_FAILURE),
+    .ec = htonl (ec)
+  };
+
+  return TES_transmit (client->csock,
+                       &sf.header);
+}
+
+
+/**
+ * Generate signature response.
+ *
+ * @param client client to send response to
+ * @param[in] rsa_signature signature to send, freed by this function
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+send_signature (struct TES_Client *client,
+                struct GNUNET_CRYPTO_RsaSignature *rsa_signature)
+{
+  struct TALER_CRYPTO_SignResponse *sr;
+  void *buf;
+  size_t buf_size;
+  size_t tsize;
+  enum GNUNET_GenericReturnValue ret;
+
+  buf_size = GNUNET_CRYPTO_rsa_signature_encode (rsa_signature,
+                                                 &buf);
+  GNUNET_CRYPTO_rsa_signature_free (rsa_signature);
+  tsize = sizeof (*sr) + buf_size;
+  GNUNET_assert (tsize < UINT16_MAX);
+  sr = GNUNET_malloc (tsize);
+  sr->header.size = htons (tsize);
+  sr->header.type = htons (TALER_HELPER_RSA_MT_RES_SIGNATURE);
+  GNUNET_memcpy (&sr[1],
+                 buf,
+                 buf_size);
+  GNUNET_free (buf);
+  ret = TES_transmit (client->csock,
+                      &sr->header);
+  GNUNET_free (sr);
+  return ret;
+}
+
+
+/**
+ * Handle @a client request @a sr to create signature. Create the
+ * signature using the respective key and return the result to
+ * the client.
+ *
+ * @param client the client making the request
+ * @param sr the request details
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_sign_request (struct TES_Client *client,
+                     const struct TALER_CRYPTO_SignRequest *sr)
+{
+  struct GNUNET_CRYPTO_RsaBlindedMessage bm = {
+    .blinded_msg = (void *) &sr[1],
+    .blinded_msg_size = ntohs (sr->header.size) - sizeof (*sr)
+  };
+  struct GNUNET_CRYPTO_RsaSignature *rsa_signature;
+  enum TALER_ErrorCode ec;
+
+  ec = do_sign (&sr->h_rsa,
+                &bm,
+                &rsa_signature);
+  if (TALER_EC_NONE != ec)
+  {
+    return fail_sign (client,
+                      ec);
+  }
+  return send_signature (client,
+                         rsa_signature);
+}
+
+
+/**
+ * Initialize a semaphore @a sem with a value of @a val.
+ *
+ * @param[out] sem semaphore to initialize
+ * @param val initial value of the semaphore
+ */
+static void
+sem_init (struct Semaphore *sem,
+          unsigned int val)
+{
+  GNUNET_assert (0 ==
+                 pthread_mutex_init (&sem->mutex,
+                                     NULL));
+  GNUNET_assert (0 ==
+                 pthread_cond_init (&sem->cv,
+                                    NULL));
+  sem->ctr = val;
+}
+
+
+/**
+ * Decrement semaphore, blocks until this is possible.
+ *
+ * @param[in,out] sem semaphore to decrement
+ */
+static void
+sem_down (struct Semaphore *sem)
+{
+  GNUNET_assert (0 == pthread_mutex_lock (&sem->mutex));
+  while (0 == sem->ctr)
+  {
+    pthread_cond_wait (&sem->cv,
+                       &sem->mutex);
+  }
+  sem->ctr--;
+  GNUNET_assert (0 == pthread_mutex_unlock (&sem->mutex));
+}
+
+
+/**
+ * Increment semaphore, blocks until this is possible.
+ *
+ * @param[in,out] sem semaphore to decrement
+ */
+static void
+sem_up (struct Semaphore *sem)
+{
+  GNUNET_assert (0 == pthread_mutex_lock (&sem->mutex));
+  sem->ctr++;
+  GNUNET_assert (0 == pthread_mutex_unlock (&sem->mutex));
+  pthread_cond_signal (&sem->cv);
+}
+
+
+/**
+ * Release resources used by @a sem.
+ *
+ * @param[in] sem semaphore to release (except the memory itself)
+ */
+static void
+sem_done (struct Semaphore *sem)
+{
+  GNUNET_break (0 == pthread_cond_destroy (&sem->cv));
+  GNUNET_break (0 == pthread_mutex_destroy (&sem->mutex));
+}
+
+
+/**
+ * Main logic of a worker thread. Grabs work, does it,
+ * grabs more work.
+ *
+ * @param cls a `struct Worker *`
+ * @returns cls
+ */
+static void *
+worker (void *cls)
+{
+  struct Worker *w = cls;
+
+  while (true)
+  {
+    GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+    GNUNET_CONTAINER_DLL_insert (worker_head,
+                                 worker_tail,
+                                 w);
+    GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+    sem_up (&worker_sem);
+    sem_down (&w->sem);
+    if (w->do_shutdown)
+      break;
+    {
+      struct BatchJob *bj = w->job;
+      const struct TALER_CRYPTO_SignRequest *sr = bj->sr;
+      struct GNUNET_CRYPTO_RsaBlindedMessage bm = {
+        .blinded_msg = (void *) &sr[1],
+        .blinded_msg_size = ntohs (sr->header.size) - sizeof (*sr)
+      };
+
+      bj->ec = do_sign (&sr->h_rsa,
+                        &bm,
+                        &bj->rsa_signature);
+      sem_up (&bj->sem);
+      w->job = NULL;
+    }
+  }
+  return w;
+}
+
+
+/**
+ * Start batch job @a bj to sign @a sr.
+ *
+ * @param sr signature request to answer
+ * @param[out] bj job data structure
+ */
+static void
+start_job (const struct TALER_CRYPTO_SignRequest *sr,
+           struct BatchJob *bj)
+{
+  sem_init (&bj->sem,
+            0);
+  bj->sr = sr;
+  sem_down (&worker_sem);
+  GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+  bj->worker = worker_head;
+  GNUNET_CONTAINER_DLL_remove (worker_head,
+                               worker_tail,
+                               bj->worker);
+  GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+  bj->worker->job = bj;
+  sem_up (&bj->worker->sem);
+}
+
+
+/**
+ * Finish a job @a bj for a @a client.
+ *
+ * @param client who made the request
+ * @param[in,out] bj job to finish
+ */
+static void
+finish_job (struct TES_Client *client,
+            struct BatchJob *bj)
+{
+  sem_down (&bj->sem);
+  sem_done (&bj->sem);
+  if (TALER_EC_NONE != bj->ec)
+  {
+    fail_sign (client,
+               bj->ec);
+    return;
+  }
+  GNUNET_assert (NULL != bj->rsa_signature);
+  send_signature (client,
+                  bj->rsa_signature);
+  bj->rsa_signature = NULL; /* freed in send_signature */
+}
+
+
+/**
+ * Handle @a client request @a sr to create a batch of signature. Creates the
+ * signatures using the respective key and return the results to the client.
+ *
+ * @param client the client making the request
+ * @param bsr the request details
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+handle_batch_sign_request (struct TES_Client *client,
+                           const struct TALER_CRYPTO_BatchSignRequest *bsr)
+{
+  uint32_t bs = ntohl (bsr->batch_size);
+  uint16_t size = ntohs (bsr->header.size) - sizeof (*bsr);
+  const void *off = (const void *) &bsr[1];
+  unsigned int idx = 0;
+  struct BatchJob jobs[bs];
+  bool failure = false;
+
+  if (bs > TALER_MAX_FRESH_COINS)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  while ( (bs > 0) &&
+          (size > sizeof (struct TALER_CRYPTO_SignRequest)) )
+  {
+    const struct TALER_CRYPTO_SignRequest *sr = off;
+    uint16_t s = ntohs (sr->header.size);
+
+    if (s > size)
+    {
+      failure = true;
+      bs = idx;
+      break;
+    }
+    start_job (sr,
+               &jobs[idx++]);
+    off += s;
+    size -= s;
+  }
+  GNUNET_break_op (0 == size);
+  bs = GNUNET_MIN (bs,
+                   idx);
+  for (unsigned int i = 0; i<bs; i++)
+    finish_job (client,
+                &jobs[i]);
+  if (failure)
+  {
     struct TALER_CRYPTO_SignFailure sf = {
       .header.size = htons (sizeof (sf)),
-      .header.type = htons (TALER_HELPER_RSA_MT_RES_SIGN_FAILURE),
+      .header.type = htons (TALER_HELPER_RSA_MT_RES_BATCH_FAILURE),
       .ec = htonl (TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE)
     };
 
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Signing request failed, worker failed to produce signature\n");
+    GNUNET_break (0);
     return TES_transmit (client->csock,
                          &sf.header);
   }
+  return GNUNET_OK;
+}
 
+
+/**
+ * Start worker thread for batch processing.
+ *
+ * @return #GNUNET_OK on success
+ */
+static enum GNUNET_GenericReturnValue
+start_worker (void)
+{
+  struct Worker *w;
+
+  w = GNUNET_new (struct Worker);
+  sem_init (&w->sem,
+            0);
+  if (0 != pthread_create (&w->pt,
+                           NULL,
+                           &worker,
+                           w))
   {
-    struct TALER_CRYPTO_SignResponse *sr;
-    void *buf;
-    size_t buf_size;
-    size_t tsize;
-    enum GNUNET_GenericReturnValue ret;
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+                         "pthread_create");
+    GNUNET_free (w);
+    return GNUNET_SYSERR;
+  }
+  workers++;
+  return GNUNET_OK;
+}
 
-    buf_size = GNUNET_CRYPTO_rsa_signature_encode (rsa_signature,
-                                                   &buf);
-    GNUNET_CRYPTO_rsa_signature_free (rsa_signature);
-    tsize = sizeof (*sr) + buf_size;
-    GNUNET_assert (tsize < UINT16_MAX);
-    sr = GNUNET_malloc (tsize);
-    sr->header.size = htons (tsize);
-    sr->header.type = htons (TALER_HELPER_RSA_MT_RES_SIGNATURE);
-    memcpy (&sr[1],
-            buf,
-            buf_size);
-    GNUNET_free (buf);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sending RSA signature after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    ret = TES_transmit (client->csock,
-                        &sr->header);
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Sent RSA signature after %s\n",
-                GNUNET_TIME_relative2s (
-                  GNUNET_TIME_absolute_get_duration (now),
-                  GNUNET_YES));
-    GNUNET_free (sr);
-    return ret;
+
+/**
+ * Stop all worker threads.
+ */
+static void
+stop_workers (void)
+{
+  while (workers > 0)
+  {
+    struct Worker *w;
+    void *result;
+
+    sem_down (&worker_sem);
+    GNUNET_assert (0 == pthread_mutex_lock (&worker_lock));
+    w = worker_head;
+    GNUNET_CONTAINER_DLL_remove (worker_head,
+                                 worker_tail,
+                                 w);
+    GNUNET_assert (0 == pthread_mutex_unlock (&worker_lock));
+    w->do_shutdown = true;
+    sem_up (&w->sem);
+    pthread_join (w->pt,
+                  &result);
+    GNUNET_assert (result == w);
+    sem_done (&w->sem);
+    GNUNET_free (w);
+    workers--;
   }
 }
 
@@ -431,8 +886,8 @@ setup_key (struct DenominationKey *dk,
   }
   buf_size = GNUNET_CRYPTO_rsa_private_key_encode (priv,
                                                    &buf);
-  TALER_rsa_pub_hash (pub,
-                      &dk->h_rsa);
+  GNUNET_CRYPTO_rsa_public_key_hash (pub,
+                                     &dk->h_rsa.hash);
   GNUNET_asprintf (&dk->filename,
                    "%s/%s/%llu",
                    keydir,
@@ -606,6 +1061,15 @@ rsa_work_dispatch (struct TES_Client *client,
     return handle_revoke_request (
       client,
       (const struct TALER_CRYPTO_RevokeRequest *) hdr);
+  case TALER_HELPER_RSA_MT_REQ_BATCH_SIGN:
+    if (msize <= sizeof (struct TALER_CRYPTO_BatchSignRequest))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+    return handle_batch_sign_request (
+      client,
+      (const struct TALER_CRYPTO_BatchSignRequest *) hdr);
   default:
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -638,6 +1102,8 @@ rsa_client_init (struct TES_Client *client)
          NULL != dk;
          dk = dk->next)
     {
+      GNUNET_assert (obs + ntohs (dk->an->header.size)
+                     > obs);
       obs += ntohs (dk->an->header.size);
     }
   }
@@ -651,9 +1117,11 @@ rsa_client_init (struct TES_Client *client)
          NULL != dk;
          dk = dk->next)
     {
-      memcpy (&buf[obs],
-              dk->an,
-              ntohs (dk->an->header.size));
+      GNUNET_memcpy (&buf[obs],
+                     dk->an,
+                     ntohs (dk->an->header.size));
+      GNUNET_assert (obs + ntohs (dk->an->header.size)
+                     > obs);
       obs += ntohs (dk->an->header.size);
     }
   }
@@ -750,16 +1218,20 @@ rsa_update_client_keys (struct TES_Client *client)
           .h_rsa = key->h_rsa
         };
 
-        memcpy (&buf[obs],
-                &pn,
-                sizeof (pn));
+        GNUNET_memcpy (&buf[obs],
+                       &pn,
+                       sizeof (pn));
+        GNUNET_assert (obs + sizeof (pn)
+                       > obs);
         obs += sizeof (pn);
       }
       else
       {
-        memcpy (&buf[obs],
-                key->an,
-                ntohs (key->an->header.size));
+        GNUNET_memcpy (&buf[obs],
+                       key->an,
+                       ntohs (key->an->header.size));
+        GNUNET_assert (obs + ntohs (key->an->header.size)
+                       > obs);
         obs += ntohs (key->an->header.size);
       }
     }
@@ -789,6 +1261,7 @@ create_key (struct Denomination *denom,
   struct GNUNET_TIME_Timestamp anchor;
 
   anchor = now;
+  // FIXME: round down to multiple of 'anchor_round' value from configuration
   if (NULL != denom->keys_tail)
   {
     struct GNUNET_TIME_Absolute abs;
@@ -1079,8 +1552,8 @@ parse_key (struct Denomination *denom,
     dk->denom = denom;
     dk->anchor = anchor;
     dk->filename = GNUNET_strdup (filename);
-    TALER_rsa_pub_hash (pub,
-                        &dk->h_rsa);
+    GNUNET_CRYPTO_rsa_public_key_hash (pub,
+                                       &dk->h_rsa.hash);
     dk->denom_pub = pub;
     generate_response (dk);
     if (GNUNET_OK !=
@@ -1105,7 +1578,9 @@ parse_key (struct Denomination *denom,
          NULL != pos;
          pos = pos->next)
     {
-      if (GNUNET_TIME_timestamp_cmp (pos->anchor, >, anchor))
+      if (GNUNET_TIME_timestamp_cmp (pos->anchor,
+                                     >,
+                                     anchor))
         break;
       before = pos;
     }
@@ -1161,13 +1636,12 @@ import_key (void *cls,
   }
 
   fd = open (filename,
-             O_CLOEXEC);
+             O_RDONLY | O_CLOEXEC);
   if (-1 == fd)
   {
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "open",
                               filename);
-    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (0 != fstat (fd,
@@ -1176,6 +1650,7 @@ import_key (void *cls,
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
                               "stat",
                               filename);
+    GNUNET_break (0 == close (fd));
     return GNUNET_OK;
   }
   if (! S_ISREG (sbuf.st_mode))
@@ -1255,7 +1730,11 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                         struct Denomination *denom)
 {
   unsigned long long rsa_keysize;
+  char *secname;
 
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-rsa",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
                                            ct,
@@ -1265,6 +1744,7 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                ct,
                                "DURATION_WITHDRAW");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if (GNUNET_TIME_relative_cmp (overlap_duration,
@@ -1272,9 +1752,10 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                 denom->duration_withdraw))
   {
     GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               section,
                                "OVERLAP_DURATION",
                                "Value given must be smaller than value for DURATION_WITHDRAW!");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
@@ -1286,6 +1767,7 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                ct,
                                "RSA_KEYSIZE");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if ( (rsa_keysize > 4 * 2048) ||
@@ -1295,8 +1777,10 @@ parse_denomination_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                ct,
                                "RSA_KEYSIZE",
                                "Given RSA keysize outside of permitted range [1024,8192]\n");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
+  GNUNET_free (secname);
   denom->rsa_keysize = (unsigned int) rsa_keysize;
   denom->section = GNUNET_strdup (ct);
   return GNUNET_OK;
@@ -1411,28 +1895,36 @@ load_denominations (void *cls,
 static enum GNUNET_GenericReturnValue
 load_durations (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  char *secname;
+
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-rsa",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-rsa",
+                                           secname,
                                            "OVERLAP_DURATION",
                                            &overlap_duration))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               secname,
                                "OVERLAP_DURATION");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_time (cfg,
-                                           "taler-exchange-secmod-rsa",
+                                           secname,
                                            "LOOKAHEAD_SIGN",
                                            &lookahead_sign))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               secname,
                                "LOOKAHEAD_SIGN");
+    GNUNET_free (secname);
     return GNUNET_SYSERR;
   }
+  GNUNET_free (secname);
   return GNUNET_OK;
 }
 
@@ -1452,6 +1944,8 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (keygen_task);
     keygen_task = NULL;
   }
+  stop_workers ();
+  sem_done (&worker_sem);
 }
 
 
@@ -1474,6 +1968,7 @@ run (void *cls,
     .updater = rsa_update_client_keys,
     .init = rsa_client_init
   };
+  char *secname;
 
   (void) cls;
   (void) args;
@@ -1488,31 +1983,63 @@ run (void *cls,
     /* get current time again, we may be timetraveling! */
     now = GNUNET_TIME_timestamp_get ();
   }
+  GNUNET_asprintf (&secname,
+                   "%s-secmod-rsa",
+                   section);
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               "taler-exchange-secmod-rsa",
+                                               secname,
                                                "KEY_DIR",
                                                &keydir))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
-                               "taler-exchange-secmod-rsa",
+                               secname,
                                "KEY_DIR");
+    GNUNET_free (secname);
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
+  GNUNET_free (secname);
   if (GNUNET_OK !=
       load_durations (cfg))
   {
     global_ret = EXIT_NOTCONFIGURED;
     return;
   }
-  global_ret = TES_listen_start (cfg,
-                                 "taler-exchange-secmod-rsa",
-                                 &cb);
+  {
+    char *secname;
+
+    GNUNET_asprintf (&secname,
+                     "%s-secmod-rsa",
+                     section);
+    global_ret = TES_listen_start (cfg,
+                                   secname,
+                                   &cb);
+    GNUNET_free (secname);
+  }
   if (0 != global_ret)
     return;
+  sem_init (&worker_sem,
+            0);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
                                  NULL);
+  if (0 == max_workers)
+  {
+    long lret;
+
+    lret = sysconf (_SC_NPROCESSORS_CONF);
+    if (lret <= 0)
+      lret = 1;
+    max_workers = (unsigned int) lret;
+  }
+
+  for (unsigned int i = 0; i<max_workers; i++)
+    if (GNUNET_OK !=
+        start_worker ())
+    {
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
   /* Load denominations */
   keys = GNUNET_CONTAINER_multihashmap_create (65536,
                                                GNUNET_YES);
@@ -1563,6 +2090,11 @@ main (int argc,
       char **argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('s',
+                                 "section",
+                                 "SECTION",
+                                 "name of the configuration section prefix to use, default is 'taler'",
+                                 &section),
     GNUNET_GETOPT_option_timetravel ('T',
                                      "timetravel"),
     GNUNET_GETOPT_option_timestamp ('t',
@@ -1570,13 +2102,18 @@ main (int argc,
                                     "TIMESTAMP",
                                     "pretend it is a different time for the update",
                                     &now_tmp),
+    GNUNET_GETOPT_option_uint ('w',
+                               "workers",
+                               "COUNT",
+                               "use COUNT workers for parallel processing of batch requests",
+                               &max_workers),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
 
   /* Restrict permissions for the key files that we create. */
   (void) umask (S_IWGRP | S_IROTH | S_IWOTH | S_IXOTH);
-
+  section = GNUNET_strdup ("taler-exchange");
   /* force linker to link against libtalerutil; if we do
    not do this, the linker may "optimize" libtalerutil
    away and skip #TALER_OS_init(), which we do need */
diff --git a/src/util/taler-exchange-secmod-rsa.conf b/src/util/taler-exchange-secmod-rsa.conf
index dfa87f050..978c40258 100644
--- a/src/util/taler-exchange-secmod-rsa.conf
+++ b/src/util/taler-exchange-secmod-rsa.conf
@@ -5,19 +5,22 @@
 # wallets picking one key and then due to network latency
 # another key being valid.  The DURATION_WITHDRAW period
 # must be longer than this value.
-OVERLAP_DURATION = 5 m
+OVERLAP_DURATION = 0 m
 
 # Where do we store the generated private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/keys
+KEY_DIR = ${TALER_DATA_HOME}exchange-secmod-rsa/keys
 
 # Where does the helper listen for requests?
-UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-rsa/server.sock
+UNIXPATH = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/server.sock
 
 # Directory for clients.
-CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-rsa/clients
+CLIENT_DIR = ${TALER_RUNTIME_DIR}exchange-secmod-rsa/clients
 
 # Where should the security module store its own private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-rsa/secmod-private-key
+SM_PRIV_KEY = ${TALER_DATA_HOME}exchange-secmod-rsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
+
+# Round down anchor key start date to multiples of this time.
+ANCHOR_ROUND = 1 ms
\ No newline at end of file
diff --git a/src/util/taler-exchange-secmod-rsa.h b/src/util/taler-exchange-secmod-rsa.h
index 625ff87d9..ffbceb48e 100644
--- a/src/util/taler-exchange-secmod-rsa.h
+++ b/src/util/taler-exchange-secmod-rsa.h
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2020 Taler Systems SA
+  Copyright (C) 2020-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
@@ -24,14 +24,17 @@
 #define TALER_HELPER_RSA_MT_PURGE 1
 #define TALER_HELPER_RSA_MT_AVAIL 2
 
+#define TALER_HELPER_RSA_MT_REQ_BATCH_SIGN 3
 #define TALER_HELPER_RSA_MT_REQ_INIT 4
 #define TALER_HELPER_RSA_MT_REQ_SIGN 5
 #define TALER_HELPER_RSA_MT_REQ_REVOKE 6
 
 #define TALER_HELPER_RSA_MT_RES_SIGNATURE 7
 #define TALER_HELPER_RSA_MT_RES_SIGN_FAILURE 8
+#define TALER_HELPER_RSA_MT_RES_BATCH_FAILURE 9
+
+#define TALER_HELPER_RSA_SYNCED 10
 
-#define TALER_HELPER_RSA_SYNCED 9
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -133,6 +136,28 @@ struct TALER_CRYPTO_SignRequest
 
 
 /**
+ * Message sent if a batch of signatures is requested.
+ */
+struct TALER_CRYPTO_BatchSignRequest
+{
+  /**
+   * Type is #TALER_HELPER_RSA_MT_REQ_BATCH_SIGN.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Number of signatures to create, in NBO.
+   */
+  uint32_t batch_size;
+
+  /*
+   * Followed by @e batch_size sign requests.
+   */
+
+};
+
+
+/**
  * Message sent if a key was revoked.
  */
 struct TALER_CRYPTO_RevokeRequest
diff --git a/src/util/test_age_restriction.c b/src/util/test_age_restriction.c
index 3c5d52629..61499e5e0 100644
--- a/src/util/test_age_restriction.c
+++ b/src/util/test_age_restriction.c
@@ -21,12 +21,7 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler_crypto_lib.h"
-
-extern uint8_t
-get_age_group (
-  const struct TALER_AgeMask *mask,
-  uint8_t age);
+#include <gnunet/gnunet_common.h>
 
 /**
  * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
@@ -85,24 +80,24 @@ test_groups (void)
       .bits =
         1 | 1 << 5 | 1 << 13 | 1 << 23,
 
-        .group = { 0, 0, 0, 0, 0,
-                   1, 1, 1, 1, 1, 1, 1, 1,
-                   2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-                   3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }
+      .group = { 0, 0, 0, 0, 0,
+                 1, 1, 1, 1, 1, 1, 1, 1,
+                 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+                 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }
 
 
     },
     {
       .bits =
         1 | 1 << 8 | 1 << 10 | 1 << 12 | 1 << 14 | 1 << 16 | 1 << 18 | 1 << 21,
-        .group = { 0, 0, 0, 0, 0, 0, 0, 0,
-                   1, 1,
-                   2, 2,
-                   3, 3,
-                   4, 4,
-                   5, 5,
-                   6, 6, 6,
-                   7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}
+      .group = { 0, 0, 0, 0, 0, 0, 0, 0,
+                 1, 1,
+                 2, 2,
+                 3, 3,
+                 4, 4,
+                 5, 5,
+                 6, 6, 6,
+                 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}
 
 
     }
@@ -114,10 +109,10 @@ test_groups (void)
 
     for (uint8_t i = 0; i < 32; i++)
     {
-      uint8_t r = get_age_group (&mask, i);
+      uint8_t r = TALER_get_age_group (&mask, i);
       char *m = age_mask_to_string (&mask);
 
-      printf ("get_age_group(%s, %2d) = %d vs %d (exp)\n",
+      printf ("TALER_get_age_group(%s, %2d) = %d vs %d (exp)\n",
               m,
               i,
               r,
@@ -134,6 +129,177 @@ test_groups (void)
 }
 
 
+enum GNUNET_GenericReturnValue
+test_dates (void)
+{
+  struct TALER_AgeMask mask = {
+    .bits = 1 | 1 << 5 | 1 << 9 | 1 << 13 | 1 << 17 | 1 << 21
+  };
+  struct
+  {
+    char *date;
+    uint32_t expected;
+    enum GNUNET_GenericReturnValue ret;
+  }
+  test [] = {
+    {.date = "abcd-00-00", .expected = 0, .ret = GNUNET_SYSERR},
+    {.date = "1900-00-01", .expected = 0, .ret = GNUNET_SYSERR},
+    {.date = "19000001",   .expected = 0, .ret = GNUNET_SYSERR},
+    {.date = "2001-33-05", .expected = 0, .ret = GNUNET_SYSERR},
+    {.date = "2001-33-35", .expected = 0, .ret = GNUNET_SYSERR},
+
+    {.date = "1900-00-00", .expected = 0, .ret = GNUNET_OK},
+    {.date = "2001-00-00", .expected = 0, .ret = GNUNET_OK},
+    {.date = "2001-03-00", .expected = 0, .ret = GNUNET_OK},
+    {.date = "2001-03-05", .expected = 0, .ret = GNUNET_OK},
+
+    /* These dates should be far enough for the near future so that
+     * the expected values are correct. Will need adjustment in 2044 :) */
+    {.date = "2022-11-26", .expected = 19322, .ret = GNUNET_OK },
+    {.date = "2022-11-27", .expected = 19323, .ret = GNUNET_OK },
+    {.date = "2023-06-26", .expected = 19534, .ret = GNUNET_OK },
+    {.date = "2023-06-01", .expected = 19509, .ret = GNUNET_OK },
+    {.date = "2023-06-00", .expected = 19509, .ret = GNUNET_OK },
+    {.date = "2023-01-01", .expected = 19358, .ret = GNUNET_OK },
+    {.date = "2023-00-00", .expected = 19358, .ret = GNUNET_OK },
+
+    /* Special case: .date == NULL meands birthday == current date, which
+     * should be 21 years in the future.  We will set these values below in the
+     * loop */
+    {.date = NULL, .expected = 0, .ret = GNUNET_OK },
+  };
+  char buf[256] = {0};
+
+  for (uint8_t t = 0; t < sizeof(test) / sizeof(test[0]); t++)
+  {
+    uint32_t d;
+    enum GNUNET_GenericReturnValue ret;
+    char *date = test[t].date;
+
+    if (NULL == test[t].date)
+    {
+      /* Special case:  We set .date to the current date. */
+      time_t tn;
+      struct tm now;
+
+      time (&tn);
+      localtime_r (&tn, &now);
+      strftime (buf, sizeof(buf), "%Y-%m-%d", &now);
+      date = &buf[0];
+
+      /* The expected value is the number of days since 1970-01-01,
+       * counted simplistically */
+      test[t].expected = timegm (&now) / 60 / 60 / 24;
+    }
+
+    ret = TALER_parse_coarse_date (date,
+                                   &mask,
+                                   &d);
+    if (ret != test[t].ret)
+    {
+      printf (
+        "dates[%d] for date `%s` expected parser to return: %d, got: %d\n",
+        t, date, test[t].ret, ret);
+      return GNUNET_SYSERR;
+    }
+
+    if (ret == GNUNET_SYSERR)
+      continue;
+
+    if (d != test[t].expected)
+    {
+      printf (
+        "dates[%d] for date `%s` expected value %d, but got %d\n",
+        t, date, test[t].expected, d);
+      return GNUNET_SYSERR;
+    }
+
+    printf ("dates[%d] for date `%s` got expected value %d\n",
+            t, date, d);
+  }
+
+  printf ("done with dates\n");
+
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+test_lowest (void)
+{
+  struct TALER_AgeMask mask = {
+    .bits = 1 | 1 << 5 | 1 << 9 | 1 << 13 | 1 << 17 | 1 << 21
+  };
+
+  struct { uint8_t age; uint8_t expected; }
+  test [] = {
+    {.age = 1, .expected = 0 },
+    {.age = 2, .expected = 0 },
+    {.age = 3, .expected = 0 },
+    {.age = 4, .expected = 0 },
+    {.age = 5, .expected = 5 },
+    {.age = 6, .expected = 5 },
+    {.age = 7, .expected = 5 },
+    {.age = 8, .expected = 5 },
+    {.age = 9, .expected = 9 },
+    {.age = 10, .expected = 9 },
+    {.age = 11, .expected = 9 },
+    {.age = 12, .expected = 9 },
+    {.age = 13, .expected = 13 },
+    {.age = 14, .expected = 13 },
+    {.age = 15, .expected = 13 },
+    {.age = 16, .expected = 13 },
+    {.age = 17, .expected = 17 },
+    {.age = 18, .expected = 17 },
+    {.age = 19, .expected = 17 },
+    {.age = 20, .expected = 17 },
+    {.age = 21, .expected = 21 },
+    {.age = 22, .expected = 21 },
+  };
+
+  for (uint8_t n = 0; n < sizeof(test) / sizeof(test[0]); n++)
+  {
+    uint8_t l = TALER_get_lowest_age (&mask, test[n].age);
+    printf ("lowest[%d] for age %d, expected lowest: %d, got: %d\n",
+            n, test[n].age, test[n].expected, l);
+    if (test[n].expected != l)
+      return GNUNET_SYSERR;
+  }
+
+  return GNUNET_OK;
+}
+
+
+enum GNUNET_GenericReturnValue
+test_adult (void)
+{
+  struct { struct TALER_AgeMask mask; uint8_t expected; }
+  test[] = {
+    { .mask = {.bits = 1 | 1 << 2},
+      .expected = 2 },
+    { .mask = {.bits = 1 | 1 << 2 | 1 << 3},
+      .expected = 3 },
+    { .mask = {.bits = 1 | 1 << 3},
+      .expected = 3 },
+    { .mask = {.bits = 1 | 1 << 22},
+      .expected = 22 },
+    { .mask = {.bits = 1 | 1 << 10 | 1 << 16 | 1 << 22},
+      .expected = 22 },
+  };
+  for (uint8_t n = 0; n < sizeof(test) / sizeof(test[0]); n++)
+  {
+    uint8_t l = TALER_adult_age (&test[n].mask);
+    printf ("adult[%d] for mask %s, expected: %d, got: %d\n",
+            n, TALER_age_mask_to_string (&test[n].mask), test[n].expected, l);
+    if (test[n].expected != l)
+      return GNUNET_SYSERR;
+  }
+  printf ("done with adult\n");
+
+  return GNUNET_OK;
+}
+
+
 static struct TALER_AgeMask age_mask = {
   .bits = 1 | 1 << 8 | 1 << 10 | 1 << 12 | 1 << 14 | 1 << 16 | 1 << 18 | 1 << 21
 };
@@ -147,7 +313,7 @@ test_attestation (void)
     enum GNUNET_GenericReturnValue ret;
     struct TALER_AgeCommitmentProof acp[3] = {0};
     struct TALER_AgeAttestation at = {0};
-    uint8_t age_group = get_age_group (&age_mask, age);
+    uint8_t age_group = TALER_get_age_group (&age_mask, age);
     struct GNUNET_HashCode seed;
 
 
@@ -155,15 +321,13 @@ test_attestation (void)
                                 &seed,
                                 sizeof(seed));
 
-    ret = TALER_age_restriction_commit (&age_mask,
-                                        age,
-                                        &seed,
-                                        &acp[0]);
-
+    TALER_age_restriction_commit (&age_mask,
+                                  age,
+                                  &seed,
+                                  &acp[0]);
     printf (
-      "commit(age:%d) == %d; proof.num: %ld; age_group: %d\n",
+      "commit(age:%d); proof.num: %ld; age_group: %d\n",
       age,
-      ret,
       acp[0].proof.num,
       age_group);
 
@@ -184,7 +348,7 @@ test_attestation (void)
     {
       for (uint8_t min = 0; min < 22; min++)
       {
-        uint8_t min_group = get_age_group (&age_mask, min);
+        uint8_t min_group = TALER_get_age_group (&age_mask, min);
 
         ret = TALER_age_commitment_attest (&acp[i],
                                            min,
@@ -260,11 +424,17 @@ main (int argc,
                     NULL);
   if (GNUNET_OK != test_groups ())
     return 1;
+  if (GNUNET_OK != test_lowest ())
+    return 2;
   if (GNUNET_OK != test_attestation ())
   {
     GNUNET_break (0);
-    return 2;
+    return 3;
   }
+  if (GNUNET_OK != test_dates ())
+    return 4;
+  if (GNUNET_OK != test_adult ())
+    return 5;
   return 0;
 }
 
diff --git a/src/util/test_amount.c b/src/util/test_amount.c
index 1af383dcc..57d73b14f 100644
--- a/src/util/test_amount.c
+++ b/src/util/test_amount.c
@@ -21,7 +21,6 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler_amount_lib.h"
 
 
 int
@@ -79,31 +78,31 @@ main (int argc,
 
   /* test conversion with leading zero in fraction */
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount ("eur:0.02",
+                 TALER_string_to_amount ("EUR:0.02",
                                          &a2));
-  GNUNET_assert (0 == strcasecmp ("eur",
+  GNUNET_assert (0 == strcasecmp ("EUR",
                                   a2.currency));
   GNUNET_assert (0 == a2.value);
   GNUNET_assert (TALER_AMOUNT_FRAC_BASE / 100 * 2 == a2.fraction);
   c = TALER_amount_to_string (&a2);
-  GNUNET_assert (0 == strcmp ("eur:0.02",
-                              c));
+  GNUNET_assert (0 == strcasecmp ("EUR:0.02",
+                                  c));
   GNUNET_free (c);
 
   /* test conversion with leading space and with fraction */
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (" eur:4.12",
+                 TALER_string_to_amount (" EUR:4.12",
                                          &a2));
-  GNUNET_assert (0 == strcasecmp ("eur",
+  GNUNET_assert (0 == strcasecmp ("EUR",
                                   a2.currency));
   GNUNET_assert (4 == a2.value);
   GNUNET_assert (TALER_AMOUNT_FRAC_BASE / 100 * 12 == a2.fraction);
 
   /* test use of local currency */
   GNUNET_assert (GNUNET_OK ==
-                 TALER_string_to_amount (" *LOCAL:4444.1000",
+                 TALER_string_to_amount (" LOCAL:4444.1000",
                                          &a3));
-  GNUNET_assert (0 == strcasecmp ("*LOCAL",
+  GNUNET_assert (0 == strcasecmp ("LOCAL",
                                   a3.currency));
   GNUNET_assert (4444 == a3.value);
   GNUNET_assert (TALER_AMOUNT_FRAC_BASE / 10 == a3.fraction);
diff --git a/src/util/test_conversion.c b/src/util/test_conversion.c
new file mode 100644
index 000000000..00cb35e72
--- /dev/null
+++ b/src/util/test_conversion.c
@@ -0,0 +1,149 @@
+/*
+  This file is part of TALER
+  (C) 2023 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/>
+*/
+/**
+ * @file util/test_conversion.c
+ * @brief Tests for conversion logic
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler_util.h"
+#include <gnunet/gnunet_json_lib.h>
+
+/**
+ * Return value from main().
+ */
+static int global_ret;
+
+/**
+ * Handle to our helper.
+ */
+static struct TALER_JSON_ExternalConversion *ec;
+
+
+/**
+ * Type of a callback that receives a JSON @a result.
+ *
+ * @param cls closure
+ * @param status_type how did the process die
+ * @apram code termination status code from the process
+ * @param result some JSON result, NULL if we failed to get an JSON output
+ */
+static void
+conv_cb (void *cls,
+         enum GNUNET_OS_ProcessStatusType status_type,
+         unsigned long code,
+         const json_t *result)
+{
+  json_t *expect;
+
+  (void) cls;
+  (void) status_type;
+  ec = NULL;
+  global_ret = 3;
+  if (42 != code)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected return value from helper: %u\n",
+                (unsigned int) code);
+    return;
+  }
+  expect = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("foo",
+                             "arg")
+    );
+  if (1 == json_equal (expect,
+                       result))
+  {
+    global_ret = 0;
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unexpected JSON result\n");
+    json_dumpf (result,
+                stderr,
+                JSON_INDENT (2));
+    global_ret = 4;
+  }
+  json_decref (expect);
+}
+
+
+/**
+ * Function called on shutdown/CTRL-C.
+ *
+ * @param cls NULL
+ */
+static void
+do_shutdown (void *cls)
+{
+  (void) cls;
+  if (NULL != ec)
+  {
+    GNUNET_break (0);
+    global_ret = 2;
+    TALER_JSON_external_conversion_stop (ec);
+    ec = NULL;
+  }
+}
+
+
+/**
+ * Main test function.
+ *
+ * @param cls NULL
+ */
+static void
+run (void *cls)
+{
+  json_t *input;
+
+  (void) cls;
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+  input = GNUNET_JSON_PACK (
+    GNUNET_JSON_pack_string ("key",
+                             "foo")
+    );
+  ec = TALER_JSON_external_conversion_start (input,
+                                             &conv_cb,
+                                             NULL,
+                                             "./test_conversion.sh",
+                                             "test_conversion.sh",
+                                             "arg",
+                                             NULL);
+  json_decref (input);
+  GNUNET_assert (NULL != ec);
+}
+
+
+int
+main (int argc,
+      const char *const argv[])
+{
+  (void) argc;
+  (void) argv;
+  unsetenv ("XDG_DATA_HOME");
+  unsetenv ("XDG_CONFIG_HOME");
+  GNUNET_log_setup ("test-conversion",
+                    "WARNING",
+                    NULL);
+  GNUNET_OS_init (TALER_project_data_default ());
+  global_ret = 1;
+  GNUNET_SCHEDULER_run (&run,
+                        NULL);
+  return global_ret;
+}
diff --git a/src/util/test_conversion.sh b/src/util/test_conversion.sh
new file mode 100755
index 000000000..26e1a36d8
--- /dev/null
+++ b/src/util/test_conversion.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+KEY=$(jq -r .key)
+echo -n "{\"$KEY\":\"$1\"}"
+exit 42
diff --git a/src/util/test_crypto.c b/src/util/test_crypto.c
index 186874e3c..2a2090952 100644
--- a/src/util/test_crypto.c
+++ b/src/util/test_crypto.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2015, 2020-2022 Taler Systems SA
+  (C) 2015, 2020-2023 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
@@ -21,7 +21,6 @@
  */
 #include "platform.h"
 #include "taler_util.h"
-#include "taler_crypto_lib.h"
 
 
 /**
@@ -38,14 +37,21 @@ test_high_level (void)
   struct TALER_TransferPublicKeyP trans_pub;
   struct TALER_TransferSecretP secret;
   struct TALER_TransferSecretP secret2;
-  union TALER_DenominationBlindingKeyP bks1;
-  union TALER_DenominationBlindingKeyP bks2;
+  union GNUNET_CRYPTO_BlindingSecretP bks1;
+  union GNUNET_CRYPTO_BlindingSecretP bks2;
   struct TALER_CoinSpendPrivateKeyP coin_priv1;
   struct TALER_CoinSpendPrivateKeyP coin_priv2;
   struct TALER_PlanchetMasterSecretP ps1;
   struct TALER_PlanchetMasterSecretP ps2;
-  struct TALER_ExchangeWithdrawValues alg1;
-  struct TALER_ExchangeWithdrawValues alg2;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_RSA
+  };
+  struct TALER_ExchangeWithdrawValues alg1 = {
+    .blinding_inputs = &bi
+  };
+  struct TALER_ExchangeWithdrawValues alg2 = {
+    .blinding_inputs = &bi
+  };
 
   GNUNET_CRYPTO_eddsa_key_create (&coin_priv.eddsa_priv);
   GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
@@ -71,14 +77,12 @@ test_high_level (void)
   TALER_transfer_secret_to_planchet_secret (&secret,
                                             0,
                                             &ps1);
-  alg1.cipher = TALER_DENOMINATION_RSA;
   TALER_planchet_setup_coin_priv (&ps1,
                                   &alg1,
                                   &coin_priv1);
   TALER_planchet_blinding_secret_create (&ps1,
                                          &alg1,
                                          &bks1);
-  alg2.cipher = TALER_DENOMINATION_RSA;
   TALER_transfer_secret_to_planchet_secret (&secret,
                                             1,
                                             &ps2);
@@ -117,31 +121,30 @@ test_planchets_rsa (uint8_t age)
 {
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
   struct TALER_DenominationPrivateKey dk_priv;
   struct TALER_DenominationPublicKey dk_pub;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  const struct TALER_ExchangeWithdrawValues *alg_values;
   struct TALER_PlanchetDetail pd;
   struct TALER_BlindedDenominationSignature blind_sig;
   struct TALER_FreshCoin coin;
   struct TALER_CoinPubHashP c_hash;
   struct TALER_AgeCommitmentHash *ach = NULL;
+  struct TALER_AgeCommitmentHash ah = {0};
 
+  alg_values = TALER_denom_ewv_rsa_singleton ();
   if (0 < age)
   {
     struct TALER_AgeCommitmentProof acp;
-    struct TALER_AgeCommitmentHash ah = {0};
     struct GNUNET_HashCode seed;
 
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &seed,
                                 sizeof(seed));
-
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_age_restriction_commit (&age_mask,
-                                                 age,
-                                                 &seed,
-                                                 &acp));
+    TALER_age_restriction_commit (&age_mask,
+                                  age,
+                                  &seed,
+                                  &acp);
     TALER_age_commitment_hash (&acp.commitment,
                                &ah);
     ach = &ah;
@@ -151,12 +154,12 @@ test_planchets_rsa (uint8_t age)
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
                               &ps,
                               sizeof (ps));
-
+  GNUNET_log_skip (1, GNUNET_YES);
   GNUNET_assert (GNUNET_SYSERR ==
                  TALER_denom_priv_create (&dk_priv,
                                           &dk_pub,
-                                          TALER_DENOMINATION_INVALID));
-
+                                          GNUNET_CRYPTO_BSA_INVALID));
+  GNUNET_log_skip (1, GNUNET_YES);
   GNUNET_assert (GNUNET_SYSERR ==
                  TALER_denom_priv_create (&dk_priv,
                                           &dk_pub,
@@ -165,19 +168,19 @@ test_planchets_rsa (uint8_t age)
   GNUNET_assert (GNUNET_OK ==
                  TALER_denom_priv_create (&dk_priv,
                                           &dk_pub,
-                                          TALER_DENOMINATION_RSA,
+                                          GNUNET_CRYPTO_BSA_RSA,
                                           1024));
-  alg_values.cipher = TALER_DENOMINATION_RSA;
   TALER_planchet_setup_coin_priv (&ps,
-                                  &alg_values,
+                                  alg_values,
                                   &coin_priv);
   TALER_planchet_blinding_secret_create (&ps,
-                                         &alg_values,
+                                         alg_values,
                                          &bks);
   GNUNET_assert (GNUNET_OK ==
                  TALER_planchet_prepare (&dk_pub,
-                                         &alg_values,
+                                         alg_values,
                                          &bks,
+                                         NULL,
                                          &coin_priv,
                                          ach,
                                          &c_hash,
@@ -195,7 +198,7 @@ test_planchets_rsa (uint8_t age)
                                          &coin_priv,
                                          ach,
                                          &c_hash,
-                                         &alg_values,
+                                         alg_values,
                                          &coin));
   TALER_blinded_denom_sig_free (&blind_sig);
   TALER_denom_sig_free (&coin.sig);
@@ -206,39 +209,6 @@ test_planchets_rsa (uint8_t age)
 
 
 /**
- * @brief Function for CS signatures to derive public R_0 and R_1
- *
- * @param nonce withdraw nonce from a client
- * @param denom_priv denomination privkey as long-term secret
- * @param r_pub the resulting R_0 and R_1
- * @return enum GNUNET_GenericReturnValue
- */
-static enum GNUNET_GenericReturnValue
-derive_r_public (
-  const struct TALER_CsNonce *nonce,
-  const struct TALER_DenominationPrivateKey *denom_priv,
-  struct TALER_DenominationCSPublicRPairP *r_pub)
-{
-  struct GNUNET_CRYPTO_CsRSecret r[2];
-
-  if (denom_priv->cipher != TALER_DENOMINATION_CS)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_CRYPTO_cs_r_derive (&nonce->nonce,
-                             "rw",
-                             &denom_priv->details.cs_private_key,
-                             r);
-  GNUNET_CRYPTO_cs_r_get_public (&r[0],
-                                 &r_pub->r_pub[0]);
-  GNUNET_CRYPTO_cs_r_get_public (&r[1],
-                                 &r_pub->r_pub[1]);
-  return GNUNET_OK;
-}
-
-
-/**
  * Test the basic planchet functionality of creating a fresh planchet with CS denomination
  * and extracting the respective signature.
  *
@@ -249,11 +219,12 @@ test_planchets_cs (uint8_t age)
 {
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
   struct TALER_DenominationPrivateKey dk_priv;
   struct TALER_DenominationPublicKey dk_pub;
   struct TALER_PlanchetDetail pd;
   struct TALER_CoinPubHashP c_hash;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
   struct TALER_BlindedDenominationSignature blind_sig;
   struct TALER_FreshCoin coin;
   struct TALER_ExchangeWithdrawValues alg_values;
@@ -268,12 +239,10 @@ test_planchets_cs (uint8_t age)
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &seed,
                                 sizeof(seed));
-
-    GNUNET_assert (GNUNET_OK ==
-                   TALER_age_restriction_commit (&age_mask,
-                                                 age,
-                                                 &seed,
-                                                 &acp));
+    TALER_age_restriction_commit (&age_mask,
+                                  age,
+                                  &seed,
+                                  &acp);
     TALER_age_commitment_hash (&acp.commitment,
                                &ah);
     ach = &ah;
@@ -286,16 +255,17 @@ test_planchets_cs (uint8_t age)
   GNUNET_assert (GNUNET_OK ==
                  TALER_denom_priv_create (&dk_priv,
                                           &dk_pub,
-                                          TALER_DENOMINATION_CS));
-  alg_values.cipher = TALER_DENOMINATION_CS;
+                                          GNUNET_CRYPTO_BSA_CS));
   TALER_cs_withdraw_nonce_derive (
     &ps,
-    &pd.blinded_planchet.details.cs_blinded_planchet.nonce);
-  GNUNET_assert (GNUNET_OK ==
-                 derive_r_public (
-                   &pd.blinded_planchet.details.cs_blinded_planchet.nonce,
-                   &dk_priv,
-                   &alg_values.details.cs_values));
+    &nonce.cs_nonce);
+  // FIXME: define Taler abstraction for this:
+  alg_values.blinding_inputs
+    = GNUNET_CRYPTO_get_blinding_input_values (dk_priv.bsign_priv_key,
+                                               &nonce,
+                                               "rw");
+  TALER_denom_pub_hash (&dk_pub,
+                        &pd.denom_pub_hash);
   TALER_planchet_setup_coin_priv (&ps,
                                   &alg_values,
                                   &coin_priv);
@@ -306,6 +276,7 @@ test_planchets_cs (uint8_t age)
                  TALER_planchet_prepare (&dk_pub,
                                          &alg_values,
                                          &bks,
+                                         &nonce,
                                          &coin_priv,
                                          ach,
                                          &c_hash,
@@ -315,7 +286,6 @@ test_planchets_cs (uint8_t age)
                                            &dk_priv,
                                            false,
                                            &pd.blinded_planchet));
-  TALER_planchet_detail_free (&pd);
   GNUNET_assert (GNUNET_OK ==
                  TALER_planchet_to_coin (&dk_pub,
                                          &blind_sig,
@@ -356,15 +326,24 @@ test_exchange_sigs (void)
   struct TALER_MasterPrivateKeyP priv;
   struct TALER_MasterPublicKeyP pub;
   struct TALER_MasterSignatureP sig;
+  json_t *rest;
 
   GNUNET_CRYPTO_eddsa_key_create (&priv.eddsa_priv);
+  rest = json_array ();
+  GNUNET_assert (NULL != rest);
   TALER_exchange_wire_signature_make (pt,
+                                      NULL,
+                                      rest,
+                                      rest,
                                       &priv,
                                       &sig);
   GNUNET_CRYPTO_eddsa_key_get_public (&priv.eddsa_priv,
                                       &pub.eddsa_pub);
   if (GNUNET_OK !=
       TALER_exchange_wire_signature_check (pt,
+                                           NULL,
+                                           rest,
+                                           rest,
                                            &pub,
                                            &sig))
   {
@@ -374,12 +353,28 @@ test_exchange_sigs (void)
   if (GNUNET_OK ==
       TALER_exchange_wire_signature_check (
         "payto://x-taler-bank/localhost/Other",
+        NULL,
+        rest,
+        rest,
         &pub,
         &sig))
   {
     GNUNET_break (0);
     return 1;
   }
+  if (GNUNET_OK ==
+      TALER_exchange_wire_signature_check (
+        pt,
+        "http://example.com/",
+        rest,
+        rest,
+        &pub,
+        &sig))
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  json_decref (rest);
   return 0;
 }
 
@@ -482,12 +477,51 @@ test_contracts (void)
 }
 
 
+static int
+test_attributes (void)
+{
+  struct TALER_AttributeEncryptionKeyP key;
+  void *eattr;
+  size_t eattr_size;
+  json_t *c;
+
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE,
+                              &key,
+                              sizeof (key));
+  c = json_pack ("{s:s}", "test", "value");
+  GNUNET_assert (NULL != c);
+  TALER_CRYPTO_kyc_attributes_encrypt (&key,
+                                       c,
+                                       &eattr,
+                                       &eattr_size);
+  json_decref (c);
+  c = TALER_CRYPTO_kyc_attributes_decrypt (&key,
+                                           eattr,
+                                           eattr_size);
+  GNUNET_free (eattr);
+  if (NULL == c)
+  {
+    GNUNET_break (0);
+    return 1;
+  }
+  GNUNET_assert (0 ==
+                 strcmp ("value",
+                         json_string_value (json_object_get (c,
+                                                             "test"))));
+  json_decref (c);
+  return 0;
+}
+
+
 int
 main (int argc,
       const char *const argv[])
 {
   (void) argc;
   (void) argv;
+  GNUNET_log_setup ("test-crypto",
+                    "WARNING",
+                    NULL);
   if (0 != test_high_level ())
     return 1;
   if (0 != test_planchets (0))
@@ -500,6 +534,8 @@ main (int argc,
     return 5;
   if (0 != test_contracts ())
     return 6;
+  if (0 != test_attributes ())
+    return 7;
   return 0;
 }
 
diff --git a/src/util/test_helper_cs.c b/src/util/test_helper_cs.c
index 566f1d611..93562e459 100644
--- a/src/util/test_helper_cs.c
+++ b/src/util/test_helper_cs.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2020, 2021 Taler Systems SA
+  (C) 2020, 2021, 2023 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
@@ -129,7 +129,7 @@ free_keys (void)
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_cs hash of the @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -140,7 +140,7 @@ key_cb (void *cls,
         struct GNUNET_TIME_Timestamp start_time,
         struct GNUNET_TIME_Relative validity_duration,
         const struct TALER_CsPubHashP *h_cs,
-        const struct TALER_DenominationPublicKey *denom_pub,
+        struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub,
         const struct TALER_SecurityModulePublicKeyP *sm_pub,
         const struct TALER_SecurityModuleSignatureP *sm_sig)
 {
@@ -155,7 +155,7 @@ key_cb (void *cls,
   {
     bool found = false;
 
-    GNUNET_break (NULL == denom_pub);
+    GNUNET_break (NULL == bs_pub);
     GNUNET_break (NULL == section_name);
     for (unsigned int i = 0; i<MAX_KEYS; i++)
       if (0 == GNUNET_memcmp (h_cs,
@@ -176,7 +176,7 @@ key_cb (void *cls,
     return;
   }
 
-  GNUNET_break (NULL != denom_pub);
+  GNUNET_break (NULL != bs_pub);
   for (unsigned int i = 0; i<MAX_KEYS; i++)
     if (! keys[i].valid)
     {
@@ -184,8 +184,8 @@ key_cb (void *cls,
       keys[i].h_cs = *h_cs;
       keys[i].start_time = start_time;
       keys[i].validity_duration = validity_duration;
-      TALER_denom_pub_deep_copy (&keys[i].denom_pub,
-                                 denom_pub);
+      keys[i].denom_pub.bsign_pub_key
+        = GNUNET_CRYPTO_bsign_pub_incref (bs_pub);
       num_keys++;
       return;
     }
@@ -268,9 +268,15 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh)
   bool success = false;
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
   struct TALER_CoinPubHashP c_hash;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_CS
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
 
   TALER_planchet_master_setup_random (&ps);
   for (unsigned int i = 0; i<MAX_KEYS; i++)
@@ -279,21 +285,26 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh)
 
     if (! keys[i].valid)
       continue;
-    GNUNET_assert (TALER_DENOMINATION_CS ==
-                   keys[i].denom_pub.cipher);
-    pd.blinded_planchet.cipher = TALER_DENOMINATION_CS;
+    GNUNET_assert (GNUNET_CRYPTO_BSA_CS ==
+                   keys[i].denom_pub.bsign_pub_key->cipher);
     TALER_cs_withdraw_nonce_derive (
       &ps,
-      &pd.blinded_planchet.details.cs_blinded_planchet.nonce);
+      &nonce.cs_nonce);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Requesting R derivation with key %s\n",
                 GNUNET_h2s (&keys[i].h_cs.hash));
-    alg_values.cipher = TALER_DENOMINATION_CS;
-    ec = TALER_CRYPTO_helper_cs_r_derive_withdraw (
-      dh,
-      &keys[i].h_cs,
-      &pd.blinded_planchet.details.cs_blinded_planchet.nonce,
-      &alg_values.details.cs_values);
+    {
+      struct TALER_CRYPTO_CsDeriveRequest cdr = {
+        .h_cs = &keys[i].h_cs,
+        .nonce = &nonce.cs_nonce
+      };
+
+      ec = TALER_CRYPTO_helper_cs_r_derive (
+        dh,
+        &cdr,
+        false,
+        &bi.details.cs_values);
+    }
     switch (ec)
     {
     case TALER_EC_NONE:
@@ -329,10 +340,12 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh)
                      TALER_planchet_prepare (&keys[i].denom_pub,
                                              &alg_values,
                                              &bks,
+                                             &nonce,
                                              &coin_priv,
                                              NULL, /* no age commitment */
                                              &c_hash,
                                              &pd));
+      TALER_blinded_planchet_free (&pd.blinded_planchet);
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Successfully prepared planchet");
       success = true;
@@ -372,8 +385,11 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh)
   /* check R derivation does not work if the key is unknown */
   {
     struct TALER_CsPubHashP rnd;
-    struct TALER_CsNonce nonce;
-    struct TALER_DenominationCSPublicRPairP crp;
+    struct GNUNET_CRYPTO_CSPublicRPairP crp;
+    struct TALER_CRYPTO_CsDeriveRequest cdr = {
+      .h_cs = &rnd,
+      .nonce = &nonce.cs_nonce,
+    };
 
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &rnd,
@@ -381,10 +397,10 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh)
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &nonce,
                                 sizeof (nonce));
-    ec = TALER_CRYPTO_helper_cs_r_derive_withdraw (dh,
-                                                   &rnd,
-                                                   &nonce,
-                                                   &crp);
+    ec = TALER_CRYPTO_helper_cs_r_derive (dh,
+                                          &cdr,
+                                          false,
+                                          &crp);
     if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec)
     {
       GNUNET_break (0);
@@ -412,9 +428,15 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
   bool success = false;
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
   struct TALER_CoinPubHashP c_hash;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  struct GNUNET_CRYPTO_BlindingInputValues bi = {
+    .cipher = GNUNET_CRYPTO_BSA_CS
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bi
+  };
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
 
   TALER_planchet_master_setup_random (&ps);
   for (unsigned int i = 0; i<MAX_KEYS; i++)
@@ -423,21 +445,19 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
       continue;
     {
       struct TALER_PlanchetDetail pd;
-
-      pd.blinded_planchet.cipher = TALER_DENOMINATION_CS;
-      // keys[i].denom_pub.cipher = TALER_DENOMINATION_CS;
+      struct TALER_CRYPTO_CsSignRequest csr;
+      struct TALER_CRYPTO_CsDeriveRequest cdr = {
+        .h_cs = &keys[i].h_cs,
+        .nonce = &nonce.cs_nonce
+      };
 
       TALER_cs_withdraw_nonce_derive (&ps,
-                                      &pd.blinded_planchet.details.
-                                      cs_blinded_planchet.nonce);
-      alg_values.cipher = TALER_DENOMINATION_CS;
-      ec = TALER_CRYPTO_helper_cs_r_derive_withdraw (
+                                      &nonce.cs_nonce);
+      ec = TALER_CRYPTO_helper_cs_r_derive (
         dh,
-        &keys[i].h_cs,
-        &pd.blinded_planchet.
-        details.
-        cs_blinded_planchet.nonce,
-        &alg_values.details.cs_values);
+        &cdr,
+        false,
+        &bi.details.cs_values);
       if (TALER_EC_NONE != ec)
         continue;
       TALER_planchet_setup_coin_priv (&ps,
@@ -446,11 +466,11 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
       TALER_planchet_blinding_secret_create (&ps,
                                              &alg_values,
                                              &bks);
-
       GNUNET_assert (GNUNET_YES ==
                      TALER_planchet_prepare (&keys[i].denom_pub,
                                              &alg_values,
                                              &bks,
+                                             &nonce,
                                              &coin_priv,
                                              NULL, /* no age commitment */
                                              &c_hash,
@@ -458,12 +478,15 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Requesting signature with key %s\n",
                   GNUNET_h2s (&keys[i].h_cs.hash));
-      ec = TALER_CRYPTO_helper_cs_sign_withdraw (
+      csr.h_cs = &keys[i].h_cs;
+      csr.blinded_planchet
+        = &pd.blinded_planchet.blinded_message->details.cs_blinded_message;
+      ec = TALER_CRYPTO_helper_cs_sign (
         dh,
-        &keys[i].h_cs,
-        &pd.blinded_planchet.details.
-        cs_blinded_planchet,
+        &csr,
+        false,
         &ds);
+      TALER_blinded_planchet_free (&pd.blinded_planchet);
     }
     switch (ec)
     {
@@ -475,6 +498,7 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
       {
         /* key worked too early */
         GNUNET_break (0);
+        TALER_blinded_denom_sig_free (&ds);
         return 4;
       }
       if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_duration (
@@ -484,6 +508,7 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
       {
         /* key worked too later */
         GNUNET_break (0);
+        TALER_blinded_denom_sig_free (&ds);
         return 5;
       }
       {
@@ -500,8 +525,11 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
                                     &coin))
         {
           GNUNET_break (0);
+          TALER_blinded_denom_sig_free (&ds);
           return 6;
         }
+        TALER_blinded_denom_sig_free (&ds);
+        TALER_denom_sig_free (&coin.sig);
       }
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Received valid signature for key %s\n",
@@ -544,25 +572,29 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
   {
     struct TALER_PlanchetDetail pd;
     struct TALER_CsPubHashP rnd;
+    struct TALER_CRYPTO_CsSignRequest csr;
 
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &rnd,
                                 sizeof (rnd));
-    pd.blinded_planchet.cipher = TALER_DENOMINATION_CS;
     GNUNET_assert (GNUNET_YES ==
                    TALER_planchet_prepare (&keys[0].denom_pub,
                                            &alg_values,
                                            &bks,
+                                           &nonce,
                                            &coin_priv,
                                            NULL, /* no age commitment */
                                            &c_hash,
                                            &pd));
-
-    ec = TALER_CRYPTO_helper_cs_sign_withdraw (
+    csr.h_cs = &rnd;
+    csr.blinded_planchet
+      = &pd.blinded_planchet.blinded_message->details.cs_blinded_message;
+    ec = TALER_CRYPTO_helper_cs_sign (
       dh,
-      &rnd,
-      &pd.blinded_planchet.details.cs_blinded_planchet,
+      &csr,
+      false,
       &ds);
+    TALER_blinded_planchet_free (&pd.blinded_planchet);
     if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec)
     {
       if (TALER_EC_NONE == ec)
@@ -579,6 +611,226 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh)
 
 
 /**
+ * Test batch signing logic.
+ *
+ * @param dh handle to the helper
+ * @param batch_size how large should the batch be
+ * @param check_sigs also check unknown key and signatures
+ * @return 0 on success
+ */
+static int
+test_batch_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
+                    unsigned int batch_size,
+                    bool check_sigs)
+{
+  struct TALER_BlindedDenominationSignature ds[batch_size];
+  enum TALER_ErrorCode ec;
+  bool success = false;
+  struct TALER_PlanchetMasterSecretP ps[batch_size];
+  struct TALER_CoinSpendPrivateKeyP coin_priv[batch_size];
+  union GNUNET_CRYPTO_BlindingSecretP bks[batch_size];
+  struct TALER_CoinPubHashP c_hash[batch_size];
+  struct GNUNET_CRYPTO_BlindingInputValues bi[batch_size];
+  struct TALER_ExchangeWithdrawValues alg_values[batch_size];
+  union GNUNET_CRYPTO_BlindSessionNonce nonces[batch_size];
+
+  for (unsigned int i = 0; i<batch_size; i++)
+    TALER_planchet_master_setup_random (&ps[i]);
+  for (unsigned int k = 0; k<MAX_KEYS; k++)
+  {
+    if (! keys[k].valid)
+      continue;
+    {
+      struct TALER_PlanchetDetail pd[batch_size];
+      struct TALER_CRYPTO_CsSignRequest csr[batch_size];
+      struct TALER_CRYPTO_CsDeriveRequest cdr[batch_size];
+      struct GNUNET_CRYPTO_CSPublicRPairP crps[batch_size];
+
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        cdr[i].h_cs = &keys[k].h_cs;
+        cdr[i].nonce = &nonces[i].cs_nonce;
+        TALER_cs_withdraw_nonce_derive (
+          &ps[i],
+          &nonces[i].cs_nonce);
+        bi[i].cipher = GNUNET_CRYPTO_BSA_CS;
+        alg_values[i].blinding_inputs = &bi[i];
+      }
+      ec = TALER_CRYPTO_helper_cs_r_batch_derive (
+        dh,
+        batch_size,
+        cdr,
+        false,
+        crps);
+      if (TALER_EC_NONE != ec)
+        continue;
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        bi[i].details.cs_values = crps[i];
+        TALER_planchet_setup_coin_priv (&ps[i],
+                                        &alg_values[i],
+                                        &coin_priv[i]);
+        TALER_planchet_blinding_secret_create (&ps[i],
+                                               &alg_values[i],
+                                               &bks[i]);
+        GNUNET_assert (GNUNET_YES ==
+                       TALER_planchet_prepare (&keys[k].denom_pub,
+                                               &alg_values[i],
+                                               &bks[i],
+                                               &nonces[i],
+                                               &coin_priv[i],
+                                               NULL, /* no age commitment */
+                                               &c_hash[i],
+                                               &pd[i]));
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Requesting signature with key %s\n",
+                    GNUNET_h2s (&keys[k].h_cs.hash));
+        csr[i].h_cs = &keys[k].h_cs;
+        csr[i].blinded_planchet
+          = &pd[i].blinded_planchet.blinded_message->details.cs_blinded_message;
+      }
+      ec = TALER_CRYPTO_helper_cs_batch_sign (
+        dh,
+        batch_size,
+        csr,
+        false,
+        ds);
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        TALER_blinded_planchet_free (&pd[i].blinded_planchet);
+      }
+    }
+    switch (ec)
+    {
+    case TALER_EC_NONE:
+      if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_remaining (
+                                      keys[k].start_time.abs_time),
+                                    >,
+                                    GNUNET_TIME_UNIT_SECONDS))
+      {
+        /* key worked too early */
+        GNUNET_break (0);
+        return 4;
+      }
+      if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_duration (
+                                      keys[k].start_time.abs_time),
+                                    >,
+                                    keys[k].validity_duration))
+      {
+        /* key worked too later */
+        GNUNET_break (0);
+        return 5;
+      }
+      if (check_sigs)
+      {
+        for (unsigned int i = 0; i<batch_size; i++)
+        {
+          struct TALER_FreshCoin coin;
+
+          if (GNUNET_OK !=
+              TALER_planchet_to_coin (&keys[k].denom_pub,
+                                      &ds[i],
+                                      &bks[i],
+                                      &coin_priv[i],
+                                      NULL, /* no age commitment */
+                                      &c_hash[i],
+                                      &alg_values[i],
+                                      &coin))
+          {
+            GNUNET_break (0);
+            return 6;
+          }
+          TALER_blinded_denom_sig_free (&ds[i]);
+          TALER_denom_sig_free (&coin.sig);
+        }
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Received valid signature for key %s\n",
+                    GNUNET_h2s (&keys[k].h_cs.hash));
+      }
+      else
+      {
+        for (unsigned int i = 0; i<batch_size; i++)
+          TALER_blinded_denom_sig_free (&ds[i]);
+      }
+      success = true;
+      break;
+    case TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY:
+      /* This 'failure' is expected, we're testing also for the
+         error handling! */
+      if ( (GNUNET_TIME_relative_is_zero (
+              GNUNET_TIME_absolute_get_remaining (
+                keys[k].start_time.abs_time))) &&
+           (GNUNET_TIME_relative_cmp (
+              GNUNET_TIME_absolute_get_duration (
+                keys[k].start_time.abs_time),
+              <,
+              keys[k].validity_duration)) )
+      {
+        /* key should have worked! */
+        GNUNET_break (0);
+        return 6;
+      }
+      break;
+    default:
+      /* unexpected error */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Unexpected error %d\n",
+                  ec);
+      return 7;
+    }
+  }
+  if (! success)
+  {
+    /* no valid key for signing found, also bad */
+    GNUNET_break (0);
+    return 16;
+  }
+
+  /* check signing does not work if the key is unknown */
+  if (check_sigs)
+  {
+    struct TALER_PlanchetDetail pd;
+    struct TALER_CsPubHashP rnd;
+    struct TALER_CRYPTO_CsSignRequest csr;
+
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &rnd,
+                                sizeof (rnd));
+    GNUNET_assert (GNUNET_YES ==
+                   TALER_planchet_prepare (&keys[0].denom_pub,
+                                           &alg_values[0],
+                                           &bks[0],
+                                           &nonces[0],
+                                           &coin_priv[0],
+                                           NULL, /* no age commitment */
+                                           &c_hash[0],
+                                           &pd));
+    csr.h_cs = &rnd;
+    csr.blinded_planchet
+      = &pd.blinded_planchet.blinded_message->details.cs_blinded_message;
+    ec = TALER_CRYPTO_helper_cs_batch_sign (
+      dh,
+      1,
+      &csr,
+      false,
+      &ds[0]);
+    TALER_blinded_planchet_free (&pd.blinded_planchet);
+    if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec)
+    {
+      if (TALER_EC_NONE == ec)
+        TALER_blinded_denom_sig_free (&ds[0]);
+      GNUNET_break (0);
+      return 17;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Signing with invalid key %s failed as desired\n",
+                GNUNET_h2s (&rnd.hash));
+  }
+  return 0;
+}
+
+
+/**
  * Benchmark signing logic.
  *
  * @param dh handle to the helper
@@ -593,8 +845,13 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
   struct GNUNET_TIME_Relative duration;
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+  struct GNUNET_CRYPTO_BlindingInputValues bv = {
+    .cipher = GNUNET_CRYPTO_BSA_CS
+  };
+  struct TALER_ExchangeWithdrawValues alg_values = {
+    .blinding_inputs = &bv
+  };
 
   TALER_planchet_master_setup_random (&ps);
   duration = GNUNET_TIME_UNIT_ZERO;
@@ -618,19 +875,20 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
       {
         struct TALER_CoinPubHashP c_hash;
         struct TALER_PlanchetDetail pd;
-
-        pd.blinded_planchet.cipher = TALER_DENOMINATION_CS;
-        TALER_cs_withdraw_nonce_derive (&ps,
-                                        &pd.blinded_planchet.details.
-                                        cs_blinded_planchet.nonce);
-        alg_values.cipher = TALER_DENOMINATION_CS;
-        ec = TALER_CRYPTO_helper_cs_r_derive_melt (
+        union GNUNET_CRYPTO_BlindSessionNonce nonce;
+        struct TALER_CRYPTO_CsDeriveRequest cdr = {
+          .h_cs = &keys[i].h_cs,
+          .nonce = &nonce.cs_nonce
+        };
+
+        TALER_cs_withdraw_nonce_derive (
+          &ps,
+          &nonce.cs_nonce);
+        ec = TALER_CRYPTO_helper_cs_r_derive (
           dh,
-          &keys[i].h_cs,
-          &pd.blinded_planchet.
-          details.
-          cs_blinded_planchet.nonce,
-          &alg_values.details.cs_values);
+          &cdr,
+          true,
+          &bv.details.cs_values);
         if (TALER_EC_NONE != ec)
           continue;
         TALER_planchet_setup_coin_priv (&ps,
@@ -643,6 +901,7 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
                        TALER_planchet_prepare (&keys[i].denom_pub,
                                                &alg_values,
                                                &bks,
+                                               &nonce,
                                                &coin_priv,
                                                NULL, /* no age commitment */
                                                &c_hash,
@@ -652,12 +911,15 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
         {
           struct GNUNET_TIME_Absolute start = GNUNET_TIME_absolute_get ();
           struct GNUNET_TIME_Relative delay;
+          struct TALER_CRYPTO_CsSignRequest csr;
 
-          ec = TALER_CRYPTO_helper_cs_sign_melt (
+          csr.h_cs = &keys[i].h_cs;
+          csr.blinded_planchet
+            = &pd.blinded_planchet.blinded_message->details.cs_blinded_message;
+          ec = TALER_CRYPTO_helper_cs_sign (
             dh,
-            &keys[i].h_cs,
-            &pd.blinded_planchet.details.
-            cs_blinded_planchet,
+            &csr,
+            true,
             &ds);
           if (TALER_EC_NONE != ec)
             break;
@@ -669,9 +931,10 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh,
           if (NUM_SIGN_PERFS <= j)
             break;
         }
+        TALER_blinded_planchet_free (&pd.blinded_planchet);
       }
-    } /* for i */
-  } /* for j */
+    }   /* for i */
+  }   /* for j */
   fprintf (stderr,
            "%u (%s) signature operations took %s\n",
            (unsigned int) NUM_SIGN_PERFS,
@@ -707,6 +970,7 @@ par_signing (struct GNUNET_CONFIGURATION_Handle *cfg)
       int ret;
 
       dh = TALER_CRYPTO_helper_cs_connect (cfg,
+                                           "taler-exchange",
                                            &key_cb,
                                            NULL);
       GNUNET_assert (NULL != dh);
@@ -764,6 +1028,7 @@ run_test (void)
     nanosleep (&req,
                NULL);
     dh = TALER_CRYPTO_helper_cs_connect (cfg,
+                                         "taler-exchange",
                                          &key_cb,
                                          NULL);
     if (NULL != dh)
@@ -796,6 +1061,34 @@ run_test (void)
   if (0 == ret)
     ret = test_signing (dh);
   if (0 == ret)
+    ret = test_batch_signing (dh,
+                              2,
+                              true);
+  if (0 == ret)
+    ret = test_batch_signing (dh,
+                              256,
+                              true);
+  for (unsigned int i = 0; i<5; i++)
+  {
+    static unsigned int batches[] = { 1, 4, 16, 64, 256 };
+    unsigned int batch_size = batches[i];
+    struct GNUNET_TIME_Absolute start;
+    struct GNUNET_TIME_Relative duration;
+
+    start = GNUNET_TIME_absolute_get ();
+    if (0 != ret)
+      break;
+    ret = test_batch_signing (dh,
+                              batch_size,
+                              false);
+    duration = GNUNET_TIME_absolute_get_duration (start);
+    fprintf (stderr,
+             "%4u (batch) signature operations took %s (total real time)\n",
+             (unsigned int) batch_size,
+             GNUNET_STRINGS_relative_time_to_string (duration,
+                                                     GNUNET_YES));
+  }
+  if (0 == ret)
     ret = perf_signing (dh,
                         "sequential");
   TALER_CRYPTO_helper_cs_disconnect (dh);
@@ -818,13 +1111,14 @@ main (int argc,
   int ret;
   enum GNUNET_OS_ProcessStatusType type;
   unsigned long code;
+  const char *loglev = "WARNING";
 
   (void) argc;
   (void) argv;
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
   GNUNET_log_setup ("test-helper-cs",
-                    "WARNING",
+                    loglev,
                     NULL);
   GNUNET_OS_init (TALER_project_data_default ());
   libexec_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
@@ -840,7 +1134,7 @@ main (int argc,
                                     "-c",
                                     "test_helper_cs.conf",
                                     "-L",
-                                    "WARNING",
+                                    loglev,
                                     NULL);
   if (NULL == helper)
   {
diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
index da1c51b46..0119e4278 100644
--- a/src/util/test_helper_eddsa.c
+++ b/src/util/test_helper_eddsa.c
@@ -365,6 +365,7 @@ par_signing (struct GNUNET_CONFIGURATION_Handle *cfg)
       int ret;
 
       esh = TALER_CRYPTO_helper_esign_connect (cfg,
+                                               "taler-exchange",
                                                &key_cb,
                                                NULL);
       if (NULL == esh)
@@ -427,6 +428,7 @@ run_test (void)
     nanosleep (&req,
                NULL);
     esh = TALER_CRYPTO_helper_esign_connect (cfg,
+                                             "taler-exchange",
                                              &key_cb,
                                              NULL);
     if (NULL != esh)
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index eaf43622a..2bc15879f 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  (C) 2020, 2021 Taler Systems SA
+  (C) 2020, 2021, 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
@@ -129,7 +129,7 @@ free_keys (void)
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_rsa hash of the @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -140,7 +140,7 @@ key_cb (void *cls,
         struct GNUNET_TIME_Timestamp start_time,
         struct GNUNET_TIME_Relative validity_duration,
         const struct TALER_RsaPubHashP *h_rsa,
-        const struct TALER_DenominationPublicKey *denom_pub,
+        struct GNUNET_CRYPTO_BlindSignPublicKey *bs_pub,
         const struct TALER_SecurityModulePublicKeyP *sm_pub,
         const struct TALER_SecurityModuleSignatureP *sm_sig)
 {
@@ -155,7 +155,7 @@ key_cb (void *cls,
   {
     bool found = false;
 
-    GNUNET_break (NULL == denom_pub);
+    GNUNET_break (NULL == bs_pub);
     GNUNET_break (NULL == section_name);
     for (unsigned int i = 0; i<MAX_KEYS; i++)
       if (0 == GNUNET_memcmp (h_rsa,
@@ -176,7 +176,7 @@ key_cb (void *cls,
     return;
   }
 
-  GNUNET_break (NULL != denom_pub);
+  GNUNET_break (NULL != bs_pub);
   for (unsigned int i = 0; i<MAX_KEYS; i++)
     if (! keys[i].valid)
     {
@@ -184,8 +184,8 @@ key_cb (void *cls,
       keys[i].h_rsa = *h_rsa;
       keys[i].start_time = start_time;
       keys[i].validity_duration = validity_duration;
-      TALER_denom_pub_deep_copy (&keys[i].denom_pub,
-                                 denom_pub);
+      keys[i].denom_pub.bsign_pub_key
+        = GNUNET_CRYPTO_bsign_pub_incref (bs_pub);
       num_keys++;
       return;
     }
@@ -268,19 +268,22 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
   enum TALER_ErrorCode ec;
   bool success = false;
   struct TALER_PlanchetMasterSecretP ps;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  const struct TALER_ExchangeWithdrawValues *alg_values
+    = TALER_denom_ewv_rsa_singleton ();
   struct TALER_AgeCommitmentHash ach;
   struct TALER_CoinPubHashP c_hash;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
-  union TALER_DenominationBlindingKeyP bks;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
 
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
                               &ps,
                               sizeof (ps));
-
-  alg_values.cipher = TALER_DENOMINATION_RSA;
-  TALER_planchet_setup_coin_priv (&ps, &alg_values, &coin_priv);
-  TALER_planchet_blinding_secret_create (&ps, &alg_values, &bks);
+  TALER_planchet_setup_coin_priv (&ps,
+                                  alg_values,
+                                  &coin_priv);
+  TALER_planchet_blinding_secret_create (&ps,
+                                         alg_values,
+                                         &bks);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                               &ach,
                               sizeof(ach));
@@ -289,33 +292,40 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
   {
     if (! keys[i].valid)
       continue;
-    if (TALER_DENOMINATION_RSA != keys[i].denom_pub.cipher)
+    if (GNUNET_CRYPTO_BSA_RSA !=
+        keys[i].denom_pub.bsign_pub_key->cipher)
       continue;
     {
       struct TALER_PlanchetDetail pd;
-      pd.blinded_planchet.cipher = TALER_DENOMINATION_RSA;
 
       GNUNET_assert (GNUNET_YES ==
                      TALER_planchet_prepare (&keys[i].denom_pub,
-                                             &alg_values,
+                                             alg_values,
                                              &bks,
+                                             NULL,
                                              &coin_priv,
                                              &ach,
                                              &c_hash,
                                              &pd));
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Requesting signature over %u bytes with key %s\n",
-                  (unsigned
-                   int) pd.blinded_planchet.details.rsa_blinded_planchet.
-                  blinded_msg_size,
-                  GNUNET_h2s (&keys[i].h_rsa.hash));
-      ec = TALER_CRYPTO_helper_rsa_sign (dh,
-                                         &keys[i].h_rsa,
-                                         pd.blinded_planchet.details.
-                                         rsa_blinded_planchet.blinded_msg,
-                                         pd.blinded_planchet.details.
-                                         rsa_blinded_planchet.blinded_msg_size,
-                                         &ds);
+      {
+        struct TALER_CRYPTO_RsaSignRequest rsr = {
+          .h_rsa = &keys[i].h_rsa,
+          .msg =
+            pd.blinded_planchet.blinded_message->details.rsa_blinded_message.
+            blinded_msg,
+          .msg_size =
+            pd.blinded_planchet.blinded_message->details.rsa_blinded_message.
+            blinded_msg_size
+        };
+
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "Requesting signature over %u bytes with key %s\n",
+                    (unsigned int) rsr.msg_size,
+                    GNUNET_h2s (&rsr.h_rsa->hash));
+        ec = TALER_CRYPTO_helper_rsa_sign (dh,
+                                           &rsr,
+                                           &ds);
+      }
       TALER_blinded_planchet_free (&pd.blinded_planchet);
     }
     switch (ec)
@@ -347,7 +357,7 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
                                      &ds,
                                      &bks,
                                      &c_hash,
-                                     &alg_values,
+                                     alg_values,
                                      &keys[i].denom_pub))
         {
           GNUNET_break (0);
@@ -391,8 +401,10 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
     default:
       /* unexpected error */
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unexpected error %d\n",
-                  ec);
+                  "Unexpected error %d at %s:%u\n",
+                  ec,
+                  __FILE__,
+                  __LINE__);
       return 7;
     }
   }
@@ -406,14 +418,17 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
   /* check signing does not work if the key is unknown */
   {
     struct TALER_RsaPubHashP rnd;
+    struct TALER_CRYPTO_RsaSignRequest rsr = {
+      .h_rsa = &rnd,
+      .msg = "Hello",
+      .msg_size = strlen ("Hello")
+    };
 
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &rnd,
                                 sizeof (rnd));
     ec = TALER_CRYPTO_helper_rsa_sign (dh,
-                                       &rnd,
-                                       "Hello",
-                                       strlen ("Hello"),
+                                       &rsr,
                                        &ds);
     if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec)
     {
@@ -431,6 +446,227 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh)
 
 
 /**
+ * Test batch signing logic.
+ *
+ * @param dh handle to the helper
+ * @param batch_size how large should the batch be
+ * @param check_sigs also check unknown key and signatures
+ * @return 0 on success
+ */
+static int
+test_batch_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh,
+                    unsigned int batch_size,
+                    bool check_sigs)
+{
+  struct TALER_BlindedDenominationSignature ds[batch_size];
+  enum TALER_ErrorCode ec;
+  bool success = false;
+  struct TALER_PlanchetMasterSecretP ps[batch_size];
+  const struct TALER_ExchangeWithdrawValues *alg_values;
+  struct TALER_AgeCommitmentHash ach[batch_size];
+  struct TALER_CoinPubHashP c_hash[batch_size];
+  struct TALER_CoinSpendPrivateKeyP coin_priv[batch_size];
+  union GNUNET_CRYPTO_BlindingSecretP bks[batch_size];
+
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
+                              &ps,
+                              sizeof (ps));
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                              &ach,
+                              sizeof(ach));
+  alg_values = TALER_denom_ewv_rsa_singleton ();
+  for (unsigned int i = 0; i<batch_size; i++)
+  {
+    TALER_planchet_setup_coin_priv (&ps[i],
+                                    alg_values,
+                                    &coin_priv[i]);
+    TALER_planchet_blinding_secret_create (&ps[i],
+                                           alg_values,
+                                           &bks[i]);
+  }
+  for (unsigned int k = 0; k<MAX_KEYS; k++)
+  {
+    if (success && ! check_sigs)
+      break; /* only do one round */
+    if (! keys[k].valid)
+      continue;
+    if (GNUNET_CRYPTO_BSA_RSA !=
+        keys[k].denom_pub.bsign_pub_key->cipher)
+      continue;
+    {
+      struct TALER_PlanchetDetail pd[batch_size];
+      struct TALER_CRYPTO_RsaSignRequest rsr[batch_size];
+
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        GNUNET_assert (GNUNET_YES ==
+                       TALER_planchet_prepare (&keys[k].denom_pub,
+                                               alg_values,
+                                               &bks[i],
+                                               NULL,
+                                               &coin_priv[i],
+                                               &ach[i],
+                                               &c_hash[i],
+                                               &pd[i]));
+        rsr[i].h_rsa
+          = &keys[k].h_rsa;
+        rsr[i].msg
+          = pd[i].blinded_planchet.blinded_message->details.rsa_blinded_message.
+            blinded_msg;
+        rsr[i].msg_size
+          = pd[i].blinded_planchet.blinded_message->details.rsa_blinded_message.
+            blinded_msg_size;
+      }
+      ec = TALER_CRYPTO_helper_rsa_batch_sign (dh,
+                                               batch_size,
+                                               rsr,
+                                               ds);
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        if (TALER_EC_NONE == ec)
+          GNUNET_break (GNUNET_CRYPTO_BSA_RSA ==
+                        ds[i].blinded_sig->cipher);
+        TALER_blinded_planchet_free (&pd[i].blinded_planchet);
+      }
+    }
+    switch (ec)
+    {
+    case TALER_EC_NONE:
+      if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_remaining (
+                                      keys[k].start_time.abs_time),
+                                    >,
+                                    GNUNET_TIME_UNIT_SECONDS))
+      {
+        /* key worked too early */
+        GNUNET_break (0);
+        return 4;
+      }
+      if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_duration (
+                                      keys[k].start_time.abs_time),
+                                    >,
+                                    keys[k].validity_duration))
+      {
+        /* key worked too later */
+        GNUNET_break (0);
+        return 5;
+      }
+      for (unsigned int i = 0; i<batch_size; i++)
+      {
+        struct TALER_DenominationSignature rs;
+
+        if (check_sigs)
+        {
+          if (GNUNET_OK !=
+              TALER_denom_sig_unblind (&rs,
+                                       &ds[i],
+                                       &bks[i],
+                                       &c_hash[i],
+                                       alg_values,
+                                       &keys[k].denom_pub))
+          {
+            GNUNET_break (0);
+            return 6;
+          }
+        }
+        TALER_blinded_denom_sig_free (&ds[i]);
+        if (check_sigs)
+        {
+          if (GNUNET_OK !=
+              TALER_denom_pub_verify (&keys[k].denom_pub,
+                                      &rs,
+                                      &c_hash[i]))
+          {
+            /* signature invalid */
+            GNUNET_break (0);
+            TALER_denom_sig_free (&rs);
+            return 7;
+          }
+          TALER_denom_sig_free (&rs);
+        }
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  "Received valid signature for key %s\n",
+                  GNUNET_h2s (&keys[k].h_rsa.hash));
+      success = true;
+      break;
+    case TALER_EC_EXCHANGE_DENOMINATION_HELPER_TOO_EARLY:
+      /* This 'failure' is expected, we're testing also for the
+         error handling! */
+      for (unsigned int i = 0; i<batch_size; i++)
+        TALER_blinded_denom_sig_free (&ds[i]);
+      if ( (GNUNET_TIME_relative_is_zero (
+              GNUNET_TIME_absolute_get_remaining (
+                keys[k].start_time.abs_time))) &&
+           (GNUNET_TIME_relative_cmp (
+              GNUNET_TIME_absolute_get_duration (
+                keys[k].start_time.abs_time),
+              <,
+              keys[k].validity_duration)) )
+      {
+        /* key should have worked! */
+        GNUNET_break (0);
+        return 6;
+      }
+      break;
+    case TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN:
+      for (unsigned int i = 0; i<batch_size; i++)
+        TALER_blinded_denom_sig_free (&ds[i]);
+      break;
+    default:
+      /* unexpected error */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Unexpected error %d at %s:%u\n",
+                  ec,
+                  __FILE__,
+                  __LINE__);
+      for (unsigned int i = 0; i<batch_size; i++)
+        TALER_blinded_denom_sig_free (&ds[i]);
+      return 7;
+    }
+  }
+  if (! success)
+  {
+    /* no valid key for signing found, also bad */
+    GNUNET_break (0);
+    return 16;
+  }
+
+  /* check signing does not work if the key is unknown */
+  if (check_sigs)
+  {
+    struct TALER_RsaPubHashP rnd;
+    struct TALER_CRYPTO_RsaSignRequest rsr = {
+      .h_rsa = &rnd,
+      .msg = "Hello",
+      .msg_size = strlen ("Hello")
+    };
+
+    GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
+                                &rnd,
+                                sizeof (rnd));
+    ec = TALER_CRYPTO_helper_rsa_batch_sign (dh,
+                                             1,
+                                             &rsr,
+                                             ds);
+    if (TALER_EC_EXCHANGE_GENERIC_DENOMINATION_KEY_UNKNOWN != ec)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Signing with invalid key returned unexpected status %d\n",
+                  ec);
+      if (TALER_EC_NONE == ec)
+        TALER_blinded_denom_sig_free (ds);
+      GNUNET_break (0);
+      return 17;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Signing with invalid key %s failed as desired\n",
+                GNUNET_h2s (&rnd.hash));
+  }
+  return 0;
+}
+
+
+/**
  * Benchmark signing logic.
  *
  * @param dh handle to the helper
@@ -446,13 +682,17 @@ perf_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh,
   struct TALER_PlanchetMasterSecretP ps;
   struct TALER_CoinSpendPrivateKeyP coin_priv;
   struct TALER_AgeCommitmentHash ach;
-  union TALER_DenominationBlindingKeyP bks;
-  struct TALER_ExchangeWithdrawValues alg_values;
+  union GNUNET_CRYPTO_BlindingSecretP bks;
+  const struct TALER_ExchangeWithdrawValues *alg_values
+    = TALER_denom_ewv_rsa_singleton ();
 
   TALER_planchet_master_setup_random (&ps);
-  alg_values.cipher = TALER_DENOMINATION_RSA;
-  TALER_planchet_setup_coin_priv (&ps, &alg_values, &coin_priv);
-  TALER_planchet_blinding_secret_create (&ps, &alg_values, &bks);
+  TALER_planchet_setup_coin_priv (&ps,
+                                  alg_values,
+                                  &coin_priv);
+  TALER_planchet_blinding_secret_create (&ps,
+                                         alg_values,
+                                         &bks);
   GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                               &ach,
                               sizeof(ach));
@@ -464,7 +704,8 @@ perf_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh,
     {
       if (! keys[i].valid)
         continue;
-      if (TALER_DENOMINATION_RSA != keys[i].denom_pub.cipher)
+      if (GNUNET_CRYPTO_BSA_RSA !=
+          keys[i].denom_pub.bsign_pub_key->cipher)
         continue;
       if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_remaining (
                                       keys[i].start_time.abs_time),
@@ -482,8 +723,9 @@ perf_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh,
 
         GNUNET_assert (GNUNET_YES ==
                        TALER_planchet_prepare (&keys[i].denom_pub,
-                                               &alg_values,
+                                               alg_values,
                                                &bks,
+                                               NULL,
                                                &coin_priv,
                                                &ach,
                                                &c_hash,
@@ -493,14 +735,18 @@ perf_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh,
         {
           struct GNUNET_TIME_Absolute start = GNUNET_TIME_absolute_get ();
           struct GNUNET_TIME_Relative delay;
+          struct TALER_CRYPTO_RsaSignRequest rsr = {
+            .h_rsa = &keys[i].h_rsa,
+            .msg =
+              pd.blinded_planchet.blinded_message->details.rsa_blinded_message.
+              blinded_msg,
+            .msg_size =
+              pd.blinded_planchet.blinded_message->details.rsa_blinded_message.
+              blinded_msg_size
+          };
 
           ec = TALER_CRYPTO_helper_rsa_sign (dh,
-                                             &keys[i].h_rsa,
-                                             pd.blinded_planchet.details.
-                                             rsa_blinded_planchet.blinded_msg,
-                                             pd.blinded_planchet.details.
-                                             rsa_blinded_planchet.
-                                             blinded_msg_size,
+                                             &rsr,
                                              &ds);
           if (TALER_EC_NONE != ec)
             break;
@@ -551,6 +797,7 @@ par_signing (struct GNUNET_CONFIGURATION_Handle *cfg)
       int ret;
 
       dh = TALER_CRYPTO_helper_rsa_connect (cfg,
+                                            "taler-exchange",
                                             &key_cb,
                                             NULL);
       GNUNET_assert (NULL != dh);
@@ -602,12 +849,14 @@ run_test (void)
     return 77;
   }
 
-  fprintf (stderr, "Waiting for helper to start ... ");
+  fprintf (stderr,
+           "Waiting for helper to start ... ");
   for (unsigned int i = 0; i<100; i++)
   {
     nanosleep (&req,
                NULL);
     dh = TALER_CRYPTO_helper_rsa_connect (cfg,
+                                          "taler-exchange",
                                           &key_cb,
                                           NULL);
     if (NULL != dh)
@@ -638,6 +887,34 @@ run_test (void)
   if (0 == ret)
     ret = test_signing (dh);
   if (0 == ret)
+    ret = test_batch_signing (dh,
+                              2,
+                              true);
+  if (0 == ret)
+    ret = test_batch_signing (dh,
+                              256,
+                              true);
+  for (unsigned int i = 0; i<5; i++)
+  {
+    static unsigned int batches[] = { 1, 4, 16, 64, 256 };
+    unsigned int batch_size = batches[i];
+    struct GNUNET_TIME_Absolute start;
+    struct GNUNET_TIME_Relative duration;
+
+    start = GNUNET_TIME_absolute_get ();
+    if (0 != ret)
+      break;
+    ret = test_batch_signing (dh,
+                              batch_size,
+                              false);
+    duration = GNUNET_TIME_absolute_get_duration (start);
+    fprintf (stderr,
+             "%4u (batch) signature operations took %s (total real time)\n",
+             (unsigned int) batch_size,
+             GNUNET_STRINGS_relative_time_to_string (duration,
+                                                     GNUNET_YES));
+  }
+  if (0 == ret)
     ret = perf_signing (dh,
                         "sequential");
   TALER_CRYPTO_helper_rsa_disconnect (dh);
diff --git a/src/util/test_payto.c b/src/util/test_payto.c
index 4dc73a964..62ba7d28e 100644
--- a/src/util/test_payto.c
+++ b/src/util/test_payto.c
@@ -22,16 +22,16 @@
 #include "taler_util.h"
 
 #define CHECK(a,b) do { \
-    GNUNET_assert (a != NULL); \
-    GNUNET_assert (b != NULL); \
-    if (0 != strcmp (a,b)) {   \
-      GNUNET_break (0); \
-      fprintf (stderr, "Got %s, wanted %s\n", b, a); \
-      GNUNET_free (b); \
-      return 1; \
-    } else { \
-      GNUNET_free (b); \
-    }  \
+          GNUNET_assert (a != NULL); \
+          GNUNET_assert (b != NULL); \
+          if (0 != strcmp (a,b)) {   \
+            GNUNET_break (0); \
+            fprintf (stderr, "Got %s, wanted %s\n", b, a); \
+            GNUNET_free (b); \
+            return 1; \
+          } else { \
+            GNUNET_free (b); \
+          }  \
 } while (0)
 
 
@@ -50,11 +50,55 @@ main (int argc,
                  TALER_iban_validate ("FR1420041010050500013M02606"));
   GNUNET_assert (NULL ==
                  TALER_iban_validate ("DE89370400440532013000"));
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/hostname/username?receiver-name=foo");
+  GNUNET_assert (NULL == r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/hostname/~path/username?receiver-name=foo");
+  GNUNET_assert (NULL == r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/hostname/~path/username?receiver-name=fo/o");
+  GNUNET_assert (NULL == r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/hostname/path/username?receiver-name=foo");
+  GNUNET_assert (NULL == r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/https://hostname/username?receiver-name=foo");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/hostname:4a2/path/username?receiver-name=foo");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/-hostname/username?receiver-name=foo");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/domain..name/username?receiver-name=foo");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/domain..name/?receiver-name=foo");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
+  r = TALER_payto_validate (
+    "payto://x-taler-bank/domain.name/username");
+  GNUNET_assert (NULL != r);
+  GNUNET_free (r);
   r = TALER_xtalerbank_account_from_payto (
     "payto://x-taler-bank/localhost:1080/alice");
   CHECK ("alice",
          r);
   r = TALER_xtalerbank_account_from_payto (
+    "payto://x-taler-bank/localhost:1080/path/alice");
+  CHECK ("alice",
+         r);
+  r = TALER_xtalerbank_account_from_payto (
+    "payto://x-taler-bank/localhost:1080/path/alice?receiver-name=ali/cia");
+  CHECK ("alice",
+         r);
+  r = TALER_xtalerbank_account_from_payto (
     "payto://x-taler-bank/localhost:1080/alice?subject=hello&amount=EUR:1");
   CHECK ("alice",
          r);
diff --git a/src/util/tv_age_restriction.c b/src/util/tv_age_restriction.c
index 2bddb9d1b..9fc2b4823 100644
--- a/src/util/tv_age_restriction.c
+++ b/src/util/tv_age_restriction.c
@@ -34,16 +34,12 @@ get_age_group (
 
 /**
  * Encodes the age mask into a string, like "8:10:12:14:16:18:21"
- *
- * @param mask Age mask
- * @return String representation of the age mask, allocated by GNUNET_malloc.
- *         Can be used as value in the TALER config.
  */
 char *
 age_mask_to_string (
-  const struct TALER_AgeMask *m)
+  const struct TALER_AgeMask *mask)
 {
-  uint32_t bits = m->bits;
+  uint32_t bits = mask->bits;
   unsigned int n = 0;
   char *buf = GNUNET_malloc (32 * 3); // max characters possible
   char *pos = buf;
@@ -162,7 +158,7 @@ generate (
                                 sizeof(seed));
 
     json_object_set (j_top,
-                     "commited_age",
+                     "committed_age",
                      json_integer (age));
 
     ret = TALER_age_restriction_commit (mask,
@@ -179,8 +175,6 @@ generate (
       GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                   &salt,
                                   sizeof (salt));
-      uint64_t salt = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                                UINT64_MAX / 2);
       GNUNET_assert (GNUNET_OK ==
                      TALER_age_commitment_derive (&acp[i],
                                                   &salt,
@@ -216,7 +210,7 @@ generate (
             "not required: age group is 0");
         else if (min_group > age_group)
           j_reason = json_string (
-            "not applicable: commited age too small");
+            "not applicable: committed age too small");
         else
           j_reason = GNUNET_JSON_PACK (
             GNUNET_JSON_pack_data_auto (NULL, &at));
diff --git a/src/util/url.c b/src/util/url.c
index a140a3a2e..bf59ba6ec 100644
--- a/src/util/url.c
+++ b/src/util/url.c
@@ -212,8 +212,6 @@ TALER_url_join (const char *base_url,
                 ...)
 {
   struct GNUNET_Buffer buf = { 0 };
-  va_list args;
-  size_t len;
 
   GNUNET_assert (NULL != base_url);
   GNUNET_assert (NULL != path);
@@ -224,40 +222,45 @@ TALER_url_join (const char *base_url,
                 "Empty base URL specified\n");
     return NULL;
   }
-  if ('/' != base_url[strlen (base_url) - 1])
+  if ('\0' != path[0])
   {
-    /* Must be an actual base URL! */
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Base URL `%s' does not end with '/', cannot join with `%s'\n",
-                base_url,
-                path);
-    return NULL;
+    if ('/' != base_url[strlen (base_url) - 1])
+    {
+      /* Must be an actual base URL! */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Base URL `%s' does not end with '/', cannot join with `%s'\n",
+                  base_url,
+                  path);
+      return NULL;
+    }
+    if ('/' == path[0])
+    {
+      /* The path must be relative. */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Path `%s' is not relative\n",
+                  path);
+      return NULL;
+    }
   }
-  if ('/' == path[0])
+
   {
-    /* The path must be relative. */
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Path `%s' is not relative\n",
-                path);
-    return NULL;
+    va_list args;
+    size_t len;
+
+    va_start (args,
+              path);
+    len = strlen (base_url) + strlen (path) + 1;
+    len += calculate_argument_length (args);
+    GNUNET_buffer_prealloc (&buf,
+                            len);
+    GNUNET_buffer_write_str (&buf,
+                             base_url);
+    GNUNET_buffer_write_str (&buf,
+                             path);
+    serialize_arguments (&buf,
+                         args);
+    va_end (args);
   }
-
-  va_start (args,
-            path);
-
-  len = strlen (base_url) + strlen (path) + 1;
-  len += calculate_argument_length (args);
-
-  GNUNET_buffer_prealloc (&buf,
-                          len);
-  GNUNET_buffer_write_str (&buf,
-                           base_url);
-  GNUNET_buffer_write_str (&buf,
-                           path);
-  serialize_arguments (&buf,
-                       args);
-  va_end (args);
-
   return GNUNET_buffer_reap_str (&buf);
 }
 
@@ -322,7 +325,7 @@ TALER_url_valid_charset (const char *url)
   for (unsigned int i = 0; '\0' != url[i]; i++)
   {
 #define ALLOWED_CHARACTERS \
-  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/:;&?-.,=_~%+"
+  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/:;&?-.,=_~%+#"
     if (NULL == strchr (ALLOWED_CHARACTERS,
                         (int) url[i]))
       return false;
@@ -332,4 +335,20 @@ TALER_url_valid_charset (const char *url)
 }
 
 
+bool
+TALER_is_web_url (const char *url)
+{
+  if ( (0 != strncasecmp (url,
+                          "https://",
+                          strlen ("https://"))) &&
+       (0 != strncasecmp (url,
+                          "http://",
+                          strlen ("http://"))) )
+    return false;
+  if (! TALER_url_valid_charset (url) )
+    return false;
+  return true;
+}
+
+
 /* end of url.c */
diff --git a/src/util/util.c b/src/util/util.c
index 2d10fd69d..da5727487 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014-2020 Taler Systems SA
+  Copyright (C) 2014-2023 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
@@ -19,16 +19,20 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Florian Dold
  * @author Benedikt Mueller
+ * @author Christian Grothoff
  */
 #include "platform.h"
 #include "taler_util.h"
+#include "taler_attributes.h"
+#include <gnunet/gnunet_json_lib.h>
+#include <unistr.h>
 
 
 const char *
 TALER_b2s (const void *buf,
            size_t buf_size)
 {
-  static GNUNET_THREAD_LOCAL char ret[9];
+  static TALER_THREAD_LOCAL char ret[9];
   struct GNUNET_HashCode hc;
   char *tmp;
 
@@ -37,9 +41,9 @@ TALER_b2s (const void *buf,
                       &hc);
   tmp = GNUNET_STRINGS_data_to_string_alloc (&hc,
                                              sizeof (hc));
-  memcpy (ret,
-          tmp,
-          8);
+  GNUNET_memcpy (ret,
+                 tmp,
+                 8);
   GNUNET_free (tmp);
   ret[8] = '\0';
   return ret;
@@ -82,8 +86,6 @@ TALER_global_fee_set_hton (struct TALER_GlobalFeeSetNBOP *nbo,
 {
   TALER_amount_hton (&nbo->history,
                      &fees->history);
-  TALER_amount_hton (&nbo->kyc,
-                     &fees->kyc);
   TALER_amount_hton (&nbo->account,
                      &fees->account);
   TALER_amount_hton (&nbo->purse,
@@ -97,8 +99,6 @@ TALER_global_fee_set_ntoh (struct TALER_GlobalFeeSet *fees,
 {
   TALER_amount_ntoh (&fees->history,
                      &nbo->history);
-  TALER_amount_ntoh (&fees->kyc,
-                     &nbo->kyc);
   TALER_amount_ntoh (&fees->account,
                      &nbo->account);
   TALER_amount_ntoh (&fees->purse,
@@ -114,8 +114,6 @@ TALER_wire_fee_set_hton (struct TALER_WireFeeSetNBOP *nbo,
                      &fees->wire);
   TALER_amount_hton (&nbo->closing,
                      &fees->closing);
-  TALER_amount_hton (&nbo->wad,
-                     &fees->wad);
 }
 
 
@@ -127,8 +125,6 @@ TALER_wire_fee_set_ntoh (struct TALER_WireFeeSet *fees,
                      &nbo->wire);
   TALER_amount_ntoh (&fees->closing,
                      &nbo->closing);
-  TALER_amount_ntoh (&fees->wad,
-                     &nbo->wad);
 }
 
 
@@ -142,10 +138,6 @@ TALER_global_fee_set_cmp (const struct TALER_GlobalFeeSet *f1,
                           &f2->history);
   if (0 != ret)
     return ret;
-  ret = TALER_amount_cmp (&f1->kyc,
-                          &f2->kyc);
-  if (0 != ret)
-    return ret;
   ret = TALER_amount_cmp (&f1->account,
                           &f2->account);
   if (0 != ret)
@@ -172,10 +164,6 @@ TALER_wire_fee_set_cmp (const struct TALER_WireFeeSet *f1,
                           &f2->closing);
   if (0 != ret)
     return ret;
-  ret = TALER_amount_cmp (&f1->wad,
-                          &f2->wad);
-  if (0 != ret)
-    return ret;
   return 0;
 }
 
@@ -217,6 +205,189 @@ TALER_denom_fee_check_currency (
 }
 
 
+/**
+ * Dump character in the low range into @a buf
+ * following RFC 8785.
+ *
+ * @param[in,out] buf buffer to modify
+ * @param val value to dump
+ */
+static void
+lowdump (struct GNUNET_Buffer *buf,
+         unsigned char val)
+{
+  char scratch[7];
+
+  switch (val)
+  {
+  case 0x8:
+    GNUNET_buffer_write (buf,
+                         "\\b",
+                         2);
+    break;
+  case 0x9:
+    GNUNET_buffer_write (buf,
+                         "\\t",
+                         2);
+    break;
+  case 0xA:
+    GNUNET_buffer_write (buf,
+                         "\\n",
+                         2);
+    break;
+  case 0xC:
+    GNUNET_buffer_write (buf,
+                         "\\f",
+                         2);
+    break;
+  case 0xD:
+    GNUNET_buffer_write (buf,
+                         "\\r",
+                         2);
+    break;
+  default:
+    GNUNET_snprintf (scratch,
+                     sizeof (scratch),
+                     "\\u%04x",
+                     (unsigned int) val);
+    GNUNET_buffer_write (buf,
+                         scratch,
+                         6);
+    break;
+  }
+}
+
+
+size_t
+TALER_rfc8785encode (char **inp)
+{
+  struct GNUNET_Buffer buf = { 0 };
+  size_t left = strlen (*inp) + 1;
+  size_t olen;
+  char *in = *inp;
+  const char *pos = in;
+
+  GNUNET_buffer_prealloc (&buf,
+                          left + 40);
+  buf.warn_grow = 0; /* disable, + 40 is just a wild guess */
+  while (1)
+  {
+    int mbl = u8_mblen ((unsigned char *) pos,
+                        left);
+    unsigned char val;
+
+    if (0 == mbl)
+      break;
+    val = (unsigned char) *pos;
+    if ( (1 == mbl) &&
+         (val <= 0x1F) )
+    {
+      /* Should not happen, as input is produced by
+       * JSON stringification */
+      GNUNET_break (0);
+      lowdump (&buf,
+               val);
+    }
+    else if ( (1 == mbl) && ('\\' == *pos) )
+    {
+      switch (*(pos + 1))
+      {
+      case '\\':
+        mbl = 2;
+        GNUNET_buffer_write (&buf,
+                             pos,
+                             mbl);
+        break;
+      case 'u':
+        {
+          unsigned int num;
+          uint32_t n32;
+          unsigned char res[8];
+          size_t rlen;
+
+          GNUNET_assert ( (1 ==
+                           sscanf (pos + 2,
+                                   "%4x",
+                                   &num)) ||
+                          (1 ==
+                           sscanf (pos + 2,
+                                   "%4X",
+                                   &num)) );
+          mbl = 6;
+          n32 = (uint32_t) num;
+          rlen = sizeof (res);
+          u32_to_u8 (&n32,
+                     1,
+                     res,
+                     &rlen);
+          if ( (1 == rlen) &&
+               (res[0] <= 0x1F) )
+          {
+            lowdump (&buf,
+                     res[0]);
+          }
+          else
+          {
+            GNUNET_buffer_write (&buf,
+                                 (const char *) res,
+                                 rlen);
+          }
+        }
+        break;
+      default:
+        mbl = 2;
+        GNUNET_buffer_write (&buf,
+                             pos,
+                             mbl);
+        break;
+      }
+    }
+    else
+    {
+      GNUNET_buffer_write (&buf,
+                           pos,
+                           mbl);
+    }
+    left -= mbl;
+    pos += mbl;
+  }
+
+  /* 0-terminate buffer */
+  GNUNET_buffer_write (&buf,
+                       "",
+                       1);
+  GNUNET_free (in);
+  *inp = GNUNET_buffer_reap (&buf,
+                             &olen);
+  return olen;
+}
+
+
+/**
+ * Hash normalized @a j JSON object or array and
+ * store the result in @a hc.
+ *
+ * @param j JSON to hash
+ * @param[out] hc where to write the hash
+ */
+void
+TALER_json_hash (const json_t *j,
+                 struct GNUNET_HashCode *hc)
+{
+  char *cstr;
+  size_t clen;
+
+  cstr = json_dumps (j,
+                     JSON_COMPACT | JSON_SORT_KEYS);
+  GNUNET_assert (NULL != cstr);
+  clen = TALER_rfc8785encode (&cstr);
+  GNUNET_CRYPTO_hash (cstr,
+                      clen,
+                      hc);
+  GNUNET_free (cstr);
+}
+
+
 #ifdef __APPLE__
 char *
 strchrnul (const char *s,
@@ -234,4 +405,51 @@ strchrnul (const char *s,
 #endif
 
 
+void
+TALER_CRYPTO_attributes_to_kyc_prox (
+  const json_t *attr,
+  struct GNUNET_ShortHashCode *kyc_prox)
+{
+  const char *name = NULL;
+  const char *birthdate = NULL;
+  struct GNUNET_JSON_Specification spec[] = {
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string (TALER_ATTRIBUTE_FULL_NAME,
+                               &name),
+      NULL),
+    GNUNET_JSON_spec_mark_optional (
+      GNUNET_JSON_spec_string (TALER_ATTRIBUTE_BIRTHDATE,
+                               &birthdate),
+      NULL),
+    GNUNET_JSON_spec_end ()
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (attr,
+                         spec,
+                         NULL, NULL))
+  {
+    GNUNET_break (0);
+    memset (kyc_prox,
+            0,
+            sizeof (*kyc_prox));
+    return;
+  }
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CRYPTO_kdf (
+                   kyc_prox,
+                   sizeof (*kyc_prox),
+                   name,
+                   (NULL == name)
+                   ? 0
+                   : strlen (name),
+                   birthdate,
+                   (NULL == birthdate)
+                   ? 0
+                   : strlen (birthdate),
+                   NULL,
+                   0));
+}
+
+
 /* end of util.c */
diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c
index 27a28256c..0b6ab5432 100644
--- a/src/util/wallet_signatures.c
+++ b/src/util/wallet_signatures.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2021, 2022 Taler Systems SA
+  Copyright (C) 2021-2023 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
@@ -17,12 +17,16 @@
  * @file wallet_signatures.c
  * @brief Utility functions for Taler wallet signatures
  * @author Christian Grothoff
+ * @author Özgür Kesim
  */
 #include "platform.h"
 #include "taler_util.h"
 #include "taler_signatures.h"
+#include <gnunet/gnunet_common.h>
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * @brief Format used to generate the signature on a request to deposit
  * a coin into the account of a merchant.
@@ -47,9 +51,9 @@ struct TALER_DepositRequestPS
   struct TALER_AgeCommitmentHash h_age_commitment GNUNET_PACKED;
 
   /**
-   * Hash over extension attributes shared with the exchange.
+   * Hash over optional policy extension attributes shared with the exchange.
    */
-  struct TALER_ExtensionContractHashP h_extensions GNUNET_PACKED;
+  struct TALER_ExtensionPolicyHashP h_policy GNUNET_PACKED;
 
   /**
    * Hash over the wiring information of the merchant.
@@ -107,8 +111,15 @@ struct TALER_DepositRequestPS
    */
   struct TALER_MerchantPublicKeyP merchant;
 
+  /**
+   * Hash over a JSON containing data provided by the
+   * wallet to complete the contract upon payment.
+   */
+  struct GNUNET_HashCode wallet_data_hash;
+
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_deposit_sign (
@@ -116,8 +127,9 @@ TALER_wallet_deposit_sign (
   const struct TALER_Amount *deposit_fee,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct GNUNET_HashCode *wallet_data_hash,
   const struct TALER_AgeCommitmentHash *h_age_commitment,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_DenominationHashP *h_denom_pub,
   const struct GNUNET_TIME_Timestamp wallet_timestamp,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -136,12 +148,12 @@ TALER_wallet_deposit_sign (
     .merchant = *merchant_pub
   };
 
+  if (NULL != wallet_data_hash)
+    dr.wallet_data_hash = *wallet_data_hash;
   if (NULL != h_age_commitment)
     dr.h_age_commitment = *h_age_commitment;
-
-  if (NULL != h_extensions)
-    dr.h_extensions = *h_extensions;
-
+  if (NULL != h_policy)
+    dr.h_policy = *h_policy;
   TALER_amount_hton (&dr.amount_with_fee,
                      amount);
   TALER_amount_hton (&dr.deposit_fee,
@@ -158,8 +170,9 @@ TALER_wallet_deposit_verify (
   const struct TALER_Amount *deposit_fee,
   const struct TALER_MerchantWireHashP *h_wire,
   const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct GNUNET_HashCode *wallet_data_hash,
   const struct TALER_AgeCommitmentHash *h_age_commitment,
-  const struct TALER_ExtensionContractHashP *h_extensions,
+  const struct TALER_ExtensionPolicyHashP *h_policy,
   const struct TALER_DenominationHashP *h_denom_pub,
   struct GNUNET_TIME_Timestamp wallet_timestamp,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -176,21 +189,18 @@ TALER_wallet_deposit_verify (
     .wallet_timestamp = GNUNET_TIME_timestamp_hton (wallet_timestamp),
     .refund_deadline = GNUNET_TIME_timestamp_hton (refund_deadline),
     .merchant = *merchant_pub,
-    .h_age_commitment = {{{0}}},
-    .h_extensions = {{{0}}}
   };
 
+  if (NULL != wallet_data_hash)
+    dr.wallet_data_hash = *wallet_data_hash;
   if (NULL != h_age_commitment)
     dr.h_age_commitment = *h_age_commitment;
-
-  if (NULL != h_extensions)
-    dr.h_extensions = *h_extensions;
-
+  if (NULL != h_policy)
+    dr.h_policy = *h_policy;
   TALER_amount_hton (&dr.amount_with_fee,
                      amount);
   TALER_amount_hton (&dr.deposit_fee,
                      deposit_fee);
-
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_WALLET_COIN_DEPOSIT,
                                   &dr,
@@ -204,6 +214,8 @@ TALER_wallet_deposit_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * @brief Format used for to allow the wallet to authenticate
  * link data provided by the exchange.
@@ -238,6 +250,7 @@ struct TALER_LinkDataPS
   struct TALER_BlindedCoinHashP coin_envelope_hash;
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_link_sign (const struct TALER_DenominationHashP *h_denom_pub,
@@ -284,6 +297,8 @@ TALER_wallet_link_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Signed data to request that a coin should be refunded as part of
  * the "emergency" /recoup protocol.  The refund will go back to the bank
@@ -305,15 +320,17 @@ struct TALER_RecoupRequestPS
   /**
    * Blinding factor that was used to withdraw the coin.
    */
-  union TALER_DenominationBlindingKeyP coin_blind;
+  union GNUNET_CRYPTO_BlindingSecretP coin_blind;
 
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 
 enum GNUNET_GenericReturnValue
 TALER_wallet_recoup_verify (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -334,7 +351,7 @@ TALER_wallet_recoup_verify (
 void
 TALER_wallet_recoup_sign (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -354,7 +371,7 @@ TALER_wallet_recoup_sign (
 enum GNUNET_GenericReturnValue
 TALER_wallet_recoup_refresh_verify (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -375,7 +392,7 @@ TALER_wallet_recoup_refresh_verify (
 void
 TALER_wallet_recoup_refresh_sign (
   const struct TALER_DenominationHashP *h_denom_pub,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -392,6 +409,8 @@ TALER_wallet_recoup_refresh_sign (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * @brief Message signed by a coin to indicate that the coin should be
  * melted.
@@ -443,6 +462,7 @@ struct TALER_RefreshMeltCoinAffirmationPS
   struct TALER_AmountNBO melt_fee;
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_melt_sign (
@@ -509,6 +529,9 @@ TALER_wallet_melt_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
 /**
  * @brief Format used for to generate the signature on a request to withdraw
  * coins from a reserve.
@@ -543,6 +566,8 @@ struct TALER_WithdrawRequestPS
 };
 
 
+GNUNET_NETWORK_STRUCT_END
+
 void
 TALER_wallet_withdraw_sign (
   const struct TALER_DenominationHashP *h_denom_pub,
@@ -591,45 +616,181 @@ TALER_wallet_withdraw_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * @brief Format used for to generate the signature on a request to
+ * age-withdraw from a reserve.
+ */
+struct TALER_AgeWithdrawRequestPS
+{
+
+  /**
+   * Purpose must be #TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW.
+   * Used with an EdDSA signature of a `struct TALER_ReservePublicKeyP`.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * The reserve's public key
+   */
+  struct TALER_ReservePublicKeyP reserve_pub;
+
+  /**
+   * Value of the coin being exchanged (matching the denomination key)
+   * plus the transaction fee.  We include this in what is being
+   * signed so that we can verify a reserve's remaining total balance
+   * without needing to access the respective denomination key
+   * information each time.
+   */
+  struct TALER_AmountNBO amount_with_fee;
+
+  /**
+   * Running SHA512 hash of the commitment of n*kappa coins
+   */
+  struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+
+  /**
+   * The mask that defines the age groups.  MUST be the same for all denominations.
+   */
+  struct TALER_AgeMask mask;
+
+  /**
+   * Maximum age group that the coins are going to be restricted to.
+   */
+  uint8_t max_age_group;
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+void
+TALER_wallet_age_withdraw_sign (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_AgeMask *mask,
+  uint8_t max_age,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_AgeWithdrawRequestPS req = {
+    .purpose.size = htonl (sizeof (req)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_AGE_WITHDRAW),
+    .h_commitment = *h_commitment,
+    .mask = *mask,
+    .max_age_group = TALER_get_age_group (mask, max_age)
+  };
+
+  GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+                                      &req.reserve_pub.eddsa_pub);
+  TALER_amount_hton (&req.amount_with_fee,
+                     amount_with_fee);
+  GNUNET_CRYPTO_eddsa_sign (&reserve_priv->eddsa_priv,
+                            &req,
+                            &reserve_sig->eddsa_signature);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_wallet_age_withdraw_verify (
+  const struct TALER_AgeWithdrawCommitmentHashP *h_commitment,
+  const struct TALER_Amount *amount_with_fee,
+  const struct TALER_AgeMask *mask,
+  uint8_t max_age,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_AgeWithdrawRequestPS awsrd = {
+    .purpose.size = htonl (sizeof (awsrd)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_AGE_WITHDRAW),
+    .reserve_pub = *reserve_pub,
+    .h_commitment = *h_commitment,
+    .mask = *mask,
+    .max_age_group = TALER_get_age_group (mask, max_age)
+  };
+
+  TALER_amount_hton (&awsrd.amount_with_fee,
+                     amount_with_fee);
+  return GNUNET_CRYPTO_eddsa_verify (
+    TALER_SIGNATURE_WALLET_RESERVE_AGE_WITHDRAW,
+    &awsrd,
+    &reserve_sig->eddsa_signature,
+    &reserve_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
+/**
+ * @brief Format used for to generate the signature on a request to withdraw
+ * coins from a reserve.
+ */
+struct TALER_AccountSetupRequestSignaturePS
+{
+
+  /**
+   * Purpose must be #TALER_SIGNATURE_WALLET_ACCOUNT_SETUP.
+   * Used with an EdDSA signature of a `struct TALER_ReservePublicKeyP`.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Balance threshold the wallet is about to cross.
+   */
+  struct TALER_AmountNBO threshold;
+
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+
 void
 TALER_wallet_account_setup_sign (
   const struct TALER_ReservePrivateKeyP *reserve_priv,
+  const struct TALER_Amount *balance_threshold,
   struct TALER_ReserveSignatureP *reserve_sig)
 {
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
-    .size = htonl (sizeof (purpose)),
-    .purpose = htonl (TALER_SIGNATURE_WALLET_ACCOUNT_SETUP)
+  struct TALER_AccountSetupRequestSignaturePS asap = {
+    .purpose.size = htonl (sizeof (asap)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_ACCOUNT_SETUP)
   };
 
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_eddsa_sign_ (&reserve_priv->eddsa_priv,
-                                            &purpose,
-                                            &reserve_sig->eddsa_signature));
+  TALER_amount_hton (&asap.threshold,
+                     balance_threshold);
+  GNUNET_CRYPTO_eddsa_sign (&reserve_priv->eddsa_priv,
+                            &asap,
+                            &reserve_sig->eddsa_signature);
 }
 
 
 enum GNUNET_GenericReturnValue
 TALER_wallet_account_setup_verify (
   const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_Amount *balance_threshold,
   const struct TALER_ReserveSignatureP *reserve_sig)
 {
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
-    .size = htonl (sizeof (purpose)),
-    .purpose = htonl (TALER_SIGNATURE_WALLET_ACCOUNT_SETUP)
+  struct TALER_AccountSetupRequestSignaturePS asap = {
+    .purpose.size = htonl (sizeof (asap)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_ACCOUNT_SETUP)
   };
 
-  return GNUNET_CRYPTO_eddsa_verify_ (
+  TALER_amount_hton (&asap.threshold,
+                     balance_threshold);
+  return GNUNET_CRYPTO_eddsa_verify (
     TALER_SIGNATURE_WALLET_ACCOUNT_SETUP,
-    &purpose,
+    &asap,
     &reserve_sig->eddsa_signature,
     &reserve_pub->eddsa_pub);
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
 /**
- * Response by which a wallet requests a full
- * reserve history and indicates it is willing
- * to pay for it.
+ * Response by which a wallet requests a reserve history.
  */
 struct TALER_ReserveHistoryRequestPS
 {
@@ -640,35 +801,29 @@ struct TALER_ReserveHistoryRequestPS
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * When did the wallet make the requst.
-   */
-  struct GNUNET_TIME_TimestampNBO request_timestamp;
-
-  /**
-   * How much does the exchange charge for the history?
+   * Which entries to exclude. Only return above this offset.
    */
-  struct TALER_AmountNBO history_fee;
+  uint64_t start_off;
 
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 
 enum GNUNET_GenericReturnValue
 TALER_wallet_reserve_history_verify (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_Amount *history_fee,
+  uint64_t start_off,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_ReserveSignatureP *reserve_sig)
 {
   struct TALER_ReserveHistoryRequestPS rhr = {
     .purpose.size = htonl (sizeof (rhr)),
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_HISTORY),
-    .request_timestamp = GNUNET_TIME_timestamp_hton (ts)
+    .start_off = GNUNET_htonll (start_off)
   };
 
-  TALER_amount_hton (&rhr.history_fee,
-                     history_fee);
   return GNUNET_CRYPTO_eddsa_verify (
-    TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW,
+    TALER_SIGNATURE_WALLET_RESERVE_HISTORY,
     &rhr,
     &reserve_sig->eddsa_signature,
     &reserve_pub->eddsa_pub);
@@ -677,82 +832,84 @@ TALER_wallet_reserve_history_verify (
 
 void
 TALER_wallet_reserve_history_sign (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_Amount *history_fee,
+  uint64_t start_off,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   struct TALER_ReserveSignatureP *reserve_sig)
 {
   struct TALER_ReserveHistoryRequestPS rhr = {
     .purpose.size = htonl (sizeof (rhr)),
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_HISTORY),
-    .request_timestamp = GNUNET_TIME_timestamp_hton (ts)
+    .start_off = GNUNET_htonll (start_off)
   };
 
-  TALER_amount_hton (&rhr.history_fee,
-                     history_fee);
   GNUNET_CRYPTO_eddsa_sign (&reserve_priv->eddsa_priv,
                             &rhr,
                             &reserve_sig->eddsa_signature);
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
- * Response by which a wallet requests an account status.
+ * Response by which a wallet requests a coin history.
  */
-struct TALER_ReserveStatusRequestPS
+struct TALER_CoinHistoryRequestPS
 {
 
   /**
-   * Purpose is #TALER_SIGNATURE_WALLET_RESERVE_STATUS
+   * Purpose is #TALER_SIGNATURE_WALLET_COIN_HISTORY
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
-   * When did the wallet make the requst.
+   * Which entries to exclude. Only return above this offset.
    */
-  struct GNUNET_TIME_TimestampNBO request_timestamp;
+  uint64_t start_off;
 
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 enum GNUNET_GenericReturnValue
-TALER_wallet_reserve_status_verify (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_ReservePublicKeyP *reserve_pub,
-  const struct TALER_ReserveSignatureP *reserve_sig)
+TALER_wallet_coin_history_verify (
+  uint64_t start_off,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig)
 {
-  struct TALER_ReserveStatusRequestPS rsr = {
+  struct TALER_CoinHistoryRequestPS rsr = {
     .purpose.size = htonl (sizeof (rsr)),
-    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_STATUS),
-    .request_timestamp = GNUNET_TIME_timestamp_hton (ts)
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_HISTORY),
+    .start_off = GNUNET_htonll (start_off)
   };
 
   return GNUNET_CRYPTO_eddsa_verify (
-    TALER_SIGNATURE_WALLET_RESERVE_STATUS,
+    TALER_SIGNATURE_WALLET_COIN_HISTORY,
     &rsr,
-    &reserve_sig->eddsa_signature,
-    &reserve_pub->eddsa_pub);
+    &coin_sig->eddsa_signature,
+    &coin_pub->eddsa_pub);
 }
 
 
 void
-TALER_wallet_reserve_status_sign (
-  const struct GNUNET_TIME_Timestamp ts,
-  const struct TALER_ReservePrivateKeyP *reserve_priv,
-  struct TALER_ReserveSignatureP *reserve_sig)
+TALER_wallet_coin_history_sign (
+  uint64_t start_off,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  struct TALER_CoinSpendSignatureP *coin_sig)
 {
-  struct TALER_ReserveStatusRequestPS rsr = {
+  struct TALER_CoinHistoryRequestPS rsr = {
     .purpose.size = htonl (sizeof (rsr)),
-    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_STATUS),
-    .request_timestamp = GNUNET_TIME_timestamp_hton (ts)
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_COIN_HISTORY),
+    .start_off = GNUNET_htonll (start_off)
   };
 
-  GNUNET_CRYPTO_eddsa_sign (&reserve_priv->eddsa_priv,
+  GNUNET_CRYPTO_eddsa_sign (&coin_priv->eddsa_priv,
                             &rsr,
-                            &reserve_sig->eddsa_signature);
+                            &coin_sig->eddsa_signature);
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message signed to create a purse (without reserve).
  */
@@ -792,10 +949,13 @@ struct TALER_PurseCreatePS
 };
 
 
+GNUNET_NETWORK_STRUCT_END
+
+
 void
 TALER_wallet_purse_create_sign (
   struct GNUNET_TIME_Timestamp purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
   uint32_t min_age,
   const struct TALER_Amount *amount,
@@ -822,7 +982,7 @@ TALER_wallet_purse_create_sign (
 enum GNUNET_GenericReturnValue
 TALER_wallet_purse_create_verify (
   struct GNUNET_TIME_Timestamp purse_expiration,
-  struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct TALER_PrivateContractHashP *h_contract_terms,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
   uint32_t min_age,
   const struct TALER_Amount *amount,
@@ -848,6 +1008,59 @@ TALER_wallet_purse_create_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed to delete a purse.
+ */
+struct TALER_PurseDeletePS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_WALLET_PURSE_DELETE
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_wallet_purse_delete_sign (
+  const struct TALER_PurseContractPrivateKeyP *purse_priv,
+  struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct TALER_PurseDeletePS pm = {
+    .purpose.size = htonl (sizeof (pm)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_DELETE)
+  };
+
+  GNUNET_CRYPTO_eddsa_sign (&purse_priv->eddsa_priv,
+                            &pm,
+                            &purse_sig->eddsa_signature);
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_wallet_purse_delete_verify (
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct TALER_PurseDeletePS pm = {
+    .purpose.size = htonl (sizeof (pm)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_DELETE)
+  };
+
+  return GNUNET_CRYPTO_eddsa_verify (
+    TALER_SIGNATURE_WALLET_PURSE_DELETE,
+    &pm,
+    &purse_sig->eddsa_signature,
+    &purse_pub->eddsa_pub);
+}
+
+
 void
 TALER_wallet_purse_status_sign (
   const struct TALER_PurseContractPrivateKeyP *purse_priv,
@@ -882,6 +1095,8 @@ TALER_wallet_purse_status_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message signed to deposit a coin into a purse.
  */
@@ -899,6 +1114,17 @@ struct TALER_PurseDepositPS
   struct TALER_AmountNBO coin_amount;
 
   /**
+   * Hash over the denomination public key used to sign the coin.
+   */
+  struct TALER_DenominationHashP h_denom_pub GNUNET_PACKED;
+
+  /**
+   * Hash over the age commitment that went into the coin. Maybe all zero, if
+   * age commitment isn't applicable to the denomination.
+   */
+  struct TALER_AgeCommitmentHash h_age_commitment GNUNET_PACKED;
+
+  /**
    * Purse to deposit funds into.
    */
   struct TALER_PurseContractPublicKeyP purse_pub;
@@ -907,15 +1133,18 @@ struct TALER_PurseDepositPS
    * Hash of the base URL of the exchange hosting the
    * @e purse_pub.
    */
-  struct GNUNET_HashCode h_exchange_base_url;
+  struct GNUNET_HashCode h_exchange_base_url GNUNET_PACKED;
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_purse_deposit_sign (
   const char *exchange_base_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_Amount *amount,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
   const struct TALER_CoinSpendPrivateKeyP *coin_priv,
   struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -923,6 +1152,8 @@ TALER_wallet_purse_deposit_sign (
     .purpose.size = htonl (sizeof (pm)),
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_DEPOSIT),
     .purse_pub = *purse_pub,
+    .h_denom_pub = *h_denom_pub,
+    .h_age_commitment = *h_age_commitment
   };
 
   GNUNET_CRYPTO_hash (exchange_base_url,
@@ -941,6 +1172,8 @@ TALER_wallet_purse_deposit_verify (
   const char *exchange_base_url,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_Amount *amount,
+  const struct TALER_DenominationHashP *h_denom_pub,
+  const struct TALER_AgeCommitmentHash *h_age_commitment,
   const struct TALER_CoinSpendPublicKeyP *coin_pub,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
@@ -948,6 +1181,8 @@ TALER_wallet_purse_deposit_verify (
     .purpose.size = htonl (sizeof (pm)),
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_DEPOSIT),
     .purse_pub = *purse_pub,
+    .h_denom_pub = *h_denom_pub,
+    .h_age_commitment = *h_age_commitment
   };
 
   GNUNET_CRYPTO_hash (exchange_base_url,
@@ -963,6 +1198,8 @@ TALER_wallet_purse_deposit_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message signed to merge a purse into a reserve.
  */
@@ -992,10 +1229,11 @@ struct TALER_PurseMergePS
 
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_purse_merge_sign (
-  const char *reserve_url,
+  const char *reserve_uri,
   struct GNUNET_TIME_Timestamp merge_timestamp,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseMergePrivateKeyP *merge_priv,
@@ -1008,7 +1246,11 @@ TALER_wallet_purse_merge_sign (
     .purse_pub = *purse_pub
   };
 
-  TALER_payto_hash (reserve_url,
+  GNUNET_assert (0 ==
+                 strncasecmp (reserve_uri,
+                              "payto://taler-reserve",
+                              strlen ("payto://taler-reserve")));
+  TALER_payto_hash (reserve_uri,
                     &pm.h_payto);
   GNUNET_CRYPTO_eddsa_sign (&merge_priv->eddsa_priv,
                             &pm,
@@ -1018,7 +1260,7 @@ TALER_wallet_purse_merge_sign (
 
 enum GNUNET_GenericReturnValue
 TALER_wallet_purse_merge_verify (
-  const char *reserve_url,
+  const char *reserve_uri,
   struct GNUNET_TIME_Timestamp merge_timestamp,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseMergePublicKeyP *merge_pub,
@@ -1031,7 +1273,15 @@ TALER_wallet_purse_merge_verify (
     .purse_pub = *purse_pub
   };
 
-  TALER_payto_hash (reserve_url,
+  if (0 !=
+      strncasecmp (reserve_uri,
+                   "payto://taler-reserve",
+                   strlen ("payto://taler-reserve")))
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  TALER_payto_hash (reserve_uri,
                     &pm.h_payto);
   return GNUNET_CRYPTO_eddsa_verify (
     TALER_SIGNATURE_WALLET_PURSE_MERGE,
@@ -1041,6 +1291,8 @@ TALER_wallet_purse_merge_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message signed by account to merge a purse into a reserve.
  */
@@ -1096,6 +1348,8 @@ struct TALER_AccountMergePS
   uint32_t flags GNUNET_PACKED;
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 
 void
 TALER_wallet_account_merge_sign (
@@ -1167,40 +1421,323 @@ TALER_wallet_account_merge_verify (
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by reserve key.
+ */
+struct TALER_ReserveOpenPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_WALLET_RESERVE_OPEN
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Amount to be paid from the reserve balance to open
+   * the reserve.
+   */
+  struct TALER_AmountNBO reserve_payment;
+
+  /**
+   * When was the request created.
+   */
+  struct GNUNET_TIME_TimestampNBO request_timestamp;
+
+  /**
+   * For how long should the reserve be kept open.
+   * (Determines amount to be paid.)
+   */
+  struct GNUNET_TIME_TimestampNBO reserve_expiration;
+
+  /**
+   * How many open purses should be included with the
+   * open reserve?
+   * (Determines amount to be paid.)
+   */
+  uint32_t purse_limit GNUNET_PACKED;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
 void
-TALER_wallet_account_close_sign (
+TALER_wallet_reserve_open_sign (
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
   const struct TALER_ReservePrivateKeyP *reserve_priv,
   struct TALER_ReserveSignatureP *reserve_sig)
 {
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
-    .size = htonl (sizeof (purpose)),
-    .purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_CLOSE)
+  struct TALER_ReserveOpenPS rop = {
+    .purpose.size = htonl (sizeof (rop)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_OPEN),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp),
+    .reserve_expiration = GNUNET_TIME_timestamp_hton (reserve_expiration),
+    .purse_limit = htonl (purse_limit)
   };
 
+  TALER_amount_hton (&rop.reserve_payment,
+                     reserve_payment);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_CRYPTO_eddsa_sign_ (&reserve_priv->eddsa_priv,
-                                            &purpose,
+                                            &rop.purpose,
                                             &reserve_sig->eddsa_signature));
 }
 
 
 enum GNUNET_GenericReturnValue
-TALER_wallet_account_close_verify (
+TALER_wallet_reserve_open_verify (
+  const struct TALER_Amount *reserve_payment,
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  struct GNUNET_TIME_Timestamp reserve_expiration,
+  uint32_t purse_limit,
   const struct TALER_ReservePublicKeyP *reserve_pub,
   const struct TALER_ReserveSignatureP *reserve_sig)
 {
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose = {
-    .size = htonl (sizeof (purpose)),
-    .purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_CLOSE)
+  struct TALER_ReserveOpenPS rop = {
+    .purpose.size = htonl (sizeof (rop)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_OPEN),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp),
+    .reserve_expiration = GNUNET_TIME_timestamp_hton (reserve_expiration),
+    .purse_limit = htonl (purse_limit)
   };
 
+  TALER_amount_hton (&rop.reserve_payment,
+                     reserve_payment);
+  return GNUNET_CRYPTO_eddsa_verify_ (TALER_SIGNATURE_WALLET_RESERVE_OPEN,
+                                      &rop.purpose,
+                                      &reserve_sig->eddsa_signature,
+                                      &reserve_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by
+ */
+struct TALER_ReserveOpenDepositPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Which reserve's opening signature should be paid for?
+   */
+  struct TALER_ReserveSignatureP reserve_sig;
+
+  /**
+   * Specifies how much of the coin's value should be spent on opening this
+   * reserve.
+   */
+  struct TALER_AmountNBO coin_contribution;
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+// FIXME-#7267: add h_age_commitment, h_denom_pub to have proof!
+void
+TALER_wallet_reserve_open_deposit_sign (
+  const struct TALER_Amount *coin_contribution,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_CoinSpendPrivateKeyP *coin_priv,
+  struct TALER_CoinSpendSignatureP *coin_sig)
+{
+  struct TALER_ReserveOpenDepositPS rod = {
+    .purpose.size = htonl (sizeof (rod)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT),
+    .reserve_sig = *reserve_sig
+  };
+
+  TALER_amount_hton (&rod.coin_contribution,
+                     coin_contribution);
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CRYPTO_eddsa_sign_ (&coin_priv->eddsa_priv,
+                                            &rod.purpose,
+                                            &coin_sig->eddsa_signature));
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_open_deposit_verify (
+  const struct TALER_Amount *coin_contribution,
+  const struct TALER_ReserveSignatureP *reserve_sig,
+  const struct TALER_CoinSpendPublicKeyP *coin_pub,
+  const struct TALER_CoinSpendSignatureP *coin_sig)
+{
+  struct TALER_ReserveOpenDepositPS rod = {
+    .purpose.size = htonl (sizeof (rod)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT),
+    .reserve_sig = *reserve_sig
+  };
+
+  TALER_amount_hton (&rod.coin_contribution,
+                     coin_contribution);
+  return GNUNET_CRYPTO_eddsa_verify_ (
+    TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT,
+    &rod.purpose,
+    &coin_sig->eddsa_signature,
+    &coin_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by reserve key.
+ */
+struct TALER_ReserveClosePS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_WALLET_RESERVE_CLOSE
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * When was the request created.
+   */
+  struct GNUNET_TIME_TimestampNBO request_timestamp;
+
+  /**
+   * Hash of the payto://-URI of the target account
+   * for the closure, or all zeros for the reserve
+   * origin account.
+   */
+  struct TALER_PaytoHashP target_account_h_payto;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_wallet_reserve_close_sign (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_ReserveClosePS rcp = {
+    .purpose.size = htonl (sizeof (rcp)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_CLOSE),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp)
+  };
+
+  if (NULL != h_payto)
+    rcp.target_account_h_payto = *h_payto;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CRYPTO_eddsa_sign_ (&reserve_priv->eddsa_priv,
+                                            &rcp.purpose,
+                                            &reserve_sig->eddsa_signature));
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_close_verify (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const struct TALER_PaytoHashP *h_payto,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_ReserveClosePS rcp = {
+    .purpose.size = htonl (sizeof (rcp)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_CLOSE),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp)
+  };
+
+  if (NULL != h_payto)
+    rcp.target_account_h_payto = *h_payto;
   return GNUNET_CRYPTO_eddsa_verify_ (TALER_SIGNATURE_WALLET_RESERVE_CLOSE,
-                                      &purpose,
+                                      &rcp.purpose,
                                       &reserve_sig->eddsa_signature,
                                       &reserve_pub->eddsa_pub);
 }
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Message signed by reserve private key.
+ */
+struct TALER_ReserveAttestRequestPS
+{
+
+  /**
+   * Purpose is #TALER_SIGNATURE_WALLET_ATTEST_REQUEST
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * When was the request created.
+   */
+  struct GNUNET_TIME_TimestampNBO request_timestamp;
+
+  /**
+   * Hash over the JSON array of requested attributes.
+   */
+  struct GNUNET_HashCode h_details;
+
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+void
+TALER_wallet_reserve_attest_request_sign (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const json_t *details,
+  const struct TALER_ReservePrivateKeyP *reserve_priv,
+  struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_ReserveAttestRequestPS rcp = {
+    .purpose.size = htonl (sizeof (rcp)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_ATTEST_DETAILS),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp)
+  };
+
+  TALER_json_hash (details,
+                   &rcp.h_details);
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CRYPTO_eddsa_sign_ (&reserve_priv->eddsa_priv,
+                                            &rcp.purpose,
+                                            &reserve_sig->eddsa_signature));
+}
+
+
+enum GNUNET_GenericReturnValue
+TALER_wallet_reserve_attest_request_verify (
+  struct GNUNET_TIME_Timestamp request_timestamp,
+  const json_t *details,
+  const struct TALER_ReservePublicKeyP *reserve_pub,
+  const struct TALER_ReserveSignatureP *reserve_sig)
+{
+  struct TALER_ReserveAttestRequestPS rcp = {
+    .purpose.size = htonl (sizeof (rcp)),
+    .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_RESERVE_ATTEST_DETAILS),
+    .request_timestamp = GNUNET_TIME_timestamp_hton (request_timestamp)
+  };
+
+  TALER_json_hash (details,
+                   &rcp.h_details);
+  return GNUNET_CRYPTO_eddsa_verify_ (
+    TALER_SIGNATURE_WALLET_RESERVE_ATTEST_DETAILS,
+    &rcp.purpose,
+    &reserve_sig->eddsa_signature,
+    &reserve_pub->eddsa_pub);
+}
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message signed by purse to associate an encrypted contract.
  */
@@ -1223,6 +1760,7 @@ struct TALER_PurseContractPS
   struct TALER_ContractDiffiePublicP contract_pub;
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 void
 TALER_wallet_econtract_upload_sign (
@@ -1248,20 +1786,9 @@ TALER_wallet_econtract_upload_sign (
 }
 
 
-/**
- * Verify a signature over encrypted contract.
- *
- * @param econtract encrypted contract
- * @param econtract_size number of bytes in @a econtract
- * @param contract_pub public key for the DH-encryption
- * @param purse_pub purse’s public key
- * @param purse_sig the signature made with purpose #TALER_SIGNATURE_WALLET_PURSE_CREATE
- * @return #GNUNET_OK if the signature is valid
- */
 enum GNUNET_GenericReturnValue
-TALER_wallet_econtract_upload_verify (
-  const void *econtract,
-  size_t econtract_size,
+TALER_wallet_econtract_upload_verify2 (
+  const struct GNUNET_HashCode *h_econtract,
   const struct TALER_ContractDiffiePublicP *contract_pub,
   const struct TALER_PurseContractPublicKeyP *purse_pub,
   const struct TALER_PurseContractSignatureP *purse_sig)
@@ -1269,12 +1796,10 @@ TALER_wallet_econtract_upload_verify (
   struct TALER_PurseContractPS pc = {
     .purpose.size = htonl (sizeof (pc)),
     .purpose.purpose = htonl (TALER_SIGNATURE_WALLET_PURSE_ECONTRACT),
-    .contract_pub = *contract_pub
+    .contract_pub = *contract_pub,
+    .h_econtract = *h_econtract
   };
 
-  GNUNET_CRYPTO_hash (econtract,
-                      econtract_size,
-                      &pc.h_econtract);
   return GNUNET_CRYPTO_eddsa_verify_ (TALER_SIGNATURE_WALLET_PURSE_ECONTRACT,
                                       &pc.purpose,
                                       &purse_sig->eddsa_signature,
@@ -1282,4 +1807,24 @@ TALER_wallet_econtract_upload_verify (
 }
 
 
+enum GNUNET_GenericReturnValue
+TALER_wallet_econtract_upload_verify (
+  const void *econtract,
+  size_t econtract_size,
+  const struct TALER_ContractDiffiePublicP *contract_pub,
+  const struct TALER_PurseContractPublicKeyP *purse_pub,
+  const struct TALER_PurseContractSignatureP *purse_sig)
+{
+  struct GNUNET_HashCode h_econtract;
+
+  GNUNET_CRYPTO_hash (econtract,
+                      econtract_size,
+                      &h_econtract);
+  return TALER_wallet_econtract_upload_verify2 (&h_econtract,
+                                                contract_pub,
+                                                purse_pub,
+                                                purse_sig);
+}
+
+
 /* end of wallet_signatures.c */